- dfsound: quick fix (FF9 music, maybe others as well).

- peopsxgl (unix): imported new config utility written by Kivutar, with minor amendments (https://github.com/Kivutar/cfgPeopsMesaGL).

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

13 files changed, 4093 insertions, 3593 deletions

diff --git a/Makefile.am b/Makefile.am
index 5020c58f..1425f840 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,9 @@
-SUBDIRS = data doc po libpcsxcore gui pixmaps plugins/dfinput plugins/dfsound plugins/dfxvideo plugins/gxvideo plugins/dfcdrom plugins/dfnet plugins/bladesio1
+SUBDIRS = data doc po libpcsxcore gui pixmaps
+SUBDIRS += plugins/dfinput plugins/dfsound
+SUBDIRS += plugins/dfxvideo plugins/dfcdrom plugins/dfnet
+
+SUBDIRS += plugins/bladesio1 plugins/gxvideo
+
 SUBDIRS += $(PEOPSXGL)
 
 EXTRA_DIST = AUTHORS COPYING INSTALL NEWS README ChangeLog ChangeLog.df
diff --git a/gui/AboutDlg.c b/gui/AboutDlg.c
index a411e5f0..2dcff91e 100644
--- a/gui/AboutDlg.c
+++ b/gui/AboutDlg.c
@@ -19,10 +19,6 @@
 #include "Linux.h"
 #include <gtk/gtk.h>
 
-#if GTK_MAJOR_VERSION <= 2 && GTK_MINOR_VERSION < 12
-#define gtk_about_dialog_set_program_name gtk_about_dialog_set_name
-#endif
-
 #define ABOUT_VERSION "svn"
 
 void RunAboutDialog(void) {
diff --git a/plugins/dfsound/externals.h b/plugins/dfsound/externals.h
index 3143c6df..b8a5c43d 100644
--- a/plugins/dfsound/externals.h
+++ b/plugins/dfsound/externals.h
@@ -276,7 +276,7 @@ extern unsigned long  spuAddr;
 extern int      bEndThread;

 extern int      bThreadEnded;

 extern int      bSpuInit;

-extern unsigned long dwNewChannel;

+extern uint32_t dwNewChannel;

 

 extern int      SSumR[];

 extern int      SSumL[];

diff --git a/plugins/dfsound/spu.c b/plugins/dfsound/spu.c
index f6c8ebd5..40e32094 100644
--- a/plugins/dfsound/spu.c
+++ b/plugins/dfsound/spu.c
@@ -109,7 +109,7 @@ static HANDLE   hMainThread;
 static pthread_t thread = (pthread_t)-1;               // thread id (linux)
 #endif
 
-unsigned long dwNewChannel=0;                          // flags for faster testing, if new channel starts
+uint32_t dwNewChannel=0;                          // flags for faster testing, if new channel starts
 
 void (CALLBACK *irqCallback)(void)=0;                  // func of main emu, called on spu irq
 void (CALLBACK *cddavCallback)(unsigned short,unsigned short)=0;
@@ -596,7 +596,10 @@ static void *MAINThread(void *arg)
 
 				for(ch=0;ch<MAXCHAN;ch++)                         // loop em all... we will collect 1 ms of sound of each playing channel
         {
-				 if(s_chan[ch].bNew) StartSound(ch);             // start new sound
+					if(s_chan[ch].bNew) {

+						StartSound(ch);             // start new sound

+						dwNewChannel&=~(1<<ch);                       // clear new channel bit

+					}
 				 if(!s_chan[ch].bOn) continue;                   // channel not playing? next
 
 				 if(s_chan[ch].iActFreq!=s_chan[ch].iUsedFreq)   // new psx frequency?
diff --git a/plugins/peopsxgl/Makefile.am b/plugins/peopsxgl/Makefile.am
index f0bb949a..e7478efa 100644
--- a/plugins/peopsxgl/Makefile.am
+++ b/plugins/peopsxgl/Makefile.am
@@ -20,4 +20,4 @@ cfgpeopsxgl_LDADD = $(GTK2_LIBS)
 
 glade_DATA = gpucfg/peopsxgl.ui
 gladedir = $(datadir)/psemu/
-#EXTRA_DIST = $(glade_DATA)
+EXTRA_DIST = $(glade_DATA)
diff --git a/plugins/peopsxgl/gpucfg/main.c b/plugins/peopsxgl/gpucfg/main.c
index 199160c2..f9dbdeef 100644
--- a/plugins/peopsxgl/gpucfg/main.c
+++ b/plugins/peopsxgl/gpucfg/main.c
@@ -1,545 +1,723 @@
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include <gtk/gtk.h>
-
-#include <unistd.h>
-#include <stdio.h>
-#include <stdlib.h>  
+#include <stdlib.h>
 #include <string.h>
 
-#define SETCHECK(winame)  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object (wndMain,winame)), TRUE)
-#define SETEDITVAL(winame,v)  sprintf(t,"%d",v);gtk_entry_set_text(GTK_ENTRY(gtk_builder_get_object (wndMain,winame)), t)
-#define SETLIST(winame,v)  gtk_combo_box_set_active(GTK_COMBO_BOX(gtk_builder_get_object(wndMain,winame)), v)
-
-static GtkBuilder *wndMain;
-void SaveConfig(void);
-
-int main (int argc, char *argv[])
-{
-  GtkWidget *main_win;
-  GError *error = NULL;
-  FILE *in;char t[256];int len,val; 
-  char * pB, * p; 
-
-  if(argc!=2) return 0;
-  if(strcmp(argv[1],"CFG")!=0 && strcmp(argv[1],"ABOUT")!=0)
-   return 0;
-
-  gtk_set_locale ();
-  gtk_init (&argc, &argv);
-
-  wndMain = gtk_builder_new();
-  gtk_builder_set_translation_domain(wndMain, PACKAGE_NAME);
-  if (!gtk_builder_add_from_file (wndMain, DATADIR "peopsxgl.ui", &error))
-    {
-     g_warning ("Couldn't load builder file: %s", error->message);
-     g_error_free (error);
-     return -1;
-    }
-
-  if (strcmp(argv[1],"ABOUT") == 0)
-   {
-    main_win  = GTK_WIDGET(gtk_builder_get_object(wndMain, "AboutWnd"));
-    gtk_widget_show_all (main_win);
-    gtk_dialog_run(GTK_DIALOG(main_win));
-    return 0;
-   }
-
-  main_win = GTK_WIDGET(gtk_builder_get_object(wndMain, "CfgWnd"));
-
-  in = fopen("gpuPeopsMesaGL.cfg","rb");
-  if(in)
-   {
-    pB=(char *)malloc(32767);
-    memset(pB,0,32767);
-    len = fread(pB, 1, 32767, in);
-    fclose(in);
-   }
-  else pB=0;
-
-  val=640;
-  if(pB)
-   {
-    strcpy(t,"\nResX");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
-    if(p) val=atoi(p+len);
-    if(val<10) val=10;
-   }
-  SETEDITVAL("edtXSize",val);
-
-  val=480;
-  if(pB)
-   {
-    strcpy(t,"\nResY");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
-    if(p) val=atoi(p+len);
-    if(val<10) val=10;
-   }
-  SETEDITVAL("edtYSize",val);
-
-  val=0;
-  if(pB)
-   {
-    strcpy(t,"\nKeepRatio");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
-    if(p) val=atoi(p+len);
-    if(val<0) val=0;
-    if(val>1) val=1;
-   }
-  if(val) SETCHECK("chkKeepRatio");
-
-  val=0;
-  if(pB)
-   {
-    strcpy(t,"\nVRamSize");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
-    if(p) val=atoi(p+len);
-    if(val<0)    val=0;
-    if(val>1024) val=1024;
-   }
-  SETEDITVAL("edtMaxTex",val);
-
-  val=0;
-  if(pB)
-   {
-    strcpy(t,"\n15bitMdec");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
-    if(p) val=atoi(p+len);
-    if(val<0) val=0;
-    if(val>1) val=1;
-   }
-  if(val) SETCHECK("chk15bitMdec");
-
-  val=0;
-  if(pB)
-   {
-    strcpy(t,"\nHiResTextures");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
-    if(p) val=atoi(p+len);
-    if(val<0) val=0;
-    if(val>2) val=2;
-   }
-  SETLIST("cmbHiresTex",val);
-
-  val=0;
-  if(pB)
-   {
-    strcpy(t,"\nFullScreen");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
-    if(p) val=atoi(p+len);
-    if(val<0) val=0;
-    if(val>1) val=1;
-   }
-  if(val) SETCHECK("chkFullScreen");
-
-  val=0;
-  if(pB)
-   {
-    strcpy(t,"\nScanLines");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
-    if(p) val=atoi(p+len);
-    if(val<0) val=0;
-    if(val>1) val=1;
-   }
-  if(val) SETCHECK("chkScanlines");
-
-  val=0;
-  if(pB)
-   {
-    strcpy(t,"\nScanLinesBlend");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
-    if(p) val=atoi(p+len);
-    if(val<-1)  val=-1;
-    if(val>255) val=255;
-   }
-  SETEDITVAL("edtScanBlend",val);
-
-  val=1;
-  if(pB)
-   {
-    strcpy(t,"\nFrameTextures");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
-    if(p) val=atoi(p+len);
-    if(val<0) val=0;
-    if(val>3) val=3;
-   }
-  SETLIST("cmbFrameTex",val);
-
-  val=0;
-  if(pB)
-   {
-    strcpy(t,"\nFrameAccess");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
-    if(p) val=atoi(p+len);
-    if(val<0) val=0;
-    if(val>4) val=4;
-   }
-  SETLIST("cmbFrameAcc",val);
-
-  val=0;
-  if(pB)
-   {
-    strcpy(t,"\nTexFilter");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
-    if(p) val=atoi(p+len);
-    if(val<0) val=0;
-    if(val>6) val=6;
-   }
-  SETLIST("cmbFilter",val);
-
-  val=0;
-  if(pB)
-   {
-    strcpy(t,"\nAdvancedBlend");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
-    if(p) val=atoi(p+len);
-    if(val<0) val=0;
-    if(val>1) val=1;
-   }
-  if(val) SETCHECK("chkABlend");
-
-  val=0;
-  if(pB)
-   {
-    strcpy(t,"\nDithering");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
-    if(p) val=atoi(p+len);
-    if(val<0) val=0;
-    if(val>1) val=1;
-   }
-  if(val) SETCHECK("chkDither");
-
-  val=0;
-  if(pB)
-   {
-    strcpy(t,"\nLineMode");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
-    if(p) val=atoi(p+len);
-    if(val<0) val=0;
-    if(val>1) val=1;
-   }
-  if(val) SETCHECK("chkLinemode");
-
-  val=0;
-  if(pB)
-   {
-    strcpy(t,"\nShowFPS");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
-    if(p) val=atoi(p+len);
-    if(val<0) val=0;
-    if(val>1) val=1;
-   }
-  if(val) SETCHECK("chkShowFPS");
-
-  val=1;
-  if(pB)
-   {
-    strcpy(t,"\nUseFrameLimit");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
-    if(p) val=atoi(p+len);
-    if(val<0) val=0;
-    if(val>1) val=1;
-   }
-  if(val) SETCHECK("chkFPSLimit");
-
-  val=0;
-  if(pB)
-   {
-    strcpy(t,"\nUseFrameSkip");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
-    if(p) val=atoi(p+len);
-    if(val<0) val=0;
-    if(val>1) val=1;
-   }
-  if(val) SETCHECK("chkFPSSkip");
-
-  val=2;
-  if(pB)
-   {
-    strcpy(t,"\nFPSDetection");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
-    if(p) val=atoi(p+len)+1;
-    if(val<1) val=1;
-    if(val>2) val=2;
-   }
-  if(val==2) SETCHECK("rdbLimAuto");
-  if(val==1) SETCHECK("rdbLimMan");
-
-  val=200;
-  if(pB)
-   {
-    strcpy(t,"\nFrameRate");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
-    if(p) val=atoi(p+len);
-    if(val<0)    val=0;
-    if(val>1000) val=1000;
-   }
-  SETEDITVAL("edtFPSlim",val);
-
-  val=2;
-  if(pB)
-   {
-    strcpy(t,"\nOffscreenDrawing");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
-    if(p) val=atoi(p+len);
-    if(val<0) val=0;
-    if(val>4) val=4;
-   }
-  SETLIST("cmbOffscreen",val);
-
-  val=1;
-  if(pB)
-   {
-    strcpy(t,"\nOpaquePass");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
-    if(p) val=atoi(p+len);
-    if(val<0) val=0;
-    if(val>1) val=1;
-   }
-  if(val) SETCHECK("chkOpaque");
-
-  val=0;
-  if(pB)
-   {
-    strcpy(t,"\nAntiAlias");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
-    if(p) val=atoi(p+len);
-    if(val<0) val=0;
-    if(val>1) val=1;
-   }
-  if(val) SETCHECK("chkAntiA");
-
-  val=0;
-  if(pB)
-   {
-    strcpy(t,"\nTexQuality");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
-    if(p) val=atoi(p+len);
-    if(val<0) val=0;
-    if(val>4) val=4;
-   }
-  SETLIST("cmbQuality",val);
-
-  val=0;
-  if(pB)
-   {
-    strcpy(t,"\nMaskDetect");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
-    if(p) val=atoi(p+len);
-    if(val<0) val=0;
-    if(val>1) val=1;
-   }
-  if(val) SETCHECK("chkMaskBit");
-
-  val=1;
-  if(pB)
-   {
-    strcpy(t,"\nFastMdec");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
-    if(p) val=atoi(p+len);
-    if(val<0) val=0;
-    if(val>1) val=1;
-   }
-  if(val) SETCHECK("chkFastMdec");
-
-  val=1;
-  if(pB)
-   {
-    strcpy(t,"\nOGLExtensions");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
-    if(p) val=atoi(p+len);
-    if(val<0) val=0;
-    if(val>1) val=1;
-   }
-  if(val) SETCHECK("chkExtensions");
-
-  val=0;
-  if(pB)
-   {
-    strcpy(t,"\nScreenSmoothing");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
-    if(p) val=atoi(p+len);
-    if(val<0) val=0;
-    if(val>1) val=1;
-   }
-  if(val) SETCHECK("chkBlur");
-
-  val=0;
-  if(pB)
-   {
-    strcpy(t,"\nUseFixes");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
-    if(p) val=atoi(p+len);
-    if(val<0) val=0;
-    if(val>1) val=1;
-   }
-  if(val) SETCHECK("chkGameFixes");
-
-  val=0;
-  if(pB)
-   {
-    strcpy(t,"\nCfgFixes");p=strstr(pB,t);if(p) {p=strstr(p,"=");len=1;}
-    if(p) val=atoi(p+len);
-   }
-
-  for(len=0;len<18;len++)
-   {
-    if(val & (1<<len))
-     {
-      sprintf(t,"chkFix%d",len);
-      SETCHECK(t);
-     }
-   }
-
-  if(pB) free(pB);
-
-  gtk_widget_show_all (main_win);
-  if (gtk_dialog_run(GTK_DIALOG(main_win))==GTK_RESPONSE_OK) {SaveConfig();}
-  return 0;
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////
-
-void SetCfgVal(char * pB,char * pE,int val)
-{
- char * p, *ps, *pC;char t[32];
-
- sprintf(t,"%d",val);
-
- p=strstr(pB,pE);
- if(p)
-  {
-   p=strstr(p,"=");
-   if(!p) return;
-   p++;
-   while(*p && *p!='\n' && *p!='-' && (*p<'0' || *p>'9')) p++;
-   if(*p==0 || *p=='\n') return;
-   ps=p;
-   while((*p>='0' && *p<='9') || *p=='-') p++;
-   pC=(char *)malloc(32767);
-   strcpy(pC,p);
-   strcpy(ps,t);
-   strcat(pB,pC);
-   free(pC);
-  }
- else
-  {
-   strcat(pB,pE);
-   strcat(pB," = ");
-   strcat(pB,t);
-   strcat(pB,"\n");
-  }
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////
-
-#define GETEDITVAL(winame) atoi(gtk_entry_get_text(GTK_ENTRY(gtk_builder_get_object (wndMain,winame))))
-#define GETCHECK(winame)  gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object (wndMain,winame)))
-#define GETLIST(winame)  gtk_combo_box_get_active(GTK_COMBO_BOX(gtk_builder_get_object(wndMain,winame)))
-
-void SaveConfig(void)
-{
-  FILE *in;int len,val;char * pB;char t[16];
-
-  pB=(char *)malloc(32767);
-  memset(pB,0,32767);
-
-  in = fopen("gpuPeopsMesaGL.cfg","rb");
-  if(in)
-   {
-    len = fread(pB, 1, 32767, in);
-    fclose(in); 
-   }
-
- ///////////////////////////////////////////////////////////////////////////////
-
- val=GETEDITVAL("edtXSize");
- if(val<10) val=10;
- SetCfgVal(pB,"\nResX",val);
-
- val=GETEDITVAL("edtYSize");
- if(val<10) val=10;
- SetCfgVal(pB,"\nResY",val);
-
- val=GETCHECK("chkKeepRatio");
- SetCfgVal(pB,"\nKeepRatio",val);
-
- val=GETEDITVAL("edtMaxTex");
- if(val<0)    val=0;
- if(val>1024) val=1024;
- SetCfgVal(pB,"\nVRamSize",val);
-
- val=GETCHECK("chk15bitMdec");
- SetCfgVal(pB,"\n15bitMdec",val);
-
- val=GETLIST("cmbHiresTex");
- SetCfgVal(pB,"\nHiResTextures",val);
-
- val=GETCHECK("chkFullScreen");
- SetCfgVal(pB,"\nFullScreen",val);
-
- val=GETCHECK("chkScanlines");
- SetCfgVal(pB,"\nScanLines",val);
-
- val=GETEDITVAL("edtScanBlend");
- if(val<-1)  val=-1;
- if(val>255) val=255;
- SetCfgVal(pB,"\nScanLinesBlend",val);
-
- val=GETLIST("cmbFrameTex");
- SetCfgVal(pB,"\nFrameTextures",val);
-
- val=GETLIST("cmbFrameAcc");
- SetCfgVal(pB,"\nFrameAccess",val);
-
- val=GETLIST("cmbFilter");
- SetCfgVal(pB,"\nTexFilter",val);
-
- val=GETCHECK("chkABlend");
- SetCfgVal(pB,"\nAdvancedBlend",val);
+#include "config.h"
 
- val=GETCHECK("chkDither");
- SetCfgVal(pB,"\nDithering",val);
+#ifdef ENABLE_NLS
+#include <libintl.h>
+#include <locale.h>
+#endif
 
- val=GETCHECK("chkLinemode");
- SetCfgVal(pB,"\nLineMode",val);
+// Widgets
+GtkWidget *window,
+          *btnCancel,
+          *btnSave,
+          *spinXSize,
+          *spinYSize,
+          *chkKeepRatio,
+          *chkDithering,
+          *chkFullScreen,
+          *cbxTexQuality,
+          *cbxTexFiltering,
+          *cbxHiResTex,
+          *spinVRam,
+          *chkShowFPS,
+          *chkUseFPSLimit,
+          *vboxFPSLimit,
+          *radFPSLimitAuto,
+          *radFPSLimitManual,
+          *spinFPSLimit,
+          *chkUseFrameSkipping,
+          *cbxOffscreen,
+          *cbxFBTex,
+          *cbxFBAccess,
+          *chkMaskDetect,
+          *chkOpaquePass,
+          *chkAdvancedBlend,
+          *chkScanLines,
+          *spinScanLinesBlend,
+          *chkFastMdec,
+          *chk15bitMdec,
+          *chkLineMode,
+          *chkAntiAlias,
+          *chkOGLExtensions,
+          *chkScreenSmoothing,
+          *chkUseGameFixes,
+          *tblGameFixes,
+          *chkCfgFix1,
+          *chkCfgFix2,
+          *chkCfgFix4,
+          *chkCfgFix8,
+          *chkCfgFix16,
+          *chkCfgFix32,
+          *chkCfgFix64,
+          *chkCfgFix128,
+          *chkCfgFix256,
+          *chkCfgFix512,
+          *chkCfgFix1024,
+          *chkCfgFix2048,
+          *chkCfgFix4096,
+          *chkCfgFix8192,
+          *chkCfgFix16384,
+          *chkCfgFix32768,
+          *chkCfgFix65536,
+          *chkCfgFix131072,
+          *btnFast,
+          *btnBeautiful;
+
+// Save values to the config file
+void on_btnSave_clicked( GtkObject *object, gpointer user_data ) {
+    FILE *out;
+    out = fopen( "gpuPeopsMesaGL.cfg", "w+" );
+
+    if ( out != NULL ) {
+
+        // Computes the 'fixes' bitfield
+        int cfgFixes = 0;
+        if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( chkCfgFix1      ) ) ) { cfgFixes |= (1 << 0); }
+        if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( chkCfgFix2      ) ) ) { cfgFixes |= (1 << 1); }
+        if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( chkCfgFix4      ) ) ) { cfgFixes |= (1 << 2); }
+        if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( chkCfgFix8      ) ) ) { cfgFixes |= (1 << 3); }
+        if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( chkCfgFix16     ) ) ) { cfgFixes |= (1 << 4); }
+        if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( chkCfgFix32     ) ) ) { cfgFixes |= (1 << 5); }
+        if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( chkCfgFix64     ) ) ) { cfgFixes |= (1 << 6); }
+        if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( chkCfgFix128    ) ) ) { cfgFixes |= (1 << 7); }
+        if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( chkCfgFix256    ) ) ) { cfgFixes |= (1 << 8); }
+        if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( chkCfgFix512    ) ) ) { cfgFixes |= (1 << 9); }
+        if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( chkCfgFix1024   ) ) ) { cfgFixes |= (1 << 10); }
+        if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( chkCfgFix2048   ) ) ) { cfgFixes |= (1 << 11); }
+        if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( chkCfgFix4096   ) ) ) { cfgFixes |= (1 << 12); }
+        if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( chkCfgFix8192   ) ) ) { cfgFixes |= (1 << 13); }
+        if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( chkCfgFix16384  ) ) ) { cfgFixes |= (1 << 14); }
+        if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( chkCfgFix32768  ) ) ) { cfgFixes |= (1 << 15); }
+        if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( chkCfgFix65536  ) ) ) { cfgFixes |= (1 << 16); }
+        if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( chkCfgFix131072 ) ) ) { cfgFixes |= (1 << 17); }
+
+        // Print data to the config file
+        fprintf( out, "\nResX             = %i", gtk_spin_button_get_value_as_int( GTK_SPIN_BUTTON(   spinXSize           ) ) );
+        fprintf( out, "\nResY             = %i", gtk_spin_button_get_value_as_int( GTK_SPIN_BUTTON(   spinYSize           ) ) );        
+        fprintf( out, "\nKeepRatio        = %i", gtk_toggle_button_get_active(     GTK_TOGGLE_BUTTON( chkKeepRatio        ) ) );
+        fprintf( out, "\nDithering        = %i", gtk_toggle_button_get_active(     GTK_TOGGLE_BUTTON( chkDithering        ) ) );
+        fprintf( out, "\nFullScreen       = %i", gtk_toggle_button_get_active(     GTK_TOGGLE_BUTTON( chkFullScreen       ) ) );
+        fprintf( out, "\nTexQuality       = %i", gtk_combo_box_get_active(         GTK_COMBO_BOX(     cbxTexQuality       ) ) );
+        fprintf( out, "\nTexFilter        = %i", gtk_combo_box_get_active(         GTK_COMBO_BOX(     cbxTexFiltering     ) ) );
+        fprintf( out, "\nHiResTextures    = %i", gtk_combo_box_get_active(         GTK_COMBO_BOX(     cbxHiResTex         ) ) );
+        fprintf( out, "\nVRamSize         = %i", gtk_spin_button_get_value_as_int( GTK_SPIN_BUTTON(   spinVRam            ) ) );        
+        fprintf( out, "\nShowFPS          = %i", gtk_toggle_button_get_active(     GTK_TOGGLE_BUTTON( chkShowFPS          ) ) );
+        fprintf( out, "\nUseFrameLimit    = %i", gtk_toggle_button_get_active(     GTK_TOGGLE_BUTTON( chkUseFPSLimit      ) ) );
+        fprintf( out, "\nFPSDetection     = %i", gtk_toggle_button_get_active(     GTK_TOGGLE_BUTTON( radFPSLimitAuto     ) ) );
+        fprintf( out, "\nFrameRate        = %i", gtk_spin_button_get_value_as_int( GTK_SPIN_BUTTON(   spinFPSLimit        ) ) );
+        fprintf( out, "\nUseFrameSkip     = %i", gtk_toggle_button_get_active(     GTK_TOGGLE_BUTTON( chkUseFrameSkipping ) ) );
+        fprintf( out, "\nOffscreenDrawing = %i", gtk_combo_box_get_active(         GTK_COMBO_BOX(     cbxOffscreen        ) ) );
+        fprintf( out, "\nFrameTextures    = %i", gtk_combo_box_get_active(         GTK_COMBO_BOX(     cbxFBTex            ) ) );
+        fprintf( out, "\nFrameAccess      = %i", gtk_combo_box_get_active(         GTK_COMBO_BOX(     cbxFBAccess         ) ) );
+        fprintf( out, "\nMaskDetect       = %i", gtk_toggle_button_get_active(     GTK_TOGGLE_BUTTON( chkMaskDetect       ) ) );
+        fprintf( out, "\nOpaquePass       = %i", gtk_toggle_button_get_active(     GTK_TOGGLE_BUTTON( chkOpaquePass       ) ) );
+        fprintf( out, "\nAdvancedBlend    = %i", gtk_toggle_button_get_active(     GTK_TOGGLE_BUTTON( chkAdvancedBlend    ) ) );
+        fprintf( out, "\nScanLines        = %i", gtk_toggle_button_get_active(     GTK_TOGGLE_BUTTON( chkScanLines        ) ) );
+        fprintf( out, "\nScanLinesBlend   = %i", gtk_spin_button_get_value_as_int( GTK_SPIN_BUTTON(   spinScanLinesBlend  ) ) );
+        fprintf( out, "\nFastMdec         = %i", gtk_toggle_button_get_active(     GTK_TOGGLE_BUTTON( chkFastMdec         ) ) );
+        fprintf( out, "\n15bitMdec        = %i", gtk_toggle_button_get_active(     GTK_TOGGLE_BUTTON( chk15bitMdec        ) ) );
+        fprintf( out, "\nLineMode         = %i", gtk_toggle_button_get_active(     GTK_TOGGLE_BUTTON( chkLineMode         ) ) );
+        fprintf( out, "\nAntiAlias        = %i", gtk_toggle_button_get_active(     GTK_TOGGLE_BUTTON( chkAntiAlias        ) ) );
+        fprintf( out, "\nOGLExtensions    = %i", gtk_toggle_button_get_active(     GTK_TOGGLE_BUTTON( chkOGLExtensions    ) ) );
+        fprintf( out, "\nScreenSmoothing  = %i", gtk_toggle_button_get_active(     GTK_TOGGLE_BUTTON( chkScreenSmoothing  ) ) );
+        fprintf( out, "\nUseFixes         = %i", gtk_toggle_button_get_active(     GTK_TOGGLE_BUTTON( chkUseGameFixes     ) ) );
+        fprintf( out, "\nCfgFixes         = %i", cfgFixes );
+
+        fclose( out );
+    }
 
- val=GETCHECK("chkShowFPS");
- SetCfgVal(pB,"\nShowFPS",val);
+    gtk_main_quit();
+}
 
- val=GETCHECK("chkFPSLimit");
- SetCfgVal(pB,"\nUseFrameLimit",val);
+// Autoconfiguration callbacks
+
+void on_btnFast_clicked( GtkObject *object, gpointer user_data ) {
+    gtk_spin_button_set_value(    GTK_SPIN_BUTTON(   spinXSize ),           640 );
+    gtk_spin_button_set_value(    GTK_SPIN_BUTTON(   spinYSize ),           480 );
+    gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkKeepRatio ),          0 );
+    gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkDithering ),          0 );
+    gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkFullScreen ),         0 );
+    gtk_combo_box_set_active(     GTK_COMBO_BOX(     cbxTexQuality ),         0 );
+    gtk_combo_box_set_active(     GTK_COMBO_BOX(     cbxTexFiltering ),       0 );
+    gtk_combo_box_set_active(     GTK_COMBO_BOX(     cbxHiResTex ),           0 );
+    gtk_spin_button_set_value(    GTK_SPIN_BUTTON(   spinVRam ),              0 );
+    gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkShowFPS ),            0 );
+    gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkUseFPSLimit ),        1 );
+    gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( radFPSLimitAuto ),       1 );
+    gtk_spin_button_set_value(    GTK_SPIN_BUTTON(   spinFPSLimit ),        200 );
+    gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkUseFrameSkipping ),   0 );
+    gtk_combo_box_set_active(     GTK_COMBO_BOX(     cbxOffscreen ),          1 );
+    gtk_combo_box_set_active(     GTK_COMBO_BOX(     cbxFBTex ),              1 );
+    gtk_combo_box_set_active(     GTK_COMBO_BOX(     cbxFBAccess ),           0 );
+    gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkMaskDetect ),         0 );
+    gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkOpaquePass ),         1 );
+    gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkAdvancedBlend ),      0 );
+    gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkScanLines ),          0 );
+    gtk_spin_button_set_value(    GTK_SPIN_BUTTON(   spinScanLinesBlend ),    0 );
+    gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkFastMdec ),           1 );
+    gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chk15bitMdec ),          1 );
+    gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkLineMode ),           0 );
+    gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkAntiAlias ),          0 );
+    gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkOGLExtensions ),      1 );
+    gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkScreenSmoothing ),    0 );
+}
 
- val=GETCHECK("chkFPSSkip");
- SetCfgVal(pB,"\nUseFrameSkip",val);
+void on_btnBeautiful_clicked( GtkObject *object, gpointer user_data ) {
+    gtk_spin_button_set_value(    GTK_SPIN_BUTTON(   spinXSize ),           640 );
+    gtk_spin_button_set_value(    GTK_SPIN_BUTTON(   spinYSize ),           480 );
+    gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkKeepRatio ),          0 );
+    gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkDithering ),          0 );
+    gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkFullScreen ),         0 );
+    gtk_combo_box_set_active(     GTK_COMBO_BOX(     cbxTexQuality ),         3 );
+    gtk_combo_box_set_active(     GTK_COMBO_BOX(     cbxTexFiltering ),       0 );
+    gtk_combo_box_set_active(     GTK_COMBO_BOX(     cbxHiResTex ),           0 );
+    gtk_spin_button_set_value(    GTK_SPIN_BUTTON(   spinVRam ),              0 );
+    gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkShowFPS ),            0 );
+    gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkUseFPSLimit ),        1 );
+    gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( radFPSLimitAuto ),       1 );
+    gtk_spin_button_set_value(    GTK_SPIN_BUTTON(   spinFPSLimit ),        200 );
+    gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkUseFrameSkipping ),   0 );
+    gtk_combo_box_set_active(     GTK_COMBO_BOX(     cbxOffscreen ),          3 );
+    gtk_combo_box_set_active(     GTK_COMBO_BOX(     cbxFBTex ),              2 );
+    gtk_combo_box_set_active(     GTK_COMBO_BOX(     cbxFBAccess ),           0 );
+    gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkMaskDetect ),         1 );
+    gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkOpaquePass ),         1 );
+    gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkAdvancedBlend ),      1 );
+    gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkScanLines ),          0 );
+    gtk_spin_button_set_value(    GTK_SPIN_BUTTON(   spinScanLinesBlend ),    0 );
+    gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkFastMdec ),           0 );
+    gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chk15bitMdec ),          0 );
+    gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkLineMode ),           0 );
+    gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkAntiAlias ),          0 );
+    gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkOGLExtensions ),      1 );
+    gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkScreenSmoothing ),    0 );   
+}
 
- val=GETCHECK("rdbLimAuto");
- if(val) val=1; else val=0;
- SetCfgVal(pB,"\nFPSDetection",val);
+// Callbacks used to toggle the sensitivity of some parts of the GUI
 
- val=GETEDITVAL("edtFPSlim");
- if(val<0)    val=0;
- if(val>1000) val=1000;
- SetCfgVal(pB,"\nFrameRate",val);
+void on_chkUseGameFixes_toggled( GtkObject *object, gpointer user_data ) {
+    gtk_widget_set_sensitive( tblGameFixes, gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( chkUseGameFixes ) ) );
+}
 
- val=GETLIST("cmbOffscreen");
- SetCfgVal(pB,"\nOffscreenDrawing",val);
+void on_chkUseFPSLimit_toggled( GtkObject *object, gpointer user_data ) {
+    gtk_widget_set_sensitive( vboxFPSLimit, gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( chkUseFPSLimit ) ) );
+}
 
- val=GETCHECK("chkOpaque");
- SetCfgVal(pB,"\nOpaquePass",val);
+void on_radFPSLimitManual_toggled( GtkObject *object, gpointer user_data ) {
+    gtk_widget_set_sensitive( spinFPSLimit, gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( radFPSLimitManual ) ) );
+}
 
- val=GETCHECK("chkAntiA");
- SetCfgVal(pB,"\nAntiAlias",val);
+void on_chkScanLines_toggled( GtkObject *object, gpointer user_data ) {
+    gtk_widget_set_sensitive( spinScanLinesBlend, gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( chkScanLines ) ) );
+}
 
- val=GETLIST("cmbQuality");
- SetCfgVal(pB,"\nTexQuality",val);
+/* Instanciates the GUI
+   Reads the config file
+   Sets widget states according to the config file
+   Connect callbacks to signals */
+int main( int argc, char **argv ) {
+    GtkBuilder *builder;
+    GError *error = NULL;
+    FILE *in;
+    char *pB, *p;
+    int len, val;
+    char t[256];
+
+#ifdef ENABLE_NLS
+    setlocale (LC_ALL, "");
+    bindtextdomain (GETTEXT_PACKAGE, LOCALE_DIR);
+    bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+    textdomain (GETTEXT_PACKAGE);
+#endif
 
- val=GETCHECK("chkMaskBit");
- SetCfgVal(pB,"\nMaskDetect",val);
+    gtk_set_locale();
+    gtk_init( &argc, &argv );
 
- val=GETCHECK("chkFastMdec");
- SetCfgVal(pB,"\nFastMdec",val);
+    builder = gtk_builder_new();
 
- val=GETCHECK("chkExtensions");
- SetCfgVal(pB,"\nOGLExtensions",val);
+    // Load the glade file
+    if ( !gtk_builder_add_from_file( builder, DATADIR "peopsxgl.ui", &error ) ) {
+        g_warning( "%s", error->message );
+        g_free( error );
+        return( 1 );
+    }
 
- val=GETCHECK("chkBlur");
- SetCfgVal(pB,"\nScreenSmoothing",val);
+    // Display the About dialog when the emulator ask for it
+    if ( argv[1] && strcmp( argv[1], "ABOUT" ) == 0 ) {
+        GtkWidget *widget;
+        const char *authors[]= {"Adapted from P.E.Op.S OpenGL GPU by Pete Bernert", NULL};
 
- val=GETCHECK("chkGameFixes");
- SetCfgVal(pB,"\nUseFixes",val);
+        widget = gtk_about_dialog_new();
+        gtk_about_dialog_set_name(GTK_ABOUT_DIALOG(widget), "OpenGL GPU Driver");
+        gtk_about_dialog_set_version(GTK_ABOUT_DIALOG(widget), "1.18");
+        gtk_about_dialog_set_authors(GTK_ABOUT_DIALOG(widget), authors);
+        gtk_about_dialog_set_website(GTK_ABOUT_DIALOG(widget), "http://pcsxr.codeplex.com/");
 
- val=0;
- for(len=0;len<18;len++)
-  {
-   sprintf(t,"chkFix%d",len);
-   if(GETCHECK(t)) val|=(1<<len);
-  }
- SetCfgVal(pB,"\nCfgFixes",val);
+        gtk_dialog_run(GTK_DIALOG(widget));
+        gtk_widget_destroy(widget);
 
- ///////////////////////////////////////////////////////////////////////////////
+        return 0;
+    }
 
- if((in=fopen("gpuPeopsMesaGL.cfg","wb"))!=NULL)
-  {
-   fwrite(pB,strlen(pB),1,in);
-   fclose(in);
-  }
+    // Get widgets from the glade file
+    window              = GTK_WIDGET( gtk_builder_get_object( builder, "MainDialog"          ) );
+    btnCancel           = GTK_WIDGET( gtk_builder_get_object( builder, "btnCancel"           ) );
+    btnSave             = GTK_WIDGET( gtk_builder_get_object( builder, "btnSave"             ) );
+    spinXSize           = GTK_WIDGET( gtk_builder_get_object( builder, "spinXSize"           ) );
+    spinYSize           = GTK_WIDGET( gtk_builder_get_object( builder, "spinYSize"           ) );
+    chkKeepRatio        = GTK_WIDGET( gtk_builder_get_object( builder, "chkKeepRatio"        ) );
+    chkDithering        = GTK_WIDGET( gtk_builder_get_object( builder, "chkDithering"        ) );
+    chkFullScreen       = GTK_WIDGET( gtk_builder_get_object( builder, "chkFullScreen"       ) );
+    cbxTexQuality       = GTK_WIDGET( gtk_builder_get_object( builder, "cbxTexQuality"       ) );
+    cbxTexFiltering     = GTK_WIDGET( gtk_builder_get_object( builder, "cbxTexFiltering"     ) );
+    cbxHiResTex         = GTK_WIDGET( gtk_builder_get_object( builder, "cbxHiResTex"         ) );
+    spinVRam            = GTK_WIDGET( gtk_builder_get_object( builder, "spinVRam"            ) );
+    chkShowFPS          = GTK_WIDGET( gtk_builder_get_object( builder, "chkShowFPS"          ) );
+    chkUseFPSLimit      = GTK_WIDGET( gtk_builder_get_object( builder, "chkUseFPSLimit"      ) );
+    vboxFPSLimit        = GTK_WIDGET( gtk_builder_get_object( builder, "vboxFPSLimit"        ) );
+    radFPSLimitAuto     = GTK_WIDGET( gtk_builder_get_object( builder, "radFPSLimitAuto"     ) );
+    radFPSLimitManual   = GTK_WIDGET( gtk_builder_get_object( builder, "radFPSLimitManual"   ) );
+    spinFPSLimit        = GTK_WIDGET( gtk_builder_get_object( builder, "spinFPSLimit"        ) );
+    chkUseFrameSkipping = GTK_WIDGET( gtk_builder_get_object( builder, "chkUseFrameSkipping" ) );
+    cbxOffscreen        = GTK_WIDGET( gtk_builder_get_object( builder, "cbxOffscreen"        ) );
+    cbxFBTex            = GTK_WIDGET( gtk_builder_get_object( builder, "cbxFBTex"            ) );
+    cbxFBAccess         = GTK_WIDGET( gtk_builder_get_object( builder, "cbxFBAccess"         ) );
+    chkMaskDetect       = GTK_WIDGET( gtk_builder_get_object( builder, "chkMaskDetect"       ) );
+    chkOpaquePass       = GTK_WIDGET( gtk_builder_get_object( builder, "chkOpaquePass"       ) );
+    chkAdvancedBlend    = GTK_WIDGET( gtk_builder_get_object( builder, "chkAdvancedBlend"    ) );
+    chkScanLines        = GTK_WIDGET( gtk_builder_get_object( builder, "chkScanLines"        ) );
+    spinScanLinesBlend  = GTK_WIDGET( gtk_builder_get_object( builder, "spinScanLinesBlend"  ) );
+    chkFastMdec         = GTK_WIDGET( gtk_builder_get_object( builder, "chkFastMdec"         ) );
+    chk15bitMdec        = GTK_WIDGET( gtk_builder_get_object( builder, "chk15bitMdec"        ) );
+    chkLineMode         = GTK_WIDGET( gtk_builder_get_object( builder, "chkLineMode"         ) );
+    chkAntiAlias        = GTK_WIDGET( gtk_builder_get_object( builder, "chkAntiAlias"        ) );
+    chkOGLExtensions    = GTK_WIDGET( gtk_builder_get_object( builder, "chkOGLExtensions"    ) );
+    chkScreenSmoothing  = GTK_WIDGET( gtk_builder_get_object( builder, "chkScreenSmoothing"  ) );
+    chkUseGameFixes     = GTK_WIDGET( gtk_builder_get_object( builder, "chkUseGameFixes"     ) );
+    tblGameFixes        = GTK_WIDGET( gtk_builder_get_object( builder, "tblGameFixes"        ) );
+    chkCfgFix1          = GTK_WIDGET( gtk_builder_get_object( builder, "chkCfgFix1"          ) );
+    chkCfgFix2          = GTK_WIDGET( gtk_builder_get_object( builder, "chkCfgFix2"          ) );
+    chkCfgFix4          = GTK_WIDGET( gtk_builder_get_object( builder, "chkCfgFix4"          ) );
+    chkCfgFix8          = GTK_WIDGET( gtk_builder_get_object( builder, "chkCfgFix8"          ) );
+    chkCfgFix16         = GTK_WIDGET( gtk_builder_get_object( builder, "chkCfgFix16"         ) );
+    chkCfgFix32         = GTK_WIDGET( gtk_builder_get_object( builder, "chkCfgFix32"         ) );
+    chkCfgFix64         = GTK_WIDGET( gtk_builder_get_object( builder, "chkCfgFix64"         ) );
+    chkCfgFix128        = GTK_WIDGET( gtk_builder_get_object( builder, "chkCfgFix128"        ) );
+    chkCfgFix256        = GTK_WIDGET( gtk_builder_get_object( builder, "chkCfgFix256"        ) );
+    chkCfgFix512        = GTK_WIDGET( gtk_builder_get_object( builder, "chkCfgFix512"        ) );
+    chkCfgFix1024       = GTK_WIDGET( gtk_builder_get_object( builder, "chkCfgFix1024"       ) );
+    chkCfgFix2048       = GTK_WIDGET( gtk_builder_get_object( builder, "chkCfgFix2048"       ) );
+    chkCfgFix4096       = GTK_WIDGET( gtk_builder_get_object( builder, "chkCfgFix4096"       ) );
+    chkCfgFix8192       = GTK_WIDGET( gtk_builder_get_object( builder, "chkCfgFix8192"       ) );
+    chkCfgFix16384      = GTK_WIDGET( gtk_builder_get_object( builder, "chkCfgFix16384"      ) );
+    chkCfgFix32768      = GTK_WIDGET( gtk_builder_get_object( builder, "chkCfgFix32768"      ) );
+    chkCfgFix65536      = GTK_WIDGET( gtk_builder_get_object( builder, "chkCfgFix65536"      ) );
+    chkCfgFix131072     = GTK_WIDGET( gtk_builder_get_object( builder, "chkCfgFix131072"     ) );
+    btnFast             = GTK_WIDGET( gtk_builder_get_object( builder, "btnFast"             ) );
+    btnBeautiful        = GTK_WIDGET( gtk_builder_get_object( builder, "btnBeautiful"        ) );
+
+    // Read the config file
+    in = fopen( "gpuPeopsMesaGL.cfg", "rb" );
+    if ( in ) {
+        pB = (char *) malloc( 32767 );
+        memset( pB, 0, 32767 );
+        len = fread( pB, 1, 32767, in );
+        fclose(in);
+    }
+    else pB = 0;
+
+    val = 640;
+    if ( pB ) {
+        strcpy( t, "\nResX" );
+        p = strstr( pB, t );
+        if ( p ) {
+            p = strstr( p, "=" );
+            len = 1;
+            val = atoi( p + len );
+        }
+    }
+    gtk_spin_button_set_value( GTK_SPIN_BUTTON( spinXSize ), val );
+
+    val = 480;
+    if ( pB ) {
+        strcpy( t, "\nResY" );
+        p = strstr( pB, t );
+        if ( p ) {
+            p = strstr( p, "=" );
+            len = 1;
+            val = atoi( p + len );
+        }
+    }
+    gtk_spin_button_set_value( GTK_SPIN_BUTTON( spinYSize ), val );
+
+    val = 0;
+    if ( pB ) {
+        strcpy( t, "\nKeepRatio" );
+        p = strstr( pB, t );
+        if ( p ) {
+            p = strstr( p, "=" );
+            len = 1;
+            val = atoi( p + len );
+        }
+    }
+    gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkKeepRatio ), val );
+
+    val = 0;
+    if ( pB ) {
+        strcpy( t, "\nDithering" );
+        p = strstr( pB, t );
+        if ( p ) {
+            p = strstr( p, "=" );
+            len = 1;
+            val = atoi( p + len );
+        }
+    }
+    gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkDithering ), val );
+
+    val = 0;
+    if ( pB ) {
+        strcpy( t, "\nFullScreen" );
+        p = strstr( pB, t );
+        if ( p ) {
+            p = strstr( p, "=" );
+            len = 1;
+            val = atoi( p + len );
+        }
+    }
+    gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkFullScreen ), val );
+    
+    val = 0;
+    if ( pB ) {
+        strcpy( t, "\nTexQuality" );
+        p = strstr( pB, t );
+        if ( p ) {
+            p = strstr( p, "=" );
+            len = 1;
+            val = atoi( p + len );
+        }
+    }
+    gtk_combo_box_set_active( GTK_COMBO_BOX( cbxTexQuality ), val );
+
+    val = 0;
+    if ( pB ) {
+        strcpy( t, "\nTexFilter" );
+        p = strstr( pB, t );
+        if ( p ) {
+            p = strstr( p, "=" );
+            len = 1;
+            val = atoi( p + len );
+        }
+    }
+    gtk_combo_box_set_active( GTK_COMBO_BOX( cbxTexFiltering ), val );
+
+    val = 0;
+    if ( pB ) {
+        strcpy( t, "\nHiResTextures" );
+        p = strstr( pB, t );
+        if ( p ) {
+            p = strstr( p, "=" );
+            len = 1;
+            val = atoi( p + len );
+        }
+    }
+    gtk_combo_box_set_active( GTK_COMBO_BOX( cbxHiResTex ), val );
+
+    val = 0;
+    if ( pB ) {
+        strcpy(t,"\nVRamSize");
+        p = strstr( pB, t );
+        if ( p ) {
+            p = strstr( p, "=" );
+            len = 1;
+            val = atoi( p + len );
+        }
+    }
+    gtk_spin_button_set_value( GTK_SPIN_BUTTON( spinVRam ), val );
+
+    val = 0;
+    if ( pB ) {
+        strcpy( t, "\nShowFPS" );
+        p = strstr( pB, t );
+        if ( p ) {
+            p = strstr( p, "=" );
+            len = 1;
+            val = atoi( p + len );
+        }
+    }
+    gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkShowFPS ), val );
+
+    val = 1;
+    if ( pB ) {
+        strcpy( t, "\nUseFrameLimit" );
+        p = strstr( pB, t );
+        if ( p ) {
+            p = strstr( p, "=" );
+            len = 1;
+            val = atoi( p + len );
+        }
+    }
+    gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkUseFPSLimit ), val );
+
+    val = 1;
+    if ( pB ) {
+        strcpy( t, "\nFPSDetection" );
+        p = strstr( pB, t );
+        if ( p ) {
+            p = strstr( p, "=" );
+            len = 1;
+            val = atoi( p + len );
+        }
+    }
+    gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( radFPSLimitAuto ), val );
+
+    val = 200;
+    if ( pB ) {
+        strcpy(t,"\nFrameRate");
+        p = strstr( pB, t );
+        if ( p ) {
+            p = strstr( p, "=" );
+            len = 1;
+            val = atoi( p + len );
+        }
+    }
+    gtk_spin_button_set_value( GTK_SPIN_BUTTON( spinFPSLimit ), val );
+
+    val = 0;
+    if ( pB ) {
+        strcpy( t, "\nUseFrameSkip" );
+        p = strstr( pB, t );
+        if ( p ) {
+            p = strstr( p, "=" );
+            len = 1;
+            val = atoi( p + len );
+        }
+    }
+    gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkUseFrameSkipping ), val );
+
+    val = 2;
+    if ( pB ) {
+        strcpy( t, "\nOffscreenDrawing" );
+        p = strstr( pB, t );
+        if ( p ) {
+            p = strstr( p, "=" );
+            len = 1;
+            val = atoi( p + len );
+        }
+    }
+    gtk_combo_box_set_active( GTK_COMBO_BOX( cbxOffscreen ), val );
+    
+    val = 1;
+    if ( pB ) {
+        strcpy( t, "\nFrameTextures" );
+        p = strstr( pB, t );
+        if ( p ) {
+            p = strstr( p, "=" );
+            len = 1;
+            val = atoi( p + len );
+        }
+    }
+    gtk_combo_box_set_active( GTK_COMBO_BOX( cbxFBTex ), val );
+    
+    val = 0;
+    if ( pB ) {
+        strcpy( t, "\nFrameAccess" );
+        p = strstr( pB, t );
+        if ( p ) {
+            p = strstr( p, "=" );
+            len = 1;
+            val = atoi( p + len );
+        }
+    }
+    gtk_combo_box_set_active( GTK_COMBO_BOX( cbxFBAccess ), val );
+
+    val = 0;
+    if ( pB ) {
+        strcpy( t, "\nMaskDetect" );
+        p = strstr( pB, t );
+        if ( p ) {
+            p = strstr( p, "=" );
+            len = 1;
+            val = atoi( p + len );
+        }
+    }
+    gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkMaskDetect ), val );
+
+    val = 1;
+    if ( pB ) {
+        strcpy( t, "\nOpaquePass" );
+        p = strstr( pB, t );
+        if ( p ) {
+            p = strstr( p, "=" );
+            len = 1;
+            val = atoi( p + len );
+        }
+    }
+    gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkOpaquePass ), val );
+
+    val = 0;
+    if ( pB ) {
+        strcpy( t, "\nAdvancedBlend" );
+        p = strstr( pB, t );
+        if ( p ) {
+            p = strstr( p, "=" );
+            len = 1;
+            val = atoi( p + len );
+        }
+    }
+    gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkAdvancedBlend ), val );
+
+    val = 0;
+    if ( pB ) {
+        strcpy( t, "\nScanLines" );
+        p = strstr( pB, t );
+        if ( p ) {
+            p = strstr( p, "=" );
+            len = 1;
+            val = atoi( p + len );
+        }
+    }
+    gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkScanLines ), val );
+
+    val = 0;
+    if ( pB ) {
+        strcpy(t,"\nScanLinesBlend");
+        p = strstr( pB, t );
+        if ( p ) {
+            p = strstr( p, "=" );
+            len = 1;
+            val = atoi( p + len );
+        }
+    }
+    gtk_spin_button_set_value( GTK_SPIN_BUTTON( spinScanLinesBlend ), val );
+
+    val = 1;
+    if ( pB ) {
+        strcpy( t, "\nFastMdec" );
+        p = strstr( pB, t );
+        if ( p ) {
+            p = strstr( p, "=" );
+            len = 1;
+            val = atoi( p + len );
+        }
+    }
+    gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkFastMdec ), val );
+
+    val = 0;
+    if ( pB ) {
+        strcpy( t, "\n15bitMdec" );
+        p = strstr( pB, t );
+        if ( p ) {
+            p = strstr( p, "=" );
+            len = 1;
+            val = atoi( p + len );
+        }
+    }
+    gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chk15bitMdec ), val );
+
+    val = 0;
+    if ( pB ) {
+        strcpy( t, "\nLineMode" );
+        p = strstr( pB, t );
+        if ( p ) {
+            p = strstr( p, "=" );
+            len = 1;
+            val = atoi( p + len );
+        }
+    }
+    gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkLineMode ), val );
+
+    val = 0;
+    if ( pB ) {
+        strcpy( t, "\nAntiAlias" );
+        p = strstr( pB, t );
+        if ( p ) {
+            p = strstr( p, "=" );
+            len = 1;
+            val = atoi( p + len );
+        }
+    }
+    gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkAntiAlias ), val );
+
+    val = 0;
+    if ( pB ) {
+        strcpy( t, "\nOGLExtensions" );
+        p = strstr( pB, t );
+        if ( p ) {
+            p = strstr( p, "=" );
+            len = 1;
+            val = atoi( p + len );
+        }
+    }
+    gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkOGLExtensions ), val );
+
+    val = 0;
+    if ( pB ) {
+        strcpy( t, "\nScreenSmoothing" );
+        p = strstr( pB, t );
+        if ( p ) {
+            p = strstr( p, "=" );
+            len = 1;
+            val = atoi( p + len );
+        }
+    }
+    gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkScreenSmoothing ), val );
+
+    val = 0;
+    if ( pB ) {
+        strcpy( t, "\nCfgFixes" );
+        p = strstr( pB, t );
+        if ( p ) {
+            p = strstr( p, "=" );
+            len = 1;
+            val = atoi( p + len );
+        }
+    }
+    if ( val & (1 << 17) ) { gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkCfgFix131072 ), TRUE ); }
+    if ( val & (1 << 16) ) { gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkCfgFix65536  ), TRUE ); }
+    if ( val & (1 << 15) ) { gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkCfgFix32768  ), TRUE ); }
+    if ( val & (1 << 14) ) { gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkCfgFix16384  ), TRUE ); }
+    if ( val & (1 << 13) ) { gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkCfgFix8192   ), TRUE ); }
+    if ( val & (1 << 12) ) { gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkCfgFix4096   ), TRUE ); }
+    if ( val & (1 << 11) ) { gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkCfgFix2048   ), TRUE ); }
+    if ( val & (1 << 10) ) { gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkCfgFix1024   ), TRUE ); }
+    if ( val & (1 << 9)  ) { gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkCfgFix512    ), TRUE ); }
+    if ( val & (1 << 8)  ) { gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkCfgFix256    ), TRUE ); }
+    if ( val & (1 << 7)  ) { gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkCfgFix128    ), TRUE ); }
+    if ( val & (1 << 6)  ) { gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkCfgFix64     ), TRUE ); }
+    if ( val & (1 << 5)  ) { gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkCfgFix32     ), TRUE ); }
+    if ( val & (1 << 4)  ) { gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkCfgFix16     ), TRUE ); }
+    if ( val & (1 << 3)  ) { gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkCfgFix8      ), TRUE ); }
+    if ( val & (1 << 2)  ) { gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkCfgFix4      ), TRUE ); }
+    if ( val & (1 << 1)  ) { gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkCfgFix2      ), TRUE ); }
+    if ( val & (1 << 0)  ) { gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( chkCfgFix1      ), TRUE ); }
+
+    gtk_builder_connect_signals( builder, NULL );
+    
+    g_object_unref( G_OBJECT( builder ) );
+
+    // Connect callbacks to signals
+    gtk_signal_connect( GTK_OBJECT( window ),            "destroy", GTK_SIGNAL_FUNC( gtk_main_quit ),                NULL );
+    gtk_signal_connect( GTK_OBJECT( btnCancel ),         "clicked", GTK_SIGNAL_FUNC( gtk_main_quit ),                NULL );
+    gtk_signal_connect( GTK_OBJECT( btnSave ),           "clicked", GTK_SIGNAL_FUNC( on_btnSave_clicked ),           NULL );
+    gtk_signal_connect( GTK_OBJECT( chkUseGameFixes ),   "toggled", GTK_SIGNAL_FUNC( on_chkUseGameFixes_toggled ),   NULL );
+    gtk_signal_connect( GTK_OBJECT( chkUseFPSLimit ),    "toggled", GTK_SIGNAL_FUNC( on_chkUseFPSLimit_toggled ),    NULL );
+    gtk_signal_connect( GTK_OBJECT( radFPSLimitManual ), "toggled", GTK_SIGNAL_FUNC( on_radFPSLimitManual_toggled ), NULL );
+    gtk_signal_connect( GTK_OBJECT( chkScanLines ),      "toggled", GTK_SIGNAL_FUNC( on_chkScanLines_toggled ),      NULL );
+    gtk_signal_connect( GTK_OBJECT( btnFast ),           "clicked", GTK_SIGNAL_FUNC( on_btnFast_clicked ),           NULL );
+    gtk_signal_connect( GTK_OBJECT( btnBeautiful ),      "clicked", GTK_SIGNAL_FUNC( on_btnBeautiful_clicked ),      NULL );
+
+    // Call some callbacks to ensure widget state consistency
+    on_chkUseGameFixes_toggled(   GTK_OBJECT( chkUseGameFixes   ), NULL );
+    on_chkUseFPSLimit_toggled(    GTK_OBJECT( chkUseFPSLimit    ), NULL );
+    on_radFPSLimitManual_toggled( GTK_OBJECT( radFPSLimitManual ), NULL );
+    on_chkScanLines_toggled(      GTK_OBJECT( chkScanLines      ), NULL );
+
+    gtk_widget_show( window );
+
+    gtk_main();
 
- free(pB);
+    return 0;
 }
-
-
-
diff --git a/plugins/peopsxgl/gpucfg/peopsxgl.ui b/plugins/peopsxgl/gpucfg/peopsxgl.ui
index 538c08ce..b96b6485 100644
--- a/plugins/peopsxgl/gpucfg/peopsxgl.ui
+++ b/plugins/peopsxgl/gpucfg/peopsxgl.ui
@@ -1,1004 +1,911 @@
 <?xml version="1.0"?>
 <interface>
-  <requires lib="gtk+" version="2.16"/>
+  <requires lib="gtk+" version="2.14"/>
   <!-- interface-naming-policy project-wide -->
-  <object class="GtkListStore" id="liststore6">
-    <columns>
-      <!-- column-name item -->
-      <column type="gchararray"/>
-    </columns>
-    <data>
-      <row>
-        <col id="0" translatable="yes">0: Emulated vram - ok most times</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">1: Gfx card buffer reads</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">2: Gfx card buffer moves</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">3: Gfx buffer reads </col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">4: Full Software (FVP)</col>
-      </row>
-    </data>
-  </object>
-  <object class="GtkListStore" id="liststore5">
-    <columns>
-      <!-- column-name item -->
-      <column type="gchararray"/>
-    </columns>
-    <data>
-      <row>
-        <col id="0" translatable="yes">0: None - Fastest, most glitches</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">1: Minimum - Missing screens</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">2: Standard - OK for most games</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">3: Enhanced - Shows more stuff</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">4: Extended - Causing garbage</col>
-      </row>
-    </data>
-  </object>
-  <object class="GtkListStore" id="liststore4">
-    <columns>
-      <!-- column-name item -->
-      <column type="gchararray"/>
-    </columns>
-    <data>
-      <row>
-        <col id="0" translatable="yes">0: Emulated vram - Needs FVP</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">1: Black - Fast, no effects</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">2: Gfx card buffer - Can be slow</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">3: Gfx card </col>
-      </row>
-    </data>
-  </object>
-  <object class="GtkListStore" id="liststore3">
-    <columns>
-      <!-- column-name item -->
-      <column type="gchararray"/>
-    </columns>
-    <data>
-      <row>
-        <col id="0" translatable="yes">0: None (standard)</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">1: 2xSaI (much vram needed)</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">2: Scaled (needs tex filtering)</col>
-      </row>
-    </data>
-  </object>
-  <object class="GtkListStore" id="liststore2">
-    <columns>
-      <!-- column-name item -->
-      <column type="gchararray"/>
-    </columns>
-    <data>
-      <row>
-        <col id="0" translatable="yes">0: None</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">1: Standard - Glitches will happen</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">2: Extended - No black borders</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">3: Standard without sprites - unfiltered 2D</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">4: Extended without sprites - unfiltered 2D</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">5: Standard + smoothed sprites</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">6: Extended + smoothed sprites</col>
-      </row>
-    </data>
-  </object>
-  <object class="GtkListStore" id="liststore1">
-    <columns>
-      <!-- column-name item -->
-      <column type="gchararray"/>
-    </columns>
-    <data>
-      <row>
-        <col id="0" translatable="yes">0: don't care - Use driver's default textures</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">1: 4444 - Fast, but less colorful</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">2: 5551 - Nice colors, bad transparency</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">3: 8888 - Best colors, more ram needed</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">4: BGR8888 - Faster on some cards</col>
-      </row>
-    </data>
-  </object>
-  <object class="GtkDialog" id="CfgWnd">
+  <object class="GtkDialog" id="MainDialog">
     <property name="border_width">5</property>
-    <property name="title" translatable="yes">P.E.Op.S. MesaGL PSX GPU configuration...</property>
+    <property name="title" translatable="yes">OpenGL Driver configuration</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">
-      <object class="GtkVBox" id="fixed1">
+      <object class="GtkVBox" id="dialog-vbox3">
+        <property name="visible">True</property>
         <property name="orientation">vertical</property>
+        <property name="spacing">2</property>
         <child>
-          <object class="GtkHBox" id="my_hbox0">
-            <property name="spacing">5</property>
+          <object class="GtkNotebook" id="notebook1">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
             <child>
-              <object class="GtkFrame" id="frmWindow">
-                <property name="label_xalign">0</property>
+              <object class="GtkVBox" id="vbox2">
+                <property name="visible">True</property>
+                <property name="border_width">10</property>
+                <property name="orientation">vertical</property>
+                <property name="spacing">5</property>
                 <child>
-                  <object class="GtkVBox" id="fixed2">
-                    <property name="border_width">5</property>
-                    <property name="orientation">vertical</property>
+                  <object class="GtkTable" id="table2">
+                    <property name="visible">True</property>
+                    <property name="n_rows">2</property>
+                    <property name="n_columns">2</property>
+                    <property name="column_spacing">5</property>
+                    <property name="row_spacing">5</property>
                     <child>
-                      <object class="GtkTable" id="table1">
+                      <object class="GtkSpinButton" id="spinXSize">
                         <property name="visible">True</property>
-                        <property name="n_rows">2</property>
-                        <property name="n_columns">3</property>
-                        <child>
-                          <object class="GtkCheckButton" id="chkFullScreen">
-                            <property name="label" translatable="yes">Fullscreen</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="draw_indicator">True</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">2</property>
-                            <property name="right_attach">3</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkEntry" id="edtXSize">
-                            <property name="can_focus">True</property>
-                            <property name="max_length">5</property>
-                            <property name="invisible_char">&#x2022;</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="right_attach">2</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkEntry" id="edtYSize">
-                            <property name="can_focus">True</property>
-                            <property name="invisible_char">&#x2022;</property>
-                          </object>
-                          <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>
-                          <object class="GtkLabel" id="label2">
-                            <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Width:</property>
-                            <property name="justify">right</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="label3">
-                            <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Height:</property>
-                            <property name="justify">right</property>
-                          </object>
-                          <packing>
-                            <property name="top_attach">1</property>
-                            <property name="bottom_attach">2</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <placeholder/>
-                        </child>
+                        <property name="can_focus">True</property>
+                        <property name="invisible_char">&#x2022;</property>
+                        <property name="adjustment">x</property>
+                        <property name="numeric">True</property>
                       </object>
                       <packing>
-                        <property name="position">0</property>
+                        <property name="left_attach">1</property>
+                        <property name="right_attach">2</property>
+                        <property name="x_options"></property>
+                        <property name="y_options"></property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkCheckButton" id="chkDither">
-                        <property name="label" translatable="yes">Dithering</property>
-                        <property name="can_focus">False</property>
-                        <property name="receives_default">False</property>
-                        <property name="draw_indicator">True</property>
+                      <object class="GtkSpinButton" id="spinYSize">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="invisible_char">&#x2022;</property>
+                        <property name="adjustment">y</property>
+                        <property name="numeric">True</property>
                       </object>
                       <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">1</property>
+                        <property name="left_attach">1</property>
+                        <property name="right_attach">2</property>
+                        <property name="top_attach">1</property>
+                        <property name="bottom_attach">2</property>
+                        <property name="x_options"></property>
+                        <property name="y_options"></property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkCheckButton" id="chkKeepRatio">
-                        <property name="label" translatable="yes">Keep psx aspect ratio</property>
-                        <property name="can_focus">False</property>
-                        <property name="receives_default">False</property>
-                        <property name="draw_indicator">True</property>
+                      <object class="GtkLabel" id="label7">
+                        <property name="visible">True</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">Width:</property>
                       </object>
                       <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">2</property>
+                        <property name="x_options"></property>
+                        <property name="y_options"></property>
                       </packing>
                     </child>
+                    <child>
+                      <object class="GtkLabel" id="label8">
+                        <property name="visible">True</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">Height:</property>
+                      </object>
+                      <packing>
+                        <property name="top_attach">1</property>
+                        <property name="bottom_attach">2</property>
+                        <property name="x_options"></property>
+                        <property name="y_options"></property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkCheckButton" id="chkFullScreen">
+                    <property name="label" translatable="yes">Fullscreen</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="draw_indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkCheckButton" id="chkDithering">
+                    <property name="label" translatable="yes">Dithering</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="draw_indicator">True</property>
                   </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">2</property>
+                  </packing>
                 </child>
-                <child type="label">
-                  <object class="GtkLabel" id="frame-label1">
-                    <property name="label" translatable="yes">Window options</property>
+                <child>
+                  <object class="GtkCheckButton" id="chkKeepRatio">
+                    <property name="label" translatable="yes">Keep psx aspect ratio</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="draw_indicator">True</property>
                   </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">3</property>
+                  </packing>
                 </child>
               </object>
+            </child>
+            <child type="tab">
+              <object class="GtkLabel" id="label1">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">Window options</property>
+              </object>
               <packing>
-                <property name="position">0</property>
+                <property name="tab_fill">False</property>
               </packing>
             </child>
             <child>
-              <object class="GtkFrame" id="frmTextures">
-                <property name="label_xalign">0</property>
+              <object class="GtkVBox" id="vbox6">
+                <property name="visible">True</property>
+                <property name="border_width">10</property>
+                <property name="orientation">vertical</property>
+                <property name="spacing">5</property>
                 <child>
-                  <object class="GtkVBox" id="fixed3">
-                    <property name="border_width">5</property>
-                    <property name="orientation">vertical</property>
+                  <object class="GtkTable" id="table3">
+                    <property name="visible">True</property>
+                    <property name="n_rows">3</property>
+                    <property name="n_columns">2</property>
+                    <property name="column_spacing">5</property>
+                    <property name="row_spacing">5</property>
                     <child>
-                      <object class="GtkHBox" id="hbox3">
+                      <object class="GtkLabel" id="label9">
                         <property name="visible">True</property>
-                        <child>
-                          <object class="GtkVBox" id="vbox1">
-                            <property name="visible">True</property>
-                            <property name="orientation">vertical</property>
-                            <property name="spacing">2</property>
-                            <child>
-                              <object class="GtkLabel" id="label5">
-                                <property name="xalign">0</property>
-                                <property name="label" translatable="yes">Quality:</property>
-                              </object>
-                              <packing>
-                                <property name="fill">False</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkLabel" id="label6">
-                                <property name="xalign">0</property>
-                                <property name="label" translatable="yes">Filtering:</property>
-                              </object>
-                              <packing>
-                                <property name="fill">False</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkLabel" id="label23">
-                                <property name="xalign">0</property>
-                                <property name="label" translatable="yes">HiRes Tex:</property>
-                              </object>
-                              <packing>
-                                <property name="fill">False</property>
-                                <property name="position">2</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkVBox" id="vbox3">
-                            <property name="visible">True</property>
-                            <property name="orientation">vertical</property>
-                            <property name="spacing">2</property>
-                            <child>
-                              <object class="GtkComboBox" id="cmbQuality">
-                                <property name="model">liststore1</property>
-                                <child>
-                                  <object class="GtkCellRendererText" id="cellrenderertext1"/>
-                                  <attributes>
-                                    <attribute name="text">0</attribute>
-                                  </attributes>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkComboBox" id="cmbFilter">
-                                <property name="model">liststore2</property>
-                                <child>
-                                  <object class="GtkCellRendererText" id="cellrenderertext2"/>
-                                  <attributes>
-                                    <attribute name="text">0</attribute>
-                                  </attributes>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkComboBox" id="cmbHiresTex">
-                                <property name="model">liststore3</property>
-                                <child>
-                                  <object class="GtkCellRendererText" id="cellrenderertext3"/>
-                                  <attributes>
-                                    <attribute name="text">0</attribute>
-                                  </attributes>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="position">2</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">Quality:</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="label10">
+                        <property name="visible">True</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">Filtering:</property>
                       </object>
                       <packing>
-                        <property name="position">0</property>
+                        <property name="top_attach">1</property>
+                        <property name="bottom_attach">2</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkHBox" id="my_hbox6">
-                        <child>
-                          <object class="GtkLabel" id="label7">
-                            <property name="label" translatable="yes">VRam size in MBytes (0..1024, 0=auto):</property>
-                            <property name="justify">center</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkEntry" id="edtMaxTex">
-                            <property name="can_focus">True</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="padding">5</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
+                      <object class="GtkLabel" id="label11">
+                        <property name="visible">True</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">HiRes Tex:</property>
                       </object>
                       <packing>
-                        <property name="position">1</property>
+                        <property name="top_attach">2</property>
+                        <property name="bottom_attach">3</property>
                       </packing>
                     </child>
-                  </object>
-                </child>
-                <child type="label">
-                  <object class="GtkLabel" id="frame-label2">
-                    <property name="label" translatable="yes">Textures</property>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkHBox" id="hbox2">
-            <property name="visible">True</property>
-            <property name="spacing">5</property>
-            <child>
-              <object class="GtkFrame" id="frmFPS">
-                <property name="label_xalign">0</property>
-                <child>
-                  <object class="GtkVBox" id="fixed4">
-                    <property name="border_width">5</property>
-                    <property name="orientation">vertical</property>
                     <child>
-                      <object class="GtkCheckButton" id="chkShowFPS">
-                        <property name="label" translatable="yes">Show FPS display on startup</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="draw_indicator">True</property>
+                      <object class="GtkComboBox" id="cbxTexQuality">
+                        <property name="visible">True</property>
+                        <property name="model">liststore6</property>
+                        <child>
+                          <object class="GtkCellRendererText" id="cellrenderertext6"/>
+                          <attributes>
+                            <attribute name="text">0</attribute>
+                          </attributes>
+                        </child>
                       </object>
                       <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">0</property>
+                        <property name="left_attach">1</property>
+                        <property name="right_attach">2</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkCheckButton" id="chkFPSLimit">
-                        <property name="label" translatable="yes">Use FPS limit</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="draw_indicator">True</property>
+                      <object class="GtkComboBox" id="cbxTexFiltering">
+                        <property name="visible">True</property>
+                        <property name="model">liststore5</property>
+                        <child>
+                          <object class="GtkCellRendererText" id="cellrenderertext5"/>
+                          <attributes>
+                            <attribute name="text">0</attribute>
+                          </attributes>
+                        </child>
                       </object>
                       <packing>
-                        <property name="expand">False</property>
-                        <property name="position">1</property>
+                        <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>
-                      <object class="GtkCheckButton" id="chkFPSSkip">
-                        <property name="label" translatable="yes">Use Frame skipping</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="draw_indicator">True</property>
+                      <object class="GtkComboBox" id="cbxHiResTex">
+                        <property name="visible">True</property>
+                        <property name="model">liststore4</property>
+                        <child>
+                          <object class="GtkCellRendererText" id="cellrenderertext4"/>
+                          <attributes>
+                            <attribute name="text">0</attribute>
+                          </attributes>
+                        </child>
                       </object>
                       <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">2</property>
+                        <property name="left_attach">1</property>
+                        <property name="right_attach">2</property>
+                        <property name="top_attach">2</property>
+                        <property name="bottom_attach">3</property>
                       </packing>
                     </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkHBox" id="hbox4">
+                    <property name="visible">True</property>
+                    <property name="spacing">5</property>
                     <child>
-                      <object class="GtkRadioButton" id="rdbLimAuto">
-                        <property name="label" translatable="yes">FPS limit auto-detection</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="draw_indicator">True</property>
-                        <property name="group">rdbLimMan</property>
+                      <object class="GtkLabel" id="label12">
+                        <property name="visible">True</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">VRam size in MBytes (0..1024, 0=auto):</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
-                        <property name="position">3</property>
+                        <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkHBox" id="my_hbox12">
-                        <child>
-                          <object class="GtkRadioButton" id="rdbLimMan">
-                            <property name="label" translatable="yes">FPS limit manual</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="active">True</property>
-                            <property name="draw_indicator">True</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkEntry" id="edtFPSlim">
-                            <property name="can_focus">True</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="padding">5</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="label8">
-                            <property name="label" translatable="yes">FPS</property>
-                            <property name="justify">center</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
+                      <object class="GtkSpinButton" id="spinVRam">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="invisible_char">&#x2022;</property>
+                        <property name="adjustment">v</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
-                        <property name="position">4</property>
+                        <property name="position">1</property>
                       </packing>
                     </child>
                   </object>
-                </child>
-                <child type="label">
-                  <object class="GtkLabel" id="frame-label3">
-                    <property name="label" translatable="yes">Framerate</property>
-                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">1</property>
+                  </packing>
                 </child>
               </object>
               <packing>
-                <property name="position">0</property>
+                <property name="position">1</property>
+                <property name="tab_fill">False</property>
+              </packing>
+            </child>
+            <child type="tab">
+              <object class="GtkLabel" id="label2">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">Textures</property>
+              </object>
+              <packing>
+                <property name="position">1</property>
+                <property name="tab_fill">False</property>
               </packing>
             </child>
             <child>
-              <object class="GtkFrame" id="frmCompat">
-                <property name="label_xalign">0</property>
+              <object class="GtkVBox" id="vbox3">
+                <property name="visible">True</property>
+                <property name="border_width">10</property>
+                <property name="orientation">vertical</property>
+                <property name="spacing">5</property>
+                <child>
+                  <object class="GtkCheckButton" id="chkShowFPS">
+                    <property name="label" translatable="yes">Show FPS display on startup</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="draw_indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkCheckButton" id="chkUseFPSLimit">
+                    <property name="label" translatable="yes">Use FPS limit</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="draw_indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
                 <child>
-                  <object class="GtkVBox" id="fixed5">
-                    <property name="border_width">5</property>
-                    <property name="orientation">vertical</property>
+                  <object class="GtkAlignment" id="alignment3">
+                    <property name="visible">True</property>
+                    <property name="left_padding">20</property>
                     <child>
-                      <object class="GtkHBox" id="hbox1">
+                      <object class="GtkVBox" id="vboxFPSLimit">
                         <property name="visible">True</property>
+                        <property name="orientation">vertical</property>
+                        <property name="spacing">5</property>
                         <child>
-                          <object class="GtkVBox" id="vbox2">
+                          <object class="GtkRadioButton" id="radFPSLimitAuto">
+                            <property name="label" translatable="yes">FPS limit auto-detector</property>
                             <property name="visible">True</property>
-                            <property name="orientation">vertical</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">radFPSLimitManual</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkHBox" id="hbox2">
+                            <property name="visible">True</property>
+                            <property name="spacing">5</property>
                             <child>
-                              <object class="GtkHBox" id="hbox4">
+                              <object class="GtkRadioButton" id="radFPSLimitManual">
+                                <property name="label" translatable="yes">FPS limit manual</property>
                                 <property name="visible">True</property>
-                                <child>
-                                  <object class="GtkVBox" id="vbox4">
-                                    <property name="visible">True</property>
-                                    <property name="orientation">vertical</property>
-                                    <property name="spacing">2</property>
-                                    <child>
-                                      <object class="GtkLabel" id="label9">
-                                        <property name="xalign">0</property>
-                                        <property name="label" translatable="yes">Offscreen Drawing:</property>
-                                      </object>
-                                      <packing>
-                                        <property name="fill">False</property>
-                                        <property name="position">0</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkLabel" id="label10">
-                                        <property name="xalign">0</property>
-                                        <property name="label" translatable="yes">Framebuffer textures:</property>
-                                      </object>
-                                      <packing>
-                                        <property name="fill">False</property>
-                                        <property name="position">1</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkLabel" id="label22">
-                                        <property name="xalign">0</property>
-                                        <property name="label" translatable="yes">Framebuffer access:</property>
-                                      </object>
-                                      <packing>
-                                        <property name="fill">False</property>
-                                        <property name="position">2</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="position">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkVBox" id="vbox5">
-                                    <property name="visible">True</property>
-                                    <property name="orientation">vertical</property>
-                                    <property name="spacing">2</property>
-                                    <child>
-                                      <object class="GtkComboBox" id="cmbOffscreen">
-                                        <property name="model">liststore5</property>
-                                        <child>
-                                          <object class="GtkCellRendererText" id="cellrenderertext5"/>
-                                          <attributes>
-                                            <attribute name="markup">0</attribute>
-                                            <attribute name="text">0</attribute>
-                                          </attributes>
-                                        </child>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="fill">False</property>
-                                        <property name="position">0</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkComboBox" id="cmbFrameAcc">
-                                        <property name="model">liststore6</property>
-                                        <child>
-                                          <object class="GtkCellRendererText" id="cellrenderertext6"/>
-                                          <attributes>
-                                            <attribute name="text">0</attribute>
-                                          </attributes>
-                                        </child>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="fill">False</property>
-                                        <property name="position">1</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkComboBox" id="cmbFrameTex">
-                                        <property name="model">liststore4</property>
-                                        <child>
-                                          <object class="GtkCellRendererText" id="cellrenderertext4"/>
-                                          <attributes>
-                                            <attribute name="text">0</attribute>
-                                          </attributes>
-                                        </child>
-                                      </object>
-                                      <packing>
-                                        <property name="position">2</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="position">1</property>
-                                  </packing>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkCheckButton" id="chkMaskBit">
-                                <property name="label" translatable="yes">Mask bit detection (needed by a few games, zbuffer)</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
+                                <property name="active">True</property>
                                 <property name="draw_indicator">True</property>
                               </object>
                               <packing>
-                                <property name="position">1</property>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">0</property>
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkCheckButton" id="chkOpaque">
-                                <property name="label" translatable="yes">Alpha Multipass (correct opaque texture areas)</property>
+                              <object class="GtkSpinButton" id="spinFPSLimit">
+                                <property name="visible">True</property>
+                                <property name="sensitive">False</property>
                                 <property name="can_focus">True</property>
-                                <property name="receives_default">False</property>
-                                <property name="draw_indicator">True</property>
+                                <property name="invisible_char">&#x2022;</property>
+                                <property name="adjustment">f</property>
                               </object>
                               <packing>
-                                <property name="position">2</property>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">1</property>
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkCheckButton" id="chkABlend">
-                                <property name="label" translatable="yes">Advanced blending (Accurate psx color emulation)</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">False</property>
-                                <property name="draw_indicator">True</property>
+                              <object class="GtkLabel" id="label13">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">FPS</property>
                               </object>
                               <packing>
-                                <property name="position">3</property>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">2</property>
                               </packing>
                             </child>
                           </object>
                           <packing>
-                            <property name="position">0</property>
+                            <property name="expand">False</property>
+                            <property name="position">1</property>
                           </packing>
                         </child>
                       </object>
-                      <packing>
-                        <property name="position">0</property>
-                      </packing>
                     </child>
                   </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="position">2</property>
+                  </packing>
                 </child>
-                <child type="label">
-                  <object class="GtkLabel" id="frame-label4">
-                    <property name="label" translatable="yes">Compatibility</property>
+                <child>
+                  <object class="GtkCheckButton" id="chkUseFrameSkipping">
+                    <property name="label" translatable="yes">Use Frame skipping</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="draw_indicator">True</property>
                   </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">3</property>
+                  </packing>
                 </child>
               </object>
               <packing>
-                <property name="position">1</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
+            <child type="tab">
+              <object class="GtkLabel" id="label3">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">Framerate</property>
+              </object>
+              <packing>
+                <property name="position">2</property>
+                <property name="tab_fill">False</property>
               </packing>
             </child>
-          </object>
-          <packing>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkHBox" id="my_hbox3">
-            <property name="spacing">5</property>
             <child>
-              <object class="GtkFrame" id="frmMisc">
-                <property name="label_xalign">0</property>
+              <object class="GtkVBox" id="vbox8">
+                <property name="visible">True</property>
+                <property name="border_width">10</property>
+                <property name="orientation">vertical</property>
+                <property name="spacing">5</property>
                 <child>
-                  <object class="GtkVBox" id="fixed6">
-                    <property name="border_width">5</property>
-                    <property name="orientation">vertical</property>
+                  <object class="GtkTable" id="table4">
+                    <property name="visible">True</property>
+                    <property name="n_rows">3</property>
+                    <property name="n_columns">2</property>
+                    <property name="column_spacing">5</property>
+                    <property name="row_spacing">5</property>
                     <child>
-                      <object class="GtkHBox" id="my_hbox4">
-                        <child>
-                          <object class="GtkCheckButton" id="chkScanlines">
-                            <property name="label" translatable="yes">Scanlines</property>
-                            <property name="can_focus">False</property>
-                            <property name="receives_default">False</property>
-                            <property name="draw_indicator">True</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="label11">
-                            <property name="label" translatable="yes">Blending (0..255,-1=dot):</property>
-                            <property name="justify">center</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="padding">13</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkEntry" id="edtScanBlend">
-                            <property name="can_focus">True</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
+                      <object class="GtkLabel" id="label14">
+                        <property name="visible">True</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">Offscreen drawing:</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="label15">
+                        <property name="visible">True</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">Framebuffer textures:</property>
                       </object>
                       <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">0</property>
+                        <property name="top_attach">1</property>
+                        <property name="bottom_attach">2</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkCheckButton" id="chkFastMdec">
-                        <property name="label" translatable="yes">Unfiltered MDECs (small movie speedup)</property>
-                        <property name="can_focus">False</property>
-                        <property name="receives_default">False</property>
-                        <property name="draw_indicator">True</property>
+                      <object class="GtkLabel" id="label16">
+                        <property name="visible">True</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">Framebuffer access:</property>
                       </object>
                       <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">1</property>
+                        <property name="top_attach">2</property>
+                        <property name="bottom_attach">3</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkCheckButton" id="chk15bitMdec">
-                        <property name="label" translatable="yes">Force 15 bit framebuffer updates (faster movies)</property>
-                        <property name="can_focus">False</property>
-                        <property name="receives_default">False</property>
-                        <property name="draw_indicator">True</property>
+                      <object class="GtkComboBox" id="cbxOffscreen">
+                        <property name="visible">True</property>
+                        <property name="model">liststore3</property>
+                        <child>
+                          <object class="GtkCellRendererText" id="cellrenderertext3"/>
+                          <attributes>
+                            <attribute name="text">0</attribute>
+                          </attributes>
+                        </child>
                       </object>
                       <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">2</property>
+                        <property name="left_attach">1</property>
+                        <property name="right_attach">2</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkCheckButton" id="chkLinemode">
-                        <property name="label" translatable="yes">Line mode (polygons will not get filled)</property>
-                        <property name="can_focus">False</property>
-                        <property name="receives_default">False</property>
-                        <property name="draw_indicator">True</property>
+                      <object class="GtkComboBox" id="cbxFBTex">
+                        <property name="visible">True</property>
+                        <property name="model">liststore2</property>
+                        <child>
+                          <object class="GtkCellRendererText" id="cellrenderertext2"/>
+                          <attributes>
+                            <attribute name="text">0</attribute>
+                          </attributes>
+                        </child>
                       </object>
                       <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">3</property>
+                        <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>
-                      <object class="GtkCheckButton" id="chkAntiA">
-                        <property name="label" translatable="yes">Polygon anti-aliasing (slow with most cards)</property>
-                        <property name="can_focus">False</property>
-                        <property name="receives_default">False</property>
-                        <property name="draw_indicator">True</property>
+                      <object class="GtkComboBox" id="cbxFBAccess">
+                        <property name="visible">True</property>
+                        <property name="model">liststore1</property>
+                        <child>
+                          <object class="GtkCellRendererText" id="cellrenderertext1"/>
+                          <attributes>
+                            <attribute name="text">0</attribute>
+                          </attributes>
+                        </child>
                       </object>
                       <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">4</property>
+                        <property name="left_attach">1</property>
+                        <property name="right_attach">2</property>
+                        <property name="top_attach">2</property>
+                        <property name="bottom_attach">3</property>
                       </packing>
                     </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkCheckButton" id="chkMaskDetect">
+                    <property name="label" translatable="yes">Mask bit detection (Needed by a few games, zbuffer)</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="draw_indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkCheckButton" id="chkOpaquePass">
+                    <property name="label" translatable="yes">Alpha multipass (Correct opaque texture areas)</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="draw_indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkCheckButton" id="chkAdvancedBlend">
+                    <property name="label" translatable="yes">Advanced blending (Accurate psx color emulation)</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="draw_indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="position">3</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="position">3</property>
+              </packing>
+            </child>
+            <child type="tab">
+              <object class="GtkLabel" id="label4">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">Compatibility</property>
+              </object>
+              <packing>
+                <property name="position">3</property>
+                <property name="tab_fill">False</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkVBox" id="vbox5">
+                <property name="visible">True</property>
+                <property name="border_width">10</property>
+                <property name="orientation">vertical</property>
+                <property name="spacing">5</property>
+                <child>
+                  <object class="GtkHBox" id="hbox3">
+                    <property name="visible">True</property>
+                    <property name="spacing">5</property>
                     <child>
-                      <object class="GtkCheckButton" id="chkExtensions">
-                        <property name="label" translatable="yes">Use OpenGL extensions (recommended)</property>
-                        <property name="can_focus">False</property>
+                      <object class="GtkCheckButton" id="chkScanLines">
+                        <property name="label" translatable="yes">Scanlines Blending (0..255, -1=dot):</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="draw_indicator">True</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">5</property>
+                        <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkCheckButton" id="chkBlur">
-                        <property name="label" translatable="yes">Screen smoothing (can be slow or unsupported)</property>
-                        <property name="can_focus">False</property>
-                        <property name="receives_default">False</property>
-                        <property name="draw_indicator">True</property>
+                      <object class="GtkSpinButton" id="spinScanLinesBlend">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="invisible_char">&#x2022;</property>
+                        <property name="adjustment">s</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">6</property>
+                        <property name="position">1</property>
                       </packing>
                     </child>
                   </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkCheckButton" id="chkFastMdec">
+                    <property name="label" translatable="yes">Unfiltered MDECs (Small movie speedup)</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="draw_indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkCheckButton" id="chk15bitMdec">
+                    <property name="label" translatable="yes">Force 15 bit framebuffer updates (Faster movies)</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="draw_indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkCheckButton" id="chkLineMode">
+                    <property name="label" translatable="yes">Line mode (Polygons will not get filled)</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="draw_indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="position">3</property>
+                  </packing>
                 </child>
-                <child type="label">
-                  <object class="GtkLabel" id="frame-label5">
-                    <property name="label" translatable="yes">Misc</property>
+                <child>
+                  <object class="GtkCheckButton" id="chkAntiAlias">
+                    <property name="label" translatable="yes">Polygon anti-aliasing (Slow with most cards)</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="draw_indicator">True</property>
                   </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="position">4</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkCheckButton" id="chkOGLExtensions">
+                    <property name="label" translatable="yes">Use OpenGL extensions (Recommended)</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="draw_indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="position">5</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkCheckButton" id="chkScreenSmoothing">
+                    <property name="label" translatable="yes">Screen smoothing (Can be slow or unsupported)</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="draw_indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="position">6</property>
+                  </packing>
                 </child>
               </object>
               <packing>
-                <property name="position">0</property>
+                <property name="position">4</property>
+              </packing>
+            </child>
+            <child type="tab">
+              <object class="GtkLabel" id="label5">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">Misc</property>
+              </object>
+              <packing>
+                <property name="position">4</property>
+                <property name="tab_fill">False</property>
               </packing>
             </child>
             <child>
-              <object class="GtkFrame" id="frmFixes">
-                <property name="label_xalign">0</property>
+              <object class="GtkVBox" id="vbox1">
+                <property name="visible">True</property>
+                <property name="border_width">10</property>
+                <property name="orientation">vertical</property>
+                <property name="spacing">5</property>
                 <child>
-                  <object class="GtkVBox" id="fixed7">
-                    <property name="border_width">5</property>
-                    <property name="orientation">vertical</property>
-                    <child>
-                      <object class="GtkCheckButton" id="chkGameFixes">
-                        <property name="label" translatable="yes">Use game fixes</property>
-                        <property name="can_focus">False</property>
-                        <property name="receives_default">False</property>
-                        <property name="draw_indicator">True</property>
-                      </object>
-                      <packing>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
+                  <object class="GtkCheckButton" id="chkUseGameFixes">
+                    <property name="label" translatable="yes">Use game fixes</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="draw_indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkAlignment" id="alignment8">
+                    <property name="visible">True</property>
+                    <property name="left_padding">20</property>
                     <child>
-                      <object class="GtkTable" id="fix_table">
+                      <object class="GtkTable" id="tblGameFixes">
+                        <property name="visible">True</property>
                         <property name="n_rows">9</property>
                         <property name="n_columns">2</property>
-                        <property name="homogeneous">True</property>
+                        <property name="column_spacing">5</property>
+                        <property name="row_spacing">5</property>
                         <child>
-                          <object class="GtkCheckButton" id="chkFix0">
-                            <property name="label" translatable="yes">01: Battle cursor (FF7)</property>
-                            <property name="can_focus">False</property>
+                          <object class="GtkCheckButton" id="chkCfgFix1">
+                            <property name="label" translatable="yes">Battle cursor (FF7)</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
                             <property name="draw_indicator">True</property>
                           </object>
+                          <packing>
+                            <property name="y_options"></property>
+                          </packing>
                         </child>
                         <child>
-                          <object class="GtkCheckButton" id="chkFix1">
-                            <property name="label" translatable="yes">02: Direct FB updates</property>
-                            <property name="can_focus">False</property>
+                          <object class="GtkCheckButton" id="chkCfgFix512">
+                            <property name="label" translatable="yes">Yellow rect (FF9)</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="draw_indicator">True</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="right_attach">2</property>
+                            <property name="y_options"></property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkCheckButton" id="chkCfgFix2">
+                            <property name="label" translatable="yes">Direct FB updates</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
                             <property name="draw_indicator">True</property>
                           </object>
                           <packing>
                             <property name="top_attach">1</property>
                             <property name="bottom_attach">2</property>
+                            <property name="y_options"></property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkCheckButton" id="chkFix2">
-                            <property name="label" translatable="yes">04: Black brightness (Lunar)</property>
-                            <property name="can_focus">False</property>
+                          <object class="GtkCheckButton" id="chkCfgFix4">
+                            <property name="label" translatable="yes">Black brightness (Lunar)</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
                             <property name="draw_indicator">True</property>
                           </object>
                           <packing>
                             <property name="top_attach">2</property>
                             <property name="bottom_attach">3</property>
+                            <property name="y_options"></property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkCheckButton" id="chkFix3">
-                            <property name="label" translatable="yes">08: Swap front detection</property>
-                            <property name="can_focus">False</property>
+                          <object class="GtkCheckButton" id="chkCfgFix8">
+                            <property name="label" translatable="yes">Swap front detection</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
                             <property name="draw_indicator">True</property>
                           </object>
                           <packing>
                             <property name="top_attach">3</property>
                             <property name="bottom_attach">4</property>
+                            <property name="y_options"></property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkCheckButton" id="chkFix4">
-                            <property name="label" translatable="yes">10: Disable coord check</property>
-                            <property name="can_focus">False</property>
+                          <object class="GtkCheckButton" id="chkCfgFix16">
+                            <property name="label" translatable="yes">Disable coord check</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
                             <property name="draw_indicator">True</property>
                           </object>
                           <packing>
                             <property name="top_attach">4</property>
                             <property name="bottom_attach">5</property>
+                            <property name="y_options"></property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkCheckButton" id="chkFix5">
-                            <property name="label" translatable="yes">20: No blue glitches (LoD)</property>
-                            <property name="can_focus">False</property>
+                          <object class="GtkCheckButton" id="chkCfgFix32">
+                            <property name="label" translatable="yes">No blue glitches (LoD)</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
                             <property name="draw_indicator">True</property>
                           </object>
                           <packing>
                             <property name="top_attach">5</property>
                             <property name="bottom_attach">6</property>
+                            <property name="y_options"></property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkCheckButton" id="chkFix6">
-                            <property name="label" translatable="yes">40: Soft FB access</property>
-                            <property name="can_focus">False</property>
+                          <object class="GtkCheckButton" id="chkCfgFix64">
+                            <property name="label" translatable="yes">Soft FB access</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
                             <property name="draw_indicator">True</property>
                           </object>
                           <packing>
                             <property name="top_attach">6</property>
                             <property name="bottom_attach">7</property>
+                            <property name="y_options"></property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkCheckButton" id="chkFix7">
-                            <property name="label" translatable="yes">80: PC fps calculation</property>
-                            <property name="can_focus">False</property>
+                          <object class="GtkCheckButton" id="chkCfgFix128">
+                            <property name="label" translatable="yes">PC FPS calculation</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
                             <property name="draw_indicator">True</property>
                           </object>
                           <packing>
                             <property name="top_attach">7</property>
                             <property name="bottom_attach">8</property>
+                            <property name="y_options"></property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkCheckButton" id="chkFix8">
-                            <property name="label" translatable="yes">100: Old frame skipping</property>
-                            <property name="can_focus">False</property>
+                          <object class="GtkCheckButton" id="chkCfgFix256">
+                            <property name="label" translatable="yes">Old frame skipping</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
                             <property name="draw_indicator">True</property>
                           </object>
                           <packing>
                             <property name="top_attach">8</property>
                             <property name="bottom_attach">9</property>
+                            <property name="y_options"></property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkCheckButton" id="chkFix9">
-                            <property name="label" translatable="yes">200: Yellow rect (FF9)</property>
-                            <property name="can_focus">False</property>
-                            <property name="receives_default">False</property>
-                            <property name="draw_indicator">True</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="right_attach">2</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkCheckButton" id="chkFix10">
-                            <property name="label" translatable="yes">400: No subtr. blending</property>
-                            <property name="can_focus">False</property>
+                          <object class="GtkCheckButton" id="chkCfgFix1024">
+                            <property name="label" translatable="yes">No subtr. blending</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
                             <property name="draw_indicator">True</property>
                           </object>
@@ -1007,12 +914,14 @@
                             <property name="right_attach">2</property>
                             <property name="top_attach">1</property>
                             <property name="bottom_attach">2</property>
+                            <property name="y_options"></property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkCheckButton" id="chkFix11">
-                            <property name="label" translatable="yes">800: Lazy upload (DW7)</property>
-                            <property name="can_focus">False</property>
+                          <object class="GtkCheckButton" id="chkCfgFix2048">
+                            <property name="label" translatable="yes">Lazy upload (DW7)</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
                             <property name="draw_indicator">True</property>
                           </object>
@@ -1021,12 +930,14 @@
                             <property name="right_attach">2</property>
                             <property name="top_attach">2</property>
                             <property name="bottom_attach">3</property>
+                            <property name="y_options"></property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkCheckButton" id="chkFix12">
-                            <property name="label" translatable="yes">1000: Odd/even hack</property>
-                            <property name="can_focus">False</property>
+                          <object class="GtkCheckButton" id="chkCfgFix4096">
+                            <property name="label" translatable="yes">Odd/even hack</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
                             <property name="draw_indicator">True</property>
                           </object>
@@ -1035,12 +946,14 @@
                             <property name="right_attach">2</property>
                             <property name="top_attach">3</property>
                             <property name="bottom_attach">4</property>
+                            <property name="y_options"></property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkCheckButton" id="chkFix13">
-                            <property name="label" translatable="yes">2000: Adjust screen width</property>
-                            <property name="can_focus">False</property>
+                          <object class="GtkCheckButton" id="chkCfgFix8192">
+                            <property name="label" translatable="yes">Adjust screen width</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
                             <property name="draw_indicator">True</property>
                           </object>
@@ -1049,12 +962,14 @@
                             <property name="right_attach">2</property>
                             <property name="top_attach">4</property>
                             <property name="bottom_attach">5</property>
+                            <property name="y_options"></property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkCheckButton" id="chkFix14">
-                            <property name="label" translatable="yes">4000: Old texture filtering</property>
-                            <property name="can_focus">False</property>
+                          <object class="GtkCheckButton" id="chkCfgFix16384">
+                            <property name="label" translatable="yes">Old texture filtering</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
                             <property name="draw_indicator">True</property>
                           </object>
@@ -1063,12 +978,14 @@
                             <property name="right_attach">2</property>
                             <property name="top_attach">5</property>
                             <property name="bottom_attach">6</property>
+                            <property name="y_options"></property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkCheckButton" id="chkFix15">
-                            <property name="label" translatable="yes">8000: Additional uploads</property>
-                            <property name="can_focus">False</property>
+                          <object class="GtkCheckButton" id="chkCfgFix32768">
+                            <property name="label" translatable="yes">Additional uploads</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
                             <property name="draw_indicator">True</property>
                           </object>
@@ -1077,12 +994,15 @@
                             <property name="right_attach">2</property>
                             <property name="top_attach">6</property>
                             <property name="bottom_attach">7</property>
+                            <property name="y_options"></property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkCheckButton" id="chkFix16">
-                            <property name="label" translatable="yes">10000: unused</property>
-                            <property name="can_focus">False</property>
+                          <object class="GtkCheckButton" id="chkCfgFix65536">
+                            <property name="label" translatable="yes">Unused</property>
+                            <property name="visible">True</property>
+                            <property name="sensitive">False</property>
+                            <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
                             <property name="draw_indicator">True</property>
                           </object>
@@ -1091,12 +1011,14 @@
                             <property name="right_attach">2</property>
                             <property name="top_attach">7</property>
                             <property name="bottom_attach">8</property>
+                            <property name="y_options"></property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkCheckButton" id="chkFix17">
-                            <property name="label" translatable="yes">20000: fake 'gpu busy'</property>
-                            <property name="can_focus">False</property>
+                          <object class="GtkCheckButton" id="chkCfgFix131072">
+                            <property name="label" translatable="yes">Fake 'GPU busy'</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
                             <property name="draw_indicator">True</property>
                           </object>
@@ -1105,104 +1027,275 @@
                             <property name="right_attach">2</property>
                             <property name="top_attach">8</property>
                             <property name="bottom_attach">9</property>
+                            <property name="y_options"></property>
                           </packing>
                         </child>
                       </object>
-                      <packing>
-                        <property name="position">1</property>
-                      </packing>
                     </child>
                   </object>
-                </child>
-                <child type="label">
-                  <object class="GtkLabel" id="frame-label6">
-                    <property name="label" translatable="yes">Special game fixes</property>
-                  </object>
+                  <packing>
+                    <property name="position">1</property>
+                  </packing>
                 </child>
               </object>
               <packing>
-                <property name="position">1</property>
+                <property name="position">5</property>
+              </packing>
+            </child>
+            <child type="tab">
+              <object class="GtkLabel" id="label6">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">Special game fixes</property>
+              </object>
+              <packing>
+                <property name="position">5</property>
+                <property name="tab_fill">False</property>
               </packing>
             </child>
           </object>
           <packing>
-            <property name="position">2</property>
+            <property name="position">0</property>
           </packing>
         </child>
         <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="act_area1">
-            <property name="layout_style">center</property>
+          <object class="GtkHButtonBox" id="dialog-action_area3">
+            <property name="visible">True</property>
+            <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" id="btnFast">
+                <property name="label" translatable="yes">Fast</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="tooltip_text" translatable="yes">Autoconfigure for fast display</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+                <property name="secondary">True</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="btnBeautiful">
+                <property name="label" translatable="yes">Beautiful</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="tooltip_text" translatable="yes">Auto configure for beautiful display</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">1</property>
+                <property name="secondary">True</property>
+              </packing>
+            </child>
             <child>
               <object class="GtkButton" id="btnSave">
                 <property name="label">gtk-ok</property>
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="receives_default">False</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
-                <property name="position">0</property>
+                <property name="position">2</property>
               </packing>
             </child>
             <child>
               <object class="GtkButton" id="btnCancel">
                 <property name="label">gtk-cancel</property>
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="receives_default">False</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
-                <property name="position">1</property>
+                <property name="position">3</property>
               </packing>
             </child>
           </object>
           <packing>
             <property name="expand">False</property>
             <property name="pack_type">end</property>
-            <property name="position">3</property>
+            <property name="position">0</property>
           </packing>
         </child>
       </object>
     </child>
     <action-widgets>
-      <action-widget response="-5">btnSave</action-widget>
-      <action-widget response="-6">btnCancel</action-widget>
+      <action-widget response="0">btnFast</action-widget>
+      <action-widget response="0">btnBeautiful</action-widget>
+      <action-widget response="0">btnSave</action-widget>
+      <action-widget response="0">btnCancel</action-widget>
     </action-widgets>
   </object>
-  <object class="GtkAboutDialog" id="AboutWnd">
-    <property name="border_width">5</property>
-    <property name="type_hint">dialog</property>
-    <property name="program_name">P.E.Op.S. MesaGL PSX GPU</property>
-    <property name="version">1.78</property>
-    <property name="copyright" translatable="yes">Coded by: Pete Bernert</property>
-    <property name="comments" translatable="yes">Release date: 01.04.2009</property>
-    <property name="website">http://www.pbernert.com</property>
-    <property name="website_label" translatable="yes">http://www.pbernert.com</property>
-    <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog-vbox3">
-        <property name="visible">True</property>
-        <property name="orientation">vertical</property>
-        <property name="spacing">2</property>
-        <child>
-          <placeholder/>
-        </child>
-        <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="dialog-action_area4">
-            <property name="visible">True</property>
-            <property name="layout_style">end</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-      </object>
-    </child>
+  <object class="GtkAdjustment" id="x">
+    <property name="upper">9999</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkAdjustment" id="y">
+    <property name="upper">9999</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkAdjustment" id="f">
+    <property name="value">60</property>
+    <property name="lower">20</property>
+    <property name="upper">200</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkListStore" id="liststore1">
+    <columns>
+      <!-- column-name item -->
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">Emulated VRam - Ok most times</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Gfx card buffer reads</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Gfx card buffer moves</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Gfx card buffer reads and moves</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Full Software (FVP)</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkListStore" id="liststore2">
+    <columns>
+      <!-- column-name item -->
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">Emulated VRam - Needs FVP</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Black - Fast, no effects</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Gfx card buffer - Can be slow</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Gfx card and soft - Slow</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkListStore" id="liststore3">
+    <columns>
+      <!-- column-name item -->
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">None - Fastest, most glitches</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Minimum - Missing screens</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Standard - OK for most games</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Enhanced - Shows more stuff</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Extended - Causing garbage</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkListStore" id="liststore4">
+    <columns>
+      <!-- column-name item -->
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">None (Standard)</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">2xSaI (Much vram needed)</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Scaled (Needs tex filtering)</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkListStore" id="liststore5">
+    <columns>
+      <!-- column-name item -->
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">None</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Standard - Glitches will happen</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Extended - No black borders</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Standard without sprites - Unfiltered 2D</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Extended without sprites - Unfiltered 2D</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Standard + smoothed sprites</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Extended + smoothed sprites</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkListStore" id="liststore6">
+    <columns>
+      <!-- column-name item -->
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">Don't care - Use driver's default textures</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">4444 - Fast, but less colorful</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">5551 - Nice colors, bad transparency</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">8888 - Best colors, more ram needed</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">BGR8888 - Faster on some cards</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkAdjustment" id="v">
+    <property name="upper">1024</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkAdjustment" id="s">
+    <property name="lower">-1</property>
+    <property name="upper">255</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
   </object>
 </interface>
diff --git a/po/fr_FR.po b/po/fr_FR.po
index ead5e1e2..4dd405ef 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: pcsxr 1.0\n"
-"Report-Msgid-Bugs-To: schultz.ryan@gmail.com\n"
-"POT-Creation-Date: 2010-12-29 23:29+0800\n"
+"Report-Msgid-Bugs-To: whistler_wmz@users.sf.net\n"
+"POT-Creation-Date: 2011-01-02 13:15+0800\n"
 "PO-Revision-Date: 2010-12-30 12:51+0100\n"
 "Last-Translator: Jean-André Santoni <jean.andre.santoni@gmail.com>\n"
 "Language-Team: French <jean.andre.santoni@gmail.com>\n"
@@ -485,7 +485,7 @@ msgstr "_Son"
 msgid "label_resultsfound"
 msgstr ""
 
-#: ../gui/AboutDlg.c:76
+#: ../gui/AboutDlg.c:72
 msgid ""
 "(C) 1999-2003 PCSX Team\n"
 "(C) 2005-2009 PCSX-df Team\n"
@@ -495,7 +495,7 @@ msgstr ""
 "(C) 2005-2009 L'équipe PCSX-df\n"
 "(C) 2009-2010 L'équipe PCSX-Reloaded"
 
-#: ../gui/AboutDlg.c:81
+#: ../gui/AboutDlg.c:77
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License as published by the Free "
@@ -512,11 +512,11 @@ msgid ""
 "Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA."
 msgstr ""
 
-#: ../gui/AboutDlg.c:104
+#: ../gui/AboutDlg.c:100
 msgid "translator-credits"
 msgstr ""
 
-#: ../gui/AboutDlg.c:105
+#: ../gui/AboutDlg.c:101
 msgid "A PlayStation emulator."
 msgstr "Un émulateur PlayStation"
 
@@ -811,7 +811,8 @@ msgstr ""
 "\t-runcd\t\tLance à partir du CD-ROM\n"
 "\t-cdfile FILE\tLance une image CD\n"
 "\t-nogui\t\tDésactiver l'interface graphique\n"
-"\t-cfg FILE\tCharge le fichier de configuration désiré (par défaut: ~/.pcsx/pcsx.cfg)\n"
+"\t-cfg FILE\tCharge le fichier de configuration désiré (par défaut: ~/.pcsx/"
+"pcsx.cfg)\n"
 "\t-psxout\t\tActiver la sortie PSX\n"
 "\t-load STATENUM\tCharge la sauvegarde d'état STATENUM (1-9)\n"
 "\t-h -help\tAffiche ce message\n"
@@ -888,8 +889,8 @@ msgid ""
 "If you format the memory card, the card will be empty, and any existing data "
 "overwritten."
 msgstr ""
-"Si vous formatez la carte mémoire, la carte sera vidée, et toute donnée existante "
-"perdue."
+"Si vous formatez la carte mémoire, la carte sera vidée, et toute donnée "
+"existante perdue."
 
 #: ../gui/MemcardDlg.c:369
 msgid "Format card"
@@ -914,8 +915,8 @@ msgid ""
 "There are no free slots available on the target memory card. Please delete a "
 "slot first."
 msgstr ""
-"Il n'y a pas d'emplacement disponible sur la carte mémoire sélectionnée. "
-"Il faut d'abord libérer un emplacement."
+"Il n'y a pas d'emplacement disponible sur la carte mémoire sélectionnée. Il "
+"faut d'abord libérer un emplacement."
 
 #: ../gui/MemcardDlg.c:667
 msgid "Memory Card Manager"
@@ -1166,7 +1167,8 @@ msgstr "Connection fermée !\n"
 #: ../libpcsxcore/sio.c:872
 #, c-format
 msgid "No memory card value was specified - creating a default card %s\n"
-msgstr "Pas de carte mémoire spécifiée - création d'une carte mémoire par défaut %s\n"
+msgstr ""
+"Pas de carte mémoire spécifiée - création d'une carte mémoire par défaut %s\n"
 
 #: ../libpcsxcore/sio.c:876
 #, c-format
@@ -1206,7 +1208,8 @@ msgstr "Vitesse de lecture (Def. 0 = MAX) :"
 
 #: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:4
 msgid "Choose your CD-ROM device or type its path if it's not listed"
-msgstr "Choisissez votre lecteur de CD-ROM ou entrez son chemin s'il n'est pas listé"
+msgstr ""
+"Choisissez votre lecteur de CD-ROM ou entrez son chemin s'il n'est pas listé"
 
 #: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:5
 msgid ""
@@ -1433,6 +1436,7 @@ msgid "(Not Set)"
 msgstr "(Non défini)"
 
 #: ../plugins/dfinput/cfg-gtk2.c:559
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:55
 msgid "None"
 msgstr "Aucun"
 
@@ -1513,8 +1517,7 @@ msgstr "Copier l'IP du PC dans le presse-papier"
 #: ../plugins/dfnet/dfnet.glade2.h:3
 msgid ""
 "Do not change if not necessary (remember it must be changed on both sides)."
-msgstr ""
-"Ne changer que si nécessaire (doit être modifié des deux cotés)."
+msgstr "Ne changer que si nécessaire (doit être modifié des deux cotés)."
 
 #: ../plugins/dfnet/dfnet.glade2.h:4
 msgid "Play Offline"
@@ -1536,11 +1539,11 @@ msgid ""
 msgstr ""
 "Choisissez si vous voulez être serveur (Joueur 1) ou client (Joueur 2).\n"
 "\n"
-"Si vous avez choisi serveur, vous devez copier votre IP dans le presse-papier"
-"et la coller (Ctrl+V) quelque part où le client pourra la voir.\n"
+"Si vous avez choisi serveur, vous devez copier votre IP dans le presse-"
+"papieret la coller (Ctrl+V) quelque part où le client pourra la voir.\n"
 "\n"
-"Si vous avez choisi client, veuillez entrer l'adresse IP que le serveur vous"
-"aura fournie dans la zone Adresse IP."
+"Si vous avez choisi client, veuillez entrer l'adresse IP que le serveur "
+"vousaura fournie dans la zone Adresse IP."
 
 #: ../plugins/dfnet/dfnet.glade2.h:11
 msgid "Server (Player1)"
@@ -1870,7 +1873,7 @@ msgid "For precise framerate"
 msgstr "Pour un taux de rafraichissement précis"
 
 #: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2.h:39
-#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:62
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:39
 msgid "Fullscreen"
 msgstr "Plein écran"
 
@@ -1899,10 +1902,12 @@ msgid "Odd/even bit hack"
 msgstr "Hack des bits pairs/impairs"
 
 #: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2.h:46
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:60
 msgid "Old frame skipping"
 msgstr "Ancien saut d'image"
 
 #: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2.h:47
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:63
 msgid "PC FPS calculation"
 msgstr ""
 
@@ -1972,317 +1977,320 @@ msgstr ""
 "Codé par Pete Bernert\n"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:1
-msgid "01: Battle cursor (FF7)"
-msgstr "01: Curseur de bataille (FF7)"
+msgid "2xSaI (Much vram needed)"
+msgstr ""
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:2
-msgid "02: Direct FB updates"
+msgid "4444 - Fast, but less colorful"
 msgstr ""
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:3
-msgid "04: Black brightness (Lunar)"
+msgid "5551 - Nice colors, bad transparency"
 msgstr ""
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:4
-msgid "08: Swap front detection"
+msgid "8888 - Best colors, more ram needed"
 msgstr ""
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:5
-msgid "0: Emulated vram - Needs FVP"
-msgstr "0: VRam émulée - Nécessite FVP"
+msgid "Additional uploads"
+msgstr ""
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:6
-msgid "0: Emulated vram - ok most times"
-msgstr "0: VRam émulée - Ok la plupart du temps"
+#, fuzzy
+msgid "Adjust screen width"
+msgstr "Étendre la largeur d'écran"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:7
-msgid "0: None"
-msgstr "0: Aucun"
+msgid "Advanced blending (Accurate psx color emulation)"
+msgstr ""
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:8
-msgid "0: None (standard)"
-msgstr "0: Aucun (Défaut)"
+msgid "Alpha multipass (Correct opaque texture areas)"
+msgstr ""
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:9
-msgid "0: None - Fastest, most glitches"
-msgstr "0: Aucun - Le plus rapide, mais des glitches"
+msgid "Auto configure for beautiful display"
+msgstr ""
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:10
-msgid "0: don't care - Use driver's default textures"
+msgid "Autoconfigure for fast display"
 msgstr ""
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:11
-msgid "10000: unused"
-msgstr "10000: Inutilisé"
+msgid "BGR8888 - Faster on some cards"
+msgstr ""
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:12
-msgid "1000: Odd/even hack"
-msgstr ""
+#, fuzzy
+msgid "Battle cursor (FF7)"
+msgstr "01: Curseur de bataille (FF7)"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:13
-msgid "100: Old frame skipping"
+msgid "Beautiful"
 msgstr ""
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:14
-msgid "10: Disable coord check"
+msgid "Black - Fast, no effects"
 msgstr ""
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:15
-msgid "1: 2xSaI (much vram needed)"
-msgstr ""
+#, fuzzy
+msgid "Black brightness (Lunar)"
+msgstr "Écrans noirs dans Lunar"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:16
-msgid "1: 4444 - Fast, but less colorful"
-msgstr ""
+msgid "Compatibility"
+msgstr "Compatibilité"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:17
-msgid "1: Black - Fast, no effects"
+msgid "Direct FB updates"
 msgstr ""
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:18
-msgid "1: Gfx card buffer reads"
-msgstr ""
+#, fuzzy
+msgid "Disable coord check"
+msgstr "Désactiver la vérification des coordonnées"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:19
-msgid "1: Minimum - Missing screens"
-msgstr ""
+msgid "Dithering"
+msgstr "Tramage"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:20
-msgid "1: Standard - Glitches will happen"
+msgid "Don't care - Use driver's default textures"
 msgstr ""
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:21
-msgid "20000: fake 'gpu busy'"
-msgstr ""
+#, fuzzy
+msgid "Emulated VRam - Needs FVP"
+msgstr "0: VRam émulée - Nécessite FVP"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:22
-msgid "2000: Adjust screen width"
-msgstr ""
+#, fuzzy
+msgid "Emulated VRam - Ok most times"
+msgstr "0: VRam émulée - Ok la plupart du temps"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:23
-msgid "200: Yellow rect (FF9)"
+msgid "Enhanced - Shows more stuff"
 msgstr ""
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:24
-msgid "20: No blue glitches (LoD)"
+msgid "Extended + smoothed sprites"
 msgstr ""
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:25
-msgid "2: 5551 - Nice colors, bad transparency"
+msgid "Extended - Causing garbage"
 msgstr ""
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:26
-msgid "2: Extended - No black borders"
+msgid "Extended - No black borders"
 msgstr ""
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:27
-msgid "2: Gfx card buffer - Can be slow"
+msgid "Extended without sprites - Unfiltered 2D"
 msgstr ""
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:28
-msgid "2: Gfx card buffer moves"
-msgstr ""
+msgid "FPS"
+msgstr "FPS"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:29
-msgid "2: Scaled (needs tex filtering)"
-msgstr ""
+#, fuzzy
+msgid "FPS limit auto-detector"
+msgstr "Limite FPS auto"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:30
-msgid "2: Standard - OK for most games"
-msgstr ""
+msgid "FPS limit manual"
+msgstr "Limite FPS manuelle"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:31
-msgid "3: 8888 - Best colors, more ram needed"
-msgstr ""
+#, fuzzy
+msgid "Fake 'GPU busy'"
+msgstr "Faux états 'GPU occupé'"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:32
-msgid "3: Enhanced - Shows more stuff"
-msgstr ""
+#, fuzzy
+msgid "Fast"
+msgstr "Coller"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:33
-msgid "3: Gfx buffer reads "
-msgstr ""
+msgid "Filtering:"
+msgstr "Filtrage"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:34
-msgid "3: Gfx card "
+msgid "Force 15 bit framebuffer updates (Faster movies)"
 msgstr ""
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:35
-msgid "3: Standard without sprites - unfiltered 2D"
+msgid "Framebuffer access:"
 msgstr ""
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:36
-msgid "4000: Old texture filtering"
+msgid "Framebuffer textures:"
 msgstr ""
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:37
-msgid "400: No subtr. blending"
+msgid "Framerate"
 msgstr ""
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:38
-msgid "40: Soft FB access"
-msgstr ""
-
-#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:39
-msgid "4: BGR8888 - Faster on some cards"
+msgid "Full Software (FVP)"
 msgstr ""
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:40
-msgid "4: Extended - Causing garbage"
+msgid "Gfx card and soft - Slow"
 msgstr ""
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:41
-msgid "4: Extended without sprites - unfiltered 2D"
+msgid "Gfx card buffer - Can be slow"
 msgstr ""
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:42
-msgid "4: Full Software (FVP)"
+msgid "Gfx card buffer moves"
 msgstr ""
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:43
-msgid "5: Standard + smoothed sprites"
+msgid "Gfx card buffer reads"
 msgstr ""
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:44
-msgid "6: Extended + smoothed sprites"
+msgid "Gfx card buffer reads and moves"
 msgstr ""
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:45
-msgid "8000: Additional uploads"
-msgstr ""
+msgid "Height:"
+msgstr "Hauteur :"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:46
-msgid "800: Lazy upload (DW7)"
+msgid "HiRes Tex:"
 msgstr ""
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:47
-msgid "80: PC fps calculation"
+msgid "Keep psx aspect ratio"
 msgstr ""
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:48
-msgid "Advanced blending (Accurate psx color emulation)"
+msgid "Lazy upload (DW7)"
 msgstr ""
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:49
-msgid "Alpha Multipass (correct opaque texture areas)"
+msgid "Line mode (Polygons will not get filled)"
 msgstr ""
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:50
-msgid "Blending (0..255,-1=dot):"
+msgid "Mask bit detection (Needed by a few games, zbuffer)"
 msgstr ""
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:51
-msgid "Coded by: Pete Bernert"
-msgstr "Codé par : Pete Bernert"
+msgid "Minimum - Missing screens"
+msgstr ""
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:52
-msgid "Compatibility"
-msgstr "Compatibilité"
+msgid "Misc"
+msgstr "Divers"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:53
-msgid "Dithering"
-msgstr "Tramage"
+msgid "No blue glitches (LoD)"
+msgstr ""
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:54
-msgid "FPS"
-msgstr "FPS"
-
-#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:55
-msgid "FPS limit auto-detection"
-msgstr "Limite FPS auto"
+msgid "No subtr. blending"
+msgstr ""
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:56
-msgid "FPS limit manual"
-msgstr "Limite FPS manuelle"
+#, fuzzy
+msgid "None (Standard)"
+msgstr "0: Aucun (Défaut)"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:57
-msgid "Filtering:"
-msgstr "Filtrage"
+#, fuzzy
+msgid "None - Fastest, most glitches"
+msgstr "0: Aucun - Le plus rapide, mais des glitches"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:58
-msgid "Force 15 bit framebuffer updates (faster movies)"
-msgstr ""
+#, fuzzy
+msgid "Odd/even hack"
+msgstr "Hack des bits pairs/impairs"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:59
-msgid "Framebuffer access:"
-msgstr ""
-
-#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:60
-msgid "Framebuffer textures:"
+msgid "Offscreen drawing:"
 msgstr ""
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:61
-msgid "Framerate"
+msgid "Old texture filtering"
 msgstr ""
 
-#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:63
-msgid "Height:"
-msgstr "Hauteur :"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:62
+#, fuzzy
+msgid "OpenGL Driver configuration"
+msgstr "Configuration CDR"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:64
-msgid "HiRes Tex:"
+msgid "Polygon anti-aliasing (Slow with most cards)"
 msgstr ""
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:65
-msgid "Keep psx aspect ratio"
-msgstr ""
+msgid "Quality:"
+msgstr "Qualité :"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:66
-msgid "Line mode (polygons will not get filled)"
+msgid "Scaled (Needs tex filtering)"
 msgstr ""
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:67
-msgid "Mask bit detection (needed by a few games, zbuffer)"
+msgid "Scanlines Blending (0..255, -1=dot):"
 msgstr ""
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:68
-msgid "Misc"
-msgstr "Divers"
+#, fuzzy
+msgid "Screen smoothing (Can be slow or unsupported)"
+msgstr "Lissage d'écran (peut être lent ou non supporté)"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:69
-msgid "Offscreen Drawing:"
-msgstr ""
+msgid "Show FPS display on startup"
+msgstr "Afficher le FPS au démarrage"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:70
-msgid "P.E.Op.S. MesaGL PSX GPU configuration..."
+msgid "Soft FB access"
 msgstr ""
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:71
-msgid "Polygon anti-aliasing (slow with most cards)"
-msgstr ""
+msgid "Special game fixes"
+msgstr "Correctifs spécifique aux jeux"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:72
-msgid "Quality:"
-msgstr "Qualité :"
+msgid "Standard + smoothed sprites"
+msgstr ""
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:73
-msgid "Release date: 01.04.2009"
+msgid "Standard - Glitches will happen"
 msgstr ""
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:74
-msgid "Scanlines"
+msgid "Standard - OK for most games"
 msgstr ""
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:75
-msgid "Screen smoothing (can be slow or unsupported)"
-msgstr "Lissage d'écran (peut être lent ou non supporté)"
+msgid "Standard without sprites - Unfiltered 2D"
+msgstr ""
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:76
-msgid "Show FPS display on startup"
-msgstr "Afficher le FPS au démarrage"
+msgid "Swap front detection"
+msgstr ""
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:77
-msgid "Special game fixes"
-msgstr "Correctifs spécifique aux jeux"
-
-#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:78
 msgid "Textures"
 msgstr "Textures"
 
-#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:79
-msgid "Unfiltered MDECs (small movie speedup)"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:78
+msgid "Unfiltered MDECs (Small movie speedup)"
 msgstr ""
 
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:79
+#, fuzzy
+msgid "Unused"
+msgstr "Utilisé"
+
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:80
 msgid "Use FPS limit"
 msgstr "Limiter les FPS"
@@ -2292,7 +2300,8 @@ msgid "Use Frame skipping"
 msgstr "Saut d'image"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:82
-msgid "Use OpenGL extensions (recommended)"
+#, fuzzy
+msgid "Use OpenGL extensions (Recommended)"
 msgstr "Extentions OpenGL (Recommandé)"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:84
@@ -2308,8 +2317,8 @@ msgid "Window options"
 msgstr "Options d'écran"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:87
-msgid "http://www.pbernert.com"
-msgstr "http://www.pbernert.com"
+msgid "Yellow rect (FF9)"
+msgstr ""
 
 #. ****************************************************************************
 #: ../plugins/bladesio1/sio1.c:29
@@ -2600,7 +2609,8 @@ msgstr "Configuration du jeu en réseau"
 msgid ""
 "Note: The NetPlay Plugin Directory should be the same as the other Plugins."
 msgstr ""
-"NB : Le dossier du greffon de jeu en réseau doit être le même que pour les autres greffons."
+"NB : Le dossier du greffon de jeu en réseau doit être le même que pour les "
+"autres greffons."
 
 #: ../win32/gui/plugin.c:94 ../win32/gui/WndMain.c:320
 #, c-format
@@ -3138,3 +3148,15 @@ msgstr "Message PCSX"
 #: ../win32/gui/WndMain.c:1866
 msgid "Error Loading Symbol"
 msgstr "Erreur au chargement du symbole"
+
+#~ msgid "0: None"
+#~ msgstr "0: Aucun"
+
+#~ msgid "10000: unused"
+#~ msgstr "10000: Inutilisé"
+
+#~ msgid "Coded by: Pete Bernert"
+#~ msgstr "Codé par : Pete Bernert"
+
+#~ msgid "http://www.pbernert.com"
+#~ msgstr "http://www.pbernert.com"
diff --git a/po/it.po b/po/it.po
index a055ecca..974028f2 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: pcsxr 1.0\n"
-"Report-Msgid-Bugs-To: schultz.ryan@gmail.com\n"
-"POT-Creation-Date: 2010-12-29 23:29+0800\n"
+"Report-Msgid-Bugs-To: whistler_wmz@users.sf.net\n"
+"POT-Creation-Date: 2011-01-02 13: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"
@@ -490,14 +490,14 @@ msgstr "_Audio..."
 msgid "label_resultsfound"
 msgstr "etichetta_risultatitrovati"
 
-#: ../gui/AboutDlg.c:76
+#: ../gui/AboutDlg.c:72
 msgid ""
 "(C) 1999-2003 PCSX Team\n"
 "(C) 2005-2009 PCSX-df Team\n"
 "(C) 2009-2010 PCSX-Reloaded Team"
 msgstr ""
 
-#: ../gui/AboutDlg.c:81
+#: ../gui/AboutDlg.c:77
 #, fuzzy
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
@@ -530,12 +530,12 @@ msgstr ""
 "Public License along with this program; if not, write to\n"
 "the Free Software Foundation, Inc."
 
-#: ../gui/AboutDlg.c:104
+#: ../gui/AboutDlg.c:100
 msgid "translator-credits"
 msgstr ""
 "Traduzione italiana a cura di Giovanni Scafora <giovanni@archlinux.org>"
 
-#: ../gui/AboutDlg.c:105
+#: ../gui/AboutDlg.c:101
 msgid "A PlayStation emulator."
 msgstr "Un emulatore della PlayStation."
 
@@ -1478,6 +1478,7 @@ msgid "(Not Set)"
 msgstr "(Nessuna impostazione)"
 
 #: ../plugins/dfinput/cfg-gtk2.c:559
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:55
 msgid "None"
 msgstr "Nessuno"
 
@@ -1917,7 +1918,7 @@ msgid "For precise framerate"
 msgstr "Per framerate preciso"
 
 #: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2.h:39
-#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:62
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:39
 msgid "Fullscreen"
 msgstr "Schermo intero"
 
@@ -1946,10 +1947,12 @@ msgid "Odd/even bit hack"
 msgstr "Hack del bit dispari/pari"
 
 #: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2.h:46
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:60
 msgid "Old frame skipping"
 msgstr "Vecchio salto del frame"
 
 #: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2.h:47
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:63
 msgid "PC FPS calculation"
 msgstr "Calcolo degli FPS del PC"
 
@@ -2020,338 +2023,357 @@ msgstr ""
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:1
 #, fuzzy
-msgid "01: Battle cursor (FF7)"
-msgstr "Cursore della battaglia (Final Fantasy 7)"
+msgid "2xSaI (Much vram needed)"
+msgstr "1: 2xSaI (richiede più vram)"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:2
 #, fuzzy
-msgid "02: Direct FB updates"
-msgstr "Aggiornamenti del Direct FB"
+msgid "4444 - Fast, but less colorful"
+msgstr "1: 4444, veloce, ma meno colorito"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:3
 #, fuzzy
-msgid "04: Black brightness (Lunar)"
-msgstr "Luminosità bassa (Lunar)"
+msgid "5551 - Nice colors, bad transparency"
+msgstr "2: 5551, colori piacevoli, cattiva trasparenza"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:4
 #, fuzzy
-msgid "08: Swap front detection"
-msgstr "Rilevamento dell'inversione frontale"
+msgid "8888 - Best colors, more ram needed"
+msgstr "3: 8888, colori migliori, richiede più ram"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:5
-msgid "0: Emulated vram - Needs FVP"
-msgstr "0: Vram emulata, richiede FVP"
+#, fuzzy
+msgid "Additional uploads"
+msgstr "Invio di dati addizionali"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:6
-msgid "0: Emulated vram - ok most times"
-msgstr "0: Vram emulata, funziona quasi sempre bene"
+#, fuzzy
+msgid "Adjust screen width"
+msgstr "Aggiusta la larghezza dello schermo"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:7
-msgid "0: None"
-msgstr "0: Nessuno"
+msgid "Advanced blending (Accurate psx color emulation)"
+msgstr "Mescolamento avanzato (emulazione accurata del colore della psx)"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:8
-msgid "0: None (standard)"
-msgstr "0: Nessuno (standard)"
+#, fuzzy
+msgid "Alpha multipass (Correct opaque texture areas)"
+msgstr "Alpha Multipass (corregge le aree opache della struttura)"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:9
-msgid "0: None - Fastest, most glitches"
-msgstr "0: Nessuno, velocissimo, più disturbi"
+msgid "Auto configure for beautiful display"
+msgstr ""
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:10
-msgid "0: don't care - Use driver's default textures"
-msgstr "0: non se ne preoccupa, usa le strutture di default del driver"
+msgid "Autoconfigure for fast display"
+msgstr ""
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:11
 #, fuzzy
-msgid "10000: unused"
-msgstr "Inutilizzato"
+msgid "BGR8888 - Faster on some cards"
+msgstr "4: BGR8888, velocissimo su alcune schede"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:12
 #, fuzzy
-msgid "1000: Odd/even hack"
-msgstr "Hack del dispari/pari"
+msgid "Battle cursor (FF7)"
+msgstr "Cursore della battaglia (Final Fantasy 7)"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:13
-#, fuzzy
-msgid "100: Old frame skipping"
-msgstr "Vecchio salto del frame"
+msgid "Beautiful"
+msgstr ""
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:14
 #, fuzzy
-msgid "10: Disable coord check"
-msgstr "Disabilita il controllo della coordinata"
+msgid "Black - Fast, no effects"
+msgstr "1: Nero, veloce, nessun effetto"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:15
-msgid "1: 2xSaI (much vram needed)"
-msgstr "1: 2xSaI (richiede più vram)"
+#, fuzzy
+msgid "Black brightness (Lunar)"
+msgstr "Luminosità bassa (Lunar)"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:16
-msgid "1: 4444 - Fast, but less colorful"
-msgstr "1: 4444, veloce, ma meno colorito"
+msgid "Compatibility"
+msgstr "Compatibilità"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:17
-msgid "1: Black - Fast, no effects"
-msgstr "1: Nero, veloce, nessun effetto"
+#, fuzzy
+msgid "Direct FB updates"
+msgstr "Aggiornamenti del Direct FB"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:18
-msgid "1: Gfx card buffer reads"
-msgstr "1: Legge il buffer Gfx della scheda"
+#, fuzzy
+msgid "Disable coord check"
+msgstr "Disabilita il controllo della coordinata"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:19
-msgid "1: Minimum - Missing screens"
-msgstr "1: Minimo, schermi mancanti"
+msgid "Dithering"
+msgstr "Retinatura"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:20
-msgid "1: Standard - Glitches will happen"
-msgstr "1: Standard, si verificheranno dei disturbi"
+#, fuzzy
+msgid "Don't care - Use driver's default textures"
+msgstr "0: non se ne preoccupa, usa le strutture di default del driver"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:21
 #, fuzzy
-msgid "20000: fake 'gpu busy'"
-msgstr "Simula lo stato di 'gpu occupata'"
+msgid "Emulated VRam - Needs FVP"
+msgstr "0: Vram emulata, richiede FVP"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:22
 #, fuzzy
-msgid "2000: Adjust screen width"
-msgstr "Aggiusta la larghezza dello schermo"
+msgid "Emulated VRam - Ok most times"
+msgstr "0: Vram emulata, funziona quasi sempre bene"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:23
 #, fuzzy
-msgid "200: Yellow rect (FF9)"
-msgstr "Rettangolo giallo (Final Fantasy 9)"
+msgid "Enhanced - Shows more stuff"
+msgstr "3: Migliorato, visualizza più cose"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:24
 #, fuzzy
-msgid "20: No blue glitches (LoD)"
-msgstr "Senza spurie blu (Legend of Dragoon)"
+msgid "Extended + smoothed sprites"
+msgstr "6: Esteso + immagini uniformi"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:25
-msgid "2: 5551 - Nice colors, bad transparency"
-msgstr "2: 5551, colori piacevoli, cattiva trasparenza"
+#, fuzzy
+msgid "Extended - Causing garbage"
+msgstr "4: Esteso, produce risultati poco apprezzabili"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:26
-msgid "2: Extended - No black borders"
+#, fuzzy
+msgid "Extended - No black borders"
 msgstr "2: Esteso, senza bordi neri"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:27
-msgid "2: Gfx card buffer - Can be slow"
-msgstr "2: Gfx card buffer, può essere lento"
+#, fuzzy
+msgid "Extended without sprites - Unfiltered 2D"
+msgstr "4: Esteso senza immagini, 2D non filtrato"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:28
-msgid "2: Gfx card buffer moves"
-msgstr "2: Sposta il buffer Gfx della scheda"
+msgid "FPS"
+msgstr "FPS"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:29
-msgid "2: Scaled (needs tex filtering)"
-msgstr "2: Scalato (necessita del filtraggio della struttura)"
+#, fuzzy
+msgid "FPS limit auto-detector"
+msgstr "Autorilevamento del limite degli FPS"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:30
-msgid "2: Standard - OK for most games"
-msgstr "2: Standard, va bene per la maggior parte dei giochi"
+msgid "FPS limit manual"
+msgstr "Limite manuale degli FPS"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:31
-msgid "3: 8888 - Best colors, more ram needed"
-msgstr "3: 8888, colori migliori, richiede più ram"
+#, fuzzy
+msgid "Fake 'GPU busy'"
+msgstr "Simula lo stato di 'gpu occupata'"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:32
-msgid "3: Enhanced - Shows more stuff"
-msgstr "3: Migliorato, visualizza più cose"
+#, fuzzy
+msgid "Fast"
+msgstr "Incolla"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:33
-#, fuzzy
-msgid "3: Gfx buffer reads "
-msgstr "3: Legge e sposta il buffer Gfx"
+msgid "Filtering:"
+msgstr "Filtraggio:"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:34
 #, fuzzy
-msgid "3: Gfx card "
-msgstr "3: Gfx card e soft, lento"
+msgid "Force 15 bit framebuffer updates (Faster movies)"
+msgstr "Forza a 15 bit gli aggiornamenti del framebuffer (filmati velocissimi)"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:35
-msgid "3: Standard without sprites - unfiltered 2D"
-msgstr "3: Standard senza immagini, 2D non filtrato"
+msgid "Framebuffer access:"
+msgstr "Accesso del framebuffer:"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:36
-#, fuzzy
-msgid "4000: Old texture filtering"
-msgstr "Filtraggio della struttura vecchia"
+msgid "Framebuffer textures:"
+msgstr "Strutture del framebuffer:"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:37
-#, fuzzy
-msgid "400: No subtr. blending"
-msgstr "Senza sottrazione nella fusione"
+msgid "Framerate"
+msgstr "Framerate"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:38
 #, fuzzy
-msgid "40: Soft FB access"
-msgstr "Accesso al FB via software"
-
-#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:39
-msgid "4: BGR8888 - Faster on some cards"
-msgstr "4: BGR8888, velocissimo su alcune schede"
+msgid "Full Software (FVP)"
+msgstr "4: Software completo (FVP)"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:40
-msgid "4: Extended - Causing garbage"
-msgstr "4: Esteso, produce risultati poco apprezzabili"
+msgid "Gfx card and soft - Slow"
+msgstr ""
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:41
-msgid "4: Extended without sprites - unfiltered 2D"
-msgstr "4: Esteso senza immagini, 2D non filtrato"
+#, fuzzy
+msgid "Gfx card buffer - Can be slow"
+msgstr "2: Gfx card buffer, può essere lento"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:42
-msgid "4: Full Software (FVP)"
-msgstr "4: Software completo (FVP)"
+#, fuzzy
+msgid "Gfx card buffer moves"
+msgstr "2: Sposta il buffer Gfx della scheda"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:43
-msgid "5: Standard + smoothed sprites"
-msgstr "5: Standard + immagini uniformi"
+#, fuzzy
+msgid "Gfx card buffer reads"
+msgstr "1: Legge il buffer Gfx della scheda"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:44
-msgid "6: Extended + smoothed sprites"
-msgstr "6: Esteso + immagini uniformi"
+#, fuzzy
+msgid "Gfx card buffer reads and moves"
+msgstr "1: Legge il buffer Gfx della scheda"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:45
-#, fuzzy
-msgid "8000: Additional uploads"
-msgstr "Invio di dati addizionali"
+msgid "Height:"
+msgstr "Altezza:"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:46
-#, fuzzy
-msgid "800: Lazy upload (DW7)"
-msgstr "Upload pigro (Dragon Warrior 7)"
+msgid "HiRes Tex:"
+msgstr "Struttura ad alta risoluzione:"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:47
-#, fuzzy
-msgid "80: PC fps calculation"
-msgstr "Calcolo degli fps del PC"
+msgid "Keep psx aspect ratio"
+msgstr "Mantiene la proporzione dell'aspetto della psx"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:48
-msgid "Advanced blending (Accurate psx color emulation)"
-msgstr "Mescolamento avanzato (emulazione accurata del colore della psx)"
+#, fuzzy
+msgid "Lazy upload (DW7)"
+msgstr "Upload pigro (Dragon Warrior 7)"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:49
-msgid "Alpha Multipass (correct opaque texture areas)"
-msgstr "Alpha Multipass (corregge le aree opache della struttura)"
+#, fuzzy
+msgid "Line mode (Polygons will not get filled)"
+msgstr "Modalità linea (i poligoni non saranno riempiti)"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:50
 #, fuzzy
-msgid "Blending (0..255,-1=dot):"
-msgstr "Fusione (0..255, -1=punto):"
+msgid "Mask bit detection (Needed by a few games, zbuffer)"
+msgstr "Rilevazione del bit mask (richiesto da pochi giochi, zbuffer)"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:51
 #, fuzzy
-msgid "Coded by: Pete Bernert"
-msgstr "Pete Bernert"
+msgid "Minimum - Missing screens"
+msgstr "1: Minimo, schermi mancanti"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:52
-msgid "Compatibility"
-msgstr "Compatibilità"
+msgid "Misc"
+msgstr "Varie"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:53
-msgid "Dithering"
-msgstr "Retinatura"
+#, fuzzy
+msgid "No blue glitches (LoD)"
+msgstr "Senza spurie blu (Legend of Dragoon)"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:54
-msgid "FPS"
-msgstr "FPS"
-
-#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:55
-msgid "FPS limit auto-detection"
-msgstr "Autorilevamento del limite degli FPS"
+#, fuzzy
+msgid "No subtr. blending"
+msgstr "Senza sottrazione nella fusione"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:56
-msgid "FPS limit manual"
-msgstr "Limite manuale degli FPS"
+#, fuzzy
+msgid "None (Standard)"
+msgstr "0: Nessuno (standard)"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:57
-msgid "Filtering:"
-msgstr "Filtraggio:"
+#, fuzzy
+msgid "None - Fastest, most glitches"
+msgstr "0: Nessuno, velocissimo, più disturbi"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:58
-msgid "Force 15 bit framebuffer updates (faster movies)"
-msgstr "Forza a 15 bit gli aggiornamenti del framebuffer (filmati velocissimi)"
+#, fuzzy
+msgid "Odd/even hack"
+msgstr "Hack del bit dispari/pari"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:59
-msgid "Framebuffer access:"
-msgstr "Accesso del framebuffer:"
-
-#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:60
-msgid "Framebuffer textures:"
-msgstr "Strutture del framebuffer:"
+#, fuzzy
+msgid "Offscreen drawing:"
+msgstr "Disegno fuori schermo:"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:61
-msgid "Framerate"
-msgstr "Framerate"
+#, fuzzy
+msgid "Old texture filtering"
+msgstr "Filtraggio della struttura vecchia"
 
-#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:63
-msgid "Height:"
-msgstr "Altezza:"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:62
+msgid "OpenGL Driver configuration"
+msgstr "Configurazione del driver OpenGL"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:64
-msgid "HiRes Tex:"
-msgstr "Struttura ad alta risoluzione:"
+#, fuzzy
+msgid "Polygon anti-aliasing (Slow with most cards)"
+msgstr "Poligono anti-aliasing (lento con la maggior parte delle schede)"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:65
-msgid "Keep psx aspect ratio"
-msgstr "Mantiene la proporzione dell'aspetto della psx"
+msgid "Quality:"
+msgstr "Qualità"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:66
-msgid "Line mode (polygons will not get filled)"
-msgstr "Modalità linea (i poligoni non saranno riempiti)"
+#, fuzzy
+msgid "Scaled (Needs tex filtering)"
+msgstr "2: Scalato (necessita del filtraggio della struttura)"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:67
-msgid "Mask bit detection (needed by a few games, zbuffer)"
-msgstr "Rilevazione del bit mask (richiesto da pochi giochi, zbuffer)"
+#, fuzzy
+msgid "Scanlines Blending (0..255, -1=dot):"
+msgstr "Fusione (0..255, -1=punto):"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:68
-msgid "Misc"
-msgstr "Varie"
+#, fuzzy
+msgid "Screen smoothing (Can be slow or unsupported)"
+msgstr "Schermo uniforme (può essere lento o non supportato)"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:69
-msgid "Offscreen Drawing:"
-msgstr "Disegno fuori schermo:"
+msgid "Show FPS display on startup"
+msgstr "Visualizza gli FPS all'avvio"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:70
-msgid "P.E.Op.S. MesaGL PSX GPU configuration..."
-msgstr ""
+#, fuzzy
+msgid "Soft FB access"
+msgstr "Accesso al FB via software"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:71
-msgid "Polygon anti-aliasing (slow with most cards)"
-msgstr "Poligono anti-aliasing (lento con la maggior parte delle schede)"
+msgid "Special game fixes"
+msgstr "Attiva il gioco speciale"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:72
-msgid "Quality:"
-msgstr "Qualità"
+#, fuzzy
+msgid "Standard + smoothed sprites"
+msgstr "5: Standard + immagini uniformi"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:73
-msgid "Release date: 01.04.2009"
-msgstr ""
+#, fuzzy
+msgid "Standard - Glitches will happen"
+msgstr "1: Standard, si verificheranno dei disturbi"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:74
-msgid "Scanlines"
-msgstr "Scanlines"
+#, fuzzy
+msgid "Standard - OK for most games"
+msgstr "2: Standard, va bene per la maggior parte dei giochi"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:75
-msgid "Screen smoothing (can be slow or unsupported)"
-msgstr "Schermo uniforme (può essere lento o non supportato)"
+#, fuzzy
+msgid "Standard without sprites - Unfiltered 2D"
+msgstr "3: Standard senza immagini, 2D non filtrato"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:76
-msgid "Show FPS display on startup"
-msgstr "Visualizza gli FPS all'avvio"
+#, fuzzy
+msgid "Swap front detection"
+msgstr "Rilevamento dell'inversione frontale"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:77
-msgid "Special game fixes"
-msgstr "Attiva il gioco speciale"
-
-#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:78
 msgid "Textures"
 msgstr "Strutture"
 
-#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:79
-msgid "Unfiltered MDECs (small movie speedup)"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:78
+#, fuzzy
+msgid "Unfiltered MDECs (Small movie speedup)"
 msgstr "MDECs non filtrati (basso guadagno di velocità nei filmati)"
 
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:79
+#, fuzzy
+msgid "Unused"
+msgstr "Usato"
+
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:80
 msgid "Use FPS limit"
 msgstr "Usa il limite degli FPS"
@@ -2361,7 +2383,8 @@ msgid "Use Frame skipping"
 msgstr "Usa il salto dei frame"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:82
-msgid "Use OpenGL extensions (recommended)"
+#, fuzzy
+msgid "Use OpenGL extensions (Recommended)"
 msgstr "Usa le estensioni OpenGL (consigliato)"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:84
@@ -2378,8 +2401,8 @@ msgstr "Opzioni della finestra"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:87
 #, fuzzy
-msgid "http://www.pbernert.com"
-msgstr "Homepage: http://www.pbernert.com"
+msgid "Yellow rect (FF9)"
+msgstr "Rettangolo giallo (Final Fantasy 9)"
 
 #. ****************************************************************************
 #: ../plugins/bladesio1/sio1.c:29
@@ -3214,12 +3237,51 @@ msgstr "Messaggio di pcsx"
 msgid "Error Loading Symbol"
 msgstr "Si è verificato un errore durante il caricamento del simbolo"
 
+#~ msgid "0: None"
+#~ msgstr "0: Nessuno"
+
+#, fuzzy
+#~ msgid "10000: unused"
+#~ msgstr "Inutilizzato"
+
+#, fuzzy
+#~ msgid "1000: Odd/even hack"
+#~ msgstr "Hack del dispari/pari"
+
+#, fuzzy
+#~ msgid "100: Old frame skipping"
+#~ msgstr "Vecchio salto del frame"
+
+#, fuzzy
+#~ msgid "20000: fake 'gpu busy'"
+#~ msgstr "Simula lo stato di 'gpu occupata'"
+
+#, fuzzy
+#~ msgid "3: Gfx buffer reads "
+#~ msgstr "3: Legge e sposta il buffer Gfx"
+
+#, fuzzy
+#~ msgid "3: Gfx card "
+#~ msgstr "3: Gfx card e soft, lento"
+
+#, fuzzy
+#~ msgid "80: PC fps calculation"
+#~ msgstr "Calcolo degli fps del PC"
+
+#, fuzzy
+#~ msgid "Coded by: Pete Bernert"
+#~ msgstr "Pete Bernert"
+
+#~ msgid "Scanlines"
+#~ msgstr "Scanlines"
+
+#, fuzzy
+#~ msgid "http://www.pbernert.com"
+#~ msgstr "Homepage: http://www.pbernert.com"
+
 #~ msgid "COFF files not supported.\n"
 #~ msgstr "File COFF non supportato.\n"
 
-#~ msgid "OpenGL Driver configuration"
-#~ msgstr "Configurazione del driver OpenGL"
-
 #~ msgid "Adapted from P.E.Op.S OpenGL GPU by Pete Bernert"
 #~ msgstr "Adattato da P.E.Op.S OpenGL GPU da Pete Bernert"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 232e6015..025a88fe 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: pcsx-df\n"
-"Report-Msgid-Bugs-To: schultz.ryan@gmail.com\n"
-"POT-Creation-Date: 2010-12-29 23:29+0800\n"
+"Report-Msgid-Bugs-To: whistler_wmz@users.sf.net\n"
+"POT-Creation-Date: 2011-01-02 13: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"
@@ -489,14 +489,14 @@ msgstr "Á_udio..."
 msgid "label_resultsfound"
 msgstr "Resultados encontrados:"
 
-#: ../gui/AboutDlg.c:76
+#: ../gui/AboutDlg.c:72
 msgid ""
 "(C) 1999-2003 PCSX Team\n"
 "(C) 2005-2009 PCSX-df Team\n"
 "(C) 2009-2010 PCSX-Reloaded Team"
 msgstr ""
 
-#: ../gui/AboutDlg.c:81
+#: ../gui/AboutDlg.c:77
 #, fuzzy
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
@@ -529,12 +529,12 @@ msgstr ""
 "Public License along with this program; if not, write to\n"
 "the Free Software Foundation, Inc."
 
-#: ../gui/AboutDlg.c:104
+#: ../gui/AboutDlg.c:100
 msgid "translator-credits"
 msgstr ""
 "Tradução para português brasileiro por Tibério Vítor (tvtoon@gmail.com)"
 
-#: ../gui/AboutDlg.c:105
+#: ../gui/AboutDlg.c:101
 msgid "A PlayStation emulator."
 msgstr "Um emulador de PlayStation."
 
@@ -1437,6 +1437,7 @@ msgid "(Not Set)"
 msgstr ""
 
 #: ../plugins/dfinput/cfg-gtk2.c:559
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:55
 msgid "None"
 msgstr ""
 
@@ -1871,7 +1872,7 @@ msgid "For precise framerate"
 msgstr "Para uma taxa de FPS precisa."
 
 #: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2.h:39
-#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:62
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:39
 msgid "Fullscreen"
 msgstr "Tela cheia"
 
@@ -1900,10 +1901,12 @@ msgid "Odd/even bit hack"
 msgstr "Hack do bit ímpar/par"
 
 #: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2.h:46
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:60
 msgid "Old frame skipping"
 msgstr "Pulo de quadros antigo"
 
 #: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2.h:47
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:63
 msgid "PC FPS calculation"
 msgstr "Cálculo de FPS feito pelo PC"
 
@@ -1974,338 +1977,357 @@ msgstr ""
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:1
 #, fuzzy
-msgid "01: Battle cursor (FF7)"
-msgstr "Cursor da batalha (Final Fantasy 7)"
+msgid "2xSaI (Much vram needed)"
+msgstr "1: 2xSaI (muita VRAM usada)"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:2
 #, fuzzy
-msgid "02: Direct FB updates"
-msgstr "Atualização direta do framebuffer"
+msgid "4444 - Fast, but less colorful"
+msgstr "1: 4444 - Rápido, mas sem muitas cores"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:3
 #, fuzzy
-msgid "04: Black brightness (Lunar)"
-msgstr "Brilho no mínimo (Lunar)"
+msgid "5551 - Nice colors, bad transparency"
+msgstr "2: 5551 - Cores bonitas, transparência ruim"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:4
 #, fuzzy
-msgid "08: Swap front detection"
-msgstr "Detecção da inversão frontal"
+msgid "8888 - Best colors, more ram needed"
+msgstr "3: 8888 - Melhor padrão, o que mais usa RAM"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:5
-msgid "0: Emulated vram - Needs FVP"
-msgstr "0: VRAM emulada - precisa do FVP"
+#, fuzzy
+msgid "Additional uploads"
+msgstr "Envio de dados adicionais"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:6
-msgid "0: Emulated vram - ok most times"
-msgstr "0: VRAM Emulada - bom na maioria das vezes"
+#, fuzzy
+msgid "Adjust screen width"
+msgstr "Ajustar largura da tela"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:7
-msgid "0: None"
-msgstr "0: Nenhum"
+msgid "Advanced blending (Accurate psx color emulation)"
+msgstr "Mesclagem avançada (emulação precisa das cores do PSX)"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:8
-msgid "0: None (standard)"
-msgstr "0: Nenhuma (padrão)"
+#, fuzzy
+msgid "Alpha multipass (Correct opaque texture areas)"
+msgstr "Multipassagem dos canais alfa (áreas opacas de texturas corretas)"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:9
-msgid "0: None - Fastest, most glitches"
-msgstr "0: Nenhuma - Mais rápido e mais problemas"
+msgid "Auto configure for beautiful display"
+msgstr ""
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:10
-msgid "0: don't care - Use driver's default textures"
-msgstr "0: tanto faz - usar textura padrão da placa"
+msgid "Autoconfigure for fast display"
+msgstr ""
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:11
 #, fuzzy
-msgid "10000: unused"
-msgstr "Não usado"
+msgid "BGR8888 - Faster on some cards"
+msgstr "4: BGR8888 - Mais rápido em algumas placas"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:12
 #, fuzzy
-msgid "1000: Odd/even hack"
-msgstr "Hack do ímpar/par"
+msgid "Battle cursor (FF7)"
+msgstr "Cursor da batalha (Final Fantasy 7)"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:13
-#, fuzzy
-msgid "100: Old frame skipping"
-msgstr "Pulo de quadros antigo"
+msgid "Beautiful"
+msgstr ""
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:14
 #, fuzzy
-msgid "10: Disable coord check"
-msgstr "Desligar checagem de coordenadas"
+msgid "Black - Fast, no effects"
+msgstr "1: Preto - Rápido, sem efeitos"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:15
-msgid "1: 2xSaI (much vram needed)"
-msgstr "1: 2xSaI (muita VRAM usada)"
+#, fuzzy
+msgid "Black brightness (Lunar)"
+msgstr "Brilho no mínimo (Lunar)"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:16
-msgid "1: 4444 - Fast, but less colorful"
-msgstr "1: 4444 - Rápido, mas sem muitas cores"
+msgid "Compatibility"
+msgstr "Compatibilidade"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:17
-msgid "1: Black - Fast, no effects"
-msgstr "1: Preto - Rápido, sem efeitos"
+#, fuzzy
+msgid "Direct FB updates"
+msgstr "Atualização direta do framebuffer"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:18
-msgid "1: Gfx card buffer reads"
-msgstr "1: Leitura do buffer da placa"
+#, fuzzy
+msgid "Disable coord check"
+msgstr "Desligar checagem de coordenadas"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:19
-msgid "1: Minimum - Missing screens"
-msgstr "1: Mínimo - Perde algumas telas"
+msgid "Dithering"
+msgstr "Colorização"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:20
-msgid "1: Standard - Glitches will happen"
-msgstr "1: Padrão - Problemas vão acontecer"
+#, fuzzy
+msgid "Don't care - Use driver's default textures"
+msgstr "0: tanto faz - usar textura padrão da placa"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:21
 #, fuzzy
-msgid "20000: fake 'gpu busy'"
-msgstr "Imitar estado 'GPU ocupada'"
+msgid "Emulated VRam - Needs FVP"
+msgstr "0: VRAM emulada - precisa do FVP"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:22
 #, fuzzy
-msgid "2000: Adjust screen width"
-msgstr "Ajustar largura da tela"
+msgid "Emulated VRam - Ok most times"
+msgstr "0: VRAM Emulada - bom na maioria das vezes"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:23
 #, fuzzy
-msgid "200: Yellow rect (FF9)"
-msgstr "Retângulo amarelo (Final Fantasy 9)"
+msgid "Enhanced - Shows more stuff"
+msgstr "3: Aumentado - Mostra mais coisas"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:24
 #, fuzzy
-msgid "20: No blue glitches (LoD)"
-msgstr "Sem sujeira azul (Legend of Dragoon)"
+msgid "Extended + smoothed sprites"
+msgstr "6: Extendido mais sprites filtrados"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:25
-msgid "2: 5551 - Nice colors, bad transparency"
-msgstr "2: 5551 - Cores bonitas, transparência ruim"
+#, fuzzy
+msgid "Extended - Causing garbage"
+msgstr "4: Extendido - Pode causar lixo na tela"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:26
-msgid "2: Extended - No black borders"
+#, fuzzy
+msgid "Extended - No black borders"
 msgstr "2: Extendido - Sem bordas escuras"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:27
-msgid "2: Gfx card buffer - Can be slow"
-msgstr "2: Usar buffer da placa - Pode ficar lento"
+#, fuzzy
+msgid "Extended without sprites - Unfiltered 2D"
+msgstr "4: Extendido sem sprites - 2D sem filtro"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:28
-msgid "2: Gfx card buffer moves"
-msgstr "2: Escrita no buffer da placa"
+msgid "FPS"
+msgstr "FPS"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:29
-msgid "2: Scaled (needs tex filtering)"
-msgstr "2: Escalonado (precisa ativar filtragem)"
+#, fuzzy
+msgid "FPS limit auto-detector"
+msgstr "Autodetecção do limite de FPS"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:30
-msgid "2: Standard - OK for most games"
-msgstr "2: Padrão - Bom para a maioria dos jogos"
+msgid "FPS limit manual"
+msgstr "Limite manual de FPS"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:31
-msgid "3: 8888 - Best colors, more ram needed"
-msgstr "3: 8888 - Melhor padrão, o que mais usa RAM"
+#, fuzzy
+msgid "Fake 'GPU busy'"
+msgstr "Imitar estado 'GPU ocupada'"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:32
-msgid "3: Enhanced - Shows more stuff"
-msgstr "3: Aumentado - Mostra mais coisas"
+#, fuzzy
+msgid "Fast"
+msgstr "Colar"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:33
-#, fuzzy
-msgid "3: Gfx buffer reads "
-msgstr "3: Leitura e Escrita no buffer da placa"
+msgid "Filtering:"
+msgstr "Filtragem:"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:34
 #, fuzzy
-msgid "3: Gfx card "
-msgstr "3: Placa e software - Lento"
+msgid "Force 15 bit framebuffer updates (Faster movies)"
+msgstr "Forçar atualizações do framebuffer em 15 bit (filmes mais rápidos)"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:35
-msgid "3: Standard without sprites - unfiltered 2D"
-msgstr "3: Padrão sem sprites - 2D sem filtro"
+msgid "Framebuffer access:"
+msgstr "Acesso ao framebuffer:"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:36
-#, fuzzy
-msgid "4000: Old texture filtering"
-msgstr "Filtragem de textura antiga"
+msgid "Framebuffer textures:"
+msgstr "Texturas do framebuffer:"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:37
-#, fuzzy
-msgid "400: No subtr. blending"
-msgstr "Sem subtração na mesclagem"
+msgid "Framerate"
+msgstr "Taxa de FPS"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:38
 #, fuzzy
-msgid "40: Soft FB access"
-msgstr "Acesso ao framebuffer por software"
-
-#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:39
-msgid "4: BGR8888 - Faster on some cards"
-msgstr "4: BGR8888 - Mais rápido em algumas placas"
+msgid "Full Software (FVP)"
+msgstr "4: Todo em software (FVP)"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:40
-msgid "4: Extended - Causing garbage"
-msgstr "4: Extendido - Pode causar lixo na tela"
+msgid "Gfx card and soft - Slow"
+msgstr ""
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:41
-msgid "4: Extended without sprites - unfiltered 2D"
-msgstr "4: Extendido sem sprites - 2D sem filtro"
+#, fuzzy
+msgid "Gfx card buffer - Can be slow"
+msgstr "2: Usar buffer da placa - Pode ficar lento"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:42
-msgid "4: Full Software (FVP)"
-msgstr "4: Todo em software (FVP)"
+#, fuzzy
+msgid "Gfx card buffer moves"
+msgstr "2: Escrita no buffer da placa"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:43
-msgid "5: Standard + smoothed sprites"
-msgstr "5: Padrão mais sprites filtrados"
+#, fuzzy
+msgid "Gfx card buffer reads"
+msgstr "1: Leitura do buffer da placa"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:44
-msgid "6: Extended + smoothed sprites"
-msgstr "6: Extendido mais sprites filtrados"
+#, fuzzy
+msgid "Gfx card buffer reads and moves"
+msgstr "1: Leitura do buffer da placa"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:45
-#, fuzzy
-msgid "8000: Additional uploads"
-msgstr "Envio de dados adicionais"
+msgid "Height:"
+msgstr "Altura:"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:46
-#, fuzzy
-msgid "800: Lazy upload (DW7)"
-msgstr "Atualização tardia (Dragon Warrior 7)"
+msgid "HiRes Tex:"
+msgstr "Textura em alta resolução:"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:47
-#, fuzzy
-msgid "80: PC fps calculation"
-msgstr "Cálculo do FPS feito pelo PC"
+msgid "Keep psx aspect ratio"
+msgstr "Manter proporção do PSX"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:48
-msgid "Advanced blending (Accurate psx color emulation)"
-msgstr "Mesclagem avançada (emulação precisa das cores do PSX)"
+#, fuzzy
+msgid "Lazy upload (DW7)"
+msgstr "Atualização tardia (Dragon Warrior 7)"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:49
-msgid "Alpha Multipass (correct opaque texture areas)"
-msgstr "Multipassagem dos canais alfa (áreas opacas de texturas corretas)"
+#, fuzzy
+msgid "Line mode (Polygons will not get filled)"
+msgstr "Modo de linhas (polígonos não serão tratados)"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:50
 #, fuzzy
-msgid "Blending (0..255,-1=dot):"
-msgstr "Mesclagem (0..255, -1=por ponto):"
+msgid "Mask bit detection (Needed by a few games, zbuffer)"
+msgstr "Detecção do bit mascarador (necessário para alguns jogos, zbuffer)"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:51
 #, fuzzy
-msgid "Coded by: Pete Bernert"
-msgstr "Pete Bernert"
+msgid "Minimum - Missing screens"
+msgstr "1: Mínimo - Perde algumas telas"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:52
-msgid "Compatibility"
-msgstr "Compatibilidade"
+msgid "Misc"
+msgstr "Miscelânea"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:53
-msgid "Dithering"
-msgstr "Colorização"
+#, fuzzy
+msgid "No blue glitches (LoD)"
+msgstr "Sem sujeira azul (Legend of Dragoon)"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:54
-msgid "FPS"
-msgstr "FPS"
-
-#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:55
-msgid "FPS limit auto-detection"
-msgstr "Autodetecção do limite de FPS"
+#, fuzzy
+msgid "No subtr. blending"
+msgstr "Sem subtração na mesclagem"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:56
-msgid "FPS limit manual"
-msgstr "Limite manual de FPS"
+#, fuzzy
+msgid "None (Standard)"
+msgstr "0: Nenhuma (padrão)"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:57
-msgid "Filtering:"
-msgstr "Filtragem:"
+#, fuzzy
+msgid "None - Fastest, most glitches"
+msgstr "0: Nenhuma - Mais rápido e mais problemas"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:58
-msgid "Force 15 bit framebuffer updates (faster movies)"
-msgstr "Forçar atualizações do framebuffer em 15 bit (filmes mais rápidos)"
+#, fuzzy
+msgid "Odd/even hack"
+msgstr "Hack do bit ímpar/par"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:59
-msgid "Framebuffer access:"
-msgstr "Acesso ao framebuffer:"
-
-#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:60
-msgid "Framebuffer textures:"
-msgstr "Texturas do framebuffer:"
+#, fuzzy
+msgid "Offscreen drawing:"
+msgstr "Desenhos de fora da tela:"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:61
-msgid "Framerate"
-msgstr "Taxa de FPS"
+#, fuzzy
+msgid "Old texture filtering"
+msgstr "Filtragem de textura antiga"
 
-#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:63
-msgid "Height:"
-msgstr "Altura:"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:62
+msgid "OpenGL Driver configuration"
+msgstr "Configuração da extensão OpenGL"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:64
-msgid "HiRes Tex:"
-msgstr "Textura em alta resolução:"
+#, fuzzy
+msgid "Polygon anti-aliasing (Slow with most cards)"
+msgstr "Anti-aliasing de polígonos (lento com a maioria das placas)"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:65
-msgid "Keep psx aspect ratio"
-msgstr "Manter proporção do PSX"
+msgid "Quality:"
+msgstr "Qualidade:"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:66
-msgid "Line mode (polygons will not get filled)"
-msgstr "Modo de linhas (polígonos não serão tratados)"
+#, fuzzy
+msgid "Scaled (Needs tex filtering)"
+msgstr "2: Escalonado (precisa ativar filtragem)"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:67
-msgid "Mask bit detection (needed by a few games, zbuffer)"
-msgstr "Detecção do bit mascarador (necessário para alguns jogos, zbuffer)"
+#, fuzzy
+msgid "Scanlines Blending (0..255, -1=dot):"
+msgstr "Mesclagem (0..255, -1=por ponto):"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:68
-msgid "Misc"
-msgstr "Miscelânea"
+#, fuzzy
+msgid "Screen smoothing (Can be slow or unsupported)"
+msgstr "Filtragem da tela inteira (pode ser lenta ou não suportada)"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:69
-msgid "Offscreen Drawing:"
-msgstr "Desenhos de fora da tela:"
+msgid "Show FPS display on startup"
+msgstr "Mostrar taxa de FPS ao iniciar"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:70
-msgid "P.E.Op.S. MesaGL PSX GPU configuration..."
-msgstr ""
+#, fuzzy
+msgid "Soft FB access"
+msgstr "Acesso ao framebuffer por software"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:71
-msgid "Polygon anti-aliasing (slow with most cards)"
-msgstr "Anti-aliasing de polígonos (lento com a maioria das placas)"
+msgid "Special game fixes"
+msgstr "Consertos específicos para jogos"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:72
-msgid "Quality:"
-msgstr "Qualidade:"
+#, fuzzy
+msgid "Standard + smoothed sprites"
+msgstr "5: Padrão mais sprites filtrados"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:73
-msgid "Release date: 01.04.2009"
-msgstr ""
+#, fuzzy
+msgid "Standard - Glitches will happen"
+msgstr "1: Padrão - Problemas vão acontecer"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:74
-msgid "Scanlines"
-msgstr "Scanlines"
+#, fuzzy
+msgid "Standard - OK for most games"
+msgstr "2: Padrão - Bom para a maioria dos jogos"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:75
-msgid "Screen smoothing (can be slow or unsupported)"
-msgstr "Filtragem da tela inteira (pode ser lenta ou não suportada)"
+#, fuzzy
+msgid "Standard without sprites - Unfiltered 2D"
+msgstr "3: Padrão sem sprites - 2D sem filtro"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:76
-msgid "Show FPS display on startup"
-msgstr "Mostrar taxa de FPS ao iniciar"
+#, fuzzy
+msgid "Swap front detection"
+msgstr "Detecção da inversão frontal"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:77
-msgid "Special game fixes"
-msgstr "Consertos específicos para jogos"
-
-#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:78
 msgid "Textures"
 msgstr "Texturas"
 
-#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:79
-msgid "Unfiltered MDECs (small movie speedup)"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:78
+#, fuzzy
+msgid "Unfiltered MDECs (Small movie speedup)"
 msgstr "MDECs sem filtragem (pequeno ganho de velocidade nos filmes)"
 
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:79
+#, fuzzy
+msgid "Unused"
+msgstr "Usado"
+
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:80
 msgid "Use FPS limit"
 msgstr "Usar limite de FPS"
@@ -2315,7 +2337,8 @@ msgid "Use Frame skipping"
 msgstr "Usar pulo de quadros"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:82
-msgid "Use OpenGL extensions (recommended)"
+#, fuzzy
+msgid "Use OpenGL extensions (Recommended)"
 msgstr "Usar extensões OpenGL (recomendado)"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:84
@@ -2332,8 +2355,8 @@ msgstr "Opções da janela"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:87
 #, fuzzy
-msgid "http://www.pbernert.com"
-msgstr "Página: http://www.pbernert.com"
+msgid "Yellow rect (FF9)"
+msgstr "Retângulo amarelo (Final Fantasy 9)"
 
 #. ****************************************************************************
 #: ../plugins/bladesio1/sio1.c:29
@@ -3164,12 +3187,51 @@ msgstr "Mensagens do PCSX"
 msgid "Error Loading Symbol"
 msgstr "Erro ao carregar símbolo"
 
+#~ msgid "0: None"
+#~ msgstr "0: Nenhum"
+
+#, fuzzy
+#~ msgid "10000: unused"
+#~ msgstr "Não usado"
+
+#, fuzzy
+#~ msgid "1000: Odd/even hack"
+#~ msgstr "Hack do ímpar/par"
+
+#, fuzzy
+#~ msgid "100: Old frame skipping"
+#~ msgstr "Pulo de quadros antigo"
+
+#, fuzzy
+#~ msgid "20000: fake 'gpu busy'"
+#~ msgstr "Imitar estado 'GPU ocupada'"
+
+#, fuzzy
+#~ msgid "3: Gfx buffer reads "
+#~ msgstr "3: Leitura e Escrita no buffer da placa"
+
+#, fuzzy
+#~ msgid "3: Gfx card "
+#~ msgstr "3: Placa e software - Lento"
+
+#, fuzzy
+#~ msgid "80: PC fps calculation"
+#~ msgstr "Cálculo do FPS feito pelo PC"
+
+#, fuzzy
+#~ msgid "Coded by: Pete Bernert"
+#~ msgstr "Pete Bernert"
+
+#~ msgid "Scanlines"
+#~ msgstr "Scanlines"
+
+#, fuzzy
+#~ msgid "http://www.pbernert.com"
+#~ msgstr "Página: http://www.pbernert.com"
+
 #~ msgid "COFF files not supported.\n"
 #~ msgstr "Arquivos COFF não são suportados!\n"
 
-#~ msgid "OpenGL Driver configuration"
-#~ msgstr "Configuração da extensão OpenGL"
-
 #~ msgid "Adapted from P.E.Op.S OpenGL GPU by Pete Bernert"
 #~ msgstr "Adaptado da extensão de GPU OpenGL P.E.Op.S por Pete Bernert"
 
diff --git a/po/ru_RU.po b/po/ru_RU.po
index 0d2e8b45..8fb86a9c 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: pcsxr 1.0\n"
-"Report-Msgid-Bugs-To: schultz.ryan@gmail.com\n"
-"POT-Creation-Date: 2010-12-29 23:29+0800\n"
+"Report-Msgid-Bugs-To: whistler_wmz@users.sf.net\n"
+"POT-Creation-Date: 2011-01-02 13:15+0800\n"
 "PO-Revision-Date: 2010-08-28 16:44+0400\n"
 "Last-Translator: Blade_Arma <edgbla@yandex.ru>\n"
 "Language-Team: American English <kde-i18n-doc@kde.org>\n"
@@ -485,14 +485,14 @@ msgstr "Звук..."
 msgid "label_resultsfound"
 msgstr ""
 
-#: ../gui/AboutDlg.c:76
+#: ../gui/AboutDlg.c:72
 msgid ""
 "(C) 1999-2003 PCSX Team\n"
 "(C) 2005-2009 PCSX-df Team\n"
 "(C) 2009-2010 PCSX-Reloaded Team"
 msgstr ""
 
-#: ../gui/AboutDlg.c:81
+#: ../gui/AboutDlg.c:77
 msgid ""
 "This program is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU General Public License as published by the Free "
@@ -509,11 +509,11 @@ msgid ""
 "Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA."
 msgstr ""
 
-#: ../gui/AboutDlg.c:104
+#: ../gui/AboutDlg.c:100
 msgid "translator-credits"
 msgstr "edgbla"
 
-#: ../gui/AboutDlg.c:105
+#: ../gui/AboutDlg.c:101
 msgid "A PlayStation emulator."
 msgstr "Эмулятор PlayStation."
 
@@ -1430,6 +1430,7 @@ msgid "(Not Set)"
 msgstr "(Не установлено)"
 
 #: ../plugins/dfinput/cfg-gtk2.c:559
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:55
 msgid "None"
 msgstr "Нету"
 
@@ -1854,7 +1855,7 @@ msgid "For precise framerate"
 msgstr "Для повышения точности частоты смены кадров"
 
 #: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2.h:39
-#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:62
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:39
 msgid "Fullscreen"
 msgstr "Полноэкранный режим"
 
@@ -1883,10 +1884,12 @@ msgid "Odd/even bit hack"
 msgstr "Хак бита ODE"
 
 #: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2.h:46
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:60
 msgid "Old frame skipping"
 msgstr "Старый режим пропуска кадров"
 
 #: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2.h:47
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:63
 msgid "PC FPS calculation"
 msgstr ""
 
@@ -1955,331 +1958,334 @@ msgstr ""
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:1
 #, fuzzy
-msgid "01: Battle cursor (FF7)"
-msgstr "Курсор в режиме боя (FF7)"
+msgid "2xSaI (Much vram needed)"
+msgstr "1: 2xSaI (требуется много видеопамяти)"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:2
-msgid "02: Direct FB updates"
-msgstr ""
+#, fuzzy
+msgid "4444 - Fast, but less colorful"
+msgstr "1: 4444 - Быстро, плохая цветопередача"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:3
 #, fuzzy
-msgid "04: Black brightness (Lunar)"
-msgstr "Чёрный экран в LunarSSSC"
+msgid "5551 - Nice colors, bad transparency"
+msgstr "2: 5551 - Хорошая цветопередача, проблемы с прозрачностью"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:4
-msgid "08: Swap front detection"
-msgstr ""
+#, fuzzy
+msgid "8888 - Best colors, more ram needed"
+msgstr "3: 8888 - Лучшая цветопередача, требует много памяти"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:5
-msgid "0: Emulated vram - Needs FVP"
+msgid "Additional uploads"
 msgstr ""
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:6
-msgid "0: Emulated vram - ok most times"
-msgstr ""
+#, fuzzy
+msgid "Adjust screen width"
+msgstr "Корректировка ширины экрана"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:7
-#, fuzzy
-msgid "0: None"
-msgstr "Нету"
+msgid "Advanced blending (Accurate psx color emulation)"
+msgstr "Улучшенное смешивание (более точная эмуляция цветов psx)"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:8
-msgid "0: None (standard)"
-msgstr "0: None (стандартный)"
+#, fuzzy
+msgid "Alpha multipass (Correct opaque texture areas)"
+msgstr "Многопроходная отрисовка текстур с прозрачностью"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:9
-msgid "0: None - Fastest, most glitches"
+msgid "Auto configure for beautiful display"
 msgstr ""
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:10
-msgid "0: don't care - Use driver's default textures"
-msgstr "0: Использовать формат текстур по-умолчанию"
+msgid "Autoconfigure for fast display"
+msgstr ""
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:11
 #, fuzzy
-msgid "10000: unused"
-msgstr "не используется"
+msgid "BGR8888 - Faster on some cards"
+msgstr "4: BGR8888 - Быстрее на некоторых видеокартах"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:12
 #, fuzzy
-msgid "1000: Odd/even hack"
-msgstr "Хак бита ODE"
+msgid "Battle cursor (FF7)"
+msgstr "Курсор в режиме боя (FF7)"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:13
-#, fuzzy
-msgid "100: Old frame skipping"
-msgstr "Старый режим пропуска кадров"
+msgid "Beautiful"
+msgstr ""
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:14
-#, fuzzy
-msgid "10: Disable coord check"
-msgstr "Выключить проверку координат"
+msgid "Black - Fast, no effects"
+msgstr ""
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:15
-msgid "1: 2xSaI (much vram needed)"
-msgstr "1: 2xSaI (требуется много видеопамяти)"
+#, fuzzy
+msgid "Black brightness (Lunar)"
+msgstr "Чёрный экран в LunarSSSC"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:16
-msgid "1: 4444 - Fast, but less colorful"
-msgstr "1: 4444 - Быстро, плохая цветопередача"
+msgid "Compatibility"
+msgstr "Совместимость"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:17
-msgid "1: Black - Fast, no effects"
+msgid "Direct FB updates"
 msgstr ""
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:18
-msgid "1: Gfx card buffer reads"
-msgstr ""
+#, fuzzy
+msgid "Disable coord check"
+msgstr "Выключить проверку координат"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:19
-msgid "1: Minimum - Missing screens"
-msgstr ""
+msgid "Dithering"
+msgstr "Дизеринг"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:20
-msgid "1: Standard - Glitches will happen"
-msgstr ""
+#, fuzzy
+msgid "Don't care - Use driver's default textures"
+msgstr "0: Использовать формат текстур по-умолчанию"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:21
-#, fuzzy
-msgid "20000: fake 'gpu busy'"
-msgstr "Имитация 'занятости' gpu"
+msgid "Emulated VRam - Needs FVP"
+msgstr ""
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:22
-#, fuzzy
-msgid "2000: Adjust screen width"
-msgstr "Корректировка ширины экрана"
+msgid "Emulated VRam - Ok most times"
+msgstr ""
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:23
-msgid "200: Yellow rect (FF9)"
+msgid "Enhanced - Shows more stuff"
 msgstr ""
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:24
-msgid "20: No blue glitches (LoD)"
+msgid "Extended + smoothed sprites"
 msgstr ""
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:25
-msgid "2: 5551 - Nice colors, bad transparency"
-msgstr "2: 5551 - Хорошая цветопередача, проблемы с прозрачностью"
+msgid "Extended - Causing garbage"
+msgstr ""
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:26
-msgid "2: Extended - No black borders"
+msgid "Extended - No black borders"
 msgstr ""
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:27
-msgid "2: Gfx card buffer - Can be slow"
+msgid "Extended without sprites - Unfiltered 2D"
 msgstr ""
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:28
-msgid "2: Gfx card buffer moves"
+msgid "FPS"
 msgstr ""
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:29
-msgid "2: Scaled (needs tex filtering)"
-msgstr "2: Scaled (используется совместно с текстурной фильтрацией)"
+#, fuzzy
+msgid "FPS limit auto-detector"
+msgstr "Авто-определение FPS"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:30
-msgid "2: Standard - OK for most games"
-msgstr ""
+msgid "FPS limit manual"
+msgstr "Ручное ограничение FPS"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:31
-msgid "3: 8888 - Best colors, more ram needed"
-msgstr "3: 8888 - Лучшая цветопередача, требует много памяти"
+#, fuzzy
+msgid "Fake 'GPU busy'"
+msgstr "Имитация 'занятости' gpu "
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:32
-msgid "3: Enhanced - Shows more stuff"
-msgstr ""
+#, fuzzy
+msgid "Fast"
+msgstr "Вставить"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:33
-msgid "3: Gfx buffer reads "
-msgstr ""
+msgid "Filtering:"
+msgstr "Фильтрация:"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:34
-msgid "3: Gfx card "
+msgid "Force 15 bit framebuffer updates (Faster movies)"
 msgstr ""
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:35
-msgid "3: Standard without sprites - unfiltered 2D"
+msgid "Framebuffer access:"
 msgstr ""
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:36
-#, fuzzy
-msgid "4000: Old texture filtering"
-msgstr "Старый режим текстурной фильтрации"
+msgid "Framebuffer textures:"
+msgstr ""
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:37
-#, fuzzy
-msgid "400: No subtr. blending"
-msgstr "Отключить вычитающее смешивание"
+msgid "Framerate"
+msgstr "Частота кадров"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:38
-msgid "40: Soft FB access"
+msgid "Full Software (FVP)"
 msgstr ""
 
-#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:39
-msgid "4: BGR8888 - Faster on some cards"
-msgstr "4: BGR8888 - Быстрее на некоторых видеокартах"
-
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:40
-msgid "4: Extended - Causing garbage"
+msgid "Gfx card and soft - Slow"
 msgstr ""
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:41
-msgid "4: Extended without sprites - unfiltered 2D"
+msgid "Gfx card buffer - Can be slow"
 msgstr ""
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:42
-msgid "4: Full Software (FVP)"
+msgid "Gfx card buffer moves"
 msgstr ""
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:43
-msgid "5: Standard + smoothed sprites"
+msgid "Gfx card buffer reads"
 msgstr ""
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:44
-msgid "6: Extended + smoothed sprites"
+msgid "Gfx card buffer reads and moves"
 msgstr ""
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:45
-msgid "8000: Additional uploads"
-msgstr ""
+msgid "Height:"
+msgstr "Высота:"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:46
-#, fuzzy
-msgid "800: Lazy upload (DW7)"
-msgstr "\"Ленивая\" загрузка (DW7)"
+msgid "HiRes Tex:"
+msgstr "HiRes текстуры:"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:47
-msgid "80: PC fps calculation"
-msgstr ""
+msgid "Keep psx aspect ratio"
+msgstr "Сохранять пропорции картинки psx"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:48
-msgid "Advanced blending (Accurate psx color emulation)"
-msgstr "Улучшенное смешивание (более точная эмуляция цветов psx)"
+#, fuzzy
+msgid "Lazy upload (DW7)"
+msgstr "\"Ленивая\" загрузка (DW7)"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:49
-msgid "Alpha Multipass (correct opaque texture areas)"
-msgstr "Многопроходная отрисовка текстур с прозрачностью"
+#, fuzzy
+msgid "Line mode (Polygons will not get filled)"
+msgstr "Режим линий (отрисовываются только края полигонов)"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:50
 #, fuzzy
-msgid "Blending (0..255,-1=dot):"
-msgstr "Смешивание (0..255, -1=точка):"
+msgid "Mask bit detection (Needed by a few games, zbuffer)"
+msgstr "Эмуляция маскирования (используется в нескольких играх, zbuffer)"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:51
-msgid "Coded by: Pete Bernert"
+msgid "Minimum - Missing screens"
 msgstr ""
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:52
-msgid "Compatibility"
-msgstr "Совместимость"
+msgid "Misc"
+msgstr "Разное"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:53
-msgid "Dithering"
-msgstr "Дизеринг"
-
-#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:54
-msgid "FPS"
+msgid "No blue glitches (LoD)"
 msgstr ""
 
-#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:55
-msgid "FPS limit auto-detection"
-msgstr "Авто-определение FPS"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:54
+#, fuzzy
+msgid "No subtr. blending"
+msgstr "Отключить вычитающее смешивание"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:56
-msgid "FPS limit manual"
-msgstr "Ручное ограничение FPS"
+#, fuzzy
+msgid "None (Standard)"
+msgstr "0: None (стандартный)"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:57
-msgid "Filtering:"
-msgstr "Фильтрация:"
+msgid "None - Fastest, most glitches"
+msgstr ""
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:58
-msgid "Force 15 bit framebuffer updates (faster movies)"
-msgstr ""
+#, fuzzy
+msgid "Odd/even hack"
+msgstr "Хак бита ODE"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:59
-msgid "Framebuffer access:"
-msgstr ""
-
-#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:60
-msgid "Framebuffer textures:"
-msgstr ""
+#, fuzzy
+msgid "Offscreen drawing:"
+msgstr "Внеэкранная отрисовка:"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:61
-msgid "Framerate"
-msgstr "Частота кадров"
+#, fuzzy
+msgid "Old texture filtering"
+msgstr "Старый режим текстурной фильтрации"
 
-#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:63
-msgid "Height:"
-msgstr "Высота:"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:62
+msgid "OpenGL Driver configuration"
+msgstr "Настройка OpenGL Driver"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:64
-msgid "HiRes Tex:"
-msgstr "HiRes текстуры:"
+#, fuzzy
+msgid "Polygon anti-aliasing (Slow with most cards)"
+msgstr "Антиалиясинг полигонов (медленно на большинстве карт)"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:65
-msgid "Keep psx aspect ratio"
-msgstr "Сохранять пропорции картинки psx"
+msgid "Quality:"
+msgstr "Качество:"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:66
-msgid "Line mode (polygons will not get filled)"
-msgstr "Режим линий (отрисовываются только края полигонов)"
+#, fuzzy
+msgid "Scaled (Needs tex filtering)"
+msgstr "2: Scaled (используется совместно с текстурной фильтрацией)"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:67
-msgid "Mask bit detection (needed by a few games, zbuffer)"
-msgstr "Эмуляция маскирования (используется в нескольких играх, zbuffer)"
+#, fuzzy
+msgid "Scanlines Blending (0..255, -1=dot):"
+msgstr "Смешивание (0..255, -1=точка):"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:68
-msgid "Misc"
-msgstr "Разное"
+#, fuzzy
+msgid "Screen smoothing (Can be slow or unsupported)"
+msgstr "Полноэкранное сглаживание (может быть медленно или неподдерживатся)"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:69
-msgid "Offscreen Drawing:"
-msgstr "Внеэкранная отрисовка:"
+msgid "Show FPS display on startup"
+msgstr "Отображать FPS дисплей при старте"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:70
-msgid "P.E.Op.S. MesaGL PSX GPU configuration..."
+msgid "Soft FB access"
 msgstr ""
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:71
-msgid "Polygon anti-aliasing (slow with most cards)"
-msgstr "Антиалиясинг полигонов (медленно на большинстве карт)"
+msgid "Special game fixes"
+msgstr "Исправления для некоторых игр"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:72
-msgid "Quality:"
-msgstr "Качество:"
+msgid "Standard + smoothed sprites"
+msgstr ""
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:73
-msgid "Release date: 01.04.2009"
+msgid "Standard - Glitches will happen"
 msgstr ""
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:74
-msgid "Scanlines"
-msgstr "Скан-линии"
+msgid "Standard - OK for most games"
+msgstr ""
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:75
-msgid "Screen smoothing (can be slow or unsupported)"
-msgstr "Полноэкранное сглаживание (может быть медленно или неподдерживатся)"
+msgid "Standard without sprites - Unfiltered 2D"
+msgstr ""
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:76
-msgid "Show FPS display on startup"
-msgstr "Отображать FPS дисплей при старте"
+msgid "Swap front detection"
+msgstr ""
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:77
-msgid "Special game fixes"
-msgstr "Исправления для некоторых игр"
-
-#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:78
 msgid "Textures"
 msgstr "Текстуры"
 
-#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:79
-msgid "Unfiltered MDECs (small movie speedup)"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:78
+#, fuzzy
+msgid "Unfiltered MDECs (Small movie speedup)"
 msgstr ""
 "Не фильтровать MDECs (некоторый прирост скорости при проигрывании "
 "видеовставок)"
 
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:79
+#, fuzzy
+msgid "Unused"
+msgstr "Использовано"
+
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:80
 msgid "Use FPS limit"
 msgstr "Включить ограничение FPS"
@@ -2289,7 +2295,8 @@ msgid "Use Frame skipping"
 msgstr "Пропуск кадров"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:82
-msgid "Use OpenGL extensions (recommended)"
+#, fuzzy
+msgid "Use OpenGL extensions (Recommended)"
 msgstr "Использовать расширения OpenGL (рекомендуется)"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:84
@@ -2305,9 +2312,8 @@ msgid "Window options"
 msgstr "Опции окна"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:87
-#, fuzzy
-msgid "http://www.pbernert.com"
-msgstr "Домашняя страница: http://www.pbernert.com"
+msgid "Yellow rect (FF9)"
+msgstr ""
 
 #. ****************************************************************************
 #: ../plugins/bladesio1/sio1.c:29
@@ -3118,12 +3124,36 @@ msgstr "Сообщение pcsx"
 msgid "Error Loading Symbol"
 msgstr "Ошибка загрузки символа"
 
+#, fuzzy
+#~ msgid "0: None"
+#~ msgstr "Нету"
+
+#, fuzzy
+#~ msgid "10000: unused"
+#~ msgstr "не используется"
+
+#, fuzzy
+#~ msgid "1000: Odd/even hack"
+#~ msgstr "Хак бита ODE"
+
+#, fuzzy
+#~ msgid "100: Old frame skipping"
+#~ msgstr "Старый режим пропуска кадров"
+
+#, fuzzy
+#~ msgid "20000: fake 'gpu busy'"
+#~ msgstr "Имитация 'занятости' gpu"
+
+#~ msgid "Scanlines"
+#~ msgstr "Скан-линии"
+
+#, fuzzy
+#~ msgid "http://www.pbernert.com"
+#~ msgstr "Домашняя страница: http://www.pbernert.com"
+
 #~ msgid "COFF files not supported.\n"
 #~ msgstr "Формат COFF не поддерживается.\n"
 
-#~ msgid "OpenGL Driver configuration"
-#~ msgstr "Настройка OpenGL Driver"
-
 #~ msgid "Adapted from P.E.Op.S OpenGL GPU by Pete Bernert"
 #~ msgstr "Адаптированно из \"P.E.Op.S OpenGL GPU\" от Pete Bernert"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 469de543..61d9845c 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -6,9 +6,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: pcsxr 1.0\n"
-"Report-Msgid-Bugs-To: schultz.ryan@gmail.com\n"
-"POT-Creation-Date: 2010-12-29 23:29+0800\n"
-"PO-Revision-Date: 2010-12-29 23:30+0700\n"
+"Report-Msgid-Bugs-To: whistler_wmz@users.sf.net\n"
+"POT-Creation-Date: 2011-01-02 13:15+0800\n"
+"PO-Revision-Date: 2011-01-02 13:16+0700\n"
 "Last-Translator: Wei Mingzhi <whistler@openoffice.org>\n"
 "Language-Team: Simplified Chinese <whistler@openoffice.org>\n"
 "MIME-Version: 1.0\n"
@@ -507,7 +507,7 @@ msgstr "声音(_S)..."
 msgid "label_resultsfound"
 msgstr "label_resultsfound"
 
-#: ../gui/AboutDlg.c:76
+#: ../gui/AboutDlg.c:72
 msgid ""
 "(C) 1999-2003 PCSX Team\n"
 "(C) 2005-2009 PCSX-df Team\n"
@@ -517,7 +517,7 @@ msgstr ""
 "(C) 2005-2009 PCSX-df 开发组\n"
 "(C) 2009-2010 PCSX-Reloaded 开发组"
 
-#: ../gui/AboutDlg.c:81
+#: ../gui/AboutDlg.c:77
 msgid ""
 "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\n"
 "\n"
@@ -531,11 +531,11 @@ msgstr ""
 "\n"
 "You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA."
 
-#: ../gui/AboutDlg.c:104
+#: ../gui/AboutDlg.c:100
 msgid "translator-credits"
 msgstr "Wei Mingzhi <whistler@openoffice.org>"
 
-#: ../gui/AboutDlg.c:105
+#: ../gui/AboutDlg.c:101
 msgid "A PlayStation emulator."
 msgstr "一个 PlayStation 模拟器。"
 
@@ -1507,6 +1507,7 @@ msgid "(Not Set)"
 msgstr "(未设定)"
 
 #: ../plugins/dfinput/cfg-gtk2.c:559
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:55
 msgid "None"
 msgstr "无"
 
@@ -1941,7 +1942,7 @@ msgid "For precise framerate"
 msgstr "精确帧率"
 
 #: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2.h:39
-#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:62
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:39
 msgid "Fullscreen"
 msgstr "全屏"
 
@@ -1970,10 +1971,12 @@ msgid "Odd/even bit hack"
 msgstr "奇/偶位 hack"
 
 #: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2.h:46
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:60
 msgid "Old frame skipping"
 msgstr "旧的跳帧方式"
 
 #: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2.h:47
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:63
 msgid "PC FPS calculation"
 msgstr "PC FPS 计算"
 
@@ -2043,317 +2046,305 @@ msgstr ""
 "作者: Pete Bernert\n"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:1
-msgid "01: Battle cursor (FF7)"
-msgstr "01: 战斗光标 (FF7)"
+msgid "2xSaI (Much vram needed)"
+msgstr "2xSaI (需较多显存)"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:2
-msgid "02: Direct FB updates"
-msgstr "02: 直接 FB 更新"
+msgid "4444 - Fast, but less colorful"
+msgstr "4444 - 较快，较少颜色"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:3
-msgid "04: Black brightness (Lunar)"
-msgstr "04: 黑色亮度 (Lunar)"
+msgid "5551 - Nice colors, bad transparency"
+msgstr "5551 - 较好的颜色，较差的透明效果"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:4
-msgid "08: Swap front detection"
-msgstr "08: Swap front 检测"
+msgid "8888 - Best colors, more ram needed"
+msgstr "8888 - 最佳的颜色，需更多内存"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:5
-msgid "0: Emulated vram - Needs FVP"
-msgstr "0: 模拟 vram - 需 FVP"
+msgid "Additional uploads"
+msgstr "附加上传"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:6
-msgid "0: Emulated vram - ok most times"
-msgstr "0: 模拟 vram - 大多数情况运行良好"
+msgid "Adjust screen width"
+msgstr "调整屏幕宽度"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:7
-msgid "0: None"
-msgstr "0: 无"
+msgid "Advanced blending (Accurate psx color emulation)"
+msgstr "高级混合 (精确的 psx 色彩模拟)"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:8
-msgid "0: None (standard)"
-msgstr "0: 无 (标准)"
+msgid "Alpha multipass (Correct opaque texture areas)"
+msgstr "半透明多通道 (更正不透明的纹理区域)"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:9
-msgid "0: None - Fastest, most glitches"
-msgstr "0: 无 - 最快，问题较多"
+msgid "Auto configure for beautiful display"
+msgstr "自动配置为最佳外观"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:10
-msgid "0: don't care - Use driver's default textures"
-msgstr "0: 使用驱动程序的默认纹理"
+msgid "Autoconfigure for fast display"
+msgstr "自动配置为最佳性能"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:11
-msgid "10000: unused"
-msgstr "10000: 未使用"
+msgid "BGR8888 - Faster on some cards"
+msgstr "BGR8888 - 某些显卡较快"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:12
-msgid "1000: Odd/even hack"
-msgstr "1000: 奇/偶位 hack"
+msgid "Battle cursor (FF7)"
+msgstr "战斗光标 (FF7)"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:13
-msgid "100: Old frame skipping"
-msgstr "100: 旧的跳帧方式"
+msgid "Beautiful"
+msgstr "最佳外观"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:14
-msgid "10: Disable coord check"
-msgstr "10: 禁用坐标检查"
+msgid "Black - Fast, no effects"
+msgstr "黑色 - 快，无特效"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:15
-msgid "1: 2xSaI (much vram needed)"
-msgstr "1: 2xSaI (需较多显存)"
+msgid "Black brightness (Lunar)"
+msgstr "黑色亮度 (Lunar)"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:16
-msgid "1: 4444 - Fast, but less colorful"
-msgstr "1: 4444 - 较快，较少颜色"
+msgid "Compatibility"
+msgstr "兼容性"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:17
-msgid "1: Black - Fast, no effects"
-msgstr "1: 黑色 - 快，无特效"
+msgid "Direct FB updates"
+msgstr "直接 FB 更新"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:18
-msgid "1: Gfx card buffer reads"
-msgstr "1: Gfx 卡缓存读取"
+msgid "Disable coord check"
+msgstr "禁用坐标检查"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:19
-msgid "1: Minimum - Missing screens"
-msgstr "1: 最小 - 丢失屏幕元素"
+msgid "Dithering"
+msgstr "抖动"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:20
-msgid "1: Standard - Glitches will happen"
-msgstr "1: 标准 - 可能会发生问题"
+msgid "Don't care - Use driver's default textures"
+msgstr "使用驱动程序的默认纹理"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:21
-msgid "20000: fake 'gpu busy'"
-msgstr "20000: 欺骗 'gpu 忙' 状态"
+msgid "Emulated VRam - Needs FVP"
+msgstr "模拟 vram - 需 FVP"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:22
-msgid "2000: Adjust screen width"
-msgstr "2000: 调整屏幕宽度"
+msgid "Emulated VRam - Ok most times"
+msgstr "模拟 vram - 大多数情况运行良好"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:23
-msgid "200: Yellow rect (FF9)"
-msgstr "200: 黄色方块 (FF9)"
+msgid "Enhanced - Shows more stuff"
+msgstr "增强 - 显示更多的东西"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:24
-msgid "20: No blue glitches (LoD)"
-msgstr "20: 去除蓝色干扰 (LoD)"
+msgid "Extended + smoothed sprites"
+msgstr "增强 + 平滑贴图"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:25
-msgid "2: 5551 - Nice colors, bad transparency"
-msgstr "2: 5551 - 较好的颜色，较差的透明效果"
+msgid "Extended - Causing garbage"
+msgstr "增强 - 可能导致错误"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:26
-msgid "2: Extended - No black borders"
-msgstr "2: 增强 - 去除黑框"
+msgid "Extended - No black borders"
+msgstr "增强 - 去除黑框"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:27
-msgid "2: Gfx card buffer - Can be slow"
-msgstr "2: Gfx 卡缓存 - 可能较慢"
+msgid "Extended without sprites - Unfiltered 2D"
+msgstr "增强，不含贴图 - 未过滤的 2D"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:28
-msgid "2: Gfx card buffer moves"
-msgstr "2: Gfx 卡缓存移动"
+msgid "FPS"
+msgstr "FPS"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:29
-msgid "2: Scaled (needs tex filtering)"
-msgstr "2: 拉伸 (需要纹理过滤)"
+msgid "FPS limit auto-detector"
+msgstr "FPS 界限自动检测"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:30
-msgid "2: Standard - OK for most games"
-msgstr "2: 标准 - 大多数游戏运行良好"
+msgid "FPS limit manual"
+msgstr "手动设置 FPS 界限"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:31
-msgid "3: 8888 - Best colors, more ram needed"
-msgstr "3: 8888 - 最佳的颜色，需更多内存"
+msgid "Fake 'GPU busy'"
+msgstr "欺骗 'gpu 忙' 状态"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:32
-msgid "3: Enhanced - Shows more stuff"
-msgstr "3: 增强 - 显示更多的东西"
+msgid "Fast"
+msgstr "最佳速度"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:33
-msgid "3: Gfx buffer reads "
-msgstr "3: Gfx 缓存读取"
+msgid "Filtering:"
+msgstr "过滤:"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:34
-msgid "3: Gfx card "
-msgstr "3: Gfx 卡"
+msgid "Force 15 bit framebuffer updates (Faster movies)"
+msgstr "强制 15 位帧缓冲更新 (影片较快)"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:35
-msgid "3: Standard without sprites - unfiltered 2D"
-msgstr "3: 标准，不含贴图 - 未过滤的 2D"
+msgid "Framebuffer access:"
+msgstr "帧缓冲访问:"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:36
-msgid "4000: Old texture filtering"
-msgstr "4000: 旧的纹理过滤"
+msgid "Framebuffer textures:"
+msgstr "帧缓冲纹理:"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:37
-msgid "400: No subtr. blending"
-msgstr "400: 无 subtr. 混合"
+msgid "Framerate"
+msgstr "帧率"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:38
-msgid "40: Soft FB access"
-msgstr "40: 软件 FB 访问"
-
-#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:39
-msgid "4: BGR8888 - Faster on some cards"
-msgstr "4: BGR8888 - 某些显卡较快"
+msgid "Full Software (FVP)"
+msgstr "纯软件 (FVP)"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:40
-msgid "4: Extended - Causing garbage"
-msgstr "4: 增强 - 可能导致错误"
+msgid "Gfx card and soft - Slow"
+msgstr "Gfx 卡及软件 - 慢"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:41
-msgid "4: Extended without sprites - unfiltered 2D"
-msgstr "4: 增强，不含贴图 - 未过滤的 2D"
+msgid "Gfx card buffer - Can be slow"
+msgstr "Gfx 卡缓存 - 可能较慢"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:42
-msgid "4: Full Software (FVP)"
-msgstr "4: 纯软件 (FVP)"
+msgid "Gfx card buffer moves"
+msgstr "Gfx 卡缓存移动"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:43
-msgid "5: Standard + smoothed sprites"
-msgstr "5: 标准 + 平滑贴图"
+msgid "Gfx card buffer reads"
+msgstr "Gfx 卡缓存读取"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:44
-msgid "6: Extended + smoothed sprites"
-msgstr "6: 增强 + 平滑贴图"
+msgid "Gfx card buffer reads and moves"
+msgstr "Gfx 卡缓存读取及移动"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:45
-msgid "8000: Additional uploads"
-msgstr "8000: 附加上传"
+msgid "Height:"
+msgstr "高度"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:46
-msgid "800: Lazy upload (DW7)"
-msgstr "800: 懒惰上传 (DW7)"
+msgid "HiRes Tex:"
+msgstr "高分纹理:"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:47
-msgid "80: PC fps calculation"
-msgstr "80: PC FPS 计算"
+msgid "Keep psx aspect ratio"
+msgstr "保持 psx 纵横比"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:48
-msgid "Advanced blending (Accurate psx color emulation)"
-msgstr "高级混合 (精确的 psx 色彩模拟)"
+msgid "Lazy upload (DW7)"
+msgstr "懒惰上传 (DW7)"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:49
-msgid "Alpha Multipass (correct opaque texture areas)"
-msgstr "半透明多通道 (更正不透明的纹理区域)"
+msgid "Line mode (Polygons will not get filled)"
+msgstr "框架模式 (不填充多边形)"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:50
-msgid "Blending (0..255,-1=dot):"
-msgstr "混合 (0..255, -1=点阵):"
+msgid "Mask bit detection (Needed by a few games, zbuffer)"
+msgstr "屏蔽位检测 (某些游戏需要)"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:51
-msgid "Coded by: Pete Bernert"
-msgstr "编写者: Pete Bernert"
+msgid "Minimum - Missing screens"
+msgstr "最小 - 丢失屏幕元素"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:52
-msgid "Compatibility"
-msgstr "兼容性"
+msgid "Misc"
+msgstr "杂项"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:53
-msgid "Dithering"
-msgstr "抖动"
+msgid "No blue glitches (LoD)"
+msgstr "去除蓝色干扰 (LoD)"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:54
-msgid "FPS"
-msgstr "FPS"
-
-#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:55
-msgid "FPS limit auto-detection"
-msgstr "FPS 界限自动检测"
+msgid "No subtr. blending"
+msgstr "无 subtr. 混合"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:56
-msgid "FPS limit manual"
-msgstr "手动设置 FPS 界限"
+msgid "None (Standard)"
+msgstr "无 (标准)"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:57
-msgid "Filtering:"
-msgstr "过滤:"
+msgid "None - Fastest, most glitches"
+msgstr "无 - 最快，问题较多"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:58
-msgid "Force 15 bit framebuffer updates (faster movies)"
-msgstr "强制 15 位帧缓冲更新 (影片较快)"
+msgid "Odd/even hack"
+msgstr "奇/偶位 hack"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:59
-msgid "Framebuffer access:"
-msgstr "帧缓冲访问:"
-
-#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:60
-msgid "Framebuffer textures:"
-msgstr "帧缓冲纹理:"
+msgid "Offscreen drawing:"
+msgstr "离屏描绘:"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:61
-msgid "Framerate"
-msgstr "帧率"
+msgid "Old texture filtering"
+msgstr "旧的纹理过滤"
 
-#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:63
-msgid "Height:"
-msgstr "高度"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:62
+msgid "OpenGL Driver configuration"
+msgstr "OpenGL 驱动程序配置"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:64
-msgid "HiRes Tex:"
-msgstr "高分纹理:"
+msgid "Polygon anti-aliasing (Slow with most cards)"
+msgstr "多边形抗锯齿 (对大多数显卡较慢)"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:65
-msgid "Keep psx aspect ratio"
-msgstr "保持 psx 纵横比"
+msgid "Quality:"
+msgstr "质量:"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:66
-msgid "Line mode (polygons will not get filled)"
-msgstr "框架模式 (不填充多边形)"
+msgid "Scaled (Needs tex filtering)"
+msgstr "拉伸 (需要纹理过滤)"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:67
-msgid "Mask bit detection (needed by a few games, zbuffer)"
-msgstr "屏蔽位检测 (某些游戏需要)"
+msgid "Scanlines Blending (0..255, -1=dot):"
+msgstr "混合 (0..255, -1=点阵):"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:68
-msgid "Misc"
-msgstr "杂项"
+msgid "Screen smoothing (Can be slow or unsupported)"
+msgstr "屏幕平滑 (可能较慢或不被支持)"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:69
-msgid "Offscreen Drawing:"
-msgstr "离屏描绘:"
+msgid "Show FPS display on startup"
+msgstr "启动时显示 FPS"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:70
-msgid "P.E.Op.S. MesaGL PSX GPU configuration..."
-msgstr "P.E.Op.S MesaGL PSX GPU 配置..."
+msgid "Soft FB access"
+msgstr "软件 FB 访问"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:71
-msgid "Polygon anti-aliasing (slow with most cards)"
-msgstr "多边形抗锯齿 (对大多数显卡较慢)"
+msgid "Special game fixes"
+msgstr "特定游戏修正"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:72
-msgid "Quality:"
-msgstr "质量:"
+msgid "Standard + smoothed sprites"
+msgstr "标准 + 平滑贴图"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:73
-msgid "Release date: 01.04.2009"
-msgstr "发布日期: 01.04.2009"
+msgid "Standard - Glitches will happen"
+msgstr "标准 - 可能会发生问题"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:74
-msgid "Scanlines"
-msgstr "扫描线"
+msgid "Standard - OK for most games"
+msgstr "标准 - 大多数游戏运行良好"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:75
-msgid "Screen smoothing (can be slow or unsupported)"
-msgstr "屏幕平滑 (可能较慢或不被支持)"
+msgid "Standard without sprites - Unfiltered 2D"
+msgstr "标准，不含贴图 - 未过滤的 2D"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:76
-msgid "Show FPS display on startup"
-msgstr "启动时显示 FPS"
+msgid "Swap front detection"
+msgstr "Swap front 检测"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:77
-msgid "Special game fixes"
-msgstr "特定游戏修正"
-
-#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:78
 msgid "Textures"
 msgstr "纹理"
 
-#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:79
-msgid "Unfiltered MDECs (small movie speedup)"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:78
+msgid "Unfiltered MDECs (Small movie speedup)"
 msgstr "非过滤 MDEC (微小的影片加速)"
 
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:79
+msgid "Unused"
+msgstr "未使用"
+
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:80
 msgid "Use FPS limit"
 msgstr "启用 FPS 界限"
@@ -2363,7 +2354,7 @@ msgid "Use Frame skipping"
 msgstr "启用跳帧"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:82
-msgid "Use OpenGL extensions (recommended)"
+msgid "Use OpenGL extensions (Recommended)"
 msgstr "使用 OpenGL 扩展 (推荐)"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:84
@@ -2379,8 +2370,8 @@ msgid "Window options"
 msgstr "窗口选项"
 
 #: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:87
-msgid "http://www.pbernert.com"
-msgstr "http://www.pbernert.com"
+msgid "Yellow rect (FF9)"
+msgstr "黄色方块 (FF9)"
 
 #. ****************************************************************************
 #: ../plugins/bladesio1/sio1.c:29
@@ -3250,10 +3241,34 @@ msgstr "PCSX 消息"
 msgid "Error Loading Symbol"
 msgstr "无法加载符号"
 
+#~ msgid "0: None"
+#~ msgstr "0: 无"
+#~ msgid "10000: unused"
+#~ msgstr "10000: 未使用"
+#~ msgid "1000: Odd/even hack"
+#~ msgstr "1000: 奇/偶位 hack"
+#~ msgid "100: Old frame skipping"
+#~ msgstr "100: 旧的跳帧方式"
+#~ msgid "20000: fake 'gpu busy'"
+#~ msgstr "20000: 欺骗 'gpu 忙' 状态"
+#~ msgid "3: Gfx buffer reads "
+#~ msgstr "3: Gfx 缓存读取"
+#~ msgid "3: Gfx card "
+#~ msgstr "3: Gfx 卡"
+#~ msgid "80: PC fps calculation"
+#~ msgstr "80: PC FPS 计算"
+#~ msgid "Coded by: Pete Bernert"
+#~ msgstr "编写者: Pete Bernert"
+#~ msgid "P.E.Op.S. MesaGL PSX GPU configuration..."
+#~ msgstr "P.E.Op.S MesaGL PSX GPU 配置..."
+#~ msgid "Release date: 01.04.2009"
+#~ msgstr "发布日期: 01.04.2009"
+#~ msgid "Scanlines"
+#~ msgstr "扫描线"
+#~ msgid "http://www.pbernert.com"
+#~ msgstr "http://www.pbernert.com"
 #~ msgid "COFF files not supported.\n"
 #~ msgstr "COFF 文件尚未支持。\n"
-#~ msgid "OpenGL Driver configuration"
-#~ msgstr "OpenGL 驱动程序配置"
 #~ msgid "Adapted from P.E.Op.S OpenGL GPU by Pete Bernert"
 #~ msgstr "基于 Pete Bernert 的 P.E.Op.S OpenGL GPU"
 #~ msgid "Version: 1.78"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 13eb7543..2f5bbf7a 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: pcsxr 1.0\n"
-"Report-Msgid-Bugs-To: schultz.ryan@gmail.com\n"
-"POT-Creation-Date: 2010-12-28 23:38+0800\n"
+"Report-Msgid-Bugs-To: whistler_wmz@users.sf.net\n"
+"POT-Creation-Date: 2011-01-02 13:15+0800\n"
 "PO-Revision-Date: 2010-12-29 11:28+0800\n"
 "Last-Translator: Wei Mingzhi <whistler_wmz@users.sf.net>\n"
 "Language-Team: Traditional Chinese <whistler@openoffice.org>\n"
@@ -15,516 +15,477 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: data/pcsx.glade2:7
-msgid "PCSX"
-msgstr "PCSX"
-
-#: data/pcsx.glade2:22
-msgid "_File"
-msgstr "檔案(_F)"
-
-#: data/pcsx.glade2:28
-msgid "Run _CD"
-msgstr "執行光碟(_C)"
+#: ../data/pcsx.glade2.h:1
+msgid ""
+"8-bit\n"
+"16-bit\n"
+"32-bit"
+msgstr ""
+"8 位元\n"
+"16 位元\n"
+"32 位元"
 
-#: data/pcsx.glade2:46
-msgid "Run _ISO..."
-msgstr "執行 _ISO..."
+#: ../data/pcsx.glade2.h:4
+msgid "<b>BIOS</b>"
+msgstr "<b>BIOS</b>"
 
-#: data/pcsx.glade2:63
-msgid "Run _BIOS"
-msgstr "執行 _BIOS"
+#: ../data/pcsx.glade2.h:5
+msgid "<b>Cheat Codes</b>"
+msgstr "<b>金手指碼</b>"
 
-#: data/pcsx.glade2:80
-msgid "Run _EXE..."
-msgstr "執行 _EXE..."
+#: ../data/pcsx.glade2.h:6
+msgid "<b>Cheat Search</b>"
+msgstr "<b>金手指碼搜尋</b>"
 
-#: data/pcsx.glade2:102
-msgid "E_xit"
-msgstr "離開(_X)"
+#: ../data/pcsx.glade2.h:7
+msgid "<b>Memory Card 1</b>"
+msgstr "<b>記憶卡 1</b>"
 
-#: data/pcsx.glade2:124
-msgid "_Emulator"
-msgstr "模擬器(_E)"
+#: ../data/pcsx.glade2.h:8
+msgid "<b>Memory Card 2</b>"
+msgstr "<b>記憶卡 2</b>"
 
-#: data/pcsx.glade2:130
-msgid "_Continue"
-msgstr "繼續(_C)"
+#: ../data/pcsx.glade2.h:9
+msgid "<b>NetPlay</b>"
+msgstr "<b>聯線遊戲</b>"
 
-#: data/pcsx.glade2:147
-msgid "_Reset"
-msgstr "複位(_R)"
+#: ../data/pcsx.glade2.h:10
+msgid "<b>Options</b>"
+msgstr "<b>選項</b>"
 
-#: data/pcsx.glade2:169
-msgid "S_witch ISO..."
-msgstr "更換 ISO(_W)"
+#: ../data/pcsx.glade2.h:11
+msgid "<b>Plugins</b>"
+msgstr "<b>外掛</b>"
 
-#: data/pcsx.glade2:191
-msgid "_Save State"
-msgstr "存儲記錄(_S)"
+#: ../data/pcsx.glade2.h:12
+msgid "<b>System Type</b>"
+msgstr "<b>系統類型</b>"
 
-#: data/pcsx.glade2:200
-#: data/pcsx.glade2:313
-msgid "Slot _1"
-msgstr "記錄 _1"
+#: ../data/pcsx.glade2.h:13 ../gui/DebugMemory.c:188
+msgid "Address (Hexadecimal):"
+msgstr "位址 (十六進制):"
 
-#: data/pcsx.glade2:209
-#: data/pcsx.glade2:322
-msgid "Slot _2"
-msgstr "記錄 _2"
+#: ../data/pcsx.glade2.h:14 ../win32/gui/WndMain.c:1299
+msgid "Autodetect"
+msgstr "自動檢測"
 
-#: data/pcsx.glade2:218
-#: data/pcsx.glade2:331
-msgid "Slot _3"
-msgstr "記錄 _3"
+#: ../data/pcsx.glade2.h:15
+msgid "Black & White Movies"
+msgstr "黑白電影"
 
-#: data/pcsx.glade2:227
-#: data/pcsx.glade2:340
-msgid "Slot _4"
-msgstr "記錄 _4"
+#: ../data/pcsx.glade2.h:16
+msgid "CD-ROM..."
+msgstr "CD-ROM..."
 
-#: data/pcsx.glade2:236
-#: data/pcsx.glade2:349
-msgid "Slot _5"
-msgstr "記錄 _5"
+#: ../data/pcsx.glade2.h:17
+msgid "CD-ROM:"
+msgstr "CD-ROM:"
 
-#: data/pcsx.glade2:245
-#: data/pcsx.glade2:358
-msgid "Slot _6"
-msgstr "記錄 _6"
+#: ../data/pcsx.glade2.h:18
+msgid "CD-_ROM..."
+msgstr "CD-_ROM..."
 
-#: data/pcsx.glade2:253
-#: data/pcsx.glade2:366
-msgid "Slot _7"
-msgstr "記錄 _7"
+#: ../data/pcsx.glade2.h:19
+msgid "C_ontrollers..."
+msgstr "控制器(_O)..."
 
-#: data/pcsx.glade2:261
-#: data/pcsx.glade2:374
-msgid "Slot _8"
-msgstr "記錄 _8"
+#: ../data/pcsx.glade2.h:20
+msgid "Chea_t"
+msgstr "金手指(_T)"
 
-#: data/pcsx.glade2:269
-#: data/pcsx.glade2:382
-msgid "Slot _9"
-msgstr "記錄 _9"
+#: ../data/pcsx.glade2.h:21 ../gui/Cheat.c:1129 ../win32/gui/CheatDlg.c:678
+msgid "Cheat Search"
+msgstr "搜尋金手指碼"
 
-#: data/pcsx.glade2:276
-#: data/pcsx.glade2:389
-msgid "_Other..."
-msgstr "其它(_O)..."
+#: ../data/pcsx.glade2.h:22
+msgid "Configure CD-ROM"
+msgstr "CD-ROM 設定"
 
-#: data/pcsx.glade2:304
-msgid "_Load State"
-msgstr "讀取記錄(_L)"
+#: ../data/pcsx.glade2.h:23
+msgid "Configure CPU"
+msgstr "CPU 設定"
 
-#: data/pcsx.glade2:422
-msgid "_Configuration"
-msgstr "設定(_C)"
+#: ../data/pcsx.glade2.h:24
+msgid "Configure Controllers"
+msgstr "控制器設定"
 
-#: data/pcsx.glade2:428
-msgid "_Plugins & BIOS..."
-msgstr "外掛及 BIOS(_P)..."
+#: ../data/pcsx.glade2.h:25
+msgid "Configure Graphics"
+msgstr "圖像設定"
 
-#: data/pcsx.glade2:450
-msgid "_Graphics..."
-msgstr "圖像(_G)..."
+#: ../data/pcsx.glade2.h:26
+msgid "Configure Memory Cards"
+msgstr "記憶卡設定"
 
-#: data/pcsx.glade2:465
-msgid "_Sound..."
-msgstr "聲音(_S)..."
+#: ../data/pcsx.glade2.h:27
+msgid "Configure NetPlay"
+msgstr "聯線遊戲設定"
 
-#: data/pcsx.glade2:480
-msgid "CD-_ROM..."
-msgstr "CD-_ROM..."
+#: ../data/pcsx.glade2.h:28 ../gui/ConfDlg.c:112
+msgid "Configure PCSX"
+msgstr "設定 PCSX"
 
-#: data/pcsx.glade2:495
-msgid "C_ontrollers..."
-msgstr "控制器(_O)..."
+#: ../data/pcsx.glade2.h:29 ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:6
+msgid "Configure Sound"
+msgstr "聲音設定"
 
-#: data/pcsx.glade2:515
-msgid "_CPU..."
-msgstr "_CPU..."
+#: ../data/pcsx.glade2.h:30
+msgid "Continue Emulation"
+msgstr "繼續模擬"
 
-#: data/pcsx.glade2:531
-msgid "_Memory Cards..."
-msgstr "記憶卡(_M)..."
+#: ../data/pcsx.glade2.h:31
+msgid "Continue..."
+msgstr "繼續..."
 
-#: data/pcsx.glade2:548
-msgid "_Netplay..."
-msgstr "聯線遊戲(_N)..."
+#: ../data/pcsx.glade2.h:32
+msgid "Controller 1:   "
+msgstr "控制器 1:"
 
-#: data/pcsx.glade2:569
-msgid "Chea_t"
-msgstr "金手指(_T)"
+#: ../data/pcsx.glade2.h:33
+msgid "Controller 2:"
+msgstr "控制器 2:"
 
-#: data/pcsx.glade2:578
-msgid "_Browse..."
-msgstr "檢視(_B)..."
+#: ../data/pcsx.glade2.h:34
+msgid "Controllers..."
+msgstr "控制器..."
 
-#: data/pcsx.glade2:593
-msgid "_Search..."
-msgstr "搜尋(_S)..."
+#: ../data/pcsx.glade2.h:35
+msgid "Copy"
+msgstr "複制"
 
-#: data/pcsx.glade2:619
-msgid "Memory _Dump"
-msgstr "記憶體轉儲(_D)"
+#: ../data/pcsx.glade2.h:36 ../win32/gui/CheatDlg.c:683
+msgid "Data Base:"
+msgstr "數值基:"
 
-#: data/pcsx.glade2:639
-msgid "_Help"
-msgstr "說明(_H)"
+#: ../data/pcsx.glade2.h:37 ../win32/gui/CheatDlg.c:681
+msgid "Data Type:"
+msgstr "數值類型:"
 
-#: data/pcsx.glade2:645
-msgid "_About PCSX..."
-msgstr "關於 PCSX(_A)..."
+#: ../data/pcsx.glade2.h:38
+msgid ""
+"Decimal\n"
+"Hexadecimal"
+msgstr ""
+"十進制\n"
+"十六進制"
 
-#: data/pcsx.glade2:678
-#: data/pcsx.glade2:679
-msgid "Run CD"
-msgstr "執行光碟"
+#: ../data/pcsx.glade2.h:40
+msgid "Disable CD Audio"
+msgstr "禁用 CD 音頻"
 
-#: data/pcsx.glade2:691
-msgid "Run ISO Image"
-msgstr "執行 ISO 光碟映像"
+#: ../data/pcsx.glade2.h:41
+msgid "Disable XA Decoding"
+msgstr "禁用 XA 解碼"
 
-#: data/pcsx.glade2:692
-msgid "Run ISO..."
-msgstr "執行 ISO..."
+#: ../data/pcsx.glade2.h:42
+msgid "E_xit"
+msgstr "離開(_X)"
 
-#: data/pcsx.glade2:713
-msgid "Continue Emulation"
-msgstr "繼續模擬"
+#: ../data/pcsx.glade2.h:43 ../win32/gui/CheatDlg.c:166
+msgid "Edit Cheat Codes"
+msgstr "編輯金手指"
 
-#: data/pcsx.glade2:714
-msgid "Continue..."
-msgstr "繼續..."
+#: ../data/pcsx.glade2.h:44 ../win32/gui/WndMain.c:1301
+msgid "Enable Console Output"
+msgstr "開啟控制台輸出"
 
-#: data/pcsx.glade2:726
-msgid "Switch ISO Image"
-msgstr "更換 ISO 光碟映像"
+#: ../data/pcsx.glade2.h:45 ../win32/gui/WndMain.c:1302
+msgid "Enable Debugger"
+msgstr "開啟調試器"
 
-#: data/pcsx.glade2:727
-msgid "Switch ISO..."
-msgstr "更換 ISO..."
+#: ../data/pcsx.glade2.h:46
+msgid "Enable Interpreter CPU"
+msgstr "開啟解釋執行 CPU"
 
-#: data/pcsx.glade2:748
-#: data/pcsx.glade2:1875
-msgid "Configure Memory Cards"
-msgstr "記憶卡設定"
+#: ../data/pcsx.glade2.h:47
+msgid ""
+"Equal Value\n"
+"Not Equal Value\n"
+"Range\n"
+"Increased By\n"
+"Decreased By\n"
+"Increased\n"
+"Decreased\n"
+"Different\n"
+"No Change"
+msgstr ""
+"等于數值\n"
+"不等于數值\n"
+"範圍\n"
+"增加數值\n"
+"減少數值\n"
+"增加\n"
+"減少\n"
+"不同\n"
+"無變動"
 
-#: data/pcsx.glade2:749
-msgid "Memcards..."
-msgstr "記憶卡..."
+#: ../data/pcsx.glade2.h:56
+msgid "Format"
+msgstr "格式化"
 
-#: data/pcsx.glade2:761
-msgid "Configure Graphics"
-msgstr "圖像設定"
+#: ../data/pcsx.glade2.h:57 ../win32/gui/CheatDlg.c:504
+msgid "Freeze"
+msgstr "固定"
 
-#: data/pcsx.glade2:762
+#: ../data/pcsx.glade2.h:58
 msgid "Graphics..."
 msgstr "圖像..."
 
-#: data/pcsx.glade2:774
-#: plugins/dfsound/spucfg-0.1df/dfsound.glade2:8
-msgid "Configure Sound"
-msgstr "聲音設定"
-
-#: data/pcsx.glade2:775
-msgid "Sound..."
-msgstr "聲音..."
-
-#: data/pcsx.glade2:787
-msgid "Configure CD-ROM"
-msgstr "CD-ROM 設定"
+#: ../data/pcsx.glade2.h:59
+msgid "Graphics:"
+msgstr "圖像:"
 
-#: data/pcsx.glade2:788
-msgid "CD-ROM..."
-msgstr "CD-ROM..."
+#: ../data/pcsx.glade2.h:60 ../win32/gui/WndMain.c:1305
+msgid "InuYasha Sengoku Battle Fix"
+msgstr "InuYasha Sengoku 戰斗修正"
 
-#: data/pcsx.glade2:800
-msgid "Configure Controllers"
-msgstr "控制器設定"
+#: ../data/pcsx.glade2.h:61
+msgid "Memcards..."
+msgstr "記憶卡..."
 
-#: data/pcsx.glade2:801
-msgid "Controllers..."
-msgstr "控制器..."
+#: ../data/pcsx.glade2.h:62 ../gui/DebugMemory.c:103
+msgid "Memory Dump"
+msgstr "記憶體轉儲"
 
-#: data/pcsx.glade2:843
-#: gui/ConfDlg.c:112
-msgid "Configure PCSX"
-msgstr "設定 PCSX"
+#: ../data/pcsx.glade2.h:63
+msgid "Memory _Dump"
+msgstr "記憶體轉儲(_D)"
 
-#: data/pcsx.glade2:944
-msgid "Select Folder to Search"
-msgstr "選擇要檢索的資料夾"
+#: ../data/pcsx.glade2.h:64 ../win32/gui/CheatDlg.c:595
+msgid "Modify"
+msgstr "更改"
 
-#: data/pcsx.glade2:960
-msgid "Search in:"
-msgstr "在此處檢索外掛:"
+#: ../data/pcsx.glade2.h:65
+msgid ""
+"NTSC\n"
+"PAL"
+msgstr ""
+"NTSC\n"
+"PAL"
 
-#: data/pcsx.glade2:1233
-msgid "Graphics:"
-msgstr "圖像:"
+#: ../data/pcsx.glade2.h:67
+msgid "New"
+msgstr "新增"
 
-#: data/pcsx.glade2:1246
-msgid "Sound:"
-msgstr "聲音:"
+#: ../data/pcsx.glade2.h:68
+msgid "PCSX"
+msgstr "PCSX"
 
-#: data/pcsx.glade2:1261
-msgid "Controller 1:   "
-msgstr "控制器 1:"
+#: ../data/pcsx.glade2.h:69 ../win32/gui/WndMain.c:1304
+msgid "Parasite Eve 2, Vandal Hearts 1/2 Fix"
+msgstr "Parasite Eve 2, Vandal Hearts 1/2 修正"
 
-#: data/pcsx.glade2:1276
-msgid "Controller 2:"
-msgstr "控制器 2:"
+#: ../data/pcsx.glade2.h:70
+msgid "Patch Memory..."
+msgstr "修改記憶體..."
 
-#: data/pcsx.glade2:1291
-msgid "CD-ROM:"
-msgstr "CD-ROM:"
+#: ../data/pcsx.glade2.h:71
+msgid "Raw Dump..."
+msgstr "Raw 轉儲..."
 
-#: data/pcsx.glade2:1329
-msgid "<b>Plugins</b>"
-msgstr "<b>外掛</b>"
+#: ../data/pcsx.glade2.h:72
+msgid "Restart"
+msgstr "重新開始"
 
-#: data/pcsx.glade2:1390
-msgid "<b>BIOS</b>"
-msgstr "<b>BIOS</b>"
+#: ../data/pcsx.glade2.h:73
+msgid "Run CD"
+msgstr "執行光碟"
 
-#: data/pcsx.glade2:1440
-msgid "Configure CPU"
-msgstr "CPU 設定"
+#: ../data/pcsx.glade2.h:74
+msgid "Run ISO Image"
+msgstr "執行 ISO 光碟映像"
 
-#: data/pcsx.glade2:1466
-#: win32/gui/WndMain.c:1302
-msgid "Enable Debugger"
-msgstr "開啟調試器"
+#: ../data/pcsx.glade2.h:75
+msgid "Run ISO..."
+msgstr "執行 ISO..."
 
-#: data/pcsx.glade2:1484
-msgid "SPU IRQ Always Enabled"
-msgstr "SPU IRQ 總是開啟"
+#: ../data/pcsx.glade2.h:76
+msgid "Run _BIOS"
+msgstr "執行 _BIOS"
 
-#: data/pcsx.glade2:1500
-msgid "Black & White Movies"
-msgstr "黑白電影"
+#: ../data/pcsx.glade2.h:77
+msgid "Run _CD"
+msgstr "執行光碟(_C)"
 
-#: data/pcsx.glade2:1516
-#: win32/gui/WndMain.c:1301
-msgid "Enable Console Output"
-msgstr "開啟控制台輸出"
+#: ../data/pcsx.glade2.h:78
+msgid "Run _EXE..."
+msgstr "執行 _EXE..."
 
-#: data/pcsx.glade2:1534
-msgid "Enable Interpreter CPU"
-msgstr "開啟解釋執行 CPU"
+#: ../data/pcsx.glade2.h:79
+msgid "Run _ISO..."
+msgstr "執行 _ISO..."
 
-#: data/pcsx.glade2:1552
-#: gui/Plugin.c:239
+#: ../data/pcsx.glade2.h:80 ../gui/Plugin.c:239
 #, c-format
 msgid "SIO IRQ Always Enabled"
 msgstr "SIO IRQ 總是開啟"
 
-#: data/pcsx.glade2:1568
-msgid "Disable CD Audio"
-msgstr "禁用 CD 音頻"
-
-#: data/pcsx.glade2:1584
-msgid "Disable XA Decoding"
-msgstr "禁用 XA 解碼"
+#: ../data/pcsx.glade2.h:81
+msgid "SPU IRQ Always Enabled"
+msgstr "SPU IRQ 總是開啟"
 
-#: data/pcsx.glade2:1603
-#: win32/gui/WndMain.c:1304
-msgid "Parasite Eve 2, Vandal Hearts 1/2 Fix"
-msgstr "Parasite Eve 2, Vandal Hearts 1/2 修正"
+#: ../data/pcsx.glade2.h:82
+msgid "S_witch ISO..."
+msgstr "更換 ISO(_W)"
 
-#: data/pcsx.glade2:1618
-#: win32/gui/WndMain.c:1305
-msgid "InuYasha Sengoku Battle Fix"
-msgstr "InuYasha Sengoku 戰斗修正"
+#: ../data/pcsx.glade2.h:83
+msgid "Search"
+msgstr "搜尋"
 
-#: data/pcsx.glade2:1636
-msgid "<b>Options</b>"
-msgstr "<b>選項</b>"
+#: ../data/pcsx.glade2.h:84 ../win32/gui/CheatDlg.c:680
+msgid "Search For:"
+msgstr "搜尋:"
 
-#: data/pcsx.glade2:1660
-#: win32/gui/WndMain.c:1299
-msgid "Autodetect"
-msgstr "自動檢測"
+#: ../data/pcsx.glade2.h:85
+msgid "Search in:"
+msgstr "在此處檢索外掛:"
 
-#: data/pcsx.glade2:1677
-msgid ""
-"NTSC\n"
-"PAL"
-msgstr ""
-"NTSC\n"
-"PAL"
+#: ../data/pcsx.glade2.h:86
+msgid "Select Folder to Search"
+msgstr "選擇要檢索的資料夾"
 
-#: data/pcsx.glade2:1691
-msgid "<b>System Type</b>"
-msgstr "<b>系統類型</b>"
+#: ../data/pcsx.glade2.h:87
+msgid "Slot _1"
+msgstr "記錄 _1"
 
-#: data/pcsx.glade2:1739
-msgid "Configure NetPlay"
-msgstr "聯線遊戲設定"
+#: ../data/pcsx.glade2.h:88
+msgid "Slot _2"
+msgstr "記錄 _2"
 
-#: data/pcsx.glade2:1825
-msgid "<b>NetPlay</b>"
-msgstr "<b>聯線遊戲</b>"
+#: ../data/pcsx.glade2.h:89
+msgid "Slot _3"
+msgstr "記錄 _3"
 
-#: data/pcsx.glade2:1951
-#: data/pcsx.glade2:2348
-msgid "New"
-msgstr "新增"
+#: ../data/pcsx.glade2.h:90
+msgid "Slot _4"
+msgstr "記錄 _4"
 
-#: data/pcsx.glade2:2001
-#: data/pcsx.glade2:2398
-msgid "Format"
-msgstr "格式化"
+#: ../data/pcsx.glade2.h:91
+msgid "Slot _5"
+msgstr "記錄 _5"
 
-#: data/pcsx.glade2:2051
-#: data/pcsx.glade2:2448
-msgid "Un/Delete"
-msgstr "刪除/恢複"
+#: ../data/pcsx.glade2.h:92
+msgid "Slot _6"
+msgstr "記錄 _6"
 
-#: data/pcsx.glade2:2144
-msgid "<b>Memory Card 1</b>"
-msgstr "<b>記憶卡 1</b>"
+#: ../data/pcsx.glade2.h:93
+msgid "Slot _7"
+msgstr "記錄 _7"
 
-#: data/pcsx.glade2:2204
-#: data/pcsx.glade2:2254
-#: data/pcsx.glade2:3067
-msgid "Copy"
-msgstr "複制"
+#: ../data/pcsx.glade2.h:94
+msgid "Slot _8"
+msgstr "記錄 _8"
 
-#: data/pcsx.glade2:2541
-msgid "<b>Memory Card 2</b>"
-msgstr "<b>記憶卡 2</b>"
+#: ../data/pcsx.glade2.h:95
+msgid "Slot _9"
+msgstr "記錄 _9"
 
-#: data/pcsx.glade2:2599
-#: win32/gui/CheatDlg.c:166
-msgid "Edit Cheat Codes"
-msgstr "編輯金手指"
+#: ../data/pcsx.glade2.h:96
+msgid "Sound..."
+msgstr "聲音..."
 
-#: data/pcsx.glade2:2637
-msgid "<b>Cheat Codes</b>"
-msgstr "<b>金手指碼</b>"
+#: ../data/pcsx.glade2.h:97
+msgid "Sound:"
+msgstr "聲音:"
 
-#: data/pcsx.glade2:2768
-#: gui/Cheat.c:1129
-#: win32/gui/CheatDlg.c:678
-msgid "Cheat Search"
-msgstr "搜尋金手指碼"
+#: ../data/pcsx.glade2.h:98
+msgid "Switch ISO Image"
+msgstr "更換 ISO 光碟映像"
 
-#: data/pcsx.glade2:2801
-msgid ""
-"8-bit\n"
-"16-bit\n"
-"32-bit"
-msgstr ""
-"8 位元\n"
-"16 位元\n"
-"32 位元"
+#: ../data/pcsx.glade2.h:99
+msgid "Switch ISO..."
+msgstr "更換 ISO..."
 
-#: data/pcsx.glade2:2816
-#: win32/gui/CheatDlg.c:680
-msgid "Search For:"
-msgstr "搜尋:"
+#: ../data/pcsx.glade2.h:100 ../win32/gui/CheatDlg.c:684
+msgid "To:"
+msgstr "至:"
 
-#: data/pcsx.glade2:2826
-#: win32/gui/CheatDlg.c:681
-msgid "Data Type:"
-msgstr "數值類型:"
+#: ../data/pcsx.glade2.h:101
+msgid "Un/Delete"
+msgstr "刪除/恢複"
 
-#: data/pcsx.glade2:2838
-#: gui/Cheat.c:647
-#: win32/gui/CheatDlg.c:506
-#: win32/gui/CheatDlg.c:597
-#: win32/gui/CheatDlg.c:682
+#: ../data/pcsx.glade2.h:102 ../gui/Cheat.c:647 ../win32/gui/CheatDlg.c:506
+#: ../win32/gui/CheatDlg.c:597 ../win32/gui/CheatDlg.c:682
 msgid "Value:"
 msgstr "值:"
 
-#: data/pcsx.glade2:2850
-#: win32/gui/CheatDlg.c:683
-msgid "Data Base:"
-msgstr "數值基:"
+#: ../data/pcsx.glade2.h:103
+msgid "_About PCSX..."
+msgstr "關於 PCSX(_A)..."
 
-#: data/pcsx.glade2:2864
-msgid ""
-"Equal Value\n"
-"Not Equal Value\n"
-"Range\n"
-"Increased By\n"
-"Decreased By\n"
-"Increased\n"
-"Decreased\n"
-"Different\n"
-"No Change"
-msgstr ""
-"等于數值\n"
-"不等于數值\n"
-"範圍\n"
-"增加數值\n"
-"減少數值\n"
-"增加\n"
-"減少\n"
-"不同\n"
-"無變動"
+#: ../data/pcsx.glade2.h:104
+msgid "_Browse..."
+msgstr "檢視(_B)..."
 
-#: data/pcsx.glade2:2896
-msgid ""
-"Decimal\n"
-"Hexadecimal"
-msgstr ""
-"十進制\n"
-"十六進制"
+#: ../data/pcsx.glade2.h:105
+msgid "_CPU..."
+msgstr "_CPU..."
 
-#: data/pcsx.glade2:2910
-#: win32/gui/CheatDlg.c:684
-msgid "To:"
-msgstr "至:"
+#: ../data/pcsx.glade2.h:106
+msgid "_Configuration"
+msgstr "設定(_C)"
 
-#: data/pcsx.glade2:2995
-#: win32/gui/CheatDlg.c:504
-msgid "Freeze"
-msgstr "固定"
+#: ../data/pcsx.glade2.h:107
+msgid "_Continue"
+msgstr "繼續(_C)"
 
-#: data/pcsx.glade2:3031
-#: win32/gui/CheatDlg.c:595
-msgid "Modify"
-msgstr "更改"
+#: ../data/pcsx.glade2.h:108
+msgid "_Emulator"
+msgstr "模擬器(_E)"
 
-#: data/pcsx.glade2:3100
-msgid "label_resultsfound"
-msgstr "label_resultsfound"
+#: ../data/pcsx.glade2.h:109
+msgid "_File"
+msgstr "檔案(_F)"
 
-#: data/pcsx.glade2:3135
-msgid "Search"
-msgstr "搜尋"
+#: ../data/pcsx.glade2.h:110
+msgid "_Graphics..."
+msgstr "圖像(_G)..."
 
-#: data/pcsx.glade2:3171
-msgid "Restart"
-msgstr "重新開始"
+#: ../data/pcsx.glade2.h:111
+msgid "_Help"
+msgstr "說明(_H)"
 
-#: data/pcsx.glade2:3200
-msgid "<b>Cheat Search</b>"
-msgstr "<b>金手指碼搜尋</b>"
+#: ../data/pcsx.glade2.h:112
+msgid "_Load State"
+msgstr "讀取記錄(_L)"
 
-#: data/pcsx.glade2:3243
-#: gui/DebugMemory.c:103
-msgid "Memory Dump"
-msgstr "記憶體轉儲"
+#: ../data/pcsx.glade2.h:113
+msgid "_Memory Cards..."
+msgstr "記憶卡(_M)..."
 
-#: data/pcsx.glade2:3264
-#: gui/DebugMemory.c:188
-msgid "Address (Hexadecimal):"
-msgstr "位址 (十六進制):"
+#: ../data/pcsx.glade2.h:114
+msgid "_Netplay..."
+msgstr "聯線遊戲(_N)..."
 
-#: data/pcsx.glade2:3356
-msgid "Raw Dump..."
-msgstr "Raw 轉儲..."
+#: ../data/pcsx.glade2.h:115
+msgid "_Other..."
+msgstr "其它(_O)..."
 
-#: data/pcsx.glade2:3391
-msgid "Patch Memory..."
-msgstr "修改記憶體..."
+#: ../data/pcsx.glade2.h:116
+msgid "_Plugins & BIOS..."
+msgstr "外掛及 BIOS(_P)..."
+
+#: ../data/pcsx.glade2.h:117
+msgid "_Reset"
+msgstr "複位(_R)"
+
+#: ../data/pcsx.glade2.h:118
+msgid "_Save State"
+msgstr "存儲記錄(_S)"
+
+#: ../data/pcsx.glade2.h:119
+msgid "_Search..."
+msgstr "搜尋(_S)..."
 
-#: gui/AboutDlg.c:76
+#: ../data/pcsx.glade2.h:120
+msgid "_Sound..."
+msgstr "聲音(_S)..."
+
+#: ../data/pcsx.glade2.h:121
+msgid "label_resultsfound"
+msgstr "label_resultsfound"
+
+#: ../gui/AboutDlg.c:72
 msgid ""
 "(C) 1999-2003 PCSX Team\n"
 "(C) 2005-2009 PCSX-df Team\n"
@@ -534,338 +495,318 @@ msgstr ""
 "(C) 2005-2009 PCSX-df 開發組\n"
 "(C) 2009-2010 PCSX-Reloaded 開發組"
 
-#: gui/AboutDlg.c:81
+#: ../gui/AboutDlg.c:77
 msgid ""
-"This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\n"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
 "\n"
-"This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
+"more details.\n"
 "\n"
-"You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA."
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA."
 msgstr ""
-"This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\n"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
 "\n"
-"This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
+"more details.\n"
 "\n"
-"You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA."
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA."
 
-#: gui/AboutDlg.c:104
+#: ../gui/AboutDlg.c:100
 msgid "translator-credits"
 msgstr "Wei Mingzhi <whistler@openoffice.org>"
 
-#: gui/AboutDlg.c:105
+#: ../gui/AboutDlg.c:101
 msgid "A PlayStation emulator."
 msgstr "一個 PlayStation 模擬器。"
 
-#: gui/Cheat.c:109
-#: win32/gui/CheatDlg.c:116
+#: ../gui/Cheat.c:109 ../win32/gui/CheatDlg.c:116
 msgid "Add New Cheat"
 msgstr "添加新金手指"
 
-#: gui/Cheat.c:117
-#: gui/Cheat.c:202
+#: ../gui/Cheat.c:117 ../gui/Cheat.c:202
 msgid "Cheat Description:"
 msgstr "金手指描述:"
 
-#: gui/Cheat.c:125
-#: gui/Cheat.c:211
-#: win32/gui/CheatDlg.c:68
-#: win32/gui/CheatDlg.c:118
+#: ../gui/Cheat.c:125 ../gui/Cheat.c:211 ../win32/gui/CheatDlg.c:68
+#: ../win32/gui/CheatDlg.c:118
 msgid "Cheat Code:"
 msgstr "金手指碼:"
 
-#: gui/Cheat.c:155
-#: gui/Cheat.c:251
-#: gui/LnxMain.c:419
-#: win32/gui/ConfigurePlugins.c:305
+#: ../gui/Cheat.c:155 ../gui/Cheat.c:251 ../gui/LnxMain.c:419
+#: ../win32/gui/ConfigurePlugins.c:305
 msgid "Error"
 msgstr "錯誤"
 
-#: gui/Cheat.c:155
-#: gui/Cheat.c:251
-#: win32/gui/CheatDlg.c:91
-#: win32/gui/CheatDlg.c:132
+#: ../gui/Cheat.c:155 ../gui/Cheat.c:251 ../win32/gui/CheatDlg.c:91
+#: ../win32/gui/CheatDlg.c:132
 msgid "Invalid cheat code!"
 msgstr "非法金手指碼!"
 
-#: gui/Cheat.c:194
-#: win32/gui/CheatDlg.c:66
+#: ../gui/Cheat.c:194 ../win32/gui/CheatDlg.c:66
 msgid "Edit Cheat"
 msgstr "編輯金手指"
 
-#: gui/Cheat.c:306
+#: ../gui/Cheat.c:306
 msgid "Open Cheat File"
 msgstr "打開金手指檔"
 
-#: gui/Cheat.c:316
-#: gui/Cheat.c:356
+#: ../gui/Cheat.c:316 ../gui/Cheat.c:356
 msgid "PCSX Cheat Code Files (*.cht)"
 msgstr "PCSX 金手指檔 (*.cht)"
 
-#: gui/Cheat.c:321
-#: gui/Gtk2Gui.c:446
-#: gui/Gtk2Gui.c:587
-#: win32/gui/WndMain.c:1442
-#: win32/gui/WndMain.c:1523
+#: ../gui/Cheat.c:321 ../gui/Gtk2Gui.c:446 ../gui/Gtk2Gui.c:587
+#: ../win32/gui/WndMain.c:1442 ../win32/gui/WndMain.c:1523
 msgid "All Files"
 msgstr "所有檔案"
 
-#: gui/Cheat.c:346
+#: ../gui/Cheat.c:346
 msgid "Save Cheat File"
 msgstr "儲存金手指檔"
 
-#: gui/Cheat.c:361
+#: ../gui/Cheat.c:361
 msgid "All Files (*.*)"
 msgstr "所有檔案 (*.*)"
 
-#: gui/Cheat.c:394
-#: gui/Cheat.c:1124
-#: gui/ConfDlg.c:104
-#: gui/ConfDlg.c:200
-#: gui/DebugMemory.c:259
+#: ../gui/Cheat.c:394 ../gui/Cheat.c:1124 ../gui/ConfDlg.c:104
+#: ../gui/ConfDlg.c:200 ../gui/DebugMemory.c:259
 msgid "Error: Glade interface could not be loaded!"
 msgstr "錯誤：無法加載 Glade 界面!"
 
-#: gui/Cheat.c:399
+#: ../gui/Cheat.c:399
 msgid "Cheat Codes"
 msgstr "金手指碼"
 
-#: gui/Cheat.c:405
+#: ../gui/Cheat.c:405
 msgid "Enable"
 msgstr "開啟"
 
-#: gui/Cheat.c:413
-#: win32/gui/CheatDlg.c:185
+#: ../gui/Cheat.c:413 ../win32/gui/CheatDlg.c:185
 msgid "Description"
 msgstr "描述"
 
-#: gui/Cheat.c:543
-#: win32/gui/CheatDlg.c:457
+#: ../gui/Cheat.c:543 ../win32/gui/CheatDlg.c:457
 msgid "Too many addresses found."
 msgstr "找到過多位址。"
 
-#: gui/Cheat.c:552
-#: win32/gui/CheatDlg.c:466
+#: ../gui/Cheat.c:552 ../win32/gui/CheatDlg.c:466
 #, c-format
 msgid "%.8X    Current: %u (%.2X), Previous: %u (%.2X)"
 msgstr "%.8X    當前值: %u (%.2X), 前次值: %u (%.2X)"
 
-#: gui/Cheat.c:557
-#: win32/gui/CheatDlg.c:471
+#: ../gui/Cheat.c:557 ../win32/gui/CheatDlg.c:471
 #, c-format
 msgid "%.8X    Current: %u (%.4X), Previous: %u (%.4X)"
 msgstr "%.8X    當前值: %u (%.4X), 前次值: %u (%.4X)"
 
-#: gui/Cheat.c:562
-#: win32/gui/CheatDlg.c:476
+#: ../gui/Cheat.c:562 ../win32/gui/CheatDlg.c:476
 #, c-format
 msgid "%.8X    Current: %u (%.8X), Previous: %u (%.8X)"
 msgstr "%.8X    當前值: %u (%.8X), 前次值: %u (%.8X)"
 
-#: gui/Cheat.c:577
-#: win32/gui/CheatDlg.c:492
+#: ../gui/Cheat.c:577 ../win32/gui/CheatDlg.c:492
 #, c-format
 msgid "Founded Addresses: %d"
 msgstr "找到位址: %d"
 
-#: gui/Cheat.c:585
-#: win32/gui/CheatDlg.c:448
+#: ../gui/Cheat.c:585 ../win32/gui/CheatDlg.c:448
 msgid "Enter the values and start your search."
 msgstr "輸入數值並開始搜索。"
 
-#: gui/Cheat.c:630
+#: ../gui/Cheat.c:630
 msgid "Freeze value"
 msgstr "固定數值"
 
-#: gui/Cheat.c:636
-#: win32/gui/CheatDlg.c:67
-#: win32/gui/CheatDlg.c:117
+#: ../gui/Cheat.c:636 ../win32/gui/CheatDlg.c:67 ../win32/gui/CheatDlg.c:117
 msgid "Description:"
 msgstr "描述:"
 
-#: gui/Cheat.c:729
+#: ../gui/Cheat.c:729
 msgid "Modify value"
 msgstr "更改數值"
 
-#: gui/Cheat.c:737
+#: ../gui/Cheat.c:737
 msgid "New value:"
 msgstr "新值:"
 
-#: gui/Cheat.c:1134
+#: ../gui/Cheat.c:1134
 msgid "Search Results"
 msgstr "搜尋結果"
 
-#: gui/ConfDlg.c:237
-#: gui/ConfDlg.c:258
-#: gui/ConfDlg.c:279
-#: gui/ConfDlg.c:300
-#: gui/ConfDlg.c:355
+#. TODO Check whether configuration is required when we choose the plugin, and set the state of the
+#. button appropriately. New gtk tooltip API should allow us to put a tooltip explanation for
+#. disabled widgets
+#. TODO If combo screen hasn't been opened and the user chooses the menu config option, confs.Combo will be null and cause a segfault
+#. printf("Configuring plugin %s\n", filename);
+#: ../gui/ConfDlg.c:237 ../gui/ConfDlg.c:258 ../gui/ConfDlg.c:279
+#: ../gui/ConfDlg.c:300 ../gui/ConfDlg.c:355
 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 "此外掛不需要被設定。"
 
-#: gui/ConfDlg.c:581
+#: ../gui/ConfDlg.c:581
 #, c-format
 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/ConfDlg.c:675
+#. The BIOS list always contains the PCSX internal BIOS
+#: ../gui/ConfDlg.c:675
 msgid "Simulate PSX BIOS"
 msgstr "模擬 PS BIOS"
 
-#: gui/DebugMemory.c:111
+#: ../gui/DebugMemory.c:111
 msgid "Start Address (Hexadecimal):"
 msgstr "起始位址 (十六進制):"
 
-#: gui/DebugMemory.c:121
+#: ../gui/DebugMemory.c:121
 msgid "Length (Decimal):"
 msgstr "長度 (十進制):"
 
-#: gui/DebugMemory.c:147
+#: ../gui/DebugMemory.c:147
 msgid "Dump to File"
 msgstr "轉儲至檔案"
 
-#: gui/DebugMemory.c:162
+#: ../gui/DebugMemory.c:162
 #, c-format
 msgid "Error writing to %s!"
 msgstr "存儲至 %s 時出錯!"
 
-#: gui/DebugMemory.c:180
+#: ../gui/DebugMemory.c:180
 msgid "Memory Patch"
 msgstr "記憶體修改"
 
-#: gui/DebugMemory.c:198
+#: ../gui/DebugMemory.c:198
 msgid "Value (Hexa string):"
 msgstr "數值 (十六進制串):"
 
-#: gui/DebugMemory.c:264
+#: ../gui/DebugMemory.c:264
 msgid "Memory Viewer"
 msgstr "記憶體檢視"
 
-#: gui/DebugMemory.c:269
+#: ../gui/DebugMemory.c:269
 msgid "Address"
 msgstr "位址"
 
-#: gui/DebugMemory.c:287
+#: ../gui/DebugMemory.c:287
 msgid "Text"
 msgstr "文字"
 
-#: gui/Gtk2Gui.c:113
+#: ../gui/Gtk2Gui.c:113
 msgid "Ready"
 msgstr "就緒"
 
-#: gui/Gtk2Gui.c:154
+#: ../gui/Gtk2Gui.c:154
 msgid "Emulation Paused."
 msgstr "模擬器已暫停。"
 
-#: gui/Gtk2Gui.c:429
+#: ../gui/Gtk2Gui.c:429
 msgid "Select PSX EXE File"
 msgstr "選擇 PS EXE 檔案"
 
-#: gui/Gtk2Gui.c:442
+#: ../gui/Gtk2Gui.c:442
 msgid "PlayStation Executable Files"
 msgstr "PlayStation 執行檔"
 
-#: gui/Gtk2Gui.c:479
+#: ../gui/Gtk2Gui.c:479
 msgid "Not a valid PSX file"
 msgstr "不是一個合法的 PSX 檔"
 
-#: gui/Gtk2Gui.c:479
+#: ../gui/Gtk2Gui.c:479
 msgid "The file does not appear to be a valid Playstation executable"
 msgstr "此文件不是一個合法的 PlayStation 執行檔"
 
-#: gui/Gtk2Gui.c:508
-#: gui/Gtk2Gui.c:649
+#: ../gui/Gtk2Gui.c:508 ../gui/Gtk2Gui.c:649
 msgid "CD ROM failed"
 msgstr "CD-ROM 失敗"
 
-#: gui/Gtk2Gui.c:508
-#: gui/Gtk2Gui.c:649
-#: win32/gui/WndMain.c:461
-#: win32/gui/WndMain.c:513
-#: win32/gui/WndMain.c:582
+#: ../gui/Gtk2Gui.c:508 ../gui/Gtk2Gui.c:649 ../win32/gui/WndMain.c:461
+#: ../win32/gui/WndMain.c:513 ../win32/gui/WndMain.c:582
 #, c-format
 msgid "The CD does not appear to be a valid Playstation CD"
 msgstr "此光碟不是一張合法的 PlayStation 光碟。"
 
-#: gui/Gtk2Gui.c:519
-#: gui/Gtk2Gui.c:660
-#: win32/gui/WndMain.c:471
-#: win32/gui/WndMain.c:523
-#: win32/gui/WndMain.c:592
+#: ../gui/Gtk2Gui.c:519 ../gui/Gtk2Gui.c:660 ../win32/gui/WndMain.c:471
+#: ../win32/gui/WndMain.c:523 ../win32/gui/WndMain.c:592
 #, c-format
 msgid "Could not load CD-ROM!"
 msgstr "無法加載光碟!"
 
-#: gui/Gtk2Gui.c:519
-#: gui/Gtk2Gui.c:660
+#: ../gui/Gtk2Gui.c:519 ../gui/Gtk2Gui.c:660
 msgid "The CD-ROM could not be loaded"
 msgstr "無法加載 CD-ROM"
 
-#: gui/Gtk2Gui.c:533
+#: ../gui/Gtk2Gui.c:533
 msgid "Could not run BIOS"
 msgstr "無法執行 BIOS"
 
-#: gui/Gtk2Gui.c:533
+#: ../gui/Gtk2Gui.c:533
 msgid "Running BIOS is not supported with Internal HLE BIOS."
 msgstr "內部 HLE BIOS 不支援直接執行。"
 
-#: gui/Gtk2Gui.c:562
+#: ../gui/Gtk2Gui.c:562
 msgid "Open PSX Disc Image File"
 msgstr "打開 PS 光碟映像檔"
 
-#: gui/Gtk2Gui.c:582
+#: ../gui/Gtk2Gui.c:582
 msgid "PSX Image Files (*.bin, *.img, *.mdf, *.iso)"
 msgstr "PS 鏡像檔 (*.bin, *.img, *.mdf, *.iso)"
 
-#: gui/Gtk2Gui.c:813
+#: ../gui/Gtk2Gui.c:813
 #, c-format
 msgid "Loaded state %s."
 msgstr "已讀取記錄 %s。"
 
-#: gui/Gtk2Gui.c:816
+#: ../gui/Gtk2Gui.c:816
 #, c-format
 msgid "Error loading state %s!"
 msgstr "讀取記錄 %s 時出錯。"
 
-#: gui/Gtk2Gui.c:827
+#: ../gui/Gtk2Gui.c:827
 #, c-format
 msgid "Saved state %s."
 msgstr "已存儲記錄 %s"
 
-#: gui/Gtk2Gui.c:829
+#: ../gui/Gtk2Gui.c:829
 #, c-format
 msgid "Error saving state %s!"
 msgstr "存儲記錄 %s 時出錯。"
 
-#: gui/Gtk2Gui.c:864
-#: gui/Gtk2Gui.c:892
+#: ../gui/Gtk2Gui.c:864 ../gui/Gtk2Gui.c:892
 msgid "Select State File"
 msgstr "選擇記錄檔案"
 
-#: gui/Gtk2Gui.c:935
+#: ../gui/Gtk2Gui.c:935
 msgid "Notice"
 msgstr "警告"
 
-#: gui/LnxMain.c:62
+#: ../gui/LnxMain.c:62
 #, c-format
 msgid "Creating memory card: %s\n"
 msgstr "創建記憶卡: %s\n"
 
-#: gui/LnxMain.c:326
+#: ../gui/LnxMain.c:326
 msgid ""
 " pcsx [options] [file]\n"
 "\toptions:\n"
@@ -879,408 +820,392 @@ msgid ""
 "\tfile\t\tLoads file\n"
 msgstr ""
 
-#: gui/LnxMain.c:363
+#: ../gui/LnxMain.c:363
 #, 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:419
+#: ../gui/LnxMain.c:419
 msgid "Failed loading plugins!"
 msgstr "外掛加載失敗"
 
-#: gui/LnxMain.c:438
+#: ../gui/LnxMain.c:438
 #, c-format
 msgid "Could not load CD-ROM!\n"
 msgstr "無法加載光碟。\n"
 
-#: gui/LnxMain.c:469
+#: ../gui/LnxMain.c:469
 #, c-format
 msgid "PSX emulator couldn't be initialized.\n"
 msgstr "PS 模擬器無法初期化。\n"
 
-#: gui/MemcardDlg.c:56
+#: ../gui/MemcardDlg.c:56
 msgid "Icon"
 msgstr "圖符"
 
-#: gui/MemcardDlg.c:62
-#: win32/gui/WndMain.c:746
+#: ../gui/MemcardDlg.c:62 ../win32/gui/WndMain.c:746
 msgid "Title"
 msgstr "標題"
 
-#: gui/MemcardDlg.c:68
-#: win32/gui/WndMain.c:752
+#: ../gui/MemcardDlg.c:68 ../win32/gui/WndMain.c:752
 msgid "Status"
 msgstr "狀態"
 
-#: gui/MemcardDlg.c:74
+#: ../gui/MemcardDlg.c:74
 msgid "ID"
 msgstr "ID"
 
-#: gui/MemcardDlg.c:80
+#: ../gui/MemcardDlg.c:80
 msgid "Name"
 msgstr "名稱"
 
-#: gui/MemcardDlg.c:155
-#: gui/MemcardDlg.c:260
-#: win32/gui/WndMain.c:957
+#: ../gui/MemcardDlg.c:155 ../gui/MemcardDlg.c:260 ../win32/gui/WndMain.c:957
 msgid "Deleted"
 msgstr "已刪除"
 
-#: gui/MemcardDlg.c:157
-#: gui/MemcardDlg.c:161
-#: gui/MemcardDlg.c:262
-#: gui/MemcardDlg.c:266
-#: win32/gui/WndMain.c:958
-#: win32/gui/WndMain.c:961
+#: ../gui/MemcardDlg.c:157 ../gui/MemcardDlg.c:161 ../gui/MemcardDlg.c:262
+#: ../gui/MemcardDlg.c:266 ../win32/gui/WndMain.c:958
+#: ../win32/gui/WndMain.c:961
 msgid "Free"
 msgstr "空閑"
 
-#: gui/MemcardDlg.c:159
-#: gui/MemcardDlg.c:264
-#: win32/gui/WndMain.c:960
+#: ../gui/MemcardDlg.c:159 ../gui/MemcardDlg.c:264 ../win32/gui/WndMain.c:960
 msgid "Used"
 msgstr "已使用"
 
-#: gui/MemcardDlg.c:323
+#. Ask for name of memory card
+#: ../gui/MemcardDlg.c:323
 msgid "Select A File"
 msgstr "選擇檔案"
 
-#: gui/MemcardDlg.c:364
+#: ../gui/MemcardDlg.c:364
 msgid "Format this Memory Card?"
 msgstr "格式化此記憶卡?"
 
-#: gui/MemcardDlg.c:366
-msgid "If you format the memory card, the card will be empty, and any existing data overwritten."
+#: ../gui/MemcardDlg.c:366
+msgid ""
+"If you format the memory card, the card will be empty, and any existing data "
+"overwritten."
 msgstr "如果您選擇格式化記憶卡，記憶卡將被清空，並且任何現有資料都將被覆蓋。"
 
-#: gui/MemcardDlg.c:369
+#: ../gui/MemcardDlg.c:369
 msgid "Format card"
 msgstr "格式化記憶卡"
 
-#: gui/MemcardDlg.c:393
+#. Ask for name of new memory card
+#: ../gui/MemcardDlg.c:393
 msgid "Create a new Memory Card"
 msgstr "新增記憶卡"
 
-#: gui/MemcardDlg.c:402
+#: ../gui/MemcardDlg.c:402
 msgid "New Memory Card.mcd"
 msgstr "新記憶卡檔.mcd"
 
-#: gui/MemcardDlg.c:503
+#. No free slots available on the destination card
+#: ../gui/MemcardDlg.c:503
 msgid "No free space on memory card"
 msgstr "記憶卡無空餘位置"
 
-#: gui/MemcardDlg.c:504
-msgid "There are no free slots available on the target memory card. Please delete a slot first."
+#: ../gui/MemcardDlg.c:504
+msgid ""
+"There are no free slots available on the target memory card. Please delete a "
+"slot first."
 msgstr "目的記憶卡無空餘位置。請先刪除一個檔案。"
 
-#: gui/MemcardDlg.c:667
+#: ../gui/MemcardDlg.c:667
 msgid "Memory Card Manager"
 msgstr "記憶卡管理器"
 
-#: gui/Plugin.c:240
+#: ../gui/Plugin.c:240
 #, c-format
 msgid "SIO IRQ Not Always Enabled"
 msgstr "SIO IRQ 不總是開啟"
 
-#: gui/Plugin.c:246
+#: ../gui/Plugin.c:246
 #, c-format
 msgid "Black & White Mdecs Only Enabled"
 msgstr "Black & White Mdecs Only 開啟"
 
-#: gui/Plugin.c:247
+#: ../gui/Plugin.c:247
 #, c-format
 msgid "Black & White Mdecs Only Disabled"
 msgstr "Black & White Mdecs Only 禁用"
 
-#: gui/Plugin.c:253
+#: ../gui/Plugin.c:253
 #, c-format
 msgid "XA Enabled"
 msgstr "XA 已開啟"
 
-#: gui/Plugin.c:254
+#: ../gui/Plugin.c:254
 #, c-format
 msgid "XA Disabled"
 msgstr "XA 已禁用"
 
-#: gui/Plugin.c:323
+#: ../gui/Plugin.c:323
 msgid "Error opening CD-ROM plugin!"
 msgstr "無法開啟 CD-ROM 外掛!"
 
-#: gui/Plugin.c:325
+#: ../gui/Plugin.c:325
 msgid "Error opening SPU plugin!"
 msgstr "無法開啟 SPU 外掛!"
 
-#: gui/Plugin.c:328
+#: ../gui/Plugin.c:328
 msgid "Error opening GPU plugin!"
 msgstr "無法開啟 GPU 外掛!"
 
-#: gui/Plugin.c:331
+#: ../gui/Plugin.c:331
 msgid "Error opening Controller 1 plugin!"
 msgstr "無法開啟 \"控制器 1\" 外掛!"
 
-#: gui/Plugin.c:333
+#: ../gui/Plugin.c:333
 msgid "Error opening Controller 2 plugin!"
 msgstr "無法開啟 \"控制器 2\" 外掛!"
 
-#: gui/Plugin.c:413
+#: ../gui/Plugin.c:413
 msgid "Error closing CD-ROM plugin!"
 msgstr "無法關閉 CD-ROM 外掛!"
 
-#: gui/Plugin.c:415
+#: ../gui/Plugin.c:415
 msgid "Error closing SPU plugin!"
 msgstr "無法關閉 SPU 外掛!"
 
-#: gui/Plugin.c:417
+#: ../gui/Plugin.c:417
 msgid "Error closing Controller 1 Plugin!"
 msgstr "無法關閉 \"控制器 1\" 外掛!"
 
-#: gui/Plugin.c:419
+#: ../gui/Plugin.c:419
 msgid "Error closing Controller 2 plugin!"
 msgstr "無法關閉 \"控制器 2\" 外掛!"
 
-#: gui/Plugin.c:421
+#: ../gui/Plugin.c:421
 msgid "Error closing GPU plugin!"
 msgstr "無法關閉 GPU 外掛!"
 
-#: libpcsxcore/cdriso.c:783
+#: ../libpcsxcore/cdriso.c:783
 #, c-format
 msgid "Track %.2d (%s) - Start %.2d:%.2d:%.2d, Length %.2d:%.2d:%.2d\n"
 msgstr "軌道 %.2d (%s) - 起始位置 %.2d:%.2d:%.2d, 長度 %.2d:%.2d:%.2d\n"
 
-#: libpcsxcore/cdriso.c:804
+#: ../libpcsxcore/cdriso.c:804
 #, c-format
 msgid "Loaded CD Image: %s"
 msgstr "已加載 CD 映像: %s"
 
-#: libpcsxcore/cheat.c:147
+#: ../libpcsxcore/cheat.c:147
 #, c-format
 msgid "Cheats loaded from: %s\n"
 msgstr "金手指碼已加載: %s\n"
 
-#: libpcsxcore/cheat.c:179
+#: ../libpcsxcore/cheat.c:179
 #, c-format
 msgid "Cheats saved to: %s\n"
 msgstr "金手指碼已保存: %s\n"
 
-#: libpcsxcore/cheat.c:322
-#: libpcsxcore/cheat.c:443
+#: ../libpcsxcore/cheat.c:322 ../libpcsxcore/cheat.c:443
 msgid "(Untitled)"
 msgstr "(未定名)"
 
-#: libpcsxcore/debug.c:317
+#: ../libpcsxcore/debug.c:317
 msgid "Error allocating memory"
 msgstr "分配記憶體錯誤"
 
-#: libpcsxcore/debug.c:322
+#: ../libpcsxcore/debug.c:322
 msgid "Unable to start debug server.\n"
 msgstr "無法啟動調試伺服器。\n"
 
-#: libpcsxcore/debug.c:326
+#: ../libpcsxcore/debug.c:326
 msgid "Debugger started.\n"
 msgstr "調試器已啟動。\n"
 
-#: libpcsxcore/debug.c:333
+#: ../libpcsxcore/debug.c:333
 msgid "Debugger stopped.\n"
 msgstr "調試器已停止。\n"
 
-#: libpcsxcore/misc.c:345
+#: ../libpcsxcore/misc.c:345
 #, c-format
 msgid "CD-ROM Label: %.32s\n"
 msgstr "CD-ROM 卷標: %.32s\n"
 
-#: libpcsxcore/misc.c:346
+#: ../libpcsxcore/misc.c:346
 #, c-format
 msgid "CD-ROM ID: %.9s\n"
 msgstr "CD-ROM ID: %.9s\n"
 
-#: libpcsxcore/misc.c:409
+#: ../libpcsxcore/misc.c:409
 #, c-format
 msgid "Error opening file: %s.\n"
 msgstr "開啟檔案錯誤: %s.\n"
 
-#: libpcsxcore/misc.c:452
+#: ../libpcsxcore/misc.c:452
 #, c-format
 msgid "Unknown CPE opcode %02x at position %08x.\n"
 msgstr "未知 CPE opcode %02x 位於 %08x.\n"
 
-#: libpcsxcore/misc.c:480
+#: ../libpcsxcore/misc.c:480
 msgid "This file does not appear to be a valid PSX file.\n"
 msgstr "此檔案不是一個合法的 PSX 檔案。\n"
 
-#: libpcsxcore/plugins.c:183
+#: ../libpcsxcore/plugins.c:183
 #, c-format
 msgid "Error loading %s: %s"
 msgstr "無法加載 %s: %s"
 
-#: libpcsxcore/plugins.c:235
+#: ../libpcsxcore/plugins.c:235
 #, c-format
 msgid "Could not load GPU plugin %s!"
 msgstr "無法加載 GPU 外掛 %s!"
 
-#: libpcsxcore/plugins.c:308
+#: ../libpcsxcore/plugins.c:308
 #, c-format
 msgid "Could not load CD-ROM plugin %s!"
 msgstr "無法加載 CD-ROM 外掛 %s!"
 
-#: libpcsxcore/plugins.c:356
+#: ../libpcsxcore/plugins.c:356
 #, c-format
 msgid "Could not load SPU plugin %s!"
 msgstr "無法加載 SPU 外掛 %s!"
 
-#: libpcsxcore/plugins.c:493
+#: ../libpcsxcore/plugins.c:493
 #, c-format
 msgid "Could not load Controller 1 plugin %s!"
 msgstr "無法加載 \"控制器1\" 外掛 %s!"
 
-#: libpcsxcore/plugins.c:547
+#: ../libpcsxcore/plugins.c:547
 #, c-format
 msgid "Could not load Controller 2 plugin %s!"
 msgstr "無法加載 \"控制器2\" 外掛 %s!"
 
-#: libpcsxcore/plugins.c:590
+#: ../libpcsxcore/plugins.c:590
 #, c-format
 msgid "Could not load NetPlay plugin %s!"
 msgstr "無法加載聯線遊戲外掛 %s!"
 
-#: libpcsxcore/plugins.c:670
+#: ../libpcsxcore/plugins.c:670
 #, c-format
 msgid "Could not load SIO1 plugin %s!"
 msgstr "無法加載 SIO1 外掛 %s!"
 
-#: libpcsxcore/plugins.c:755
+#: ../libpcsxcore/plugins.c:755
 #, c-format
 msgid "Error initializing CD-ROM plugin: %d"
 msgstr "CD-ROM 外掛初始化錯誤: %d"
 
-#: libpcsxcore/plugins.c:757
+#: ../libpcsxcore/plugins.c:757
 #, c-format
 msgid "Error initializing GPU plugin: %d"
 msgstr "GPU 外掛初始化錯誤: %d"
 
-#: libpcsxcore/plugins.c:759
+#: ../libpcsxcore/plugins.c:759
 #, c-format
 msgid "Error initializing SPU plugin: %d"
 msgstr "SPU 外掛初始化錯誤: %d"
 
-#: libpcsxcore/plugins.c:761
+#: ../libpcsxcore/plugins.c:761
 #, c-format
 msgid "Error initializing Controller 1 plugin: %d"
 msgstr "\"控制器1\" 外掛初始化錯誤: %d"
 
-#: libpcsxcore/plugins.c:763
+#: ../libpcsxcore/plugins.c:763
 #, c-format
 msgid "Error initializing Controller 2 plugin: %d"
 msgstr "\"控制器2\" 外掛初始化錯誤: %d"
 
-#: libpcsxcore/plugins.c:767
+#: ../libpcsxcore/plugins.c:767
 #, c-format
 msgid "Error initializing NetPlay plugin: %d"
 msgstr "聯線遊戲外掛初始化錯誤: %d"
 
-#: libpcsxcore/plugins.c:772
+#: ../libpcsxcore/plugins.c:772
 #, c-format
 msgid "Error initializing SIO1 plugin: %d"
 msgstr "SIO1 外掛初始化錯誤: %d"
 
-#: libpcsxcore/plugins.c:775
+#: ../libpcsxcore/plugins.c:775
 msgid "Plugins loaded.\n"
 msgstr "外掛已加載。\n"
 
-#: libpcsxcore/ppf.c:216
+#: ../libpcsxcore/ppf.c:216
 #, c-format
 msgid "Invalid PPF patch: %s.\n"
 msgstr "無效 PPF 補丁: %s。\n"
 
-#: libpcsxcore/ppf.c:292
+#: ../libpcsxcore/ppf.c:292
 #, c-format
 msgid "Unsupported PPF version (%d).\n"
 msgstr "不支援的 PPF 補丁版本 (%d)。\n"
 
-#: libpcsxcore/ppf.c:331
+#. build address array
+#: ../libpcsxcore/ppf.c:331
 #, c-format
 msgid "Loaded PPF %d.0 patch: %s.\n"
 msgstr "已加載 PPF %d.0 補丁: %s。\n"
 
-#: libpcsxcore/psxmem.c:78
+#: ../libpcsxcore/psxmem.c:78
 msgid "Error allocating memory!"
 msgstr "分配記憶體錯誤!"
 
-#: libpcsxcore/psxmem.c:121
+#: ../libpcsxcore/psxmem.c:121
 #, c-format
 msgid "Could not open BIOS:\"%s\". Enabling HLE Bios!\n"
 msgstr "無法開啟 BIOS: \"%s\"。使用內部 HLE Bios。\n"
 
-#: libpcsxcore/r3000a.c:37
+#: ../libpcsxcore/r3000a.c:37
 #, c-format
 msgid "Running PCSX Version %s (%s).\n"
 msgstr "PCSX 版本 %s (%s) 執行中。\n"
 
-#: libpcsxcore/sio.c:839
+#: ../libpcsxcore/sio.c:839
 msgid "Connection closed!\n"
 msgstr "連線被關閉!\n"
 
-#: libpcsxcore/sio.c:872
+#: ../libpcsxcore/sio.c:872
 #, c-format
 msgid "No memory card value was specified - creating a default card %s\n"
 msgstr "未指定記憶卡 - 創建一個新的記憶卡 %s\n"
 
-#: libpcsxcore/sio.c:876
+#: ../libpcsxcore/sio.c:876
 #, c-format
 msgid "The memory card %s doesn't exist - creating it\n"
 msgstr "記憶卡 %s 不存在 - 正在創建\n"
 
-#: libpcsxcore/sio.c:892
+#: ../libpcsxcore/sio.c:892
 #, c-format
 msgid "Memory card %s failed to load!\n"
 msgstr "記憶卡 %s 讀取失敗!\n"
 
-#: libpcsxcore/sio.c:896
+#: ../libpcsxcore/sio.c:896
 #, c-format
 msgid "Loading memory card %s\n"
 msgstr "正在加載記憶卡 %s\n"
 
-#: plugins/dfcdrom/cdr.c:25
+#: ../plugins/dfcdrom/cdr.c:25
 msgid "CD-ROM Drive Reader"
 msgstr "CD-ROM 裝置讀取外掛"
 
-#: plugins/dfcdrom/cdr.c:27
+#: ../plugins/dfcdrom/cdr.c:27
 msgid "CDR NULL Plugin"
 msgstr "CDR NULL 外掛"
 
-#: plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2:8
-#: plugins/dfcdrom/cdrcfg-0.1df/main.c:219
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:1
+#: ../plugins/dfcdrom/cdrcfg-0.1df/main.c:219
 msgid "CDR configuration"
 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-ROM 裝置，如未列出請輸入其路徑"
-
-#: plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2:44
-msgid "Select CD-ROM device"
-msgstr "選擇 CD-ROM 裝置"
-
-#: plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2:72
-msgid "Select read mode:"
-msgstr "選擇讀取模式:"
-
-#: plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2:83
-msgid ""
-"Normal (No Cache)\n"
-"Threaded - Faster (With Cache)"
-msgstr ""
-"正常 (無快取)\n"
-"多執行緒 - 較快 (使用快取)"
-
-#: plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2:114
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:2
 msgid "Cache Size (Def. 64):"
 msgstr "快取大小 (缺省 64):"
 
-#: plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2:159
-msgid "Spindown Time:"
-msgstr "電機停轉時限:"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:3
+msgid "Cdrom Speed (Def. 0 = MAX):"
+msgstr "Cdrom 速度 (缺省 0 = 最快):"
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:4
+msgid "Choose your CD-ROM device or type its path if it's not listed"
+msgstr "選擇 CD-ROM 裝置，如未列出請輸入其路徑"
 
-#: plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2:170
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:5
 msgid ""
 "Default\n"
 "125ms\n"
@@ -1316,223 +1241,228 @@ msgstr ""
 "16 分鐘\n"
 "32 分鐘"
 
-#: plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2:216
-msgid "Cdrom Speed (Def. 0 = MAX):"
-msgstr "Cdrom 速度 (缺省 0 = 最快):"
-
-#: plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2:248
-msgid "hseparator"
-msgstr "hseparator"
-
-#: plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2:258
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:21
 msgid "Enable subchannel read"
 msgstr "開啟子通道讀取"
 
-#: plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2:277
-#: plugins/dfinput/dfinput.glade2:448
-#: win32/gui/WndMain.c:1307
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:22
+msgid ""
+"Normal (No Cache)\n"
+"Threaded - Faster (With Cache)"
+msgstr ""
+"正常 (無快取)\n"
+"多執行緒 - 較快 (使用快取)"
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:24
+#: ../plugins/dfinput/dfinput.glade2.h:8 ../win32/gui/WndMain.c:1307
 msgid "Options"
 msgstr "選項"
 
-#: plugins/dfinput/cfg-gtk2.c:48
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:25
+msgid "Select CD-ROM device"
+msgstr "選擇 CD-ROM 裝置"
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:26
+msgid "Select read mode:"
+msgstr "選擇讀取模式:"
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:27
+msgid "Spindown Time:"
+msgstr "電機停轉時限:"
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:28
+msgid "hseparator"
+msgstr "hseparator"
+
+#: ../plugins/dfinput/cfg-gtk2.c:48
 msgid "D-Pad Up"
 msgstr "上方向鍵"
 
-#: plugins/dfinput/cfg-gtk2.c:49
+#: ../plugins/dfinput/cfg-gtk2.c:49
 msgid "D-Pad Down"
 msgstr "下方向鍵"
 
-#: plugins/dfinput/cfg-gtk2.c:50
+#: ../plugins/dfinput/cfg-gtk2.c:50
 msgid "D-Pad Left"
 msgstr "左方向鍵"
 
-#: plugins/dfinput/cfg-gtk2.c:51
+#: ../plugins/dfinput/cfg-gtk2.c:51
 msgid "D-Pad Right"
 msgstr "右方向鍵"
 
-#: plugins/dfinput/cfg-gtk2.c:52
+#: ../plugins/dfinput/cfg-gtk2.c:52
 msgid "Cross"
 msgstr "叉號鍵"
 
-#: plugins/dfinput/cfg-gtk2.c:53
+#: ../plugins/dfinput/cfg-gtk2.c:53
 msgid "Circle"
 msgstr "圓圈鍵"
 
-#: plugins/dfinput/cfg-gtk2.c:54
+#: ../plugins/dfinput/cfg-gtk2.c:54
 msgid "Square"
 msgstr "方塊鍵"
 
-#: plugins/dfinput/cfg-gtk2.c:55
+#: ../plugins/dfinput/cfg-gtk2.c:55
 msgid "Triangle"
 msgstr "三角鍵"
 
-#: plugins/dfinput/cfg-gtk2.c:56
+#: ../plugins/dfinput/cfg-gtk2.c:56
 msgid "L1"
 msgstr "L1"
 
-#: plugins/dfinput/cfg-gtk2.c:57
+#: ../plugins/dfinput/cfg-gtk2.c:57
 msgid "R1"
 msgstr "R1"
 
-#: plugins/dfinput/cfg-gtk2.c:58
+#: ../plugins/dfinput/cfg-gtk2.c:58
 msgid "L2"
 msgstr "L2"
 
-#: plugins/dfinput/cfg-gtk2.c:59
+#: ../plugins/dfinput/cfg-gtk2.c:59
 msgid "R2"
 msgstr "R2"
 
-#: plugins/dfinput/cfg-gtk2.c:60
+#: ../plugins/dfinput/cfg-gtk2.c:60
 msgid "Select"
 msgstr "選擇鍵"
 
-#: plugins/dfinput/cfg-gtk2.c:61
+#: ../plugins/dfinput/cfg-gtk2.c:61
 msgid "Start"
 msgstr "開始鍵"
 
-#: plugins/dfinput/cfg-gtk2.c:62
+#: ../plugins/dfinput/cfg-gtk2.c:62
 msgid "L3"
 msgstr "L3"
 
-#: plugins/dfinput/cfg-gtk2.c:63
+#: ../plugins/dfinput/cfg-gtk2.c:63
 msgid "R3"
 msgstr "R3"
 
-#: plugins/dfinput/cfg-gtk2.c:67
+#: ../plugins/dfinput/cfg-gtk2.c:67
 msgid "L-Stick Right"
 msgstr "左搖桿右方向"
 
-#: plugins/dfinput/cfg-gtk2.c:68
+#: ../plugins/dfinput/cfg-gtk2.c:68
 msgid "L-Stick Left"
 msgstr "左搖桿左方向"
 
-#: plugins/dfinput/cfg-gtk2.c:69
+#: ../plugins/dfinput/cfg-gtk2.c:69
 msgid "L-Stick Down"
 msgstr "左搖桿下方向"
 
-#: plugins/dfinput/cfg-gtk2.c:70
+#: ../plugins/dfinput/cfg-gtk2.c:70
 msgid "L-Stick Up"
 msgstr "左搖桿上方向"
 
-#: plugins/dfinput/cfg-gtk2.c:71
+#: ../plugins/dfinput/cfg-gtk2.c:71
 msgid "R-Stick Right"
 msgstr "右搖桿右方向"
 
-#: plugins/dfinput/cfg-gtk2.c:72
+#: ../plugins/dfinput/cfg-gtk2.c:72
 msgid "R-Stick Left"
 msgstr "右搖桿左方向"
 
-#: plugins/dfinput/cfg-gtk2.c:73
+#: ../plugins/dfinput/cfg-gtk2.c:73
 msgid "R-Stick Down"
 msgstr "右搖桿下方向"
 
-#: plugins/dfinput/cfg-gtk2.c:74
+#: ../plugins/dfinput/cfg-gtk2.c:74
 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 "(未設定)"
 
-#: plugins/dfinput/cfg-gtk2.c:559
+#: ../plugins/dfinput/cfg-gtk2.c:559
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:55
 msgid "None"
 msgstr "無"
 
-#: plugins/dfinput/cfg-gtk2.c:601
+#: ../plugins/dfinput/cfg-gtk2.c:601
 msgid "Gamepad/Keyboard Input Configuration"
 msgstr "手把/鍵盤輸入設定"
 
-#: plugins/dfinput/cfg-gtk2.c:607
-#: plugins/dfinput/cfg-gtk2.c:627
+#: ../plugins/dfinput/cfg-gtk2.c:607 ../plugins/dfinput/cfg-gtk2.c:627
 msgid "Key"
 msgstr "按鍵"
 
-#: plugins/dfinput/cfg-gtk2.c:613
-#: plugins/dfinput/cfg-gtk2.c:633
+#: ../plugins/dfinput/cfg-gtk2.c:613 ../plugins/dfinput/cfg-gtk2.c:633
 msgid "Button"
 msgstr "按鈕"
 
-#: plugins/dfinput/dfinput.glade2:35
-#: plugins/dfinput/dfinput.glade2:232
+#: ../plugins/dfinput/dfinput.glade2.h:1
+msgid "Change"
+msgstr "更改"
+
+#: ../plugins/dfinput/dfinput.glade2.h:2
+msgid "Controller 1"
+msgstr "控制器 1"
+
+#: ../plugins/dfinput/dfinput.glade2.h:3
+msgid "Controller 2"
+msgstr "控制器 2"
+
+#: ../plugins/dfinput/dfinput.glade2.h:4
 msgid "Device:"
 msgstr "裝置:"
 
-#: 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.h:5
 msgid ""
 "Digital Pad\n"
 "Analog Pad"
@@ -1540,52 +1470,66 @@ msgstr ""
 "普通手把\n"
 "類比手把"
 
-#: plugins/dfinput/dfinput.glade2:149
-#: plugins/dfinput/dfinput.glade2:346
-msgid "Change"
-msgstr "更改"
+#: ../plugins/dfinput/dfinput.glade2.h:7
+msgid "Multi-Threaded (Recommended)"
+msgstr "多執行緒 (建議使用)"
 
-#: plugins/dfinput/dfinput.glade2:185
-#: plugins/dfinput/dfinput.glade2:382
+#: ../plugins/dfinput/dfinput.glade2.h:9
 msgid "Reset"
 msgstr "重置"
 
-#: plugins/dfinput/dfinput.glade2:210
-msgid "Controller 1"
-msgstr "控制器 1"
-
-#: plugins/dfinput/dfinput.glade2:412
-msgid "Controller 2"
-msgstr "控制器 2"
-
-#: plugins/dfinput/dfinput.glade2:427
-msgid "Multi-Threaded (Recommended)"
-msgstr "多執行緒 (建議使用)"
+#: ../plugins/dfinput/dfinput.glade2.h:10
+msgid "Type:"
+msgstr "類型:"
 
-#: plugins/dfinput/pad.c:22
+#: ../plugins/dfinput/pad.c:22
 msgid "Gamepad/Keyboard Input"
 msgstr "手把/鍵盤輸入"
 
-#: plugins/dfnet/dfnet.c:23
+#. increase that with each version
+#: ../plugins/dfnet/dfnet.c:23
 msgid "Socket Driver"
 msgstr "Socket 驅動程式"
 
-#: plugins/dfnet/dfnet.c:161
+#: ../plugins/dfnet/dfnet.c:161
 #, c-format
 msgid "error connecting to %s: %s\n"
 msgstr "無法連線至 %s: %s\n"
 
-#: plugins/dfnet/dfnet.c:186
+#: ../plugins/dfnet/dfnet.c:186
 msgid "Error allocating memory!\n"
 msgstr "分配記憶體錯誤!\n"
 
-#: plugins/dfnet/dfnet.glade2:23
+#: ../plugins/dfnet/dfnet.glade2.h:1
+msgid "Client (Player2)"
+msgstr "客戶端 (玩家 2)"
+
+#: ../plugins/dfnet/dfnet.glade2.h:2
+msgid "Copy PC IP to Clipboard"
+msgstr "將本機 IP 複制到剪貼板"
+
+#: ../plugins/dfnet/dfnet.glade2.h:3
+msgid ""
+"Do not change if not necessary (remember it must be changed on both sides)."
+msgstr "如非必要請勿更改 (必須在兩端都要更改)。"
+
+#: ../plugins/dfnet/dfnet.glade2.h:4
+msgid "Play Offline"
+msgstr "離線遊戲"
+
+#: ../plugins/dfnet/dfnet.glade2.h:5
+msgid "Port Number"
+msgstr "Port 號"
+
+#: ../plugins/dfnet/dfnet.glade2.h:6
 msgid ""
 "Select here if you'll be Server (Player1) or Client (Player2).\n"
 "\n"
-"If you select Server you must Copy your IP address to the Clipboard and paste if (Ctrl+V) wherever the Client can see it.\n"
+"If you select Server you must Copy your IP address to the Clipboard and "
+"paste if (Ctrl+V) wherever the Client can see it.\n"
 "\n"
-"If you selected Client please enter the IP address the Server gave to you in the IP Address Control."
+"If you selected Client please enter the IP address the Server gave to you in "
+"the IP Address Control."
 msgstr ""
 "在此選擇以伺服器端 (玩家 1) 還是客戶端 (玩家 2) 方式執行。\n"
 "\n"
@@ -1593,86 +1537,65 @@ msgstr ""
 "\n"
 "如果您選擇客戶端，請輸入伺服器端提供給您的 IP 地址。"
 
-#: plugins/dfnet/dfnet.glade2:63
-msgid "Copy PC IP to Clipboard"
-msgstr "將本機 IP 複制到剪貼板"
-
-#: plugins/dfnet/dfnet.glade2:94
+#: ../plugins/dfnet/dfnet.glade2.h:11
 msgid "Server (Player1)"
 msgstr "伺服器 (玩家 1)"
 
-#: plugins/dfnet/dfnet.glade2:104
-msgid "Client (Player2)"
-msgstr "客戶端 (玩家 2)"
-
-#: plugins/dfnet/dfnet.glade2:130
-msgid "Do not change if not necessary (remember it must be changed on both sides)."
-msgstr "如非必要請勿更改 (必須在兩端都要更改)。"
-
-#: plugins/dfnet/dfnet.glade2:143
-msgid "Port Number"
-msgstr "Port 號"
-
-#: plugins/dfnet/dfnet.glade2:202
+#: ../plugins/dfnet/dfnet.glade2.h:12
 msgid "Start Game"
 msgstr "開始遊戲"
 
-#: plugins/dfnet/dfnet.glade2:240
-msgid "Play Offline"
-msgstr "離線遊戲"
-
-#: plugins/dfnet/gui.c:31
-#: plugins/dfnet/gui.c:112
-#: win32/gui/ConfigurePlugins.c:616
+#: ../plugins/dfnet/gui.c:31 ../plugins/dfnet/gui.c:112
+#: ../win32/gui/ConfigurePlugins.c:616
 msgid "NetPlay"
 msgstr "聯線遊戲"
 
-#: plugins/dfnet/gui.c:39
+#: ../plugins/dfnet/gui.c:39
 msgid "Nothing to configure"
 msgstr "沒有可以配置的內容"
 
-#: plugins/dfnet/gui.c:95
+#: ../plugins/dfnet/gui.c:95
 #, c-format
 msgid "IP %s"
 msgstr "IP %s"
 
-#: plugins/dfnet/gui.c:165
+#: ../plugins/dfnet/gui.c:165
 msgid "Waiting for connection..."
 msgstr "等待連線中..."
 
-#: plugins/dfnet/gui.c:168
+#: ../plugins/dfnet/gui.c:168
 msgid "The Client should now Start a Connection, waiting..."
 msgstr "客戶端現在應開始連線，等待中..."
 
-#: plugins/dfsound/spu.c:43
+#: ../plugins/dfsound/spu.c:43
 msgid "DirectSound Driver"
 msgstr "DirectSound 驅動程式"
 
-#: plugins/dfsound/spu.c:45
+#: ../plugins/dfsound/spu.c:45
 msgid "Mac OS X Sound"
 msgstr "Mac OS X 聲音"
 
-#: plugins/dfsound/spu.c:47
+#: ../plugins/dfsound/spu.c:47
 msgid "ALSA Sound"
 msgstr "ALSA 聲音"
 
-#: plugins/dfsound/spu.c:49
+#: ../plugins/dfsound/spu.c:49
 msgid "OSS Sound"
 msgstr "OSS 聲音"
 
-#: plugins/dfsound/spu.c:51
+#: ../plugins/dfsound/spu.c:51
 msgid "SDL Sound"
 msgstr "SDL 聲音"
 
-#: plugins/dfsound/spu.c:53
+#: ../plugins/dfsound/spu.c:53
 msgid "PulseAudio Sound"
 msgstr "PulseAudio 聲音"
 
-#: plugins/dfsound/spu.c:55
+#: ../plugins/dfsound/spu.c:55
 msgid "NULL Sound"
 msgstr "NULL 聲音"
 
-#: plugins/dfsound/spu.c:58
+#: ../plugins/dfsound/spu.c:58
 msgid ""
 "P.E.Op.S. Sound Driver V1.7\n"
 "Coded by Pete Bernert and the P.E.Op.S. team\n"
@@ -1680,19 +1603,40 @@ msgstr ""
 "P.E.Op.S. Sound 驅動程式 V1.7\n"
 "由 Pete Bernert 及 P.E.Op.S. 開發組編寫\n"
 
-#: plugins/dfsound/spucfg-0.1df/dfsound.glade2:42
-msgid "Volume:"
-msgstr "音量:"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:1
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2.h:20
+msgid "<b>Compatibility</b>"
+msgstr "<b>相容性</b>"
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:2
+msgid "<b>General</b>"
+msgstr "<b>一般</b>"
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:3
+msgid "<b>XA Music</b>"
+msgstr "<b>XA 音樂</b>"
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:4
+msgid "Adjust XA speed"
+msgstr "調整 XA 速度"
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:5
+msgid "Choose this if XA music is played too quickly."
+msgstr "如 XA 音樂播放得過快，選中此項。"
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:7
+msgid "Frequency Response - Output Filter"
+msgstr "頻率響應 - 輸出過濾"
 
-#: plugins/dfsound/spucfg-0.1df/dfsound.glade2:54
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:8
+msgid "High compatibility mode"
+msgstr "高相容性模式"
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:9
 msgid "Interpolation:"
 msgstr "插值:"
 
-#: plugins/dfsound/spucfg-0.1df/dfsound.glade2:68
-msgid "Reverb:"
-msgstr "回響:"
-
-#: plugins/dfsound/spucfg-0.1df/dfsound.glade2:81
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:10
 msgid ""
 "None\n"
 "Low\n"
@@ -1706,17 +1650,7 @@ msgstr ""
 "高\n"
 "最高"
 
-#: plugins/dfsound/spucfg-0.1df/dfsound.glade2:96
-msgid ""
-"Off\n"
-"Simple\n"
-"Playstation"
-msgstr ""
-"關閉\n"
-"簡易\n"
-"Playstation"
-
-#: plugins/dfsound/spucfg-0.1df/dfsound.glade2:112
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:15
 msgid ""
 "None\n"
 "Simple\n"
@@ -1728,70 +1662,59 @@ msgstr ""
 "高斯\n"
 "立方"
 
-#: plugins/dfsound/spucfg-0.1df/dfsound.glade2:133
-msgid "<b>General</b>"
-msgstr "<b>一般</b>"
-
-#: plugins/dfsound/spucfg-0.1df/dfsound.glade2:164
-msgid "Adjust XA speed"
-msgstr "調整 XA 速度"
-
-#: plugins/dfsound/spucfg-0.1df/dfsound.glade2:168
-msgid "Choose this if XA music is played too quickly."
-msgstr "如 XA 音樂播放得過快，選中此項。"
-
-#: plugins/dfsound/spucfg-0.1df/dfsound.glade2:185
-msgid "<b>XA Music</b>"
-msgstr "<b>XA 音樂</b>"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:19
+msgid ""
+"Off\n"
+"Simple\n"
+"Playstation"
+msgstr ""
+"關閉\n"
+"簡易\n"
+"Playstation"
 
-#: plugins/dfsound/spucfg-0.1df/dfsound.glade2:216
-msgid "High compatibility mode"
-msgstr "高相容性模式"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:22
+msgid "Play only one channel for a performance boost."
+msgstr "僅播放一個聲道以提高性能。"
 
-#: plugins/dfsound/spucfg-0.1df/dfsound.glade2:220
-msgid "Use the asynchronous SPU interface."
-msgstr "使用異步 SPU 介面。"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:23
+msgid "Reverb:"
+msgstr "回響:"
 
-#: plugins/dfsound/spucfg-0.1df/dfsound.glade2:232
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:24
 msgid "SPU IRQ Wait"
 msgstr "SPU IRQ 等待"
 
-#: plugins/dfsound/spucfg-0.1df/dfsound.glade2:236
-msgid "Wait for CPU; only useful for some games."
-msgstr "等待 CPU；僅在一部分遊戲中有效。"
-
-#: plugins/dfsound/spucfg-0.1df/dfsound.glade2:248
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:25
 msgid "Single channel sound"
 msgstr "單聲道聲音"
 
-#: plugins/dfsound/spucfg-0.1df/dfsound.glade2:252
-msgid "Play only one channel for a performance boost."
-msgstr "僅播放一個聲道以提高性能。"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:26
+msgid "Use the asynchronous SPU interface."
+msgstr "使用異步 SPU 介面。"
 
-#: plugins/dfsound/spucfg-0.1df/dfsound.glade2:264
-msgid "Frequency Response - Output Filter"
-msgstr "頻率響應 - 輸出過濾"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:27
+msgid "Volume:"
+msgstr "音量:"
 
-#: plugins/dfsound/spucfg-0.1df/dfsound.glade2:281
-#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:585
-msgid "<b>Compatibility</b>"
-msgstr "<b>相容性</b>"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:28
+msgid "Wait for CPU; only useful for some games."
+msgstr "等待 CPU；僅在一部分遊戲中有效。"
 
-#: plugins/dfxvideo/gpu.c:60
+#: ../plugins/dfxvideo/gpu.c:60
 msgid "Soft Driver"
 msgstr ""
 
-#: plugins/dfxvideo/gpu.c:61
+#: ../plugins/dfxvideo/gpu.c:61
 msgid ""
 "P.E.Op.S. Soft Driver V1.17\n"
 "Coded by Pete Bernert and the P.E.Op.S. team\n"
 msgstr ""
 
-#: plugins/dfxvideo/gpu.c:63
+#: ../plugins/dfxvideo/gpu.c:63
 msgid "SoftGL Driver"
 msgstr "SoftGL 驅動程式"
 
-#: plugins/dfxvideo/gpu.c:64
+#: ../plugins/dfxvideo/gpu.c:64
 msgid ""
 "P.E.Op.S. SoftGL Driver V1.17\n"
 "Coded by Pete Bernert and the P.E.Op.S. team\n"
@@ -1799,11 +1722,11 @@ msgstr ""
 "P.E.Op.S. SoftGL Driver V1.17\n"
 "Coded by Pete Bernert and the P.E.Op.S. team\n"
 
-#: plugins/dfxvideo/gpu.c:66
+#: ../plugins/dfxvideo/gpu.c:66
 msgid "XVideo Driver"
 msgstr "XVideo 驅動程式"
 
-#: plugins/dfxvideo/gpu.c:67
+#: ../plugins/dfxvideo/gpu.c:67
 msgid ""
 "P.E.Op.S. Xvideo Driver V1.17\n"
 "Coded by Pete Bernert and the P.E.Op.S. team\n"
@@ -1811,27 +1734,11 @@ msgstr ""
 "P.E.Op.S. Xvideo 驅動程序 V1.17\n"
 "由 Pete Bernert 及 P.E.Op.S. 開發組編寫\n"
 
-#: plugins/dfxvideo/gpu.c:70
+#: ../plugins/dfxvideo/gpu.c:70
 msgid "Pete Bernert and the P.E.Op.S. team"
 msgstr "Pete Bernert 和 P.E.Op.S. 開發組"
 
-#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:8
-msgid "Configure X11 Video"
-msgstr "設定 X11 Video"
-
-#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:45
-msgid "Initial Window Size:"
-msgstr "初始視窗大小:"
-
-#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:56
-msgid "Stretching:"
-msgstr "拉抻:"
-
-#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:69
-msgid "Dithering:"
-msgstr "抖動:"
-
-#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:82
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2.h:1
 msgid ""
 "0: None\n"
 "1: 2xSai\n"
@@ -1851,7 +1758,7 @@ msgstr ""
 "6: HQ2X\n"
 "7: HQ3X"
 
-#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:104
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2.h:9
 msgid ""
 "0: Off (fastest)\n"
 "1: Game dependant\n"
@@ -1861,7 +1768,11 @@ msgstr ""
 "1: 取決于遊戲\n"
 "2: 總是開啟"
 
-#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:125
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2.h:12
+msgid "200.0"
+msgstr "200.0"
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2.h:13
 msgid ""
 "320x240\n"
 "640x480\n"
@@ -1879,161 +1790,175 @@ msgstr ""
 "1280x1024\n"
 "1600x1200"
 
-#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:139
-#: plugins/peopsxgl/gpucfg/gpucfg-newstyle2.glade:167
-msgid "Fullscreen"
-msgstr "全螢幕"
-
-#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:144
-msgid "Toggle windowed/fullscreen mode."
-msgstr "切換視窗/全螢幕方式。"
-
-#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:170
-msgid "Maintain 4:3 Aspect Ratio"
-msgstr "維持 4:3 縱橫比"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2.h:21
+msgid "<b>Framerate</b>"
+msgstr "<b>幀率</b>"
 
-#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:195
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2.h:22
 msgid "<b>Screen</b>"
 msgstr "<b>螢幕</b>"
 
-#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:224
-msgid "Show FPS"
-msgstr "顯示 FPS"
-
-#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:228
-msgid "Toggle whether the FPS will be shown."
-msgstr "切換 FPS 是否將被顯示。"
-
-#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:240
-msgid "Enable frame skipping"
-msgstr "開啟跳幀"
-
-#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:244
-msgid "Skip frames when rendering."
-msgstr "渲染時跳幀。"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2.h:23
+msgid "Autodetect FPS limit"
+msgstr "自動偵測 FPS 界限"
 
-#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:261
-msgid "Set FPS"
-msgstr "設定  FPS"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2.h:24
+msgid "Better FPS limit in some"
+msgstr "部分遊戲中可取得更佳的 FPS 界限"
 
-#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:265
-msgid "Enable this if games display too quickly."
-msgstr "如遊戲顯示過快，請開啟此項。"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2.h:25
+msgid "Black screens in Lunar"
+msgstr "Lunar 中黑螢幕"
 
-#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:279
-msgid "200.0"
-msgstr "200.0"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2.h:26
+msgid "Capcom fighting games"
+msgstr "Capcom 格鬥遊戲"
 
-#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:290
-msgid "Autodetect FPS limit"
-msgstr "自動偵測 FPS 界限"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2.h:27
+msgid "Chrono Cross"
+msgstr "Chrono Cross"
 
-#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:318
-msgid "<b>Framerate</b>"
-msgstr "<b>幀率</b>"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2.h:28
+msgid "Compatibility mode"
+msgstr "相容方式"
 
-#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:347
-#: plugins/peopsxgl/gpucfg/gpucfg-newstyle2.glade:868
-msgid "Use game fixes"
-msgstr "開啟遊戲修補"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2.h:29
+msgid "Configure X11 Video"
+msgstr "設定 X11 Video"
 
-#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:372
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2.h:30
 msgid "Disable CPU Saving"
 msgstr "禁用 CPU Saving"
 
-#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:376
-msgid "For precise framerate"
-msgstr "確保準確幀率"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2.h:31
+msgid "Disable coordinate check"
+msgstr "禁用坐標檢查"
 
-#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:389
-msgid "Odd/even bit hack"
-msgstr "奇偶位修正"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2.h:32
+msgid "Dithering:"
+msgstr "抖動:"
 
-#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:393
-msgid "Chrono Cross"
-msgstr "Chrono Cross"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2.h:33
+msgid "Draw quads with triangles"
+msgstr "用三角形繪製 quad"
 
-#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:404
-msgid "PC FPS calculation"
-msgstr "PC FPS 計算"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2.h:34
+msgid "Enable frame skipping"
+msgstr "開啟跳幀"
 
-#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:408
-msgid "Better FPS limit in some"
-msgstr "部分遊戲中可取得更佳的 FPS 界限"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2.h:35
+msgid "Enable this if games display too quickly."
+msgstr "如遊戲顯示過快，請開啟此項。"
 
-#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:421
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2.h:36
 msgid "Expand screen width"
 msgstr "擴展熒幕寬度"
 
-#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:425
-msgid "Capcom fighting games"
-msgstr "Capcom 格鬥遊戲"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2.h:37
+msgid "Fake 'gpu busy' states"
+msgstr "欺騙 'gpu 忙'"
 
-#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:438
-msgid "Ignore brightness color"
-msgstr "忽略高亮度顏色"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2.h:38
+msgid "For precise framerate"
+msgstr "確保準確幀率"
 
-#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:442
-msgid "Black screens in Lunar"
-msgstr "Lunar 中黑螢幕"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2.h:39
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:39
+msgid "Fullscreen"
+msgstr "全螢幕"
 
-#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:455
-msgid "Disable coordinate check"
-msgstr "禁用坐標檢查"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2.h:40
+msgid "Ignore brightness color"
+msgstr "忽略高亮度顏色"
 
-#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:459
-msgid "Compatibility mode"
-msgstr "相容方式"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2.h:41
+msgid "Initial Window Size:"
+msgstr "初始視窗大小:"
 
-#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:472
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2.h:42
 msgid "Lazy screen update"
 msgstr "延遲熒幕更新"
 
-#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:477
-msgid "Pandemonium 2"
-msgstr "Pandemonium 2"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2.h:43
+msgid "Maintain 4:3 Aspect Ratio"
+msgstr "維持 4:3 縱橫比"
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2.h:44
+msgid "Needed by Dark Forces"
+msgstr "Dark Forces 需要"
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2.h:45
+msgid "Odd/even bit hack"
+msgstr "奇偶位修正"
 
-#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:490
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2.h:46
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:60
 msgid "Old frame skipping"
 msgstr "老式跳幀"
 
-#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:495
-msgid "Skip every second frame"
-msgstr "每兩幀跳過一幀"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2.h:47
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:63
+msgid "PC FPS calculation"
+msgstr "PC FPS 計算"
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2.h:48
+msgid "Pandemonium 2"
+msgstr "Pandemonium 2"
 
-#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:510
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2.h:49
 msgid "Repeated flat tex triangles"
 msgstr "重復平滑多邊形紋理"
 
-#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:515
-msgid "Needed by Dark Forces"
-msgstr "Dark Forces 需要"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2.h:50
+msgid "Set FPS"
+msgstr "設定  FPS"
 
-#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:530
-msgid "Draw quads with triangles"
-msgstr "用三角形繪製 quad"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2.h:51
+msgid "Show FPS"
+msgstr "顯示 FPS"
 
-#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:535
-msgid "better g-colors, worse textures"
-msgstr "較好的 g-colors，較差的紋理"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2.h:52
+msgid "Skip every second frame"
+msgstr "每兩幀跳過一幀"
 
-#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:550
-msgid "Fake 'gpu busy' states"
-msgstr "欺騙 'gpu 忙'"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2.h:53
+msgid "Skip frames when rendering."
+msgstr "渲染時跳幀。"
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2.h:54
+msgid "Stretching:"
+msgstr "拉抻:"
 
-#: plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:555
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2.h:55
 msgid "Toggle busy flags after drawing"
 msgstr "繪製後切換忙碌標誌"
 
-#: plugins/peopsxgl/gpu.c:70
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2.h:56
+msgid "Toggle whether the FPS will be shown."
+msgstr "切換 FPS 是否將被顯示。"
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2.h:57
+msgid "Toggle windowed/fullscreen mode."
+msgstr "切換視窗/全螢幕方式。"
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2.h:58
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:83
+msgid "Use game fixes"
+msgstr "開啟遊戲修補"
+
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2.h:59
+msgid "better g-colors, worse textures"
+msgstr "較好的 g-colors，較差的紋理"
+
+#: ../plugins/peopsxgl/gpu.c:70
 msgid "OpenGL Driver"
 msgstr "OpenGL 驅動程式"
 
-#: plugins/peopsxgl/gpu.c:72
+#: ../plugins/peopsxgl/gpu.c:72
 msgid "Pete Bernert"
 msgstr "Pete Bernert"
 
-#: plugins/peopsxgl/gpu.c:73
+#: ../plugins/peopsxgl/gpu.c:73
 msgid ""
 "Based on P.E.Op.S. MesaGL Driver V1.78\n"
 "Coded by Pete Bernert\n"
@@ -2041,235 +1966,373 @@ msgstr ""
 "基于 P.E.Op.S. MesaGL 驅動程式 V1.78\n"
 "由 Pete Bernert 編寫\n"
 
-#: plugins/peopsxgl/gpucfg/gpucfg-newstyle2.glade:142
-msgid "P.E.Op.S. MesaGL PSX GPU configuration..."
-msgstr "P.E.Op.S. MesaGL PSX GPU 配置..."
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:1
+msgid "2xSaI (Much vram needed)"
+msgstr ""
 
-#: plugins/peopsxgl/gpucfg/gpucfg-newstyle2.glade:203
-msgid "Width:"
-msgstr "寬度:"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:2
+msgid "4444 - Fast, but less colorful"
+msgstr ""
 
-#: plugins/peopsxgl/gpucfg/gpucfg-newstyle2.glade:210
-msgid "Height:"
-msgstr "高度:"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:3
+msgid "5551 - Nice colors, bad transparency"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:4
+msgid "8888 - Best colors, more ram needed"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:5
+#, fuzzy
+msgid "Additional uploads"
+msgstr "附加上傳"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:6
+#, fuzzy
+msgid "Adjust screen width"
+msgstr "調整熒幕寬度"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:7
+msgid "Advanced blending (Accurate psx color emulation)"
+msgstr "高級混合 (準確的 psx 顏色模擬)"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:8
+#, fuzzy
+msgid "Alpha multipass (Correct opaque texture areas)"
+msgstr "半透明多通道 (更正不透明的紋理區域)"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:9
+msgid "Auto configure for beautiful display"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:10
+msgid "Autoconfigure for fast display"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:11
+msgid "BGR8888 - Faster on some cards"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:12
+#, fuzzy
+msgid "Battle cursor (FF7)"
+msgstr "戰鬥光標 (FF7)"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:13
+msgid "Beautiful"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:14
+msgid "Black - Fast, no effects"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:15
+#, fuzzy
+msgid "Black brightness (Lunar)"
+msgstr "黑色亮度 (Lunar)"
 
-#: plugins/peopsxgl/gpucfg/gpucfg-newstyle2.glade:228
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:16
+msgid "Compatibility"
+msgstr "相容性"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:17
+#, fuzzy
+msgid "Direct FB updates"
+msgstr "直接 FB 更新"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:18
+#, fuzzy
+msgid "Disable coord check"
+msgstr "禁用坐標檢查"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:19
 msgid "Dithering"
 msgstr "抖動"
 
-#: plugins/peopsxgl/gpucfg/gpucfg-newstyle2.glade:241
-msgid "Keep psx aspect ratio"
-msgstr "保持 psx 縱橫比"
-
-#: plugins/peopsxgl/gpucfg/gpucfg-newstyle2.glade:256
-msgid "Window options"
-msgstr "視窗設定"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:20
+#, fuzzy
+msgid "Don't care - Use driver's default textures"
+msgstr "0: 不設定 - 使用驅動程式缺省紋理"
 
-#: plugins/peopsxgl/gpucfg/gpucfg-newstyle2.glade:282
-msgid "Quality:"
-msgstr "質量:"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:21
+msgid "Emulated VRam - Needs FVP"
+msgstr ""
 
-#: plugins/peopsxgl/gpucfg/gpucfg-newstyle2.glade:292
-msgid "Filtering:"
-msgstr "過濾:"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:22
+msgid "Emulated VRam - Ok most times"
+msgstr ""
 
-#: plugins/peopsxgl/gpucfg/gpucfg-newstyle2.glade:302
-msgid "HiRes Tex:"
-msgstr "高分辨率紋理:"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:23
+msgid "Enhanced - Shows more stuff"
+msgstr ""
 
-#: plugins/peopsxgl/gpucfg/gpucfg-newstyle2.glade:375
-msgid "VRam size in MBytes (0..1024, 0=auto):"
-msgstr "顯存大小 MB (0..1024, 0=自動):"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:24
+msgid "Extended + smoothed sprites"
+msgstr ""
 
-#: plugins/peopsxgl/gpucfg/gpucfg-newstyle2.glade:403
-msgid "Textures"
-msgstr "紋理"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:25
+msgid "Extended - Causing garbage"
+msgstr ""
 
-#: plugins/peopsxgl/gpucfg/gpucfg-newstyle2.glade:429
-msgid "Show FPS display on startup"
-msgstr "啟動時顯示 FPS"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:26
+#, fuzzy
+msgid "Extended - No black borders"
+msgstr "2: 擴展 - 無黑色邊緣"
 
-#: plugins/peopsxgl/gpucfg/gpucfg-newstyle2.glade:442
-msgid "Use FPS limit"
-msgstr "开啟 FPS 界限"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:27
+msgid "Extended without sprites - Unfiltered 2D"
+msgstr ""
 
-#: plugins/peopsxgl/gpucfg/gpucfg-newstyle2.glade:454
-msgid "Use Frame skipping"
-msgstr "開啟跳幀"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:28
+msgid "FPS"
+msgstr "FPS"
 
-#: plugins/peopsxgl/gpucfg/gpucfg-newstyle2.glade:467
-msgid "FPS limit auto-detection"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:29
+#, fuzzy
+msgid "FPS limit auto-detector"
 msgstr "FPS 界限自動偵測"
 
-#: plugins/peopsxgl/gpucfg/gpucfg-newstyle2.glade:483
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:30
 msgid "FPS limit manual"
 msgstr "手動設定 FPS 界限"
 
-#: plugins/peopsxgl/gpucfg/gpucfg-newstyle2.glade:508
-msgid "FPS"
-msgstr "FPS"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:31
+#, fuzzy
+msgid "Fake 'GPU busy'"
+msgstr "欺騙 'gpu 忙'"
 
-#: plugins/peopsxgl/gpucfg/gpucfg-newstyle2.glade:528
-msgid "Framerate"
-msgstr "幀率"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:32
+#, fuzzy
+msgid "Fast"
+msgstr "粘貼"
 
-#: plugins/peopsxgl/gpucfg/gpucfg-newstyle2.glade:561
-msgid "Offscreen Drawing:"
-msgstr "離熒幕描繪:"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:33
+msgid "Filtering:"
+msgstr "過濾:"
 
-#: plugins/peopsxgl/gpucfg/gpucfg-newstyle2.glade:571
-msgid "Framebuffer textures:"
-msgstr "Framebuffer 紋理:"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:34
+#, fuzzy
+msgid "Force 15 bit framebuffer updates (Faster movies)"
+msgstr "強制 15 位 framebuffer 更新 (影片較快)"
 
-#: plugins/peopsxgl/gpucfg/gpucfg-newstyle2.glade:581
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:35
 msgid "Framebuffer access:"
 msgstr "Framebuffer 存取:"
 
-#: plugins/peopsxgl/gpucfg/gpucfg-newstyle2.glade:657
-msgid "Mask bit detection (needed by a few games, zbuffer)"
-msgstr "屏蔽位偵測 (部分遊戲需要, zbuffer)"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:36
+msgid "Framebuffer textures:"
+msgstr "Framebuffer 紋理:"
 
-#: plugins/peopsxgl/gpucfg/gpucfg-newstyle2.glade:668
-msgid "Alpha Multipass (correct opaque texture areas)"
-msgstr "半透明多通道 (更正不透明的紋理區域)"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:37
+msgid "Framerate"
+msgstr "幀率"
 
-#: plugins/peopsxgl/gpucfg/gpucfg-newstyle2.glade:679
-msgid "Advanced blending (Accurate psx color emulation)"
-msgstr "高級混合 (準確的 psx 顏色模擬)"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:38
+#, fuzzy
+msgid "Full Software (FVP)"
+msgstr "4: 全軟體 (FVP)"
 
-#: plugins/peopsxgl/gpucfg/gpucfg-newstyle2.glade:702
-msgid "Compatibility"
-msgstr "相容性"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:40
+msgid "Gfx card and soft - Slow"
+msgstr ""
 
-#: plugins/peopsxgl/gpucfg/gpucfg-newstyle2.glade:729
-msgid "Scanlines"
-msgstr "掃描線"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:41
+msgid "Gfx card buffer - Can be slow"
+msgstr ""
 
-#: plugins/peopsxgl/gpucfg/gpucfg-newstyle2.glade:742
-msgid "Blending (0..255,-1=dot):"
-msgstr "混合 (0..255, -1=dot):"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:42
+msgid "Gfx card buffer moves"
+msgstr ""
 
-#: plugins/peopsxgl/gpucfg/gpucfg-newstyle2.glade:771
-msgid "Unfiltered MDECs (small movie speedup)"
-msgstr "非過濾 MDECs (微小的影片加速)"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:43
+msgid "Gfx card buffer reads"
+msgstr ""
 
-#: plugins/peopsxgl/gpucfg/gpucfg-newstyle2.glade:784
-msgid "Force 15 bit framebuffer updates (faster movies)"
-msgstr "強制 15 位 framebuffer 更新 (影片較快)"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:44
+msgid "Gfx card buffer reads and moves"
+msgstr ""
 
-#: plugins/peopsxgl/gpucfg/gpucfg-newstyle2.glade:797
-msgid "Line mode (polygons will not get filled)"
-msgstr "直線模式 (多邊形將不被填充)"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:45
+msgid "Height:"
+msgstr "高度:"
 
-#: plugins/peopsxgl/gpucfg/gpucfg-newstyle2.glade:810
-msgid "Polygon anti-aliasing (slow with most cards)"
-msgstr "多邊形抗鋸齒 (對于大多數顯卡較慢)"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:46
+msgid "HiRes Tex:"
+msgstr "高分辨率紋理:"
 
-#: plugins/peopsxgl/gpucfg/gpucfg-newstyle2.glade:823
-msgid "Use OpenGL extensions (recommended)"
-msgstr "使用 OpenGL 擴展 (建議使用)"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:47
+msgid "Keep psx aspect ratio"
+msgstr "保持 psx 縱橫比"
 
-#: plugins/peopsxgl/gpucfg/gpucfg-newstyle2.glade:836
-msgid "Screen smoothing (can be slow or unsupported)"
-msgstr "平滑熒幕 (可能較慢或不被支援)"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:48
+#, fuzzy
+msgid "Lazy upload (DW7)"
+msgstr "延遲上傳 (DW7)"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:49
+#, fuzzy
+msgid "Line mode (Polygons will not get filled)"
+msgstr "直線模式 (多邊形將不被填充)"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:50
+#, fuzzy
+msgid "Mask bit detection (Needed by a few games, zbuffer)"
+msgstr "屏蔽位偵測 (部分遊戲需要, zbuffer)"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:51
+msgid "Minimum - Missing screens"
+msgstr ""
 
-#: plugins/peopsxgl/gpucfg/gpucfg-newstyle2.glade:851
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:52
 msgid "Misc"
 msgstr "雜項"
 
-#: plugins/peopsxgl/gpucfg/gpucfg-newstyle2.glade:884
-msgid "01: Battle cursor (FF7)"
-msgstr "戰鬥光標 (FF7)"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:53
+#, fuzzy
+msgid "No blue glitches (LoD)"
+msgstr "無藍色干擾 (LoD)"
 
-#: plugins/peopsxgl/gpucfg/gpucfg-newstyle2.glade:892
-msgid "02: Direct FB updates"
-msgstr "直接 FB 更新"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:54
+#, fuzzy
+msgid "No subtr. blending"
+msgstr "無 subtr. 混合"
 
-#: plugins/peopsxgl/gpucfg/gpucfg-newstyle2.glade:904
-msgid "04: Black brightness (Lunar)"
-msgstr "黑色亮度 (Lunar)"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:56
+#, fuzzy
+msgid "None (Standard)"
+msgstr "0: 無 (標準)"
 
-#: plugins/peopsxgl/gpucfg/gpucfg-newstyle2.glade:916
-msgid "08: Swap front detection"
-msgstr "swap front 偵測"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:57
+msgid "None - Fastest, most glitches"
+msgstr ""
 
-#: plugins/peopsxgl/gpucfg/gpucfg-newstyle2.glade:928
-msgid "10: Disable coord check"
-msgstr "禁用坐標檢查"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:58
+#, fuzzy
+msgid "Odd/even hack"
+msgstr "奇偶位修正"
 
-#: plugins/peopsxgl/gpucfg/gpucfg-newstyle2.glade:940
-msgid "20: No blue glitches (LoD)"
-msgstr "無藍色干擾 (LoD)"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:59
+#, fuzzy
+msgid "Offscreen drawing:"
+msgstr "離熒幕描繪:"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:61
+#, fuzzy
+msgid "Old texture filtering"
+msgstr "老式紋理過濾"
 
-#: plugins/peopsxgl/gpucfg/gpucfg-newstyle2.glade:952
-msgid "40: Soft FB access"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:62
+msgid "OpenGL Driver configuration"
+msgstr "OpenGL 驅動程式設定"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:64
+#, fuzzy
+msgid "Polygon anti-aliasing (Slow with most cards)"
+msgstr "多邊形抗鋸齒 (對于大多數顯卡較慢)"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:65
+msgid "Quality:"
+msgstr "質量:"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:66
+msgid "Scaled (Needs tex filtering)"
+msgstr ""
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:67
+#, fuzzy
+msgid "Scanlines Blending (0..255, -1=dot):"
+msgstr "混合 (0..255, -1=dot):"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:68
+#, fuzzy
+msgid "Screen smoothing (Can be slow or unsupported)"
+msgstr "平滑熒幕 (可能較慢或不被支援)"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:69
+msgid "Show FPS display on startup"
+msgstr "啟動時顯示 FPS"
+
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:70
+#, fuzzy
+msgid "Soft FB access"
 msgstr "軟 FB 存取"
 
-#: plugins/peopsxgl/gpucfg/gpucfg-newstyle2.glade:964
-msgid "80: PC fps calculation"
-msgstr "PC fps 計算"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:71
+msgid "Special game fixes"
+msgstr "特定遊戲修正"
 
-#: plugins/peopsxgl/gpucfg/gpucfg-newstyle2.glade:976
-msgid "100: Old frame skipping"
-msgstr "老式跳幀"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:72
+msgid "Standard + smoothed sprites"
+msgstr ""
 
-#: plugins/peopsxgl/gpucfg/gpucfg-newstyle2.glade:988
-msgid "200: Yellow rect (FF9)"
-msgstr "黃色方塊 (FF9)"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:73
+#, fuzzy
+msgid "Standard - Glitches will happen"
+msgstr "1: 標準 - 可能有問題"
 
-#: plugins/peopsxgl/gpucfg/gpucfg-newstyle2.glade:1000
-msgid "400: No subtr. blending"
-msgstr "無 subtr. 混合"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:74
+msgid "Standard - OK for most games"
+msgstr ""
 
-#: plugins/peopsxgl/gpucfg/gpucfg-newstyle2.glade:1014
-msgid "800: Lazy upload (DW7)"
-msgstr "延遲上傳 (DW7)"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:75
+msgid "Standard without sprites - Unfiltered 2D"
+msgstr ""
 
-#: plugins/peopsxgl/gpucfg/gpucfg-newstyle2.glade:1028
-msgid "1000: Odd/even hack"
-msgstr "奇偶位修正"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:76
+#, fuzzy
+msgid "Swap front detection"
+msgstr "swap front 偵測"
 
-#: plugins/peopsxgl/gpucfg/gpucfg-newstyle2.glade:1042
-msgid "2000: Adjust screen width"
-msgstr "調整熒幕寬度"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:77
+msgid "Textures"
+msgstr "紋理"
 
-#: plugins/peopsxgl/gpucfg/gpucfg-newstyle2.glade:1056
-msgid "4000: Old texture filtering"
-msgstr "老式紋理過濾"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:78
+#, fuzzy
+msgid "Unfiltered MDECs (Small movie speedup)"
+msgstr "非過濾 MDECs (微小的影片加速)"
 
-#: plugins/peopsxgl/gpucfg/gpucfg-newstyle2.glade:1070
-msgid "8000: Additional uploads"
-msgstr "附加上傳"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:79
+#, fuzzy
+msgid "Unused"
+msgstr "已使用"
 
-#: plugins/peopsxgl/gpucfg/gpucfg-newstyle2.glade:1084
-msgid "10000: unused"
-msgstr "未使用"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:80
+msgid "Use FPS limit"
+msgstr "开啟 FPS 界限"
 
-#: plugins/peopsxgl/gpucfg/gpucfg-newstyle2.glade:1098
-msgid "20000: fake 'gpu busy'"
-msgstr "欺騙 'gpu 忙'"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:81
+msgid "Use Frame skipping"
+msgstr "開啟跳幀"
 
-#: plugins/peopsxgl/gpucfg/gpucfg-newstyle2.glade:1119
-msgid "Special game fixes"
-msgstr "特定遊戲修正"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:82
+#, fuzzy
+msgid "Use OpenGL extensions (Recommended)"
+msgstr "使用 OpenGL 擴展 (建議使用)"
 
-#: plugins/peopsxgl/gpucfg/gpucfg-newstyle2.glade:1182
-msgid "Coded by: Pete Bernert"
-msgstr "Pete Bernert"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:84
+msgid "VRam size in MBytes (0..1024, 0=auto):"
+msgstr "顯存大小 MB (0..1024, 0=自動):"
 
-#: plugins/peopsxgl/gpucfg/gpucfg-newstyle2.glade:1183
-msgid "Release date: 01.04.2009"
-msgstr "發佈日期: 01.04.2009"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:85
+msgid "Width:"
+msgstr "寬度:"
 
-#: plugins/peopsxgl/gpucfg/gpucfg-newstyle2.glade:1185
-msgid "http://www.pbernert.com"
-msgstr "網址: http://www.pbernert.com"
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:86
+msgid "Window options"
+msgstr "視窗設定"
 
-#: plugins/bladesio1/sio1.c:29
+#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:87
+#, fuzzy
+msgid "Yellow rect (FF9)"
+msgstr "黃色方塊 (FF9)"
+
+#. ****************************************************************************
+#: ../plugins/bladesio1/sio1.c:29
 msgid "Sio1 Driver"
 msgstr "Sio1 驅動程式"
 
-#: win32/gui/AboutDlg.c:26
+#: ../win32/gui/AboutDlg.c:26
 msgid ""
 "PCSX - A PlayStation Emulator\n"
 "\n"
@@ -2287,7 +2350,7 @@ msgstr ""
 "前程式: Nocomp, Pete Bernett, nik3d\n"
 "網站管理: AkumaX"
 
-#: win32/gui/AboutDlg.c:35
+#: ../win32/gui/AboutDlg.c:35
 msgid ""
 "PCSX-df Authors:\n"
 "Ryan Schultz, Andrew Burton, Stephen Chao,\n"
@@ -2307,477 +2370,452 @@ msgstr ""
 "\n"
 "http://pcsxr.codeplex.com/"
 
-#: win32/gui/AboutDlg.c:46
+#: ../win32/gui/AboutDlg.c:46
 msgid "About"
 msgstr "關於 PCSX"
 
-#: win32/gui/AboutDlg.c:48
-#: win32/gui/AboutDlg.c:52
-#: win32/gui/CheatDlg.c:69
-#: win32/gui/CheatDlg.c:119
-#: win32/gui/ConfigurePlugins.c:483
-#: win32/gui/ConfigurePlugins.c:614
-#: win32/gui/WndMain.c:1056
-#: win32/gui/WndMain.c:1292
+#: ../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:1056 ../win32/gui/WndMain.c:1292
 msgid "OK"
 msgstr "確定"
 
-#: win32/gui/AboutDlg.c:49
+#: ../win32/gui/AboutDlg.c:49
 msgid "PCSX EMU\n"
 msgstr "PCSX 模擬器\n"
 
-#: win32/gui/CheatDlg.c:51
-#: win32/gui/CheatDlg.c:223
-#: win32/gui/CheatDlg.c:270
+#: ../win32/gui/CheatDlg.c:51 ../win32/gui/CheatDlg.c:223
+#: ../win32/gui/CheatDlg.c:270
 msgid "Yes"
 msgstr "是"
 
-#: win32/gui/CheatDlg.c:51
-#: win32/gui/CheatDlg.c:223
-#: win32/gui/CheatDlg.c:270
+#: ../win32/gui/CheatDlg.c:51 ../win32/gui/CheatDlg.c:223
+#: ../win32/gui/CheatDlg.c:270
 msgid "No"
 msgstr "否"
 
-#: win32/gui/CheatDlg.c:70
-#: win32/gui/CheatDlg.c:120
-#: win32/gui/ConfigurePlugins.c:484
-#: win32/gui/ConfigurePlugins.c:615
-#: win32/gui/WndMain.c:1057
-#: win32/gui/WndMain.c:1293
+#: ../win32/gui/CheatDlg.c:70 ../win32/gui/CheatDlg.c:120
+#: ../win32/gui/ConfigurePlugins.c:484 ../win32/gui/ConfigurePlugins.c:615
+#: ../win32/gui/WndMain.c:1057 ../win32/gui/WndMain.c:1293
 msgid "Cancel"
 msgstr "取消"
 
-#: win32/gui/CheatDlg.c:168
+#: ../win32/gui/CheatDlg.c:168
 msgid "&Add Code"
 msgstr "增加金手指碼(&A)"
 
-#: win32/gui/CheatDlg.c:169
+#: ../win32/gui/CheatDlg.c:169
 msgid "&Edit Code"
 msgstr "編輯金手指(&E):"
 
-#: win32/gui/CheatDlg.c:170
+#: ../win32/gui/CheatDlg.c:170
 msgid "&Remove Code"
 msgstr "刪除金手指碼(&R)"
 
-#: win32/gui/CheatDlg.c:171
+#: ../win32/gui/CheatDlg.c:171
 msgid "&Enable/Disable"
 msgstr "開啟/關閉(&E)"
 
-#: win32/gui/CheatDlg.c:172
+#: ../win32/gui/CheatDlg.c:172
 msgid "&Load..."
 msgstr "讀取(&L)..."
 
-#: win32/gui/CheatDlg.c:173
+#: ../win32/gui/CheatDlg.c:173
 msgid "&Save As..."
 msgstr "存儲為(&S)..."
 
-#: win32/gui/CheatDlg.c:174
+#: ../win32/gui/CheatDlg.c:174
 msgid "&Close"
 msgstr "關閉(&C)"
 
-#: win32/gui/CheatDlg.c:190
+#: ../win32/gui/CheatDlg.c:190
 msgid "Enabled"
 msgstr "開啟"
 
-#: win32/gui/CheatDlg.c:282
-#: win32/gui/CheatDlg.c:311
+#: ../win32/gui/CheatDlg.c:282 ../win32/gui/CheatDlg.c:311
 msgid "PCSX Cheat Code Files"
 msgstr "PCSX 金手指檔 (*.cht)"
 
-#: win32/gui/CheatDlg.c:402
+#: ../win32/gui/CheatDlg.c:402
 msgid "Equal Value"
 msgstr "等于數值"
 
-#: win32/gui/CheatDlg.c:403
+#: ../win32/gui/CheatDlg.c:403
 msgid "Not Equal Value"
 msgstr "不等于數值"
 
-#: win32/gui/CheatDlg.c:404
+#: ../win32/gui/CheatDlg.c:404
 msgid "Range"
 msgstr "範圍"
 
-#: win32/gui/CheatDlg.c:407
+#: ../win32/gui/CheatDlg.c:407
 msgid "Increased By"
 msgstr "增加數值"
 
-#: win32/gui/CheatDlg.c:408
+#: ../win32/gui/CheatDlg.c:408
 msgid "Decreased By"
 msgstr "減少數值"
 
-#: win32/gui/CheatDlg.c:409
+#: ../win32/gui/CheatDlg.c:409
 msgid "Increased"
 msgstr "增加"
 
-#: win32/gui/CheatDlg.c:410
+#: ../win32/gui/CheatDlg.c:410
 msgid "Decreased"
 msgstr "已減少"
 
-#: win32/gui/CheatDlg.c:411
+#: ../win32/gui/CheatDlg.c:411
 msgid "Different"
 msgstr "不同"
 
-#: win32/gui/CheatDlg.c:412
+#: ../win32/gui/CheatDlg.c:412
 msgid "No Change"
 msgstr "無改變"
 
-#: win32/gui/CheatDlg.c:453
+#: ../win32/gui/CheatDlg.c:453
 msgid "No addresses found."
 msgstr "未找到位址。"
 
-#: win32/gui/CheatDlg.c:505
-#: win32/gui/CheatDlg.c:596
+#: ../win32/gui/CheatDlg.c:505 ../win32/gui/CheatDlg.c:596
 msgid "Address:"
 msgstr "位址:"
 
-#: win32/gui/CheatDlg.c:566
+#: ../win32/gui/CheatDlg.c:566
 #, c-format
 msgid "Freeze %.8X"
 msgstr "固定 %.8X"
 
-#: win32/gui/CheatDlg.c:685
+#: ../win32/gui/CheatDlg.c:685
 msgid "&Freeze"
 msgstr "固定(&F)"
 
-#: win32/gui/CheatDlg.c:686
+#: ../win32/gui/CheatDlg.c:686
 msgid "&Modify"
 msgstr "更改(&M)"
 
-#: win32/gui/CheatDlg.c:687
+#: ../win32/gui/CheatDlg.c:687
 msgid "&Copy"
 msgstr "複制(&C)"
 
-#: win32/gui/CheatDlg.c:688
+#: ../win32/gui/CheatDlg.c:688
 msgid "&Search"
 msgstr "搜尋(&S)"
 
-#: win32/gui/CheatDlg.c:689
+#: ../win32/gui/CheatDlg.c:689
 msgid "&New Search"
 msgstr "新搜尋(&N)"
 
-#: win32/gui/CheatDlg.c:690
+#: ../win32/gui/CheatDlg.c:690
 msgid "C&lose"
 msgstr "關閉(&L)"
 
-#: win32/gui/CheatDlg.c:692
+#: ../win32/gui/CheatDlg.c:692
 msgid "8-bit"
 msgstr "8 位元"
 
-#: win32/gui/CheatDlg.c:693
+#: ../win32/gui/CheatDlg.c:693
 msgid "16-bit"
 msgstr "16 位元"
 
-#: win32/gui/CheatDlg.c:694
+#: ../win32/gui/CheatDlg.c:694
 msgid "32-bit"
 msgstr "32 位元"
 
-#: win32/gui/CheatDlg.c:695
+#: ../win32/gui/CheatDlg.c:695
 msgid "Decimal"
 msgstr "十進制"
 
-#: win32/gui/CheatDlg.c:696
+#: ../win32/gui/CheatDlg.c:696
 msgid "Hexadecimal"
 msgstr "十六進制"
 
-#: win32/gui/ConfigurePlugins.c:219
+#: ../win32/gui/ConfigurePlugins.c:219
 msgid "Simulate Psx Bios"
 msgstr "模擬 PS BIOS"
 
-#: win32/gui/ConfigurePlugins.c:305
+#: ../win32/gui/ConfigurePlugins.c:305
 msgid "Configuration not OK!"
 msgstr "設定不正確!"
 
-#: win32/gui/ConfigurePlugins.c:406
+#: ../win32/gui/ConfigurePlugins.c:406
 msgid "This plugin reports that should work correctly"
 msgstr "此外掛報告其可正常工作。"
 
-#: win32/gui/ConfigurePlugins.c:407
+#: ../win32/gui/ConfigurePlugins.c:407
 msgid "This plugin reports that should not work correctly"
 msgstr "此外掛報告其不可正常工作。"
 
-#: win32/gui/ConfigurePlugins.c:463
+#: ../win32/gui/ConfigurePlugins.c:463
 msgid "Select Plugins Directory"
 msgstr "選擇外掛目錄"
 
-#: win32/gui/ConfigurePlugins.c:472
+#: ../win32/gui/ConfigurePlugins.c:472
 msgid "Select Bios Directory"
 msgstr "選擇 BIOS 目錄"
 
-#: win32/gui/ConfigurePlugins.c:481
+#: ../win32/gui/ConfigurePlugins.c:481
 msgid "Configuration"
 msgstr "設定"
 
-#: win32/gui/ConfigurePlugins.c:485
+#: ../win32/gui/ConfigurePlugins.c:485
 msgid "Graphics"
 msgstr "圖像"
 
-#: win32/gui/ConfigurePlugins.c:486
+#: ../win32/gui/ConfigurePlugins.c:486
 msgid "First Controller"
 msgstr "主控制器"
 
-#: win32/gui/ConfigurePlugins.c:487
+#: ../win32/gui/ConfigurePlugins.c:487
 msgid "Second Controller"
 msgstr "輔控制器"
 
-#: win32/gui/ConfigurePlugins.c:488
+#: ../win32/gui/ConfigurePlugins.c:488
 msgid "Sound"
 msgstr "聲音"
 
-#: win32/gui/ConfigurePlugins.c:489
+#: ../win32/gui/ConfigurePlugins.c:489
 msgid "Cdrom"
 msgstr "CD-ROM"
 
-#: win32/gui/ConfigurePlugins.c:490
+#: ../win32/gui/ConfigurePlugins.c:490
 msgid "Bios"
 msgstr "BIOS"
 
-#: win32/gui/ConfigurePlugins.c:491
+#: ../win32/gui/ConfigurePlugins.c:491
 msgid "Set Bios Directory"
 msgstr "設定 BIOS 目錄"
 
-#: win32/gui/ConfigurePlugins.c:492
+#: ../win32/gui/ConfigurePlugins.c:492
 msgid "Set Plugins Directory"
 msgstr "設定外掛目錄"
 
-#: win32/gui/ConfigurePlugins.c:493
-#: win32/gui/ConfigurePlugins.c:496
-#: win32/gui/ConfigurePlugins.c:499
-#: win32/gui/ConfigurePlugins.c:502
-#: win32/gui/ConfigurePlugins.c:505
-#: win32/gui/ConfigurePlugins.c:617
+#: ../win32/gui/ConfigurePlugins.c:493 ../win32/gui/ConfigurePlugins.c:496
+#: ../win32/gui/ConfigurePlugins.c:499 ../win32/gui/ConfigurePlugins.c:502
+#: ../win32/gui/ConfigurePlugins.c:505 ../win32/gui/ConfigurePlugins.c:617
 msgid "Configure..."
 msgstr "設定..."
 
-#: win32/gui/ConfigurePlugins.c:494
-#: win32/gui/ConfigurePlugins.c:497
-#: win32/gui/ConfigurePlugins.c:500
-#: win32/gui/ConfigurePlugins.c:503
-#: win32/gui/ConfigurePlugins.c:506
-#: win32/gui/ConfigurePlugins.c:618
+#: ../win32/gui/ConfigurePlugins.c:494 ../win32/gui/ConfigurePlugins.c:497
+#: ../win32/gui/ConfigurePlugins.c:500 ../win32/gui/ConfigurePlugins.c:503
+#: ../win32/gui/ConfigurePlugins.c:506 ../win32/gui/ConfigurePlugins.c:618
 msgid "Test..."
 msgstr "測試..."
 
-#: win32/gui/ConfigurePlugins.c:495
-#: win32/gui/ConfigurePlugins.c:498
-#: win32/gui/ConfigurePlugins.c:501
-#: win32/gui/ConfigurePlugins.c:504
-#: win32/gui/ConfigurePlugins.c:507
-#: win32/gui/ConfigurePlugins.c:619
+#: ../win32/gui/ConfigurePlugins.c:495 ../win32/gui/ConfigurePlugins.c:498
+#: ../win32/gui/ConfigurePlugins.c:501 ../win32/gui/ConfigurePlugins.c:504
+#: ../win32/gui/ConfigurePlugins.c:507 ../win32/gui/ConfigurePlugins.c:619
 msgid "About..."
 msgstr "關於..."
 
-#: win32/gui/ConfigurePlugins.c:612
+#: ../win32/gui/ConfigurePlugins.c:612
 msgid "NetPlay Configuration"
 msgstr "聯線遊戲設定"
 
-#: win32/gui/ConfigurePlugins.c:620
-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:94
-#: win32/gui/WndMain.c:320
+#: ../win32/gui/plugin.c:94 ../win32/gui/WndMain.c:320
 #, c-format
 msgid "*PCSX*: Saved State %d"
 msgstr "*PCSX*: Saved State %d"
 
-#: win32/gui/plugin.c:95
-#: win32/gui/WndMain.c:321
+#: ../win32/gui/plugin.c:95 ../win32/gui/WndMain.c:321
 #, c-format
 msgid "*PCSX*: Error Saving State %d"
 msgstr "*PCSX*: Error Saving State %d"
 
-#: win32/gui/plugin.c:111
-#: win32/gui/WndMain.c:298
+#: ../win32/gui/plugin.c:111 ../win32/gui/WndMain.c:298
 #, c-format
 msgid "*PCSX*: Loaded State %d"
 msgstr "*PCSX*: Loaded State %d"
 
-#: win32/gui/plugin.c:112
-#: win32/gui/WndMain.c:299
+#: ../win32/gui/plugin.c:112 ../win32/gui/WndMain.c:299
 #, c-format
 msgid "*PCSX*: Error Loading State %d"
 msgstr "*PCSX*: Error Loading State %d"
 
-#: win32/gui/plugin.c:123
+#: ../win32/gui/plugin.c:123
 #, c-format
 msgid "*PCSX*: Sio Irq Always Enabled"
 msgstr "*PCSX*: Sio Irq Always Enabled"
 
-#: win32/gui/plugin.c:124
+#: ../win32/gui/plugin.c:124
 #, c-format
 msgid "*PCSX*: Sio Irq Not Always Enabled"
 msgstr "*PCSX*: Sio Irq Not Always Enabled"
 
-#: win32/gui/plugin.c:131
+#: ../win32/gui/plugin.c:131
 #, c-format
 msgid "*PCSX*: Black&White Mdecs Only Enabled"
 msgstr "*PCSX*: Black&White Mdecs Only Enabled"
 
-#: win32/gui/plugin.c:132
+#: ../win32/gui/plugin.c:132
 #, c-format
 msgid "*PCSX*: Black&White Mdecs Only Disabled"
 msgstr "*PCSX*: Black&White Mdecs Only Disabled"
 
-#: win32/gui/plugin.c:139
+#: ../win32/gui/plugin.c:139
 #, c-format
 msgid "*PCSX*: Xa Enabled"
 msgstr "*PCSX*: Xa Enabled"
 
-#: win32/gui/plugin.c:140
+#: ../win32/gui/plugin.c:140
 #, c-format
 msgid "*PCSX*: Xa Disabled"
 msgstr "*PCSX*: Xa Disabled"
 
-#: win32/gui/plugin.c:149
+#: ../win32/gui/plugin.c:149
 msgid "*PCSX*: CdRom Case Opened"
 msgstr "*PCSX*: CdRom Case Opened"
 
-#: win32/gui/plugin.c:155
+#: ../win32/gui/plugin.c:155
 msgid "*PCSX*: CdRom Case Closed"
 msgstr "*PCSX*: CdRom Case Closed"
 
-#: win32/gui/plugin.c:183
+#: ../win32/gui/plugin.c:183
 msgid "Connecting..."
 msgstr "正在連線..."
 
-#: win32/gui/plugin.c:185
-#: win32/gui/plugin.c:192
+#: ../win32/gui/plugin.c:185 ../win32/gui/plugin.c:192
 #, c-format
 msgid "Please wait while connecting... %c\n"
 msgstr "請稍候，正在連線... %c\n"
 
-#: win32/gui/plugin.c:220
+#: ../win32/gui/plugin.c:220
 msgid "Error Opening CDR Plugin"
 msgstr "無法開啟 CDR 外掛"
 
-#: win32/gui/plugin.c:283
+#: ../win32/gui/plugin.c:283
 #, c-format
 msgid "Error Opening GPU Plugin (%d)"
 msgstr "無法開啟 GPU 外掛 (%d)"
 
-#: win32/gui/plugin.c:286
+#: ../win32/gui/plugin.c:286
 #, c-format
 msgid "Error Opening SPU Plugin (%d)"
 msgstr "無法開啟 SPU 外掛 (%d)"
 
-#: win32/gui/plugin.c:289
+#: ../win32/gui/plugin.c:289
 #, c-format
 msgid "Error Opening PAD1 Plugin (%d)"
 msgstr "無法開啟 PAD1 外掛 (%d)"
 
-#: win32/gui/plugin.c:291
+#: ../win32/gui/plugin.c:291
 #, c-format
 msgid "Error Opening PAD2 Plugin (%d)"
 msgstr "無法開啟 PAD2 外掛 (%d)"
 
-#: win32/gui/plugin.c:319
+#: ../win32/gui/plugin.c:319
 msgid "Error Closing CDR Plugin"
 msgstr "無法關閉 CD-ROM 外掛 (%d)"
 
-#: win32/gui/plugin.c:321
+#: ../win32/gui/plugin.c:321
 msgid "Error Closing GPU Plugin"
 msgstr "無法關閉 GPU 外掛"
 
-#: win32/gui/plugin.c:323
+#: ../win32/gui/plugin.c:323
 msgid "Error Closing SPU Plugin"
 msgstr "無法關閉 SPU 外掛"
 
-#: win32/gui/plugin.c:341
+#: ../win32/gui/plugin.c:341
 #, c-format
 msgid "CDRinit error: %d"
 msgstr "CDRinit 錯誤: %d"
 
-#: win32/gui/plugin.c:343
+#: ../win32/gui/plugin.c:343
 #, c-format
 msgid "GPUinit error: %d"
 msgstr "GPUinit 錯誤: %d"
 
-#: win32/gui/plugin.c:345
+#: ../win32/gui/plugin.c:345
 #, c-format
 msgid "SPUinit error: %d"
 msgstr "SPUinit 錯誤: %d"
 
-#: win32/gui/plugin.c:347
+#: ../win32/gui/plugin.c:347
 #, c-format
 msgid "PAD1init error: %d"
 msgstr "PAD1init 錯誤: %d"
 
-#: win32/gui/plugin.c:349
+#: ../win32/gui/plugin.c:349
 #, c-format
 msgid "PAD2init error: %d"
 msgstr "PAD2init 錯誤: %d"
 
-#: win32/gui/plugin.c:352
+#: ../win32/gui/plugin.c:352
 #, c-format
 msgid "NETinit error: %d"
 msgstr "NETinit 錯誤: %d"
 
-#: win32/gui/WndMain.c:77
+#: ../win32/gui/WndMain.c:77
 msgid "Arabic"
 msgstr "阿拉伯語"
 
-#: win32/gui/WndMain.c:78
+#: ../win32/gui/WndMain.c:78
 msgid "Catalan"
 msgstr "加泰隆尼亞語"
 
-#: win32/gui/WndMain.c:79
+#: ../win32/gui/WndMain.c:79
 msgid "German"
 msgstr "德語"
 
-#: win32/gui/WndMain.c:80
+#: ../win32/gui/WndMain.c:80
 msgid "Greek"
 msgstr "希臘語"
 
-#: win32/gui/WndMain.c:81
-#: win32/gui/WndMain.c:1656
-#: win32/gui/WndMain.c:1658
+#: ../win32/gui/WndMain.c:81 ../win32/gui/WndMain.c:1656
+#: ../win32/gui/WndMain.c:1658
 msgid "English"
 msgstr "英語"
 
-#: win32/gui/WndMain.c:82
+#: ../win32/gui/WndMain.c:82
 msgid "Spanish"
 msgstr "西班牙語"
 
-#: win32/gui/WndMain.c:83
+#: ../win32/gui/WndMain.c:83
 msgid "French"
 msgstr "法語"
 
-#: win32/gui/WndMain.c:84
+#: ../win32/gui/WndMain.c:84
 msgid "Italian"
 msgstr "義大利語"
 
-#: win32/gui/WndMain.c:85
+#: ../win32/gui/WndMain.c:85
 msgid "Portuguese"
 msgstr "葡萄牙語"
 
-#: win32/gui/WndMain.c:86
+#: ../win32/gui/WndMain.c:86
 msgid "Portuguese (Brazilian)"
 msgstr "葡萄牙語 (巴西)"
 
-#: win32/gui/WndMain.c:87
+#: ../win32/gui/WndMain.c:87
 msgid "Romanian"
 msgstr "羅馬尼亞語"
 
-#: win32/gui/WndMain.c:88
+#: ../win32/gui/WndMain.c:88
 msgid "Russian"
 msgstr "俄語"
 
-#: win32/gui/WndMain.c:89
+#: ../win32/gui/WndMain.c:89
 msgid "Simplified Chinese"
 msgstr "簡體中文"
 
-#: win32/gui/WndMain.c:90
+#: ../win32/gui/WndMain.c:90
 msgid "Traditional Chinese"
 msgstr "正體中文"
 
-#: win32/gui/WndMain.c:91
+#: ../win32/gui/WndMain.c:91
 msgid "Japanese"
 msgstr "日語"
 
-#: win32/gui/WndMain.c:92
+#: ../win32/gui/WndMain.c:92
 msgid "Korean"
 msgstr "韓國語"
 
-#: win32/gui/WndMain.c:213
+#: ../win32/gui/WndMain.c:213
 msgid ""
 "Usage: pcsx [options]\n"
 "\toptions:\n"
@@ -2788,366 +2826,362 @@ msgid ""
 "\t-help\t\tDisplay this message"
 msgstr ""
 
-#: win32/gui/WndMain.c:339
-#: win32/gui/WndMain.c:385
+#: ../win32/gui/WndMain.c:339 ../win32/gui/WndMain.c:385
 msgid "PCSX State Format"
 msgstr "PCSX 記錄格式"
 
-#: win32/gui/WndMain.c:366
+#: ../win32/gui/WndMain.c:366
 #, c-format
 msgid "*PCSX*: Loaded State %s"
 msgstr "*PCSX*: Loaded State %s"
 
-#: win32/gui/WndMain.c:367
+#: ../win32/gui/WndMain.c:367
 #, c-format
 msgid "*PCSX*: Error Loading State %s"
 msgstr "*PCSX*: Error Loading State %s"
 
-#: win32/gui/WndMain.c:412
+#: ../win32/gui/WndMain.c:412
 #, c-format
 msgid "*PCSX*: Saved State %s"
 msgstr "*PCSX*: Saved State %s"
 
-#: win32/gui/WndMain.c:413
+#: ../win32/gui/WndMain.c:413
 #, c-format
 msgid "*PCSX*: Error Saving State %s"
 msgstr "*PCSX*: Error Saving State %s"
 
-#: win32/gui/WndMain.c:481
+#: ../win32/gui/WndMain.c:481
 msgid "Running BIOS is not supported with Internal HLE Bios."
 msgstr "內部 HLE BIOS 不支援直接執行。"
 
-#: win32/gui/WndMain.c:758
+#: ../win32/gui/WndMain.c:758
 msgid "Game ID"
 msgstr "遊戲 ID"
 
-#: win32/gui/WndMain.c:764
+#: ../win32/gui/WndMain.c:764
 msgid "Game"
 msgstr "遊戲"
 
-#: win32/gui/WndMain.c:946
+#: ../win32/gui/WndMain.c:946
 msgid "mid link block"
 msgstr "mid link block"
 
-#: win32/gui/WndMain.c:949
+#: ../win32/gui/WndMain.c:949
 msgid "terminiting link block"
 msgstr "terminiting link block"
 
-#: win32/gui/WndMain.c:1054
+#: ../win32/gui/WndMain.c:1054
 msgid "Memcard Manager"
 msgstr "記憶卡管理器"
 
-#: win32/gui/WndMain.c:1058
-#: win32/gui/WndMain.c:1061
+#: ../win32/gui/WndMain.c:1058 ../win32/gui/WndMain.c:1061
 msgid "Select Mcd"
 msgstr "選擇"
 
-#: win32/gui/WndMain.c:1059
-#: win32/gui/WndMain.c:1062
+#: ../win32/gui/WndMain.c:1059 ../win32/gui/WndMain.c:1062
 msgid "Format Mcd"
 msgstr "格式化"
 
-#: win32/gui/WndMain.c:1060
-#: win32/gui/WndMain.c:1063
+#: ../win32/gui/WndMain.c:1060 ../win32/gui/WndMain.c:1063
 msgid "Reload Mcd"
 msgstr "重新加載"
 
-#: win32/gui/WndMain.c:1064
+#: ../win32/gui/WndMain.c:1064
 msgid "-> Copy ->"
 msgstr "-> 複制 ->"
 
-#: win32/gui/WndMain.c:1065
+#: ../win32/gui/WndMain.c:1065
 msgid "<- Copy <-"
 msgstr "<- 複制 <-"
 
-#: win32/gui/WndMain.c:1066
+#: ../win32/gui/WndMain.c:1066
 msgid "Paste"
 msgstr "粘貼"
 
-#: win32/gui/WndMain.c:1067
+#: ../win32/gui/WndMain.c:1067
 msgid "<- Un/Delete"
 msgstr "<- 刪除/恢複"
 
-#: win32/gui/WndMain.c:1068
+#: ../win32/gui/WndMain.c:1068
 msgid "Un/Delete ->"
 msgstr "刪除/恢複 ->"
 
-#: win32/gui/WndMain.c:1070
+#: ../win32/gui/WndMain.c:1070
 msgid "Memory Card 1"
 msgstr "記憶卡 1"
 
-#: win32/gui/WndMain.c:1071
+#: ../win32/gui/WndMain.c:1071
 msgid "Memory Card 2"
 msgstr "記憶卡 2"
 
-#: win32/gui/WndMain.c:1126
+#: ../win32/gui/WndMain.c:1126
 msgid "Are you sure you want to paste this selection?"
 msgstr "是否確認粘貼此選中內容?"
 
-#: win32/gui/WndMain.c:1126
-#: win32/gui/WndMain.c:1237
-#: win32/gui/WndMain.c:1244
+#: ../win32/gui/WndMain.c:1126 ../win32/gui/WndMain.c:1237
+#: ../win32/gui/WndMain.c:1244
 msgid "Confirmation"
 msgstr "確認"
 
-#: win32/gui/WndMain.c:1237
-#: win32/gui/WndMain.c:1244
+#: ../win32/gui/WndMain.c:1237 ../win32/gui/WndMain.c:1244
 msgid "Are you sure you want to format this Memory Card?"
 msgstr "是否確認格式化此記憶卡?"
 
-#: win32/gui/WndMain.c:1290
+#: ../win32/gui/WndMain.c:1290
 msgid "Cpu Config"
 msgstr "CPU 設定"
 
-#: win32/gui/WndMain.c:1295
+#: ../win32/gui/WndMain.c:1295
 msgid "Disable Xa Decoding"
 msgstr "禁用 XA 解碼"
 
-#: win32/gui/WndMain.c:1296
+#: ../win32/gui/WndMain.c:1296
 msgid "Sio Irq Always Enabled"
 msgstr "SIO IRQ 總是開啟"
 
-#: win32/gui/WndMain.c:1297
+#: ../win32/gui/WndMain.c:1297
 msgid "Black && White Movies"
 msgstr "黑白電影"
 
-#: win32/gui/WndMain.c:1298
+#: ../win32/gui/WndMain.c:1298
 msgid "Disable Cd audio"
 msgstr "禁用 CD 音頻"
 
-#: win32/gui/WndMain.c:1300
+#: ../win32/gui/WndMain.c:1300
 msgid "Enable Interpreter Cpu"
 msgstr "開啟解釋執行 CPU"
 
-#: win32/gui/WndMain.c:1303
+#: ../win32/gui/WndMain.c:1303
 msgid "Spu Irq Always Enabled"
 msgstr "SPU IRQ 總是開啟"
 
-#: win32/gui/WndMain.c:1308
+#: ../win32/gui/WndMain.c:1308
 msgid "Psx System Type"
 msgstr "PS 系統類型"
 
-#: win32/gui/WndMain.c:1412
+#: ../win32/gui/WndMain.c:1412
 msgid "Psx Mcd Format (*.mcr;*.mc;*.mem;*.vgs;*.mcd;*.gme;*.ddf)"
 msgstr "PS 記憶卡格式 (*.mcr;*.mc;*.mem;*.vgs;*.mcd;*.gme;*.ddf)"
 
-#: win32/gui/WndMain.c:1417
+#: ../win32/gui/WndMain.c:1417
 msgid "Psx Memory Card (*.mcr;*.mc)"
 msgstr "PS 記憶卡 (*.mcr;*.mc)"
 
-#: win32/gui/WndMain.c:1422
+#: ../win32/gui/WndMain.c:1422
 msgid "CVGS Memory Card (*.mem;*.vgs)"
 msgstr "VGS 記憶卡 (*.mem;*.vgs)"
 
-#: win32/gui/WndMain.c:1427
+#: ../win32/gui/WndMain.c:1427
 msgid "Bleem Memory Card (*.mcd)"
 msgstr "Bleem 記憶卡 (*.mcd)"
 
-#: win32/gui/WndMain.c:1432
+#: ../win32/gui/WndMain.c:1432
 msgid "DexDrive Memory Card (*.gme)"
 msgstr "DexDrive 記憶卡 (*.gme)"
 
-#: win32/gui/WndMain.c:1437
+#: ../win32/gui/WndMain.c:1437
 msgid "DataDeck Memory Card (*.ddf)"
 msgstr "DataDeck 記憶卡 (*.ddl)"
 
-#: win32/gui/WndMain.c:1481
+#: ../win32/gui/WndMain.c:1481
 msgid "Psx Exe Format"
 msgstr "PS EXE 格式"
 
-#: win32/gui/WndMain.c:1518
+#: ../win32/gui/WndMain.c:1518
 msgid "Psx Isos (*.iso;*.mdf;*.img;*.bin)"
 msgstr "PS 鏡像檔 (*.iso;*.mdf;*.img;*.bin)"
 
-#: win32/gui/WndMain.c:1594
+#: ../win32/gui/WndMain.c:1594
 msgid "&File"
 msgstr "檔案(&F)"
 
-#: win32/gui/WndMain.c:1595
+#: ../win32/gui/WndMain.c:1595
 msgid "E&xit"
 msgstr "離開(&X)"
 
-#: win32/gui/WndMain.c:1597
+#: ../win32/gui/WndMain.c:1597
 msgid "Run &EXE..."
 msgstr "執行 EXE(&E)..."
 
-#: win32/gui/WndMain.c:1598
+#: ../win32/gui/WndMain.c:1598
 msgid "Run &BIOS"
 msgstr "執行 BIOS(&B)"
 
-#: win32/gui/WndMain.c:1599
+#: ../win32/gui/WndMain.c:1599
 msgid "Run &ISO..."
 msgstr "執行 ISO(&I)..."
 
-#: win32/gui/WndMain.c:1600
+#: ../win32/gui/WndMain.c:1600
 msgid "Run &CD"
 msgstr "執行光碟(&C)"
 
-#: win32/gui/WndMain.c:1602
+#: ../win32/gui/WndMain.c:1602
 msgid "&Emulator"
 msgstr "模擬器(&E)"
 
-#: win32/gui/WndMain.c:1603
+#: ../win32/gui/WndMain.c:1603
 msgid "&States"
 msgstr "記錄(&S)"
 
-#: win32/gui/WndMain.c:1605
+#: ../win32/gui/WndMain.c:1605
 msgid "S&witch ISO..."
 msgstr "更換 ISO(&W)..."
 
-#: win32/gui/WndMain.c:1607
+#: ../win32/gui/WndMain.c:1607
 msgid "Re&set"
 msgstr "複位(&S)"
 
-#: win32/gui/WndMain.c:1608
+#: ../win32/gui/WndMain.c:1608
 msgid "&Run"
 msgstr "執行(&R)"
 
-#: win32/gui/WndMain.c:1609
+#: ../win32/gui/WndMain.c:1609
 msgid "&Save"
 msgstr "存儲(&S)"
 
-#: win32/gui/WndMain.c:1610
+#: ../win32/gui/WndMain.c:1610
 msgid "&Load"
 msgstr "讀取(&L)"
 
-#: win32/gui/WndMain.c:1611
-#: win32/gui/WndMain.c:1621
+#: ../win32/gui/WndMain.c:1611 ../win32/gui/WndMain.c:1621
 msgid "&Other..."
 msgstr "其它(&O)..."
 
-#: win32/gui/WndMain.c:1612
-#: win32/gui/WndMain.c:1622
+#: ../win32/gui/WndMain.c:1612 ../win32/gui/WndMain.c:1622
 msgid "Slot &9"
 msgstr "記錄 9(&9)"
 
-#: win32/gui/WndMain.c:1613
-#: win32/gui/WndMain.c:1623
+#: ../win32/gui/WndMain.c:1613 ../win32/gui/WndMain.c:1623
 msgid "Slot &8"
 msgstr "記錄 8(&8)"
 
-#: win32/gui/WndMain.c:1614
-#: win32/gui/WndMain.c:1624
+#: ../win32/gui/WndMain.c:1614 ../win32/gui/WndMain.c:1624
 msgid "Slot &7"
 msgstr "記錄 7(&7)"
 
-#: win32/gui/WndMain.c:1615
-#: win32/gui/WndMain.c:1625
+#: ../win32/gui/WndMain.c:1615 ../win32/gui/WndMain.c:1625
 msgid "Slot &6"
 msgstr "記錄 6(&6)"
 
-#: win32/gui/WndMain.c:1616
-#: win32/gui/WndMain.c:1626
+#: ../win32/gui/WndMain.c:1616 ../win32/gui/WndMain.c:1626
 msgid "Slot &5"
 msgstr "記錄 5(&5)"
 
-#: win32/gui/WndMain.c:1617
-#: win32/gui/WndMain.c:1627
+#: ../win32/gui/WndMain.c:1617 ../win32/gui/WndMain.c:1627
 msgid "Slot &4"
 msgstr "記錄 4(&4)"
 
-#: win32/gui/WndMain.c:1618
-#: win32/gui/WndMain.c:1628
+#: ../win32/gui/WndMain.c:1618 ../win32/gui/WndMain.c:1628
 msgid "Slot &3"
 msgstr "記錄 3(&3)"
 
-#: win32/gui/WndMain.c:1619
-#: win32/gui/WndMain.c:1629
+#: ../win32/gui/WndMain.c:1619 ../win32/gui/WndMain.c:1629
 msgid "Slot &2"
 msgstr "記錄 2(&2)"
 
-#: win32/gui/WndMain.c:1620
-#: win32/gui/WndMain.c:1630
+#: ../win32/gui/WndMain.c:1620 ../win32/gui/WndMain.c:1630
 msgid "Slot &1"
 msgstr "記錄 1(&1)"
 
-#: win32/gui/WndMain.c:1632
+#: ../win32/gui/WndMain.c:1632
 msgid "&Configuration"
 msgstr "設定(&C)"
 
-#: win32/gui/WndMain.c:1633
+#: ../win32/gui/WndMain.c:1633
 msgid "Cheat &Search..."
 msgstr "搜尋金手指碼(&S)..."
 
-#: win32/gui/WndMain.c:1634
+#: ../win32/gui/WndMain.c:1634
 msgid "Ch&eat Code..."
 msgstr "金手指碼(&E)..."
 
-#: win32/gui/WndMain.c:1637
+#: ../win32/gui/WndMain.c:1637
 msgid "&Language"
 msgstr "語言(&L)"
 
-#: win32/gui/WndMain.c:1662
+#: ../win32/gui/WndMain.c:1662
 msgid "&Memory cards..."
 msgstr "記憶卡(&M)..."
 
-#: win32/gui/WndMain.c:1663
+#: ../win32/gui/WndMain.c:1663
 msgid "C&PU..."
 msgstr "CPU(&P)..."
 
-#: win32/gui/WndMain.c:1665
+#: ../win32/gui/WndMain.c:1665
 msgid "&NetPlay..."
 msgstr "聯線遊戲(&N)..."
 
-#: win32/gui/WndMain.c:1667
+#: ../win32/gui/WndMain.c:1667
 msgid "&Controllers..."
 msgstr "控制器(&C)..."
 
-#: win32/gui/WndMain.c:1668
+#: ../win32/gui/WndMain.c:1668
 msgid "CD-&ROM..."
 msgstr "CD-ROM(&R)..."
 
-#: win32/gui/WndMain.c:1669
+#: ../win32/gui/WndMain.c:1669
 msgid "&Sound..."
 msgstr "聲音(&S)..."
 
-#: win32/gui/WndMain.c:1670
+#: ../win32/gui/WndMain.c:1670
 msgid "&Graphics..."
 msgstr "圖像(&G)..."
 
-#: win32/gui/WndMain.c:1672
+#: ../win32/gui/WndMain.c:1672
 msgid "&Plugins && Bios..."
 msgstr "外掛及 BIOS(&P)..."
 
-#: win32/gui/WndMain.c:1674
+#: ../win32/gui/WndMain.c:1674
 msgid "&Help"
 msgstr "說明(&H)"
 
-#: win32/gui/WndMain.c:1675
+#: ../win32/gui/WndMain.c:1675
 msgid "&About..."
 msgstr "關於(&A)..."
 
-#: win32/gui/WndMain.c:1863
+#: ../win32/gui/WndMain.c:1863
 msgid "Pcsx Msg"
 msgstr "Pcsx 消息"
 
-#: win32/gui/WndMain.c:1866
+#: ../win32/gui/WndMain.c:1866
 msgid "Error Loading Symbol"
 msgstr "無法加載符號"
 
-#~ msgid "COFF files not supported.\n"
-#~ msgstr "COFF 檔案不被支援.\n"
+#~ msgid "P.E.Op.S. MesaGL PSX GPU configuration..."
+#~ msgstr "P.E.Op.S. MesaGL PSX GPU 配置..."
 
-#~ msgid "OpenGL Driver configuration"
-#~ msgstr "OpenGL 驅動程式設定"
+#~ msgid "Scanlines"
+#~ msgstr "掃描線"
 
-#~ msgid "0: don't care - Use driver's default textures"
-#~ msgstr "0: 不設定 - 使用驅動程式缺省紋理"
+#~ msgid "80: PC fps calculation"
+#~ msgstr "PC fps 計算"
 
-#~ msgid "0: None"
-#~ msgstr "0: 無"
+#~ msgid "100: Old frame skipping"
+#~ msgstr "老式跳幀"
+
+#~ msgid "1000: Odd/even hack"
+#~ msgstr "奇偶位修正"
 
-#~ msgid "1: Standard - Glitches will happen"
-#~ msgstr "1: 標準 - 可能有問題"
+#~ msgid "10000: unused"
+#~ msgstr "未使用"
 
-#~ msgid "2: Extended - No black borders"
-#~ msgstr "2: 擴展 - 無黑色邊緣"
+#~ msgid "20000: fake 'gpu busy'"
+#~ msgstr "欺騙 'gpu 忙'"
 
-#~ msgid "0: None (standard)"
-#~ msgstr "0: 無 (標準)"
+#~ msgid "Coded by: Pete Bernert"
+#~ msgstr "Pete Bernert"
 
-#~ msgid "4: Full Software (FVP)"
-#~ msgstr "4: 全軟體 (FVP)"
+#~ msgid "Release date: 01.04.2009"
+#~ msgstr "發佈日期: 01.04.2009"
+
+#~ msgid "http://www.pbernert.com"
+#~ msgstr "網址: http://www.pbernert.com"
+
+#~ msgid "COFF files not supported.\n"
+#~ msgstr "COFF 檔案不被支援.\n"
+
+#~ msgid "0: None"
+#~ msgstr "0: 無"
 
 #~ msgid "Adapted from P.E.Op.S OpenGL GPU by Pete Bernert"
 #~ msgstr "基於由 Pete Bernert 編寫的 P.E.Op.S OpenGL GPU"