-(SysBeep)Added Mac OS X port of P.E.Op.S OpenGL plugin. (Patch #8361)

-Fixed help message for Windows. (Issue #8028).


git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@63522 e17a0e51-4ae3-4d35-97c3-1a29b211df97

33 files changed, 3214 insertions, 1242 deletions

diff --git a/macosx/plugins/PeopsXgl/English.lproj/Credits.rtf b/macosx/plugins/PeopsXgl/English.lproj/Credits.rtf
new file mode 100644
index 00000000..f49ff39e
--- /dev/null
+++ b/macosx/plugins/PeopsXgl/English.lproj/Credits.rtf
@@ -0,0 +1,13 @@
+{\rtf1\mac\ansicpg10000\cocoartf102
+{\fonttbl\f0\fswiss\fcharset77 Helvetica-Bold;\f1\fswiss\fcharset77 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+\pard\tx565\tx1133\tx1700\tx2266\tx2833\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802\ql\qnatural
+
+\f0\b\fs24 \cf0 Created By
+\f1\b0 \
+  Pete Bernert and the P.E.Op.S. team\
+\
+
+\f0\b Macintosh Port By
+\f1\b0 \
+  Gil Pedersen}
\ No newline at end of file
diff --git a/macosx/plugins/PeopsXgl/English.lproj/InfoPlist.strings b/macosx/plugins/PeopsXgl/English.lproj/InfoPlist.strings
new file mode 100644
index 00000000..6aa8ae00
--- /dev/null
+++ b/macosx/plugins/PeopsXgl/English.lproj/InfoPlist.strings
diff --git a/macosx/plugins/PeopsXgl/English.lproj/NetSfPeopsOpenGLConfig.nib/classes.nib b/macosx/plugins/PeopsXgl/English.lproj/NetSfPeopsOpenGLConfig.nib/classes.nib
new file mode 100644
index 00000000..6c70d5bf
--- /dev/null
+++ b/macosx/plugins/PeopsXgl/English.lproj/NetSfPeopsOpenGLConfig.nib/classes.nib
@@ -0,0 +1,42 @@
+{
+    IBClasses = (
+        {
+            ACTIONS = {"" = id; }; 
+            CLASS = FirstResponder; 
+            LANGUAGE = ObjC; 
+            SUPERCLASS = NSObject; 
+        }, 
+        {
+            ACTIONS = {cancel = id; hackToggle = id; ok = id; reset = id; }; 
+            CLASS = NetSfPeopsOpenGLPluginConfigController; 
+            LANGUAGE = ObjC; 
+            OUTLETS = {
+                advancedBlending = NSControl; 
+                autoFullScreen = NSControl; 
+                blurEffect = NSControl; 
+                ditherMode = NSPopUpButton; 
+                drawScanlines = NSControl; 
+                fpsCounter = NSControl; 
+                frameBufferEffects = NSPopUpButton; 
+                frameSkipping = NSControl; 
+                fullscreenSize = NSPopUpButton; 
+                hackEnable = NSControl; 
+                hacksView = NSView; 
+                mjpegDecoder = NSControl; 
+                mjpegDecoder15bit = NSControl; 
+                offscreenDrawing = NSPopUpButton; 
+                opaquePass = NSControl; 
+                proportionalResize = NSControl; 
+                texColorDepth = NSPopUpButton; 
+                texEnhancment = NSSlider; 
+                texFiltering = NSSlider; 
+                vSync = NSControl; 
+                windowSize = NSPopUpButton; 
+                wireframeOnly = NSControl; 
+                zMaskClipping = NSControl; 
+            }; 
+            SUPERCLASS = NSWindowController; 
+        }
+    ); 
+    IBVersion = 1; 
+}
\ No newline at end of file
diff --git a/macosx/plugins/PeopsXgl/English.lproj/NetSfPeopsOpenGLConfig.nib/info.nib b/macosx/plugins/PeopsXgl/English.lproj/NetSfPeopsOpenGLConfig.nib/info.nib
new file mode 100644
index 00000000..3481fbf9
--- /dev/null
+++ b/macosx/plugins/PeopsXgl/English.lproj/NetSfPeopsOpenGLConfig.nib/info.nib
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IBDocumentLocation</key>
+	<string>115 92 561 249 0 0 1440 878 </string>
+	<key>IBFramework Version</key>
+	<string>489.0</string>
+	<key>IBOpenObjects</key>
+	<array>
+		<integer>5</integer>
+	</array>
+	<key>IBSystem Version</key>
+	<string>8S2167</string>
+</dict>
+</plist>
diff --git a/macosx/plugins/PeopsXgl/English.lproj/NetSfPeopsOpenGLConfig.nib/keyedobjects.nib b/macosx/plugins/PeopsXgl/English.lproj/NetSfPeopsOpenGLConfig.nib/keyedobjects.nib
new file mode 100644
index 00000000..6112f7ab
--- /dev/null
+++ b/macosx/plugins/PeopsXgl/English.lproj/NetSfPeopsOpenGLConfig.nib/keyedobjects.nib
diff --git a/macosx/plugins/PeopsXgl/Info.plist b/macosx/plugins/PeopsXgl/Info.plist
new file mode 100644
index 00000000..d5641fc2
--- /dev/null
+++ b/macosx/plugins/PeopsXgl/Info.plist
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleExecutable</key>
+	<string>${EXECUTABLE_NAME}</string>
+	<key>CFBundleIdentifier</key>
+	<string>net.sf.peops.GpuOpenGLPlugin</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundlePackageType</key>
+	<string>PsxP</string>
+	<key>CFBundleSignature</key>
+	<string>POGl</string>
+	<key>CFBundleVersion</key>
+	<string>1.16</string>
+</dict>
+</plist>
diff --git a/macosx/plugins/PeopsXgl/NetSfPeopsOpenGLGPUInterface.nib/classes.nib b/macosx/plugins/PeopsXgl/NetSfPeopsOpenGLGPUInterface.nib/classes.nib
new file mode 100644
index 00000000..9e107a47
--- /dev/null
+++ b/macosx/plugins/PeopsXgl/NetSfPeopsOpenGLGPUInterface.nib/classes.nib
@@ -0,0 +1,22 @@
+{
+    IBClasses = (
+        {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, 
+        {
+            CLASS = NetSfPeopsOpenGLGPUPluginGLView; 
+            LANGUAGE = ObjC; 
+            SUPERCLASS = NSOpenGLView; 
+        }, 
+        {
+            CLASS = NetSfPeopsOpenGLGPUPluginWindow; 
+            LANGUAGE = ObjC; 
+            SUPERCLASS = NSWindow; 
+        }, 
+        {
+            CLASS = NetSfPeopsSoftGPUPluginWindowController; 
+            LANGUAGE = ObjC; 
+            OUTLETS = {glView = NSOpenGLView; }; 
+            SUPERCLASS = NSWindowController; 
+        }
+    ); 
+    IBVersion = 1; 
+}
\ No newline at end of file
diff --git a/macosx/plugins/PeopsXgl/NetSfPeopsOpenGLGPUInterface.nib/info.nib b/macosx/plugins/PeopsXgl/NetSfPeopsOpenGLGPUInterface.nib/info.nib
new file mode 100644
index 00000000..54f46a4d
--- /dev/null
+++ b/macosx/plugins/PeopsXgl/NetSfPeopsOpenGLGPUInterface.nib/info.nib
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IBDocumentLocation</key>
+	<string>99 26 409 240 0 0 1024 746 </string>
+	<key>IBFramework Version</key>
+	<string>489.0</string>
+	<key>IBOpenObjects</key>
+	<array>
+		<integer>5</integer>
+	</array>
+	<key>IBSystem Version</key>
+	<string>8S2167</string>
+</dict>
+</plist>
diff --git a/macosx/plugins/PeopsXgl/NetSfPeopsOpenGLGPUInterface.nib/keyedobjects.nib b/macosx/plugins/PeopsXgl/NetSfPeopsOpenGLGPUInterface.nib/keyedobjects.nib
new file mode 100644
index 00000000..b84980d4
--- /dev/null
+++ b/macosx/plugins/PeopsXgl/NetSfPeopsOpenGLGPUInterface.nib/keyedobjects.nib
diff --git a/macosx/plugins/PeopsXgl/PeopsXGL.xcodeproj/project.pbxproj b/macosx/plugins/PeopsXgl/PeopsXGL.xcodeproj/project.pbxproj
new file mode 100644
index 00000000..d9e60332
--- /dev/null
+++ b/macosx/plugins/PeopsXgl/PeopsXGL.xcodeproj/project.pbxproj
@@ -0,0 +1,421 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 42;
+	objects = {
+
+/* Begin PBXBuildFile section */
+		2B038C07069183300082466B /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 2B038C05069183300082466B /* InfoPlist.strings */; };
+		2B959E4406342D32000F2A2D /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2B959E4306342D32000F2A2D /* OpenGL.framework */; };
+		2BD2E769077AF53E00657C69 /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 2BD2E767077AF53E00657C69 /* Credits.rtf */; };
+		2BD7C777076E1FAB000F05ED /* GLUT.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2B51949E06B3D2D200744730 /* GLUT.framework */; };
+		3F31AF741302D4B600CBB551 /* drawgl.m in Sources */ = {isa = PBXBuildFile; fileRef = 3F31AF6A1302D4B600CBB551 /* drawgl.m */; };
+		3F31AF761302D4B600CBB551 /* PluginGLView.m in Sources */ = {isa = PBXBuildFile; fileRef = 3F31AF6F1302D4B600CBB551 /* PluginGLView.m */; };
+		3F31AF771302D4B600CBB551 /* PluginWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = 3F31AF711302D4B600CBB551 /* PluginWindow.m */; };
+		3F31AF781302D4B600CBB551 /* PluginWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3F31AF731302D4B600CBB551 /* PluginWindowController.m */; };
+		3F7F38011307996100556C34 /* NetSfPeopsOpenGLGPUInterface.nib in Resources */ = {isa = PBXBuildFile; fileRef = 3F7F38001307996100556C34 /* NetSfPeopsOpenGLGPUInterface.nib */; };
+		3F7F38041307999800556C34 /* NetSfPeopsOpenGLPluginConfigController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3F7F38031307999800556C34 /* NetSfPeopsOpenGLPluginConfigController.m */; };
+		3F7F3808130799CA00556C34 /* NetSfPeopsOpenGLConfig.nib in Resources */ = {isa = PBXBuildFile; fileRef = 3F7F3806130799CA00556C34 /* NetSfPeopsOpenGLConfig.nib */; };
+		3F7F384813079BFD00556C34 /* texture.c in Sources */ = {isa = PBXBuildFile; fileRef = 3F7F383613079BFD00556C34 /* texture.c */; };
+		3F7F384913079BFD00556C34 /* menu.c in Sources */ = {isa = PBXBuildFile; fileRef = 3F7F383913079BFD00556C34 /* menu.c */; };
+		3F7F384A13079BFD00556C34 /* prim.c in Sources */ = {isa = PBXBuildFile; fileRef = 3F7F383B13079BFD00556C34 /* prim.c */; };
+		3F7F384B13079BFD00556C34 /* key.c in Sources */ = {isa = PBXBuildFile; fileRef = 3F7F383C13079BFD00556C34 /* key.c */; };
+		3F7F384C13079BFD00556C34 /* fps.c in Sources */ = {isa = PBXBuildFile; fileRef = 3F7F383D13079BFD00556C34 /* fps.c */; };
+		3F7F384E13079BFD00556C34 /* gpu.c in Sources */ = {isa = PBXBuildFile; fileRef = 3F7F384113079BFD00556C34 /* gpu.c */; };
+		3F7F384F13079BFD00556C34 /* soft.c in Sources */ = {isa = PBXBuildFile; fileRef = 3F7F384313079BFD00556C34 /* soft.c */; };
+		3F7F385013079BFD00556C34 /* draw.c in Sources */ = {isa = PBXBuildFile; fileRef = 3F7F384713079BFD00556C34 /* draw.c */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXFileReference section */
+		2B038C06069183300082466B /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+		2B038D2206918AA80082466B /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = Info.plist; sourceTree = "<group>"; };
+		2B51949E06B3D2D200744730 /* GLUT.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GLUT.framework; path = /System/Library/Frameworks/GLUT.framework; sourceTree = "<absolute>"; };
+		2B959E4306342D32000F2A2D /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = /System/Library/Frameworks/OpenGL.framework; sourceTree = "<absolute>"; };
+		2BAF50930632BB1A00DB9A16 /* PeopsXGL.psxplugin */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = PeopsXGL.psxplugin; sourceTree = BUILT_PRODUCTS_DIR; };
+		2BD2E768077AF53E00657C69 /* English */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = English; path = English.lproj/Credits.rtf; sourceTree = "<group>"; };
+		3F31AF6A1302D4B600CBB551 /* drawgl.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = drawgl.m; path = macsrc/drawgl.m; sourceTree = SOURCE_ROOT; };
+		3F31AF6B1302D4B600CBB551 /* ExtendedKeys.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ExtendedKeys.h; path = macsrc/ExtendedKeys.h; sourceTree = SOURCE_ROOT; };
+		3F31AF6E1302D4B600CBB551 /* PluginGLView.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = PluginGLView.h; path = macsrc/PluginGLView.h; sourceTree = SOURCE_ROOT; };
+		3F31AF6F1302D4B600CBB551 /* PluginGLView.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = PluginGLView.m; path = macsrc/PluginGLView.m; sourceTree = SOURCE_ROOT; };
+		3F31AF701302D4B600CBB551 /* PluginWindow.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = PluginWindow.h; path = macsrc/PluginWindow.h; sourceTree = SOURCE_ROOT; };
+		3F31AF711302D4B600CBB551 /* PluginWindow.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = PluginWindow.m; path = macsrc/PluginWindow.m; sourceTree = SOURCE_ROOT; };
+		3F31AF721302D4B600CBB551 /* PluginWindowController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = PluginWindowController.h; path = macsrc/PluginWindowController.h; sourceTree = SOURCE_ROOT; };
+		3F31AF731302D4B600CBB551 /* PluginWindowController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = PluginWindowController.m; path = macsrc/PluginWindowController.m; sourceTree = SOURCE_ROOT; };
+		3F7F38001307996100556C34 /* NetSfPeopsOpenGLGPUInterface.nib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; path = NetSfPeopsOpenGLGPUInterface.nib; sourceTree = SOURCE_ROOT; };
+		3F7F38021307999800556C34 /* NetSfPeopsOpenGLPluginConfigController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = NetSfPeopsOpenGLPluginConfigController.h; path = macsrc/NetSfPeopsOpenGLPluginConfigController.h; sourceTree = SOURCE_ROOT; };
+		3F7F38031307999800556C34 /* NetSfPeopsOpenGLPluginConfigController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = NetSfPeopsOpenGLPluginConfigController.m; path = macsrc/NetSfPeopsOpenGLPluginConfigController.m; sourceTree = SOURCE_ROOT; };
+		3F7F3807130799CA00556C34 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/NetSfPeopsOpenGLConfig.nib; sourceTree = "<group>"; };
+		3F7F383313079BFD00556C34 /* stdafx.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; lineEnding = 2; name = stdafx.h; path = ../../../plugins/peopsxgl/stdafx.h; sourceTree = SOURCE_ROOT; };
+		3F7F383513079BFD00556C34 /* texture.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = texture.h; path = ../../../plugins/peopsxgl/texture.h; sourceTree = SOURCE_ROOT; };
+		3F7F383613079BFD00556C34 /* texture.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = texture.c; path = ../../../plugins/peopsxgl/texture.c; sourceTree = SOURCE_ROOT; };
+		3F7F383713079BFD00556C34 /* key.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = key.h; path = ../../../plugins/peopsxgl/key.h; sourceTree = SOURCE_ROOT; };
+		3F7F383813079BFD00556C34 /* menu.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = menu.h; path = ../../../plugins/peopsxgl/menu.h; sourceTree = SOURCE_ROOT; };
+		3F7F383913079BFD00556C34 /* menu.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = menu.c; path = ../../../plugins/peopsxgl/menu.c; sourceTree = SOURCE_ROOT; };
+		3F7F383A13079BFD00556C34 /* gpu.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = gpu.h; path = ../../../plugins/peopsxgl/gpu.h; sourceTree = SOURCE_ROOT; };
+		3F7F383B13079BFD00556C34 /* prim.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = prim.c; path = ../../../plugins/peopsxgl/prim.c; sourceTree = SOURCE_ROOT; };
+		3F7F383C13079BFD00556C34 /* key.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; lineEnding = 2; name = key.c; path = ../../../plugins/peopsxgl/key.c; sourceTree = SOURCE_ROOT; };
+		3F7F383D13079BFD00556C34 /* fps.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; lineEnding = 2; name = fps.c; path = ../../../plugins/peopsxgl/fps.c; sourceTree = SOURCE_ROOT; };
+		3F7F383F13079BFD00556C34 /* gl_ext.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = gl_ext.h; path = ../../../plugins/peopsxgl/gl_ext.h; sourceTree = SOURCE_ROOT; };
+		3F7F384013079BFD00556C34 /* fps.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = fps.h; path = ../../../plugins/peopsxgl/fps.h; sourceTree = SOURCE_ROOT; };
+		3F7F384113079BFD00556C34 /* gpu.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; lineEnding = 0; name = gpu.c; path = ../../../plugins/peopsxgl/gpu.c; sourceTree = SOURCE_ROOT; };
+		3F7F384213079BFD00556C34 /* soft.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = soft.h; path = ../../../plugins/peopsxgl/soft.h; sourceTree = SOURCE_ROOT; };
+		3F7F384313079BFD00556C34 /* soft.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = soft.c; path = ../../../plugins/peopsxgl/soft.c; sourceTree = SOURCE_ROOT; };
+		3F7F384413079BFD00556C34 /* prim.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = prim.h; path = ../../../plugins/peopsxgl/prim.h; sourceTree = SOURCE_ROOT; };
+		3F7F384513079BFD00556C34 /* externals.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; lineEnding = 2; name = externals.h; path = ../../../plugins/peopsxgl/externals.h; sourceTree = SOURCE_ROOT; };
+		3F7F384613079BFD00556C34 /* draw.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = draw.h; path = ../../../plugins/peopsxgl/draw.h; sourceTree = SOURCE_ROOT; };
+		3F7F384713079BFD00556C34 /* draw.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; lineEnding = 2; name = draw.c; path = ../../../plugins/peopsxgl/draw.c; sourceTree = SOURCE_ROOT; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		2BAF50910632BB1A00DB9A16 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				2B959E4406342D32000F2A2D /* OpenGL.framework in Frameworks */,
+				2BD7C777076E1FAB000F05ED /* GLUT.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		2B3E59FF062AAC1A001D796E = {
+			isa = PBXGroup;
+			children = (
+				3F7F38001307996100556C34 /* NetSfPeopsOpenGLGPUInterface.nib */,
+				71E9EBF0109F24B600E98D1D /* src */,
+				2BD2E2F40779F50B00657C69 /* macsrc */,
+				2BD2E818077AFB9F00657C69 /* Resources */,
+				2B038D2206918AA80082466B /* Info.plist */,
+				2B3E5A0B062AAC34001D796E /* Frameworks */,
+				2B3E5A46062AACF3001D796E /* Products */,
+			);
+			sourceTree = "<group>";
+		};
+		2B3E5A0B062AAC34001D796E /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				2B959E4306342D32000F2A2D /* OpenGL.framework */,
+				2B51949E06B3D2D200744730 /* GLUT.framework */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
+		2B3E5A46062AACF3001D796E /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				2BAF50930632BB1A00DB9A16 /* PeopsXGL.psxplugin */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		2BD2E2F40779F50B00657C69 /* macsrc */ = {
+			isa = PBXGroup;
+			children = (
+				3F7F38021307999800556C34 /* NetSfPeopsOpenGLPluginConfigController.h */,
+				3F7F38031307999800556C34 /* NetSfPeopsOpenGLPluginConfigController.m */,
+				3F31AF6A1302D4B600CBB551 /* drawgl.m */,
+				3F31AF6B1302D4B600CBB551 /* ExtendedKeys.h */,
+				3F31AF6E1302D4B600CBB551 /* PluginGLView.h */,
+				3F31AF6F1302D4B600CBB551 /* PluginGLView.m */,
+				3F31AF701302D4B600CBB551 /* PluginWindow.h */,
+				3F31AF711302D4B600CBB551 /* PluginWindow.m */,
+				3F31AF721302D4B600CBB551 /* PluginWindowController.h */,
+				3F31AF731302D4B600CBB551 /* PluginWindowController.m */,
+			);
+			name = macsrc;
+			sourceTree = "<group>";
+		};
+		2BD2E818077AFB9F00657C69 /* Resources */ = {
+			isa = PBXGroup;
+			children = (
+				3F7F3806130799CA00556C34 /* NetSfPeopsOpenGLConfig.nib */,
+				2BD2E767077AF53E00657C69 /* Credits.rtf */,
+				2B038C05069183300082466B /* InfoPlist.strings */,
+			);
+			name = Resources;
+			sourceTree = "<group>";
+		};
+		71E9EBF0109F24B600E98D1D /* src */ = {
+			isa = PBXGroup;
+			children = (
+				3F7F383313079BFD00556C34 /* stdafx.h */,
+				3F7F383513079BFD00556C34 /* texture.h */,
+				3F7F383613079BFD00556C34 /* texture.c */,
+				3F7F383713079BFD00556C34 /* key.h */,
+				3F7F383813079BFD00556C34 /* menu.h */,
+				3F7F383913079BFD00556C34 /* menu.c */,
+				3F7F383A13079BFD00556C34 /* gpu.h */,
+				3F7F383B13079BFD00556C34 /* prim.c */,
+				3F7F383C13079BFD00556C34 /* key.c */,
+				3F7F383D13079BFD00556C34 /* fps.c */,
+				3F7F383F13079BFD00556C34 /* gl_ext.h */,
+				3F7F384013079BFD00556C34 /* fps.h */,
+				3F7F384113079BFD00556C34 /* gpu.c */,
+				3F7F384213079BFD00556C34 /* soft.h */,
+				3F7F384313079BFD00556C34 /* soft.c */,
+				3F7F384413079BFD00556C34 /* prim.h */,
+				3F7F384513079BFD00556C34 /* externals.h */,
+				3F7F384613079BFD00556C34 /* draw.h */,
+				3F7F384713079BFD00556C34 /* draw.c */,
+			);
+			name = src;
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXNativeTarget section */
+		2BAF50920632BB1A00DB9A16 /* gpuPeopsXGL */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 7170842C0FDFD328004F3EB4 /* Build configuration list for PBXNativeTarget "gpuPeopsXGL" */;
+			buildPhases = (
+				2BAF508F0632BB1A00DB9A16 /* Resources */,
+				2BAF50900632BB1A00DB9A16 /* Sources */,
+				2BAF50910632BB1A00DB9A16 /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = gpuPeopsXGL;
+			productName = gpuPeopsSoftGL;
+			productReference = 2BAF50930632BB1A00DB9A16 /* PeopsXGL.psxplugin */;
+			productType = "com.apple.product-type.bundle";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		2B3E5A03062AAC1A001D796E /* Project object */ = {
+			isa = PBXProject;
+			buildConfigurationList = 717084310FDFD328004F3EB4 /* Build configuration list for PBXProject "PeopsXGL" */;
+			compatibilityVersion = "Xcode 2.4";
+			hasScannedForEncodings = 1;
+			knownRegions = (
+				English,
+				Japanese,
+				French,
+				German,
+			);
+			mainGroup = 2B3E59FF062AAC1A001D796E;
+			productRefGroup = 2B3E5A46062AACF3001D796E /* Products */;
+			projectDirPath = "";
+			projectRoot = "";
+			targets = (
+				2BAF50920632BB1A00DB9A16 /* gpuPeopsXGL */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXResourcesBuildPhase section */
+		2BAF508F0632BB1A00DB9A16 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				2B038C07069183300082466B /* InfoPlist.strings in Resources */,
+				2BD2E769077AF53E00657C69 /* Credits.rtf in Resources */,
+				3F7F38011307996100556C34 /* NetSfPeopsOpenGLGPUInterface.nib in Resources */,
+				3F7F3808130799CA00556C34 /* NetSfPeopsOpenGLConfig.nib in Resources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXResourcesBuildPhase section */
+
+/* Begin PBXSourcesBuildPhase section */
+		2BAF50900632BB1A00DB9A16 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				3F31AF741302D4B600CBB551 /* drawgl.m in Sources */,
+				3F31AF761302D4B600CBB551 /* PluginGLView.m in Sources */,
+				3F31AF771302D4B600CBB551 /* PluginWindow.m in Sources */,
+				3F31AF781302D4B600CBB551 /* PluginWindowController.m in Sources */,
+				3F7F38041307999800556C34 /* NetSfPeopsOpenGLPluginConfigController.m in Sources */,
+				3F7F384813079BFD00556C34 /* texture.c in Sources */,
+				3F7F384913079BFD00556C34 /* menu.c in Sources */,
+				3F7F384A13079BFD00556C34 /* prim.c in Sources */,
+				3F7F384B13079BFD00556C34 /* key.c in Sources */,
+				3F7F384C13079BFD00556C34 /* fps.c in Sources */,
+				3F7F384E13079BFD00556C34 /* gpu.c in Sources */,
+				3F7F384F13079BFD00556C34 /* soft.c in Sources */,
+				3F7F385013079BFD00556C34 /* draw.c in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin PBXVariantGroup section */
+		2B038C05069183300082466B /* InfoPlist.strings */ = {
+			isa = PBXVariantGroup;
+			children = (
+				2B038C06069183300082466B /* English */,
+			);
+			name = InfoPlist.strings;
+			sourceTree = "<group>";
+		};
+		2BD2E767077AF53E00657C69 /* Credits.rtf */ = {
+			isa = PBXVariantGroup;
+			children = (
+				2BD2E768077AF53E00657C69 /* English */,
+			);
+			name = Credits.rtf;
+			sourceTree = "<group>";
+		};
+		3F7F3806130799CA00556C34 /* NetSfPeopsOpenGLConfig.nib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				3F7F3807130799CA00556C34 /* English */,
+			);
+			name = NetSfPeopsOpenGLConfig.nib;
+			sourceTree = "<group>";
+		};
+/* End PBXVariantGroup section */
+
+/* Begin XCBuildConfiguration section */
+		7170842D0FDFD328004F3EB4 /* Development */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				COPY_PHASE_STRIP = NO;
+				DEBUGGING_SYMBOLS = YES;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
+				GCC_MODEL_TUNING = "";
+				GCC_OPTIMIZATION_LEVEL = 1;
+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+				GCC_PREFIX_HEADER = "";
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					_MACGL,
+					_DARWIN,
+				);
+				GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
+				GCC_WARN_UNKNOWN_PRAGMAS = NO;
+				INFOPLIST_FILE = Info.plist;
+				INSTALL_PATH = "$(USER_LIBRARY_DIR)/Playstation Emulator Plugins";
+				LIBRARY_STYLE = BUNDLE;
+				OPTIMIZATION_CFLAGS = "-finline-functions -finline-limit=1600 -fomit-frame-pointer -fno-exceptions -funroll-loops -falign-loops=16 -ffast-math";
+				OTHER_CFLAGS = "-finline-functions";
+				OTHER_LDFLAGS = (
+					"-framework",
+					Foundation,
+					"-framework",
+					AppKit,
+				);
+				OTHER_REZFLAGS = "";
+				PRODUCT_NAME = PeopsXGL;
+				SECTORDER_FLAGS = "";
+				SYMROOT = ../../build;
+				WARNING_CFLAGS = (
+					"-Wmost",
+					"-Wno-four-char-constants",
+					"-Wno-unknown-pragmas",
+				);
+				WRAPPER_EXTENSION = psxplugin;
+			};
+			name = Development;
+		};
+		7170842E0FDFD328004F3EB4 /* Deployment */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				COPY_PHASE_STRIP = YES;
+				DEBUGGING_SYMBOLS = NO;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_ENABLE_FIX_AND_CONTINUE = NO;
+				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
+				GCC_MODEL_TUNING = "";
+				GCC_OPTIMIZATION_LEVEL = 3;
+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+				GCC_PREFIX_HEADER = "";
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					_MACGL,
+					_DARWIN,
+				);
+				GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
+				GCC_WARN_UNKNOWN_PRAGMAS = NO;
+				INFOPLIST_FILE = Info.plist;
+				INSTALL_PATH = "$(USER_LIBRARY_DIR)/Playstation Emulator Plugins";
+				LIBRARY_STYLE = BUNDLE;
+				OPTIMIZATION_CFLAGS = "-finline-functions -finline-limit=1600 -fomit-frame-pointer -fno-exceptions -funroll-loops -falign-loops=16 -ffast-math";
+				OTHER_LDFLAGS = (
+					"-framework",
+					Foundation,
+					"-framework",
+					AppKit,
+				);
+				OTHER_REZFLAGS = "";
+				PRODUCT_NAME = PeopsXGL;
+				SECTORDER_FLAGS = "";
+				SYMROOT = ../../build;
+				WARNING_CFLAGS = (
+					"-Wmost",
+					"-Wno-four-char-constants",
+					"-Wno-unknown-pragmas",
+				);
+				WRAPPER_EXTENSION = psxplugin;
+				ZERO_LINK = NO;
+			};
+			name = Deployment;
+		};
+		717084320FDFD328004F3EB4 /* Development */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ARCHS = "$(ONLY_ACTIVE_ARCH_PRE_XCODE_3_1)";
+				GCC_MODEL_TUNING = "";
+				GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
+				HEADER_SEARCH_PATHS = (
+					../../../plugins/dfxvideo,
+					../../../libpcsxcore,
+				);
+				ONLY_ACTIVE_ARCH_PRE_XCODE_3_1 = "$(NATIVE_ARCH_ACTUAL)";
+				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
+			};
+			name = Development;
+		};
+		717084330FDFD328004F3EB4 /* Deployment */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ARCHS = (
+					i386,
+					ppc,
+				);
+				ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = i386;
+				GCC_ENABLE_SSE3_EXTENSIONS = YES;
+				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
+				GCC_MODEL_TUNING = "";
+				GCC_OPTIMIZATION_LEVEL = 3;
+				GCC_UNROLL_LOOPS = YES;
+				GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
+				HEADER_SEARCH_PATHS = (
+					../../../plugins/dfxvideo,
+					../../../libpcsxcore,
+				);
+				OTHER_CFLAGS = "-fomit-frame-pointer";
+				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
+			};
+			name = Deployment;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		7170842C0FDFD328004F3EB4 /* Build configuration list for PBXNativeTarget "gpuPeopsXGL" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				7170842D0FDFD328004F3EB4 /* Development */,
+				7170842E0FDFD328004F3EB4 /* Deployment */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Development;
+		};
+		717084310FDFD328004F3EB4 /* Build configuration list for PBXProject "PeopsXGL" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				717084320FDFD328004F3EB4 /* Development */,
+				717084330FDFD328004F3EB4 /* Deployment */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Development;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = 2B3E5A03062AAC1A001D796E /* Project object */;
+}
diff --git a/macosx/plugins/PeopsXgl/macsrc/ExtendedKeys.h b/macosx/plugins/PeopsXgl/macsrc/ExtendedKeys.h
new file mode 100644
index 00000000..1b6475b8
--- /dev/null
+++ b/macosx/plugins/PeopsXgl/macsrc/ExtendedKeys.h
@@ -0,0 +1,23 @@
+
+#ifndef __EXTENDED_KEYS_H__
+#define __EXTENDED_KEYS_H__
+
+enum {
+	PSX_FREEZE_KEY = 0xFFBE/*XK_F1*/,
+	PSX_NEXT_FREEZE_SLOT_KEY = 0xFFBF/*XK_F2*/,
+	PSX_DEFROST_KEY = 0xFFC0/*XK_F3*/,
+	PSX_SHOW_FREEZE_PIC_KEY = 0xFFC1/*XK_F4*/,
+	PSX_SIO_ALWAYS_ON_KEY = 0xFFC2/*XK_F5*/,
+	PSX_BW_MDEC_KEY = 0xFFC3/*XK_F6*/,
+	PSX_XA_AUDIO_ON_KEY = 0xFFC4/*XK_F7*/,
+	PSX_SNAPSHOT_KEY = 0xFFC5/*XK_F8*/,
+	PSX_OPEN_SHELL_KEY = 0xFFC6/*XK_F9*/,
+	PSX_CLOSE_SHELL_KEY = 0xFFC7/*XK_F10*/,
+	
+	PSX_STOP_KEY = 0xFF1B/*XK_Escape*/,
+	
+	GPU_FULLSCREEN_KEY = 0x0100,
+	GPU_FPS_DISPLAY_KEY = 0xFFFF/*XK_Delete*/
+};
+
+#endif //__EXTENDED_KEYS_H__
diff --git a/macosx/plugins/PeopsXgl/macsrc/NetSfPeopsOpenGLPluginConfigController.h b/macosx/plugins/PeopsXgl/macsrc/NetSfPeopsOpenGLPluginConfigController.h
new file mode 100644
index 00000000..7d3bea7c
--- /dev/null
+++ b/macosx/plugins/PeopsXgl/macsrc/NetSfPeopsOpenGLPluginConfigController.h
@@ -0,0 +1,60 @@
+/* NetSfPeopsSoftGPUPluginConfigController */
+/* All the various stuff needed for configuration is done here, including reading 
+   the preferences and displaying a dialog box for the user
+*/
+
+#define PluginConfigController NetSfPeopsOpenGLPluginConfigController
+
+#import <Cocoa/Cocoa.h>
+
+@interface NetSfPeopsOpenGLPluginConfigController : NSWindowController
+{
+    // buncha controls.
+    // most aren't worthy as IBOutlets since the IB interface
+    // uses bindings to magically set user defaults.
+    // But you can look at their grandness if you like:
+    
+    IBOutlet NSControl *autoFullScreen;
+    IBOutlet NSPopUpButton *ditherMode;
+    IBOutlet NSControl *fpsCounter;
+    IBOutlet NSControl *frameSkipping;
+    IBOutlet NSControl *hackEnable;
+    IBOutlet NSView *hacksView;
+    IBOutlet NSControl *vSync;
+    
+    IBOutlet NSControl *proportionalResize;
+	IBOutlet NSPopUpButton *windowSize;
+    IBOutlet NSPopUpButton *fullscreenSize;
+    IBOutlet NSPopUpButton *offscreenDrawing;
+    
+    IBOutlet NSPopUpButton *texColorDepth;
+    IBOutlet NSSlider *texFiltering;
+    IBOutlet NSSlider *texEnhancment;
+    
+    IBOutlet NSPopUpButton *frameBufferEffects;
+
+
+    IBOutlet NSControl *drawScanlines;
+    IBOutlet NSControl *advancedBlending;
+    IBOutlet NSControl *opaquePass;
+    IBOutlet NSControl *zMaskClipping;
+    IBOutlet NSControl *wireframeOnly;
+    IBOutlet NSControl *blurEffect;
+    IBOutlet NSControl *mjpegDecoder;
+    IBOutlet NSControl *mjpegDecoder15bit;
+
+
+      
+	 NSMutableDictionary *keyValues;
+}
+- (IBAction)cancel:(id)sender;
+- (IBAction)ok:(id)sender;
+- (IBAction)reset:(id)sender;
+- (IBAction)hackToggle:(id)sender;
+
+- (void)loadValues;
+
+@end
+
+void PrepFactoryDefaultPreferences(void);
+
diff --git a/macosx/plugins/PeopsXgl/macsrc/NetSfPeopsOpenGLPluginConfigController.m b/macosx/plugins/PeopsXgl/macsrc/NetSfPeopsOpenGLPluginConfigController.m
new file mode 100644
index 00000000..781508be
--- /dev/null
+++ b/macosx/plugins/PeopsXgl/macsrc/NetSfPeopsOpenGLPluginConfigController.m
@@ -0,0 +1,348 @@
+
+/* All the various stuff needed for configuration is done here, 
+   including reading the Config file and displaying a dialog box
+   AboutDlgProc() is a plug-in function called from the PCSX app, as is
+   DlgProc()
+*/
+
+#import "NetSfPeopsOpenGLPluginConfigController.h"
+#include "gpu.h"
+#include "cfg.h"
+#include "menu.h"
+#include <OpenGL/gl.h> // bah, "externals.h" thinks include files are for wimps; OpenGL header, in fact, is needed
+#include "externals.h"
+
+#define APP_ID @"net.sf.peops.GpuOpenGLPlugin"
+#define PrefsKey APP_ID @" Settings"
+
+static NetSfPeopsOpenGLPluginConfigController *windowController;
+char * pConfigFile=NULL;
+
+void AboutDlgProc()
+{
+	// Get parent application instance
+	NSApplication *app = [NSApplication sharedApplication];
+	NSBundle *bundle = [NSBundle bundleWithIdentifier:APP_ID];
+
+	// Get Credits.rtf
+	NSString *path = [bundle pathForResource:@"Credits" ofType:@"rtf"];
+	NSAttributedString *credits;
+	if (path) {
+		credits = [[[NSAttributedString alloc] initWithPath: path
+				documentAttributes:NULL] autorelease];
+	} else {
+		credits = [[[NSAttributedString alloc] initWithString:@""] autorelease];
+	}
+	
+	// Get Application Icon
+	NSImage *icon = [[NSWorkspace sharedWorkspace] iconForFile:[bundle bundlePath]];
+	NSSize size = NSMakeSize(64, 64);
+	[icon setSize:size];
+		
+	[app orderFrontStandardAboutPanelWithOptions:[NSDictionary dictionaryWithObjectsAndKeys:
+			[bundle objectForInfoDictionaryKey:@"CFBundleName"], @"ApplicationName",
+			icon, @"ApplicationIcon",
+			[bundle objectForInfoDictionaryKey:@"CFBundleShortVersionString"], @"ApplicationVersion",
+			[bundle objectForInfoDictionaryKey:@"CFBundleVersion"], @"Version",
+			[bundle objectForInfoDictionaryKey:@"NSHumanReadableCopyright"], @"Copyright",
+			credits, @"Credits",
+			nil]];
+}
+
+
+void DlgProc()
+{
+	NSWindow *window;
+
+    PrepFactoryDefaultPreferences(); // Must do here to avoid a "when does such-and-such bind" issue
+	
+	if (windowController == nil) {
+		windowController = [[PluginConfigController alloc] initWithWindowNibName:@"NetSfPeopsOpenGLConfig"];
+	}
+	window = [windowController window];
+	
+	/* load values */
+	[windowController loadValues];
+	
+	[window center];
+	[window makeKeyAndOrderFront:nil];
+}
+
+
+void PrepFactoryDefaultPreferences(void)
+{
+    // THE place to find the names of settings.
+    // If it's not here, you can't set it.
+
+    // create or read a sub-dictionary beneath the main PCSX app prefs.
+    // dictionary is named "net.sf.GpuOpenGLPlugin Settings"
+    // and contains all our key/values
+    // the prefs .plist will store this dictionary ("net.sf...") as an object
+    
+	NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+
+    //tired of wasting time hacking around the "convenience" function
+    // of registerDefaults, so:
+    if ([defaults objectForKey:PrefsKey] == nil)
+    {
+    // just create default preferences and save them.
+
+    NSDictionary* defaultPrefs = 
+            [[NSDictionary alloc] initWithObjectsAndKeys:
+					[NSNumber numberWithBool:NO], @"FPS Counter",
+					[NSNumber numberWithBool:NO], @"Auto Full Screen",
+					[NSNumber numberWithBool:NO], @"Frame Skipping",
+					[NSNumber numberWithBool:YES], @"Frame Limit",
+					[NSNumber numberWithBool:NO], @"VSync",
+					[NSNumber numberWithBool:NO], @"Enable Hacks",
+					[NSNumber numberWithInt:0], @"Dither Mode",
+					[NSNumber numberWithLong:0], @"Hacks",
+                    
+                    [NSNumber numberWithBool:YES], @"Proportional Resize",
+//                    [NSSize stringWithCString: @"default"], @"Fullscreen Resolution",
+                    [NSNumber numberWithInt:2], @"Offscreen Drawing Level",
+                    [NSNumber numberWithInt:0], @"Texture Color Depth Level",
+                    [NSNumber numberWithInt:0], @"Texture Enhancement Level",
+                    [NSNumber numberWithInt:0], @"Texture Filter Level",
+                    [NSNumber numberWithInt:0], @"Frame Buffer Level",
+                    [NSNumber numberWithBool:NO], @"Draw Scanlines",
+                    // nasty:
+                    [NSArchiver archivedDataWithRootObject: [NSColor colorWithCalibratedRed:0  green:0 blue:0 alpha:0.25]], @"Scanline Color",
+                    [NSNumber numberWithBool:NO], @"Advanced Blending",
+                    [NSNumber numberWithBool:NO], @"Opaque Pass",
+                    [NSNumber numberWithBool:NO], @"Blur",
+                    [NSNumber numberWithBool:YES], @"Z Mask Clipping",
+                    [NSNumber numberWithBool:NO], @"Wireframe Mode",
+                    [NSNumber numberWithBool:YES], @"Emulate mjpeg decoder", // helps remove unsightly vertical line in movies
+                    [NSNumber numberWithBool:NO], @"Fast mjpeg decoder",
+					nil];
+            
+    [defaults setObject: defaultPrefs forKey:PrefsKey];
+    [defaults synchronize];
+    }
+    return;
+}
+
+void ReadConfig(void)
+{
+    // set up PCSX GPU plug's global variables according to user preferences.
+    // this is called from the PCSX GPU plugin thread via GPUOpen.
+    
+    // has nothing to do with the Configuration dialog box, btw., other than the
+    // fact that the config dialog writes to user prefs. This only reads, which
+    // is important because PCSX will change its globals on the fly
+    // and saving those new ad hoc changes is Bad for the user.
+    
+    PrepFactoryDefaultPreferences(); // in case user deletes, or on new startup
+
+//NOTE this is NOT the "keyValues" member of the controller. Just sayin.	
+    NSDictionary* keyValues = [[NSUserDefaults standardUserDefaults] dictionaryForKey:PrefsKey];
+
+
+    // bind all prefs settings to their PCSX counterparts
+    // with a little finagling to make it work as expected
+	iShowFPS = [[keyValues objectForKey:@"FPS Counter"] boolValue];
+    
+    if ([[keyValues objectForKey:@"Frame Limit"] boolValue]){
+        bUseFrameLimit = 1;
+        iFrameLimit = 2; // required
+        fFrameRate = 60; // required (some number, 60 seems ok)
+    }
+
+// Dithering is either on or off in OpenGL plug, but hey
+	bDrawDither = [[keyValues objectForKey:@"Dither Mode"] intValue];
+
+	bChangeWinMode = [[keyValues objectForKey:@"Auto Full Screen"] boolValue] ? 2 : 1;
+	bUseFrameSkip = [[keyValues objectForKey:@"Frame Skipping"] boolValue];
+
+	bUseFixes = [[keyValues objectForKey:@"Enable Hacks"] boolValue];
+	dwCfgFixes = [[keyValues objectForKey:@"Hacks"] longValue];
+    
+
+// we always start out at 800x600 (at least until resizing the window is implemented)
+	iResX = 800;
+	iResY = 600;
+
+    iBlurBuffer = [[keyValues objectForKey:@"Blur"] boolValue]; // not noticeable, but doesn't harm
+    iUseScanLines = [[keyValues objectForKey:@"Draw Scanlines"] boolValue]; // works
+    NSColor* scanColor = [NSUnarchiver unarchiveObjectWithData: [keyValues objectForKey:@"Scanline Color"]];
+    iScanlineColor[0] = [scanColor redComponent];
+    iScanlineColor[1] = [scanColor greenComponent];
+    iScanlineColor[2] = [scanColor blueComponent];
+    iScanlineColor[3] = [scanColor alphaComponent];
+    
+    iScanBlend = 0; // we always draw nice since it costs nothing.
+    iUseMask = [[keyValues objectForKey:@"Z Mask Clipping"] boolValue];  // works, clips polygons with primitive "Z" buffer
+    bUseLines = [[keyValues objectForKey:@"Wireframe Mode"] boolValue]; // works, aka "Wireframe" mode
+    iOffscreenDrawing = [[keyValues objectForKey:@"Offscreen Drawing Level"] intValue]; // draw offscreen for texture building?
+    if (iOffscreenDrawing > 4) iOffscreenDrawing = 4;
+    if (iOffscreenDrawing < 0) iOffscreenDrawing = 0;
+    
+
+// texture quality, whatever that means (doesn't hurt), more like "texture handling" or "texture performance"
+    iFrameTexType = [[keyValues objectForKey:@"Frame Buffer Level"] intValue];
+    if (iFrameTexType > 3) iFrameTexType = 3;
+    if (iFrameTexType < 0) iFrameTexType = 0;
+    
+    iTexQuality = [[keyValues objectForKey:@"Texture Color Depth Level"] intValue];
+    if (iTexQuality > 4) iTexQuality = 4;
+    if (iTexQuality < 0) iTexQuality = 0;
+
+// MAG_FILTER = LINEAR, etc.
+    iFilterType = [[keyValues objectForKey:@"Texture Filter Level"] intValue];
+    if (iFilterType > 2) iFilterType = 2;
+    if (iFilterType < 0) iFilterType = 0;
+    
+// stretches textures (more detail). You'd think it would look great, but it's not massively better. NEEDS iFilterType to be of any use.
+    iHiResTextures = [[keyValues objectForKey:@"Texture Enhancement Level"] intValue];
+    if (iHiResTextures > 2) iHiResTextures = 2;
+    if (iHiResTextures < 0) iHiResTextures = 0;
+    
+    // well actually, the "SaI" mode is best, but is #1, so swap qualities:
+    if (iHiResTextures != 0)
+        iHiResTextures = 3 - iHiResTextures;
+    
+    if (iHiResTextures && !iFilterType)
+        iFilterType = 1; // needed to see any real effect
+    
+    bUseFastMdec = [[keyValues objectForKey:@"Emulate mjpeg decoder"] boolValue];
+    bUse15bitMdec = [[keyValues objectForKey:@"Fast mjpeg decoder"] boolValue];
+    
+	
+	if (iShowFPS)
+		ulKeybits|=KEY_SHOWFPS;
+	else
+		ulKeybits&=~KEY_SHOWFPS;
+
+ // additional checks
+ if(!iColDepth)       iColDepth=32;
+#if 0 // was in SoftGPU, not in OpenGL
+ if(iUseFixes)        dwActFixes=dwCfgFixes;
+ else						 dwActFixes=0;
+#else
+    dwActFixes=0; // for now... TODO
+#endif
+
+
+ SetFixes();
+ 
+ // need this or you'll be playing at light speed:
+ if(iFrameLimit==2) SetAutoFrameCap();
+ bSkipNextFrame = FALSE;
+ 
+ szDispBuf[0]=0;
+ BuildDispMenu(0);
+}
+
+@implementation PluginConfigController
+
+- (IBAction)cancel:(id)sender
+{
+    //TODO: the IB bindings have already changed everything to what the
+    // user clicked on.
+    // Therefore, "backup" settings should be stored before interaction, 
+    // then restored here.
+    // IMO, 'cancel' is not needed since the config dialog doesn't launch
+    // an action when "ok" is clicked.
+	[self close];
+}
+
+- (IBAction)ok:(id)sender
+{
+
+// most everything is taken care of through bindings in Interface Builder.
+// note that the IB interface uses NSObjectController (a dict controller) as a proxy to
+// NSUserDefaultsController because NSUserDefaultsController can't
+// handle dictionaries. Yup, that's what I said. </snark>.
+
+	NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+   [defaults synchronize];
+
+// treat hacks specially:
+
+	unsigned long hackValues = 0;
+	int i;
+	NSArray *views = [hacksView subviews];
+	for (i=0; i<[views count]; i++) {
+	   NSView *control = [views objectAtIndex:i];
+		if ([control isKindOfClass:[NSButton class]]) {
+			hackValues |= [(NSControl *)control intValue] << ([control tag] - 1);
+		}
+	}
+	
+	keyValues = [NSMutableDictionary dictionaryWithDictionary: [[NSUserDefaults standardUserDefaults] dictionaryForKey:PrefsKey]];
+
+	NSMutableDictionary *writeDic = [NSMutableDictionary dictionaryWithDictionary:keyValues];
+	[writeDic setObject:[NSNumber numberWithLong:hackValues] forKey:@"Hacks"];
+	
+	// write the preferences with Hacks adjustments
+	[defaults setObject:writeDic forKey:PrefsKey];
+	[defaults synchronize];
+	
+	[self close];
+}
+
+- (IBAction)reset:(id)sender
+{
+	NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+	[defaults removeObjectForKey:PrefsKey];
+	[self loadValues];
+}
+
+- (IBAction)hackToggle:(id)sender
+{
+    // enable the "hacks" checkboxes 
+	BOOL enable = [sender intValue] ? YES : NO;
+	int i;
+	NSArray *views = [hacksView subviews];
+
+	for (i=0; i<[views count]; i++) {
+	   NSView *control = [views objectAtIndex:i];
+		if ([control isKindOfClass:[NSButton class]]) {
+			[(NSControl *)control setEnabled:enable];
+		}
+	}
+}
+
+- (void)loadValues
+{
+// set up the window with the values in the .plist
+
+// all preferences are bound in Interface Builder.
+// Though the "hacks settings" is controlled here because it disables/enables the list
+// and uses a bit mask
+
+// Note that in the .nib, an NSObjectController (aka "dict controller")
+// is used as a proxy to NSUserDefaults
+// because NSUserDefaults is slightly retarded about nested dictionaries
+// OK, "Completely" retarded.
+
+    PrepFactoryDefaultPreferences(); // in case we're starting anew
+
+	NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+
+	/* load from preferences */
+	keyValues = [NSMutableDictionary dictionaryWithDictionary: [defaults dictionaryForKey:PrefsKey]];
+
+	unsigned long hackValues = [[keyValues objectForKey:@"Hacks"] longValue];
+
+    // build refs to hacks checkboxes
+	int i;
+	NSArray *views = [hacksView subviews];
+	for (i=0; i<[views count]; i++) {
+	   NSView *control = [views objectAtIndex:i];
+		if ([control isKindOfClass:[NSButton class]]) {
+			[(NSControl *)control setIntValue:(hackValues >> ([control tag] - 1)) & 1];
+		}
+	}
+	
+	[self hackToggle:hackEnable];
+}
+
+- (void)awakeFromNib
+{
+	hacksView = [[hacksView subviews] objectAtIndex:0];
+    [[NSColorPanel sharedColorPanel] setShowsAlpha:YES]; // eliminate dumb behavior!
+}
+
+@end
diff --git a/macosx/plugins/PeopsXgl/macsrc/PluginGLView.h b/macosx/plugins/PeopsXgl/macsrc/PluginGLView.h
new file mode 100644
index 00000000..da780293
--- /dev/null
+++ b/macosx/plugins/PeopsXgl/macsrc/PluginGLView.h
@@ -0,0 +1,47 @@
+/***************************************************************************
+    PluginGLView.h -- a view within game window, rudimentary OpenGL setup + maintainence
+    PeopsOpenGPU
+  
+    Created by Gil Pedersen on Sun April 18 2004.
+    Copyright (c) 2004 Gil Pedersen.
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version. See also the license.txt file for *
+ *   additional informations.                                              *
+ *                                                                         *
+ ***************************************************************************/
+
+#define PluginGLView NetSfPeopsOpenGLGPUPluginGLView
+
+#import <Cocoa/Cocoa.h>
+#import <OpenGL/gl.h>
+#include <sys/time.h>
+
+#define IMAGE_COUNT  2
+
+@interface PluginGLView : NSOpenGLView
+{
+	struct timeval cycle_time;
+	
+	NSLock *glLock; // FIXME: wha?
+	BOOL noDisplay;
+	BOOL drawBG;
+
+}
+
+
+- (void)swapBuffer; // I wonder what this does ;-)
+
+// overrides:
+- (id) initWithCoder: (NSCoder *) coder;
+- (void)dealloc;
+- (BOOL)isOpaque;
+- (BOOL)acceptsFirstResponder;
+- (void)reshape;
+
+@end
diff --git a/macosx/plugins/PeopsXgl/macsrc/PluginGLView.m b/macosx/plugins/PeopsXgl/macsrc/PluginGLView.m
new file mode 100644
index 00000000..feb483a9
--- /dev/null
+++ b/macosx/plugins/PeopsXgl/macsrc/PluginGLView.m
@@ -0,0 +1,135 @@
+/***************************************************************************
+    PluginGLView.m
+    a view within game window, rudimentary OpenGL setup + maintainence
+    Also, I clear the gl screen with a beautiful yellow color for
+    debugging purposes.
+    
+    PeopsOpenGLGPU
+  
+    Created by Gil Pedersen on Sun April 18 2004.
+    Copyright (c) 2004 Gil Pedersen.
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version. See also the license.txt file for *
+ *   additional informations.                                              *
+ *                                                                         *
+ ***************************************************************************/
+
+#import <OpenGL/gl.h>
+#import <OpenGL/glext.h>
+#import <OpenGL/glu.h>
+//#import <GLUT/glut.h>
+//#import <Carbon/Carbon.h>
+#import "PluginGLView.h"
+#include "externals.h" // for PSXDisplay.disable -- should move it elsewhere really
+#undef BOOL
+
+@implementation PluginGLView
+
+- (BOOL)isOpaque {	return YES; } 
+- (BOOL)acceptsFirstResponder { return NO; }
+
+
+- (id) initWithCoder: (NSCoder *) coder
+{
+    // Set up pixel format on creation
+    // and, well, that's about it.
+    if ((self = [super initWithCoder:coder]) == nil)
+		return nil;
+
+	glLock = [[NSLock alloc] init];
+	if (nil == glLock) {
+		[self release];
+		return nil;
+	}
+
+	// Init pixel format attribs
+	NSOpenGLPixelFormatAttribute attrs[] =
+	{
+		NSOpenGLPFAAccelerated,
+		NSOpenGLPFANoRecovery,
+		NSOpenGLPFADoubleBuffer,
+//      NSOpenGLPFASampleBuffers, 1,  // For full screen AA when implemented
+//      NSOpenGLPFASamples, 2,
+		0
+	};
+
+	// Get pixel format from OpenGL
+	NSOpenGLPixelFormat* pixFmt = [[NSOpenGLPixelFormat alloc] initWithAttributes:attrs];
+	if (!pixFmt)
+	{
+		NSLog(@"No Accelerated OpenGL pixel format found\n");
+		
+		NSOpenGLPixelFormatAttribute attrs2[] =
+		{
+			NSOpenGLPFANoRecovery,
+			0
+		};
+
+		// Get pixel format from OpenGL
+		pixFmt = [[NSOpenGLPixelFormat alloc] initWithAttributes:attrs2];
+		if (!pixFmt) {
+			NSLog(@"No OpenGL pixel format found!\n");
+			
+			[self release];
+			return nil;
+		}
+	}
+	
+	[self setPixelFormat:[pixFmt autorelease]];
+
+	[[self openGLContext] makeCurrentContext];
+
+    // we're done, dude.
+
+	// Call for a redisplay
+	noDisplay = YES; // hm, this can be deleted I think
+	PSXDisplay.Disabled = 1;
+	[self setNeedsDisplay:true];
+	
+	return self;
+}
+
+- (void)dealloc
+{
+	[[self openGLContext] makeCurrentContext]; // just in case
+	[NSOpenGLContext clearCurrentContext];
+	[glLock release];
+	[super dealloc];
+}
+
+
+- (void)reshape	// scrolled, moved or resized
+{
+	[super reshape];
+    
+    [glLock lock];  // not sure if needed, but hey
+    [[self openGLContext] makeCurrentContext];
+    
+    NSRect rect = [self bounds];
+    rect.size = [self convertSize:rect.size toView:nil];
+    glViewport(0.0, 0.0, NSWidth(rect), NSHeight(rect));
+ 
+    glClearColor (1.0, 0.5, 0.0, 0.0);
+	glClear(GL_COLOR_BUFFER_BIT);
+   [[self openGLContext] flushBuffer];
+
+//    [NSOpenGLContext clearCurrentContext]; // this makes bad things happen, so screw it.
+	[glLock unlock];
+    return;
+}
+
+- (void)swapBuffer
+{
+    // actually not much to do here.
+	[[self openGLContext] flushBuffer];
+    return;
+ }
+
+
+@end
diff --git a/macosx/plugins/PeopsXgl/macsrc/PluginWindow.h b/macosx/plugins/PeopsXgl/macsrc/PluginWindow.h
new file mode 100644
index 00000000..06a75546
--- /dev/null
+++ b/macosx/plugins/PeopsXgl/macsrc/PluginWindow.h
@@ -0,0 +1,55 @@
+/***************************************************************************
+    PluginWindow.h - Specialization of the main game window (borderless)
+    PeopsSoftGPU
+  
+    Created by Gil Pedersen on Wed April 21 2004.
+    Copyright (c) 2004 Gil Pedersen.
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version. See also the license.txt file for *
+ *   additional informations.                                              *
+ *                                                                         *
+ ***************************************************************************/
+ 
+ /* this is a borderless window that can be dragged about. Also, holds a GLView */
+#import <Cocoa/Cocoa.h>
+#import <AppKit/NSMenu.h>
+
+@interface NetSfPeopsOpenGLGPUPluginWindow : NSWindow
+{
+    NSWindow* myParent; 
+    NSPoint initialLocation;
+}
+
+- (id) initWithContentRect: (NSRect) contentRect
+                 styleMask: (unsigned int) aStyle
+                   backing: (NSBackingStoreType) bufferingType
+                     defer: (BOOL) flag ;
+
+
+- (BOOL) canBecomeKeyWindow; // to stop the beeping
+
+- (void) sendEvent:(NSEvent *)theEvent;
+- (void) windowDidResize:(NSNotification*)notice;
+- (void) windowDidUpdate: (NSNotification*)notice;
+- (void) windowDidMove:(NSNotification *)notice;
+
+- (void) performClose: (id)sender;
+- (void) mouseDown:(NSEvent *)theEvent; 
+- (void) mouseDragged:(NSEvent *)theEvent;
+
+- (void)keyDown:(NSEvent *)theEvent;
+- (void)keyUp:(NSEvent *)theEvent;
+
+@end
+
+
+
+@interface NetSfPeopsOpenGLGPUPluginWindow (NSMenuValidation) 
+- (BOOL)validateMenuItem:(NSMenuItem*) item;
+@end
diff --git a/macosx/plugins/PeopsXgl/macsrc/PluginWindow.m b/macosx/plugins/PeopsXgl/macsrc/PluginWindow.m
new file mode 100644
index 00000000..feffedec
--- /dev/null
+++ b/macosx/plugins/PeopsXgl/macsrc/PluginWindow.m
@@ -0,0 +1,155 @@
+/***************************************************************************
+    PluginWindow.m
+    PeopsSoftGPU
+  
+    Created by Gil Pedersen on Wed April 21 2004.
+    Copyright (c) 2004 Gil Pedersen.
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version. See also the license.txt file for *
+ *   additional informations.                                              *
+ *                                                                         *
+ ***************************************************************************/
+
+#import "PluginWindow.h"
+@implementation NetSfPeopsOpenGLGPUPluginWindow
+/*
+- (BOOL)windowShouldClose:(id)sender
+{
+	[[NSNotificationCenter defaultCenter] postNotificationName:@"emuWindowDidClose" object:self];
+	
+	return YES;
+}*/
+
+- (void)sendEvent:(NSEvent *)theEvent
+{
+	int type = [theEvent type];
+	if (type == NSKeyDown || type == NSKeyUp) {
+		if (type == NSKeyDown && [theEvent keyCode] == 53 /* escape */) {
+			// reroute to menu event
+			[[NSApp mainMenu] performKeyEquivalent:theEvent];
+		}
+		
+		// ignore all key Events
+		return;
+	}
+
+	[super sendEvent:theEvent];
+}
+
+- (id) initWithContentRect: (NSRect) contentRect
+                 styleMask: (unsigned int) aStyle
+                   backing: (NSBackingStoreType) bufferingType
+                     defer: (BOOL) flag
+{
+    if (self = [super initWithContentRect: contentRect
+                                styleMask: NSBorderlessWindowMask
+                                  backing: bufferingType
+                                    defer: flag])
+    {
+    return self;
+    }
+
+    return nil;
+}
+
+
+
+- (void) windowDidResize:(NSNotification*)notice
+{
+}
+
+- (void) windowDidUpdate: (NSNotification*)notice
+{
+}
+
+- (void)windowDidMove:(NSNotification *)notification
+{
+
+}
+
+
+
+- (BOOL) canBecomeKeyWindow
+{
+    return YES;
+}
+
+- (void)keyDown:(NSEvent *)theEvent
+{
+}
+
+- (void)keyUp:(NSEvent *)theEvent
+{
+}
+
+
+- (BOOL)validateMenuItem:(NSMenuItem*) menuItem
+{
+//    SEL bleh = [menuItem action];
+//    NSLog(@"Validate: %@, action: %@", menuItem, NSStringFromSelector(bleh));
+    if ([menuItem action] == @selector(performClose:))
+        return YES;
+    
+    return NO;
+    
+}
+
+- (void) performClose: (id)sender
+{
+    if ([self delegate]){
+  //      NSLog(@"We have a delegate %@", [self delegate]);
+
+        if ([[self delegate] windowShouldClose:sender])
+            [super close];
+    }
+    else {
+        // hmm, just explode I guess
+        [super close];
+    }
+}
+
+- (void)mouseDown:(NSEvent *)theEvent {    
+
+    // Get the mouse location in window coordinates.
+    initialLocation = [theEvent locationInWindow];
+
+}
+
+ 
+
+/*
+
+ Once the user starts dragging the mouse, move the window with it. The window has no title bar for the user to drag (so we have to implement dragging ourselves)
+
+ */
+
+- (void)mouseDragged:(NSEvent *)theEvent {
+
+    NSRect screenVisibleFrame = [[NSScreen mainScreen] visibleFrame];
+    NSRect windowFrame = [self frame];
+    NSPoint newOrigin = windowFrame.origin;
+
+    // Get the mouse location in window coordinates.
+    NSPoint currentLocation = [theEvent locationInWindow];
+
+    // Update the origin with the difference between the new mouse location and the old mouse location.
+    newOrigin.x += (currentLocation.x - initialLocation.x);
+    newOrigin.y += (currentLocation.y - initialLocation.y);
+
+    // Don't let window get dragged up under the menu bar
+    if ((newOrigin.y + windowFrame.size.height) > (screenVisibleFrame.origin.y + screenVisibleFrame.size.height)) {
+        newOrigin.y = screenVisibleFrame.origin.y + (screenVisibleFrame.size.height - windowFrame.size.height);
+    }
+
+    // Move the window to the new location
+    [self setFrameOrigin:newOrigin];
+
+}
+
+@end
diff --git a/macosx/plugins/PeopsXgl/macsrc/PluginWindowController.h b/macosx/plugins/PeopsXgl/macsrc/PluginWindowController.h
new file mode 100644
index 00000000..8ead9fc6
--- /dev/null
+++ b/macosx/plugins/PeopsXgl/macsrc/PluginWindowController.h
@@ -0,0 +1,52 @@
+/***************************************************************************
+    PluginWindowController.h
+    The big bad boy that controls/creates the game window, the openGLView, and
+    communicates with PCSX itself
+    PeopsOpenGPU
+  
+    Created by Gil Pedersen on Mon April 11 2004.
+    Copyright (c) 2004 Gil Pedersen.
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version. See also the license.txt file for *
+ *   additional informations.                                              *
+ *                                                                         *
+ ***************************************************************************/
+
+/*
+    In truth, this controller should be the ONLY place that glues between the 
+    running PCSX gpu and the mac interface. 
+    ATM, some of the glue is here, some of it in drawgl.m, and a couple
+    of bits are in the config controller...
+*/
+
+#define PluginWindowController NetSfPeopsOpenGLGPUPluginWindowController
+
+#import <Cocoa/Cocoa.h>
+#import "PluginGLView.h"
+
+@class PluginWindowController;
+
+extern NSWindow *gameWindow;
+extern PluginWindowController *gameController;
+
+@interface PluginWindowController : NSWindowController
+{
+    IBOutlet NSOpenGLView *glView;
+	 
+	// NSWindow *fullWindow;
+    bool inFullscreen;
+}
+
++ (id)openGameView;
+- (PluginGLView *)getOpenGLView;
+- (BOOL)fullscreen;
+- (void)setFullscreen:(BOOL)flag;
+- (void)performFullscreenSwap;
+- (void)cureAllIlls;
+@end
diff --git a/macosx/plugins/PeopsXgl/macsrc/PluginWindowController.m b/macosx/plugins/PeopsXgl/macsrc/PluginWindowController.m
new file mode 100644
index 00000000..1ff8c0ac
--- /dev/null
+++ b/macosx/plugins/PeopsXgl/macsrc/PluginWindowController.m
@@ -0,0 +1,302 @@
+/***************************************************************************
+    PluginWindowController.m
+    The big bad boy that controls/creates the game window, the openGLView, and
+    communicates with PCSX itself
+    
+    PeopsOpenGPU
+  
+    Created by Gil Pedersen on Tue April 12 2004.
+    Copyright (c) 2004 Gil Pedersen.
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version. See also the license.txt file for *
+ *   additional informations.                                              *
+ *                                                                         *
+ ***************************************************************************/
+
+#import "PluginWindowController.h"
+#import "PluginWindow.h"
+#import "Carbon/Carbon.h"
+#include <OpenGL/gl.h> // OpenGL needed for "externals.h"
+#include "externals.h"
+#undef BOOL
+
+// not sure why these aren't class or instance variables...
+NSWindow *gameWindow;
+PluginWindowController *gameController;
+NSRect windowFrame;
+NSRect windowDefaultRect; // default window size (needed to go back into window mode)
+
+@implementation PluginWindowController
+
++ (id)openGameView
+{
+    // create a window for the GPU and return
+    // the controller that controls it
+
+	if (gameWindow == nil) {
+		if (gameController == nil) {
+			gameController = [[PluginWindowController alloc] initWithWindowNibName:@"NetSfPeopsOpenGLGPUInterface"];
+		}
+		gameWindow = [gameController window];
+	}
+    else {
+        NSLog(@"Well, we have a game window open already, which is kinda bad.");
+        abort(); 
+        return nil;
+    }
+    
+    [gameWindow setBackgroundColor: [NSColor blackColor]];
+
+    windowFrame.size.width=iResX;
+    windowFrame.size.height=iResY;
+    
+    
+	if (windowFrame.size.width != 0)
+		[gameWindow setFrame:windowFrame display:NO];
+        
+	[gameWindow center];
+    windowDefaultRect = [gameWindow frame];
+
+	[gameWindow makeKeyAndOrderFront:nil];
+	[gameController showWindow:nil];
+    NSOpenGLView*  glInstance = [gameController getOpenGLView];
+    [glInstance setFrameSize: windowDefaultRect.size];
+    [glInstance reshape];
+//    [glView update];
+   
+	CGDirectDisplayID display = (CGDirectDisplayID)[[[[gameWindow screen] deviceDescription] objectForKey:@"NSScreenNumber"] longValue];
+	if (CGDisplayIsCaptured(display)) {
+		[gameController setFullscreen:YES];
+	}
+	
+	return gameController;
+}
+
+- (PluginGLView *)getOpenGLView
+{
+	return (PluginGLView *)glView;
+}
+
+- (void) cureAllIlls
+{
+    // try to reset the GPU without discarding textures, etc.
+    // when a resize takes place, all hell breaks loose, so
+    // this is necessarily ugly.
+
+    // all this should be in draw.c, actually
+
+// needed, but I don't know what it's for...
+ rRatioRect.left   = rRatioRect.top=0;
+ rRatioRect.right  = iResX;
+ rRatioRect.bottom = iResY;
+
+ [[glView openGLContext] makeCurrentContext];
+
+ glFlush();
+ glFinish();
+ 
+ glViewport(rRatioRect.left,                           // init viewport by ratio rect
+            iResY-(rRatioRect.top+rRatioRect.bottom),
+            rRatioRect.right, 
+            rRatioRect.bottom);  
+ 
+ 
+ glScissor(0, 0, iResX, iResY);                        // init clipping (fullscreen)
+ glEnable(GL_SCISSOR_TEST);     
+ glMatrixMode(GL_PROJECTION);                          // init projection with psx resolution
+ glLoadIdentity();
+ glOrtho(0,PSXDisplay.DisplayMode.x,
+         PSXDisplay.DisplayMode.y, 0, -1, 1);
+
+ CreateScanLines();
+// if(bKeepRatio) SetAspectRatio();                      // set ratio
+ glFlush();
+ glFinish();
+
+ [NSOpenGLContext clearCurrentContext];
+
+ [glView reshape]; // to get rid of fuglies on screen
+// GLinitialize(); // blunt instrument method of setting a proper state.
+
+}
+
+- (void)dealloc
+{
+
+	windowFrame = [[self window] frame];
+	
+	[super dealloc];
+}
+
+// forget keyDownEvents
+- (void)keyDown:(NSEvent *)theEvent
+{
+	// Not required any more
+}
+
+- (void)mouseDown:(NSEvent *)theEvent
+{
+	if ([self fullscreen]) {
+		[self setFullscreen:NO];
+	}
+}
+
+- (BOOL)fullscreen
+{
+	return inFullscreen;
+}
+
+- (void)setFullscreen:(BOOL)flag
+{
+// this is called by cocoa, not the main PSX thread.
+// Messing with the opengl context is a Bad Thing.
+// Therefore, just set a global flag, and
+// wait around for a frame until
+// gpu.c calls fullscreenswap() from
+// the right thread
+
+    if ([self fullscreen] == flag)
+        return;
+        
+    if (flag)
+        bChangeWinMode = 2;
+    else
+        bChangeWinMode = 1;
+
+}
+
+- (void)performFullscreenSwap
+{
+    // ah, that's better. We are called from the main PSX thread
+    // after a screen update, so we're clean.
+    // bChangeWinMode is a global set from PSX
+    
+    int flag = bChangeWinMode - 1; // 1 = go to window, 2 = go to fullscreen
+    bChangeWinMode = 0; // this is our flag that launched us, so 0 now
+    
+	NSWindow *window = [self window];
+	NSScreen *screen = [window screen];
+
+    CGDirectDisplayID display = (CGDirectDisplayID)[[[screen deviceDescription] objectForKey:@"NSScreenNumber"] longValue];
+
+    NSRect newPlace;
+    
+    if (flag){
+        [window setLevel: NSScreenSaverWindowLevel];
+        newPlace = NSMakeRect(0,0,CGDisplayPixelsWide(display), CGDisplayPixelsHigh(display));
+		CGDisplayHideCursor(display);
+		CGAssociateMouseAndMouseCursorPosition(NO);
+    }
+    else{
+        [window setLevel: NSNormalWindowLevel];
+        newPlace = windowDefaultRect;
+		CGDisplayShowCursor(display);
+		CGAssociateMouseAndMouseCursorPosition(YES);
+    }
+    
+    
+    int proportionalWidth, proportionalHeight;
+    
+    [window setFrame:newPlace display:true];
+    
+    // assume square pixel ratio on the monitor
+    if ((newPlace.size.width*3)/4 <= newPlace.size.height) { // is window skinnier than it needs to be?
+        proportionalHeight = (newPlace.size.width*3)/4; // then shrink the content height (letterbox)
+        proportionalWidth = newPlace.size.width;        // and conform to width
+    } else {
+        proportionalWidth = (newPlace.size.height*4)/3;
+        proportionalHeight = newPlace.size.height;
+    }
+    NSRect fitToWindow = NSMakeRect(
+        (newPlace.size.width - proportionalWidth)/2, 
+        (newPlace.size.height - proportionalHeight)/2, 
+        proportionalWidth, proportionalHeight);
+        
+    [glView setFrame:fitToWindow];
+    [glView reshape];
+    iResX = proportionalWidth;
+    iResY = proportionalHeight;
+        
+    if (flag) inFullscreen = TRUE;
+    else inFullscreen = FALSE;
+
+    [self cureAllIlls]; // do some fixin'
+    return;
+
+}
+
+- (BOOL)windowShouldZoom:(NSWindow *)sender toFrame:(NSRect)newFrame
+{
+	[self setFullscreen:YES];
+	
+	return NO;
+}
+
+- (NSSize)windowWillResize:(NSWindow *)sender toSize:(NSSize)proposedFrameSize
+{
+    // we don't bother
+
+    return proposedFrameSize;
+        
+	if (!(([sender resizeFlags] & NSShiftKeyMask) == NSShiftKeyMask)) {
+		NSRect oldSize = [sender frame];
+		NSRect viewSize = [glView frame];
+		
+		float xDiff = NSWidth(oldSize) - NSWidth(viewSize);
+		float yDiff = NSHeight(oldSize) - NSHeight(viewSize);
+		
+		//if ((proposedFrameSize.height / proposedFrameSize.width) < (3.0/4.0))
+		//	proposedFrameSize.height = ((proposedFrameSize.width - xDiff) * 3.0) / 4.0 + yDiff;
+		//else
+			proposedFrameSize.width = ((proposedFrameSize.height - yDiff) * 4.0) / 3.0 + xDiff;
+	}
+	
+	return proposedFrameSize;
+}
+
+- (void)windowWillMiniaturize:(NSNotification *)aNotification
+{
+	[[NSNotificationCenter defaultCenter] postNotificationName:@"emuWindowWantPause" object:self];
+}
+
+- (void)windowDidDeminiaturize:(NSNotification *)aNotification
+{
+	[[NSNotificationCenter defaultCenter] postNotificationName:@"emuWindowWantResume" object:self];
+}
+
+//- (void)windowDidBecomeMain:(NSNotification *)aNotification
+/*- (void)windowDidBecomeKey:(NSNotification *)aNotification
+{
+	if (iWindowMode==0) {
+		[self setFullscreen:YES];
+	}
+}*/
+
+- (BOOL)windowShouldClose:(id)sender
+{
+/*	if (fullWindow) {
+		return NO;
+	}
+*/
+//    NSLog(@"windowShouldClose: We're closing the window");
+	[[NSNotificationCenter defaultCenter] postNotificationName:@"emuWindowDidClose" object:self];
+	[gameController autorelease];
+	gameController = nil;
+	gameWindow = nil;
+	
+	return YES;
+}
+
+@end
+
+void ChangeWindowMode(void)
+{
+    // glue from PSX thread. Globals are already set
+   [ gameController performFullscreenSwap];
+}
diff --git a/macosx/plugins/PeopsXgl/macsrc/drawgl.m b/macosx/plugins/PeopsXgl/macsrc/drawgl.m
new file mode 100644
index 00000000..91c7ecbf
--- /dev/null
+++ b/macosx/plugins/PeopsXgl/macsrc/drawgl.m
@@ -0,0 +1,234 @@
+/***************************************************************************
+    drawgl.m
+    an odd set of functions that seem misplaced ATM.
+    presumably this is the glue to the C GPU plugin stuff
+    but a much better place might be "PluginWindowController.m" as
+    gluing is what a controller is made for.
+    
+    PeopsOpenGPU
+  
+    Created by Gil Pedersen on Sun April 18 2004.
+    Copyright (c) 2004 Gil Pedersen.
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version. See also the license.txt file for *
+ *   additional informations.                                              *
+ *                                                                         *
+ ***************************************************************************/
+
+#import "PluginWindowController.h"
+#import "PluginGLView.h"
+#include "ExtendedKeys.h"
+#include "externals.h"
+#include "draw.h"
+#include "gpu.h"
+#include "menu.h"
+
+////////////////////////////////////////////////////////////////////////////////////
+// misc globals
+////////////////////////////////////////////////////////////////////////////////////
+#if 0 // globals for OpenGL (vs. SoftGPU) are owned by others... weird
+int            iResX;
+int            iResY;
+long           lLowerpart;
+BOOL           bIsFirstFrame = TRUE;
+BOOL           bCheckMask=FALSE;
+unsigned short sSetMask=0;
+/* unsigned long  lSetMask=0; */
+uint32_t        sSetMassk=0;
+int            iDesktopCol=16;
+int            iShowFPS=0;
+int            iWinSize; 
+int            iUseScanLines=0;
+int            iUseNoStretchBlt=0;
+int            iFastFwd=0;
+int            iDebugMode=0;
+int            iFVDisplay=0;
+PSXPoint_t     ptCursorPoint[8];
+unsigned short usCursorActive=0;
+char *			Xpixels;
+char *         pCaptionText;
+#endif
+
+
+extern BOOL    bCheckMask;
+extern BOOL    bIsFirstFrame;
+extern int     iShowFPS;
+extern unsigned short sSetMask;
+extern int     iUseScanLines;
+extern unsigned short usCursorActive;
+
+
+
+int            iResX;
+int            iResY;
+long           lLowerpart;
+
+uint32_t        sSetMassk=0;
+int            iDesktopCol=16;
+int            iWinSize; 
+int            iUseNoStretchBlt=0;
+int            iFastFwd=0;
+int            iDebugMode=0;
+int            iFVDisplay=0;
+PSXPoint_t     ptCursorPoint[8];
+char *			Xpixels;
+char *         pCaptionText;
+
+
+
+
+//static PluginWindowController *windowController;
+// static is BAD NEWS if user uses other plug ins
+PluginGLView *glView;
+
+////////////////////////////////////////////////////////////////////////
+
+void DoBufferSwap(void)                                // SWAP BUFFERS
+{
+#if 1
+	[glView swapBuffer];
+#else
+	static long long lastTickCount = -1;
+	static int skipCount = 0;
+	long long microTickCount;
+	long deltaTime;
+	
+	Microseconds((struct UnsignedWide *)&microTickCount);
+	deltaTime = (long)(microTickCount - lastTickCount);
+	if (deltaTime <= (PSXDisplay.PAL ? 1000000/50 : 100000000 / 5994) ||
+		 skipCount >= 3) {
+		skipCount = 0;
+		[glView swapBuffer];
+	} else {
+		skipCount++;
+	}
+	NSLog(@"count: %i", deltaTime); 
+	lastTickCount = microTickCount;
+#endif
+}
+
+
+////////////////////////////////////////////////////////////////////////
+
+void DoClearScreenBuffer(void)                         // CLEAR DX BUFFER
+{
+	// clear the screen, and DON'T flush it
+	[glView clearBuffer:NO];
+}
+
+
+////////////////////////////////////////////////////////////////////////
+
+void DoClearFrontBuffer(void)                          // CLEAR DX BUFFER
+{
+	// clear the screen, and flush it
+	[glView clearBuffer:YES];
+}
+
+////////////////////////////////////////////////////////////////////////
+
+unsigned long ulInitDisplay(void)	// OPEN GAME WINDOW
+{
+	bUsingTWin=FALSE;                          
+
+//	InitMenu(); // This function does nothing 
+
+	bIsFirstFrame = FALSE;
+
+	if(iShowFPS)
+	{
+		//iShowFPS=0;
+		ulKeybits|=KEY_SHOWFPS;
+		szDispBuf[0]=0;
+		BuildDispMenu(0);
+	}
+	
+	PluginWindowController *windowController = [PluginWindowController openGameView];
+	glView = [windowController getOpenGLView];
+	
+	[[windowController window] setTitle:[NSString stringWithCString:pCaptionText]];
+	
+	return (unsigned long)[windowController window];
+}
+
+
+////////////////////////////////////////////////////////////////////////
+
+void CloseDisplay(void)
+{
+	if (gameController) {
+		[gameController close];
+		[gameController release];
+		gameController = nil;
+		gameWindow = nil;
+	}
+}
+
+void BringContextForward(void)
+{
+    [[glView openGLContext] makeCurrentContext];
+}
+
+void SendContextBack(void)
+{
+    [NSOpenGLContext clearCurrentContext];
+}
+
+void SetVSync(long myValue)
+{
+    long DoItMyFriend = myValue;
+   [[glView openGLContext] setValues: &DoItMyFriend forParameter: NSOpenGLCPSwapInterval];
+
+}
+////////////////////////////////////////////////////////////////////////
+
+/* taken care of in menu.c
+void CreatePic(unsigned char * pMem)
+{
+}
+*/
+
+///////////////////////////////////////////////////////////////////////////////////////
+
+/* taken care of in menu.c
+void DestroyPic(void)
+{
+}
+*/
+
+///////////////////////////////////////////////////////////////////////////////////////
+/* taken care of in menu.c
+void DisplayPic(void)
+{
+}
+*/
+
+///////////////////////////////////////////////////////////////////////////////////////
+
+void ShowGpuPic(void)
+{
+	// this is the default implementation...
+}
+
+///////////////////////////////////////////////////////////////////////////////////////
+
+void ShowTextGpuPic(void)
+{
+	// this is the default implementation...
+}
+
+
+void HandleKey(int keycode)
+{
+	switch (keycode) {
+		case GPU_FULLSCREEN_KEY:
+			[gameController setFullscreen:![gameController fullscreen]];
+			break;
+	}
+}
diff --git a/plugins/peopsxgl/draw.c b/plugins/peopsxgl/draw.c
index 32dcc83b..748824a1 100644
--- a/plugins/peopsxgl/draw.c
+++ b/plugins/peopsxgl/draw.c
@@ -27,6 +27,11 @@
 #include "texture.h"

 #include "menu.h"

 

+#if defined(_MACGL)

+// if you use it, you must include it

+#include <OpenGL/gl.h>

+#include <OpenGL/glext.h>

+#endif

 ////////////////////////////////////////////////////////////////////////////////////

 // defines

 

@@ -125,9 +130,13 @@ BOOL               bGLExt;
 BOOL               bGLFastMovie=FALSE;

 BOOL               bGLSoft;

 BOOL               bGLBlend;

+#if defined (_MACGL) // always supported on OSX > 10.4.3

+#define glBlendEquationEXTEx glBlendEquationEXT

+#define glColorTableEXTEx glColorTableEXT

+#else

 PFNGLBLENDEQU      glBlendEquationEXTEx=NULL;

 PFNGLCOLORTABLEEXT glColorTableEXTEx=NULL;

-

+#endif

 // gfx card buffer infos

 

 int            iDepthFunc=0;

@@ -215,7 +224,9 @@ void GetExtInfos(void)
       iClampType=GL_TO_EDGE_CLAMP;

  else iClampType=GL_CLAMP;

 

+#if !defined (_MACGL) // OSX > 10.4.3 defines this

  glColorTableEXTEx=(PFNGLCOLORTABLEEXT)NULL;           // init ogl palette func pointer

+#endif

 

 #ifndef __sun

  if(iGPUHeight!=1024 &&                                // no pal textures in ZN mode (height=1024)! 

@@ -226,11 +237,14 @@ void GetExtInfos(void)
 

 #ifdef _WINDOWS

    glColorTableEXTEx=(PFNGLCOLORTABLEEXT)wglGetProcAddress("glColorTableEXT");

+#elif defined (_MACGL)

+    // no prob, done already in OSX > 10.4.3

 #else

    glColorTableEXTEx=(PFNGLCOLORTABLEEXT)glXGetProcAddress("glColorTableEXT");

 #endif

 

    if(glColorTableEXTEx==NULL) iUsePalTextures=0;      // -> ha, cheater... no func, no support

+

   }

  else iUsePalTextures=0;

 #else

@@ -261,13 +275,17 @@ void SetExtGLFuncs(void)
    if(wglSwapIntervalEXT) wglSwapIntervalEXT(iForceVSync);

   }

 #endif

-

+#ifdef _MACGL

+    SetVSync(iForceVSync);

+#endif

  if(iUseExts && !(dwActFixes&1024) &&                  // extensions wanted? and not turned off by game fix?

     strstr((char *)glGetString(GL_EXTENSIONS),         // and blend_subtract available?

     "GL_EXT_blend_subtract"))

      {                                                 // -> get ogl blend function pointer

 #ifdef _WINDOWS

       glBlendEquationEXTEx=(PFNGLBLENDEQU)wglGetProcAddress("glBlendEquationEXT");

+#elif defined(_MACGL)

+    // no prob, OSX > 10.4.3 has this

 #else

       glBlendEquationEXTEx=(PFNGLBLENDEQU)glXGetProcAddress("glBlendEquationEXT");

 #endif

@@ -276,7 +294,9 @@ void SetExtGLFuncs(void)
   {

    if(glBlendEquationEXTEx)                            // -> change to additive blending (if subract was active)

     glBlendEquationEXTEx(FUNC_ADD_EXT);

+#if !defined(_MACGL) // BTW, why set to null? strange...

    glBlendEquationEXTEx=(PFNGLBLENDEQU)NULL;           // -> no more blend function pointer

+#endif

   }

 

  //----------------------------------------------------//

@@ -501,8 +521,24 @@ void CreateScanLines(void)
     {

      uiScanLine=glGenLists(1);

      glNewList(uiScanLine,GL_COMPILE);

-

-     for(y=0;y<iResY;y+=2)

+     #ifdef _MACGL

+     	// not mac specific, just commenting out to be friendly

+     	// use it if you like

+     	// this draws anti-aliased lines with user-chosen color

+         glPushAttrib(GL_ENABLE_BIT | GL_COLOR_BUFFER_BIT | GL_CURRENT_BIT);

+             glEnable(GL_BLEND | GL_LINE_SMOOTH);

+             glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA);

+             glColor4f(iScanlineColor[0],iScanlineColor[1],iScanlineColor[2],iScanlineColor[3]);

+             glBegin(GL_LINES);

+                 for(y=0;y<iResY;y+=2)

+                  {

+                    glVertex2f(0,y);

+                    glVertex2f(iResX,y);

+                  }

+             glEnd();

+         glPopAttrib();

+	 #else

+	      for(y=0;y<iResY;y+=2)

       {

        glBegin(GL_QUADS);

          glVertex2f(0,y);

@@ -511,7 +547,9 @@ void CreateScanLines(void)
          glVertex2f(0,y+1);

        glEnd();

       }

-     glEndList();

+     

+    #endif

+    glEndList();

     }

   }

 }

@@ -536,7 +574,9 @@ int GLinitialize()
  // CheckWGLExtensions(dcGlobal);

  if(bWindowMode) ReleaseDC(hWWindow,dcGlobal);         // win mode: release dc again

 #endif

-

+#if defined (_MACGL)

+    BringContextForward();

+#endif

  glViewport(rRatioRect.left,                           // init viewport by ratio rect

             iResY-(rRatioRect.top+rRatioRect.bottom),

             rRatioRect.right, 

diff --git a/plugins/peopsxgl/externals.h b/plugins/peopsxgl/externals.h
index 02b1fdf1..0fa4ac9f 100644
--- a/plugins/peopsxgl/externals.h
+++ b/plugins/peopsxgl/externals.h
@@ -16,6 +16,12 @@
  *                                                                         *

  ***************************************************************************/

 

+#if defined (_MACGL)

+// if you use it, you must include it.

+#include <OpenGL/gl.h>

+#include <OpenGL/glext.h>

+#endif

+

 #define MIRROR_TEST 1

 #define SCISSOR_TEST 1

 

@@ -84,6 +90,7 @@
 #define TRUE  1

 #define BOOL unsigned short

 #define bool unsigned short

+

 #define LOWORD(l)           ((unsigned short)(l))

 #define HIWORD(l)           ((unsigned short)(((uint32_t)(l) >> 16) & 0xFFFF))

 #define max(a,b)            (((a) > (b)) ? (a) : (b))

@@ -222,8 +229,13 @@ extern BOOL           bGLFastMovie;
 extern BOOL           bGLSoft;

 extern BOOL           bGLBlend;

 

+#if !defined(_MACGL)

 extern PFNGLBLENDEQU      glBlendEquationEXTEx;

 extern PFNGLCOLORTABLEEXT glColorTableEXTEx;

+#else // no pointers for mac (OSX >= 10.4.3)

+#define glBlendEquationEXTEx glBlendEquationEXT

+#define glColorTableEXTEx glColorTableEXT

+#endif

 

 extern unsigned char  gl_ux[8];

 extern unsigned char  gl_vy[8];

@@ -372,6 +384,7 @@ extern BOOL           bNeedRGB24Update;
 extern BOOL           bChangeWinMode;

 extern GLuint         uiScanLine;

 extern int            iUseScanLines;

+extern float        iScanlineColor[]; /* 4 element array of RGBA float */

 extern int            lSelectedSlot;

 extern int            iScanBlend;

 extern BOOL           bInitCap;

diff --git a/plugins/peopsxgl/gpu.c b/plugins/peopsxgl/gpu.c
index beb11156..f379372b 100644
--- a/plugins/peopsxgl/gpu.c
+++ b/plugins/peopsxgl/gpu.c
@@ -142,6 +142,7 @@ short           imageY0,imageY1;
 BOOL            bDisplayNotSet = TRUE;

 GLuint          uiScanLine=0;

 int             iUseScanLines=0;

+float           iScanlineColor[] = {0,0,0, 0.3}; // easy on the eyes.

 int             lSelectedSlot=0;

 unsigned char * pGfxCardScreen=0;

 int             iBlurBuffer=0;

@@ -694,7 +695,7 @@ long CALLBACK GPUopen(HWND hwndGPU)
  return 0;

 }

 

-#else

+#elif !defined (_MACGL)

 

 ////////////////////////////////////////////////////////////////////////

 // LINUX GPU OPEN: func to open up the gpu display (X stuff)

@@ -999,6 +1000,14 @@ void sysdep_create_display(void)                       // create display
   }

 }

 

+#endif // !defined(_MACGL)

+

+#ifndef _WINDOWS

+

+#if defined(_MACGL)

+extern char * pCaptionText;

+#endif

+

 ////////////////////////////////////////////////////////////////////////

 

 long GPUopen(unsigned long * disp,char * CapText,char * CfgFile)

@@ -1012,8 +1021,12 @@ long GPUopen(unsigned long * disp,char * CapText,char * CfgFile)
 

  bIsFirstFrame = TRUE;                                 // we have to init later (well, no really... in Linux we do all in GPUopen)

 

+ #if defined (_MACGL)

+ unsigned long display = ulInitDisplay();

+ #else

  sysdep_create_display();                              // create display

-

+ #endif 

+ 

  InitializeTextureStore();                             // init texture mem

 

  rRatioRect.left   = rRatioRect.top=0;

@@ -1024,14 +1037,20 @@ long GPUopen(unsigned long * disp,char * CapText,char * CfgFile)
 

  if(disp)

   {

+  #if defined (_MACGL)

+  *disp = display;

+  #else

    *disp=(unsigned long *)display;                       // return display ID to main emu

+  #endif

   }

 

  if(display) return 0;

  return -1;

 }

 

-#endif

+#endif // ndef _WINDOWS

+

+

 

 ////////////////////////////////////////////////////////////////////////

 // close

@@ -1067,9 +1086,11 @@ long GPUclose()                                        // LINUX CLOSE
 

  if(pGfxCardScreen) free(pGfxCardScreen);              // free helper memory

  pGfxCardScreen=0;

-

+ #if defined (_MACGL)

+ CloseDisplay();

+ #else

  osd_close_display();                                  // destroy display

-

+ #endif

  return 0;

 }

 

@@ -1399,7 +1420,9 @@ void updateDisplay(void)                               // UPDATE DISPLAY
  HDC hdc=GetDC(hWWindow);                              // windows:

  wglMakeCurrent(hdc,GLCONTEXT);                        // -> make context current again

 #endif

-

+#if defined (_MACGL)

+    BringContextForward();

+#endif

  bFakeFrontBuffer=FALSE;

  bRenderFrontBuffer=FALSE;

 

@@ -1489,6 +1512,8 @@ void updateDisplay(void)                               // UPDATE DISPLAY
      if(iDrawnSomething)

 #ifdef _WINDOWS

       SwapBuffers(wglGetCurrentDC());                  // -> to skip or not to skip

+#elif defined(_MACGL)

+        DoBufferSwap();

 #else

       glXSwapBuffers(display,window);

 #endif

@@ -1506,6 +1531,8 @@ void updateDisplay(void)                               // UPDATE DISPLAY
    if(iDrawnSomething)

 #ifdef _WINDOWS

     SwapBuffers(wglGetCurrentDC());                    // -> swap

+#elif defined(_MACGL)

+    DoBufferSwap();

 #else

     glXSwapBuffers(display,window);

 #endif

@@ -1630,6 +1657,10 @@ void updateFrontDisplay(void)
     SwapBuffers(wglGetCurrentDC());                    // -> swap

    ReleaseDC(hWWindow,hdc);                            // -> ! important !

   }

+#elif defined (_MACGL)

+if (iDrawnSomething){

+    DoBufferSwap();

+    }

 #else

  if(iDrawnSomething)                                   // linux:

   glXSwapBuffers(display,window);

@@ -1964,7 +1995,7 @@ void CALLBACK GPUupdateLace(void)
    updateDisplay();

   }

 

-#ifdef _WINDOWS

+#if defined(_WINDOWS) || defined(_MACGL)

  if(bChangeWinMode) ChangeWindowMode();

 #endif

 }

@@ -2906,7 +2937,24 @@ void CALLBACK GPUwriteData(uint32_t gdata)
 // call config dlg

 ////////////////////////////////////////////////////////////////////////

 

-#ifndef _WINDOWS

+#ifdef _WINDOWS

+

+long CALLBACK GPUconfigure(void)

+{

+ HWND hWP=GetActiveWindow();

+ DialogBox(hInst,MAKEINTRESOURCE(IDD_CFGDLG),

+           hWP,(DLGPROC)CfgDlgProc);

+

+ return 0;

+}

+

+#elif defined(_MACGL)

+long CALLBACK GPUconfigure(void)

+{

+ DlgProc();

+   return 0;

+}

+#else

 

 void StartCfgTool(char *arg) // linux: start external cfg tool

 {

@@ -2949,18 +2997,7 @@ long CALLBACK GPUconfigure(void)
  return 0;

 }

 

-#else

-

-long CALLBACK GPUconfigure(void)

-{

- HWND hWP=GetActiveWindow();

- DialogBox(hInst,MAKEINTRESOURCE(IDD_CFGDLG),

-           hWP,(DLGPROC)CfgDlgProc);

-

- return 0;

-}

-

-#endif

+#endif // def _WINDOWS / _MACGL

 

 ////////////////////////////////////////////////////////////////////////

 // sets all kind of act fixes

@@ -3042,6 +3079,9 @@ void CALLBACK GPUabout(void)
  HWND hWP=GetActiveWindow();                           // to be sure

  DialogBox(hInst,MAKEINTRESOURCE(IDD_DIALOG_ABOUT),

            hWP,(DLGPROC)AboutDlgProc);

+#elif defined(_MACGL)

+

+    AboutDlgProc();

 #else

 

  StartCfgTool("ABOUT");

diff --git a/plugins/peopsxgl/key.c b/plugins/peopsxgl/key.c
index 25afa172..dba1c839 100644
--- a/plugins/peopsxgl/key.c
+++ b/plugins/peopsxgl/key.c
@@ -46,6 +46,7 @@ uint32_t   ulKeybits = 0;
 

 void GPUkeypressed(int keycode)

 {

+/* arrives via the input plugin, so who knows what thread you're in */

     switch(keycode)

      {

       case VK_F5:

@@ -78,6 +79,9 @@ void GPUkeypressed(int keycode)
       case VK_NEXT:  BuildDispMenu( 1);            break;

       case VK_END:   SwitchDispMenu( 1);           break;

       case VK_HOME:  SwitchDispMenu(-1);           break;

+#if defined (_MACGL)

+      default: { void HandleKey(int keycode); HandleKey(keycode); };

+#endif

      }

 

 }

diff --git a/po/fr_FR.po b/po/fr_FR.po
index a8c0519c..858341e2 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pcsxr 1.0\n"
 "Report-Msgid-Bugs-To: whistler_wmz@users.sf.net\n"
-"POT-Creation-Date: 2011-02-12 12:56+0800\n"
+"POT-Creation-Date: 2011-02-18 16:56+0800\n"
 "PO-Revision-Date: 2010-12-30 12:51+0100\n"
 "Last-Translator: Jean-André Santoni <jean.andre.santoni@gmail.com>\n"
 "Language-Team: French <jean.andre.santoni@gmail.com>\n"
@@ -66,7 +66,7 @@ msgstr "<b>Type de système</b>"
 msgid "Address (Hexadecimal):"
 msgstr "Adresse (Hexadécimal) :"
 
-#: ../data/pcsx.glade2.h:14 ../win32/gui/WndMain.c:1301
+#: ../data/pcsx.glade2.h:14 ../win32/gui/WndMain.c:1302
 msgid "Autodetect"
 msgstr "Autodétection"
 
@@ -186,11 +186,11 @@ msgstr "Quitter"
 msgid "Edit Cheat Codes"
 msgstr "Modifier les codes"
 
-#: ../data/pcsx.glade2.h:44 ../win32/gui/WndMain.c:1303
+#: ../data/pcsx.glade2.h:44 ../win32/gui/WndMain.c:1304
 msgid "Enable Console Output"
 msgstr "Activer la sortie console"
 
-#: ../data/pcsx.glade2.h:45 ../win32/gui/WndMain.c:1304
+#: ../data/pcsx.glade2.h:45 ../win32/gui/WndMain.c:1305
 msgid "Enable Debugger"
 msgstr "Activer le débuggeur"
 
@@ -236,7 +236,7 @@ msgstr "Graphismes..."
 msgid "Graphics:"
 msgstr "Graphismes:"
 
-#: ../data/pcsx.glade2.h:60 ../win32/gui/WndMain.c:1307
+#: ../data/pcsx.glade2.h:60 ../win32/gui/WndMain.c:1308
 msgid "InuYasha Sengoku Battle Fix"
 msgstr ""
 
@@ -272,7 +272,7 @@ msgstr "Nouveau"
 msgid "PCSX"
 msgstr "PCSX"
 
-#: ../data/pcsx.glade2.h:69 ../win32/gui/WndMain.c:1306
+#: ../data/pcsx.glade2.h:69 ../win32/gui/WndMain.c:1307
 msgid "Parasite Eve 2, Vandal Hearts 1/2 Fix"
 msgstr ""
 
@@ -557,7 +557,7 @@ msgid "PCSX Cheat Code Files (*.cht)"
 msgstr "Codes de triche PCSX (*.cht)"
 
 #: ../gui/Cheat.c:321 ../gui/Gtk2Gui.c:446 ../gui/Gtk2Gui.c:587
-#: ../win32/gui/WndMain.c:1444 ../win32/gui/WndMain.c:1525
+#: ../win32/gui/WndMain.c:1445 ../win32/gui/WndMain.c:1526
 msgid "All Files"
 msgstr "Tous les fichiers"
 
@@ -729,14 +729,14 @@ msgstr "Le fichier n'est pas un exécutable PlayStation valide"
 msgid "CD ROM failed"
 msgstr "Plantage du CD ROM"
 
-#: ../gui/Gtk2Gui.c:508 ../gui/Gtk2Gui.c:649 ../win32/gui/WndMain.c:463
-#: ../win32/gui/WndMain.c:515 ../win32/gui/WndMain.c:584
+#: ../gui/Gtk2Gui.c:508 ../gui/Gtk2Gui.c:649 ../win32/gui/WndMain.c:464
+#: ../win32/gui/WndMain.c:516 ../win32/gui/WndMain.c:585
 #, c-format
 msgid "The CD does not appear to be a valid Playstation CD"
 msgstr "Ce CD n'est pas un CD de PlayStation valide"
 
-#: ../gui/Gtk2Gui.c:519 ../gui/Gtk2Gui.c:660 ../win32/gui/WndMain.c:473
-#: ../win32/gui/WndMain.c:525 ../win32/gui/WndMain.c:594
+#: ../gui/Gtk2Gui.c:519 ../gui/Gtk2Gui.c:660 ../win32/gui/WndMain.c:474
+#: ../win32/gui/WndMain.c:526 ../win32/gui/WndMain.c:595
 #, c-format
 msgid "Could not load CD-ROM!"
 msgstr "Impossible de charger le CD-ROM !"
@@ -844,50 +844,50 @@ msgstr "Impossible de charger le CD-ROM !\n"
 msgid "PSX emulator couldn't be initialized.\n"
 msgstr "L'émulateur PSX n'a pas pu être initialisé.\n"
 
-#: ../gui/MemcardDlg.c:56
+#: ../gui/MemcardDlg.c:60
 msgid "Icon"
 msgstr "Icone"
 
-#: ../gui/MemcardDlg.c:62 ../win32/gui/WndMain.c:748
+#: ../gui/MemcardDlg.c:66 ../win32/gui/WndMain.c:749
 msgid "Title"
 msgstr "Titre"
 
-#: ../gui/MemcardDlg.c:68 ../win32/gui/WndMain.c:754
+#: ../gui/MemcardDlg.c:72 ../win32/gui/WndMain.c:755
 msgid "Status"
 msgstr "Statut"
 
-#: ../gui/MemcardDlg.c:74
+#: ../gui/MemcardDlg.c:78
 msgid "ID"
 msgstr "ID"
 
-#: ../gui/MemcardDlg.c:80
+#: ../gui/MemcardDlg.c:84
 msgid "Name"
 msgstr "Nom"
 
-#: ../gui/MemcardDlg.c:155 ../gui/MemcardDlg.c:260 ../win32/gui/WndMain.c:959
+#: ../gui/MemcardDlg.c:192 ../gui/MemcardDlg.c:297 ../win32/gui/WndMain.c:960
 msgid "Deleted"
 msgstr "Supprimé"
 
-#: ../gui/MemcardDlg.c:157 ../gui/MemcardDlg.c:161 ../gui/MemcardDlg.c:262
-#: ../gui/MemcardDlg.c:266 ../win32/gui/WndMain.c:960
-#: ../win32/gui/WndMain.c:963
+#: ../gui/MemcardDlg.c:194 ../gui/MemcardDlg.c:198 ../gui/MemcardDlg.c:299
+#: ../gui/MemcardDlg.c:303 ../win32/gui/WndMain.c:961
+#: ../win32/gui/WndMain.c:964
 msgid "Free"
 msgstr "Libre"
 
-#: ../gui/MemcardDlg.c:159 ../gui/MemcardDlg.c:264 ../win32/gui/WndMain.c:962
+#: ../gui/MemcardDlg.c:196 ../gui/MemcardDlg.c:301 ../win32/gui/WndMain.c:963
 msgid "Used"
 msgstr "Utilisé"
 
 #. Ask for name of memory card
-#: ../gui/MemcardDlg.c:323
+#: ../gui/MemcardDlg.c:360
 msgid "Select A File"
 msgstr "Selectionner un fichier"
 
-#: ../gui/MemcardDlg.c:364
+#: ../gui/MemcardDlg.c:401
 msgid "Format this Memory Card?"
 msgstr "Formater cette carte mémoire ?"
 
-#: ../gui/MemcardDlg.c:366
+#: ../gui/MemcardDlg.c:403
 msgid ""
 "If you format the memory card, the card will be empty, and any existing data "
 "overwritten."
@@ -895,25 +895,25 @@ msgstr ""
 "Si vous formatez la carte mémoire, la carte sera vidée, et toute donnée "
 "existante perdue."
 
-#: ../gui/MemcardDlg.c:369
+#: ../gui/MemcardDlg.c:406
 msgid "Format card"
 msgstr "Formater la carte"
 
 #. Ask for name of new memory card
-#: ../gui/MemcardDlg.c:393
+#: ../gui/MemcardDlg.c:430
 msgid "Create a new Memory Card"
 msgstr "Créer une nouvelle carte"
 
-#: ../gui/MemcardDlg.c:402
+#: ../gui/MemcardDlg.c:439
 msgid "New Memory Card.mcd"
 msgstr "Nouvelle carte mémoire.mcd"
 
 #. No free slots available on the destination card
-#: ../gui/MemcardDlg.c:503
+#: ../gui/MemcardDlg.c:540
 msgid "No free space on memory card"
 msgstr "Pas d'emplacement libre sur la carte mémoire"
 
-#: ../gui/MemcardDlg.c:504
+#: ../gui/MemcardDlg.c:541
 msgid ""
 "There are no free slots available on the target memory card. Please delete a "
 "slot first."
@@ -921,7 +921,7 @@ msgstr ""
 "Il n'y a pas d'emplacement disponible sur la carte mémoire sélectionnée. Il "
 "faut d'abord libérer un emplacement."
 
-#: ../gui/MemcardDlg.c:667
+#: ../gui/MemcardDlg.c:704
 msgid "Memory Card Manager"
 msgstr "Gestionnaire de carte mémoire"
 
@@ -1268,7 +1268,7 @@ msgstr ""
 "Threadé - Plus rapide (Avec Cache)"
 
 #: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:24
-#: ../plugins/dfinput/dfinput.ui.h:8 ../win32/gui/WndMain.c:1309
+#: ../plugins/dfinput/dfinput.ui.h:8 ../win32/gui/WndMain.c:1310
 msgid "Options"
 msgstr "Options"
 
@@ -2384,7 +2384,7 @@ msgstr "À propos"
 #: ../win32/gui/AboutDlg.c:48 ../win32/gui/AboutDlg.c:52
 #: ../win32/gui/CheatDlg.c:69 ../win32/gui/CheatDlg.c:119
 #: ../win32/gui/ConfigurePlugins.c:483 ../win32/gui/ConfigurePlugins.c:614
-#: ../win32/gui/WndMain.c:1058 ../win32/gui/WndMain.c:1294
+#: ../win32/gui/WndMain.c:1059 ../win32/gui/WndMain.c:1295
 msgid "OK"
 msgstr "OK"
 
@@ -2404,7 +2404,7 @@ msgstr "Non"
 
 #: ../win32/gui/CheatDlg.c:70 ../win32/gui/CheatDlg.c:120
 #: ../win32/gui/ConfigurePlugins.c:484 ../win32/gui/ConfigurePlugins.c:615
-#: ../win32/gui/WndMain.c:1059 ../win32/gui/WndMain.c:1295
+#: ../win32/gui/WndMain.c:1060 ../win32/gui/WndMain.c:1296
 msgid "Cancel"
 msgstr "Annuler"
 
@@ -2626,22 +2626,22 @@ msgstr ""
 "NB : Le dossier du greffon de jeu en réseau doit être le même que pour les "
 "autres greffons."
 
-#: ../win32/gui/plugin.c:94 ../win32/gui/WndMain.c:322
+#: ../win32/gui/plugin.c:94 ../win32/gui/WndMain.c:323
 #, c-format
 msgid "*PCSX*: Saved State %d"
 msgstr "*PCSX*: État sauvé %d"
 
-#: ../win32/gui/plugin.c:95 ../win32/gui/WndMain.c:323
+#: ../win32/gui/plugin.c:95 ../win32/gui/WndMain.c:324
 #, c-format
 msgid "*PCSX*: Error Saving State %d"
 msgstr "*PCSX*: Erreur lors de la sauvegarde de l'état %d"
 
-#: ../win32/gui/plugin.c:111 ../win32/gui/WndMain.c:300
+#: ../win32/gui/plugin.c:111 ../win32/gui/WndMain.c:301
 #, c-format
 msgid "*PCSX*: Loaded State %d"
 msgstr "*PCSX*: État chargé %d"
 
-#: ../win32/gui/plugin.c:112 ../win32/gui/WndMain.c:301
+#: ../win32/gui/plugin.c:112 ../win32/gui/WndMain.c:302
 #, c-format
 msgid "*PCSX*: Error Loading State %d"
 msgstr "*PCSX*: Erreur lors du chargement de l'état %d"
@@ -2775,8 +2775,8 @@ msgstr "Allemand"
 msgid "Greek"
 msgstr "Grec"
 
-#: ../win32/gui/WndMain.c:81 ../win32/gui/WndMain.c:1658
-#: ../win32/gui/WndMain.c:1660
+#: ../win32/gui/WndMain.c:81 ../win32/gui/WndMain.c:1659
+#: ../win32/gui/WndMain.c:1661
 msgid "English"
 msgstr "Anglais"
 
@@ -2825,11 +2825,13 @@ msgid "Korean"
 msgstr "Koréen"
 
 #: ../win32/gui/WndMain.c:215
+#, fuzzy
 msgid ""
 "Usage: pcsx [options]\n"
 "\toptions:\n"
 "\t-nogui\t\tDon't open the GUI\n"
 "\t-psxout\t\tEnable PSX output\n"
+"\t-slowboot\t\tEnable BIOS logo\n"
 "\t-runcd\t\tRuns CD-ROM (requires -nogui)\n"
 "\t-cdfile FILE\tRuns a CD image file (requires -nogui)\n"
 "\t-help\t\tDisplay this message"
@@ -2842,324 +2844,324 @@ msgstr ""
 "\t-cdfile FILE\tLance une image CD (requière -nogui)\n"
 "\t-help\tAffiche ce message"
 
-#: ../win32/gui/WndMain.c:341 ../win32/gui/WndMain.c:387
+#: ../win32/gui/WndMain.c:342 ../win32/gui/WndMain.c:388
 msgid "PCSX State Format"
 msgstr "Format d'état PCSX"
 
-#: ../win32/gui/WndMain.c:368
+#: ../win32/gui/WndMain.c:369
 #, c-format
 msgid "*PCSX*: Loaded State %s"
 msgstr "*PCSX*: État chargé %s"
 
-#: ../win32/gui/WndMain.c:369
+#: ../win32/gui/WndMain.c:370
 #, c-format
 msgid "*PCSX*: Error Loading State %s"
 msgstr "*PCSX*: Erreur lors du chargement de l'état %s"
 
-#: ../win32/gui/WndMain.c:414
+#: ../win32/gui/WndMain.c:415
 #, c-format
 msgid "*PCSX*: Saved State %s"
 msgstr "*PCSX*: État %s sauvegardé"
 
-#: ../win32/gui/WndMain.c:415
+#: ../win32/gui/WndMain.c:416
 #, c-format
 msgid "*PCSX*: Error Saving State %s"
 msgstr "*PCSX*: Erreur lors de la sauvegarde de l'état %s"
 
-#: ../win32/gui/WndMain.c:483
+#: ../win32/gui/WndMain.c:484
 msgid "Running BIOS is not supported with Internal HLE Bios."
 msgstr "Le lancement du BIOS n'est pas supporté en mode Internal HLE BIOS."
 
-#: ../win32/gui/WndMain.c:760
+#: ../win32/gui/WndMain.c:761
 msgid "Game ID"
 msgstr "ID du jeu"
 
-#: ../win32/gui/WndMain.c:766
+#: ../win32/gui/WndMain.c:767
 msgid "Game"
 msgstr "Jeu"
 
-#: ../win32/gui/WndMain.c:948
+#: ../win32/gui/WndMain.c:949
 msgid "mid link block"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:951
+#: ../win32/gui/WndMain.c:952
 msgid "terminiting link block"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1056
+#: ../win32/gui/WndMain.c:1057
 msgid "Memcard Manager"
 msgstr "Gestionnaire de carte mémoire"
 
-#: ../win32/gui/WndMain.c:1060 ../win32/gui/WndMain.c:1063
+#: ../win32/gui/WndMain.c:1061 ../win32/gui/WndMain.c:1064
 msgid "Select Mcd"
 msgstr "Sélectionner une carte mémoire"
 
-#: ../win32/gui/WndMain.c:1061 ../win32/gui/WndMain.c:1064
+#: ../win32/gui/WndMain.c:1062 ../win32/gui/WndMain.c:1065
 msgid "Format Mcd"
 msgstr "Formater la carte mémoire"
 
-#: ../win32/gui/WndMain.c:1062 ../win32/gui/WndMain.c:1065
+#: ../win32/gui/WndMain.c:1063 ../win32/gui/WndMain.c:1066
 msgid "Reload Mcd"
 msgstr "Recharger la carte mémoire"
 
-#: ../win32/gui/WndMain.c:1066
+#: ../win32/gui/WndMain.c:1067
 msgid "-> Copy ->"
 msgstr "-> Copier ->"
 
-#: ../win32/gui/WndMain.c:1067
+#: ../win32/gui/WndMain.c:1068
 msgid "<- Copy <-"
 msgstr "<- Copier <-"
 
-#: ../win32/gui/WndMain.c:1068
+#: ../win32/gui/WndMain.c:1069
 msgid "Paste"
 msgstr "Coller"
 
-#: ../win32/gui/WndMain.c:1069
+#: ../win32/gui/WndMain.c:1070
 msgid "<- Un/Delete"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1070
+#: ../win32/gui/WndMain.c:1071
 msgid "Un/Delete ->"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1072
+#: ../win32/gui/WndMain.c:1073
 msgid "Memory Card 1"
 msgstr "Carte mémoire 1"
 
-#: ../win32/gui/WndMain.c:1073
+#: ../win32/gui/WndMain.c:1074
 msgid "Memory Card 2"
 msgstr "Carte mémoire 2"
 
-#: ../win32/gui/WndMain.c:1128
+#: ../win32/gui/WndMain.c:1129
 msgid "Are you sure you want to paste this selection?"
 msgstr "Êtes-vous sûr de vouloir coller cette sélection ?"
 
-#: ../win32/gui/WndMain.c:1128 ../win32/gui/WndMain.c:1239
-#: ../win32/gui/WndMain.c:1246
+#: ../win32/gui/WndMain.c:1129 ../win32/gui/WndMain.c:1240
+#: ../win32/gui/WndMain.c:1247
 msgid "Confirmation"
 msgstr "Confirmation"
 
-#: ../win32/gui/WndMain.c:1239 ../win32/gui/WndMain.c:1246
+#: ../win32/gui/WndMain.c:1240 ../win32/gui/WndMain.c:1247
 msgid "Are you sure you want to format this Memory Card?"
 msgstr "Êtes vous sûr de vouloir formater cette carte mémoire ?"
 
-#: ../win32/gui/WndMain.c:1292
+#: ../win32/gui/WndMain.c:1293
 msgid "Cpu Config"
 msgstr "Configuration CPU"
 
-#: ../win32/gui/WndMain.c:1297
+#: ../win32/gui/WndMain.c:1298
 msgid "Disable Xa Decoding"
 msgstr "Désactiver le décodage XA"
 
-#: ../win32/gui/WndMain.c:1298
+#: ../win32/gui/WndMain.c:1299
 msgid "Sio Irq Always Enabled"
 msgstr "SIO IRQ toujours activé"
 
-#: ../win32/gui/WndMain.c:1299
+#: ../win32/gui/WndMain.c:1300
 msgid "Black && White Movies"
 msgstr "Films en noir et blanc"
 
-#: ../win32/gui/WndMain.c:1300
+#: ../win32/gui/WndMain.c:1301
 msgid "Disable Cd audio"
 msgstr "Désactiver CD Audio"
 
-#: ../win32/gui/WndMain.c:1302
+#: ../win32/gui/WndMain.c:1303
 msgid "Enable Interpreter Cpu"
 msgstr "Activer l'interpréteur CPU"
 
-#: ../win32/gui/WndMain.c:1305
+#: ../win32/gui/WndMain.c:1306
 msgid "Spu Irq Always Enabled"
 msgstr "SPU IRQ toujours activé"
 
-#: ../win32/gui/WndMain.c:1310
+#: ../win32/gui/WndMain.c:1311
 msgid "Psx System Type"
 msgstr "Type de système PSX"
 
-#: ../win32/gui/WndMain.c:1414
+#: ../win32/gui/WndMain.c:1415
 msgid "Psx Mcd Format (*.mcr;*.mc;*.mem;*.vgs;*.mcd;*.gme;*.ddf)"
 msgstr "Format de carte mémoire PSX (*.mcr;*.mc;*.mem;*.vgs;*.mcd;*.gme;*.ddf)"
 
-#: ../win32/gui/WndMain.c:1419
+#: ../win32/gui/WndMain.c:1420
 msgid "Psx Memory Card (*.mcr;*.mc)"
 msgstr "Carte mémoire PSX (*.mcr;*.mc)"
 
-#: ../win32/gui/WndMain.c:1424
+#: ../win32/gui/WndMain.c:1425
 msgid "CVGS Memory Card (*.mem;*.vgs)"
 msgstr "Carte mémoire CVGS (*.mem;*.vgs)"
 
-#: ../win32/gui/WndMain.c:1429
+#: ../win32/gui/WndMain.c:1430
 msgid "Bleem Memory Card (*.mcd)"
 msgstr "Carte mémoire Bleem (*.mcd)"
 
-#: ../win32/gui/WndMain.c:1434
+#: ../win32/gui/WndMain.c:1435
 msgid "DexDrive Memory Card (*.gme)"
 msgstr "Carte mémoire DexDrive (*.gme)"
 
-#: ../win32/gui/WndMain.c:1439
+#: ../win32/gui/WndMain.c:1440
 msgid "DataDeck Memory Card (*.ddf)"
 msgstr "Carte mémoire DataDeck (*.ddf)"
 
-#: ../win32/gui/WndMain.c:1483
+#: ../win32/gui/WndMain.c:1484
 msgid "Psx Exe Format"
 msgstr "Format EXE PSX"
 
-#: ../win32/gui/WndMain.c:1520
+#: ../win32/gui/WndMain.c:1521
 msgid "Psx Isos (*.iso;*.mdf;*.img;*.bin)"
 msgstr "ISOs PSX (*.iso;*.mdf;*.img;*.bin)"
 
-#: ../win32/gui/WndMain.c:1596
+#: ../win32/gui/WndMain.c:1597
 msgid "&File"
 msgstr "&Fichier"
 
-#: ../win32/gui/WndMain.c:1597
+#: ../win32/gui/WndMain.c:1598
 msgid "E&xit"
 msgstr "Quitter"
 
-#: ../win32/gui/WndMain.c:1599
+#: ../win32/gui/WndMain.c:1600
 msgid "Run &EXE..."
 msgstr "Lancer un EXE..."
 
-#: ../win32/gui/WndMain.c:1600
+#: ../win32/gui/WndMain.c:1601
 msgid "Run &BIOS"
 msgstr "Lancer le BIOS"
 
-#: ../win32/gui/WndMain.c:1601
+#: ../win32/gui/WndMain.c:1602
 msgid "Run &ISO..."
 msgstr "Lancer un ISO..."
 
-#: ../win32/gui/WndMain.c:1602
+#: ../win32/gui/WndMain.c:1603
 msgid "Run &CD"
 msgstr "Lancer à partir du CD"
 
-#: ../win32/gui/WndMain.c:1604
+#: ../win32/gui/WndMain.c:1605
 msgid "&Emulator"
 msgstr "Émulateur"
 
-#: ../win32/gui/WndMain.c:1605
+#: ../win32/gui/WndMain.c:1606
 msgid "&States"
 msgstr "États"
 
-#: ../win32/gui/WndMain.c:1607
+#: ../win32/gui/WndMain.c:1608
 msgid "S&witch ISO..."
 msgstr "Changer d'ISO..."
 
-#: ../win32/gui/WndMain.c:1609
+#: ../win32/gui/WndMain.c:1610
 msgid "Re&set"
 msgstr "&Reset"
 
-#: ../win32/gui/WndMain.c:1610
+#: ../win32/gui/WndMain.c:1611
 msgid "&Run"
 msgstr "&Lancer"
 
-#: ../win32/gui/WndMain.c:1611
+#: ../win32/gui/WndMain.c:1612
 msgid "&Save"
 msgstr "&Sauvegarder"
 
-#: ../win32/gui/WndMain.c:1612
+#: ../win32/gui/WndMain.c:1613
 msgid "&Load"
 msgstr "&Charger"
 
-#: ../win32/gui/WndMain.c:1613 ../win32/gui/WndMain.c:1623
+#: ../win32/gui/WndMain.c:1614 ../win32/gui/WndMain.c:1624
 msgid "&Other..."
 msgstr "&Autre..."
 
-#: ../win32/gui/WndMain.c:1614 ../win32/gui/WndMain.c:1624
+#: ../win32/gui/WndMain.c:1615 ../win32/gui/WndMain.c:1625
 msgid "Slot &9"
 msgstr "Emplacement &9"
 
-#: ../win32/gui/WndMain.c:1615 ../win32/gui/WndMain.c:1625
+#: ../win32/gui/WndMain.c:1616 ../win32/gui/WndMain.c:1626
 msgid "Slot &8"
 msgstr "Emplacement &8"
 
-#: ../win32/gui/WndMain.c:1616 ../win32/gui/WndMain.c:1626
+#: ../win32/gui/WndMain.c:1617 ../win32/gui/WndMain.c:1627
 msgid "Slot &7"
 msgstr "Emplacement &7"
 
-#: ../win32/gui/WndMain.c:1617 ../win32/gui/WndMain.c:1627
+#: ../win32/gui/WndMain.c:1618 ../win32/gui/WndMain.c:1628
 msgid "Slot &6"
 msgstr "Emplacement &6"
 
-#: ../win32/gui/WndMain.c:1618 ../win32/gui/WndMain.c:1628
+#: ../win32/gui/WndMain.c:1619 ../win32/gui/WndMain.c:1629
 msgid "Slot &5"
 msgstr "Emplacement &5"
 
-#: ../win32/gui/WndMain.c:1619 ../win32/gui/WndMain.c:1629
+#: ../win32/gui/WndMain.c:1620 ../win32/gui/WndMain.c:1630
 msgid "Slot &4"
 msgstr "Emplacement &4"
 
-#: ../win32/gui/WndMain.c:1620 ../win32/gui/WndMain.c:1630
+#: ../win32/gui/WndMain.c:1621 ../win32/gui/WndMain.c:1631
 msgid "Slot &3"
 msgstr "Emplacement &3"
 
-#: ../win32/gui/WndMain.c:1621 ../win32/gui/WndMain.c:1631
+#: ../win32/gui/WndMain.c:1622 ../win32/gui/WndMain.c:1632
 msgid "Slot &2"
 msgstr "Emplacement &2"
 
-#: ../win32/gui/WndMain.c:1622 ../win32/gui/WndMain.c:1632
+#: ../win32/gui/WndMain.c:1623 ../win32/gui/WndMain.c:1633
 msgid "Slot &1"
 msgstr "Emplacement &1"
 
-#: ../win32/gui/WndMain.c:1634
+#: ../win32/gui/WndMain.c:1635
 msgid "&Configuration"
 msgstr "&Configuration"
 
-#: ../win32/gui/WndMain.c:1635
+#: ../win32/gui/WndMain.c:1636
 msgid "Cheat &Search..."
 msgstr "&Recherche de codes..."
 
-#: ../win32/gui/WndMain.c:1636
+#: ../win32/gui/WndMain.c:1637
 msgid "Ch&eat Code..."
 msgstr "Cod&es de triche..."
 
-#: ../win32/gui/WndMain.c:1639
+#: ../win32/gui/WndMain.c:1640
 msgid "&Language"
 msgstr "&Langue"
 
-#: ../win32/gui/WndMain.c:1664
+#: ../win32/gui/WndMain.c:1665
 msgid "&Memory cards..."
 msgstr "Cartes &Mémoires..."
 
-#: ../win32/gui/WndMain.c:1665
+#: ../win32/gui/WndMain.c:1666
 msgid "C&PU..."
 msgstr "C&PU..."
 
-#: ../win32/gui/WndMain.c:1667
+#: ../win32/gui/WndMain.c:1668
 msgid "&NetPlay..."
 msgstr "&Jeu en réseau..."
 
-#: ../win32/gui/WndMain.c:1669
+#: ../win32/gui/WndMain.c:1670
 msgid "&Controllers..."
 msgstr "&Contrôleurs..."
 
-#: ../win32/gui/WndMain.c:1670
+#: ../win32/gui/WndMain.c:1671
 msgid "CD-&ROM..."
 msgstr "CD-&ROM..."
 
-#: ../win32/gui/WndMain.c:1671
+#: ../win32/gui/WndMain.c:1672
 msgid "&Sound..."
 msgstr "&Son..."
 
-#: ../win32/gui/WndMain.c:1672
+#: ../win32/gui/WndMain.c:1673
 msgid "&Graphics..."
 msgstr "&Graphismes..."
 
-#: ../win32/gui/WndMain.c:1674
+#: ../win32/gui/WndMain.c:1675
 msgid "&Plugins && Bios..."
 msgstr "&Greffons && BIOS..."
 
-#: ../win32/gui/WndMain.c:1676
+#: ../win32/gui/WndMain.c:1677
 msgid "&Help"
 msgstr "&Aide"
 
-#: ../win32/gui/WndMain.c:1677
+#: ../win32/gui/WndMain.c:1678
 msgid "&About..."
 msgstr "À propos..."
 
-#: ../win32/gui/WndMain.c:1865
+#: ../win32/gui/WndMain.c:1866
 msgid "Pcsx Msg"
 msgstr "Message PCSX"
 
-#: ../win32/gui/WndMain.c:1868
+#: ../win32/gui/WndMain.c:1869
 msgid "Error Loading Symbol"
 msgstr "Erreur au chargement du symbole"
 
diff --git a/po/hu_HU.po b/po/hu_HU.po
index 55867c10..2e921dea 100644
--- a/po/hu_HU.po
+++ b/po/hu_HU.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pcsxr 1.0\n"
 "Report-Msgid-Bugs-To: whistler_wmz@users.sf.net\n"
-"POT-Creation-Date: 2011-02-12 12:56+0800\n"
+"POT-Creation-Date: 2011-02-18 16:56+0800\n"
 "PO-Revision-Date: 2011-02-08 15:14+0100\n"
 "Last-Translator: Delirious <delirious@freemail.hu>\n"
 "Language-Team: Delirious <delirious@freemail.hu>\n"
@@ -67,7 +67,7 @@ msgstr "<b>Rendszer típus</b>"
 msgid "Address (Hexadecimal):"
 msgstr "Címzés (hexadecimális):"
 
-#: ../data/pcsx.glade2.h:14 ../win32/gui/WndMain.c:1301
+#: ../data/pcsx.glade2.h:14 ../win32/gui/WndMain.c:1302
 msgid "Autodetect"
 msgstr "Automatikus észlelés"
 
@@ -187,11 +187,11 @@ msgstr "E_xit"
 msgid "Edit Cheat Codes"
 msgstr "Csalás kódok szerkesztése"
 
-#: ../data/pcsx.glade2.h:44 ../win32/gui/WndMain.c:1303
+#: ../data/pcsx.glade2.h:44 ../win32/gui/WndMain.c:1304
 msgid "Enable Console Output"
 msgstr "Konzol kimenet bekapcsolása"
 
-#: ../data/pcsx.glade2.h:45 ../win32/gui/WndMain.c:1304
+#: ../data/pcsx.glade2.h:45 ../win32/gui/WndMain.c:1305
 msgid "Enable Debugger"
 msgstr "Hibakereső bekapcsolása"
 
@@ -238,7 +238,7 @@ msgstr "Kép..."
 msgid "Graphics:"
 msgstr "Kép:"
 
-#: ../data/pcsx.glade2.h:60 ../win32/gui/WndMain.c:1307
+#: ../data/pcsx.glade2.h:60 ../win32/gui/WndMain.c:1308
 msgid "InuYasha Sengoku Battle Fix"
 msgstr "InuYasha Sengoku Battle javítás"
 
@@ -274,7 +274,7 @@ msgstr "Új"
 msgid "PCSX"
 msgstr "PCSX"
 
-#: ../data/pcsx.glade2.h:69 ../win32/gui/WndMain.c:1306
+#: ../data/pcsx.glade2.h:69 ../win32/gui/WndMain.c:1307
 msgid "Parasite Eve 2, Vandal Hearts 1/2 Fix"
 msgstr "Parasite Eve 2, Vandal Hearts 1/2 javítás"
 
@@ -572,7 +572,7 @@ msgid "PCSX Cheat Code Files (*.cht)"
 msgstr "PCSX csalás kód fájlok (*.cht)"
 
 #: ../gui/Cheat.c:321 ../gui/Gtk2Gui.c:446 ../gui/Gtk2Gui.c:587
-#: ../win32/gui/WndMain.c:1444 ../win32/gui/WndMain.c:1525
+#: ../win32/gui/WndMain.c:1445 ../win32/gui/WndMain.c:1526
 msgid "All Files"
 msgstr "Minden fájl"
 
@@ -744,14 +744,14 @@ msgstr "A fájl nem tűnik PlayStation futtatható fájlnak"
 msgid "CD ROM failed"
 msgstr "CD ROM hiba"
 
-#: ../gui/Gtk2Gui.c:508 ../gui/Gtk2Gui.c:649 ../win32/gui/WndMain.c:463
-#: ../win32/gui/WndMain.c:515 ../win32/gui/WndMain.c:584
+#: ../gui/Gtk2Gui.c:508 ../gui/Gtk2Gui.c:649 ../win32/gui/WndMain.c:464
+#: ../win32/gui/WndMain.c:516 ../win32/gui/WndMain.c:585
 #, c-format
 msgid "The CD does not appear to be a valid Playstation CD"
 msgstr "Úgy tűnik a CD lemez nem PlayStation CD formátum"
 
-#: ../gui/Gtk2Gui.c:519 ../gui/Gtk2Gui.c:660 ../win32/gui/WndMain.c:473
-#: ../win32/gui/WndMain.c:525 ../win32/gui/WndMain.c:594
+#: ../gui/Gtk2Gui.c:519 ../gui/Gtk2Gui.c:660 ../win32/gui/WndMain.c:474
+#: ../win32/gui/WndMain.c:526 ../win32/gui/WndMain.c:595
 #, c-format
 msgid "Could not load CD-ROM!"
 msgstr "CD-ROM betöltése sikertelen!"
@@ -858,50 +858,50 @@ msgstr "CD-ROM nem tölthető be!\n"
 msgid "PSX emulator couldn't be initialized.\n"
 msgstr "PSX emulátor incializálása sikertelen.\n"
 
-#: ../gui/MemcardDlg.c:56
+#: ../gui/MemcardDlg.c:60
 msgid "Icon"
 msgstr "Ikon"
 
-#: ../gui/MemcardDlg.c:62 ../win32/gui/WndMain.c:748
+#: ../gui/MemcardDlg.c:66 ../win32/gui/WndMain.c:749
 msgid "Title"
 msgstr "Cím"
 
-#: ../gui/MemcardDlg.c:68 ../win32/gui/WndMain.c:754
+#: ../gui/MemcardDlg.c:72 ../win32/gui/WndMain.c:755
 msgid "Status"
 msgstr "Állapot"
 
-#: ../gui/MemcardDlg.c:74
+#: ../gui/MemcardDlg.c:78
 msgid "ID"
 msgstr "Azonosító"
 
-#: ../gui/MemcardDlg.c:80
+#: ../gui/MemcardDlg.c:84
 msgid "Name"
 msgstr "Név"
 
-#: ../gui/MemcardDlg.c:155 ../gui/MemcardDlg.c:260 ../win32/gui/WndMain.c:959
+#: ../gui/MemcardDlg.c:192 ../gui/MemcardDlg.c:297 ../win32/gui/WndMain.c:960
 msgid "Deleted"
 msgstr "Törölve"
 
-#: ../gui/MemcardDlg.c:157 ../gui/MemcardDlg.c:161 ../gui/MemcardDlg.c:262
-#: ../gui/MemcardDlg.c:266 ../win32/gui/WndMain.c:960
-#: ../win32/gui/WndMain.c:963
+#: ../gui/MemcardDlg.c:194 ../gui/MemcardDlg.c:198 ../gui/MemcardDlg.c:299
+#: ../gui/MemcardDlg.c:303 ../win32/gui/WndMain.c:961
+#: ../win32/gui/WndMain.c:964
 msgid "Free"
 msgstr "Üres"
 
-#: ../gui/MemcardDlg.c:159 ../gui/MemcardDlg.c:264 ../win32/gui/WndMain.c:962
+#: ../gui/MemcardDlg.c:196 ../gui/MemcardDlg.c:301 ../win32/gui/WndMain.c:963
 msgid "Used"
 msgstr "Foglalt"
 
 #. Ask for name of memory card
-#: ../gui/MemcardDlg.c:323
+#: ../gui/MemcardDlg.c:360
 msgid "Select A File"
 msgstr "Fájl választás"
 
-#: ../gui/MemcardDlg.c:364
+#: ../gui/MemcardDlg.c:401
 msgid "Format this Memory Card?"
 msgstr "Formázod a memória kártyát?"
 
-#: ../gui/MemcardDlg.c:366
+#: ../gui/MemcardDlg.c:403
 msgid ""
 "If you format the memory card, the card will be empty, and any existing data "
 "overwritten."
@@ -909,32 +909,32 @@ msgstr ""
 "Ha leformázod a memória kártyát, akkor a kártya üres lesz és minden meglévő "
 "adat el fog veszni."
 
-#: ../gui/MemcardDlg.c:369
+#: ../gui/MemcardDlg.c:406
 msgid "Format card"
 msgstr "Kártya formázása"
 
 #. Ask for name of new memory card
-#: ../gui/MemcardDlg.c:393
+#: ../gui/MemcardDlg.c:430
 msgid "Create a new Memory Card"
 msgstr "Új memória kártya létrehozása"
 
-#: ../gui/MemcardDlg.c:402
+#: ../gui/MemcardDlg.c:439
 msgid "New Memory Card.mcd"
 msgstr "Új memória kártya.mcd"
 
 #. No free slots available on the destination card
-#: ../gui/MemcardDlg.c:503
+#: ../gui/MemcardDlg.c:540
 msgid "No free space on memory card"
 msgstr "Nincs szabad hely a memória kártyán"
 
-#: ../gui/MemcardDlg.c:504
+#: ../gui/MemcardDlg.c:541
 msgid ""
 "There are no free slots available on the target memory card. Please delete a "
 "slot first."
 msgstr ""
 "Nincs szabad mentési blokk a cél memória kártyán. Először törölj egy blokkot."
 
-#: ../gui/MemcardDlg.c:667
+#: ../gui/MemcardDlg.c:704
 msgid "Memory Card Manager"
 msgstr "Memória kártya intéző"
 
@@ -1283,7 +1283,7 @@ msgstr ""
 "Szálanként - Gyorsabb (gyorsítótárral)"
 
 #: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:24
-#: ../plugins/dfinput/dfinput.ui.h:8 ../win32/gui/WndMain.c:1309
+#: ../plugins/dfinput/dfinput.ui.h:8 ../win32/gui/WndMain.c:1310
 msgid "Options"
 msgstr "Lehetőségek"
 
@@ -2379,7 +2379,7 @@ msgstr "A program névjegye"
 #: ../win32/gui/AboutDlg.c:48 ../win32/gui/AboutDlg.c:52
 #: ../win32/gui/CheatDlg.c:69 ../win32/gui/CheatDlg.c:119
 #: ../win32/gui/ConfigurePlugins.c:483 ../win32/gui/ConfigurePlugins.c:614
-#: ../win32/gui/WndMain.c:1058 ../win32/gui/WndMain.c:1294
+#: ../win32/gui/WndMain.c:1059 ../win32/gui/WndMain.c:1295
 msgid "OK"
 msgstr "Rendben"
 
@@ -2399,7 +2399,7 @@ msgstr "Nem"
 
 #: ../win32/gui/CheatDlg.c:70 ../win32/gui/CheatDlg.c:120
 #: ../win32/gui/ConfigurePlugins.c:484 ../win32/gui/ConfigurePlugins.c:615
-#: ../win32/gui/WndMain.c:1059 ../win32/gui/WndMain.c:1295
+#: ../win32/gui/WndMain.c:1060 ../win32/gui/WndMain.c:1296
 msgid "Cancel"
 msgstr "Mégsem"
 
@@ -2620,22 +2620,22 @@ msgid ""
 msgstr ""
 "Megjegyzés: A NetPlay plugin könyvtár azonos a többi plugin könyvtárával."
 
-#: ../win32/gui/plugin.c:94 ../win32/gui/WndMain.c:322
+#: ../win32/gui/plugin.c:94 ../win32/gui/WndMain.c:323
 #, c-format
 msgid "*PCSX*: Saved State %d"
 msgstr "*PCSX*: Elmentett állás %d"
 
-#: ../win32/gui/plugin.c:95 ../win32/gui/WndMain.c:323
+#: ../win32/gui/plugin.c:95 ../win32/gui/WndMain.c:324
 #, c-format
 msgid "*PCSX*: Error Saving State %d"
 msgstr "*PCSX*: Hiba az állás mentése közben %d"
 
-#: ../win32/gui/plugin.c:111 ../win32/gui/WndMain.c:300
+#: ../win32/gui/plugin.c:111 ../win32/gui/WndMain.c:301
 #, c-format
 msgid "*PCSX*: Loaded State %d"
 msgstr "*PCSX*: Betöltött elmentett állás %d"
 
-#: ../win32/gui/plugin.c:112 ../win32/gui/WndMain.c:301
+#: ../win32/gui/plugin.c:112 ../win32/gui/WndMain.c:302
 #, c-format
 msgid "*PCSX*: Error Loading State %d"
 msgstr "*PCSX*: Hiba a mentett állás betöltése közben %d"
@@ -2769,8 +2769,8 @@ msgstr "Német"
 msgid "Greek"
 msgstr "Görög"
 
-#: ../win32/gui/WndMain.c:81 ../win32/gui/WndMain.c:1658
-#: ../win32/gui/WndMain.c:1660
+#: ../win32/gui/WndMain.c:81 ../win32/gui/WndMain.c:1659
+#: ../win32/gui/WndMain.c:1661
 msgid "English"
 msgstr "Angol"
 
@@ -2819,11 +2819,13 @@ msgid "Korean"
 msgstr "Koreai"
 
 #: ../win32/gui/WndMain.c:215
+#, fuzzy
 msgid ""
 "Usage: pcsx [options]\n"
 "\toptions:\n"
 "\t-nogui\t\tDon't open the GUI\n"
 "\t-psxout\t\tEnable PSX output\n"
+"\t-slowboot\t\tEnable BIOS logo\n"
 "\t-runcd\t\tRuns CD-ROM (requires -nogui)\n"
 "\t-cdfile FILE\tRuns a CD image file (requires -nogui)\n"
 "\t-help\t\tDisplay this message"
@@ -2836,324 +2838,324 @@ msgstr ""
 "\t-cdfile FILE\tCD képfájl futtatása (-nogui szükséges)\n"
 "\t-help\t\tAz üzenet megjelenítése"
 
-#: ../win32/gui/WndMain.c:341 ../win32/gui/WndMain.c:387
+#: ../win32/gui/WndMain.c:342 ../win32/gui/WndMain.c:388
 msgid "PCSX State Format"
 msgstr "PCSX állás mentés formátum"
 
-#: ../win32/gui/WndMain.c:368
+#: ../win32/gui/WndMain.c:369
 #, c-format
 msgid "*PCSX*: Loaded State %s"
 msgstr "*PCSX*: Betöltött állás %s"
 
-#: ../win32/gui/WndMain.c:369
+#: ../win32/gui/WndMain.c:370
 #, c-format
 msgid "*PCSX*: Error Loading State %s"
 msgstr "*PCSX*: Hiba a mentett állás betöltése közben %s"
 
-#: ../win32/gui/WndMain.c:414
+#: ../win32/gui/WndMain.c:415
 #, c-format
 msgid "*PCSX*: Saved State %s"
 msgstr "*PCSX*: Mentett állás %s"
 
-#: ../win32/gui/WndMain.c:415
+#: ../win32/gui/WndMain.c:416
 #, c-format
 msgid "*PCSX*: Error Saving State %s"
 msgstr "*PCSX*: Hiba az állás mentése közben %s"
 
-#: ../win32/gui/WndMain.c:483
+#: ../win32/gui/WndMain.c:484
 msgid "Running BIOS is not supported with Internal HLE Bios."
 msgstr "BIOS használata nem támogatott belső HLE Bios esetén."
 
-#: ../win32/gui/WndMain.c:760
+#: ../win32/gui/WndMain.c:761
 msgid "Game ID"
 msgstr "Játék azonosító"
 
-#: ../win32/gui/WndMain.c:766
+#: ../win32/gui/WndMain.c:767
 msgid "Game"
 msgstr "Játék"
 
-#: ../win32/gui/WndMain.c:948
+#: ../win32/gui/WndMain.c:949
 msgid "mid link block"
 msgstr "mid link block"
 
-#: ../win32/gui/WndMain.c:951
+#: ../win32/gui/WndMain.c:952
 msgid "terminiting link block"
 msgstr "link block megszakítása"
 
-#: ../win32/gui/WndMain.c:1056
+#: ../win32/gui/WndMain.c:1057
 msgid "Memcard Manager"
 msgstr "Memória kártya kezelő"
 
-#: ../win32/gui/WndMain.c:1060 ../win32/gui/WndMain.c:1063
+#: ../win32/gui/WndMain.c:1061 ../win32/gui/WndMain.c:1064
 msgid "Select Mcd"
 msgstr "Választás"
 
-#: ../win32/gui/WndMain.c:1061 ../win32/gui/WndMain.c:1064
+#: ../win32/gui/WndMain.c:1062 ../win32/gui/WndMain.c:1065
 msgid "Format Mcd"
 msgstr "Formázás"
 
-#: ../win32/gui/WndMain.c:1062 ../win32/gui/WndMain.c:1065
+#: ../win32/gui/WndMain.c:1063 ../win32/gui/WndMain.c:1066
 msgid "Reload Mcd"
 msgstr "Újratöltés"
 
-#: ../win32/gui/WndMain.c:1066
+#: ../win32/gui/WndMain.c:1067
 msgid "-> Copy ->"
 msgstr "-> Másolás ->"
 
-#: ../win32/gui/WndMain.c:1067
+#: ../win32/gui/WndMain.c:1068
 msgid "<- Copy <-"
 msgstr "<- Másolás <-"
 
-#: ../win32/gui/WndMain.c:1068
+#: ../win32/gui/WndMain.c:1069
 msgid "Paste"
 msgstr "Beszúrás"
 
-#: ../win32/gui/WndMain.c:1069
+#: ../win32/gui/WndMain.c:1070
 msgid "<- Un/Delete"
 msgstr "<- Nem/törlés"
 
-#: ../win32/gui/WndMain.c:1070
+#: ../win32/gui/WndMain.c:1071
 msgid "Un/Delete ->"
 msgstr "Nem/törlés ->"
 
-#: ../win32/gui/WndMain.c:1072
+#: ../win32/gui/WndMain.c:1073
 msgid "Memory Card 1"
 msgstr "Memória kártya 1"
 
-#: ../win32/gui/WndMain.c:1073
+#: ../win32/gui/WndMain.c:1074
 msgid "Memory Card 2"
 msgstr "Memória kártya 2"
 
-#: ../win32/gui/WndMain.c:1128
+#: ../win32/gui/WndMain.c:1129
 msgid "Are you sure you want to paste this selection?"
 msgstr "Valóban be akarod szúrni a kijelölést?"
 
-#: ../win32/gui/WndMain.c:1128 ../win32/gui/WndMain.c:1239
-#: ../win32/gui/WndMain.c:1246
+#: ../win32/gui/WndMain.c:1129 ../win32/gui/WndMain.c:1240
+#: ../win32/gui/WndMain.c:1247
 msgid "Confirmation"
 msgstr "Megerősítés"
 
-#: ../win32/gui/WndMain.c:1239 ../win32/gui/WndMain.c:1246
+#: ../win32/gui/WndMain.c:1240 ../win32/gui/WndMain.c:1247
 msgid "Are you sure you want to format this Memory Card?"
 msgstr "Valóban le kívánod formázni ezt a Memória kártyát?"
 
-#: ../win32/gui/WndMain.c:1292
+#: ../win32/gui/WndMain.c:1293
 msgid "Cpu Config"
 msgstr "Processzor beállítás"
 
-#: ../win32/gui/WndMain.c:1297
+#: ../win32/gui/WndMain.c:1298
 msgid "Disable Xa Decoding"
 msgstr "Xa kódolás kikapcsolása"
 
-#: ../win32/gui/WndMain.c:1298
+#: ../win32/gui/WndMain.c:1299
 msgid "Sio Irq Always Enabled"
 msgstr "Sio IRQ mindig bekapcsolva"
 
-#: ../win32/gui/WndMain.c:1299
+#: ../win32/gui/WndMain.c:1300
 msgid "Black && White Movies"
 msgstr "Fekete &fehér videók"
 
-#: ../win32/gui/WndMain.c:1300
+#: ../win32/gui/WndMain.c:1301
 msgid "Disable Cd audio"
 msgstr "CD hang kikapcsolása"
 
-#: ../win32/gui/WndMain.c:1302
+#: ../win32/gui/WndMain.c:1303
 msgid "Enable Interpreter Cpu"
 msgstr "Processzor interpretáló rutin bekapcsolása"
 
-#: ../win32/gui/WndMain.c:1305
+#: ../win32/gui/WndMain.c:1306
 msgid "Spu Irq Always Enabled"
 msgstr "Hang IRQ mindig bekapcsolva"
 
-#: ../win32/gui/WndMain.c:1310
+#: ../win32/gui/WndMain.c:1311
 msgid "Psx System Type"
 msgstr "PSX régió"
 
-#: ../win32/gui/WndMain.c:1414
+#: ../win32/gui/WndMain.c:1415
 msgid "Psx Mcd Format (*.mcr;*.mc;*.mem;*.vgs;*.mcd;*.gme;*.ddf)"
 msgstr "Psx memória kártya formátum (*.mcr;*.mc;*.mem;*.vgs;*.mcd;*.gme;*.ddf)"
 
-#: ../win32/gui/WndMain.c:1419
+#: ../win32/gui/WndMain.c:1420
 msgid "Psx Memory Card (*.mcr;*.mc)"
 msgstr "Psx memória kártya (*.mcr;*.mc)"
 
-#: ../win32/gui/WndMain.c:1424
+#: ../win32/gui/WndMain.c:1425
 msgid "CVGS Memory Card (*.mem;*.vgs)"
 msgstr "CVSG memória kártya (*.mem;*.vgs)"
 
-#: ../win32/gui/WndMain.c:1429
+#: ../win32/gui/WndMain.c:1430
 msgid "Bleem Memory Card (*.mcd)"
 msgstr "Bleem memória kártya (*.mcd)"
 
-#: ../win32/gui/WndMain.c:1434
+#: ../win32/gui/WndMain.c:1435
 msgid "DexDrive Memory Card (*.gme)"
 msgstr "DexDrive memória kártya (*.gme)"
 
-#: ../win32/gui/WndMain.c:1439
+#: ../win32/gui/WndMain.c:1440
 msgid "DataDeck Memory Card (*.ddf)"
 msgstr "DataDeck memória kártya (*.ddf)"
 
-#: ../win32/gui/WndMain.c:1483
+#: ../win32/gui/WndMain.c:1484
 msgid "Psx Exe Format"
 msgstr "Psx exe formátum"
 
-#: ../win32/gui/WndMain.c:1520
+#: ../win32/gui/WndMain.c:1521
 msgid "Psx Isos (*.iso;*.mdf;*.img;*.bin)"
 msgstr "Psx képfájlok (*.iso;*.mdf;*.img;*.bin)"
 
-#: ../win32/gui/WndMain.c:1596
+#: ../win32/gui/WndMain.c:1597
 msgid "&File"
 msgstr "&Fájl"
 
-#: ../win32/gui/WndMain.c:1597
+#: ../win32/gui/WndMain.c:1598
 msgid "E&xit"
 msgstr "K&ilépés"
 
-#: ../win32/gui/WndMain.c:1599
+#: ../win32/gui/WndMain.c:1600
 msgid "Run &EXE..."
 msgstr "&EXE indítása..."
 
-#: ../win32/gui/WndMain.c:1600
+#: ../win32/gui/WndMain.c:1601
 msgid "Run &BIOS"
 msgstr "&BIOS indítása"
 
-#: ../win32/gui/WndMain.c:1601
+#: ../win32/gui/WndMain.c:1602
 msgid "Run &ISO..."
 msgstr "&ISO megnyitása..."
 
-#: ../win32/gui/WndMain.c:1602
+#: ../win32/gui/WndMain.c:1603
 msgid "Run &CD"
 msgstr "&CD indítása"
 
-#: ../win32/gui/WndMain.c:1604
+#: ../win32/gui/WndMain.c:1605
 msgid "&Emulator"
 msgstr "&Emulátor"
 
-#: ../win32/gui/WndMain.c:1605
+#: ../win32/gui/WndMain.c:1606
 msgid "&States"
 msgstr "&Állapot"
 
-#: ../win32/gui/WndMain.c:1607
+#: ../win32/gui/WndMain.c:1608
 msgid "S&witch ISO..."
 msgstr "ISO v&áltás..."
 
-#: ../win32/gui/WndMain.c:1609
+#: ../win32/gui/WndMain.c:1610
 msgid "Re&set"
 msgstr "Al&apra állítás"
 
-#: ../win32/gui/WndMain.c:1610
+#: ../win32/gui/WndMain.c:1611
 msgid "&Run"
 msgstr "&Indítás"
 
-#: ../win32/gui/WndMain.c:1611
+#: ../win32/gui/WndMain.c:1612
 msgid "&Save"
 msgstr "&Mentés"
 
-#: ../win32/gui/WndMain.c:1612
+#: ../win32/gui/WndMain.c:1613
 msgid "&Load"
 msgstr "&Betöltés"
 
-#: ../win32/gui/WndMain.c:1613 ../win32/gui/WndMain.c:1623
+#: ../win32/gui/WndMain.c:1614 ../win32/gui/WndMain.c:1624
 msgid "&Other..."
 msgstr "&Más..."
 
-#: ../win32/gui/WndMain.c:1614 ../win32/gui/WndMain.c:1624
+#: ../win32/gui/WndMain.c:1615 ../win32/gui/WndMain.c:1625
 msgid "Slot &9"
 msgstr "&Kilencedik hely"
 
-#: ../win32/gui/WndMain.c:1615 ../win32/gui/WndMain.c:1625
+#: ../win32/gui/WndMain.c:1616 ../win32/gui/WndMain.c:1626
 msgid "Slot &8"
 msgstr "&Nyolcadik hely"
 
-#: ../win32/gui/WndMain.c:1616 ../win32/gui/WndMain.c:1626
+#: ../win32/gui/WndMain.c:1617 ../win32/gui/WndMain.c:1627
 msgid "Slot &7"
 msgstr "&Hetedik hely"
 
-#: ../win32/gui/WndMain.c:1617 ../win32/gui/WndMain.c:1627
+#: ../win32/gui/WndMain.c:1618 ../win32/gui/WndMain.c:1628
 msgid "Slot &6"
 msgstr "&Hatodik hely"
 
-#: ../win32/gui/WndMain.c:1618 ../win32/gui/WndMain.c:1628
+#: ../win32/gui/WndMain.c:1619 ../win32/gui/WndMain.c:1629
 msgid "Slot &5"
 msgstr "&Ötödik hely"
 
-#: ../win32/gui/WndMain.c:1619 ../win32/gui/WndMain.c:1629
+#: ../win32/gui/WndMain.c:1620 ../win32/gui/WndMain.c:1630
 msgid "Slot &4"
 msgstr "&Negyedik hely"
 
-#: ../win32/gui/WndMain.c:1620 ../win32/gui/WndMain.c:1630
+#: ../win32/gui/WndMain.c:1621 ../win32/gui/WndMain.c:1631
 msgid "Slot &3"
 msgstr "&Harmadik hely"
 
-#: ../win32/gui/WndMain.c:1621 ../win32/gui/WndMain.c:1631
+#: ../win32/gui/WndMain.c:1622 ../win32/gui/WndMain.c:1632
 msgid "Slot &2"
 msgstr "&Második hely"
 
-#: ../win32/gui/WndMain.c:1622 ../win32/gui/WndMain.c:1632
+#: ../win32/gui/WndMain.c:1623 ../win32/gui/WndMain.c:1633
 msgid "Slot &1"
 msgstr "&Első hely"
 
-#: ../win32/gui/WndMain.c:1634
+#: ../win32/gui/WndMain.c:1635
 msgid "&Configuration"
 msgstr "&Beállítások"
 
-#: ../win32/gui/WndMain.c:1635
+#: ../win32/gui/WndMain.c:1636
 msgid "Cheat &Search..."
 msgstr "Csalás &keresése..."
 
-#: ../win32/gui/WndMain.c:1636
+#: ../win32/gui/WndMain.c:1637
 msgid "Ch&eat Code..."
 msgstr "Cs&alás kód..."
 
-#: ../win32/gui/WndMain.c:1639
+#: ../win32/gui/WndMain.c:1640
 msgid "&Language"
 msgstr "&Nyelv"
 
-#: ../win32/gui/WndMain.c:1664
+#: ../win32/gui/WndMain.c:1665
 msgid "&Memory cards..."
 msgstr "&Memória kártyák..."
 
-#: ../win32/gui/WndMain.c:1665
+#: ../win32/gui/WndMain.c:1666
 msgid "C&PU..."
 msgstr "P&rocesszor..."
 
-#: ../win32/gui/WndMain.c:1667
+#: ../win32/gui/WndMain.c:1668
 msgid "&NetPlay..."
 msgstr "&Internetes játék..."
 
-#: ../win32/gui/WndMain.c:1669
+#: ../win32/gui/WndMain.c:1670
 msgid "&Controllers..."
 msgstr "&Irányítók..."
 
-#: ../win32/gui/WndMain.c:1670
+#: ../win32/gui/WndMain.c:1671
 msgid "CD-&ROM..."
 msgstr "CD-&ROM..."
 
-#: ../win32/gui/WndMain.c:1671
+#: ../win32/gui/WndMain.c:1672
 msgid "&Sound..."
 msgstr "&Hang..."
 
-#: ../win32/gui/WndMain.c:1672
+#: ../win32/gui/WndMain.c:1673
 msgid "&Graphics..."
 msgstr "&Kép..."
 
-#: ../win32/gui/WndMain.c:1674
+#: ../win32/gui/WndMain.c:1675
 msgid "&Plugins && Bios..."
 msgstr "&Pluginok és BIOS..."
 
-#: ../win32/gui/WndMain.c:1676
+#: ../win32/gui/WndMain.c:1677
 msgid "&Help"
 msgstr "&Súgó"
 
-#: ../win32/gui/WndMain.c:1677
+#: ../win32/gui/WndMain.c:1678
 msgid "&About..."
 msgstr "&A program névjegye..."
 
-#: ../win32/gui/WndMain.c:1865
+#: ../win32/gui/WndMain.c:1866
 msgid "Pcsx Msg"
 msgstr "Pcsx üzenet"
 
-#: ../win32/gui/WndMain.c:1868
+#: ../win32/gui/WndMain.c:1869
 msgid "Error Loading Symbol"
 msgstr "Hiba a szimbólum betöltése közben"
 
diff --git a/po/it.po b/po/it.po
index 9705c2f6..dc0a8c57 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pcsxr 1.0\n"
 "Report-Msgid-Bugs-To: whistler_wmz@users.sf.net\n"
-"POT-Creation-Date: 2011-02-12 12:56+0800\n"
+"POT-Creation-Date: 2011-02-18 16:56+0800\n"
 "PO-Revision-Date: 2010-03-15 16:00+0200\n"
 "Last-Translator: Giovanni Scafora <giovanni@archlinux.org>\n"
 "Language-Team: Arch Linux Italian Team <giovanni@archlinux.org>\n"
@@ -67,7 +67,7 @@ msgstr "<b>Regione del sistema</b>"
 msgid "Address (Hexadecimal):"
 msgstr "Esadecimale"
 
-#: ../data/pcsx.glade2.h:14 ../win32/gui/WndMain.c:1301
+#: ../data/pcsx.glade2.h:14 ../win32/gui/WndMain.c:1302
 msgid "Autodetect"
 msgstr "Rileva automaticamente"
 
@@ -187,11 +187,11 @@ msgstr "E_sci"
 msgid "Edit Cheat Codes"
 msgstr "Modifica i codici dei cheat"
 
-#: ../data/pcsx.glade2.h:44 ../win32/gui/WndMain.c:1303
+#: ../data/pcsx.glade2.h:44 ../win32/gui/WndMain.c:1304
 msgid "Enable Console Output"
 msgstr "Abilita l'output sulla console"
 
-#: ../data/pcsx.glade2.h:45 ../win32/gui/WndMain.c:1304
+#: ../data/pcsx.glade2.h:45 ../win32/gui/WndMain.c:1305
 msgid "Enable Debugger"
 msgstr "Abilita il debugger"
 
@@ -237,7 +237,7 @@ msgstr "Video..."
 msgid "Graphics:"
 msgstr "Video:"
 
-#: ../data/pcsx.glade2.h:60 ../win32/gui/WndMain.c:1307
+#: ../data/pcsx.glade2.h:60 ../win32/gui/WndMain.c:1308
 msgid "InuYasha Sengoku Battle Fix"
 msgstr "InuYasha Sengoku Battle Fix"
 
@@ -273,7 +273,7 @@ msgstr "Nuovo"
 msgid "PCSX"
 msgstr "PCSX"
 
-#: ../data/pcsx.glade2.h:69 ../win32/gui/WndMain.c:1306
+#: ../data/pcsx.glade2.h:69 ../win32/gui/WndMain.c:1307
 msgid "Parasite Eve 2, Vandal Hearts 1/2 Fix"
 msgstr "Parasite Eve 2, Vandal Hearts 1/2 Fix"
 
@@ -576,7 +576,7 @@ msgid "PCSX Cheat Code Files (*.cht)"
 msgstr "File cheat di PCSX (*.cht)"
 
 #: ../gui/Cheat.c:321 ../gui/Gtk2Gui.c:446 ../gui/Gtk2Gui.c:587
-#: ../win32/gui/WndMain.c:1444 ../win32/gui/WndMain.c:1525
+#: ../win32/gui/WndMain.c:1445 ../win32/gui/WndMain.c:1526
 msgid "All Files"
 msgstr "Tutti i file"
 
@@ -754,14 +754,14 @@ msgstr "Il file non sembra essere un eseguibile valido della Playstation"
 msgid "CD ROM failed"
 msgstr "Si è verificato un problema con il CD ROM"
 
-#: ../gui/Gtk2Gui.c:508 ../gui/Gtk2Gui.c:649 ../win32/gui/WndMain.c:463
-#: ../win32/gui/WndMain.c:515 ../win32/gui/WndMain.c:584
+#: ../gui/Gtk2Gui.c:508 ../gui/Gtk2Gui.c:649 ../win32/gui/WndMain.c:464
+#: ../win32/gui/WndMain.c:516 ../win32/gui/WndMain.c:585
 #, c-format
 msgid "The CD does not appear to be a valid Playstation CD"
 msgstr "Il CD inserito non sembra essere un valido CD della Playstation"
 
-#: ../gui/Gtk2Gui.c:519 ../gui/Gtk2Gui.c:660 ../win32/gui/WndMain.c:473
-#: ../win32/gui/WndMain.c:525 ../win32/gui/WndMain.c:594
+#: ../gui/Gtk2Gui.c:519 ../gui/Gtk2Gui.c:660 ../win32/gui/WndMain.c:474
+#: ../win32/gui/WndMain.c:526 ../win32/gui/WndMain.c:595
 #, c-format
 msgid "Could not load CD-ROM!"
 msgstr "Impossibile caricare il CD-ROM!"
@@ -869,50 +869,50 @@ msgstr "Impossibile caricare il CD-ROM!\n"
 msgid "PSX emulator couldn't be initialized.\n"
 msgstr "Impossibile inizializzare l'emulatore PSX.\n"
 
-#: ../gui/MemcardDlg.c:56
+#: ../gui/MemcardDlg.c:60
 msgid "Icon"
 msgstr "Icona"
 
-#: ../gui/MemcardDlg.c:62 ../win32/gui/WndMain.c:748
+#: ../gui/MemcardDlg.c:66 ../win32/gui/WndMain.c:749
 msgid "Title"
 msgstr "Titolo"
 
-#: ../gui/MemcardDlg.c:68 ../win32/gui/WndMain.c:754
+#: ../gui/MemcardDlg.c:72 ../win32/gui/WndMain.c:755
 msgid "Status"
 msgstr "Stato"
 
-#: ../gui/MemcardDlg.c:74
+#: ../gui/MemcardDlg.c:78
 msgid "ID"
 msgstr "ID"
 
-#: ../gui/MemcardDlg.c:80
+#: ../gui/MemcardDlg.c:84
 msgid "Name"
 msgstr "Nome"
 
-#: ../gui/MemcardDlg.c:155 ../gui/MemcardDlg.c:260 ../win32/gui/WndMain.c:959
+#: ../gui/MemcardDlg.c:192 ../gui/MemcardDlg.c:297 ../win32/gui/WndMain.c:960
 msgid "Deleted"
 msgstr "Eliminato"
 
-#: ../gui/MemcardDlg.c:157 ../gui/MemcardDlg.c:161 ../gui/MemcardDlg.c:262
-#: ../gui/MemcardDlg.c:266 ../win32/gui/WndMain.c:960
-#: ../win32/gui/WndMain.c:963
+#: ../gui/MemcardDlg.c:194 ../gui/MemcardDlg.c:198 ../gui/MemcardDlg.c:299
+#: ../gui/MemcardDlg.c:303 ../win32/gui/WndMain.c:961
+#: ../win32/gui/WndMain.c:964
 msgid "Free"
 msgstr "Libero"
 
-#: ../gui/MemcardDlg.c:159 ../gui/MemcardDlg.c:264 ../win32/gui/WndMain.c:962
+#: ../gui/MemcardDlg.c:196 ../gui/MemcardDlg.c:301 ../win32/gui/WndMain.c:963
 msgid "Used"
 msgstr "Usato"
 
 #. Ask for name of memory card
-#: ../gui/MemcardDlg.c:323
+#: ../gui/MemcardDlg.c:360
 msgid "Select A File"
 msgstr "Seleziona un file"
 
-#: ../gui/MemcardDlg.c:364
+#: ../gui/MemcardDlg.c:401
 msgid "Format this Memory Card?"
 msgstr "Formatto questa memory card?"
 
-#: ../gui/MemcardDlg.c:366
+#: ../gui/MemcardDlg.c:403
 msgid ""
 "If you format the memory card, the card will be empty, and any existing data "
 "overwritten."
@@ -920,25 +920,25 @@ msgstr ""
 "Se formatti la memory card, questa sarà svuotata e tutti i dati esistenti "
 "saranno sovrascritti."
 
-#: ../gui/MemcardDlg.c:369
+#: ../gui/MemcardDlg.c:406
 msgid "Format card"
 msgstr "Formatta la memory card"
 
 #. Ask for name of new memory card
-#: ../gui/MemcardDlg.c:393
+#: ../gui/MemcardDlg.c:430
 msgid "Create a new Memory Card"
 msgstr "Crea una nuova memory card"
 
-#: ../gui/MemcardDlg.c:402
+#: ../gui/MemcardDlg.c:439
 msgid "New Memory Card.mcd"
 msgstr "Nuova memory card.mcd"
 
 #. No free slots available on the destination card
-#: ../gui/MemcardDlg.c:503
+#: ../gui/MemcardDlg.c:540
 msgid "No free space on memory card"
 msgstr "Non c'è spazio libero sulla memory card"
 
-#: ../gui/MemcardDlg.c:504
+#: ../gui/MemcardDlg.c:541
 msgid ""
 "There are no free slots available on the target memory card. Please delete a "
 "slot first."
@@ -946,7 +946,7 @@ msgstr ""
 "Non vi sono slot liberi disponibili nella memory card. Elimina almeno uno "
 "slot."
 
-#: ../gui/MemcardDlg.c:667
+#: ../gui/MemcardDlg.c:704
 msgid "Memory Card Manager"
 msgstr "Gestore della memory card"
 
@@ -1309,7 +1309,7 @@ msgstr ""
 "Threaded, veloce (con la cache)"
 
 #: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:24
-#: ../plugins/dfinput/dfinput.ui.h:8 ../win32/gui/WndMain.c:1309
+#: ../plugins/dfinput/dfinput.ui.h:8 ../win32/gui/WndMain.c:1310
 msgid "Options"
 msgstr "Opzioni"
 
@@ -2469,7 +2469,7 @@ msgstr "Informazioni"
 #: ../win32/gui/AboutDlg.c:48 ../win32/gui/AboutDlg.c:52
 #: ../win32/gui/CheatDlg.c:69 ../win32/gui/CheatDlg.c:119
 #: ../win32/gui/ConfigurePlugins.c:483 ../win32/gui/ConfigurePlugins.c:614
-#: ../win32/gui/WndMain.c:1058 ../win32/gui/WndMain.c:1294
+#: ../win32/gui/WndMain.c:1059 ../win32/gui/WndMain.c:1295
 msgid "OK"
 msgstr "OK"
 
@@ -2489,7 +2489,7 @@ msgstr "No"
 
 #: ../win32/gui/CheatDlg.c:70 ../win32/gui/CheatDlg.c:120
 #: ../win32/gui/ConfigurePlugins.c:484 ../win32/gui/ConfigurePlugins.c:615
-#: ../win32/gui/WndMain.c:1059 ../win32/gui/WndMain.c:1295
+#: ../win32/gui/WndMain.c:1060 ../win32/gui/WndMain.c:1296
 msgid "Cancel"
 msgstr "Annulla"
 
@@ -2711,23 +2711,23 @@ msgstr ""
 "Nota: la cartella del plugin NetPlay dovrebbe essere la stessa degli altri "
 "plugin."
 
-#: ../win32/gui/plugin.c:94 ../win32/gui/WndMain.c:322
+#: ../win32/gui/plugin.c:94 ../win32/gui/WndMain.c:323
 #, c-format
 msgid "*PCSX*: Saved State %d"
 msgstr "*PCSX*: è stato salvato lo stato %d"
 
-#: ../win32/gui/plugin.c:95 ../win32/gui/WndMain.c:323
+#: ../win32/gui/plugin.c:95 ../win32/gui/WndMain.c:324
 #, c-format
 msgid "*PCSX*: Error Saving State %d"
 msgstr ""
 "*PCSX*: si è verificato un errore durante il salvataggio dello stato %d"
 
-#: ../win32/gui/plugin.c:111 ../win32/gui/WndMain.c:300
+#: ../win32/gui/plugin.c:111 ../win32/gui/WndMain.c:301
 #, c-format
 msgid "*PCSX*: Loaded State %d"
 msgstr "*PCSX*: è stato caricato lo stato %d"
 
-#: ../win32/gui/plugin.c:112 ../win32/gui/WndMain.c:301
+#: ../win32/gui/plugin.c:112 ../win32/gui/WndMain.c:302
 #, c-format
 msgid "*PCSX*: Error Loading State %d"
 msgstr ""
@@ -2862,8 +2862,8 @@ msgstr "Tedesco"
 msgid "Greek"
 msgstr "Greco"
 
-#: ../win32/gui/WndMain.c:81 ../win32/gui/WndMain.c:1658
-#: ../win32/gui/WndMain.c:1660
+#: ../win32/gui/WndMain.c:81 ../win32/gui/WndMain.c:1659
+#: ../win32/gui/WndMain.c:1661
 msgid "English"
 msgstr "Inglese"
 
@@ -2917,336 +2917,337 @@ msgid ""
 "\toptions:\n"
 "\t-nogui\t\tDon't open the GUI\n"
 "\t-psxout\t\tEnable PSX output\n"
+"\t-slowboot\t\tEnable BIOS logo\n"
 "\t-runcd\t\tRuns CD-ROM (requires -nogui)\n"
 "\t-cdfile FILE\tRuns a CD image file (requires -nogui)\n"
 "\t-help\t\tDisplay this message"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:341 ../win32/gui/WndMain.c:387
+#: ../win32/gui/WndMain.c:342 ../win32/gui/WndMain.c:388
 msgid "PCSX State Format"
 msgstr "Formato dei salvataggi di PCSX"
 
-#: ../win32/gui/WndMain.c:368
+#: ../win32/gui/WndMain.c:369
 #, c-format
 msgid "*PCSX*: Loaded State %s"
 msgstr "*PCSX*: è stato caricato lo stato %s"
 
-#: ../win32/gui/WndMain.c:369
+#: ../win32/gui/WndMain.c:370
 #, c-format
 msgid "*PCSX*: Error Loading State %s"
 msgstr ""
 "*PCSX*: si è verificato un errore durante il caricamento dello stato %s"
 
-#: ../win32/gui/WndMain.c:414
+#: ../win32/gui/WndMain.c:415
 #, c-format
 msgid "*PCSX*: Saved State %s"
 msgstr "*PCSX*: è stato salvato lo stato %s"
 
-#: ../win32/gui/WndMain.c:415
+#: ../win32/gui/WndMain.c:416
 #, c-format
 msgid "*PCSX*: Error Saving State %s"
 msgstr ""
 "*PCSX*: si è verificato un errore durante il salvataggio dello stato %s"
 
-#: ../win32/gui/WndMain.c:483
+#: ../win32/gui/WndMain.c:484
 msgid "Running BIOS is not supported with Internal HLE Bios."
 msgstr "L'avvio del BIOS non è supportato dal bios interno HLE."
 
-#: ../win32/gui/WndMain.c:760
+#: ../win32/gui/WndMain.c:761
 msgid "Game ID"
 msgstr "ID del gioco"
 
-#: ../win32/gui/WndMain.c:766
+#: ../win32/gui/WndMain.c:767
 msgid "Game"
 msgstr "Gioco"
 
-#: ../win32/gui/WndMain.c:948
+#: ../win32/gui/WndMain.c:949
 msgid "mid link block"
 msgstr "mid link block"
 
-#: ../win32/gui/WndMain.c:951
+#: ../win32/gui/WndMain.c:952
 msgid "terminiting link block"
 msgstr "terminiting link block"
 
-#: ../win32/gui/WndMain.c:1056
+#: ../win32/gui/WndMain.c:1057
 msgid "Memcard Manager"
 msgstr "Gestore della memory card"
 
-#: ../win32/gui/WndMain.c:1060 ../win32/gui/WndMain.c:1063
+#: ../win32/gui/WndMain.c:1061 ../win32/gui/WndMain.c:1064
 msgid "Select Mcd"
 msgstr "Seleziona la memory card"
 
-#: ../win32/gui/WndMain.c:1061 ../win32/gui/WndMain.c:1064
+#: ../win32/gui/WndMain.c:1062 ../win32/gui/WndMain.c:1065
 msgid "Format Mcd"
 msgstr "Formatta la memory card"
 
-#: ../win32/gui/WndMain.c:1062 ../win32/gui/WndMain.c:1065
+#: ../win32/gui/WndMain.c:1063 ../win32/gui/WndMain.c:1066
 msgid "Reload Mcd"
 msgstr "Ricarica la memory card"
 
-#: ../win32/gui/WndMain.c:1066
+#: ../win32/gui/WndMain.c:1067
 msgid "-> Copy ->"
 msgstr "-> Copia ->"
 
-#: ../win32/gui/WndMain.c:1067
+#: ../win32/gui/WndMain.c:1068
 msgid "<- Copy <-"
 msgstr "<- Copia <-"
 
-#: ../win32/gui/WndMain.c:1068
+#: ../win32/gui/WndMain.c:1069
 msgid "Paste"
 msgstr "Incolla"
 
-#: ../win32/gui/WndMain.c:1069
+#: ../win32/gui/WndMain.c:1070
 msgid "<- Un/Delete"
 msgstr "<- Non/Elimina"
 
-#: ../win32/gui/WndMain.c:1070
+#: ../win32/gui/WndMain.c:1071
 msgid "Un/Delete ->"
 msgstr "Non/Elimina ->"
 
-#: ../win32/gui/WndMain.c:1072
+#: ../win32/gui/WndMain.c:1073
 msgid "Memory Card 1"
 msgstr "Memory card 1"
 
-#: ../win32/gui/WndMain.c:1073
+#: ../win32/gui/WndMain.c:1074
 msgid "Memory Card 2"
 msgstr "Memory card 2"
 
-#: ../win32/gui/WndMain.c:1128
+#: ../win32/gui/WndMain.c:1129
 msgid "Are you sure you want to paste this selection?"
 msgstr "Sei sicuro di voler incollare questa selezione?"
 
-#: ../win32/gui/WndMain.c:1128 ../win32/gui/WndMain.c:1239
-#: ../win32/gui/WndMain.c:1246
+#: ../win32/gui/WndMain.c:1129 ../win32/gui/WndMain.c:1240
+#: ../win32/gui/WndMain.c:1247
 msgid "Confirmation"
 msgstr "Conferma"
 
-#: ../win32/gui/WndMain.c:1239 ../win32/gui/WndMain.c:1246
+#: ../win32/gui/WndMain.c:1240 ../win32/gui/WndMain.c:1247
 msgid "Are you sure you want to format this Memory Card?"
 msgstr "Sei sicuro di voler formattare questa memory card?"
 
-#: ../win32/gui/WndMain.c:1292
+#: ../win32/gui/WndMain.c:1293
 msgid "Cpu Config"
 msgstr "Configurazione della Cpu"
 
-#: ../win32/gui/WndMain.c:1297
+#: ../win32/gui/WndMain.c:1298
 msgid "Disable Xa Decoding"
 msgstr "Disabilita il decoding Xa"
 
-#: ../win32/gui/WndMain.c:1298
+#: ../win32/gui/WndMain.c:1299
 msgid "Sio Irq Always Enabled"
 msgstr "Sio irq sempre abilitato"
 
-#: ../win32/gui/WndMain.c:1299
+#: ../win32/gui/WndMain.c:1300
 msgid "Black && White Movies"
 msgstr "Filmati in bianco e nero"
 
-#: ../win32/gui/WndMain.c:1300
+#: ../win32/gui/WndMain.c:1301
 msgid "Disable Cd audio"
 msgstr "Disabilita cd audio"
 
-#: ../win32/gui/WndMain.c:1302
+#: ../win32/gui/WndMain.c:1303
 msgid "Enable Interpreter Cpu"
 msgstr "Abilita l'interprete della cpu"
 
-#: ../win32/gui/WndMain.c:1305
+#: ../win32/gui/WndMain.c:1306
 msgid "Spu Irq Always Enabled"
 msgstr "Spu irq sempre abilitato"
 
-#: ../win32/gui/WndMain.c:1310
+#: ../win32/gui/WndMain.c:1311
 msgid "Psx System Type"
 msgstr "Regione del sistema"
 
-#: ../win32/gui/WndMain.c:1414
+#: ../win32/gui/WndMain.c:1415
 msgid "Psx Mcd Format (*.mcr;*.mc;*.mem;*.vgs;*.mcd;*.gme;*.ddf)"
 msgstr ""
 "Formato memory card della psx (*.mcr;*.mc;*.mem;*.vgs;*.mcd;*.gme;*.ddf)"
 
-#: ../win32/gui/WndMain.c:1419
+#: ../win32/gui/WndMain.c:1420
 msgid "Psx Memory Card (*.mcr;*.mc)"
 msgstr "Memory card psx (*.mcr;*.mc)"
 
-#: ../win32/gui/WndMain.c:1424
+#: ../win32/gui/WndMain.c:1425
 msgid "CVGS Memory Card (*.mem;*.vgs)"
 msgstr "Memory card CVSG (*.mem;*.vgs)"
 
-#: ../win32/gui/WndMain.c:1429
+#: ../win32/gui/WndMain.c:1430
 msgid "Bleem Memory Card (*.mcd)"
 msgstr "Memory card bleem (*.mcd)"
 
-#: ../win32/gui/WndMain.c:1434
+#: ../win32/gui/WndMain.c:1435
 msgid "DexDrive Memory Card (*.gme)"
 msgstr "Memory card DexDrive (*.gme)"
 
-#: ../win32/gui/WndMain.c:1439
+#: ../win32/gui/WndMain.c:1440
 msgid "DataDeck Memory Card (*.ddf)"
 msgstr "Memory card DataDeck (*.ddf)"
 
-#: ../win32/gui/WndMain.c:1483
+#: ../win32/gui/WndMain.c:1484
 msgid "Psx Exe Format"
 msgstr "Formato exe della Psx"
 
-#: ../win32/gui/WndMain.c:1520
+#: ../win32/gui/WndMain.c:1521
 msgid "Psx Isos (*.iso;*.mdf;*.img;*.bin)"
 msgstr "ISO della psx (*.iso;*.mdf;*.img;*.bin)"
 
-#: ../win32/gui/WndMain.c:1596
+#: ../win32/gui/WndMain.c:1597
 msgid "&File"
 msgstr "&File"
 
-#: ../win32/gui/WndMain.c:1597
+#: ../win32/gui/WndMain.c:1598
 msgid "E&xit"
 msgstr "E&sci"
 
-#: ../win32/gui/WndMain.c:1599
+#: ../win32/gui/WndMain.c:1600
 msgid "Run &EXE..."
 msgstr "Avvia &EXE..."
 
-#: ../win32/gui/WndMain.c:1600
+#: ../win32/gui/WndMain.c:1601
 msgid "Run &BIOS"
 msgstr "Avvia &BIOS"
 
-#: ../win32/gui/WndMain.c:1601
+#: ../win32/gui/WndMain.c:1602
 msgid "Run &ISO..."
 msgstr "Avvia &ISO..."
 
-#: ../win32/gui/WndMain.c:1602
+#: ../win32/gui/WndMain.c:1603
 msgid "Run &CD"
 msgstr "Avvia &CD"
 
-#: ../win32/gui/WndMain.c:1604
+#: ../win32/gui/WndMain.c:1605
 msgid "&Emulator"
 msgstr "&Emulatore"
 
-#: ../win32/gui/WndMain.c:1605
+#: ../win32/gui/WndMain.c:1606
 msgid "&States"
 msgstr "&Stati"
 
-#: ../win32/gui/WndMain.c:1607
+#: ../win32/gui/WndMain.c:1608
 msgid "S&witch ISO..."
 msgstr "C&ambia ISO..."
 
-#: ../win32/gui/WndMain.c:1609
+#: ../win32/gui/WndMain.c:1610
 msgid "Re&set"
 msgstr "Re&setta"
 
-#: ../win32/gui/WndMain.c:1610
+#: ../win32/gui/WndMain.c:1611
 msgid "&Run"
 msgstr "&Avvia"
 
-#: ../win32/gui/WndMain.c:1611
+#: ../win32/gui/WndMain.c:1612
 msgid "&Save"
 msgstr "&Salva"
 
-#: ../win32/gui/WndMain.c:1612
+#: ../win32/gui/WndMain.c:1613
 msgid "&Load"
 msgstr "&Carica"
 
-#: ../win32/gui/WndMain.c:1613 ../win32/gui/WndMain.c:1623
+#: ../win32/gui/WndMain.c:1614 ../win32/gui/WndMain.c:1624
 msgid "&Other..."
 msgstr "&Altro..."
 
-#: ../win32/gui/WndMain.c:1614 ../win32/gui/WndMain.c:1624
+#: ../win32/gui/WndMain.c:1615 ../win32/gui/WndMain.c:1625
 #, fuzzy
 msgid "Slot &9"
 msgstr "Slot &5"
 
-#: ../win32/gui/WndMain.c:1615 ../win32/gui/WndMain.c:1625
+#: ../win32/gui/WndMain.c:1616 ../win32/gui/WndMain.c:1626
 #, fuzzy
 msgid "Slot &8"
 msgstr "Slot &5"
 
-#: ../win32/gui/WndMain.c:1616 ../win32/gui/WndMain.c:1626
+#: ../win32/gui/WndMain.c:1617 ../win32/gui/WndMain.c:1627
 #, fuzzy
 msgid "Slot &7"
 msgstr "Slot &5"
 
-#: ../win32/gui/WndMain.c:1617 ../win32/gui/WndMain.c:1627
+#: ../win32/gui/WndMain.c:1618 ../win32/gui/WndMain.c:1628
 #, fuzzy
 msgid "Slot &6"
 msgstr "Slot &5"
 
-#: ../win32/gui/WndMain.c:1618 ../win32/gui/WndMain.c:1628
+#: ../win32/gui/WndMain.c:1619 ../win32/gui/WndMain.c:1629
 msgid "Slot &5"
 msgstr "Slot &5"
 
-#: ../win32/gui/WndMain.c:1619 ../win32/gui/WndMain.c:1629
+#: ../win32/gui/WndMain.c:1620 ../win32/gui/WndMain.c:1630
 msgid "Slot &4"
 msgstr "Slot &4"
 
-#: ../win32/gui/WndMain.c:1620 ../win32/gui/WndMain.c:1630
+#: ../win32/gui/WndMain.c:1621 ../win32/gui/WndMain.c:1631
 msgid "Slot &3"
 msgstr "Slot &3"
 
-#: ../win32/gui/WndMain.c:1621 ../win32/gui/WndMain.c:1631
+#: ../win32/gui/WndMain.c:1622 ../win32/gui/WndMain.c:1632
 msgid "Slot &2"
 msgstr "Slot &2"
 
-#: ../win32/gui/WndMain.c:1622 ../win32/gui/WndMain.c:1632
+#: ../win32/gui/WndMain.c:1623 ../win32/gui/WndMain.c:1633
 msgid "Slot &1"
 msgstr "Slot &1"
 
-#: ../win32/gui/WndMain.c:1634
+#: ../win32/gui/WndMain.c:1635
 msgid "&Configuration"
 msgstr "&Configurazione"
 
-#: ../win32/gui/WndMain.c:1635
+#: ../win32/gui/WndMain.c:1636
 msgid "Cheat &Search..."
 msgstr "Cerca &cheat..."
 
-#: ../win32/gui/WndMain.c:1636
+#: ../win32/gui/WndMain.c:1637
 msgid "Ch&eat Code..."
 msgstr "Codice ch&eat..."
 
-#: ../win32/gui/WndMain.c:1639
+#: ../win32/gui/WndMain.c:1640
 msgid "&Language"
 msgstr "&Lingua"
 
-#: ../win32/gui/WndMain.c:1664
+#: ../win32/gui/WndMain.c:1665
 msgid "&Memory cards..."
 msgstr "&Memory card..."
 
-#: ../win32/gui/WndMain.c:1665
+#: ../win32/gui/WndMain.c:1666
 msgid "C&PU..."
 msgstr "C&PU..."
 
-#: ../win32/gui/WndMain.c:1667
+#: ../win32/gui/WndMain.c:1668
 msgid "&NetPlay..."
 msgstr "&NetPlay..."
 
-#: ../win32/gui/WndMain.c:1669
+#: ../win32/gui/WndMain.c:1670
 msgid "&Controllers..."
 msgstr "&Controller..."
 
-#: ../win32/gui/WndMain.c:1670
+#: ../win32/gui/WndMain.c:1671
 msgid "CD-&ROM..."
 msgstr "CD-&ROM..."
 
-#: ../win32/gui/WndMain.c:1671
+#: ../win32/gui/WndMain.c:1672
 msgid "&Sound..."
 msgstr "&Audio..."
 
-#: ../win32/gui/WndMain.c:1672
+#: ../win32/gui/WndMain.c:1673
 msgid "&Graphics..."
 msgstr "&Video..."
 
-#: ../win32/gui/WndMain.c:1674
+#: ../win32/gui/WndMain.c:1675
 msgid "&Plugins && Bios..."
 msgstr "&Plugin e Bios..."
 
-#: ../win32/gui/WndMain.c:1676
+#: ../win32/gui/WndMain.c:1677
 msgid "&Help"
 msgstr "&Aiuto"
 
-#: ../win32/gui/WndMain.c:1677
+#: ../win32/gui/WndMain.c:1678
 msgid "&About..."
 msgstr "&Informazioni..."
 
-#: ../win32/gui/WndMain.c:1865
+#: ../win32/gui/WndMain.c:1866
 msgid "Pcsx Msg"
 msgstr "Messaggio di pcsx"
 
-#: ../win32/gui/WndMain.c:1868
+#: ../win32/gui/WndMain.c:1869
 msgid "Error Loading Symbol"
 msgstr "Si è verificato un errore durante il caricamento del simbolo"
 
diff --git a/po/pcsx.pot b/po/pcsx.pot
index 96e02ed7..8cfa6619 100644
--- a/po/pcsx.pot
+++ b/po/pcsx.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: whistler_wmz@users.sf.net\n"
-"POT-Creation-Date: 2011-02-12 12:56+0800\n"
+"POT-Creation-Date: 2011-02-18 16:56+0800\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"
@@ -64,7 +64,7 @@ msgstr ""
 msgid "Address (Hexadecimal):"
 msgstr ""
 
-#: ../data/pcsx.glade2.h:14 ../win32/gui/WndMain.c:1301
+#: ../data/pcsx.glade2.h:14 ../win32/gui/WndMain.c:1302
 msgid "Autodetect"
 msgstr ""
 
@@ -182,11 +182,11 @@ msgstr ""
 msgid "Edit Cheat Codes"
 msgstr ""
 
-#: ../data/pcsx.glade2.h:44 ../win32/gui/WndMain.c:1303
+#: ../data/pcsx.glade2.h:44 ../win32/gui/WndMain.c:1304
 msgid "Enable Console Output"
 msgstr ""
 
-#: ../data/pcsx.glade2.h:45 ../win32/gui/WndMain.c:1304
+#: ../data/pcsx.glade2.h:45 ../win32/gui/WndMain.c:1305
 msgid "Enable Debugger"
 msgstr ""
 
@@ -223,7 +223,7 @@ msgstr ""
 msgid "Graphics:"
 msgstr ""
 
-#: ../data/pcsx.glade2.h:60 ../win32/gui/WndMain.c:1307
+#: ../data/pcsx.glade2.h:60 ../win32/gui/WndMain.c:1308
 msgid "InuYasha Sengoku Battle Fix"
 msgstr ""
 
@@ -257,7 +257,7 @@ msgstr ""
 msgid "PCSX"
 msgstr ""
 
-#: ../data/pcsx.glade2.h:69 ../win32/gui/WndMain.c:1306
+#: ../data/pcsx.glade2.h:69 ../win32/gui/WndMain.c:1307
 msgid "Parasite Eve 2, Vandal Hearts 1/2 Fix"
 msgstr ""
 
@@ -539,7 +539,7 @@ msgid "PCSX Cheat Code Files (*.cht)"
 msgstr ""
 
 #: ../gui/Cheat.c:321 ../gui/Gtk2Gui.c:446 ../gui/Gtk2Gui.c:587
-#: ../win32/gui/WndMain.c:1444 ../win32/gui/WndMain.c:1525
+#: ../win32/gui/WndMain.c:1445 ../win32/gui/WndMain.c:1526
 msgid "All Files"
 msgstr ""
 
@@ -711,14 +711,14 @@ msgstr ""
 msgid "CD ROM failed"
 msgstr ""
 
-#: ../gui/Gtk2Gui.c:508 ../gui/Gtk2Gui.c:649 ../win32/gui/WndMain.c:463
-#: ../win32/gui/WndMain.c:515 ../win32/gui/WndMain.c:584
+#: ../gui/Gtk2Gui.c:508 ../gui/Gtk2Gui.c:649 ../win32/gui/WndMain.c:464
+#: ../win32/gui/WndMain.c:516 ../win32/gui/WndMain.c:585
 #, c-format
 msgid "The CD does not appear to be a valid Playstation CD"
 msgstr ""
 
-#: ../gui/Gtk2Gui.c:519 ../gui/Gtk2Gui.c:660 ../win32/gui/WndMain.c:473
-#: ../win32/gui/WndMain.c:525 ../win32/gui/WndMain.c:594
+#: ../gui/Gtk2Gui.c:519 ../gui/Gtk2Gui.c:660 ../win32/gui/WndMain.c:474
+#: ../win32/gui/WndMain.c:526 ../win32/gui/WndMain.c:595
 #, c-format
 msgid "Could not load CD-ROM!"
 msgstr ""
@@ -812,80 +812,80 @@ msgstr ""
 msgid "PSX emulator couldn't be initialized.\n"
 msgstr ""
 
-#: ../gui/MemcardDlg.c:56
+#: ../gui/MemcardDlg.c:60
 msgid "Icon"
 msgstr ""
 
-#: ../gui/MemcardDlg.c:62 ../win32/gui/WndMain.c:748
+#: ../gui/MemcardDlg.c:66 ../win32/gui/WndMain.c:749
 msgid "Title"
 msgstr ""
 
-#: ../gui/MemcardDlg.c:68 ../win32/gui/WndMain.c:754
+#: ../gui/MemcardDlg.c:72 ../win32/gui/WndMain.c:755
 msgid "Status"
 msgstr ""
 
-#: ../gui/MemcardDlg.c:74
+#: ../gui/MemcardDlg.c:78
 msgid "ID"
 msgstr ""
 
-#: ../gui/MemcardDlg.c:80
+#: ../gui/MemcardDlg.c:84
 msgid "Name"
 msgstr ""
 
-#: ../gui/MemcardDlg.c:155 ../gui/MemcardDlg.c:260 ../win32/gui/WndMain.c:959
+#: ../gui/MemcardDlg.c:192 ../gui/MemcardDlg.c:297 ../win32/gui/WndMain.c:960
 msgid "Deleted"
 msgstr ""
 
-#: ../gui/MemcardDlg.c:157 ../gui/MemcardDlg.c:161 ../gui/MemcardDlg.c:262
-#: ../gui/MemcardDlg.c:266 ../win32/gui/WndMain.c:960
-#: ../win32/gui/WndMain.c:963
+#: ../gui/MemcardDlg.c:194 ../gui/MemcardDlg.c:198 ../gui/MemcardDlg.c:299
+#: ../gui/MemcardDlg.c:303 ../win32/gui/WndMain.c:961
+#: ../win32/gui/WndMain.c:964
 msgid "Free"
 msgstr ""
 
-#: ../gui/MemcardDlg.c:159 ../gui/MemcardDlg.c:264 ../win32/gui/WndMain.c:962
+#: ../gui/MemcardDlg.c:196 ../gui/MemcardDlg.c:301 ../win32/gui/WndMain.c:963
 msgid "Used"
 msgstr ""
 
 #. Ask for name of memory card
-#: ../gui/MemcardDlg.c:323
+#: ../gui/MemcardDlg.c:360
 msgid "Select A File"
 msgstr ""
 
-#: ../gui/MemcardDlg.c:364
+#: ../gui/MemcardDlg.c:401
 msgid "Format this Memory Card?"
 msgstr ""
 
-#: ../gui/MemcardDlg.c:366
+#: ../gui/MemcardDlg.c:403
 msgid ""
 "If you format the memory card, the card will be empty, and any existing data "
 "overwritten."
 msgstr ""
 
-#: ../gui/MemcardDlg.c:369
+#: ../gui/MemcardDlg.c:406
 msgid "Format card"
 msgstr ""
 
 #. Ask for name of new memory card
-#: ../gui/MemcardDlg.c:393
+#: ../gui/MemcardDlg.c:430
 msgid "Create a new Memory Card"
 msgstr ""
 
-#: ../gui/MemcardDlg.c:402
+#: ../gui/MemcardDlg.c:439
 msgid "New Memory Card.mcd"
 msgstr ""
 
 #. No free slots available on the destination card
-#: ../gui/MemcardDlg.c:503
+#: ../gui/MemcardDlg.c:540
 msgid "No free space on memory card"
 msgstr ""
 
-#: ../gui/MemcardDlg.c:504
+#: ../gui/MemcardDlg.c:541
 msgid ""
 "There are no free slots available on the target memory card. Please delete a "
 "slot first."
 msgstr ""
 
-#: ../gui/MemcardDlg.c:667
+#: ../gui/MemcardDlg.c:704
 msgid "Memory Card Manager"
 msgstr ""
 
@@ -1212,7 +1212,7 @@ msgid ""
 msgstr ""
 
 #: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:24
-#: ../plugins/dfinput/dfinput.ui.h:8 ../win32/gui/WndMain.c:1309
+#: ../plugins/dfinput/dfinput.ui.h:8 ../win32/gui/WndMain.c:1310
 msgid "Options"
 msgstr ""
 
@@ -2244,7 +2244,7 @@ msgstr ""
 #: ../win32/gui/AboutDlg.c:48 ../win32/gui/AboutDlg.c:52
 #: ../win32/gui/CheatDlg.c:69 ../win32/gui/CheatDlg.c:119
 #: ../win32/gui/ConfigurePlugins.c:483 ../win32/gui/ConfigurePlugins.c:614
-#: ../win32/gui/WndMain.c:1058 ../win32/gui/WndMain.c:1294
+#: ../win32/gui/WndMain.c:1059 ../win32/gui/WndMain.c:1295
 msgid "OK"
 msgstr ""
 
@@ -2264,7 +2264,7 @@ msgstr ""
 
 #: ../win32/gui/CheatDlg.c:70 ../win32/gui/CheatDlg.c:120
 #: ../win32/gui/ConfigurePlugins.c:484 ../win32/gui/ConfigurePlugins.c:615
-#: ../win32/gui/WndMain.c:1059 ../win32/gui/WndMain.c:1295
+#: ../win32/gui/WndMain.c:1060 ../win32/gui/WndMain.c:1296
 msgid "Cancel"
 msgstr ""
 
@@ -2484,22 +2484,22 @@ msgid ""
 "Note: The NetPlay Plugin Directory should be the same as the other Plugins."
 msgstr ""
 
-#: ../win32/gui/plugin.c:94 ../win32/gui/WndMain.c:322
+#: ../win32/gui/plugin.c:94 ../win32/gui/WndMain.c:323
 #, c-format
 msgid "*PCSX*: Saved State %d"
 msgstr ""
 
-#: ../win32/gui/plugin.c:95 ../win32/gui/WndMain.c:323
+#: ../win32/gui/plugin.c:95 ../win32/gui/WndMain.c:324
 #, c-format
 msgid "*PCSX*: Error Saving State %d"
 msgstr ""
 
-#: ../win32/gui/plugin.c:111 ../win32/gui/WndMain.c:300
+#: ../win32/gui/plugin.c:111 ../win32/gui/WndMain.c:301
 #, c-format
 msgid "*PCSX*: Loaded State %d"
 msgstr ""
 
-#: ../win32/gui/plugin.c:112 ../win32/gui/WndMain.c:301
+#: ../win32/gui/plugin.c:112 ../win32/gui/WndMain.c:302
 #, c-format
 msgid "*PCSX*: Error Loading State %d"
 msgstr ""
@@ -2633,8 +2633,8 @@ msgstr ""
 msgid "Greek"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:81 ../win32/gui/WndMain.c:1658
-#: ../win32/gui/WndMain.c:1660
+#: ../win32/gui/WndMain.c:81 ../win32/gui/WndMain.c:1659
+#: ../win32/gui/WndMain.c:1661
 msgid "English"
 msgstr ""
 
@@ -2688,328 +2688,329 @@ msgid ""
 "\toptions:\n"
 "\t-nogui\t\tDon't open the GUI\n"
 "\t-psxout\t\tEnable PSX output\n"
+"\t-slowboot\t\tEnable BIOS logo\n"
 "\t-runcd\t\tRuns CD-ROM (requires -nogui)\n"
 "\t-cdfile FILE\tRuns a CD image file (requires -nogui)\n"
 "\t-help\t\tDisplay this message"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:341 ../win32/gui/WndMain.c:387
+#: ../win32/gui/WndMain.c:342 ../win32/gui/WndMain.c:388
 msgid "PCSX State Format"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:368
+#: ../win32/gui/WndMain.c:369
 #, c-format
 msgid "*PCSX*: Loaded State %s"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:369
+#: ../win32/gui/WndMain.c:370
 #, c-format
 msgid "*PCSX*: Error Loading State %s"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:414
+#: ../win32/gui/WndMain.c:415
 #, c-format
 msgid "*PCSX*: Saved State %s"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:415
+#: ../win32/gui/WndMain.c:416
 #, c-format
 msgid "*PCSX*: Error Saving State %s"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:483
+#: ../win32/gui/WndMain.c:484
 msgid "Running BIOS is not supported with Internal HLE Bios."
 msgstr ""
 
-#: ../win32/gui/WndMain.c:760
+#: ../win32/gui/WndMain.c:761
 msgid "Game ID"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:766
+#: ../win32/gui/WndMain.c:767
 msgid "Game"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:948
+#: ../win32/gui/WndMain.c:949
 msgid "mid link block"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:951
+#: ../win32/gui/WndMain.c:952
 msgid "terminiting link block"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1056
+#: ../win32/gui/WndMain.c:1057
 msgid "Memcard Manager"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1060 ../win32/gui/WndMain.c:1063
+#: ../win32/gui/WndMain.c:1061 ../win32/gui/WndMain.c:1064
 msgid "Select Mcd"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1061 ../win32/gui/WndMain.c:1064
+#: ../win32/gui/WndMain.c:1062 ../win32/gui/WndMain.c:1065
 msgid "Format Mcd"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1062 ../win32/gui/WndMain.c:1065
+#: ../win32/gui/WndMain.c:1063 ../win32/gui/WndMain.c:1066
 msgid "Reload Mcd"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1066
+#: ../win32/gui/WndMain.c:1067
 msgid "-> Copy ->"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1067
+#: ../win32/gui/WndMain.c:1068
 msgid "<- Copy <-"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1068
+#: ../win32/gui/WndMain.c:1069
 msgid "Paste"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1069
+#: ../win32/gui/WndMain.c:1070
 msgid "<- Un/Delete"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1070
+#: ../win32/gui/WndMain.c:1071
 msgid "Un/Delete ->"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1072
+#: ../win32/gui/WndMain.c:1073
 msgid "Memory Card 1"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1073
+#: ../win32/gui/WndMain.c:1074
 msgid "Memory Card 2"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1128
+#: ../win32/gui/WndMain.c:1129
 msgid "Are you sure you want to paste this selection?"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1128 ../win32/gui/WndMain.c:1239
-#: ../win32/gui/WndMain.c:1246
+#: ../win32/gui/WndMain.c:1129 ../win32/gui/WndMain.c:1240
+#: ../win32/gui/WndMain.c:1247
 msgid "Confirmation"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1239 ../win32/gui/WndMain.c:1246
+#: ../win32/gui/WndMain.c:1240 ../win32/gui/WndMain.c:1247
 msgid "Are you sure you want to format this Memory Card?"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1292
+#: ../win32/gui/WndMain.c:1293
 msgid "Cpu Config"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1297
+#: ../win32/gui/WndMain.c:1298
 msgid "Disable Xa Decoding"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1298
+#: ../win32/gui/WndMain.c:1299
 msgid "Sio Irq Always Enabled"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1299
+#: ../win32/gui/WndMain.c:1300
 msgid "Black && White Movies"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1300
+#: ../win32/gui/WndMain.c:1301
 msgid "Disable Cd audio"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1302
+#: ../win32/gui/WndMain.c:1303
 msgid "Enable Interpreter Cpu"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1305
+#: ../win32/gui/WndMain.c:1306
 msgid "Spu Irq Always Enabled"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1310
+#: ../win32/gui/WndMain.c:1311
 msgid "Psx System Type"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1414
+#: ../win32/gui/WndMain.c:1415
 msgid "Psx Mcd Format (*.mcr;*.mc;*.mem;*.vgs;*.mcd;*.gme;*.ddf)"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1419
+#: ../win32/gui/WndMain.c:1420
 msgid "Psx Memory Card (*.mcr;*.mc)"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1424
+#: ../win32/gui/WndMain.c:1425
 msgid "CVGS Memory Card (*.mem;*.vgs)"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1429
+#: ../win32/gui/WndMain.c:1430
 msgid "Bleem Memory Card (*.mcd)"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1434
+#: ../win32/gui/WndMain.c:1435
 msgid "DexDrive Memory Card (*.gme)"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1439
+#: ../win32/gui/WndMain.c:1440
 msgid "DataDeck Memory Card (*.ddf)"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1483
+#: ../win32/gui/WndMain.c:1484
 msgid "Psx Exe Format"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1520
+#: ../win32/gui/WndMain.c:1521
 msgid "Psx Isos (*.iso;*.mdf;*.img;*.bin)"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1596
+#: ../win32/gui/WndMain.c:1597
 msgid "&File"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1597
+#: ../win32/gui/WndMain.c:1598
 msgid "E&xit"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1599
+#: ../win32/gui/WndMain.c:1600
 msgid "Run &EXE..."
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1600
+#: ../win32/gui/WndMain.c:1601
 msgid "Run &BIOS"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1601
+#: ../win32/gui/WndMain.c:1602
 msgid "Run &ISO..."
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1602
+#: ../win32/gui/WndMain.c:1603
 msgid "Run &CD"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1604
+#: ../win32/gui/WndMain.c:1605
 msgid "&Emulator"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1605
+#: ../win32/gui/WndMain.c:1606
 msgid "&States"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1607
+#: ../win32/gui/WndMain.c:1608
 msgid "S&witch ISO..."
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1609
+#: ../win32/gui/WndMain.c:1610
 msgid "Re&set"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1610
+#: ../win32/gui/WndMain.c:1611
 msgid "&Run"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1611
+#: ../win32/gui/WndMain.c:1612
 msgid "&Save"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1612
+#: ../win32/gui/WndMain.c:1613
 msgid "&Load"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1613 ../win32/gui/WndMain.c:1623
+#: ../win32/gui/WndMain.c:1614 ../win32/gui/WndMain.c:1624
 msgid "&Other..."
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1614 ../win32/gui/WndMain.c:1624
+#: ../win32/gui/WndMain.c:1615 ../win32/gui/WndMain.c:1625
 msgid "Slot &9"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1615 ../win32/gui/WndMain.c:1625
+#: ../win32/gui/WndMain.c:1616 ../win32/gui/WndMain.c:1626
 msgid "Slot &8"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1616 ../win32/gui/WndMain.c:1626
+#: ../win32/gui/WndMain.c:1617 ../win32/gui/WndMain.c:1627
 msgid "Slot &7"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1617 ../win32/gui/WndMain.c:1627
+#: ../win32/gui/WndMain.c:1618 ../win32/gui/WndMain.c:1628
 msgid "Slot &6"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1618 ../win32/gui/WndMain.c:1628
+#: ../win32/gui/WndMain.c:1619 ../win32/gui/WndMain.c:1629
 msgid "Slot &5"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1619 ../win32/gui/WndMain.c:1629
+#: ../win32/gui/WndMain.c:1620 ../win32/gui/WndMain.c:1630
 msgid "Slot &4"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1620 ../win32/gui/WndMain.c:1630
+#: ../win32/gui/WndMain.c:1621 ../win32/gui/WndMain.c:1631
 msgid "Slot &3"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1621 ../win32/gui/WndMain.c:1631
+#: ../win32/gui/WndMain.c:1622 ../win32/gui/WndMain.c:1632
 msgid "Slot &2"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1622 ../win32/gui/WndMain.c:1632
+#: ../win32/gui/WndMain.c:1623 ../win32/gui/WndMain.c:1633
 msgid "Slot &1"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1634
+#: ../win32/gui/WndMain.c:1635
 msgid "&Configuration"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1635
+#: ../win32/gui/WndMain.c:1636
 msgid "Cheat &Search..."
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1636
+#: ../win32/gui/WndMain.c:1637
 msgid "Ch&eat Code..."
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1639
+#: ../win32/gui/WndMain.c:1640
 msgid "&Language"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1664
+#: ../win32/gui/WndMain.c:1665
 msgid "&Memory cards..."
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1665
+#: ../win32/gui/WndMain.c:1666
 msgid "C&PU..."
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1667
+#: ../win32/gui/WndMain.c:1668
 msgid "&NetPlay..."
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1669
+#: ../win32/gui/WndMain.c:1670
 msgid "&Controllers..."
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1670
+#: ../win32/gui/WndMain.c:1671
 msgid "CD-&ROM..."
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1671
+#: ../win32/gui/WndMain.c:1672
 msgid "&Sound..."
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1672
+#: ../win32/gui/WndMain.c:1673
 msgid "&Graphics..."
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1674
+#: ../win32/gui/WndMain.c:1675
 msgid "&Plugins && Bios..."
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1676
+#: ../win32/gui/WndMain.c:1677
 msgid "&Help"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1677
+#: ../win32/gui/WndMain.c:1678
 msgid "&About..."
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1865
+#: ../win32/gui/WndMain.c:1866
 msgid "Pcsx Msg"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1868
+#: ../win32/gui/WndMain.c:1869
 msgid "Error Loading Symbol"
 msgstr ""
diff --git a/po/pt_BR.po b/po/pt_BR.po
index d8520696..a44be401 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pcsx-df\n"
 "Report-Msgid-Bugs-To: whistler_wmz@users.sf.net\n"
-"POT-Creation-Date: 2011-02-12 12:56+0800\n"
+"POT-Creation-Date: 2011-02-18 16:56+0800\n"
 "PO-Revision-Date: 2009-11-28 23:57+0700\n"
 "Last-Translator: Wei Mingzhi <whistler@openoffice.org>\n"
 "Language-Team: PoBRE <romhackers@gmail.com>\n"
@@ -66,7 +66,7 @@ msgstr "<b>Tipo do sistema</b>"
 msgid "Address (Hexadecimal):"
 msgstr "Hexadecimal"
 
-#: ../data/pcsx.glade2.h:14 ../win32/gui/WndMain.c:1301
+#: ../data/pcsx.glade2.h:14 ../win32/gui/WndMain.c:1302
 msgid "Autodetect"
 msgstr "Detectar Automaticamente"
 
@@ -186,11 +186,11 @@ msgstr "_Sair"
 msgid "Edit Cheat Codes"
 msgstr "Editar Códigos de Trapaça"
 
-#: ../data/pcsx.glade2.h:44 ../win32/gui/WndMain.c:1303
+#: ../data/pcsx.glade2.h:44 ../win32/gui/WndMain.c:1304
 msgid "Enable Console Output"
 msgstr "Ativar saída no terminal"
 
-#: ../data/pcsx.glade2.h:45 ../win32/gui/WndMain.c:1304
+#: ../data/pcsx.glade2.h:45 ../win32/gui/WndMain.c:1305
 msgid "Enable Debugger"
 msgstr "Ligar debugger"
 
@@ -236,7 +236,7 @@ msgstr "Gráficos..."
 msgid "Graphics:"
 msgstr "Gráficos:"
 
-#: ../data/pcsx.glade2.h:60 ../win32/gui/WndMain.c:1307
+#: ../data/pcsx.glade2.h:60 ../win32/gui/WndMain.c:1308
 msgid "InuYasha Sengoku Battle Fix"
 msgstr "Correção para InuYasha, Sengoku Battle..."
 
@@ -272,7 +272,7 @@ msgstr ""
 msgid "PCSX"
 msgstr "PCSX"
 
-#: ../data/pcsx.glade2.h:69 ../win32/gui/WndMain.c:1306
+#: ../data/pcsx.glade2.h:69 ../win32/gui/WndMain.c:1307
 msgid "Parasite Eve 2, Vandal Hearts 1/2 Fix"
 msgstr "Correção para Parasite Eve 2, Vandal Hearts..."
 
@@ -575,7 +575,7 @@ msgid "PCSX Cheat Code Files (*.cht)"
 msgstr "Arquivos de trapaça do PCSX (*.cht)"
 
 #: ../gui/Cheat.c:321 ../gui/Gtk2Gui.c:446 ../gui/Gtk2Gui.c:587
-#: ../win32/gui/WndMain.c:1444 ../win32/gui/WndMain.c:1525
+#: ../win32/gui/WndMain.c:1445 ../win32/gui/WndMain.c:1526
 msgid "All Files"
 msgstr "Todos os arquivos"
 
@@ -753,14 +753,14 @@ msgstr "Esse arquivo não parece ser um executável válido de PlayStation!"
 msgid "CD ROM failed"
 msgstr "CDROM falhou"
 
-#: ../gui/Gtk2Gui.c:508 ../gui/Gtk2Gui.c:649 ../win32/gui/WndMain.c:463
-#: ../win32/gui/WndMain.c:515 ../win32/gui/WndMain.c:584
+#: ../gui/Gtk2Gui.c:508 ../gui/Gtk2Gui.c:649 ../win32/gui/WndMain.c:464
+#: ../win32/gui/WndMain.c:516 ../win32/gui/WndMain.c:585
 #, c-format
 msgid "The CD does not appear to be a valid Playstation CD"
 msgstr "Esse CD não parece ser um CD de PlayStation!"
 
-#: ../gui/Gtk2Gui.c:519 ../gui/Gtk2Gui.c:660 ../win32/gui/WndMain.c:473
-#: ../win32/gui/WndMain.c:525 ../win32/gui/WndMain.c:594
+#: ../gui/Gtk2Gui.c:519 ../gui/Gtk2Gui.c:660 ../win32/gui/WndMain.c:474
+#: ../win32/gui/WndMain.c:526 ../win32/gui/WndMain.c:595
 #, c-format
 msgid "Could not load CD-ROM!"
 msgstr "Não pôde carregar o CDROM!"
@@ -867,80 +867,80 @@ msgstr "Não pôde carregar o CD-ROM!\n"
 msgid "PSX emulator couldn't be initialized.\n"
 msgstr "O emulador não pôde ser inicializado.\n"
 
-#: ../gui/MemcardDlg.c:56
+#: ../gui/MemcardDlg.c:60
 msgid "Icon"
 msgstr "Ícone"
 
-#: ../gui/MemcardDlg.c:62 ../win32/gui/WndMain.c:748
+#: ../gui/MemcardDlg.c:66 ../win32/gui/WndMain.c:749
 msgid "Title"
 msgstr "Título"
 
-#: ../gui/MemcardDlg.c:68 ../win32/gui/WndMain.c:754
+#: ../gui/MemcardDlg.c:72 ../win32/gui/WndMain.c:755
 msgid "Status"
 msgstr "Estado"
 
-#: ../gui/MemcardDlg.c:74
+#: ../gui/MemcardDlg.c:78
 msgid "ID"
 msgstr "ID"
 
-#: ../gui/MemcardDlg.c:80
+#: ../gui/MemcardDlg.c:84
 msgid "Name"
 msgstr "Nome"
 
-#: ../gui/MemcardDlg.c:155 ../gui/MemcardDlg.c:260 ../win32/gui/WndMain.c:959
+#: ../gui/MemcardDlg.c:192 ../gui/MemcardDlg.c:297 ../win32/gui/WndMain.c:960
 msgid "Deleted"
 msgstr "Apagado"
 
-#: ../gui/MemcardDlg.c:157 ../gui/MemcardDlg.c:161 ../gui/MemcardDlg.c:262
-#: ../gui/MemcardDlg.c:266 ../win32/gui/WndMain.c:960
-#: ../win32/gui/WndMain.c:963
+#: ../gui/MemcardDlg.c:194 ../gui/MemcardDlg.c:198 ../gui/MemcardDlg.c:299
+#: ../gui/MemcardDlg.c:303 ../win32/gui/WndMain.c:961
+#: ../win32/gui/WndMain.c:964
 msgid "Free"
 msgstr "Liberado"
 
-#: ../gui/MemcardDlg.c:159 ../gui/MemcardDlg.c:264 ../win32/gui/WndMain.c:962
+#: ../gui/MemcardDlg.c:196 ../gui/MemcardDlg.c:301 ../win32/gui/WndMain.c:963
 msgid "Used"
 msgstr "Usado"
 
 #. Ask for name of memory card
-#: ../gui/MemcardDlg.c:323
+#: ../gui/MemcardDlg.c:360
 msgid "Select A File"
 msgstr ""
 
-#: ../gui/MemcardDlg.c:364
+#: ../gui/MemcardDlg.c:401
 msgid "Format this Memory Card?"
 msgstr "Formatar esse cartão de memória?"
 
-#: ../gui/MemcardDlg.c:366
+#: ../gui/MemcardDlg.c:403
 msgid ""
 "If you format the memory card, the card will be empty, and any existing data "
 "overwritten."
 msgstr "Ao formatar o cartão de memória, todo o conteúdo será zerado."
 
-#: ../gui/MemcardDlg.c:369
+#: ../gui/MemcardDlg.c:406
 msgid "Format card"
 msgstr "Formatar cartão"
 
 #. Ask for name of new memory card
-#: ../gui/MemcardDlg.c:393
+#: ../gui/MemcardDlg.c:430
 msgid "Create a new Memory Card"
 msgstr ""
 
-#: ../gui/MemcardDlg.c:402
+#: ../gui/MemcardDlg.c:439
 msgid "New Memory Card.mcd"
 msgstr ""
 
 #. No free slots available on the destination card
-#: ../gui/MemcardDlg.c:503
+#: ../gui/MemcardDlg.c:540
 msgid "No free space on memory card"
 msgstr ""
 
-#: ../gui/MemcardDlg.c:504
+#: ../gui/MemcardDlg.c:541
 msgid ""
 "There are no free slots available on the target memory card. Please delete a "
 "slot first."
 msgstr ""
 
-#: ../gui/MemcardDlg.c:667
+#: ../gui/MemcardDlg.c:704
 msgid "Memory Card Manager"
 msgstr "Gerenciador de cartões de memória"
 
@@ -1268,7 +1268,7 @@ msgid ""
 msgstr ""
 
 #: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:24
-#: ../plugins/dfinput/dfinput.ui.h:8 ../win32/gui/WndMain.c:1309
+#: ../plugins/dfinput/dfinput.ui.h:8 ../win32/gui/WndMain.c:1310
 msgid "Options"
 msgstr "Opções"
 
@@ -2419,7 +2419,7 @@ msgstr "Sobre"
 #: ../win32/gui/AboutDlg.c:48 ../win32/gui/AboutDlg.c:52
 #: ../win32/gui/CheatDlg.c:69 ../win32/gui/CheatDlg.c:119
 #: ../win32/gui/ConfigurePlugins.c:483 ../win32/gui/ConfigurePlugins.c:614
-#: ../win32/gui/WndMain.c:1058 ../win32/gui/WndMain.c:1294
+#: ../win32/gui/WndMain.c:1059 ../win32/gui/WndMain.c:1295
 msgid "OK"
 msgstr "OK"
 
@@ -2439,7 +2439,7 @@ msgstr "Não"
 
 #: ../win32/gui/CheatDlg.c:70 ../win32/gui/CheatDlg.c:120
 #: ../win32/gui/ConfigurePlugins.c:484 ../win32/gui/ConfigurePlugins.c:615
-#: ../win32/gui/WndMain.c:1059 ../win32/gui/WndMain.c:1295
+#: ../win32/gui/WndMain.c:1060 ../win32/gui/WndMain.c:1296
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -2661,22 +2661,22 @@ msgstr ""
 "Observação: o diretório da extensão de jogo em rede deve ser o mesmo que "
 "odas outras extensões."
 
-#: ../win32/gui/plugin.c:94 ../win32/gui/WndMain.c:322
+#: ../win32/gui/plugin.c:94 ../win32/gui/WndMain.c:323
 #, c-format
 msgid "*PCSX*: Saved State %d"
 msgstr "PCSX: Estado \"%d\" salvo."
 
-#: ../win32/gui/plugin.c:95 ../win32/gui/WndMain.c:323
+#: ../win32/gui/plugin.c:95 ../win32/gui/WndMain.c:324
 #, c-format
 msgid "*PCSX*: Error Saving State %d"
 msgstr "PCSX: Erro ao salvar o estado \"%d\"!"
 
-#: ../win32/gui/plugin.c:111 ../win32/gui/WndMain.c:300
+#: ../win32/gui/plugin.c:111 ../win32/gui/WndMain.c:301
 #, c-format
 msgid "*PCSX*: Loaded State %d"
 msgstr "PCSX: Estado \"%d\" carregado."
 
-#: ../win32/gui/plugin.c:112 ../win32/gui/WndMain.c:301
+#: ../win32/gui/plugin.c:112 ../win32/gui/WndMain.c:302
 #, c-format
 msgid "*PCSX*: Error Loading State %d"
 msgstr "PCSX: Erro ao carregar o estado \"%d\"!"
@@ -2810,8 +2810,8 @@ msgstr "Alemão"
 msgid "Greek"
 msgstr "Grego"
 
-#: ../win32/gui/WndMain.c:81 ../win32/gui/WndMain.c:1658
-#: ../win32/gui/WndMain.c:1660
+#: ../win32/gui/WndMain.c:81 ../win32/gui/WndMain.c:1659
+#: ../win32/gui/WndMain.c:1661
 msgid "English"
 msgstr "Inglês"
 
@@ -2866,333 +2866,334 @@ msgid ""
 "\toptions:\n"
 "\t-nogui\t\tDon't open the GUI\n"
 "\t-psxout\t\tEnable PSX output\n"
+"\t-slowboot\t\tEnable BIOS logo\n"
 "\t-runcd\t\tRuns CD-ROM (requires -nogui)\n"
 "\t-cdfile FILE\tRuns a CD image file (requires -nogui)\n"
 "\t-help\t\tDisplay this message"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:341 ../win32/gui/WndMain.c:387
+#: ../win32/gui/WndMain.c:342 ../win32/gui/WndMain.c:388
 msgid "PCSX State Format"
 msgstr "Formato dos estados salvos do PCSX"
 
-#: ../win32/gui/WndMain.c:368
+#: ../win32/gui/WndMain.c:369
 #, c-format
 msgid "*PCSX*: Loaded State %s"
 msgstr "PCSX: Arquivo de estado \"%s\" carregado."
 
-#: ../win32/gui/WndMain.c:369
+#: ../win32/gui/WndMain.c:370
 #, c-format
 msgid "*PCSX*: Error Loading State %s"
 msgstr "PCSX: Erro ao carregar o arquivo de estado \"%s\"!"
 
-#: ../win32/gui/WndMain.c:414
+#: ../win32/gui/WndMain.c:415
 #, c-format
 msgid "*PCSX*: Saved State %s"
 msgstr "PCSX: Arquivo de estado \"%s\" salvo."
 
-#: ../win32/gui/WndMain.c:415
+#: ../win32/gui/WndMain.c:416
 #, c-format
 msgid "*PCSX*: Error Saving State %s"
 msgstr "PCSX: Erro ao salvar o arquivo de estado \"%s\"!"
 
-#: ../win32/gui/WndMain.c:483
+#: ../win32/gui/WndMain.c:484
 msgid "Running BIOS is not supported with Internal HLE Bios."
 msgstr "Iniciar pela BIOS não é suportado com a BIOS HLE interna."
 
-#: ../win32/gui/WndMain.c:760
+#: ../win32/gui/WndMain.c:761
 msgid "Game ID"
 msgstr "ID do Jogo"
 
-#: ../win32/gui/WndMain.c:766
+#: ../win32/gui/WndMain.c:767
 msgid "Game"
 msgstr "Jogo"
 
-#: ../win32/gui/WndMain.c:948
+#: ../win32/gui/WndMain.c:949
 msgid "mid link block"
 msgstr "bloco de ligação intermediário"
 
-#: ../win32/gui/WndMain.c:951
+#: ../win32/gui/WndMain.c:952
 msgid "terminiting link block"
 msgstr "bloco final da ligação"
 
-#: ../win32/gui/WndMain.c:1056
+#: ../win32/gui/WndMain.c:1057
 msgid "Memcard Manager"
 msgstr "Gerenciador de cartões de memória"
 
-#: ../win32/gui/WndMain.c:1060 ../win32/gui/WndMain.c:1063
+#: ../win32/gui/WndMain.c:1061 ../win32/gui/WndMain.c:1064
 msgid "Select Mcd"
 msgstr "Selecionar cartão"
 
-#: ../win32/gui/WndMain.c:1061 ../win32/gui/WndMain.c:1064
+#: ../win32/gui/WndMain.c:1062 ../win32/gui/WndMain.c:1065
 msgid "Format Mcd"
 msgstr "Formatar cartão"
 
-#: ../win32/gui/WndMain.c:1062 ../win32/gui/WndMain.c:1065
+#: ../win32/gui/WndMain.c:1063 ../win32/gui/WndMain.c:1066
 msgid "Reload Mcd"
 msgstr "Reiniciar cartão"
 
-#: ../win32/gui/WndMain.c:1066
+#: ../win32/gui/WndMain.c:1067
 msgid "-> Copy ->"
 msgstr "-> Copiar ->"
 
-#: ../win32/gui/WndMain.c:1067
+#: ../win32/gui/WndMain.c:1068
 msgid "<- Copy <-"
 msgstr "<- Copiar <-"
 
-#: ../win32/gui/WndMain.c:1068
+#: ../win32/gui/WndMain.c:1069
 msgid "Paste"
 msgstr "Colar"
 
-#: ../win32/gui/WndMain.c:1069
+#: ../win32/gui/WndMain.c:1070
 msgid "<- Un/Delete"
 msgstr "<- Apagar/Desfazer"
 
-#: ../win32/gui/WndMain.c:1070
+#: ../win32/gui/WndMain.c:1071
 msgid "Un/Delete ->"
 msgstr "Apagar/Desfazer ->"
 
-#: ../win32/gui/WndMain.c:1072
+#: ../win32/gui/WndMain.c:1073
 msgid "Memory Card 1"
 msgstr "Cartão de memória 1"
 
-#: ../win32/gui/WndMain.c:1073
+#: ../win32/gui/WndMain.c:1074
 msgid "Memory Card 2"
 msgstr "Cartão de memória 2"
 
-#: ../win32/gui/WndMain.c:1128
+#: ../win32/gui/WndMain.c:1129
 msgid "Are you sure you want to paste this selection?"
 msgstr "Você tem certeza que quer colar o selecionado?"
 
-#: ../win32/gui/WndMain.c:1128 ../win32/gui/WndMain.c:1239
-#: ../win32/gui/WndMain.c:1246
+#: ../win32/gui/WndMain.c:1129 ../win32/gui/WndMain.c:1240
+#: ../win32/gui/WndMain.c:1247
 msgid "Confirmation"
 msgstr "Confirmação"
 
-#: ../win32/gui/WndMain.c:1239 ../win32/gui/WndMain.c:1246
+#: ../win32/gui/WndMain.c:1240 ../win32/gui/WndMain.c:1247
 msgid "Are you sure you want to format this Memory Card?"
 msgstr "Você tem certeza que quer formatar esse Cartão de Memória?"
 
-#: ../win32/gui/WndMain.c:1292
+#: ../win32/gui/WndMain.c:1293
 msgid "Cpu Config"
 msgstr "Configuração da CPU"
 
-#: ../win32/gui/WndMain.c:1297
+#: ../win32/gui/WndMain.c:1298
 msgid "Disable Xa Decoding"
 msgstr "Desativar decodificação de XA"
 
-#: ../win32/gui/WndMain.c:1298
+#: ../win32/gui/WndMain.c:1299
 msgid "Sio Irq Always Enabled"
 msgstr "IRQ SIO sempre ativado"
 
-#: ../win32/gui/WndMain.c:1299
+#: ../win32/gui/WndMain.c:1300
 msgid "Black && White Movies"
 msgstr "Filmes em preto e branco"
 
-#: ../win32/gui/WndMain.c:1300
+#: ../win32/gui/WndMain.c:1301
 msgid "Disable Cd audio"
 msgstr "Desativar áudio de CD"
 
-#: ../win32/gui/WndMain.c:1302
+#: ../win32/gui/WndMain.c:1303
 msgid "Enable Interpreter Cpu"
 msgstr "Ativar interpretador da CPU"
 
-#: ../win32/gui/WndMain.c:1305
+#: ../win32/gui/WndMain.c:1306
 msgid "Spu Irq Always Enabled"
 msgstr "IRQ da SPU sempre ligada"
 
-#: ../win32/gui/WndMain.c:1310
+#: ../win32/gui/WndMain.c:1311
 msgid "Psx System Type"
 msgstr "Tipo de sistema do PSX"
 
-#: ../win32/gui/WndMain.c:1414
+#: ../win32/gui/WndMain.c:1415
 msgid "Psx Mcd Format (*.mcr;*.mc;*.mem;*.vgs;*.mcd;*.gme;*.ddf)"
 msgstr "Qualquer formato (*.mcr;*.mc;*.mem;*.vgs;*.mcd;*.gme;*.ddf)"
 
-#: ../win32/gui/WndMain.c:1419
+#: ../win32/gui/WndMain.c:1420
 msgid "Psx Memory Card (*.mcr;*.mc)"
 msgstr "Cartão de memória binário (*.mcr;*.mc)"
 
-#: ../win32/gui/WndMain.c:1424
+#: ../win32/gui/WndMain.c:1425
 msgid "CVGS Memory Card (*.mem;*.vgs)"
 msgstr "Cartão de memória do CVGS (*.mem;*.vgs)"
 
-#: ../win32/gui/WndMain.c:1429
+#: ../win32/gui/WndMain.c:1430
 msgid "Bleem Memory Card (*.mcd)"
 msgstr "Cartão de memória do Bleem (*.mcd)"
 
-#: ../win32/gui/WndMain.c:1434
+#: ../win32/gui/WndMain.c:1435
 msgid "DexDrive Memory Card (*.gme)"
 msgstr "Cartão de memória do DexDrive (*.gme)"
 
-#: ../win32/gui/WndMain.c:1439
+#: ../win32/gui/WndMain.c:1440
 msgid "DataDeck Memory Card (*.ddf)"
 msgstr "Cartão de memória do DataDeck (*.ddf)"
 
-#: ../win32/gui/WndMain.c:1483
+#: ../win32/gui/WndMain.c:1484
 msgid "Psx Exe Format"
 msgstr "Formato executável do PSX"
 
-#: ../win32/gui/WndMain.c:1520
+#: ../win32/gui/WndMain.c:1521
 msgid "Psx Isos (*.iso;*.mdf;*.img;*.bin)"
 msgstr "Imagens de CD (*.iso;*.mdf;*.img;*.bin)"
 
-#: ../win32/gui/WndMain.c:1596
+#: ../win32/gui/WndMain.c:1597
 msgid "&File"
 msgstr "&Arquivo"
 
-#: ../win32/gui/WndMain.c:1597
+#: ../win32/gui/WndMain.c:1598
 msgid "E&xit"
 msgstr "&Sair"
 
-#: ../win32/gui/WndMain.c:1599
+#: ../win32/gui/WndMain.c:1600
 msgid "Run &EXE..."
 msgstr "Rodar &EXE..."
 
-#: ../win32/gui/WndMain.c:1600
+#: ../win32/gui/WndMain.c:1601
 msgid "Run &BIOS"
 msgstr "Iniciar pela &BIOS"
 
-#: ../win32/gui/WndMain.c:1601
+#: ../win32/gui/WndMain.c:1602
 msgid "Run &ISO..."
 msgstr "Rodar &imagem de CD..."
 
-#: ../win32/gui/WndMain.c:1602
+#: ../win32/gui/WndMain.c:1603
 msgid "Run &CD"
 msgstr "Rodar &CD"
 
-#: ../win32/gui/WndMain.c:1604
+#: ../win32/gui/WndMain.c:1605
 msgid "&Emulator"
 msgstr "&Emulador"
 
-#: ../win32/gui/WndMain.c:1605
+#: ../win32/gui/WndMain.c:1606
 msgid "&States"
 msgstr "&Estados"
 
-#: ../win32/gui/WndMain.c:1607
+#: ../win32/gui/WndMain.c:1608
 msgid "S&witch ISO..."
 msgstr "T&rocar de imagem de CD..."
 
-#: ../win32/gui/WndMain.c:1609
+#: ../win32/gui/WndMain.c:1610
 msgid "Re&set"
 msgstr "Re&iniciar"
 
-#: ../win32/gui/WndMain.c:1610
+#: ../win32/gui/WndMain.c:1611
 msgid "&Run"
 msgstr "&Executar"
 
-#: ../win32/gui/WndMain.c:1611
+#: ../win32/gui/WndMain.c:1612
 msgid "&Save"
 msgstr "&Salvar"
 
-#: ../win32/gui/WndMain.c:1612
+#: ../win32/gui/WndMain.c:1613
 msgid "&Load"
 msgstr "&Carregar"
 
-#: ../win32/gui/WndMain.c:1613 ../win32/gui/WndMain.c:1623
+#: ../win32/gui/WndMain.c:1614 ../win32/gui/WndMain.c:1624
 msgid "&Other..."
 msgstr "&Outros..."
 
-#: ../win32/gui/WndMain.c:1614 ../win32/gui/WndMain.c:1624
+#: ../win32/gui/WndMain.c:1615 ../win32/gui/WndMain.c:1625
 #, fuzzy
 msgid "Slot &9"
 msgstr "Unidade &5"
 
-#: ../win32/gui/WndMain.c:1615 ../win32/gui/WndMain.c:1625
+#: ../win32/gui/WndMain.c:1616 ../win32/gui/WndMain.c:1626
 #, fuzzy
 msgid "Slot &8"
 msgstr "Unidade &5"
 
-#: ../win32/gui/WndMain.c:1616 ../win32/gui/WndMain.c:1626
+#: ../win32/gui/WndMain.c:1617 ../win32/gui/WndMain.c:1627
 #, fuzzy
 msgid "Slot &7"
 msgstr "Unidade &5"
 
-#: ../win32/gui/WndMain.c:1617 ../win32/gui/WndMain.c:1627
+#: ../win32/gui/WndMain.c:1618 ../win32/gui/WndMain.c:1628
 #, fuzzy
 msgid "Slot &6"
 msgstr "Unidade &5"
 
-#: ../win32/gui/WndMain.c:1618 ../win32/gui/WndMain.c:1628
+#: ../win32/gui/WndMain.c:1619 ../win32/gui/WndMain.c:1629
 msgid "Slot &5"
 msgstr "Unidade &5"
 
-#: ../win32/gui/WndMain.c:1619 ../win32/gui/WndMain.c:1629
+#: ../win32/gui/WndMain.c:1620 ../win32/gui/WndMain.c:1630
 msgid "Slot &4"
 msgstr "Unidade &4"
 
-#: ../win32/gui/WndMain.c:1620 ../win32/gui/WndMain.c:1630
+#: ../win32/gui/WndMain.c:1621 ../win32/gui/WndMain.c:1631
 msgid "Slot &3"
 msgstr "Unidade &3"
 
-#: ../win32/gui/WndMain.c:1621 ../win32/gui/WndMain.c:1631
+#: ../win32/gui/WndMain.c:1622 ../win32/gui/WndMain.c:1632
 msgid "Slot &2"
 msgstr "Unidade &2"
 
-#: ../win32/gui/WndMain.c:1622 ../win32/gui/WndMain.c:1632
+#: ../win32/gui/WndMain.c:1623 ../win32/gui/WndMain.c:1633
 msgid "Slot &1"
 msgstr "Unidade &1"
 
-#: ../win32/gui/WndMain.c:1634
+#: ../win32/gui/WndMain.c:1635
 msgid "&Configuration"
 msgstr "&Configuração"
 
-#: ../win32/gui/WndMain.c:1635
+#: ../win32/gui/WndMain.c:1636
 msgid "Cheat &Search..."
 msgstr "Procurar por &trapaça..."
 
-#: ../win32/gui/WndMain.c:1636
+#: ../win32/gui/WndMain.c:1637
 msgid "Ch&eat Code..."
 msgstr "&Código de trapaça..."
 
-#: ../win32/gui/WndMain.c:1639
+#: ../win32/gui/WndMain.c:1640
 msgid "&Language"
 msgstr "&Linguagem"
 
-#: ../win32/gui/WndMain.c:1664
+#: ../win32/gui/WndMain.c:1665
 msgid "&Memory cards..."
 msgstr "&Cartões de memória..."
 
-#: ../win32/gui/WndMain.c:1665
+#: ../win32/gui/WndMain.c:1666
 msgid "C&PU..."
 msgstr "C&PU..."
 
-#: ../win32/gui/WndMain.c:1667
+#: ../win32/gui/WndMain.c:1668
 msgid "&NetPlay..."
 msgstr "&Jogo em rede..."
 
-#: ../win32/gui/WndMain.c:1669
+#: ../win32/gui/WndMain.c:1670
 msgid "&Controllers..."
 msgstr "&Controles..."
 
-#: ../win32/gui/WndMain.c:1670
+#: ../win32/gui/WndMain.c:1671
 msgid "CD-&ROM..."
 msgstr "CD&ROM..."
 
-#: ../win32/gui/WndMain.c:1671
+#: ../win32/gui/WndMain.c:1672
 msgid "&Sound..."
 msgstr "Á&udio..."
 
-#: ../win32/gui/WndMain.c:1672
+#: ../win32/gui/WndMain.c:1673
 msgid "&Graphics..."
 msgstr "&Gráficos..."
 
-#: ../win32/gui/WndMain.c:1674
+#: ../win32/gui/WndMain.c:1675
 msgid "&Plugins && Bios..."
 msgstr "&Extensões e BIOS..."
 
-#: ../win32/gui/WndMain.c:1676
+#: ../win32/gui/WndMain.c:1677
 msgid "&Help"
 msgstr "&Ajuda"
 
-#: ../win32/gui/WndMain.c:1677
+#: ../win32/gui/WndMain.c:1678
 msgid "&About..."
 msgstr "&Sobre..."
 
-#: ../win32/gui/WndMain.c:1865
+#: ../win32/gui/WndMain.c:1866
 msgid "Pcsx Msg"
 msgstr "Mensagens do PCSX"
 
-#: ../win32/gui/WndMain.c:1868
+#: ../win32/gui/WndMain.c:1869
 msgid "Error Loading Symbol"
 msgstr "Erro ao carregar símbolo"
 
diff --git a/po/ru_RU.po b/po/ru_RU.po
index 0d87038d..e45c43b9 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pcsxr 1.0\n"
 "Report-Msgid-Bugs-To: whistler_wmz@users.sf.net\n"
-"POT-Creation-Date: 2011-02-12 12:56+0800\n"
+"POT-Creation-Date: 2011-02-18 16:56+0800\n"
 "PO-Revision-Date: 2011-02-12 23:46+0300\n"
 "Last-Translator: Blade_Arma <edgbla@yandex.ru>\n"
 "Language-Team: American English <kde-i18n-doc@kde.org>\n"
@@ -64,13 +64,11 @@ msgstr "<b>Плагины</b>"
 msgid "<b>System Type</b>"
 msgstr "<b>Тип системы</b>"
 
-#: ../data/pcsx.glade2.h:13
-#: ../gui/DebugMemory.c:188
+#: ../data/pcsx.glade2.h:13 ../gui/DebugMemory.c:188
 msgid "Address (Hexadecimal):"
 msgstr "Адрес (шестнадцатиричный):"
 
-#: ../data/pcsx.glade2.h:14
-#: ../win32/gui/WndMain.c:1301
+#: ../data/pcsx.glade2.h:14 ../win32/gui/WndMain.c:1302
 msgid "Autodetect"
 msgstr "Авто-определение"
 
@@ -98,9 +96,7 @@ msgstr "Управление..."
 msgid "Chea_t"
 msgstr "Читы"
 
-#: ../data/pcsx.glade2.h:21
-#: ../gui/Cheat.c:1129
-#: ../win32/gui/CheatDlg.c:678
+#: ../data/pcsx.glade2.h:21 ../gui/Cheat.c:1129 ../win32/gui/CheatDlg.c:678
 msgid "Cheat Search"
 msgstr "Поиск читов"
 
@@ -128,13 +124,11 @@ msgstr "Настройка карт памяти"
 msgid "Configure NetPlay"
 msgstr "Настройка сетевой игры"
 
-#: ../data/pcsx.glade2.h:28
-#: ../gui/ConfDlg.c:112
+#: ../data/pcsx.glade2.h:28 ../gui/ConfDlg.c:112
 msgid "Configure PCSX"
 msgstr "Настройка PCSX"
 
-#: ../data/pcsx.glade2.h:29
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:6
+#: ../data/pcsx.glade2.h:29 ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:6
 msgid "Configure Sound"
 msgstr "Настройка звука"
 
@@ -162,13 +156,11 @@ msgstr "Контроллеры..."
 msgid "Copy"
 msgstr "Копировать"
 
-#: ../data/pcsx.glade2.h:36
-#: ../win32/gui/CheatDlg.c:683
+#: ../data/pcsx.glade2.h:36 ../win32/gui/CheatDlg.c:683
 msgid "Data Base:"
 msgstr "Основание:"
 
-#: ../data/pcsx.glade2.h:37
-#: ../win32/gui/CheatDlg.c:681
+#: ../data/pcsx.glade2.h:37 ../win32/gui/CheatDlg.c:681
 msgid "Data Type:"
 msgstr "Тип данных:"
 
@@ -192,18 +184,15 @@ msgstr "Выключить декодирование XA"
 msgid "E_xit"
 msgstr "Выход"
 
-#: ../data/pcsx.glade2.h:43
-#: ../win32/gui/CheatDlg.c:166
+#: ../data/pcsx.glade2.h:43 ../win32/gui/CheatDlg.c:166
 msgid "Edit Cheat Codes"
 msgstr "Редактировать чит код"
 
-#: ../data/pcsx.glade2.h:44
-#: ../win32/gui/WndMain.c:1303
+#: ../data/pcsx.glade2.h:44 ../win32/gui/WndMain.c:1304
 msgid "Enable Console Output"
 msgstr "Включить вывод в консоль"
 
-#: ../data/pcsx.glade2.h:45
-#: ../win32/gui/WndMain.c:1304
+#: ../data/pcsx.glade2.h:45 ../win32/gui/WndMain.c:1305
 msgid "Enable Debugger"
 msgstr "Включить отладчик"
 
@@ -237,8 +226,7 @@ msgstr ""
 msgid "Format"
 msgstr "Форматировать"
 
-#: ../data/pcsx.glade2.h:57
-#: ../win32/gui/CheatDlg.c:504
+#: ../data/pcsx.glade2.h:57 ../win32/gui/CheatDlg.c:504
 msgid "Freeze"
 msgstr "Заморозить"
 
@@ -250,8 +238,7 @@ msgstr "Графика..."
 msgid "Graphics:"
 msgstr "Графика:"
 
-#: ../data/pcsx.glade2.h:60
-#: ../win32/gui/WndMain.c:1307
+#: ../data/pcsx.glade2.h:60 ../win32/gui/WndMain.c:1308
 msgid "InuYasha Sengoku Battle Fix"
 msgstr "Исправление для InuYasha Sengoku Battle"
 
@@ -259,8 +246,7 @@ msgstr "Исправление для InuYasha Sengoku Battle"
 msgid "Memcards..."
 msgstr "Карты памяти..."
 
-#: ../data/pcsx.glade2.h:62
-#: ../gui/DebugMemory.c:103
+#: ../data/pcsx.glade2.h:62 ../gui/DebugMemory.c:103
 msgid "Memory Dump"
 msgstr "Дамп памяти"
 
@@ -268,8 +254,7 @@ msgstr "Дамп памяти"
 msgid "Memory _Dump"
 msgstr "Дамп памяти"
 
-#: ../data/pcsx.glade2.h:64
-#: ../win32/gui/CheatDlg.c:595
+#: ../data/pcsx.glade2.h:64 ../win32/gui/CheatDlg.c:595
 msgid "Modify"
 msgstr "Изменить"
 
@@ -287,8 +272,7 @@ msgstr "Создать"
 msgid "PCSX"
 msgstr ""
 
-#: ../data/pcsx.glade2.h:69
-#: ../win32/gui/WndMain.c:1306
+#: ../data/pcsx.glade2.h:69 ../win32/gui/WndMain.c:1307
 msgid "Parasite Eve 2, Vandal Hearts 1/2 Fix"
 msgstr "Исправление для Parasite Eve 2 и Vandal Hearts"
 
@@ -332,8 +316,7 @@ msgstr "Запустить _EXE"
 msgid "Run _ISO..."
 msgstr "Запустить _ISO"
 
-#: ../data/pcsx.glade2.h:80
-#: ../gui/Plugin.c:239
+#: ../data/pcsx.glade2.h:80 ../gui/Plugin.c:239
 #, c-format
 msgid "SIO IRQ Always Enabled"
 msgstr "Удерживание линии прерывания SIO"
@@ -350,8 +333,7 @@ msgstr "Сменить ISO..."
 msgid "Search"
 msgstr "Поиск"
 
-#: ../data/pcsx.glade2.h:84
-#: ../win32/gui/CheatDlg.c:680
+#: ../data/pcsx.glade2.h:84 ../win32/gui/CheatDlg.c:680
 msgid "Search For:"
 msgstr "Искать для:"
 
@@ -415,8 +397,7 @@ msgstr "Сменить образ ISO"
 msgid "Switch ISO..."
 msgstr "Сменить ISO..."
 
-#: ../data/pcsx.glade2.h:100
-#: ../win32/gui/CheatDlg.c:684
+#: ../data/pcsx.glade2.h:100 ../win32/gui/CheatDlg.c:684
 msgid "To:"
 msgstr "До:"
 
@@ -424,11 +405,8 @@ msgstr "До:"
 msgid "Un/Delete"
 msgstr "Восстановить блок"
 
-#: ../data/pcsx.glade2.h:102
-#: ../gui/Cheat.c:647
-#: ../win32/gui/CheatDlg.c:506
-#: ../win32/gui/CheatDlg.c:597
-#: ../win32/gui/CheatDlg.c:682
+#: ../data/pcsx.glade2.h:102 ../gui/Cheat.c:647 ../win32/gui/CheatDlg.c:506
+#: ../win32/gui/CheatDlg.c:597 ../win32/gui/CheatDlg.c:682
 msgid "Value:"
 msgstr "Значение:"
 
@@ -517,11 +495,19 @@ msgstr ""
 
 #: ../gui/AboutDlg.c:77
 msgid ""
-"This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\n"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
 "\n"
-"This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
+"more details.\n"
 "\n"
-"You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA."
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA."
 msgstr ""
 
 #: ../gui/AboutDlg.c:100
@@ -532,39 +518,30 @@ msgstr "edgbla"
 msgid "A PlayStation emulator."
 msgstr "Эмулятор PlayStation."
 
-#: ../gui/Cheat.c:109
-#: ../win32/gui/CheatDlg.c:116
+#: ../gui/Cheat.c:109 ../win32/gui/CheatDlg.c:116
 msgid "Add New Cheat"
 msgstr "Добавить новый чит"
 
-#: ../gui/Cheat.c:117
-#: ../gui/Cheat.c:202
+#: ../gui/Cheat.c:117 ../gui/Cheat.c:202
 msgid "Cheat Description:"
 msgstr "Описание чита:"
 
-#: ../gui/Cheat.c:125
-#: ../gui/Cheat.c:211
-#: ../win32/gui/CheatDlg.c:68
+#: ../gui/Cheat.c:125 ../gui/Cheat.c:211 ../win32/gui/CheatDlg.c:68
 #: ../win32/gui/CheatDlg.c:118
 msgid "Cheat Code:"
 msgstr "Чит код:"
 
-#: ../gui/Cheat.c:155
-#: ../gui/Cheat.c:251
-#: ../gui/LnxMain.c:422
+#: ../gui/Cheat.c:155 ../gui/Cheat.c:251 ../gui/LnxMain.c:422
 #: ../win32/gui/ConfigurePlugins.c:305
 msgid "Error"
 msgstr "Ошибка"
 
-#: ../gui/Cheat.c:155
-#: ../gui/Cheat.c:251
-#: ../win32/gui/CheatDlg.c:91
+#: ../gui/Cheat.c:155 ../gui/Cheat.c:251 ../win32/gui/CheatDlg.c:91
 #: ../win32/gui/CheatDlg.c:132
 msgid "Invalid cheat code!"
 msgstr "Неверный чит код!"
 
-#: ../gui/Cheat.c:194
-#: ../win32/gui/CheatDlg.c:66
+#: ../gui/Cheat.c:194 ../win32/gui/CheatDlg.c:66
 msgid "Edit Cheat"
 msgstr "Редактирование чита"
 
@@ -572,16 +549,12 @@ msgstr "Редактирование чита"
 msgid "Open Cheat File"
 msgstr "Открыть файл чита"
 
-#: ../gui/Cheat.c:316
-#: ../gui/Cheat.c:356
+#: ../gui/Cheat.c:316 ../gui/Cheat.c:356
 msgid "PCSX Cheat Code Files (*.cht)"
 msgstr "Файлы читов PCSX (*.cht)"
 
-#: ../gui/Cheat.c:321
-#: ../gui/Gtk2Gui.c:446
-#: ../gui/Gtk2Gui.c:587
-#: ../win32/gui/WndMain.c:1444
-#: ../win32/gui/WndMain.c:1525
+#: ../gui/Cheat.c:321 ../gui/Gtk2Gui.c:446 ../gui/Gtk2Gui.c:587
+#: ../win32/gui/WndMain.c:1445 ../win32/gui/WndMain.c:1526
 msgid "All Files"
 msgstr "Все файлы"
 
@@ -593,11 +566,8 @@ msgstr "Сохранить чит файл"
 msgid "All Files (*.*)"
 msgstr "Все файлы (*.*)"
 
-#: ../gui/Cheat.c:394
-#: ../gui/Cheat.c:1124
-#: ../gui/ConfDlg.c:104
-#: ../gui/ConfDlg.c:200
-#: ../gui/DebugMemory.c:259
+#: ../gui/Cheat.c:394 ../gui/Cheat.c:1124 ../gui/ConfDlg.c:104
+#: ../gui/ConfDlg.c:200 ../gui/DebugMemory.c:259
 msgid "Error: Glade interface could not be loaded!"
 msgstr "Ошибка: интерфейс Glade не может быть загружен!"
 
@@ -609,42 +579,35 @@ msgstr "Чит коды"
 msgid "Enable"
 msgstr "Включить"
 
-#: ../gui/Cheat.c:413
-#: ../win32/gui/CheatDlg.c:185
+#: ../gui/Cheat.c:413 ../win32/gui/CheatDlg.c:185
 msgid "Description"
 msgstr "Описание"
 
-#: ../gui/Cheat.c:543
-#: ../win32/gui/CheatDlg.c:457
+#: ../gui/Cheat.c:543 ../win32/gui/CheatDlg.c:457
 msgid "Too many addresses found."
 msgstr "Слишком много адресов найдено."
 
-#: ../gui/Cheat.c:552
-#: ../win32/gui/CheatDlg.c:466
+#: ../gui/Cheat.c:552 ../win32/gui/CheatDlg.c:466
 #, c-format
 msgid "%.8X    Current: %u (%.2X), Previous: %u (%.2X)"
 msgstr "%.8X    Текущее: %u (%.2X), Предыдущее: %u (%.2X)"
 
-#: ../gui/Cheat.c:557
-#: ../win32/gui/CheatDlg.c:471
+#: ../gui/Cheat.c:557 ../win32/gui/CheatDlg.c:471
 #, c-format
 msgid "%.8X    Current: %u (%.4X), Previous: %u (%.4X)"
 msgstr "%.8X    Текущее: %u (%.4X), Предыдущее: %u (%.4X)"
 
-#: ../gui/Cheat.c:562
-#: ../win32/gui/CheatDlg.c:476
+#: ../gui/Cheat.c:562 ../win32/gui/CheatDlg.c:476
 #, c-format
 msgid "%.8X    Current: %u (%.8X), Previous: %u (%.8X)"
 msgstr "%.8X    Текущее: %u (%.8X), Предыдущее: %u (%.8X)"
 
-#: ../gui/Cheat.c:577
-#: ../win32/gui/CheatDlg.c:492
+#: ../gui/Cheat.c:577 ../win32/gui/CheatDlg.c:492
 #, c-format
 msgid "Founded Addresses: %d"
 msgstr "Найденные адреса: %d"
 
-#: ../gui/Cheat.c:585
-#: ../win32/gui/CheatDlg.c:448
+#: ../gui/Cheat.c:585 ../win32/gui/CheatDlg.c:448
 msgid "Enter the values and start your search."
 msgstr "Введите значение и начните поиск."
 
@@ -652,9 +615,7 @@ msgstr "Введите значение и начните поиск."
 msgid "Freeze value"
 msgstr "Заморозить значение"
 
-#: ../gui/Cheat.c:636
-#: ../win32/gui/CheatDlg.c:67
-#: ../win32/gui/CheatDlg.c:117
+#: ../gui/Cheat.c:636 ../win32/gui/CheatDlg.c:67 ../win32/gui/CheatDlg.c:117
 msgid "Description:"
 msgstr "Описание:"
 
@@ -675,19 +636,13 @@ msgstr "Результат поиска"
 #. disabled widgets
 #. TODO If combo screen hasn't been opened and the user chooses the menu config option, confs.Combo will be null and cause a segfault
 #. printf("Configuring plugin %s\n", filename);
-#: ../gui/ConfDlg.c:237
-#: ../gui/ConfDlg.c:258
-#: ../gui/ConfDlg.c:279
-#: ../gui/ConfDlg.c:300
-#: ../gui/ConfDlg.c:355
+#: ../gui/ConfDlg.c:237 ../gui/ConfDlg.c:258 ../gui/ConfDlg.c:279
+#: ../gui/ConfDlg.c:300 ../gui/ConfDlg.c:355
 msgid "No configuration required"
 msgstr "Настройка не требуется"
 
-#: ../gui/ConfDlg.c:237
-#: ../gui/ConfDlg.c:258
-#: ../gui/ConfDlg.c:279
-#: ../gui/ConfDlg.c:300
-#: ../gui/ConfDlg.c:355
+#: ../gui/ConfDlg.c:237 ../gui/ConfDlg.c:258 ../gui/ConfDlg.c:279
+#: ../gui/ConfDlg.c:300 ../gui/ConfDlg.c:355
 msgid "This plugin doesn't need to be configured."
 msgstr "Плагин не нуждается в настройке."
 
@@ -696,9 +651,7 @@ msgstr "Плагин не нуждается в настройке."
 msgid "Could not open BIOS directory: '%s'\n"
 msgstr "Не удалось открыть каталог с биосами BIOS: \"%s\"\n"
 
-#: ../gui/ConfDlg.c:611
-#: ../gui/ConfDlg.c:704
-#: ../gui/LnxMain.c:168
+#: ../gui/ConfDlg.c:611 ../gui/ConfDlg.c:704 ../gui/LnxMain.c:168
 #, c-format
 msgid "Could not open directory: '%s'\n"
 msgstr "Не удалось открыть каталог: '%s'\n"
@@ -769,31 +722,23 @@ msgstr "Недопустимый формат файла"
 msgid "The file does not appear to be a valid Playstation executable"
 msgstr "Файл не является запускным файлом PlayStation"
 
-#: ../gui/Gtk2Gui.c:508
-#: ../gui/Gtk2Gui.c:649
+#: ../gui/Gtk2Gui.c:508 ../gui/Gtk2Gui.c:649
 msgid "CD ROM failed"
 msgstr "Ошибка CD-привода"
 
-#: ../gui/Gtk2Gui.c:508
-#: ../gui/Gtk2Gui.c:649
-#: ../win32/gui/WndMain.c:463
-#: ../win32/gui/WndMain.c:515
-#: ../win32/gui/WndMain.c:584
+#: ../gui/Gtk2Gui.c:508 ../gui/Gtk2Gui.c:649 ../win32/gui/WndMain.c:464
+#: ../win32/gui/WndMain.c:516 ../win32/gui/WndMain.c:585
 #, c-format
 msgid "The CD does not appear to be a valid Playstation CD"
 msgstr "Установленный CD-диск не является диском PlayStation"
 
-#: ../gui/Gtk2Gui.c:519
-#: ../gui/Gtk2Gui.c:660
-#: ../win32/gui/WndMain.c:473
-#: ../win32/gui/WndMain.c:525
-#: ../win32/gui/WndMain.c:594
+#: ../gui/Gtk2Gui.c:519 ../gui/Gtk2Gui.c:660 ../win32/gui/WndMain.c:474
+#: ../win32/gui/WndMain.c:526 ../win32/gui/WndMain.c:595
 #, c-format
 msgid "Could not load CD-ROM!"
 msgstr "Не удалось загрузить CD-ROM!"
 
-#: ../gui/Gtk2Gui.c:519
-#: ../gui/Gtk2Gui.c:660
+#: ../gui/Gtk2Gui.c:519 ../gui/Gtk2Gui.c:660
 msgid "The CD-ROM could not be loaded"
 msgstr "Не удалось загрузить CD-ROM"
 
@@ -803,7 +748,9 @@ msgstr "Не удалось запустить биос"
 
 #: ../gui/Gtk2Gui.c:533
 msgid "Running BIOS is not supported with Internal HLE BIOS."
-msgstr "Стандартная оболочка, позволяющая управлять картами памяти и проигрывать DA музыку, при использовании HLE-биоса недоступна."
+msgstr ""
+"Стандартная оболочка, позволяющая управлять картами памяти и проигрывать DA "
+"музыку, при использовании HLE-биоса недоступна."
 
 #: ../gui/Gtk2Gui.c:562
 msgid "Open PSX Disc Image File"
@@ -833,8 +780,7 @@ msgstr "Состояние сохранено %s."
 msgid "Error saving state %s!"
 msgstr "Ошибка сохранения состояния %s!"
 
-#: ../gui/Gtk2Gui.c:864
-#: ../gui/Gtk2Gui.c:892
+#: ../gui/Gtk2Gui.c:864 ../gui/Gtk2Gui.c:892
 msgid "Select State File"
 msgstr "Выберите файл состояния"
 
@@ -875,8 +821,12 @@ msgstr ""
 
 #: ../gui/LnxMain.c:366
 #, c-format
-msgid "PCSX cannot be configured without using the GUI -- you should restart without -nogui.\n"
-msgstr "PCSX не может быть настроен без использования графического интерфейса -- необходимо перезапустить эмулятор без опции -nogui.\n"
+msgid ""
+"PCSX cannot be configured without using the GUI -- you should restart "
+"without -nogui.\n"
+msgstr ""
+"PCSX не может быть настроен без использования графического интерфейса -- "
+"необходимо перезапустить эмулятор без опции -nogui.\n"
 
 #: ../gui/LnxMain.c:422
 msgid "Failed loading plugins!"
@@ -892,85 +842,81 @@ msgstr "Не удалось загрузить CD-ROM!\n"
 msgid "PSX emulator couldn't be initialized.\n"
 msgstr "Ошибка инициализации эмулятора.\n"
 
-#: ../gui/MemcardDlg.c:56
+#: ../gui/MemcardDlg.c:60
 msgid "Icon"
 msgstr "Иконка"
 
-#: ../gui/MemcardDlg.c:62
-#: ../win32/gui/WndMain.c:748
+#: ../gui/MemcardDlg.c:66 ../win32/gui/WndMain.c:749
 msgid "Title"
 msgstr "Название"
 
-#: ../gui/MemcardDlg.c:68
-#: ../win32/gui/WndMain.c:754
+#: ../gui/MemcardDlg.c:72 ../win32/gui/WndMain.c:755
 msgid "Status"
 msgstr "Статус"
 
-#: ../gui/MemcardDlg.c:74
+#: ../gui/MemcardDlg.c:78
 msgid "ID"
 msgstr "Идентификатор"
 
-#: ../gui/MemcardDlg.c:80
+#: ../gui/MemcardDlg.c:84
 msgid "Name"
 msgstr "Название"
 
-#: ../gui/MemcardDlg.c:155
-#: ../gui/MemcardDlg.c:260
-#: ../win32/gui/WndMain.c:959
+#: ../gui/MemcardDlg.c:192 ../gui/MemcardDlg.c:297 ../win32/gui/WndMain.c:960
 msgid "Deleted"
 msgstr "Удалено"
 
-#: ../gui/MemcardDlg.c:157
-#: ../gui/MemcardDlg.c:161
-#: ../gui/MemcardDlg.c:262
-#: ../gui/MemcardDlg.c:266
-#: ../win32/gui/WndMain.c:960
-#: ../win32/gui/WndMain.c:963
+#: ../gui/MemcardDlg.c:194 ../gui/MemcardDlg.c:198 ../gui/MemcardDlg.c:299
+#: ../gui/MemcardDlg.c:303 ../win32/gui/WndMain.c:961
+#: ../win32/gui/WndMain.c:964
 msgid "Free"
 msgstr "Свободно"
 
-#: ../gui/MemcardDlg.c:159
-#: ../gui/MemcardDlg.c:264
-#: ../win32/gui/WndMain.c:962
+#: ../gui/MemcardDlg.c:196 ../gui/MemcardDlg.c:301 ../win32/gui/WndMain.c:963
 msgid "Used"
 msgstr "Использовано"
 
 #. Ask for name of memory card
-#: ../gui/MemcardDlg.c:323
+#: ../gui/MemcardDlg.c:360
 msgid "Select A File"
 msgstr "Выберите файл"
 
-#: ../gui/MemcardDlg.c:364
+#: ../gui/MemcardDlg.c:401
 msgid "Format this Memory Card?"
 msgstr "Отформатировать карту памяти?"
 
-#: ../gui/MemcardDlg.c:366
-msgid "If you format the memory card, the card will be empty, and any existing data overwritten."
-msgstr "При форматировании все данные на карте памяти будут безвозвратно утеряны."
+#: ../gui/MemcardDlg.c:403
+msgid ""
+"If you format the memory card, the card will be empty, and any existing data "
+"overwritten."
+msgstr ""
+"При форматировании все данные на карте памяти будут безвозвратно утеряны."
 
-#: ../gui/MemcardDlg.c:369
+#: ../gui/MemcardDlg.c:406
 msgid "Format card"
 msgstr "Отформатировать карту памяти"
 
 #. Ask for name of new memory card
-#: ../gui/MemcardDlg.c:393
+#: ../gui/MemcardDlg.c:430
 msgid "Create a new Memory Card"
 msgstr "Создать новую карту памяти"
 
-#: ../gui/MemcardDlg.c:402
+#: ../gui/MemcardDlg.c:439
 msgid "New Memory Card.mcd"
 msgstr ""
 
 #. No free slots available on the destination card
-#: ../gui/MemcardDlg.c:503
+#: ../gui/MemcardDlg.c:540
 msgid "No free space on memory card"
 msgstr "Недостаточно места на карте памяти"
 
-#: ../gui/MemcardDlg.c:504
-msgid "There are no free slots available on the target memory card. Please delete a slot first."
+#: ../gui/MemcardDlg.c:541
+msgid ""
+"There are no free slots available on the target memory card. Please delete a "
+"slot first."
 msgstr "Недостаточно свободных блоков на карте памяти."
 
-#: ../gui/MemcardDlg.c:667
+#: ../gui/MemcardDlg.c:704
 msgid "Memory Card Manager"
 msgstr "Менеджер карт памяти"
 
@@ -1059,8 +1005,7 @@ msgstr "Чит загружен из: %s\n"
 msgid "Cheats saved to: %s\n"
 msgstr "Чит сохранён в: %s\n"
 
-#: ../libpcsxcore/cheat.c:322
-#: ../libpcsxcore/cheat.c:443
+#: ../libpcsxcore/cheat.c:322 ../libpcsxcore/cheat.c:443
 msgid "(Untitled)"
 msgstr "(без названия)"
 
@@ -1265,7 +1210,8 @@ msgstr "Скорость вращения диска (по умолчанию 0
 
 #: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:4
 msgid "Choose your CD-ROM device or type its path if it's not listed"
-msgstr "Выберите CD-привод или введите свой путь, если устройства нету в списке"
+msgstr ""
+"Выберите CD-привод или введите свой путь, если устройства нету в списке"
 
 #: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:5
 msgid ""
@@ -1316,8 +1262,7 @@ msgstr ""
 "В отдельном потоке - (Кеширование)"
 
 #: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:24
-#: ../plugins/dfinput/dfinput.ui.h:8
-#: ../win32/gui/WndMain.c:1309
+#: ../plugins/dfinput/dfinput.ui.h:8 ../win32/gui/WndMain.c:1310
 msgid "Options"
 msgstr "Опции"
 
@@ -1433,76 +1378,62 @@ msgstr ""
 msgid "R-Stick Up"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:100
-#: ../plugins/dfinput/cfg-gtk2.c:139
+#: ../plugins/dfinput/cfg-gtk2.c:100 ../plugins/dfinput/cfg-gtk2.c:139
 msgid "Centered"
 msgstr "Отцентровано"
 
-#: ../plugins/dfinput/cfg-gtk2.c:100
-#: ../plugins/dfinput/cfg-gtk2.c:139
+#: ../plugins/dfinput/cfg-gtk2.c:100 ../plugins/dfinput/cfg-gtk2.c:139
 msgid "Up"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:100
-#: ../plugins/dfinput/cfg-gtk2.c:139
+#: ../plugins/dfinput/cfg-gtk2.c:100 ../plugins/dfinput/cfg-gtk2.c:139
 msgid "Right"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:100
-#: ../plugins/dfinput/cfg-gtk2.c:139
+#: ../plugins/dfinput/cfg-gtk2.c:100 ../plugins/dfinput/cfg-gtk2.c:139
 msgid "Rightup"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:101
-#: ../plugins/dfinput/cfg-gtk2.c:140
+#: ../plugins/dfinput/cfg-gtk2.c:101 ../plugins/dfinput/cfg-gtk2.c:140
 msgid "Down"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:101
-#: ../plugins/dfinput/cfg-gtk2.c:140
+#: ../plugins/dfinput/cfg-gtk2.c:101 ../plugins/dfinput/cfg-gtk2.c:140
 msgid "Rightdown"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:101
-#: ../plugins/dfinput/cfg-gtk2.c:140
+#: ../plugins/dfinput/cfg-gtk2.c:101 ../plugins/dfinput/cfg-gtk2.c:140
 msgid "Left"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:101
-#: ../plugins/dfinput/cfg-gtk2.c:140
+#: ../plugins/dfinput/cfg-gtk2.c:101 ../plugins/dfinput/cfg-gtk2.c:140
 msgid "Leftup"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:102
-#: ../plugins/dfinput/cfg-gtk2.c:141
+#: ../plugins/dfinput/cfg-gtk2.c:102 ../plugins/dfinput/cfg-gtk2.c:141
 msgid "Leftdown"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:106
-#: ../plugins/dfinput/cfg-gtk2.c:145
+#: ../plugins/dfinput/cfg-gtk2.c:106 ../plugins/dfinput/cfg-gtk2.c:145
 #, c-format
 msgid "Joystick: Button %d"
 msgstr "Джойстик: Кнопка %d"
 
-#: ../plugins/dfinput/cfg-gtk2.c:110
-#: ../plugins/dfinput/cfg-gtk2.c:149
+#: ../plugins/dfinput/cfg-gtk2.c:110 ../plugins/dfinput/cfg-gtk2.c:149
 #, c-format
 msgid "Joystick: Axis %d%c"
 msgstr "Джойстик: Ось %d%c"
 
-#: ../plugins/dfinput/cfg-gtk2.c:115
-#: ../plugins/dfinput/cfg-gtk2.c:154
+#: ../plugins/dfinput/cfg-gtk2.c:115 ../plugins/dfinput/cfg-gtk2.c:154
 #, c-format
 msgid "Joystick: Hat %d %s"
 msgstr "Джойстик: Крестовина %d %s"
 
-#: ../plugins/dfinput/cfg-gtk2.c:130
-#: ../plugins/dfinput/cfg-gtk2.c:169
+#: ../plugins/dfinput/cfg-gtk2.c:130 ../plugins/dfinput/cfg-gtk2.c:169
 msgid "Keyboard:"
 msgstr "Клавиатура:"
 
-#: ../plugins/dfinput/cfg-gtk2.c:134
-#: ../plugins/dfinput/cfg-gtk2.c:173
+#: ../plugins/dfinput/cfg-gtk2.c:134 ../plugins/dfinput/cfg-gtk2.c:173
 msgid "(Not Set)"
 msgstr "(Не установлено)"
 
@@ -1515,13 +1446,11 @@ msgstr "Нету"
 msgid "Gamepad/Keyboard Input Configuration"
 msgstr "Настройка Gamepad/Keyboard"
 
-#: ../plugins/dfinput/cfg-gtk2.c:590
-#: ../plugins/dfinput/cfg-gtk2.c:610
+#: ../plugins/dfinput/cfg-gtk2.c:590 ../plugins/dfinput/cfg-gtk2.c:610
 msgid "Key"
 msgstr "Клавиша"
 
-#: ../plugins/dfinput/cfg-gtk2.c:596
-#: ../plugins/dfinput/cfg-gtk2.c:616
+#: ../plugins/dfinput/cfg-gtk2.c:596 ../plugins/dfinput/cfg-gtk2.c:616
 msgid "Button"
 msgstr "Кнопка"
 
@@ -1588,8 +1517,11 @@ msgid "Copy PC IP to Clipboard"
 msgstr "Скопировать IP адрес в буфер обмена"
 
 #: ../plugins/dfnet/dfnet.ui.h:3
-msgid "Do not change if not necessary (remember it must be changed on both sides)."
-msgstr "Не меняйте без особой необходимости (помните что порты должны быть одинаковы для обеих сторон)"
+msgid ""
+"Do not change if not necessary (remember it must be changed on both sides)."
+msgstr ""
+"Не меняйте без особой необходимости (помните что порты должны быть одинаковы "
+"для обеих сторон)"
 
 #: ../plugins/dfnet/dfnet.ui.h:4
 msgid "Play Offline"
@@ -1603,15 +1535,19 @@ msgstr "Номер порта"
 msgid ""
 "Select here if you'll be Server (Player1) or Client (Player2).\n"
 "\n"
-"If you select Server you must Copy your IP address to the Clipboard and paste if (Ctrl+V) wherever the Client can see it.\n"
+"If you select Server you must Copy your IP address to the Clipboard and "
+"paste if (Ctrl+V) wherever the Client can see it.\n"
 "\n"
-"If you selected Client please enter the IP address the Server gave to you in the IP Address Control."
+"If you selected Client please enter the IP address the Server gave to you in "
+"the IP Address Control."
 msgstr ""
 "Выберите здесь сторону: Сервер (Игрок 1) или Клиент (Игрок 2)\n"
 "\n"
-"Если вы выбрали Сервер - скопируйте IP адрес в буфер обмена и вставьте (Ctrl+V) куда-либо, чтобы Клиент мог его видеть.\n"
+"Если вы выбрали Сервер - скопируйте IP адрес в буфер обмена и вставьте (Ctrl"
+"+V) куда-либо, чтобы Клиент мог его видеть.\n"
 "\n"
-"Если вы выбрали Клиента - введите полученный IP адрес Сервера в соответствующее поле."
+"Если вы выбрали Клиента - введите полученный IP адрес Сервера в "
+"соответствующее поле."
 
 #: ../plugins/dfnet/dfnet.ui.h:11
 msgid "Server (Player1)"
@@ -1621,8 +1557,7 @@ msgstr "Сервер (Игрок 1)"
 msgid "Start Game"
 msgstr "Начать сетевую игру"
 
-#: ../plugins/dfnet/gui.c:30
-#: ../plugins/dfnet/gui.c:112
+#: ../plugins/dfnet/gui.c:30 ../plugins/dfnet/gui.c:112
 #: ../win32/gui/ConfigurePlugins.c:616
 msgid "NetPlay"
 msgstr "Сетевая игра"
@@ -1912,7 +1847,8 @@ msgstr "Включить пропуск кадров"
 
 #: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2.h:35
 msgid "Enable this if games display too quickly."
-msgstr "Следует включить для автоматического определения и ограничения скорости игры."
+msgstr ""
+"Следует включить для автоматического определения и ограничения скорости игры."
 
 #: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2.h:36
 msgid "Expand screen width"
@@ -2322,7 +2258,9 @@ msgstr "Текстуры"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:78
 msgid "Unfiltered MDECs (Small movie speedup)"
-msgstr "Не фильтровать MDECs (некоторый прирост скорости при проигрывании видеовставок)"
+msgstr ""
+"Не фильтровать MDECs (некоторый прирост скорости при проигрывании "
+"видеовставок)"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:79
 msgid "Unused"
@@ -2388,14 +2326,10 @@ msgstr ""
 msgid "About"
 msgstr "О PCSX"
 
-#: ../win32/gui/AboutDlg.c:48
-#: ../win32/gui/AboutDlg.c:52
-#: ../win32/gui/CheatDlg.c:69
-#: ../win32/gui/CheatDlg.c:119
-#: ../win32/gui/ConfigurePlugins.c:483
-#: ../win32/gui/ConfigurePlugins.c:614
-#: ../win32/gui/WndMain.c:1058
-#: ../win32/gui/WndMain.c:1294
+#: ../win32/gui/AboutDlg.c:48 ../win32/gui/AboutDlg.c:52
+#: ../win32/gui/CheatDlg.c:69 ../win32/gui/CheatDlg.c:119
+#: ../win32/gui/ConfigurePlugins.c:483 ../win32/gui/ConfigurePlugins.c:614
+#: ../win32/gui/WndMain.c:1059 ../win32/gui/WndMain.c:1295
 msgid "OK"
 msgstr "Ок"
 
@@ -2403,24 +2337,19 @@ msgstr "Ок"
 msgid "PCSX EMU\n"
 msgstr "PCSX EMU\n"
 
-#: ../win32/gui/CheatDlg.c:51
-#: ../win32/gui/CheatDlg.c:223
+#: ../win32/gui/CheatDlg.c:51 ../win32/gui/CheatDlg.c:223
 #: ../win32/gui/CheatDlg.c:270
 msgid "Yes"
 msgstr "Да"
 
-#: ../win32/gui/CheatDlg.c:51
-#: ../win32/gui/CheatDlg.c:223
+#: ../win32/gui/CheatDlg.c:51 ../win32/gui/CheatDlg.c:223
 #: ../win32/gui/CheatDlg.c:270
 msgid "No"
 msgstr "Нет"
 
-#: ../win32/gui/CheatDlg.c:70
-#: ../win32/gui/CheatDlg.c:120
-#: ../win32/gui/ConfigurePlugins.c:484
-#: ../win32/gui/ConfigurePlugins.c:615
-#: ../win32/gui/WndMain.c:1059
-#: ../win32/gui/WndMain.c:1295
+#: ../win32/gui/CheatDlg.c:70 ../win32/gui/CheatDlg.c:120
+#: ../win32/gui/ConfigurePlugins.c:484 ../win32/gui/ConfigurePlugins.c:615
+#: ../win32/gui/WndMain.c:1060 ../win32/gui/WndMain.c:1296
 msgid "Cancel"
 msgstr "Отмена"
 
@@ -2456,8 +2385,7 @@ msgstr "Закрыть(&C)"
 msgid "Enabled"
 msgstr "Включено"
 
-#: ../win32/gui/CheatDlg.c:282
-#: ../win32/gui/CheatDlg.c:311
+#: ../win32/gui/CheatDlg.c:282 ../win32/gui/CheatDlg.c:311
 msgid "PCSX Cheat Code Files"
 msgstr "Файл чит кодов PCSX (*.cht)"
 
@@ -2501,8 +2429,7 @@ msgstr "Не изменилось"
 msgid "No addresses found."
 msgstr "Адреса не найдены."
 
-#: ../win32/gui/CheatDlg.c:505
-#: ../win32/gui/CheatDlg.c:596
+#: ../win32/gui/CheatDlg.c:505 ../win32/gui/CheatDlg.c:596
 msgid "Address:"
 msgstr "Адрес:"
 
@@ -2615,30 +2542,21 @@ msgstr "Выберите каталог с биосами"
 msgid "Set Plugins Directory"
 msgstr "Выберите каталог с плагинами"
 
-#: ../win32/gui/ConfigurePlugins.c:493
-#: ../win32/gui/ConfigurePlugins.c:496
-#: ../win32/gui/ConfigurePlugins.c:499
-#: ../win32/gui/ConfigurePlugins.c:502
-#: ../win32/gui/ConfigurePlugins.c:505
-#: ../win32/gui/ConfigurePlugins.c:617
+#: ../win32/gui/ConfigurePlugins.c:493 ../win32/gui/ConfigurePlugins.c:496
+#: ../win32/gui/ConfigurePlugins.c:499 ../win32/gui/ConfigurePlugins.c:502
+#: ../win32/gui/ConfigurePlugins.c:505 ../win32/gui/ConfigurePlugins.c:617
 msgid "Configure..."
 msgstr "Настройка..."
 
-#: ../win32/gui/ConfigurePlugins.c:494
-#: ../win32/gui/ConfigurePlugins.c:497
-#: ../win32/gui/ConfigurePlugins.c:500
-#: ../win32/gui/ConfigurePlugins.c:503
-#: ../win32/gui/ConfigurePlugins.c:506
-#: ../win32/gui/ConfigurePlugins.c:618
+#: ../win32/gui/ConfigurePlugins.c:494 ../win32/gui/ConfigurePlugins.c:497
+#: ../win32/gui/ConfigurePlugins.c:500 ../win32/gui/ConfigurePlugins.c:503
+#: ../win32/gui/ConfigurePlugins.c:506 ../win32/gui/ConfigurePlugins.c:618
 msgid "Test..."
 msgstr "Тест..."
 
-#: ../win32/gui/ConfigurePlugins.c:495
-#: ../win32/gui/ConfigurePlugins.c:498
-#: ../win32/gui/ConfigurePlugins.c:501
-#: ../win32/gui/ConfigurePlugins.c:504
-#: ../win32/gui/ConfigurePlugins.c:507
-#: ../win32/gui/ConfigurePlugins.c:619
+#: ../win32/gui/ConfigurePlugins.c:495 ../win32/gui/ConfigurePlugins.c:498
+#: ../win32/gui/ConfigurePlugins.c:501 ../win32/gui/ConfigurePlugins.c:504
+#: ../win32/gui/ConfigurePlugins.c:507 ../win32/gui/ConfigurePlugins.c:619
 msgid "About..."
 msgstr "О..."
 
@@ -2647,29 +2565,28 @@ msgid "NetPlay Configuration"
 msgstr "Настройка сетевой игры"
 
 #: ../win32/gui/ConfigurePlugins.c:620
-msgid "Note: The NetPlay Plugin Directory should be the same as the other Plugins."
-msgstr "Внимание! NetPlay плагин должен находится в том же каталоге что и остальные плагины."
+msgid ""
+"Note: The NetPlay Plugin Directory should be the same as the other Plugins."
+msgstr ""
+"Внимание! NetPlay плагин должен находится в том же каталоге что и остальные "
+"плагины."
 
-#: ../win32/gui/plugin.c:94
-#: ../win32/gui/WndMain.c:322
+#: ../win32/gui/plugin.c:94 ../win32/gui/WndMain.c:323
 #, c-format
 msgid "*PCSX*: Saved State %d"
 msgstr "*PCSX*: Состояние сохранено %d"
 
-#: ../win32/gui/plugin.c:95
-#: ../win32/gui/WndMain.c:323
+#: ../win32/gui/plugin.c:95 ../win32/gui/WndMain.c:324
 #, c-format
 msgid "*PCSX*: Error Saving State %d"
 msgstr "*PCSX*: Ошибка сохранения состояния %d"
 
-#: ../win32/gui/plugin.c:111
-#: ../win32/gui/WndMain.c:300
+#: ../win32/gui/plugin.c:111 ../win32/gui/WndMain.c:301
 #, c-format
 msgid "*PCSX*: Loaded State %d"
 msgstr "PCSX*: Состояние загружено %d"
 
-#: ../win32/gui/plugin.c:112
-#: ../win32/gui/WndMain.c:301
+#: ../win32/gui/plugin.c:112 ../win32/gui/WndMain.c:302
 #, c-format
 msgid "*PCSX*: Error Loading State %d"
 msgstr "*PCSX*: Ошибка загрузки состояния %d"
@@ -2716,8 +2633,7 @@ msgstr "*PCSX*: крышка CD-привода закрыта"
 msgid "Connecting..."
 msgstr "Соединение..."
 
-#: ../win32/gui/plugin.c:185
-#: ../win32/gui/plugin.c:192
+#: ../win32/gui/plugin.c:185 ../win32/gui/plugin.c:192
 #, c-format
 msgid "Please wait while connecting... %c\n"
 msgstr "Идёт соединение, подождите... %c\n"
@@ -2804,9 +2720,8 @@ msgstr "Немецкий"
 msgid "Greek"
 msgstr "Греческий"
 
-#: ../win32/gui/WndMain.c:81
-#: ../win32/gui/WndMain.c:1658
-#: ../win32/gui/WndMain.c:1660
+#: ../win32/gui/WndMain.c:81 ../win32/gui/WndMain.c:1659
+#: ../win32/gui/WndMain.c:1661
 msgid "English"
 msgstr "Английский"
 
@@ -2855,11 +2770,13 @@ msgid "Korean"
 msgstr "Корейский"
 
 #: ../win32/gui/WndMain.c:215
+#, fuzzy
 msgid ""
 "Usage: pcsx [options]\n"
 "\toptions:\n"
 "\t-nogui\t\tDon't open the GUI\n"
 "\t-psxout\t\tEnable PSX output\n"
+"\t-slowboot\t\tEnable BIOS logo\n"
 "\t-runcd\t\tRuns CD-ROM (requires -nogui)\n"
 "\t-cdfile FILE\tRuns a CD image file (requires -nogui)\n"
 "\t-help\t\tDisplay this message"
@@ -2872,340 +2789,326 @@ msgstr ""
 "\t-cdfile FILE\tЗапустить с файла образа CD (требует -nogui)\n"
 "\t-h -help\tПоказать это сообщение"
 
-#: ../win32/gui/WndMain.c:341
-#: ../win32/gui/WndMain.c:387
+#: ../win32/gui/WndMain.c:342 ../win32/gui/WndMain.c:388
 msgid "PCSX State Format"
 msgstr "Формат состояния PCSX"
 
-#: ../win32/gui/WndMain.c:368
+#: ../win32/gui/WndMain.c:369
 #, c-format
 msgid "*PCSX*: Loaded State %s"
 msgstr "*PCSX*: Состояние загружено %s"
 
-#: ../win32/gui/WndMain.c:369
+#: ../win32/gui/WndMain.c:370
 #, c-format
 msgid "*PCSX*: Error Loading State %s"
 msgstr "*PCSX*: Ошибка загрузки состояния %s"
 
-#: ../win32/gui/WndMain.c:414
+#: ../win32/gui/WndMain.c:415
 #, c-format
 msgid "*PCSX*: Saved State %s"
 msgstr "*PCSX*: Состояние сохранено %s"
 
-#: ../win32/gui/WndMain.c:415
+#: ../win32/gui/WndMain.c:416
 #, c-format
 msgid "*PCSX*: Error Saving State %s"
 msgstr "*PCSX*: Ошибка сохранения состояния %s"
 
-#: ../win32/gui/WndMain.c:483
+#: ../win32/gui/WndMain.c:484
 msgid "Running BIOS is not supported with Internal HLE Bios."
-msgstr "Стандартная оболочка, позволяющая управлять картами памяти и проигрывать DA музыку, при использовании HLE-биоса недоступна."
+msgstr ""
+"Стандартная оболочка, позволяющая управлять картами памяти и проигрывать DA "
+"музыку, при использовании HLE-биоса недоступна."
 
-#: ../win32/gui/WndMain.c:760
+#: ../win32/gui/WndMain.c:761
 msgid "Game ID"
 msgstr "Идентификатор игры"
 
-#: ../win32/gui/WndMain.c:766
+#: ../win32/gui/WndMain.c:767
 msgid "Game"
 msgstr "Игра"
 
-#: ../win32/gui/WndMain.c:948
+#: ../win32/gui/WndMain.c:949
 msgid "mid link block"
 msgstr "соединительный блок"
 
-#: ../win32/gui/WndMain.c:951
+#: ../win32/gui/WndMain.c:952
 msgid "terminiting link block"
 msgstr "завершающий соединительный блок"
 
-#: ../win32/gui/WndMain.c:1056
+#: ../win32/gui/WndMain.c:1057
 msgid "Memcard Manager"
 msgstr "Менеджер карт памяти"
 
-#: ../win32/gui/WndMain.c:1060
-#: ../win32/gui/WndMain.c:1063
+#: ../win32/gui/WndMain.c:1061 ../win32/gui/WndMain.c:1064
 msgid "Select Mcd"
 msgstr "Выбрать"
 
-#: ../win32/gui/WndMain.c:1061
-#: ../win32/gui/WndMain.c:1064
+#: ../win32/gui/WndMain.c:1062 ../win32/gui/WndMain.c:1065
 msgid "Format Mcd"
 msgstr "Форматировать"
 
-#: ../win32/gui/WndMain.c:1062
-#: ../win32/gui/WndMain.c:1065
+#: ../win32/gui/WndMain.c:1063 ../win32/gui/WndMain.c:1066
 msgid "Reload Mcd"
 msgstr "Перезагрузить"
 
-#: ../win32/gui/WndMain.c:1066
+#: ../win32/gui/WndMain.c:1067
 msgid "-> Copy ->"
 msgstr "-> Копировать ->"
 
-#: ../win32/gui/WndMain.c:1067
+#: ../win32/gui/WndMain.c:1068
 msgid "<- Copy <-"
 msgstr "<- Копировать <-"
 
-#: ../win32/gui/WndMain.c:1068
+#: ../win32/gui/WndMain.c:1069
 msgid "Paste"
 msgstr "Вставить"
 
-#: ../win32/gui/WndMain.c:1069
+#: ../win32/gui/WndMain.c:1070
 msgid "<- Un/Delete"
 msgstr "<- Восстановить блок"
 
-#: ../win32/gui/WndMain.c:1070
+#: ../win32/gui/WndMain.c:1071
 msgid "Un/Delete ->"
 msgstr "Восстановить блок ->"
 
-#: ../win32/gui/WndMain.c:1072
+#: ../win32/gui/WndMain.c:1073
 msgid "Memory Card 1"
 msgstr "Карта памяти 1"
 
-#: ../win32/gui/WndMain.c:1073
+#: ../win32/gui/WndMain.c:1074
 msgid "Memory Card 2"
 msgstr "Карта памяти 2"
 
-#: ../win32/gui/WndMain.c:1128
+#: ../win32/gui/WndMain.c:1129
 msgid "Are you sure you want to paste this selection?"
 msgstr "Вы уверены в том, что хотите вставить выделенное?"
 
-#: ../win32/gui/WndMain.c:1128
-#: ../win32/gui/WndMain.c:1239
-#: ../win32/gui/WndMain.c:1246
+#: ../win32/gui/WndMain.c:1129 ../win32/gui/WndMain.c:1240
+#: ../win32/gui/WndMain.c:1247
 msgid "Confirmation"
 msgstr "Подтверждение"
 
-#: ../win32/gui/WndMain.c:1239
-#: ../win32/gui/WndMain.c:1246
+#: ../win32/gui/WndMain.c:1240 ../win32/gui/WndMain.c:1247
 msgid "Are you sure you want to format this Memory Card?"
 msgstr "Вы уверены в том, что хотите отформатировать карту памяти?"
 
-#: ../win32/gui/WndMain.c:1292
+#: ../win32/gui/WndMain.c:1293
 msgid "Cpu Config"
 msgstr "Настройка ЦПУ"
 
-#: ../win32/gui/WndMain.c:1297
+#: ../win32/gui/WndMain.c:1298
 msgid "Disable Xa Decoding"
 msgstr "Отключить декодирование XA"
 
-#: ../win32/gui/WndMain.c:1298
+#: ../win32/gui/WndMain.c:1299
 msgid "Sio Irq Always Enabled"
 msgstr "Удерживание линии прерывания SIO"
 
-#: ../win32/gui/WndMain.c:1299
+#: ../win32/gui/WndMain.c:1300
 msgid "Black && White Movies"
 msgstr "Чёрно-белые заставки"
 
-#: ../win32/gui/WndMain.c:1300
+#: ../win32/gui/WndMain.c:1301
 msgid "Disable Cd audio"
 msgstr "Выключить CD музыку"
 
-#: ../win32/gui/WndMain.c:1302
+#: ../win32/gui/WndMain.c:1303
 msgid "Enable Interpreter Cpu"
 msgstr "Включить интерпретатор ЦПУ"
 
-#: ../win32/gui/WndMain.c:1305
+#: ../win32/gui/WndMain.c:1306
 msgid "Spu Irq Always Enabled"
 msgstr "Удерживание линии прерывания SPU"
 
-#: ../win32/gui/WndMain.c:1310
+#: ../win32/gui/WndMain.c:1311
 msgid "Psx System Type"
 msgstr "Тип системы psx"
 
-#: ../win32/gui/WndMain.c:1414
+#: ../win32/gui/WndMain.c:1415
 msgid "Psx Mcd Format (*.mcr;*.mc;*.mem;*.vgs;*.mcd;*.gme;*.ddf)"
 msgstr "Форматы карт памяти psx (*.mcr;*.mc;*.mem;*.vgs;*.mcd;*.gme;*.ddf)"
 
-#: ../win32/gui/WndMain.c:1419
+#: ../win32/gui/WndMain.c:1420
 msgid "Psx Memory Card (*.mcr;*.mc)"
 msgstr "Карта памяти psx (*.mcr;*.mc)"
 
-#: ../win32/gui/WndMain.c:1424
+#: ../win32/gui/WndMain.c:1425
 msgid "CVGS Memory Card (*.mem;*.vgs)"
 msgstr "Карта памяти CVGS (*.mem;*.vgs)"
 
-#: ../win32/gui/WndMain.c:1429
+#: ../win32/gui/WndMain.c:1430
 msgid "Bleem Memory Card (*.mcd)"
 msgstr "Карта памяти Bleem (*.mcd)"
 
-#: ../win32/gui/WndMain.c:1434
+#: ../win32/gui/WndMain.c:1435
 msgid "DexDrive Memory Card (*.gme)"
 msgstr "Карта памяти DexDrive (*.gme)"
 
-#: ../win32/gui/WndMain.c:1439
+#: ../win32/gui/WndMain.c:1440
 msgid "DataDeck Memory Card (*.ddf)"
 msgstr "Карта памяти DataDeck (*.ddf)"
 
-#: ../win32/gui/WndMain.c:1483
+#: ../win32/gui/WndMain.c:1484
 msgid "Psx Exe Format"
 msgstr "Psx exe формат"
 
-#: ../win32/gui/WndMain.c:1520
+#: ../win32/gui/WndMain.c:1521
 msgid "Psx Isos (*.iso;*.mdf;*.img;*.bin)"
 msgstr "Образы диска psx (*.iso;*.mdf;*.img;*.bin)"
 
-#: ../win32/gui/WndMain.c:1596
+#: ../win32/gui/WndMain.c:1597
 msgid "&File"
 msgstr "Файл(&F)"
 
-#: ../win32/gui/WndMain.c:1597
+#: ../win32/gui/WndMain.c:1598
 msgid "E&xit"
 msgstr "Выход(&X)"
 
-#: ../win32/gui/WndMain.c:1599
+#: ../win32/gui/WndMain.c:1600
 msgid "Run &EXE..."
 msgstr "Запустить EXE"
 
-#: ../win32/gui/WndMain.c:1600
+#: ../win32/gui/WndMain.c:1601
 msgid "Run &BIOS"
 msgstr "Запустить BIOS"
 
-#: ../win32/gui/WndMain.c:1601
+#: ../win32/gui/WndMain.c:1602
 msgid "Run &ISO..."
 msgstr "Запустить ISO"
 
-#: ../win32/gui/WndMain.c:1602
+#: ../win32/gui/WndMain.c:1603
 msgid "Run &CD"
 msgstr "Запустить CD"
 
-#: ../win32/gui/WndMain.c:1604
+#: ../win32/gui/WndMain.c:1605
 msgid "&Emulator"
 msgstr "Эмулятор(&E)"
 
-#: ../win32/gui/WndMain.c:1605
+#: ../win32/gui/WndMain.c:1606
 msgid "&States"
 msgstr "Состояния(&S)"
 
-#: ../win32/gui/WndMain.c:1607
+#: ../win32/gui/WndMain.c:1608
 msgid "S&witch ISO..."
 msgstr "Изменить ISO(&W)..."
 
-#: ../win32/gui/WndMain.c:1609
+#: ../win32/gui/WndMain.c:1610
 msgid "Re&set"
 msgstr "Сброс(&S)"
 
-#: ../win32/gui/WndMain.c:1610
+#: ../win32/gui/WndMain.c:1611
 msgid "&Run"
 msgstr "Старт(&R)"
 
-#: ../win32/gui/WndMain.c:1611
+#: ../win32/gui/WndMain.c:1612
 msgid "&Save"
 msgstr "Сохранить(&S)"
 
-#: ../win32/gui/WndMain.c:1612
+#: ../win32/gui/WndMain.c:1613
 msgid "&Load"
 msgstr "Загрузить(&L)"
 
-#: ../win32/gui/WndMain.c:1613
-#: ../win32/gui/WndMain.c:1623
+#: ../win32/gui/WndMain.c:1614 ../win32/gui/WndMain.c:1624
 msgid "&Other..."
 msgstr "Другой(&O)..."
 
-#: ../win32/gui/WndMain.c:1614
-#: ../win32/gui/WndMain.c:1624
+#: ../win32/gui/WndMain.c:1615 ../win32/gui/WndMain.c:1625
 msgid "Slot &9"
 msgstr "Слот &9"
 
-#: ../win32/gui/WndMain.c:1615
-#: ../win32/gui/WndMain.c:1625
+#: ../win32/gui/WndMain.c:1616 ../win32/gui/WndMain.c:1626
 msgid "Slot &8"
 msgstr "Слот &8"
 
-#: ../win32/gui/WndMain.c:1616
-#: ../win32/gui/WndMain.c:1626
+#: ../win32/gui/WndMain.c:1617 ../win32/gui/WndMain.c:1627
 msgid "Slot &7"
 msgstr "Слот &7"
 
-#: ../win32/gui/WndMain.c:1617
-#: ../win32/gui/WndMain.c:1627
+#: ../win32/gui/WndMain.c:1618 ../win32/gui/WndMain.c:1628
 msgid "Slot &6"
 msgstr "Слот &6"
 
-#: ../win32/gui/WndMain.c:1618
-#: ../win32/gui/WndMain.c:1628
+#: ../win32/gui/WndMain.c:1619 ../win32/gui/WndMain.c:1629
 msgid "Slot &5"
 msgstr "Слот 5(&5)"
 
-#: ../win32/gui/WndMain.c:1619
-#: ../win32/gui/WndMain.c:1629
+#: ../win32/gui/WndMain.c:1620 ../win32/gui/WndMain.c:1630
 msgid "Slot &4"
 msgstr "Слот 4(&4)"
 
-#: ../win32/gui/WndMain.c:1620
-#: ../win32/gui/WndMain.c:1630
+#: ../win32/gui/WndMain.c:1621 ../win32/gui/WndMain.c:1631
 msgid "Slot &3"
 msgstr "Слот 3(&3)"
 
-#: ../win32/gui/WndMain.c:1621
-#: ../win32/gui/WndMain.c:1631
+#: ../win32/gui/WndMain.c:1622 ../win32/gui/WndMain.c:1632
 msgid "Slot &2"
 msgstr "Слот 2(&2)"
 
-#: ../win32/gui/WndMain.c:1622
-#: ../win32/gui/WndMain.c:1632
+#: ../win32/gui/WndMain.c:1623 ../win32/gui/WndMain.c:1633
 msgid "Slot &1"
 msgstr "Слот 1(&1)"
 
-#: ../win32/gui/WndMain.c:1634
+#: ../win32/gui/WndMain.c:1635
 msgid "&Configuration"
 msgstr "Настройка(&C)"
 
-#: ../win32/gui/WndMain.c:1635
+#: ../win32/gui/WndMain.c:1636
 msgid "Cheat &Search..."
 msgstr "Поиск читов...(&S)"
 
-#: ../win32/gui/WndMain.c:1636
+#: ../win32/gui/WndMain.c:1637
 msgid "Ch&eat Code..."
 msgstr "Чит код...(&E)"
 
-#: ../win32/gui/WndMain.c:1639
+#: ../win32/gui/WndMain.c:1640
 msgid "&Language"
 msgstr "Язык(&L)"
 
-#: ../win32/gui/WndMain.c:1664
+#: ../win32/gui/WndMain.c:1665
 msgid "&Memory cards..."
 msgstr "Карты памяти(&M)..."
 
-#: ../win32/gui/WndMain.c:1665
+#: ../win32/gui/WndMain.c:1666
 msgid "C&PU..."
 msgstr "ЦПУ(&P)..."
 
-#: ../win32/gui/WndMain.c:1667
+#: ../win32/gui/WndMain.c:1668
 msgid "&NetPlay..."
 msgstr "Сетевая игра..."
 
-#: ../win32/gui/WndMain.c:1669
+#: ../win32/gui/WndMain.c:1670
 msgid "&Controllers..."
 msgstr "Управление..."
 
-#: ../win32/gui/WndMain.c:1670
+#: ../win32/gui/WndMain.c:1671
 msgid "CD-&ROM..."
 msgstr "CD-привод(&R)..."
 
-#: ../win32/gui/WndMain.c:1671
+#: ../win32/gui/WndMain.c:1672
 msgid "&Sound..."
 msgstr "Звук..."
 
-#: ../win32/gui/WndMain.c:1672
+#: ../win32/gui/WndMain.c:1673
 msgid "&Graphics..."
 msgstr "Графика..."
 
-#: ../win32/gui/WndMain.c:1674
+#: ../win32/gui/WndMain.c:1675
 msgid "&Plugins && Bios..."
 msgstr "Плагины и биос(&P)..."
 
-#: ../win32/gui/WndMain.c:1676
+#: ../win32/gui/WndMain.c:1677
 msgid "&Help"
 msgstr "Помощь(&H)"
 
-#: ../win32/gui/WndMain.c:1677
+#: ../win32/gui/WndMain.c:1678
 msgid "&About..."
 msgstr "О(&A)..."
 
-#: ../win32/gui/WndMain.c:1865
+#: ../win32/gui/WndMain.c:1866
 msgid "Pcsx Msg"
 msgstr "Сообщение pcsx"
 
-#: ../win32/gui/WndMain.c:1868
+#: ../win32/gui/WndMain.c:1869
 msgid "Error Loading Symbol"
 msgstr "Ошибка загрузки символа"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 3a10cfba..1bd7fb3f 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pcsxr 1.0\n"
 "Report-Msgid-Bugs-To: whistler_wmz@users.sf.net\n"
-"POT-Creation-Date: 2011-02-12 12:56+0800\n"
-"PO-Revision-Date: 2011-02-12 12:56+0800\n"
+"POT-Creation-Date: 2011-02-18 16:56+0800\n"
+"PO-Revision-Date: 2011-02-18 16:56+0800\n"
 "Last-Translator: Wei Mingzhi <whistler_wmz@users.sf.net>\n"
 "Language-Team: Simplified Chinese <whistler@openoffice.org>\n"
 "Language: \n"
@@ -68,7 +68,7 @@ msgid "Address (Hexadecimal):"
 msgstr "地址 (十六进制):"
 
 #: ../data/pcsx.glade2.h:14
-#: ../win32/gui/WndMain.c:1301
+#: ../win32/gui/WndMain.c:1302
 msgid "Autodetect"
 msgstr "自动检测"
 
@@ -196,12 +196,12 @@ msgid "Edit Cheat Codes"
 msgstr "编辑作弊码"
 
 #: ../data/pcsx.glade2.h:44
-#: ../win32/gui/WndMain.c:1303
+#: ../win32/gui/WndMain.c:1304
 msgid "Enable Console Output"
 msgstr "启用控制台输出"
 
 #: ../data/pcsx.glade2.h:45
-#: ../win32/gui/WndMain.c:1304
+#: ../win32/gui/WndMain.c:1305
 msgid "Enable Debugger"
 msgstr "启用调试器"
 
@@ -249,7 +249,7 @@ msgid "Graphics:"
 msgstr "图像:"
 
 #: ../data/pcsx.glade2.h:60
-#: ../win32/gui/WndMain.c:1307
+#: ../win32/gui/WndMain.c:1308
 msgid "InuYasha Sengoku Battle Fix"
 msgstr "InuYasha Sengoku Battle 修正"
 
@@ -288,7 +288,7 @@ msgid "PCSX"
 msgstr "PCSX"
 
 #: ../data/pcsx.glade2.h:69
-#: ../win32/gui/WndMain.c:1306
+#: ../win32/gui/WndMain.c:1307
 msgid "Parasite Eve 2, Vandal Hearts 1/2 Fix"
 msgstr "Parasite Eve 2, Vandal Hearts 1/2 修正"
 
@@ -588,8 +588,8 @@ msgstr "PCSX 作弊码文件 (*.cht)"
 #: ../gui/Cheat.c:321
 #: ../gui/Gtk2Gui.c:446
 #: ../gui/Gtk2Gui.c:587
-#: ../win32/gui/WndMain.c:1444
-#: ../win32/gui/WndMain.c:1525
+#: ../win32/gui/WndMain.c:1445
+#: ../win32/gui/WndMain.c:1526
 msgid "All Files"
 msgstr "所有文件"
 
@@ -784,18 +784,18 @@ msgstr "CD-ROM 失败"
 
 #: ../gui/Gtk2Gui.c:508
 #: ../gui/Gtk2Gui.c:649
-#: ../win32/gui/WndMain.c:463
-#: ../win32/gui/WndMain.c:515
-#: ../win32/gui/WndMain.c:584
+#: ../win32/gui/WndMain.c:464
+#: ../win32/gui/WndMain.c:516
+#: ../win32/gui/WndMain.c:585
 #, c-format
 msgid "The CD does not appear to be a valid Playstation CD"
 msgstr "此光盘不是一张合法的 PlayStation 光盘。"
 
 #: ../gui/Gtk2Gui.c:519
 #: ../gui/Gtk2Gui.c:660
-#: ../win32/gui/WndMain.c:473
-#: ../win32/gui/WndMain.c:525
-#: ../win32/gui/WndMain.c:594
+#: ../win32/gui/WndMain.c:474
+#: ../win32/gui/WndMain.c:526
+#: ../win32/gui/WndMain.c:595
 #, c-format
 msgid "Could not load CD-ROM!"
 msgstr "无法加载光盘!"
@@ -900,85 +900,85 @@ msgstr "无法加载光盘。\n"
 msgid "PSX emulator couldn't be initialized.\n"
 msgstr "无法初始化 PS 模拟器。\n"
 
-#: ../gui/MemcardDlg.c:56
+#: ../gui/MemcardDlg.c:60
 msgid "Icon"
 msgstr "图标"
 
-#: ../gui/MemcardDlg.c:62
-#: ../win32/gui/WndMain.c:748
+#: ../gui/MemcardDlg.c:66
+#: ../win32/gui/WndMain.c:749
 msgid "Title"
 msgstr "标题"
 
-#: ../gui/MemcardDlg.c:68
-#: ../win32/gui/WndMain.c:754
+#: ../gui/MemcardDlg.c:72
+#: ../win32/gui/WndMain.c:755
 msgid "Status"
 msgstr "状态"
 
-#: ../gui/MemcardDlg.c:74
+#: ../gui/MemcardDlg.c:78
 msgid "ID"
 msgstr "ID"
 
-#: ../gui/MemcardDlg.c:80
+#: ../gui/MemcardDlg.c:84
 msgid "Name"
 msgstr "名称"
 
-#: ../gui/MemcardDlg.c:155
-#: ../gui/MemcardDlg.c:260
-#: ../win32/gui/WndMain.c:959
+#: ../gui/MemcardDlg.c:192
+#: ../gui/MemcardDlg.c:297
+#: ../win32/gui/WndMain.c:960
 msgid "Deleted"
 msgstr "已删除"
 
-#: ../gui/MemcardDlg.c:157
-#: ../gui/MemcardDlg.c:161
-#: ../gui/MemcardDlg.c:262
-#: ../gui/MemcardDlg.c:266
-#: ../win32/gui/WndMain.c:960
-#: ../win32/gui/WndMain.c:963
+#: ../gui/MemcardDlg.c:194
+#: ../gui/MemcardDlg.c:198
+#: ../gui/MemcardDlg.c:299
+#: ../gui/MemcardDlg.c:303
+#: ../win32/gui/WndMain.c:961
+#: ../win32/gui/WndMain.c:964
 msgid "Free"
 msgstr "空闲"
 
-#: ../gui/MemcardDlg.c:159
-#: ../gui/MemcardDlg.c:264
-#: ../win32/gui/WndMain.c:962
+#: ../gui/MemcardDlg.c:196
+#: ../gui/MemcardDlg.c:301
+#: ../win32/gui/WndMain.c:963
 msgid "Used"
 msgstr "已使用"
 
 #. Ask for name of memory card
-#: ../gui/MemcardDlg.c:323
+#: ../gui/MemcardDlg.c:360
 msgid "Select A File"
 msgstr "选择一个文件"
 
-#: ../gui/MemcardDlg.c:364
+#: ../gui/MemcardDlg.c:401
 msgid "Format this Memory Card?"
 msgstr "格式化此记忆卡?"
 
-#: ../gui/MemcardDlg.c:366
+#: ../gui/MemcardDlg.c:403
 msgid "If you format the memory card, the card will be empty, and any existing data overwritten."
 msgstr "如果您选择格式化记忆卡，记忆卡将被清空，并且任何现有数据都将被覆盖。"
 
-#: ../gui/MemcardDlg.c:369
+#: ../gui/MemcardDlg.c:406
 msgid "Format card"
 msgstr "格式化记忆卡"
 
 #. Ask for name of new memory card
-#: ../gui/MemcardDlg.c:393
+#: ../gui/MemcardDlg.c:430
 msgid "Create a new Memory Card"
 msgstr "新建记忆卡"
 
-#: ../gui/MemcardDlg.c:402
+#: ../gui/MemcardDlg.c:439
 msgid "New Memory Card.mcd"
 msgstr "新记忆卡.mcd"
 
 #. No free slots available on the destination card
-#: ../gui/MemcardDlg.c:503
+#: ../gui/MemcardDlg.c:540
 msgid "No free space on memory card"
 msgstr "记忆卡无空余位置"
 
-#: ../gui/MemcardDlg.c:504
+#: ../gui/MemcardDlg.c:541
 msgid "There are no free slots available on the target memory card. Please delete a slot first."
 msgstr "目标记忆卡上无空余位置。请先删除一个存档。"
 
-#: ../gui/MemcardDlg.c:667
+#: ../gui/MemcardDlg.c:704
 msgid "Memory Card Manager"
 msgstr "记忆卡管理器"
 
@@ -1325,7 +1325,7 @@ msgstr ""
 
 #: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:24
 #: ../plugins/dfinput/dfinput.ui.h:8
-#: ../win32/gui/WndMain.c:1309
+#: ../win32/gui/WndMain.c:1310
 msgid "Options"
 msgstr "选项"
 
@@ -2434,8 +2434,8 @@ msgstr "关于 PCSX"
 #: ../win32/gui/CheatDlg.c:119
 #: ../win32/gui/ConfigurePlugins.c:483
 #: ../win32/gui/ConfigurePlugins.c:614
-#: ../win32/gui/WndMain.c:1058
-#: ../win32/gui/WndMain.c:1294
+#: ../win32/gui/WndMain.c:1059
+#: ../win32/gui/WndMain.c:1295
 msgid "OK"
 msgstr "确定"
 
@@ -2459,8 +2459,8 @@ msgstr "否"
 #: ../win32/gui/CheatDlg.c:120
 #: ../win32/gui/ConfigurePlugins.c:484
 #: ../win32/gui/ConfigurePlugins.c:615
-#: ../win32/gui/WndMain.c:1059
-#: ../win32/gui/WndMain.c:1295
+#: ../win32/gui/WndMain.c:1060
+#: ../win32/gui/WndMain.c:1296
 msgid "Cancel"
 msgstr "取消"
 
@@ -2691,25 +2691,25 @@ msgid "Note: The NetPlay Plugin Directory should be the same as the other Plugin
 msgstr "注意: 联网游戏插件应和其它插件放在同一目录中。"
 
 #: ../win32/gui/plugin.c:94
-#: ../win32/gui/WndMain.c:322
+#: ../win32/gui/WndMain.c:323
 #, c-format
 msgid "*PCSX*: Saved State %d"
 msgstr "*PCSX*: Saved State %d"
 
 #: ../win32/gui/plugin.c:95
-#: ../win32/gui/WndMain.c:323
+#: ../win32/gui/WndMain.c:324
 #, c-format
 msgid "*PCSX*: Error Saving State %d"
 msgstr "*PCSX*: Error Saving State %d"
 
 #: ../win32/gui/plugin.c:111
-#: ../win32/gui/WndMain.c:300
+#: ../win32/gui/WndMain.c:301
 #, c-format
 msgid "*PCSX*: Loaded State %d"
 msgstr "*PCSX*: Loaded State %d"
 
 #: ../win32/gui/plugin.c:112
-#: ../win32/gui/WndMain.c:301
+#: ../win32/gui/WndMain.c:302
 #, c-format
 msgid "*PCSX*: Error Loading State %d"
 msgstr "*PCSX*: Error Loading State %d"
@@ -2845,8 +2845,8 @@ msgid "Greek"
 msgstr "希腊语"
 
 #: ../win32/gui/WndMain.c:81
-#: ../win32/gui/WndMain.c:1658
-#: ../win32/gui/WndMain.c:1660
+#: ../win32/gui/WndMain.c:1659
+#: ../win32/gui/WndMain.c:1661
 msgid "English"
 msgstr "英语"
 
@@ -2900,6 +2900,7 @@ msgid ""
 "\toptions:\n"
 "\t-nogui\t\tDon't open the GUI\n"
 "\t-psxout\t\tEnable PSX output\n"
+"\t-slowboot\t\tEnable BIOS logo\n"
 "\t-runcd\t\tRuns CD-ROM (requires -nogui)\n"
 "\t-cdfile FILE\tRuns a CD image file (requires -nogui)\n"
 "\t-help\t\tDisplay this message"
@@ -2908,344 +2909,345 @@ msgstr ""
 "\t选项:\n"
 "\t-nogui\t\t不打开 GUI\n"
 "\t-psxout\t\t启用 PSX 控制台输出\n"
+"\t-slowboot\t\t启用 BIOS 启动画面\n"
 "\t-runcd\t\t运行 CD-ROM (需要 -nogui)\n"
 "\t-cdfile FILE\t运行 CD 镜像文件 (需要 -nogui)\n"
 "\t-help\t\t显示此信息"
 
-#: ../win32/gui/WndMain.c:341
-#: ../win32/gui/WndMain.c:387
+#: ../win32/gui/WndMain.c:342
+#: ../win32/gui/WndMain.c:388
 msgid "PCSX State Format"
 msgstr "PCSX 即时存档格式"
 
-#: ../win32/gui/WndMain.c:368
+#: ../win32/gui/WndMain.c:369
 #, c-format
 msgid "*PCSX*: Loaded State %s"
 msgstr "*PCSX*: Loaded State %s"
 
-#: ../win32/gui/WndMain.c:369
+#: ../win32/gui/WndMain.c:370
 #, c-format
 msgid "*PCSX*: Error Loading State %s"
 msgstr "*PCSX*: Error Loading State %s"
 
-#: ../win32/gui/WndMain.c:414
+#: ../win32/gui/WndMain.c:415
 #, c-format
 msgid "*PCSX*: Saved State %s"
 msgstr "*PCSX*: Saved State %s"
 
-#: ../win32/gui/WndMain.c:415
+#: ../win32/gui/WndMain.c:416
 #, c-format
 msgid "*PCSX*: Error Saving State %s"
 msgstr "*PCSX*: Error Saving State %s"
 
-#: ../win32/gui/WndMain.c:483
+#: ../win32/gui/WndMain.c:484
 msgid "Running BIOS is not supported with Internal HLE Bios."
 msgstr "内部 HLE BIOS 不支持直接运行。"
 
-#: ../win32/gui/WndMain.c:760
+#: ../win32/gui/WndMain.c:761
 msgid "Game ID"
 msgstr "游戏 ID"
 
-#: ../win32/gui/WndMain.c:766
+#: ../win32/gui/WndMain.c:767
 msgid "Game"
 msgstr "游戏"
 
-#: ../win32/gui/WndMain.c:948
+#: ../win32/gui/WndMain.c:949
 msgid "mid link block"
 msgstr "中间链接块"
 
-#: ../win32/gui/WndMain.c:951
+#: ../win32/gui/WndMain.c:952
 msgid "terminiting link block"
 msgstr "终止链接块"
 
-#: ../win32/gui/WndMain.c:1056
+#: ../win32/gui/WndMain.c:1057
 msgid "Memcard Manager"
 msgstr "记忆卡管理器"
 
-#: ../win32/gui/WndMain.c:1060
-#: ../win32/gui/WndMain.c:1063
+#: ../win32/gui/WndMain.c:1061
+#: ../win32/gui/WndMain.c:1064
 msgid "Select Mcd"
 msgstr "选择"
 
-#: ../win32/gui/WndMain.c:1061
-#: ../win32/gui/WndMain.c:1064
+#: ../win32/gui/WndMain.c:1062
+#: ../win32/gui/WndMain.c:1065
 msgid "Format Mcd"
 msgstr "格式化"
 
-#: ../win32/gui/WndMain.c:1062
-#: ../win32/gui/WndMain.c:1065
+#: ../win32/gui/WndMain.c:1063
+#: ../win32/gui/WndMain.c:1066
 msgid "Reload Mcd"
 msgstr "重新加载"
 
-#: ../win32/gui/WndMain.c:1066
+#: ../win32/gui/WndMain.c:1067
 msgid "-> Copy ->"
 msgstr "-> 复制 ->"
 
-#: ../win32/gui/WndMain.c:1067
+#: ../win32/gui/WndMain.c:1068
 msgid "<- Copy <-"
 msgstr "<- 复制 <-"
 
-#: ../win32/gui/WndMain.c:1068
+#: ../win32/gui/WndMain.c:1069
 msgid "Paste"
 msgstr "粘贴"
 
-#: ../win32/gui/WndMain.c:1069
+#: ../win32/gui/WndMain.c:1070
 msgid "<- Un/Delete"
 msgstr "<- 删除/恢复"
 
-#: ../win32/gui/WndMain.c:1070
+#: ../win32/gui/WndMain.c:1071
 msgid "Un/Delete ->"
 msgstr "删除/恢复 ->"
 
-#: ../win32/gui/WndMain.c:1072
+#: ../win32/gui/WndMain.c:1073
 msgid "Memory Card 1"
 msgstr "记忆卡 1"
 
-#: ../win32/gui/WndMain.c:1073
+#: ../win32/gui/WndMain.c:1074
 msgid "Memory Card 2"
 msgstr "记忆卡 2"
 
-#: ../win32/gui/WndMain.c:1128
+#: ../win32/gui/WndMain.c:1129
 msgid "Are you sure you want to paste this selection?"
 msgstr "是否确认粘贴此选中内容?"
 
-#: ../win32/gui/WndMain.c:1128
-#: ../win32/gui/WndMain.c:1239
-#: ../win32/gui/WndMain.c:1246
+#: ../win32/gui/WndMain.c:1129
+#: ../win32/gui/WndMain.c:1240
+#: ../win32/gui/WndMain.c:1247
 msgid "Confirmation"
 msgstr "确认"
 
-#: ../win32/gui/WndMain.c:1239
-#: ../win32/gui/WndMain.c:1246
+#: ../win32/gui/WndMain.c:1240
+#: ../win32/gui/WndMain.c:1247
 msgid "Are you sure you want to format this Memory Card?"
 msgstr "是否确认格式化此记忆卡?"
 
-#: ../win32/gui/WndMain.c:1292
+#: ../win32/gui/WndMain.c:1293
 msgid "Cpu Config"
 msgstr "CPU 配置"
 
-#: ../win32/gui/WndMain.c:1297
+#: ../win32/gui/WndMain.c:1298
 msgid "Disable Xa Decoding"
 msgstr "禁用 XA 解码"
 
-#: ../win32/gui/WndMain.c:1298
+#: ../win32/gui/WndMain.c:1299
 msgid "Sio Irq Always Enabled"
 msgstr "SIO IRQ 总是启用"
 
-#: ../win32/gui/WndMain.c:1299
+#: ../win32/gui/WndMain.c:1300
 msgid "Black && White Movies"
 msgstr "黑白电影"
 
-#: ../win32/gui/WndMain.c:1300
+#: ../win32/gui/WndMain.c:1301
 msgid "Disable Cd audio"
 msgstr "禁用 CD 音频"
 
-#: ../win32/gui/WndMain.c:1302
+#: ../win32/gui/WndMain.c:1303
 msgid "Enable Interpreter Cpu"
 msgstr "启用解释执行 CPU"
 
-#: ../win32/gui/WndMain.c:1305
+#: ../win32/gui/WndMain.c:1306
 msgid "Spu Irq Always Enabled"
 msgstr "SPU IRQ 总是启用"
 
-#: ../win32/gui/WndMain.c:1310
+#: ../win32/gui/WndMain.c:1311
 msgid "Psx System Type"
 msgstr "PS 系统类型"
 
-#: ../win32/gui/WndMain.c:1414
+#: ../win32/gui/WndMain.c:1415
 msgid "Psx Mcd Format (*.mcr;*.mc;*.mem;*.vgs;*.mcd;*.gme;*.ddf)"
 msgstr "PS 记忆卡格式 (*.mcr;*.mc;*.mem;*.vgs;*.mcd;*.gme;*.ddf)"
 
-#: ../win32/gui/WndMain.c:1419
+#: ../win32/gui/WndMain.c:1420
 msgid "Psx Memory Card (*.mcr;*.mc)"
 msgstr "PS 记忆卡 (*.mcr;*.mc)"
 
-#: ../win32/gui/WndMain.c:1424
+#: ../win32/gui/WndMain.c:1425
 msgid "CVGS Memory Card (*.mem;*.vgs)"
 msgstr "VGS 记忆卡 (*.mem;*.vgs)"
 
-#: ../win32/gui/WndMain.c:1429
+#: ../win32/gui/WndMain.c:1430
 msgid "Bleem Memory Card (*.mcd)"
 msgstr "Bleem 记忆卡 (*.mcd)"
 
-#: ../win32/gui/WndMain.c:1434
+#: ../win32/gui/WndMain.c:1435
 msgid "DexDrive Memory Card (*.gme)"
 msgstr "DexDrive 记忆卡 (*.gme)"
 
-#: ../win32/gui/WndMain.c:1439
+#: ../win32/gui/WndMain.c:1440
 msgid "DataDeck Memory Card (*.ddf)"
 msgstr "DataDeck 记忆卡 (*.ddl)"
 
-#: ../win32/gui/WndMain.c:1483
+#: ../win32/gui/WndMain.c:1484
 msgid "Psx Exe Format"
 msgstr "PS EXE 格式"
 
-#: ../win32/gui/WndMain.c:1520
+#: ../win32/gui/WndMain.c:1521
 msgid "Psx Isos (*.iso;*.mdf;*.img;*.bin)"
 msgstr "PS 光盘镜像 (*.iso;*.mdf;*.img;*.bin)"
 
-#: ../win32/gui/WndMain.c:1596
+#: ../win32/gui/WndMain.c:1597
 msgid "&File"
 msgstr "文件(&F)"
 
-#: ../win32/gui/WndMain.c:1597
+#: ../win32/gui/WndMain.c:1598
 msgid "E&xit"
 msgstr "退出(&X)"
 
-#: ../win32/gui/WndMain.c:1599
+#: ../win32/gui/WndMain.c:1600
 msgid "Run &EXE..."
 msgstr "运行 &EXE..."
 
-#: ../win32/gui/WndMain.c:1600
+#: ../win32/gui/WndMain.c:1601
 msgid "Run &BIOS"
 msgstr "运行 BIOS(&B)"
 
-#: ../win32/gui/WndMain.c:1601
+#: ../win32/gui/WndMain.c:1602
 msgid "Run &ISO..."
 msgstr "运行 &ISO..."
 
-#: ../win32/gui/WndMain.c:1602
+#: ../win32/gui/WndMain.c:1603
 msgid "Run &CD"
 msgstr "运行光碟(&C)"
 
-#: ../win32/gui/WndMain.c:1604
+#: ../win32/gui/WndMain.c:1605
 msgid "&Emulator"
 msgstr "模拟器(&E)"
 
-#: ../win32/gui/WndMain.c:1605
+#: ../win32/gui/WndMain.c:1606
 msgid "&States"
 msgstr "存档(&S)"
 
-#: ../win32/gui/WndMain.c:1607
+#: ../win32/gui/WndMain.c:1608
 msgid "S&witch ISO..."
 msgstr "更换 ISO(&W)..."
 
-#: ../win32/gui/WndMain.c:1609
+#: ../win32/gui/WndMain.c:1610
 msgid "Re&set"
 msgstr "复位(&S)"
 
-#: ../win32/gui/WndMain.c:1610
+#: ../win32/gui/WndMain.c:1611
 msgid "&Run"
 msgstr "运行(&R)"
 
-#: ../win32/gui/WndMain.c:1611
+#: ../win32/gui/WndMain.c:1612
 msgid "&Save"
 msgstr "保存(&S)"
 
-#: ../win32/gui/WndMain.c:1612
+#: ../win32/gui/WndMain.c:1613
 msgid "&Load"
 msgstr "读取(&L)"
 
-#: ../win32/gui/WndMain.c:1613
-#: ../win32/gui/WndMain.c:1623
+#: ../win32/gui/WndMain.c:1614
+#: ../win32/gui/WndMain.c:1624
 msgid "&Other..."
 msgstr "其它(&O)..."
 
-#: ../win32/gui/WndMain.c:1614
-#: ../win32/gui/WndMain.c:1624
+#: ../win32/gui/WndMain.c:1615
+#: ../win32/gui/WndMain.c:1625
 msgid "Slot &9"
 msgstr "存档 9(&9)"
 
-#: ../win32/gui/WndMain.c:1615
-#: ../win32/gui/WndMain.c:1625
+#: ../win32/gui/WndMain.c:1616
+#: ../win32/gui/WndMain.c:1626
 msgid "Slot &8"
 msgstr "存档 8(&8)"
 
-#: ../win32/gui/WndMain.c:1616
-#: ../win32/gui/WndMain.c:1626
+#: ../win32/gui/WndMain.c:1617
+#: ../win32/gui/WndMain.c:1627
 msgid "Slot &7"
 msgstr "存档 7(&7)"
 
-#: ../win32/gui/WndMain.c:1617
-#: ../win32/gui/WndMain.c:1627
+#: ../win32/gui/WndMain.c:1618
+#: ../win32/gui/WndMain.c:1628
 msgid "Slot &6"
 msgstr "存档 6(&6)"
 
-#: ../win32/gui/WndMain.c:1618
-#: ../win32/gui/WndMain.c:1628
+#: ../win32/gui/WndMain.c:1619
+#: ../win32/gui/WndMain.c:1629
 msgid "Slot &5"
 msgstr "存档 5(&5)"
 
-#: ../win32/gui/WndMain.c:1619
-#: ../win32/gui/WndMain.c:1629
+#: ../win32/gui/WndMain.c:1620
+#: ../win32/gui/WndMain.c:1630
 msgid "Slot &4"
 msgstr "存档 4(&4)"
 
-#: ../win32/gui/WndMain.c:1620
-#: ../win32/gui/WndMain.c:1630
+#: ../win32/gui/WndMain.c:1621
+#: ../win32/gui/WndMain.c:1631
 msgid "Slot &3"
 msgstr "存档 3(&3)"
 
-#: ../win32/gui/WndMain.c:1621
-#: ../win32/gui/WndMain.c:1631
+#: ../win32/gui/WndMain.c:1622
+#: ../win32/gui/WndMain.c:1632
 msgid "Slot &2"
 msgstr "存档 2(&2)"
 
-#: ../win32/gui/WndMain.c:1622
-#: ../win32/gui/WndMain.c:1632
+#: ../win32/gui/WndMain.c:1623
+#: ../win32/gui/WndMain.c:1633
 msgid "Slot &1"
 msgstr "存档 1(&1)"
 
-#: ../win32/gui/WndMain.c:1634
+#: ../win32/gui/WndMain.c:1635
 msgid "&Configuration"
 msgstr "配置(&C)"
 
-#: ../win32/gui/WndMain.c:1635
+#: ../win32/gui/WndMain.c:1636
 msgid "Cheat &Search..."
 msgstr "查找作弊码(&S)..."
 
-#: ../win32/gui/WndMain.c:1636
+#: ../win32/gui/WndMain.c:1637
 msgid "Ch&eat Code..."
 msgstr "作弊码(&E)..."
 
-#: ../win32/gui/WndMain.c:1639
+#: ../win32/gui/WndMain.c:1640
 msgid "&Language"
 msgstr "语言(&L)"
 
-#: ../win32/gui/WndMain.c:1664
+#: ../win32/gui/WndMain.c:1665
 msgid "&Memory cards..."
 msgstr "记忆卡(&M)..."
 
-#: ../win32/gui/WndMain.c:1665
+#: ../win32/gui/WndMain.c:1666
 msgid "C&PU..."
 msgstr "C&PU..."
 
-#: ../win32/gui/WndMain.c:1667
+#: ../win32/gui/WndMain.c:1668
 msgid "&NetPlay..."
 msgstr "联网游戏(&N)..."
 
-#: ../win32/gui/WndMain.c:1669
+#: ../win32/gui/WndMain.c:1670
 msgid "&Controllers..."
 msgstr "控制器(&C)..."
 
-#: ../win32/gui/WndMain.c:1670
+#: ../win32/gui/WndMain.c:1671
 msgid "CD-&ROM..."
 msgstr "CD-&ROM..."
 
-#: ../win32/gui/WndMain.c:1671
+#: ../win32/gui/WndMain.c:1672
 msgid "&Sound..."
 msgstr "声音(&S)..."
 
-#: ../win32/gui/WndMain.c:1672
+#: ../win32/gui/WndMain.c:1673
 msgid "&Graphics..."
 msgstr "图像(&G)..."
 
-#: ../win32/gui/WndMain.c:1674
+#: ../win32/gui/WndMain.c:1675
 msgid "&Plugins && Bios..."
 msgstr "插件及 BIOS(&P)..."
 
-#: ../win32/gui/WndMain.c:1676
+#: ../win32/gui/WndMain.c:1677
 msgid "&Help"
 msgstr "帮助(&H)"
 
-#: ../win32/gui/WndMain.c:1677
+#: ../win32/gui/WndMain.c:1678
 msgid "&About..."
 msgstr "关于(&A)..."
 
-#: ../win32/gui/WndMain.c:1865
+#: ../win32/gui/WndMain.c:1866
 msgid "Pcsx Msg"
 msgstr "PCSX 消息"
 
-#: ../win32/gui/WndMain.c:1868
+#: ../win32/gui/WndMain.c:1869
 msgid "Error Loading Symbol"
 msgstr "无法加载符号"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 4feba538..2cfed643 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pcsxr 1.0\n"
 "Report-Msgid-Bugs-To: whistler_wmz@users.sf.net\n"
-"POT-Creation-Date: 2011-02-12 12:56+0800\n"
+"POT-Creation-Date: 2011-02-18 16:56+0800\n"
 "PO-Revision-Date: 2011-01-10 11:13+0800\n"
 "Last-Translator: Wei Mingzhi <whistler_wmz@users.sf.net>\n"
 "Language-Team: Traditional Chinese <whistler@openoffice.org>\n"
@@ -66,7 +66,7 @@ msgstr "<b>系統類型</b>"
 msgid "Address (Hexadecimal):"
 msgstr "位址 (十六進制):"
 
-#: ../data/pcsx.glade2.h:14 ../win32/gui/WndMain.c:1301
+#: ../data/pcsx.glade2.h:14 ../win32/gui/WndMain.c:1302
 msgid "Autodetect"
 msgstr "自動檢測"
 
@@ -186,11 +186,11 @@ msgstr "離開(_X)"
 msgid "Edit Cheat Codes"
 msgstr "編輯金手指"
 
-#: ../data/pcsx.glade2.h:44 ../win32/gui/WndMain.c:1303
+#: ../data/pcsx.glade2.h:44 ../win32/gui/WndMain.c:1304
 msgid "Enable Console Output"
 msgstr "開啟控制台輸出"
 
-#: ../data/pcsx.glade2.h:45 ../win32/gui/WndMain.c:1304
+#: ../data/pcsx.glade2.h:45 ../win32/gui/WndMain.c:1305
 msgid "Enable Debugger"
 msgstr "開啟調試器"
 
@@ -236,7 +236,7 @@ msgstr "圖像..."
 msgid "Graphics:"
 msgstr "圖像:"
 
-#: ../data/pcsx.glade2.h:60 ../win32/gui/WndMain.c:1307
+#: ../data/pcsx.glade2.h:60 ../win32/gui/WndMain.c:1308
 msgid "InuYasha Sengoku Battle Fix"
 msgstr "InuYasha Sengoku 戰斗修正"
 
@@ -272,7 +272,7 @@ msgstr "新增"
 msgid "PCSX"
 msgstr "PCSX"
 
-#: ../data/pcsx.glade2.h:69 ../win32/gui/WndMain.c:1306
+#: ../data/pcsx.glade2.h:69 ../win32/gui/WndMain.c:1307
 msgid "Parasite Eve 2, Vandal Hearts 1/2 Fix"
 msgstr "Parasite Eve 2, Vandal Hearts 1/2 修正"
 
@@ -570,7 +570,7 @@ msgid "PCSX Cheat Code Files (*.cht)"
 msgstr "PCSX 金手指檔 (*.cht)"
 
 #: ../gui/Cheat.c:321 ../gui/Gtk2Gui.c:446 ../gui/Gtk2Gui.c:587
-#: ../win32/gui/WndMain.c:1444 ../win32/gui/WndMain.c:1525
+#: ../win32/gui/WndMain.c:1445 ../win32/gui/WndMain.c:1526
 msgid "All Files"
 msgstr "所有檔案"
 
@@ -742,14 +742,14 @@ msgstr "此文件不是一個合法的 PlayStation 執行檔"
 msgid "CD ROM failed"
 msgstr "CD-ROM 失敗"
 
-#: ../gui/Gtk2Gui.c:508 ../gui/Gtk2Gui.c:649 ../win32/gui/WndMain.c:463
-#: ../win32/gui/WndMain.c:515 ../win32/gui/WndMain.c:584
+#: ../gui/Gtk2Gui.c:508 ../gui/Gtk2Gui.c:649 ../win32/gui/WndMain.c:464
+#: ../win32/gui/WndMain.c:516 ../win32/gui/WndMain.c:585
 #, c-format
 msgid "The CD does not appear to be a valid Playstation CD"
 msgstr "此光碟不是一張合法的 PlayStation 光碟。"
 
-#: ../gui/Gtk2Gui.c:519 ../gui/Gtk2Gui.c:660 ../win32/gui/WndMain.c:473
-#: ../win32/gui/WndMain.c:525 ../win32/gui/WndMain.c:594
+#: ../gui/Gtk2Gui.c:519 ../gui/Gtk2Gui.c:660 ../win32/gui/WndMain.c:474
+#: ../win32/gui/WndMain.c:526 ../win32/gui/WndMain.c:595
 #, c-format
 msgid "Could not load CD-ROM!"
 msgstr "無法加載光碟!"
@@ -843,80 +843,80 @@ msgstr "無法加載光碟。\n"
 msgid "PSX emulator couldn't be initialized.\n"
 msgstr "PS 模擬器無法初期化。\n"
 
-#: ../gui/MemcardDlg.c:56
+#: ../gui/MemcardDlg.c:60
 msgid "Icon"
 msgstr "圖符"
 
-#: ../gui/MemcardDlg.c:62 ../win32/gui/WndMain.c:748
+#: ../gui/MemcardDlg.c:66 ../win32/gui/WndMain.c:749
 msgid "Title"
 msgstr "標題"
 
-#: ../gui/MemcardDlg.c:68 ../win32/gui/WndMain.c:754
+#: ../gui/MemcardDlg.c:72 ../win32/gui/WndMain.c:755
 msgid "Status"
 msgstr "狀態"
 
-#: ../gui/MemcardDlg.c:74
+#: ../gui/MemcardDlg.c:78
 msgid "ID"
 msgstr "ID"
 
-#: ../gui/MemcardDlg.c:80
+#: ../gui/MemcardDlg.c:84
 msgid "Name"
 msgstr "名稱"
 
-#: ../gui/MemcardDlg.c:155 ../gui/MemcardDlg.c:260 ../win32/gui/WndMain.c:959
+#: ../gui/MemcardDlg.c:192 ../gui/MemcardDlg.c:297 ../win32/gui/WndMain.c:960
 msgid "Deleted"
 msgstr "已刪除"
 
-#: ../gui/MemcardDlg.c:157 ../gui/MemcardDlg.c:161 ../gui/MemcardDlg.c:262
-#: ../gui/MemcardDlg.c:266 ../win32/gui/WndMain.c:960
-#: ../win32/gui/WndMain.c:963
+#: ../gui/MemcardDlg.c:194 ../gui/MemcardDlg.c:198 ../gui/MemcardDlg.c:299
+#: ../gui/MemcardDlg.c:303 ../win32/gui/WndMain.c:961
+#: ../win32/gui/WndMain.c:964
 msgid "Free"
 msgstr "空閑"
 
-#: ../gui/MemcardDlg.c:159 ../gui/MemcardDlg.c:264 ../win32/gui/WndMain.c:962
+#: ../gui/MemcardDlg.c:196 ../gui/MemcardDlg.c:301 ../win32/gui/WndMain.c:963
 msgid "Used"
 msgstr "已使用"
 
 #. Ask for name of memory card
-#: ../gui/MemcardDlg.c:323
+#: ../gui/MemcardDlg.c:360
 msgid "Select A File"
 msgstr "選擇檔案"
 
-#: ../gui/MemcardDlg.c:364
+#: ../gui/MemcardDlg.c:401
 msgid "Format this Memory Card?"
 msgstr "格式化此記憶卡?"
 
-#: ../gui/MemcardDlg.c:366
+#: ../gui/MemcardDlg.c:403
 msgid ""
 "If you format the memory card, the card will be empty, and any existing data "
 "overwritten."
 msgstr "如果您選擇格式化記憶卡，記憶卡將被清空，並且任何現有資料都將被覆蓋。"
 
-#: ../gui/MemcardDlg.c:369
+#: ../gui/MemcardDlg.c:406
 msgid "Format card"
 msgstr "格式化記憶卡"
 
 #. Ask for name of new memory card
-#: ../gui/MemcardDlg.c:393
+#: ../gui/MemcardDlg.c:430
 msgid "Create a new Memory Card"
 msgstr "新增記憶卡"
 
-#: ../gui/MemcardDlg.c:402
+#: ../gui/MemcardDlg.c:439
 msgid "New Memory Card.mcd"
 msgstr "新記憶卡檔.mcd"
 
 #. No free slots available on the destination card
-#: ../gui/MemcardDlg.c:503
+#: ../gui/MemcardDlg.c:540
 msgid "No free space on memory card"
 msgstr "記憶卡無空餘位置"
 
-#: ../gui/MemcardDlg.c:504
+#: ../gui/MemcardDlg.c:541
 msgid ""
 "There are no free slots available on the target memory card. Please delete a "
 "slot first."
 msgstr "目的記憶卡無空餘位置。請先刪除一個檔案。"
 
-#: ../gui/MemcardDlg.c:667
+#: ../gui/MemcardDlg.c:704
 msgid "Memory Card Manager"
 msgstr "記憶卡管理器"
 
@@ -1261,7 +1261,7 @@ msgstr ""
 "多執行緒 - 較快 (使用快取)"
 
 #: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:24
-#: ../plugins/dfinput/dfinput.ui.h:8 ../win32/gui/WndMain.c:1309
+#: ../plugins/dfinput/dfinput.ui.h:8 ../win32/gui/WndMain.c:1310
 msgid "Options"
 msgstr "選項"
 
@@ -2351,7 +2351,7 @@ msgstr "關於 PCSX"
 #: ../win32/gui/AboutDlg.c:48 ../win32/gui/AboutDlg.c:52
 #: ../win32/gui/CheatDlg.c:69 ../win32/gui/CheatDlg.c:119
 #: ../win32/gui/ConfigurePlugins.c:483 ../win32/gui/ConfigurePlugins.c:614
-#: ../win32/gui/WndMain.c:1058 ../win32/gui/WndMain.c:1294
+#: ../win32/gui/WndMain.c:1059 ../win32/gui/WndMain.c:1295
 msgid "OK"
 msgstr "確定"
 
@@ -2371,7 +2371,7 @@ msgstr "否"
 
 #: ../win32/gui/CheatDlg.c:70 ../win32/gui/CheatDlg.c:120
 #: ../win32/gui/ConfigurePlugins.c:484 ../win32/gui/ConfigurePlugins.c:615
-#: ../win32/gui/WndMain.c:1059 ../win32/gui/WndMain.c:1295
+#: ../win32/gui/WndMain.c:1060 ../win32/gui/WndMain.c:1296
 msgid "Cancel"
 msgstr "取消"
 
@@ -2591,22 +2591,22 @@ msgid ""
 "Note: The NetPlay Plugin Directory should be the same as the other Plugins."
 msgstr "注意: 聯線遊戲外掛應和其它外掛放在同一資料夾中。"
 
-#: ../win32/gui/plugin.c:94 ../win32/gui/WndMain.c:322
+#: ../win32/gui/plugin.c:94 ../win32/gui/WndMain.c:323
 #, c-format
 msgid "*PCSX*: Saved State %d"
 msgstr "*PCSX*: Saved State %d"
 
-#: ../win32/gui/plugin.c:95 ../win32/gui/WndMain.c:323
+#: ../win32/gui/plugin.c:95 ../win32/gui/WndMain.c:324
 #, c-format
 msgid "*PCSX*: Error Saving State %d"
 msgstr "*PCSX*: Error Saving State %d"
 
-#: ../win32/gui/plugin.c:111 ../win32/gui/WndMain.c:300
+#: ../win32/gui/plugin.c:111 ../win32/gui/WndMain.c:301
 #, c-format
 msgid "*PCSX*: Loaded State %d"
 msgstr "*PCSX*: Loaded State %d"
 
-#: ../win32/gui/plugin.c:112 ../win32/gui/WndMain.c:301
+#: ../win32/gui/plugin.c:112 ../win32/gui/WndMain.c:302
 #, c-format
 msgid "*PCSX*: Error Loading State %d"
 msgstr "*PCSX*: Error Loading State %d"
@@ -2740,8 +2740,8 @@ msgstr "德語"
 msgid "Greek"
 msgstr "希臘語"
 
-#: ../win32/gui/WndMain.c:81 ../win32/gui/WndMain.c:1658
-#: ../win32/gui/WndMain.c:1660
+#: ../win32/gui/WndMain.c:81 ../win32/gui/WndMain.c:1659
+#: ../win32/gui/WndMain.c:1661
 msgid "English"
 msgstr "英語"
 
@@ -2795,328 +2795,329 @@ msgid ""
 "\toptions:\n"
 "\t-nogui\t\tDon't open the GUI\n"
 "\t-psxout\t\tEnable PSX output\n"
+"\t-slowboot\t\tEnable BIOS logo\n"
 "\t-runcd\t\tRuns CD-ROM (requires -nogui)\n"
 "\t-cdfile FILE\tRuns a CD image file (requires -nogui)\n"
 "\t-help\t\tDisplay this message"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:341 ../win32/gui/WndMain.c:387
+#: ../win32/gui/WndMain.c:342 ../win32/gui/WndMain.c:388
 msgid "PCSX State Format"
 msgstr "PCSX 記錄格式"
 
-#: ../win32/gui/WndMain.c:368
+#: ../win32/gui/WndMain.c:369
 #, c-format
 msgid "*PCSX*: Loaded State %s"
 msgstr "*PCSX*: Loaded State %s"
 
-#: ../win32/gui/WndMain.c:369
+#: ../win32/gui/WndMain.c:370
 #, c-format
 msgid "*PCSX*: Error Loading State %s"
 msgstr "*PCSX*: Error Loading State %s"
 
-#: ../win32/gui/WndMain.c:414
+#: ../win32/gui/WndMain.c:415
 #, c-format
 msgid "*PCSX*: Saved State %s"
 msgstr "*PCSX*: Saved State %s"
 
-#: ../win32/gui/WndMain.c:415
+#: ../win32/gui/WndMain.c:416
 #, c-format
 msgid "*PCSX*: Error Saving State %s"
 msgstr "*PCSX*: Error Saving State %s"
 
-#: ../win32/gui/WndMain.c:483
+#: ../win32/gui/WndMain.c:484
 msgid "Running BIOS is not supported with Internal HLE Bios."
 msgstr "內部 HLE BIOS 不支援直接執行。"
 
-#: ../win32/gui/WndMain.c:760
+#: ../win32/gui/WndMain.c:761
 msgid "Game ID"
 msgstr "遊戲 ID"
 
-#: ../win32/gui/WndMain.c:766
+#: ../win32/gui/WndMain.c:767
 msgid "Game"
 msgstr "遊戲"
 
-#: ../win32/gui/WndMain.c:948
+#: ../win32/gui/WndMain.c:949
 msgid "mid link block"
 msgstr "mid link block"
 
-#: ../win32/gui/WndMain.c:951
+#: ../win32/gui/WndMain.c:952
 msgid "terminiting link block"
 msgstr "terminiting link block"
 
-#: ../win32/gui/WndMain.c:1056
+#: ../win32/gui/WndMain.c:1057
 msgid "Memcard Manager"
 msgstr "記憶卡管理器"
 
-#: ../win32/gui/WndMain.c:1060 ../win32/gui/WndMain.c:1063
+#: ../win32/gui/WndMain.c:1061 ../win32/gui/WndMain.c:1064
 msgid "Select Mcd"
 msgstr "選擇"
 
-#: ../win32/gui/WndMain.c:1061 ../win32/gui/WndMain.c:1064
+#: ../win32/gui/WndMain.c:1062 ../win32/gui/WndMain.c:1065
 msgid "Format Mcd"
 msgstr "格式化"
 
-#: ../win32/gui/WndMain.c:1062 ../win32/gui/WndMain.c:1065
+#: ../win32/gui/WndMain.c:1063 ../win32/gui/WndMain.c:1066
 msgid "Reload Mcd"
 msgstr "重新加載"
 
-#: ../win32/gui/WndMain.c:1066
+#: ../win32/gui/WndMain.c:1067
 msgid "-> Copy ->"
 msgstr "-> 複制 ->"
 
-#: ../win32/gui/WndMain.c:1067
+#: ../win32/gui/WndMain.c:1068
 msgid "<- Copy <-"
 msgstr "<- 複制 <-"
 
-#: ../win32/gui/WndMain.c:1068
+#: ../win32/gui/WndMain.c:1069
 msgid "Paste"
 msgstr "粘貼"
 
-#: ../win32/gui/WndMain.c:1069
+#: ../win32/gui/WndMain.c:1070
 msgid "<- Un/Delete"
 msgstr "<- 刪除/恢複"
 
-#: ../win32/gui/WndMain.c:1070
+#: ../win32/gui/WndMain.c:1071
 msgid "Un/Delete ->"
 msgstr "刪除/恢複 ->"
 
-#: ../win32/gui/WndMain.c:1072
+#: ../win32/gui/WndMain.c:1073
 msgid "Memory Card 1"
 msgstr "記憶卡 1"
 
-#: ../win32/gui/WndMain.c:1073
+#: ../win32/gui/WndMain.c:1074
 msgid "Memory Card 2"
 msgstr "記憶卡 2"
 
-#: ../win32/gui/WndMain.c:1128
+#: ../win32/gui/WndMain.c:1129
 msgid "Are you sure you want to paste this selection?"
 msgstr "是否確認粘貼此選中內容?"
 
-#: ../win32/gui/WndMain.c:1128 ../win32/gui/WndMain.c:1239
-#: ../win32/gui/WndMain.c:1246
+#: ../win32/gui/WndMain.c:1129 ../win32/gui/WndMain.c:1240
+#: ../win32/gui/WndMain.c:1247
 msgid "Confirmation"
 msgstr "確認"
 
-#: ../win32/gui/WndMain.c:1239 ../win32/gui/WndMain.c:1246
+#: ../win32/gui/WndMain.c:1240 ../win32/gui/WndMain.c:1247
 msgid "Are you sure you want to format this Memory Card?"
 msgstr "是否確認格式化此記憶卡?"
 
-#: ../win32/gui/WndMain.c:1292
+#: ../win32/gui/WndMain.c:1293
 msgid "Cpu Config"
 msgstr "CPU 設定"
 
-#: ../win32/gui/WndMain.c:1297
+#: ../win32/gui/WndMain.c:1298
 msgid "Disable Xa Decoding"
 msgstr "禁用 XA 解碼"
 
-#: ../win32/gui/WndMain.c:1298
+#: ../win32/gui/WndMain.c:1299
 msgid "Sio Irq Always Enabled"
 msgstr "SIO IRQ 總是開啟"
 
-#: ../win32/gui/WndMain.c:1299
+#: ../win32/gui/WndMain.c:1300
 msgid "Black && White Movies"
 msgstr "黑白電影"
 
-#: ../win32/gui/WndMain.c:1300
+#: ../win32/gui/WndMain.c:1301
 msgid "Disable Cd audio"
 msgstr "禁用 CD 音頻"
 
-#: ../win32/gui/WndMain.c:1302
+#: ../win32/gui/WndMain.c:1303
 msgid "Enable Interpreter Cpu"
 msgstr "開啟解釋執行 CPU"
 
-#: ../win32/gui/WndMain.c:1305
+#: ../win32/gui/WndMain.c:1306
 msgid "Spu Irq Always Enabled"
 msgstr "SPU IRQ 總是開啟"
 
-#: ../win32/gui/WndMain.c:1310
+#: ../win32/gui/WndMain.c:1311
 msgid "Psx System Type"
 msgstr "PS 系統類型"
 
-#: ../win32/gui/WndMain.c:1414
+#: ../win32/gui/WndMain.c:1415
 msgid "Psx Mcd Format (*.mcr;*.mc;*.mem;*.vgs;*.mcd;*.gme;*.ddf)"
 msgstr "PS 記憶卡格式 (*.mcr;*.mc;*.mem;*.vgs;*.mcd;*.gme;*.ddf)"
 
-#: ../win32/gui/WndMain.c:1419
+#: ../win32/gui/WndMain.c:1420
 msgid "Psx Memory Card (*.mcr;*.mc)"
 msgstr "PS 記憶卡 (*.mcr;*.mc)"
 
-#: ../win32/gui/WndMain.c:1424
+#: ../win32/gui/WndMain.c:1425
 msgid "CVGS Memory Card (*.mem;*.vgs)"
 msgstr "VGS 記憶卡 (*.mem;*.vgs)"
 
-#: ../win32/gui/WndMain.c:1429
+#: ../win32/gui/WndMain.c:1430
 msgid "Bleem Memory Card (*.mcd)"
 msgstr "Bleem 記憶卡 (*.mcd)"
 
-#: ../win32/gui/WndMain.c:1434
+#: ../win32/gui/WndMain.c:1435
 msgid "DexDrive Memory Card (*.gme)"
 msgstr "DexDrive 記憶卡 (*.gme)"
 
-#: ../win32/gui/WndMain.c:1439
+#: ../win32/gui/WndMain.c:1440
 msgid "DataDeck Memory Card (*.ddf)"
 msgstr "DataDeck 記憶卡 (*.ddl)"
 
-#: ../win32/gui/WndMain.c:1483
+#: ../win32/gui/WndMain.c:1484
 msgid "Psx Exe Format"
 msgstr "PS EXE 格式"
 
-#: ../win32/gui/WndMain.c:1520
+#: ../win32/gui/WndMain.c:1521
 msgid "Psx Isos (*.iso;*.mdf;*.img;*.bin)"
 msgstr "PS 鏡像檔 (*.iso;*.mdf;*.img;*.bin)"
 
-#: ../win32/gui/WndMain.c:1596
+#: ../win32/gui/WndMain.c:1597
 msgid "&File"
 msgstr "檔案(&F)"
 
-#: ../win32/gui/WndMain.c:1597
+#: ../win32/gui/WndMain.c:1598
 msgid "E&xit"
 msgstr "離開(&X)"
 
-#: ../win32/gui/WndMain.c:1599
+#: ../win32/gui/WndMain.c:1600
 msgid "Run &EXE..."
 msgstr "執行 EXE(&E)..."
 
-#: ../win32/gui/WndMain.c:1600
+#: ../win32/gui/WndMain.c:1601
 msgid "Run &BIOS"
 msgstr "執行 BIOS(&B)"
 
-#: ../win32/gui/WndMain.c:1601
+#: ../win32/gui/WndMain.c:1602
 msgid "Run &ISO..."
 msgstr "執行 ISO(&I)..."
 
-#: ../win32/gui/WndMain.c:1602
+#: ../win32/gui/WndMain.c:1603
 msgid "Run &CD"
 msgstr "執行光碟(&C)"
 
-#: ../win32/gui/WndMain.c:1604
+#: ../win32/gui/WndMain.c:1605
 msgid "&Emulator"
 msgstr "模擬器(&E)"
 
-#: ../win32/gui/WndMain.c:1605
+#: ../win32/gui/WndMain.c:1606
 msgid "&States"
 msgstr "記錄(&S)"
 
-#: ../win32/gui/WndMain.c:1607
+#: ../win32/gui/WndMain.c:1608
 msgid "S&witch ISO..."
 msgstr "更換 ISO(&W)..."
 
-#: ../win32/gui/WndMain.c:1609
+#: ../win32/gui/WndMain.c:1610
 msgid "Re&set"
 msgstr "複位(&S)"
 
-#: ../win32/gui/WndMain.c:1610
+#: ../win32/gui/WndMain.c:1611
 msgid "&Run"
 msgstr "執行(&R)"
 
-#: ../win32/gui/WndMain.c:1611
+#: ../win32/gui/WndMain.c:1612
 msgid "&Save"
 msgstr "存儲(&S)"
 
-#: ../win32/gui/WndMain.c:1612
+#: ../win32/gui/WndMain.c:1613
 msgid "&Load"
 msgstr "讀取(&L)"
 
-#: ../win32/gui/WndMain.c:1613 ../win32/gui/WndMain.c:1623
+#: ../win32/gui/WndMain.c:1614 ../win32/gui/WndMain.c:1624
 msgid "&Other..."
 msgstr "其它(&O)..."
 
-#: ../win32/gui/WndMain.c:1614 ../win32/gui/WndMain.c:1624
+#: ../win32/gui/WndMain.c:1615 ../win32/gui/WndMain.c:1625
 msgid "Slot &9"
 msgstr "記錄 9(&9)"
 
-#: ../win32/gui/WndMain.c:1615 ../win32/gui/WndMain.c:1625
+#: ../win32/gui/WndMain.c:1616 ../win32/gui/WndMain.c:1626
 msgid "Slot &8"
 msgstr "記錄 8(&8)"
 
-#: ../win32/gui/WndMain.c:1616 ../win32/gui/WndMain.c:1626
+#: ../win32/gui/WndMain.c:1617 ../win32/gui/WndMain.c:1627
 msgid "Slot &7"
 msgstr "記錄 7(&7)"
 
-#: ../win32/gui/WndMain.c:1617 ../win32/gui/WndMain.c:1627
+#: ../win32/gui/WndMain.c:1618 ../win32/gui/WndMain.c:1628
 msgid "Slot &6"
 msgstr "記錄 6(&6)"
 
-#: ../win32/gui/WndMain.c:1618 ../win32/gui/WndMain.c:1628
+#: ../win32/gui/WndMain.c:1619 ../win32/gui/WndMain.c:1629
 msgid "Slot &5"
 msgstr "記錄 5(&5)"
 
-#: ../win32/gui/WndMain.c:1619 ../win32/gui/WndMain.c:1629
+#: ../win32/gui/WndMain.c:1620 ../win32/gui/WndMain.c:1630
 msgid "Slot &4"
 msgstr "記錄 4(&4)"
 
-#: ../win32/gui/WndMain.c:1620 ../win32/gui/WndMain.c:1630
+#: ../win32/gui/WndMain.c:1621 ../win32/gui/WndMain.c:1631
 msgid "Slot &3"
 msgstr "記錄 3(&3)"
 
-#: ../win32/gui/WndMain.c:1621 ../win32/gui/WndMain.c:1631
+#: ../win32/gui/WndMain.c:1622 ../win32/gui/WndMain.c:1632
 msgid "Slot &2"
 msgstr "記錄 2(&2)"
 
-#: ../win32/gui/WndMain.c:1622 ../win32/gui/WndMain.c:1632
+#: ../win32/gui/WndMain.c:1623 ../win32/gui/WndMain.c:1633
 msgid "Slot &1"
 msgstr "記錄 1(&1)"
 
-#: ../win32/gui/WndMain.c:1634
+#: ../win32/gui/WndMain.c:1635
 msgid "&Configuration"
 msgstr "設定(&C)"
 
-#: ../win32/gui/WndMain.c:1635
+#: ../win32/gui/WndMain.c:1636
 msgid "Cheat &Search..."
 msgstr "搜尋金手指碼(&S)..."
 
-#: ../win32/gui/WndMain.c:1636
+#: ../win32/gui/WndMain.c:1637
 msgid "Ch&eat Code..."
 msgstr "金手指碼(&E)..."
 
-#: ../win32/gui/WndMain.c:1639
+#: ../win32/gui/WndMain.c:1640
 msgid "&Language"
 msgstr "語言(&L)"
 
-#: ../win32/gui/WndMain.c:1664
+#: ../win32/gui/WndMain.c:1665
 msgid "&Memory cards..."
 msgstr "記憶卡(&M)..."
 
-#: ../win32/gui/WndMain.c:1665
+#: ../win32/gui/WndMain.c:1666
 msgid "C&PU..."
 msgstr "CPU(&P)..."
 
-#: ../win32/gui/WndMain.c:1667
+#: ../win32/gui/WndMain.c:1668
 msgid "&NetPlay..."
 msgstr "聯線遊戲(&N)..."
 
-#: ../win32/gui/WndMain.c:1669
+#: ../win32/gui/WndMain.c:1670
 msgid "&Controllers..."
 msgstr "控制器(&C)..."
 
-#: ../win32/gui/WndMain.c:1670
+#: ../win32/gui/WndMain.c:1671
 msgid "CD-&ROM..."
 msgstr "CD-ROM(&R)..."
 
-#: ../win32/gui/WndMain.c:1671
+#: ../win32/gui/WndMain.c:1672
 msgid "&Sound..."
 msgstr "聲音(&S)..."
 
-#: ../win32/gui/WndMain.c:1672
+#: ../win32/gui/WndMain.c:1673
 msgid "&Graphics..."
 msgstr "圖像(&G)..."
 
-#: ../win32/gui/WndMain.c:1674
+#: ../win32/gui/WndMain.c:1675
 msgid "&Plugins && Bios..."
 msgstr "外掛及 BIOS(&P)..."
 
-#: ../win32/gui/WndMain.c:1676
+#: ../win32/gui/WndMain.c:1677
 msgid "&Help"
 msgstr "說明(&H)"
 
-#: ../win32/gui/WndMain.c:1677
+#: ../win32/gui/WndMain.c:1678
 msgid "&About..."
 msgstr "關於(&A)..."
 
-#: ../win32/gui/WndMain.c:1865
+#: ../win32/gui/WndMain.c:1866
 msgid "Pcsx Msg"
 msgstr "Pcsx 消息"
 
-#: ../win32/gui/WndMain.c:1868
+#: ../win32/gui/WndMain.c:1869
 msgid "Error Loading Symbol"
 msgstr "無法加載符號"
diff --git a/win32/gui/WndMain.c b/win32/gui/WndMain.c
index 7d1360e4..5a5f734d 100644
--- a/win32/gui/WndMain.c
+++ b/win32/gui/WndMain.c
@@ -216,6 +216,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
 				"\toptions:\n"

 				"\t-nogui\t\tDon't open the GUI\n"

 				"\t-psxout\t\tEnable PSX output\n"

+				"\t-slowboot\t\tEnable BIOS logo\n"

 				"\t-runcd\t\tRuns CD-ROM (requires -nogui)\n"

 				"\t-cdfile FILE\tRuns a CD image file (requires -nogui)\n"

 				"\t-help\t\tDisplay this message"),