added netplay plugin

git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@47937 e17a0e51-4ae3-4d35-97c3-1a29b211df97
author: SND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> 2010-05-13 03:40:12 +0000
committer: SND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> 2010-05-13 03:40:12 +0000
commit: 0d1d9bece31f605d4aa68b20f3ecb19cd0db2d3d (patch)
tree: aa8228a939d9c813626e71f937b56b2280f2fc86
parent: 53eb8b20be0ed97773df48ce9788e617ad876e50 (diff)
download: pcsxr-0d1d9bece31f605d4aa68b20f3ecb19cd0db2d3d.tar.gz
22 files changed, 4755 insertions, 3065 deletions
diff --git a/ChangeLog b/ChangeLog
index abdfa4b7..19cb4f70 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+May 13, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
+
+ * configure.ac: Added plugins/dfnet/Makefile.am.
+ * Makefile.am: Added plugins/dfnet.
+ * plugins/dfnet/dfnet.c: Added NetPlay plugin (based on netSock).
+ * plugins/dfnet/unix.c: Likewise.
+ * plugins/dfnet/cfg.c: Likewise.
+ * plugins/dfnet/gui.c: Likewise.
+ * plugins/dfnet/dfnet.h: Likewise.
+ * plugins/dfnet/Makefile.am: Likewise.
+ * plugins/dfnet/dfnet.glade2: Likewise.
+ * plugins/dfinput/cfg-gtk2.c: Use gtk_dialog_run() for about dialog.
+ * plugins/dfcdrom/cdrcfg-0.1df/main.c: Likewise.
+ * po/pt_BR.po, po/it.po, po/zh_CN.po, po/zh_TW.po, po/ru_RU.po, po/pcsx.pot:
+   Updated.
+ * po/update-pot.sh: Added files in plugins/dfnet.
+
 May 12, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
 
  * libpcsxcore/sio.c: Erase CdromId and CdromLabel when net connection closed.
diff --git a/Makefile.am b/Makefile.am
index 5a5fed2b..9affdf8b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = data doc po libpcsxcore gui pixmaps plugins/dfinput plugins/dfsound plugins/dfxvideo plugins/dfcdrom
+SUBDIRS = data doc po libpcsxcore gui pixmaps plugins/dfinput plugins/dfsound plugins/dfxvideo plugins/dfcdrom plugins/dfnet
 SUBDIRS += $(PEOPSXGL)
 
 EXTRA_DIST = AUTHORS COPYING INSTALL NEWS README ChangeLog ChangeLog.df
diff --git a/Makefile.in b/Makefile.in
index 4a75b346..beb2ed58 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -257,7 +257,8 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 SUBDIRS = data doc po libpcsxcore gui pixmaps plugins/dfinput \
-	plugins/dfsound plugins/dfxvideo plugins/dfcdrom $(PEOPSXGL)
+	plugins/dfsound plugins/dfxvideo plugins/dfcdrom plugins/dfnet \
+	$(PEOPSXGL)
 EXTRA_DIST = AUTHORS COPYING INSTALL NEWS README ChangeLog ChangeLog.df
 all: all-recursive
 
diff --git a/configure b/configure
index 22121ada..03114879 100755
--- a/configure
+++ b/configure
@@ -13427,7 +13427,7 @@ rm -f core conftest.err conftest.$ac_objext \
 
 
 
-ac_config_files="$ac_config_files Makefile data/Makefile doc/Makefile libpcsxcore/Makefile gui/Makefile plugins/dfinput/Makefile plugins/dfsound/Makefile plugins/dfxvideo/Makefile plugins/dfcdrom/Makefile pixmaps/Makefile po/Makefile.in"
+ac_config_files="$ac_config_files Makefile data/Makefile doc/Makefile libpcsxcore/Makefile gui/Makefile plugins/dfinput/Makefile plugins/dfsound/Makefile plugins/dfxvideo/Makefile plugins/dfcdrom/Makefile plugins/dfnet/Makefile pixmaps/Makefile po/Makefile.in"
 
 
 saved_CFLAGS="$CFLAGS"
@@ -15271,6 +15271,7 @@ do
     "plugins/dfsound/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/dfsound/Makefile" ;;
     "plugins/dfxvideo/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/dfxvideo/Makefile" ;;
     "plugins/dfcdrom/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/dfcdrom/Makefile" ;;
+    "plugins/dfnet/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/dfnet/Makefile" ;;
     "pixmaps/Makefile") CONFIG_FILES="$CONFIG_FILES pixmaps/Makefile" ;;
     "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
     "plugins/peopsxgl/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/peopsxgl/Makefile" ;;
diff --git a/configure.ac b/configure.ac
index 0aef9912..bc4f1e21 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,7 +34,7 @@ AC_SUBST(GTK2_LIBS)
 AC_SUBST(GLADE2_CFLAGS)
 AC_SUBST(GLADE2_LIBS)
 
-AC_CONFIG_FILES([Makefile data/Makefile doc/Makefile libpcsxcore/Makefile gui/Makefile plugins/dfinput/Makefile plugins/dfsound/Makefile plugins/dfxvideo/Makefile plugins/dfcdrom/Makefile pixmaps/Makefile po/Makefile.in])
+AC_CONFIG_FILES([Makefile data/Makefile doc/Makefile libpcsxcore/Makefile gui/Makefile plugins/dfinput/Makefile plugins/dfsound/Makefile plugins/dfxvideo/Makefile plugins/dfcdrom/Makefile plugins/dfnet/Makefile pixmaps/Makefile po/Makefile.in])
 
 dnl Check for -fno-dse option support
 saved_CFLAGS="$CFLAGS"
diff --git a/plugins/dfcdrom/cdrcfg-0.1df/main.c b/plugins/dfcdrom/cdrcfg-0.1df/main.c
index 55172d20..c78558fd 100644
--- a/plugins/dfcdrom/cdrcfg-0.1df/main.c
+++ b/plugins/dfcdrom/cdrcfg-0.1df/main.c
@@ -202,11 +202,6 @@ long CDRconfigure() {
 	return 0;
 }
 
-static void OnAboutExit(GtkWidget *widget, gpointer user_data) {
-	gtk_widget_destroy(widget);
-	gtk_exit(0);
-}
-
 void CDRabout() {
 	GtkWidget *widget;
 	const char *authors[]= {"linuzappz <linuzappz@hotmail.com>",
@@ -218,11 +213,8 @@ void CDRabout() {
 	gtk_about_dialog_set_authors(GTK_ABOUT_DIALOG(widget), authors);
 	gtk_about_dialog_set_website(GTK_ABOUT_DIALOG(widget), "http://pcsxr.codeplex.com/");
 
-	g_signal_connect_data(GTK_OBJECT(widget), "response",
-		GTK_SIGNAL_FUNC(OnAboutExit), NULL, NULL, G_CONNECT_AFTER);
-
-	gtk_widget_show(widget);
-	gtk_main();
+	gtk_dialog_run(GTK_DIALOG(widget));
+	gtk_widget_destroy(widget);
 }
 
 #endif
diff --git a/plugins/dfinput/cfg-gtk2.c b/plugins/dfinput/cfg-gtk2.c
index 0434d363..768e317e 100644
--- a/plugins/dfinput/cfg-gtk2.c
+++ b/plugins/dfinput/cfg-gtk2.c
@@ -682,11 +682,6 @@ long PADconfigure() {
 	return 0;
 }
 
-static void OnAboutExit(GtkWidget *widget, gpointer user_data) {
-	gtk_widget_destroy(widget);
-	gtk_exit(0);
-}
-
 void PADabout() {
 	const char *authors[]= {"Wei Mingzhi <weimingzhi@gmail.com>", NULL};
 	GtkWidget *widget;
@@ -697,11 +692,8 @@ void PADabout() {
 	gtk_about_dialog_set_authors(GTK_ABOUT_DIALOG(widget), authors);
 	gtk_about_dialog_set_website(GTK_ABOUT_DIALOG(widget), "http://www.codeplex.com/pcsxr/");
 
-	g_signal_connect_data(GTK_OBJECT(widget), "response",
-		GTK_SIGNAL_FUNC(OnAboutExit), NULL, NULL, G_CONNECT_AFTER);
-
-	gtk_widget_show(widget);
-	gtk_main();
+	gtk_dialog_run(GTK_DIALOG(widget));
+	gtk_widget_destroy(widget);
 }
 
 int main(int argc, char *argv[]) {
diff --git a/plugins/dfnet/Makefile.am b/plugins/dfnet/Makefile.am
new file mode 100644
index 00000000..36f97682
--- /dev/null
+++ b/plugins/dfnet/Makefile.am
@@ -0,0 +1,21 @@
+bindir = @libdir@/games/psemu/
+libdir = @libdir@/games/psemu/
+
+lib_LTLIBRARIES = libDFNet.la
+
+libDFNet_la_SOURCES = dfnet.c unix.c cfg.c
+libDFNet_la_LDFLAGS = -module -avoid-version
+
+INCLUDES = -DPIXMAPDIR=\"${datadir}/pixmaps/\" \
+	-DLOCALE_DIR=\"${datadir}/locale/\" \
+	-DDATADIR=\"${datadir}/psemu/\" \
+	$(GTK2_CFLAGS) $(GLADE2_CFLAGS) \
+	-I../../libpcsxcore -I../../include
+
+bin_PROGRAMS = cfgDFNet
+cfgDFNet_SOURCES = gui.c
+cfgDFNet_LDADD = $(GTK2_LIBS) $(GLADE2_LIBS)
+
+glade_DATA = dfnet.glade2
+gladedir = $(datadir)/psemu/
+EXTRA_DIST = $(glade_DATA)
diff --git a/plugins/dfnet/Makefile.in b/plugins/dfnet/Makefile.in
new file mode 100644
index 00000000..23f17f4b
--- /dev/null
+++ b/plugins/dfnet/Makefile.in
@@ -0,0 +1,653 @@
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+target_triplet = @target@
+bin_PROGRAMS = cfgDFNet$(EXEEXT)
+subdir = plugins/dfnet
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/include/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
+	"$(DESTDIR)$(gladedir)"
+LTLIBRARIES = $(lib_LTLIBRARIES)
+libDFNet_la_LIBADD =
+am_libDFNet_la_OBJECTS = dfnet.lo unix.lo cfg.lo
+libDFNet_la_OBJECTS = $(am_libDFNet_la_OBJECTS)
+libDFNet_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(libDFNet_la_LDFLAGS) $(LDFLAGS) -o $@
+PROGRAMS = $(bin_PROGRAMS)
+am_cfgDFNet_OBJECTS = gui.$(OBJEXT)
+cfgDFNet_OBJECTS = $(am_cfgDFNet_OBJECTS)
+am__DEPENDENCIES_1 =
+cfgDFNet_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+SOURCES = $(libDFNet_la_SOURCES) $(cfgDFNet_SOURCES)
+DIST_SOURCES = $(libDFNet_la_SOURCES) $(cfgDFNet_SOURCES)
+DATA = $(glade_DATA)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALSA_CFLAGS = @ALSA_CFLAGS@
+ALSA_LIBS = @ALSA_LIBS@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCAS = @CCAS@
+CCASDEPMODE = @CCASDEPMODE@
+CCASFLAGS = @CCASFLAGS@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GLADE2_CFLAGS = @GLADE2_CFLAGS@
+GLADE2_LIBS = @GLADE2_LIBS@
+GLIB2_CFLAGS = @GLIB2_CFLAGS@
+GLIB2_LIBS = @GLIB2_LIBS@
+GMSGFMT = @GMSGFMT@
+GMSGFMT_015 = @GMSGFMT_015@
+GREP = @GREP@
+GTK2_CFLAGS = @GTK2_CFLAGS@
+GTK2_LIBS = @GTK2_LIBS@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INTLLIBS = @INTLLIBS@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MSGFMT = @MSGFMT@
+MSGFMT_015 = @MSGFMT_015@
+MSGMERGE = @MSGMERGE@
+NASM = @NASM@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PEOPSXGL = @PEOPSXGL@
+PKG_CONFIG = @PKG_CONFIG@
+POSUB = @POSUB@
+PULSEAUDIO_CFLAGS = @PULSEAUDIO_CFLAGS@
+PULSEAUDIO_LIBS = @PULSEAUDIO_LIBS@
+RANLIB = @RANLIB@
+SDL_CFLAGS = @SDL_CFLAGS@
+SDL_CONFIG = @SDL_CONFIG@
+SDL_LIBS = @SDL_LIBS@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+XGETTEXT = @XGETTEXT@
+XGETTEXT_015 = @XGETTEXT_015@
+XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @libdir@/games/psemu/
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@/games/psemu/
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+lib_LTLIBRARIES = libDFNet.la
+libDFNet_la_SOURCES = dfnet.c unix.c cfg.c
+libDFNet_la_LDFLAGS = -module -avoid-version
+INCLUDES = -DPIXMAPDIR=\"${datadir}/pixmaps/\" \
+	-DLOCALE_DIR=\"${datadir}/locale/\" \
+	-DDATADIR=\"${datadir}/psemu/\" \
+	$(GTK2_CFLAGS) $(GLADE2_CFLAGS) \
+	-I../../libpcsxcore -I../../include
+
+cfgDFNet_SOURCES = gui.c
+cfgDFNet_LDADD = $(GTK2_LIBS) $(GLADE2_LIBS)
+glade_DATA = dfnet.glade2
+gladedir = $(datadir)/psemu/
+EXTRA_DIST = $(glade_DATA)
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/dfnet/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu plugins/dfnet/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+	@$(NORMAL_INSTALL)
+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
+	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+	list2=; for p in $$list; do \
+	  if test -f $$p; then \
+	    list2="$$list2 $$p"; \
+	  else :; fi; \
+	done; \
+	test -z "$$list2" || { \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
+	}
+
+uninstall-libLTLIBRARIES:
+	@$(NORMAL_UNINSTALL)
+	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+	for p in $$list; do \
+	  $(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \
+	done
+
+clean-libLTLIBRARIES:
+	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+	  test "$$dir" != "$$p" || dir=.; \
+	  echo "rm -f \"$${dir}/so_locations\""; \
+	  rm -f "$${dir}/so_locations"; \
+	done
+libDFNet.la: $(libDFNet_la_OBJECTS) $(libDFNet_la_DEPENDENCIES) 
+	$(libDFNet_la_LINK) -rpath $(libdir) $(libDFNet_la_OBJECTS) $(libDFNet_la_LIBADD) $(LIBS)
+install-binPROGRAMS: $(bin_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
+	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	for p in $$list; do echo "$$p $$p"; done | \
+	sed 's/$(EXEEXT)$$//' | \
+	while read p p1; do if test -f $$p || test -f $$p1; \
+	  then echo "$$p"; echo "$$p"; else :; fi; \
+	done | \
+	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+	sed 'N;N;N;s,\n, ,g' | \
+	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
+	    else { print "f", $$3 "/" $$4, $$1; } } \
+	  END { for (d in files) print "f", d, files[d] }' | \
+	while read type dir files; do \
+	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+	    test -z "$$files" || { \
+	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
+	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
+	    } \
+	; done
+
+uninstall-binPROGRAMS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	files=`for p in $$list; do echo "$$p"; done | \
+	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+	      -e 's/$$/$(EXEEXT)/' `; \
+	test -n "$$list" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(bindir)" && rm -f $$files
+
+clean-binPROGRAMS:
+	@list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
+cfgDFNet$(EXEEXT): $(cfgDFNet_OBJECTS) $(cfgDFNet_DEPENDENCIES) 
+	@rm -f cfgDFNet$(EXEEXT)
+	$(LINK) $(cfgDFNet_OBJECTS) $(cfgDFNet_LDADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cfg.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dfnet.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gui.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unix.Plo@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+install-gladeDATA: $(glade_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(gladedir)" || $(MKDIR_P) "$(DESTDIR)$(gladedir)"
+	@list='$(glade_DATA)'; test -n "$(gladedir)" || list=; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(gladedir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(gladedir)" || exit $$?; \
+	done
+
+uninstall-gladeDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(glade_DATA)'; test -n "$(gladedir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(gladedir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(gladedir)" && rm -f $$files
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	set x; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA)
+install-binPROGRAMS: install-libLTLIBRARIES
+
+installdirs:
+	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(gladedir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
+	clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-gladeDATA
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am: install-binPROGRAMS install-libLTLIBRARIES
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-binPROGRAMS uninstall-gladeDATA \
+	uninstall-libLTLIBRARIES
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
+	clean-generic clean-libLTLIBRARIES clean-libtool ctags \
+	distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-binPROGRAMS \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-gladeDATA install-html \
+	install-html-am install-info install-info-am \
+	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags uninstall uninstall-am uninstall-binPROGRAMS \
+	uninstall-gladeDATA uninstall-libLTLIBRARIES
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/plugins/dfnet/cfg.c b/plugins/dfnet/cfg.c
new file mode 100644
index 00000000..a63b074b
--- /dev/null
+++ b/plugins/dfnet/cfg.c
@@ -0,0 +1,37 @@
+//
+// DF Netplay Plugin
+//
+// Based on netSock 0.2 by linuzappz.
+// The Plugin is free source code.
+//
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "dfnet.h"
+
+#define CFG_FILENAME "dfnet.cfg"
+
+void SaveConf() {
+	FILE *f;
+
+	f = fopen(CFG_FILENAME, "w");
+	if (f == NULL) return;
+	fwrite(&conf, 1, sizeof(conf), f);
+	fclose(f);
+}
+
+void LoadConf() {
+	FILE *f;
+
+	f = fopen(CFG_FILENAME, "r");
+	if (f == NULL) {
+		conf.PlayerNum = 1;
+		conf.PortNum = 33306;
+		strcpy(conf.ipAddress, "127.0.0.1");
+		return;
+	}
+
+	fread(&conf, 1, sizeof(conf), f);
+	fclose(f);
+}
diff --git a/plugins/dfnet/dfnet.c b/plugins/dfnet/dfnet.c
new file mode 100644
index 00000000..acc8fb48
--- /dev/null
+++ b/plugins/dfnet/dfnet.c
@@ -0,0 +1,285 @@
+//
+// DF Netplay Plugin
+//
+// Based on netSock 0.2 by linuzappz.
+// The Plugin is free source code.
+//
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <sys/types.h>
+#include <fcntl.h>
+#include <errno.h>
+extern int errno;
+
+#include "dfnet.h"
+
+const unsigned char version  = 2;    // NET library v2
+const unsigned char revision = 0;
+const unsigned char build    = 3;    // increase that with each version
+
+static char *libraryName      = N_("Socket Driver");
+
+unsigned long CALLBACK PSEgetLibType() {
+	return PSE_LT_NET;
+}
+
+char* CALLBACK PSEgetLibName() {
+	return _(libraryName);
+}
+
+unsigned long CALLBACK PSEgetLibVersion() {
+	return version << 16 | revision << 8 | build;
+}
+
+long CALLBACK NETinit() {
+	return sockInit();
+}
+
+int SEND(const void *buf, int Size, int Mode) {
+	int bytes;
+	int count = 0;
+	const char *pData = (const char *)buf;
+
+	if (Mode & PSE_NET_NONBLOCKING) { // NONBLOCKING
+		int ret;
+
+		FD_ZERO(&wset);
+		FD_SET(sock, &wset);
+
+		ret = select(sock + 1, NULL, &wset, NULL, &tm);
+		if (ret == -1) return -1;
+
+		if (FD_ISSET(sock, &wset)) {
+			return send(sock, pData, Size, 0);
+		} else {
+			return 0;
+		}
+	} else { // BLOCKING
+		while (Size > 0) {
+			bytes = send(sock, pData, Size, 0);
+			if (bytes < 0) return -1;
+			pData += bytes; Size -= bytes;
+			count += bytes;
+		}
+	}
+
+	return count;
+}
+
+int RECV(void *buf, int Size, int Mode) {
+	int bytes;
+	int count = 0;
+	char *pData = (char *)buf;
+
+	if (Mode & PSE_NET_NONBLOCKING) { // NONBLOCKING
+		int ret;
+
+		FD_ZERO(&rset);
+		FD_SET(sock, &rset);
+
+		ret = select(sock, &rset, NULL, NULL, &tm);
+
+		if (FD_ISSET(sock, &rset)) {
+			return recv(sock, pData, Size, 0);
+		} else {
+			return 0;
+		}
+	} else { // BLOCKING
+		while (Size > 0) {
+			bytes = recv(sock, pData, Size, 0);
+			if (bytes == -1) return -1;
+			pData+= bytes; Size-= bytes;
+			count+= bytes;
+		}
+	}
+
+	return count;
+}
+
+void sockGetIP(char *IPAddress) {
+	char str[256];
+	struct hostent *host;
+	unsigned char *addr;
+
+	gethostname(str, 256);
+	host = gethostbyname(str);
+	addr = host->h_addr_list[0];
+	sprintf(IPAddress, "%d.%d.%d.%d", addr[0], addr[1], addr[2], addr[3]);
+}
+
+long CALLBACK NETopen(unsigned long *gpuDisp) {
+	int ret = sockOpen();
+
+	struct sockaddr_in address;
+
+	if (ret == -1) return -1;
+
+	if (conf.PlayerNum == 1) {
+		int listen_sock, reuse_addr = 1;
+		int ret;
+
+		memset((char *)&address, 0, sizeof (address));
+
+		address.sin_family = AF_INET;
+		address.sin_port = htons(conf.PortNum);
+		address.sin_addr.s_addr = INADDR_ANY;
+
+		listen_sock = socket(AF_INET, SOCK_STREAM, 0);
+		if (listen_sock == -1)
+			return -1;
+
+		setsockopt(listen_sock, SOL_SOCKET, SO_REUSEADDR, (const char *)&reuse_addr, sizeof(reuse_addr));
+
+		if (bind(listen_sock,(struct sockaddr *) &address, sizeof(address)) == -1)
+			return -1;
+
+		if (listen(listen_sock, 1) != 0) 
+			return -1; 
+
+		sock = -1;
+
+		WaitCancel = 0;
+		sockCreateWaitDlg();
+
+		while (sock < 0) {
+			FD_ZERO(&rset);
+			FD_SET(listen_sock, &rset);
+
+			ret = select(listen_sock + 1, &rset, NULL, NULL, &tm);
+			if (FD_ISSET(listen_sock, &rset)) {
+				sock = accept(listen_sock, NULL, NULL);
+			}
+
+			if (WaitCancel) break;
+			sockDlgUpdate();
+		}
+		close(listen_sock);
+
+		sockDestroyWaitDlg();
+		if (WaitCancel == 1) return -1;
+	} else {
+		memset((char *)&address, 0, sizeof(address));
+		address.sin_family = AF_INET;
+		address.sin_port = htons(conf.PortNum);
+		address.sin_addr.s_addr = inet_addr(conf.ipAddress);
+
+		sock = socket(AF_INET, SOCK_STREAM, 0);
+
+		if (connect(sock, (struct sockaddr *)&address, sizeof(address))!=0) {
+			SysMessage(_("error connecting to %s: %s\n"), conf.ipAddress, strerror(errno));
+			return -1;
+		}
+	}
+
+	PadInit = 0;
+	PadCount = 0;
+	PadSize[0] = -1;
+	PadSize[1] = -1;
+	PadRecvSize = -1;
+	PadSendSize = -1;
+	Ping = sockPing();
+	Ping = (sockPing() + Ping) / 2;
+	Ping = (sockPing() + Ping) / 2;
+
+	if (conf.PlayerNum == 1) {
+		PadCountMax = (int)(((double)Ping / 1000.0) * 60.0);
+		if (PadCountMax <= 0) PadCountMax = 1;
+		SEND(&PadCountMax, 4, PSE_NET_BLOCKING);
+	} else {
+		RECV(&PadCountMax, 4, PSE_NET_BLOCKING);
+	}
+
+	PadSendData = (char *)malloc(PadCountMax * 128);
+	if (PadSendData == NULL) {
+		SysMessage(_("Error allocating memory!\n")); return -1;
+	}
+	memset(PadSendData, 0xff, PadCountMax);
+
+	return ret;
+}
+
+long CALLBACK NETclose() {
+	close(sock);
+
+	return 0;
+}
+
+long CALLBACK NETshutdown() {
+	return sockShutdown();
+}
+
+void CALLBACK NETpause() {
+/*	unsigned char Code = 0x80;
+
+	SEND(&Code, 1, PSE_NET_BLOCKING);*/
+}
+
+void CALLBACK NETresume() {
+/*	unsigned char Code = 0x80;
+
+	SEND(&Code, 1, PSE_NET_BLOCKING);*/
+}
+
+long CALLBACK NETsendData(void *pData, int Size, int Mode) {
+	return SEND(pData, Size, Mode);
+}
+
+long CALLBACK NETrecvData(void *pData, int Size, int Mode) {
+	return RECV(pData, Size, Mode);
+}
+
+long CALLBACK NETsendPadData(void *pData, int Size) {
+	if (PadSendSize == -1) {
+		PadSendSize = Size;
+
+		if (SEND(&PadSendSize, 1, PSE_NET_BLOCKING) == -1)
+			return -1;
+
+		if (RECV(&PadRecvSize, 1, PSE_NET_BLOCKING) == -1)
+			return -1;
+	}
+
+	memcpy(&PadSendData[PadCount], pData, Size);
+	if (SEND(pData, PadSendSize, PSE_NET_BLOCKING) == -1)
+		return -1;
+
+	return 0;
+}
+
+long CALLBACK NETrecvPadData(void *pData, int Pad) {
+	if (PadInit == 0) {
+		if (conf.PlayerNum == Pad) {
+			memset(pData, 0xff, PadSendSize);
+		} else {
+			memset(pData, 0xff, PadRecvSize);
+		}
+	} else {
+		if (conf.PlayerNum == Pad) {
+			memcpy(pData, &PadSendData[PadCount == 0 ? PadCountMax-1 : PadCount-1], PadSendSize);
+		} else {
+			if (RECV(pData, PadRecvSize, PSE_NET_BLOCKING) == -1)
+				return -1;
+		}
+	}
+
+	if (Pad == 2) {
+		PadCount++;
+		if (PadCount == PadCountMax) {
+			PadCount = 0;
+			PadInit = 1;
+		}
+	}
+
+	return 0;
+}
+
+long CALLBACK NETqueryPlayer() {
+	return conf.PlayerNum;
+}
+
+long CALLBACK NETtest() {
+	return 0;
+}
diff --git a/plugins/dfnet/dfnet.glade2 b/plugins/dfnet/dfnet.glade2
new file mode 100644
index 00000000..204a7905
--- /dev/null
+++ b/plugins/dfnet/dfnet.glade2
@@ -0,0 +1,264 @@
+<?xml version="1.0"?>
+<glade-interface>
+  <!-- interface-requires gtk+ 2.8 -->
+  <!-- interface-naming-policy project-wide -->
+  <widget class="GtkDialog" id="dlgStart">
+    <property name="border_width">5</property>
+    <property name="resizable">False</property>
+    <property name="modal">True</property>
+    <property name="window_position">center</property>
+    <property name="type_hint">normal</property>
+    <property name="has_separator">False</property>
+    <child internal-child="vbox">
+      <widget class="GtkVBox" id="dialog-vbox1">
+        <property name="visible">True</property>
+        <property name="spacing">5</property>
+        <child>
+          <widget class="GtkVBox" id="vbox1">
+            <property name="visible">True</property>
+            <property name="spacing">12</property>
+            <child>
+              <widget class="GtkLabel" id="label1">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">Select here if you'll be Server (Player1) or Client (Player2).
+
+If you select Server you must Copy your IP address to the Clipboard and paste if (Ctrl+V) wherever the Client can see it.
+
+If you selected Client please enter the IP address the Server gave to you in the IP Address Control.</property>
+                <property name="wrap">True</property>
+              </widget>
+              <packing>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkTable" id="table1">
+                <property name="visible">True</property>
+                <property name="n_rows">2</property>
+                <property name="n_columns">2</property>
+                <property name="column_spacing">8</property>
+                <property name="row_spacing">12</property>
+                <child>
+                  <widget class="GtkButton" id="btnCopyIP">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">True</property>
+                    <child>
+                      <widget class="GtkHBox" id="hbox2">
+                        <property name="visible">True</property>
+                        <child>
+                          <widget class="GtkImage" id="image1">
+                            <property name="visible">True</property>
+                            <property name="stock">gtk-copy</property>
+                          </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkLabel" id="label4">
+                            <property name="visible">True</property>
+                            <property name="label" translatable="yes">Copy PC IP to Clipboard</property>
+                          </widget>
+                          <packing>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </widget>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="right_attach">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkEntry" id="tbServerIP">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="max_length">11</property>
+                    <property name="invisible_char">&#x25CF;</property>
+                  </widget>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="right_attach">2</property>
+                    <property name="top_attach">1</property>
+                    <property name="bottom_attach">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkRadioButton" id="rbServer">
+                    <property name="label" translatable="yes">Server (Player1)</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="active">True</property>
+                    <property name="draw_indicator">True</property>
+                  </widget>
+                </child>
+                <child>
+                  <widget class="GtkRadioButton" id="rbClient">
+                    <property name="label" translatable="yes">Client (Player2)</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="active">True</property>
+                    <property name="draw_indicator">True</property>
+                    <property name="group">rbServer</property>
+                  </widget>
+                  <packing>
+                    <property name="top_attach">1</property>
+                    <property name="bottom_attach">2</property>
+                  </packing>
+                </child>
+              </widget>
+              <packing>
+                <property name="padding">2</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkVBox" id="vbox2">
+                <property name="visible">True</property>
+                <property name="spacing">6</property>
+                <child>
+                  <widget class="GtkLabel" id="label2">
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">Do not change if not necessary (remember it must be changed on both sides).</property>
+                    <property name="wrap">True</property>
+                  </widget>
+                  <packing>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkHBox" id="hbox1">
+                    <property name="visible">True</property>
+                    <child>
+                      <widget class="GtkLabel" id="label3">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">Port Number</property>
+                      </widget>
+                      <packing>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkEntry" id="tbPort">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="max_length">5</property>
+                        <property name="invisible_char">&#x25CF;</property>
+                      </widget>
+                      <packing>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </widget>
+              <packing>
+                <property name="position">2</property>
+              </packing>
+            </child>
+          </widget>
+          <packing>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child internal-child="action_area">
+          <widget class="GtkHButtonBox" id="dialog-action_area1">
+            <property name="visible">True</property>
+            <property name="layout_style">end</property>
+            <child>
+              <widget class="GtkButton" id="btnStart">
+                <property name="response_id">-5</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <child>
+                  <widget class="GtkHBox" id="hbox3">
+                    <property name="visible">True</property>
+                    <child>
+                      <widget class="GtkImage" id="image2">
+                        <property name="visible">True</property>
+                        <property name="stock">gtk-network</property>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkLabel" id="label5">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">Start Game</property>
+                      </widget>
+                      <packing>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </widget>
+                </child>
+              </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkButton" id="btnOffline">
+                <property name="response_id">-6</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <child>
+                  <widget class="GtkHBox" id="hbox4">
+                    <property name="visible">True</property>
+                    <child>
+                      <widget class="GtkImage" id="image3">
+                        <property name="visible">True</property>
+                        <property name="stock">gtk-no</property>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkLabel" id="label6">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">Play Offline</property>
+                      </widget>
+                      <packing>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </widget>
+                </child>
+              </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+      </widget>
+    </child>
+  </widget>
+</glade-interface>
diff --git a/plugins/dfnet/dfnet.h b/plugins/dfnet/dfnet.h
new file mode 100644
index 00000000..d5851218
--- /dev/null
+++ b/plugins/dfnet/dfnet.h
@@ -0,0 +1,82 @@
+//
+// DF Netplay Plugin
+//
+// Based on netSock 0.2 by linuzappz.
+// The Plugin is free source code.
+//
+
+#ifndef __DFNET_H__
+#define __DFNET_H__
+
+#include "config.h"
+
+#include <sys/time.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <netdb.h>
+#include <unistd.h>
+
+#ifdef ENABLE_NLS
+#include <libintl.h>
+#include <locale.h>
+#define _(x)  gettext(x)
+#define N_(x) (x)
+#else
+#define _(x)  (x)
+#define N_(x) (x)
+#endif
+
+typedef void* HWND;
+
+struct timeval tm;
+
+#define CALLBACK
+
+long timeGetTime();
+
+#include "psemu_plugin_defs.h"
+
+typedef struct {
+	int PlayerNum;
+	unsigned short PortNum;
+	char ipAddress[32];
+} Config;
+
+Config conf;
+
+void LoadConf();
+void SaveConf();
+
+long sock;
+char *PadSendData;
+char *PadRecvData;
+char PadSendSize;
+char PadRecvSize;
+char PadSize[2];
+int PadCount;
+int PadCountMax;
+int PadInit;
+int Ping;
+volatile int WaitCancel;
+fd_set rset;
+fd_set wset;
+
+long sockInit();
+long sockShutdown();
+long sockOpen();
+void sockCreateWaitDlg();
+void sockDlgUpdate();
+void sockDestroyWaitDlg();
+
+void sockGetIP(char *IPAddress);
+int sockPing();
+
+int ShowPauseDlg();
+void SysMessage(const char *fmt, ...);
+
+int SEND(const void *pData, int Size, int Mode);
+int RECV(void *pData, int Size, int Mode);
+
+#endif
diff --git a/plugins/dfnet/gui.c b/plugins/dfnet/gui.c
new file mode 100644
index 00000000..ad991bc1
--- /dev/null
+++ b/plugins/dfnet/gui.c
@@ -0,0 +1,195 @@
+//
+// DF Netplay Plugin
+//
+// Based on netSock 0.2 by linuzappz.
+// The Plugin is free source code.
+//
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>
+#include <glade/glade.h>
+
+#include "cfg.c"
+
+void cfgSysMessage(const char *fmt, ...) {
+	GtkWidget *MsgDlg;
+	va_list list;
+	char msg[512];
+
+	va_start(list, fmt);
+	vsprintf(msg, fmt, list);
+	va_end(list);
+
+	if (msg[strlen(msg) - 1] == '\n') msg[strlen(msg) - 1] = 0;
+
+	MsgDlg = gtk_message_dialog_new(NULL, GTK_DIALOG_MODAL,
+		GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, _("NetPlay"));
+	gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(MsgDlg), msg);
+
+	gtk_dialog_run(GTK_DIALOG(MsgDlg));
+	gtk_widget_destroy(MsgDlg);
+}
+
+void CFGconfigure() {
+	cfgSysMessage(_("Nothing to configure"));
+}
+
+void sockGetIP(char *IPAddress) {
+	char str[256];
+	struct hostent *host;
+	unsigned char *addr;
+
+	gethostname(str, 256);
+	host = gethostbyname(str);
+	addr = (unsigned char *)host->h_addr_list[0];
+	sprintf(IPAddress, "%d.%d.%d.%d", addr[0], addr[1], addr[2], addr[3]);
+}
+
+void OnCopyIP(GtkWidget *widget, gpointer user_data) {
+	char str[256];
+
+	sockGetIP(str);
+	gtk_clipboard_set_text(gtk_clipboard_get(GDK_SELECTION_CLIPBOARD), str, strlen(str));
+	cfgSysMessage(_("IP %s"), str);
+}
+
+long CFGopen() {
+	GladeXML *xml;
+	GtkWidget *widget, *MainWindow;
+	char buf[256];
+
+	LoadConf();
+
+	xml = glade_xml_new(DATADIR "dfnet.glade2", "dlgStart", NULL);
+	if (xml == NULL) {
+		g_warning("We could not load the interface!");
+		return 0;
+	}
+
+	MainWindow = glade_xml_get_widget(xml, "dlgStart");
+	gtk_window_set_title(GTK_WINDOW(MainWindow), _("NetPlay"));
+
+	widget = glade_xml_get_widget(xml, "btnCopyIP");
+	g_signal_connect_data(GTK_OBJECT(widget), "clicked",
+		GTK_SIGNAL_FUNC(OnCopyIP), NULL, NULL, G_CONNECT_AFTER);
+
+	widget = glade_xml_get_widget(xml, "tbServerIP");
+	gtk_entry_set_text(GTK_ENTRY(widget), conf.ipAddress);
+
+	widget = glade_xml_get_widget(xml, "tbPort");
+	sprintf(buf, "%d", conf.PortNum);
+	gtk_entry_set_text(GTK_ENTRY(widget), buf);
+
+	if (conf.PlayerNum == 1) {
+		widget = glade_xml_get_widget(xml, "rbServer");
+		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), TRUE);
+	} else {
+		widget = glade_xml_get_widget(xml, "rbClient");
+		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), TRUE);
+	}
+
+	if (gtk_dialog_run(GTK_DIALOG(MainWindow)) == GTK_RESPONSE_OK) {
+		widget = glade_xml_get_widget(xml, "tbServerIP");
+		strcpy(conf.ipAddress, gtk_entry_get_text(GTK_ENTRY(widget)));
+
+		widget = glade_xml_get_widget(xml, "tbPort");
+		conf.PortNum = atoi(gtk_entry_get_text(GTK_ENTRY(widget)));
+
+		widget = glade_xml_get_widget(xml, "rbServer");
+		if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget))) {
+			conf.PlayerNum = 1;
+		} else {
+			conf.PlayerNum = 2;
+		}
+
+		SaveConf();
+		gtk_widget_destroy(MainWindow);
+		return 1;
+	}
+
+	gtk_widget_destroy(MainWindow);
+
+	return 0;
+}
+
+void OnWaitDialog_Abort() {
+	kill(getppid(), SIGUSR2);
+}
+
+void CFGwait() {
+	GtkWidget *WaitDlg;
+
+	WaitDlg = gtk_message_dialog_new(NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_INFO,
+		GTK_BUTTONS_CANCEL, _("Waiting for connection..."));
+
+	gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(WaitDlg),
+		_("The Client should now Start a Connection, waiting..."));
+
+	gtk_dialog_run(GTK_DIALOG(WaitDlg));
+	gtk_widget_destroy(WaitDlg);
+
+	OnWaitDialog_Abort();
+}
+
+long CFGpause() {
+	return 0;
+}
+
+void CFGabout() {
+	const char *authors[]= {"linuzappz <linuzappz@hotmail.com>", "Wei Mingzhi <whistler_wmz@users.sf.net>", NULL};
+	GtkWidget *widget;
+
+	widget = gtk_about_dialog_new();
+	gtk_about_dialog_set_name(GTK_ABOUT_DIALOG(widget), "Socket NetPlay Driver");
+	gtk_about_dialog_set_version(GTK_ABOUT_DIALOG(widget), "0.21");
+	gtk_about_dialog_set_authors(GTK_ABOUT_DIALOG(widget), authors);
+	gtk_about_dialog_set_website(GTK_ABOUT_DIALOG(widget), "http://www.codeplex.com/pcsxr/");
+
+	gtk_dialog_run(GTK_DIALOG(widget));
+	gtk_widget_destroy(widget);
+}
+
+long CFGmessage(char *args[], int num) {
+	char msg[512];
+
+	memset(msg, 0, sizeof(msg));
+	while (num) {
+		strcat(msg, *args); strcat(msg, " ");
+		num--; args++;
+	}
+	cfgSysMessage(msg);
+
+	return 0;
+}
+
+int main(int argc, char *argv[]) {
+#ifdef ENABLE_NLS
+	setlocale(LC_ALL, "");
+	bindtextdomain(GETTEXT_PACKAGE, LOCALE_DIR);
+	bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
+	textdomain(GETTEXT_PACKAGE);
+#endif
+
+	gtk_set_locale();
+	gtk_init(&argc, &argv);
+
+	if (!strcmp(argv[1], "configure")) {
+		CFGconfigure();
+	} else if (!strcmp(argv[1], "open")) {
+		return CFGopen();
+	} else if (!strcmp(argv[1], "wait")) {
+		CFGwait();
+	} else if (!strcmp(argv[1], "pause")) {
+		return CFGpause();
+	} else if (!strcmp(argv[1], "about")) {
+		CFGabout();
+	} else if (!strcmp(argv[1], "message")) {
+		CFGmessage(&argv[2], argc - 2);
+	}
+
+	return 0;
+}
diff --git a/plugins/dfnet/unix.c b/plugins/dfnet/unix.c
new file mode 100644
index 00000000..82f8c1f8
--- /dev/null
+++ b/plugins/dfnet/unix.c
@@ -0,0 +1,125 @@
+//
+// DF Netplay Plugin
+//
+// Based on netSock 0.2 by linuzappz.
+// The Plugin is free source code.
+//
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include <sys/types.h>
+#include <fcntl.h>
+#include <string.h>
+#include <sys/stat.h>
+#include <errno.h>
+#include <signal.h>
+#include <sys/wait.h>
+extern int errno;
+
+#include "dfnet.h"
+
+int ExecCfg(const char *arg) {
+	char cfg[512];
+	struct stat buf;
+
+	strcpy(cfg, "cfg/cfgDFNet");
+	if (stat(cfg, &buf) != -1) {
+		strcat(cfg, " ");
+		strcat(cfg, arg);
+		return system(cfg);
+	}
+
+	printf("cfgDFNet file not found!\n");
+	return -1;
+}
+
+void SysMessage(const char *fmt, ...) {
+	va_list list;
+	char msg[512];
+	char cmd[512];
+
+	va_start(list, fmt);
+	vsprintf(msg, fmt, list);
+	va_end(list);
+
+	sprintf(cmd, "message %s\n", msg);
+	ExecCfg(cmd);
+}
+
+long sockInit() {
+	conf.PlayerNum = 0;
+	tm.tv_sec = 0;
+	tm.tv_usec = 0;
+
+	return 0;
+}
+
+long sockShutdown() {
+	return 0;
+}
+
+long sockOpen() {
+	if (ExecCfg("open") == 0) return -1;
+
+	LoadConf();
+
+	return 0;
+}
+
+int sockPing() {
+	char data[32];
+	struct timeval tv, tvn;
+
+	memset(data, 0, sizeof(data));
+
+	gettimeofday(&tv, NULL);
+	SEND(data, 32, PSE_NET_BLOCKING);
+	RECV(data, 32, PSE_NET_BLOCKING);
+	gettimeofday(&tvn, NULL);
+
+	return (tvn.tv_sec - tv.tv_sec) * 1000 +
+		   (tvn.tv_usec - tv.tv_usec) / 1000;
+}
+
+void CALLBACK NETconfigure() {
+	ExecCfg("configure");
+}
+
+void CALLBACK NETabout() {
+	ExecCfg("about");
+}
+
+pid_t cfgpid = 0;
+
+void OnWaitDlg_Abort(int num) {
+	WaitCancel = 1;
+	cfgpid = 0;
+}
+
+void sockCreateWaitDlg() {
+	signal(SIGUSR2, OnWaitDlg_Abort);
+	if ((cfgpid = fork()) == 0) {
+		execl("cfg/cfgDFNet", "cfgDFNet", "wait", NULL);
+		exit(0);
+	}
+	usleep(100000);
+}
+
+void sockDlgUpdate() {
+	usleep(100000);
+}
+
+void sockDestroyWaitDlg() {
+	if (cfgpid > 0) {
+		kill(cfgpid, SIGKILL);
+		cfgpid = 0;
+	}
+}
+
+long timeGetTime() {
+	struct timeval tv;
+
+	gettimeofday(&tv, NULL);
+	return (tv.tv_sec) * 1000 + (tv.tv_usec) / 1000;
+}
diff --git a/po/it.po b/po/it.po
index 3bdd0980..4e592219 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: \n"
-"POT-Creation-Date: 2010-04-11 20:17+0800\n"
+"POT-Creation-Date: 2010-05-13 11:15+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"
@@ -58,8 +58,8 @@ msgid "About"
 msgstr "Informazioni"
 
 #: ../win32/gui/AboutDlg.c:48 ../win32/gui/AboutDlg.c:52
-#: ../win32/gui/CheatDlg.c:70 ../win32/gui/CheatDlg.c:120
-#: ../win32/gui/ConfigurePlugins.c:470 ../win32/gui/ConfigurePlugins.c:601
+#: ../win32/gui/CheatDlg.c:69 ../win32/gui/CheatDlg.c:119
+#: ../win32/gui/ConfigurePlugins.c:483 ../win32/gui/ConfigurePlugins.c:614
 #: ../win32/gui/WndMain.c:966 ../win32/gui/WndMain.c:1202
 #: ../plugins/peopsxgl/gpucfg/interface.c:130
 #: ../plugins/peopsxgl/gpucfg/interface.c:843
@@ -70,484 +70,342 @@ msgstr "OK"
 msgid "PCSX EMU\n"
 msgstr "PCSX EMU\n"
 
-#: ../win32/gui/CheatDlg.c:52 ../win32/gui/CheatDlg.c:224
-#: ../win32/gui/CheatDlg.c:271
+#: ../win32/gui/CheatDlg.c:51 ../win32/gui/CheatDlg.c:223
+#: ../win32/gui/CheatDlg.c:270
 msgid "Yes"
 msgstr "Sì"
 
-#: ../win32/gui/CheatDlg.c:52 ../win32/gui/CheatDlg.c:224
-#: ../win32/gui/CheatDlg.c:271
+#: ../win32/gui/CheatDlg.c:51 ../win32/gui/CheatDlg.c:223
+#: ../win32/gui/CheatDlg.c:270
 msgid "No"
 msgstr "No"
 
-#: ../win32/gui/CheatDlg.c:67 ../gui/Cheat.c:195
+#: ../win32/gui/CheatDlg.c:66 ../gui/Cheat.c:194
 msgid "Edit Cheat"
 msgstr "Modifica cheat"
 
-#: ../win32/gui/CheatDlg.c:68 ../win32/gui/CheatDlg.c:118 ../gui/Cheat.c:637
+#: ../win32/gui/CheatDlg.c:67 ../win32/gui/CheatDlg.c:117 ../gui/Cheat.c:636
 msgid "Description:"
 msgstr "Descrizione:"
 
-#: ../win32/gui/CheatDlg.c:69 ../win32/gui/CheatDlg.c:119 ../gui/Cheat.c:126
-#: ../gui/Cheat.c:212
+#: ../win32/gui/CheatDlg.c:68 ../win32/gui/CheatDlg.c:118 ../gui/Cheat.c:125
+#: ../gui/Cheat.c:211
 msgid "Cheat Code:"
 msgstr "Codice cheat:"
 
-#: ../win32/gui/CheatDlg.c:71 ../win32/gui/CheatDlg.c:121
-#: ../win32/gui/ConfigurePlugins.c:471 ../win32/gui/ConfigurePlugins.c:602
+#: ../win32/gui/CheatDlg.c:70 ../win32/gui/CheatDlg.c:120
+#: ../win32/gui/ConfigurePlugins.c:484 ../win32/gui/ConfigurePlugins.c:615
 #: ../win32/gui/WndMain.c:967 ../win32/gui/WndMain.c:1203
 #: ../plugins/peopsxgl/gpucfg/interface.c:338
 msgid "Cancel"
 msgstr "Annulla"
 
-#: ../win32/gui/CheatDlg.c:92 ../win32/gui/CheatDlg.c:133 ../gui/Cheat.c:156
-#: ../gui/Cheat.c:252
+#: ../win32/gui/CheatDlg.c:91 ../win32/gui/CheatDlg.c:132 ../gui/Cheat.c:155
+#: ../gui/Cheat.c:251
 msgid "Invalid cheat code!"
 msgstr "Codice del cheat non valido!"
 
-#: ../win32/gui/CheatDlg.c:117 ../gui/Cheat.c:110
+#: ../win32/gui/CheatDlg.c:116 ../gui/Cheat.c:109
 msgid "Add New Cheat"
 msgstr "Aggiungi un nuovo cheat"
 
-#: ../win32/gui/CheatDlg.c:167 ../data/pcsx.glade2:2622
+#: ../win32/gui/CheatDlg.c:166 ../data/pcsx.glade2:2612
 msgid "Edit Cheat Codes"
 msgstr "Modifica i codici dei cheat"
 
-#: ../win32/gui/CheatDlg.c:169
+#: ../win32/gui/CheatDlg.c:168
 msgid "&Add Code"
 msgstr "&Aggiungi un codice"
 
-#: ../win32/gui/CheatDlg.c:170
+#: ../win32/gui/CheatDlg.c:169
 msgid "&Edit Code"
 msgstr "&Modifica un codice"
 
-#: ../win32/gui/CheatDlg.c:171
+#: ../win32/gui/CheatDlg.c:170
 msgid "&Remove Code"
 msgstr "&Rimuovi un codice"
 
-#: ../win32/gui/CheatDlg.c:172
+#: ../win32/gui/CheatDlg.c:171
 msgid "&Enable/Disable"
 msgstr "&Abilita/Disabilita"
 
-#: ../win32/gui/CheatDlg.c:173
+#: ../win32/gui/CheatDlg.c:172
 msgid "&Load..."
 msgstr "&Carica..."
 
-#: ../win32/gui/CheatDlg.c:174
+#: ../win32/gui/CheatDlg.c:173
 msgid "&Save As..."
 msgstr "&Salva come..."
 
-#: ../win32/gui/CheatDlg.c:175
+#: ../win32/gui/CheatDlg.c:174
 msgid "&Close"
 msgstr "&Chiudi"
 
-#: ../win32/gui/CheatDlg.c:186 ../gui/Cheat.c:414
+#: ../win32/gui/CheatDlg.c:185 ../gui/Cheat.c:413
 msgid "Description"
 msgstr "Descrizione"
 
-#: ../win32/gui/CheatDlg.c:191
+#: ../win32/gui/CheatDlg.c:190
 msgid "Enabled"
 msgstr "Abilitato"
 
-#: ../win32/gui/CheatDlg.c:283 ../win32/gui/CheatDlg.c:312
+#: ../win32/gui/CheatDlg.c:282 ../win32/gui/CheatDlg.c:311
 msgid "PCSX Cheat Code Files"
 msgstr "File del codice dei cheat di PCSX"
 
-#: ../win32/gui/CheatDlg.c:403
+#: ../win32/gui/CheatDlg.c:402
 msgid "Equal Value"
 msgstr "Stesso valore"
 
-#: ../win32/gui/CheatDlg.c:404
+#: ../win32/gui/CheatDlg.c:403
 msgid "Not Equal Value"
 msgstr "Valore diverso"
 
-#: ../win32/gui/CheatDlg.c:405
+#: ../win32/gui/CheatDlg.c:404
 msgid "Range"
 msgstr "Scala"
 
-#: ../win32/gui/CheatDlg.c:408
+#: ../win32/gui/CheatDlg.c:407
 msgid "Increased By"
 msgstr "Incrementato da"
 
-#: ../win32/gui/CheatDlg.c:409
+#: ../win32/gui/CheatDlg.c:408
 msgid "Decreased By"
 msgstr "Decrementato da"
 
-#: ../win32/gui/CheatDlg.c:410
+#: ../win32/gui/CheatDlg.c:409
 msgid "Increased"
 msgstr "Incrementato"
 
-#: ../win32/gui/CheatDlg.c:411
+#: ../win32/gui/CheatDlg.c:410
 msgid "Decreased"
 msgstr "Decrementato"
 
-#: ../win32/gui/CheatDlg.c:412
+#: ../win32/gui/CheatDlg.c:411
 msgid "Different"
 msgstr "Differente"
 
-#: ../win32/gui/CheatDlg.c:413
+#: ../win32/gui/CheatDlg.c:412
 msgid "No Change"
 msgstr "Nessun cambio"
 
-#: ../win32/gui/CheatDlg.c:449 ../gui/Cheat.c:586
+#: ../win32/gui/CheatDlg.c:448 ../gui/Cheat.c:585
 msgid "Enter the values and start your search."
 msgstr "Digita i valori ed inizia la tua ricerca."
 
-#: ../win32/gui/CheatDlg.c:454
+#: ../win32/gui/CheatDlg.c:453
 msgid "No addresses found."
 msgstr "Non è stato trovato nessun indirizzo."
 
-#: ../win32/gui/CheatDlg.c:458 ../gui/Cheat.c:544
+#: ../win32/gui/CheatDlg.c:457 ../gui/Cheat.c:543
 msgid "Too many addresses found."
 msgstr "Sono stati trovati troppi indirizzi."
 
-#: ../win32/gui/CheatDlg.c:467 ../gui/Cheat.c:553
+#: ../win32/gui/CheatDlg.c:466 ../gui/Cheat.c:552
 #, c-format
 msgid "%.8X    Current: %u (%.2X), Previous: %u (%.2X)"
 msgstr "%.8X    Attuale: %u (%.2X), Precedente: %u (%.2X)"
 
-#: ../win32/gui/CheatDlg.c:472 ../gui/Cheat.c:558
+#: ../win32/gui/CheatDlg.c:471 ../gui/Cheat.c:557
 #, c-format
 msgid "%.8X    Current: %u (%.4X), Previous: %u (%.4X)"
 msgstr "%.8X    Attuale: %u (%.4X), Precedente: %u (%.4X)"
 
-#: ../win32/gui/CheatDlg.c:477 ../gui/Cheat.c:563
+#: ../win32/gui/CheatDlg.c:476 ../gui/Cheat.c:562
 #, c-format
 msgid "%.8X    Current: %u (%.8X), Previous: %u (%.8X)"
 msgstr "%.8X    Attuale: %u (%.8X), Precedente: %u (%.8X)"
 
-#: ../win32/gui/CheatDlg.c:493 ../gui/Cheat.c:578
+#: ../win32/gui/CheatDlg.c:492 ../gui/Cheat.c:577
 #, c-format
 msgid "Founded Addresses: %d"
 msgstr "Indirizzi trovati: %d"
 
-#: ../win32/gui/CheatDlg.c:505 ../data/pcsx.glade2:3022
+#: ../win32/gui/CheatDlg.c:504 ../data/pcsx.glade2:3012
 msgid "Freeze"
 msgstr "Blocca"
 
-#: ../win32/gui/CheatDlg.c:506 ../win32/gui/CheatDlg.c:597
+#: ../win32/gui/CheatDlg.c:505 ../win32/gui/CheatDlg.c:596
 msgid "Address:"
 msgstr "Indirizzo:"
 
-#: ../win32/gui/CheatDlg.c:507 ../win32/gui/CheatDlg.c:598
-#: ../win32/gui/CheatDlg.c:683 ../gui/Cheat.c:648 ../data/pcsx.glade2:2865
+#: ../win32/gui/CheatDlg.c:506 ../win32/gui/CheatDlg.c:597
+#: ../win32/gui/CheatDlg.c:682 ../gui/Cheat.c:647 ../data/pcsx.glade2:2855
 msgid "Value:"
 msgstr "Valore:"
 
-#: ../win32/gui/CheatDlg.c:567
+#: ../win32/gui/CheatDlg.c:566
 #, c-format
 msgid "Freeze %.8X"
 msgstr "Blocca %.8x"
 
-#: ../win32/gui/CheatDlg.c:596 ../data/pcsx.glade2:3058
+#: ../win32/gui/CheatDlg.c:595 ../data/pcsx.glade2:3048
 msgid "Modify"
 msgstr "Modifica"
 
-#: ../win32/gui/CheatDlg.c:679 ../gui/Cheat.c:1130 ../data/pcsx.glade2:2793
+#: ../win32/gui/CheatDlg.c:678 ../gui/Cheat.c:1129 ../data/pcsx.glade2:2783
 msgid "Cheat Search"
 msgstr "Cerca cheat"
 
-#: ../win32/gui/CheatDlg.c:681 ../data/pcsx.glade2:2843
+#: ../win32/gui/CheatDlg.c:680 ../data/pcsx.glade2:2833
 msgid "Search For:"
 msgstr "Cerca per:"
 
-#: ../win32/gui/CheatDlg.c:682 ../data/pcsx.glade2:2853
+#: ../win32/gui/CheatDlg.c:681 ../data/pcsx.glade2:2843
 msgid "Data Type:"
 msgstr "Tipo di dato:"
 
-#: ../win32/gui/CheatDlg.c:684 ../data/pcsx.glade2:2877
+#: ../win32/gui/CheatDlg.c:683 ../data/pcsx.glade2:2867
 msgid "Data Base:"
 msgstr "Base di dato:"
 
-#: ../win32/gui/CheatDlg.c:685 ../data/pcsx.glade2:2937
+#: ../win32/gui/CheatDlg.c:684 ../data/pcsx.glade2:2927
 msgid "To:"
 msgstr "A:"
 
-#: ../win32/gui/CheatDlg.c:686
+#: ../win32/gui/CheatDlg.c:685
 msgid "&Freeze"
 msgstr "&Blocca"
 
-#: ../win32/gui/CheatDlg.c:687
+#: ../win32/gui/CheatDlg.c:686
 msgid "&Modify"
 msgstr "&Modifica"
 
-#: ../win32/gui/CheatDlg.c:688
+#: ../win32/gui/CheatDlg.c:687
 msgid "&Copy"
 msgstr "&Copia"
 
-#: ../win32/gui/CheatDlg.c:689
+#: ../win32/gui/CheatDlg.c:688
 msgid "&Search"
 msgstr "&Cerca"
 
-#: ../win32/gui/CheatDlg.c:690
+#: ../win32/gui/CheatDlg.c:689
 msgid "&New Search"
 msgstr "&Nuova ricerca"
 
-#: ../win32/gui/CheatDlg.c:691
+#: ../win32/gui/CheatDlg.c:690
 msgid "C&lose"
 msgstr "C&hiudi"
 
-#: ../win32/gui/CheatDlg.c:693
+#: ../win32/gui/CheatDlg.c:692
 msgid "8-bit"
 msgstr "8-bit"
 
-#: ../win32/gui/CheatDlg.c:694
+#: ../win32/gui/CheatDlg.c:693
 msgid "16-bit"
 msgstr "16-bit"
 
-#: ../win32/gui/CheatDlg.c:695
+#: ../win32/gui/CheatDlg.c:694
 msgid "32-bit"
 msgstr "32-bit"
 
-#: ../win32/gui/CheatDlg.c:696
+#: ../win32/gui/CheatDlg.c:695
 msgid "Decimal"
 msgstr "Decimale"
 
-#: ../win32/gui/CheatDlg.c:697
+#: ../win32/gui/CheatDlg.c:696
 msgid "Hexadecimal"
 msgstr "Esadecimale"
 
-#: ../win32/gui/ConfigurePlugins.c:206 ../gui/ConfDlg.c:675
+#: ../win32/gui/ConfigurePlugins.c:219 ../gui/ConfDlg.c:675
 msgid "Internal HLE Bios"
 msgstr "Bios HLE interno"
 
-#: ../win32/gui/ConfigurePlugins.c:292
+#: ../win32/gui/ConfigurePlugins.c:305
 msgid "Configuration not OK!"
 msgstr "La configurazione non è corretta!"
 
-#: ../win32/gui/ConfigurePlugins.c:292 ../gui/Cheat.c:156 ../gui/Cheat.c:252
-#: ../gui/LnxMain.c:414
+#: ../win32/gui/ConfigurePlugins.c:305 ../gui/Cheat.c:155 ../gui/Cheat.c:251
+#: ../gui/LnxMain.c:418
 msgid "Error"
 msgstr "Errore"
 
-#: ../win32/gui/ConfigurePlugins.c:393
+#: ../win32/gui/ConfigurePlugins.c:406
 msgid "This plugin reports that should work correctly"
 msgstr "Questo plugin dovrebbe funzionare correttamente"
 
-#: ../win32/gui/ConfigurePlugins.c:394
+#: ../win32/gui/ConfigurePlugins.c:407
 msgid "This plugin reports that should not work correctly"
 msgstr "Questo plugin potrebbe non funzionare correttamente"
 
-#: ../win32/gui/ConfigurePlugins.c:450
+#: ../win32/gui/ConfigurePlugins.c:463
 msgid "Select Plugins Directory"
 msgstr "Seleziona la cartella dei plugin"
 
-#: ../win32/gui/ConfigurePlugins.c:459
+#: ../win32/gui/ConfigurePlugins.c:472
 msgid "Select Bios Directory"
 msgstr "Seleziona la cartella del bios"
 
-#: ../win32/gui/ConfigurePlugins.c:468
+#: ../win32/gui/ConfigurePlugins.c:481
 msgid "Configuration"
 msgstr "Configurazione"
 
-#: ../win32/gui/ConfigurePlugins.c:472
+#: ../win32/gui/ConfigurePlugins.c:485
 msgid "Graphics"
 msgstr "Video"
 
-#: ../win32/gui/ConfigurePlugins.c:473
+#: ../win32/gui/ConfigurePlugins.c:486
 msgid "First Controller"
 msgstr "Primo controller"
 
-#: ../win32/gui/ConfigurePlugins.c:474
+#: ../win32/gui/ConfigurePlugins.c:487
 msgid "Second Controller"
 msgstr "Secondo controller"
 
-#: ../win32/gui/ConfigurePlugins.c:475
+#: ../win32/gui/ConfigurePlugins.c:488
 msgid "Sound"
 msgstr "Audio"
 
-#: ../win32/gui/ConfigurePlugins.c:476
+#: ../win32/gui/ConfigurePlugins.c:489
 msgid "Cdrom"
 msgstr "Cdrom"
 
-#: ../win32/gui/ConfigurePlugins.c:477
+#: ../win32/gui/ConfigurePlugins.c:490
 msgid "Bios"
 msgstr "Bios"
 
-#: ../win32/gui/ConfigurePlugins.c:478
+#: ../win32/gui/ConfigurePlugins.c:491
 msgid "Set Bios Directory"
 msgstr "Imposta la cartella del bios"
 
-#: ../win32/gui/ConfigurePlugins.c:479
+#: ../win32/gui/ConfigurePlugins.c:492
 msgid "Set Plugins Directory"
 msgstr "Imposta la cartella dei plugin"
 
-#: ../win32/gui/ConfigurePlugins.c:480 ../win32/gui/ConfigurePlugins.c:483
-#: ../win32/gui/ConfigurePlugins.c:486 ../win32/gui/ConfigurePlugins.c:489
-#: ../win32/gui/ConfigurePlugins.c:492 ../win32/gui/ConfigurePlugins.c:604
+#: ../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 "Configura..."
 
-#: ../win32/gui/ConfigurePlugins.c:481 ../win32/gui/ConfigurePlugins.c:484
-#: ../win32/gui/ConfigurePlugins.c:487 ../win32/gui/ConfigurePlugins.c:490
-#: ../win32/gui/ConfigurePlugins.c:493 ../win32/gui/ConfigurePlugins.c:605
+#: ../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 "Prova..."
 
-#: ../win32/gui/ConfigurePlugins.c:482 ../win32/gui/ConfigurePlugins.c:485
-#: ../win32/gui/ConfigurePlugins.c:488 ../win32/gui/ConfigurePlugins.c:491
-#: ../win32/gui/ConfigurePlugins.c:494 ../win32/gui/ConfigurePlugins.c:606
+#: ../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 "Informazioni..."
 
-#: ../win32/gui/ConfigurePlugins.c:599
+#: ../win32/gui/ConfigurePlugins.c:612
 msgid "NetPlay Configuration"
 msgstr "Configurazione del NetPlay"
 
-#: ../win32/gui/ConfigurePlugins.c:603
+#: ../win32/gui/ConfigurePlugins.c:616 ../plugins/dfnet/gui.c:30
+#: ../plugins/dfnet/gui.c:74
 msgid "NetPlay"
 msgstr "NetPlay"
 
-#: ../win32/gui/ConfigurePlugins.c:607
+#: ../win32/gui/ConfigurePlugins.c:620
 msgid ""
 "Note: The NetPlay Plugin Directory should be the same as the other Plugins."
 msgstr ""
 "Nota: la cartella del plugin NetPlay dovrebbe essere la stessa degli altri "
 "plugin."
 
-#: ../win32/gui/plugin.c:90 ../win32/gui/WndMain.c:281
-#, c-format
-msgid "*PCSX*: Saved State %d"
-msgstr "*PCSX*: è stato salvato lo stato %d"
-
-#: ../win32/gui/plugin.c:91 ../win32/gui/WndMain.c:282
-#, c-format
-msgid "*PCSX*: Error Saving State %d"
-msgstr ""
-"*PCSX*: si è verificato un errore durante il salvataggio dello stato %d"
-
-#: ../win32/gui/plugin.c:107 ../win32/gui/WndMain.c:259
-#, c-format
-msgid "*PCSX*: Loaded State %d"
-msgstr "*PCSX*: è stato caricato lo stato %d"
-
-#: ../win32/gui/plugin.c:108 ../win32/gui/WndMain.c:260
-#, c-format
-msgid "*PCSX*: Error Loading State %d"
-msgstr ""
-"*PCSX*: si è verificato un errore durante il caricamento dello stato %d"
-
-#: ../win32/gui/plugin.c:119
-#, c-format
-msgid "*PCSX*: Sio Irq Always Enabled"
-msgstr "*PCSX*: sio irq è sempre abilitato"
-
-#: ../win32/gui/plugin.c:120
-#, c-format
-msgid "*PCSX*: Sio Irq Not Always Enabled"
-msgstr "*PCSX*: sio irq non è sempre abilitato"
-
-#: ../win32/gui/plugin.c:127
-#, c-format
-msgid "*PCSX*: Black&White Mdecs Only Enabled"
-msgstr "*PCSX*: abilita solo i filmati in bianco e nero"
-
-#: ../win32/gui/plugin.c:128
-#, c-format
-msgid "*PCSX*: Black&White Mdecs Only Disabled"
-msgstr "*PCSX*: disabilita solo i filmati in bianco e nero"
-
-#: ../win32/gui/plugin.c:135
-#, c-format
-msgid "*PCSX*: Xa Enabled"
-msgstr "*PCSX*: abilita Xa"
-
-#: ../win32/gui/plugin.c:136
-#, c-format
-msgid "*PCSX*: Xa Disabled"
-msgstr "*PCSX*: disabilita Xa"
-
-#: ../win32/gui/plugin.c:145
-msgid "*PCSX*: CdRom Case Opened"
-msgstr "*PCSX*: il vano del CdRom è aperto"
-
-#: ../win32/gui/plugin.c:150
-msgid "*PCSX*: CdRom Case Closed"
-msgstr "*PCSX*: il vano del CdRom è chiuso"
-
-#: ../win32/gui/plugin.c:177
-msgid "Connecting..."
-msgstr "Connessione in corso..."
-
-#: ../win32/gui/plugin.c:179 ../win32/gui/plugin.c:186
-#, c-format
-msgid "Please wait while connecting... %c\n"
-msgstr "Attendere prego, connessione in corso... %c\n"
-
-#: ../win32/gui/plugin.c:216
-msgid "Error Opening CDR Plugin"
-msgstr "Si è verificato un errore durante l'apertura del plugin del CD-ROM"
-
-#: ../win32/gui/plugin.c:279
-#, c-format
-msgid "Error Opening GPU Plugin (%d)"
-msgstr "Si è verificato un errore durante l'apertura del plugin della GPU (%d)"
-
-#: ../win32/gui/plugin.c:281
-#, c-format
-msgid "Error Opening SPU Plugin (%d)"
-msgstr "Si è verificato un errore durante l'apertura del plugin della SPU (%d)"
-
-#: ../win32/gui/plugin.c:284
-#, c-format
-msgid "Error Opening PAD1 Plugin (%d)"
-msgstr "Si è verificato un errore durante l'apertura del plugin del PAD1 (%d)"
-
-#: ../win32/gui/plugin.c:286
-#, c-format
-msgid "Error Opening PAD2 Plugin (%d)"
-msgstr "Si è verificato un errore durante l'apertura del plugin del PAD2 (%d)"
-
-#: ../win32/gui/plugin.c:309
-msgid "Error Closing CDR Plugin"
-msgstr "Si è verificato un errore durante la chiusura del plugin del CD-ROM"
-
-#: ../win32/gui/plugin.c:311
-msgid "Error Closing GPU Plugin"
-msgstr "Si è verificato un errore durante la chiusura del plugin della GPU"
-
-#: ../win32/gui/plugin.c:313
-msgid "Error Closing SPU Plugin"
-msgstr "Si è verificato un errore durante la chiusura del plugin della SPU"
-
-#: ../win32/gui/plugin.c:315
-msgid "Error Closing PAD1 Plugin"
-msgstr "Si è verificato un errore durante la chiusura del plugin del PAD1"
-
-#: ../win32/gui/plugin.c:317
-msgid "Error Closing PAD2 Plugin"
-msgstr "Si è verificato un errore durante la chiusura del plugin del PAD2"
-
-#: ../win32/gui/plugin.c:335
-#, c-format
-msgid "CDRinit error: %d"
-msgstr "CDRinit errore: %d"
-
-#: ../win32/gui/plugin.c:337
-#, c-format
-msgid "GPUinit error: %d"
-msgstr "GPUinit errore: %d"
-
-#: ../win32/gui/plugin.c:339
-#, c-format
-msgid "SPUinit error: %d"
-msgstr "SPUinit errore: %d"
-
-#: ../win32/gui/plugin.c:341
-#, c-format
-msgid "PAD1init error: %d"
-msgstr "PAD1init errore: %d"
-
-#: ../win32/gui/plugin.c:343
-#, c-format
-msgid "PAD2init error: %d"
-msgstr "PAD2init errore: %d"
-
-#: ../win32/gui/plugin.c:346
-#, c-format
-msgid "NETinit error: %d"
-msgstr "NETinit errore: %d"
-
 #: ../win32/gui/WndMain.c:76
 msgid "Arabic"
 msgstr "Arabo"
@@ -564,8 +422,8 @@ msgstr "Tedesco"
 msgid "Greek"
 msgstr "Greco"
 
-#: ../win32/gui/WndMain.c:80 ../win32/gui/WndMain.c:1559
-#: ../win32/gui/WndMain.c:1561
+#: ../win32/gui/WndMain.c:80 ../win32/gui/WndMain.c:1558
+#: ../win32/gui/WndMain.c:1560
 msgid "English"
 msgstr "Inglese"
 
@@ -613,6 +471,28 @@ msgstr "Giapponese"
 msgid "Korean"
 msgstr "Coreano"
 
+#: ../win32/gui/WndMain.c:259 ../win32/gui/plugin.c:107
+#, c-format
+msgid "*PCSX*: Loaded State %d"
+msgstr "*PCSX*: è stato caricato lo stato %d"
+
+#: ../win32/gui/WndMain.c:260 ../win32/gui/plugin.c:108
+#, c-format
+msgid "*PCSX*: Error Loading State %d"
+msgstr ""
+"*PCSX*: si è verificato un errore durante il caricamento dello stato %d"
+
+#: ../win32/gui/WndMain.c:281 ../win32/gui/plugin.c:90
+#, c-format
+msgid "*PCSX*: Saved State %d"
+msgstr "*PCSX*: è stato salvato lo stato %d"
+
+#: ../win32/gui/WndMain.c:282 ../win32/gui/plugin.c:91
+#, c-format
+msgid "*PCSX*: Error Saving State %d"
+msgstr ""
+"*PCSX*: si è verificato un errore durante il salvataggio dello stato %d"
+
 #: ../win32/gui/WndMain.c:300 ../win32/gui/WndMain.c:352
 msgid "PCSX State Format"
 msgstr "Formato dei salvataggi di PCSX"
@@ -653,11 +533,11 @@ msgstr "Impossibile caricare il CD-ROM!"
 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:664 ../gui/MemcardDlg.c:59
+#: ../win32/gui/WndMain.c:664 ../gui/MemcardDlg.c:62
 msgid "Title"
 msgstr "Titolo"
 
-#: ../win32/gui/WndMain.c:670 ../gui/MemcardDlg.c:65
+#: ../win32/gui/WndMain.c:670 ../gui/MemcardDlg.c:68
 msgid "Status"
 msgstr "Stato"
 
@@ -677,17 +557,17 @@ msgstr "mid link block"
 msgid "terminiting link block"
 msgstr "terminiting link block"
 
-#: ../win32/gui/WndMain.c:867 ../gui/MemcardDlg.c:147 ../gui/MemcardDlg.c:244
+#: ../win32/gui/WndMain.c:867 ../gui/MemcardDlg.c:154 ../gui/MemcardDlg.c:252
 msgid "Deleted"
 msgstr "Eliminato"
 
 #: ../win32/gui/WndMain.c:868 ../win32/gui/WndMain.c:871
-#: ../gui/MemcardDlg.c:149 ../gui/MemcardDlg.c:153 ../gui/MemcardDlg.c:246
-#: ../gui/MemcardDlg.c:250
+#: ../gui/MemcardDlg.c:156 ../gui/MemcardDlg.c:160 ../gui/MemcardDlg.c:254
+#: ../gui/MemcardDlg.c:258
 msgid "Free"
 msgstr "Libero"
 
-#: ../win32/gui/WndMain.c:870 ../gui/MemcardDlg.c:151 ../gui/MemcardDlg.c:248
+#: ../win32/gui/WndMain.c:870 ../gui/MemcardDlg.c:158 ../gui/MemcardDlg.c:256
 msgid "Used"
 msgstr "Usato"
 
@@ -806,230 +686,351 @@ msgstr "Opzioni"
 msgid "Psx System Type"
 msgstr "Regione del sistema"
 
-#: ../win32/gui/WndMain.c:1323
+#: ../win32/gui/WndMain.c:1322
 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:1328
+#: ../win32/gui/WndMain.c:1327
 msgid "Psx Memory Card (*.mcr;*.mc)"
 msgstr "Memory card psx (*.mcr;*.mc)"
 
-#: ../win32/gui/WndMain.c:1333
+#: ../win32/gui/WndMain.c:1332
 msgid "CVGS Memory Card (*.mem;*.vgs)"
 msgstr "Memory card CVSG (*.mem;*.vgs)"
 
-#: ../win32/gui/WndMain.c:1338
+#: ../win32/gui/WndMain.c:1337
 msgid "Bleem Memory Card (*.mcd)"
 msgstr "Memory card bleem (*.mcd)"
 
-#: ../win32/gui/WndMain.c:1343
+#: ../win32/gui/WndMain.c:1342
 msgid "DexDrive Memory Card (*.gme)"
 msgstr "Memory card DexDrive (*.gme)"
 
-#: ../win32/gui/WndMain.c:1348
+#: ../win32/gui/WndMain.c:1347
 msgid "DataDeck Memory Card (*.ddf)"
 msgstr "Memory card DataDeck (*.ddf)"
 
-#: ../win32/gui/WndMain.c:1353 ../win32/gui/WndMain.c:1434 ../gui/Cheat.c:322
+#: ../win32/gui/WndMain.c:1352 ../win32/gui/WndMain.c:1433 ../gui/Cheat.c:321
 #: ../gui/Gtk2Gui.c:421 ../gui/Gtk2Gui.c:560
 msgid "All Files"
 msgstr "Tutti i file"
 
-#: ../win32/gui/WndMain.c:1392
+#: ../win32/gui/WndMain.c:1391
 msgid "Psx Exe Format"
 msgstr "Formato exe della Psx"
 
-#: ../win32/gui/WndMain.c:1429
+#: ../win32/gui/WndMain.c:1428
 msgid "Psx Isos (*.iso;*.mdf;*.img;*.bin)"
 msgstr "ISO della psx (*.iso;*.mdf;*.img;*.bin)"
 
-#: ../win32/gui/WndMain.c:1505
+#: ../win32/gui/WndMain.c:1504
 msgid "&File"
 msgstr "&File"
 
-#: ../win32/gui/WndMain.c:1506
+#: ../win32/gui/WndMain.c:1505
 msgid "E&xit"
 msgstr "E&sci"
 
-#: ../win32/gui/WndMain.c:1508
+#: ../win32/gui/WndMain.c:1507
 msgid "Run &EXE..."
 msgstr "Avvia &EXE..."
 
-#: ../win32/gui/WndMain.c:1509
+#: ../win32/gui/WndMain.c:1508
 msgid "Run &BIOS"
 msgstr "Avvia &BIOS"
 
-#: ../win32/gui/WndMain.c:1510
+#: ../win32/gui/WndMain.c:1509
 msgid "Run &ISO..."
 msgstr "Avvia &ISO..."
 
-#: ../win32/gui/WndMain.c:1511
+#: ../win32/gui/WndMain.c:1510
 msgid "Run &CD"
 msgstr "Avvia &CD"
 
-#: ../win32/gui/WndMain.c:1513
+#: ../win32/gui/WndMain.c:1512
 msgid "&Emulator"
 msgstr "&Emulatore"
 
-#: ../win32/gui/WndMain.c:1514
+#: ../win32/gui/WndMain.c:1513
 msgid "&States"
 msgstr "&Stati"
 
-#: ../win32/gui/WndMain.c:1516
+#: ../win32/gui/WndMain.c:1515
 msgid "S&witch ISO..."
 msgstr "C&ambia ISO..."
 
-#: ../win32/gui/WndMain.c:1518
+#: ../win32/gui/WndMain.c:1517
 msgid "Re&set"
 msgstr "Re&setta"
 
-#: ../win32/gui/WndMain.c:1519
+#: ../win32/gui/WndMain.c:1518
 msgid "&Run"
 msgstr "&Avvia"
 
-#: ../win32/gui/WndMain.c:1520
+#: ../win32/gui/WndMain.c:1519
 msgid "&Save"
 msgstr "&Salva"
 
-#: ../win32/gui/WndMain.c:1521
+#: ../win32/gui/WndMain.c:1520
 msgid "&Load"
 msgstr "&Carica"
 
-#: ../win32/gui/WndMain.c:1522 ../win32/gui/WndMain.c:1528
+#: ../win32/gui/WndMain.c:1521 ../win32/gui/WndMain.c:1527
 msgid "&Other..."
 msgstr "&Altro..."
 
-#: ../win32/gui/WndMain.c:1523 ../win32/gui/WndMain.c:1529
+#: ../win32/gui/WndMain.c:1522 ../win32/gui/WndMain.c:1528
 msgid "Slot &5"
 msgstr "Slot &5"
 
-#: ../win32/gui/WndMain.c:1524 ../win32/gui/WndMain.c:1530
+#: ../win32/gui/WndMain.c:1523 ../win32/gui/WndMain.c:1529
 msgid "Slot &4"
 msgstr "Slot &4"
 
-#: ../win32/gui/WndMain.c:1525 ../win32/gui/WndMain.c:1531
+#: ../win32/gui/WndMain.c:1524 ../win32/gui/WndMain.c:1530
 msgid "Slot &3"
 msgstr "Slot &3"
 
-#: ../win32/gui/WndMain.c:1526 ../win32/gui/WndMain.c:1532
+#: ../win32/gui/WndMain.c:1525 ../win32/gui/WndMain.c:1531
 msgid "Slot &2"
 msgstr "Slot &2"
 
-#: ../win32/gui/WndMain.c:1527 ../win32/gui/WndMain.c:1533
+#: ../win32/gui/WndMain.c:1526 ../win32/gui/WndMain.c:1532
 msgid "Slot &1"
 msgstr "Slot &1"
 
-#: ../win32/gui/WndMain.c:1535
+#: ../win32/gui/WndMain.c:1534
 msgid "&Configuration"
 msgstr "&Configurazione"
 
-#: ../win32/gui/WndMain.c:1536
+#: ../win32/gui/WndMain.c:1535
 msgid "Cheat &Search..."
 msgstr "Cerca &cheat..."
 
-#: ../win32/gui/WndMain.c:1537
+#: ../win32/gui/WndMain.c:1536
 msgid "Ch&eat Code..."
 msgstr "Codice ch&eat..."
 
-#: ../win32/gui/WndMain.c:1540
+#: ../win32/gui/WndMain.c:1539
 msgid "&Language"
 msgstr "&Lingua"
 
-#: ../win32/gui/WndMain.c:1565
+#: ../win32/gui/WndMain.c:1564
 msgid "&Memory cards..."
 msgstr "&Memory card..."
 
-#: ../win32/gui/WndMain.c:1566
+#: ../win32/gui/WndMain.c:1565
 msgid "C&PU..."
 msgstr "C&PU..."
 
-#: ../win32/gui/WndMain.c:1568
+#: ../win32/gui/WndMain.c:1567
 msgid "&NetPlay..."
 msgstr "&NetPlay..."
 
-#: ../win32/gui/WndMain.c:1570
+#: ../win32/gui/WndMain.c:1569
 msgid "&Controllers..."
 msgstr "&Controller..."
 
-#: ../win32/gui/WndMain.c:1571
+#: ../win32/gui/WndMain.c:1570
 msgid "CD-&ROM..."
 msgstr "CD-&ROM..."
 
-#: ../win32/gui/WndMain.c:1572
+#: ../win32/gui/WndMain.c:1571
 msgid "&Sound..."
 msgstr "&Audio..."
 
-#: ../win32/gui/WndMain.c:1573
+#: ../win32/gui/WndMain.c:1572
 msgid "&Graphics..."
 msgstr "&Video..."
 
-#: ../win32/gui/WndMain.c:1575
+#: ../win32/gui/WndMain.c:1574
 msgid "&Plugins && Bios..."
 msgstr "&Plugin e Bios..."
 
-#: ../win32/gui/WndMain.c:1577
+#: ../win32/gui/WndMain.c:1576
 msgid "&Help"
 msgstr "&Aiuto"
 
-#: ../win32/gui/WndMain.c:1578
+#: ../win32/gui/WndMain.c:1577
 msgid "&About..."
 msgstr "&Informazioni..."
 
-#: ../win32/gui/WndMain.c:1764
+#: ../win32/gui/WndMain.c:1756
 msgid "Pcsx Msg"
 msgstr "Messaggio di pcsx"
 
-#: ../win32/gui/WndMain.c:1767
+#: ../win32/gui/WndMain.c:1759
 msgid "Error Loading Symbol"
 msgstr "Si è verificato un errore durante il caricamento del simbolo"
 
-#: ../gui/Cheat.c:118 ../gui/Cheat.c:203
+#: ../win32/gui/plugin.c:119
+#, c-format
+msgid "*PCSX*: Sio Irq Always Enabled"
+msgstr "*PCSX*: sio irq è sempre abilitato"
+
+#: ../win32/gui/plugin.c:120
+#, c-format
+msgid "*PCSX*: Sio Irq Not Always Enabled"
+msgstr "*PCSX*: sio irq non è sempre abilitato"
+
+#: ../win32/gui/plugin.c:127
+#, c-format
+msgid "*PCSX*: Black&White Mdecs Only Enabled"
+msgstr "*PCSX*: abilita solo i filmati in bianco e nero"
+
+#: ../win32/gui/plugin.c:128
+#, c-format
+msgid "*PCSX*: Black&White Mdecs Only Disabled"
+msgstr "*PCSX*: disabilita solo i filmati in bianco e nero"
+
+#: ../win32/gui/plugin.c:135
+#, c-format
+msgid "*PCSX*: Xa Enabled"
+msgstr "*PCSX*: abilita Xa"
+
+#: ../win32/gui/plugin.c:136
+#, c-format
+msgid "*PCSX*: Xa Disabled"
+msgstr "*PCSX*: disabilita Xa"
+
+#: ../win32/gui/plugin.c:145
+msgid "*PCSX*: CdRom Case Opened"
+msgstr "*PCSX*: il vano del CdRom è aperto"
+
+#: ../win32/gui/plugin.c:150
+msgid "*PCSX*: CdRom Case Closed"
+msgstr "*PCSX*: il vano del CdRom è chiuso"
+
+#: ../win32/gui/plugin.c:177
+msgid "Connecting..."
+msgstr "Connessione in corso..."
+
+#: ../win32/gui/plugin.c:179 ../win32/gui/plugin.c:186
+#, c-format
+msgid "Please wait while connecting... %c\n"
+msgstr "Attendere prego, connessione in corso... %c\n"
+
+#: ../win32/gui/plugin.c:214
+msgid "Error Opening CDR Plugin"
+msgstr "Si è verificato un errore durante l'apertura del plugin del CD-ROM"
+
+#: ../win32/gui/plugin.c:277
+#, c-format
+msgid "Error Opening GPU Plugin (%d)"
+msgstr "Si è verificato un errore durante l'apertura del plugin della GPU (%d)"
+
+#: ../win32/gui/plugin.c:279
+#, c-format
+msgid "Error Opening SPU Plugin (%d)"
+msgstr "Si è verificato un errore durante l'apertura del plugin della SPU (%d)"
+
+#: ../win32/gui/plugin.c:282
+#, c-format
+msgid "Error Opening PAD1 Plugin (%d)"
+msgstr "Si è verificato un errore durante l'apertura del plugin del PAD1 (%d)"
+
+#: ../win32/gui/plugin.c:284
+#, c-format
+msgid "Error Opening PAD2 Plugin (%d)"
+msgstr "Si è verificato un errore durante l'apertura del plugin del PAD2 (%d)"
+
+#: ../win32/gui/plugin.c:307
+msgid "Error Closing CDR Plugin"
+msgstr "Si è verificato un errore durante la chiusura del plugin del CD-ROM"
+
+#: ../win32/gui/plugin.c:309
+msgid "Error Closing GPU Plugin"
+msgstr "Si è verificato un errore durante la chiusura del plugin della GPU"
+
+#: ../win32/gui/plugin.c:311
+msgid "Error Closing SPU Plugin"
+msgstr "Si è verificato un errore durante la chiusura del plugin della SPU"
+
+#: ../win32/gui/plugin.c:313
+msgid "Error Closing PAD1 Plugin"
+msgstr "Si è verificato un errore durante la chiusura del plugin del PAD1"
+
+#: ../win32/gui/plugin.c:315
+msgid "Error Closing PAD2 Plugin"
+msgstr "Si è verificato un errore durante la chiusura del plugin del PAD2"
+
+#: ../win32/gui/plugin.c:333
+#, c-format
+msgid "CDRinit error: %d"
+msgstr "CDRinit errore: %d"
+
+#: ../win32/gui/plugin.c:335
+#, c-format
+msgid "GPUinit error: %d"
+msgstr "GPUinit errore: %d"
+
+#: ../win32/gui/plugin.c:337
+#, c-format
+msgid "SPUinit error: %d"
+msgstr "SPUinit errore: %d"
+
+#: ../win32/gui/plugin.c:339
+#, c-format
+msgid "PAD1init error: %d"
+msgstr "PAD1init errore: %d"
+
+#: ../win32/gui/plugin.c:341
+#, c-format
+msgid "PAD2init error: %d"
+msgstr "PAD2init errore: %d"
+
+#: ../win32/gui/plugin.c:344
+#, c-format
+msgid "NETinit error: %d"
+msgstr "NETinit errore: %d"
+
+#: ../gui/Cheat.c:117 ../gui/Cheat.c:202
 msgid "Cheat Description:"
 msgstr "Descrizione del cheat:"
 
-#: ../gui/Cheat.c:307
+#: ../gui/Cheat.c:306
 msgid "Open Cheat File"
 msgstr "Apri il file del cheat"
 
-#: ../gui/Cheat.c:317 ../gui/Cheat.c:357
+#: ../gui/Cheat.c:316 ../gui/Cheat.c:356
 msgid "PCSX Cheat Code Files (*.cht)"
 msgstr "File cheat di PCSX (*.cht)"
 
-#: ../gui/Cheat.c:347
+#: ../gui/Cheat.c:346
 msgid "Save Cheat File"
 msgstr "Salva il file del cheat"
 
-#: ../gui/Cheat.c:362
+#: ../gui/Cheat.c:361
 msgid "All Files (*.*)"
 msgstr "Tutti i file (*.*)"
 
-#: ../gui/Cheat.c:395 ../gui/Cheat.c:1125 ../gui/ConfDlg.c:104
-#: ../gui/ConfDlg.c:200 ../gui/DebugMemory.c:256
+#: ../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 "Errore: impossibile caricare l'interfaccia di glade!"
 
-#: ../gui/Cheat.c:400
+#: ../gui/Cheat.c:399
 msgid "Cheat Codes"
 msgstr "Codici cheat"
 
-#: ../gui/Cheat.c:406
+#: ../gui/Cheat.c:405
 msgid "Enable"
 msgstr "Abilita"
 
-#: ../gui/Cheat.c:631
+#: ../gui/Cheat.c:630
 msgid "Freeze value"
 msgstr "Blocca valore"
 
-#: ../gui/Cheat.c:730
+#: ../gui/Cheat.c:729
 msgid "Modify value"
 msgstr "Modifica il valore"
 
-#: ../gui/Cheat.c:738
+#: ../gui/Cheat.c:737
 msgid "New value:"
 msgstr "Nuovo valore:"
 
-#: ../gui/Cheat.c:1135
+#: ../gui/Cheat.c:1134
 msgid "Search Results"
 msgstr "Risultati della ricerca"
 
@@ -1057,54 +1058,54 @@ msgstr "Impossibile aprire la cartella del BIOS: '%s'\n"
 msgid "Could not open directory: '%s'\n"
 msgstr "Impossibile aprire la cartella: '%s'\n"
 
-#: ../gui/DebugMemory.c:102 ../data/pcsx.glade2:3270
+#: ../gui/DebugMemory.c:103 ../data/pcsx.glade2:3260
 msgid "Memory Dump"
 msgstr ""
 
-#: ../gui/DebugMemory.c:110
+#: ../gui/DebugMemory.c:111
 #, fuzzy
 msgid "Start Address (Hexadecimal):"
 msgstr "Esadecimale"
 
-#: ../gui/DebugMemory.c:118
+#: ../gui/DebugMemory.c:121
 msgid "Length (Decimal):"
 msgstr ""
 
-#: ../gui/DebugMemory.c:144
+#: ../gui/DebugMemory.c:147
 msgid "Dump to File"
 msgstr ""
 
-#: ../gui/DebugMemory.c:159
+#: ../gui/DebugMemory.c:162
 #, fuzzy, c-format
 msgid "Error writing to %s!"
 msgstr "Si è verificato un errore durante il salvataggio dello stato %s!"
 
-#: ../gui/DebugMemory.c:177
+#: ../gui/DebugMemory.c:180
 #, fuzzy
 msgid "Memory Patch"
 msgstr "Memory card 1"
 
-#: ../gui/DebugMemory.c:185 ../data/pcsx.glade2:3292
+#: ../gui/DebugMemory.c:188 ../data/pcsx.glade2:3282
 #, fuzzy
 msgid "Address (Hexadecimal):"
 msgstr "Esadecimale"
 
-#: ../gui/DebugMemory.c:195
+#: ../gui/DebugMemory.c:198
 #, fuzzy
 msgid "Value (Hexa string):"
 msgstr "Esadecimale"
 
-#: ../gui/DebugMemory.c:261
+#: ../gui/DebugMemory.c:264
 #, fuzzy
 msgid "Memory Viewer"
 msgstr "Memory card 1"
 
-#: ../gui/DebugMemory.c:266
+#: ../gui/DebugMemory.c:269
 #, fuzzy
 msgid "Address"
 msgstr "Indirizzo:"
 
-#: ../gui/DebugMemory.c:284
+#: ../gui/DebugMemory.c:287
 #, fuzzy
 msgid "Text"
 msgstr "Strutture"
@@ -1157,31 +1158,31 @@ msgstr "Apri il file immagine del disco PSX"
 msgid "PSX Image Files (*.bin, *.img, *.mdf, *.iso)"
 msgstr "File immagine PSX (*.bin, *.img, *.mdf, *.iso)"
 
-#: ../gui/Gtk2Gui.c:766
+#: ../gui/Gtk2Gui.c:770
 #, c-format
 msgid "Loaded state %s."
 msgstr "È stato caricato lo stato %s."
 
-#: ../gui/Gtk2Gui.c:770
+#: ../gui/Gtk2Gui.c:773
 #, c-format
 msgid "Error loading state %s!"
 msgstr "Si è verificato un errore durante il caricamento dello stato %s!"
 
-#: ../gui/Gtk2Gui.c:781
+#: ../gui/Gtk2Gui.c:784
 #, c-format
 msgid "Saved state %s."
 msgstr "È stato salvato lo stato %s."
 
-#: ../gui/Gtk2Gui.c:783
+#: ../gui/Gtk2Gui.c:786
 #, c-format
 msgid "Error saving state %s!"
 msgstr "Si è verificato un errore durante il salvataggio dello stato %s!"
 
-#: ../gui/Gtk2Gui.c:816 ../gui/Gtk2Gui.c:843
+#: ../gui/Gtk2Gui.c:821 ../gui/Gtk2Gui.c:849
 msgid "Select State File"
 msgstr "Seleziona il file dello stato"
 
-#: ../gui/Gtk2Gui.c:900
+#: ../gui/Gtk2Gui.c:905
 msgid "Notice"
 msgstr "Avviso"
 
@@ -1190,7 +1191,7 @@ msgstr "Avviso"
 msgid "Creating memory card: %s\n"
 msgstr "Creazione in corso della memory card: %s\n"
 
-#: ../gui/LnxMain.c:321
+#: ../gui/LnxMain.c:325
 msgid ""
 " pcsx [options] [file]\n"
 "\toptions:\n"
@@ -1215,7 +1216,7 @@ msgstr ""
 "\t-h -help\tVisualizza questo messaggio\n"
 "\tfile\t\tCarica un file\n"
 
-#: ../gui/LnxMain.c:358
+#: ../gui/LnxMain.c:362
 #, c-format
 msgid ""
 "PCSX cannot be configured without using the GUI -- you should restart "
@@ -1224,41 +1225,41 @@ msgstr ""
 "PCSX non può essere configurato senza una GUI, dovresti riavviare senza "
 "l'opzione -nogui.\n"
 
-#: ../gui/LnxMain.c:414
+#: ../gui/LnxMain.c:418
 msgid "Failed loading plugins!"
 msgstr "Il caricamento dei plugin non è andato a buon fine!"
 
-#: ../gui/LnxMain.c:431
+#: ../gui/LnxMain.c:435
 #, c-format
 msgid "Could not load CD-ROM!\n"
 msgstr "Impossibile caricare il CD-ROM!\n"
 
-#: ../gui/LnxMain.c:467
+#: ../gui/LnxMain.c:466
 #, c-format
 msgid "PSX emulator couldn't be initialized.\n"
 msgstr "Impossibile inizializzare l'emulatore PSX.\n"
 
-#: ../gui/MemcardDlg.c:53
+#: ../gui/MemcardDlg.c:56
 msgid "Icon"
 msgstr "Icona"
 
-#: ../gui/MemcardDlg.c:71
+#: ../gui/MemcardDlg.c:74
 msgid "ID"
 msgstr "ID"
 
-#: ../gui/MemcardDlg.c:77
+#: ../gui/MemcardDlg.c:80
 msgid "Name"
 msgstr "Nome"
 
-#: ../gui/MemcardDlg.c:297
+#: ../gui/MemcardDlg.c:317
 msgid "Select A File"
 msgstr "Seleziona un file"
 
-#: ../gui/MemcardDlg.c:338
+#: ../gui/MemcardDlg.c:358
 msgid "Format this Memory Card?"
 msgstr "Formatto questa memory card?"
 
-#: ../gui/MemcardDlg.c:340
+#: ../gui/MemcardDlg.c:360
 msgid ""
 "If you format the memory card, the card will be empty, and any existing data "
 "overwritten."
@@ -1266,23 +1267,23 @@ msgstr ""
 "Se formatti la memory card, questa sarà svuotata e tutti i dati esistenti "
 "saranno sovrascritti."
 
-#: ../gui/MemcardDlg.c:343
+#: ../gui/MemcardDlg.c:363
 msgid "Format card"
 msgstr "Formatta la memory card"
 
-#: ../gui/MemcardDlg.c:367
+#: ../gui/MemcardDlg.c:387
 msgid "Create a new Memory Card"
 msgstr "Crea una nuova memory card"
 
-#: ../gui/MemcardDlg.c:376
+#: ../gui/MemcardDlg.c:396
 msgid "New Memory Card.mcd"
 msgstr "Nuova memory card.mcd"
 
-#: ../gui/MemcardDlg.c:477
+#: ../gui/MemcardDlg.c:497
 msgid "No free space on memory card"
 msgstr "Non c'è spazio libero sulla memory card"
 
-#: ../gui/MemcardDlg.c:478
+#: ../gui/MemcardDlg.c:498
 msgid ""
 "There are no free slots available on the target memory card. Please delete a "
 "slot first."
@@ -1290,81 +1291,81 @@ msgstr ""
 "Non vi sono slot liberi disponibili nella memory card. Elimina almeno uno "
 "slot."
 
-#: ../gui/MemcardDlg.c:632
+#: ../gui/MemcardDlg.c:661
 msgid "Memory Card Manager"
 msgstr "Gestore della memory card"
 
-#: ../gui/Plugin.c:204 ../data/pcsx.glade2:1493
+#: ../gui/Plugin.c:203 ../data/pcsx.glade2:1493
 #, c-format
 msgid "SIO IRQ Always Enabled"
 msgstr "SIO IRQ sempre abilitato"
 
-#: ../gui/Plugin.c:205
+#: ../gui/Plugin.c:204
 #, c-format
 msgid "SIO IRQ Not Always Enabled"
 msgstr "SIO IRQ non sempre abilitato"
 
-#: ../gui/Plugin.c:211
+#: ../gui/Plugin.c:210
 #, c-format
 msgid "Black & White Mdecs Only Enabled"
 msgstr "Abilita solo i filmati in bianco e nero"
 
-#: ../gui/Plugin.c:212
+#: ../gui/Plugin.c:211
 #, c-format
 msgid "Black & White Mdecs Only Disabled"
 msgstr "Disabilita solo i filmati in bianco e nero"
 
-#: ../gui/Plugin.c:218
+#: ../gui/Plugin.c:217
 #, c-format
 msgid "XA Enabled"
 msgstr "XA abilitato"
 
-#: ../gui/Plugin.c:219
+#: ../gui/Plugin.c:218
 #, c-format
 msgid "XA Disabled"
 msgstr "XA disabilitato"
 
-#: ../gui/Plugin.c:285
+#: ../gui/Plugin.c:280
 msgid "Error opening CD-ROM plugin!"
 msgstr "Si è verificato un errore durante l'apertura del plugin del CD-ROM!"
 
-#: ../gui/Plugin.c:287
+#: ../gui/Plugin.c:282
 msgid "Error opening SPU plugin!"
 msgstr "Si è verificato un errore durante l'apertura del plugin della SPU!"
 
-#: ../gui/Plugin.c:290
+#: ../gui/Plugin.c:285
 msgid "Error opening GPU plugin!"
 msgstr "Si è verificato un errore durante l'apertura del plugin della GPU!"
 
-#: ../gui/Plugin.c:292
+#: ../gui/Plugin.c:287
 msgid "Error opening Controller 1 plugin!"
 msgstr ""
 "Si è verificato un errore durante l'apertura del plugin del controller 1!"
 
-#: ../gui/Plugin.c:294
+#: ../gui/Plugin.c:289
 msgid "Error opening Controller 2 plugin!"
 msgstr ""
 "Si è verificato un errore durante l'apertura del plugin del controller 2!"
 
-#: ../gui/Plugin.c:374
+#: ../gui/Plugin.c:369
 msgid "Error closing CD-ROM plugin!"
 msgstr "Si è verificato un errore durante la chiusura del plugin del CD-ROM!"
 
-#: ../gui/Plugin.c:376
+#: ../gui/Plugin.c:371
 msgid "Error closing SPU plugin!"
 msgstr "Si è verificato un errore durante la chiusura del plugin della SPU!"
 
-#: ../gui/Plugin.c:378
+#: ../gui/Plugin.c:373
 msgid "Error closing Controller 1 Plugin!"
 msgstr ""
 "Si è verificato un errore durante la chiusura del plugin del controller 1!"
 
-#: ../gui/Plugin.c:380
+#: ../gui/Plugin.c:375
 msgid "Error closing Controller 2 plugin!"
 msgstr ""
 "Si è verificato un errore durante la chiusura del plugin del controller 2!"
 
-#: ../gui/Plugin.c:382
+#: ../gui/Plugin.c:377
 msgid "Error closing GPU plugin!"
 msgstr "Si è verificato un errore durante la chiusura del plugin della GPU!"
 
@@ -1373,17 +1374,17 @@ msgstr "Si è verificato un errore durante la chiusura del plugin della GPU!"
 msgid "Loaded CD Image: %s"
 msgstr "È stata caricata l'immagine del CD: %s"
 
-#: ../libpcsxcore/cheat.c:148
+#: ../libpcsxcore/cheat.c:147
 #, c-format
 msgid "Cheats loaded from: %s\n"
 msgstr "Cheat caricati da: %s\n"
 
-#: ../libpcsxcore/cheat.c:180
+#: ../libpcsxcore/cheat.c:179
 #, c-format
 msgid "Cheats saved to: %s\n"
 msgstr "Cheat salvati in: %s\n"
 
-#: ../libpcsxcore/cheat.c:323 ../libpcsxcore/cheat.c:444
+#: ../libpcsxcore/cheat.c:322 ../libpcsxcore/cheat.c:443
 msgid "(Untitled)"
 msgstr "(Senza titolo)"
 
@@ -1403,154 +1404,154 @@ msgstr "Il debugger è stato avviato.\n"
 msgid "Debugger stopped.\n"
 msgstr "Il debugger è stato fermato.\n"
 
-#: ../libpcsxcore/misc.c:392
+#: ../libpcsxcore/misc.c:388
 #, c-format
 msgid "Error opening file: %s.\n"
 msgstr "Si è verificato un errore durante l'apertura del file: %s.\n"
 
-#: ../libpcsxcore/misc.c:432
+#: ../libpcsxcore/misc.c:428
 #, c-format
 msgid "Unknown CPE opcode %02x at position %08x.\n"
 msgstr "Opcode CPE sconosciuto %02x alla posizione %08x.\n"
 
-#: ../libpcsxcore/misc.c:439
+#: ../libpcsxcore/misc.c:435
 msgid "COFF files not supported.\n"
 msgstr "File COFF non supportato.\n"
 
-#: ../libpcsxcore/misc.c:443
+#: ../libpcsxcore/misc.c:439
 msgid "This file does not appear to be a valid PSX file.\n"
 msgstr "Questo file non sembra essere un file valido di PSX.\n"
 
-#: ../libpcsxcore/plugins.c:33
+#: ../libpcsxcore/plugins.c:138
 #, c-format
 msgid "Error loading %s: %s"
 msgstr "Si è verificato un errore durante il caricamento di %s: %s"
 
-#: ../libpcsxcore/plugins.c:162
+#: ../libpcsxcore/plugins.c:181
 #, c-format
 msgid "Could not load GPU plugin %s!"
 msgstr "Impossibile caricare il plugin %s della GPU!"
 
-#: ../libpcsxcore/plugins.c:228
+#: ../libpcsxcore/plugins.c:251
 #, c-format
 msgid "Could not load CD-ROM plugin %s!"
 msgstr "Impossibile caricare il plugin %s del CD-ROM!"
 
-#: ../libpcsxcore/plugins.c:467
+#: ../libpcsxcore/plugins.c:297
 #, c-format
 msgid "Could not load SPU plugin %s!"
 msgstr "Impossibile caricare il plugin %s della SPU!"
 
-#: ../libpcsxcore/plugins.c:616
+#: ../libpcsxcore/plugins.c:347
 #, c-format
 msgid "Could not load Controller 1 plugin %s!"
 msgstr "Impossibile caricare il plugin %s del controller 1!"
 
-#: ../libpcsxcore/plugins.c:670
+#: ../libpcsxcore/plugins.c:388
 #, c-format
 msgid "Could not load Controller 2 plugin %s!"
 msgstr "Impossibile caricare il plugin %s del controller 2!"
 
-#: ../libpcsxcore/plugins.c:713
+#: ../libpcsxcore/plugins.c:430
 #, c-format
 msgid "Could not load NetPlay plugin %s!"
 msgstr "Impossibile caricare il plugin %s di NetPlay!"
 
-#: ../libpcsxcore/plugins.c:776
+#: ../libpcsxcore/plugins.c:491
 #, c-format
 msgid "Error initializing CD-ROM plugin: %d"
 msgstr ""
 "Si è verificato un errore durante l'inizializzazione del plugin del CD-ROM: %"
 "d"
 
-#: ../libpcsxcore/plugins.c:778
+#: ../libpcsxcore/plugins.c:493
 #, c-format
 msgid "Error initializing GPU plugin: %d"
 msgstr ""
 "Si è verificato un errore durante l'inizializzazione del plugin della GPU: %d"
 
-#: ../libpcsxcore/plugins.c:780
+#: ../libpcsxcore/plugins.c:495
 #, c-format
 msgid "Error initializing SPU plugin: %d"
 msgstr ""
 "Si è verificato un errore durante l'inizializzazione del plugin della SPU: %d"
 
-#: ../libpcsxcore/plugins.c:782
+#: ../libpcsxcore/plugins.c:497
 #, c-format
 msgid "Error initializing Controller 1 plugin: %d"
 msgstr ""
 "Si è verificato un errore durante l'inizializzazione del plugin del "
 "controller 1: %d"
 
-#: ../libpcsxcore/plugins.c:784
+#: ../libpcsxcore/plugins.c:499
 #, c-format
 msgid "Error initializing Controller 2 plugin: %d"
 msgstr ""
 "Si è verificato un errore durante l'inizializzazione del plugin del "
 "controller 2: %d"
 
-#: ../libpcsxcore/plugins.c:788
+#: ../libpcsxcore/plugins.c:503
 #, c-format
 msgid "Error initializing NetPlay plugin: %d"
 msgstr ""
 "Si è verificato un errore durante l'inizializzazione del plugin di NetPlay: %"
 "d"
 
-#: ../libpcsxcore/plugins.c:791
+#: ../libpcsxcore/plugins.c:506
 msgid "Plugins loaded.\n"
 msgstr "Plugin caricati.\n"
 
-#: ../libpcsxcore/ppf.c:218
+#: ../libpcsxcore/ppf.c:216
 #, c-format
 msgid "Invalid PPF patch: %s.\n"
 msgstr "Patch PPF non valida: %s.\n"
 
-#: ../libpcsxcore/ppf.c:294
+#: ../libpcsxcore/ppf.c:292
 #, c-format
 msgid "Unsupported PPF version (%d).\n"
 msgstr "Versione PPF non supportata (%d).\n"
 
-#: ../libpcsxcore/ppf.c:333
+#: ../libpcsxcore/ppf.c:331
 #, c-format
 msgid "Loaded PPF %d.0 patch: %s.\n"
 msgstr "Caricata la patch PPF %d.0: %s.\n"
 
-#: ../libpcsxcore/psxmem.c:69
+#: ../libpcsxcore/psxmem.c:76
 msgid "Error allocating memory!"
 msgstr "Si è verificato un errore durante l'allocazione della memoria!"
 
-#: ../libpcsxcore/psxmem.c:107
+#: ../libpcsxcore/psxmem.c:114
 #, c-format
 msgid "Could not open BIOS:\"%s\". Enabling HLE Bios!\n"
 msgstr "Impossibile aprire il BIOS:\"%s\". Sto abilitando il bios HLE!\n"
 
-#: ../libpcsxcore/r3000a.c:35
+#: ../libpcsxcore/r3000a.c:33
 #, c-format
 msgid "Running PCSX Version %s (%s).\n"
 msgstr "Avvio in corso di PCSX versione %s (%s).\n"
 
-#: ../libpcsxcore/sio.c:99
+#: ../libpcsxcore/sio.c:344
 msgid "Connection closed!\n"
 msgstr "Connessione chiusa!\n"
 
-#: ../libpcsxcore/sio.c:322
+#: ../libpcsxcore/sio.c:370
 #, c-format
 msgid "No memory card value was specified - creating a default card %s\n"
 msgstr ""
 "Nessun valore specificato per la memory card, sto creando una card di "
 "default %s\n"
 
-#: ../libpcsxcore/sio.c:326
+#: ../libpcsxcore/sio.c:374
 #, c-format
 msgid "The memory card %s doesn't exist - creating it\n"
 msgstr "La memory card %s non esiste, la sto creando\n"
 
-#: ../libpcsxcore/sio.c:342
+#: ../libpcsxcore/sio.c:390
 #, c-format
 msgid "Memory card %s failed to load!\n"
 msgstr "Impossibile caricare la memory card %s!\n"
 
-#: ../libpcsxcore/sio.c:346
+#: ../libpcsxcore/sio.c:394
 #, c-format
 msgid "Loading memory card %s\n"
 msgstr "Sto caricando la memory card %s\n"
@@ -2079,15 +2080,15 @@ msgstr "Configura il NetPlay"
 msgid "<b>NetPlay</b>"
 msgstr "<b>NetPlay</b>"
 
-#: ../data/pcsx.glade2:1897 ../data/pcsx.glade2:2295
+#: ../data/pcsx.glade2:1896 ../data/pcsx.glade2:2296
 msgid "New"
 msgstr "Nuovo"
 
-#: ../data/pcsx.glade2:1947 ../data/pcsx.glade2:2345
+#: ../data/pcsx.glade2:1946 ../data/pcsx.glade2:2346
 msgid "Format"
 msgstr "Formatta"
 
-#: ../data/pcsx.glade2:1997 ../data/pcsx.glade2:2395
+#: ../data/pcsx.glade2:1996 ../data/pcsx.glade2:2396
 msgid "Un/Delete"
 msgstr "Non/Elimina"
 
@@ -2095,26 +2096,26 @@ msgstr "Non/Elimina"
 msgid "<b>Memory Card 1</b>"
 msgstr "<b>Memory card 1</b>"
 
-#: ../data/pcsx.glade2:2151 ../data/pcsx.glade2:2201 ../data/pcsx.glade2:3094
+#: ../data/pcsx.glade2:2151 ../data/pcsx.glade2:2201 ../data/pcsx.glade2:3084
 msgid "Copy"
 msgstr "Copia"
 
-#: ../data/pcsx.glade2:2488
+#: ../data/pcsx.glade2:2490
 msgid "<b>Memory Card 2</b>"
 msgstr "<b>Memory card 2</b>"
 
-#: ../data/pcsx.glade2:2552
+#: ../data/pcsx.glade2:2554
 msgid ""
 "(C) 1999-2003 PCSX Development Team\n"
 "(C) 2005-2009 PCSX-df Team\n"
 "(C) 2009-2010 PCSX-Reloaded Team"
 msgstr ""
 
-#: ../data/pcsx.glade2:2555
+#: ../data/pcsx.glade2:2557
 msgid "A PlayStation emulator."
 msgstr "Un emulatore della PlayStation."
 
-#: ../data/pcsx.glade2:2558
+#: ../data/pcsx.glade2:2560
 msgid ""
 "This program is free software; you can redistribute it\n"
 "and/or modify it under the terms of the GNU General\n"
@@ -2148,16 +2149,16 @@ msgstr ""
 "Public License along with this program; if not, write to\n"
 "the Free Software Foundation, Inc."
 
-#: ../data/pcsx.glade2:2600
+#: ../data/pcsx.glade2:2590
 msgid "translator-credits"
 msgstr ""
 "Traduzione italiana a cura di Giovanni Scafora <giovanni@archlinux.org>"
 
-#: ../data/pcsx.glade2:2662
+#: ../data/pcsx.glade2:2652
 msgid "<b>Cheat Codes</b>"
 msgstr "<b>Codici cheat</b>"
 
-#: ../data/pcsx.glade2:2828
+#: ../data/pcsx.glade2:2818
 msgid ""
 "8-bit\n"
 "16-bit\n"
@@ -2167,7 +2168,7 @@ msgstr ""
 "16-bit\n"
 "32-bit"
 
-#: ../data/pcsx.glade2:2891
+#: ../data/pcsx.glade2:2881
 msgid ""
 "Equal Value\n"
 "Not Equal Value\n"
@@ -2189,7 +2190,7 @@ msgstr ""
 "Differente\n"
 "Nessun cambio"
 
-#: ../data/pcsx.glade2:2923
+#: ../data/pcsx.glade2:2913
 msgid ""
 "Decimal\n"
 "Hexadecimal"
@@ -2197,27 +2198,27 @@ msgstr ""
 "Decimale\n"
 "Esadecimale"
 
-#: ../data/pcsx.glade2:3127
+#: ../data/pcsx.glade2:3117
 msgid "label_resultsfound"
 msgstr "etichetta_risultatitrovati"
 
-#: ../data/pcsx.glade2:3162
+#: ../data/pcsx.glade2:3152
 msgid "Search"
 msgstr "Cerca"
 
-#: ../data/pcsx.glade2:3198
+#: ../data/pcsx.glade2:3188
 msgid "Restart"
 msgstr "Riavvia"
 
-#: ../data/pcsx.glade2:3227
+#: ../data/pcsx.glade2:3217
 msgid "<b>Cheat Search</b>"
 msgstr "<b>Cerca cheat</b>"
 
-#: ../data/pcsx.glade2:3384
+#: ../data/pcsx.glade2:3374
 msgid "Raw Dump..."
 msgstr ""
 
-#: ../data/pcsx.glade2:3419
+#: ../data/pcsx.glade2:3409
 msgid "Patch Memory..."
 msgstr ""
 
@@ -2994,6 +2995,79 @@ msgstr "Controller 2"
 msgid "Multi-Threaded (Recommended)"
 msgstr "Multi-Threaded (consigliato)"
 
+#: ../plugins/dfnet/dfnet.c:23
+#, fuzzy
+msgid "Socket Driver"
+msgstr "Driver SoftGL"
+
+#: ../plugins/dfnet/dfnet.c:172
+#, fuzzy, c-format
+msgid "error connecting to %s: %s\n"
+msgstr "Si è verificato un errore durante il caricamento di %s: %s"
+
+#: ../plugins/dfnet/dfnet.c:197
+#, fuzzy
+msgid "Error allocating memory!\n"
+msgstr "Si è verificato un errore durante l'allocazione della memoria!"
+
+#: ../plugins/dfnet/gui.c:38
+msgid "Nothing to configure"
+msgstr ""
+
+#: ../plugins/dfnet/gui.c:57
+#, c-format
+msgid "IP %s"
+msgstr ""
+
+#: ../plugins/dfnet/gui.c:127
+msgid "Waiting for connection..."
+msgstr ""
+
+#: ../plugins/dfnet/gui.c:130
+msgid "The Client should now Start a Connection, waiting..."
+msgstr ""
+
+#: ../plugins/dfnet/dfnet.glade2:23
+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"
+"\n"
+"If you selected Client please enter the IP address the Server gave to you in "
+"the IP Address Control."
+msgstr ""
+
+#: ../plugins/dfnet/dfnet.glade2:63
+msgid "Copy PC IP to Clipboard"
+msgstr ""
+
+#: ../plugins/dfnet/dfnet.glade2:93
+msgid "Server (Player1)"
+msgstr ""
+
+#: ../plugins/dfnet/dfnet.glade2:103
+msgid "Client (Player2)"
+msgstr ""
+
+#: ../plugins/dfnet/dfnet.glade2:129
+msgid ""
+"Do not change if not necessary (remember it must be changed on both sides)."
+msgstr ""
+
+#: ../plugins/dfnet/dfnet.glade2:142
+msgid "Port Number"
+msgstr ""
+
+#: ../plugins/dfnet/dfnet.glade2:201
+#, fuzzy
+msgid "Start Game"
+msgstr "Tasto Start"
+
+#: ../plugins/dfnet/dfnet.glade2:239
+msgid "Play Offline"
+msgstr ""
+
 #, fuzzy
 #~ msgid "Dump Memory..."
 #~ msgstr "&Memory card..."
diff --git a/po/pcsx.pot b/po/pcsx.pot
index 57853734..e6088687 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: \n"
-"POT-Creation-Date: 2010-04-11 20:17+0800\n"
+"POT-Creation-Date: 2010-05-13 11:15+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"
@@ -44,8 +44,8 @@ msgid "About"
 msgstr ""
 
 #: ../win32/gui/AboutDlg.c:48 ../win32/gui/AboutDlg.c:52
-#: ../win32/gui/CheatDlg.c:70 ../win32/gui/CheatDlg.c:120
-#: ../win32/gui/ConfigurePlugins.c:470 ../win32/gui/ConfigurePlugins.c:601
+#: ../win32/gui/CheatDlg.c:69 ../win32/gui/CheatDlg.c:119
+#: ../win32/gui/ConfigurePlugins.c:483 ../win32/gui/ConfigurePlugins.c:614
 #: ../win32/gui/WndMain.c:966 ../win32/gui/WndMain.c:1202
 #: ../plugins/peopsxgl/gpucfg/interface.c:130
 #: ../plugins/peopsxgl/gpucfg/interface.c:843
@@ -56,480 +56,340 @@ msgstr ""
 msgid "PCSX EMU\n"
 msgstr ""
 
-#: ../win32/gui/CheatDlg.c:52 ../win32/gui/CheatDlg.c:224
-#: ../win32/gui/CheatDlg.c:271
+#: ../win32/gui/CheatDlg.c:51 ../win32/gui/CheatDlg.c:223
+#: ../win32/gui/CheatDlg.c:270
 msgid "Yes"
 msgstr ""
 
-#: ../win32/gui/CheatDlg.c:52 ../win32/gui/CheatDlg.c:224
-#: ../win32/gui/CheatDlg.c:271
+#: ../win32/gui/CheatDlg.c:51 ../win32/gui/CheatDlg.c:223
+#: ../win32/gui/CheatDlg.c:270
 msgid "No"
 msgstr ""
 
-#: ../win32/gui/CheatDlg.c:67 ../gui/Cheat.c:195
+#: ../win32/gui/CheatDlg.c:66 ../gui/Cheat.c:194
 msgid "Edit Cheat"
 msgstr ""
 
-#: ../win32/gui/CheatDlg.c:68 ../win32/gui/CheatDlg.c:118 ../gui/Cheat.c:637
+#: ../win32/gui/CheatDlg.c:67 ../win32/gui/CheatDlg.c:117 ../gui/Cheat.c:636
 msgid "Description:"
 msgstr ""
 
-#: ../win32/gui/CheatDlg.c:69 ../win32/gui/CheatDlg.c:119 ../gui/Cheat.c:126
-#: ../gui/Cheat.c:212
+#: ../win32/gui/CheatDlg.c:68 ../win32/gui/CheatDlg.c:118 ../gui/Cheat.c:125
+#: ../gui/Cheat.c:211
 msgid "Cheat Code:"
 msgstr ""
 
-#: ../win32/gui/CheatDlg.c:71 ../win32/gui/CheatDlg.c:121
-#: ../win32/gui/ConfigurePlugins.c:471 ../win32/gui/ConfigurePlugins.c:602
+#: ../win32/gui/CheatDlg.c:70 ../win32/gui/CheatDlg.c:120
+#: ../win32/gui/ConfigurePlugins.c:484 ../win32/gui/ConfigurePlugins.c:615
 #: ../win32/gui/WndMain.c:967 ../win32/gui/WndMain.c:1203
 #: ../plugins/peopsxgl/gpucfg/interface.c:338
 msgid "Cancel"
 msgstr ""
 
-#: ../win32/gui/CheatDlg.c:92 ../win32/gui/CheatDlg.c:133 ../gui/Cheat.c:156
-#: ../gui/Cheat.c:252
+#: ../win32/gui/CheatDlg.c:91 ../win32/gui/CheatDlg.c:132 ../gui/Cheat.c:155
+#: ../gui/Cheat.c:251
 msgid "Invalid cheat code!"
 msgstr ""
 
-#: ../win32/gui/CheatDlg.c:117 ../gui/Cheat.c:110
+#: ../win32/gui/CheatDlg.c:116 ../gui/Cheat.c:109
 msgid "Add New Cheat"
 msgstr ""
 
-#: ../win32/gui/CheatDlg.c:167 ../data/pcsx.glade2:2622
+#: ../win32/gui/CheatDlg.c:166 ../data/pcsx.glade2:2612
 msgid "Edit Cheat Codes"
 msgstr ""
 
-#: ../win32/gui/CheatDlg.c:169
+#: ../win32/gui/CheatDlg.c:168
 msgid "&Add Code"
 msgstr ""
 
-#: ../win32/gui/CheatDlg.c:170
+#: ../win32/gui/CheatDlg.c:169
 msgid "&Edit Code"
 msgstr ""
 
-#: ../win32/gui/CheatDlg.c:171
+#: ../win32/gui/CheatDlg.c:170
 msgid "&Remove Code"
 msgstr ""
 
-#: ../win32/gui/CheatDlg.c:172
+#: ../win32/gui/CheatDlg.c:171
 msgid "&Enable/Disable"
 msgstr ""
 
-#: ../win32/gui/CheatDlg.c:173
+#: ../win32/gui/CheatDlg.c:172
 msgid "&Load..."
 msgstr ""
 
-#: ../win32/gui/CheatDlg.c:174
+#: ../win32/gui/CheatDlg.c:173
 msgid "&Save As..."
 msgstr ""
 
-#: ../win32/gui/CheatDlg.c:175
+#: ../win32/gui/CheatDlg.c:174
 msgid "&Close"
 msgstr ""
 
-#: ../win32/gui/CheatDlg.c:186 ../gui/Cheat.c:414
+#: ../win32/gui/CheatDlg.c:185 ../gui/Cheat.c:413
 msgid "Description"
 msgstr ""
 
-#: ../win32/gui/CheatDlg.c:191
+#: ../win32/gui/CheatDlg.c:190
 msgid "Enabled"
 msgstr ""
 
-#: ../win32/gui/CheatDlg.c:283 ../win32/gui/CheatDlg.c:312
+#: ../win32/gui/CheatDlg.c:282 ../win32/gui/CheatDlg.c:311
 msgid "PCSX Cheat Code Files"
 msgstr ""
 
-#: ../win32/gui/CheatDlg.c:403
+#: ../win32/gui/CheatDlg.c:402
 msgid "Equal Value"
 msgstr ""
 
-#: ../win32/gui/CheatDlg.c:404
+#: ../win32/gui/CheatDlg.c:403
 msgid "Not Equal Value"
 msgstr ""
 
-#: ../win32/gui/CheatDlg.c:405
+#: ../win32/gui/CheatDlg.c:404
 msgid "Range"
 msgstr ""
 
-#: ../win32/gui/CheatDlg.c:408
+#: ../win32/gui/CheatDlg.c:407
 msgid "Increased By"
 msgstr ""
 
-#: ../win32/gui/CheatDlg.c:409
+#: ../win32/gui/CheatDlg.c:408
 msgid "Decreased By"
 msgstr ""
 
-#: ../win32/gui/CheatDlg.c:410
+#: ../win32/gui/CheatDlg.c:409
 msgid "Increased"
 msgstr ""
 
-#: ../win32/gui/CheatDlg.c:411
+#: ../win32/gui/CheatDlg.c:410
 msgid "Decreased"
 msgstr ""
 
-#: ../win32/gui/CheatDlg.c:412
+#: ../win32/gui/CheatDlg.c:411
 msgid "Different"
 msgstr ""
 
-#: ../win32/gui/CheatDlg.c:413
+#: ../win32/gui/CheatDlg.c:412
 msgid "No Change"
 msgstr ""
 
-#: ../win32/gui/CheatDlg.c:449 ../gui/Cheat.c:586
+#: ../win32/gui/CheatDlg.c:448 ../gui/Cheat.c:585
 msgid "Enter the values and start your search."
 msgstr ""
 
-#: ../win32/gui/CheatDlg.c:454
+#: ../win32/gui/CheatDlg.c:453
 msgid "No addresses found."
 msgstr ""
 
-#: ../win32/gui/CheatDlg.c:458 ../gui/Cheat.c:544
+#: ../win32/gui/CheatDlg.c:457 ../gui/Cheat.c:543
 msgid "Too many addresses found."
 msgstr ""
 
-#: ../win32/gui/CheatDlg.c:467 ../gui/Cheat.c:553
+#: ../win32/gui/CheatDlg.c:466 ../gui/Cheat.c:552
 #, c-format
 msgid "%.8X    Current: %u (%.2X), Previous: %u (%.2X)"
 msgstr ""
 
-#: ../win32/gui/CheatDlg.c:472 ../gui/Cheat.c:558
+#: ../win32/gui/CheatDlg.c:471 ../gui/Cheat.c:557
 #, c-format
 msgid "%.8X    Current: %u (%.4X), Previous: %u (%.4X)"
 msgstr ""
 
-#: ../win32/gui/CheatDlg.c:477 ../gui/Cheat.c:563
+#: ../win32/gui/CheatDlg.c:476 ../gui/Cheat.c:562
 #, c-format
 msgid "%.8X    Current: %u (%.8X), Previous: %u (%.8X)"
 msgstr ""
 
-#: ../win32/gui/CheatDlg.c:493 ../gui/Cheat.c:578
+#: ../win32/gui/CheatDlg.c:492 ../gui/Cheat.c:577
 #, c-format
 msgid "Founded Addresses: %d"
 msgstr ""
 
-#: ../win32/gui/CheatDlg.c:505 ../data/pcsx.glade2:3022
+#: ../win32/gui/CheatDlg.c:504 ../data/pcsx.glade2:3012
 msgid "Freeze"
 msgstr ""
 
-#: ../win32/gui/CheatDlg.c:506 ../win32/gui/CheatDlg.c:597
+#: ../win32/gui/CheatDlg.c:505 ../win32/gui/CheatDlg.c:596
 msgid "Address:"
 msgstr ""
 
-#: ../win32/gui/CheatDlg.c:507 ../win32/gui/CheatDlg.c:598
-#: ../win32/gui/CheatDlg.c:683 ../gui/Cheat.c:648 ../data/pcsx.glade2:2865
+#: ../win32/gui/CheatDlg.c:506 ../win32/gui/CheatDlg.c:597
+#: ../win32/gui/CheatDlg.c:682 ../gui/Cheat.c:647 ../data/pcsx.glade2:2855
 msgid "Value:"
 msgstr ""
 
-#: ../win32/gui/CheatDlg.c:567
+#: ../win32/gui/CheatDlg.c:566
 #, c-format
 msgid "Freeze %.8X"
 msgstr ""
 
-#: ../win32/gui/CheatDlg.c:596 ../data/pcsx.glade2:3058
+#: ../win32/gui/CheatDlg.c:595 ../data/pcsx.glade2:3048
 msgid "Modify"
 msgstr ""
 
-#: ../win32/gui/CheatDlg.c:679 ../gui/Cheat.c:1130 ../data/pcsx.glade2:2793
+#: ../win32/gui/CheatDlg.c:678 ../gui/Cheat.c:1129 ../data/pcsx.glade2:2783
 msgid "Cheat Search"
 msgstr ""
 
-#: ../win32/gui/CheatDlg.c:681 ../data/pcsx.glade2:2843
+#: ../win32/gui/CheatDlg.c:680 ../data/pcsx.glade2:2833
 msgid "Search For:"
 msgstr ""
 
-#: ../win32/gui/CheatDlg.c:682 ../data/pcsx.glade2:2853
+#: ../win32/gui/CheatDlg.c:681 ../data/pcsx.glade2:2843
 msgid "Data Type:"
 msgstr ""
 
-#: ../win32/gui/CheatDlg.c:684 ../data/pcsx.glade2:2877
+#: ../win32/gui/CheatDlg.c:683 ../data/pcsx.glade2:2867
 msgid "Data Base:"
 msgstr ""
 
-#: ../win32/gui/CheatDlg.c:685 ../data/pcsx.glade2:2937
+#: ../win32/gui/CheatDlg.c:684 ../data/pcsx.glade2:2927
 msgid "To:"
 msgstr ""
 
-#: ../win32/gui/CheatDlg.c:686
+#: ../win32/gui/CheatDlg.c:685
 msgid "&Freeze"
 msgstr ""
 
-#: ../win32/gui/CheatDlg.c:687
+#: ../win32/gui/CheatDlg.c:686
 msgid "&Modify"
 msgstr ""
 
-#: ../win32/gui/CheatDlg.c:688
+#: ../win32/gui/CheatDlg.c:687
 msgid "&Copy"
 msgstr ""
 
-#: ../win32/gui/CheatDlg.c:689
+#: ../win32/gui/CheatDlg.c:688
 msgid "&Search"
 msgstr ""
 
-#: ../win32/gui/CheatDlg.c:690
+#: ../win32/gui/CheatDlg.c:689
 msgid "&New Search"
 msgstr ""
 
-#: ../win32/gui/CheatDlg.c:691
+#: ../win32/gui/CheatDlg.c:690
 msgid "C&lose"
 msgstr ""
 
-#: ../win32/gui/CheatDlg.c:693
+#: ../win32/gui/CheatDlg.c:692
 msgid "8-bit"
 msgstr ""
 
-#: ../win32/gui/CheatDlg.c:694
+#: ../win32/gui/CheatDlg.c:693
 msgid "16-bit"
 msgstr ""
 
-#: ../win32/gui/CheatDlg.c:695
+#: ../win32/gui/CheatDlg.c:694
 msgid "32-bit"
 msgstr ""
 
-#: ../win32/gui/CheatDlg.c:696
+#: ../win32/gui/CheatDlg.c:695
 msgid "Decimal"
 msgstr ""
 
-#: ../win32/gui/CheatDlg.c:697
+#: ../win32/gui/CheatDlg.c:696
 msgid "Hexadecimal"
 msgstr ""
 
-#: ../win32/gui/ConfigurePlugins.c:206 ../gui/ConfDlg.c:675
+#: ../win32/gui/ConfigurePlugins.c:219 ../gui/ConfDlg.c:675
 msgid "Internal HLE Bios"
 msgstr ""
 
-#: ../win32/gui/ConfigurePlugins.c:292
+#: ../win32/gui/ConfigurePlugins.c:305
 msgid "Configuration not OK!"
 msgstr ""
 
-#: ../win32/gui/ConfigurePlugins.c:292 ../gui/Cheat.c:156 ../gui/Cheat.c:252
-#: ../gui/LnxMain.c:414
+#: ../win32/gui/ConfigurePlugins.c:305 ../gui/Cheat.c:155 ../gui/Cheat.c:251
+#: ../gui/LnxMain.c:418
 msgid "Error"
 msgstr ""
 
-#: ../win32/gui/ConfigurePlugins.c:393
+#: ../win32/gui/ConfigurePlugins.c:406
 msgid "This plugin reports that should work correctly"
 msgstr ""
 
-#: ../win32/gui/ConfigurePlugins.c:394
+#: ../win32/gui/ConfigurePlugins.c:407
 msgid "This plugin reports that should not work correctly"
 msgstr ""
 
-#: ../win32/gui/ConfigurePlugins.c:450
+#: ../win32/gui/ConfigurePlugins.c:463
 msgid "Select Plugins Directory"
 msgstr ""
 
-#: ../win32/gui/ConfigurePlugins.c:459
+#: ../win32/gui/ConfigurePlugins.c:472
 msgid "Select Bios Directory"
 msgstr ""
 
-#: ../win32/gui/ConfigurePlugins.c:468
+#: ../win32/gui/ConfigurePlugins.c:481
 msgid "Configuration"
 msgstr ""
 
-#: ../win32/gui/ConfigurePlugins.c:472
+#: ../win32/gui/ConfigurePlugins.c:485
 msgid "Graphics"
 msgstr ""
 
-#: ../win32/gui/ConfigurePlugins.c:473
+#: ../win32/gui/ConfigurePlugins.c:486
 msgid "First Controller"
 msgstr ""
 
-#: ../win32/gui/ConfigurePlugins.c:474
+#: ../win32/gui/ConfigurePlugins.c:487
 msgid "Second Controller"
 msgstr ""
 
-#: ../win32/gui/ConfigurePlugins.c:475
+#: ../win32/gui/ConfigurePlugins.c:488
 msgid "Sound"
 msgstr ""
 
-#: ../win32/gui/ConfigurePlugins.c:476
+#: ../win32/gui/ConfigurePlugins.c:489
 msgid "Cdrom"
 msgstr ""
 
-#: ../win32/gui/ConfigurePlugins.c:477
+#: ../win32/gui/ConfigurePlugins.c:490
 msgid "Bios"
 msgstr ""
 
-#: ../win32/gui/ConfigurePlugins.c:478
+#: ../win32/gui/ConfigurePlugins.c:491
 msgid "Set Bios Directory"
 msgstr ""
 
-#: ../win32/gui/ConfigurePlugins.c:479
+#: ../win32/gui/ConfigurePlugins.c:492
 msgid "Set Plugins Directory"
 msgstr ""
 
-#: ../win32/gui/ConfigurePlugins.c:480 ../win32/gui/ConfigurePlugins.c:483
-#: ../win32/gui/ConfigurePlugins.c:486 ../win32/gui/ConfigurePlugins.c:489
-#: ../win32/gui/ConfigurePlugins.c:492 ../win32/gui/ConfigurePlugins.c:604
+#: ../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:481 ../win32/gui/ConfigurePlugins.c:484
-#: ../win32/gui/ConfigurePlugins.c:487 ../win32/gui/ConfigurePlugins.c:490
-#: ../win32/gui/ConfigurePlugins.c:493 ../win32/gui/ConfigurePlugins.c:605
+#: ../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:482 ../win32/gui/ConfigurePlugins.c:485
-#: ../win32/gui/ConfigurePlugins.c:488 ../win32/gui/ConfigurePlugins.c:491
-#: ../win32/gui/ConfigurePlugins.c:494 ../win32/gui/ConfigurePlugins.c:606
+#: ../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 ""
 
-#: ../win32/gui/ConfigurePlugins.c:599
+#: ../win32/gui/ConfigurePlugins.c:612
 msgid "NetPlay Configuration"
 msgstr ""
 
-#: ../win32/gui/ConfigurePlugins.c:603
+#: ../win32/gui/ConfigurePlugins.c:616 ../plugins/dfnet/gui.c:30
+#: ../plugins/dfnet/gui.c:74
 msgid "NetPlay"
 msgstr ""
 
-#: ../win32/gui/ConfigurePlugins.c:607
+#: ../win32/gui/ConfigurePlugins.c:620
 msgid ""
 "Note: The NetPlay Plugin Directory should be the same as the other Plugins."
 msgstr ""
 
-#: ../win32/gui/plugin.c:90 ../win32/gui/WndMain.c:281
-#, c-format
-msgid "*PCSX*: Saved State %d"
-msgstr ""
-
-#: ../win32/gui/plugin.c:91 ../win32/gui/WndMain.c:282
-#, c-format
-msgid "*PCSX*: Error Saving State %d"
-msgstr ""
-
-#: ../win32/gui/plugin.c:107 ../win32/gui/WndMain.c:259
-#, c-format
-msgid "*PCSX*: Loaded State %d"
-msgstr ""
-
-#: ../win32/gui/plugin.c:108 ../win32/gui/WndMain.c:260
-#, c-format
-msgid "*PCSX*: Error Loading State %d"
-msgstr ""
-
-#: ../win32/gui/plugin.c:119
-#, c-format
-msgid "*PCSX*: Sio Irq Always Enabled"
-msgstr ""
-
-#: ../win32/gui/plugin.c:120
-#, c-format
-msgid "*PCSX*: Sio Irq Not Always Enabled"
-msgstr ""
-
-#: ../win32/gui/plugin.c:127
-#, c-format
-msgid "*PCSX*: Black&White Mdecs Only Enabled"
-msgstr ""
-
-#: ../win32/gui/plugin.c:128
-#, c-format
-msgid "*PCSX*: Black&White Mdecs Only Disabled"
-msgstr ""
-
-#: ../win32/gui/plugin.c:135
-#, c-format
-msgid "*PCSX*: Xa Enabled"
-msgstr ""
-
-#: ../win32/gui/plugin.c:136
-#, c-format
-msgid "*PCSX*: Xa Disabled"
-msgstr ""
-
-#: ../win32/gui/plugin.c:145
-msgid "*PCSX*: CdRom Case Opened"
-msgstr ""
-
-#: ../win32/gui/plugin.c:150
-msgid "*PCSX*: CdRom Case Closed"
-msgstr ""
-
-#: ../win32/gui/plugin.c:177
-msgid "Connecting..."
-msgstr ""
-
-#: ../win32/gui/plugin.c:179 ../win32/gui/plugin.c:186
-#, c-format
-msgid "Please wait while connecting... %c\n"
-msgstr ""
-
-#: ../win32/gui/plugin.c:216
-msgid "Error Opening CDR Plugin"
-msgstr ""
-
-#: ../win32/gui/plugin.c:279
-#, c-format
-msgid "Error Opening GPU Plugin (%d)"
-msgstr ""
-
-#: ../win32/gui/plugin.c:281
-#, c-format
-msgid "Error Opening SPU Plugin (%d)"
-msgstr ""
-
-#: ../win32/gui/plugin.c:284
-#, c-format
-msgid "Error Opening PAD1 Plugin (%d)"
-msgstr ""
-
-#: ../win32/gui/plugin.c:286
-#, c-format
-msgid "Error Opening PAD2 Plugin (%d)"
-msgstr ""
-
-#: ../win32/gui/plugin.c:309
-msgid "Error Closing CDR Plugin"
-msgstr ""
-
-#: ../win32/gui/plugin.c:311
-msgid "Error Closing GPU Plugin"
-msgstr ""
-
-#: ../win32/gui/plugin.c:313
-msgid "Error Closing SPU Plugin"
-msgstr ""
-
-#: ../win32/gui/plugin.c:315
-msgid "Error Closing PAD1 Plugin"
-msgstr ""
-
-#: ../win32/gui/plugin.c:317
-msgid "Error Closing PAD2 Plugin"
-msgstr ""
-
-#: ../win32/gui/plugin.c:335
-#, c-format
-msgid "CDRinit error: %d"
-msgstr ""
-
-#: ../win32/gui/plugin.c:337
-#, c-format
-msgid "GPUinit error: %d"
-msgstr ""
-
-#: ../win32/gui/plugin.c:339
-#, c-format
-msgid "SPUinit error: %d"
-msgstr ""
-
-#: ../win32/gui/plugin.c:341
-#, c-format
-msgid "PAD1init error: %d"
-msgstr ""
-
-#: ../win32/gui/plugin.c:343
-#, c-format
-msgid "PAD2init error: %d"
-msgstr ""
-
-#: ../win32/gui/plugin.c:346
-#, c-format
-msgid "NETinit error: %d"
-msgstr ""
-
 #: ../win32/gui/WndMain.c:76
 msgid "Arabic"
 msgstr ""
@@ -546,8 +406,8 @@ msgstr ""
 msgid "Greek"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:80 ../win32/gui/WndMain.c:1559
-#: ../win32/gui/WndMain.c:1561
+#: ../win32/gui/WndMain.c:80 ../win32/gui/WndMain.c:1558
+#: ../win32/gui/WndMain.c:1560
 msgid "English"
 msgstr ""
 
@@ -595,6 +455,26 @@ msgstr ""
 msgid "Korean"
 msgstr ""
 
+#: ../win32/gui/WndMain.c:259 ../win32/gui/plugin.c:107
+#, c-format
+msgid "*PCSX*: Loaded State %d"
+msgstr ""
+
+#: ../win32/gui/WndMain.c:260 ../win32/gui/plugin.c:108
+#, c-format
+msgid "*PCSX*: Error Loading State %d"
+msgstr ""
+
+#: ../win32/gui/WndMain.c:281 ../win32/gui/plugin.c:90
+#, c-format
+msgid "*PCSX*: Saved State %d"
+msgstr ""
+
+#: ../win32/gui/WndMain.c:282 ../win32/gui/plugin.c:91
+#, c-format
+msgid "*PCSX*: Error Saving State %d"
+msgstr ""
+
 #: ../win32/gui/WndMain.c:300 ../win32/gui/WndMain.c:352
 msgid "PCSX State Format"
 msgstr ""
@@ -633,11 +513,11 @@ msgstr ""
 msgid "Running BIOS is not supported with Internal HLE Bios."
 msgstr ""
 
-#: ../win32/gui/WndMain.c:664 ../gui/MemcardDlg.c:59
+#: ../win32/gui/WndMain.c:664 ../gui/MemcardDlg.c:62
 msgid "Title"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:670 ../gui/MemcardDlg.c:65
+#: ../win32/gui/WndMain.c:670 ../gui/MemcardDlg.c:68
 msgid "Status"
 msgstr ""
 
@@ -657,17 +537,17 @@ msgstr ""
 msgid "terminiting link block"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:867 ../gui/MemcardDlg.c:147 ../gui/MemcardDlg.c:244
+#: ../win32/gui/WndMain.c:867 ../gui/MemcardDlg.c:154 ../gui/MemcardDlg.c:252
 msgid "Deleted"
 msgstr ""
 
 #: ../win32/gui/WndMain.c:868 ../win32/gui/WndMain.c:871
-#: ../gui/MemcardDlg.c:149 ../gui/MemcardDlg.c:153 ../gui/MemcardDlg.c:246
-#: ../gui/MemcardDlg.c:250
+#: ../gui/MemcardDlg.c:156 ../gui/MemcardDlg.c:160 ../gui/MemcardDlg.c:254
+#: ../gui/MemcardDlg.c:258
 msgid "Free"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:870 ../gui/MemcardDlg.c:151 ../gui/MemcardDlg.c:248
+#: ../win32/gui/WndMain.c:870 ../gui/MemcardDlg.c:158 ../gui/MemcardDlg.c:256
 msgid "Used"
 msgstr ""
 
@@ -786,229 +666,350 @@ msgstr ""
 msgid "Psx System Type"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1323
+#: ../win32/gui/WndMain.c:1322
 msgid "Psx Mcd Format (*.mcr;*.mc;*.mem;*.vgs;*.mcd;*.gme;*.ddf)"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1328
+#: ../win32/gui/WndMain.c:1327
 msgid "Psx Memory Card (*.mcr;*.mc)"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1333
+#: ../win32/gui/WndMain.c:1332
 msgid "CVGS Memory Card (*.mem;*.vgs)"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1338
+#: ../win32/gui/WndMain.c:1337
 msgid "Bleem Memory Card (*.mcd)"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1343
+#: ../win32/gui/WndMain.c:1342
 msgid "DexDrive Memory Card (*.gme)"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1348
+#: ../win32/gui/WndMain.c:1347
 msgid "DataDeck Memory Card (*.ddf)"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1353 ../win32/gui/WndMain.c:1434 ../gui/Cheat.c:322
+#: ../win32/gui/WndMain.c:1352 ../win32/gui/WndMain.c:1433 ../gui/Cheat.c:321
 #: ../gui/Gtk2Gui.c:421 ../gui/Gtk2Gui.c:560
 msgid "All Files"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1392
+#: ../win32/gui/WndMain.c:1391
 msgid "Psx Exe Format"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1429
+#: ../win32/gui/WndMain.c:1428
 msgid "Psx Isos (*.iso;*.mdf;*.img;*.bin)"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1505
+#: ../win32/gui/WndMain.c:1504
 msgid "&File"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1506
+#: ../win32/gui/WndMain.c:1505
 msgid "E&xit"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1508
+#: ../win32/gui/WndMain.c:1507
 msgid "Run &EXE..."
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1509
+#: ../win32/gui/WndMain.c:1508
 msgid "Run &BIOS"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1510
+#: ../win32/gui/WndMain.c:1509
 msgid "Run &ISO..."
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1511
+#: ../win32/gui/WndMain.c:1510
 msgid "Run &CD"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1513
+#: ../win32/gui/WndMain.c:1512
 msgid "&Emulator"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1514
+#: ../win32/gui/WndMain.c:1513
 msgid "&States"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1516
+#: ../win32/gui/WndMain.c:1515
 msgid "S&witch ISO..."
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1518
+#: ../win32/gui/WndMain.c:1517
 msgid "Re&set"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1519
+#: ../win32/gui/WndMain.c:1518
 msgid "&Run"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1520
+#: ../win32/gui/WndMain.c:1519
 msgid "&Save"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1521
+#: ../win32/gui/WndMain.c:1520
 msgid "&Load"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1522 ../win32/gui/WndMain.c:1528
+#: ../win32/gui/WndMain.c:1521 ../win32/gui/WndMain.c:1527
 msgid "&Other..."
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1523 ../win32/gui/WndMain.c:1529
+#: ../win32/gui/WndMain.c:1522 ../win32/gui/WndMain.c:1528
 msgid "Slot &5"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1524 ../win32/gui/WndMain.c:1530
+#: ../win32/gui/WndMain.c:1523 ../win32/gui/WndMain.c:1529
 msgid "Slot &4"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1525 ../win32/gui/WndMain.c:1531
+#: ../win32/gui/WndMain.c:1524 ../win32/gui/WndMain.c:1530
 msgid "Slot &3"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1526 ../win32/gui/WndMain.c:1532
+#: ../win32/gui/WndMain.c:1525 ../win32/gui/WndMain.c:1531
 msgid "Slot &2"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1527 ../win32/gui/WndMain.c:1533
+#: ../win32/gui/WndMain.c:1526 ../win32/gui/WndMain.c:1532
 msgid "Slot &1"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1535
+#: ../win32/gui/WndMain.c:1534
 msgid "&Configuration"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1536
+#: ../win32/gui/WndMain.c:1535
 msgid "Cheat &Search..."
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1537
+#: ../win32/gui/WndMain.c:1536
 msgid "Ch&eat Code..."
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1540
+#: ../win32/gui/WndMain.c:1539
 msgid "&Language"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1565
+#: ../win32/gui/WndMain.c:1564
 msgid "&Memory cards..."
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1566
+#: ../win32/gui/WndMain.c:1565
 msgid "C&PU..."
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1568
+#: ../win32/gui/WndMain.c:1567
 msgid "&NetPlay..."
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1570
+#: ../win32/gui/WndMain.c:1569
 msgid "&Controllers..."
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1571
+#: ../win32/gui/WndMain.c:1570
 msgid "CD-&ROM..."
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1572
+#: ../win32/gui/WndMain.c:1571
 msgid "&Sound..."
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1573
+#: ../win32/gui/WndMain.c:1572
 msgid "&Graphics..."
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1575
+#: ../win32/gui/WndMain.c:1574
 msgid "&Plugins && Bios..."
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1577
+#: ../win32/gui/WndMain.c:1576
 msgid "&Help"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1578
+#: ../win32/gui/WndMain.c:1577
 msgid "&About..."
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1764
+#: ../win32/gui/WndMain.c:1756
 msgid "Pcsx Msg"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1767
+#: ../win32/gui/WndMain.c:1759
 msgid "Error Loading Symbol"
 msgstr ""
 
-#: ../gui/Cheat.c:118 ../gui/Cheat.c:203
+#: ../win32/gui/plugin.c:119
+#, c-format
+msgid "*PCSX*: Sio Irq Always Enabled"
+msgstr ""
+
+#: ../win32/gui/plugin.c:120
+#, c-format
+msgid "*PCSX*: Sio Irq Not Always Enabled"
+msgstr ""
+
+#: ../win32/gui/plugin.c:127
+#, c-format
+msgid "*PCSX*: Black&White Mdecs Only Enabled"
+msgstr ""
+
+#: ../win32/gui/plugin.c:128
+#, c-format
+msgid "*PCSX*: Black&White Mdecs Only Disabled"
+msgstr ""
+
+#: ../win32/gui/plugin.c:135
+#, c-format
+msgid "*PCSX*: Xa Enabled"
+msgstr ""
+
+#: ../win32/gui/plugin.c:136
+#, c-format
+msgid "*PCSX*: Xa Disabled"
+msgstr ""
+
+#: ../win32/gui/plugin.c:145
+msgid "*PCSX*: CdRom Case Opened"
+msgstr ""
+
+#: ../win32/gui/plugin.c:150
+msgid "*PCSX*: CdRom Case Closed"
+msgstr ""
+
+#: ../win32/gui/plugin.c:177
+msgid "Connecting..."
+msgstr ""
+
+#: ../win32/gui/plugin.c:179 ../win32/gui/plugin.c:186
+#, c-format
+msgid "Please wait while connecting... %c\n"
+msgstr ""
+
+#: ../win32/gui/plugin.c:214
+msgid "Error Opening CDR Plugin"
+msgstr ""
+
+#: ../win32/gui/plugin.c:277
+#, c-format
+msgid "Error Opening GPU Plugin (%d)"
+msgstr ""
+
+#: ../win32/gui/plugin.c:279
+#, c-format
+msgid "Error Opening SPU Plugin (%d)"
+msgstr ""
+
+#: ../win32/gui/plugin.c:282
+#, c-format
+msgid "Error Opening PAD1 Plugin (%d)"
+msgstr ""
+
+#: ../win32/gui/plugin.c:284
+#, c-format
+msgid "Error Opening PAD2 Plugin (%d)"
+msgstr ""
+
+#: ../win32/gui/plugin.c:307
+msgid "Error Closing CDR Plugin"
+msgstr ""
+
+#: ../win32/gui/plugin.c:309
+msgid "Error Closing GPU Plugin"
+msgstr ""
+
+#: ../win32/gui/plugin.c:311
+msgid "Error Closing SPU Plugin"
+msgstr ""
+
+#: ../win32/gui/plugin.c:313
+msgid "Error Closing PAD1 Plugin"
+msgstr ""
+
+#: ../win32/gui/plugin.c:315
+msgid "Error Closing PAD2 Plugin"
+msgstr ""
+
+#: ../win32/gui/plugin.c:333
+#, c-format
+msgid "CDRinit error: %d"
+msgstr ""
+
+#: ../win32/gui/plugin.c:335
+#, c-format
+msgid "GPUinit error: %d"
+msgstr ""
+
+#: ../win32/gui/plugin.c:337
+#, c-format
+msgid "SPUinit error: %d"
+msgstr ""
+
+#: ../win32/gui/plugin.c:339
+#, c-format
+msgid "PAD1init error: %d"
+msgstr ""
+
+#: ../win32/gui/plugin.c:341
+#, c-format
+msgid "PAD2init error: %d"
+msgstr ""
+
+#: ../win32/gui/plugin.c:344
+#, c-format
+msgid "NETinit error: %d"
+msgstr ""
+
+#: ../gui/Cheat.c:117 ../gui/Cheat.c:202
 msgid "Cheat Description:"
 msgstr ""
 
-#: ../gui/Cheat.c:307
+#: ../gui/Cheat.c:306
 msgid "Open Cheat File"
 msgstr ""
 
-#: ../gui/Cheat.c:317 ../gui/Cheat.c:357
+#: ../gui/Cheat.c:316 ../gui/Cheat.c:356
 msgid "PCSX Cheat Code Files (*.cht)"
 msgstr ""
 
-#: ../gui/Cheat.c:347
+#: ../gui/Cheat.c:346
 msgid "Save Cheat File"
 msgstr ""
 
-#: ../gui/Cheat.c:362
+#: ../gui/Cheat.c:361
 msgid "All Files (*.*)"
 msgstr ""
 
-#: ../gui/Cheat.c:395 ../gui/Cheat.c:1125 ../gui/ConfDlg.c:104
-#: ../gui/ConfDlg.c:200 ../gui/DebugMemory.c:256
+#: ../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 ""
 
-#: ../gui/Cheat.c:400
+#: ../gui/Cheat.c:399
 msgid "Cheat Codes"
 msgstr ""
 
-#: ../gui/Cheat.c:406
+#: ../gui/Cheat.c:405
 msgid "Enable"
 msgstr ""
 
-#: ../gui/Cheat.c:631
+#: ../gui/Cheat.c:630
 msgid "Freeze value"
 msgstr ""
 
-#: ../gui/Cheat.c:730
+#: ../gui/Cheat.c:729
 msgid "Modify value"
 msgstr ""
 
-#: ../gui/Cheat.c:738
+#: ../gui/Cheat.c:737
 msgid "New value:"
 msgstr ""
 
-#: ../gui/Cheat.c:1135
+#: ../gui/Cheat.c:1134
 msgid "Search Results"
 msgstr ""
 
@@ -1036,48 +1037,48 @@ msgstr ""
 msgid "Could not open directory: '%s'\n"
 msgstr ""
 
-#: ../gui/DebugMemory.c:102 ../data/pcsx.glade2:3270
+#: ../gui/DebugMemory.c:103 ../data/pcsx.glade2:3260
 msgid "Memory Dump"
 msgstr ""
 
-#: ../gui/DebugMemory.c:110
+#: ../gui/DebugMemory.c:111
 msgid "Start Address (Hexadecimal):"
 msgstr ""
 
-#: ../gui/DebugMemory.c:118
+#: ../gui/DebugMemory.c:121
 msgid "Length (Decimal):"
 msgstr ""
 
-#: ../gui/DebugMemory.c:144
+#: ../gui/DebugMemory.c:147
 msgid "Dump to File"
 msgstr ""
 
-#: ../gui/DebugMemory.c:159
+#: ../gui/DebugMemory.c:162
 #, c-format
 msgid "Error writing to %s!"
 msgstr ""
 
-#: ../gui/DebugMemory.c:177
+#: ../gui/DebugMemory.c:180
 msgid "Memory Patch"
 msgstr ""
 
-#: ../gui/DebugMemory.c:185 ../data/pcsx.glade2:3292
+#: ../gui/DebugMemory.c:188 ../data/pcsx.glade2:3282
 msgid "Address (Hexadecimal):"
 msgstr ""
 
-#: ../gui/DebugMemory.c:195
+#: ../gui/DebugMemory.c:198
 msgid "Value (Hexa string):"
 msgstr ""
 
-#: ../gui/DebugMemory.c:261
+#: ../gui/DebugMemory.c:264
 msgid "Memory Viewer"
 msgstr ""
 
-#: ../gui/DebugMemory.c:266
+#: ../gui/DebugMemory.c:269
 msgid "Address"
 msgstr ""
 
-#: ../gui/DebugMemory.c:284
+#: ../gui/DebugMemory.c:287
 msgid "Text"
 msgstr ""
 
@@ -1129,31 +1130,31 @@ msgstr ""
 msgid "PSX Image Files (*.bin, *.img, *.mdf, *.iso)"
 msgstr ""
 
-#: ../gui/Gtk2Gui.c:766
+#: ../gui/Gtk2Gui.c:770
 #, c-format
 msgid "Loaded state %s."
 msgstr ""
 
-#: ../gui/Gtk2Gui.c:770
+#: ../gui/Gtk2Gui.c:773
 #, c-format
 msgid "Error loading state %s!"
 msgstr ""
 
-#: ../gui/Gtk2Gui.c:781
+#: ../gui/Gtk2Gui.c:784
 #, c-format
 msgid "Saved state %s."
 msgstr ""
 
-#: ../gui/Gtk2Gui.c:783
+#: ../gui/Gtk2Gui.c:786
 #, c-format
 msgid "Error saving state %s!"
 msgstr ""
 
-#: ../gui/Gtk2Gui.c:816 ../gui/Gtk2Gui.c:843
+#: ../gui/Gtk2Gui.c:821 ../gui/Gtk2Gui.c:849
 msgid "Select State File"
 msgstr ""
 
-#: ../gui/Gtk2Gui.c:900
+#: ../gui/Gtk2Gui.c:905
 msgid "Notice"
 msgstr ""
 
@@ -1162,7 +1163,7 @@ msgstr ""
 msgid "Creating memory card: %s\n"
 msgstr ""
 
-#: ../gui/LnxMain.c:321
+#: ../gui/LnxMain.c:325
 msgid ""
 " pcsx [options] [file]\n"
 "\toptions:\n"
@@ -1176,146 +1177,146 @@ msgid ""
 "\tfile\t\tLoads file\n"
 msgstr ""
 
-#: ../gui/LnxMain.c:358
+#: ../gui/LnxMain.c:362
 #, c-format
 msgid ""
 "PCSX cannot be configured without using the GUI -- you should restart "
 "without -nogui.\n"
 msgstr ""
 
-#: ../gui/LnxMain.c:414
+#: ../gui/LnxMain.c:418
 msgid "Failed loading plugins!"
 msgstr ""
 
-#: ../gui/LnxMain.c:431
+#: ../gui/LnxMain.c:435
 #, c-format
 msgid "Could not load CD-ROM!\n"
 msgstr ""
 
-#: ../gui/LnxMain.c:467
+#: ../gui/LnxMain.c:466
 #, c-format
 msgid "PSX emulator couldn't be initialized.\n"
 msgstr ""
 
-#: ../gui/MemcardDlg.c:53
+#: ../gui/MemcardDlg.c:56
 msgid "Icon"
 msgstr ""
 
-#: ../gui/MemcardDlg.c:71
+#: ../gui/MemcardDlg.c:74
 msgid "ID"
 msgstr ""
 
-#: ../gui/MemcardDlg.c:77
+#: ../gui/MemcardDlg.c:80
 msgid "Name"
 msgstr ""
 
-#: ../gui/MemcardDlg.c:297
+#: ../gui/MemcardDlg.c:317
 msgid "Select A File"
 msgstr ""
 
-#: ../gui/MemcardDlg.c:338
+#: ../gui/MemcardDlg.c:358
 msgid "Format this Memory Card?"
 msgstr ""
 
-#: ../gui/MemcardDlg.c:340
+#: ../gui/MemcardDlg.c:360
 msgid ""
 "If you format the memory card, the card will be empty, and any existing data "
 "overwritten."
 msgstr ""
 
-#: ../gui/MemcardDlg.c:343
+#: ../gui/MemcardDlg.c:363
 msgid "Format card"
 msgstr ""
 
-#: ../gui/MemcardDlg.c:367
+#: ../gui/MemcardDlg.c:387
 msgid "Create a new Memory Card"
 msgstr ""
 
-#: ../gui/MemcardDlg.c:376
+#: ../gui/MemcardDlg.c:396
 msgid "New Memory Card.mcd"
 msgstr ""
 
-#: ../gui/MemcardDlg.c:477
+#: ../gui/MemcardDlg.c:497
 msgid "No free space on memory card"
 msgstr ""
 
-#: ../gui/MemcardDlg.c:478
+#: ../gui/MemcardDlg.c:498
 msgid ""
 "There are no free slots available on the target memory card. Please delete a "
 "slot first."
 msgstr ""
 
-#: ../gui/MemcardDlg.c:632
+#: ../gui/MemcardDlg.c:661
 msgid "Memory Card Manager"
 msgstr ""
 
-#: ../gui/Plugin.c:204 ../data/pcsx.glade2:1493
+#: ../gui/Plugin.c:203 ../data/pcsx.glade2:1493
 #, c-format
 msgid "SIO IRQ Always Enabled"
 msgstr ""
 
-#: ../gui/Plugin.c:205
+#: ../gui/Plugin.c:204
 #, c-format
 msgid "SIO IRQ Not Always Enabled"
 msgstr ""
 
-#: ../gui/Plugin.c:211
+#: ../gui/Plugin.c:210
 #, c-format
 msgid "Black & White Mdecs Only Enabled"
 msgstr ""
 
-#: ../gui/Plugin.c:212
+#: ../gui/Plugin.c:211
 #, c-format
 msgid "Black & White Mdecs Only Disabled"
 msgstr ""
 
-#: ../gui/Plugin.c:218
+#: ../gui/Plugin.c:217
 #, c-format
 msgid "XA Enabled"
 msgstr ""
 
-#: ../gui/Plugin.c:219
+#: ../gui/Plugin.c:218
 #, c-format
 msgid "XA Disabled"
 msgstr ""
 
-#: ../gui/Plugin.c:285
+#: ../gui/Plugin.c:280
 msgid "Error opening CD-ROM plugin!"
 msgstr ""
 
-#: ../gui/Plugin.c:287
+#: ../gui/Plugin.c:282
 msgid "Error opening SPU plugin!"
 msgstr ""
 
-#: ../gui/Plugin.c:290
+#: ../gui/Plugin.c:285
 msgid "Error opening GPU plugin!"
 msgstr ""
 
-#: ../gui/Plugin.c:292
+#: ../gui/Plugin.c:287
 msgid "Error opening Controller 1 plugin!"
 msgstr ""
 
-#: ../gui/Plugin.c:294
+#: ../gui/Plugin.c:289
 msgid "Error opening Controller 2 plugin!"
 msgstr ""
 
-#: ../gui/Plugin.c:374
+#: ../gui/Plugin.c:369
 msgid "Error closing CD-ROM plugin!"
 msgstr ""
 
-#: ../gui/Plugin.c:376
+#: ../gui/Plugin.c:371
 msgid "Error closing SPU plugin!"
 msgstr ""
 
-#: ../gui/Plugin.c:378
+#: ../gui/Plugin.c:373
 msgid "Error closing Controller 1 Plugin!"
 msgstr ""
 
-#: ../gui/Plugin.c:380
+#: ../gui/Plugin.c:375
 msgid "Error closing Controller 2 plugin!"
 msgstr ""
 
-#: ../gui/Plugin.c:382
+#: ../gui/Plugin.c:377
 msgid "Error closing GPU plugin!"
 msgstr ""
 
@@ -1324,17 +1325,17 @@ msgstr ""
 msgid "Loaded CD Image: %s"
 msgstr ""
 
-#: ../libpcsxcore/cheat.c:148
+#: ../libpcsxcore/cheat.c:147
 #, c-format
 msgid "Cheats loaded from: %s\n"
 msgstr ""
 
-#: ../libpcsxcore/cheat.c:180
+#: ../libpcsxcore/cheat.c:179
 #, c-format
 msgid "Cheats saved to: %s\n"
 msgstr ""
 
-#: ../libpcsxcore/cheat.c:323 ../libpcsxcore/cheat.c:444
+#: ../libpcsxcore/cheat.c:322 ../libpcsxcore/cheat.c:443
 msgid "(Untitled)"
 msgstr ""
 
@@ -1354,142 +1355,142 @@ msgstr ""
 msgid "Debugger stopped.\n"
 msgstr ""
 
-#: ../libpcsxcore/misc.c:392
+#: ../libpcsxcore/misc.c:388
 #, c-format
 msgid "Error opening file: %s.\n"
 msgstr ""
 
-#: ../libpcsxcore/misc.c:432
+#: ../libpcsxcore/misc.c:428
 #, c-format
 msgid "Unknown CPE opcode %02x at position %08x.\n"
 msgstr ""
 
-#: ../libpcsxcore/misc.c:439
+#: ../libpcsxcore/misc.c:435
 msgid "COFF files not supported.\n"
 msgstr ""
 
-#: ../libpcsxcore/misc.c:443
+#: ../libpcsxcore/misc.c:439
 msgid "This file does not appear to be a valid PSX file.\n"
 msgstr ""
 
-#: ../libpcsxcore/plugins.c:33
+#: ../libpcsxcore/plugins.c:138
 #, c-format
 msgid "Error loading %s: %s"
 msgstr ""
 
-#: ../libpcsxcore/plugins.c:162
+#: ../libpcsxcore/plugins.c:181
 #, c-format
 msgid "Could not load GPU plugin %s!"
 msgstr ""
 
-#: ../libpcsxcore/plugins.c:228
+#: ../libpcsxcore/plugins.c:251
 #, c-format
 msgid "Could not load CD-ROM plugin %s!"
 msgstr ""
 
-#: ../libpcsxcore/plugins.c:467
+#: ../libpcsxcore/plugins.c:297
 #, c-format
 msgid "Could not load SPU plugin %s!"
 msgstr ""
 
-#: ../libpcsxcore/plugins.c:616
+#: ../libpcsxcore/plugins.c:347
 #, c-format
 msgid "Could not load Controller 1 plugin %s!"
 msgstr ""
 
-#: ../libpcsxcore/plugins.c:670
+#: ../libpcsxcore/plugins.c:388
 #, c-format
 msgid "Could not load Controller 2 plugin %s!"
 msgstr ""
 
-#: ../libpcsxcore/plugins.c:713
+#: ../libpcsxcore/plugins.c:430
 #, c-format
 msgid "Could not load NetPlay plugin %s!"
 msgstr ""
 
-#: ../libpcsxcore/plugins.c:776
+#: ../libpcsxcore/plugins.c:491
 #, c-format
 msgid "Error initializing CD-ROM plugin: %d"
 msgstr ""
 
-#: ../libpcsxcore/plugins.c:778
+#: ../libpcsxcore/plugins.c:493
 #, c-format
 msgid "Error initializing GPU plugin: %d"
 msgstr ""
 
-#: ../libpcsxcore/plugins.c:780
+#: ../libpcsxcore/plugins.c:495
 #, c-format
 msgid "Error initializing SPU plugin: %d"
 msgstr ""
 
-#: ../libpcsxcore/plugins.c:782
+#: ../libpcsxcore/plugins.c:497
 #, c-format
 msgid "Error initializing Controller 1 plugin: %d"
 msgstr ""
 
-#: ../libpcsxcore/plugins.c:784
+#: ../libpcsxcore/plugins.c:499
 #, c-format
 msgid "Error initializing Controller 2 plugin: %d"
 msgstr ""
 
-#: ../libpcsxcore/plugins.c:788
+#: ../libpcsxcore/plugins.c:503
 #, c-format
 msgid "Error initializing NetPlay plugin: %d"
 msgstr ""
 
-#: ../libpcsxcore/plugins.c:791
+#: ../libpcsxcore/plugins.c:506
 msgid "Plugins loaded.\n"
 msgstr ""
 
-#: ../libpcsxcore/ppf.c:218
+#: ../libpcsxcore/ppf.c:216
 #, c-format
 msgid "Invalid PPF patch: %s.\n"
 msgstr ""
 
-#: ../libpcsxcore/ppf.c:294
+#: ../libpcsxcore/ppf.c:292
 #, c-format
 msgid "Unsupported PPF version (%d).\n"
 msgstr ""
 
-#: ../libpcsxcore/ppf.c:333
+#: ../libpcsxcore/ppf.c:331
 #, c-format
 msgid "Loaded PPF %d.0 patch: %s.\n"
 msgstr ""
 
-#: ../libpcsxcore/psxmem.c:69
+#: ../libpcsxcore/psxmem.c:76
 msgid "Error allocating memory!"
 msgstr ""
 
-#: ../libpcsxcore/psxmem.c:107
+#: ../libpcsxcore/psxmem.c:114
 #, c-format
 msgid "Could not open BIOS:\"%s\". Enabling HLE Bios!\n"
 msgstr ""
 
-#: ../libpcsxcore/r3000a.c:35
+#: ../libpcsxcore/r3000a.c:33
 #, c-format
 msgid "Running PCSX Version %s (%s).\n"
 msgstr ""
 
-#: ../libpcsxcore/sio.c:99
+#: ../libpcsxcore/sio.c:344
 msgid "Connection closed!\n"
 msgstr ""
 
-#: ../libpcsxcore/sio.c:322
+#: ../libpcsxcore/sio.c:370
 #, c-format
 msgid "No memory card value was specified - creating a default card %s\n"
 msgstr ""
 
-#: ../libpcsxcore/sio.c:326
+#: ../libpcsxcore/sio.c:374
 #, c-format
 msgid "The memory card %s doesn't exist - creating it\n"
 msgstr ""
 
-#: ../libpcsxcore/sio.c:342
+#: ../libpcsxcore/sio.c:390
 #, c-format
 msgid "Memory card %s failed to load!\n"
 msgstr ""
 
-#: ../libpcsxcore/sio.c:346
+#: ../libpcsxcore/sio.c:394
 #, c-format
 msgid "Loading memory card %s\n"
 msgstr ""
@@ -1994,15 +1995,15 @@ msgstr ""
 msgid "<b>NetPlay</b>"
 msgstr ""
 
-#: ../data/pcsx.glade2:1897 ../data/pcsx.glade2:2295
+#: ../data/pcsx.glade2:1896 ../data/pcsx.glade2:2296
 msgid "New"
 msgstr ""
 
-#: ../data/pcsx.glade2:1947 ../data/pcsx.glade2:2345
+#: ../data/pcsx.glade2:1946 ../data/pcsx.glade2:2346
 msgid "Format"
 msgstr ""
 
-#: ../data/pcsx.glade2:1997 ../data/pcsx.glade2:2395
+#: ../data/pcsx.glade2:1996 ../data/pcsx.glade2:2396
 msgid "Un/Delete"
 msgstr ""
 
@@ -2010,26 +2011,26 @@ msgstr ""
 msgid "<b>Memory Card 1</b>"
 msgstr ""
 
-#: ../data/pcsx.glade2:2151 ../data/pcsx.glade2:2201 ../data/pcsx.glade2:3094
+#: ../data/pcsx.glade2:2151 ../data/pcsx.glade2:2201 ../data/pcsx.glade2:3084
 msgid "Copy"
 msgstr ""
 
-#: ../data/pcsx.glade2:2488
+#: ../data/pcsx.glade2:2490
 msgid "<b>Memory Card 2</b>"
 msgstr ""
 
-#: ../data/pcsx.glade2:2552
+#: ../data/pcsx.glade2:2554
 msgid ""
 "(C) 1999-2003 PCSX Development Team\n"
 "(C) 2005-2009 PCSX-df Team\n"
 "(C) 2009-2010 PCSX-Reloaded Team"
 msgstr ""
 
-#: ../data/pcsx.glade2:2555
+#: ../data/pcsx.glade2:2557
 msgid "A PlayStation emulator."
 msgstr ""
 
-#: ../data/pcsx.glade2:2558
+#: ../data/pcsx.glade2:2560
 msgid ""
 "This program is free software; you can redistribute it\n"
 "and/or modify it under the terms of the GNU General\n"
@@ -2048,22 +2049,22 @@ msgid ""
 "the Free Software Foundation, Inc."
 msgstr ""
 
-#: ../data/pcsx.glade2:2600
+#: ../data/pcsx.glade2:2590
 msgid "translator-credits"
 msgstr ""
 
-#: ../data/pcsx.glade2:2662
+#: ../data/pcsx.glade2:2652
 msgid "<b>Cheat Codes</b>"
 msgstr ""
 
-#: ../data/pcsx.glade2:2828
+#: ../data/pcsx.glade2:2818
 msgid ""
 "8-bit\n"
 "16-bit\n"
 "32-bit"
 msgstr ""
 
-#: ../data/pcsx.glade2:2891
+#: ../data/pcsx.glade2:2881
 msgid ""
 "Equal Value\n"
 "Not Equal Value\n"
@@ -2076,33 +2077,33 @@ msgid ""
 "No Change"
 msgstr ""
 
-#: ../data/pcsx.glade2:2923
+#: ../data/pcsx.glade2:2913
 msgid ""
 "Decimal\n"
 "Hexadecimal"
 msgstr ""
 
-#: ../data/pcsx.glade2:3127
+#: ../data/pcsx.glade2:3117
 msgid "label_resultsfound"
 msgstr ""
 
-#: ../data/pcsx.glade2:3162
+#: ../data/pcsx.glade2:3152
 msgid "Search"
 msgstr ""
 
-#: ../data/pcsx.glade2:3198
+#: ../data/pcsx.glade2:3188
 msgid "Restart"
 msgstr ""
 
-#: ../data/pcsx.glade2:3227
+#: ../data/pcsx.glade2:3217
 msgid "<b>Cheat Search</b>"
 msgstr ""
 
-#: ../data/pcsx.glade2:3384
+#: ../data/pcsx.glade2:3374
 msgid "Raw Dump..."
 msgstr ""
 
-#: ../data/pcsx.glade2:3419
+#: ../data/pcsx.glade2:3409
 msgid "Patch Memory..."
 msgstr ""
 
@@ -2842,3 +2843,73 @@ msgstr ""
 #: ../plugins/dfinput/dfinput.glade2:427
 msgid "Multi-Threaded (Recommended)"
 msgstr ""
+
+#: ../plugins/dfnet/dfnet.c:23
+msgid "Socket Driver"
+msgstr ""
+
+#: ../plugins/dfnet/dfnet.c:172
+#, c-format
+msgid "error connecting to %s: %s\n"
+msgstr ""
+
+#: ../plugins/dfnet/dfnet.c:197
+msgid "Error allocating memory!\n"
+msgstr ""
+
+#: ../plugins/dfnet/gui.c:38
+msgid "Nothing to configure"
+msgstr ""
+
+#: ../plugins/dfnet/gui.c:57
+#, c-format
+msgid "IP %s"
+msgstr ""
+
+#: ../plugins/dfnet/gui.c:127
+msgid "Waiting for connection..."
+msgstr ""
+
+#: ../plugins/dfnet/gui.c:130
+msgid "The Client should now Start a Connection, waiting..."
+msgstr ""
+
+#: ../plugins/dfnet/dfnet.glade2:23
+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"
+"\n"
+"If you selected Client please enter the IP address the Server gave to you in "
+"the IP Address Control."
+msgstr ""
+
+#: ../plugins/dfnet/dfnet.glade2:63
+msgid "Copy PC IP to Clipboard"
+msgstr ""
+
+#: ../plugins/dfnet/dfnet.glade2:93
+msgid "Server (Player1)"
+msgstr ""
+
+#: ../plugins/dfnet/dfnet.glade2:103
+msgid "Client (Player2)"
+msgstr ""
+
+#: ../plugins/dfnet/dfnet.glade2:129
+msgid ""
+"Do not change if not necessary (remember it must be changed on both sides)."
+msgstr ""
+
+#: ../plugins/dfnet/dfnet.glade2:142
+msgid "Port Number"
+msgstr ""
+
+#: ../plugins/dfnet/dfnet.glade2:201
+msgid "Start Game"
+msgstr ""
+
+#: ../plugins/dfnet/dfnet.glade2:239
+msgid "Play Offline"
+msgstr ""
diff --git a/po/pt_BR.po b/po/pt_BR.po
index f3ba5062..e97a2c92 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: \n"
-"POT-Creation-Date: 2010-04-11 20:17+0800\n"
+"POT-Creation-Date: 2010-05-13 11:15+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"
@@ -57,8 +57,8 @@ msgid "About"
 msgstr "Sobre"
 
 #: ../win32/gui/AboutDlg.c:48 ../win32/gui/AboutDlg.c:52
-#: ../win32/gui/CheatDlg.c:70 ../win32/gui/CheatDlg.c:120
-#: ../win32/gui/ConfigurePlugins.c:470 ../win32/gui/ConfigurePlugins.c:601
+#: ../win32/gui/CheatDlg.c:69 ../win32/gui/CheatDlg.c:119
+#: ../win32/gui/ConfigurePlugins.c:483 ../win32/gui/ConfigurePlugins.c:614
 #: ../win32/gui/WndMain.c:966 ../win32/gui/WndMain.c:1202
 #: ../plugins/peopsxgl/gpucfg/interface.c:130
 #: ../plugins/peopsxgl/gpucfg/interface.c:843
@@ -69,482 +69,342 @@ msgstr "OK"
 msgid "PCSX EMU\n"
 msgstr "EMULADOR PCSX\n"
 
-#: ../win32/gui/CheatDlg.c:52 ../win32/gui/CheatDlg.c:224
-#: ../win32/gui/CheatDlg.c:271
+#: ../win32/gui/CheatDlg.c:51 ../win32/gui/CheatDlg.c:223
+#: ../win32/gui/CheatDlg.c:270
 msgid "Yes"
 msgstr "Sim"
 
-#: ../win32/gui/CheatDlg.c:52 ../win32/gui/CheatDlg.c:224
-#: ../win32/gui/CheatDlg.c:271
+#: ../win32/gui/CheatDlg.c:51 ../win32/gui/CheatDlg.c:223
+#: ../win32/gui/CheatDlg.c:270
 msgid "No"
 msgstr "Não"
 
-#: ../win32/gui/CheatDlg.c:67 ../gui/Cheat.c:195
+#: ../win32/gui/CheatDlg.c:66 ../gui/Cheat.c:194
 msgid "Edit Cheat"
 msgstr "Editar Trapaça"
 
-#: ../win32/gui/CheatDlg.c:68 ../win32/gui/CheatDlg.c:118 ../gui/Cheat.c:637
+#: ../win32/gui/CheatDlg.c:67 ../win32/gui/CheatDlg.c:117 ../gui/Cheat.c:636
 msgid "Description:"
 msgstr "Descrição:"
 
-#: ../win32/gui/CheatDlg.c:69 ../win32/gui/CheatDlg.c:119 ../gui/Cheat.c:126
-#: ../gui/Cheat.c:212
+#: ../win32/gui/CheatDlg.c:68 ../win32/gui/CheatDlg.c:118 ../gui/Cheat.c:125
+#: ../gui/Cheat.c:211
 msgid "Cheat Code:"
 msgstr "Código de Trapaça:"
 
-#: ../win32/gui/CheatDlg.c:71 ../win32/gui/CheatDlg.c:121
-#: ../win32/gui/ConfigurePlugins.c:471 ../win32/gui/ConfigurePlugins.c:602
+#: ../win32/gui/CheatDlg.c:70 ../win32/gui/CheatDlg.c:120
+#: ../win32/gui/ConfigurePlugins.c:484 ../win32/gui/ConfigurePlugins.c:615
 #: ../win32/gui/WndMain.c:967 ../win32/gui/WndMain.c:1203
 #: ../plugins/peopsxgl/gpucfg/interface.c:338
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../win32/gui/CheatDlg.c:92 ../win32/gui/CheatDlg.c:133 ../gui/Cheat.c:156
-#: ../gui/Cheat.c:252
+#: ../win32/gui/CheatDlg.c:91 ../win32/gui/CheatDlg.c:132 ../gui/Cheat.c:155
+#: ../gui/Cheat.c:251
 msgid "Invalid cheat code!"
 msgstr "Código de trapaça inválido!"
 
-#: ../win32/gui/CheatDlg.c:117 ../gui/Cheat.c:110
+#: ../win32/gui/CheatDlg.c:116 ../gui/Cheat.c:109
 msgid "Add New Cheat"
 msgstr "Adicionar nova Trapaça"
 
-#: ../win32/gui/CheatDlg.c:167 ../data/pcsx.glade2:2622
+#: ../win32/gui/CheatDlg.c:166 ../data/pcsx.glade2:2612
 msgid "Edit Cheat Codes"
 msgstr "Editar Códigos de Trapaça"
 
-#: ../win32/gui/CheatDlg.c:169
+#: ../win32/gui/CheatDlg.c:168
 msgid "&Add Code"
 msgstr "&Adicionar código"
 
-#: ../win32/gui/CheatDlg.c:170
+#: ../win32/gui/CheatDlg.c:169
 msgid "&Edit Code"
 msgstr "&Editar trapaça"
 
-#: ../win32/gui/CheatDlg.c:171
+#: ../win32/gui/CheatDlg.c:170
 msgid "&Remove Code"
 msgstr "&Remover trapaça"
 
-#: ../win32/gui/CheatDlg.c:172
+#: ../win32/gui/CheatDlg.c:171
 msgid "&Enable/Disable"
 msgstr "Ativar ou desativar"
 
-#: ../win32/gui/CheatDlg.c:173
+#: ../win32/gui/CheatDlg.c:172
 msgid "&Load..."
 msgstr "&Carregar..."
 
-#: ../win32/gui/CheatDlg.c:174
+#: ../win32/gui/CheatDlg.c:173
 msgid "&Save As..."
 msgstr "&Salvar como..."
 
-#: ../win32/gui/CheatDlg.c:175
+#: ../win32/gui/CheatDlg.c:174
 msgid "&Close"
 msgstr "&Fechar"
 
-#: ../win32/gui/CheatDlg.c:186 ../gui/Cheat.c:414
+#: ../win32/gui/CheatDlg.c:185 ../gui/Cheat.c:413
 msgid "Description"
 msgstr "Descrição"
 
-#: ../win32/gui/CheatDlg.c:191
+#: ../win32/gui/CheatDlg.c:190
 msgid "Enabled"
 msgstr "Ligado"
 
-#: ../win32/gui/CheatDlg.c:283 ../win32/gui/CheatDlg.c:312
+#: ../win32/gui/CheatDlg.c:282 ../win32/gui/CheatDlg.c:311
 msgid "PCSX Cheat Code Files"
 msgstr "Arquivos de trapaça do PCSX"
 
-#: ../win32/gui/CheatDlg.c:403
+#: ../win32/gui/CheatDlg.c:402
 msgid "Equal Value"
 msgstr "Valores igual à"
 
-#: ../win32/gui/CheatDlg.c:404
+#: ../win32/gui/CheatDlg.c:403
 msgid "Not Equal Value"
 msgstr "Valores diferente de"
 
-#: ../win32/gui/CheatDlg.c:405
+#: ../win32/gui/CheatDlg.c:404
 msgid "Range"
 msgstr "Intervalo"
 
-#: ../win32/gui/CheatDlg.c:408
+#: ../win32/gui/CheatDlg.c:407
 msgid "Increased By"
 msgstr "Somado por"
 
-#: ../win32/gui/CheatDlg.c:409
+#: ../win32/gui/CheatDlg.c:408
 msgid "Decreased By"
 msgstr "Subtraído por"
 
-#: ../win32/gui/CheatDlg.c:410
+#: ../win32/gui/CheatDlg.c:409
 msgid "Increased"
 msgstr "Maiores"
 
-#: ../win32/gui/CheatDlg.c:411
+#: ../win32/gui/CheatDlg.c:410
 msgid "Decreased"
 msgstr "Menores"
 
-#: ../win32/gui/CheatDlg.c:412
+#: ../win32/gui/CheatDlg.c:411
 msgid "Different"
 msgstr "Diferentes"
 
-#: ../win32/gui/CheatDlg.c:413
+#: ../win32/gui/CheatDlg.c:412
 msgid "No Change"
 msgstr "Sem mudanças"
 
-#: ../win32/gui/CheatDlg.c:449 ../gui/Cheat.c:586
+#: ../win32/gui/CheatDlg.c:448 ../gui/Cheat.c:585
 msgid "Enter the values and start your search."
 msgstr "Digite algum número para começar a pesquisa."
 
-#: ../win32/gui/CheatDlg.c:454
+#: ../win32/gui/CheatDlg.c:453
 msgid "No addresses found."
 msgstr "Nenhum endereço encontrado com esse número."
 
-#: ../win32/gui/CheatDlg.c:458 ../gui/Cheat.c:544
+#: ../win32/gui/CheatDlg.c:457 ../gui/Cheat.c:543
 msgid "Too many addresses found."
 msgstr "Muitos endereços encontrados com esse número, refine a pesquisa."
 
-#: ../win32/gui/CheatDlg.c:467 ../gui/Cheat.c:553
+#: ../win32/gui/CheatDlg.c:466 ../gui/Cheat.c:552
 #, c-format
 msgid "%.8X    Current: %u (%.2X), Previous: %u (%.2X)"
 msgstr "%.8X    Atual: %u (%.2X), Anterior: %u (%.2X)"
 
-#: ../win32/gui/CheatDlg.c:472 ../gui/Cheat.c:558
+#: ../win32/gui/CheatDlg.c:471 ../gui/Cheat.c:557
 #, c-format
 msgid "%.8X    Current: %u (%.4X), Previous: %u (%.4X)"
 msgstr "%.8X    Atual: %u (%.4X), Anterior: %u (%.4X)"
 
-#: ../win32/gui/CheatDlg.c:477 ../gui/Cheat.c:563
+#: ../win32/gui/CheatDlg.c:476 ../gui/Cheat.c:562
 #, c-format
 msgid "%.8X    Current: %u (%.8X), Previous: %u (%.8X)"
 msgstr "%.8X    Atual: %u (%.8X), Anterior: %u (%.8X)"
 
-#: ../win32/gui/CheatDlg.c:493 ../gui/Cheat.c:578
+#: ../win32/gui/CheatDlg.c:492 ../gui/Cheat.c:577
 #, c-format
 msgid "Founded Addresses: %d"
 msgstr "Endereços com o número: %d"
 
-#: ../win32/gui/CheatDlg.c:505 ../data/pcsx.glade2:3022
+#: ../win32/gui/CheatDlg.c:504 ../data/pcsx.glade2:3012
 msgid "Freeze"
 msgstr "Parar"
 
-#: ../win32/gui/CheatDlg.c:506 ../win32/gui/CheatDlg.c:597
+#: ../win32/gui/CheatDlg.c:505 ../win32/gui/CheatDlg.c:596
 msgid "Address:"
 msgstr "Endereço:"
 
-#: ../win32/gui/CheatDlg.c:507 ../win32/gui/CheatDlg.c:598
-#: ../win32/gui/CheatDlg.c:683 ../gui/Cheat.c:648 ../data/pcsx.glade2:2865
+#: ../win32/gui/CheatDlg.c:506 ../win32/gui/CheatDlg.c:597
+#: ../win32/gui/CheatDlg.c:682 ../gui/Cheat.c:647 ../data/pcsx.glade2:2855
 msgid "Value:"
 msgstr "Valor:"
 
-#: ../win32/gui/CheatDlg.c:567
+#: ../win32/gui/CheatDlg.c:566
 #, c-format
 msgid "Freeze %.8X"
 msgstr "Parar %.8X"
 
-#: ../win32/gui/CheatDlg.c:596 ../data/pcsx.glade2:3058
+#: ../win32/gui/CheatDlg.c:595 ../data/pcsx.glade2:3048
 msgid "Modify"
 msgstr "Modificar"
 
-#: ../win32/gui/CheatDlg.c:679 ../gui/Cheat.c:1130 ../data/pcsx.glade2:2793
+#: ../win32/gui/CheatDlg.c:678 ../gui/Cheat.c:1129 ../data/pcsx.glade2:2783
 msgid "Cheat Search"
 msgstr "Procurar por trapaça"
 
-#: ../win32/gui/CheatDlg.c:681 ../data/pcsx.glade2:2843
+#: ../win32/gui/CheatDlg.c:680 ../data/pcsx.glade2:2833
 msgid "Search For:"
 msgstr "Buscar por:"
 
-#: ../win32/gui/CheatDlg.c:682 ../data/pcsx.glade2:2853
+#: ../win32/gui/CheatDlg.c:681 ../data/pcsx.glade2:2843
 msgid "Data Type:"
 msgstr "Tipo de dados:"
 
-#: ../win32/gui/CheatDlg.c:684 ../data/pcsx.glade2:2877
+#: ../win32/gui/CheatDlg.c:683 ../data/pcsx.glade2:2867
 msgid "Data Base:"
 msgstr "Banco de dados:"
 
-#: ../win32/gui/CheatDlg.c:685 ../data/pcsx.glade2:2937
+#: ../win32/gui/CheatDlg.c:684 ../data/pcsx.glade2:2927
 msgid "To:"
 msgstr "Para:"
 
-#: ../win32/gui/CheatDlg.c:686
+#: ../win32/gui/CheatDlg.c:685
 msgid "&Freeze"
 msgstr "&Parar"
 
-#: ../win32/gui/CheatDlg.c:687
+#: ../win32/gui/CheatDlg.c:686
 msgid "&Modify"
 msgstr "&Modificar"
 
-#: ../win32/gui/CheatDlg.c:688
+#: ../win32/gui/CheatDlg.c:687
 msgid "&Copy"
 msgstr "&Copiar"
 
-#: ../win32/gui/CheatDlg.c:689
+#: ../win32/gui/CheatDlg.c:688
 msgid "&Search"
 msgstr "&Buscar"
 
-#: ../win32/gui/CheatDlg.c:690
+#: ../win32/gui/CheatDlg.c:689
 msgid "&New Search"
 msgstr "&Nova busca"
 
-#: ../win32/gui/CheatDlg.c:691
+#: ../win32/gui/CheatDlg.c:690
 msgid "C&lose"
 msgstr "Fe&char"
 
-#: ../win32/gui/CheatDlg.c:693
+#: ../win32/gui/CheatDlg.c:692
 msgid "8-bit"
 msgstr "8-bit"
 
-#: ../win32/gui/CheatDlg.c:694
+#: ../win32/gui/CheatDlg.c:693
 msgid "16-bit"
 msgstr "16-bit"
 
-#: ../win32/gui/CheatDlg.c:695
+#: ../win32/gui/CheatDlg.c:694
 msgid "32-bit"
 msgstr "32-bit"
 
-#: ../win32/gui/CheatDlg.c:696
+#: ../win32/gui/CheatDlg.c:695
 msgid "Decimal"
 msgstr "Decimal"
 
-#: ../win32/gui/CheatDlg.c:697
+#: ../win32/gui/CheatDlg.c:696
 msgid "Hexadecimal"
 msgstr "Hexadecimal"
 
-#: ../win32/gui/ConfigurePlugins.c:206 ../gui/ConfDlg.c:675
+#: ../win32/gui/ConfigurePlugins.c:219 ../gui/ConfDlg.c:675
 msgid "Internal HLE Bios"
 msgstr "BIOS HLE interna"
 
-#: ../win32/gui/ConfigurePlugins.c:292
+#: ../win32/gui/ConfigurePlugins.c:305
 msgid "Configuration not OK!"
 msgstr "Não configurou corretamente!"
 
-#: ../win32/gui/ConfigurePlugins.c:292 ../gui/Cheat.c:156 ../gui/Cheat.c:252
-#: ../gui/LnxMain.c:414
+#: ../win32/gui/ConfigurePlugins.c:305 ../gui/Cheat.c:155 ../gui/Cheat.c:251
+#: ../gui/LnxMain.c:418
 msgid "Error"
 msgstr "Erro"
 
-#: ../win32/gui/ConfigurePlugins.c:393
+#: ../win32/gui/ConfigurePlugins.c:406
 msgid "This plugin reports that should work correctly"
 msgstr "Esta extensão informou que deve funcionar corretamente."
 
-#: ../win32/gui/ConfigurePlugins.c:394
+#: ../win32/gui/ConfigurePlugins.c:407
 msgid "This plugin reports that should not work correctly"
 msgstr "Esta extensão informou que não deve funcionar corretamente."
 
-#: ../win32/gui/ConfigurePlugins.c:450
+#: ../win32/gui/ConfigurePlugins.c:463
 msgid "Select Plugins Directory"
 msgstr "Escolha o diretório das extensões"
 
-#: ../win32/gui/ConfigurePlugins.c:459
+#: ../win32/gui/ConfigurePlugins.c:472
 msgid "Select Bios Directory"
 msgstr "Escolha o diretório da BIOS"
 
-#: ../win32/gui/ConfigurePlugins.c:468
+#: ../win32/gui/ConfigurePlugins.c:481
 msgid "Configuration"
 msgstr "Configuração"
 
-#: ../win32/gui/ConfigurePlugins.c:472
+#: ../win32/gui/ConfigurePlugins.c:485
 msgid "Graphics"
 msgstr "Gráficos"
 
-#: ../win32/gui/ConfigurePlugins.c:473
+#: ../win32/gui/ConfigurePlugins.c:486
 msgid "First Controller"
 msgstr "Controle 1"
 
-#: ../win32/gui/ConfigurePlugins.c:474
+#: ../win32/gui/ConfigurePlugins.c:487
 msgid "Second Controller"
 msgstr "Controle 2"
 
-#: ../win32/gui/ConfigurePlugins.c:475
+#: ../win32/gui/ConfigurePlugins.c:488
 msgid "Sound"
 msgstr "Áudio"
 
-#: ../win32/gui/ConfigurePlugins.c:476
+#: ../win32/gui/ConfigurePlugins.c:489
 msgid "Cdrom"
 msgstr "CDROM"
 
-#: ../win32/gui/ConfigurePlugins.c:477
+#: ../win32/gui/ConfigurePlugins.c:490
 msgid "Bios"
 msgstr "BIOS"
 
-#: ../win32/gui/ConfigurePlugins.c:478
+#: ../win32/gui/ConfigurePlugins.c:491
 msgid "Set Bios Directory"
 msgstr "Escolher o diretório da BIOS"
 
-#: ../win32/gui/ConfigurePlugins.c:479
+#: ../win32/gui/ConfigurePlugins.c:492
 msgid "Set Plugins Directory"
 msgstr "Escolher o diretório das extensões"
 
-#: ../win32/gui/ConfigurePlugins.c:480 ../win32/gui/ConfigurePlugins.c:483
-#: ../win32/gui/ConfigurePlugins.c:486 ../win32/gui/ConfigurePlugins.c:489
-#: ../win32/gui/ConfigurePlugins.c:492 ../win32/gui/ConfigurePlugins.c:604
+#: ../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 "Configurar..."
 
-#: ../win32/gui/ConfigurePlugins.c:481 ../win32/gui/ConfigurePlugins.c:484
-#: ../win32/gui/ConfigurePlugins.c:487 ../win32/gui/ConfigurePlugins.c:490
-#: ../win32/gui/ConfigurePlugins.c:493 ../win32/gui/ConfigurePlugins.c:605
+#: ../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 "Testar..."
 
-#: ../win32/gui/ConfigurePlugins.c:482 ../win32/gui/ConfigurePlugins.c:485
-#: ../win32/gui/ConfigurePlugins.c:488 ../win32/gui/ConfigurePlugins.c:491
-#: ../win32/gui/ConfigurePlugins.c:494 ../win32/gui/ConfigurePlugins.c:606
+#: ../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 "Sobre..."
 
-#: ../win32/gui/ConfigurePlugins.c:599
+#: ../win32/gui/ConfigurePlugins.c:612
 msgid "NetPlay Configuration"
 msgstr "Configuração do jogo em rede"
 
-#: ../win32/gui/ConfigurePlugins.c:603
+#: ../win32/gui/ConfigurePlugins.c:616 ../plugins/dfnet/gui.c:30
+#: ../plugins/dfnet/gui.c:74
 msgid "NetPlay"
 msgstr "Jogo em rede"
 
-#: ../win32/gui/ConfigurePlugins.c:607
+#: ../win32/gui/ConfigurePlugins.c:620
 msgid ""
 "Note: The NetPlay Plugin Directory should be the same as the other Plugins."
 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:90 ../win32/gui/WndMain.c:281
-#, c-format
-msgid "*PCSX*: Saved State %d"
-msgstr "PCSX: Estado \"%d\" salvo."
-
-#: ../win32/gui/plugin.c:91 ../win32/gui/WndMain.c:282
-#, c-format
-msgid "*PCSX*: Error Saving State %d"
-msgstr "PCSX: Erro ao salvar o estado \"%d\"!"
-
-#: ../win32/gui/plugin.c:107 ../win32/gui/WndMain.c:259
-#, c-format
-msgid "*PCSX*: Loaded State %d"
-msgstr "PCSX: Estado \"%d\" carregado."
-
-#: ../win32/gui/plugin.c:108 ../win32/gui/WndMain.c:260
-#, c-format
-msgid "*PCSX*: Error Loading State %d"
-msgstr "PCSX: Erro ao carregar o estado \"%d\"!"
-
-#: ../win32/gui/plugin.c:119
-#, c-format
-msgid "*PCSX*: Sio Irq Always Enabled"
-msgstr "PCSX: IRQ SIO sempre ativada."
-
-#: ../win32/gui/plugin.c:120
-#, c-format
-msgid "*PCSX*: Sio Irq Not Always Enabled"
-msgstr "PCSX: IRQ SIO nem sempre ativada."
-
-#: ../win32/gui/plugin.c:127
-#, c-format
-msgid "*PCSX*: Black&White Mdecs Only Enabled"
-msgstr "PCSX: Mdecs apenas em preto e branco."
-
-#: ../win32/gui/plugin.c:128
-#, c-format
-msgid "*PCSX*: Black&White Mdecs Only Disabled"
-msgstr "PCSX: Mdecs coloridas."
-
-#: ../win32/gui/plugin.c:135
-#, c-format
-msgid "*PCSX*: Xa Enabled"
-msgstr "PCSX: XA Ligado."
-
-#: ../win32/gui/plugin.c:136
-#, c-format
-msgid "*PCSX*: Xa Disabled"
-msgstr "PCSX: XA Desligado."
-
-#: ../win32/gui/plugin.c:145
-msgid "*PCSX*: CdRom Case Opened"
-msgstr "PCSX: Bandeja do CDROM aberta."
-
-#: ../win32/gui/plugin.c:150
-msgid "*PCSX*: CdRom Case Closed"
-msgstr "PCSX: Bandeja do CDROM fechada."
-
-#: ../win32/gui/plugin.c:177
-msgid "Connecting..."
-msgstr "Conectando..."
-
-#: ../win32/gui/plugin.c:179 ../win32/gui/plugin.c:186
-#, c-format
-msgid "Please wait while connecting... %c\n"
-msgstr "Por favor, espere enquanto o emulador se conecta... %c\n"
-
-#: ../win32/gui/plugin.c:216
-msgid "Error Opening CDR Plugin"
-msgstr "Erro ao abrir a extensão de CDROM!"
-
-#: ../win32/gui/plugin.c:279
-#, c-format
-msgid "Error Opening GPU Plugin (%d)"
-msgstr "Erro ao abrir a extensão de GPU (%d)!"
-
-#: ../win32/gui/plugin.c:281
-#, c-format
-msgid "Error Opening SPU Plugin (%d)"
-msgstr "Erro ao abrir a extensão de SPU (%d)!"
-
-#: ../win32/gui/plugin.c:284
-#, c-format
-msgid "Error Opening PAD1 Plugin (%d)"
-msgstr "Erro ao abrir a extensão do controle 1 (%d)!"
-
-#: ../win32/gui/plugin.c:286
-#, c-format
-msgid "Error Opening PAD2 Plugin (%d)"
-msgstr "Erro ao abrir a extensão do controle 2 (%d)!"
-
-#: ../win32/gui/plugin.c:309
-msgid "Error Closing CDR Plugin"
-msgstr "Erro ao fechar a extensão de CDROM!"
-
-#: ../win32/gui/plugin.c:311
-msgid "Error Closing GPU Plugin"
-msgstr "Erro ao fechar a extensão de GPU!"
-
-#: ../win32/gui/plugin.c:313
-msgid "Error Closing SPU Plugin"
-msgstr "Erro ao fechar a extensão de SPU!"
-
-#: ../win32/gui/plugin.c:315
-msgid "Error Closing PAD1 Plugin"
-msgstr "Erro ao fechar a extensão do controle 1!"
-
-#: ../win32/gui/plugin.c:317
-msgid "Error Closing PAD2 Plugin"
-msgstr "Erro ao fechar a extensão do controle 2!"
-
-#: ../win32/gui/plugin.c:335
-#, c-format
-msgid "CDRinit error: %d"
-msgstr "Erro ao iniciar o CDROM: %d"
-
-#: ../win32/gui/plugin.c:337
-#, c-format
-msgid "GPUinit error: %d"
-msgstr "Erro ao iniciar a GPU: %d"
-
-#: ../win32/gui/plugin.c:339
-#, c-format
-msgid "SPUinit error: %d"
-msgstr "Erro ao iniciar a SPU: %d"
-
-#: ../win32/gui/plugin.c:341
-#, c-format
-msgid "PAD1init error: %d"
-msgstr "Erro ao iniciar o controle 1: %d"
-
-#: ../win32/gui/plugin.c:343
-#, c-format
-msgid "PAD2init error: %d"
-msgstr "Erro ao iniciar o controle 2: %d"
-
-#: ../win32/gui/plugin.c:346
-#, c-format
-msgid "NETinit error: %d"
-msgstr "Erro ao iniciar a rede: %d"
-
 #: ../win32/gui/WndMain.c:76
 msgid "Arabic"
 msgstr "Arábico"
@@ -561,8 +421,8 @@ msgstr "Alemão"
 msgid "Greek"
 msgstr "Grego"
 
-#: ../win32/gui/WndMain.c:80 ../win32/gui/WndMain.c:1559
-#: ../win32/gui/WndMain.c:1561
+#: ../win32/gui/WndMain.c:80 ../win32/gui/WndMain.c:1558
+#: ../win32/gui/WndMain.c:1560
 msgid "English"
 msgstr "Inglês"
 
@@ -611,6 +471,26 @@ msgstr "Japonês"
 msgid "Korean"
 msgstr "Coreano"
 
+#: ../win32/gui/WndMain.c:259 ../win32/gui/plugin.c:107
+#, c-format
+msgid "*PCSX*: Loaded State %d"
+msgstr "PCSX: Estado \"%d\" carregado."
+
+#: ../win32/gui/WndMain.c:260 ../win32/gui/plugin.c:108
+#, c-format
+msgid "*PCSX*: Error Loading State %d"
+msgstr "PCSX: Erro ao carregar o estado \"%d\"!"
+
+#: ../win32/gui/WndMain.c:281 ../win32/gui/plugin.c:90
+#, c-format
+msgid "*PCSX*: Saved State %d"
+msgstr "PCSX: Estado \"%d\" salvo."
+
+#: ../win32/gui/WndMain.c:282 ../win32/gui/plugin.c:91
+#, c-format
+msgid "*PCSX*: Error Saving State %d"
+msgstr "PCSX: Erro ao salvar o estado \"%d\"!"
+
 #: ../win32/gui/WndMain.c:300 ../win32/gui/WndMain.c:352
 msgid "PCSX State Format"
 msgstr "Formato dos estados salvos do PCSX"
@@ -649,11 +529,11 @@ msgstr "Não pôde carregar o CDROM!"
 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:664 ../gui/MemcardDlg.c:59
+#: ../win32/gui/WndMain.c:664 ../gui/MemcardDlg.c:62
 msgid "Title"
 msgstr "Título"
 
-#: ../win32/gui/WndMain.c:670 ../gui/MemcardDlg.c:65
+#: ../win32/gui/WndMain.c:670 ../gui/MemcardDlg.c:68
 msgid "Status"
 msgstr "Estado"
 
@@ -673,17 +553,17 @@ msgstr "bloco de ligação intermediário"
 msgid "terminiting link block"
 msgstr "bloco final da ligação"
 
-#: ../win32/gui/WndMain.c:867 ../gui/MemcardDlg.c:147 ../gui/MemcardDlg.c:244
+#: ../win32/gui/WndMain.c:867 ../gui/MemcardDlg.c:154 ../gui/MemcardDlg.c:252
 msgid "Deleted"
 msgstr "Apagado"
 
 #: ../win32/gui/WndMain.c:868 ../win32/gui/WndMain.c:871
-#: ../gui/MemcardDlg.c:149 ../gui/MemcardDlg.c:153 ../gui/MemcardDlg.c:246
-#: ../gui/MemcardDlg.c:250
+#: ../gui/MemcardDlg.c:156 ../gui/MemcardDlg.c:160 ../gui/MemcardDlg.c:254
+#: ../gui/MemcardDlg.c:258
 msgid "Free"
 msgstr "Liberado"
 
-#: ../win32/gui/WndMain.c:870 ../gui/MemcardDlg.c:151 ../gui/MemcardDlg.c:248
+#: ../win32/gui/WndMain.c:870 ../gui/MemcardDlg.c:158 ../gui/MemcardDlg.c:256
 msgid "Used"
 msgstr "Usado"
 
@@ -802,229 +682,350 @@ msgstr "Opções"
 msgid "Psx System Type"
 msgstr "Tipo de sistema do PSX"
 
-#: ../win32/gui/WndMain.c:1323
+#: ../win32/gui/WndMain.c:1322
 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:1328
+#: ../win32/gui/WndMain.c:1327
 msgid "Psx Memory Card (*.mcr;*.mc)"
 msgstr "Cartão de memória binário (*.mcr;*.mc)"
 
-#: ../win32/gui/WndMain.c:1333
+#: ../win32/gui/WndMain.c:1332
 msgid "CVGS Memory Card (*.mem;*.vgs)"
 msgstr "Cartão de memória do CVGS (*.mem;*.vgs)"
 
-#: ../win32/gui/WndMain.c:1338
+#: ../win32/gui/WndMain.c:1337
 msgid "Bleem Memory Card (*.mcd)"
 msgstr "Cartão de memória do Bleem (*.mcd)"
 
-#: ../win32/gui/WndMain.c:1343
+#: ../win32/gui/WndMain.c:1342
 msgid "DexDrive Memory Card (*.gme)"
 msgstr "Cartão de memória do DexDrive (*.gme)"
 
-#: ../win32/gui/WndMain.c:1348
+#: ../win32/gui/WndMain.c:1347
 msgid "DataDeck Memory Card (*.ddf)"
 msgstr "Cartão de memória do DataDeck (*.ddf)"
 
-#: ../win32/gui/WndMain.c:1353 ../win32/gui/WndMain.c:1434 ../gui/Cheat.c:322
+#: ../win32/gui/WndMain.c:1352 ../win32/gui/WndMain.c:1433 ../gui/Cheat.c:321
 #: ../gui/Gtk2Gui.c:421 ../gui/Gtk2Gui.c:560
 msgid "All Files"
 msgstr "Todos os arquivos"
 
-#: ../win32/gui/WndMain.c:1392
+#: ../win32/gui/WndMain.c:1391
 msgid "Psx Exe Format"
 msgstr "Formato executável do PSX"
 
-#: ../win32/gui/WndMain.c:1429
+#: ../win32/gui/WndMain.c:1428
 msgid "Psx Isos (*.iso;*.mdf;*.img;*.bin)"
 msgstr "Imagens de CD (*.iso;*.mdf;*.img;*.bin)"
 
-#: ../win32/gui/WndMain.c:1505
+#: ../win32/gui/WndMain.c:1504
 msgid "&File"
 msgstr "&Arquivo"
 
-#: ../win32/gui/WndMain.c:1506
+#: ../win32/gui/WndMain.c:1505
 msgid "E&xit"
 msgstr "&Sair"
 
-#: ../win32/gui/WndMain.c:1508
+#: ../win32/gui/WndMain.c:1507
 msgid "Run &EXE..."
 msgstr "Rodar &EXE..."
 
-#: ../win32/gui/WndMain.c:1509
+#: ../win32/gui/WndMain.c:1508
 msgid "Run &BIOS"
 msgstr "Iniciar pela &BIOS"
 
-#: ../win32/gui/WndMain.c:1510
+#: ../win32/gui/WndMain.c:1509
 msgid "Run &ISO..."
 msgstr "Rodar &imagem de CD..."
 
-#: ../win32/gui/WndMain.c:1511
+#: ../win32/gui/WndMain.c:1510
 msgid "Run &CD"
 msgstr "Rodar &CD"
 
-#: ../win32/gui/WndMain.c:1513
+#: ../win32/gui/WndMain.c:1512
 msgid "&Emulator"
 msgstr "&Emulador"
 
-#: ../win32/gui/WndMain.c:1514
+#: ../win32/gui/WndMain.c:1513
 msgid "&States"
 msgstr "&Estados"
 
-#: ../win32/gui/WndMain.c:1516
+#: ../win32/gui/WndMain.c:1515
 msgid "S&witch ISO..."
 msgstr "T&rocar de imagem de CD..."
 
-#: ../win32/gui/WndMain.c:1518
+#: ../win32/gui/WndMain.c:1517
 msgid "Re&set"
 msgstr "Re&iniciar"
 
-#: ../win32/gui/WndMain.c:1519
+#: ../win32/gui/WndMain.c:1518
 msgid "&Run"
 msgstr "&Executar"
 
-#: ../win32/gui/WndMain.c:1520
+#: ../win32/gui/WndMain.c:1519
 msgid "&Save"
 msgstr "&Salvar"
 
-#: ../win32/gui/WndMain.c:1521
+#: ../win32/gui/WndMain.c:1520
 msgid "&Load"
 msgstr "&Carregar"
 
-#: ../win32/gui/WndMain.c:1522 ../win32/gui/WndMain.c:1528
+#: ../win32/gui/WndMain.c:1521 ../win32/gui/WndMain.c:1527
 msgid "&Other..."
 msgstr "&Outros..."
 
-#: ../win32/gui/WndMain.c:1523 ../win32/gui/WndMain.c:1529
+#: ../win32/gui/WndMain.c:1522 ../win32/gui/WndMain.c:1528
 msgid "Slot &5"
 msgstr "Unidade &5"
 
-#: ../win32/gui/WndMain.c:1524 ../win32/gui/WndMain.c:1530
+#: ../win32/gui/WndMain.c:1523 ../win32/gui/WndMain.c:1529
 msgid "Slot &4"
 msgstr "Unidade &4"
 
-#: ../win32/gui/WndMain.c:1525 ../win32/gui/WndMain.c:1531
+#: ../win32/gui/WndMain.c:1524 ../win32/gui/WndMain.c:1530
 msgid "Slot &3"
 msgstr "Unidade &3"
 
-#: ../win32/gui/WndMain.c:1526 ../win32/gui/WndMain.c:1532
+#: ../win32/gui/WndMain.c:1525 ../win32/gui/WndMain.c:1531
 msgid "Slot &2"
 msgstr "Unidade &2"
 
-#: ../win32/gui/WndMain.c:1527 ../win32/gui/WndMain.c:1533
+#: ../win32/gui/WndMain.c:1526 ../win32/gui/WndMain.c:1532
 msgid "Slot &1"
 msgstr "Unidade &1"
 
-#: ../win32/gui/WndMain.c:1535
+#: ../win32/gui/WndMain.c:1534
 msgid "&Configuration"
 msgstr "&Configuração"
 
-#: ../win32/gui/WndMain.c:1536
+#: ../win32/gui/WndMain.c:1535
 msgid "Cheat &Search..."
 msgstr "Procurar por &trapaça..."
 
-#: ../win32/gui/WndMain.c:1537
+#: ../win32/gui/WndMain.c:1536
 msgid "Ch&eat Code..."
 msgstr "&Código de trapaça..."
 
-#: ../win32/gui/WndMain.c:1540
+#: ../win32/gui/WndMain.c:1539
 msgid "&Language"
 msgstr "&Linguagem"
 
-#: ../win32/gui/WndMain.c:1565
+#: ../win32/gui/WndMain.c:1564
 msgid "&Memory cards..."
 msgstr "&Cartões de memória..."
 
-#: ../win32/gui/WndMain.c:1566
+#: ../win32/gui/WndMain.c:1565
 msgid "C&PU..."
 msgstr "C&PU..."
 
-#: ../win32/gui/WndMain.c:1568
+#: ../win32/gui/WndMain.c:1567
 msgid "&NetPlay..."
 msgstr "&Jogo em rede..."
 
-#: ../win32/gui/WndMain.c:1570
+#: ../win32/gui/WndMain.c:1569
 msgid "&Controllers..."
 msgstr "&Controles..."
 
-#: ../win32/gui/WndMain.c:1571
+#: ../win32/gui/WndMain.c:1570
 msgid "CD-&ROM..."
 msgstr "CD&ROM..."
 
-#: ../win32/gui/WndMain.c:1572
+#: ../win32/gui/WndMain.c:1571
 msgid "&Sound..."
 msgstr "Á&udio..."
 
-#: ../win32/gui/WndMain.c:1573
+#: ../win32/gui/WndMain.c:1572
 msgid "&Graphics..."
 msgstr "&Gráficos..."
 
-#: ../win32/gui/WndMain.c:1575
+#: ../win32/gui/WndMain.c:1574
 msgid "&Plugins && Bios..."
 msgstr "&Extensões e BIOS..."
 
-#: ../win32/gui/WndMain.c:1577
+#: ../win32/gui/WndMain.c:1576
 msgid "&Help"
 msgstr "&Ajuda"
 
-#: ../win32/gui/WndMain.c:1578
+#: ../win32/gui/WndMain.c:1577
 msgid "&About..."
 msgstr "&Sobre..."
 
-#: ../win32/gui/WndMain.c:1764
+#: ../win32/gui/WndMain.c:1756
 msgid "Pcsx Msg"
 msgstr "Mensagens do PCSX"
 
-#: ../win32/gui/WndMain.c:1767
+#: ../win32/gui/WndMain.c:1759
 msgid "Error Loading Symbol"
 msgstr "Erro ao carregar símbolo"
 
-#: ../gui/Cheat.c:118 ../gui/Cheat.c:203
+#: ../win32/gui/plugin.c:119
+#, c-format
+msgid "*PCSX*: Sio Irq Always Enabled"
+msgstr "PCSX: IRQ SIO sempre ativada."
+
+#: ../win32/gui/plugin.c:120
+#, c-format
+msgid "*PCSX*: Sio Irq Not Always Enabled"
+msgstr "PCSX: IRQ SIO nem sempre ativada."
+
+#: ../win32/gui/plugin.c:127
+#, c-format
+msgid "*PCSX*: Black&White Mdecs Only Enabled"
+msgstr "PCSX: Mdecs apenas em preto e branco."
+
+#: ../win32/gui/plugin.c:128
+#, c-format
+msgid "*PCSX*: Black&White Mdecs Only Disabled"
+msgstr "PCSX: Mdecs coloridas."
+
+#: ../win32/gui/plugin.c:135
+#, c-format
+msgid "*PCSX*: Xa Enabled"
+msgstr "PCSX: XA Ligado."
+
+#: ../win32/gui/plugin.c:136
+#, c-format
+msgid "*PCSX*: Xa Disabled"
+msgstr "PCSX: XA Desligado."
+
+#: ../win32/gui/plugin.c:145
+msgid "*PCSX*: CdRom Case Opened"
+msgstr "PCSX: Bandeja do CDROM aberta."
+
+#: ../win32/gui/plugin.c:150
+msgid "*PCSX*: CdRom Case Closed"
+msgstr "PCSX: Bandeja do CDROM fechada."
+
+#: ../win32/gui/plugin.c:177
+msgid "Connecting..."
+msgstr "Conectando..."
+
+#: ../win32/gui/plugin.c:179 ../win32/gui/plugin.c:186
+#, c-format
+msgid "Please wait while connecting... %c\n"
+msgstr "Por favor, espere enquanto o emulador se conecta... %c\n"
+
+#: ../win32/gui/plugin.c:214
+msgid "Error Opening CDR Plugin"
+msgstr "Erro ao abrir a extensão de CDROM!"
+
+#: ../win32/gui/plugin.c:277
+#, c-format
+msgid "Error Opening GPU Plugin (%d)"
+msgstr "Erro ao abrir a extensão de GPU (%d)!"
+
+#: ../win32/gui/plugin.c:279
+#, c-format
+msgid "Error Opening SPU Plugin (%d)"
+msgstr "Erro ao abrir a extensão de SPU (%d)!"
+
+#: ../win32/gui/plugin.c:282
+#, c-format
+msgid "Error Opening PAD1 Plugin (%d)"
+msgstr "Erro ao abrir a extensão do controle 1 (%d)!"
+
+#: ../win32/gui/plugin.c:284
+#, c-format
+msgid "Error Opening PAD2 Plugin (%d)"
+msgstr "Erro ao abrir a extensão do controle 2 (%d)!"
+
+#: ../win32/gui/plugin.c:307
+msgid "Error Closing CDR Plugin"
+msgstr "Erro ao fechar a extensão de CDROM!"
+
+#: ../win32/gui/plugin.c:309
+msgid "Error Closing GPU Plugin"
+msgstr "Erro ao fechar a extensão de GPU!"
+
+#: ../win32/gui/plugin.c:311
+msgid "Error Closing SPU Plugin"
+msgstr "Erro ao fechar a extensão de SPU!"
+
+#: ../win32/gui/plugin.c:313
+msgid "Error Closing PAD1 Plugin"
+msgstr "Erro ao fechar a extensão do controle 1!"
+
+#: ../win32/gui/plugin.c:315
+msgid "Error Closing PAD2 Plugin"
+msgstr "Erro ao fechar a extensão do controle 2!"
+
+#: ../win32/gui/plugin.c:333
+#, c-format
+msgid "CDRinit error: %d"
+msgstr "Erro ao iniciar o CDROM: %d"
+
+#: ../win32/gui/plugin.c:335
+#, c-format
+msgid "GPUinit error: %d"
+msgstr "Erro ao iniciar a GPU: %d"
+
+#: ../win32/gui/plugin.c:337
+#, c-format
+msgid "SPUinit error: %d"
+msgstr "Erro ao iniciar a SPU: %d"
+
+#: ../win32/gui/plugin.c:339
+#, c-format
+msgid "PAD1init error: %d"
+msgstr "Erro ao iniciar o controle 1: %d"
+
+#: ../win32/gui/plugin.c:341
+#, c-format
+msgid "PAD2init error: %d"
+msgstr "Erro ao iniciar o controle 2: %d"
+
+#: ../win32/gui/plugin.c:344
+#, c-format
+msgid "NETinit error: %d"
+msgstr "Erro ao iniciar a rede: %d"
+
+#: ../gui/Cheat.c:117 ../gui/Cheat.c:202
 msgid "Cheat Description:"
 msgstr "Descrição da trapaça:"
 
-#: ../gui/Cheat.c:307
+#: ../gui/Cheat.c:306
 msgid "Open Cheat File"
 msgstr "Abrir arquivo de trapaça"
 
-#: ../gui/Cheat.c:317 ../gui/Cheat.c:357
+#: ../gui/Cheat.c:316 ../gui/Cheat.c:356
 msgid "PCSX Cheat Code Files (*.cht)"
 msgstr "Arquivos de trapaça do PCSX (*.cht)"
 
-#: ../gui/Cheat.c:347
+#: ../gui/Cheat.c:346
 msgid "Save Cheat File"
 msgstr "Salvar um arquivo de trapaça"
 
-#: ../gui/Cheat.c:362
+#: ../gui/Cheat.c:361
 msgid "All Files (*.*)"
 msgstr "Todos os arquivos (*.*)"
 
-#: ../gui/Cheat.c:395 ../gui/Cheat.c:1125 ../gui/ConfDlg.c:104
-#: ../gui/ConfDlg.c:200 ../gui/DebugMemory.c:256
+#: ../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 "Erro: o ambiente Glade não pôde ser carregado!"
 
-#: ../gui/Cheat.c:400
+#: ../gui/Cheat.c:399
 msgid "Cheat Codes"
 msgstr "Códigos de trapaça"
 
-#: ../gui/Cheat.c:406
+#: ../gui/Cheat.c:405
 msgid "Enable"
 msgstr "Ligar"
 
-#: ../gui/Cheat.c:631
+#: ../gui/Cheat.c:630
 msgid "Freeze value"
 msgstr "Congelar valor"
 
-#: ../gui/Cheat.c:730
+#: ../gui/Cheat.c:729
 msgid "Modify value"
 msgstr "Modificar valor"
 
-#: ../gui/Cheat.c:738
+#: ../gui/Cheat.c:737
 msgid "New value:"
 msgstr "Novo valor:"
 
-#: ../gui/Cheat.c:1135
+#: ../gui/Cheat.c:1134
 msgid "Search Results"
 msgstr "Resultados da busca"
 
@@ -1052,54 +1053,54 @@ msgstr "Não conseguiu abrir o diretório \"%s\", da BIOS!\n"
 msgid "Could not open directory: '%s'\n"
 msgstr "Não conseguiu abrir o diretório \"%s\"!\n"
 
-#: ../gui/DebugMemory.c:102 ../data/pcsx.glade2:3270
+#: ../gui/DebugMemory.c:103 ../data/pcsx.glade2:3260
 msgid "Memory Dump"
 msgstr ""
 
-#: ../gui/DebugMemory.c:110
+#: ../gui/DebugMemory.c:111
 #, fuzzy
 msgid "Start Address (Hexadecimal):"
 msgstr "Hexadecimal"
 
-#: ../gui/DebugMemory.c:118
+#: ../gui/DebugMemory.c:121
 msgid "Length (Decimal):"
 msgstr ""
 
-#: ../gui/DebugMemory.c:144
+#: ../gui/DebugMemory.c:147
 msgid "Dump to File"
 msgstr ""
 
-#: ../gui/DebugMemory.c:159
+#: ../gui/DebugMemory.c:162
 #, fuzzy, c-format
 msgid "Error writing to %s!"
 msgstr "Erro ao salvar o arquivo de estado \"%s\"!"
 
-#: ../gui/DebugMemory.c:177
+#: ../gui/DebugMemory.c:180
 #, fuzzy
 msgid "Memory Patch"
 msgstr "Cartão de memória 1"
 
-#: ../gui/DebugMemory.c:185 ../data/pcsx.glade2:3292
+#: ../gui/DebugMemory.c:188 ../data/pcsx.glade2:3282
 #, fuzzy
 msgid "Address (Hexadecimal):"
 msgstr "Hexadecimal"
 
-#: ../gui/DebugMemory.c:195
+#: ../gui/DebugMemory.c:198
 #, fuzzy
 msgid "Value (Hexa string):"
 msgstr "Hexadecimal"
 
-#: ../gui/DebugMemory.c:261
+#: ../gui/DebugMemory.c:264
 #, fuzzy
 msgid "Memory Viewer"
 msgstr "Cartão de memória 1"
 
-#: ../gui/DebugMemory.c:266
+#: ../gui/DebugMemory.c:269
 #, fuzzy
 msgid "Address"
 msgstr "Endereço:"
 
-#: ../gui/DebugMemory.c:284
+#: ../gui/DebugMemory.c:287
 #, fuzzy
 msgid "Text"
 msgstr "Texturas"
@@ -1152,31 +1153,31 @@ msgstr "Abrir arquivo de imagem de CD de PSX"
 msgid "PSX Image Files (*.bin, *.img, *.mdf, *.iso)"
 msgstr "Arquivo de imagens de CD de PSX (*.bin, *.img, *.mdf, *.iso)"
 
-#: ../gui/Gtk2Gui.c:766
+#: ../gui/Gtk2Gui.c:770
 #, c-format
 msgid "Loaded state %s."
 msgstr "Arquivo de estado \"%s\" carregado."
 
-#: ../gui/Gtk2Gui.c:770
+#: ../gui/Gtk2Gui.c:773
 #, c-format
 msgid "Error loading state %s!"
 msgstr "Erro ao carregar o arquivo de estado \"%s\"!"
 
-#: ../gui/Gtk2Gui.c:781
+#: ../gui/Gtk2Gui.c:784
 #, c-format
 msgid "Saved state %s."
 msgstr "Arquivo de estado \"%s\" salvo."
 
-#: ../gui/Gtk2Gui.c:783
+#: ../gui/Gtk2Gui.c:786
 #, c-format
 msgid "Error saving state %s!"
 msgstr "Erro ao salvar o arquivo de estado \"%s\"!"
 
-#: ../gui/Gtk2Gui.c:816 ../gui/Gtk2Gui.c:843
+#: ../gui/Gtk2Gui.c:821 ../gui/Gtk2Gui.c:849
 msgid "Select State File"
 msgstr "Selecione o arquivo de estado"
 
-#: ../gui/Gtk2Gui.c:900
+#: ../gui/Gtk2Gui.c:905
 msgid "Notice"
 msgstr "Aviso"
 
@@ -1185,7 +1186,7 @@ msgstr "Aviso"
 msgid "Creating memory card: %s\n"
 msgstr "Criando cartão de memória \"%s\"\n"
 
-#: ../gui/LnxMain.c:321
+#: ../gui/LnxMain.c:325
 msgid ""
 " pcsx [options] [file]\n"
 "\toptions:\n"
@@ -1210,7 +1211,7 @@ msgstr ""
 "\t-h -help\tMostra essa mensagem\n"
 "\t[arquivo]\t\tCarrega um arquivo.\n"
 
-#: ../gui/LnxMain.c:358
+#: ../gui/LnxMain.c:362
 #, c-format
 msgid ""
 "PCSX cannot be configured without using the GUI -- you should restart "
@@ -1218,139 +1219,139 @@ msgid ""
 msgstr ""
 "PCSX não pode ser configurado sem o GUI -- reinicie sem a opção -nogui.\n"
 
-#: ../gui/LnxMain.c:414
+#: ../gui/LnxMain.c:418
 msgid "Failed loading plugins!"
 msgstr "Não conseguiu carregar as extensões!"
 
-#: ../gui/LnxMain.c:431
+#: ../gui/LnxMain.c:435
 #, c-format
 msgid "Could not load CD-ROM!\n"
 msgstr "Não pôde carregar o CD-ROM!\n"
 
-#: ../gui/LnxMain.c:467
+#: ../gui/LnxMain.c:466
 #, c-format
 msgid "PSX emulator couldn't be initialized.\n"
 msgstr "O emulador não pôde ser inicializado.\n"
 
-#: ../gui/MemcardDlg.c:53
+#: ../gui/MemcardDlg.c:56
 msgid "Icon"
 msgstr "Ícone"
 
-#: ../gui/MemcardDlg.c:71
+#: ../gui/MemcardDlg.c:74
 msgid "ID"
 msgstr "ID"
 
-#: ../gui/MemcardDlg.c:77
+#: ../gui/MemcardDlg.c:80
 msgid "Name"
 msgstr "Nome"
 
-#: ../gui/MemcardDlg.c:297
+#: ../gui/MemcardDlg.c:317
 msgid "Select A File"
 msgstr ""
 
-#: ../gui/MemcardDlg.c:338
+#: ../gui/MemcardDlg.c:358
 msgid "Format this Memory Card?"
 msgstr "Formatar esse cartão de memória?"
 
-#: ../gui/MemcardDlg.c:340
+#: ../gui/MemcardDlg.c:360
 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:343
+#: ../gui/MemcardDlg.c:363
 msgid "Format card"
 msgstr "Formatar cartão"
 
-#: ../gui/MemcardDlg.c:367
+#: ../gui/MemcardDlg.c:387
 msgid "Create a new Memory Card"
 msgstr ""
 
-#: ../gui/MemcardDlg.c:376
+#: ../gui/MemcardDlg.c:396
 msgid "New Memory Card.mcd"
 msgstr ""
 
-#: ../gui/MemcardDlg.c:477
+#: ../gui/MemcardDlg.c:497
 msgid "No free space on memory card"
 msgstr ""
 
-#: ../gui/MemcardDlg.c:478
+#: ../gui/MemcardDlg.c:498
 msgid ""
 "There are no free slots available on the target memory card. Please delete a "
 "slot first."
 msgstr ""
 
-#: ../gui/MemcardDlg.c:632
+#: ../gui/MemcardDlg.c:661
 msgid "Memory Card Manager"
 msgstr "Gerenciador de cartões de memória"
 
-#: ../gui/Plugin.c:204 ../data/pcsx.glade2:1493
+#: ../gui/Plugin.c:203 ../data/pcsx.glade2:1493
 #, c-format
 msgid "SIO IRQ Always Enabled"
 msgstr "IRQ SIO sempre ativada"
 
-#: ../gui/Plugin.c:205
+#: ../gui/Plugin.c:204
 #, c-format
 msgid "SIO IRQ Not Always Enabled"
 msgstr "IRQ SIO nem sempre ativada"
 
-#: ../gui/Plugin.c:211
+#: ../gui/Plugin.c:210
 #, c-format
 msgid "Black & White Mdecs Only Enabled"
 msgstr "Mdecs apenas em preto e branco ativado"
 
-#: ../gui/Plugin.c:212
+#: ../gui/Plugin.c:211
 #, c-format
 msgid "Black & White Mdecs Only Disabled"
 msgstr "Mdecs apenas em preto e branco desativado"
 
-#: ../gui/Plugin.c:218
+#: ../gui/Plugin.c:217
 #, c-format
 msgid "XA Enabled"
 msgstr "XA Ligado"
 
-#: ../gui/Plugin.c:219
+#: ../gui/Plugin.c:218
 #, c-format
 msgid "XA Disabled"
 msgstr "XA Desligado"
 
-#: ../gui/Plugin.c:285
+#: ../gui/Plugin.c:280
 msgid "Error opening CD-ROM plugin!"
 msgstr "Erro ao abrir a extensão de CD-ROM!"
 
-#: ../gui/Plugin.c:287
+#: ../gui/Plugin.c:282
 msgid "Error opening SPU plugin!"
 msgstr "Erro ao abrir a extensão de SPU!"
 
-#: ../gui/Plugin.c:290
+#: ../gui/Plugin.c:285
 msgid "Error opening GPU plugin!"
 msgstr "Erro ao abrir a extensão de GPU!"
 
-#: ../gui/Plugin.c:292
+#: ../gui/Plugin.c:287
 msgid "Error opening Controller 1 plugin!"
 msgstr "Erro ao abrir a extensão do Controle 1!"
 
-#: ../gui/Plugin.c:294
+#: ../gui/Plugin.c:289
 msgid "Error opening Controller 2 plugin!"
 msgstr "Erro ao abrir a extensão do Controle 2!"
 
-#: ../gui/Plugin.c:374
+#: ../gui/Plugin.c:369
 msgid "Error closing CD-ROM plugin!"
 msgstr "Erro ao fechar a extensão de CD-ROM!"
 
-#: ../gui/Plugin.c:376
+#: ../gui/Plugin.c:371
 msgid "Error closing SPU plugin!"
 msgstr "Erro ao fechar a extensão de SPU!"
 
-#: ../gui/Plugin.c:378
+#: ../gui/Plugin.c:373
 msgid "Error closing Controller 1 Plugin!"
 msgstr "Erro ao fechar a extensão do Controle 1!"
 
-#: ../gui/Plugin.c:380
+#: ../gui/Plugin.c:375
 msgid "Error closing Controller 2 plugin!"
 msgstr "Erro ao fechar a extensão de Controle 2!"
 
-#: ../gui/Plugin.c:382
+#: ../gui/Plugin.c:377
 msgid "Error closing GPU plugin!"
 msgstr "Erro ao fechar a extensão de GPU!"
 
@@ -1359,17 +1360,17 @@ msgstr "Erro ao fechar a extensão de GPU!"
 msgid "Loaded CD Image: %s"
 msgstr "Carregou a imagem de CD \"%s\"."
 
-#: ../libpcsxcore/cheat.c:148
+#: ../libpcsxcore/cheat.c:147
 #, c-format
 msgid "Cheats loaded from: %s\n"
 msgstr "Trapaças de \"%s\" carregadas.\n"
 
-#: ../libpcsxcore/cheat.c:180
+#: ../libpcsxcore/cheat.c:179
 #, c-format
 msgid "Cheats saved to: %s\n"
 msgstr "Trapaças salvas para \"%s\".\n"
 
-#: ../libpcsxcore/cheat.c:323 ../libpcsxcore/cheat.c:444
+#: ../libpcsxcore/cheat.c:322 ../libpcsxcore/cheat.c:443
 msgid "(Untitled)"
 msgstr "(Sem título)"
 
@@ -1389,142 +1390,142 @@ msgstr ""
 msgid "Debugger stopped.\n"
 msgstr ""
 
-#: ../libpcsxcore/misc.c:392
+#: ../libpcsxcore/misc.c:388
 #, c-format
 msgid "Error opening file: %s.\n"
 msgstr "Erro ao abrir o arquivo \"%s\"!\n"
 
-#: ../libpcsxcore/misc.c:432
+#: ../libpcsxcore/misc.c:428
 #, c-format
 msgid "Unknown CPE opcode %02x at position %08x.\n"
 msgstr "Código operacional CPE %02x desconhecido, na posição %08x.\n"
 
-#: ../libpcsxcore/misc.c:439
+#: ../libpcsxcore/misc.c:435
 msgid "COFF files not supported.\n"
 msgstr "Arquivos COFF não são suportados!\n"
 
-#: ../libpcsxcore/misc.c:443
+#: ../libpcsxcore/misc.c:439
 msgid "This file does not appear to be a valid PSX file.\n"
 msgstr "Esse arquivo não parece ser um arquivo válido de PSX!\n"
 
-#: ../libpcsxcore/plugins.c:33
+#: ../libpcsxcore/plugins.c:138
 #, c-format
 msgid "Error loading %s: %s"
 msgstr "Erro carregando \"%s\": \"%s\""
 
-#: ../libpcsxcore/plugins.c:162
+#: ../libpcsxcore/plugins.c:181
 #, c-format
 msgid "Could not load GPU plugin %s!"
 msgstr "Não conseguiu carregar a extensão de GPU \"%s\"!"
 
-#: ../libpcsxcore/plugins.c:228
+#: ../libpcsxcore/plugins.c:251
 #, c-format
 msgid "Could not load CD-ROM plugin %s!"
 msgstr "Não conseguiu carregar a extensão de CD-ROM \"%s\"!"
 
-#: ../libpcsxcore/plugins.c:467
+#: ../libpcsxcore/plugins.c:297
 #, c-format
 msgid "Could not load SPU plugin %s!"
 msgstr "Não conseguiu carregar a extensão de SPU \"%s\"!"
 
-#: ../libpcsxcore/plugins.c:616
+#: ../libpcsxcore/plugins.c:347
 #, c-format
 msgid "Could not load Controller 1 plugin %s!"
 msgstr "Não conseguiu carregar a extensão do Controle 1 \"%s\"!"
 
-#: ../libpcsxcore/plugins.c:670
+#: ../libpcsxcore/plugins.c:388
 #, c-format
 msgid "Could not load Controller 2 plugin %s!"
 msgstr "Não conseguiu carregar a extensão do Controle 2 \"%s\"!"
 
-#: ../libpcsxcore/plugins.c:713
+#: ../libpcsxcore/plugins.c:430
 #, c-format
 msgid "Could not load NetPlay plugin %s!"
 msgstr "Não conseguiu carregar a extensão de jogo em rede \"%s\"!"
 
-#: ../libpcsxcore/plugins.c:776
+#: ../libpcsxcore/plugins.c:491
 #, c-format
 msgid "Error initializing CD-ROM plugin: %d"
 msgstr "Erro ao iniciar a extensão de CD-ROM \"%d\"!"
 
-#: ../libpcsxcore/plugins.c:778
+#: ../libpcsxcore/plugins.c:493
 #, c-format
 msgid "Error initializing GPU plugin: %d"
 msgstr "Erro ao iniciar a extensão de GPU \"%d\"!"
 
-#: ../libpcsxcore/plugins.c:780
+#: ../libpcsxcore/plugins.c:495
 #, c-format
 msgid "Error initializing SPU plugin: %d"
 msgstr "Erro ao iniciar a extensão de SPU \"%d\"!"
 
-#: ../libpcsxcore/plugins.c:782
+#: ../libpcsxcore/plugins.c:497
 #, c-format
 msgid "Error initializing Controller 1 plugin: %d"
 msgstr "Erro ao iniciar a extensão do Controle 1 \"%d\"!"
 
-#: ../libpcsxcore/plugins.c:784
+#: ../libpcsxcore/plugins.c:499
 #, c-format
 msgid "Error initializing Controller 2 plugin: %d"
 msgstr "Erro ao iniciar a extensão do Controle 2 \"%d\"!"
 
-#: ../libpcsxcore/plugins.c:788
+#: ../libpcsxcore/plugins.c:503
 #, c-format
 msgid "Error initializing NetPlay plugin: %d"
 msgstr "Erro ao iniciar a extensão de jogo em rede \"%d\"!"
 
-#: ../libpcsxcore/plugins.c:791
+#: ../libpcsxcore/plugins.c:506
 msgid "Plugins loaded.\n"
 msgstr "Extensões carregadas.\n"
 
-#: ../libpcsxcore/ppf.c:218
+#: ../libpcsxcore/ppf.c:216
 #, c-format
 msgid "Invalid PPF patch: %s.\n"
 msgstr ""
 
-#: ../libpcsxcore/ppf.c:294
+#: ../libpcsxcore/ppf.c:292
 #, c-format
 msgid "Unsupported PPF version (%d).\n"
 msgstr ""
 
-#: ../libpcsxcore/ppf.c:333
+#: ../libpcsxcore/ppf.c:331
 #, fuzzy, c-format
 msgid "Loaded PPF %d.0 patch: %s.\n"
 msgstr "Arquivo de estado \"%s\" carregado."
 
-#: ../libpcsxcore/psxmem.c:69
+#: ../libpcsxcore/psxmem.c:76
 msgid "Error allocating memory!"
 msgstr "Erro ao alocar memória!"
 
-#: ../libpcsxcore/psxmem.c:107
+#: ../libpcsxcore/psxmem.c:114
 #, c-format
 msgid "Could not open BIOS:\"%s\". Enabling HLE Bios!\n"
 msgstr "Não conseguiu abrir a BIOS\"%s\". Usando BIOS HLE!\n"
 
-#: ../libpcsxcore/r3000a.c:35
+#: ../libpcsxcore/r3000a.c:33
 #, c-format
 msgid "Running PCSX Version %s (%s).\n"
 msgstr "Rodando o PCSX Versão %s (%s).\n"
 
-#: ../libpcsxcore/sio.c:99
+#: ../libpcsxcore/sio.c:344
 msgid "Connection closed!\n"
 msgstr "Conexão encerrada!\n"
 
-#: ../libpcsxcore/sio.c:322
+#: ../libpcsxcore/sio.c:370
 #, c-format
 msgid "No memory card value was specified - creating a default card %s\n"
 msgstr "Nenhum cartão de memória foi especificado, criando um \"%s\" padrão.\n"
 
-#: ../libpcsxcore/sio.c:326
+#: ../libpcsxcore/sio.c:374
 #, c-format
 msgid "The memory card %s doesn't exist - creating it\n"
 msgstr "O cartão de memória \"%s\" não existe, será criado.\n"
 
-#: ../libpcsxcore/sio.c:342
+#: ../libpcsxcore/sio.c:390
 #, c-format
 msgid "Memory card %s failed to load!\n"
 msgstr "Cartão de memória \"%s\" falhou para carregar!\n"
 
-#: ../libpcsxcore/sio.c:346
+#: ../libpcsxcore/sio.c:394
 #, c-format
 msgid "Loading memory card %s\n"
 msgstr "Carregando cartão de memória \"%s\".\n"
@@ -2051,15 +2052,15 @@ msgstr "Configurar jogo em rede"
 msgid "<b>NetPlay</b>"
 msgstr "<b>Jogo em rede</b>"
 
-#: ../data/pcsx.glade2:1897 ../data/pcsx.glade2:2295
+#: ../data/pcsx.glade2:1896 ../data/pcsx.glade2:2296
 msgid "New"
 msgstr ""
 
-#: ../data/pcsx.glade2:1947 ../data/pcsx.glade2:2345
+#: ../data/pcsx.glade2:1946 ../data/pcsx.glade2:2346
 msgid "Format"
 msgstr "Formatar"
 
-#: ../data/pcsx.glade2:1997 ../data/pcsx.glade2:2395
+#: ../data/pcsx.glade2:1996 ../data/pcsx.glade2:2396
 msgid "Un/Delete"
 msgstr "Apagar/Desfazer"
 
@@ -2067,26 +2068,26 @@ msgstr "Apagar/Desfazer"
 msgid "<b>Memory Card 1</b>"
 msgstr "<b>Cartão de memória 1</b>"
 
-#: ../data/pcsx.glade2:2151 ../data/pcsx.glade2:2201 ../data/pcsx.glade2:3094
+#: ../data/pcsx.glade2:2151 ../data/pcsx.glade2:2201 ../data/pcsx.glade2:3084
 msgid "Copy"
 msgstr "Copiar"
 
-#: ../data/pcsx.glade2:2488
+#: ../data/pcsx.glade2:2490
 msgid "<b>Memory Card 2</b>"
 msgstr "<b>Cartão de memória 2</b>"
 
-#: ../data/pcsx.glade2:2552
+#: ../data/pcsx.glade2:2554
 msgid ""
 "(C) 1999-2003 PCSX Development Team\n"
 "(C) 2005-2009 PCSX-df Team\n"
 "(C) 2009-2010 PCSX-Reloaded Team"
 msgstr ""
 
-#: ../data/pcsx.glade2:2555
+#: ../data/pcsx.glade2:2557
 msgid "A PlayStation emulator."
 msgstr "Um emulador de PlayStation."
 
-#: ../data/pcsx.glade2:2558
+#: ../data/pcsx.glade2:2560
 msgid ""
 "This program is free software; you can redistribute it\n"
 "and/or modify it under the terms of the GNU General\n"
@@ -2120,16 +2121,16 @@ msgstr ""
 "Public License along with this program; if not, write to\n"
 "the Free Software Foundation, Inc."
 
-#: ../data/pcsx.glade2:2600
+#: ../data/pcsx.glade2:2590
 msgid "translator-credits"
 msgstr ""
 "Tradução para português brasileiro por Tibério Vítor (tvtoon@gmail.com)"
 
-#: ../data/pcsx.glade2:2662
+#: ../data/pcsx.glade2:2652
 msgid "<b>Cheat Codes</b>"
 msgstr "<b>Códigos de trapaça</b>"
 
-#: ../data/pcsx.glade2:2828
+#: ../data/pcsx.glade2:2818
 msgid ""
 "8-bit\n"
 "16-bit\n"
@@ -2139,7 +2140,7 @@ msgstr ""
 "16-bit\n"
 "32-bit"
 
-#: ../data/pcsx.glade2:2891
+#: ../data/pcsx.glade2:2881
 msgid ""
 "Equal Value\n"
 "Not Equal Value\n"
@@ -2161,7 +2162,7 @@ msgstr ""
 "Diferente\n"
 "Sem mudanças"
 
-#: ../data/pcsx.glade2:2923
+#: ../data/pcsx.glade2:2913
 msgid ""
 "Decimal\n"
 "Hexadecimal"
@@ -2169,27 +2170,27 @@ msgstr ""
 "Decimal\n"
 "Hexadecimal"
 
-#: ../data/pcsx.glade2:3127
+#: ../data/pcsx.glade2:3117
 msgid "label_resultsfound"
 msgstr "Resultados encontrados:"
 
-#: ../data/pcsx.glade2:3162
+#: ../data/pcsx.glade2:3152
 msgid "Search"
 msgstr "Buscar"
 
-#: ../data/pcsx.glade2:3198
+#: ../data/pcsx.glade2:3188
 msgid "Restart"
 msgstr "Reiniciar"
 
-#: ../data/pcsx.glade2:3227
+#: ../data/pcsx.glade2:3217
 msgid "<b>Cheat Search</b>"
 msgstr "<b>Busca de trapaças</b>"
 
-#: ../data/pcsx.glade2:3384
+#: ../data/pcsx.glade2:3374
 msgid "Raw Dump..."
 msgstr ""
 
-#: ../data/pcsx.glade2:3419
+#: ../data/pcsx.glade2:3409
 msgid "Patch Memory..."
 msgstr ""
 
@@ -2946,6 +2947,78 @@ msgstr "Controle 2"
 msgid "Multi-Threaded (Recommended)"
 msgstr ""
 
+#: ../plugins/dfnet/dfnet.c:23
+#, fuzzy
+msgid "Socket Driver"
+msgstr "Extensão SoftGL"
+
+#: ../plugins/dfnet/dfnet.c:172
+#, fuzzy, c-format
+msgid "error connecting to %s: %s\n"
+msgstr "Erro carregando \"%s\": \"%s\""
+
+#: ../plugins/dfnet/dfnet.c:197
+#, fuzzy
+msgid "Error allocating memory!\n"
+msgstr "Erro ao alocar memória!"
+
+#: ../plugins/dfnet/gui.c:38
+msgid "Nothing to configure"
+msgstr ""
+
+#: ../plugins/dfnet/gui.c:57
+#, c-format
+msgid "IP %s"
+msgstr ""
+
+#: ../plugins/dfnet/gui.c:127
+msgid "Waiting for connection..."
+msgstr ""
+
+#: ../plugins/dfnet/gui.c:130
+msgid "The Client should now Start a Connection, waiting..."
+msgstr ""
+
+#: ../plugins/dfnet/dfnet.glade2:23
+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"
+"\n"
+"If you selected Client please enter the IP address the Server gave to you in "
+"the IP Address Control."
+msgstr ""
+
+#: ../plugins/dfnet/dfnet.glade2:63
+msgid "Copy PC IP to Clipboard"
+msgstr ""
+
+#: ../plugins/dfnet/dfnet.glade2:93
+msgid "Server (Player1)"
+msgstr ""
+
+#: ../plugins/dfnet/dfnet.glade2:103
+msgid "Client (Player2)"
+msgstr ""
+
+#: ../plugins/dfnet/dfnet.glade2:129
+msgid ""
+"Do not change if not necessary (remember it must be changed on both sides)."
+msgstr ""
+
+#: ../plugins/dfnet/dfnet.glade2:142
+msgid "Port Number"
+msgstr ""
+
+#: ../plugins/dfnet/dfnet.glade2:201
+msgid "Start Game"
+msgstr ""
+
+#: ../plugins/dfnet/dfnet.glade2:239
+msgid "Play Offline"
+msgstr ""
+
 #, fuzzy
 #~ msgid "Dump Memory..."
 #~ msgstr "&Cartões de memória..."
diff --git a/po/ru_RU.po b/po/ru_RU.po
index 2cc44b5e..295c1cb5 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: \n"
-"POT-Creation-Date: 2010-04-11 20:17+0800\n"
+"POT-Creation-Date: 2010-05-13 11:15+0800\n"
 "PO-Revision-Date: 2010-04-17 10:30+0500\n"
 "Last-Translator: Blade_Arma <edgbla@yandex.ru>\n"
 "Language-Team: American English <kde-i18n-doc@kde.org>\n"
@@ -40,19 +40,14 @@ msgid ""
 "http://www.codeplex.com/pcsxr"
 msgstr ""
 
-#: ../win32/gui/AboutDlg.c:46
-#: ../plugins/peopsxgl/gpucfg/interface.c:831
+#: ../win32/gui/AboutDlg.c:46 ../plugins/peopsxgl/gpucfg/interface.c:831
 msgid "About"
 msgstr "О PCSX"
 
-#: ../win32/gui/AboutDlg.c:48
-#: ../win32/gui/AboutDlg.c:52
-#: ../win32/gui/CheatDlg.c:70
-#: ../win32/gui/CheatDlg.c:120
-#: ../win32/gui/ConfigurePlugins.c:470
-#: ../win32/gui/ConfigurePlugins.c:601
-#: ../win32/gui/WndMain.c:966
-#: ../win32/gui/WndMain.c:1202
+#: ../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:966 ../win32/gui/WndMain.c:1202
 #: ../plugins/peopsxgl/gpucfg/interface.c:130
 #: ../plugins/peopsxgl/gpucfg/interface.c:843
 msgid "OK"
@@ -62,530 +57,340 @@ msgstr "Ок"
 msgid "PCSX EMU\n"
 msgstr "PCSX EMU\n"
 
-#: ../win32/gui/CheatDlg.c:52
-#: ../win32/gui/CheatDlg.c:224
-#: ../win32/gui/CheatDlg.c:271
+#: ../win32/gui/CheatDlg.c:51 ../win32/gui/CheatDlg.c:223
+#: ../win32/gui/CheatDlg.c:270
 msgid "Yes"
 msgstr "Да"
 
-#: ../win32/gui/CheatDlg.c:52
-#: ../win32/gui/CheatDlg.c:224
-#: ../win32/gui/CheatDlg.c:271
+#: ../win32/gui/CheatDlg.c:51 ../win32/gui/CheatDlg.c:223
+#: ../win32/gui/CheatDlg.c:270
 msgid "No"
 msgstr "Нет"
 
-#: ../win32/gui/CheatDlg.c:67
-#: ../gui/Cheat.c:195
+#: ../win32/gui/CheatDlg.c:66 ../gui/Cheat.c:194
 msgid "Edit Cheat"
 msgstr "Редактирование чита"
 
-#: ../win32/gui/CheatDlg.c:68
-#: ../win32/gui/CheatDlg.c:118
-#: ../gui/Cheat.c:637
+#: ../win32/gui/CheatDlg.c:67 ../win32/gui/CheatDlg.c:117 ../gui/Cheat.c:636
 msgid "Description:"
 msgstr "Описание:"
 
-#: ../win32/gui/CheatDlg.c:69
-#: ../win32/gui/CheatDlg.c:119
-#: ../gui/Cheat.c:126
-#: ../gui/Cheat.c:212
+#: ../win32/gui/CheatDlg.c:68 ../win32/gui/CheatDlg.c:118 ../gui/Cheat.c:125
+#: ../gui/Cheat.c:211
 msgid "Cheat Code:"
 msgstr "Чит код:"
 
-#: ../win32/gui/CheatDlg.c:71
-#: ../win32/gui/CheatDlg.c:121
-#: ../win32/gui/ConfigurePlugins.c:471
-#: ../win32/gui/ConfigurePlugins.c:602
-#: ../win32/gui/WndMain.c:967
-#: ../win32/gui/WndMain.c:1203
+#: ../win32/gui/CheatDlg.c:70 ../win32/gui/CheatDlg.c:120
+#: ../win32/gui/ConfigurePlugins.c:484 ../win32/gui/ConfigurePlugins.c:615
+#: ../win32/gui/WndMain.c:967 ../win32/gui/WndMain.c:1203
 #: ../plugins/peopsxgl/gpucfg/interface.c:338
 msgid "Cancel"
 msgstr "Отмена"
 
-#: ../win32/gui/CheatDlg.c:92
-#: ../win32/gui/CheatDlg.c:133
-#: ../gui/Cheat.c:156
-#: ../gui/Cheat.c:252
+#: ../win32/gui/CheatDlg.c:91 ../win32/gui/CheatDlg.c:132 ../gui/Cheat.c:155
+#: ../gui/Cheat.c:251
 msgid "Invalid cheat code!"
 msgstr "Неверный чит код!"
 
-#: ../win32/gui/CheatDlg.c:117
-#: ../gui/Cheat.c:110
+#: ../win32/gui/CheatDlg.c:116 ../gui/Cheat.c:109
 msgid "Add New Cheat"
 msgstr "Добавить новый чит"
 
-#: ../win32/gui/CheatDlg.c:167
-#: ../data/pcsx.glade2:2622
+#: ../win32/gui/CheatDlg.c:166 ../data/pcsx.glade2:2612
 msgid "Edit Cheat Codes"
 msgstr "Редактировать чит код"
 
-#: ../win32/gui/CheatDlg.c:169
+#: ../win32/gui/CheatDlg.c:168
 msgid "&Add Code"
 msgstr "Добавить код(&A)"
 
-#: ../win32/gui/CheatDlg.c:170
+#: ../win32/gui/CheatDlg.c:169
 msgid "&Edit Code"
 msgstr "Редактировать код(&E):"
 
-#: ../win32/gui/CheatDlg.c:171
+#: ../win32/gui/CheatDlg.c:170
 msgid "&Remove Code"
 msgstr "Удалить код(&R)"
 
-#: ../win32/gui/CheatDlg.c:172
+#: ../win32/gui/CheatDlg.c:171
 msgid "&Enable/Disable"
 msgstr "Включить/Выключить(&E)"
 
-#: ../win32/gui/CheatDlg.c:173
+#: ../win32/gui/CheatDlg.c:172
 msgid "&Load..."
 msgstr "Загрузить(&L)..."
 
-#: ../win32/gui/CheatDlg.c:174
+#: ../win32/gui/CheatDlg.c:173
 msgid "&Save As..."
 msgstr "Сохранить как(&S)..."
 
-#: ../win32/gui/CheatDlg.c:175
+#: ../win32/gui/CheatDlg.c:174
 msgid "&Close"
 msgstr "Закрыть(&C)"
 
-#: ../win32/gui/CheatDlg.c:186
-#: ../gui/Cheat.c:414
+#: ../win32/gui/CheatDlg.c:185 ../gui/Cheat.c:413
 msgid "Description"
 msgstr "Описание"
 
-#: ../win32/gui/CheatDlg.c:191
+#: ../win32/gui/CheatDlg.c:190
 msgid "Enabled"
 msgstr "Включено"
 
-#: ../win32/gui/CheatDlg.c:283
-#: ../win32/gui/CheatDlg.c:312
+#: ../win32/gui/CheatDlg.c:282 ../win32/gui/CheatDlg.c:311
 msgid "PCSX Cheat Code Files"
 msgstr "Файл чит кодов PCSX (*.cht)"
 
-#: ../win32/gui/CheatDlg.c:403
+#: ../win32/gui/CheatDlg.c:402
 msgid "Equal Value"
 msgstr "Равно значению"
 
-#: ../win32/gui/CheatDlg.c:404
+#: ../win32/gui/CheatDlg.c:403
 msgid "Not Equal Value"
 msgstr "Не равно значению"
 
-#: ../win32/gui/CheatDlg.c:405
+#: ../win32/gui/CheatDlg.c:404
 msgid "Range"
 msgstr "Диапазон"
 
-#: ../win32/gui/CheatDlg.c:408
+#: ../win32/gui/CheatDlg.c:407
 msgid "Increased By"
 msgstr "Увеличилось на"
 
-#: ../win32/gui/CheatDlg.c:409
+#: ../win32/gui/CheatDlg.c:408
 msgid "Decreased By"
 msgstr "Уменьшилось на"
 
-#: ../win32/gui/CheatDlg.c:410
+#: ../win32/gui/CheatDlg.c:409
 msgid "Increased"
 msgstr "Увеличилось"
 
-#: ../win32/gui/CheatDlg.c:411
+#: ../win32/gui/CheatDlg.c:410
 msgid "Decreased"
 msgstr "Уменьшилось"
 
-#: ../win32/gui/CheatDlg.c:412
+#: ../win32/gui/CheatDlg.c:411
 msgid "Different"
 msgstr "Изменилось"
 
-#: ../win32/gui/CheatDlg.c:413
+#: ../win32/gui/CheatDlg.c:412
 msgid "No Change"
 msgstr "Не изменилось"
 
-#: ../win32/gui/CheatDlg.c:449
-#: ../gui/Cheat.c:586
+#: ../win32/gui/CheatDlg.c:448 ../gui/Cheat.c:585
 msgid "Enter the values and start your search."
 msgstr "Введите значение и начните поиск."
 
-#: ../win32/gui/CheatDlg.c:454
+#: ../win32/gui/CheatDlg.c:453
 msgid "No addresses found."
 msgstr "Адреса не найдены."
 
-#: ../win32/gui/CheatDlg.c:458
-#: ../gui/Cheat.c:544
+#: ../win32/gui/CheatDlg.c:457 ../gui/Cheat.c:543
 msgid "Too many addresses found."
 msgstr "Слишком много адресов найдено."
 
-#: ../win32/gui/CheatDlg.c:467
-#: ../gui/Cheat.c:553
+#: ../win32/gui/CheatDlg.c:466 ../gui/Cheat.c:552
 #, c-format
 msgid "%.8X    Current: %u (%.2X), Previous: %u (%.2X)"
 msgstr "%.8X    Текущее: %u (%.2X), Предыдущее: %u (%.2X)"
 
-#: ../win32/gui/CheatDlg.c:472
-#: ../gui/Cheat.c:558
+#: ../win32/gui/CheatDlg.c:471 ../gui/Cheat.c:557
 #, c-format
 msgid "%.8X    Current: %u (%.4X), Previous: %u (%.4X)"
 msgstr "%.8X    Текущее: %u (%.4X), Предыдущее: %u (%.4X)"
 
-#: ../win32/gui/CheatDlg.c:477
-#: ../gui/Cheat.c:563
+#: ../win32/gui/CheatDlg.c:476 ../gui/Cheat.c:562
 #, c-format
 msgid "%.8X    Current: %u (%.8X), Previous: %u (%.8X)"
 msgstr "%.8X    Текущее: %u (%.8X), Предыдущее: %u (%.8X)"
 
-#: ../win32/gui/CheatDlg.c:493
-#: ../gui/Cheat.c:578
+#: ../win32/gui/CheatDlg.c:492 ../gui/Cheat.c:577
 #, c-format
 msgid "Founded Addresses: %d"
 msgstr "Найденные адреса: %d"
 
-#: ../win32/gui/CheatDlg.c:505
-#: ../data/pcsx.glade2:3022
+#: ../win32/gui/CheatDlg.c:504 ../data/pcsx.glade2:3012
 msgid "Freeze"
 msgstr "Заморозить"
 
-#: ../win32/gui/CheatDlg.c:506
-#: ../win32/gui/CheatDlg.c:597
+#: ../win32/gui/CheatDlg.c:505 ../win32/gui/CheatDlg.c:596
 msgid "Address:"
 msgstr "Адрес:"
 
-#: ../win32/gui/CheatDlg.c:507
-#: ../win32/gui/CheatDlg.c:598
-#: ../win32/gui/CheatDlg.c:683
-#: ../gui/Cheat.c:648
-#: ../data/pcsx.glade2:2865
+#: ../win32/gui/CheatDlg.c:506 ../win32/gui/CheatDlg.c:597
+#: ../win32/gui/CheatDlg.c:682 ../gui/Cheat.c:647 ../data/pcsx.glade2:2855
 msgid "Value:"
 msgstr "Значение:"
 
-#: ../win32/gui/CheatDlg.c:567
+#: ../win32/gui/CheatDlg.c:566
 #, c-format
 msgid "Freeze %.8X"
 msgstr "Заморозить %.8X"
 
-#: ../win32/gui/CheatDlg.c:596
-#: ../data/pcsx.glade2:3058
+#: ../win32/gui/CheatDlg.c:595 ../data/pcsx.glade2:3048
 msgid "Modify"
 msgstr "Изменить"
 
-#: ../win32/gui/CheatDlg.c:679
-#: ../gui/Cheat.c:1130
-#: ../data/pcsx.glade2:2793
+#: ../win32/gui/CheatDlg.c:678 ../gui/Cheat.c:1129 ../data/pcsx.glade2:2783
 msgid "Cheat Search"
 msgstr "Поиск читов"
 
-#: ../win32/gui/CheatDlg.c:681
-#: ../data/pcsx.glade2:2843
+#: ../win32/gui/CheatDlg.c:680 ../data/pcsx.glade2:2833
 msgid "Search For:"
 msgstr "Искать для:"
 
-#: ../win32/gui/CheatDlg.c:682
-#: ../data/pcsx.glade2:2853
+#: ../win32/gui/CheatDlg.c:681 ../data/pcsx.glade2:2843
 msgid "Data Type:"
 msgstr "Тип данных:"
 
-#: ../win32/gui/CheatDlg.c:684
-#: ../data/pcsx.glade2:2877
+#: ../win32/gui/CheatDlg.c:683 ../data/pcsx.glade2:2867
 msgid "Data Base:"
 msgstr "Основание:"
 
-#: ../win32/gui/CheatDlg.c:685
-#: ../data/pcsx.glade2:2937
+#: ../win32/gui/CheatDlg.c:684 ../data/pcsx.glade2:2927
 msgid "To:"
 msgstr "До:"
 
-#: ../win32/gui/CheatDlg.c:686
+#: ../win32/gui/CheatDlg.c:685
 msgid "&Freeze"
 msgstr "Заморозить"
 
-#: ../win32/gui/CheatDlg.c:687
+#: ../win32/gui/CheatDlg.c:686
 msgid "&Modify"
 msgstr "Изменить"
 
-#: ../win32/gui/CheatDlg.c:688
+#: ../win32/gui/CheatDlg.c:687
 msgid "&Copy"
 msgstr "Копировать"
 
-#: ../win32/gui/CheatDlg.c:689
+#: ../win32/gui/CheatDlg.c:688
 msgid "&Search"
 msgstr "Поиск"
 
-#: ../win32/gui/CheatDlg.c:690
+#: ../win32/gui/CheatDlg.c:689
 msgid "&New Search"
 msgstr "Новый поиск"
 
-#: ../win32/gui/CheatDlg.c:691
+#: ../win32/gui/CheatDlg.c:690
 msgid "C&lose"
 msgstr "Закрыть"
 
-#: ../win32/gui/CheatDlg.c:693
+#: ../win32/gui/CheatDlg.c:692
 msgid "8-bit"
 msgstr "8-бит"
 
-#: ../win32/gui/CheatDlg.c:694
+#: ../win32/gui/CheatDlg.c:693
 msgid "16-bit"
 msgstr "16-бит"
 
-#: ../win32/gui/CheatDlg.c:695
+#: ../win32/gui/CheatDlg.c:694
 msgid "32-bit"
 msgstr "32-бита"
 
-#: ../win32/gui/CheatDlg.c:696
+#: ../win32/gui/CheatDlg.c:695
 msgid "Decimal"
 msgstr "Десятичное"
 
-#: ../win32/gui/CheatDlg.c:697
+#: ../win32/gui/CheatDlg.c:696
 msgid "Hexadecimal"
 msgstr "Шестнадцатеричное"
 
-#: ../win32/gui/ConfigurePlugins.c:206
-#: ../gui/ConfDlg.c:675
+#: ../win32/gui/ConfigurePlugins.c:219 ../gui/ConfDlg.c:675
 msgid "Internal HLE Bios"
 msgstr "Внутренний HLE-биос"
 
-#: ../win32/gui/ConfigurePlugins.c:292
+#: ../win32/gui/ConfigurePlugins.c:305
 msgid "Configuration not OK!"
 msgstr "Настройка не завершена!"
 
-#: ../win32/gui/ConfigurePlugins.c:292
-#: ../gui/Cheat.c:156
-#: ../gui/Cheat.c:252
-#: ../gui/LnxMain.c:414
+#: ../win32/gui/ConfigurePlugins.c:305 ../gui/Cheat.c:155 ../gui/Cheat.c:251
+#: ../gui/LnxMain.c:418
 msgid "Error"
 msgstr "Ошибка"
 
-#: ../win32/gui/ConfigurePlugins.c:393
+#: ../win32/gui/ConfigurePlugins.c:406
 msgid "This plugin reports that should work correctly"
 msgstr "Плагин готов к работе"
 
-#: ../win32/gui/ConfigurePlugins.c:394
+#: ../win32/gui/ConfigurePlugins.c:407
 msgid "This plugin reports that should not work correctly"
 msgstr "Плагин вернул сообщение об ошибке"
 
-#: ../win32/gui/ConfigurePlugins.c:450
+#: ../win32/gui/ConfigurePlugins.c:463
 msgid "Select Plugins Directory"
 msgstr "Каталог с плагинами"
 
-#: ../win32/gui/ConfigurePlugins.c:459
+#: ../win32/gui/ConfigurePlugins.c:472
 msgid "Select Bios Directory"
 msgstr "Каталог с биосами"
 
-#: ../win32/gui/ConfigurePlugins.c:468
+#: ../win32/gui/ConfigurePlugins.c:481
 msgid "Configuration"
 msgstr "Настройка"
 
-#: ../win32/gui/ConfigurePlugins.c:472
+#: ../win32/gui/ConfigurePlugins.c:485
 msgid "Graphics"
 msgstr "Графика"
 
-#: ../win32/gui/ConfigurePlugins.c:473
+#: ../win32/gui/ConfigurePlugins.c:486
 msgid "First Controller"
 msgstr "Первый контроллер"
 
-#: ../win32/gui/ConfigurePlugins.c:474
+#: ../win32/gui/ConfigurePlugins.c:487
 msgid "Second Controller"
 msgstr "Второй контроллер"
 
-#: ../win32/gui/ConfigurePlugins.c:475
+#: ../win32/gui/ConfigurePlugins.c:488
 msgid "Sound"
 msgstr "Звук"
 
-#: ../win32/gui/ConfigurePlugins.c:476
+#: ../win32/gui/ConfigurePlugins.c:489
 msgid "Cdrom"
 msgstr "CD-привод"
 
-#: ../win32/gui/ConfigurePlugins.c:477
+#: ../win32/gui/ConfigurePlugins.c:490
 msgid "Bios"
 msgstr "Биос"
 
-#: ../win32/gui/ConfigurePlugins.c:478
+#: ../win32/gui/ConfigurePlugins.c:491
 msgid "Set Bios Directory"
 msgstr "Выберите каталог с биосами"
 
-#: ../win32/gui/ConfigurePlugins.c:479
+#: ../win32/gui/ConfigurePlugins.c:492
 msgid "Set Plugins Directory"
 msgstr "Выберите каталог с плагинами"
 
-#: ../win32/gui/ConfigurePlugins.c:480
-#: ../win32/gui/ConfigurePlugins.c:483
-#: ../win32/gui/ConfigurePlugins.c:486
-#: ../win32/gui/ConfigurePlugins.c:489
-#: ../win32/gui/ConfigurePlugins.c:492
-#: ../win32/gui/ConfigurePlugins.c:604
+#: ../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:481
-#: ../win32/gui/ConfigurePlugins.c:484
-#: ../win32/gui/ConfigurePlugins.c:487
-#: ../win32/gui/ConfigurePlugins.c:490
-#: ../win32/gui/ConfigurePlugins.c:493
-#: ../win32/gui/ConfigurePlugins.c:605
+#: ../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:482
-#: ../win32/gui/ConfigurePlugins.c:485
-#: ../win32/gui/ConfigurePlugins.c:488
-#: ../win32/gui/ConfigurePlugins.c:491
-#: ../win32/gui/ConfigurePlugins.c:494
-#: ../win32/gui/ConfigurePlugins.c:606
+#: ../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 "О..."
 
-#: ../win32/gui/ConfigurePlugins.c:599
+#: ../win32/gui/ConfigurePlugins.c:612
 msgid "NetPlay Configuration"
 msgstr "Настройка сетевой игры"
 
-#: ../win32/gui/ConfigurePlugins.c:603
+#: ../win32/gui/ConfigurePlugins.c:616 ../plugins/dfnet/gui.c:30
+#: ../plugins/dfnet/gui.c:74
 msgid "NetPlay"
 msgstr "Сетевая игра"
 
-#: ../win32/gui/ConfigurePlugins.c:607
-msgid "Note: The NetPlay Plugin Directory should be the same as the other Plugins."
+#: ../win32/gui/ConfigurePlugins.c:620
+msgid ""
+"Note: The NetPlay Plugin Directory should be the same as the other Plugins."
 msgstr ""
 
-#: ../win32/gui/plugin.c:90
-#: ../win32/gui/WndMain.c:281
-#, c-format
-msgid "*PCSX*: Saved State %d"
-msgstr "*PCSX*: Состояние сохранено %d"
-
-#: ../win32/gui/plugin.c:91
-#: ../win32/gui/WndMain.c:282
-#, c-format
-msgid "*PCSX*: Error Saving State %d"
-msgstr "*PCSX*: Ошибка сохранения состояния %d"
-
-#: ../win32/gui/plugin.c:107
-#: ../win32/gui/WndMain.c:259
-#, c-format
-msgid "*PCSX*: Loaded State %d"
-msgstr "PCSX*: Состояние загружено %d"
-
-#: ../win32/gui/plugin.c:108
-#: ../win32/gui/WndMain.c:260
-#, c-format
-msgid "*PCSX*: Error Loading State %d"
-msgstr "*PCSX*: Ошибка загрузки состояния %d"
-
-#: ../win32/gui/plugin.c:119
-#, c-format
-msgid "*PCSX*: Sio Irq Always Enabled"
-msgstr "*PCSX*: Удерживание линии прерывания SIO включено"
-
-#: ../win32/gui/plugin.c:120
-#, c-format
-msgid "*PCSX*: Sio Irq Not Always Enabled"
-msgstr "*PCSX*: Удерживание линии прерывания SIO выключено"
-
-#: ../win32/gui/plugin.c:127
-#, c-format
-msgid "*PCSX*: Black&White Mdecs Only Enabled"
-msgstr "*PCSX*: Режим чёрно-белых видео вставок (Mdecs) включен"
-
-#: ../win32/gui/plugin.c:128
-#, c-format
-msgid "*PCSX*: Black&White Mdecs Only Disabled"
-msgstr "*PCSX*: Режим чёрно-белых видео вставок (Mdecs) выключен"
-
-#: ../win32/gui/plugin.c:135
-#, c-format
-msgid "*PCSX*: Xa Enabled"
-msgstr "*PCSX*: Xa включено"
-
-#: ../win32/gui/plugin.c:136
-#, c-format
-msgid "*PCSX*: Xa Disabled"
-msgstr "*PCSX*: Xa выключено"
-
-#: ../win32/gui/plugin.c:145
-msgid "*PCSX*: CdRom Case Opened"
-msgstr "*PCSX*: крышка CD-привода открыта"
-
-#: ../win32/gui/plugin.c:150
-msgid "*PCSX*: CdRom Case Closed"
-msgstr "*PCSX*: крышка CD-привода закрыта"
-
-#: ../win32/gui/plugin.c:177
-msgid "Connecting..."
-msgstr "Соединение..."
-
-#: ../win32/gui/plugin.c:179
-#: ../win32/gui/plugin.c:186
-#, c-format
-msgid "Please wait while connecting... %c\n"
-msgstr "Идёт соединение, подождите... %c\n"
-
-#: ../win32/gui/plugin.c:216
-msgid "Error Opening CDR Plugin"
-msgstr "Ошибка открытия CDR плагина"
-
-#: ../win32/gui/plugin.c:279
-#, c-format
-msgid "Error Opening GPU Plugin (%d)"
-msgstr "Ошибка открытия GPU плагина (%d)"
-
-#: ../win32/gui/plugin.c:281
-#, c-format
-msgid "Error Opening SPU Plugin (%d)"
-msgstr "Ошибка открытия SPU плагина (%d)"
-
-#: ../win32/gui/plugin.c:284
-#, c-format
-msgid "Error Opening PAD1 Plugin (%d)"
-msgstr "Ошибка открытия PAD1 плагина (%d)"
-
-#: ../win32/gui/plugin.c:286
-#, c-format
-msgid "Error Opening PAD2 Plugin (%d)"
-msgstr "Ошибка открытия PAD2 плагина (%d)"
-
-#: ../win32/gui/plugin.c:309
-msgid "Error Closing CDR Plugin"
-msgstr "Ошибка при закрытии CD-ROM плагина (%d)"
-
-#: ../win32/gui/plugin.c:311
-msgid "Error Closing GPU Plugin"
-msgstr "Ошибка при закрытии GPU плагина"
-
-#: ../win32/gui/plugin.c:313
-msgid "Error Closing SPU Plugin"
-msgstr "Ошибка при закрытии SPU плагина"
-
-#: ../win32/gui/plugin.c:315
-msgid "Error Closing PAD1 Plugin"
-msgstr "Ошибка при закрытии PAD1 плагина"
-
-#: ../win32/gui/plugin.c:317
-msgid "Error Closing PAD2 Plugin"
-msgstr "Ошибка при закрытии PAD2 плагина"
-
-#: ../win32/gui/plugin.c:335
-#, c-format
-msgid "CDRinit error: %d"
-msgstr "Ошибка в CDRinit: %d"
-
-#: ../win32/gui/plugin.c:337
-#, c-format
-msgid "GPUinit error: %d"
-msgstr "Ошибка в GPUinit: %d"
-
-#: ../win32/gui/plugin.c:339
-#, c-format
-msgid "SPUinit error: %d"
-msgstr "Ошибка в SPUinit: %d"
-
-#: ../win32/gui/plugin.c:341
-#, c-format
-msgid "PAD1init error: %d"
-msgstr "Ошибка в PAD1init: %d"
-
-#: ../win32/gui/plugin.c:343
-#, c-format
-msgid "PAD2init error: %d"
-msgstr "Ошибка в PAD2init: %d"
-
-#: ../win32/gui/plugin.c:346
-#, c-format
-msgid "NETinit error: %d"
-msgstr "Ошибка в NETinit: %d"
-
 #: ../win32/gui/WndMain.c:76
 msgid "Arabic"
 msgstr "Арабский"
@@ -602,9 +407,8 @@ msgstr "Немецкий"
 msgid "Greek"
 msgstr "Греческий"
 
-#: ../win32/gui/WndMain.c:80
-#: ../win32/gui/WndMain.c:1559
-#: ../win32/gui/WndMain.c:1561
+#: ../win32/gui/WndMain.c:80 ../win32/gui/WndMain.c:1558
+#: ../win32/gui/WndMain.c:1560
 msgid "English"
 msgstr "Английский"
 
@@ -652,8 +456,27 @@ msgstr "Японский"
 msgid "Korean"
 msgstr "Корейский"
 
-#: ../win32/gui/WndMain.c:300
-#: ../win32/gui/WndMain.c:352
+#: ../win32/gui/WndMain.c:259 ../win32/gui/plugin.c:107
+#, c-format
+msgid "*PCSX*: Loaded State %d"
+msgstr "PCSX*: Состояние загружено %d"
+
+#: ../win32/gui/WndMain.c:260 ../win32/gui/plugin.c:108
+#, c-format
+msgid "*PCSX*: Error Loading State %d"
+msgstr "*PCSX*: Ошибка загрузки состояния %d"
+
+#: ../win32/gui/WndMain.c:281 ../win32/gui/plugin.c:90
+#, c-format
+msgid "*PCSX*: Saved State %d"
+msgstr "*PCSX*: Состояние сохранено %d"
+
+#: ../win32/gui/WndMain.c:282 ../win32/gui/plugin.c:91
+#, c-format
+msgid "*PCSX*: Error Saving State %d"
+msgstr "*PCSX*: Ошибка сохранения состояния %d"
+
+#: ../win32/gui/WndMain.c:300 ../win32/gui/WndMain.c:352
 msgid "PCSX State Format"
 msgstr "Формат состояния PCSX"
 
@@ -677,16 +500,12 @@ msgstr "*PCSX*: Состояние сохранено %s"
 msgid "*PCSX*: Error Saving State %s"
 msgstr "*PCSX*: Ошибка сохранения состояния %s"
 
-#: ../win32/gui/WndMain.c:429
-#: ../win32/gui/WndMain.c:478
-#: ../gui/Gtk2Gui.c:484
+#: ../win32/gui/WndMain.c:429 ../win32/gui/WndMain.c:478 ../gui/Gtk2Gui.c:484
 #: ../gui/Gtk2Gui.c:609
 msgid "The CD does not appear to be a valid Playstation CD"
 msgstr "Установленный CD-диск не является диском PlayStation"
 
-#: ../win32/gui/WndMain.c:435
-#: ../win32/gui/WndMain.c:484
-#: ../gui/Gtk2Gui.c:492
+#: ../win32/gui/WndMain.c:435 ../win32/gui/WndMain.c:484 ../gui/Gtk2Gui.c:492
 #: ../gui/Gtk2Gui.c:617
 msgid "Could not load CD-ROM!"
 msgstr "Не удалось загрузить CD-ROM!"
@@ -694,16 +513,14 @@ msgstr "Не удалось загрузить CD-ROM!"
 #: ../win32/gui/WndMain.c:445
 msgid "Running BIOS is not supported with Internal HLE Bios."
 msgstr ""
-"Стандартная оболочка, позволяющая управлять картами памяти и проигрывать DA музыку, при "
-"использовании HLE-биоса недоступна."
+"Стандартная оболочка, позволяющая управлять картами памяти и проигрывать DA "
+"музыку, при использовании HLE-биоса недоступна."
 
-#: ../win32/gui/WndMain.c:664
-#: ../gui/MemcardDlg.c:59
+#: ../win32/gui/WndMain.c:664 ../gui/MemcardDlg.c:62
 msgid "Title"
 msgstr "Название"
 
-#: ../win32/gui/WndMain.c:670
-#: ../gui/MemcardDlg.c:65
+#: ../win32/gui/WndMain.c:670 ../gui/MemcardDlg.c:68
 msgid "Status"
 msgstr "Статус"
 
@@ -723,24 +540,17 @@ msgstr "соединительный блок"
 msgid "terminiting link block"
 msgstr "завершающий соединительный блок"
 
-#: ../win32/gui/WndMain.c:867
-#: ../gui/MemcardDlg.c:147
-#: ../gui/MemcardDlg.c:244
+#: ../win32/gui/WndMain.c:867 ../gui/MemcardDlg.c:154 ../gui/MemcardDlg.c:252
 msgid "Deleted"
 msgstr "Удалено"
 
-#: ../win32/gui/WndMain.c:868
-#: ../win32/gui/WndMain.c:871
-#: ../gui/MemcardDlg.c:149
-#: ../gui/MemcardDlg.c:153
-#: ../gui/MemcardDlg.c:246
-#: ../gui/MemcardDlg.c:250
+#: ../win32/gui/WndMain.c:868 ../win32/gui/WndMain.c:871
+#: ../gui/MemcardDlg.c:156 ../gui/MemcardDlg.c:160 ../gui/MemcardDlg.c:254
+#: ../gui/MemcardDlg.c:258
 msgid "Free"
 msgstr "Свободно"
 
-#: ../win32/gui/WndMain.c:870
-#: ../gui/MemcardDlg.c:151
-#: ../gui/MemcardDlg.c:248
+#: ../win32/gui/WndMain.c:870 ../gui/MemcardDlg.c:158 ../gui/MemcardDlg.c:256
 msgid "Used"
 msgstr "Использовано"
 
@@ -748,18 +558,15 @@ msgstr "Использовано"
 msgid "Memcard Manager"
 msgstr "Менеджер карт памяти"
 
-#: ../win32/gui/WndMain.c:968
-#: ../win32/gui/WndMain.c:971
+#: ../win32/gui/WndMain.c:968 ../win32/gui/WndMain.c:971
 msgid "Select Mcd"
 msgstr "Выбрать"
 
-#: ../win32/gui/WndMain.c:969
-#: ../win32/gui/WndMain.c:972
+#: ../win32/gui/WndMain.c:969 ../win32/gui/WndMain.c:972
 msgid "Format Mcd"
 msgstr "Форматировать"
 
-#: ../win32/gui/WndMain.c:970
-#: ../win32/gui/WndMain.c:973
+#: ../win32/gui/WndMain.c:970 ../win32/gui/WndMain.c:973
 msgid "Reload Mcd"
 msgstr "Перезагрузить"
 
@@ -795,14 +602,12 @@ msgstr "Карта памяти 2"
 msgid "Are you sure you want to paste this selection?"
 msgstr "Вы уверены в том, что хотите вставить выделенное?"
 
-#: ../win32/gui/WndMain.c:1036
-#: ../win32/gui/WndMain.c:1147
+#: ../win32/gui/WndMain.c:1036 ../win32/gui/WndMain.c:1147
 #: ../win32/gui/WndMain.c:1154
 msgid "Confirmation"
 msgstr "Подтверждение"
 
-#: ../win32/gui/WndMain.c:1147
-#: ../win32/gui/WndMain.c:1154
+#: ../win32/gui/WndMain.c:1147 ../win32/gui/WndMain.c:1154
 msgid "Are you sure you want to format this Memory Card?"
 msgstr "Вы уверены в том, что хотите отформатировать карту памяти?"
 
@@ -826,8 +631,7 @@ msgstr "Чёрно-белые заставки"
 msgid "Disable Cd audio"
 msgstr "Выключить CD музыку"
 
-#: ../win32/gui/WndMain.c:1209
-#: ../data/pcsx.glade2:1601
+#: ../win32/gui/WndMain.c:1209 ../data/pcsx.glade2:1601
 msgid "Autodetect"
 msgstr "Автоопределение"
 
@@ -835,13 +639,11 @@ msgstr "Автоопределение"
 msgid "Enable Interpreter Cpu"
 msgstr "Включить интерпретатор ЦПУ"
 
-#: ../win32/gui/WndMain.c:1211
-#: ../data/pcsx.glade2:1457
+#: ../win32/gui/WndMain.c:1211 ../data/pcsx.glade2:1457
 msgid "Enable Console Output"
 msgstr "Включить вывод в консоль"
 
-#: ../win32/gui/WndMain.c:1212
-#: ../data/pcsx.glade2:1407
+#: ../win32/gui/WndMain.c:1212 ../data/pcsx.glade2:1407
 msgid "Enable Debugger"
 msgstr "Включить отладчик"
 
@@ -849,13 +651,11 @@ msgstr "Включить отладчик"
 msgid "Spu Irq Always Enabled"
 msgstr "Удерживание линии прерывания SPU"
 
-#: ../win32/gui/WndMain.c:1214
-#: ../data/pcsx.glade2:1544
+#: ../win32/gui/WndMain.c:1214 ../data/pcsx.glade2:1544
 msgid "Parasite Eve 2, Vandal Hearts 1/2 Fix"
 msgstr "Исправление для Parasite Eve 2 и Vandal Hearts"
 
-#: ../win32/gui/WndMain.c:1215
-#: ../data/pcsx.glade2:1559
+#: ../win32/gui/WndMain.c:1215 ../data/pcsx.glade2:1559
 msgid "InuYasha Sengoku Battle Fix"
 msgstr "Исправление для InuYasha Sengoku Battle"
 
@@ -869,264 +669,364 @@ msgstr "Опции"
 msgid "Psx System Type"
 msgstr "Тип системы psx"
 
-#: ../win32/gui/WndMain.c:1323
+#: ../win32/gui/WndMain.c:1322
 msgid "Psx Mcd Format (*.mcr;*.mc;*.mem;*.vgs;*.mcd;*.gme;*.ddf)"
 msgstr "Форматы карт памяти psx (*.mcr;*.mc;*.mem;*.vgs;*.mcd;*.gme;*.ddf)"
 
-#: ../win32/gui/WndMain.c:1328
+#: ../win32/gui/WndMain.c:1327
 msgid "Psx Memory Card (*.mcr;*.mc)"
 msgstr "Карта памяти psx (*.mcr;*.mc)"
 
-#: ../win32/gui/WndMain.c:1333
+#: ../win32/gui/WndMain.c:1332
 msgid "CVGS Memory Card (*.mem;*.vgs)"
 msgstr "Карта памяти CVGS (*.mem;*.vgs)"
 
-#: ../win32/gui/WndMain.c:1338
+#: ../win32/gui/WndMain.c:1337
 msgid "Bleem Memory Card (*.mcd)"
 msgstr "Карта памяти Bleem (*.mcd)"
 
-#: ../win32/gui/WndMain.c:1343
+#: ../win32/gui/WndMain.c:1342
 msgid "DexDrive Memory Card (*.gme)"
 msgstr "Карта памяти DexDrive (*.gme)"
 
-#: ../win32/gui/WndMain.c:1348
+#: ../win32/gui/WndMain.c:1347
 msgid "DataDeck Memory Card (*.ddf)"
 msgstr "Карта памяти DataDeck (*.ddf)"
 
-#: ../win32/gui/WndMain.c:1353
-#: ../win32/gui/WndMain.c:1434
-#: ../gui/Cheat.c:322
-#: ../gui/Gtk2Gui.c:421
-#: ../gui/Gtk2Gui.c:560
+#: ../win32/gui/WndMain.c:1352 ../win32/gui/WndMain.c:1433 ../gui/Cheat.c:321
+#: ../gui/Gtk2Gui.c:421 ../gui/Gtk2Gui.c:560
 msgid "All Files"
 msgstr "Все файлы"
 
-#: ../win32/gui/WndMain.c:1392
+#: ../win32/gui/WndMain.c:1391
 msgid "Psx Exe Format"
 msgstr "Psx exe формат"
 
-#: ../win32/gui/WndMain.c:1429
+#: ../win32/gui/WndMain.c:1428
 msgid "Psx Isos (*.iso;*.mdf;*.img;*.bin)"
 msgstr "Образы диска psx (*.iso;*.mdf;*.img;*.bin)"
 
-#: ../win32/gui/WndMain.c:1505
+#: ../win32/gui/WndMain.c:1504
 msgid "&File"
 msgstr "Файл(&F)"
 
-#: ../win32/gui/WndMain.c:1506
+#: ../win32/gui/WndMain.c:1505
 msgid "E&xit"
 msgstr "Выход(&X)"
 
-#: ../win32/gui/WndMain.c:1508
+#: ../win32/gui/WndMain.c:1507
 msgid "Run &EXE..."
 msgstr "Запустить EXE"
 
-#: ../win32/gui/WndMain.c:1509
+#: ../win32/gui/WndMain.c:1508
 msgid "Run &BIOS"
 msgstr "Запустить BIOS"
 
-#: ../win32/gui/WndMain.c:1510
+#: ../win32/gui/WndMain.c:1509
 msgid "Run &ISO..."
 msgstr "Запустить ISO"
 
-#: ../win32/gui/WndMain.c:1511
+#: ../win32/gui/WndMain.c:1510
 msgid "Run &CD"
 msgstr "Запустить CD"
 
-#: ../win32/gui/WndMain.c:1513
+#: ../win32/gui/WndMain.c:1512
 msgid "&Emulator"
 msgstr "Эмулятор(&E)"
 
-#: ../win32/gui/WndMain.c:1514
+#: ../win32/gui/WndMain.c:1513
 msgid "&States"
 msgstr "Состояния(&S)"
 
-#: ../win32/gui/WndMain.c:1516
+#: ../win32/gui/WndMain.c:1515
 msgid "S&witch ISO..."
 msgstr "Изменить ISO(&W)..."
 
-#: ../win32/gui/WndMain.c:1518
+#: ../win32/gui/WndMain.c:1517
 msgid "Re&set"
 msgstr "Сброс(&S)"
 
-#: ../win32/gui/WndMain.c:1519
+#: ../win32/gui/WndMain.c:1518
 msgid "&Run"
 msgstr "Старт(&R)"
 
-#: ../win32/gui/WndMain.c:1520
+#: ../win32/gui/WndMain.c:1519
 msgid "&Save"
 msgstr "Сохранить(&S)"
 
-#: ../win32/gui/WndMain.c:1521
+#: ../win32/gui/WndMain.c:1520
 msgid "&Load"
 msgstr "Загрузить(&L)"
 
-#: ../win32/gui/WndMain.c:1522
-#: ../win32/gui/WndMain.c:1528
+#: ../win32/gui/WndMain.c:1521 ../win32/gui/WndMain.c:1527
 msgid "&Other..."
 msgstr "Другой(&O)..."
 
-#: ../win32/gui/WndMain.c:1523
-#: ../win32/gui/WndMain.c:1529
+#: ../win32/gui/WndMain.c:1522 ../win32/gui/WndMain.c:1528
 msgid "Slot &5"
 msgstr "Слот 5(&5)"
 
-#: ../win32/gui/WndMain.c:1524
-#: ../win32/gui/WndMain.c:1530
+#: ../win32/gui/WndMain.c:1523 ../win32/gui/WndMain.c:1529
 msgid "Slot &4"
 msgstr "Слот 4(&4)"
 
-#: ../win32/gui/WndMain.c:1525
-#: ../win32/gui/WndMain.c:1531
+#: ../win32/gui/WndMain.c:1524 ../win32/gui/WndMain.c:1530
 msgid "Slot &3"
 msgstr "Слот 3(&3)"
 
-#: ../win32/gui/WndMain.c:1526
-#: ../win32/gui/WndMain.c:1532
+#: ../win32/gui/WndMain.c:1525 ../win32/gui/WndMain.c:1531
 msgid "Slot &2"
 msgstr "Слот 2(&2)"
 
-#: ../win32/gui/WndMain.c:1527
-#: ../win32/gui/WndMain.c:1533
+#: ../win32/gui/WndMain.c:1526 ../win32/gui/WndMain.c:1532
 msgid "Slot &1"
 msgstr "Слот 1(&1)"
 
-#: ../win32/gui/WndMain.c:1535
+#: ../win32/gui/WndMain.c:1534
 msgid "&Configuration"
 msgstr "Настройка(&C)"
 
-#: ../win32/gui/WndMain.c:1536
+#: ../win32/gui/WndMain.c:1535
 msgid "Cheat &Search..."
 msgstr "Поиск читов...(&S)"
 
-#: ../win32/gui/WndMain.c:1537
+#: ../win32/gui/WndMain.c:1536
 msgid "Ch&eat Code..."
 msgstr "Чит код...(&E)"
 
-#: ../win32/gui/WndMain.c:1540
+#: ../win32/gui/WndMain.c:1539
 msgid "&Language"
 msgstr "Язык(&L)"
 
-#: ../win32/gui/WndMain.c:1565
+#: ../win32/gui/WndMain.c:1564
 msgid "&Memory cards..."
 msgstr "Карты памяти(&M)..."
 
-#: ../win32/gui/WndMain.c:1566
+#: ../win32/gui/WndMain.c:1565
 msgid "C&PU..."
 msgstr "ЦПУ(&P)..."
 
-#: ../win32/gui/WndMain.c:1568
+#: ../win32/gui/WndMain.c:1567
 msgid "&NetPlay..."
 msgstr "Сетевая игра..."
 
-#: ../win32/gui/WndMain.c:1570
+#: ../win32/gui/WndMain.c:1569
 msgid "&Controllers..."
 msgstr "Управление..."
 
-#: ../win32/gui/WndMain.c:1571
+#: ../win32/gui/WndMain.c:1570
 msgid "CD-&ROM..."
 msgstr "CD-привод(&R)..."
 
-#: ../win32/gui/WndMain.c:1572
+#: ../win32/gui/WndMain.c:1571
 msgid "&Sound..."
 msgstr "Звук..."
 
-#: ../win32/gui/WndMain.c:1573
+#: ../win32/gui/WndMain.c:1572
 msgid "&Graphics..."
 msgstr "Графика..."
 
-#: ../win32/gui/WndMain.c:1575
+#: ../win32/gui/WndMain.c:1574
 msgid "&Plugins && Bios..."
 msgstr "Плагины и биос(&P)..."
 
-#: ../win32/gui/WndMain.c:1577
+#: ../win32/gui/WndMain.c:1576
 msgid "&Help"
 msgstr "Помощь(&H)"
 
-#: ../win32/gui/WndMain.c:1578
+#: ../win32/gui/WndMain.c:1577
 msgid "&About..."
 msgstr "О(&A)..."
 
-#: ../win32/gui/WndMain.c:1764
+#: ../win32/gui/WndMain.c:1756
 msgid "Pcsx Msg"
 msgstr "Сообщение pcsx"
 
-#: ../win32/gui/WndMain.c:1767
+#: ../win32/gui/WndMain.c:1759
 msgid "Error Loading Symbol"
 msgstr "Ошибка загрузки символа"
 
-#: ../gui/Cheat.c:118
-#: ../gui/Cheat.c:203
+#: ../win32/gui/plugin.c:119
+#, c-format
+msgid "*PCSX*: Sio Irq Always Enabled"
+msgstr "*PCSX*: Удерживание линии прерывания SIO включено"
+
+#: ../win32/gui/plugin.c:120
+#, c-format
+msgid "*PCSX*: Sio Irq Not Always Enabled"
+msgstr "*PCSX*: Удерживание линии прерывания SIO выключено"
+
+#: ../win32/gui/plugin.c:127
+#, c-format
+msgid "*PCSX*: Black&White Mdecs Only Enabled"
+msgstr "*PCSX*: Режим чёрно-белых видео вставок (Mdecs) включен"
+
+#: ../win32/gui/plugin.c:128
+#, c-format
+msgid "*PCSX*: Black&White Mdecs Only Disabled"
+msgstr "*PCSX*: Режим чёрно-белых видео вставок (Mdecs) выключен"
+
+#: ../win32/gui/plugin.c:135
+#, c-format
+msgid "*PCSX*: Xa Enabled"
+msgstr "*PCSX*: Xa включено"
+
+#: ../win32/gui/plugin.c:136
+#, c-format
+msgid "*PCSX*: Xa Disabled"
+msgstr "*PCSX*: Xa выключено"
+
+#: ../win32/gui/plugin.c:145
+msgid "*PCSX*: CdRom Case Opened"
+msgstr "*PCSX*: крышка CD-привода открыта"
+
+#: ../win32/gui/plugin.c:150
+msgid "*PCSX*: CdRom Case Closed"
+msgstr "*PCSX*: крышка CD-привода закрыта"
+
+#: ../win32/gui/plugin.c:177
+msgid "Connecting..."
+msgstr "Соединение..."
+
+#: ../win32/gui/plugin.c:179 ../win32/gui/plugin.c:186
+#, c-format
+msgid "Please wait while connecting... %c\n"
+msgstr "Идёт соединение, подождите... %c\n"
+
+#: ../win32/gui/plugin.c:214
+msgid "Error Opening CDR Plugin"
+msgstr "Ошибка открытия CDR плагина"
+
+#: ../win32/gui/plugin.c:277
+#, c-format
+msgid "Error Opening GPU Plugin (%d)"
+msgstr "Ошибка открытия GPU плагина (%d)"
+
+#: ../win32/gui/plugin.c:279
+#, c-format
+msgid "Error Opening SPU Plugin (%d)"
+msgstr "Ошибка открытия SPU плагина (%d)"
+
+#: ../win32/gui/plugin.c:282
+#, c-format
+msgid "Error Opening PAD1 Plugin (%d)"
+msgstr "Ошибка открытия PAD1 плагина (%d)"
+
+#: ../win32/gui/plugin.c:284
+#, c-format
+msgid "Error Opening PAD2 Plugin (%d)"
+msgstr "Ошибка открытия PAD2 плагина (%d)"
+
+#: ../win32/gui/plugin.c:307
+msgid "Error Closing CDR Plugin"
+msgstr "Ошибка при закрытии CD-ROM плагина (%d)"
+
+#: ../win32/gui/plugin.c:309
+msgid "Error Closing GPU Plugin"
+msgstr "Ошибка при закрытии GPU плагина"
+
+#: ../win32/gui/plugin.c:311
+msgid "Error Closing SPU Plugin"
+msgstr "Ошибка при закрытии SPU плагина"
+
+#: ../win32/gui/plugin.c:313
+msgid "Error Closing PAD1 Plugin"
+msgstr "Ошибка при закрытии PAD1 плагина"
+
+#: ../win32/gui/plugin.c:315
+msgid "Error Closing PAD2 Plugin"
+msgstr "Ошибка при закрытии PAD2 плагина"
+
+#: ../win32/gui/plugin.c:333
+#, c-format
+msgid "CDRinit error: %d"
+msgstr "Ошибка в CDRinit: %d"
+
+#: ../win32/gui/plugin.c:335
+#, c-format
+msgid "GPUinit error: %d"
+msgstr "Ошибка в GPUinit: %d"
+
+#: ../win32/gui/plugin.c:337
+#, c-format
+msgid "SPUinit error: %d"
+msgstr "Ошибка в SPUinit: %d"
+
+#: ../win32/gui/plugin.c:339
+#, c-format
+msgid "PAD1init error: %d"
+msgstr "Ошибка в PAD1init: %d"
+
+#: ../win32/gui/plugin.c:341
+#, c-format
+msgid "PAD2init error: %d"
+msgstr "Ошибка в PAD2init: %d"
+
+#: ../win32/gui/plugin.c:344
+#, c-format
+msgid "NETinit error: %d"
+msgstr "Ошибка в NETinit: %d"
+
+#: ../gui/Cheat.c:117 ../gui/Cheat.c:202
 msgid "Cheat Description:"
 msgstr "Описание чита:"
 
-#: ../gui/Cheat.c:307
+#: ../gui/Cheat.c:306
 msgid "Open Cheat File"
 msgstr "Открыть файл чита"
 
-#: ../gui/Cheat.c:317
-#: ../gui/Cheat.c:357
+#: ../gui/Cheat.c:316 ../gui/Cheat.c:356
 msgid "PCSX Cheat Code Files (*.cht)"
 msgstr "Файлы читов PCSX (*.cht)"
 
-#: ../gui/Cheat.c:347
+#: ../gui/Cheat.c:346
 msgid "Save Cheat File"
 msgstr "Сохранить чит файл"
 
-#: ../gui/Cheat.c:362
+#: ../gui/Cheat.c:361
 msgid "All Files (*.*)"
 msgstr "Все файлы (*.*)"
 
-#: ../gui/Cheat.c:395
-#: ../gui/Cheat.c:1125
-#: ../gui/ConfDlg.c:104
-#: ../gui/ConfDlg.c:200
-#: ../gui/DebugMemory.c:256
+#: ../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 не может быть загружен!"
 
-#: ../gui/Cheat.c:400
+#: ../gui/Cheat.c:399
 msgid "Cheat Codes"
 msgstr "Чит коды"
 
-#: ../gui/Cheat.c:406
+#: ../gui/Cheat.c:405
 msgid "Enable"
 msgstr "Включить"
 
-#: ../gui/Cheat.c:631
+#: ../gui/Cheat.c:630
 msgid "Freeze value"
 msgstr "Заморозить значение"
 
-#: ../gui/Cheat.c:730
+#: ../gui/Cheat.c:729
 msgid "Modify value"
 msgstr "Изменить значение"
 
-#: ../gui/Cheat.c:738
+#: ../gui/Cheat.c:737
 msgid "New value:"
 msgstr "Новое значение:"
 
-#: ../gui/Cheat.c:1135
+#: ../gui/Cheat.c:1134
 msgid "Search Results"
 msgstr "Результат поиска"
 
-#: ../gui/ConfDlg.c:112
-#: ../data/pcsx.glade2:779
+#: ../gui/ConfDlg.c:112 ../data/pcsx.glade2:779
 msgid "Configure PCSX"
 msgstr "Настройка PCSX"
 
-#: ../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 "Плагин не нуждается в настройке."
 
@@ -1135,57 +1035,53 @@ 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"
 
-#: ../gui/DebugMemory.c:102
-#: ../data/pcsx.glade2:3270
+#: ../gui/DebugMemory.c:103 ../data/pcsx.glade2:3260
 msgid "Memory Dump"
 msgstr "Дамп памяти"
 
-#: ../gui/DebugMemory.c:110
+#: ../gui/DebugMemory.c:111
 msgid "Start Address (Hexadecimal):"
 msgstr "Начальный адрес (шестнадцатиричный):"
 
-#: ../gui/DebugMemory.c:118
+#: ../gui/DebugMemory.c:121
 msgid "Length (Decimal):"
 msgstr "Длина (десятичный):"
 
-#: ../gui/DebugMemory.c:144
+#: ../gui/DebugMemory.c:147
 msgid "Dump to File"
 msgstr "Дамп в файл"
 
-#: ../gui/DebugMemory.c:159
+#: ../gui/DebugMemory.c:162
 #, c-format
 msgid "Error writing to %s!"
 msgstr "Ошибка записи в %s!"
 
-#: ../gui/DebugMemory.c:177
+#: ../gui/DebugMemory.c:180
 msgid "Memory Patch"
 msgstr "Патч памяти"
 
-#: ../gui/DebugMemory.c:185
-#: ../data/pcsx.glade2:3292
+#: ../gui/DebugMemory.c:188 ../data/pcsx.glade2:3282
 msgid "Address (Hexadecimal):"
 msgstr "Адрес (шестнадцатиричный):"
 
-#: ../gui/DebugMemory.c:195
+#: ../gui/DebugMemory.c:198
 msgid "Value (Hexa string):"
 msgstr "Значение (Hexa string):"
 
-#: ../gui/DebugMemory.c:261
+#: ../gui/DebugMemory.c:264
 msgid "Memory Viewer"
 msgstr "Просмотр памяти"
 
-#: ../gui/DebugMemory.c:266
+#: ../gui/DebugMemory.c:269
 msgid "Address"
 msgstr "Адрес"
 
-#: ../gui/DebugMemory.c:284
+#: ../gui/DebugMemory.c:287
 msgid "Text"
 msgstr "Текст"
 
@@ -1213,13 +1109,11 @@ msgstr "Недопустимый формат файла"
 msgid "The file does not appear to be a valid Playstation executable"
 msgstr "Файл не является запускным файлом PlayStation"
 
-#: ../gui/Gtk2Gui.c:484
-#: ../gui/Gtk2Gui.c:609
+#: ../gui/Gtk2Gui.c:484 ../gui/Gtk2Gui.c:609
 msgid "CD ROM failed"
 msgstr "Ошибка CD-привода"
 
-#: ../gui/Gtk2Gui.c:492
-#: ../gui/Gtk2Gui.c:617
+#: ../gui/Gtk2Gui.c:492 ../gui/Gtk2Gui.c:617
 msgid "The CD-ROM could not be loaded"
 msgstr "Не удалось загрузить CD-ROM"
 
@@ -1230,8 +1124,8 @@ msgstr "Не удалось запустить биос"
 #: ../gui/Gtk2Gui.c:506
 msgid "Running BIOS is not supported with Internal HLE BIOS."
 msgstr ""
-"Стандартная оболочка, позволяющая управлять картами памяти и проигрывать DA музыку, при "
-"использовании HLE-биоса недоступна."
+"Стандартная оболочка, позволяющая управлять картами памяти и проигрывать DA "
+"музыку, при использовании HLE-биоса недоступна."
 
 #: ../gui/Gtk2Gui.c:535
 msgid "Open PSX Disc Image File"
@@ -1241,32 +1135,31 @@ msgstr "Открыть образ PSX диска"
 msgid "PSX Image Files (*.bin, *.img, *.mdf, *.iso)"
 msgstr "Образы PSX дисков (*.bin, *.img, *.mdf, *.iso)"
 
-#: ../gui/Gtk2Gui.c:766
+#: ../gui/Gtk2Gui.c:770
 #, c-format
 msgid "Loaded state %s."
 msgstr "Состояние загружено %s."
 
-#: ../gui/Gtk2Gui.c:770
+#: ../gui/Gtk2Gui.c:773
 #, c-format
 msgid "Error loading state %s!"
 msgstr "Ошибка загрузки состояния %s!"
 
-#: ../gui/Gtk2Gui.c:781
+#: ../gui/Gtk2Gui.c:784
 #, c-format
 msgid "Saved state %s."
 msgstr "Состояние сохранено %s."
 
-#: ../gui/Gtk2Gui.c:783
+#: ../gui/Gtk2Gui.c:786
 #, c-format
 msgid "Error saving state %s!"
 msgstr "Ошибка сохранения состояния %s!"
 
-#: ../gui/Gtk2Gui.c:816
-#: ../gui/Gtk2Gui.c:843
+#: ../gui/Gtk2Gui.c:821 ../gui/Gtk2Gui.c:849
 msgid "Select State File"
 msgstr "Выберите файл состояния"
 
-#: ../gui/Gtk2Gui.c:900
+#: ../gui/Gtk2Gui.c:905
 msgid "Notice"
 msgstr "Сообщение"
 
@@ -1275,7 +1168,7 @@ msgstr "Сообщение"
 msgid "Creating memory card: %s\n"
 msgstr "Создание карты памяти: %s\n"
 
-#: ../gui/LnxMain.c:321
+#: ../gui/LnxMain.c:325
 msgid ""
 " pcsx [options] [file]\n"
 "\toptions:\n"
@@ -1299,143 +1192,149 @@ msgstr ""
 "\t-h -help\tПоказать это сообщение\n"
 "\tfile\t\tЗагрузить файл\n"
 
-#: ../gui/LnxMain.c:358
+#: ../gui/LnxMain.c:362
 #, c-format
-msgid "PCSX cannot be configured without using the GUI -- you should restart without -nogui.\n"
+msgid ""
+"PCSX cannot be configured without using the GUI -- you should restart "
+"without -nogui.\n"
 msgstr ""
-"PCSX не может быть настроен без использования графического интерфейса -- необходимо "
-"перезапустить эмулятор без опции -nogui.\n"
+"PCSX не может быть настроен без использования графического интерфейса -- "
+"необходимо перезапустить эмулятор без опции -nogui.\n"
 
-#: ../gui/LnxMain.c:414
+#: ../gui/LnxMain.c:418
 msgid "Failed loading plugins!"
 msgstr "Ошибка загрузки плагинов!"
 
-#: ../gui/LnxMain.c:431
+#: ../gui/LnxMain.c:435
 #, c-format
 msgid "Could not load CD-ROM!\n"
 msgstr "Не удалось загрузить CD-ROM!\n"
 
-#: ../gui/LnxMain.c:467
+#: ../gui/LnxMain.c:466
 #, c-format
 msgid "PSX emulator couldn't be initialized.\n"
 msgstr "Ошибка инициализации эмулятора.\n"
 
-#: ../gui/MemcardDlg.c:53
+#: ../gui/MemcardDlg.c:56
 msgid "Icon"
 msgstr "Иконка"
 
-#: ../gui/MemcardDlg.c:71
+#: ../gui/MemcardDlg.c:74
 msgid "ID"
 msgstr "Идентификатор"
 
-#: ../gui/MemcardDlg.c:77
+#: ../gui/MemcardDlg.c:80
 msgid "Name"
 msgstr "Название"
 
-#: ../gui/MemcardDlg.c:297
+#: ../gui/MemcardDlg.c:317
 msgid "Select A File"
 msgstr "Выберите файл"
 
-#: ../gui/MemcardDlg.c:338
+#: ../gui/MemcardDlg.c:358
 msgid "Format this Memory Card?"
 msgstr "Отформатировать карту памяти?"
 
-#: ../gui/MemcardDlg.c:340
-msgid "If you format the memory card, the card will be empty, and any existing data overwritten."
-msgstr "При форматировании все данные на карте памяти будут безвозвратно утеряны."
+#: ../gui/MemcardDlg.c:360
+msgid ""
+"If you format the memory card, the card will be empty, and any existing data "
+"overwritten."
+msgstr ""
+"При форматировании все данные на карте памяти будут безвозвратно утеряны."
 
-#: ../gui/MemcardDlg.c:343
+#: ../gui/MemcardDlg.c:363
 msgid "Format card"
 msgstr "Отформатировать карту памяти"
 
-#: ../gui/MemcardDlg.c:367
+#: ../gui/MemcardDlg.c:387
 msgid "Create a new Memory Card"
 msgstr "Создать новую карту памяти"
 
-#: ../gui/MemcardDlg.c:376
+#: ../gui/MemcardDlg.c:396
 msgid "New Memory Card.mcd"
 msgstr ""
 
-#: ../gui/MemcardDlg.c:477
+#: ../gui/MemcardDlg.c:497
 msgid "No free space on memory card"
 msgstr "Недостаточно места на карте памяти"
 
-#: ../gui/MemcardDlg.c:478
-msgid "There are no free slots available on the target memory card. Please delete a slot first."
+#: ../gui/MemcardDlg.c:498
+msgid ""
+"There are no free slots available on the target memory card. Please delete a "
+"slot first."
 msgstr "Недостаточно свободных блоков на карте памяти."
 
-#: ../gui/MemcardDlg.c:632
+#: ../gui/MemcardDlg.c:661
 msgid "Memory Card Manager"
 msgstr "Менеджер карт памяти"
 
-#: ../gui/Plugin.c:204
-#: ../data/pcsx.glade2:1493
+#: ../gui/Plugin.c:203 ../data/pcsx.glade2:1493
 #, c-format
 msgid "SIO IRQ Always Enabled"
 msgstr "Удерживание линии прерывания SIO"
 
-#: ../gui/Plugin.c:205
+#: ../gui/Plugin.c:204
 #, c-format
 msgid "SIO IRQ Not Always Enabled"
 msgstr "Удерживание линии прерывания SIO выключено"
 
-#: ../gui/Plugin.c:211
+#: ../gui/Plugin.c:210
 #, c-format
 msgid "Black & White Mdecs Only Enabled"
 msgstr "Режим чёрно-белых видео вставок (Mdecs) включен"
 
-#: ../gui/Plugin.c:212
+#: ../gui/Plugin.c:211
 #, c-format
 msgid "Black & White Mdecs Only Disabled"
 msgstr "Режим чёрно-белых видео вставок (Mdecs) выключен"
 
-#: ../gui/Plugin.c:218
+#: ../gui/Plugin.c:217
 #, c-format
 msgid "XA Enabled"
 msgstr "XA включено"
 
-#: ../gui/Plugin.c:219
+#: ../gui/Plugin.c:218
 #, c-format
 msgid "XA Disabled"
 msgstr "XA выключено"
 
-#: ../gui/Plugin.c:285
+#: ../gui/Plugin.c:280
 msgid "Error opening CD-ROM plugin!"
 msgstr "Ошибка открытия CD-ROM плагина!"
 
-#: ../gui/Plugin.c:287
+#: ../gui/Plugin.c:282
 msgid "Error opening SPU plugin!"
 msgstr "Ошибка открытия SPU плагина!"
 
-#: ../gui/Plugin.c:290
+#: ../gui/Plugin.c:285
 msgid "Error opening GPU plugin!"
 msgstr "Ошибка открытия GPU плагина!"
 
-#: ../gui/Plugin.c:292
+#: ../gui/Plugin.c:287
 msgid "Error opening Controller 1 plugin!"
 msgstr "Ошибка открытия PAD1 плагина!"
 
-#: ../gui/Plugin.c:294
+#: ../gui/Plugin.c:289
 msgid "Error opening Controller 2 plugin!"
 msgstr "Ошибка открытия PAD2 плагина!"
 
-#: ../gui/Plugin.c:374
+#: ../gui/Plugin.c:369
 msgid "Error closing CD-ROM plugin!"
 msgstr "Ошибка при закрытии CD-ROM плагина!"
 
-#: ../gui/Plugin.c:376
+#: ../gui/Plugin.c:371
 msgid "Error closing SPU plugin!"
 msgstr "Ошибка при закрытии SPU плагина!"
 
-#: ../gui/Plugin.c:378
+#: ../gui/Plugin.c:373
 msgid "Error closing Controller 1 Plugin!"
 msgstr "Ошибка при закрытии PAD1 плагина!"
 
-#: ../gui/Plugin.c:380
+#: ../gui/Plugin.c:375
 msgid "Error closing Controller 2 plugin!"
 msgstr "Ошибка при закрытии PAD2 плагина!"
 
-#: ../gui/Plugin.c:382
+#: ../gui/Plugin.c:377
 msgid "Error closing GPU plugin!"
 msgstr "Ошибка при закрытии GPU плагина!"
 
@@ -1444,18 +1343,17 @@ msgstr "Ошибка при закрытии GPU плагина!"
 msgid "Loaded CD Image: %s"
 msgstr "Загружен образ CD: %s"
 
-#: ../libpcsxcore/cheat.c:148
+#: ../libpcsxcore/cheat.c:147
 #, c-format
 msgid "Cheats loaded from: %s\n"
 msgstr "Чит загружен из: %s\n"
 
-#: ../libpcsxcore/cheat.c:180
+#: ../libpcsxcore/cheat.c:179
 #, c-format
 msgid "Cheats saved to: %s\n"
 msgstr "Чит сохранён в: %s\n"
 
-#: ../libpcsxcore/cheat.c:323
-#: ../libpcsxcore/cheat.c:444
+#: ../libpcsxcore/cheat.c:322 ../libpcsxcore/cheat.c:443
 msgid "(Untitled)"
 msgstr "(без названия)"
 
@@ -1475,142 +1373,142 @@ msgstr "Дебаггер запущен.\n"
 msgid "Debugger stopped.\n"
 msgstr "Дебаггер остановлен.\n"
 
-#: ../libpcsxcore/misc.c:392
+#: ../libpcsxcore/misc.c:388
 #, c-format
 msgid "Error opening file: %s.\n"
 msgstr "Ошибка открытия файла: %s.\n"
 
-#: ../libpcsxcore/misc.c:432
+#: ../libpcsxcore/misc.c:428
 #, c-format
 msgid "Unknown CPE opcode %02x at position %08x.\n"
 msgstr "Неизвестный опкод CPE %02x по адресу %08x.\n"
 
-#: ../libpcsxcore/misc.c:439
+#: ../libpcsxcore/misc.c:435
 msgid "COFF files not supported.\n"
 msgstr "Формат COFF не поддерживается.\n"
 
-#: ../libpcsxcore/misc.c:443
+#: ../libpcsxcore/misc.c:439
 msgid "This file does not appear to be a valid PSX file.\n"
 msgstr "This file does not appear to be a valid PSX file.\n"
 
-#: ../libpcsxcore/plugins.c:33
+#: ../libpcsxcore/plugins.c:138
 #, c-format
 msgid "Error loading %s: %s"
 msgstr "Ошибка загрузки %s: %s"
 
-#: ../libpcsxcore/plugins.c:162
+#: ../libpcsxcore/plugins.c:181
 #, c-format
 msgid "Could not load GPU plugin %s!"
 msgstr "Не удалось загрузить GPU плагин %s!"
 
-#: ../libpcsxcore/plugins.c:228
+#: ../libpcsxcore/plugins.c:251
 #, c-format
 msgid "Could not load CD-ROM plugin %s!"
 msgstr "Не удалось загрузить CD-ROM плагин %s!"
 
-#: ../libpcsxcore/plugins.c:467
+#: ../libpcsxcore/plugins.c:297
 #, c-format
 msgid "Could not load SPU plugin %s!"
 msgstr "Не удалось загрузить SPU плагин %s!"
 
-#: ../libpcsxcore/plugins.c:616
+#: ../libpcsxcore/plugins.c:347
 #, c-format
 msgid "Could not load Controller 1 plugin %s!"
 msgstr "Не удалось загрузить PAD1 плагин %s!"
 
-#: ../libpcsxcore/plugins.c:670
+#: ../libpcsxcore/plugins.c:388
 #, c-format
 msgid "Could not load Controller 2 plugin %s!"
 msgstr "Не удалось загрузить PAD2 плагин %s!"
 
-#: ../libpcsxcore/plugins.c:713
+#: ../libpcsxcore/plugins.c:430
 #, c-format
 msgid "Could not load NetPlay plugin %s!"
 msgstr "Не удалось загрузить NetPlay плагин %s!"
 
-#: ../libpcsxcore/plugins.c:776
+#: ../libpcsxcore/plugins.c:491
 #, c-format
 msgid "Error initializing CD-ROM plugin: %d"
 msgstr "Ошибка инициализации CD-ROM плагина: %d"
 
-#: ../libpcsxcore/plugins.c:778
+#: ../libpcsxcore/plugins.c:493
 #, c-format
 msgid "Error initializing GPU plugin: %d"
 msgstr "Ошибка инициализации GPU плагина: %d"
 
-#: ../libpcsxcore/plugins.c:780
+#: ../libpcsxcore/plugins.c:495
 #, c-format
 msgid "Error initializing SPU plugin: %d"
 msgstr "Ошибка инициализации SPU плагина: %d"
 
-#: ../libpcsxcore/plugins.c:782
+#: ../libpcsxcore/plugins.c:497
 #, c-format
 msgid "Error initializing Controller 1 plugin: %d"
 msgstr "Ошибка инициализации PAD1 плагина: %d"
 
-#: ../libpcsxcore/plugins.c:784
+#: ../libpcsxcore/plugins.c:499
 #, c-format
 msgid "Error initializing Controller 2 plugin: %d"
 msgstr "Ошибка инициализации PAD2 плагина: %d"
 
-#: ../libpcsxcore/plugins.c:788
+#: ../libpcsxcore/plugins.c:503
 #, c-format
 msgid "Error initializing NetPlay plugin: %d"
 msgstr "Ошибка инициализации NetPlay плагина: %d"
 
-#: ../libpcsxcore/plugins.c:791
+#: ../libpcsxcore/plugins.c:506
 msgid "Plugins loaded.\n"
 msgstr "Плагины загружены.\n"
 
-#: ../libpcsxcore/ppf.c:218
+#: ../libpcsxcore/ppf.c:216
 #, c-format
 msgid "Invalid PPF patch: %s.\n"
 msgstr "Неверный PPF патч: %s。\n"
 
-#: ../libpcsxcore/ppf.c:294
+#: ../libpcsxcore/ppf.c:292
 #, c-format
 msgid "Unsupported PPF version (%d).\n"
 msgstr "Неподдерживаемая версия PPF(%d).\n"
 
-#: ../libpcsxcore/ppf.c:333
+#: ../libpcsxcore/ppf.c:331
 #, c-format
 msgid "Loaded PPF %d.0 patch: %s.\n"
 msgstr "Загружен PPF %d.0 патч: %s。\n"
 
-#: ../libpcsxcore/psxmem.c:69
+#: ../libpcsxcore/psxmem.c:76
 msgid "Error allocating memory!"
 msgstr "Ошибка выделения памяти!"
 
-#: ../libpcsxcore/psxmem.c:107
+#: ../libpcsxcore/psxmem.c:114
 #, c-format
 msgid "Could not open BIOS:\"%s\". Enabling HLE Bios!\n"
 msgstr "Could not open BIOS:\"%s\". Enabling HLE Bios!\n"
 
-#: ../libpcsxcore/r3000a.c:35
+#: ../libpcsxcore/r3000a.c:33
 #, c-format
 msgid "Running PCSX Version %s (%s).\n"
 msgstr "Запуск PCSX версии %s (%s) 執行中。\n"
 
-#: ../libpcsxcore/sio.c:99
+#: ../libpcsxcore/sio.c:344
 msgid "Connection closed!\n"
 msgstr "Соединение закрыто!\n"
 
-#: ../libpcsxcore/sio.c:322
+#: ../libpcsxcore/sio.c:370
 #, c-format
 msgid "No memory card value was specified - creating a default card %s\n"
 msgstr "Карта памяти не указана - создана новая карта %s\n"
 
-#: ../libpcsxcore/sio.c:326
+#: ../libpcsxcore/sio.c:374
 #, c-format
 msgid "The memory card %s doesn't exist - creating it\n"
 msgstr "Карта памяти %s не существует - создана новая\n"
 
-#: ../libpcsxcore/sio.c:342
+#: ../libpcsxcore/sio.c:390
 #, c-format
 msgid "Memory card %s failed to load!\n"
 msgstr "Ошибка загрузки карты памяти %s!\n"
 
-#: ../libpcsxcore/sio.c:346
+#: ../libpcsxcore/sio.c:394
 #, c-format
 msgid "Loading memory card %s\n"
 msgstr "Загрузка карты памяти %s\n"
@@ -1888,33 +1786,27 @@ msgstr "Изменить ISO..."
 msgid "_Save State"
 msgstr "Сохранить состояние"
 
-#: ../data/pcsx.glade2:200
-#: ../data/pcsx.glade2:281
+#: ../data/pcsx.glade2:200 ../data/pcsx.glade2:281
 msgid "Slot _1"
 msgstr "Слот _1"
 
-#: ../data/pcsx.glade2:209
-#: ../data/pcsx.glade2:290
+#: ../data/pcsx.glade2:209 ../data/pcsx.glade2:290
 msgid "Slot _2"
 msgstr "Слот _2"
 
-#: ../data/pcsx.glade2:218
-#: ../data/pcsx.glade2:299
+#: ../data/pcsx.glade2:218 ../data/pcsx.glade2:299
 msgid "Slot _3"
 msgstr "Слот _3"
 
-#: ../data/pcsx.glade2:227
-#: ../data/pcsx.glade2:308
+#: ../data/pcsx.glade2:227 ../data/pcsx.glade2:308
 msgid "Slot _4"
 msgstr "Слот _4"
 
-#: ../data/pcsx.glade2:236
-#: ../data/pcsx.glade2:317
+#: ../data/pcsx.glade2:236 ../data/pcsx.glade2:317
 msgid "Slot _5"
 msgstr "Слот _5"
 
-#: ../data/pcsx.glade2:244
-#: ../data/pcsx.glade2:325
+#: ../data/pcsx.glade2:244 ../data/pcsx.glade2:325
 msgid "_Other..."
 msgstr "Другой..."
 
@@ -1982,8 +1874,7 @@ msgstr "Помошь(_H)"
 msgid "_About PCSX..."
 msgstr "О PCSX..."
 
-#: ../data/pcsx.glade2:614
-#: ../data/pcsx.glade2:615
+#: ../data/pcsx.glade2:614 ../data/pcsx.glade2:615
 msgid "Run CD"
 msgstr "Запустить CD"
 
@@ -2011,8 +1902,7 @@ msgstr "Изменить образ ISO"
 msgid "Switch ISO..."
 msgstr "Изменить ISO..."
 
-#: ../data/pcsx.glade2:684
-#: ../data/pcsx.glade2:1818
+#: ../data/pcsx.glade2:684 ../data/pcsx.glade2:1818
 msgid "Configure Memory Cards"
 msgstr "Настройка карт памяти"
 
@@ -2028,8 +1918,7 @@ msgstr "Настройка видео"
 msgid "Graphics..."
 msgstr "Графика..."
 
-#: ../data/pcsx.glade2:710
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:8
+#: ../data/pcsx.glade2:710 ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:8
 msgid "Configure Sound"
 msgstr "Настройка звука"
 
@@ -2135,18 +2024,15 @@ msgstr "Настройка сетевой игры"
 msgid "<b>NetPlay</b>"
 msgstr "<b>Сетевая игра</b>"
 
-#: ../data/pcsx.glade2:1897
-#: ../data/pcsx.glade2:2295
+#: ../data/pcsx.glade2:1896 ../data/pcsx.glade2:2296
 msgid "New"
 msgstr "Создать"
 
-#: ../data/pcsx.glade2:1947
-#: ../data/pcsx.glade2:2345
+#: ../data/pcsx.glade2:1946 ../data/pcsx.glade2:2346
 msgid "Format"
 msgstr "Форматировать"
 
-#: ../data/pcsx.glade2:1997
-#: ../data/pcsx.glade2:2395
+#: ../data/pcsx.glade2:1996 ../data/pcsx.glade2:2396
 msgid "Un/Delete"
 msgstr "Восстановить блок"
 
@@ -2154,28 +2040,26 @@ msgstr "Восстановить блок"
 msgid "<b>Memory Card 1</b>"
 msgstr "<b>Карта памяти 1</b>"
 
-#: ../data/pcsx.glade2:2151
-#: ../data/pcsx.glade2:2201
-#: ../data/pcsx.glade2:3094
+#: ../data/pcsx.glade2:2151 ../data/pcsx.glade2:2201 ../data/pcsx.glade2:3084
 msgid "Copy"
 msgstr "Копировать"
 
-#: ../data/pcsx.glade2:2488
+#: ../data/pcsx.glade2:2490
 msgid "<b>Memory Card 2</b>"
 msgstr "<b>Карта памяти 2</b>"
 
-#: ../data/pcsx.glade2:2552
+#: ../data/pcsx.glade2:2554
 msgid ""
 "(C) 1999-2003 PCSX Development Team\n"
 "(C) 2005-2009 PCSX-df Team\n"
 "(C) 2009-2010 PCSX-Reloaded Team"
 msgstr ""
 
-#: ../data/pcsx.glade2:2555
+#: ../data/pcsx.glade2:2557
 msgid "A PlayStation emulator."
 msgstr "Эмулятор PlayStation."
 
-#: ../data/pcsx.glade2:2558
+#: ../data/pcsx.glade2:2560
 msgid ""
 "This program is free software; you can redistribute it\n"
 "and/or modify it under the terms of the GNU General\n"
@@ -2194,15 +2078,15 @@ msgid ""
 "the Free Software Foundation, Inc."
 msgstr ""
 
-#: ../data/pcsx.glade2:2600
+#: ../data/pcsx.glade2:2590
 msgid "translator-credits"
 msgstr "edgbla"
 
-#: ../data/pcsx.glade2:2662
+#: ../data/pcsx.glade2:2652
 msgid "<b>Cheat Codes</b>"
 msgstr "<b>Чит коды</b>"
 
-#: ../data/pcsx.glade2:2828
+#: ../data/pcsx.glade2:2818
 msgid ""
 "8-bit\n"
 "16-bit\n"
@@ -2212,7 +2096,7 @@ msgstr ""
 "16-бит\n"
 "32-бита"
 
-#: ../data/pcsx.glade2:2891
+#: ../data/pcsx.glade2:2881
 msgid ""
 "Equal Value\n"
 "Not Equal Value\n"
@@ -2234,7 +2118,7 @@ msgstr ""
 "Изменилось\n"
 "Не изменилось"
 
-#: ../data/pcsx.glade2:2923
+#: ../data/pcsx.glade2:2913
 msgid ""
 "Decimal\n"
 "Hexadecimal"
@@ -2242,27 +2126,27 @@ msgstr ""
 "Десятичное\n"
 "Шестнадцатиричное"
 
-#: ../data/pcsx.glade2:3127
+#: ../data/pcsx.glade2:3117
 msgid "label_resultsfound"
 msgstr ""
 
-#: ../data/pcsx.glade2:3162
+#: ../data/pcsx.glade2:3152
 msgid "Search"
 msgstr "Поиск"
 
-#: ../data/pcsx.glade2:3198
+#: ../data/pcsx.glade2:3188
 msgid "Restart"
 msgstr "Рестарт"
 
-#: ../data/pcsx.glade2:3227
+#: ../data/pcsx.glade2:3217
 msgid "<b>Cheat Search</b>"
 msgstr "<b>Поиск читов</b>"
 
-#: ../data/pcsx.glade2:3384
+#: ../data/pcsx.glade2:3374
 msgid "Raw Dump..."
 msgstr "\"Сырой\" дамп"
 
-#: ../data/pcsx.glade2:3419
+#: ../data/pcsx.glade2:3409
 msgid "Patch Memory..."
 msgstr "Патч памяти..."
 
@@ -2393,7 +2277,8 @@ msgstr "Настройка CDR"
 
 #: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2:33
 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:44
 msgid "Select CD-ROM device"
@@ -2809,7 +2694,9 @@ msgstr ""
 
 #: ../plugins/peopsxgl/gpucfg/interface.c:799
 msgid "Unfiltered MDECs (small movie speedup)"
-msgstr "Не фильтровать MDECs (некоторый прирост скорости при проигрывании видеовставок)"
+msgstr ""
+"Не фильтровать MDECs (некоторый прирост скорости при проигрывании "
+"видеовставок)"
 
 #: ../plugins/peopsxgl/gpucfg/interface.c:852
 msgid "Adapted from P.E.Op.S OpenGL GPU by Pete Bernert"
@@ -2919,76 +2806,62 @@ msgstr ""
 msgid "R-Stick Up"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:103
-#: ../plugins/dfinput/cfg-gtk2.c:142
+#: ../plugins/dfinput/cfg-gtk2.c:103 ../plugins/dfinput/cfg-gtk2.c:142
 msgid "Centered"
 msgstr "Отцентровано"
 
-#: ../plugins/dfinput/cfg-gtk2.c:103
-#: ../plugins/dfinput/cfg-gtk2.c:142
+#: ../plugins/dfinput/cfg-gtk2.c:103 ../plugins/dfinput/cfg-gtk2.c:142
 msgid "Up"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:103
-#: ../plugins/dfinput/cfg-gtk2.c:142
+#: ../plugins/dfinput/cfg-gtk2.c:103 ../plugins/dfinput/cfg-gtk2.c:142
 msgid "Right"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:103
-#: ../plugins/dfinput/cfg-gtk2.c:142
+#: ../plugins/dfinput/cfg-gtk2.c:103 ../plugins/dfinput/cfg-gtk2.c:142
 msgid "Rightup"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:104
-#: ../plugins/dfinput/cfg-gtk2.c:143
+#: ../plugins/dfinput/cfg-gtk2.c:104 ../plugins/dfinput/cfg-gtk2.c:143
 msgid "Down"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:104
-#: ../plugins/dfinput/cfg-gtk2.c:143
+#: ../plugins/dfinput/cfg-gtk2.c:104 ../plugins/dfinput/cfg-gtk2.c:143
 msgid "Rightdown"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:104
-#: ../plugins/dfinput/cfg-gtk2.c:143
+#: ../plugins/dfinput/cfg-gtk2.c:104 ../plugins/dfinput/cfg-gtk2.c:143
 msgid "Left"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:104
-#: ../plugins/dfinput/cfg-gtk2.c:143
+#: ../plugins/dfinput/cfg-gtk2.c:104 ../plugins/dfinput/cfg-gtk2.c:143
 msgid "Leftup"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:105
-#: ../plugins/dfinput/cfg-gtk2.c:144
+#: ../plugins/dfinput/cfg-gtk2.c:105 ../plugins/dfinput/cfg-gtk2.c:144
 msgid "Leftdown"
 msgstr ""
 
-#: ../plugins/dfinput/cfg-gtk2.c:109
-#: ../plugins/dfinput/cfg-gtk2.c:148
+#: ../plugins/dfinput/cfg-gtk2.c:109 ../plugins/dfinput/cfg-gtk2.c:148
 #, c-format
 msgid "Joystick: Button %d"
 msgstr "Джойстик: Кнопка %d"
 
-#: ../plugins/dfinput/cfg-gtk2.c:113
-#: ../plugins/dfinput/cfg-gtk2.c:152
+#: ../plugins/dfinput/cfg-gtk2.c:113 ../plugins/dfinput/cfg-gtk2.c:152
 #, c-format
 msgid "Joystick: Axis %d%c"
 msgstr "Джойстик: Ось %d%c"
 
-#: ../plugins/dfinput/cfg-gtk2.c:118
-#: ../plugins/dfinput/cfg-gtk2.c:157
+#: ../plugins/dfinput/cfg-gtk2.c:118 ../plugins/dfinput/cfg-gtk2.c:157
 #, c-format
 msgid "Joystick: Hat %d %s"
 msgstr "Джойстик: Крестовина %d %s"
 
-#: ../plugins/dfinput/cfg-gtk2.c:133
-#: ../plugins/dfinput/cfg-gtk2.c:172
+#: ../plugins/dfinput/cfg-gtk2.c:133 ../plugins/dfinput/cfg-gtk2.c:172
 msgid "Keyboard:"
 msgstr "Клавиатура:"
 
-#: ../plugins/dfinput/cfg-gtk2.c:137
-#: ../plugins/dfinput/cfg-gtk2.c:176
+#: ../plugins/dfinput/cfg-gtk2.c:137 ../plugins/dfinput/cfg-gtk2.c:176
 msgid "(Not Set)"
 msgstr "(Не установлено)"
 
@@ -3000,13 +2873,11 @@ msgstr "Нету"
 msgid "Gamepad/Keyboard Input Configuration"
 msgstr "Настройка Gamepad/Keyboard"
 
-#: ../plugins/dfinput/cfg-gtk2.c:587
-#: ../plugins/dfinput/cfg-gtk2.c:607
+#: ../plugins/dfinput/cfg-gtk2.c:587 ../plugins/dfinput/cfg-gtk2.c:607
 msgid "Key"
 msgstr "Клавиша"
 
-#: ../plugins/dfinput/cfg-gtk2.c:593
-#: ../plugins/dfinput/cfg-gtk2.c:613
+#: ../plugins/dfinput/cfg-gtk2.c:593 ../plugins/dfinput/cfg-gtk2.c:613
 msgid "Button"
 msgstr "Кнопка"
 
@@ -3014,18 +2885,15 @@ msgstr "Кнопка"
 msgid "Gamepad/Keyboard Input"
 msgstr ""
 
-#: ../plugins/dfinput/dfinput.glade2:35
-#: ../plugins/dfinput/dfinput.glade2:232
+#: ../plugins/dfinput/dfinput.glade2:35 ../plugins/dfinput/dfinput.glade2:232
 msgid "Device:"
 msgstr "Устройство:"
 
-#: ../plugins/dfinput/dfinput.glade2:66
-#: ../plugins/dfinput/dfinput.glade2:263
+#: ../plugins/dfinput/dfinput.glade2:66 ../plugins/dfinput/dfinput.glade2:263
 msgid "Type:"
 msgstr "Тип:"
 
-#: ../plugins/dfinput/dfinput.glade2:78
-#: ../plugins/dfinput/dfinput.glade2:275
+#: ../plugins/dfinput/dfinput.glade2:78 ../plugins/dfinput/dfinput.glade2:275
 msgid ""
 "Digital Pad\n"
 "Analog Pad"
@@ -3033,13 +2901,11 @@ msgstr ""
 "Стандартный контроллер\n"
 "Аналоговый контроллер"
 
-#: ../plugins/dfinput/dfinput.glade2:149
-#: ../plugins/dfinput/dfinput.glade2:346
+#: ../plugins/dfinput/dfinput.glade2:149 ../plugins/dfinput/dfinput.glade2:346
 msgid "Change"
 msgstr "Изменить"
 
-#: ../plugins/dfinput/dfinput.glade2:185
-#: ../plugins/dfinput/dfinput.glade2:382
+#: ../plugins/dfinput/dfinput.glade2:185 ../plugins/dfinput/dfinput.glade2:382
 msgid "Reset"
 msgstr "Сброс"
 
@@ -3055,4 +2921,73 @@ msgstr "Контроллер 2"
 msgid "Multi-Threaded (Recommended)"
 msgstr "В отдельном потоке (Рекомендуется)"
 
+#: ../plugins/dfnet/dfnet.c:23
+msgid "Socket Driver"
+msgstr ""
 
+#: ../plugins/dfnet/dfnet.c:172
+#, fuzzy, c-format
+msgid "error connecting to %s: %s\n"
+msgstr "Ошибка загрузки %s: %s"
+
+#: ../plugins/dfnet/dfnet.c:197
+#, fuzzy
+msgid "Error allocating memory!\n"
+msgstr "Ошибка выделения памяти!"
+
+#: ../plugins/dfnet/gui.c:38
+msgid "Nothing to configure"
+msgstr ""
+
+#: ../plugins/dfnet/gui.c:57
+#, c-format
+msgid "IP %s"
+msgstr ""
+
+#: ../plugins/dfnet/gui.c:127
+msgid "Waiting for connection..."
+msgstr ""
+
+#: ../plugins/dfnet/gui.c:130
+msgid "The Client should now Start a Connection, waiting..."
+msgstr ""
+
+#: ../plugins/dfnet/dfnet.glade2:23
+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"
+"\n"
+"If you selected Client please enter the IP address the Server gave to you in "
+"the IP Address Control."
+msgstr ""
+
+#: ../plugins/dfnet/dfnet.glade2:63
+msgid "Copy PC IP to Clipboard"
+msgstr ""
+
+#: ../plugins/dfnet/dfnet.glade2:93
+msgid "Server (Player1)"
+msgstr ""
+
+#: ../plugins/dfnet/dfnet.glade2:103
+msgid "Client (Player2)"
+msgstr ""
+
+#: ../plugins/dfnet/dfnet.glade2:129
+msgid ""
+"Do not change if not necessary (remember it must be changed on both sides)."
+msgstr ""
+
+#: ../plugins/dfnet/dfnet.glade2:142
+msgid "Port Number"
+msgstr ""
+
+#: ../plugins/dfnet/dfnet.glade2:201
+msgid "Start Game"
+msgstr ""
+
+#: ../plugins/dfnet/dfnet.glade2:239
+msgid "Play Offline"
+msgstr ""
diff --git a/po/update-pot.sh b/po/update-pot.sh
index 234c95b0..51d47487 100644
--- a/po/update-pot.sh
+++ b/po/update-pot.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-xgettext --keyword=_ --keyword=N_ ../win32/gui/*.c ../gui/*.c ../gui/*.h ../libpcsxcore/*.c ../plugins/dfxvideo/*.c ../plugins/dfxvideo/gpucfg-0.1df/*.glade2 ../data/*.glade2 ../plugins/dfsound/*.c ../plugins/dfsound/spucfg-0.1df/*.glade2 ../plugins/dfcdrom/*.c ../plugins/dfcdrom/cdrcfg-0.1df/*.c ../plugins/dfcdrom/cdrcfg-0.1df/*.glade2 ../plugins/peopsxgl/*.c ../plugins/peopsxgl/gpucfg/*.c ../plugins/dfinput/*.c ../plugins/dfinput/*.glade2 --output=pcsx.pot
+xgettext --keyword=_ --keyword=N_ ../win32/gui/*.c ../gui/*.c ../gui/*.h ../libpcsxcore/*.c ../plugins/dfxvideo/*.c ../plugins/dfxvideo/gpucfg-0.1df/*.glade2 ../data/*.glade2 ../plugins/dfsound/*.c ../plugins/dfsound/spucfg-0.1df/*.glade2 ../plugins/dfcdrom/*.c ../plugins/dfcdrom/cdrcfg-0.1df/*.c ../plugins/dfcdrom/cdrcfg-0.1df/*.glade2 ../plugins/peopsxgl/*.c ../plugins/peopsxgl/gpucfg/*.c ../plugins/dfinput/*.c ../plugins/dfinput/*.glade2 ../plugins/dfnet/*.c ../plugins/dfnet/*.h ../plugins/dfnet/*.glade2 --output=pcsx.pot
 msgmerge -U --backup=none pt_BR.po pcsx.pot
 msgmerge -U --backup=none zh_CN.po pcsx.pot
 msgmerge -U --backup=none zh_TW.po pcsx.pot
diff --git a/po/zh_CN.po b/po/zh_CN.po
index db41ee76..4c60497a 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pcsxr 1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-11 20:17+0800\n"
-"PO-Revision-Date: 2010-04-11 20:18+0700\n"
-"Last-Translator: Wei Mingzhi <whistler@openoffice.org>\n"
+"POT-Creation-Date: 2010-05-13 11:15+0800\n"
+"PO-Revision-Date: 2010-05-13 10:13+0800\n"
+"Last-Translator: Wei Mingzhi <whistler_wmz@users.sourceforge.net>\n"
 "Language-Team: Simplified Chinese <whistler@openoffice.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -53,19 +53,14 @@ msgstr ""
 "\n"
 "http://www.codeplex.com/pcsxr"
 
-#: ../win32/gui/AboutDlg.c:46
-#: ../plugins/peopsxgl/gpucfg/interface.c:831
+#: ../win32/gui/AboutDlg.c:46 ../plugins/peopsxgl/gpucfg/interface.c:831
 msgid "About"
 msgstr "关于 PCSX"
 
-#: ../win32/gui/AboutDlg.c:48
-#: ../win32/gui/AboutDlg.c:52
-#: ../win32/gui/CheatDlg.c:70
-#: ../win32/gui/CheatDlg.c:120
-#: ../win32/gui/ConfigurePlugins.c:470
-#: ../win32/gui/ConfigurePlugins.c:601
-#: ../win32/gui/WndMain.c:966
-#: ../win32/gui/WndMain.c:1202
+#: ../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:966 ../win32/gui/WndMain.c:1202
 #: ../plugins/peopsxgl/gpucfg/interface.c:130
 #: ../plugins/peopsxgl/gpucfg/interface.c:843
 msgid "OK"
@@ -75,530 +70,340 @@ msgstr "确定"
 msgid "PCSX EMU\n"
 msgstr "PCSX 模拟器\n"
 
-#: ../win32/gui/CheatDlg.c:52
-#: ../win32/gui/CheatDlg.c:224
-#: ../win32/gui/CheatDlg.c:271
+#: ../win32/gui/CheatDlg.c:51 ../win32/gui/CheatDlg.c:223
+#: ../win32/gui/CheatDlg.c:270
 msgid "Yes"
 msgstr " 是"
 
-#: ../win32/gui/CheatDlg.c:52
-#: ../win32/gui/CheatDlg.c:224
-#: ../win32/gui/CheatDlg.c:271
+#: ../win32/gui/CheatDlg.c:51 ../win32/gui/CheatDlg.c:223
+#: ../win32/gui/CheatDlg.c:270
 msgid "No"
 msgstr "否"
 
-#: ../win32/gui/CheatDlg.c:67
-#: ../gui/Cheat.c:195
+#: ../win32/gui/CheatDlg.c:66 ../gui/Cheat.c:194
 msgid "Edit Cheat"
 msgstr "编辑作弊码"
 
-#: ../win32/gui/CheatDlg.c:68
-#: ../win32/gui/CheatDlg.c:118
-#: ../gui/Cheat.c:637
+#: ../win32/gui/CheatDlg.c:67 ../win32/gui/CheatDlg.c:117 ../gui/Cheat.c:636
 msgid "Description:"
 msgstr "描述:"
 
-#: ../win32/gui/CheatDlg.c:69
-#: ../win32/gui/CheatDlg.c:119
-#: ../gui/Cheat.c:126
-#: ../gui/Cheat.c:212
+#: ../win32/gui/CheatDlg.c:68 ../win32/gui/CheatDlg.c:118 ../gui/Cheat.c:125
+#: ../gui/Cheat.c:211
 msgid "Cheat Code:"
 msgstr "作弊码:"
 
-#: ../win32/gui/CheatDlg.c:71
-#: ../win32/gui/CheatDlg.c:121
-#: ../win32/gui/ConfigurePlugins.c:471
-#: ../win32/gui/ConfigurePlugins.c:602
-#: ../win32/gui/WndMain.c:967
-#: ../win32/gui/WndMain.c:1203
+#: ../win32/gui/CheatDlg.c:70 ../win32/gui/CheatDlg.c:120
+#: ../win32/gui/ConfigurePlugins.c:484 ../win32/gui/ConfigurePlugins.c:615
+#: ../win32/gui/WndMain.c:967 ../win32/gui/WndMain.c:1203
 #: ../plugins/peopsxgl/gpucfg/interface.c:338
 msgid "Cancel"
 msgstr "取消"
 
-#: ../win32/gui/CheatDlg.c:92
-#: ../win32/gui/CheatDlg.c:133
-#: ../gui/Cheat.c:156
-#: ../gui/Cheat.c:252
+#: ../win32/gui/CheatDlg.c:91 ../win32/gui/CheatDlg.c:132 ../gui/Cheat.c:155
+#: ../gui/Cheat.c:251
 msgid "Invalid cheat code!"
 msgstr "非法作弊码!"
 
-#: ../win32/gui/CheatDlg.c:117
-#: ../gui/Cheat.c:110
+#: ../win32/gui/CheatDlg.c:116 ../gui/Cheat.c:109
 msgid "Add New Cheat"
 msgstr "添加新作弊码"
 
-#: ../win32/gui/CheatDlg.c:167
-#: ../data/pcsx.glade2:2622
+#: ../win32/gui/CheatDlg.c:166 ../data/pcsx.glade2:2612
 msgid "Edit Cheat Codes"
 msgstr "编辑作弊码"
 
-#: ../win32/gui/CheatDlg.c:169
+#: ../win32/gui/CheatDlg.c:168
 msgid "&Add Code"
 msgstr "添加作弊码(&A)"
 
-#: ../win32/gui/CheatDlg.c:170
+#: ../win32/gui/CheatDlg.c:169
 msgid "&Edit Code"
 msgstr "编辑作弊码(&E)"
 
-#: ../win32/gui/CheatDlg.c:171
+#: ../win32/gui/CheatDlg.c:170
 msgid "&Remove Code"
 msgstr "删除作弊码(&R)"
 
-#: ../win32/gui/CheatDlg.c:172
+#: ../win32/gui/CheatDlg.c:171
 msgid "&Enable/Disable"
 msgstr "启用/禁用(&E)"
 
-#: ../win32/gui/CheatDlg.c:173
+#: ../win32/gui/CheatDlg.c:172
 msgid "&Load..."
 msgstr "读取(&L)..."
 
-#: ../win32/gui/CheatDlg.c:174
+#: ../win32/gui/CheatDlg.c:173
 msgid "&Save As..."
 msgstr "另存为(&S)"
 
-#: ../win32/gui/CheatDlg.c:175
+#: ../win32/gui/CheatDlg.c:174
 msgid "&Close"
 msgstr "关闭(&C)"
 
-#: ../win32/gui/CheatDlg.c:186
-#: ../gui/Cheat.c:414
+#: ../win32/gui/CheatDlg.c:185 ../gui/Cheat.c:413
 msgid "Description"
 msgstr "描述"
 
-#: ../win32/gui/CheatDlg.c:191
+#: ../win32/gui/CheatDlg.c:190
 msgid "Enabled"
 msgstr "启用"
 
-#: ../win32/gui/CheatDlg.c:283
-#: ../win32/gui/CheatDlg.c:312
+#: ../win32/gui/CheatDlg.c:282 ../win32/gui/CheatDlg.c:311
 msgid "PCSX Cheat Code Files"
 msgstr "PCSX 作弊码文件"
 
-#: ../win32/gui/CheatDlg.c:403
+#: ../win32/gui/CheatDlg.c:402
 msgid "Equal Value"
 msgstr "等于数值"
 
-#: ../win32/gui/CheatDlg.c:404
+#: ../win32/gui/CheatDlg.c:403
 msgid "Not Equal Value"
 msgstr "不等于数值"
 
-#: ../win32/gui/CheatDlg.c:405
+#: ../win32/gui/CheatDlg.c:404
 msgid "Range"
 msgstr "范围"
 
-#: ../win32/gui/CheatDlg.c:408
+#: ../win32/gui/CheatDlg.c:407
 msgid "Increased By"
 msgstr "增加数值"
 
-#: ../win32/gui/CheatDlg.c:409
+#: ../win32/gui/CheatDlg.c:408
 msgid "Decreased By"
 msgstr "减少数值"
 
-#: ../win32/gui/CheatDlg.c:410
+#: ../win32/gui/CheatDlg.c:409
 msgid "Increased"
 msgstr "增加"
 
-#: ../win32/gui/CheatDlg.c:411
+#: ../win32/gui/CheatDlg.c:410
 msgid "Decreased"
 msgstr "减少"
 
-#: ../win32/gui/CheatDlg.c:412
+#: ../win32/gui/CheatDlg.c:411
 msgid "Different"
 msgstr "不同"
 
-#: ../win32/gui/CheatDlg.c:413
+#: ../win32/gui/CheatDlg.c:412
 msgid "No Change"
 msgstr "无改变"
 
-#: ../win32/gui/CheatDlg.c:449
-#: ../gui/Cheat.c:586
+#: ../win32/gui/CheatDlg.c:448 ../gui/Cheat.c:585
 msgid "Enter the values and start your search."
 msgstr "输入数值并开始查找。"
 
-#: ../win32/gui/CheatDlg.c:454
+#: ../win32/gui/CheatDlg.c:453
 msgid "No addresses found."
 msgstr "未找到地址。"
 
-#: ../win32/gui/CheatDlg.c:458
-#: ../gui/Cheat.c:544
+#: ../win32/gui/CheatDlg.c:457 ../gui/Cheat.c:543
 msgid "Too many addresses found."
 msgstr "找到过多的地址。"
 
-#: ../win32/gui/CheatDlg.c:467
-#: ../gui/Cheat.c:553
+#: ../win32/gui/CheatDlg.c:466 ../gui/Cheat.c:552
 #, c-format
 msgid "%.8X    Current: %u (%.2X), Previous: %u (%.2X)"
 msgstr "%.8X    当前值: %u (%.2X), 前次值: %u (%.2X)"
 
-#: ../win32/gui/CheatDlg.c:472
-#: ../gui/Cheat.c:558
+#: ../win32/gui/CheatDlg.c:471 ../gui/Cheat.c:557
 #, c-format
 msgid "%.8X    Current: %u (%.4X), Previous: %u (%.4X)"
 msgstr "%.8X    当前值: %u (%.4X), 前次值: %u (%.4X)"
 
-#: ../win32/gui/CheatDlg.c:477
-#: ../gui/Cheat.c:563
+#: ../win32/gui/CheatDlg.c:476 ../gui/Cheat.c:562
 #, c-format
 msgid "%.8X    Current: %u (%.8X), Previous: %u (%.8X)"
 msgstr "%.8X    当前值: %u (%.8X), 前次值: %u (%.8X)"
 
-#: ../win32/gui/CheatDlg.c:493
-#: ../gui/Cheat.c:578
+#: ../win32/gui/CheatDlg.c:492 ../gui/Cheat.c:577
 #, c-format
 msgid "Founded Addresses: %d"
 msgstr "找到地址个数: %d"
 
-#: ../win32/gui/CheatDlg.c:505
-#: ../data/pcsx.glade2:3022
+#: ../win32/gui/CheatDlg.c:504 ../data/pcsx.glade2:3012
 msgid "Freeze"
 msgstr "固定"
 
-#: ../win32/gui/CheatDlg.c:506
-#: ../win32/gui/CheatDlg.c:597
+#: ../win32/gui/CheatDlg.c:505 ../win32/gui/CheatDlg.c:596
 msgid "Address:"
 msgstr "地址:"
 
-#: ../win32/gui/CheatDlg.c:507
-#: ../win32/gui/CheatDlg.c:598
-#: ../win32/gui/CheatDlg.c:683
-#: ../gui/Cheat.c:648
-#: ../data/pcsx.glade2:2865
+#: ../win32/gui/CheatDlg.c:506 ../win32/gui/CheatDlg.c:597
+#: ../win32/gui/CheatDlg.c:682 ../gui/Cheat.c:647 ../data/pcsx.glade2:2855
 msgid "Value:"
 msgstr "值:"
 
-#: ../win32/gui/CheatDlg.c:567
+#: ../win32/gui/CheatDlg.c:566
 #, c-format
 msgid "Freeze %.8X"
 msgstr "固定 %.8X"
 
-#: ../win32/gui/CheatDlg.c:596
-#: ../data/pcsx.glade2:3058
+#: ../win32/gui/CheatDlg.c:595 ../data/pcsx.glade2:3048
 msgid "Modify"
 msgstr "修改"
 
-#: ../win32/gui/CheatDlg.c:679
-#: ../gui/Cheat.c:1130
-#: ../data/pcsx.glade2:2793
+#: ../win32/gui/CheatDlg.c:678 ../gui/Cheat.c:1129 ../data/pcsx.glade2:2783
 msgid "Cheat Search"
 msgstr "查找作弊码"
 
-#: ../win32/gui/CheatDlg.c:681
-#: ../data/pcsx.glade2:2843
+#: ../win32/gui/CheatDlg.c:680 ../data/pcsx.glade2:2833
 msgid "Search For:"
 msgstr "查找:"
 
-#: ../win32/gui/CheatDlg.c:682
-#: ../data/pcsx.glade2:2853
+#: ../win32/gui/CheatDlg.c:681 ../data/pcsx.glade2:2843
 msgid "Data Type:"
 msgstr "数据类型:"
 
-#: ../win32/gui/CheatDlg.c:684
-#: ../data/pcsx.glade2:2877
+#: ../win32/gui/CheatDlg.c:683 ../data/pcsx.glade2:2867
 msgid "Data Base:"
 msgstr "数据基:"
 
-#: ../win32/gui/CheatDlg.c:685
-#: ../data/pcsx.glade2:2937
+#: ../win32/gui/CheatDlg.c:684 ../data/pcsx.glade2:2927
 msgid "To:"
 msgstr "到:"
 
-#: ../win32/gui/CheatDlg.c:686
+#: ../win32/gui/CheatDlg.c:685
 msgid "&Freeze"
 msgstr "固定(&F)"
 
-#: ../win32/gui/CheatDlg.c:687
+#: ../win32/gui/CheatDlg.c:686
 msgid "&Modify"
 msgstr "修改(&M)"
 
-#: ../win32/gui/CheatDlg.c:688
+#: ../win32/gui/CheatDlg.c:687
 msgid "&Copy"
 msgstr "复制(&C)"
 
-#: ../win32/gui/CheatDlg.c:689
+#: ../win32/gui/CheatDlg.c:688
 msgid "&Search"
 msgstr "查找(&S)"
 
-#: ../win32/gui/CheatDlg.c:690
+#: ../win32/gui/CheatDlg.c:689
 msgid "&New Search"
 msgstr "新查找(&N)"
 
-#: ../win32/gui/CheatDlg.c:691
+#: ../win32/gui/CheatDlg.c:690
 msgid "C&lose"
 msgstr "关闭(&L)"
 
-#: ../win32/gui/CheatDlg.c:693
+#: ../win32/gui/CheatDlg.c:692
 msgid "8-bit"
 msgstr "8 位"
 
-#: ../win32/gui/CheatDlg.c:694
+#: ../win32/gui/CheatDlg.c:693
 msgid "16-bit"
 msgstr "16 位"
 
-#: ../win32/gui/CheatDlg.c:695
+#: ../win32/gui/CheatDlg.c:694
 msgid "32-bit"
 msgstr "32 位"
 
-#: ../win32/gui/CheatDlg.c:696
+#: ../win32/gui/CheatDlg.c:695
 msgid "Decimal"
 msgstr "十进制"
 
-#: ../win32/gui/CheatDlg.c:697
+#: ../win32/gui/CheatDlg.c:696
 msgid "Hexadecimal"
 msgstr "十六进制"
 
-#: ../win32/gui/ConfigurePlugins.c:206
-#: ../gui/ConfDlg.c:675
+#: ../win32/gui/ConfigurePlugins.c:219 ../gui/ConfDlg.c:675
 msgid "Internal HLE Bios"
 msgstr "内部 HLE-Bios"
 
-#: ../win32/gui/ConfigurePlugins.c:292
+#: ../win32/gui/ConfigurePlugins.c:305
 msgid "Configuration not OK!"
 msgstr "配置不正确!"
 
-#: ../win32/gui/ConfigurePlugins.c:292
-#: ../gui/Cheat.c:156
-#: ../gui/Cheat.c:252
-#: ../gui/LnxMain.c:414
+#: ../win32/gui/ConfigurePlugins.c:305 ../gui/Cheat.c:155 ../gui/Cheat.c:251
+#: ../gui/LnxMain.c:418
 msgid "Error"
 msgstr "错误"
 
-#: ../win32/gui/ConfigurePlugins.c:393
+#: ../win32/gui/ConfigurePlugins.c:406
 msgid "This plugin reports that should work correctly"
 msgstr "此插件报告其可正常工作。"
 
-#: ../win32/gui/ConfigurePlugins.c:394
+#: ../win32/gui/ConfigurePlugins.c:407
 msgid "This plugin reports that should not work correctly"
 msgstr "此插件报告其不可正常工作。"
 
-#: ../win32/gui/ConfigurePlugins.c:450
+#: ../win32/gui/ConfigurePlugins.c:463
 msgid "Select Plugins Directory"
 msgstr "选择插件目录"
 
-#: ../win32/gui/ConfigurePlugins.c:459
+#: ../win32/gui/ConfigurePlugins.c:472
 msgid "Select Bios Directory"
 msgstr "选择 BIOS 目录"
 
-#: ../win32/gui/ConfigurePlugins.c:468
+#: ../win32/gui/ConfigurePlugins.c:481
 msgid "Configuration"
 msgstr "配置"
 
-#: ../win32/gui/ConfigurePlugins.c:472
+#: ../win32/gui/ConfigurePlugins.c:485
 msgid "Graphics"
 msgstr "图像"
 
-#: ../win32/gui/ConfigurePlugins.c:473
+#: ../win32/gui/ConfigurePlugins.c:486
 msgid "First Controller"
 msgstr "主控制器"
 
-#: ../win32/gui/ConfigurePlugins.c:474
+#: ../win32/gui/ConfigurePlugins.c:487
 msgid "Second Controller"
 msgstr "辅控制器"
 
-#: ../win32/gui/ConfigurePlugins.c:475
+#: ../win32/gui/ConfigurePlugins.c:488
 msgid "Sound"
 msgstr "声音"
 
-#: ../win32/gui/ConfigurePlugins.c:476
+#: ../win32/gui/ConfigurePlugins.c:489
 msgid "Cdrom"
 msgstr "CD-ROM"
 
-#: ../win32/gui/ConfigurePlugins.c:477
+#: ../win32/gui/ConfigurePlugins.c:490
 msgid "Bios"
 msgstr "BIOS"
 
-#: ../win32/gui/ConfigurePlugins.c:478
+#: ../win32/gui/ConfigurePlugins.c:491
 msgid "Set Bios Directory"
 msgstr "设置 BIOS 目录"
 
-#: ../win32/gui/ConfigurePlugins.c:479
+#: ../win32/gui/ConfigurePlugins.c:492
 msgid "Set Plugins Directory"
 msgstr "设置插件目录"
 
-#: ../win32/gui/ConfigurePlugins.c:480
-#: ../win32/gui/ConfigurePlugins.c:483
-#: ../win32/gui/ConfigurePlugins.c:486
-#: ../win32/gui/ConfigurePlugins.c:489
-#: ../win32/gui/ConfigurePlugins.c:492
-#: ../win32/gui/ConfigurePlugins.c:604
+#: ../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:481
-#: ../win32/gui/ConfigurePlugins.c:484
-#: ../win32/gui/ConfigurePlugins.c:487
-#: ../win32/gui/ConfigurePlugins.c:490
-#: ../win32/gui/ConfigurePlugins.c:493
-#: ../win32/gui/ConfigurePlugins.c:605
+#: ../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:482
-#: ../win32/gui/ConfigurePlugins.c:485
-#: ../win32/gui/ConfigurePlugins.c:488
-#: ../win32/gui/ConfigurePlugins.c:491
-#: ../win32/gui/ConfigurePlugins.c:494
-#: ../win32/gui/ConfigurePlugins.c:606
+#: ../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 "关于..."
 
-#: ../win32/gui/ConfigurePlugins.c:599
+#: ../win32/gui/ConfigurePlugins.c:612
 msgid "NetPlay Configuration"
 msgstr "联网游戏配置"
 
-#: ../win32/gui/ConfigurePlugins.c:603
+#: ../win32/gui/ConfigurePlugins.c:616 ../plugins/dfnet/gui.c:30
+#: ../plugins/dfnet/gui.c:74
 msgid "NetPlay"
 msgstr "联网游戏"
 
-#: ../win32/gui/ConfigurePlugins.c:607
-msgid "Note: The NetPlay Plugin Directory should be the same as the other Plugins."
+#: ../win32/gui/ConfigurePlugins.c:620
+msgid ""
+"Note: The NetPlay Plugin Directory should be the same as the other Plugins."
 msgstr "注意: 联网游戏插件应和其它插件放在同一目录中。"
 
-#: ../win32/gui/plugin.c:90
-#: ../win32/gui/WndMain.c:281
-#, c-format
-msgid "*PCSX*: Saved State %d"
-msgstr "*PCSX*: Saved State %d"
-
-#: ../win32/gui/plugin.c:91
-#: ../win32/gui/WndMain.c:282
-#, c-format
-msgid "*PCSX*: Error Saving State %d"
-msgstr "*PCSX*: Error Saving State %d"
-
-#: ../win32/gui/plugin.c:107
-#: ../win32/gui/WndMain.c:259
-#, c-format
-msgid "*PCSX*: Loaded State %d"
-msgstr "*PCSX*: Loaded State %d"
-
-#: ../win32/gui/plugin.c:108
-#: ../win32/gui/WndMain.c:260
-#, c-format
-msgid "*PCSX*: Error Loading State %d"
-msgstr "*PCSX*: Error Loading State %d"
-
-#: ../win32/gui/plugin.c:119
-#, c-format
-msgid "*PCSX*: Sio Irq Always Enabled"
-msgstr "*PCSX*: Sio Irq Always Enabled"
-
-#: ../win32/gui/plugin.c:120
-#, c-format
-msgid "*PCSX*: Sio Irq Not Always Enabled"
-msgstr "*PCSX*: Sio Irq Not Always Enabled"
-
-#: ../win32/gui/plugin.c:127
-#, c-format
-msgid "*PCSX*: Black&White Mdecs Only Enabled"
-msgstr "*PCSX*: Black&White Mdecs Only Enabled"
-
-#: ../win32/gui/plugin.c:128
-#, c-format
-msgid "*PCSX*: Black&White Mdecs Only Disabled"
-msgstr "*PCSX*: Black&White Mdecs Only Disabled"
-
-#: ../win32/gui/plugin.c:135
-#, c-format
-msgid "*PCSX*: Xa Enabled"
-msgstr "*PCSX*: Xa Enabled"
-
-#: ../win32/gui/plugin.c:136
-#, c-format
-msgid "*PCSX*: Xa Disabled"
-msgstr "*PCSX*: Xa Disabled"
-
-#: ../win32/gui/plugin.c:145
-msgid "*PCSX*: CdRom Case Opened"
-msgstr "*PCSX*: CdRom Case Opened"
-
-#: ../win32/gui/plugin.c:150
-msgid "*PCSX*: CdRom Case Closed"
-msgstr "*PCSX*: CdRom Case Closed"
-
-#: ../win32/gui/plugin.c:177
-msgid "Connecting..."
-msgstr "正在连接..."
-
-#: ../win32/gui/plugin.c:179
-#: ../win32/gui/plugin.c:186
-#, c-format
-msgid "Please wait while connecting... %c\n"
-msgstr "请稍候，正在连接... %c\n"
-
-#: ../win32/gui/plugin.c:216
-msgid "Error Opening CDR Plugin"
-msgstr "无法打开 CDR 插件"
-
-#: ../win32/gui/plugin.c:279
-#, c-format
-msgid "Error Opening GPU Plugin (%d)"
-msgstr "无法打开 GPU 插件 (%d)"
-
-#: ../win32/gui/plugin.c:281
-#, c-format
-msgid "Error Opening SPU Plugin (%d)"
-msgstr "无法打开 SPU 插件 (%d)"
-
-#: ../win32/gui/plugin.c:284
-#, c-format
-msgid "Error Opening PAD1 Plugin (%d)"
-msgstr "无法打开 PAD1 插件 (%d)"
-
-#: ../win32/gui/plugin.c:286
-#, c-format
-msgid "Error Opening PAD2 Plugin (%d)"
-msgstr "无法打开 PAD2 插件 (%d)"
-
-#: ../win32/gui/plugin.c:309
-msgid "Error Closing CDR Plugin"
-msgstr "无法关闭 CD-ROM 插件 (%d)"
-
-#: ../win32/gui/plugin.c:311
-msgid "Error Closing GPU Plugin"
-msgstr "无法关闭 GPU 插件"
-
-#: ../win32/gui/plugin.c:313
-msgid "Error Closing SPU Plugin"
-msgstr "无法关闭 SPU 插件"
-
-#: ../win32/gui/plugin.c:315
-msgid "Error Closing PAD1 Plugin"
-msgstr "无法关闭 PAD1 插件"
-
-#: ../win32/gui/plugin.c:317
-msgid "Error Closing PAD2 Plugin"
-msgstr "无法关闭 PAD2 插件!"
-
-#: ../win32/gui/plugin.c:335
-#, c-format
-msgid "CDRinit error: %d"
-msgstr "CDRinit 错误: %d"
-
-#: ../win32/gui/plugin.c:337
-#, c-format
-msgid "GPUinit error: %d"
-msgstr "GPUinit 错误: %d"
-
-#: ../win32/gui/plugin.c:339
-#, c-format
-msgid "SPUinit error: %d"
-msgstr "SPUinit 错误: %d"
-
-#: ../win32/gui/plugin.c:341
-#, c-format
-msgid "PAD1init error: %d"
-msgstr "PAD1init 错误: %d"
-
-#: ../win32/gui/plugin.c:343
-#, c-format
-msgid "PAD2init error: %d"
-msgstr "PAD2init 错误: %d"
-
-#: ../win32/gui/plugin.c:346
-#, c-format
-msgid "NETinit error: %d"
-msgstr "NETinit 错误: %d"
-
 #: ../win32/gui/WndMain.c:76
 msgid "Arabic"
 msgstr "阿拉伯语"
@@ -615,9 +420,8 @@ msgstr "德语"
 msgid "Greek"
 msgstr "希腊语"
 
-#: ../win32/gui/WndMain.c:80
-#: ../win32/gui/WndMain.c:1559
-#: ../win32/gui/WndMain.c:1561
+#: ../win32/gui/WndMain.c:80 ../win32/gui/WndMain.c:1558
+#: ../win32/gui/WndMain.c:1560
 msgid "English"
 msgstr "英语"
 
@@ -665,8 +469,27 @@ msgstr "日语"
 msgid "Korean"
 msgstr "朝鲜语"
 
-#: ../win32/gui/WndMain.c:300
-#: ../win32/gui/WndMain.c:352
+#: ../win32/gui/WndMain.c:259 ../win32/gui/plugin.c:107
+#, c-format
+msgid "*PCSX*: Loaded State %d"
+msgstr "*PCSX*: Loaded State %d"
+
+#: ../win32/gui/WndMain.c:260 ../win32/gui/plugin.c:108
+#, c-format
+msgid "*PCSX*: Error Loading State %d"
+msgstr "*PCSX*: Error Loading State %d"
+
+#: ../win32/gui/WndMain.c:281 ../win32/gui/plugin.c:90
+#, c-format
+msgid "*PCSX*: Saved State %d"
+msgstr "*PCSX*: Saved State %d"
+
+#: ../win32/gui/WndMain.c:282 ../win32/gui/plugin.c:91
+#, c-format
+msgid "*PCSX*: Error Saving State %d"
+msgstr "*PCSX*: Error Saving State %d"
+
+#: ../win32/gui/WndMain.c:300 ../win32/gui/WndMain.c:352
 msgid "PCSX State Format"
 msgstr "PCSX 存档格式"
 
@@ -690,16 +513,12 @@ msgstr "*PCSX*: Saved State %s"
 msgid "*PCSX*: Error Saving State %s"
 msgstr "*PCSX*: Error Saving State %s"
 
-#: ../win32/gui/WndMain.c:429
-#: ../win32/gui/WndMain.c:478
-#: ../gui/Gtk2Gui.c:484
+#: ../win32/gui/WndMain.c:429 ../win32/gui/WndMain.c:478 ../gui/Gtk2Gui.c:484
 #: ../gui/Gtk2Gui.c:609
 msgid "The CD does not appear to be a valid Playstation CD"
 msgstr "此光盘不是一张合法的 PlayStation 光盘。"
 
-#: ../win32/gui/WndMain.c:435
-#: ../win32/gui/WndMain.c:484
-#: ../gui/Gtk2Gui.c:492
+#: ../win32/gui/WndMain.c:435 ../win32/gui/WndMain.c:484 ../gui/Gtk2Gui.c:492
 #: ../gui/Gtk2Gui.c:617
 msgid "Could not load CD-ROM!"
 msgstr "无法加载光盘!"
@@ -708,13 +527,11 @@ msgstr "无法加载光盘!"
 msgid "Running BIOS is not supported with Internal HLE Bios."
 msgstr "内部 HLE BIOS 不支持直接运行。"
 
-#: ../win32/gui/WndMain.c:664
-#: ../gui/MemcardDlg.c:59
+#: ../win32/gui/WndMain.c:664 ../gui/MemcardDlg.c:62
 msgid "Title"
 msgstr "标题"
 
-#: ../win32/gui/WndMain.c:670
-#: ../gui/MemcardDlg.c:65
+#: ../win32/gui/WndMain.c:670 ../gui/MemcardDlg.c:68
 msgid "Status"
 msgstr "状态"
 
@@ -734,24 +551,17 @@ msgstr "mid link block"
 msgid "terminiting link block"
 msgstr "terminiting link block"
 
-#: ../win32/gui/WndMain.c:867
-#: ../gui/MemcardDlg.c:147
-#: ../gui/MemcardDlg.c:244
+#: ../win32/gui/WndMain.c:867 ../gui/MemcardDlg.c:154 ../gui/MemcardDlg.c:252
 msgid "Deleted"
 msgstr "已删除"
 
-#: ../win32/gui/WndMain.c:868
-#: ../win32/gui/WndMain.c:871
-#: ../gui/MemcardDlg.c:149
-#: ../gui/MemcardDlg.c:153
-#: ../gui/MemcardDlg.c:246
-#: ../gui/MemcardDlg.c:250
+#: ../win32/gui/WndMain.c:868 ../win32/gui/WndMain.c:871
+#: ../gui/MemcardDlg.c:156 ../gui/MemcardDlg.c:160 ../gui/MemcardDlg.c:254
+#: ../gui/MemcardDlg.c:258
 msgid "Free"
 msgstr "空闲"
 
-#: ../win32/gui/WndMain.c:870
-#: ../gui/MemcardDlg.c:151
-#: ../gui/MemcardDlg.c:248
+#: ../win32/gui/WndMain.c:870 ../gui/MemcardDlg.c:158 ../gui/MemcardDlg.c:256
 msgid "Used"
 msgstr "已使用"
 
@@ -759,18 +569,15 @@ msgstr "已使用"
 msgid "Memcard Manager"
 msgstr "记忆卡管理器"
 
-#: ../win32/gui/WndMain.c:968
-#: ../win32/gui/WndMain.c:971
+#: ../win32/gui/WndMain.c:968 ../win32/gui/WndMain.c:971
 msgid "Select Mcd"
 msgstr "选择"
 
-#: ../win32/gui/WndMain.c:969
-#: ../win32/gui/WndMain.c:972
+#: ../win32/gui/WndMain.c:969 ../win32/gui/WndMain.c:972
 msgid "Format Mcd"
 msgstr "格式化"
 
-#: ../win32/gui/WndMain.c:970
-#: ../win32/gui/WndMain.c:973
+#: ../win32/gui/WndMain.c:970 ../win32/gui/WndMain.c:973
 msgid "Reload Mcd"
 msgstr "重新加载"
 
@@ -806,14 +613,12 @@ msgstr "记忆卡 2"
 msgid "Are you sure you want to paste this selection?"
 msgstr "是否确认粘贴此选中内容?"
 
-#: ../win32/gui/WndMain.c:1036
-#: ../win32/gui/WndMain.c:1147
+#: ../win32/gui/WndMain.c:1036 ../win32/gui/WndMain.c:1147
 #: ../win32/gui/WndMain.c:1154
 msgid "Confirmation"
 msgstr "确认"
 
-#: ../win32/gui/WndMain.c:1147
-#: ../win32/gui/WndMain.c:1154
+#: ../win32/gui/WndMain.c:1147 ../win32/gui/WndMain.c:1154
 msgid "Are you sure you want to format this Memory Card?"
 msgstr "是否确认格式化此记忆卡?"
 
@@ -837,8 +642,7 @@ msgstr "黑白电影"
 msgid "Disable Cd audio"
 msgstr "禁用 CD 音频"
 
-#: ../win32/gui/WndMain.c:1209
-#: ../data/pcsx.glade2:1601
+#: ../win32/gui/WndMain.c:1209 ../data/pcsx.glade2:1601
 msgid "Autodetect"
 msgstr "自动检测"
 
@@ -846,13 +650,11 @@ msgstr "自动检测"
 msgid "Enable Interpreter Cpu"
 msgstr "启用解释执行 CPU"
 
-#: ../win32/gui/WndMain.c:1211
-#: ../data/pcsx.glade2:1457
+#: ../win32/gui/WndMain.c:1211 ../data/pcsx.glade2:1457
 msgid "Enable Console Output"
 msgstr "启用控制台输出"
 
-#: ../win32/gui/WndMain.c:1212
-#: ../data/pcsx.glade2:1407
+#: ../win32/gui/WndMain.c:1212 ../data/pcsx.glade2:1407
 msgid "Enable Debugger"
 msgstr "启用调试器"
 
@@ -860,13 +662,11 @@ msgstr "启用调试器"
 msgid "Spu Irq Always Enabled"
 msgstr "SPU IRQ 总是启用"
 
-#: ../win32/gui/WndMain.c:1214
-#: ../data/pcsx.glade2:1544
+#: ../win32/gui/WndMain.c:1214 ../data/pcsx.glade2:1544
 msgid "Parasite Eve 2, Vandal Hearts 1/2 Fix"
 msgstr "Parasite Eve 2, Vandal Hearts 1/2 修正"
 
-#: ../win32/gui/WndMain.c:1215
-#: ../data/pcsx.glade2:1559
+#: ../win32/gui/WndMain.c:1215 ../data/pcsx.glade2:1559
 msgid "InuYasha Sengoku Battle Fix"
 msgstr "InuYasha Sengoku 战斗修正"
 
@@ -880,264 +680,364 @@ msgstr "选项"
 msgid "Psx System Type"
 msgstr "Psx 系统类型"
 
-#: ../win32/gui/WndMain.c:1323
+#: ../win32/gui/WndMain.c:1322
 msgid "Psx Mcd Format (*.mcr;*.mc;*.mem;*.vgs;*.mcd;*.gme;*.ddf)"
 msgstr "Psx 记忆卡格式 (*.mcr;*.mc;*.mem;*.vgs;*.mcd;*.gme;*.ddf)"
 
-#: ../win32/gui/WndMain.c:1328
+#: ../win32/gui/WndMain.c:1327
 msgid "Psx Memory Card (*.mcr;*.mc)"
 msgstr "Psx 记忆卡 (*.mcr;*.mc)"
 
-#: ../win32/gui/WndMain.c:1333
+#: ../win32/gui/WndMain.c:1332
 msgid "CVGS Memory Card (*.mem;*.vgs)"
 msgstr "VGS 记忆卡 (*.mem;*.vgs)"
 
-#: ../win32/gui/WndMain.c:1338
+#: ../win32/gui/WndMain.c:1337
 msgid "Bleem Memory Card (*.mcd)"
 msgstr "Bleem 记忆卡 (*.mcd)"
 
-#: ../win32/gui/WndMain.c:1343
+#: ../win32/gui/WndMain.c:1342
 msgid "DexDrive Memory Card (*.gme)"
 msgstr "DexDrive 记忆卡 (*.gme)"
 
-#: ../win32/gui/WndMain.c:1348
+#: ../win32/gui/WndMain.c:1347
 msgid "DataDeck Memory Card (*.ddf)"
 msgstr "DataDeck 记忆卡 (*.ddl)"
 
-#: ../win32/gui/WndMain.c:1353
-#: ../win32/gui/WndMain.c:1434
-#: ../gui/Cheat.c:322
-#: ../gui/Gtk2Gui.c:421
-#: ../gui/Gtk2Gui.c:560
+#: ../win32/gui/WndMain.c:1352 ../win32/gui/WndMain.c:1433 ../gui/Cheat.c:321
+#: ../gui/Gtk2Gui.c:421 ../gui/Gtk2Gui.c:560
 msgid "All Files"
 msgstr "所有文件"
 
-#: ../win32/gui/WndMain.c:1392
+#: ../win32/gui/WndMain.c:1391
 msgid "Psx Exe Format"
 msgstr "PSX EXE 格式"
 
-#: ../win32/gui/WndMain.c:1429
+#: ../win32/gui/WndMain.c:1428
 msgid "Psx Isos (*.iso;*.mdf;*.img;*.bin)"
 msgstr "Psx 光盘镜像 (*.iso;*.mdf;*.img;*.bin)"
 
-#: ../win32/gui/WndMain.c:1505
+#: ../win32/gui/WndMain.c:1504
 msgid "&File"
 msgstr "文件(&F)"
 
-#: ../win32/gui/WndMain.c:1506
+#: ../win32/gui/WndMain.c:1505
 msgid "E&xit"
 msgstr "退出(&X)"
 
-#: ../win32/gui/WndMain.c:1508
+#: ../win32/gui/WndMain.c:1507
 msgid "Run &EXE..."
 msgstr "运行 &EXE..."
 
-#: ../win32/gui/WndMain.c:1509
+#: ../win32/gui/WndMain.c:1508
 msgid "Run &BIOS"
 msgstr "运行 BIOS(&B)"
 
-#: ../win32/gui/WndMain.c:1510
+#: ../win32/gui/WndMain.c:1509
 msgid "Run &ISO..."
 msgstr "运行 &ISO..."
 
-#: ../win32/gui/WndMain.c:1511
+#: ../win32/gui/WndMain.c:1510
 msgid "Run &CD"
 msgstr "运行光碟(&C)"
 
-#: ../win32/gui/WndMain.c:1513
+#: ../win32/gui/WndMain.c:1512
 msgid "&Emulator"
 msgstr "模拟器(&E)"
 
-#: ../win32/gui/WndMain.c:1514
+#: ../win32/gui/WndMain.c:1513
 msgid "&States"
 msgstr "存档(&S)"
 
-#: ../win32/gui/WndMain.c:1516
+#: ../win32/gui/WndMain.c:1515
 msgid "S&witch ISO..."
 msgstr "更换 ISO(&W)..."
 
-#: ../win32/gui/WndMain.c:1518
+#: ../win32/gui/WndMain.c:1517
 msgid "Re&set"
 msgstr "复位(&S)"
 
-#: ../win32/gui/WndMain.c:1519
+#: ../win32/gui/WndMain.c:1518
 msgid "&Run"
 msgstr "运行(&R)"
 
-#: ../win32/gui/WndMain.c:1520
+#: ../win32/gui/WndMain.c:1519
 msgid "&Save"
 msgstr "保存(&S)"
 
-#: ../win32/gui/WndMain.c:1521
+#: ../win32/gui/WndMain.c:1520
 msgid "&Load"
 msgstr "读取(&L)"
 
-#: ../win32/gui/WndMain.c:1522
-#: ../win32/gui/WndMain.c:1528
+#: ../win32/gui/WndMain.c:1521 ../win32/gui/WndMain.c:1527
 msgid "&Other..."
 msgstr "其它(&O)..."
 
-#: ../win32/gui/WndMain.c:1523
-#: ../win32/gui/WndMain.c:1529
+#: ../win32/gui/WndMain.c:1522 ../win32/gui/WndMain.c:1528
 msgid "Slot &5"
 msgstr "存档 5(&5)"
 
-#: ../win32/gui/WndMain.c:1524
-#: ../win32/gui/WndMain.c:1530
+#: ../win32/gui/WndMain.c:1523 ../win32/gui/WndMain.c:1529
 msgid "Slot &4"
 msgstr "存档 4(&4)"
 
-#: ../win32/gui/WndMain.c:1525
-#: ../win32/gui/WndMain.c:1531
+#: ../win32/gui/WndMain.c:1524 ../win32/gui/WndMain.c:1530
 msgid "Slot &3"
 msgstr "存档 3(&3)"
 
-#: ../win32/gui/WndMain.c:1526
-#: ../win32/gui/WndMain.c:1532
+#: ../win32/gui/WndMain.c:1525 ../win32/gui/WndMain.c:1531
 msgid "Slot &2"
 msgstr "存档 2(&2)"
 
-#: ../win32/gui/WndMain.c:1527
-#: ../win32/gui/WndMain.c:1533
+#: ../win32/gui/WndMain.c:1526 ../win32/gui/WndMain.c:1532
 msgid "Slot &1"
 msgstr "存档 1(&1)"
 
-#: ../win32/gui/WndMain.c:1535
+#: ../win32/gui/WndMain.c:1534
 msgid "&Configuration"
 msgstr "配置(&C)"
 
-#: ../win32/gui/WndMain.c:1536
+#: ../win32/gui/WndMain.c:1535
 msgid "Cheat &Search..."
 msgstr "查找作弊码(&S)..."
 
-#: ../win32/gui/WndMain.c:1537
+#: ../win32/gui/WndMain.c:1536
 msgid "Ch&eat Code..."
 msgstr "作弊码(&E)..."
 
-#: ../win32/gui/WndMain.c:1540
+#: ../win32/gui/WndMain.c:1539
 msgid "&Language"
 msgstr "语言(&L)"
 
-#: ../win32/gui/WndMain.c:1565
+#: ../win32/gui/WndMain.c:1564
 msgid "&Memory cards..."
 msgstr "记忆卡(&M)..."
 
-#: ../win32/gui/WndMain.c:1566
+#: ../win32/gui/WndMain.c:1565
 msgid "C&PU..."
 msgstr "C&PU..."
 
-#: ../win32/gui/WndMain.c:1568
+#: ../win32/gui/WndMain.c:1567
 msgid "&NetPlay..."
 msgstr "联网游戏(&N)..."
 
-#: ../win32/gui/WndMain.c:1570
+#: ../win32/gui/WndMain.c:1569
 msgid "&Controllers..."
 msgstr "控制器(&C)..."
 
-#: ../win32/gui/WndMain.c:1571
+#: ../win32/gui/WndMain.c:1570
 msgid "CD-&ROM..."
 msgstr "CD-&ROM..."
 
-#: ../win32/gui/WndMain.c:1572
+#: ../win32/gui/WndMain.c:1571
 msgid "&Sound..."
 msgstr "声音(&S)..."
 
-#: ../win32/gui/WndMain.c:1573
+#: ../win32/gui/WndMain.c:1572
 msgid "&Graphics..."
 msgstr "图像(&G)..."
 
-#: ../win32/gui/WndMain.c:1575
+#: ../win32/gui/WndMain.c:1574
 msgid "&Plugins && Bios..."
 msgstr "插件及 BIOS(&P)..."
 
-#: ../win32/gui/WndMain.c:1577
+#: ../win32/gui/WndMain.c:1576
 msgid "&Help"
 msgstr "帮助(&H)"
 
-#: ../win32/gui/WndMain.c:1578
+#: ../win32/gui/WndMain.c:1577
 msgid "&About..."
 msgstr "关于(&A)..."
 
-#: ../win32/gui/WndMain.c:1764
+#: ../win32/gui/WndMain.c:1756
 msgid "Pcsx Msg"
 msgstr "PCSX 消息"
 
-#: ../win32/gui/WndMain.c:1767
+#: ../win32/gui/WndMain.c:1759
 msgid "Error Loading Symbol"
 msgstr "无法加载符号"
 
-#: ../gui/Cheat.c:118
-#: ../gui/Cheat.c:203
+#: ../win32/gui/plugin.c:119
+#, c-format
+msgid "*PCSX*: Sio Irq Always Enabled"
+msgstr "*PCSX*: Sio Irq Always Enabled"
+
+#: ../win32/gui/plugin.c:120
+#, c-format
+msgid "*PCSX*: Sio Irq Not Always Enabled"
+msgstr "*PCSX*: Sio Irq Not Always Enabled"
+
+#: ../win32/gui/plugin.c:127
+#, c-format
+msgid "*PCSX*: Black&White Mdecs Only Enabled"
+msgstr "*PCSX*: Black&White Mdecs Only Enabled"
+
+#: ../win32/gui/plugin.c:128
+#, c-format
+msgid "*PCSX*: Black&White Mdecs Only Disabled"
+msgstr "*PCSX*: Black&White Mdecs Only Disabled"
+
+#: ../win32/gui/plugin.c:135
+#, c-format
+msgid "*PCSX*: Xa Enabled"
+msgstr "*PCSX*: Xa Enabled"
+
+#: ../win32/gui/plugin.c:136
+#, c-format
+msgid "*PCSX*: Xa Disabled"
+msgstr "*PCSX*: Xa Disabled"
+
+#: ../win32/gui/plugin.c:145
+msgid "*PCSX*: CdRom Case Opened"
+msgstr "*PCSX*: CdRom Case Opened"
+
+#: ../win32/gui/plugin.c:150
+msgid "*PCSX*: CdRom Case Closed"
+msgstr "*PCSX*: CdRom Case Closed"
+
+#: ../win32/gui/plugin.c:177
+msgid "Connecting..."
+msgstr "正在连接..."
+
+#: ../win32/gui/plugin.c:179 ../win32/gui/plugin.c:186
+#, c-format
+msgid "Please wait while connecting... %c\n"
+msgstr "请稍候，正在连接... %c\n"
+
+#: ../win32/gui/plugin.c:214
+msgid "Error Opening CDR Plugin"
+msgstr "无法打开 CDR 插件"
+
+#: ../win32/gui/plugin.c:277
+#, c-format
+msgid "Error Opening GPU Plugin (%d)"
+msgstr "无法打开 GPU 插件 (%d)"
+
+#: ../win32/gui/plugin.c:279
+#, c-format
+msgid "Error Opening SPU Plugin (%d)"
+msgstr "无法打开 SPU 插件 (%d)"
+
+#: ../win32/gui/plugin.c:282
+#, c-format
+msgid "Error Opening PAD1 Plugin (%d)"
+msgstr "无法打开 PAD1 插件 (%d)"
+
+#: ../win32/gui/plugin.c:284
+#, c-format
+msgid "Error Opening PAD2 Plugin (%d)"
+msgstr "无法打开 PAD2 插件 (%d)"
+
+#: ../win32/gui/plugin.c:307
+msgid "Error Closing CDR Plugin"
+msgstr "无法关闭 CD-ROM 插件 (%d)"
+
+#: ../win32/gui/plugin.c:309
+msgid "Error Closing GPU Plugin"
+msgstr "无法关闭 GPU 插件"
+
+#: ../win32/gui/plugin.c:311
+msgid "Error Closing SPU Plugin"
+msgstr "无法关闭 SPU 插件"
+
+#: ../win32/gui/plugin.c:313
+msgid "Error Closing PAD1 Plugin"
+msgstr "无法关闭 PAD1 插件"
+
+#: ../win32/gui/plugin.c:315
+msgid "Error Closing PAD2 Plugin"
+msgstr "无法关闭 PAD2 插件!"
+
+#: ../win32/gui/plugin.c:333
+#, c-format
+msgid "CDRinit error: %d"
+msgstr "CDRinit 错误: %d"
+
+#: ../win32/gui/plugin.c:335
+#, c-format
+msgid "GPUinit error: %d"
+msgstr "GPUinit 错误: %d"
+
+#: ../win32/gui/plugin.c:337
+#, c-format
+msgid "SPUinit error: %d"
+msgstr "SPUinit 错误: %d"
+
+#: ../win32/gui/plugin.c:339
+#, c-format
+msgid "PAD1init error: %d"
+msgstr "PAD1init 错误: %d"
+
+#: ../win32/gui/plugin.c:341
+#, c-format
+msgid "PAD2init error: %d"
+msgstr "PAD2init 错误: %d"
+
+#: ../win32/gui/plugin.c:344
+#, c-format
+msgid "NETinit error: %d"
+msgstr "NETinit 错误: %d"
+
+#: ../gui/Cheat.c:117 ../gui/Cheat.c:202
 msgid "Cheat Description:"
 msgstr "作弊码描述:"
 
-#: ../gui/Cheat.c:307
+#: ../gui/Cheat.c:306
 msgid "Open Cheat File"
 msgstr "打开作弊码文件"
 
-#: ../gui/Cheat.c:317
-#: ../gui/Cheat.c:357
+#: ../gui/Cheat.c:316 ../gui/Cheat.c:356
 msgid "PCSX Cheat Code Files (*.cht)"
 msgstr "PCSX 作弊码文件 (*.cht)"
 
-#: ../gui/Cheat.c:347
+#: ../gui/Cheat.c:346
 msgid "Save Cheat File"
 msgstr "保存作弊码文件"
 
-#: ../gui/Cheat.c:362
+#: ../gui/Cheat.c:361
 msgid "All Files (*.*)"
 msgstr "所有文件 (*.*)"
 
-#: ../gui/Cheat.c:395
-#: ../gui/Cheat.c:1125
-#: ../gui/ConfDlg.c:104
-#: ../gui/ConfDlg.c:200
-#: ../gui/DebugMemory.c:256
+#: ../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 界面!"
 
-#: ../gui/Cheat.c:400
+#: ../gui/Cheat.c:399
 msgid "Cheat Codes"
 msgstr "作弊码"
 
-#: ../gui/Cheat.c:406
+#: ../gui/Cheat.c:405
 msgid "Enable"
 msgstr "启用"
 
-#: ../gui/Cheat.c:631
+#: ../gui/Cheat.c:630
 msgid "Freeze value"
 msgstr "固定数值"
 
-#: ../gui/Cheat.c:730
+#: ../gui/Cheat.c:729
 msgid "Modify value"
 msgstr "修改数值"
 
-#: ../gui/Cheat.c:738
+#: ../gui/Cheat.c:737
 msgid "New value:"
 msgstr "新值:"
 
-#: ../gui/Cheat.c:1135
+#: ../gui/Cheat.c:1134
 msgid "Search Results"
 msgstr "查找结果"
 
-#: ../gui/ConfDlg.c:112
-#: ../data/pcsx.glade2:779
+#: ../gui/ConfDlg.c:112 ../data/pcsx.glade2:779
 msgid "Configure PCSX"
 msgstr "配置 PCSX"
 
-#: ../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 "此插件需要被配置。"
 
@@ -1146,57 +1046,53 @@ 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"
 
-#: ../gui/DebugMemory.c:102
-#: ../data/pcsx.glade2:3270
+#: ../gui/DebugMemory.c:103 ../data/pcsx.glade2:3260
 msgid "Memory Dump"
 msgstr "内存转储"
 
-#: ../gui/DebugMemory.c:110
+#: ../gui/DebugMemory.c:111
 msgid "Start Address (Hexadecimal):"
 msgstr "开始地址 (十六进制):"
 
-#: ../gui/DebugMemory.c:118
+#: ../gui/DebugMemory.c:121
 msgid "Length (Decimal):"
 msgstr "长度 (十进制):"
 
-#: ../gui/DebugMemory.c:144
+#: ../gui/DebugMemory.c:147
 msgid "Dump to File"
 msgstr "转储至文件"
 
-#: ../gui/DebugMemory.c:159
+#: ../gui/DebugMemory.c:162
 #, c-format
 msgid "Error writing to %s!"
 msgstr "写入到 %s 时出错!"
 
-#: ../gui/DebugMemory.c:177
+#: ../gui/DebugMemory.c:180
 msgid "Memory Patch"
 msgstr "内存修改"
 
-#: ../gui/DebugMemory.c:185
-#: ../data/pcsx.glade2:3292
+#: ../gui/DebugMemory.c:188 ../data/pcsx.glade2:3282
 msgid "Address (Hexadecimal):"
 msgstr "地址 (十六进制):"
 
-#: ../gui/DebugMemory.c:195
+#: ../gui/DebugMemory.c:198
 msgid "Value (Hexa string):"
 msgstr "数值 (十六进制串):"
 
-#: ../gui/DebugMemory.c:261
+#: ../gui/DebugMemory.c:264
 msgid "Memory Viewer"
 msgstr "内存查看器"
 
-#: ../gui/DebugMemory.c:266
+#: ../gui/DebugMemory.c:269
 msgid "Address"
 msgstr "地址"
 
-#: ../gui/DebugMemory.c:284
+#: ../gui/DebugMemory.c:287
 msgid "Text"
 msgstr "文本"
 
@@ -1224,13 +1120,11 @@ msgstr "不是一个合法的 PSX 文件"
 msgid "The file does not appear to be a valid Playstation executable"
 msgstr "此文件不是一个合法的 PlayStation 可执行文件"
 
-#: ../gui/Gtk2Gui.c:484
-#: ../gui/Gtk2Gui.c:609
+#: ../gui/Gtk2Gui.c:484 ../gui/Gtk2Gui.c:609
 msgid "CD ROM failed"
 msgstr "CD-ROM 失败"
 
-#: ../gui/Gtk2Gui.c:492
-#: ../gui/Gtk2Gui.c:617
+#: ../gui/Gtk2Gui.c:492 ../gui/Gtk2Gui.c:617
 msgid "The CD-ROM could not be loaded"
 msgstr "无法加载 CD-ROM"
 
@@ -1250,32 +1144,31 @@ msgstr "打开 PSX 光盘镜像文件"
 msgid "PSX Image Files (*.bin, *.img, *.mdf, *.iso)"
 msgstr "PS 镜像文件 (*.bin, *.img, *.mdf, *.iso)"
 
-#: ../gui/Gtk2Gui.c:766
+#: ../gui/Gtk2Gui.c:770
 #, c-format
 msgid "Loaded state %s."
 msgstr "已读取存档 %s。"
 
-#: ../gui/Gtk2Gui.c:770
+#: ../gui/Gtk2Gui.c:773
 #, c-format
 msgid "Error loading state %s!"
 msgstr "读取存档 %s 时出错。"
 
-#: ../gui/Gtk2Gui.c:781
+#: ../gui/Gtk2Gui.c:784
 #, c-format
 msgid "Saved state %s."
 msgstr "已保存存档 %s"
 
-#: ../gui/Gtk2Gui.c:783
+#: ../gui/Gtk2Gui.c:786
 #, c-format
 msgid "Error saving state %s!"
 msgstr "保存存档 %s 时出错。"
 
-#: ../gui/Gtk2Gui.c:816
-#: ../gui/Gtk2Gui.c:843
+#: ../gui/Gtk2Gui.c:821 ../gui/Gtk2Gui.c:849
 msgid "Select State File"
 msgstr "选择存档文件"
 
-#: ../gui/Gtk2Gui.c:900
+#: ../gui/Gtk2Gui.c:905
 msgid "Notice"
 msgstr "警告"
 
@@ -1284,7 +1177,7 @@ msgstr "警告"
 msgid "Creating memory card: %s\n"
 msgstr "建立记忆卡: %s\n"
 
-#: ../gui/LnxMain.c:321
+#: ../gui/LnxMain.c:325
 msgid ""
 " pcsx [options] [file]\n"
 "\toptions:\n"
@@ -1308,141 +1201,146 @@ msgstr ""
 "\t-h -help\t显示此信息\n"
 "\t文件\t\t加载文件\n"
 
-#: ../gui/LnxMain.c:358
+#: ../gui/LnxMain.c:362
 #, c-format
-msgid "PCSX cannot be configured without using the GUI -- you should restart without -nogui.\n"
+msgid ""
+"PCSX cannot be configured without using the GUI -- you should restart "
+"without -nogui.\n"
 msgstr "PCSX 不能在字符界面下配置 -- 请不使用 -nogui 参数重新启动程序\n"
 
-#: ../gui/LnxMain.c:414
+#: ../gui/LnxMain.c:418
 msgid "Failed loading plugins!"
 msgstr "加载插件失败!"
 
-#: ../gui/LnxMain.c:431
+#: ../gui/LnxMain.c:435
 #, c-format
 msgid "Could not load CD-ROM!\n"
 msgstr "无法加载光盘。\n"
 
-#: ../gui/LnxMain.c:467
+#: ../gui/LnxMain.c:466
 #, c-format
 msgid "PSX emulator couldn't be initialized.\n"
 msgstr "无法初始化 PSX 模拟器。\n"
 
-#: ../gui/MemcardDlg.c:53
+#: ../gui/MemcardDlg.c:56
 msgid "Icon"
 msgstr "图标"
 
-#: ../gui/MemcardDlg.c:71
+#: ../gui/MemcardDlg.c:74
 msgid "ID"
 msgstr "ID"
 
-#: ../gui/MemcardDlg.c:77
+#: ../gui/MemcardDlg.c:80
 msgid "Name"
 msgstr "名称"
 
-#: ../gui/MemcardDlg.c:297
+#: ../gui/MemcardDlg.c:317
 msgid "Select A File"
 msgstr "选择一个文件"
 
-#: ../gui/MemcardDlg.c:338
+#: ../gui/MemcardDlg.c:358
 msgid "Format this Memory Card?"
 msgstr "格式化此记忆卡?"
 
-#: ../gui/MemcardDlg.c:340
-msgid "If you format the memory card, the card will be empty, and any existing data overwritten."
+#: ../gui/MemcardDlg.c:360
+msgid ""
+"If you format the memory card, the card will be empty, and any existing data "
+"overwritten."
 msgstr "如果您选择格式化记忆卡，记忆卡将被清空，并且任何现有数据都将被覆盖。"
 
-#: ../gui/MemcardDlg.c:343
+#: ../gui/MemcardDlg.c:363
 msgid "Format card"
 msgstr "格式化记忆卡"
 
-#: ../gui/MemcardDlg.c:367
+#: ../gui/MemcardDlg.c:387
 msgid "Create a new Memory Card"
 msgstr "新建记忆卡"
 
-#: ../gui/MemcardDlg.c:376
+#: ../gui/MemcardDlg.c:396
 msgid "New Memory Card.mcd"
 msgstr "新记忆卡.mcd"
 
-#: ../gui/MemcardDlg.c:477
+#: ../gui/MemcardDlg.c:497
 msgid "No free space on memory card"
 msgstr "记忆卡无空余位置"
 
-#: ../gui/MemcardDlg.c:478
-msgid "There are no free slots available on the target memory card. Please delete a slot first."
+#: ../gui/MemcardDlg.c:498
+msgid ""
+"There are no free slots available on the target memory card. Please delete a "
+"slot first."
 msgstr "目标记忆卡上无空余位置。请先删除一个存档。"
 
-#: ../gui/MemcardDlg.c:632
+#: ../gui/MemcardDlg.c:661
 msgid "Memory Card Manager"
 msgstr "记忆卡管理器"
 
-#: ../gui/Plugin.c:204
-#: ../data/pcsx.glade2:1493
+#: ../gui/Plugin.c:203 ../data/pcsx.glade2:1493
 #, c-format
 msgid "SIO IRQ Always Enabled"
 msgstr "SIO IRQ 总是启用"
 
-#: ../gui/Plugin.c:205
+#: ../gui/Plugin.c:204
 #, c-format
 msgid "SIO IRQ Not Always Enabled"
 msgstr "SIO IRQ 不总是启用"
 
-#: ../gui/Plugin.c:211
+#: ../gui/Plugin.c:210
 #, c-format
 msgid "Black & White Mdecs Only Enabled"
 msgstr "Black & White Mdecs Only 启用"
 
-#: ../gui/Plugin.c:212
+#: ../gui/Plugin.c:211
 #, c-format
 msgid "Black & White Mdecs Only Disabled"
 msgstr "Black & White Mdecs Only 禁用"
 
-#: ../gui/Plugin.c:218
+#: ../gui/Plugin.c:217
 #, c-format
 msgid "XA Enabled"
 msgstr "XA 已启用"
 
-#: ../gui/Plugin.c:219
+#: ../gui/Plugin.c:218
 #, c-format
 msgid "XA Disabled"
 msgstr "XA 已禁用"
 
-#: ../gui/Plugin.c:285
+#: ../gui/Plugin.c:280
 msgid "Error opening CD-ROM plugin!"
 msgstr "无法打开CD-ROM 插件!"
 
-#: ../gui/Plugin.c:287
+#: ../gui/Plugin.c:282
 msgid "Error opening SPU plugin!"
 msgstr "无法打开 SPU 插件!"
 
-#: ../gui/Plugin.c:290
+#: ../gui/Plugin.c:285
 msgid "Error opening GPU plugin!"
 msgstr "无法打开 GPU 插件!"
 
-#: ../gui/Plugin.c:292
+#: ../gui/Plugin.c:287
 msgid "Error opening Controller 1 plugin!"
 msgstr "无法打开 \"控制器 1\" 插件!"
 
-#: ../gui/Plugin.c:294
+#: ../gui/Plugin.c:289
 msgid "Error opening Controller 2 plugin!"
 msgstr "无法打开 \"控制器 2\" 插件!"
 
-#: ../gui/Plugin.c:374
+#: ../gui/Plugin.c:369
 msgid "Error closing CD-ROM plugin!"
 msgstr "无法关闭 CD-ROM 插件!"
 
-#: ../gui/Plugin.c:376
+#: ../gui/Plugin.c:371
 msgid "Error closing SPU plugin!"
 msgstr "无法关闭 SPU 插件!"
 
-#: ../gui/Plugin.c:378
+#: ../gui/Plugin.c:373
 msgid "Error closing Controller 1 Plugin!"
 msgstr "无法关闭 \"控制器 1\" 插件!"
 
-#: ../gui/Plugin.c:380
+#: ../gui/Plugin.c:375
 msgid "Error closing Controller 2 plugin!"
 msgstr "无法关闭 \"控制器 2\" 插件!"
 
-#: ../gui/Plugin.c:382
+#: ../gui/Plugin.c:377
 msgid "Error closing GPU plugin!"
 msgstr "无法关闭 GPU 插件!"
 
@@ -1451,18 +1349,17 @@ msgstr "无法关闭 GPU 插件!"
 msgid "Loaded CD Image: %s"
 msgstr "已加载 CD 镜像: %s"
 
-#: ../libpcsxcore/cheat.c:148
+#: ../libpcsxcore/cheat.c:147
 #, c-format
 msgid "Cheats loaded from: %s\n"
 msgstr "作弊码已加载: %s\n"
 
-#: ../libpcsxcore/cheat.c:180
+#: ../libpcsxcore/cheat.c:179
 #, c-format
 msgid "Cheats saved to: %s\n"
 msgstr "作弊码己保存: %s\n"
 
-#: ../libpcsxcore/cheat.c:323
-#: ../libpcsxcore/cheat.c:444
+#: ../libpcsxcore/cheat.c:322 ../libpcsxcore/cheat.c:443
 msgid "(Untitled)"
 msgstr "(未命名)"
 
@@ -1482,142 +1379,142 @@ msgstr "调试器已启动。\n"
 msgid "Debugger stopped.\n"
 msgstr "调试器已停止。\n"
 
-#: ../libpcsxcore/misc.c:392
+#: ../libpcsxcore/misc.c:388
 #, c-format
 msgid "Error opening file: %s.\n"
 msgstr "打开文件错误: %s。\n"
 
-#: ../libpcsxcore/misc.c:432
+#: ../libpcsxcore/misc.c:428
 #, c-format
 msgid "Unknown CPE opcode %02x at position %08x.\n"
 msgstr "未知 CPE 指令码 %02x 位于 %08x。\n"
 
-#: ../libpcsxcore/misc.c:439
+#: ../libpcsxcore/misc.c:435
 msgid "COFF files not supported.\n"
 msgstr "COFF 文件尚未支持。\n"
 
-#: ../libpcsxcore/misc.c:443
+#: ../libpcsxcore/misc.c:439
 msgid "This file does not appear to be a valid PSX file.\n"
 msgstr "此文件不是一个合法的 PSX 文件。\n"
 
-#: ../libpcsxcore/plugins.c:33
+#: ../libpcsxcore/plugins.c:138
 #, c-format
 msgid "Error loading %s: %s"
 msgstr "无法加载 %s: %s"
 
-#: ../libpcsxcore/plugins.c:162
+#: ../libpcsxcore/plugins.c:181
 #, c-format
 msgid "Could not load GPU plugin %s!"
 msgstr "无法加载 GPU 插件 %s!"
 
-#: ../libpcsxcore/plugins.c:228
+#: ../libpcsxcore/plugins.c:251
 #, c-format
 msgid "Could not load CD-ROM plugin %s!"
 msgstr "无法加载 CD-ROM 插件 %s!"
 
-#: ../libpcsxcore/plugins.c:467
+#: ../libpcsxcore/plugins.c:297
 #, c-format
 msgid "Could not load SPU plugin %s!"
 msgstr "无法加载 SPU 插件 %s!"
 
-#: ../libpcsxcore/plugins.c:616
+#: ../libpcsxcore/plugins.c:347
 #, c-format
 msgid "Could not load Controller 1 plugin %s!"
 msgstr "无法加载 \"控制器1\" 插件 %s!"
 
-#: ../libpcsxcore/plugins.c:670
+#: ../libpcsxcore/plugins.c:388
 #, c-format
 msgid "Could not load Controller 2 plugin %s!"
 msgstr "无法加载 \"控制器2\" 插件 %s!"
 
-#: ../libpcsxcore/plugins.c:713
+#: ../libpcsxcore/plugins.c:430
 #, c-format
 msgid "Could not load NetPlay plugin %s!"
 msgstr "无法加载联网游戏插件 %s!"
 
-#: ../libpcsxcore/plugins.c:776
+#: ../libpcsxcore/plugins.c:491
 #, c-format
 msgid "Error initializing CD-ROM plugin: %d"
 msgstr "CD-ROM 插件初始化错误: %d"
 
-#: ../libpcsxcore/plugins.c:778
+#: ../libpcsxcore/plugins.c:493
 #, c-format
 msgid "Error initializing GPU plugin: %d"
 msgstr "GPU 插件初始化错误: %d"
 
-#: ../libpcsxcore/plugins.c:780
+#: ../libpcsxcore/plugins.c:495
 #, c-format
 msgid "Error initializing SPU plugin: %d"
 msgstr "SPU 插件初始化错误: %d"
 
-#: ../libpcsxcore/plugins.c:782
+#: ../libpcsxcore/plugins.c:497
 #, c-format
 msgid "Error initializing Controller 1 plugin: %d"
 msgstr "\"控制器1\" 插件初始化错误: %d"
 
-#: ../libpcsxcore/plugins.c:784
+#: ../libpcsxcore/plugins.c:499
 #, c-format
 msgid "Error initializing Controller 2 plugin: %d"
 msgstr "\"控制器2\" 插件初始化错误: %d"
 
-#: ../libpcsxcore/plugins.c:788
+#: ../libpcsxcore/plugins.c:503
 #, c-format
 msgid "Error initializing NetPlay plugin: %d"
 msgstr "联网游戏插件初始化错误: %d"
 
-#: ../libpcsxcore/plugins.c:791
+#: ../libpcsxcore/plugins.c:506
 msgid "Plugins loaded.\n"
 msgstr "插件已加载。\n"
 
-#: ../libpcsxcore/ppf.c:218
+#: ../libpcsxcore/ppf.c:216
 #, c-format
 msgid "Invalid PPF patch: %s.\n"
 msgstr "非法 PPF 补丁: %s。\n"
 
-#: ../libpcsxcore/ppf.c:294
+#: ../libpcsxcore/ppf.c:292
 #, c-format
 msgid "Unsupported PPF version (%d).\n"
 msgstr "不支持的 PPF 补丁版本 (%d)。\n"
 
-#: ../libpcsxcore/ppf.c:333
+#: ../libpcsxcore/ppf.c:331
 #, c-format
 msgid "Loaded PPF %d.0 patch: %s.\n"
 msgstr "已加载 PPF %d.0 补丁文件: %s。\n"
 
-#: ../libpcsxcore/psxmem.c:69
+#: ../libpcsxcore/psxmem.c:76
 msgid "Error allocating memory!"
 msgstr "分配内存错误!"
 
-#: ../libpcsxcore/psxmem.c:107
+#: ../libpcsxcore/psxmem.c:114
 #, c-format
 msgid "Could not open BIOS:\"%s\". Enabling HLE Bios!\n"
 msgstr "无法打开 BIOS: \"%s\"。使用内部 HLE Bios。\n"
 
-#: ../libpcsxcore/r3000a.c:35
+#: ../libpcsxcore/r3000a.c:33
 #, c-format
 msgid "Running PCSX Version %s (%s).\n"
 msgstr "正在运行 PCSX 版本 %s (%s)。\n"
 
-#: ../libpcsxcore/sio.c:99
+#: ../libpcsxcore/sio.c:344
 msgid "Connection closed!\n"
 msgstr "连接被关闭!\n"
 
-#: ../libpcsxcore/sio.c:322
+#: ../libpcsxcore/sio.c:370
 #, c-format
 msgid "No memory card value was specified - creating a default card %s\n"
 msgstr "未指定记忆卡 - 创建一个默认的记忆卡 %s\n"
 
-#: ../libpcsxcore/sio.c:326
+#: ../libpcsxcore/sio.c:374
 #, c-format
 msgid "The memory card %s doesn't exist - creating it\n"
 msgstr "记忆卡 %s 不存在 - 正在创建\n"
 
-#: ../libpcsxcore/sio.c:342
+#: ../libpcsxcore/sio.c:390
 #, c-format
 msgid "Memory card %s failed to load!\n"
 msgstr "记忆卡 %s 读取失败!\n"
 
-#: ../libpcsxcore/sio.c:346
+#: ../libpcsxcore/sio.c:394
 #, c-format
 msgid "Loading memory card %s\n"
 msgstr "加载记忆卡 %s\n"
@@ -1906,33 +1803,27 @@ msgstr "更换 ISO(_W)..."
 msgid "_Save State"
 msgstr "即时存档(_S)"
 
-#: ../data/pcsx.glade2:200
-#: ../data/pcsx.glade2:281
+#: ../data/pcsx.glade2:200 ../data/pcsx.glade2:281
 msgid "Slot _1"
 msgstr "存档 _1"
 
-#: ../data/pcsx.glade2:209
-#: ../data/pcsx.glade2:290
+#: ../data/pcsx.glade2:209 ../data/pcsx.glade2:290
 msgid "Slot _2"
 msgstr "存档 _2"
 
-#: ../data/pcsx.glade2:218
-#: ../data/pcsx.glade2:299
+#: ../data/pcsx.glade2:218 ../data/pcsx.glade2:299
 msgid "Slot _3"
 msgstr "存档 _3"
 
-#: ../data/pcsx.glade2:227
-#: ../data/pcsx.glade2:308
+#: ../data/pcsx.glade2:227 ../data/pcsx.glade2:308
 msgid "Slot _4"
 msgstr "存档 _4"
 
-#: ../data/pcsx.glade2:236
-#: ../data/pcsx.glade2:317
+#: ../data/pcsx.glade2:236 ../data/pcsx.glade2:317
 msgid "Slot _5"
 msgstr "存档 _5"
 
-#: ../data/pcsx.glade2:244
-#: ../data/pcsx.glade2:325
+#: ../data/pcsx.glade2:244 ../data/pcsx.glade2:325
 msgid "_Other..."
 msgstr "其它(_O)..."
 
@@ -2000,8 +1891,7 @@ msgstr "帮助(_H)"
 msgid "_About PCSX..."
 msgstr "关于 PCSX(_A)..."
 
-#: ../data/pcsx.glade2:614
-#: ../data/pcsx.glade2:615
+#: ../data/pcsx.glade2:614 ../data/pcsx.glade2:615
 msgid "Run CD"
 msgstr "运行光碟"
 
@@ -2029,8 +1919,7 @@ msgstr "更换 ISO 光盘镜像"
 msgid "Switch ISO..."
 msgstr "更换 ISO..."
 
-#: ../data/pcsx.glade2:684
-#: ../data/pcsx.glade2:1818
+#: ../data/pcsx.glade2:684 ../data/pcsx.glade2:1818
 msgid "Configure Memory Cards"
 msgstr "配置记忆卡"
 
@@ -2046,8 +1935,7 @@ msgstr "配置图像"
 msgid "Graphics..."
 msgstr "图像..."
 
-#: ../data/pcsx.glade2:710
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:8
+#: ../data/pcsx.glade2:710 ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:8
 msgid "Configure Sound"
 msgstr "配置音频"
 
@@ -2155,18 +2043,15 @@ msgstr "配置联网游戏"
 msgid "<b>NetPlay</b>"
 msgstr "<b>联网游戏</b>"
 
-#: ../data/pcsx.glade2:1897
-#: ../data/pcsx.glade2:2295
+#: ../data/pcsx.glade2:1896 ../data/pcsx.glade2:2296
 msgid "New"
 msgstr "新建"
 
-#: ../data/pcsx.glade2:1947
-#: ../data/pcsx.glade2:2345
+#: ../data/pcsx.glade2:1946 ../data/pcsx.glade2:2346
 msgid "Format"
 msgstr "格式化"
 
-#: ../data/pcsx.glade2:1997
-#: ../data/pcsx.glade2:2395
+#: ../data/pcsx.glade2:1996 ../data/pcsx.glade2:2396
 msgid "Un/Delete"
 msgstr "删除/恢复"
 
@@ -2174,17 +2059,15 @@ msgstr "删除/恢复"
 msgid "<b>Memory Card 1</b>"
 msgstr "<b>记忆卡 1</b>"
 
-#: ../data/pcsx.glade2:2151
-#: ../data/pcsx.glade2:2201
-#: ../data/pcsx.glade2:3094
+#: ../data/pcsx.glade2:2151 ../data/pcsx.glade2:2201 ../data/pcsx.glade2:3084
 msgid "Copy"
 msgstr "复制"
 
-#: ../data/pcsx.glade2:2488
+#: ../data/pcsx.glade2:2490
 msgid "<b>Memory Card 2</b>"
 msgstr "<b>记忆卡 2</b>"
 
-#: ../data/pcsx.glade2:2552
+#: ../data/pcsx.glade2:2554
 msgid ""
 "(C) 1999-2003 PCSX Development Team\n"
 "(C) 2005-2009 PCSX-df Team\n"
@@ -2194,11 +2077,11 @@ msgstr ""
 "(C) 2005-2009 PCSX-df 开发组\n"
 "(C) 2009-2010 PCSX-Reloaded 开发组"
 
-#: ../data/pcsx.glade2:2555
+#: ../data/pcsx.glade2:2557
 msgid "A PlayStation emulator."
 msgstr "一个 PlayStation 模拟器。"
 
-#: ../data/pcsx.glade2:2558
+#: ../data/pcsx.glade2:2560
 msgid ""
 "This program is free software; you can redistribute it\n"
 "and/or modify it under the terms of the GNU General\n"
@@ -2232,15 +2115,15 @@ msgstr ""
 "Public License along with this program; if not, write to\n"
 "the Free Software Foundation, Inc."
 
-#: ../data/pcsx.glade2:2600
+#: ../data/pcsx.glade2:2590
 msgid "translator-credits"
 msgstr "Wei Mingzhi <whistler@openoffice.org>"
 
-#: ../data/pcsx.glade2:2662
+#: ../data/pcsx.glade2:2652
 msgid "<b>Cheat Codes</b>"
 msgstr "<b>作弊码</b>"
 
-#: ../data/pcsx.glade2:2828
+#: ../data/pcsx.glade2:2818
 msgid ""
 "8-bit\n"
 "16-bit\n"
@@ -2250,7 +2133,7 @@ msgstr ""
 "16 位\n"
 "32 位"
 
-#: ../data/pcsx.glade2:2891
+#: ../data/pcsx.glade2:2881
 msgid ""
 "Equal Value\n"
 "Not Equal Value\n"
@@ -2272,7 +2155,7 @@ msgstr ""
 "改变\n"
 "无改变"
 
-#: ../data/pcsx.glade2:2923
+#: ../data/pcsx.glade2:2913
 msgid ""
 "Decimal\n"
 "Hexadecimal"
@@ -2280,27 +2163,27 @@ msgstr ""
 "十进制\n"
 "十六进制"
 
-#: ../data/pcsx.glade2:3127
+#: ../data/pcsx.glade2:3117
 msgid "label_resultsfound"
 msgstr "label_resultsfound"
 
-#: ../data/pcsx.glade2:3162
+#: ../data/pcsx.glade2:3152
 msgid "Search"
 msgstr "查找"
 
-#: ../data/pcsx.glade2:3198
+#: ../data/pcsx.glade2:3188
 msgid "Restart"
 msgstr "复位"
 
-#: ../data/pcsx.glade2:3227
+#: ../data/pcsx.glade2:3217
 msgid "<b>Cheat Search</b>"
 msgstr "<b>作弊码查找</b>"
 
-#: ../data/pcsx.glade2:3384
+#: ../data/pcsx.glade2:3374
 msgid "Raw Dump..."
 msgstr "Raw 转储..."
 
-#: ../data/pcsx.glade2:3419
+#: ../data/pcsx.glade2:3409
 msgid "Patch Memory..."
 msgstr "修改内存..."
 
@@ -2961,76 +2844,62 @@ msgstr "右摇杆下方向"
 msgid "R-Stick Up"
 msgstr "右摇杆上方向"
 
-#: ../plugins/dfinput/cfg-gtk2.c:103
-#: ../plugins/dfinput/cfg-gtk2.c:142
+#: ../plugins/dfinput/cfg-gtk2.c:103 ../plugins/dfinput/cfg-gtk2.c:142
 msgid "Centered"
 msgstr "居中"
 
-#: ../plugins/dfinput/cfg-gtk2.c:103
-#: ../plugins/dfinput/cfg-gtk2.c:142
+#: ../plugins/dfinput/cfg-gtk2.c:103 ../plugins/dfinput/cfg-gtk2.c:142
 msgid "Up"
 msgstr "上"
 
-#: ../plugins/dfinput/cfg-gtk2.c:103
-#: ../plugins/dfinput/cfg-gtk2.c:142
+#: ../plugins/dfinput/cfg-gtk2.c:103 ../plugins/dfinput/cfg-gtk2.c:142
 msgid "Right"
 msgstr "右方向键"
 
-#: ../plugins/dfinput/cfg-gtk2.c:103
-#: ../plugins/dfinput/cfg-gtk2.c:142
+#: ../plugins/dfinput/cfg-gtk2.c:103 ../plugins/dfinput/cfg-gtk2.c:142
 msgid "Rightup"
 msgstr "右上"
 
-#: ../plugins/dfinput/cfg-gtk2.c:104
-#: ../plugins/dfinput/cfg-gtk2.c:143
+#: ../plugins/dfinput/cfg-gtk2.c:104 ../plugins/dfinput/cfg-gtk2.c:143
 msgid "Down"
 msgstr "下"
 
-#: ../plugins/dfinput/cfg-gtk2.c:104
-#: ../plugins/dfinput/cfg-gtk2.c:143
+#: ../plugins/dfinput/cfg-gtk2.c:104 ../plugins/dfinput/cfg-gtk2.c:143
 msgid "Rightdown"
 msgstr "右下"
 
-#: ../plugins/dfinput/cfg-gtk2.c:104
-#: ../plugins/dfinput/cfg-gtk2.c:143
+#: ../plugins/dfinput/cfg-gtk2.c:104 ../plugins/dfinput/cfg-gtk2.c:143
 msgid "Left"
 msgstr "左"
 
-#: ../plugins/dfinput/cfg-gtk2.c:104
-#: ../plugins/dfinput/cfg-gtk2.c:143
+#: ../plugins/dfinput/cfg-gtk2.c:104 ../plugins/dfinput/cfg-gtk2.c:143
 msgid "Leftup"
 msgstr "左上"
 
-#: ../plugins/dfinput/cfg-gtk2.c:105
-#: ../plugins/dfinput/cfg-gtk2.c:144
+#: ../plugins/dfinput/cfg-gtk2.c:105 ../plugins/dfinput/cfg-gtk2.c:144
 msgid "Leftdown"
 msgstr "左下"
 
-#: ../plugins/dfinput/cfg-gtk2.c:109
-#: ../plugins/dfinput/cfg-gtk2.c:148
+#: ../plugins/dfinput/cfg-gtk2.c:109 ../plugins/dfinput/cfg-gtk2.c:148
 #, c-format
 msgid "Joystick: Button %d"
 msgstr "手柄: 按钮 %d"
 
-#: ../plugins/dfinput/cfg-gtk2.c:113
-#: ../plugins/dfinput/cfg-gtk2.c:152
+#: ../plugins/dfinput/cfg-gtk2.c:113 ../plugins/dfinput/cfg-gtk2.c:152
 #, c-format
 msgid "Joystick: Axis %d%c"
 msgstr "手柄: 轴 %d%c"
 
-#: ../plugins/dfinput/cfg-gtk2.c:118
-#: ../plugins/dfinput/cfg-gtk2.c:157
+#: ../plugins/dfinput/cfg-gtk2.c:118 ../plugins/dfinput/cfg-gtk2.c:157
 #, c-format
 msgid "Joystick: Hat %d %s"
 msgstr "Joystick: 操纵杆 %d %s"
 
-#: ../plugins/dfinput/cfg-gtk2.c:133
-#: ../plugins/dfinput/cfg-gtk2.c:172
+#: ../plugins/dfinput/cfg-gtk2.c:133 ../plugins/dfinput/cfg-gtk2.c:172
 msgid "Keyboard:"
 msgstr "键盘:"
 
-#: ../plugins/dfinput/cfg-gtk2.c:137
-#: ../plugins/dfinput/cfg-gtk2.c:176
+#: ../plugins/dfinput/cfg-gtk2.c:137 ../plugins/dfinput/cfg-gtk2.c:176
 msgid "(Not Set)"
 msgstr "(未设定)"
 
@@ -3042,13 +2911,11 @@ msgstr "无"
 msgid "Gamepad/Keyboard Input Configuration"
 msgstr "手柄/键盘输入配置"
 
-#: ../plugins/dfinput/cfg-gtk2.c:587
-#: ../plugins/dfinput/cfg-gtk2.c:607
+#: ../plugins/dfinput/cfg-gtk2.c:587 ../plugins/dfinput/cfg-gtk2.c:607
 msgid "Key"
 msgstr "按钮"
 
-#: ../plugins/dfinput/cfg-gtk2.c:593
-#: ../plugins/dfinput/cfg-gtk2.c:613
+#: ../plugins/dfinput/cfg-gtk2.c:593 ../plugins/dfinput/cfg-gtk2.c:613
 msgid "Button"
 msgstr "按键"
 
@@ -3056,18 +2923,15 @@ msgstr "按键"
 msgid "Gamepad/Keyboard Input"
 msgstr "手柄/键盘输入"
 
-#: ../plugins/dfinput/dfinput.glade2:35
-#: ../plugins/dfinput/dfinput.glade2:232
+#: ../plugins/dfinput/dfinput.glade2:35 ../plugins/dfinput/dfinput.glade2:232
 msgid "Device:"
 msgstr "设备:"
 
-#: ../plugins/dfinput/dfinput.glade2:66
-#: ../plugins/dfinput/dfinput.glade2:263
+#: ../plugins/dfinput/dfinput.glade2:66 ../plugins/dfinput/dfinput.glade2:263
 msgid "Type:"
 msgstr "类型:"
 
-#: ../plugins/dfinput/dfinput.glade2:78
-#: ../plugins/dfinput/dfinput.glade2:275
+#: ../plugins/dfinput/dfinput.glade2:78 ../plugins/dfinput/dfinput.glade2:275
 msgid ""
 "Digital Pad\n"
 "Analog Pad"
@@ -3075,13 +2939,11 @@ msgstr ""
 "普通手柄\n"
 "摇杆手柄"
 
-#: ../plugins/dfinput/dfinput.glade2:149
-#: ../plugins/dfinput/dfinput.glade2:346
+#: ../plugins/dfinput/dfinput.glade2:149 ../plugins/dfinput/dfinput.glade2:346
 msgid "Change"
 msgstr "更改"
 
-#: ../plugins/dfinput/dfinput.glade2:185
-#: ../plugins/dfinput/dfinput.glade2:382
+#: ../plugins/dfinput/dfinput.glade2:185 ../plugins/dfinput/dfinput.glade2:382
 msgid "Reset"
 msgstr "重置"
 
@@ -3096,3 +2958,78 @@ msgstr "控制器 2"
 #: ../plugins/dfinput/dfinput.glade2:427
 msgid "Multi-Threaded (Recommended)"
 msgstr "多线程 (推荐)"
+
+#: ../plugins/dfnet/dfnet.c:23
+msgid "Socket Driver"
+msgstr "套接字驱动程序"
+
+#: ../plugins/dfnet/dfnet.c:172
+#, c-format
+msgid "error connecting to %s: %s\n"
+msgstr "无法连接到 %s: %s\n"
+
+#: ../plugins/dfnet/dfnet.c:197
+msgid "Error allocating memory!\n"
+msgstr "分配内存错误!\n"
+
+#: ../plugins/dfnet/gui.c:38
+msgid "Nothing to configure"
+msgstr "没有可以配置的项目"
+
+#: ../plugins/dfnet/gui.c:57
+#, c-format
+msgid "IP %s"
+msgstr ""
+
+#: ../plugins/dfnet/gui.c:127
+msgid "Waiting for connection..."
+msgstr "正在等待连接..."
+
+#: ../plugins/dfnet/gui.c:130
+msgid "The Client should now Start a Connection, waiting..."
+msgstr "客户端应在此时发起连接，等待中..."
+
+#: ../plugins/dfnet/dfnet.glade2:23
+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"
+"\n"
+"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 地址到剪贴板并将此信息告知客户端。\n"
+"\n"
+"如果您选择作为客户端，请输入服务器方提供给您的 IP 地址。"
+
+#: ../plugins/dfnet/dfnet.glade2:63
+msgid "Copy PC IP to Clipboard"
+msgstr "将本机 IP 复制到剪贴板"
+
+#: ../plugins/dfnet/dfnet.glade2:93
+msgid "Server (Player1)"
+msgstr "服务器 (玩家 1)"
+
+#: ../plugins/dfnet/dfnet.glade2:103
+msgid "Client (Player2)"
+msgstr "客户端 (玩家 2)"
+
+#: ../plugins/dfnet/dfnet.glade2:129
+msgid ""
+"Do not change if not necessary (remember it must be changed on both sides)."
+msgstr "如非必要，请勿改动 (必须在两端都要改动)。"
+
+#: ../plugins/dfnet/dfnet.glade2:142
+msgid "Port Number"
+msgstr "端口号"
+
+#: ../plugins/dfnet/dfnet.glade2:201
+msgid "Start Game"
+msgstr "开始游戏"
+
+#: ../plugins/dfnet/dfnet.glade2:239
+msgid "Play Offline"
+msgstr "离线运行"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 9800bec3..85d912b1 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: \n"
-"POT-Creation-Date: 2010-04-11 20:17+0800\n"
+"POT-Creation-Date: 2010-05-13 11:15+0800\n"
 "PO-Revision-Date: 2010-04-11 20:18+0700\n"
 "Last-Translator: Wei Mingzhi <whistler@openoffice.org>\n"
 "Language-Team: Traditional Chinese <whistler@openoffice.org>\n"
@@ -53,19 +53,14 @@ msgstr ""
 "\n"
 "http://www.codeplex.com/pcsxr"
 
-#: ../win32/gui/AboutDlg.c:46
-#: ../plugins/peopsxgl/gpucfg/interface.c:831
+#: ../win32/gui/AboutDlg.c:46 ../plugins/peopsxgl/gpucfg/interface.c:831
 msgid "About"
 msgstr "關於 PCSX"
 
-#: ../win32/gui/AboutDlg.c:48
-#: ../win32/gui/AboutDlg.c:52
-#: ../win32/gui/CheatDlg.c:70
-#: ../win32/gui/CheatDlg.c:120
-#: ../win32/gui/ConfigurePlugins.c:470
-#: ../win32/gui/ConfigurePlugins.c:601
-#: ../win32/gui/WndMain.c:966
-#: ../win32/gui/WndMain.c:1202
+#: ../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:966 ../win32/gui/WndMain.c:1202
 #: ../plugins/peopsxgl/gpucfg/interface.c:130
 #: ../plugins/peopsxgl/gpucfg/interface.c:843
 msgid "OK"
@@ -75,530 +70,340 @@ msgstr "確定"
 msgid "PCSX EMU\n"
 msgstr "PCSX 模擬器\n"
 
-#: ../win32/gui/CheatDlg.c:52
-#: ../win32/gui/CheatDlg.c:224
-#: ../win32/gui/CheatDlg.c:271
+#: ../win32/gui/CheatDlg.c:51 ../win32/gui/CheatDlg.c:223
+#: ../win32/gui/CheatDlg.c:270
 msgid "Yes"
 msgstr "是"
 
-#: ../win32/gui/CheatDlg.c:52
-#: ../win32/gui/CheatDlg.c:224
-#: ../win32/gui/CheatDlg.c:271
+#: ../win32/gui/CheatDlg.c:51 ../win32/gui/CheatDlg.c:223
+#: ../win32/gui/CheatDlg.c:270
 msgid "No"
 msgstr "否"
 
-#: ../win32/gui/CheatDlg.c:67
-#: ../gui/Cheat.c:195
+#: ../win32/gui/CheatDlg.c:66 ../gui/Cheat.c:194
 msgid "Edit Cheat"
 msgstr "編輯金手指"
 
-#: ../win32/gui/CheatDlg.c:68
-#: ../win32/gui/CheatDlg.c:118
-#: ../gui/Cheat.c:637
+#: ../win32/gui/CheatDlg.c:67 ../win32/gui/CheatDlg.c:117 ../gui/Cheat.c:636
 msgid "Description:"
 msgstr "描述:"
 
-#: ../win32/gui/CheatDlg.c:69
-#: ../win32/gui/CheatDlg.c:119
-#: ../gui/Cheat.c:126
-#: ../gui/Cheat.c:212
+#: ../win32/gui/CheatDlg.c:68 ../win32/gui/CheatDlg.c:118 ../gui/Cheat.c:125
+#: ../gui/Cheat.c:211
 msgid "Cheat Code:"
 msgstr "金手指碼:"
 
-#: ../win32/gui/CheatDlg.c:71
-#: ../win32/gui/CheatDlg.c:121
-#: ../win32/gui/ConfigurePlugins.c:471
-#: ../win32/gui/ConfigurePlugins.c:602
-#: ../win32/gui/WndMain.c:967
-#: ../win32/gui/WndMain.c:1203
+#: ../win32/gui/CheatDlg.c:70 ../win32/gui/CheatDlg.c:120
+#: ../win32/gui/ConfigurePlugins.c:484 ../win32/gui/ConfigurePlugins.c:615
+#: ../win32/gui/WndMain.c:967 ../win32/gui/WndMain.c:1203
 #: ../plugins/peopsxgl/gpucfg/interface.c:338
 msgid "Cancel"
 msgstr "取消"
 
-#: ../win32/gui/CheatDlg.c:92
-#: ../win32/gui/CheatDlg.c:133
-#: ../gui/Cheat.c:156
-#: ../gui/Cheat.c:252
+#: ../win32/gui/CheatDlg.c:91 ../win32/gui/CheatDlg.c:132 ../gui/Cheat.c:155
+#: ../gui/Cheat.c:251
 msgid "Invalid cheat code!"
 msgstr "非法金手指碼!"
 
-#: ../win32/gui/CheatDlg.c:117
-#: ../gui/Cheat.c:110
+#: ../win32/gui/CheatDlg.c:116 ../gui/Cheat.c:109
 msgid "Add New Cheat"
 msgstr "添加新金手指"
 
-#: ../win32/gui/CheatDlg.c:167
-#: ../data/pcsx.glade2:2622
+#: ../win32/gui/CheatDlg.c:166 ../data/pcsx.glade2:2612
 msgid "Edit Cheat Codes"
 msgstr "編輯金手指"
 
-#: ../win32/gui/CheatDlg.c:169
+#: ../win32/gui/CheatDlg.c:168
 msgid "&Add Code"
 msgstr "增加金手指碼(&A)"
 
-#: ../win32/gui/CheatDlg.c:170
+#: ../win32/gui/CheatDlg.c:169
 msgid "&Edit Code"
 msgstr "編輯金手指(&E):"
 
-#: ../win32/gui/CheatDlg.c:171
+#: ../win32/gui/CheatDlg.c:170
 msgid "&Remove Code"
 msgstr "刪除金手指碼(&R)"
 
-#: ../win32/gui/CheatDlg.c:172
+#: ../win32/gui/CheatDlg.c:171
 msgid "&Enable/Disable"
 msgstr "開啟/關閉(&E)"
 
-#: ../win32/gui/CheatDlg.c:173
+#: ../win32/gui/CheatDlg.c:172
 msgid "&Load..."
 msgstr "讀取(&L)..."
 
-#: ../win32/gui/CheatDlg.c:174
+#: ../win32/gui/CheatDlg.c:173
 msgid "&Save As..."
 msgstr "存儲為(&S)..."
 
-#: ../win32/gui/CheatDlg.c:175
+#: ../win32/gui/CheatDlg.c:174
 msgid "&Close"
 msgstr "關閉(&C)"
 
-#: ../win32/gui/CheatDlg.c:186
-#: ../gui/Cheat.c:414
+#: ../win32/gui/CheatDlg.c:185 ../gui/Cheat.c:413
 msgid "Description"
 msgstr "描述"
 
-#: ../win32/gui/CheatDlg.c:191
+#: ../win32/gui/CheatDlg.c:190
 msgid "Enabled"
 msgstr "開啟"
 
-#: ../win32/gui/CheatDlg.c:283
-#: ../win32/gui/CheatDlg.c:312
+#: ../win32/gui/CheatDlg.c:282 ../win32/gui/CheatDlg.c:311
 msgid "PCSX Cheat Code Files"
 msgstr "PCSX 金手指檔 (*.cht)"
 
-#: ../win32/gui/CheatDlg.c:403
+#: ../win32/gui/CheatDlg.c:402
 msgid "Equal Value"
 msgstr "等于數值"
 
-#: ../win32/gui/CheatDlg.c:404
+#: ../win32/gui/CheatDlg.c:403
 msgid "Not Equal Value"
 msgstr "不等于數值"
 
-#: ../win32/gui/CheatDlg.c:405
+#: ../win32/gui/CheatDlg.c:404
 msgid "Range"
 msgstr "範圍"
 
-#: ../win32/gui/CheatDlg.c:408
+#: ../win32/gui/CheatDlg.c:407
 msgid "Increased By"
 msgstr "增加數值"
 
-#: ../win32/gui/CheatDlg.c:409
+#: ../win32/gui/CheatDlg.c:408
 msgid "Decreased By"
 msgstr "減少數值"
 
-#: ../win32/gui/CheatDlg.c:410
+#: ../win32/gui/CheatDlg.c:409
 msgid "Increased"
 msgstr "增加"
 
-#: ../win32/gui/CheatDlg.c:411
+#: ../win32/gui/CheatDlg.c:410
 msgid "Decreased"
 msgstr "已減少"
 
-#: ../win32/gui/CheatDlg.c:412
+#: ../win32/gui/CheatDlg.c:411
 msgid "Different"
 msgstr "不同"
 
-#: ../win32/gui/CheatDlg.c:413
+#: ../win32/gui/CheatDlg.c:412
 msgid "No Change"
 msgstr "無改變"
 
-#: ../win32/gui/CheatDlg.c:449
-#: ../gui/Cheat.c:586
+#: ../win32/gui/CheatDlg.c:448 ../gui/Cheat.c:585
 msgid "Enter the values and start your search."
 msgstr "輸入數值並開始搜索。"
 
-#: ../win32/gui/CheatDlg.c:454
+#: ../win32/gui/CheatDlg.c:453
 msgid "No addresses found."
 msgstr "未找到位址。"
 
-#: ../win32/gui/CheatDlg.c:458
-#: ../gui/Cheat.c:544
+#: ../win32/gui/CheatDlg.c:457 ../gui/Cheat.c:543
 msgid "Too many addresses found."
 msgstr "找到過多位址。"
 
-#: ../win32/gui/CheatDlg.c:467
-#: ../gui/Cheat.c:553
+#: ../win32/gui/CheatDlg.c:466 ../gui/Cheat.c:552
 #, c-format
 msgid "%.8X    Current: %u (%.2X), Previous: %u (%.2X)"
 msgstr "%.8X    當前值: %u (%.2X), 前次值: %u (%.2X)"
 
-#: ../win32/gui/CheatDlg.c:472
-#: ../gui/Cheat.c:558
+#: ../win32/gui/CheatDlg.c:471 ../gui/Cheat.c:557
 #, c-format
 msgid "%.8X    Current: %u (%.4X), Previous: %u (%.4X)"
 msgstr "%.8X    當前值: %u (%.4X), 前次值: %u (%.4X)"
 
-#: ../win32/gui/CheatDlg.c:477
-#: ../gui/Cheat.c:563
+#: ../win32/gui/CheatDlg.c:476 ../gui/Cheat.c:562
 #, c-format
 msgid "%.8X    Current: %u (%.8X), Previous: %u (%.8X)"
 msgstr "%.8X    當前值: %u (%.8X), 前次值: %u (%.8X)"
 
-#: ../win32/gui/CheatDlg.c:493
-#: ../gui/Cheat.c:578
+#: ../win32/gui/CheatDlg.c:492 ../gui/Cheat.c:577
 #, c-format
 msgid "Founded Addresses: %d"
 msgstr "找到位址: %d"
 
-#: ../win32/gui/CheatDlg.c:505
-#: ../data/pcsx.glade2:3022
+#: ../win32/gui/CheatDlg.c:504 ../data/pcsx.glade2:3012
 msgid "Freeze"
 msgstr "固定"
 
-#: ../win32/gui/CheatDlg.c:506
-#: ../win32/gui/CheatDlg.c:597
+#: ../win32/gui/CheatDlg.c:505 ../win32/gui/CheatDlg.c:596
 msgid "Address:"
 msgstr "位址:"
 
-#: ../win32/gui/CheatDlg.c:507
-#: ../win32/gui/CheatDlg.c:598
-#: ../win32/gui/CheatDlg.c:683
-#: ../gui/Cheat.c:648
-#: ../data/pcsx.glade2:2865
+#: ../win32/gui/CheatDlg.c:506 ../win32/gui/CheatDlg.c:597
+#: ../win32/gui/CheatDlg.c:682 ../gui/Cheat.c:647 ../data/pcsx.glade2:2855
 msgid "Value:"
 msgstr "值:"
 
-#: ../win32/gui/CheatDlg.c:567
+#: ../win32/gui/CheatDlg.c:566
 #, c-format
 msgid "Freeze %.8X"
 msgstr "固定 %.8X"
 
-#: ../win32/gui/CheatDlg.c:596
-#: ../data/pcsx.glade2:3058
+#: ../win32/gui/CheatDlg.c:595 ../data/pcsx.glade2:3048
 msgid "Modify"
 msgstr "更改"
 
-#: ../win32/gui/CheatDlg.c:679
-#: ../gui/Cheat.c:1130
-#: ../data/pcsx.glade2:2793
+#: ../win32/gui/CheatDlg.c:678 ../gui/Cheat.c:1129 ../data/pcsx.glade2:2783
 msgid "Cheat Search"
 msgstr "搜尋金手指碼"
 
-#: ../win32/gui/CheatDlg.c:681
-#: ../data/pcsx.glade2:2843
+#: ../win32/gui/CheatDlg.c:680 ../data/pcsx.glade2:2833
 msgid "Search For:"
 msgstr "搜尋:"
 
-#: ../win32/gui/CheatDlg.c:682
-#: ../data/pcsx.glade2:2853
+#: ../win32/gui/CheatDlg.c:681 ../data/pcsx.glade2:2843
 msgid "Data Type:"
 msgstr "數值類型:"
 
-#: ../win32/gui/CheatDlg.c:684
-#: ../data/pcsx.glade2:2877
+#: ../win32/gui/CheatDlg.c:683 ../data/pcsx.glade2:2867
 msgid "Data Base:"
 msgstr "數值基:"
 
-#: ../win32/gui/CheatDlg.c:685
-#: ../data/pcsx.glade2:2937
+#: ../win32/gui/CheatDlg.c:684 ../data/pcsx.glade2:2927
 msgid "To:"
 msgstr "至:"
 
-#: ../win32/gui/CheatDlg.c:686
+#: ../win32/gui/CheatDlg.c:685
 msgid "&Freeze"
 msgstr "固定(&F)"
 
-#: ../win32/gui/CheatDlg.c:687
+#: ../win32/gui/CheatDlg.c:686
 msgid "&Modify"
 msgstr "更改(&M)"
 
-#: ../win32/gui/CheatDlg.c:688
+#: ../win32/gui/CheatDlg.c:687
 msgid "&Copy"
 msgstr "複制(&C)"
 
-#: ../win32/gui/CheatDlg.c:689
+#: ../win32/gui/CheatDlg.c:688
 msgid "&Search"
 msgstr "搜尋(&S)"
 
-#: ../win32/gui/CheatDlg.c:690
+#: ../win32/gui/CheatDlg.c:689
 msgid "&New Search"
 msgstr "新搜尋(&N)"
 
-#: ../win32/gui/CheatDlg.c:691
+#: ../win32/gui/CheatDlg.c:690
 msgid "C&lose"
 msgstr "關閉(&L)"
 
-#: ../win32/gui/CheatDlg.c:693
+#: ../win32/gui/CheatDlg.c:692
 msgid "8-bit"
 msgstr "8 位元"
 
-#: ../win32/gui/CheatDlg.c:694
+#: ../win32/gui/CheatDlg.c:693
 msgid "16-bit"
 msgstr "16 位元"
 
-#: ../win32/gui/CheatDlg.c:695
+#: ../win32/gui/CheatDlg.c:694
 msgid "32-bit"
 msgstr "32 位元"
 
-#: ../win32/gui/CheatDlg.c:696
+#: ../win32/gui/CheatDlg.c:695
 msgid "Decimal"
 msgstr "十進制"
 
-#: ../win32/gui/CheatDlg.c:697
+#: ../win32/gui/CheatDlg.c:696
 msgid "Hexadecimal"
 msgstr "十六進制"
 
-#: ../win32/gui/ConfigurePlugins.c:206
-#: ../gui/ConfDlg.c:675
+#: ../win32/gui/ConfigurePlugins.c:219 ../gui/ConfDlg.c:675
 msgid "Internal HLE Bios"
 msgstr "內部 HLE-Bios"
 
-#: ../win32/gui/ConfigurePlugins.c:292
+#: ../win32/gui/ConfigurePlugins.c:305
 msgid "Configuration not OK!"
 msgstr "設定不正確!"
 
-#: ../win32/gui/ConfigurePlugins.c:292
-#: ../gui/Cheat.c:156
-#: ../gui/Cheat.c:252
-#: ../gui/LnxMain.c:414
+#: ../win32/gui/ConfigurePlugins.c:305 ../gui/Cheat.c:155 ../gui/Cheat.c:251
+#: ../gui/LnxMain.c:418
 msgid "Error"
 msgstr "錯誤"
 
-#: ../win32/gui/ConfigurePlugins.c:393
+#: ../win32/gui/ConfigurePlugins.c:406
 msgid "This plugin reports that should work correctly"
 msgstr "此外掛報告其可正常工作。"
 
-#: ../win32/gui/ConfigurePlugins.c:394
+#: ../win32/gui/ConfigurePlugins.c:407
 msgid "This plugin reports that should not work correctly"
 msgstr "此外掛報告其不可正常工作。"
 
-#: ../win32/gui/ConfigurePlugins.c:450
+#: ../win32/gui/ConfigurePlugins.c:463
 msgid "Select Plugins Directory"
 msgstr "選擇外掛目錄"
 
-#: ../win32/gui/ConfigurePlugins.c:459
+#: ../win32/gui/ConfigurePlugins.c:472
 msgid "Select Bios Directory"
 msgstr "選擇 BIOS 目錄"
 
-#: ../win32/gui/ConfigurePlugins.c:468
+#: ../win32/gui/ConfigurePlugins.c:481
 msgid "Configuration"
 msgstr "設定"
 
-#: ../win32/gui/ConfigurePlugins.c:472
+#: ../win32/gui/ConfigurePlugins.c:485
 msgid "Graphics"
 msgstr "圖像"
 
-#: ../win32/gui/ConfigurePlugins.c:473
+#: ../win32/gui/ConfigurePlugins.c:486
 msgid "First Controller"
 msgstr "主控制器"
 
-#: ../win32/gui/ConfigurePlugins.c:474
+#: ../win32/gui/ConfigurePlugins.c:487
 msgid "Second Controller"
 msgstr "輔控制器"
 
-#: ../win32/gui/ConfigurePlugins.c:475
+#: ../win32/gui/ConfigurePlugins.c:488
 msgid "Sound"
 msgstr "聲音"
 
-#: ../win32/gui/ConfigurePlugins.c:476
+#: ../win32/gui/ConfigurePlugins.c:489
 msgid "Cdrom"
 msgstr "CD-ROM"
 
-#: ../win32/gui/ConfigurePlugins.c:477
+#: ../win32/gui/ConfigurePlugins.c:490
 msgid "Bios"
 msgstr "BIOS"
 
-#: ../win32/gui/ConfigurePlugins.c:478
+#: ../win32/gui/ConfigurePlugins.c:491
 msgid "Set Bios Directory"
 msgstr "設定 BIOS 目錄"
 
-#: ../win32/gui/ConfigurePlugins.c:479
+#: ../win32/gui/ConfigurePlugins.c:492
 msgid "Set Plugins Directory"
 msgstr "設定外掛目錄"
 
-#: ../win32/gui/ConfigurePlugins.c:480
-#: ../win32/gui/ConfigurePlugins.c:483
-#: ../win32/gui/ConfigurePlugins.c:486
-#: ../win32/gui/ConfigurePlugins.c:489
-#: ../win32/gui/ConfigurePlugins.c:492
-#: ../win32/gui/ConfigurePlugins.c:604
+#: ../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:481
-#: ../win32/gui/ConfigurePlugins.c:484
-#: ../win32/gui/ConfigurePlugins.c:487
-#: ../win32/gui/ConfigurePlugins.c:490
-#: ../win32/gui/ConfigurePlugins.c:493
-#: ../win32/gui/ConfigurePlugins.c:605
+#: ../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:482
-#: ../win32/gui/ConfigurePlugins.c:485
-#: ../win32/gui/ConfigurePlugins.c:488
-#: ../win32/gui/ConfigurePlugins.c:491
-#: ../win32/gui/ConfigurePlugins.c:494
-#: ../win32/gui/ConfigurePlugins.c:606
+#: ../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 "關於..."
 
-#: ../win32/gui/ConfigurePlugins.c:599
+#: ../win32/gui/ConfigurePlugins.c:612
 msgid "NetPlay Configuration"
 msgstr "聯網遊戲設定"
 
-#: ../win32/gui/ConfigurePlugins.c:603
+#: ../win32/gui/ConfigurePlugins.c:616 ../plugins/dfnet/gui.c:30
+#: ../plugins/dfnet/gui.c:74
 msgid "NetPlay"
 msgstr "聯網遊戲"
 
-#: ../win32/gui/ConfigurePlugins.c:607
-msgid "Note: The NetPlay Plugin Directory should be the same as the other Plugins."
+#: ../win32/gui/ConfigurePlugins.c:620
+msgid ""
+"Note: The NetPlay Plugin Directory should be the same as the other Plugins."
 msgstr "注意: 聯網遊戲外掛應和其它外掛放在同一資料夾中。"
 
-#: ../win32/gui/plugin.c:90
-#: ../win32/gui/WndMain.c:281
-#, c-format
-msgid "*PCSX*: Saved State %d"
-msgstr "*PCSX*: Saved State %d"
-
-#: ../win32/gui/plugin.c:91
-#: ../win32/gui/WndMain.c:282
-#, c-format
-msgid "*PCSX*: Error Saving State %d"
-msgstr "*PCSX*: Error Saving State %d"
-
-#: ../win32/gui/plugin.c:107
-#: ../win32/gui/WndMain.c:259
-#, c-format
-msgid "*PCSX*: Loaded State %d"
-msgstr "*PCSX*: Loaded State %d"
-
-#: ../win32/gui/plugin.c:108
-#: ../win32/gui/WndMain.c:260
-#, c-format
-msgid "*PCSX*: Error Loading State %d"
-msgstr "*PCSX*: Error Loading State %d"
-
-#: ../win32/gui/plugin.c:119
-#, c-format
-msgid "*PCSX*: Sio Irq Always Enabled"
-msgstr "*PCSX*: Sio Irq Always Enabled"
-
-#: ../win32/gui/plugin.c:120
-#, c-format
-msgid "*PCSX*: Sio Irq Not Always Enabled"
-msgstr "*PCSX*: Sio Irq Not Always Enabled"
-
-#: ../win32/gui/plugin.c:127
-#, c-format
-msgid "*PCSX*: Black&White Mdecs Only Enabled"
-msgstr "*PCSX*: Black&White Mdecs Only Enabled"
-
-#: ../win32/gui/plugin.c:128
-#, c-format
-msgid "*PCSX*: Black&White Mdecs Only Disabled"
-msgstr "*PCSX*: Black&White Mdecs Only Disabled"
-
-#: ../win32/gui/plugin.c:135
-#, c-format
-msgid "*PCSX*: Xa Enabled"
-msgstr "*PCSX*: Xa Enabled"
-
-#: ../win32/gui/plugin.c:136
-#, c-format
-msgid "*PCSX*: Xa Disabled"
-msgstr "*PCSX*: Xa Disabled"
-
-#: ../win32/gui/plugin.c:145
-msgid "*PCSX*: CdRom Case Opened"
-msgstr "*PCSX*: CdRom Case Opened"
-
-#: ../win32/gui/plugin.c:150
-msgid "*PCSX*: CdRom Case Closed"
-msgstr "*PCSX*: CdRom Case Closed"
-
-#: ../win32/gui/plugin.c:177
-msgid "Connecting..."
-msgstr "正在連接..."
-
-#: ../win32/gui/plugin.c:179
-#: ../win32/gui/plugin.c:186
-#, c-format
-msgid "Please wait while connecting... %c\n"
-msgstr "請稍候，正在連接... %c\n"
-
-#: ../win32/gui/plugin.c:216
-msgid "Error Opening CDR Plugin"
-msgstr "無法開啟 CDR 外掛"
-
-#: ../win32/gui/plugin.c:279
-#, c-format
-msgid "Error Opening GPU Plugin (%d)"
-msgstr "無法開啟 GPU 外掛 (%d)"
-
-#: ../win32/gui/plugin.c:281
-#, c-format
-msgid "Error Opening SPU Plugin (%d)"
-msgstr "無法開啟 SPU 外掛 (%d)"
-
-#: ../win32/gui/plugin.c:284
-#, c-format
-msgid "Error Opening PAD1 Plugin (%d)"
-msgstr "無法開啟 PAD1 外掛 (%d)"
-
-#: ../win32/gui/plugin.c:286
-#, c-format
-msgid "Error Opening PAD2 Plugin (%d)"
-msgstr "無法開啟 PAD2 外掛 (%d)"
-
-#: ../win32/gui/plugin.c:309
-msgid "Error Closing CDR Plugin"
-msgstr "無法關閉 CD-ROM 外掛 (%d)"
-
-#: ../win32/gui/plugin.c:311
-msgid "Error Closing GPU Plugin"
-msgstr "無法關閉 GPU 外掛"
-
-#: ../win32/gui/plugin.c:313
-msgid "Error Closing SPU Plugin"
-msgstr "無法關閉 SPU 外掛"
-
-#: ../win32/gui/plugin.c:315
-msgid "Error Closing PAD1 Plugin"
-msgstr "無法關閉 PAD1 外掛"
-
-#: ../win32/gui/plugin.c:317
-msgid "Error Closing PAD2 Plugin"
-msgstr "無法關閉 PAD2 外掛!"
-
-#: ../win32/gui/plugin.c:335
-#, c-format
-msgid "CDRinit error: %d"
-msgstr "CDRinit 錯誤: %d"
-
-#: ../win32/gui/plugin.c:337
-#, c-format
-msgid "GPUinit error: %d"
-msgstr "GPUinit 錯誤: %d"
-
-#: ../win32/gui/plugin.c:339
-#, c-format
-msgid "SPUinit error: %d"
-msgstr "SPUinit 錯誤: %d"
-
-#: ../win32/gui/plugin.c:341
-#, c-format
-msgid "PAD1init error: %d"
-msgstr "PAD1init 錯誤: %d"
-
-#: ../win32/gui/plugin.c:343
-#, c-format
-msgid "PAD2init error: %d"
-msgstr "PAD2init 錯誤: %d"
-
-#: ../win32/gui/plugin.c:346
-#, c-format
-msgid "NETinit error: %d"
-msgstr "NETinit 錯誤: %d"
-
 #: ../win32/gui/WndMain.c:76
 msgid "Arabic"
 msgstr "阿拉伯語"
@@ -615,9 +420,8 @@ msgstr "德語"
 msgid "Greek"
 msgstr "希臘語"
 
-#: ../win32/gui/WndMain.c:80
-#: ../win32/gui/WndMain.c:1559
-#: ../win32/gui/WndMain.c:1561
+#: ../win32/gui/WndMain.c:80 ../win32/gui/WndMain.c:1558
+#: ../win32/gui/WndMain.c:1560
 msgid "English"
 msgstr "英語"
 
@@ -665,8 +469,27 @@ msgstr "日語"
 msgid "Korean"
 msgstr "韓國語"
 
-#: ../win32/gui/WndMain.c:300
-#: ../win32/gui/WndMain.c:352
+#: ../win32/gui/WndMain.c:259 ../win32/gui/plugin.c:107
+#, c-format
+msgid "*PCSX*: Loaded State %d"
+msgstr "*PCSX*: Loaded State %d"
+
+#: ../win32/gui/WndMain.c:260 ../win32/gui/plugin.c:108
+#, c-format
+msgid "*PCSX*: Error Loading State %d"
+msgstr "*PCSX*: Error Loading State %d"
+
+#: ../win32/gui/WndMain.c:281 ../win32/gui/plugin.c:90
+#, c-format
+msgid "*PCSX*: Saved State %d"
+msgstr "*PCSX*: Saved State %d"
+
+#: ../win32/gui/WndMain.c:282 ../win32/gui/plugin.c:91
+#, c-format
+msgid "*PCSX*: Error Saving State %d"
+msgstr "*PCSX*: Error Saving State %d"
+
+#: ../win32/gui/WndMain.c:300 ../win32/gui/WndMain.c:352
 msgid "PCSX State Format"
 msgstr "PCSX 記錄格式"
 
@@ -690,16 +513,12 @@ msgstr "*PCSX*: Saved State %s"
 msgid "*PCSX*: Error Saving State %s"
 msgstr "*PCSX*: Error Saving State %s"
 
-#: ../win32/gui/WndMain.c:429
-#: ../win32/gui/WndMain.c:478
-#: ../gui/Gtk2Gui.c:484
+#: ../win32/gui/WndMain.c:429 ../win32/gui/WndMain.c:478 ../gui/Gtk2Gui.c:484
 #: ../gui/Gtk2Gui.c:609
 msgid "The CD does not appear to be a valid Playstation CD"
 msgstr "此光碟不是一張合法的 PlayStation 光碟。"
 
-#: ../win32/gui/WndMain.c:435
-#: ../win32/gui/WndMain.c:484
-#: ../gui/Gtk2Gui.c:492
+#: ../win32/gui/WndMain.c:435 ../win32/gui/WndMain.c:484 ../gui/Gtk2Gui.c:492
 #: ../gui/Gtk2Gui.c:617
 msgid "Could not load CD-ROM!"
 msgstr "無法加載光碟!"
@@ -708,13 +527,11 @@ msgstr "無法加載光碟!"
 msgid "Running BIOS is not supported with Internal HLE Bios."
 msgstr "內部 HLE BIOS 不支援直接執行。"
 
-#: ../win32/gui/WndMain.c:664
-#: ../gui/MemcardDlg.c:59
+#: ../win32/gui/WndMain.c:664 ../gui/MemcardDlg.c:62
 msgid "Title"
 msgstr "標題"
 
-#: ../win32/gui/WndMain.c:670
-#: ../gui/MemcardDlg.c:65
+#: ../win32/gui/WndMain.c:670 ../gui/MemcardDlg.c:68
 msgid "Status"
 msgstr "狀態"
 
@@ -734,24 +551,17 @@ msgstr "mid link block"
 msgid "terminiting link block"
 msgstr "terminiting link block"
 
-#: ../win32/gui/WndMain.c:867
-#: ../gui/MemcardDlg.c:147
-#: ../gui/MemcardDlg.c:244
+#: ../win32/gui/WndMain.c:867 ../gui/MemcardDlg.c:154 ../gui/MemcardDlg.c:252
 msgid "Deleted"
 msgstr "已刪除"
 
-#: ../win32/gui/WndMain.c:868
-#: ../win32/gui/WndMain.c:871
-#: ../gui/MemcardDlg.c:149
-#: ../gui/MemcardDlg.c:153
-#: ../gui/MemcardDlg.c:246
-#: ../gui/MemcardDlg.c:250
+#: ../win32/gui/WndMain.c:868 ../win32/gui/WndMain.c:871
+#: ../gui/MemcardDlg.c:156 ../gui/MemcardDlg.c:160 ../gui/MemcardDlg.c:254
+#: ../gui/MemcardDlg.c:258
 msgid "Free"
 msgstr "空閑"
 
-#: ../win32/gui/WndMain.c:870
-#: ../gui/MemcardDlg.c:151
-#: ../gui/MemcardDlg.c:248
+#: ../win32/gui/WndMain.c:870 ../gui/MemcardDlg.c:158 ../gui/MemcardDlg.c:256
 msgid "Used"
 msgstr "已使用"
 
@@ -759,18 +569,15 @@ msgstr "已使用"
 msgid "Memcard Manager"
 msgstr "記憶卡管理器"
 
-#: ../win32/gui/WndMain.c:968
-#: ../win32/gui/WndMain.c:971
+#: ../win32/gui/WndMain.c:968 ../win32/gui/WndMain.c:971
 msgid "Select Mcd"
 msgstr "選擇"
 
-#: ../win32/gui/WndMain.c:969
-#: ../win32/gui/WndMain.c:972
+#: ../win32/gui/WndMain.c:969 ../win32/gui/WndMain.c:972
 msgid "Format Mcd"
 msgstr "格式化"
 
-#: ../win32/gui/WndMain.c:970
-#: ../win32/gui/WndMain.c:973
+#: ../win32/gui/WndMain.c:970 ../win32/gui/WndMain.c:973
 msgid "Reload Mcd"
 msgstr "重新加載"
 
@@ -806,14 +613,12 @@ msgstr "記憶卡 2"
 msgid "Are you sure you want to paste this selection?"
 msgstr "是否確認粘貼此選中內容?"
 
-#: ../win32/gui/WndMain.c:1036
-#: ../win32/gui/WndMain.c:1147
+#: ../win32/gui/WndMain.c:1036 ../win32/gui/WndMain.c:1147
 #: ../win32/gui/WndMain.c:1154
 msgid "Confirmation"
 msgstr "確認"
 
-#: ../win32/gui/WndMain.c:1147
-#: ../win32/gui/WndMain.c:1154
+#: ../win32/gui/WndMain.c:1147 ../win32/gui/WndMain.c:1154
 msgid "Are you sure you want to format this Memory Card?"
 msgstr "是否確認格式化此記憶卡?"
 
@@ -837,8 +642,7 @@ msgstr "黑白電影"
 msgid "Disable Cd audio"
 msgstr "禁用 CD 音頻"
 
-#: ../win32/gui/WndMain.c:1209
-#: ../data/pcsx.glade2:1601
+#: ../win32/gui/WndMain.c:1209 ../data/pcsx.glade2:1601
 msgid "Autodetect"
 msgstr "自動檢測"
 
@@ -846,13 +650,11 @@ msgstr "自動檢測"
 msgid "Enable Interpreter Cpu"
 msgstr "開啟解釋執行 CPU"
 
-#: ../win32/gui/WndMain.c:1211
-#: ../data/pcsx.glade2:1457
+#: ../win32/gui/WndMain.c:1211 ../data/pcsx.glade2:1457
 msgid "Enable Console Output"
 msgstr "開啟控制台輸出"
 
-#: ../win32/gui/WndMain.c:1212
-#: ../data/pcsx.glade2:1407
+#: ../win32/gui/WndMain.c:1212 ../data/pcsx.glade2:1407
 msgid "Enable Debugger"
 msgstr "開啟調試器"
 
@@ -860,13 +662,11 @@ msgstr "開啟調試器"
 msgid "Spu Irq Always Enabled"
 msgstr "SPU IRQ 總是開啟"
 
-#: ../win32/gui/WndMain.c:1214
-#: ../data/pcsx.glade2:1544
+#: ../win32/gui/WndMain.c:1214 ../data/pcsx.glade2:1544
 msgid "Parasite Eve 2, Vandal Hearts 1/2 Fix"
 msgstr "Parasite Eve 2, Vandal Hearts 1/2 修正"
 
-#: ../win32/gui/WndMain.c:1215
-#: ../data/pcsx.glade2:1559
+#: ../win32/gui/WndMain.c:1215 ../data/pcsx.glade2:1559
 msgid "InuYasha Sengoku Battle Fix"
 msgstr "InuYasha Sengoku 戰斗修正"
 
@@ -880,264 +680,364 @@ msgstr "選項"
 msgid "Psx System Type"
 msgstr "Psx 系統類型"
 
-#: ../win32/gui/WndMain.c:1323
+#: ../win32/gui/WndMain.c:1322
 msgid "Psx Mcd Format (*.mcr;*.mc;*.mem;*.vgs;*.mcd;*.gme;*.ddf)"
 msgstr "Psx 記憶卡格式 (*.mcr;*.mc;*.mem;*.vgs;*.mcd;*.gme;*.ddf)"
 
-#: ../win32/gui/WndMain.c:1328
+#: ../win32/gui/WndMain.c:1327
 msgid "Psx Memory Card (*.mcr;*.mc)"
 msgstr "Psx 記憶卡 (*.mcr;*.mc)"
 
-#: ../win32/gui/WndMain.c:1333
+#: ../win32/gui/WndMain.c:1332
 msgid "CVGS Memory Card (*.mem;*.vgs)"
 msgstr "VGS 記憶卡 (*.mem;*.vgs)"
 
-#: ../win32/gui/WndMain.c:1338
+#: ../win32/gui/WndMain.c:1337
 msgid "Bleem Memory Card (*.mcd)"
 msgstr "Bleem 記憶卡 (*.mcd)"
 
-#: ../win32/gui/WndMain.c:1343
+#: ../win32/gui/WndMain.c:1342
 msgid "DexDrive Memory Card (*.gme)"
 msgstr "DexDrive 記憶卡 (*.gme)"
 
-#: ../win32/gui/WndMain.c:1348
+#: ../win32/gui/WndMain.c:1347
 msgid "DataDeck Memory Card (*.ddf)"
 msgstr "DataDeck 記憶卡 (*.ddl)"
 
-#: ../win32/gui/WndMain.c:1353
-#: ../win32/gui/WndMain.c:1434
-#: ../gui/Cheat.c:322
-#: ../gui/Gtk2Gui.c:421
-#: ../gui/Gtk2Gui.c:560
+#: ../win32/gui/WndMain.c:1352 ../win32/gui/WndMain.c:1433 ../gui/Cheat.c:321
+#: ../gui/Gtk2Gui.c:421 ../gui/Gtk2Gui.c:560
 msgid "All Files"
 msgstr "所有檔案"
 
-#: ../win32/gui/WndMain.c:1392
+#: ../win32/gui/WndMain.c:1391
 msgid "Psx Exe Format"
 msgstr "PSX EXE 格式"
 
-#: ../win32/gui/WndMain.c:1429
+#: ../win32/gui/WndMain.c:1428
 msgid "Psx Isos (*.iso;*.mdf;*.img;*.bin)"
 msgstr "Psx 鏡像檔 (*.iso;*.mdf;*.img;*.bin)"
 
-#: ../win32/gui/WndMain.c:1505
+#: ../win32/gui/WndMain.c:1504
 msgid "&File"
 msgstr "檔案(&F)"
 
-#: ../win32/gui/WndMain.c:1506
+#: ../win32/gui/WndMain.c:1505
 msgid "E&xit"
 msgstr "離開(&X)"
 
-#: ../win32/gui/WndMain.c:1508
+#: ../win32/gui/WndMain.c:1507
 msgid "Run &EXE..."
 msgstr "執行 EXE(&E)..."
 
-#: ../win32/gui/WndMain.c:1509
+#: ../win32/gui/WndMain.c:1508
 msgid "Run &BIOS"
 msgstr "執行 BIOS(&B)"
 
-#: ../win32/gui/WndMain.c:1510
+#: ../win32/gui/WndMain.c:1509
 msgid "Run &ISO..."
 msgstr "執行 ISO(&I)..."
 
-#: ../win32/gui/WndMain.c:1511
+#: ../win32/gui/WndMain.c:1510
 msgid "Run &CD"
 msgstr "執行光碟(&C)"
 
-#: ../win32/gui/WndMain.c:1513
+#: ../win32/gui/WndMain.c:1512
 msgid "&Emulator"
 msgstr "模擬器(&E)"
 
-#: ../win32/gui/WndMain.c:1514
+#: ../win32/gui/WndMain.c:1513
 msgid "&States"
 msgstr "記錄(&S)"
 
-#: ../win32/gui/WndMain.c:1516
+#: ../win32/gui/WndMain.c:1515
 msgid "S&witch ISO..."
 msgstr "更換 ISO(&W)..."
 
-#: ../win32/gui/WndMain.c:1518
+#: ../win32/gui/WndMain.c:1517
 msgid "Re&set"
 msgstr "複位(&S)"
 
-#: ../win32/gui/WndMain.c:1519
+#: ../win32/gui/WndMain.c:1518
 msgid "&Run"
 msgstr "執行(&R)"
 
-#: ../win32/gui/WndMain.c:1520
+#: ../win32/gui/WndMain.c:1519
 msgid "&Save"
 msgstr "存儲(&S)"
 
-#: ../win32/gui/WndMain.c:1521
+#: ../win32/gui/WndMain.c:1520
 msgid "&Load"
 msgstr "讀取(&L)"
 
-#: ../win32/gui/WndMain.c:1522
-#: ../win32/gui/WndMain.c:1528
+#: ../win32/gui/WndMain.c:1521 ../win32/gui/WndMain.c:1527
 msgid "&Other..."
 msgstr "其它(&O)..."
 
-#: ../win32/gui/WndMain.c:1523
-#: ../win32/gui/WndMain.c:1529
+#: ../win32/gui/WndMain.c:1522 ../win32/gui/WndMain.c:1528
 msgid "Slot &5"
 msgstr "記錄 5(&5)"
 
-#: ../win32/gui/WndMain.c:1524
-#: ../win32/gui/WndMain.c:1530
+#: ../win32/gui/WndMain.c:1523 ../win32/gui/WndMain.c:1529
 msgid "Slot &4"
 msgstr "記錄 4(&4)"
 
-#: ../win32/gui/WndMain.c:1525
-#: ../win32/gui/WndMain.c:1531
+#: ../win32/gui/WndMain.c:1524 ../win32/gui/WndMain.c:1530
 msgid "Slot &3"
 msgstr "記錄 3(&3)"
 
-#: ../win32/gui/WndMain.c:1526
-#: ../win32/gui/WndMain.c:1532
+#: ../win32/gui/WndMain.c:1525 ../win32/gui/WndMain.c:1531
 msgid "Slot &2"
 msgstr "記錄 2(&2)"
 
-#: ../win32/gui/WndMain.c:1527
-#: ../win32/gui/WndMain.c:1533
+#: ../win32/gui/WndMain.c:1526 ../win32/gui/WndMain.c:1532
 msgid "Slot &1"
 msgstr "記錄 1(&1)"
 
-#: ../win32/gui/WndMain.c:1535
+#: ../win32/gui/WndMain.c:1534
 msgid "&Configuration"
 msgstr "設定(&C)"
 
-#: ../win32/gui/WndMain.c:1536
+#: ../win32/gui/WndMain.c:1535
 msgid "Cheat &Search..."
 msgstr "搜尋金手指碼(&S)..."
 
-#: ../win32/gui/WndMain.c:1537
+#: ../win32/gui/WndMain.c:1536
 msgid "Ch&eat Code..."
 msgstr "金手指碼(&E)..."
 
-#: ../win32/gui/WndMain.c:1540
+#: ../win32/gui/WndMain.c:1539
 msgid "&Language"
 msgstr "語言(&L)"
 
-#: ../win32/gui/WndMain.c:1565
+#: ../win32/gui/WndMain.c:1564
 msgid "&Memory cards..."
 msgstr "記憶卡(&M)..."
 
-#: ../win32/gui/WndMain.c:1566
+#: ../win32/gui/WndMain.c:1565
 msgid "C&PU..."
 msgstr "CPU(&P)..."
 
-#: ../win32/gui/WndMain.c:1568
+#: ../win32/gui/WndMain.c:1567
 msgid "&NetPlay..."
 msgstr "聯網遊戲(&N)..."
 
-#: ../win32/gui/WndMain.c:1570
+#: ../win32/gui/WndMain.c:1569
 msgid "&Controllers..."
 msgstr "控制器(&C)..."
 
-#: ../win32/gui/WndMain.c:1571
+#: ../win32/gui/WndMain.c:1570
 msgid "CD-&ROM..."
 msgstr "CD-ROM(&R)..."
 
-#: ../win32/gui/WndMain.c:1572
+#: ../win32/gui/WndMain.c:1571
 msgid "&Sound..."
 msgstr "聲音(&S)..."
 
-#: ../win32/gui/WndMain.c:1573
+#: ../win32/gui/WndMain.c:1572
 msgid "&Graphics..."
 msgstr "圖像(&G)..."
 
-#: ../win32/gui/WndMain.c:1575
+#: ../win32/gui/WndMain.c:1574
 msgid "&Plugins && Bios..."
 msgstr "外掛及 BIOS(&P)..."
 
-#: ../win32/gui/WndMain.c:1577
+#: ../win32/gui/WndMain.c:1576
 msgid "&Help"
 msgstr "說明(&H)"
 
-#: ../win32/gui/WndMain.c:1578
+#: ../win32/gui/WndMain.c:1577
 msgid "&About..."
 msgstr "關於(&A)..."
 
-#: ../win32/gui/WndMain.c:1764
+#: ../win32/gui/WndMain.c:1756
 msgid "Pcsx Msg"
 msgstr "Pcsx 消息"
 
-#: ../win32/gui/WndMain.c:1767
+#: ../win32/gui/WndMain.c:1759
 msgid "Error Loading Symbol"
 msgstr "無法加載符號"
 
-#: ../gui/Cheat.c:118
-#: ../gui/Cheat.c:203
+#: ../win32/gui/plugin.c:119
+#, c-format
+msgid "*PCSX*: Sio Irq Always Enabled"
+msgstr "*PCSX*: Sio Irq Always Enabled"
+
+#: ../win32/gui/plugin.c:120
+#, c-format
+msgid "*PCSX*: Sio Irq Not Always Enabled"
+msgstr "*PCSX*: Sio Irq Not Always Enabled"
+
+#: ../win32/gui/plugin.c:127
+#, c-format
+msgid "*PCSX*: Black&White Mdecs Only Enabled"
+msgstr "*PCSX*: Black&White Mdecs Only Enabled"
+
+#: ../win32/gui/plugin.c:128
+#, c-format
+msgid "*PCSX*: Black&White Mdecs Only Disabled"
+msgstr "*PCSX*: Black&White Mdecs Only Disabled"
+
+#: ../win32/gui/plugin.c:135
+#, c-format
+msgid "*PCSX*: Xa Enabled"
+msgstr "*PCSX*: Xa Enabled"
+
+#: ../win32/gui/plugin.c:136
+#, c-format
+msgid "*PCSX*: Xa Disabled"
+msgstr "*PCSX*: Xa Disabled"
+
+#: ../win32/gui/plugin.c:145
+msgid "*PCSX*: CdRom Case Opened"
+msgstr "*PCSX*: CdRom Case Opened"
+
+#: ../win32/gui/plugin.c:150
+msgid "*PCSX*: CdRom Case Closed"
+msgstr "*PCSX*: CdRom Case Closed"
+
+#: ../win32/gui/plugin.c:177
+msgid "Connecting..."
+msgstr "正在連接..."
+
+#: ../win32/gui/plugin.c:179 ../win32/gui/plugin.c:186
+#, c-format
+msgid "Please wait while connecting... %c\n"
+msgstr "請稍候，正在連接... %c\n"
+
+#: ../win32/gui/plugin.c:214
+msgid "Error Opening CDR Plugin"
+msgstr "無法開啟 CDR 外掛"
+
+#: ../win32/gui/plugin.c:277
+#, c-format
+msgid "Error Opening GPU Plugin (%d)"
+msgstr "無法開啟 GPU 外掛 (%d)"
+
+#: ../win32/gui/plugin.c:279
+#, c-format
+msgid "Error Opening SPU Plugin (%d)"
+msgstr "無法開啟 SPU 外掛 (%d)"
+
+#: ../win32/gui/plugin.c:282
+#, c-format
+msgid "Error Opening PAD1 Plugin (%d)"
+msgstr "無法開啟 PAD1 外掛 (%d)"
+
+#: ../win32/gui/plugin.c:284
+#, c-format
+msgid "Error Opening PAD2 Plugin (%d)"
+msgstr "無法開啟 PAD2 外掛 (%d)"
+
+#: ../win32/gui/plugin.c:307
+msgid "Error Closing CDR Plugin"
+msgstr "無法關閉 CD-ROM 外掛 (%d)"
+
+#: ../win32/gui/plugin.c:309
+msgid "Error Closing GPU Plugin"
+msgstr "無法關閉 GPU 外掛"
+
+#: ../win32/gui/plugin.c:311
+msgid "Error Closing SPU Plugin"
+msgstr "無法關閉 SPU 外掛"
+
+#: ../win32/gui/plugin.c:313
+msgid "Error Closing PAD1 Plugin"
+msgstr "無法關閉 PAD1 外掛"
+
+#: ../win32/gui/plugin.c:315
+msgid "Error Closing PAD2 Plugin"
+msgstr "無法關閉 PAD2 外掛!"
+
+#: ../win32/gui/plugin.c:333
+#, c-format
+msgid "CDRinit error: %d"
+msgstr "CDRinit 錯誤: %d"
+
+#: ../win32/gui/plugin.c:335
+#, c-format
+msgid "GPUinit error: %d"
+msgstr "GPUinit 錯誤: %d"
+
+#: ../win32/gui/plugin.c:337
+#, c-format
+msgid "SPUinit error: %d"
+msgstr "SPUinit 錯誤: %d"
+
+#: ../win32/gui/plugin.c:339
+#, c-format
+msgid "PAD1init error: %d"
+msgstr "PAD1init 錯誤: %d"
+
+#: ../win32/gui/plugin.c:341
+#, c-format
+msgid "PAD2init error: %d"
+msgstr "PAD2init 錯誤: %d"
+
+#: ../win32/gui/plugin.c:344
+#, c-format
+msgid "NETinit error: %d"
+msgstr "NETinit 錯誤: %d"
+
+#: ../gui/Cheat.c:117 ../gui/Cheat.c:202
 msgid "Cheat Description:"
 msgstr "金手指描述:"
 
-#: ../gui/Cheat.c:307
+#: ../gui/Cheat.c:306
 msgid "Open Cheat File"
 msgstr "打開金手指檔"
 
-#: ../gui/Cheat.c:317
-#: ../gui/Cheat.c:357
+#: ../gui/Cheat.c:316 ../gui/Cheat.c:356
 msgid "PCSX Cheat Code Files (*.cht)"
 msgstr "PCSX 金手指檔 (*.cht)"
 
-#: ../gui/Cheat.c:347
+#: ../gui/Cheat.c:346
 msgid "Save Cheat File"
 msgstr "儲存金手指檔"
 
-#: ../gui/Cheat.c:362
+#: ../gui/Cheat.c:361
 msgid "All Files (*.*)"
 msgstr "所有檔案 (*.*)"
 
-#: ../gui/Cheat.c:395
-#: ../gui/Cheat.c:1125
-#: ../gui/ConfDlg.c:104
-#: ../gui/ConfDlg.c:200
-#: ../gui/DebugMemory.c:256
+#: ../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 界面!"
 
-#: ../gui/Cheat.c:400
+#: ../gui/Cheat.c:399
 msgid "Cheat Codes"
 msgstr "金手指碼"
 
-#: ../gui/Cheat.c:406
+#: ../gui/Cheat.c:405
 msgid "Enable"
 msgstr "開啟"
 
-#: ../gui/Cheat.c:631
+#: ../gui/Cheat.c:630
 msgid "Freeze value"
 msgstr "固定數值"
 
-#: ../gui/Cheat.c:730
+#: ../gui/Cheat.c:729
 msgid "Modify value"
 msgstr "更改數值"
 
-#: ../gui/Cheat.c:738
+#: ../gui/Cheat.c:737
 msgid "New value:"
 msgstr "新值:"
 
-#: ../gui/Cheat.c:1135
+#: ../gui/Cheat.c:1134
 msgid "Search Results"
 msgstr "搜尋結果"
 
-#: ../gui/ConfDlg.c:112
-#: ../data/pcsx.glade2:779
+#: ../gui/ConfDlg.c:112 ../data/pcsx.glade2:779
 msgid "Configure PCSX"
 msgstr "設定 PCSX"
 
-#: ../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 "此外掛不需要被設定。"
 
@@ -1146,57 +1046,53 @@ 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"
 
-#: ../gui/DebugMemory.c:102
-#: ../data/pcsx.glade2:3270
+#: ../gui/DebugMemory.c:103 ../data/pcsx.glade2:3260
 msgid "Memory Dump"
 msgstr "記憶體轉儲"
 
-#: ../gui/DebugMemory.c:110
+#: ../gui/DebugMemory.c:111
 msgid "Start Address (Hexadecimal):"
 msgstr "起始位址 (十六進制):"
 
-#: ../gui/DebugMemory.c:118
+#: ../gui/DebugMemory.c:121
 msgid "Length (Decimal):"
 msgstr "長度 (十進制):"
 
-#: ../gui/DebugMemory.c:144
+#: ../gui/DebugMemory.c:147
 msgid "Dump to File"
 msgstr "轉儲至檔案"
 
-#: ../gui/DebugMemory.c:159
+#: ../gui/DebugMemory.c:162
 #, c-format
 msgid "Error writing to %s!"
 msgstr "存儲至 %s 時出錯!"
 
-#: ../gui/DebugMemory.c:177
+#: ../gui/DebugMemory.c:180
 msgid "Memory Patch"
 msgstr "記憶體修改"
 
-#: ../gui/DebugMemory.c:185
-#: ../data/pcsx.glade2:3292
+#: ../gui/DebugMemory.c:188 ../data/pcsx.glade2:3282
 msgid "Address (Hexadecimal):"
 msgstr "位址 (十六進制):"
 
-#: ../gui/DebugMemory.c:195
+#: ../gui/DebugMemory.c:198
 msgid "Value (Hexa string):"
 msgstr "數值 (十六進制串):"
 
-#: ../gui/DebugMemory.c:261
+#: ../gui/DebugMemory.c:264
 msgid "Memory Viewer"
 msgstr "記憶體檢視"
 
-#: ../gui/DebugMemory.c:266
+#: ../gui/DebugMemory.c:269
 msgid "Address"
 msgstr "位址"
 
-#: ../gui/DebugMemory.c:284
+#: ../gui/DebugMemory.c:287
 msgid "Text"
 msgstr "文字"
 
@@ -1224,13 +1120,11 @@ msgstr "不是一個合法的 PSX 檔"
 msgid "The file does not appear to be a valid Playstation executable"
 msgstr "此文件不是一個合法的 PlayStation 執行檔"
 
-#: ../gui/Gtk2Gui.c:484
-#: ../gui/Gtk2Gui.c:609
+#: ../gui/Gtk2Gui.c:484 ../gui/Gtk2Gui.c:609
 msgid "CD ROM failed"
 msgstr "CD-ROM 失敗"
 
-#: ../gui/Gtk2Gui.c:492
-#: ../gui/Gtk2Gui.c:617
+#: ../gui/Gtk2Gui.c:492 ../gui/Gtk2Gui.c:617
 msgid "The CD-ROM could not be loaded"
 msgstr "無法加載 CD-ROM"
 
@@ -1250,32 +1144,31 @@ msgstr "打開 PSX 光碟映像檔"
 msgid "PSX Image Files (*.bin, *.img, *.mdf, *.iso)"
 msgstr "PSX 鏡像檔 (*.bin, *.img, *.mdf, *.iso)"
 
-#: ../gui/Gtk2Gui.c:766
+#: ../gui/Gtk2Gui.c:770
 #, c-format
 msgid "Loaded state %s."
 msgstr "已讀取記錄 %s。"
 
-#: ../gui/Gtk2Gui.c:770
+#: ../gui/Gtk2Gui.c:773
 #, c-format
 msgid "Error loading state %s!"
 msgstr "讀取記錄 %s 時出錯。"
 
-#: ../gui/Gtk2Gui.c:781
+#: ../gui/Gtk2Gui.c:784
 #, c-format
 msgid "Saved state %s."
 msgstr "已存儲記錄 %s"
 
-#: ../gui/Gtk2Gui.c:783
+#: ../gui/Gtk2Gui.c:786
 #, c-format
 msgid "Error saving state %s!"
 msgstr "存儲記錄 %s 時出錯。"
 
-#: ../gui/Gtk2Gui.c:816
-#: ../gui/Gtk2Gui.c:843
+#: ../gui/Gtk2Gui.c:821 ../gui/Gtk2Gui.c:849
 msgid "Select State File"
 msgstr "選擇記錄檔案"
 
-#: ../gui/Gtk2Gui.c:900
+#: ../gui/Gtk2Gui.c:905
 msgid "Notice"
 msgstr "警告"
 
@@ -1284,7 +1177,7 @@ msgstr "警告"
 msgid "Creating memory card: %s\n"
 msgstr "創建記憶卡: %s\n"
 
-#: ../gui/LnxMain.c:321
+#: ../gui/LnxMain.c:325
 msgid ""
 " pcsx [options] [file]\n"
 "\toptions:\n"
@@ -1308,141 +1201,146 @@ msgstr ""
 "\t-h -help\t顯示此說明\n"
 "\t檔案\t\t加載檔案\n"
 
-#: ../gui/LnxMain.c:358
+#: ../gui/LnxMain.c:362
 #, c-format
-msgid "PCSX cannot be configured without using the GUI -- you should restart without -nogui.\n"
+msgid ""
+"PCSX cannot be configured without using the GUI -- you should restart "
+"without -nogui.\n"
 msgstr "PCSX 不能在字符界面下設定 -- 請不使用 -nogui 參數重新啟動程式\n"
 
-#: ../gui/LnxMain.c:414
+#: ../gui/LnxMain.c:418
 msgid "Failed loading plugins!"
 msgstr "外掛加載失敗"
 
-#: ../gui/LnxMain.c:431
+#: ../gui/LnxMain.c:435
 #, c-format
 msgid "Could not load CD-ROM!\n"
 msgstr "無法加載光碟。\n"
 
-#: ../gui/LnxMain.c:467
+#: ../gui/LnxMain.c:466
 #, c-format
 msgid "PSX emulator couldn't be initialized.\n"
 msgstr "PSX 模擬器無法初期化。\n"
 
-#: ../gui/MemcardDlg.c:53
+#: ../gui/MemcardDlg.c:56
 msgid "Icon"
 msgstr "圖符"
 
-#: ../gui/MemcardDlg.c:71
+#: ../gui/MemcardDlg.c:74
 msgid "ID"
 msgstr "ID"
 
-#: ../gui/MemcardDlg.c:77
+#: ../gui/MemcardDlg.c:80
 msgid "Name"
 msgstr "名稱"
 
-#: ../gui/MemcardDlg.c:297
+#: ../gui/MemcardDlg.c:317
 msgid "Select A File"
 msgstr "選擇檔案"
 
-#: ../gui/MemcardDlg.c:338
+#: ../gui/MemcardDlg.c:358
 msgid "Format this Memory Card?"
 msgstr "格式化此記憶卡?"
 
-#: ../gui/MemcardDlg.c:340
-msgid "If you format the memory card, the card will be empty, and any existing data overwritten."
+#: ../gui/MemcardDlg.c:360
+msgid ""
+"If you format the memory card, the card will be empty, and any existing data "
+"overwritten."
 msgstr "如果您選擇格式化記憶卡，記憶卡將被清空，並且任何現有資料都將被覆蓋。"
 
-#: ../gui/MemcardDlg.c:343
+#: ../gui/MemcardDlg.c:363
 msgid "Format card"
 msgstr "格式化記憶卡"
 
-#: ../gui/MemcardDlg.c:367
+#: ../gui/MemcardDlg.c:387
 msgid "Create a new Memory Card"
 msgstr "新增記憶卡"
 
-#: ../gui/MemcardDlg.c:376
+#: ../gui/MemcardDlg.c:396
 msgid "New Memory Card.mcd"
 msgstr "新記憶卡檔.mcd"
 
-#: ../gui/MemcardDlg.c:477
+#: ../gui/MemcardDlg.c:497
 msgid "No free space on memory card"
 msgstr "記憶卡無空餘位置"
 
-#: ../gui/MemcardDlg.c:478
-msgid "There are no free slots available on the target memory card. Please delete a slot first."
+#: ../gui/MemcardDlg.c:498
+msgid ""
+"There are no free slots available on the target memory card. Please delete a "
+"slot first."
 msgstr "目的記憶卡無空餘位置。請先刪除一個檔案。"
 
-#: ../gui/MemcardDlg.c:632
+#: ../gui/MemcardDlg.c:661
 msgid "Memory Card Manager"
 msgstr "記憶卡管理器"
 
-#: ../gui/Plugin.c:204
-#: ../data/pcsx.glade2:1493
+#: ../gui/Plugin.c:203 ../data/pcsx.glade2:1493
 #, c-format
 msgid "SIO IRQ Always Enabled"
 msgstr "SIO IRQ 總是開啟"
 
-#: ../gui/Plugin.c:205
+#: ../gui/Plugin.c:204
 #, c-format
 msgid "SIO IRQ Not Always Enabled"
 msgstr "SIO IRQ 不總是開啟"
 
-#: ../gui/Plugin.c:211
+#: ../gui/Plugin.c:210
 #, c-format
 msgid "Black & White Mdecs Only Enabled"
 msgstr "Black & White Mdecs Only 開啟"
 
-#: ../gui/Plugin.c:212
+#: ../gui/Plugin.c:211
 #, c-format
 msgid "Black & White Mdecs Only Disabled"
 msgstr "Black & White Mdecs Only 禁用"
 
-#: ../gui/Plugin.c:218
+#: ../gui/Plugin.c:217
 #, c-format
 msgid "XA Enabled"
 msgstr "XA 已開啟"
 
-#: ../gui/Plugin.c:219
+#: ../gui/Plugin.c:218
 #, c-format
 msgid "XA Disabled"
 msgstr "XA 已禁用"
 
-#: ../gui/Plugin.c:285
+#: ../gui/Plugin.c:280
 msgid "Error opening CD-ROM plugin!"
 msgstr "無法開啟 CD-ROM 外掛!"
 
-#: ../gui/Plugin.c:287
+#: ../gui/Plugin.c:282
 msgid "Error opening SPU plugin!"
 msgstr "無法開啟 SPU 外掛!"
 
-#: ../gui/Plugin.c:290
+#: ../gui/Plugin.c:285
 msgid "Error opening GPU plugin!"
 msgstr "無法開啟 GPU 外掛!"
 
-#: ../gui/Plugin.c:292
+#: ../gui/Plugin.c:287
 msgid "Error opening Controller 1 plugin!"
 msgstr "無法開啟 \"控制器 1\" 外掛!"
 
-#: ../gui/Plugin.c:294
+#: ../gui/Plugin.c:289
 msgid "Error opening Controller 2 plugin!"
 msgstr "無法開啟 \"控制器 2\" 外掛!"
 
-#: ../gui/Plugin.c:374
+#: ../gui/Plugin.c:369
 msgid "Error closing CD-ROM plugin!"
 msgstr "無法關閉 CD-ROM 外掛!"
 
-#: ../gui/Plugin.c:376
+#: ../gui/Plugin.c:371
 msgid "Error closing SPU plugin!"
 msgstr "無法關閉 SPU 外掛!"
 
-#: ../gui/Plugin.c:378
+#: ../gui/Plugin.c:373
 msgid "Error closing Controller 1 Plugin!"
 msgstr "無法關閉 \"控制器 1\" 外掛!"
 
-#: ../gui/Plugin.c:380
+#: ../gui/Plugin.c:375
 msgid "Error closing Controller 2 plugin!"
 msgstr "無法關閉 \"控制器 2\" 外掛!"
 
-#: ../gui/Plugin.c:382
+#: ../gui/Plugin.c:377
 msgid "Error closing GPU plugin!"
 msgstr "無法關閉 GPU 外掛!"
 
@@ -1451,18 +1349,17 @@ msgstr "無法關閉 GPU 外掛!"
 msgid "Loaded CD Image: %s"
 msgstr "已加載 CD 映像: %s"
 
-#: ../libpcsxcore/cheat.c:148
+#: ../libpcsxcore/cheat.c:147
 #, c-format
 msgid "Cheats loaded from: %s\n"
 msgstr "金手指碼已加載: %s\n"
 
-#: ../libpcsxcore/cheat.c:180
+#: ../libpcsxcore/cheat.c:179
 #, c-format
 msgid "Cheats saved to: %s\n"
 msgstr "金手指碼已保存: %s\n"
 
-#: ../libpcsxcore/cheat.c:323
-#: ../libpcsxcore/cheat.c:444
+#: ../libpcsxcore/cheat.c:322 ../libpcsxcore/cheat.c:443
 msgid "(Untitled)"
 msgstr "(未定名)"
 
@@ -1482,142 +1379,142 @@ msgstr "調試器已啟動。\n"
 msgid "Debugger stopped.\n"
 msgstr "調試器已停止。\n"
 
-#: ../libpcsxcore/misc.c:392
+#: ../libpcsxcore/misc.c:388
 #, c-format
 msgid "Error opening file: %s.\n"
 msgstr "開啟檔案錯誤: %s.\n"
 
-#: ../libpcsxcore/misc.c:432
+#: ../libpcsxcore/misc.c:428
 #, c-format
 msgid "Unknown CPE opcode %02x at position %08x.\n"
 msgstr "未知 CPE opcode %02x 位於 %08x.\n"
 
-#: ../libpcsxcore/misc.c:439
+#: ../libpcsxcore/misc.c:435
 msgid "COFF files not supported.\n"
 msgstr "COFF 檔案不被支援.\n"
 
-#: ../libpcsxcore/misc.c:443
+#: ../libpcsxcore/misc.c:439
 msgid "This file does not appear to be a valid PSX file.\n"
 msgstr "此檔案不是一個合法的 PSX 檔案。\n"
 
-#: ../libpcsxcore/plugins.c:33
+#: ../libpcsxcore/plugins.c:138
 #, c-format
 msgid "Error loading %s: %s"
 msgstr "無法加載 %s: %s"
 
-#: ../libpcsxcore/plugins.c:162
+#: ../libpcsxcore/plugins.c:181
 #, c-format
 msgid "Could not load GPU plugin %s!"
 msgstr "無法加載 GPU 外掛 %s!"
 
-#: ../libpcsxcore/plugins.c:228
+#: ../libpcsxcore/plugins.c:251
 #, c-format
 msgid "Could not load CD-ROM plugin %s!"
 msgstr "無法加載 CD-ROM 外掛 %s!"
 
-#: ../libpcsxcore/plugins.c:467
+#: ../libpcsxcore/plugins.c:297
 #, c-format
 msgid "Could not load SPU plugin %s!"
 msgstr "無法加載 SPU 外掛 %s!"
 
-#: ../libpcsxcore/plugins.c:616
+#: ../libpcsxcore/plugins.c:347
 #, c-format
 msgid "Could not load Controller 1 plugin %s!"
 msgstr "無法加載 \"控制器1\" 外掛 %s!"
 
-#: ../libpcsxcore/plugins.c:670
+#: ../libpcsxcore/plugins.c:388
 #, c-format
 msgid "Could not load Controller 2 plugin %s!"
 msgstr "無法加載 \"控制器2\" 外掛 %s!"
 
-#: ../libpcsxcore/plugins.c:713
+#: ../libpcsxcore/plugins.c:430
 #, c-format
 msgid "Could not load NetPlay plugin %s!"
 msgstr "無法加載聯網遊戲外掛 %s!"
 
-#: ../libpcsxcore/plugins.c:776
+#: ../libpcsxcore/plugins.c:491
 #, c-format
 msgid "Error initializing CD-ROM plugin: %d"
 msgstr "CD-ROM 外掛初始化錯誤: %d"
 
-#: ../libpcsxcore/plugins.c:778
+#: ../libpcsxcore/plugins.c:493
 #, c-format
 msgid "Error initializing GPU plugin: %d"
 msgstr "GPU 外掛初始化錯誤: %d"
 
-#: ../libpcsxcore/plugins.c:780
+#: ../libpcsxcore/plugins.c:495
 #, c-format
 msgid "Error initializing SPU plugin: %d"
 msgstr "SPU 外掛初始化錯誤: %d"
 
-#: ../libpcsxcore/plugins.c:782
+#: ../libpcsxcore/plugins.c:497
 #, c-format
 msgid "Error initializing Controller 1 plugin: %d"
 msgstr "\"控制器1\" 外掛初始化錯誤: %d"
 
-#: ../libpcsxcore/plugins.c:784
+#: ../libpcsxcore/plugins.c:499
 #, c-format
 msgid "Error initializing Controller 2 plugin: %d"
 msgstr "\"控制器2\" 外掛初始化錯誤: %d"
 
-#: ../libpcsxcore/plugins.c:788
+#: ../libpcsxcore/plugins.c:503
 #, c-format
 msgid "Error initializing NetPlay plugin: %d"
 msgstr "聯網遊戲外掛初始化錯誤: %d"
 
-#: ../libpcsxcore/plugins.c:791
+#: ../libpcsxcore/plugins.c:506
 msgid "Plugins loaded.\n"
 msgstr "外掛已加載。\n"
 
-#: ../libpcsxcore/ppf.c:218
+#: ../libpcsxcore/ppf.c:216
 #, c-format
 msgid "Invalid PPF patch: %s.\n"
 msgstr "無效 PPF 補丁: %s。\n"
 
-#: ../libpcsxcore/ppf.c:294
+#: ../libpcsxcore/ppf.c:292
 #, c-format
 msgid "Unsupported PPF version (%d).\n"
 msgstr "不支援的 PPF 補丁版本 (%d)。\n"
 
-#: ../libpcsxcore/ppf.c:333
+#: ../libpcsxcore/ppf.c:331
 #, c-format
 msgid "Loaded PPF %d.0 patch: %s.\n"
 msgstr "已加載 PPF %d.0 補丁: %s。\n"
 
-#: ../libpcsxcore/psxmem.c:69
+#: ../libpcsxcore/psxmem.c:76
 msgid "Error allocating memory!"
 msgstr "分配內存錯誤!"
 
-#: ../libpcsxcore/psxmem.c:107
+#: ../libpcsxcore/psxmem.c:114
 #, c-format
 msgid "Could not open BIOS:\"%s\". Enabling HLE Bios!\n"
 msgstr "無法開啟 BIOS: \"%s\"。使用內部 HLE Bios。\n"
 
-#: ../libpcsxcore/r3000a.c:35
+#: ../libpcsxcore/r3000a.c:33
 #, c-format
 msgid "Running PCSX Version %s (%s).\n"
 msgstr "PCSX 版本 %s (%s) 執行中。\n"
 
-#: ../libpcsxcore/sio.c:99
+#: ../libpcsxcore/sio.c:344
 msgid "Connection closed!\n"
 msgstr "連接被關閉!\n"
 
-#: ../libpcsxcore/sio.c:322
+#: ../libpcsxcore/sio.c:370
 #, c-format
 msgid "No memory card value was specified - creating a default card %s\n"
 msgstr "未指定記憶卡 - 創建一個新的記憶卡 %s\n"
 
-#: ../libpcsxcore/sio.c:326
+#: ../libpcsxcore/sio.c:374
 #, c-format
 msgid "The memory card %s doesn't exist - creating it\n"
 msgstr "記憶卡 %s 不存在 - 正在創建\n"
 
-#: ../libpcsxcore/sio.c:342
+#: ../libpcsxcore/sio.c:390
 #, c-format
 msgid "Memory card %s failed to load!\n"
 msgstr "記憶卡 %s 讀取失敗!\n"
 
-#: ../libpcsxcore/sio.c:346
+#: ../libpcsxcore/sio.c:394
 #, c-format
 msgid "Loading memory card %s\n"
 msgstr "正在加載記憶卡 %s\n"
@@ -1906,33 +1803,27 @@ msgstr "更換 ISO(_W)"
 msgid "_Save State"
 msgstr "存儲記錄(_S)"
 
-#: ../data/pcsx.glade2:200
-#: ../data/pcsx.glade2:281
+#: ../data/pcsx.glade2:200 ../data/pcsx.glade2:281
 msgid "Slot _1"
 msgstr "記錄 _1"
 
-#: ../data/pcsx.glade2:209
-#: ../data/pcsx.glade2:290
+#: ../data/pcsx.glade2:209 ../data/pcsx.glade2:290
 msgid "Slot _2"
 msgstr "記錄 _2"
 
-#: ../data/pcsx.glade2:218
-#: ../data/pcsx.glade2:299
+#: ../data/pcsx.glade2:218 ../data/pcsx.glade2:299
 msgid "Slot _3"
 msgstr "記錄 _3"
 
-#: ../data/pcsx.glade2:227
-#: ../data/pcsx.glade2:308
+#: ../data/pcsx.glade2:227 ../data/pcsx.glade2:308
 msgid "Slot _4"
 msgstr "記錄 _4"
 
-#: ../data/pcsx.glade2:236
-#: ../data/pcsx.glade2:317
+#: ../data/pcsx.glade2:236 ../data/pcsx.glade2:317
 msgid "Slot _5"
 msgstr "記錄 _5"
 
-#: ../data/pcsx.glade2:244
-#: ../data/pcsx.glade2:325
+#: ../data/pcsx.glade2:244 ../data/pcsx.glade2:325
 msgid "_Other..."
 msgstr "其它(_O)..."
 
@@ -2000,8 +1891,7 @@ msgstr "說明(_H)"
 msgid "_About PCSX..."
 msgstr "關於 PCSX(_A)..."
 
-#: ../data/pcsx.glade2:614
-#: ../data/pcsx.glade2:615
+#: ../data/pcsx.glade2:614 ../data/pcsx.glade2:615
 msgid "Run CD"
 msgstr "執行光碟"
 
@@ -2029,8 +1919,7 @@ msgstr "更換 ISO 光碟映像"
 msgid "Switch ISO..."
 msgstr "更換 ISO..."
 
-#: ../data/pcsx.glade2:684
-#: ../data/pcsx.glade2:1818
+#: ../data/pcsx.glade2:684 ../data/pcsx.glade2:1818
 msgid "Configure Memory Cards"
 msgstr "記憶卡設定"
 
@@ -2046,8 +1935,7 @@ msgstr "圖像設定"
 msgid "Graphics..."
 msgstr "圖像..."
 
-#: ../data/pcsx.glade2:710
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:8
+#: ../data/pcsx.glade2:710 ../plugins/dfsound/spucfg-0.1df/dfsound.glade2:8
 msgid "Configure Sound"
 msgstr "聲音設定"
 
@@ -2155,18 +2043,15 @@ msgstr "聯網遊戲設定"
 msgid "<b>NetPlay</b>"
 msgstr "<b>聯網遊戲</b>"
 
-#: ../data/pcsx.glade2:1897
-#: ../data/pcsx.glade2:2295
+#: ../data/pcsx.glade2:1896 ../data/pcsx.glade2:2296
 msgid "New"
 msgstr "新增"
 
-#: ../data/pcsx.glade2:1947
-#: ../data/pcsx.glade2:2345
+#: ../data/pcsx.glade2:1946 ../data/pcsx.glade2:2346
 msgid "Format"
 msgstr "格式化"
 
-#: ../data/pcsx.glade2:1997
-#: ../data/pcsx.glade2:2395
+#: ../data/pcsx.glade2:1996 ../data/pcsx.glade2:2396
 msgid "Un/Delete"
 msgstr "刪除/恢複"
 
@@ -2174,17 +2059,15 @@ msgstr "刪除/恢複"
 msgid "<b>Memory Card 1</b>"
 msgstr "<b>記憶卡 1</b>"
 
-#: ../data/pcsx.glade2:2151
-#: ../data/pcsx.glade2:2201
-#: ../data/pcsx.glade2:3094
+#: ../data/pcsx.glade2:2151 ../data/pcsx.glade2:2201 ../data/pcsx.glade2:3084
 msgid "Copy"
 msgstr "複制"
 
-#: ../data/pcsx.glade2:2488
+#: ../data/pcsx.glade2:2490
 msgid "<b>Memory Card 2</b>"
 msgstr "<b>記憶卡 2</b>"
 
-#: ../data/pcsx.glade2:2552
+#: ../data/pcsx.glade2:2554
 msgid ""
 "(C) 1999-2003 PCSX Development Team\n"
 "(C) 2005-2009 PCSX-df Team\n"
@@ -2194,11 +2077,11 @@ msgstr ""
 "(C) 2005-2009 PCSX-df 開發組\n"
 "(C) 2009-2010 PCSX-Reloaded 開發組"
 
-#: ../data/pcsx.glade2:2555
+#: ../data/pcsx.glade2:2557
 msgid "A PlayStation emulator."
 msgstr "一個 PlayStation 模擬器。"
 
-#: ../data/pcsx.glade2:2558
+#: ../data/pcsx.glade2:2560
 msgid ""
 "This program is free software; you can redistribute it\n"
 "and/or modify it under the terms of the GNU General\n"
@@ -2232,15 +2115,15 @@ msgstr ""
 "Public License along with this program; if not, write to\n"
 "the Free Software Foundation, Inc."
 
-#: ../data/pcsx.glade2:2600
+#: ../data/pcsx.glade2:2590
 msgid "translator-credits"
 msgstr "Wei Mingzhi <whistler@openoffice.org>"
 
-#: ../data/pcsx.glade2:2662
+#: ../data/pcsx.glade2:2652
 msgid "<b>Cheat Codes</b>"
 msgstr "<b>金手指碼</b>"
 
-#: ../data/pcsx.glade2:2828
+#: ../data/pcsx.glade2:2818
 msgid ""
 "8-bit\n"
 "16-bit\n"
@@ -2250,7 +2133,7 @@ msgstr ""
 "16 位元\n"
 "32 位元"
 
-#: ../data/pcsx.glade2:2891
+#: ../data/pcsx.glade2:2881
 msgid ""
 "Equal Value\n"
 "Not Equal Value\n"
@@ -2272,7 +2155,7 @@ msgstr ""
 "不同\n"
 "無變動"
 
-#: ../data/pcsx.glade2:2923
+#: ../data/pcsx.glade2:2913
 msgid ""
 "Decimal\n"
 "Hexadecimal"
@@ -2280,27 +2163,27 @@ msgstr ""
 "十進制\n"
 "十六進制"
 
-#: ../data/pcsx.glade2:3127
+#: ../data/pcsx.glade2:3117
 msgid "label_resultsfound"
 msgstr "label_resultsfound"
 
-#: ../data/pcsx.glade2:3162
+#: ../data/pcsx.glade2:3152
 msgid "Search"
 msgstr "搜尋"
 
-#: ../data/pcsx.glade2:3198
+#: ../data/pcsx.glade2:3188
 msgid "Restart"
 msgstr "重新開始"
 
-#: ../data/pcsx.glade2:3227
+#: ../data/pcsx.glade2:3217
 msgid "<b>Cheat Search</b>"
 msgstr "<b>金手指碼搜尋</b>"
 
-#: ../data/pcsx.glade2:3384
+#: ../data/pcsx.glade2:3374
 msgid "Raw Dump..."
 msgstr "Raw 轉儲..."
 
-#: ../data/pcsx.glade2:3419
+#: ../data/pcsx.glade2:3409
 msgid "Patch Memory..."
 msgstr "修改記憶體..."
 
@@ -2961,76 +2844,62 @@ msgstr "右搖桿下方向"
 msgid "R-Stick Up"
 msgstr "右搖桿上方向"
 
-#: ../plugins/dfinput/cfg-gtk2.c:103
-#: ../plugins/dfinput/cfg-gtk2.c:142
+#: ../plugins/dfinput/cfg-gtk2.c:103 ../plugins/dfinput/cfg-gtk2.c:142
 msgid "Centered"
 msgstr "居中"
 
-#: ../plugins/dfinput/cfg-gtk2.c:103
-#: ../plugins/dfinput/cfg-gtk2.c:142
+#: ../plugins/dfinput/cfg-gtk2.c:103 ../plugins/dfinput/cfg-gtk2.c:142
 msgid "Up"
 msgstr "上"
 
-#: ../plugins/dfinput/cfg-gtk2.c:103
-#: ../plugins/dfinput/cfg-gtk2.c:142
+#: ../plugins/dfinput/cfg-gtk2.c:103 ../plugins/dfinput/cfg-gtk2.c:142
 msgid "Right"
 msgstr "右"
 
-#: ../plugins/dfinput/cfg-gtk2.c:103
-#: ../plugins/dfinput/cfg-gtk2.c:142
+#: ../plugins/dfinput/cfg-gtk2.c:103 ../plugins/dfinput/cfg-gtk2.c:142
 msgid "Rightup"
 msgstr "右上"
 
-#: ../plugins/dfinput/cfg-gtk2.c:104
-#: ../plugins/dfinput/cfg-gtk2.c:143
+#: ../plugins/dfinput/cfg-gtk2.c:104 ../plugins/dfinput/cfg-gtk2.c:143
 msgid "Down"
 msgstr "下"
 
-#: ../plugins/dfinput/cfg-gtk2.c:104
-#: ../plugins/dfinput/cfg-gtk2.c:143
+#: ../plugins/dfinput/cfg-gtk2.c:104 ../plugins/dfinput/cfg-gtk2.c:143
 msgid "Rightdown"
 msgstr "右下"
 
-#: ../plugins/dfinput/cfg-gtk2.c:104
-#: ../plugins/dfinput/cfg-gtk2.c:143
+#: ../plugins/dfinput/cfg-gtk2.c:104 ../plugins/dfinput/cfg-gtk2.c:143
 msgid "Left"
 msgstr "左"
 
-#: ../plugins/dfinput/cfg-gtk2.c:104
-#: ../plugins/dfinput/cfg-gtk2.c:143
+#: ../plugins/dfinput/cfg-gtk2.c:104 ../plugins/dfinput/cfg-gtk2.c:143
 msgid "Leftup"
 msgstr "左上"
 
-#: ../plugins/dfinput/cfg-gtk2.c:105
-#: ../plugins/dfinput/cfg-gtk2.c:144
+#: ../plugins/dfinput/cfg-gtk2.c:105 ../plugins/dfinput/cfg-gtk2.c:144
 msgid "Leftdown"
 msgstr "左下"
 
-#: ../plugins/dfinput/cfg-gtk2.c:109
-#: ../plugins/dfinput/cfg-gtk2.c:148
+#: ../plugins/dfinput/cfg-gtk2.c:109 ../plugins/dfinput/cfg-gtk2.c:148
 #, c-format
 msgid "Joystick: Button %d"
 msgstr "手把: 按鈕 %d"
 
-#: ../plugins/dfinput/cfg-gtk2.c:113
-#: ../plugins/dfinput/cfg-gtk2.c:152
+#: ../plugins/dfinput/cfg-gtk2.c:113 ../plugins/dfinput/cfg-gtk2.c:152
 #, c-format
 msgid "Joystick: Axis %d%c"
 msgstr "手把: 軸 %d%c"
 
-#: ../plugins/dfinput/cfg-gtk2.c:118
-#: ../plugins/dfinput/cfg-gtk2.c:157
+#: ../plugins/dfinput/cfg-gtk2.c:118 ../plugins/dfinput/cfg-gtk2.c:157
 #, c-format
 msgid "Joystick: Hat %d %s"
 msgstr "手把: Hat %d %s"
 
-#: ../plugins/dfinput/cfg-gtk2.c:133
-#: ../plugins/dfinput/cfg-gtk2.c:172
+#: ../plugins/dfinput/cfg-gtk2.c:133 ../plugins/dfinput/cfg-gtk2.c:172
 msgid "Keyboard:"
 msgstr "鍵盤:"
 
-#: ../plugins/dfinput/cfg-gtk2.c:137
-#: ../plugins/dfinput/cfg-gtk2.c:176
+#: ../plugins/dfinput/cfg-gtk2.c:137 ../plugins/dfinput/cfg-gtk2.c:176
 msgid "(Not Set)"
 msgstr "(未設定)"
 
@@ -3042,13 +2911,11 @@ msgstr "無"
 msgid "Gamepad/Keyboard Input Configuration"
 msgstr "手把/鍵盤輸入設定"
 
-#: ../plugins/dfinput/cfg-gtk2.c:587
-#: ../plugins/dfinput/cfg-gtk2.c:607
+#: ../plugins/dfinput/cfg-gtk2.c:587 ../plugins/dfinput/cfg-gtk2.c:607
 msgid "Key"
 msgstr "按鍵"
 
-#: ../plugins/dfinput/cfg-gtk2.c:593
-#: ../plugins/dfinput/cfg-gtk2.c:613
+#: ../plugins/dfinput/cfg-gtk2.c:593 ../plugins/dfinput/cfg-gtk2.c:613
 msgid "Button"
 msgstr "按鈕"
 
@@ -3056,18 +2923,15 @@ msgstr "按鈕"
 msgid "Gamepad/Keyboard Input"
 msgstr "手把/鍵盤輸入"
 
-#: ../plugins/dfinput/dfinput.glade2:35
-#: ../plugins/dfinput/dfinput.glade2:232
+#: ../plugins/dfinput/dfinput.glade2:35 ../plugins/dfinput/dfinput.glade2:232
 msgid "Device:"
 msgstr "裝置:"
 
-#: ../plugins/dfinput/dfinput.glade2:66
-#: ../plugins/dfinput/dfinput.glade2:263
+#: ../plugins/dfinput/dfinput.glade2:66 ../plugins/dfinput/dfinput.glade2:263
 msgid "Type:"
 msgstr "類型:"
 
-#: ../plugins/dfinput/dfinput.glade2:78
-#: ../plugins/dfinput/dfinput.glade2:275
+#: ../plugins/dfinput/dfinput.glade2:78 ../plugins/dfinput/dfinput.glade2:275
 msgid ""
 "Digital Pad\n"
 "Analog Pad"
@@ -3075,13 +2939,11 @@ msgstr ""
 "數字手把\n"
 "模擬手把"
 
-#: ../plugins/dfinput/dfinput.glade2:149
-#: ../plugins/dfinput/dfinput.glade2:346
+#: ../plugins/dfinput/dfinput.glade2:149 ../plugins/dfinput/dfinput.glade2:346
 msgid "Change"
 msgstr "更改"
 
-#: ../plugins/dfinput/dfinput.glade2:185
-#: ../plugins/dfinput/dfinput.glade2:382
+#: ../plugins/dfinput/dfinput.glade2:185 ../plugins/dfinput/dfinput.glade2:382
 msgid "Reset"
 msgstr "重置"
 
@@ -3096,3 +2958,76 @@ msgstr "控制器 2"
 #: ../plugins/dfinput/dfinput.glade2:427
 msgid "Multi-Threaded (Recommended)"
 msgstr "多執行緒 (建議使用)"
+
+#: ../plugins/dfnet/dfnet.c:23
+#, fuzzy
+msgid "Socket Driver"
+msgstr "SoftGL 驅動程式"
+
+#: ../plugins/dfnet/dfnet.c:172
+#, fuzzy, c-format
+msgid "error connecting to %s: %s\n"
+msgstr "無法加載 %s: %s"
+
+#: ../plugins/dfnet/dfnet.c:197
+#, fuzzy
+msgid "Error allocating memory!\n"
+msgstr "分配內存錯誤!"
+
+#: ../plugins/dfnet/gui.c:38
+msgid "Nothing to configure"
+msgstr ""
+
+#: ../plugins/dfnet/gui.c:57
+#, c-format
+msgid "IP %s"
+msgstr ""
+
+#: ../plugins/dfnet/gui.c:127
+msgid "Waiting for connection..."
+msgstr ""
+
+#: ../plugins/dfnet/gui.c:130
+msgid "The Client should now Start a Connection, waiting..."
+msgstr ""
+
+#: ../plugins/dfnet/dfnet.glade2:23
+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"
+"\n"
+"If you selected Client please enter the IP address the Server gave to you in "
+"the IP Address Control."
+msgstr ""
+
+#: ../plugins/dfnet/dfnet.glade2:63
+msgid "Copy PC IP to Clipboard"
+msgstr ""
+
+#: ../plugins/dfnet/dfnet.glade2:93
+msgid "Server (Player1)"
+msgstr ""
+
+#: ../plugins/dfnet/dfnet.glade2:103
+msgid "Client (Player2)"
+msgstr ""
+
+#: ../plugins/dfnet/dfnet.glade2:129
+msgid ""
+"Do not change if not necessary (remember it must be changed on both sides)."
+msgstr ""
+
+#: ../plugins/dfnet/dfnet.glade2:142
+msgid "Port Number"
+msgstr ""
+
+#: ../plugins/dfnet/dfnet.glade2:201
+#, fuzzy
+msgid "Start Game"
+msgstr "開始鍵"
+
+#: ../plugins/dfnet/dfnet.glade2:239
+msgid "Play Offline"
+msgstr ""
author	SND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>	2010-05-13 03:40:12 +0000
committer	SND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>	2010-05-13 03:40:12 +0000
commit	0d1d9bece31f605d4aa68b20f3ecb19cd0db2d3d (patch)
tree	aa8228a939d9c813626e71f937b56b2280f2fc86
parent	53eb8b20be0ed97773df48ce9788e617ad876e50 (diff)
download	pcsxr-0d1d9bece31f605d4aa68b20f3ecb19cd0db2d3d.tar.gz