diff --git a/CMakeLists.txt b/CMakeLists.txt
index ce7b9d215e..f8ff113a9d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -329,6 +329,9 @@ if(NOT DISABLE_WX)
 
 		message("wxWidgets found, enabling GUI build")
 	else(wxWidgets_FOUND)
+		if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+			message(FATAL_ERROR "wxWidgets not found.  It is required to build the GUI")
+		endif()
 		message("Shared wxWidgets not found, falling back to the static library")
 		include_directories(Externals/wxWidgets/include)
 		add_subdirectory(Externals/wxWidgets)
@@ -357,7 +360,7 @@ add_subdirectory(Source)
 install(DIRECTORY Data/User/ DESTINATION ${datadir}/user PATTERN .svn EXCLUDE)
 install(DIRECTORY Data/Sys/ DESTINATION ${datadir}/sys PATTERN .svn EXCLUDE)
 include(FindGettext)
-if(GETTEXT_FOUND)
+if(GETTEXT_FOUND AND NOT DISABLE_WX)
 	file(GLOB LINGUAS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} Languages/*.po) 
 	GETTEXT_CREATE_TRANSLATIONS(Languages/dolphin-emu.pot ALL ${LINGUAS})
 endif()
diff --git a/Data/Languages/de/dolphin-emu.mo b/Data/Languages/de/dolphin-emu.mo
index d8a0a55ff6..b64a68484e 100644
Binary files a/Data/Languages/de/dolphin-emu.mo and b/Data/Languages/de/dolphin-emu.mo differ
diff --git a/Data/Languages/en/dolphin-emu.mo b/Data/Languages/en/dolphin-emu.mo
index 0466582da9..3d05e936e0 100644
Binary files a/Data/Languages/en/dolphin-emu.mo and b/Data/Languages/en/dolphin-emu.mo differ
diff --git a/Data/Languages/fr/dolphin-emu.mo b/Data/Languages/fr/dolphin-emu.mo
index 2e6a43596c..85c2c969a2 100644
Binary files a/Data/Languages/fr/dolphin-emu.mo and b/Data/Languages/fr/dolphin-emu.mo differ
diff --git a/Data/Languages/it/dolphin-emu.mo b/Data/Languages/it/dolphin-emu.mo
index 68a82b51b8..4a8c3fc103 100644
Binary files a/Data/Languages/it/dolphin-emu.mo and b/Data/Languages/it/dolphin-emu.mo differ
diff --git a/Languages/de.po b/Languages/de.po
index 7f17d7e10d..f7f5e8fc73 100644
--- a/Languages/de.po
+++ b/Languages/de.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Dolphin Emu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-06 12:03-0600\n"
+"POT-Creation-Date: 2011-01-07 08:58-0600\n"
 "PO-Revision-Date: 2011-01-06 12:08+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -26,7 +26,7 @@ msgstr "(zu viele zum anzeigen)"
 msgid " Game : "
 msgstr "Spiel:"
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:109
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:110
 msgid " Graphics Configuration"
 msgstr "Grafik Einstellungen"
 
@@ -215,11 +215,11 @@ msgstr "Ansicht"
 msgid "&Wiimote Settings"
 msgstr "&Wiimote Einstellungen"
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:436
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:438
 msgid "(off)"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:219
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:220
 msgid "3D Vision (Requires Fullscreen)"
 msgstr "3D Vision [Benötigt Vollbild]"
 
@@ -268,7 +268,7 @@ msgid "Acceleration"
 msgstr "Beschleunigung"
 
 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:342
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:292
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:293
 msgid "Accurate Texture Cache"
 msgstr "Genauer Texture Cache"
 
@@ -276,7 +276,7 @@ msgstr "Genauer Texture Cache"
 msgid "Action"
 msgstr "Aktion"
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:146
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:147
 msgid "Adapter:"
 msgstr "Adapter:"
 
@@ -311,7 +311,7 @@ msgstr "Adresse:"
 msgid "Adjust the analog control pressure required to activate buttons."
 msgstr "Einstellung des benötigten Drucks um Analoge Tasten zu aktivieren."
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:342
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:343
 msgid "Advanced"
 msgstr "Erweitert"
 
@@ -332,8 +332,8 @@ msgstr ""
 msgid "All Gamecube GCM files (gcm)"
 msgstr "Alle Gamecube GCM Dateien (gcm)|*.gcm"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1245
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1259
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1249
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1263
 msgid "All Save States (sav, s##)"
 msgstr ""
 
@@ -373,11 +373,11 @@ msgstr ""
 msgid "Alternate RFI"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:186
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:187
 msgid "Anisotropic Filtering:"
 msgstr "Anisotropischer Filter:"
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:191
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:192
 msgid "Anti-Aliasing:"
 msgstr "Anti-Aliasing:"
 
@@ -403,7 +403,7 @@ msgstr ""
 "Soll die Datei gelöscht werden? Löschen kann nicht Rückgängig gemacht werden."
 
 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:644
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:165
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:166
 msgid "Aspect Ratio:"
 msgstr "Seitenverhältnis:"
 
@@ -420,7 +420,7 @@ msgstr ""
 msgid "Auto"
 msgstr "Automatisch"
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:162
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:163
 msgid "Auto [recommended]"
 msgstr "Automatisch [empfohlen]"
 
@@ -441,7 +441,7 @@ msgstr "Banner Details"
 msgid "Banner:"
 msgstr "Banner:"
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:126
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:127
 msgid "Basic"
 msgstr ""
 
@@ -597,7 +597,7 @@ msgstr "Lösche"
 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:274
 #: Source/Core/DolphinWX/Src/LuaWindow.cpp:110
 #: Source/Core/DolphinWX/Src/AboutDolphin.cpp:42
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:459
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:461
 msgid "Close"
 msgstr "Schließen"
 
@@ -647,7 +647,7 @@ msgstr "Einstellungen"
 msgid "Config..."
 msgstr "Einstellung..."
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31
+#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:32
 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:135
 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:154
 msgid "Configure"
@@ -706,16 +706,16 @@ msgstr "Wiimote 3 Verbinden"
 msgid "Connect Wiimote 4"
 msgstr "Wiimote 4 Verbinden"
 
-#: Source/Core/DolphinWX/Src/Frame.cpp:825
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1216
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1215
 msgid "Connected"
 msgstr "Verbunden"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:9
-msgid "Connected to . Wiimotes"
-msgstr "Verbunden mit Wiimotes"
+#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:11
+#, c-format
+msgid "Connected to %i Wiimotes"
+msgstr "Verbunden mit %i Wiimotes"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:643
+#: Source/Core/DolphinWX/Src/Main.cpp:648
 msgid "Connecting..."
 msgstr "Verbinden..."
 
@@ -731,7 +731,7 @@ msgstr "Strg"
 msgid "Convert to GCI"
 msgstr "Zu GCI Convertieren"
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:257
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:258
 msgid "Copy"
 msgstr "Kopie"
 
@@ -789,7 +789,7 @@ msgstr ""
 msgid "Creator: "
 msgstr "Ersteller:"
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:424
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:425
 msgid "Crop"
 msgstr "Zuschneiden"
 
@@ -883,19 +883,19 @@ msgstr "Gerät"
 msgid "Device Settings"
 msgstr "Geräte Einstellungen"
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:356
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:357
 msgid "Disable Dest. Alpha Pass"
 msgstr "Dest. Alpha Pass Abschalten"
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:355
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:356
 msgid "Disable Fog"
 msgstr "Nebel Abschalten"
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:353
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:354
 msgid "Disable Lighting"
 msgstr "Beleuchtung Abschalten"
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:354
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:355
 msgid "Disable Textures"
 msgstr "Texturen Abschalten"
 
@@ -935,8 +935,7 @@ msgstr ""
 msgid "Disc"
 msgstr "Disc"
 
-#: Source/Core/DolphinWX/Src/Frame.cpp:825
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1216
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1215
 msgid "Disconnected"
 msgstr "Nicht Verbunden"
 
@@ -973,7 +972,7 @@ msgstr "Dolphin Konfiguration"
 msgid "Dolphin TAS Movies (*.dtm)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:67
+#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:68
 msgid "Dolphin Wiimote Configuration"
 msgstr "Dolphin Wiimote Konfiguration"
 
@@ -1003,15 +1002,15 @@ msgstr "Runter"
 msgid "Download Codes (WiiRD Database)"
 msgstr "Codes Herunterladen (WiiRD Database)"
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:412
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:413
 msgid "Dump EFB Target"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:413
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:414
 msgid "Dump Frames"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:410
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:411
 msgid "Dump Textures"
 msgstr ""
 
@@ -1028,15 +1027,15 @@ msgstr "Holländisch"
 msgid "E&xit"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:226
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:227
 msgid "EFB"
 msgstr "EFB"
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:370
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:371
 msgid "EFB Copy Regions"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:212
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:213
 msgid "EFB Scaled Copy"
 msgstr "EFB Scaled Copy"
 
@@ -1069,7 +1068,7 @@ msgstr "Aktuelle Perspektive bearbeiten"
 msgid "Edit..."
 msgstr "Bearbeiten..."
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:247
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:248
 msgid "Emulate format changes"
 msgstr "Formatänderung Emulieren"
 
@@ -1080,8 +1079,8 @@ msgid ""
 "framebuffer copies."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:20
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:32
+#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:21
+#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33
 msgid "Emulated Wiimote"
 msgstr "Emulierte Wiimote"
 
@@ -1094,9 +1093,9 @@ msgid "Emulator Display Settings"
 msgstr "Emulator Anzeige Einstellungen"
 
 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:260
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:295
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:379
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:261
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:296
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:380
 msgid "Enable"
 msgstr "Aktivieren"
 
@@ -1118,7 +1117,7 @@ msgid "Enable Block Merging"
 msgstr ""
 
 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:340
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:246
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:247
 msgid "Enable CPU Access"
 msgstr "CPU-Zugriff Aktivieren"
 
@@ -1135,7 +1134,7 @@ msgstr "Copy to EFB Aktivieren"
 msgid "Enable DTK Music"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:426
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:427
 msgid "Enable Display List Caching"
 msgstr ""
 
@@ -1156,7 +1155,7 @@ msgstr "EFB To Texture Aktivieren"
 msgid "Enable HLE Audio"
 msgstr "Tastenkürzel Aktivieren"
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:427
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:428
 msgid "Enable Hotkeys"
 msgstr "Tastenkürzel Aktivieren"
 
@@ -1177,7 +1176,7 @@ msgstr "Dual Core Aktivieren"
 msgid "Enable MMU"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:425
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:426
 msgid "Enable OpenCL"
 msgstr "OpenCL Aktivieren"
 
@@ -1194,11 +1193,11 @@ msgstr "Bildschirmschoner Erlauben"
 msgid "Enable WideScreen"
 msgstr "Breitbild Aktivieren"
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:352
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:353
 msgid "Enable Wireframe"
 msgstr "Drahtgitter Aktivieren"
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:266
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:267
 msgid "Enable cache"
 msgstr "Cache Aktivieren"
 
@@ -1279,7 +1278,7 @@ msgstr "Ende"
 msgid "English"
 msgstr "Englisch"
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:181
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:182
 msgid "Enhancements"
 msgstr "Erweiterungen"
 
@@ -1393,7 +1392,7 @@ msgstr "FRANKREICH"
 msgid "FST Size:"
 msgstr "FST Größe:"
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:311
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:312
 msgid "Fast"
 msgstr "Schnell"
 
@@ -1423,15 +1422,15 @@ msgstr "Erster Block"
 msgid "Fix Checksums"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:163
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:164
 msgid "Force 16:9"
 msgstr "16:9 Erzwingen"
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:163
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:164
 msgid "Force 4:3"
 msgstr "4:3 Erzwingen"
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:215
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:216
 msgid "Force Bi/Trilinear Filtering"
 msgstr "Erzwinge Bi/Trilineare Filterung"
 
@@ -1458,7 +1457,7 @@ msgstr ""
 "Verbessert Textur-Qualität (besonders bei hoher interner Auflösung) aber "
 "verursacht Fehler in einigen Spielen."
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:233
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:234
 msgid "Fractional"
 msgstr "Fractional"
 
@@ -1470,7 +1469,7 @@ msgstr ""
 msgid "Framelimit :"
 msgstr "Framelimit :"
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:414
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:415
 msgid "Free Look"
 msgstr "Frei Umsehen"
 
@@ -1534,7 +1533,7 @@ msgid "Gecko Codes"
 msgstr "Gecko Codes"
 
 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:394
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:121
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:122
 msgid "General"
 msgstr "Generell"
 
@@ -1590,7 +1589,7 @@ msgstr "Hotkey Konfiguration"
 msgid "Hotkeys"
 msgstr "Tastenkürzel"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:20
+#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:21
 msgid "Hybrid Wiimote"
 msgstr "Gemischte Wiimote"
 
@@ -1657,7 +1656,7 @@ msgstr "In-Game"
 msgid "Info"
 msgstr "Info"
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:361
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:362
 msgid "Information"
 msgstr "Informationen"
 
@@ -1665,7 +1664,7 @@ msgstr "Informationen"
 msgid "Input"
 msgstr "Eingabe"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:27
+#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:28
 msgid "Input Source"
 msgstr "Eingabequelle"
 
@@ -1697,7 +1696,7 @@ msgstr "Zum Wii-Menü hinzufügen."
 msgid "Installing WAD to Wii Menu..."
 msgstr "WAD ins Wii-Menü installieren..."
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:233
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:234
 msgid "Integral [recommended]"
 msgstr "Integral [empfohlen]"
 
@@ -1801,11 +1800,11 @@ msgstr "Kleiner Als"
 msgid "Load"
 msgstr "Laden"
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:411
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:412
 msgid "Load Hi-Res Textures"
 msgstr "Hochauflösende Texturen Laden"
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:211
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:212
 msgid "Load Native Mipmaps"
 msgstr "Native Mipmaps Laden"
 
@@ -1895,7 +1894,7 @@ msgstr "Menü"
 msgid "Metroid Other M"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:419
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:420
 msgid "Misc"
 msgstr "Sonstiges"
 
@@ -2055,12 +2054,12 @@ msgid "No docking"
 msgstr ""
 
 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:350
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:19
+#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:20
 #: Source/Core/DolphinWX/Src/NetWindow.cpp:554
 msgid "None"
 msgstr "Keine"
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:306
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:307
 msgid "Normal"
 msgstr "Normal"
 
@@ -2073,7 +2072,7 @@ msgstr "Ungleich"
 msgid "Not Set"
 msgstr "Nicht Festgelegt"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:642
+#: Source/Core/DolphinWX/Src/Main.cpp:647
 msgid "Not connected"
 msgstr "Nicht Verbunden"
 
@@ -2110,7 +2109,7 @@ msgstr "Nunchuk"
 msgid "Nunchuk Acceleration"
 msgstr "Nunchuck Beschleunigung"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:78
+#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:79
 #: Source/Plugins/Plugin_DSP_HLE/Src/ConfigDlg.cpp:35
 #: Source/Plugins/Plugin_DSP_LLE/Src/DSPConfigDlgLLE.cpp:37
 msgid "OK"
@@ -2172,7 +2171,7 @@ msgstr "Bild Ab"
 msgid "Page Up"
 msgstr "Bild Hoch"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:46
+#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:47
 msgid "Pair Up"
 msgstr "Verbinden"
 
@@ -2193,8 +2192,8 @@ msgstr "Patches"
 msgid "Paths"
 msgstr "Pfade"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1388
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1389
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1392
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1393
 #: Source/Core/InputUICommon/Src/WXInputBase.cpp:48
 msgid "Pause"
 msgstr "Pause"
@@ -2208,17 +2207,17 @@ msgstr "Perfekt"
 msgid "Perspective %d"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:214
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:215
 msgid "Pixel Depth"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:213
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:214
 msgid "Pixel Lighting"
 msgstr "Pixel Lighting"
 
 #: Source/Core/DolphinWX/Src/FrameTools.cpp:362
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1398
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1401
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402
 msgid "Play"
 msgstr "Start"
 
@@ -2255,7 +2254,7 @@ msgstr "Plus-Minus"
 msgid "Port :"
 msgstr "Port:"
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:432
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:434
 msgid "Post-Processing Shader:"
 msgstr ""
 
@@ -2283,7 +2282,7 @@ msgstr "Profil"
 msgid "Projection Hack for: "
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:368
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:369
 msgid "Projection Stats"
 msgstr "Projektions Statistik"
 
@@ -2304,7 +2303,7 @@ msgstr "Beenden"
 msgid "R Button"
 msgstr "R Taste"
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:264
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:265
 msgid "RAM"
 msgstr "RAM"
 
@@ -2316,12 +2315,12 @@ msgstr "RUSSLAND"
 msgid "Range"
 msgstr "Weite"
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:382
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:383
 msgid "Real"
 msgstr "Echt"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:20
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:42
+#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:21
+#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:43
 msgid "Real Wiimote"
 msgstr "Echte Wiimote"
 
@@ -2342,7 +2341,7 @@ msgstr ""
 
 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:927
 #: Source/Core/DolphinWX/Src/FrameTools.cpp:359
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:39
+#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:40
 msgid "Refresh"
 msgstr "Neu Laden"
 
@@ -2373,7 +2372,7 @@ msgstr "Im Hauptfenster Rendern"
 msgid "Render to main window."
 msgstr "Im Hauptfenster Rendern."
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:347
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:348
 msgid "Rendering"
 msgstr "Rendern"
 
@@ -2413,7 +2412,7 @@ msgstr "Script ausführen...\n"
 msgid "Sa&ve State"
 msgstr "Status Speichern"
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:300
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:301
 msgid "Safe"
 msgstr "Sicher"
 
@@ -2453,7 +2452,7 @@ msgstr "Aktuelle Perspektive speichern"
 msgid "Save decompressed GCM/ISO"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:239
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:240
 msgid "Scale:"
 msgstr "Skalierung:"
 
@@ -2530,11 +2529,11 @@ msgstr "Datei zum Speichern auswählen."
 msgid "Select the script to load"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1243
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1247
 msgid "Select the state to load"
 msgstr "Status zum Laden auswählen"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1257
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1261
 msgid "Select the state to save"
 msgstr "Status zum Speichern auswählen"
 
@@ -2616,7 +2615,7 @@ msgstr "Werkzeugleiste Anzeigen"
 msgid "Show Drives"
 msgstr "Treiber Anzeigen"
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:366
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:367
 msgid "Show FPS"
 msgstr "FPS Anzeigen"
 
@@ -2656,7 +2655,7 @@ msgstr ""
 msgid "Show Regions"
 msgstr "Regionen Anzeigen"
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:371
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:372
 msgid "Show Shader Errors"
 msgstr "Shader Fehler Anzeigen"
 
@@ -2855,7 +2854,7 @@ msgstr "Status"
 msgid "Stop"
 msgstr "Stop"
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:163
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:164
 msgid "Stretch to Window"
 msgstr "An Fenster Anpassen"
 
@@ -2890,11 +2889,11 @@ msgstr "Screenshot Speichern"
 msgid "Test"
 msgstr "Testen"
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:262
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:263
 msgid "Texture"
 msgstr "Textur"
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:369
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:370
 msgid "Texture Format"
 msgstr "Textur Format"
 
@@ -3061,11 +3060,11 @@ msgstr ""
 "Vervessert die sichtbare Qualität in Spielen, die EFB-Copies benutzen, "
 "erheblich. Kann in einigen Spielen aber zu Fehlern führen."
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:405
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:406
 msgid "Utility"
 msgstr "Utility"
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:176
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:177
 msgid "V-Sync"
 msgstr "V-Sync"
 
@@ -3081,7 +3080,7 @@ msgstr "Wert:"
 msgid "Value: "
 msgstr "Wert:"
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:367
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:368
 msgid "Various Statistics"
 msgstr "Diverse Statistiken"
 
@@ -3093,7 +3092,7 @@ msgstr ""
 msgid "Video"
 msgstr "Video"
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:381
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:382
 msgid "Virtual"
 msgstr "Virtuell"
 
@@ -3110,12 +3109,12 @@ msgstr ""
 "Auf Vertical Blanks warten.\n"
 "Reduziert Tearing aber kann die Performance verschlechtern."
 
-#: Source/Core/DolphinWX/Src/Frame.cpp:659
+#: Source/Core/DolphinWX/Src/Frame.cpp:660
 #: Source/Core/DolphinWX/Src/LogWindow.cpp:77
 msgid "Warning"
 msgstr "Warnung"
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:105
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:106
 msgid ""
 "When using EFB to RAM we very often need to decode RAM data to a VRAM "
 "texture, which is a very time-consuming task.\n"
@@ -3138,7 +3137,7 @@ msgstr ""
 "die Beschleunigung; Texture Cache auf \"sicher\"  könnte sogar langsamer "
 "sein!)"
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:174
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:175
 msgid "Widescreen Hack"
 msgstr ""
 
@@ -3175,7 +3174,7 @@ msgstr ""
 "oder die Wiimote war zulange Inaktiv oder andere Ursachen.\n"
 "Soll die Wiimote sofort wieder verbunden werden?"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:644
+#: Source/Core/DolphinWX/Src/Main.cpp:649
 msgid "Wiimote Connected"
 msgstr "Wiimote Verbunden"
 
@@ -3242,7 +3241,7 @@ msgstr "In Datei Schreiben"
 msgid "Write to Window ->"
 msgstr "In Fenster schreiben ->"
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:376
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:377
 msgid "XFB"
 msgstr "XFB"
 
diff --git a/Languages/dolphin-emu.pot b/Languages/dolphin-emu.pot
index b32c5ee1ec..60fd4bc764 100644
--- a/Languages/dolphin-emu.pot
+++ b/Languages/dolphin-emu.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Dolphin Emu 2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-06 12:03-0600\n"
+"POT-Creation-Date: 2011-01-07 09:14-0600\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"
@@ -27,7 +27,7 @@ msgstr ""
 msgid " Game : "
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:109
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:110
 msgid " Graphics Configuration"
 msgstr ""
 
@@ -209,11 +209,11 @@ msgstr ""
 msgid "&Wiimote Settings"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:436
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:438
 msgid "(off)"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:219
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:220
 msgid "3D Vision (Requires Fullscreen)"
 msgstr ""
 
@@ -262,7 +262,7 @@ msgid "Acceleration"
 msgstr ""
 
 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:342
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:292
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:293
 msgid "Accurate Texture Cache"
 msgstr ""
 
@@ -270,7 +270,7 @@ msgstr ""
 msgid "Action"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:146
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:147
 msgid "Adapter:"
 msgstr ""
 
@@ -305,7 +305,7 @@ msgstr ""
 msgid "Adjust the analog control pressure required to activate buttons."
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:342
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:343
 msgid "Advanced"
 msgstr ""
 
@@ -325,8 +325,8 @@ msgstr ""
 msgid "All Gamecube GCM files (gcm)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1245
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1259
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1249
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1263
 msgid "All Save States (sav, s##)"
 msgstr ""
 
@@ -356,11 +356,11 @@ msgstr ""
 msgid "Alternate RFI"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:186
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:187
 msgid "Anisotropic Filtering:"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:191
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:192
 msgid "Anti-Aliasing:"
 msgstr ""
 
@@ -383,7 +383,7 @@ msgid "Are you sure you want to delete this file?  It will be gone forever!"
 msgstr ""
 
 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:644
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:165
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:166
 msgid "Aspect Ratio:"
 msgstr ""
 
@@ -400,7 +400,7 @@ msgstr ""
 msgid "Auto"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:162
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:163
 msgid "Auto [recommended]"
 msgstr ""
 
@@ -421,7 +421,7 @@ msgstr ""
 msgid "Banner:"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:126
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:127
 msgid "Basic"
 msgstr ""
 
@@ -575,7 +575,7 @@ msgstr ""
 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:274
 #: Source/Core/DolphinWX/Src/LuaWindow.cpp:110
 #: Source/Core/DolphinWX/Src/AboutDolphin.cpp:42
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:459
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:461
 msgid "Close"
 msgstr ""
 
@@ -625,7 +625,7 @@ msgstr ""
 msgid "Config..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31
+#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:32
 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:135
 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:154
 msgid "Configure"
@@ -684,16 +684,16 @@ msgstr ""
 msgid "Connect Wiimote 4"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/Frame.cpp:825
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1216
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1215
 msgid "Connected"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:9
-msgid "Connected to . Wiimotes"
+#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:11
+#, c-format
+msgid "Connected to %i Wiimotes"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/Main.cpp:643
+#: Source/Core/DolphinWX/Src/Main.cpp:648
 msgid "Connecting..."
 msgstr ""
 
@@ -709,7 +709,7 @@ msgstr ""
 msgid "Convert to GCI"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:257
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:258
 msgid "Copy"
 msgstr ""
 
@@ -767,7 +767,7 @@ msgstr ""
 msgid "Creator: "
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:424
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:425
 msgid "Crop"
 msgstr ""
 
@@ -861,19 +861,19 @@ msgstr ""
 msgid "Device Settings"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:356
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:357
 msgid "Disable Dest. Alpha Pass"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:355
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:356
 msgid "Disable Fog"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:353
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:354
 msgid "Disable Lighting"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:354
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:355
 msgid "Disable Textures"
 msgstr ""
 
@@ -905,8 +905,7 @@ msgstr ""
 msgid "Disc"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/Frame.cpp:825
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1216
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1215
 msgid "Disconnected"
 msgstr ""
 
@@ -943,7 +942,7 @@ msgstr ""
 msgid "Dolphin TAS Movies (*.dtm)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:67
+#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:68
 msgid "Dolphin Wiimote Configuration"
 msgstr ""
 
@@ -971,15 +970,15 @@ msgstr ""
 msgid "Download Codes (WiiRD Database)"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:412
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:413
 msgid "Dump EFB Target"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:413
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:414
 msgid "Dump Frames"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:410
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:411
 msgid "Dump Textures"
 msgstr ""
 
@@ -996,15 +995,15 @@ msgstr ""
 msgid "E&xit"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:226
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:227
 msgid "EFB"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:370
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:371
 msgid "EFB Copy Regions"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:212
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:213
 msgid "EFB Scaled Copy"
 msgstr ""
 
@@ -1037,7 +1036,7 @@ msgstr ""
 msgid "Edit..."
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:247
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:248
 msgid "Emulate format changes"
 msgstr ""
 
@@ -1048,8 +1047,8 @@ msgid ""
 "framebuffer copies."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:20
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:32
+#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:21
+#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33
 msgid "Emulated Wiimote"
 msgstr ""
 
@@ -1062,9 +1061,9 @@ msgid "Emulator Display Settings"
 msgstr ""
 
 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:260
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:295
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:379
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:261
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:296
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:380
 msgid "Enable"
 msgstr ""
 
@@ -1086,7 +1085,7 @@ msgid "Enable Block Merging"
 msgstr ""
 
 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:340
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:246
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:247
 msgid "Enable CPU Access"
 msgstr ""
 
@@ -1103,7 +1102,7 @@ msgstr ""
 msgid "Enable DTK Music"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:426
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:427
 msgid "Enable Display List Caching"
 msgstr ""
 
@@ -1123,7 +1122,7 @@ msgstr ""
 msgid "Enable HLE Audio"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:427
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:428
 msgid "Enable Hotkeys"
 msgstr ""
 
@@ -1143,7 +1142,7 @@ msgstr ""
 msgid "Enable MMU"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:425
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:426
 msgid "Enable OpenCL"
 msgstr ""
 
@@ -1160,11 +1159,11 @@ msgstr ""
 msgid "Enable WideScreen"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:352
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:353
 msgid "Enable Wireframe"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:266
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:267
 msgid "Enable cache"
 msgstr ""
 
@@ -1235,7 +1234,7 @@ msgstr ""
 msgid "English"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:181
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:182
 msgid "Enhancements"
 msgstr ""
 
@@ -1348,7 +1347,7 @@ msgstr ""
 msgid "FST Size:"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:311
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:312
 msgid "Fast"
 msgstr ""
 
@@ -1375,15 +1374,15 @@ msgstr ""
 msgid "Fix Checksums"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:163
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:164
 msgid "Force 16:9"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:163
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:164
 msgid "Force 4:3"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:215
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:216
 msgid "Force Bi/Trilinear Filtering"
 msgstr ""
 
@@ -1404,7 +1403,7 @@ msgid ""
 "but causes glitches in some games."
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:233
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:234
 msgid "Fractional"
 msgstr ""
 
@@ -1416,7 +1415,7 @@ msgstr ""
 msgid "Framelimit :"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:414
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:415
 msgid "Free Look"
 msgstr ""
 
@@ -1479,7 +1478,7 @@ msgid "Gecko Codes"
 msgstr ""
 
 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:394
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:121
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:122
 msgid "General"
 msgstr ""
 
@@ -1533,7 +1532,7 @@ msgstr ""
 msgid "Hotkeys"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:20
+#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:21
 msgid "Hybrid Wiimote"
 msgstr ""
 
@@ -1594,7 +1593,7 @@ msgstr ""
 msgid "Info"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:361
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:362
 msgid "Information"
 msgstr ""
 
@@ -1602,7 +1601,7 @@ msgstr ""
 msgid "Input"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:27
+#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:28
 msgid "Input Source"
 msgstr ""
 
@@ -1634,7 +1633,7 @@ msgstr ""
 msgid "Installing WAD to Wii Menu..."
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:233
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:234
 msgid "Integral [recommended]"
 msgstr ""
 
@@ -1732,11 +1731,11 @@ msgstr ""
 msgid "Load"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:411
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:412
 msgid "Load Hi-Res Textures"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:211
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:212
 msgid "Load Native Mipmaps"
 msgstr ""
 
@@ -1822,7 +1821,7 @@ msgstr ""
 msgid "Metroid Other M"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:419
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:420
 msgid "Misc"
 msgstr ""
 
@@ -1980,12 +1979,12 @@ msgid "No docking"
 msgstr ""
 
 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:350
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:19
+#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:20
 #: Source/Core/DolphinWX/Src/NetWindow.cpp:554
 msgid "None"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:306
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:307
 msgid "Normal"
 msgstr ""
 
@@ -1998,7 +1997,7 @@ msgstr ""
 msgid "Not Set"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/Main.cpp:642
+#: Source/Core/DolphinWX/Src/Main.cpp:647
 msgid "Not connected"
 msgstr ""
 
@@ -2035,7 +2034,7 @@ msgstr ""
 msgid "Nunchuk Acceleration"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:78
+#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:79
 #: Source/Plugins/Plugin_DSP_HLE/Src/ConfigDlg.cpp:35
 #: Source/Plugins/Plugin_DSP_LLE/Src/DSPConfigDlgLLE.cpp:37
 msgid "OK"
@@ -2097,7 +2096,7 @@ msgstr ""
 msgid "Page Up"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:46
+#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:47
 msgid "Pair Up"
 msgstr ""
 
@@ -2118,8 +2117,8 @@ msgstr ""
 msgid "Paths"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1388
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1389
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1392
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1393
 #: Source/Core/InputUICommon/Src/WXInputBase.cpp:48
 msgid "Pause"
 msgstr ""
@@ -2133,17 +2132,17 @@ msgstr ""
 msgid "Perspective %d"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:214
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:215
 msgid "Pixel Depth"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:213
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:214
 msgid "Pixel Lighting"
 msgstr ""
 
 #: Source/Core/DolphinWX/Src/FrameTools.cpp:362
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1398
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1401
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402
 msgid "Play"
 msgstr ""
 
@@ -2180,7 +2179,7 @@ msgstr ""
 msgid "Port :"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:432
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:434
 msgid "Post-Processing Shader:"
 msgstr ""
 
@@ -2208,7 +2207,7 @@ msgstr ""
 msgid "Projection Hack for: "
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:368
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:369
 msgid "Projection Stats"
 msgstr ""
 
@@ -2229,7 +2228,7 @@ msgstr ""
 msgid "R Button"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:264
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:265
 msgid "RAM"
 msgstr ""
 
@@ -2241,12 +2240,12 @@ msgstr ""
 msgid "Range"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:382
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:383
 msgid "Real"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:20
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:42
+#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:21
+#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:43
 msgid "Real Wiimote"
 msgstr ""
 
@@ -2263,7 +2262,7 @@ msgstr ""
 
 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:927
 #: Source/Core/DolphinWX/Src/FrameTools.cpp:359
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:39
+#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:40
 msgid "Refresh"
 msgstr ""
 
@@ -2292,7 +2291,7 @@ msgstr ""
 msgid "Render to main window."
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:347
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:348
 msgid "Rendering"
 msgstr ""
 
@@ -2332,7 +2331,7 @@ msgstr ""
 msgid "Sa&ve State"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:300
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:301
 msgid "Safe"
 msgstr ""
 
@@ -2371,7 +2370,7 @@ msgstr ""
 msgid "Save decompressed GCM/ISO"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:239
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:240
 msgid "Scale:"
 msgstr ""
 
@@ -2444,11 +2443,11 @@ msgstr ""
 msgid "Select the script to load"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1243
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1247
 msgid "Select the state to load"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1257
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1261
 msgid "Select the state to save"
 msgstr ""
 
@@ -2523,7 +2522,7 @@ msgstr ""
 msgid "Show Drives"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:366
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:367
 msgid "Show FPS"
 msgstr ""
 
@@ -2563,7 +2562,7 @@ msgstr ""
 msgid "Show Regions"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:371
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:372
 msgid "Show Shader Errors"
 msgstr ""
 
@@ -2741,7 +2740,7 @@ msgstr ""
 msgid "Stop"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:163
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:164
 msgid "Stretch to Window"
 msgstr ""
 
@@ -2776,11 +2775,11 @@ msgstr ""
 msgid "Test"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:262
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:263
 msgid "Texture"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:369
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:370
 msgid "Texture Format"
 msgstr ""
 
@@ -2934,11 +2933,11 @@ msgid ""
 "glitches in some games."
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:405
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:406
 msgid "Utility"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:176
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:177
 msgid "V-Sync"
 msgstr ""
 
@@ -2954,7 +2953,7 @@ msgstr ""
 msgid "Value: "
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:367
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:368
 msgid "Various Statistics"
 msgstr ""
 
@@ -2966,7 +2965,7 @@ msgstr ""
 msgid "Video"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:381
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:382
 msgid "Virtual"
 msgstr ""
 
@@ -2981,12 +2980,12 @@ msgid ""
 "Reduces tearing but might also decrease performance"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/Frame.cpp:659
+#: Source/Core/DolphinWX/Src/Frame.cpp:660
 #: Source/Core/DolphinWX/Src/LogWindow.cpp:77
 msgid "Warning"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:105
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:106
 msgid ""
 "When using EFB to RAM we very often need to decode RAM data to a VRAM "
 "texture, which is a very time-consuming task.\n"
@@ -2999,7 +2998,7 @@ msgid ""
 "be; accurate texture cache set to \"safe\" might actually be slower!)"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:174
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:175
 msgid "Widescreen Hack"
 msgstr ""
 
@@ -3032,7 +3031,7 @@ msgid ""
 "Do you want to reconnect immediately?"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/Main.cpp:644
+#: Source/Core/DolphinWX/Src/Main.cpp:649
 msgid "Wiimote Connected"
 msgstr ""
 
@@ -3098,7 +3097,7 @@ msgstr ""
 msgid "Write to Window ->"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:376
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:377
 msgid "XFB"
 msgstr ""
 
diff --git a/Languages/en.po b/Languages/en.po
index a0d777a311..3fef2c8e9e 100644
--- a/Languages/en.po
+++ b/Languages/en.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Dolphin Emu 2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-06 12:03-0600\n"
+"POT-Creation-Date: 2011-01-07 08:58-0600\n"
 "PO-Revision-Date: 2011-01-06 14:53+0100\n"
 "Last-Translator: BhaaL <bhaal@0x1337.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -26,7 +26,7 @@ msgstr ""
 msgid " Game : "
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:109
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:110
 msgid " Graphics Configuration"
 msgstr ""
 
@@ -208,11 +208,11 @@ msgstr ""
 msgid "&Wiimote Settings"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:436
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:438
 msgid "(off)"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:219
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:220
 msgid "3D Vision (Requires Fullscreen)"
 msgstr ""
 
@@ -261,7 +261,7 @@ msgid "Acceleration"
 msgstr ""
 
 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:342
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:292
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:293
 msgid "Accurate Texture Cache"
 msgstr ""
 
@@ -269,7 +269,7 @@ msgstr ""
 msgid "Action"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:146
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:147
 msgid "Adapter:"
 msgstr ""
 
@@ -304,7 +304,7 @@ msgstr ""
 msgid "Adjust the analog control pressure required to activate buttons."
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:342
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:343
 msgid "Advanced"
 msgstr ""
 
@@ -324,8 +324,8 @@ msgstr ""
 msgid "All Gamecube GCM files (gcm)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1245
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1259
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1249
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1263
 msgid "All Save States (sav, s##)"
 msgstr ""
 
@@ -355,11 +355,11 @@ msgstr ""
 msgid "Alternate RFI"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:186
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:187
 msgid "Anisotropic Filtering:"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:191
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:192
 msgid "Anti-Aliasing:"
 msgstr ""
 
@@ -382,7 +382,7 @@ msgid "Are you sure you want to delete this file?  It will be gone forever!"
 msgstr ""
 
 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:644
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:165
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:166
 msgid "Aspect Ratio:"
 msgstr ""
 
@@ -399,7 +399,7 @@ msgstr ""
 msgid "Auto"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:162
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:163
 msgid "Auto [recommended]"
 msgstr ""
 
@@ -420,7 +420,7 @@ msgstr ""
 msgid "Banner:"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:126
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:127
 msgid "Basic"
 msgstr ""
 
@@ -574,7 +574,7 @@ msgstr ""
 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:274
 #: Source/Core/DolphinWX/Src/LuaWindow.cpp:110
 #: Source/Core/DolphinWX/Src/AboutDolphin.cpp:42
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:459
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:461
 msgid "Close"
 msgstr ""
 
@@ -624,7 +624,7 @@ msgstr ""
 msgid "Config..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31
+#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:32
 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:135
 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:154
 msgid "Configure"
@@ -683,16 +683,16 @@ msgstr ""
 msgid "Connect Wiimote 4"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/Frame.cpp:825
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1216
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1215
 msgid "Connected"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:9
-msgid "Connected to . Wiimotes"
+#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:11
+#, c-format
+msgid "Connected to %i Wiimotes"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/Main.cpp:643
+#: Source/Core/DolphinWX/Src/Main.cpp:648
 msgid "Connecting..."
 msgstr ""
 
@@ -708,7 +708,7 @@ msgstr ""
 msgid "Convert to GCI"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:257
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:258
 msgid "Copy"
 msgstr ""
 
@@ -766,7 +766,7 @@ msgstr ""
 msgid "Creator: "
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:424
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:425
 msgid "Crop"
 msgstr ""
 
@@ -860,19 +860,19 @@ msgstr ""
 msgid "Device Settings"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:356
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:357
 msgid "Disable Dest. Alpha Pass"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:355
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:356
 msgid "Disable Fog"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:353
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:354
 msgid "Disable Lighting"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:354
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:355
 msgid "Disable Textures"
 msgstr ""
 
@@ -904,8 +904,7 @@ msgstr ""
 msgid "Disc"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/Frame.cpp:825
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1216
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1215
 msgid "Disconnected"
 msgstr ""
 
@@ -942,7 +941,7 @@ msgstr ""
 msgid "Dolphin TAS Movies (*.dtm)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:67
+#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:68
 msgid "Dolphin Wiimote Configuration"
 msgstr ""
 
@@ -970,15 +969,15 @@ msgstr ""
 msgid "Download Codes (WiiRD Database)"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:412
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:413
 msgid "Dump EFB Target"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:413
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:414
 msgid "Dump Frames"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:410
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:411
 msgid "Dump Textures"
 msgstr ""
 
@@ -995,15 +994,15 @@ msgstr ""
 msgid "E&xit"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:226
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:227
 msgid "EFB"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:370
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:371
 msgid "EFB Copy Regions"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:212
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:213
 msgid "EFB Scaled Copy"
 msgstr ""
 
@@ -1036,7 +1035,7 @@ msgstr ""
 msgid "Edit..."
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:247
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:248
 msgid "Emulate format changes"
 msgstr ""
 
@@ -1047,8 +1046,8 @@ msgid ""
 "framebuffer copies."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:20
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:32
+#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:21
+#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33
 msgid "Emulated Wiimote"
 msgstr ""
 
@@ -1061,9 +1060,9 @@ msgid "Emulator Display Settings"
 msgstr ""
 
 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:260
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:295
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:379
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:261
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:296
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:380
 msgid "Enable"
 msgstr ""
 
@@ -1085,7 +1084,7 @@ msgid "Enable Block Merging"
 msgstr ""
 
 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:340
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:246
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:247
 msgid "Enable CPU Access"
 msgstr ""
 
@@ -1102,7 +1101,7 @@ msgstr ""
 msgid "Enable DTK Music"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:426
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:427
 msgid "Enable Display List Caching"
 msgstr ""
 
@@ -1122,7 +1121,7 @@ msgstr ""
 msgid "Enable HLE Audio"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:427
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:428
 msgid "Enable Hotkeys"
 msgstr ""
 
@@ -1142,7 +1141,7 @@ msgstr ""
 msgid "Enable MMU"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:425
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:426
 msgid "Enable OpenCL"
 msgstr ""
 
@@ -1159,11 +1158,11 @@ msgstr ""
 msgid "Enable WideScreen"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:352
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:353
 msgid "Enable Wireframe"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:266
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:267
 msgid "Enable cache"
 msgstr ""
 
@@ -1234,7 +1233,7 @@ msgstr ""
 msgid "English"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:181
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:182
 msgid "Enhancements"
 msgstr ""
 
@@ -1347,7 +1346,7 @@ msgstr ""
 msgid "FST Size:"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:311
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:312
 msgid "Fast"
 msgstr ""
 
@@ -1374,15 +1373,15 @@ msgstr ""
 msgid "Fix Checksums"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:163
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:164
 msgid "Force 16:9"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:163
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:164
 msgid "Force 4:3"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:215
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:216
 msgid "Force Bi/Trilinear Filtering"
 msgstr ""
 
@@ -1403,7 +1402,7 @@ msgid ""
 "but causes glitches in some games."
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:233
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:234
 msgid "Fractional"
 msgstr ""
 
@@ -1415,7 +1414,7 @@ msgstr ""
 msgid "Framelimit :"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:414
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:415
 msgid "Free Look"
 msgstr ""
 
@@ -1478,7 +1477,7 @@ msgid "Gecko Codes"
 msgstr ""
 
 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:394
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:121
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:122
 msgid "General"
 msgstr ""
 
@@ -1532,7 +1531,7 @@ msgstr ""
 msgid "Hotkeys"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:20
+#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:21
 msgid "Hybrid Wiimote"
 msgstr ""
 
@@ -1593,7 +1592,7 @@ msgstr ""
 msgid "Info"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:361
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:362
 msgid "Information"
 msgstr ""
 
@@ -1601,7 +1600,7 @@ msgstr ""
 msgid "Input"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:27
+#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:28
 msgid "Input Source"
 msgstr ""
 
@@ -1633,7 +1632,7 @@ msgstr ""
 msgid "Installing WAD to Wii Menu..."
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:233
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:234
 msgid "Integral [recommended]"
 msgstr ""
 
@@ -1731,11 +1730,11 @@ msgstr ""
 msgid "Load"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:411
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:412
 msgid "Load Hi-Res Textures"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:211
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:212
 msgid "Load Native Mipmaps"
 msgstr ""
 
@@ -1821,7 +1820,7 @@ msgstr ""
 msgid "Metroid Other M"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:419
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:420
 msgid "Misc"
 msgstr ""
 
@@ -1979,12 +1978,12 @@ msgid "No docking"
 msgstr ""
 
 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:350
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:19
+#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:20
 #: Source/Core/DolphinWX/Src/NetWindow.cpp:554
 msgid "None"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:306
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:307
 msgid "Normal"
 msgstr ""
 
@@ -1997,7 +1996,7 @@ msgstr ""
 msgid "Not Set"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/Main.cpp:642
+#: Source/Core/DolphinWX/Src/Main.cpp:647
 msgid "Not connected"
 msgstr ""
 
@@ -2034,7 +2033,7 @@ msgstr ""
 msgid "Nunchuk Acceleration"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:78
+#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:79
 #: Source/Plugins/Plugin_DSP_HLE/Src/ConfigDlg.cpp:35
 #: Source/Plugins/Plugin_DSP_LLE/Src/DSPConfigDlgLLE.cpp:37
 msgid "OK"
@@ -2096,7 +2095,7 @@ msgstr ""
 msgid "Page Up"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:46
+#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:47
 msgid "Pair Up"
 msgstr ""
 
@@ -2117,8 +2116,8 @@ msgstr ""
 msgid "Paths"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1388
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1389
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1392
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1393
 #: Source/Core/InputUICommon/Src/WXInputBase.cpp:48
 msgid "Pause"
 msgstr ""
@@ -2132,17 +2131,17 @@ msgstr ""
 msgid "Perspective %d"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:214
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:215
 msgid "Pixel Depth"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:213
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:214
 msgid "Pixel Lighting"
 msgstr ""
 
 #: Source/Core/DolphinWX/Src/FrameTools.cpp:362
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1398
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1401
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402
 msgid "Play"
 msgstr ""
 
@@ -2179,7 +2178,7 @@ msgstr ""
 msgid "Port :"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:432
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:434
 msgid "Post-Processing Shader:"
 msgstr ""
 
@@ -2207,7 +2206,7 @@ msgstr ""
 msgid "Projection Hack for: "
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:368
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:369
 msgid "Projection Stats"
 msgstr ""
 
@@ -2228,7 +2227,7 @@ msgstr ""
 msgid "R Button"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:264
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:265
 msgid "RAM"
 msgstr ""
 
@@ -2240,12 +2239,12 @@ msgstr ""
 msgid "Range"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:382
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:383
 msgid "Real"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:20
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:42
+#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:21
+#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:43
 msgid "Real Wiimote"
 msgstr ""
 
@@ -2262,7 +2261,7 @@ msgstr ""
 
 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:927
 #: Source/Core/DolphinWX/Src/FrameTools.cpp:359
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:39
+#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:40
 msgid "Refresh"
 msgstr ""
 
@@ -2291,7 +2290,7 @@ msgstr ""
 msgid "Render to main window."
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:347
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:348
 msgid "Rendering"
 msgstr ""
 
@@ -2331,7 +2330,7 @@ msgstr ""
 msgid "Sa&ve State"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:300
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:301
 msgid "Safe"
 msgstr ""
 
@@ -2370,7 +2369,7 @@ msgstr ""
 msgid "Save decompressed GCM/ISO"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:239
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:240
 msgid "Scale:"
 msgstr ""
 
@@ -2443,11 +2442,11 @@ msgstr ""
 msgid "Select the script to load"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1243
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1247
 msgid "Select the state to load"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1257
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1261
 msgid "Select the state to save"
 msgstr ""
 
@@ -2522,7 +2521,7 @@ msgstr ""
 msgid "Show Drives"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:366
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:367
 msgid "Show FPS"
 msgstr ""
 
@@ -2562,7 +2561,7 @@ msgstr ""
 msgid "Show Regions"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:371
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:372
 msgid "Show Shader Errors"
 msgstr ""
 
@@ -2740,7 +2739,7 @@ msgstr ""
 msgid "Stop"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:163
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:164
 msgid "Stretch to Window"
 msgstr ""
 
@@ -2775,11 +2774,11 @@ msgstr ""
 msgid "Test"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:262
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:263
 msgid "Texture"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:369
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:370
 msgid "Texture Format"
 msgstr ""
 
@@ -2933,11 +2932,11 @@ msgid ""
 "glitches in some games."
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:405
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:406
 msgid "Utility"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:176
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:177
 msgid "V-Sync"
 msgstr ""
 
@@ -2953,7 +2952,7 @@ msgstr ""
 msgid "Value: "
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:367
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:368
 msgid "Various Statistics"
 msgstr ""
 
@@ -2965,7 +2964,7 @@ msgstr ""
 msgid "Video"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:381
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:382
 msgid "Virtual"
 msgstr ""
 
@@ -2980,12 +2979,12 @@ msgid ""
 "Reduces tearing but might also decrease performance"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/Frame.cpp:659
+#: Source/Core/DolphinWX/Src/Frame.cpp:660
 #: Source/Core/DolphinWX/Src/LogWindow.cpp:77
 msgid "Warning"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:105
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:106
 msgid ""
 "When using EFB to RAM we very often need to decode RAM data to a VRAM "
 "texture, which is a very time-consuming task.\n"
@@ -2998,7 +2997,7 @@ msgid ""
 "be; accurate texture cache set to \"safe\" might actually be slower!)"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:174
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:175
 msgid "Widescreen Hack"
 msgstr ""
 
@@ -3031,7 +3030,7 @@ msgid ""
 "Do you want to reconnect immediately?"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/Main.cpp:644
+#: Source/Core/DolphinWX/Src/Main.cpp:649
 msgid "Wiimote Connected"
 msgstr ""
 
@@ -3097,7 +3096,7 @@ msgstr ""
 msgid "Write to Window ->"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:376
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:377
 msgid "XFB"
 msgstr ""
 
diff --git a/Languages/fr.po b/Languages/fr.po
index 55b5589195..5aec86b2af 100644
--- a/Languages/fr.po
+++ b/Languages/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Dolphin Emu 2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-06 12:03-0600\n"
+"POT-Creation-Date: 2011-01-07 08:58-0600\n"
 "PO-Revision-Date: 2011-01-06 14:53+0100\n"
 "Last-Translator: BhaaL <bhaal@0x1337.org>\n"
 "Language-Team: \n"
@@ -30,7 +30,7 @@ msgstr ""
 msgid " Game : "
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:109
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:110
 msgid " Graphics Configuration"
 msgstr ""
 
@@ -212,11 +212,11 @@ msgstr "&Affichage"
 msgid "&Wiimote Settings"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:436
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:438
 msgid "(off)"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:219
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:220
 msgid "3D Vision (Requires Fullscreen)"
 msgstr ""
 
@@ -265,7 +265,7 @@ msgid "Acceleration"
 msgstr ""
 
 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:342
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:292
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:293
 msgid "Accurate Texture Cache"
 msgstr ""
 
@@ -273,7 +273,7 @@ msgstr ""
 msgid "Action"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:146
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:147
 msgid "Adapter:"
 msgstr ""
 
@@ -308,7 +308,7 @@ msgstr ""
 msgid "Adjust the analog control pressure required to activate buttons."
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:342
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:343
 msgid "Advanced"
 msgstr ""
 
@@ -328,8 +328,8 @@ msgstr ""
 msgid "All Gamecube GCM files (gcm)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1245
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1259
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1249
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1263
 msgid "All Save States (sav, s##)"
 msgstr ""
 
@@ -359,11 +359,11 @@ msgstr ""
 msgid "Alternate RFI"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:186
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:187
 msgid "Anisotropic Filtering:"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:191
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:192
 msgid "Anti-Aliasing:"
 msgstr ""
 
@@ -386,7 +386,7 @@ msgid "Are you sure you want to delete this file?  It will be gone forever!"
 msgstr ""
 
 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:644
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:165
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:166
 msgid "Aspect Ratio:"
 msgstr ""
 
@@ -403,7 +403,7 @@ msgstr ""
 msgid "Auto"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:162
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:163
 msgid "Auto [recommended]"
 msgstr ""
 
@@ -424,7 +424,7 @@ msgstr ""
 msgid "Banner:"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:126
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:127
 msgid "Basic"
 msgstr ""
 
@@ -578,7 +578,7 @@ msgstr ""
 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:274
 #: Source/Core/DolphinWX/Src/LuaWindow.cpp:110
 #: Source/Core/DolphinWX/Src/AboutDolphin.cpp:42
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:459
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:461
 msgid "Close"
 msgstr ""
 
@@ -628,7 +628,7 @@ msgstr ""
 msgid "Config..."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31
+#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:32
 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:135
 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:154
 msgid "Configure"
@@ -687,16 +687,16 @@ msgstr ""
 msgid "Connect Wiimote 4"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/Frame.cpp:825
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1216
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1215
 msgid "Connected"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:9
-msgid "Connected to . Wiimotes"
+#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:11
+#, c-format
+msgid "Connected to %i Wiimotes"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/Main.cpp:643
+#: Source/Core/DolphinWX/Src/Main.cpp:648
 msgid "Connecting..."
 msgstr ""
 
@@ -712,7 +712,7 @@ msgstr ""
 msgid "Convert to GCI"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:257
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:258
 msgid "Copy"
 msgstr ""
 
@@ -770,7 +770,7 @@ msgstr ""
 msgid "Creator: "
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:424
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:425
 msgid "Crop"
 msgstr ""
 
@@ -864,19 +864,19 @@ msgstr ""
 msgid "Device Settings"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:356
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:357
 msgid "Disable Dest. Alpha Pass"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:355
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:356
 msgid "Disable Fog"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:353
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:354
 msgid "Disable Lighting"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:354
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:355
 msgid "Disable Textures"
 msgstr ""
 
@@ -908,8 +908,7 @@ msgstr ""
 msgid "Disc"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/Frame.cpp:825
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1216
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1215
 msgid "Disconnected"
 msgstr ""
 
@@ -946,7 +945,7 @@ msgstr ""
 msgid "Dolphin TAS Movies (*.dtm)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:67
+#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:68
 msgid "Dolphin Wiimote Configuration"
 msgstr ""
 
@@ -974,15 +973,15 @@ msgstr ""
 msgid "Download Codes (WiiRD Database)"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:412
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:413
 msgid "Dump EFB Target"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:413
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:414
 msgid "Dump Frames"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:410
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:411
 msgid "Dump Textures"
 msgstr ""
 
@@ -999,15 +998,15 @@ msgstr ""
 msgid "E&xit"
 msgstr "Quitter"
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:226
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:227
 msgid "EFB"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:370
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:371
 msgid "EFB Copy Regions"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:212
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:213
 msgid "EFB Scaled Copy"
 msgstr ""
 
@@ -1040,7 +1039,7 @@ msgstr ""
 msgid "Edit..."
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:247
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:248
 msgid "Emulate format changes"
 msgstr ""
 
@@ -1051,8 +1050,8 @@ msgid ""
 "framebuffer copies."
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:20
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:32
+#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:21
+#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33
 msgid "Emulated Wiimote"
 msgstr ""
 
@@ -1065,9 +1064,9 @@ msgid "Emulator Display Settings"
 msgstr ""
 
 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:260
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:295
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:379
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:261
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:296
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:380
 msgid "Enable"
 msgstr ""
 
@@ -1089,7 +1088,7 @@ msgid "Enable Block Merging"
 msgstr ""
 
 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:340
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:246
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:247
 msgid "Enable CPU Access"
 msgstr ""
 
@@ -1106,7 +1105,7 @@ msgstr ""
 msgid "Enable DTK Music"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:426
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:427
 msgid "Enable Display List Caching"
 msgstr ""
 
@@ -1126,7 +1125,7 @@ msgstr ""
 msgid "Enable HLE Audio"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:427
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:428
 msgid "Enable Hotkeys"
 msgstr ""
 
@@ -1146,7 +1145,7 @@ msgstr ""
 msgid "Enable MMU"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:425
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:426
 msgid "Enable OpenCL"
 msgstr ""
 
@@ -1163,11 +1162,11 @@ msgstr ""
 msgid "Enable WideScreen"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:352
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:353
 msgid "Enable Wireframe"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:266
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:267
 msgid "Enable cache"
 msgstr ""
 
@@ -1238,7 +1237,7 @@ msgstr ""
 msgid "English"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:181
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:182
 msgid "Enhancements"
 msgstr ""
 
@@ -1351,7 +1350,7 @@ msgstr ""
 msgid "FST Size:"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:311
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:312
 msgid "Fast"
 msgstr ""
 
@@ -1378,15 +1377,15 @@ msgstr ""
 msgid "Fix Checksums"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:163
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:164
 msgid "Force 16:9"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:163
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:164
 msgid "Force 4:3"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:215
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:216
 msgid "Force Bi/Trilinear Filtering"
 msgstr ""
 
@@ -1407,7 +1406,7 @@ msgid ""
 "but causes glitches in some games."
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:233
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:234
 msgid "Fractional"
 msgstr ""
 
@@ -1419,7 +1418,7 @@ msgstr ""
 msgid "Framelimit :"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:414
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:415
 msgid "Free Look"
 msgstr ""
 
@@ -1482,7 +1481,7 @@ msgid "Gecko Codes"
 msgstr "Codes Gecko"
 
 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:394
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:121
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:122
 msgid "General"
 msgstr ""
 
@@ -1536,7 +1535,7 @@ msgstr ""
 msgid "Hotkeys"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:20
+#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:21
 msgid "Hybrid Wiimote"
 msgstr ""
 
@@ -1597,7 +1596,7 @@ msgstr ""
 msgid "Info"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:361
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:362
 msgid "Information"
 msgstr ""
 
@@ -1605,7 +1604,7 @@ msgstr ""
 msgid "Input"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:27
+#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:28
 msgid "Input Source"
 msgstr ""
 
@@ -1637,7 +1636,7 @@ msgstr ""
 msgid "Installing WAD to Wii Menu..."
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:233
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:234
 msgid "Integral [recommended]"
 msgstr ""
 
@@ -1735,11 +1734,11 @@ msgstr ""
 msgid "Load"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:411
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:412
 msgid "Load Hi-Res Textures"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:211
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:212
 msgid "Load Native Mipmaps"
 msgstr ""
 
@@ -1825,7 +1824,7 @@ msgstr ""
 msgid "Metroid Other M"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:419
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:420
 msgid "Misc"
 msgstr ""
 
@@ -1983,12 +1982,12 @@ msgid "No docking"
 msgstr ""
 
 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:350
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:19
+#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:20
 #: Source/Core/DolphinWX/Src/NetWindow.cpp:554
 msgid "None"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:306
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:307
 msgid "Normal"
 msgstr ""
 
@@ -2001,7 +2000,7 @@ msgstr ""
 msgid "Not Set"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/Main.cpp:642
+#: Source/Core/DolphinWX/Src/Main.cpp:647
 msgid "Not connected"
 msgstr ""
 
@@ -2038,7 +2037,7 @@ msgstr ""
 msgid "Nunchuk Acceleration"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:78
+#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:79
 #: Source/Plugins/Plugin_DSP_HLE/Src/ConfigDlg.cpp:35
 #: Source/Plugins/Plugin_DSP_LLE/Src/DSPConfigDlgLLE.cpp:37
 msgid "OK"
@@ -2100,7 +2099,7 @@ msgstr ""
 msgid "Page Up"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:46
+#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:47
 msgid "Pair Up"
 msgstr ""
 
@@ -2121,8 +2120,8 @@ msgstr ""
 msgid "Paths"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1388
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1389
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1392
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1393
 #: Source/Core/InputUICommon/Src/WXInputBase.cpp:48
 msgid "Pause"
 msgstr ""
@@ -2136,17 +2135,17 @@ msgstr ""
 msgid "Perspective %d"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:214
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:215
 msgid "Pixel Depth"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:213
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:214
 msgid "Pixel Lighting"
 msgstr ""
 
 #: Source/Core/DolphinWX/Src/FrameTools.cpp:362
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1398
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1401
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402
 msgid "Play"
 msgstr ""
 
@@ -2183,7 +2182,7 @@ msgstr ""
 msgid "Port :"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:432
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:434
 msgid "Post-Processing Shader:"
 msgstr ""
 
@@ -2211,7 +2210,7 @@ msgstr ""
 msgid "Projection Hack for: "
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:368
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:369
 msgid "Projection Stats"
 msgstr ""
 
@@ -2232,7 +2231,7 @@ msgstr ""
 msgid "R Button"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:264
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:265
 msgid "RAM"
 msgstr ""
 
@@ -2244,12 +2243,12 @@ msgstr ""
 msgid "Range"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:382
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:383
 msgid "Real"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:20
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:42
+#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:21
+#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:43
 msgid "Real Wiimote"
 msgstr ""
 
@@ -2266,7 +2265,7 @@ msgstr ""
 
 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:927
 #: Source/Core/DolphinWX/Src/FrameTools.cpp:359
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:39
+#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:40
 msgid "Refresh"
 msgstr ""
 
@@ -2295,7 +2294,7 @@ msgstr ""
 msgid "Render to main window."
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:347
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:348
 msgid "Rendering"
 msgstr ""
 
@@ -2335,7 +2334,7 @@ msgstr ""
 msgid "Sa&ve State"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:300
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:301
 msgid "Safe"
 msgstr ""
 
@@ -2374,7 +2373,7 @@ msgstr ""
 msgid "Save decompressed GCM/ISO"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:239
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:240
 msgid "Scale:"
 msgstr ""
 
@@ -2447,11 +2446,11 @@ msgstr ""
 msgid "Select the script to load"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1243
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1247
 msgid "Select the state to load"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1257
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1261
 msgid "Select the state to save"
 msgstr ""
 
@@ -2526,7 +2525,7 @@ msgstr ""
 msgid "Show Drives"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:366
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:367
 msgid "Show FPS"
 msgstr ""
 
@@ -2566,7 +2565,7 @@ msgstr ""
 msgid "Show Regions"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:371
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:372
 msgid "Show Shader Errors"
 msgstr ""
 
@@ -2744,7 +2743,7 @@ msgstr ""
 msgid "Stop"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:163
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:164
 msgid "Stretch to Window"
 msgstr ""
 
@@ -2779,11 +2778,11 @@ msgstr ""
 msgid "Test"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:262
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:263
 msgid "Texture"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:369
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:370
 msgid "Texture Format"
 msgstr ""
 
@@ -2938,11 +2937,11 @@ msgid ""
 "glitches in some games."
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:405
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:406
 msgid "Utility"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:176
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:177
 msgid "V-Sync"
 msgstr ""
 
@@ -2958,7 +2957,7 @@ msgstr ""
 msgid "Value: "
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:367
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:368
 msgid "Various Statistics"
 msgstr ""
 
@@ -2970,7 +2969,7 @@ msgstr ""
 msgid "Video"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:381
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:382
 msgid "Virtual"
 msgstr ""
 
@@ -2985,12 +2984,12 @@ msgid ""
 "Reduces tearing but might also decrease performance"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/Frame.cpp:659
+#: Source/Core/DolphinWX/Src/Frame.cpp:660
 #: Source/Core/DolphinWX/Src/LogWindow.cpp:77
 msgid "Warning"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:105
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:106
 msgid ""
 "When using EFB to RAM we very often need to decode RAM data to a VRAM "
 "texture, which is a very time-consuming task.\n"
@@ -3003,7 +3002,7 @@ msgid ""
 "be; accurate texture cache set to \"safe\" might actually be slower!)"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:174
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:175
 msgid "Widescreen Hack"
 msgstr ""
 
@@ -3036,7 +3035,7 @@ msgid ""
 "Do you want to reconnect immediately?"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/Main.cpp:644
+#: Source/Core/DolphinWX/Src/Main.cpp:649
 msgid "Wiimote Connected"
 msgstr ""
 
@@ -3102,7 +3101,7 @@ msgstr ""
 msgid "Write to Window ->"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:376
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:377
 msgid "XFB"
 msgstr ""
 
diff --git a/Languages/it.po b/Languages/it.po
index 9ad8fc6043..a1a34847e4 100644
--- a/Languages/it.po
+++ b/Languages/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Dolphin Emu 2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-06 12:03-0600\n"
+"POT-Creation-Date: 2011-01-07 08:58-0600\n"
 "PO-Revision-Date: 2011-01-06 18:12+0100\n"
 "Last-Translator: \n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -26,7 +26,7 @@ msgstr " (troppo grande per il display)"
 msgid " Game : "
 msgstr "Gioco :"
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:109
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:110
 msgid " Graphics Configuration"
 msgstr "Configurazione grafica"
 
@@ -215,11 +215,11 @@ msgstr "&Visualizza"
 msgid "&Wiimote Settings"
 msgstr "&Impostazioni Wiimote"
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:436
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:438
 msgid "(off)"
 msgstr "(off)"
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:219
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:220
 msgid "3D Vision (Requires Fullscreen)"
 msgstr "Visione 3D Vision (Richiede Fullscreen)"
 
@@ -284,7 +284,7 @@ msgid "Acceleration"
 msgstr "Accellerazione"
 
 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:342
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:292
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:293
 msgid "Accurate Texture Cache"
 msgstr "Accurate Texture Cache"
 
@@ -292,7 +292,7 @@ msgstr "Accurate Texture Cache"
 msgid "Action"
 msgstr "Processo"
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:146
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:147
 msgid "Adapter:"
 msgstr "Adattatore:"
 
@@ -328,7 +328,7 @@ msgid "Adjust the analog control pressure required to activate buttons."
 msgstr ""
 "Regolare la pressionedel comando analogico necessaria per attivare i pulsanti"
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:342
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:343
 msgid "Advanced"
 msgstr "Avanzato"
 
@@ -349,8 +349,8 @@ msgstr ""
 msgid "All Gamecube GCM files (gcm)"
 msgstr "Tutti i file  Gamecube GCM (gcm)|*.gcm"
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1245
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1259
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1249
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1263
 msgid "All Save States (sav, s##)"
 msgstr ""
 
@@ -389,11 +389,11 @@ msgstr ""
 msgid "Alternate RFI"
 msgstr "Alternate RFI"
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:186
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:187
 msgid "Anisotropic Filtering:"
 msgstr "Anisotropic Filtering:"
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:191
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:192
 msgid "Anti-Aliasing:"
 msgstr "Anti-Aliasing:"
 
@@ -418,7 +418,7 @@ msgid "Are you sure you want to delete this file?  It will be gone forever!"
 msgstr "Sei sicuro di voler eliminare questo file? Sara cancellatoper sempre!"
 
 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:644
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:165
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:166
 msgid "Aspect Ratio:"
 msgstr "Aspect Ratio:"
 
@@ -435,7 +435,7 @@ msgstr ""
 msgid "Auto"
 msgstr "Auto"
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:162
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:163
 msgid "Auto [recommended]"
 msgstr "Auto [raccomandato]"
 
@@ -456,7 +456,7 @@ msgstr "Dettagli Banner"
 msgid "Banner:"
 msgstr "Banner:"
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:126
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:127
 msgid "Basic"
 msgstr "Di base"
 
@@ -617,7 +617,7 @@ msgstr "Cancella"
 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:274
 #: Source/Core/DolphinWX/Src/LuaWindow.cpp:110
 #: Source/Core/DolphinWX/Src/AboutDolphin.cpp:42
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:459
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:461
 msgid "Close"
 msgstr "Chiudi"
 
@@ -667,7 +667,7 @@ msgstr "Config"
 msgid "Config..."
 msgstr "Config..."
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:31
+#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:32
 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:135
 #: Source/Core/DolphinWX/Src/InputConfigDiag.h:154
 msgid "Configure"
@@ -726,16 +726,16 @@ msgstr "Connect Wiimote 3"
 msgid "Connect Wiimote 4"
 msgstr "Connect Wiimote 4"
 
-#: Source/Core/DolphinWX/Src/Frame.cpp:825
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1216
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1215
 msgid "Connected"
 msgstr "Collegato"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:9
-msgid "Connected to . Wiimotes"
-msgstr "Connessi . Wiimotes"
+#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:11
+#, c-format
+msgid "Connected to %i Wiimotes"
+msgstr "Connessi %i Wiimotes"
 
-#: Source/Core/DolphinWX/Src/Main.cpp:643
+#: Source/Core/DolphinWX/Src/Main.cpp:648
 msgid "Connecting..."
 msgstr "Connessione in corso..."
 
@@ -751,7 +751,7 @@ msgstr "Controllo"
 msgid "Convert to GCI"
 msgstr "Converti GCI"
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:257
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:258
 msgid "Copy"
 msgstr "Copia"
 
@@ -810,7 +810,7 @@ msgstr "Creata da black_rider and published on ForumW.org > Web Developments"
 msgid "Creator: "
 msgstr "Creatore:"
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:424
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:425
 msgid "Crop"
 msgstr "Crop"
 
@@ -904,19 +904,19 @@ msgstr "Dispositivo"
 msgid "Device Settings"
 msgstr "Impostazioni Dispositivo"
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:356
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:357
 msgid "Disable Dest. Alpha Pass"
 msgstr "Disabilita Dest. Alpha Pass"
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:355
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:356
 msgid "Disable Fog"
 msgstr "Disabilita Nebbia"
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:353
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:354
 msgid "Disable Lighting"
 msgstr "Disabilita Illuminazione"
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:354
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:355
 msgid "Disable Textures"
 msgstr "Disabilita Textures"
 
@@ -956,8 +956,7 @@ msgstr ""
 msgid "Disc"
 msgstr "Disco"
 
-#: Source/Core/DolphinWX/Src/Frame.cpp:825
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1216
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1215
 msgid "Disconnected"
 msgstr "Scollegato"
 
@@ -994,7 +993,7 @@ msgstr "Configurazione Dolphin"
 msgid "Dolphin TAS Movies (*.dtm)"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:67
+#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:68
 msgid "Dolphin Wiimote Configuration"
 msgstr "Configurazione Dolphin Wiimote"
 
@@ -1025,15 +1024,15 @@ msgstr "Giù"
 msgid "Download Codes (WiiRD Database)"
 msgstr "Scaricare codici (WiiRD Database)"
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:412
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:413
 msgid "Dump EFB Target"
 msgstr "Dump EFB Target"
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:413
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:414
 msgid "Dump Frames"
 msgstr "Dump Frames"
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:410
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:411
 msgid "Dump Textures"
 msgstr "Dump Textures"
 
@@ -1050,15 +1049,15 @@ msgstr "Olanda"
 msgid "E&xit"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:226
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:227
 msgid "EFB"
 msgstr "EFB"
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:370
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:371
 msgid "EFB Copy Regions"
 msgstr "Copia Regioni EFB"
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:212
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:213
 msgid "EFB Scaled Copy"
 msgstr "Copia Scaled EFB"
 
@@ -1091,7 +1090,7 @@ msgstr "Modifica prospettiva corrente"
 msgid "Edit..."
 msgstr "Modifica..."
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:247
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:248
 msgid "Emulate format changes"
 msgstr "Emula format changes"
 
@@ -1105,8 +1104,8 @@ msgstr ""
 "Ciò non molto preciso,ma è sufficentemente buono nei gioche che utilizzano "
 "copie d framebuffer."
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:20
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:32
+#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:21
+#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:33
 msgid "Emulated Wiimote"
 msgstr "Emulata Wiimote"
 
@@ -1119,9 +1118,9 @@ msgid "Emulator Display Settings"
 msgstr "Impostazioni Emulatore Display"
 
 #: Source/Core/DolphinWX/Src/UDPConfigDiag.cpp:22
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:260
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:295
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:379
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:261
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:296
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:380
 msgid "Enable"
 msgstr "Attiva"
 
@@ -1143,7 +1142,7 @@ msgid "Enable Block Merging"
 msgstr "Attiva  Block Merging"
 
 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:340
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:246
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:247
 msgid "Enable CPU Access"
 msgstr "Attiva CPU Access"
 
@@ -1161,7 +1160,7 @@ msgstr "Attiva copia EFB"
 msgid "Enable DTK Music"
 msgstr "Attiva BAT"
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:426
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:427
 msgid "Enable Display List Caching"
 msgstr "Attiva lista Display Caching"
 
@@ -1182,7 +1181,7 @@ msgstr "Attiva EFB per le Texture"
 msgid "Enable HLE Audio"
 msgstr "Attiva BAT"
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:427
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:428
 msgid "Enable Hotkeys"
 msgstr "Attiva Hotkeys"
 
@@ -1203,7 +1202,7 @@ msgstr "Attiva Dual Core"
 msgid "Enable MMU"
 msgstr "Attiva MMU"
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:425
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:426
 msgid "Enable OpenCL"
 msgstr "Attiva OpenCL"
 
@@ -1220,11 +1219,11 @@ msgstr "Attiva Screen Saver (burn-in reduction)"
 msgid "Enable WideScreen"
 msgstr "Attiva WideScreen"
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:352
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:353
 msgid "Enable Wireframe"
 msgstr "Attiva Wireframe"
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:266
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:267
 msgid "Enable cache"
 msgstr "Attiva cache"
 
@@ -1313,7 +1312,7 @@ msgstr "Fine"
 msgid "English"
 msgstr "Inglese"
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:181
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:182
 msgid "Enhancements"
 msgstr "Miglioramenti"
 
@@ -1427,7 +1426,7 @@ msgstr "FRANCIA"
 msgid "FST Size:"
 msgstr "FST Size:"
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:311
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:312
 msgid "Fast"
 msgstr "Veloce"
 
@@ -1460,15 +1459,15 @@ msgstr "Primo blocco"
 msgid "Fix Checksums"
 msgstr "Fix Checksums"
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:163
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:164
 msgid "Force 16:9"
 msgstr "Forza 16:9"
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:163
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:164
 msgid "Force 4:3"
 msgstr "Forza 4:3"
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:215
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:216
 msgid "Force Bi/Trilinear Filtering"
 msgstr "Forza Bi/Trilinear Filtering"
 
@@ -1494,7 +1493,7 @@ msgstr ""
 "Migliora la qualità delle texture (specialmente quando si utilizza una "
 "risoluzione interna) ma questo provoca anomalie in alcuni giochi."
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:233
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:234
 msgid "Fractional"
 msgstr "Fractional"
 
@@ -1506,7 +1505,7 @@ msgstr "Frame S&kipping"
 msgid "Framelimit :"
 msgstr "Framelimit :"
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:414
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:415
 msgid "Free Look"
 msgstr "Framelimit :"
 
@@ -1574,7 +1573,7 @@ msgid "Gecko Codes"
 msgstr "Codici Gecko"
 
 #: Source/Core/DolphinWX/Src/ConfigMain.cpp:394
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:121
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:122
 msgid "General"
 msgstr "Generale"
 
@@ -1630,7 +1629,7 @@ msgstr "Configurazione Hotkey"
 msgid "Hotkeys"
 msgstr "Hotkeys"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:20
+#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:21
 msgid "Hybrid Wiimote"
 msgstr "Hybrid Wiimote"
 
@@ -1696,7 +1695,7 @@ msgstr "In Game"
 msgid "Info"
 msgstr "In Game"
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:361
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:362
 msgid "Information"
 msgstr "Informazioni"
 
@@ -1704,7 +1703,7 @@ msgstr "Informazioni"
 msgid "Input"
 msgstr "Ingresso"
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:27
+#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:28
 msgid "Input Source"
 msgstr "Fonte di ingresso"
 
@@ -1736,7 +1735,7 @@ msgstr "Installare al Menu Wii"
 msgid "Installing WAD to Wii Menu..."
 msgstr "Installa WAD per Wii Menu..."
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:233
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:234
 msgid "Integral [recommended]"
 msgstr "Integrale [consigliato]"
 
@@ -1843,11 +1842,11 @@ msgstr "Di meno"
 msgid "Load"
 msgstr "Caricare"
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:411
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:412
 msgid "Load Hi-Res Textures"
 msgstr "Load Hi-Res Textures"
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:211
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:212
 msgid "Load Native Mipmaps"
 msgstr "Load Native Mipmaps"
 
@@ -1937,7 +1936,7 @@ msgstr "Menu"
 msgid "Metroid Other M"
 msgstr "Metroid Other M"
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:419
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:420
 msgid "Misc"
 msgstr "Misc"
 
@@ -2097,12 +2096,12 @@ msgid "No docking"
 msgstr ""
 
 #: Source/Core/DolphinWX/Src/ISOProperties.cpp:350
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:19
+#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:20
 #: Source/Core/DolphinWX/Src/NetWindow.cpp:554
 msgid "None"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:306
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:307
 msgid "Normal"
 msgstr ""
 
@@ -2115,7 +2114,7 @@ msgstr ""
 msgid "Not Set"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/Main.cpp:642
+#: Source/Core/DolphinWX/Src/Main.cpp:647
 msgid "Not connected"
 msgstr ""
 
@@ -2152,7 +2151,7 @@ msgstr ""
 msgid "Nunchuk Acceleration"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:78
+#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:79
 #: Source/Plugins/Plugin_DSP_HLE/Src/ConfigDlg.cpp:35
 #: Source/Plugins/Plugin_DSP_LLE/Src/DSPConfigDlgLLE.cpp:37
 msgid "OK"
@@ -2214,7 +2213,7 @@ msgstr ""
 msgid "Page Up"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:46
+#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:47
 msgid "Pair Up"
 msgstr ""
 
@@ -2235,8 +2234,8 @@ msgstr ""
 msgid "Paths"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1388
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1389
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1392
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1393
 #: Source/Core/InputUICommon/Src/WXInputBase.cpp:48
 msgid "Pause"
 msgstr ""
@@ -2250,17 +2249,17 @@ msgstr ""
 msgid "Perspective %d"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:214
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:215
 msgid "Pixel Depth"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:213
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:214
 msgid "Pixel Lighting"
 msgstr ""
 
 #: Source/Core/DolphinWX/Src/FrameTools.cpp:362
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1397
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1398
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1401
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1402
 msgid "Play"
 msgstr ""
 
@@ -2297,7 +2296,7 @@ msgstr ""
 msgid "Port :"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:432
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:434
 msgid "Post-Processing Shader:"
 msgstr ""
 
@@ -2325,7 +2324,7 @@ msgstr ""
 msgid "Projection Hack for: "
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:368
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:369
 msgid "Projection Stats"
 msgstr ""
 
@@ -2346,7 +2345,7 @@ msgstr ""
 msgid "R Button"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:264
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:265
 msgid "RAM"
 msgstr "RAM"
 
@@ -2358,12 +2357,12 @@ msgstr "RUSSIA"
 msgid "Range"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:382
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:383
 msgid "Real"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:20
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:42
+#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:21
+#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:43
 msgid "Real Wiimote"
 msgstr ""
 
@@ -2380,7 +2379,7 @@ msgstr ""
 
 #: Source/Core/DolphinWX/Src/InputConfigDiag.cpp:927
 #: Source/Core/DolphinWX/Src/FrameTools.cpp:359
-#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:39
+#: Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp:40
 msgid "Refresh"
 msgstr ""
 
@@ -2409,7 +2408,7 @@ msgstr ""
 msgid "Render to main window."
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:347
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:348
 msgid "Rendering"
 msgstr ""
 
@@ -2449,7 +2448,7 @@ msgstr ""
 msgid "Sa&ve State"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:300
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:301
 msgid "Safe"
 msgstr ""
 
@@ -2488,7 +2487,7 @@ msgstr ""
 msgid "Save decompressed GCM/ISO"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:239
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:240
 msgid "Scale:"
 msgstr ""
 
@@ -2561,11 +2560,11 @@ msgstr ""
 msgid "Select the script to load"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1243
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1247
 msgid "Select the state to load"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/FrameTools.cpp:1257
+#: Source/Core/DolphinWX/Src/FrameTools.cpp:1261
 msgid "Select the state to save"
 msgstr ""
 
@@ -2640,7 +2639,7 @@ msgstr ""
 msgid "Show Drives"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:366
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:367
 msgid "Show FPS"
 msgstr ""
 
@@ -2680,7 +2679,7 @@ msgstr ""
 msgid "Show Regions"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:371
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:372
 msgid "Show Shader Errors"
 msgstr ""
 
@@ -2859,7 +2858,7 @@ msgstr ""
 msgid "Stop"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:163
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:164
 msgid "Stretch to Window"
 msgstr ""
 
@@ -2894,11 +2893,11 @@ msgstr ""
 msgid "Test"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:262
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:263
 msgid "Texture"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:369
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:370
 msgid "Texture Format"
 msgstr ""
 
@@ -3053,11 +3052,11 @@ msgid ""
 "glitches in some games."
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:405
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:406
 msgid "Utility"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:176
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:177
 msgid "V-Sync"
 msgstr ""
 
@@ -3073,7 +3072,7 @@ msgstr ""
 msgid "Value: "
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:367
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:368
 msgid "Various Statistics"
 msgstr ""
 
@@ -3085,7 +3084,7 @@ msgstr ""
 msgid "Video"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:381
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:382
 msgid "Virtual"
 msgstr ""
 
@@ -3100,12 +3099,12 @@ msgid ""
 "Reduces tearing but might also decrease performance"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/Frame.cpp:659
+#: Source/Core/DolphinWX/Src/Frame.cpp:660
 #: Source/Core/DolphinWX/Src/LogWindow.cpp:77
 msgid "Warning"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:105
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:106
 msgid ""
 "When using EFB to RAM we very often need to decode RAM data to a VRAM "
 "texture, which is a very time-consuming task.\n"
@@ -3118,7 +3117,7 @@ msgid ""
 "be; accurate texture cache set to \"safe\" might actually be slower!)"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:174
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:175
 msgid "Widescreen Hack"
 msgstr ""
 
@@ -3151,7 +3150,7 @@ msgid ""
 "Do you want to reconnect immediately?"
 msgstr ""
 
-#: Source/Core/DolphinWX/Src/Main.cpp:644
+#: Source/Core/DolphinWX/Src/Main.cpp:649
 msgid "Wiimote Connected"
 msgstr ""
 
@@ -3217,7 +3216,7 @@ msgstr ""
 msgid "Write to Window ->"
 msgstr ""
 
-#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:376
+#: Source/Core/VideoUICommon/Src/VideoConfigDiag.cpp:377
 msgid "XFB"
 msgstr ""
 
diff --git a/Source/Core/Core/Src/HW/Wiimote.h b/Source/Core/Core/Src/HW/Wiimote.h
index 3908fc4246..843f62e249 100644
--- a/Source/Core/Core/Src/HW/Wiimote.h
+++ b/Source/Core/Core/Src/HW/Wiimote.h
@@ -9,10 +9,15 @@
 
 #define WIIMOTE_INI_NAME	"WiimoteNew"
 
-//extern InputPlugin g_plugin;
-extern unsigned int g_wiimote_sources[MAX_WIIMOTES];
+enum
+{
+	WIIMOTE_SRC_NONE = 0,
+	WIIMOTE_SRC_EMU = 1,
+	WIIMOTE_SRC_REAL = 2,
+	WIIMOTE_SRC_HYBRID = 3,	// emu + real
+};
 
-//extern SWiimoteInitialize g_WiimoteInitialize;
+extern unsigned int g_wiimote_sources[MAX_WIIMOTES];
 
 namespace Wiimote
 {
diff --git a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp
index f08d50c088..a8d74a6e47 100644
--- a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp
+++ b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp
@@ -21,6 +21,7 @@
 #include "IniFile.h"
 #include "StringUtil.h"
 #include "Timer.h"
+#include "../../Host.h"
 
 #include "WiimoteReal.h"
 
@@ -537,6 +538,8 @@ THREAD_RETURN WiimoteThreadFunc(void* arg)
 	// rumble briefly
 	wiimote->Rumble();
 
+	Host_ConnectWiimote(wiimote->index, true);
+
 	// main loop
 	while (g_run_wiimote_thread && wiimote->IsConnected())
 	{
@@ -550,6 +553,8 @@ THREAD_RETURN WiimoteThreadFunc(void* arg)
 			Common::SleepCurrentThread(1);
 	}
 
+	Host_ConnectWiimote(wiimote->index, false);
+
 #ifdef __APPLE__
 	[pool release];
 #endif
diff --git a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h
index d5363c34dc..c04c5af2e9 100644
--- a/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h
+++ b/Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h
@@ -29,14 +29,6 @@
 
 #include "../../InputCommon/Src/InputConfig.h"
 
-enum
-{
-	WIIMOTE_SRC_NONE = 0,
-	WIIMOTE_SRC_EMU = 1,
-	WIIMOTE_SRC_REAL = 2,
-	WIIMOTE_SRC_HYBRID = 3,	// emu + real
-};
-
 // Pointer to data, and size of data
 typedef std::pair<u8*,u8> Report;
 
diff --git a/Source/Core/Core/Src/Host.h b/Source/Core/Core/Src/Host.h
index 310cb6f462..fa4d31ddd6 100644
--- a/Source/Core/Core/Src/Host.h
+++ b/Source/Core/Core/Src/Host.h
@@ -56,5 +56,6 @@ void Host_UpdateStatusBar(const char* _pText, int Filed = 0);
 
 void Host_SysMessage(const char *fmt, ...);
 void Host_SetWiiMoteConnectionState(int _State);
+void Host_ConnectWiimote(int wm_idx, bool connect);
 
 #endif
diff --git a/Source/Core/DolphinWX/Src/Frame.cpp b/Source/Core/DolphinWX/Src/Frame.cpp
index c280b200da..423565ca16 100644
--- a/Source/Core/DolphinWX/Src/Frame.cpp
+++ b/Source/Core/DolphinWX/Src/Frame.cpp
@@ -640,6 +640,7 @@ void CFrame::OnHostMessage(wxCommandEvent& event)
 		if (GetStatusBar() != NULL)
 		{
 			GetStatusBar()->SetStatusText(event.GetString(), event.GetInt());
+			UpdateGUI();
 		}
 		break;
 
@@ -838,12 +839,8 @@ void CFrame::OnKeyDown(wxKeyEvent& event)
 		// Actually perform the wiimote connection or disconnection
 		if (WiimoteId >= 0)
 		{
-			bNoWiimoteMsg = GetMenuBar()->IsChecked(IDM_CONNECT_WIIMOTE1 + WiimoteId);
-			GetMenuBar()->Check(IDM_CONNECT_WIIMOTE1 + WiimoteId, !bNoWiimoteMsg);
-			GetUsbPointer()->AccessWiiMote(WiimoteId | 0x100)->Activate(!bNoWiimoteMsg);
-			wxString msg(wxString::Format(wxT("Wiimote %i %s"), WiimoteId + 1,
-						bNoWiimoteMsg ?  _("Disconnected") : _("Connected")));
-			Core::DisplayMessage(msg.ToAscii(), 3000);
+			bool connect = !GetMenuBar()->IsChecked(IDM_CONNECT_WIIMOTE1 + WiimoteId);
+			ConnectWiimote(WiimoteId, connect);
 		}
 
 		// Send the OSD hotkeys to the video plugin
diff --git a/Source/Core/DolphinWX/Src/Frame.h b/Source/Core/DolphinWX/Src/Frame.h
index b948d38a09..6b318fd1a7 100644
--- a/Source/Core/DolphinWX/Src/Frame.h
+++ b/Source/Core/DolphinWX/Src/Frame.h
@@ -131,6 +131,7 @@ class CFrame : public CRenderFrame
 		bool RendererHasFocus();
 		void DoFullscreen(bool bF);
 		void ToggleDisplayMode (bool bFullscreen);
+		static void ConnectWiimote(int wm_idx, bool connect);
 
 		#ifdef __WXGTK__
 		Common::Event panic_event;
diff --git a/Source/Core/DolphinWX/Src/FrameTools.cpp b/Source/Core/DolphinWX/Src/FrameTools.cpp
index 1d00dbe628..b2b216d09d 100644
--- a/Source/Core/DolphinWX/Src/FrameTools.cpp
+++ b/Source/Core/DolphinWX/Src/FrameTools.cpp
@@ -1206,18 +1206,22 @@ void CFrame::OnLoadWiiMenu(wxCommandEvent& event)
 	}
 }
 
-void CFrame::OnConnectWiimote(wxCommandEvent& event)
+void CFrame::ConnectWiimote(int wm_idx, bool connect)
 {
 	if (Core::isRunning() && SConfig::GetInstance().m_LocalCoreStartupParameter.bWii)
 	{
-		int Id = event.GetId() - IDM_CONNECT_WIIMOTE1;
-		bNoWiimoteMsg = !event.IsChecked();
-		GetUsbPointer()->AccessWiiMote(Id | 0x100)->Activate(event.IsChecked());
-		wxString msg(wxString::Format(wxT("Wiimote %i %s"), Id + 1, (event.IsChecked()) ? _("Connected") : _("Disconnected")));
+		GetUsbPointer()->AccessWiiMote(wm_idx | 0x100)->Activate(connect);
+		wxString msg(wxString::Format(wxT("Wiimote %i %s"), wm_idx + 1,
+					connect ? _("Connected") : _("Disconnected")));
 		Core::DisplayMessage(msg.ToAscii(), 3000);
 	}
 }
 
+void CFrame::OnConnectWiimote(wxCommandEvent& event)
+{
+	ConnectWiimote(event.GetId() - IDM_CONNECT_WIIMOTE1, event.IsChecked());
+}
+
 // Toogle fullscreen. In Windows the fullscreen mode is accomplished by expanding the m_Panel to cover
 // the entire screen (when we render to the main window).
 void CFrame::OnToggleFullscreen(wxCommandEvent& WXUNUSED (event))
diff --git a/Source/Core/DolphinWX/Src/Main.cpp b/Source/Core/DolphinWX/Src/Main.cpp
index ec6d1fb2e5..a0b1bb24ae 100644
--- a/Source/Core/DolphinWX/Src/Main.cpp
+++ b/Source/Core/DolphinWX/Src/Main.cpp
@@ -658,3 +658,8 @@ bool Host_RendererHasFocus()
 {
 	return main_frame->RendererHasFocus();
 }
+
+void Host_ConnectWiimote(int wm_idx, bool connect)
+{
+	CFrame::ConnectWiimote(wm_idx, connect);
+}
diff --git a/Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp b/Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp
index f8d8790cd3..5da18577ff 100644
--- a/Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp
+++ b/Source/Core/DolphinWX/Src/WiimoteConfigDiag.cpp
@@ -1,13 +1,14 @@
 
 #include "WiimoteConfigDiag.h"
 #include "HW/Wiimote.h"
+#include "Frame.h"
 
 #define _connect_macro_(b, f, c, s)	(b)->Connect(wxID_ANY, (c), wxCommandEventHandler( f ), (wxObject*)0, (wxEvtHandler*)s)
 
 const wxString& ConnectedWiimotesString()
 {
-	static wxString str = _("Connected to . Wiimotes");
-	str[13] = wxChar(wxT('0') + WiimoteReal::Initialize());
+	static wxString str;
+	str.Printf(_("Connected to %i Wiimotes"), WiimoteReal::Initialize());
 	return str;
 }
 
@@ -129,6 +130,9 @@ void WiimoteConfigPage::SelectSource(wxCommandEvent& event)
 {
 	// should be kinda fine, maybe should just set when user clicks OK, w/e change it later
 	g_wiimote_sources[m_index] = event.GetInt();
+
+	// Connect or disconnect emulated wiimotes (maybe do this in when OK is clicked too?).
+	CFrame::ConnectWiimote(m_index, WIIMOTE_SRC_EMU & g_wiimote_sources[m_index]);
 }
 
 void WiimoteConfigDiag::Save(wxCommandEvent&)