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

9 files changed, 615 insertions, 650 deletions

diff --git a/data/pcsx.glade2 b/data/pcsx.glade2
index 9a8deb91..eafaff38 100644
--- a/data/pcsx.glade2
+++ b/data/pcsx.glade2
@@ -428,7 +428,7 @@
                     </child>
                     <child>
                       <widget class="GtkImageMenuItem" id="pad1">
-                        <property name="label" translatable="yes">Controller _1...</property>
+                        <property name="label" translatable="yes">C_ontrollers...</property>
                         <property name="visible">True</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">False</property>
@@ -442,21 +442,6 @@
                       </widget>
                     </child>
                     <child>
-                      <widget class="GtkImageMenuItem" id="pad2">
-                        <property name="label" translatable="yes">Controller _2...</property>
-                        <property name="visible">True</property>
-                        <property name="use_underline">True</property>
-                        <property name="use_stock">False</property>
-                        <child internal-child="image">
-                          <widget class="GtkImage" id="image25">
-                            <property name="visible">True</property>
-                            <property name="stock">gtk-execute</property>
-                            <property name="icon-size">1</property>
-                          </widget>
-                        </child>
-                      </widget>
-                    </child>
-                    <child>
                       <widget class="GtkSeparatorMenuItem" id="separator7">
                         <property name="visible">True</property>
                       </widget>
diff --git a/gui/Gtk2Gui.c b/gui/Gtk2Gui.c
index 4764c3ed..2f9b56f1 100644
--- a/gui/Gtk2Gui.c
+++ b/gui/Gtk2Gui.c
@@ -65,8 +65,7 @@ void OnEmu_SwitchImage();
 void OnConf_Graphics();
 void OnConf_Sound();
 void OnConf_CdRom();
-void OnConf_Pad1();
-void OnConf_Pad2();
+void OnConf_Pad();
 void OnConf_Mcds();
 void OnConf_Cpu();
 void OnConf_Net();
@@ -352,10 +351,7 @@ void StartGui() {
 			GTK_SIGNAL_FUNC(OnConf_CdRom), NULL, NULL, G_CONNECT_AFTER);
 	widget = glade_xml_get_widget(xml, "pad1");
 	g_signal_connect_data(GTK_OBJECT(widget), "activate",
-			GTK_SIGNAL_FUNC(OnConf_Pad1), NULL, NULL, G_CONNECT_AFTER);
-	widget = glade_xml_get_widget(xml, "pad2");
-	g_signal_connect_data(GTK_OBJECT(widget), "activate",
-			GTK_SIGNAL_FUNC(OnConf_Pad2), NULL, NULL, G_CONNECT_AFTER);
+			GTK_SIGNAL_FUNC(OnConf_Pad), NULL, NULL, G_CONNECT_AFTER);
 	widget = glade_xml_get_widget(xml, "cpu1");
 	g_signal_connect_data(GTK_OBJECT(widget), "activate",
 			GTK_SIGNAL_FUNC(OnConf_Cpu), NULL, NULL, G_CONNECT_AFTER);
@@ -1568,7 +1564,7 @@ void OnConf_CdRom() {
 	SysCloseLibrary(drv);
 }
 
-void OnConf_Pad1() {
+void OnConf_Pad() {
 	void *drv;
 	PADconfigure conf;
 	char Plugin[MAXPATHLEN];
@@ -1587,27 +1583,21 @@ void OnConf_Pad1() {
 		SysInfoMessage (_("No configuration required"), _("This plugin doesn't need to be configured."));
 
 	SysCloseLibrary(drv);
-}
 
-void OnConf_Pad2() {
-	void *drv;
-	PADconfigure conf;
-	char Plugin[MAXPATHLEN];
+	if (strcmp(Config.Pad1, Config.Pad2) != 0) {
+		sprintf(Plugin, "%s/%s", Config.PluginsDir, Config.Pad2);
+		drv = SysLoadLibrary(Plugin);
+		if (drv == NULL) { printf("Error with file %s\n", Plugin); return; }
 
-	sprintf(Plugin, "%s/%s", Config.PluginsDir, Config.Pad2);
-	drv = SysLoadLibrary(Plugin);
-	if (drv == NULL) { printf("Error with file %s\n", Plugin); return; }
+		while (gtk_events_pending()) gtk_main_iteration();
 
-	while (gtk_events_pending()) gtk_main_iteration();
+		conf = (GPUconfigure)SysLoadSym(drv, "PADconfigure");
+		if (conf != NULL) {
+			conf();
+		}
 
-	conf = (GPUconfigure)SysLoadSym(drv, "PADconfigure");
-	if (conf != NULL) {
-		conf();
+		SysCloseLibrary(drv);
 	}
-	else
-		SysInfoMessage (_("No configuration required"), _("This plugin doesn't need to be configured."));
-
-	SysCloseLibrary(drv);
 }
 
 void OnConf_Mcds() {
diff --git a/po/pcsx.pot b/po/pcsx.pot
index 7e3eb1a9..5d1c554f 100644
--- a/po/pcsx.pot
+++ b/po/pcsx.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-26 13:18+0800\n"
+"POT-Creation-Date: 2009-10-01 18:26+0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -95,7 +95,7 @@ msgstr ""
 msgid "Add New Cheat"
 msgstr ""
 
-#: ../win32/gui/CheatDlg.c:167 ../data/pcsx.glade2:2347
+#: ../win32/gui/CheatDlg.c:167 ../data/pcsx.glade2:2332
 msgid "Edit Cheat Codes"
 msgstr ""
 
@@ -207,7 +207,7 @@ msgstr ""
 msgid "Founded Addresses: %d"
 msgstr ""
 
-#: ../win32/gui/CheatDlg.c:505 ../data/pcsx.glade2:2744
+#: ../win32/gui/CheatDlg.c:505 ../data/pcsx.glade2:2729
 msgid "Freeze"
 msgstr ""
 
@@ -216,7 +216,7 @@ msgid "Address:"
 msgstr ""
 
 #: ../win32/gui/CheatDlg.c:507 ../win32/gui/CheatDlg.c:598
-#: ../win32/gui/CheatDlg.c:683 ../gui/Cheat.c:644 ../data/pcsx.glade2:2588
+#: ../win32/gui/CheatDlg.c:683 ../gui/Cheat.c:644 ../data/pcsx.glade2:2573
 msgid "Value:"
 msgstr ""
 
@@ -225,27 +225,27 @@ msgstr ""
 msgid "Freeze %.8X"
 msgstr ""
 
-#: ../win32/gui/CheatDlg.c:596 ../data/pcsx.glade2:2780
+#: ../win32/gui/CheatDlg.c:596 ../data/pcsx.glade2:2765
 msgid "Modify"
 msgstr ""
 
-#: ../win32/gui/CheatDlg.c:679 ../gui/Cheat.c:1126 ../data/pcsx.glade2:2517
+#: ../win32/gui/CheatDlg.c:679 ../gui/Cheat.c:1126 ../data/pcsx.glade2:2502
 msgid "Cheat Search"
 msgstr ""
 
-#: ../win32/gui/CheatDlg.c:681 ../data/pcsx.glade2:2566
+#: ../win32/gui/CheatDlg.c:681 ../data/pcsx.glade2:2551
 msgid "Search For:"
 msgstr ""
 
-#: ../win32/gui/CheatDlg.c:682 ../data/pcsx.glade2:2576
+#: ../win32/gui/CheatDlg.c:682 ../data/pcsx.glade2:2561
 msgid "Data Type:"
 msgstr ""
 
-#: ../win32/gui/CheatDlg.c:684 ../data/pcsx.glade2:2600
+#: ../win32/gui/CheatDlg.c:684 ../data/pcsx.glade2:2585
 msgid "Data Base:"
 msgstr ""
 
-#: ../win32/gui/CheatDlg.c:685 ../data/pcsx.glade2:2660
+#: ../win32/gui/CheatDlg.c:685 ../data/pcsx.glade2:2645
 msgid "To:"
 msgstr ""
 
@@ -615,13 +615,13 @@ msgstr ""
 msgid "*PCSX*: Error Saving State %s"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:426 ../win32/gui/WndMain.c:475 ../gui/Gtk2Gui.c:574
-#: ../gui/Gtk2Gui.c:701
+#: ../win32/gui/WndMain.c:426 ../win32/gui/WndMain.c:475 ../gui/Gtk2Gui.c:580
+#: ../gui/Gtk2Gui.c:707
 msgid "The CD does not appear to be a valid Playstation CD"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:432 ../win32/gui/WndMain.c:481 ../gui/Gtk2Gui.c:582
-#: ../gui/Gtk2Gui.c:709
+#: ../win32/gui/WndMain.c:432 ../win32/gui/WndMain.c:481 ../gui/Gtk2Gui.c:588
+#: ../gui/Gtk2Gui.c:715
 msgid "Could not load CD-ROM!"
 msgstr ""
 
@@ -629,11 +629,11 @@ msgstr ""
 msgid "Running BIOS is not supported with Internal HLE Bios."
 msgstr ""
 
-#: ../win32/gui/WndMain.c:661 ../gui/Gtk2Gui.c:1074
+#: ../win32/gui/WndMain.c:661 ../gui/Gtk2Gui.c:1080
 msgid "Title"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:667 ../gui/Gtk2Gui.c:1080
+#: ../win32/gui/WndMain.c:667 ../gui/Gtk2Gui.c:1086
 msgid "Status"
 msgstr ""
 
@@ -653,16 +653,16 @@ msgstr ""
 msgid "terminiting link block"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:864 ../gui/Gtk2Gui.c:1154
+#: ../win32/gui/WndMain.c:864 ../gui/Gtk2Gui.c:1160
 msgid "Deleted"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:865 ../win32/gui/WndMain.c:868 ../gui/Gtk2Gui.c:1156
-#: ../gui/Gtk2Gui.c:1160
+#: ../win32/gui/WndMain.c:865 ../win32/gui/WndMain.c:868 ../gui/Gtk2Gui.c:1162
+#: ../gui/Gtk2Gui.c:1166
 msgid "Free"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:867 ../gui/Gtk2Gui.c:1158
+#: ../win32/gui/WndMain.c:867 ../gui/Gtk2Gui.c:1164
 msgid "Used"
 msgstr ""
 
@@ -743,7 +743,7 @@ msgstr ""
 msgid "Disable Cd audio"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1206 ../data/pcsx.glade2:1442
+#: ../win32/gui/WndMain.c:1206 ../data/pcsx.glade2:1427
 msgid "Autodetect"
 msgstr ""
 
@@ -751,7 +751,7 @@ msgstr ""
 msgid "Enable Interpreter Cpu"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1208 ../data/pcsx.glade2:1298
+#: ../win32/gui/WndMain.c:1208 ../data/pcsx.glade2:1283
 msgid "Enable Console Output"
 msgstr ""
 
@@ -759,11 +759,11 @@ msgstr ""
 msgid "Spu Irq Always Enabled"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1210 ../data/pcsx.glade2:1385
+#: ../win32/gui/WndMain.c:1210 ../data/pcsx.glade2:1370
 msgid "Parasite Eve 2, Vandal Hearts 1/2 Fix"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1211 ../data/pcsx.glade2:1400
+#: ../win32/gui/WndMain.c:1211 ../data/pcsx.glade2:1385
 msgid "InuYasha Sengoku Battle Fix"
 msgstr ""
 
@@ -800,7 +800,7 @@ msgid "DataDeck Memory Card (*.ddf)"
 msgstr ""
 
 #: ../win32/gui/WndMain.c:1316 ../win32/gui/WndMain.c:1397 ../gui/Cheat.c:319
-#: ../gui/Gtk2Gui.c:510 ../gui/Gtk2Gui.c:652
+#: ../gui/Gtk2Gui.c:516 ../gui/Gtk2Gui.c:658
 msgid "All Files"
 msgstr ""
 
@@ -821,71 +821,71 @@ msgid "E&xit"
 msgstr ""
 
 #: ../win32/gui/WndMain.c:1471
-msgid "&States"
-msgstr ""
-
-#: ../win32/gui/WndMain.c:1473
 msgid "Run &EXE..."
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1474
+#: ../win32/gui/WndMain.c:1472
 msgid "Run &BIOS"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1475
+#: ../win32/gui/WndMain.c:1473
 msgid "Run &ISO..."
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1476
+#: ../win32/gui/WndMain.c:1474
 msgid "Run &CD"
 msgstr ""
 
+#: ../win32/gui/WndMain.c:1476
+msgid "&Emulator"
+msgstr ""
+
 #: ../win32/gui/WndMain.c:1477
-msgid "&Save"
+msgid "&States"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1478
-msgid "&Load"
+#: ../win32/gui/WndMain.c:1479
+msgid "S&witch ISO..."
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1479 ../win32/gui/WndMain.c:1485
-msgid "&Other..."
+#: ../win32/gui/WndMain.c:1481
+msgid "Re&set"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1480 ../win32/gui/WndMain.c:1486
-msgid "Slot &5"
+#: ../win32/gui/WndMain.c:1482
+msgid "&Run"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1481 ../win32/gui/WndMain.c:1487
-msgid "Slot &4"
+#: ../win32/gui/WndMain.c:1483
+msgid "&Save"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1482 ../win32/gui/WndMain.c:1488
-msgid "Slot &3"
+#: ../win32/gui/WndMain.c:1484
+msgid "&Load"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1483 ../win32/gui/WndMain.c:1489
-msgid "Slot &2"
+#: ../win32/gui/WndMain.c:1485 ../win32/gui/WndMain.c:1491
+msgid "&Other..."
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1484 ../win32/gui/WndMain.c:1490
-msgid "Slot &1"
+#: ../win32/gui/WndMain.c:1486 ../win32/gui/WndMain.c:1492
+msgid "Slot &5"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1492
-msgid "&Emulator"
+#: ../win32/gui/WndMain.c:1487 ../win32/gui/WndMain.c:1493
+msgid "Slot &4"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1493
-msgid "S&witch ISO..."
+#: ../win32/gui/WndMain.c:1488 ../win32/gui/WndMain.c:1494
+msgid "Slot &3"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1495
-msgid "Re&set"
+#: ../win32/gui/WndMain.c:1489 ../win32/gui/WndMain.c:1495
+msgid "Slot &2"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:1496
-msgid "&Run"
+#: ../win32/gui/WndMain.c:1490 ../win32/gui/WndMain.c:1496
+msgid "Slot &1"
 msgstr ""
 
 #: ../win32/gui/WndMain.c:1498
@@ -972,8 +972,8 @@ msgstr ""
 msgid "All Files (*.*)"
 msgstr ""
 
-#: ../gui/Cheat.c:392 ../gui/Cheat.c:1121 ../gui/Gtk2Gui.c:398
-#: ../gui/Gtk2Gui.c:1026
+#: ../gui/Cheat.c:392 ../gui/Cheat.c:1121 ../gui/Gtk2Gui.c:404
+#: ../gui/Gtk2Gui.c:1032
 msgid "Error: Glade interface could not be loaded!"
 msgstr ""
 
@@ -1001,111 +1001,111 @@ msgstr ""
 msgid "Search Results"
 msgstr ""
 
-#: ../gui/Gtk2Gui.c:406 ../data/pcsx.glade2:620
+#: ../gui/Gtk2Gui.c:412 ../data/pcsx.glade2:605
 msgid "Configure PCSX"
 msgstr ""
 
-#: ../gui/Gtk2Gui.c:492
+#: ../gui/Gtk2Gui.c:498
 msgid "Select PSX EXE File"
 msgstr ""
 
-#: ../gui/Gtk2Gui.c:506
+#: ../gui/Gtk2Gui.c:512
 msgid "PlayStation Executable Files"
 msgstr ""
 
-#: ../gui/Gtk2Gui.c:543
+#: ../gui/Gtk2Gui.c:549
 msgid "Not a valid PSX file"
 msgstr ""
 
-#: ../gui/Gtk2Gui.c:543
+#: ../gui/Gtk2Gui.c:549
 msgid "The file does not appear to be a valid Playstation executable"
 msgstr ""
 
-#: ../gui/Gtk2Gui.c:574 ../gui/Gtk2Gui.c:701
+#: ../gui/Gtk2Gui.c:580 ../gui/Gtk2Gui.c:707
 msgid "CD ROM failed"
 msgstr ""
 
-#: ../gui/Gtk2Gui.c:582
+#: ../gui/Gtk2Gui.c:588
 msgid "The CD ROM could not be loaded"
 msgstr ""
 
-#: ../gui/Gtk2Gui.c:597
+#: ../gui/Gtk2Gui.c:603
 msgid "Could not run BIOS"
 msgstr ""
 
-#: ../gui/Gtk2Gui.c:597
+#: ../gui/Gtk2Gui.c:603
 msgid "Running BIOS is not supported with Internal HLE BIOS."
 msgstr ""
 
-#: ../gui/Gtk2Gui.c:627
+#: ../gui/Gtk2Gui.c:633
 msgid "Open PSX Disc Image File"
 msgstr ""
 
-#: ../gui/Gtk2Gui.c:647
+#: ../gui/Gtk2Gui.c:653
 msgid "PSX Image Files (*.bin, *.img, *.mdf, *.iso)"
 msgstr ""
 
-#: ../gui/Gtk2Gui.c:885
+#: ../gui/Gtk2Gui.c:891
 #, c-format
 msgid "Loaded state %s."
 msgstr ""
 
-#: ../gui/Gtk2Gui.c:890
+#: ../gui/Gtk2Gui.c:896
 #, c-format
 msgid "Error loading state %s!"
 msgstr ""
 
-#: ../gui/Gtk2Gui.c:901
+#: ../gui/Gtk2Gui.c:907
 #, c-format
 msgid "Saved state %s."
 msgstr ""
 
-#: ../gui/Gtk2Gui.c:903
+#: ../gui/Gtk2Gui.c:909
 #, c-format
 msgid "Error saving state %s!"
 msgstr ""
 
-#: ../gui/Gtk2Gui.c:937 ../gui/Gtk2Gui.c:964
+#: ../gui/Gtk2Gui.c:943 ../gui/Gtk2Gui.c:970
 msgid "Select State File"
 msgstr ""
 
-#: ../gui/Gtk2Gui.c:1068
+#: ../gui/Gtk2Gui.c:1074
 msgid "Icon"
 msgstr ""
 
-#: ../gui/Gtk2Gui.c:1086
+#: ../gui/Gtk2Gui.c:1092
 msgid "ID"
 msgstr ""
 
-#: ../gui/Gtk2Gui.c:1092
+#: ../gui/Gtk2Gui.c:1098
 msgid "Name"
 msgstr ""
 
-#: ../gui/Gtk2Gui.c:1252
+#: ../gui/Gtk2Gui.c:1258
 msgid "Format this Memory Card?"
 msgstr ""
 
-#: ../gui/Gtk2Gui.c:1254
+#: ../gui/Gtk2Gui.c:1260
 msgid ""
 "If you format the memory card, the card will be empty, and any existing data "
 "overwritten."
 msgstr ""
 
-#: ../gui/Gtk2Gui.c:1257
+#: ../gui/Gtk2Gui.c:1263
 msgid "Format card"
 msgstr ""
 
-#: ../gui/Gtk2Gui.c:1372
+#: ../gui/Gtk2Gui.c:1378
 msgid "No space available in the target memory card!"
 msgstr ""
 
-#: ../gui/Gtk2Gui.c:1514 ../gui/Gtk2Gui.c:1535 ../gui/Gtk2Gui.c:1556
-#: ../gui/Gtk2Gui.c:1577 ../gui/Gtk2Gui.c:1598 ../gui/Gtk2Gui.c:1889
+#: ../gui/Gtk2Gui.c:1520 ../gui/Gtk2Gui.c:1541 ../gui/Gtk2Gui.c:1562
+#: ../gui/Gtk2Gui.c:1583 ../gui/Gtk2Gui.c:1889
 msgid "No configuration required"
 msgstr ""
 
-#: ../gui/Gtk2Gui.c:1514 ../gui/Gtk2Gui.c:1535 ../gui/Gtk2Gui.c:1556
-#: ../gui/Gtk2Gui.c:1577 ../gui/Gtk2Gui.c:1598 ../gui/Gtk2Gui.c:1889
+#: ../gui/Gtk2Gui.c:1520 ../gui/Gtk2Gui.c:1541 ../gui/Gtk2Gui.c:1562
+#: ../gui/Gtk2Gui.c:1583 ../gui/Gtk2Gui.c:1889
 msgid "This plugin doesn't need to be configured."
 msgstr ""
 
@@ -1167,7 +1167,7 @@ msgstr ""
 msgid "PSX emulator couldn't be initialized.\n"
 msgstr ""
 
-#: ../gui/Plugin.c:204 ../data/pcsx.glade2:1334
+#: ../gui/Plugin.c:204 ../data/pcsx.glade2:1319
 #, c-format
 msgid "SIO IRQ Always Enabled"
 msgstr ""
@@ -1237,7 +1237,7 @@ msgstr ""
 msgid "Error closing GPU plugin!"
 msgstr ""
 
-#: ../libpcsxcore/cdriso.c:528
+#: ../libpcsxcore/cdriso.c:631
 #, c-format
 msgid "Loaded CD Image: %s"
 msgstr ""
@@ -1717,160 +1717,156 @@ msgid "CD-_ROM..."
 msgstr ""
 
 #: ../data/pcsx.glade2:431
-msgid "Controller _1..."
-msgstr ""
-
-#: ../data/pcsx.glade2:446
-msgid "Controller _2..."
+msgid "C_ontrollers..."
 msgstr ""
 
-#: ../data/pcsx.glade2:466
+#: ../data/pcsx.glade2:451
 msgid "_CPU..."
 msgstr ""
 
-#: ../data/pcsx.glade2:482
+#: ../data/pcsx.glade2:467
 msgid "_Memory Cards..."
 msgstr ""
 
-#: ../data/pcsx.glade2:499
+#: ../data/pcsx.glade2:484
 msgid "_Netplay..."
 msgstr ""
 
-#: ../data/pcsx.glade2:520
+#: ../data/pcsx.glade2:505
 msgid "Chea_t"
 msgstr ""
 
-#: ../data/pcsx.glade2:529
+#: ../data/pcsx.glade2:514
 msgid "_Browse..."
 msgstr ""
 
-#: ../data/pcsx.glade2:544
+#: ../data/pcsx.glade2:529
 msgid "_Search..."
 msgstr ""
 
-#: ../data/pcsx.glade2:575
+#: ../data/pcsx.glade2:560
 msgid "_Help"
 msgstr ""
 
-#: ../data/pcsx.glade2:581
+#: ../data/pcsx.glade2:566
 msgid "_About PCSX..."
 msgstr ""
 
-#: ../data/pcsx.glade2:722
+#: ../data/pcsx.glade2:707
 msgid "Select Folder to Search"
 msgstr ""
 
-#: ../data/pcsx.glade2:738
+#: ../data/pcsx.glade2:723
 msgid "Search in:"
 msgstr ""
 
-#: ../data/pcsx.glade2:1011
+#: ../data/pcsx.glade2:996
 msgid "Graphics:"
 msgstr ""
 
-#: ../data/pcsx.glade2:1024
+#: ../data/pcsx.glade2:1009
 msgid "Sound:"
 msgstr ""
 
-#: ../data/pcsx.glade2:1039
+#: ../data/pcsx.glade2:1024
 msgid "Controller 1:   "
 msgstr ""
 
-#: ../data/pcsx.glade2:1054
+#: ../data/pcsx.glade2:1039
 msgid "Controller 2:"
 msgstr ""
 
-#: ../data/pcsx.glade2:1069
+#: ../data/pcsx.glade2:1054
 msgid "CD-ROM:"
 msgstr ""
 
-#: ../data/pcsx.glade2:1107
+#: ../data/pcsx.glade2:1092
 msgid "<b>Plugins</b>"
 msgstr ""
 
-#: ../data/pcsx.glade2:1168
+#: ../data/pcsx.glade2:1153
 msgid "<b>BIOS</b>"
 msgstr ""
 
-#: ../data/pcsx.glade2:1220
+#: ../data/pcsx.glade2:1205
 msgid "Configure CPU"
 msgstr ""
 
-#: ../data/pcsx.glade2:1248
+#: ../data/pcsx.glade2:1233
 msgid "Enable Debugger"
 msgstr ""
 
-#: ../data/pcsx.glade2:1266
+#: ../data/pcsx.glade2:1251
 msgid "SPU IRQ Always Enabled"
 msgstr ""
 
-#: ../data/pcsx.glade2:1282
+#: ../data/pcsx.glade2:1267
 msgid "Black & White Movies"
 msgstr ""
 
-#: ../data/pcsx.glade2:1316
+#: ../data/pcsx.glade2:1301
 msgid "Enable Interpreter CPU"
 msgstr ""
 
-#: ../data/pcsx.glade2:1350
+#: ../data/pcsx.glade2:1335
 msgid "Disable CD Audio"
 msgstr ""
 
-#: ../data/pcsx.glade2:1366
+#: ../data/pcsx.glade2:1351
 msgid "Disable XA Decoding"
 msgstr ""
 
-#: ../data/pcsx.glade2:1418
+#: ../data/pcsx.glade2:1403
 msgid "<b>Options</b>"
 msgstr ""
 
-#: ../data/pcsx.glade2:1459
+#: ../data/pcsx.glade2:1444
 msgid ""
 "NTSC\n"
 "PAL"
 msgstr ""
 
-#: ../data/pcsx.glade2:1473
+#: ../data/pcsx.glade2:1458
 msgid "<b>System Type</b>"
 msgstr ""
 
-#: ../data/pcsx.glade2:1522
+#: ../data/pcsx.glade2:1507
 msgid "Configure NetPlay"
 msgstr ""
 
-#: ../data/pcsx.glade2:1609
+#: ../data/pcsx.glade2:1594
 msgid "<b>NetPlay</b>"
 msgstr ""
 
-#: ../data/pcsx.glade2:1661
+#: ../data/pcsx.glade2:1646
 msgid "Configure Memory Cards"
 msgstr ""
 
-#: ../data/pcsx.glade2:1737 ../data/pcsx.glade2:2133
+#: ../data/pcsx.glade2:1722 ../data/pcsx.glade2:2118
 msgid "Format"
 msgstr ""
 
-#: ../data/pcsx.glade2:1787 ../data/pcsx.glade2:2183
+#: ../data/pcsx.glade2:1772 ../data/pcsx.glade2:2168
 msgid "Reload"
 msgstr ""
 
-#: ../data/pcsx.glade2:1831
+#: ../data/pcsx.glade2:1816
 msgid "<b>Memory Card 1</b>"
 msgstr ""
 
-#: ../data/pcsx.glade2:1891 ../data/pcsx.glade2:1941 ../data/pcsx.glade2:2816
+#: ../data/pcsx.glade2:1876 ../data/pcsx.glade2:1926 ../data/pcsx.glade2:2801
 msgid "Copy"
 msgstr ""
 
-#: ../data/pcsx.glade2:1991 ../data/pcsx.glade2:2041
+#: ../data/pcsx.glade2:1976 ../data/pcsx.glade2:2026
 msgid "Un/Delete"
 msgstr ""
 
-#: ../data/pcsx.glade2:2227
+#: ../data/pcsx.glade2:2212
 msgid "<b>Memory Card 2</b>"
 msgstr ""
 
-#: ../data/pcsx.glade2:2289
+#: ../data/pcsx.glade2:2274
 msgid ""
 "(C) 1999-2003  PCSX Team\n"
 "(C) 2005-2006 Ryan Schultz\n"
@@ -1878,15 +1874,15 @@ msgid ""
 "(C) 2008-2009 Wei Mingzhi"
 msgstr ""
 
-#: ../data/pcsx.glade2:2293
+#: ../data/pcsx.glade2:2278
 msgid "A PlayStation emulator."
 msgstr ""
 
-#: ../data/pcsx.glade2:2295
+#: ../data/pcsx.glade2:2280
 msgid "PCSX Reloaded"
 msgstr ""
 
-#: ../data/pcsx.glade2:2296
+#: ../data/pcsx.glade2:2281
 msgid ""
 "This program is free software; you can redistribute it\n"
 "and/or modify it under the terms of the GNU General\n"
@@ -1905,22 +1901,22 @@ msgid ""
 "the Free Software Foundation, Inc."
 msgstr ""
 
-#: ../data/pcsx.glade2:2325 ../plugins/dfinput/dfinput.glade2:212
+#: ../data/pcsx.glade2:2310 ../plugins/dfinput/dfinput.glade2:212
 msgid "translator-credits"
 msgstr ""
 
-#: ../data/pcsx.glade2:2386
+#: ../data/pcsx.glade2:2371
 msgid "<b>Cheat Codes</b>"
 msgstr ""
 
-#: ../data/pcsx.glade2:2551
+#: ../data/pcsx.glade2:2536
 msgid ""
 "8-bit\n"
 "16-bit\n"
 "32-bit"
 msgstr ""
 
-#: ../data/pcsx.glade2:2614
+#: ../data/pcsx.glade2:2599
 msgid ""
 "Equal Value\n"
 "Not Equal Value\n"
@@ -1933,25 +1929,25 @@ msgid ""
 "No Change"
 msgstr ""
 
-#: ../data/pcsx.glade2:2646
+#: ../data/pcsx.glade2:2631
 msgid ""
 "Decimal\n"
 "Hexadecimal"
 msgstr ""
 
-#: ../data/pcsx.glade2:2849
+#: ../data/pcsx.glade2:2834
 msgid "label_resultsfound"
 msgstr ""
 
-#: ../data/pcsx.glade2:2884
+#: ../data/pcsx.glade2:2869
 msgid "Search"
 msgstr ""
 
-#: ../data/pcsx.glade2:2920
+#: ../data/pcsx.glade2:2905
 msgid "Restart"
 msgstr ""
 
-#: ../data/pcsx.glade2:2949
+#: ../data/pcsx.glade2:2934
 msgid "<b>Cheat Search</b>"
 msgstr ""
 
diff --git a/po/pt_BR.gmo b/po/pt_BR.gmo
index 06fac008..e4b5ff4c 100644
--- a/po/pt_BR.gmo
+++ b/po/pt_BR.gmo
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 03f15ba0..22ccea9d 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -5,8 +5,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pcsx-df\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-26 13:18+0800\n"
-"PO-Revision-Date: 2009-09-26 13:20+0700\n"
+"POT-Creation-Date: 2009-10-01 18:26+0800\n"
+"PO-Revision-Date: 2009-10-01 18:27+0700\n"
 "Last-Translator: Wei Mingzhi <whistler@openoffice.org>\n"
 "Language-Team: PoBRE <romhackers@gmail.com>\n"
 "MIME-Version: 1.0\n"
@@ -127,7 +127,7 @@ msgid "Add New Cheat"
 msgstr "Adicionar nova Trapaça"
 
 #: ../win32/gui/CheatDlg.c:167
-#: ../data/pcsx.glade2:2347
+#: ../data/pcsx.glade2:2332
 msgid "Edit Cheat Codes"
 msgstr "Editar Códigos de Trapaça"
 
@@ -248,7 +248,7 @@ msgid "Founded Addresses: %d"
 msgstr "Endereços com o número: %d"
 
 #: ../win32/gui/CheatDlg.c:505
-#: ../data/pcsx.glade2:2744
+#: ../data/pcsx.glade2:2729
 msgid "Freeze"
 msgstr "Parar"
 
@@ -261,7 +261,7 @@ msgstr "Endereço:"
 #: ../win32/gui/CheatDlg.c:598
 #: ../win32/gui/CheatDlg.c:683
 #: ../gui/Cheat.c:644
-#: ../data/pcsx.glade2:2588
+#: ../data/pcsx.glade2:2573
 msgid "Value:"
 msgstr "Valor:"
 
@@ -271,33 +271,33 @@ msgid "Freeze %.8X"
 msgstr "Parar %.8X"
 
 #: ../win32/gui/CheatDlg.c:596
-#: ../data/pcsx.glade2:2780
+#: ../data/pcsx.glade2:2765
 msgid "Modify"
 msgstr "Modificar"
 
 #: ../win32/gui/CheatDlg.c:679
 #: ../gui/Cheat.c:1126
-#: ../data/pcsx.glade2:2517
+#: ../data/pcsx.glade2:2502
 msgid "Cheat Search"
 msgstr "Procurar por trapaça"
 
 #: ../win32/gui/CheatDlg.c:681
-#: ../data/pcsx.glade2:2566
+#: ../data/pcsx.glade2:2551
 msgid "Search For:"
 msgstr "Buscar por:"
 
 #: ../win32/gui/CheatDlg.c:682
-#: ../data/pcsx.glade2:2576
+#: ../data/pcsx.glade2:2561
 msgid "Data Type:"
 msgstr "Tipo de dados:"
 
 #: ../win32/gui/CheatDlg.c:684
-#: ../data/pcsx.glade2:2600
+#: ../data/pcsx.glade2:2585
 msgid "Data Base:"
 msgstr "Banco de dados:"
 
 #: ../win32/gui/CheatDlg.c:685
-#: ../data/pcsx.glade2:2660
+#: ../data/pcsx.glade2:2645
 msgid "To:"
 msgstr "Para:"
 
@@ -687,15 +687,15 @@ msgstr "PCSX: Erro ao salvar o arquivo de estado \"%s\"!"
 
 #: ../win32/gui/WndMain.c:426
 #: ../win32/gui/WndMain.c:475
-#: ../gui/Gtk2Gui.c:574
-#: ../gui/Gtk2Gui.c:701
+#: ../gui/Gtk2Gui.c:580
+#: ../gui/Gtk2Gui.c:707
 msgid "The CD does not appear to be a valid Playstation CD"
 msgstr "Esse CD não parece ser um CD de PlayStation!"
 
 #: ../win32/gui/WndMain.c:432
 #: ../win32/gui/WndMain.c:481
-#: ../gui/Gtk2Gui.c:582
-#: ../gui/Gtk2Gui.c:709
+#: ../gui/Gtk2Gui.c:588
+#: ../gui/Gtk2Gui.c:715
 msgid "Could not load CD-ROM!"
 msgstr "Não pôde carregar o CDROM!"
 
@@ -704,12 +704,12 @@ msgid "Running BIOS is not supported with Internal HLE Bios."
 msgstr "Iniciar pela BIOS não é suportado com a BIOS HLE interna."
 
 #: ../win32/gui/WndMain.c:661
-#: ../gui/Gtk2Gui.c:1074
+#: ../gui/Gtk2Gui.c:1080
 msgid "Title"
 msgstr "Título"
 
 #: ../win32/gui/WndMain.c:667
-#: ../gui/Gtk2Gui.c:1080
+#: ../gui/Gtk2Gui.c:1086
 msgid "Status"
 msgstr "Estado"
 
@@ -730,19 +730,19 @@ msgid "terminiting link block"
 msgstr "bloco final da ligação"
 
 #: ../win32/gui/WndMain.c:864
-#: ../gui/Gtk2Gui.c:1154
+#: ../gui/Gtk2Gui.c:1160
 msgid "Deleted"
 msgstr "Apagado"
 
 #: ../win32/gui/WndMain.c:865
 #: ../win32/gui/WndMain.c:868
-#: ../gui/Gtk2Gui.c:1156
-#: ../gui/Gtk2Gui.c:1160
+#: ../gui/Gtk2Gui.c:1162
+#: ../gui/Gtk2Gui.c:1166
 msgid "Free"
 msgstr "Liberado"
 
 #: ../win32/gui/WndMain.c:867
-#: ../gui/Gtk2Gui.c:1158
+#: ../gui/Gtk2Gui.c:1164
 msgid "Used"
 msgstr "Usado"
 
@@ -829,7 +829,7 @@ msgid "Disable Cd audio"
 msgstr "Desativar áudio de CD"
 
 #: ../win32/gui/WndMain.c:1206
-#: ../data/pcsx.glade2:1442
+#: ../data/pcsx.glade2:1427
 msgid "Autodetect"
 msgstr "Detectar Automaticamente"
 
@@ -838,7 +838,7 @@ msgid "Enable Interpreter Cpu"
 msgstr "Ativar interpretador da CPU"
 
 #: ../win32/gui/WndMain.c:1208
-#: ../data/pcsx.glade2:1298
+#: ../data/pcsx.glade2:1283
 msgid "Enable Console Output"
 msgstr "Ativar saída no terminal"
 
@@ -847,12 +847,12 @@ msgid "Spu Irq Always Enabled"
 msgstr "IRQ da SPU sempre ligada"
 
 #: ../win32/gui/WndMain.c:1210
-#: ../data/pcsx.glade2:1385
+#: ../data/pcsx.glade2:1370
 msgid "Parasite Eve 2, Vandal Hearts 1/2 Fix"
 msgstr "Correção para Parasite Eve 2, Vandal Hearts..."
 
 #: ../win32/gui/WndMain.c:1211
-#: ../data/pcsx.glade2:1400
+#: ../data/pcsx.glade2:1385
 msgid "InuYasha Sengoku Battle Fix"
 msgstr "Correção para InuYasha, Sengoku Battle..."
 
@@ -892,8 +892,8 @@ msgstr "Cartão de memória do DataDeck (*.ddf)"
 #: ../win32/gui/WndMain.c:1316
 #: ../win32/gui/WndMain.c:1397
 #: ../gui/Cheat.c:319
-#: ../gui/Gtk2Gui.c:510
-#: ../gui/Gtk2Gui.c:652
+#: ../gui/Gtk2Gui.c:516
+#: ../gui/Gtk2Gui.c:658
 msgid "All Files"
 msgstr "Todos os arquivos"
 
@@ -914,79 +914,79 @@ msgid "E&xit"
 msgstr "&Sair"
 
 #: ../win32/gui/WndMain.c:1471
-msgid "&States"
-msgstr "&Estados"
-
-#: ../win32/gui/WndMain.c:1473
 msgid "Run &EXE..."
 msgstr "Rodar &EXE..."
 
-#: ../win32/gui/WndMain.c:1474
+#: ../win32/gui/WndMain.c:1472
 msgid "Run &BIOS"
 msgstr "Iniciar pela &BIOS"
 
-#: ../win32/gui/WndMain.c:1475
+#: ../win32/gui/WndMain.c:1473
 msgid "Run &ISO..."
 msgstr "Rodar &imagem de CD..."
 
-#: ../win32/gui/WndMain.c:1476
+#: ../win32/gui/WndMain.c:1474
 msgid "Run &CD"
 msgstr "Rodar &CD"
 
+#: ../win32/gui/WndMain.c:1476
+msgid "&Emulator"
+msgstr "&Emulador"
+
 #: ../win32/gui/WndMain.c:1477
+msgid "&States"
+msgstr "&Estados"
+
+#: ../win32/gui/WndMain.c:1479
+msgid "S&witch ISO..."
+msgstr "T&rocar de imagem de CD..."
+
+#: ../win32/gui/WndMain.c:1481
+msgid "Re&set"
+msgstr "Re&iniciar"
+
+#: ../win32/gui/WndMain.c:1482
+msgid "&Run"
+msgstr "&Executar"
+
+#: ../win32/gui/WndMain.c:1483
 msgid "&Save"
 msgstr "&Salvar"
 
-#: ../win32/gui/WndMain.c:1478
+#: ../win32/gui/WndMain.c:1484
 msgid "&Load"
 msgstr "&Carregar"
 
-#: ../win32/gui/WndMain.c:1479
 #: ../win32/gui/WndMain.c:1485
+#: ../win32/gui/WndMain.c:1491
 msgid "&Other..."
 msgstr "&Outros..."
 
-#: ../win32/gui/WndMain.c:1480
 #: ../win32/gui/WndMain.c:1486
+#: ../win32/gui/WndMain.c:1492
 msgid "Slot &5"
 msgstr "Unidade &5"
 
-#: ../win32/gui/WndMain.c:1481
 #: ../win32/gui/WndMain.c:1487
+#: ../win32/gui/WndMain.c:1493
 msgid "Slot &4"
 msgstr "Unidade &4"
 
-#: ../win32/gui/WndMain.c:1482
 #: ../win32/gui/WndMain.c:1488
+#: ../win32/gui/WndMain.c:1494
 msgid "Slot &3"
 msgstr "Unidade &3"
 
-#: ../win32/gui/WndMain.c:1483
 #: ../win32/gui/WndMain.c:1489
+#: ../win32/gui/WndMain.c:1495
 msgid "Slot &2"
 msgstr "Unidade &2"
 
-#: ../win32/gui/WndMain.c:1484
 #: ../win32/gui/WndMain.c:1490
+#: ../win32/gui/WndMain.c:1496
 msgid "Slot &1"
 msgstr "Unidade &1"
 
-#: ../win32/gui/WndMain.c:1492
-msgid "&Emulator"
-msgstr "&Emulador"
-
-#: ../win32/gui/WndMain.c:1493
-msgid "S&witch ISO..."
-msgstr "T&rocar de imagem de CD..."
-
-#: ../win32/gui/WndMain.c:1495
-msgid "Re&set"
-msgstr "Re&iniciar"
-
-#: ../win32/gui/WndMain.c:1496
-msgid "&Run"
-msgstr "&Executar"
-
 #: ../win32/gui/WndMain.c:1498
 msgid "&Configuration"
 msgstr "&Configuração"
@@ -1075,8 +1075,8 @@ msgstr "Todos os arquivos (*.*)"
 
 #: ../gui/Cheat.c:392
 #: ../gui/Cheat.c:1121
-#: ../gui/Gtk2Gui.c:398
-#: ../gui/Gtk2Gui.c:1026
+#: ../gui/Gtk2Gui.c:404
+#: ../gui/Gtk2Gui.c:1032
 msgid "Error: Glade interface could not be loaded!"
 msgstr "Erro: o ambiente Glade não pôde ser carregado!"
 
@@ -1104,119 +1104,117 @@ msgstr "Novo valor:"
 msgid "Search Results"
 msgstr "Resultados da busca"
 
-#: ../gui/Gtk2Gui.c:406
-#: ../data/pcsx.glade2:620
+#: ../gui/Gtk2Gui.c:412
+#: ../data/pcsx.glade2:605
 msgid "Configure PCSX"
 msgstr "Configurar PCSX"
 
-#: ../gui/Gtk2Gui.c:492
+#: ../gui/Gtk2Gui.c:498
 msgid "Select PSX EXE File"
 msgstr "Selecione o arquivo executável de PSX"
 
-#: ../gui/Gtk2Gui.c:506
+#: ../gui/Gtk2Gui.c:512
 msgid "PlayStation Executable Files"
 msgstr "Arquivos executáveis do PlayStation"
 
-#: ../gui/Gtk2Gui.c:543
+#: ../gui/Gtk2Gui.c:549
 msgid "Not a valid PSX file"
 msgstr "Não é um arquivo válido de PSX"
 
-#: ../gui/Gtk2Gui.c:543
+#: ../gui/Gtk2Gui.c:549
 msgid "The file does not appear to be a valid Playstation executable"
 msgstr "Esse arquivo não parece ser um executável válido de PlayStation!"
 
-#: ../gui/Gtk2Gui.c:574
-#: ../gui/Gtk2Gui.c:701
+#: ../gui/Gtk2Gui.c:580
+#: ../gui/Gtk2Gui.c:707
 msgid "CD ROM failed"
 msgstr "CDROM falhou"
 
-#: ../gui/Gtk2Gui.c:582
+#: ../gui/Gtk2Gui.c:588
 msgid "The CD ROM could not be loaded"
 msgstr "O CDROM não pôde ser carregado!"
 
-#: ../gui/Gtk2Gui.c:597
+#: ../gui/Gtk2Gui.c:603
 msgid "Could not run BIOS"
 msgstr "Não conseguiu iniciar a BIOS"
 
-#: ../gui/Gtk2Gui.c:597
+#: ../gui/Gtk2Gui.c:603
 msgid "Running BIOS is not supported with Internal HLE BIOS."
 msgstr "Iniciar pela BIOS não é suportado com a BIOS HLE interno."
 
-#: ../gui/Gtk2Gui.c:627
+#: ../gui/Gtk2Gui.c:633
 msgid "Open PSX Disc Image File"
 msgstr "Abrir arquivo de imagem de CD de PSX"
 
-#: ../gui/Gtk2Gui.c:647
+#: ../gui/Gtk2Gui.c:653
 msgid "PSX Image Files (*.bin, *.img, *.mdf, *.iso)"
 msgstr "Arquivo de imagens de CD de PSX (*.bin, *.img, *.mdf, *.iso)"
 
-#: ../gui/Gtk2Gui.c:885
+#: ../gui/Gtk2Gui.c:891
 #, c-format
 msgid "Loaded state %s."
 msgstr "Arquivo de estado \"%s\" carregado."
 
-#: ../gui/Gtk2Gui.c:890
+#: ../gui/Gtk2Gui.c:896
 #, c-format
 msgid "Error loading state %s!"
 msgstr "Erro ao carregar o arquivo de estado \"%s\"!"
 
-#: ../gui/Gtk2Gui.c:901
+#: ../gui/Gtk2Gui.c:907
 #, c-format
 msgid "Saved state %s."
 msgstr "Arquivo de estado \"%s\" salvo."
 
-#: ../gui/Gtk2Gui.c:903
+#: ../gui/Gtk2Gui.c:909
 #, c-format
 msgid "Error saving state %s!"
 msgstr "Erro ao salvar o arquivo de estado \"%s\"!"
 
-#: ../gui/Gtk2Gui.c:937
-#: ../gui/Gtk2Gui.c:964
+#: ../gui/Gtk2Gui.c:943
+#: ../gui/Gtk2Gui.c:970
 msgid "Select State File"
 msgstr "Selecione o arquivo de estado"
 
-#: ../gui/Gtk2Gui.c:1068
+#: ../gui/Gtk2Gui.c:1074
 msgid "Icon"
 msgstr "Ícone"
 
-#: ../gui/Gtk2Gui.c:1086
+#: ../gui/Gtk2Gui.c:1092
 msgid "ID"
 msgstr "ID"
 
-#: ../gui/Gtk2Gui.c:1092
+#: ../gui/Gtk2Gui.c:1098
 msgid "Name"
 msgstr "Nome"
 
-#: ../gui/Gtk2Gui.c:1252
+#: ../gui/Gtk2Gui.c:1258
 msgid "Format this Memory Card?"
 msgstr "Formatar esse cartão de memória?"
 
-#: ../gui/Gtk2Gui.c:1254
+#: ../gui/Gtk2Gui.c:1260
 msgid "If you format the memory card, the card will be empty, and any existing data overwritten."
 msgstr "Ao formatar o cartão de memória, todo o conteúdo será zerado."
 
-#: ../gui/Gtk2Gui.c:1257
+#: ../gui/Gtk2Gui.c:1263
 msgid "Format card"
 msgstr "Formatar cartão"
 
-#: ../gui/Gtk2Gui.c:1372
+#: ../gui/Gtk2Gui.c:1378
 msgid "No space available in the target memory card!"
 msgstr "Não há espaço suficiente no cartão de memória selecionado!"
 
-#: ../gui/Gtk2Gui.c:1514
-#: ../gui/Gtk2Gui.c:1535
-#: ../gui/Gtk2Gui.c:1556
-#: ../gui/Gtk2Gui.c:1577
-#: ../gui/Gtk2Gui.c:1598
+#: ../gui/Gtk2Gui.c:1520
+#: ../gui/Gtk2Gui.c:1541
+#: ../gui/Gtk2Gui.c:1562
+#: ../gui/Gtk2Gui.c:1583
 #: ../gui/Gtk2Gui.c:1889
 msgid "No configuration required"
 msgstr "Não necessita de configuração"
 
-#: ../gui/Gtk2Gui.c:1514
-#: ../gui/Gtk2Gui.c:1535
-#: ../gui/Gtk2Gui.c:1556
-#: ../gui/Gtk2Gui.c:1577
-#: ../gui/Gtk2Gui.c:1598
+#: ../gui/Gtk2Gui.c:1520
+#: ../gui/Gtk2Gui.c:1541
+#: ../gui/Gtk2Gui.c:1562
+#: ../gui/Gtk2Gui.c:1583
 #: ../gui/Gtk2Gui.c:1889
 msgid "This plugin doesn't need to be configured."
 msgstr "Esta extensão não pode ser configurada."
@@ -1290,7 +1288,7 @@ msgid "PSX emulator couldn't be initialized.\n"
 msgstr "O emulador não pôde ser inicializado.\n"
 
 #: ../gui/Plugin.c:204
-#: ../data/pcsx.glade2:1334
+#: ../data/pcsx.glade2:1319
 #, c-format
 msgid "SIO IRQ Always Enabled"
 msgstr "IRQ SIO sempre ativada"
@@ -1360,7 +1358,7 @@ msgstr "Erro ao fechar a extensão de Controle 2!"
 msgid "Error closing GPU plugin!"
 msgstr "Erro ao fechar a extensão de GPU!"
 
-#: ../libpcsxcore/cdriso.c:528
+#: ../libpcsxcore/cdriso.c:631
 #, c-format
 msgid "Loaded CD Image: %s"
 msgstr "Carregou a imagem de CD \"%s\"."
@@ -1867,114 +1865,110 @@ msgid "CD-_ROM..."
 msgstr "CD_ROM..."
 
 #: ../data/pcsx.glade2:431
-msgid "Controller _1..."
-msgstr "Controle _1..."
-
-#: ../data/pcsx.glade2:446
-msgid "Controller _2..."
-msgstr "Controle _2..."
+msgid "C_ontrollers..."
+msgstr "C_ontroles..."
 
-#: ../data/pcsx.glade2:466
+#: ../data/pcsx.glade2:451
 msgid "_CPU..."
 msgstr "_CPU..."
 
-#: ../data/pcsx.glade2:482
+#: ../data/pcsx.glade2:467
 msgid "_Memory Cards..."
 msgstr "Cartões de _memória..."
 
-#: ../data/pcsx.glade2:499
+#: ../data/pcsx.glade2:484
 msgid "_Netplay..."
 msgstr "Jogo em _rede..."
 
-#: ../data/pcsx.glade2:520
+#: ../data/pcsx.glade2:505
 msgid "Chea_t"
 msgstr "T_rapaça"
 
-#: ../data/pcsx.glade2:529
+#: ../data/pcsx.glade2:514
 msgid "_Browse..."
 msgstr "_Navegar..."
 
-#: ../data/pcsx.glade2:544
+#: ../data/pcsx.glade2:529
 msgid "_Search..."
 msgstr "_Buscar..."
 
-#: ../data/pcsx.glade2:575
+#: ../data/pcsx.glade2:560
 msgid "_Help"
 msgstr "_Ajuda"
 
-#: ../data/pcsx.glade2:581
+#: ../data/pcsx.glade2:566
 msgid "_About PCSX..."
 msgstr "_Sobre o PCSX..."
 
-#: ../data/pcsx.glade2:722
+#: ../data/pcsx.glade2:707
 msgid "Select Folder to Search"
 msgstr "Selecione o diretório para a busca"
 
-#: ../data/pcsx.glade2:738
+#: ../data/pcsx.glade2:723
 msgid "Search in:"
 msgstr "Buscar em:"
 
-#: ../data/pcsx.glade2:1011
+#: ../data/pcsx.glade2:996
 msgid "Graphics:"
 msgstr "Gráficos:"
 
-#: ../data/pcsx.glade2:1024
+#: ../data/pcsx.glade2:1009
 msgid "Sound:"
 msgstr "Áudio:"
 
-#: ../data/pcsx.glade2:1039
+#: ../data/pcsx.glade2:1024
 msgid "Controller 1:   "
 msgstr "Controle 1:"
 
-#: ../data/pcsx.glade2:1054
+#: ../data/pcsx.glade2:1039
 msgid "Controller 2:"
 msgstr "Controle 2:"
 
-#: ../data/pcsx.glade2:1069
+#: ../data/pcsx.glade2:1054
 msgid "CD-ROM:"
 msgstr "CD-ROM:"
 
-#: ../data/pcsx.glade2:1107
+#: ../data/pcsx.glade2:1092
 msgid "<b>Plugins</b>"
 msgstr "<b>Extensões</b>"
 
-#: ../data/pcsx.glade2:1168
+#: ../data/pcsx.glade2:1153
 msgid "<b>BIOS</b>"
 msgstr "<b>BIOS</b>"
 
-#: ../data/pcsx.glade2:1220
+#: ../data/pcsx.glade2:1205
 msgid "Configure CPU"
 msgstr "Configurar CPU"
 
-#: ../data/pcsx.glade2:1248
+#: ../data/pcsx.glade2:1233
 msgid "Enable Debugger"
 msgstr "Ligar debugger"
 
-#: ../data/pcsx.glade2:1266
+#: ../data/pcsx.glade2:1251
 msgid "SPU IRQ Always Enabled"
 msgstr "IRQ da SPU sempre ativada"
 
-#: ../data/pcsx.glade2:1282
+#: ../data/pcsx.glade2:1267
 msgid "Black & White Movies"
 msgstr "Filmes em preto e branco"
 
-#: ../data/pcsx.glade2:1316
+#: ../data/pcsx.glade2:1301
 msgid "Enable Interpreter CPU"
 msgstr "Ativar interpretador da CPU"
 
-#: ../data/pcsx.glade2:1350
+#: ../data/pcsx.glade2:1335
 msgid "Disable CD Audio"
 msgstr "Desativar áudio de CD"
 
-#: ../data/pcsx.glade2:1366
+#: ../data/pcsx.glade2:1351
 msgid "Disable XA Decoding"
 msgstr "Desativar decodificação de XA"
 
-#: ../data/pcsx.glade2:1418
+#: ../data/pcsx.glade2:1403
 msgid "<b>Options</b>"
 msgstr "<b>Opções</b>"
 
-#: ../data/pcsx.glade2:1459
+#: ../data/pcsx.glade2:1444
 msgid ""
 "NTSC\n"
 "PAL"
@@ -1982,52 +1976,52 @@ msgstr ""
 "NTSC\n"
 "PAL"
 
-#: ../data/pcsx.glade2:1473
+#: ../data/pcsx.glade2:1458
 msgid "<b>System Type</b>"
 msgstr "<b>Tipo do sistema</b>"
 
-#: ../data/pcsx.glade2:1522
+#: ../data/pcsx.glade2:1507
 msgid "Configure NetPlay"
 msgstr "Configurar jogo em rede"
 
-#: ../data/pcsx.glade2:1609
+#: ../data/pcsx.glade2:1594
 msgid "<b>NetPlay</b>"
 msgstr "<b>Jogo em rede</b>"
 
-#: ../data/pcsx.glade2:1661
+#: ../data/pcsx.glade2:1646
 msgid "Configure Memory Cards"
 msgstr "Configurar cartões de memória"
 
-#: ../data/pcsx.glade2:1737
-#: ../data/pcsx.glade2:2133
+#: ../data/pcsx.glade2:1722
+#: ../data/pcsx.glade2:2118
 msgid "Format"
 msgstr "Formatar"
 
-#: ../data/pcsx.glade2:1787
-#: ../data/pcsx.glade2:2183
+#: ../data/pcsx.glade2:1772
+#: ../data/pcsx.glade2:2168
 msgid "Reload"
 msgstr "Recarregar"
 
-#: ../data/pcsx.glade2:1831
+#: ../data/pcsx.glade2:1816
 msgid "<b>Memory Card 1</b>"
 msgstr "<b>Cartão de memória 1</b>"
 
-#: ../data/pcsx.glade2:1891
-#: ../data/pcsx.glade2:1941
-#: ../data/pcsx.glade2:2816
+#: ../data/pcsx.glade2:1876
+#: ../data/pcsx.glade2:1926
+#: ../data/pcsx.glade2:2801
 msgid "Copy"
 msgstr "Copiar"
 
-#: ../data/pcsx.glade2:1991
-#: ../data/pcsx.glade2:2041
+#: ../data/pcsx.glade2:1976
+#: ../data/pcsx.glade2:2026
 msgid "Un/Delete"
 msgstr "Apagar/Desfazer"
 
-#: ../data/pcsx.glade2:2227
+#: ../data/pcsx.glade2:2212
 msgid "<b>Memory Card 2</b>"
 msgstr "<b>Cartão de memória 2</b>"
 
-#: ../data/pcsx.glade2:2289
+#: ../data/pcsx.glade2:2274
 msgid ""
 "(C) 1999-2003  PCSX Team\n"
 "(C) 2005-2006 Ryan Schultz\n"
@@ -2039,15 +2033,15 @@ msgstr ""
 "(C) 2005-2006 Andrew Burton\n"
 "(C) 2008-2009 Wei Mingzhi"
 
-#: ../data/pcsx.glade2:2293
+#: ../data/pcsx.glade2:2278
 msgid "A PlayStation emulator."
 msgstr "Um emulador de PlayStation."
 
-#: ../data/pcsx.glade2:2295
+#: ../data/pcsx.glade2:2280
 msgid "PCSX Reloaded"
 msgstr "PCSX Reloaded"
 
-#: ../data/pcsx.glade2:2296
+#: ../data/pcsx.glade2:2281
 msgid ""
 "This program is free software; you can redistribute it\n"
 "and/or modify it under the terms of the GNU General\n"
@@ -2081,16 +2075,16 @@ msgstr ""
 "Public License along with this program; if not, write to\n"
 "the Free Software Foundation, Inc."
 
-#: ../data/pcsx.glade2:2325
+#: ../data/pcsx.glade2:2310
 #: ../plugins/dfinput/dfinput.glade2:212
 msgid "translator-credits"
 msgstr "Tradução para português brasileiro por Tibério Vítor (tvtoon@gmail.com)"
 
-#: ../data/pcsx.glade2:2386
+#: ../data/pcsx.glade2:2371
 msgid "<b>Cheat Codes</b>"
 msgstr "<b>Códigos de trapaça</b>"
 
-#: ../data/pcsx.glade2:2551
+#: ../data/pcsx.glade2:2536
 msgid ""
 "8-bit\n"
 "16-bit\n"
@@ -2100,7 +2094,7 @@ msgstr ""
 "16-bit\n"
 "32-bit"
 
-#: ../data/pcsx.glade2:2614
+#: ../data/pcsx.glade2:2599
 msgid ""
 "Equal Value\n"
 "Not Equal Value\n"
@@ -2122,7 +2116,7 @@ msgstr ""
 "Diferente\n"
 "Sem mudanças"
 
-#: ../data/pcsx.glade2:2646
+#: ../data/pcsx.glade2:2631
 msgid ""
 "Decimal\n"
 "Hexadecimal"
@@ -2130,19 +2124,19 @@ msgstr ""
 "Decimal\n"
 "Hexadecimal"
 
-#: ../data/pcsx.glade2:2849
+#: ../data/pcsx.glade2:2834
 msgid "label_resultsfound"
 msgstr "Resultados encontrados:"
 
-#: ../data/pcsx.glade2:2884
+#: ../data/pcsx.glade2:2869
 msgid "Search"
 msgstr "Buscar"
 
-#: ../data/pcsx.glade2:2920
+#: ../data/pcsx.glade2:2905
 msgid "Restart"
 msgstr "Reiniciar"
 
-#: ../data/pcsx.glade2:2949
+#: ../data/pcsx.glade2:2934
 msgid "<b>Cheat Search</b>"
 msgstr "<b>Busca de trapaças</b>"
 
@@ -2726,6 +2720,10 @@ msgstr "<b>Configuração dos botões</b>"
 msgid "Based on PadJoy by Erich Kitzmüller (ammoq@ammoq.com)"
 msgstr "Baseado no PadJoy por Erich Kitzmüller (ammoq@ammoq.com)"
 
+#~ msgid "Controller _1..."
+#~ msgstr "Controle _1..."
+#~ msgid "Controller _2..."
+#~ msgstr "Controle _2..."
 #~ msgid "_Graphics"
 #~ msgstr "_Gráficos"
 #~ msgid "_Sound"
diff --git a/po/zh_CN.gmo b/po/zh_CN.gmo
index 9eb40bc5..05fea5cd 100644
--- a/po/zh_CN.gmo
+++ b/po/zh_CN.gmo
diff --git a/po/zh_CN.po b/po/zh_CN.po
index c28a6c76..a821728e 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pcsxr 1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-26 13:18+0800\n"
-"PO-Revision-Date: 2009-09-26 13:19+0700\n"
+"POT-Creation-Date: 2009-10-01 18:26+0800\n"
+"PO-Revision-Date: 2009-10-01 18:27+0700\n"
 "Last-Translator: Wei Mingzhi <whistler@openoffice.org>\n"
 "Language-Team: Simplified Chinese <whistler@openoffice.org>\n"
 "MIME-Version: 1.0\n"
@@ -128,7 +128,7 @@ msgid "Add New Cheat"
 msgstr "添加新作弊码"
 
 #: ../win32/gui/CheatDlg.c:167
-#: ../data/pcsx.glade2:2347
+#: ../data/pcsx.glade2:2332
 msgid "Edit Cheat Codes"
 msgstr "编辑作弊码"
 
@@ -249,7 +249,7 @@ msgid "Founded Addresses: %d"
 msgstr "找到地址个数: %d"
 
 #: ../win32/gui/CheatDlg.c:505
-#: ../data/pcsx.glade2:2744
+#: ../data/pcsx.glade2:2729
 msgid "Freeze"
 msgstr "固定"
 
@@ -262,7 +262,7 @@ msgstr "地址:"
 #: ../win32/gui/CheatDlg.c:598
 #: ../win32/gui/CheatDlg.c:683
 #: ../gui/Cheat.c:644
-#: ../data/pcsx.glade2:2588
+#: ../data/pcsx.glade2:2573
 msgid "Value:"
 msgstr "值:"
 
@@ -272,33 +272,33 @@ msgid "Freeze %.8X"
 msgstr "固定 %.8X"
 
 #: ../win32/gui/CheatDlg.c:596
-#: ../data/pcsx.glade2:2780
+#: ../data/pcsx.glade2:2765
 msgid "Modify"
 msgstr "修改"
 
 #: ../win32/gui/CheatDlg.c:679
 #: ../gui/Cheat.c:1126
-#: ../data/pcsx.glade2:2517
+#: ../data/pcsx.glade2:2502
 msgid "Cheat Search"
 msgstr "查找作弊码"
 
 #: ../win32/gui/CheatDlg.c:681
-#: ../data/pcsx.glade2:2566
+#: ../data/pcsx.glade2:2551
 msgid "Search For:"
 msgstr "查找:"
 
 #: ../win32/gui/CheatDlg.c:682
-#: ../data/pcsx.glade2:2576
+#: ../data/pcsx.glade2:2561
 msgid "Data Type:"
 msgstr "数据类型:"
 
 #: ../win32/gui/CheatDlg.c:684
-#: ../data/pcsx.glade2:2600
+#: ../data/pcsx.glade2:2585
 msgid "Data Base:"
 msgstr "数据基:"
 
 #: ../win32/gui/CheatDlg.c:685
-#: ../data/pcsx.glade2:2660
+#: ../data/pcsx.glade2:2645
 msgid "To:"
 msgstr "到:"
 
@@ -688,15 +688,15 @@ msgstr "*PCSX*: Error Saving State %s"
 
 #: ../win32/gui/WndMain.c:426
 #: ../win32/gui/WndMain.c:475
-#: ../gui/Gtk2Gui.c:574
-#: ../gui/Gtk2Gui.c:701
+#: ../gui/Gtk2Gui.c:580
+#: ../gui/Gtk2Gui.c:707
 msgid "The CD does not appear to be a valid Playstation CD"
 msgstr "此光盘不是一张合法的 PlayStation 光盘。"
 
 #: ../win32/gui/WndMain.c:432
 #: ../win32/gui/WndMain.c:481
-#: ../gui/Gtk2Gui.c:582
-#: ../gui/Gtk2Gui.c:709
+#: ../gui/Gtk2Gui.c:588
+#: ../gui/Gtk2Gui.c:715
 msgid "Could not load CD-ROM!"
 msgstr "无法加载光盘!"
 
@@ -705,12 +705,12 @@ msgid "Running BIOS is not supported with Internal HLE Bios."
 msgstr "内部 HLE BIOS 不支持直接运行。"
 
 #: ../win32/gui/WndMain.c:661
-#: ../gui/Gtk2Gui.c:1074
+#: ../gui/Gtk2Gui.c:1080
 msgid "Title"
 msgstr "标题"
 
 #: ../win32/gui/WndMain.c:667
-#: ../gui/Gtk2Gui.c:1080
+#: ../gui/Gtk2Gui.c:1086
 msgid "Status"
 msgstr "状态"
 
@@ -731,19 +731,19 @@ msgid "terminiting link block"
 msgstr "terminiting link block"
 
 #: ../win32/gui/WndMain.c:864
-#: ../gui/Gtk2Gui.c:1154
+#: ../gui/Gtk2Gui.c:1160
 msgid "Deleted"
 msgstr "已删除"
 
 #: ../win32/gui/WndMain.c:865
 #: ../win32/gui/WndMain.c:868
-#: ../gui/Gtk2Gui.c:1156
-#: ../gui/Gtk2Gui.c:1160
+#: ../gui/Gtk2Gui.c:1162
+#: ../gui/Gtk2Gui.c:1166
 msgid "Free"
 msgstr "空闲"
 
 #: ../win32/gui/WndMain.c:867
-#: ../gui/Gtk2Gui.c:1158
+#: ../gui/Gtk2Gui.c:1164
 msgid "Used"
 msgstr "已使用"
 
@@ -830,7 +830,7 @@ msgid "Disable Cd audio"
 msgstr "禁用 CD 音频"
 
 #: ../win32/gui/WndMain.c:1206
-#: ../data/pcsx.glade2:1442
+#: ../data/pcsx.glade2:1427
 msgid "Autodetect"
 msgstr "自动检测"
 
@@ -839,7 +839,7 @@ msgid "Enable Interpreter Cpu"
 msgstr "启用解释执行 CPU"
 
 #: ../win32/gui/WndMain.c:1208
-#: ../data/pcsx.glade2:1298
+#: ../data/pcsx.glade2:1283
 msgid "Enable Console Output"
 msgstr "启用控制台输出"
 
@@ -848,12 +848,12 @@ msgid "Spu Irq Always Enabled"
 msgstr "SPU IRQ 总是启用"
 
 #: ../win32/gui/WndMain.c:1210
-#: ../data/pcsx.glade2:1385
+#: ../data/pcsx.glade2:1370
 msgid "Parasite Eve 2, Vandal Hearts 1/2 Fix"
 msgstr "Parasite Eve 2, Vandal Hearts 1/2 修正"
 
 #: ../win32/gui/WndMain.c:1211
-#: ../data/pcsx.glade2:1400
+#: ../data/pcsx.glade2:1385
 msgid "InuYasha Sengoku Battle Fix"
 msgstr "InuYasha Sengoku 战斗修正"
 
@@ -893,8 +893,8 @@ msgstr "DataDeck 记忆卡 (*.ddl)"
 #: ../win32/gui/WndMain.c:1316
 #: ../win32/gui/WndMain.c:1397
 #: ../gui/Cheat.c:319
-#: ../gui/Gtk2Gui.c:510
-#: ../gui/Gtk2Gui.c:652
+#: ../gui/Gtk2Gui.c:516
+#: ../gui/Gtk2Gui.c:658
 msgid "All Files"
 msgstr "所有文件"
 
@@ -915,79 +915,79 @@ msgid "E&xit"
 msgstr "退出(&X)"
 
 #: ../win32/gui/WndMain.c:1471
-msgid "&States"
-msgstr "存档(&S)"
-
-#: ../win32/gui/WndMain.c:1473
 msgid "Run &EXE..."
 msgstr "运行 &EXE..."
 
-#: ../win32/gui/WndMain.c:1474
+#: ../win32/gui/WndMain.c:1472
 msgid "Run &BIOS"
 msgstr "运行 BIOS(&B)"
 
-#: ../win32/gui/WndMain.c:1475
+#: ../win32/gui/WndMain.c:1473
 msgid "Run &ISO..."
 msgstr "运行 &ISO..."
 
-#: ../win32/gui/WndMain.c:1476
+#: ../win32/gui/WndMain.c:1474
 msgid "Run &CD"
 msgstr "运行光碟(&C)"
 
+#: ../win32/gui/WndMain.c:1476
+msgid "&Emulator"
+msgstr "模拟器(&E)"
+
 #: ../win32/gui/WndMain.c:1477
+msgid "&States"
+msgstr "存档(&S)"
+
+#: ../win32/gui/WndMain.c:1479
+msgid "S&witch ISO..."
+msgstr "更换 ISO(&W)..."
+
+#: ../win32/gui/WndMain.c:1481
+msgid "Re&set"
+msgstr "复位(&S)"
+
+#: ../win32/gui/WndMain.c:1482
+msgid "&Run"
+msgstr "运行(&R)"
+
+#: ../win32/gui/WndMain.c:1483
 msgid "&Save"
 msgstr "保存(&S)"
 
-#: ../win32/gui/WndMain.c:1478
+#: ../win32/gui/WndMain.c:1484
 msgid "&Load"
 msgstr "读取(&L)"
 
-#: ../win32/gui/WndMain.c:1479
 #: ../win32/gui/WndMain.c:1485
+#: ../win32/gui/WndMain.c:1491
 msgid "&Other..."
 msgstr "其它(&O)..."
 
-#: ../win32/gui/WndMain.c:1480
 #: ../win32/gui/WndMain.c:1486
+#: ../win32/gui/WndMain.c:1492
 msgid "Slot &5"
 msgstr "存档 5(&5)"
 
-#: ../win32/gui/WndMain.c:1481
 #: ../win32/gui/WndMain.c:1487
+#: ../win32/gui/WndMain.c:1493
 msgid "Slot &4"
 msgstr "存档 4(&4)"
 
-#: ../win32/gui/WndMain.c:1482
 #: ../win32/gui/WndMain.c:1488
+#: ../win32/gui/WndMain.c:1494
 msgid "Slot &3"
 msgstr "存档 3(&3)"
 
-#: ../win32/gui/WndMain.c:1483
 #: ../win32/gui/WndMain.c:1489
+#: ../win32/gui/WndMain.c:1495
 msgid "Slot &2"
 msgstr "存档 2(&2)"
 
-#: ../win32/gui/WndMain.c:1484
 #: ../win32/gui/WndMain.c:1490
+#: ../win32/gui/WndMain.c:1496
 msgid "Slot &1"
 msgstr "存档 1(&1)"
 
-#: ../win32/gui/WndMain.c:1492
-msgid "&Emulator"
-msgstr "模拟器(&E)"
-
-#: ../win32/gui/WndMain.c:1493
-msgid "S&witch ISO..."
-msgstr "更换 ISO(&W)..."
-
-#: ../win32/gui/WndMain.c:1495
-msgid "Re&set"
-msgstr "复位(&S)"
-
-#: ../win32/gui/WndMain.c:1496
-msgid "&Run"
-msgstr "运行(&R)"
-
 #: ../win32/gui/WndMain.c:1498
 msgid "&Configuration"
 msgstr "配置(&C)"
@@ -1076,8 +1076,8 @@ msgstr "所有文件 (*.*)"
 
 #: ../gui/Cheat.c:392
 #: ../gui/Cheat.c:1121
-#: ../gui/Gtk2Gui.c:398
-#: ../gui/Gtk2Gui.c:1026
+#: ../gui/Gtk2Gui.c:404
+#: ../gui/Gtk2Gui.c:1032
 msgid "Error: Glade interface could not be loaded!"
 msgstr "错误：无法加载 Glade 界面!"
 
@@ -1105,119 +1105,117 @@ msgstr "新值:"
 msgid "Search Results"
 msgstr "查找结果"
 
-#: ../gui/Gtk2Gui.c:406
-#: ../data/pcsx.glade2:620
+#: ../gui/Gtk2Gui.c:412
+#: ../data/pcsx.glade2:605
 msgid "Configure PCSX"
 msgstr "配置 PCSX"
 
-#: ../gui/Gtk2Gui.c:492
+#: ../gui/Gtk2Gui.c:498
 msgid "Select PSX EXE File"
 msgstr "选择 PSX EXE 文件"
 
-#: ../gui/Gtk2Gui.c:506
+#: ../gui/Gtk2Gui.c:512
 msgid "PlayStation Executable Files"
 msgstr "PlayStation 可执行文件"
 
-#: ../gui/Gtk2Gui.c:543
+#: ../gui/Gtk2Gui.c:549
 msgid "Not a valid PSX file"
 msgstr "不是一个合法的 PSX 文件"
 
-#: ../gui/Gtk2Gui.c:543
+#: ../gui/Gtk2Gui.c:549
 msgid "The file does not appear to be a valid Playstation executable"
 msgstr "此文件不是一个合法的 PlayStation 可执行文件"
 
-#: ../gui/Gtk2Gui.c:574
-#: ../gui/Gtk2Gui.c:701
+#: ../gui/Gtk2Gui.c:580
+#: ../gui/Gtk2Gui.c:707
 msgid "CD ROM failed"
 msgstr "CD-ROM 失败"
 
-#: ../gui/Gtk2Gui.c:582
+#: ../gui/Gtk2Gui.c:588
 msgid "The CD ROM could not be loaded"
 msgstr "无法加载 CD-ROM"
 
-#: ../gui/Gtk2Gui.c:597
+#: ../gui/Gtk2Gui.c:603
 msgid "Could not run BIOS"
 msgstr "无法运行 BIOS"
 
-#: ../gui/Gtk2Gui.c:597
+#: ../gui/Gtk2Gui.c:603
 msgid "Running BIOS is not supported with Internal HLE BIOS."
 msgstr "内部 HLE BIOS 不支持直接运行。"
 
-#: ../gui/Gtk2Gui.c:627
+#: ../gui/Gtk2Gui.c:633
 msgid "Open PSX Disc Image File"
 msgstr "打开 PSX 光盘镜像文件"
 
-#: ../gui/Gtk2Gui.c:647
+#: ../gui/Gtk2Gui.c:653
 msgid "PSX Image Files (*.bin, *.img, *.mdf, *.iso)"
 msgstr "PS 镜像文件 (*.bin, *.img, *.mdf, *.iso)"
 
-#: ../gui/Gtk2Gui.c:885
+#: ../gui/Gtk2Gui.c:891
 #, c-format
 msgid "Loaded state %s."
 msgstr "已读取存档 %s。"
 
-#: ../gui/Gtk2Gui.c:890
+#: ../gui/Gtk2Gui.c:896
 #, c-format
 msgid "Error loading state %s!"
 msgstr "读取存档 %s 时出错。"
 
-#: ../gui/Gtk2Gui.c:901
+#: ../gui/Gtk2Gui.c:907
 #, c-format
 msgid "Saved state %s."
 msgstr "已保存存档 %s"
 
-#: ../gui/Gtk2Gui.c:903
+#: ../gui/Gtk2Gui.c:909
 #, c-format
 msgid "Error saving state %s!"
 msgstr "保存存档 %s 时出错。"
 
-#: ../gui/Gtk2Gui.c:937
-#: ../gui/Gtk2Gui.c:964
+#: ../gui/Gtk2Gui.c:943
+#: ../gui/Gtk2Gui.c:970
 msgid "Select State File"
 msgstr "选择存档文件"
 
-#: ../gui/Gtk2Gui.c:1068
+#: ../gui/Gtk2Gui.c:1074
 msgid "Icon"
 msgstr "图标"
 
-#: ../gui/Gtk2Gui.c:1086
+#: ../gui/Gtk2Gui.c:1092
 msgid "ID"
 msgstr "ID"
 
-#: ../gui/Gtk2Gui.c:1092
+#: ../gui/Gtk2Gui.c:1098
 msgid "Name"
 msgstr "名称"
 
-#: ../gui/Gtk2Gui.c:1252
+#: ../gui/Gtk2Gui.c:1258
 msgid "Format this Memory Card?"
 msgstr "格式化此记忆卡?"
 
-#: ../gui/Gtk2Gui.c:1254
+#: ../gui/Gtk2Gui.c:1260
 msgid "If you format the memory card, the card will be empty, and any existing data overwritten."
 msgstr "如果您选择格式化记忆卡，记忆卡将被清空，并且任何现有数据都将被覆盖。"
 
-#: ../gui/Gtk2Gui.c:1257
+#: ../gui/Gtk2Gui.c:1263
 msgid "Format card"
 msgstr "格式化记忆卡"
 
-#: ../gui/Gtk2Gui.c:1372
+#: ../gui/Gtk2Gui.c:1378
 msgid "No space available in the target memory card!"
 msgstr "目标记忆卡没有空余位置!"
 
-#: ../gui/Gtk2Gui.c:1514
-#: ../gui/Gtk2Gui.c:1535
-#: ../gui/Gtk2Gui.c:1556
-#: ../gui/Gtk2Gui.c:1577
-#: ../gui/Gtk2Gui.c:1598
+#: ../gui/Gtk2Gui.c:1520
+#: ../gui/Gtk2Gui.c:1541
+#: ../gui/Gtk2Gui.c:1562
+#: ../gui/Gtk2Gui.c:1583
 #: ../gui/Gtk2Gui.c:1889
 msgid "No configuration required"
 msgstr "不需要配置"
 
-#: ../gui/Gtk2Gui.c:1514
-#: ../gui/Gtk2Gui.c:1535
-#: ../gui/Gtk2Gui.c:1556
-#: ../gui/Gtk2Gui.c:1577
-#: ../gui/Gtk2Gui.c:1598
+#: ../gui/Gtk2Gui.c:1520
+#: ../gui/Gtk2Gui.c:1541
+#: ../gui/Gtk2Gui.c:1562
+#: ../gui/Gtk2Gui.c:1583
 #: ../gui/Gtk2Gui.c:1889
 msgid "This plugin doesn't need to be configured."
 msgstr "此插件需要被配置。"
@@ -1291,7 +1289,7 @@ msgid "PSX emulator couldn't be initialized.\n"
 msgstr "无法初始化 PSX 模拟器。\n"
 
 #: ../gui/Plugin.c:204
-#: ../data/pcsx.glade2:1334
+#: ../data/pcsx.glade2:1319
 #, c-format
 msgid "SIO IRQ Always Enabled"
 msgstr "SIO IRQ 总是启用"
@@ -1361,7 +1359,7 @@ msgstr "无法关闭 \"控制器 2\" 插件!"
 msgid "Error closing GPU plugin!"
 msgstr "无法关闭 GPU 插件!"
 
-#: ../libpcsxcore/cdriso.c:528
+#: ../libpcsxcore/cdriso.c:631
 #, c-format
 msgid "Loaded CD Image: %s"
 msgstr "已加载 CD 镜像: %s"
@@ -1868,114 +1866,110 @@ msgid "CD-_ROM..."
 msgstr "CD-_ROM..."
 
 #: ../data/pcsx.glade2:431
-msgid "Controller _1..."
-msgstr "控制器 _1..."
-
-#: ../data/pcsx.glade2:446
-msgid "Controller _2..."
-msgstr "控制器 _2..."
+msgid "C_ontrollers..."
+msgstr "控制器(_O)..."
 
-#: ../data/pcsx.glade2:466
+#: ../data/pcsx.glade2:451
 msgid "_CPU..."
 msgstr "_CPU..."
 
-#: ../data/pcsx.glade2:482
+#: ../data/pcsx.glade2:467
 msgid "_Memory Cards..."
 msgstr "记忆卡(_M)..."
 
-#: ../data/pcsx.glade2:499
+#: ../data/pcsx.glade2:484
 msgid "_Netplay..."
 msgstr "联网游戏(_N)..."
 
-#: ../data/pcsx.glade2:520
+#: ../data/pcsx.glade2:505
 msgid "Chea_t"
 msgstr "作弊码(_T)"
 
-#: ../data/pcsx.glade2:529
+#: ../data/pcsx.glade2:514
 msgid "_Browse..."
 msgstr "浏览(_B)..."
 
-#: ../data/pcsx.glade2:544
+#: ../data/pcsx.glade2:529
 msgid "_Search..."
 msgstr "查找(_S)..."
 
-#: ../data/pcsx.glade2:575
+#: ../data/pcsx.glade2:560
 msgid "_Help"
 msgstr "帮助(_H)"
 
-#: ../data/pcsx.glade2:581
+#: ../data/pcsx.glade2:566
 msgid "_About PCSX..."
 msgstr "关于 PCSX(_A)..."
 
-#: ../data/pcsx.glade2:722
+#: ../data/pcsx.glade2:707
 msgid "Select Folder to Search"
 msgstr "选择要查找的文件夹"
 
-#: ../data/pcsx.glade2:738
+#: ../data/pcsx.glade2:723
 msgid "Search in:"
 msgstr "在此处查找插件:"
 
-#: ../data/pcsx.glade2:1011
+#: ../data/pcsx.glade2:996
 msgid "Graphics:"
 msgstr "图像:"
 
-#: ../data/pcsx.glade2:1024
+#: ../data/pcsx.glade2:1009
 msgid "Sound:"
 msgstr "声音:"
 
-#: ../data/pcsx.glade2:1039
+#: ../data/pcsx.glade2:1024
 msgid "Controller 1:   "
 msgstr "控制器 1:"
 
-#: ../data/pcsx.glade2:1054
+#: ../data/pcsx.glade2:1039
 msgid "Controller 2:"
 msgstr "控制器 2:"
 
-#: ../data/pcsx.glade2:1069
+#: ../data/pcsx.glade2:1054
 msgid "CD-ROM:"
 msgstr "CD-ROM:"
 
-#: ../data/pcsx.glade2:1107
+#: ../data/pcsx.glade2:1092
 msgid "<b>Plugins</b>"
 msgstr "<b>插件</b>"
 
-#: ../data/pcsx.glade2:1168
+#: ../data/pcsx.glade2:1153
 msgid "<b>BIOS</b>"
 msgstr "<b>BIOS</b>"
 
-#: ../data/pcsx.glade2:1220
+#: ../data/pcsx.glade2:1205
 msgid "Configure CPU"
 msgstr "配置 CPU"
 
-#: ../data/pcsx.glade2:1248
+#: ../data/pcsx.glade2:1233
 msgid "Enable Debugger"
 msgstr "启用调试器"
 
-#: ../data/pcsx.glade2:1266
+#: ../data/pcsx.glade2:1251
 msgid "SPU IRQ Always Enabled"
 msgstr "SPU IRQ 总是启用"
 
-#: ../data/pcsx.glade2:1282
+#: ../data/pcsx.glade2:1267
 msgid "Black & White Movies"
 msgstr "黑白电影"
 
-#: ../data/pcsx.glade2:1316
+#: ../data/pcsx.glade2:1301
 msgid "Enable Interpreter CPU"
 msgstr "启用解释执行 CPU"
 
-#: ../data/pcsx.glade2:1350
+#: ../data/pcsx.glade2:1335
 msgid "Disable CD Audio"
 msgstr "禁用 CD 音频"
 
-#: ../data/pcsx.glade2:1366
+#: ../data/pcsx.glade2:1351
 msgid "Disable XA Decoding"
 msgstr "禁用 XA 解码"
 
-#: ../data/pcsx.glade2:1418
+#: ../data/pcsx.glade2:1403
 msgid "<b>Options</b>"
 msgstr "<b>选项</b>"
 
-#: ../data/pcsx.glade2:1459
+#: ../data/pcsx.glade2:1444
 msgid ""
 "NTSC\n"
 "PAL"
@@ -1983,52 +1977,52 @@ msgstr ""
 "NTSC\n"
 "PAL"
 
-#: ../data/pcsx.glade2:1473
+#: ../data/pcsx.glade2:1458
 msgid "<b>System Type</b>"
 msgstr "<b>系统类型</b>"
 
-#: ../data/pcsx.glade2:1522
+#: ../data/pcsx.glade2:1507
 msgid "Configure NetPlay"
 msgstr "配置联网游戏"
 
-#: ../data/pcsx.glade2:1609
+#: ../data/pcsx.glade2:1594
 msgid "<b>NetPlay</b>"
 msgstr "<b>联网游戏</b>"
 
-#: ../data/pcsx.glade2:1661
+#: ../data/pcsx.glade2:1646
 msgid "Configure Memory Cards"
 msgstr "配置记忆卡"
 
-#: ../data/pcsx.glade2:1737
-#: ../data/pcsx.glade2:2133
+#: ../data/pcsx.glade2:1722
+#: ../data/pcsx.glade2:2118
 msgid "Format"
 msgstr "格式化"
 
-#: ../data/pcsx.glade2:1787
-#: ../data/pcsx.glade2:2183
+#: ../data/pcsx.glade2:1772
+#: ../data/pcsx.glade2:2168
 msgid "Reload"
 msgstr "重新加载"
 
-#: ../data/pcsx.glade2:1831
+#: ../data/pcsx.glade2:1816
 msgid "<b>Memory Card 1</b>"
 msgstr "<b>记忆卡 1</b>"
 
-#: ../data/pcsx.glade2:1891
-#: ../data/pcsx.glade2:1941
-#: ../data/pcsx.glade2:2816
+#: ../data/pcsx.glade2:1876
+#: ../data/pcsx.glade2:1926
+#: ../data/pcsx.glade2:2801
 msgid "Copy"
 msgstr "复制"
 
-#: ../data/pcsx.glade2:1991
-#: ../data/pcsx.glade2:2041
+#: ../data/pcsx.glade2:1976
+#: ../data/pcsx.glade2:2026
 msgid "Un/Delete"
 msgstr "删除/恢复"
 
-#: ../data/pcsx.glade2:2227
+#: ../data/pcsx.glade2:2212
 msgid "<b>Memory Card 2</b>"
 msgstr "<b>记忆卡 2</b>"
 
-#: ../data/pcsx.glade2:2289
+#: ../data/pcsx.glade2:2274
 msgid ""
 "(C) 1999-2003  PCSX Team\n"
 "(C) 2005-2006 Ryan Schultz\n"
@@ -2040,15 +2034,15 @@ msgstr ""
 "(C) 2005-2006 Andrew Burton\n"
 "(C) 2008-2009 Wei Mingzhi"
 
-#: ../data/pcsx.glade2:2293
+#: ../data/pcsx.glade2:2278
 msgid "A PlayStation emulator."
 msgstr "一个 PlayStation 模拟器。"
 
-#: ../data/pcsx.glade2:2295
+#: ../data/pcsx.glade2:2280
 msgid "PCSX Reloaded"
 msgstr "PCSX Reloaded"
 
-#: ../data/pcsx.glade2:2296
+#: ../data/pcsx.glade2:2281
 msgid ""
 "This program is free software; you can redistribute it\n"
 "and/or modify it under the terms of the GNU General\n"
@@ -2067,16 +2061,16 @@ msgid ""
 "the Free Software Foundation, Inc."
 msgstr ""
 
-#: ../data/pcsx.glade2:2325
+#: ../data/pcsx.glade2:2310
 #: ../plugins/dfinput/dfinput.glade2:212
 msgid "translator-credits"
 msgstr "Wei Mingzhi <whistler@openoffice.org>"
 
-#: ../data/pcsx.glade2:2386
+#: ../data/pcsx.glade2:2371
 msgid "<b>Cheat Codes</b>"
 msgstr "<b>作弊码</b>"
 
-#: ../data/pcsx.glade2:2551
+#: ../data/pcsx.glade2:2536
 msgid ""
 "8-bit\n"
 "16-bit\n"
@@ -2086,7 +2080,7 @@ msgstr ""
 "16 位\n"
 "32 位"
 
-#: ../data/pcsx.glade2:2614
+#: ../data/pcsx.glade2:2599
 msgid ""
 "Equal Value\n"
 "Not Equal Value\n"
@@ -2108,7 +2102,7 @@ msgstr ""
 "改变\n"
 "无改变"
 
-#: ../data/pcsx.glade2:2646
+#: ../data/pcsx.glade2:2631
 msgid ""
 "Decimal\n"
 "Hexadecimal"
@@ -2116,19 +2110,19 @@ msgstr ""
 "十进制\n"
 "十六进制"
 
-#: ../data/pcsx.glade2:2849
+#: ../data/pcsx.glade2:2834
 msgid "label_resultsfound"
 msgstr "label_resultsfound"
 
-#: ../data/pcsx.glade2:2884
+#: ../data/pcsx.glade2:2869
 msgid "Search"
 msgstr "查找"
 
-#: ../data/pcsx.glade2:2920
+#: ../data/pcsx.glade2:2905
 msgid "Restart"
 msgstr "复位"
 
-#: ../data/pcsx.glade2:2949
+#: ../data/pcsx.glade2:2934
 msgid "<b>Cheat Search</b>"
 msgstr "<b>作弊码查找</b>"
 
@@ -2712,6 +2706,10 @@ msgstr "<b>按键配置</b>"
 msgid "Based on PadJoy by Erich Kitzmüller (ammoq@ammoq.com)"
 msgstr "基于由 Erich Kitzmüller (ammoq@ammoq.com) 编写的 PadJoy"
 
+#~ msgid "Controller _1..."
+#~ msgstr "控制器 _1..."
+#~ msgid "Controller _2..."
+#~ msgstr "控制器 _2..."
 #~ msgid "_Graphics"
 #~ msgstr "图像(_G)"
 #~ msgid "_Sound"
diff --git a/po/zh_TW.gmo b/po/zh_TW.gmo
index 202061f4..e28a391a 100644
--- a/po/zh_TW.gmo
+++ b/po/zh_TW.gmo
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 465676e5..1ccd8770 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pcsxr 1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-26 13:18+0800\n"
-"PO-Revision-Date: 2009-09-26 13:21+0700\n"
+"POT-Creation-Date: 2009-10-01 18:26+0800\n"
+"PO-Revision-Date: 2009-10-01 18:27+0700\n"
 "Last-Translator: Wei Mingzhi <whistler@openoffice.org>\n"
 "Language-Team: Traditional Chinese <whistler@openoffice.org>\n"
 "MIME-Version: 1.0\n"
@@ -128,7 +128,7 @@ msgid "Add New Cheat"
 msgstr "添加新金手指"
 
 #: ../win32/gui/CheatDlg.c:167
-#: ../data/pcsx.glade2:2347
+#: ../data/pcsx.glade2:2332
 msgid "Edit Cheat Codes"
 msgstr "編輯金手指"
 
@@ -249,7 +249,7 @@ msgid "Founded Addresses: %d"
 msgstr "找到位址: %d"
 
 #: ../win32/gui/CheatDlg.c:505
-#: ../data/pcsx.glade2:2744
+#: ../data/pcsx.glade2:2729
 msgid "Freeze"
 msgstr "固定"
 
@@ -262,7 +262,7 @@ msgstr "位址:"
 #: ../win32/gui/CheatDlg.c:598
 #: ../win32/gui/CheatDlg.c:683
 #: ../gui/Cheat.c:644
-#: ../data/pcsx.glade2:2588
+#: ../data/pcsx.glade2:2573
 msgid "Value:"
 msgstr "值:"
 
@@ -272,33 +272,33 @@ msgid "Freeze %.8X"
 msgstr "固定 %.8X"
 
 #: ../win32/gui/CheatDlg.c:596
-#: ../data/pcsx.glade2:2780
+#: ../data/pcsx.glade2:2765
 msgid "Modify"
 msgstr "更改"
 
 #: ../win32/gui/CheatDlg.c:679
 #: ../gui/Cheat.c:1126
-#: ../data/pcsx.glade2:2517
+#: ../data/pcsx.glade2:2502
 msgid "Cheat Search"
 msgstr "搜尋金手指碼"
 
 #: ../win32/gui/CheatDlg.c:681
-#: ../data/pcsx.glade2:2566
+#: ../data/pcsx.glade2:2551
 msgid "Search For:"
 msgstr "搜尋:"
 
 #: ../win32/gui/CheatDlg.c:682
-#: ../data/pcsx.glade2:2576
+#: ../data/pcsx.glade2:2561
 msgid "Data Type:"
 msgstr "數值類型:"
 
 #: ../win32/gui/CheatDlg.c:684
-#: ../data/pcsx.glade2:2600
+#: ../data/pcsx.glade2:2585
 msgid "Data Base:"
 msgstr "數值基:"
 
 #: ../win32/gui/CheatDlg.c:685
-#: ../data/pcsx.glade2:2660
+#: ../data/pcsx.glade2:2645
 msgid "To:"
 msgstr "至:"
 
@@ -688,15 +688,15 @@ msgstr "*PCSX*: Error Saving State %s"
 
 #: ../win32/gui/WndMain.c:426
 #: ../win32/gui/WndMain.c:475
-#: ../gui/Gtk2Gui.c:574
-#: ../gui/Gtk2Gui.c:701
+#: ../gui/Gtk2Gui.c:580
+#: ../gui/Gtk2Gui.c:707
 msgid "The CD does not appear to be a valid Playstation CD"
 msgstr "此光碟不是一張合法的 PlayStation 光碟。"
 
 #: ../win32/gui/WndMain.c:432
 #: ../win32/gui/WndMain.c:481
-#: ../gui/Gtk2Gui.c:582
-#: ../gui/Gtk2Gui.c:709
+#: ../gui/Gtk2Gui.c:588
+#: ../gui/Gtk2Gui.c:715
 msgid "Could not load CD-ROM!"
 msgstr "無法加載光碟!"
 
@@ -705,12 +705,12 @@ msgid "Running BIOS is not supported with Internal HLE Bios."
 msgstr "內部 HLE BIOS 不支援直接執行。"
 
 #: ../win32/gui/WndMain.c:661
-#: ../gui/Gtk2Gui.c:1074
+#: ../gui/Gtk2Gui.c:1080
 msgid "Title"
 msgstr "標題"
 
 #: ../win32/gui/WndMain.c:667
-#: ../gui/Gtk2Gui.c:1080
+#: ../gui/Gtk2Gui.c:1086
 msgid "Status"
 msgstr "狀態"
 
@@ -731,19 +731,19 @@ msgid "terminiting link block"
 msgstr "terminiting link block"
 
 #: ../win32/gui/WndMain.c:864
-#: ../gui/Gtk2Gui.c:1154
+#: ../gui/Gtk2Gui.c:1160
 msgid "Deleted"
 msgstr "已刪除"
 
 #: ../win32/gui/WndMain.c:865
 #: ../win32/gui/WndMain.c:868
-#: ../gui/Gtk2Gui.c:1156
-#: ../gui/Gtk2Gui.c:1160
+#: ../gui/Gtk2Gui.c:1162
+#: ../gui/Gtk2Gui.c:1166
 msgid "Free"
 msgstr "空閑"
 
 #: ../win32/gui/WndMain.c:867
-#: ../gui/Gtk2Gui.c:1158
+#: ../gui/Gtk2Gui.c:1164
 msgid "Used"
 msgstr "已使用"
 
@@ -830,7 +830,7 @@ msgid "Disable Cd audio"
 msgstr "禁用 CD 音頻"
 
 #: ../win32/gui/WndMain.c:1206
-#: ../data/pcsx.glade2:1442
+#: ../data/pcsx.glade2:1427
 msgid "Autodetect"
 msgstr "自動檢測"
 
@@ -839,7 +839,7 @@ msgid "Enable Interpreter Cpu"
 msgstr "啟用解釋執行 CPU"
 
 #: ../win32/gui/WndMain.c:1208
-#: ../data/pcsx.glade2:1298
+#: ../data/pcsx.glade2:1283
 msgid "Enable Console Output"
 msgstr "啟用控制台輸出"
 
@@ -848,12 +848,12 @@ msgid "Spu Irq Always Enabled"
 msgstr "SPU IRQ 總是啟用"
 
 #: ../win32/gui/WndMain.c:1210
-#: ../data/pcsx.glade2:1385
+#: ../data/pcsx.glade2:1370
 msgid "Parasite Eve 2, Vandal Hearts 1/2 Fix"
 msgstr "Parasite Eve 2, Vandal Hearts 1/2 修正"
 
 #: ../win32/gui/WndMain.c:1211
-#: ../data/pcsx.glade2:1400
+#: ../data/pcsx.glade2:1385
 msgid "InuYasha Sengoku Battle Fix"
 msgstr "InuYasha Sengoku 戰斗修正"
 
@@ -893,8 +893,8 @@ msgstr "DataDeck 記憶卡 (*.ddl)"
 #: ../win32/gui/WndMain.c:1316
 #: ../win32/gui/WndMain.c:1397
 #: ../gui/Cheat.c:319
-#: ../gui/Gtk2Gui.c:510
-#: ../gui/Gtk2Gui.c:652
+#: ../gui/Gtk2Gui.c:516
+#: ../gui/Gtk2Gui.c:658
 msgid "All Files"
 msgstr "所有檔案"
 
@@ -915,79 +915,79 @@ msgid "E&xit"
 msgstr "離開(&X)"
 
 #: ../win32/gui/WndMain.c:1471
-msgid "&States"
-msgstr "記錄(&S)"
-
-#: ../win32/gui/WndMain.c:1473
 msgid "Run &EXE..."
 msgstr "執行 EXE(&E)..."
 
-#: ../win32/gui/WndMain.c:1474
+#: ../win32/gui/WndMain.c:1472
 msgid "Run &BIOS"
 msgstr "執行 BIOS(&B)"
 
-#: ../win32/gui/WndMain.c:1475
+#: ../win32/gui/WndMain.c:1473
 msgid "Run &ISO..."
 msgstr "執行 ISO(&I)..."
 
-#: ../win32/gui/WndMain.c:1476
+#: ../win32/gui/WndMain.c:1474
 msgid "Run &CD"
 msgstr "執行光碟(&C)"
 
+#: ../win32/gui/WndMain.c:1476
+msgid "&Emulator"
+msgstr "模擬器(&E)"
+
 #: ../win32/gui/WndMain.c:1477
+msgid "&States"
+msgstr "記錄(&S)"
+
+#: ../win32/gui/WndMain.c:1479
+msgid "S&witch ISO..."
+msgstr "更換 ISO(&W)..."
+
+#: ../win32/gui/WndMain.c:1481
+msgid "Re&set"
+msgstr "複位(&S)"
+
+#: ../win32/gui/WndMain.c:1482
+msgid "&Run"
+msgstr "執行(&R)"
+
+#: ../win32/gui/WndMain.c:1483
 msgid "&Save"
 msgstr "存儲(&S)"
 
-#: ../win32/gui/WndMain.c:1478
+#: ../win32/gui/WndMain.c:1484
 msgid "&Load"
 msgstr "讀取(&L)"
 
-#: ../win32/gui/WndMain.c:1479
 #: ../win32/gui/WndMain.c:1485
+#: ../win32/gui/WndMain.c:1491
 msgid "&Other..."
 msgstr "其它(&O)..."
 
-#: ../win32/gui/WndMain.c:1480
 #: ../win32/gui/WndMain.c:1486
+#: ../win32/gui/WndMain.c:1492
 msgid "Slot &5"
 msgstr "記錄 5(&5)"
 
-#: ../win32/gui/WndMain.c:1481
 #: ../win32/gui/WndMain.c:1487
+#: ../win32/gui/WndMain.c:1493
 msgid "Slot &4"
 msgstr "記錄 4(&4)"
 
-#: ../win32/gui/WndMain.c:1482
 #: ../win32/gui/WndMain.c:1488
+#: ../win32/gui/WndMain.c:1494
 msgid "Slot &3"
 msgstr "記錄 3(&3)"
 
-#: ../win32/gui/WndMain.c:1483
 #: ../win32/gui/WndMain.c:1489
+#: ../win32/gui/WndMain.c:1495
 msgid "Slot &2"
 msgstr "記錄 2(&2)"
 
-#: ../win32/gui/WndMain.c:1484
 #: ../win32/gui/WndMain.c:1490
+#: ../win32/gui/WndMain.c:1496
 msgid "Slot &1"
 msgstr "記錄 1(&1)"
 
-#: ../win32/gui/WndMain.c:1492
-msgid "&Emulator"
-msgstr "模擬器(&E)"
-
-#: ../win32/gui/WndMain.c:1493
-msgid "S&witch ISO..."
-msgstr "更換 ISO(&W)..."
-
-#: ../win32/gui/WndMain.c:1495
-msgid "Re&set"
-msgstr "複位(&S)"
-
-#: ../win32/gui/WndMain.c:1496
-msgid "&Run"
-msgstr "執行(&R)"
-
 #: ../win32/gui/WndMain.c:1498
 msgid "&Configuration"
 msgstr "配置(&C)"
@@ -1076,8 +1076,8 @@ msgstr "所有檔案 (*.*)"
 
 #: ../gui/Cheat.c:392
 #: ../gui/Cheat.c:1121
-#: ../gui/Gtk2Gui.c:398
-#: ../gui/Gtk2Gui.c:1026
+#: ../gui/Gtk2Gui.c:404
+#: ../gui/Gtk2Gui.c:1032
 msgid "Error: Glade interface could not be loaded!"
 msgstr "錯誤：無法加載 Glade 界面!"
 
@@ -1105,119 +1105,117 @@ msgstr "新值:"
 msgid "Search Results"
 msgstr "搜尋結果"
 
-#: ../gui/Gtk2Gui.c:406
-#: ../data/pcsx.glade2:620
+#: ../gui/Gtk2Gui.c:412
+#: ../data/pcsx.glade2:605
 msgid "Configure PCSX"
 msgstr "配置 PCSX"
 
-#: ../gui/Gtk2Gui.c:492
+#: ../gui/Gtk2Gui.c:498
 msgid "Select PSX EXE File"
 msgstr "選擇 PS EXE 檔案"
 
-#: ../gui/Gtk2Gui.c:506
+#: ../gui/Gtk2Gui.c:512
 msgid "PlayStation Executable Files"
 msgstr "PlayStation 執行檔"
 
-#: ../gui/Gtk2Gui.c:543
+#: ../gui/Gtk2Gui.c:549
 msgid "Not a valid PSX file"
 msgstr "不是一個合法的 PSX 檔"
 
-#: ../gui/Gtk2Gui.c:543
+#: ../gui/Gtk2Gui.c:549
 msgid "The file does not appear to be a valid Playstation executable"
 msgstr "此文件不是一個合法的 PlayStation 執行檔"
 
-#: ../gui/Gtk2Gui.c:574
-#: ../gui/Gtk2Gui.c:701
+#: ../gui/Gtk2Gui.c:580
+#: ../gui/Gtk2Gui.c:707
 msgid "CD ROM failed"
 msgstr "CD-ROM 失敗"
 
-#: ../gui/Gtk2Gui.c:582
+#: ../gui/Gtk2Gui.c:588
 msgid "The CD ROM could not be loaded"
 msgstr "無法加載 CD-ROM"
 
-#: ../gui/Gtk2Gui.c:597
+#: ../gui/Gtk2Gui.c:603
 msgid "Could not run BIOS"
 msgstr "無法執行 BIOS"
 
-#: ../gui/Gtk2Gui.c:597
+#: ../gui/Gtk2Gui.c:603
 msgid "Running BIOS is not supported with Internal HLE BIOS."
 msgstr "內部 HLE BIOS 不支援直接執行。"
 
-#: ../gui/Gtk2Gui.c:627
+#: ../gui/Gtk2Gui.c:633
 msgid "Open PSX Disc Image File"
 msgstr "打開 PSX 光碟映像檔"
 
-#: ../gui/Gtk2Gui.c:647
+#: ../gui/Gtk2Gui.c:653
 msgid "PSX Image Files (*.bin, *.img, *.mdf, *.iso)"
 msgstr "PSX 鏡像檔 (*.bin, *.img, *.mdf, *.iso)"
 
-#: ../gui/Gtk2Gui.c:885
+#: ../gui/Gtk2Gui.c:891
 #, c-format
 msgid "Loaded state %s."
 msgstr "已讀取記錄 %s。"
 
-#: ../gui/Gtk2Gui.c:890
+#: ../gui/Gtk2Gui.c:896
 #, c-format
 msgid "Error loading state %s!"
 msgstr "讀取記錄 %s 時出錯。"
 
-#: ../gui/Gtk2Gui.c:901
+#: ../gui/Gtk2Gui.c:907
 #, c-format
 msgid "Saved state %s."
 msgstr "已存儲記錄 %s"
 
-#: ../gui/Gtk2Gui.c:903
+#: ../gui/Gtk2Gui.c:909
 #, c-format
 msgid "Error saving state %s!"
 msgstr "存儲記錄 %s 時出錯。"
 
-#: ../gui/Gtk2Gui.c:937
-#: ../gui/Gtk2Gui.c:964
+#: ../gui/Gtk2Gui.c:943
+#: ../gui/Gtk2Gui.c:970
 msgid "Select State File"
 msgstr "選擇記錄檔案"
 
-#: ../gui/Gtk2Gui.c:1068
+#: ../gui/Gtk2Gui.c:1074
 msgid "Icon"
 msgstr "圖符"
 
-#: ../gui/Gtk2Gui.c:1086
+#: ../gui/Gtk2Gui.c:1092
 msgid "ID"
 msgstr "ID"
 
-#: ../gui/Gtk2Gui.c:1092
+#: ../gui/Gtk2Gui.c:1098
 msgid "Name"
 msgstr "名稱"
 
-#: ../gui/Gtk2Gui.c:1252
+#: ../gui/Gtk2Gui.c:1258
 msgid "Format this Memory Card?"
 msgstr "格式化此記憶卡?"
 
-#: ../gui/Gtk2Gui.c:1254
+#: ../gui/Gtk2Gui.c:1260
 msgid "If you format the memory card, the card will be empty, and any existing data overwritten."
 msgstr "如果您選擇格式化記憶卡，記憶卡將被清空，並且任何現有資料都將被覆蓋。"
 
-#: ../gui/Gtk2Gui.c:1257
+#: ../gui/Gtk2Gui.c:1263
 msgid "Format card"
 msgstr "格式化記憶卡"
 
-#: ../gui/Gtk2Gui.c:1372
+#: ../gui/Gtk2Gui.c:1378
 msgid "No space available in the target memory card!"
 msgstr "目標記憶卡沒有空餘位置!"
 
-#: ../gui/Gtk2Gui.c:1514
-#: ../gui/Gtk2Gui.c:1535
-#: ../gui/Gtk2Gui.c:1556
-#: ../gui/Gtk2Gui.c:1577
-#: ../gui/Gtk2Gui.c:1598
+#: ../gui/Gtk2Gui.c:1520
+#: ../gui/Gtk2Gui.c:1541
+#: ../gui/Gtk2Gui.c:1562
+#: ../gui/Gtk2Gui.c:1583
 #: ../gui/Gtk2Gui.c:1889
 msgid "No configuration required"
 msgstr "不需要配置"
 
-#: ../gui/Gtk2Gui.c:1514
-#: ../gui/Gtk2Gui.c:1535
-#: ../gui/Gtk2Gui.c:1556
-#: ../gui/Gtk2Gui.c:1577
-#: ../gui/Gtk2Gui.c:1598
+#: ../gui/Gtk2Gui.c:1520
+#: ../gui/Gtk2Gui.c:1541
+#: ../gui/Gtk2Gui.c:1562
+#: ../gui/Gtk2Gui.c:1583
 #: ../gui/Gtk2Gui.c:1889
 msgid "This plugin doesn't need to be configured."
 msgstr "此外掛需要被配置。"
@@ -1291,7 +1289,7 @@ msgid "PSX emulator couldn't be initialized.\n"
 msgstr "PSX 模擬器無法初期化。\n"
 
 #: ../gui/Plugin.c:204
-#: ../data/pcsx.glade2:1334
+#: ../data/pcsx.glade2:1319
 #, c-format
 msgid "SIO IRQ Always Enabled"
 msgstr "SIO IRQ 總是啟用"
@@ -1361,7 +1359,7 @@ msgstr "無法關閉 \"控制器 2\" 外掛!"
 msgid "Error closing GPU plugin!"
 msgstr "無法關閉 GPU 外掛!"
 
-#: ../libpcsxcore/cdriso.c:528
+#: ../libpcsxcore/cdriso.c:631
 #, c-format
 msgid "Loaded CD Image: %s"
 msgstr "已加載 CD 映像: %s"
@@ -1868,114 +1866,110 @@ msgid "CD-_ROM..."
 msgstr "CD-_ROM..."
 
 #: ../data/pcsx.glade2:431
-msgid "Controller _1..."
-msgstr "控制器 _1..."
-
-#: ../data/pcsx.glade2:446
-msgid "Controller _2..."
-msgstr "控制器 _2..."
+msgid "C_ontrollers..."
+msgstr "控制器(_O)..."
 
-#: ../data/pcsx.glade2:466
+#: ../data/pcsx.glade2:451
 msgid "_CPU..."
 msgstr "_CPU..."
 
-#: ../data/pcsx.glade2:482
+#: ../data/pcsx.glade2:467
 msgid "_Memory Cards..."
 msgstr "記憶卡(_M)..."
 
-#: ../data/pcsx.glade2:499
+#: ../data/pcsx.glade2:484
 msgid "_Netplay..."
 msgstr "聯網遊戲(_N)..."
 
-#: ../data/pcsx.glade2:520
+#: ../data/pcsx.glade2:505
 msgid "Chea_t"
 msgstr "金手指(_T)"
 
-#: ../data/pcsx.glade2:529
+#: ../data/pcsx.glade2:514
 msgid "_Browse..."
 msgstr "檢視(_B)..."
 
-#: ../data/pcsx.glade2:544
+#: ../data/pcsx.glade2:529
 msgid "_Search..."
 msgstr "搜尋(_S)..."
 
-#: ../data/pcsx.glade2:575
+#: ../data/pcsx.glade2:560
 msgid "_Help"
 msgstr "說明(_H)"
 
-#: ../data/pcsx.glade2:581
+#: ../data/pcsx.glade2:566
 msgid "_About PCSX..."
 msgstr "關於 PCSX(_A)..."
 
-#: ../data/pcsx.glade2:722
+#: ../data/pcsx.glade2:707
 msgid "Select Folder to Search"
 msgstr "選擇要查找的資料夾"
 
-#: ../data/pcsx.glade2:738
+#: ../data/pcsx.glade2:723
 msgid "Search in:"
 msgstr "在此處查找外掛:"
 
-#: ../data/pcsx.glade2:1011
+#: ../data/pcsx.glade2:996
 msgid "Graphics:"
 msgstr "圖像:"
 
-#: ../data/pcsx.glade2:1024
+#: ../data/pcsx.glade2:1009
 msgid "Sound:"
 msgstr "聲音:"
 
-#: ../data/pcsx.glade2:1039
+#: ../data/pcsx.glade2:1024
 msgid "Controller 1:   "
 msgstr "控制器 1:"
 
-#: ../data/pcsx.glade2:1054
+#: ../data/pcsx.glade2:1039
 msgid "Controller 2:"
 msgstr "控制器 2:"
 
-#: ../data/pcsx.glade2:1069
+#: ../data/pcsx.glade2:1054
 msgid "CD-ROM:"
 msgstr "CD-ROM:"
 
-#: ../data/pcsx.glade2:1107
+#: ../data/pcsx.glade2:1092
 msgid "<b>Plugins</b>"
 msgstr "<b>外掛</b>"
 
-#: ../data/pcsx.glade2:1168
+#: ../data/pcsx.glade2:1153
 msgid "<b>BIOS</b>"
 msgstr "<b>BIOS</b>"
 
-#: ../data/pcsx.glade2:1220
+#: ../data/pcsx.glade2:1205
 msgid "Configure CPU"
 msgstr "配置 CPU"
 
-#: ../data/pcsx.glade2:1248
+#: ../data/pcsx.glade2:1233
 msgid "Enable Debugger"
 msgstr "啟用調試器"
 
-#: ../data/pcsx.glade2:1266
+#: ../data/pcsx.glade2:1251
 msgid "SPU IRQ Always Enabled"
 msgstr "SPU IRQ 總是啟用"
 
-#: ../data/pcsx.glade2:1282
+#: ../data/pcsx.glade2:1267
 msgid "Black & White Movies"
 msgstr "黑白電影"
 
-#: ../data/pcsx.glade2:1316
+#: ../data/pcsx.glade2:1301
 msgid "Enable Interpreter CPU"
 msgstr "啟用解釋執行 CPU"
 
-#: ../data/pcsx.glade2:1350
+#: ../data/pcsx.glade2:1335
 msgid "Disable CD Audio"
 msgstr "禁用 CD 音頻"
 
-#: ../data/pcsx.glade2:1366
+#: ../data/pcsx.glade2:1351
 msgid "Disable XA Decoding"
 msgstr "禁用 XA 解碼"
 
-#: ../data/pcsx.glade2:1418
+#: ../data/pcsx.glade2:1403
 msgid "<b>Options</b>"
 msgstr "<b>選項</b>"
 
-#: ../data/pcsx.glade2:1459
+#: ../data/pcsx.glade2:1444
 msgid ""
 "NTSC\n"
 "PAL"
@@ -1983,52 +1977,52 @@ msgstr ""
 "NTSC\n"
 "PAL"
 
-#: ../data/pcsx.glade2:1473
+#: ../data/pcsx.glade2:1458
 msgid "<b>System Type</b>"
 msgstr "<b>系統類型</b>"
 
-#: ../data/pcsx.glade2:1522
+#: ../data/pcsx.glade2:1507
 msgid "Configure NetPlay"
 msgstr "配置聯網遊戲"
 
-#: ../data/pcsx.glade2:1609
+#: ../data/pcsx.glade2:1594
 msgid "<b>NetPlay</b>"
 msgstr "<b>聯網遊戲</b>"
 
-#: ../data/pcsx.glade2:1661
+#: ../data/pcsx.glade2:1646
 msgid "Configure Memory Cards"
 msgstr "配置記憶卡"
 
-#: ../data/pcsx.glade2:1737
-#: ../data/pcsx.glade2:2133
+#: ../data/pcsx.glade2:1722
+#: ../data/pcsx.glade2:2118
 msgid "Format"
 msgstr "格式化"
 
-#: ../data/pcsx.glade2:1787
-#: ../data/pcsx.glade2:2183
+#: ../data/pcsx.glade2:1772
+#: ../data/pcsx.glade2:2168
 msgid "Reload"
 msgstr "重新加載"
 
-#: ../data/pcsx.glade2:1831
+#: ../data/pcsx.glade2:1816
 msgid "<b>Memory Card 1</b>"
 msgstr "<b>記憶卡 1</b>"
 
-#: ../data/pcsx.glade2:1891
-#: ../data/pcsx.glade2:1941
-#: ../data/pcsx.glade2:2816
+#: ../data/pcsx.glade2:1876
+#: ../data/pcsx.glade2:1926
+#: ../data/pcsx.glade2:2801
 msgid "Copy"
 msgstr "複制"
 
-#: ../data/pcsx.glade2:1991
-#: ../data/pcsx.glade2:2041
+#: ../data/pcsx.glade2:1976
+#: ../data/pcsx.glade2:2026
 msgid "Un/Delete"
 msgstr "刪除/恢複"
 
-#: ../data/pcsx.glade2:2227
+#: ../data/pcsx.glade2:2212
 msgid "<b>Memory Card 2</b>"
 msgstr "<b>記憶卡 2</b>"
 
-#: ../data/pcsx.glade2:2289
+#: ../data/pcsx.glade2:2274
 msgid ""
 "(C) 1999-2003  PCSX Team\n"
 "(C) 2005-2006 Ryan Schultz\n"
@@ -2040,15 +2034,15 @@ msgstr ""
 "(C) 2005-2006 Andrew Burton\n"
 "(C) 2008-2009 Wei Mingzhi"
 
-#: ../data/pcsx.glade2:2293
+#: ../data/pcsx.glade2:2278
 msgid "A PlayStation emulator."
 msgstr "一個 PlayStation 模擬器。"
 
-#: ../data/pcsx.glade2:2295
+#: ../data/pcsx.glade2:2280
 msgid "PCSX Reloaded"
 msgstr "PCSX Reloaded"
 
-#: ../data/pcsx.glade2:2296
+#: ../data/pcsx.glade2:2281
 msgid ""
 "This program is free software; you can redistribute it\n"
 "and/or modify it under the terms of the GNU General\n"
@@ -2082,16 +2076,16 @@ msgstr ""
 "Public License along with this program; if not, write to\n"
 "the Free Software Foundation, Inc."
 
-#: ../data/pcsx.glade2:2325
+#: ../data/pcsx.glade2:2310
 #: ../plugins/dfinput/dfinput.glade2:212
 msgid "translator-credits"
 msgstr "Wei Mingzhi <whistler@openoffice.org>"
 
-#: ../data/pcsx.glade2:2386
+#: ../data/pcsx.glade2:2371
 msgid "<b>Cheat Codes</b>"
 msgstr "<b>金手指碼</b>"
 
-#: ../data/pcsx.glade2:2551
+#: ../data/pcsx.glade2:2536
 msgid ""
 "8-bit\n"
 "16-bit\n"
@@ -2101,7 +2095,7 @@ msgstr ""
 "16 位元\n"
 "32 位元"
 
-#: ../data/pcsx.glade2:2614
+#: ../data/pcsx.glade2:2599
 msgid ""
 "Equal Value\n"
 "Not Equal Value\n"
@@ -2114,25 +2108,25 @@ msgid ""
 "No Change"
 msgstr ""
 
-#: ../data/pcsx.glade2:2646
+#: ../data/pcsx.glade2:2631
 msgid ""
 "Decimal\n"
 "Hexadecimal"
 msgstr ""
 
-#: ../data/pcsx.glade2:2849
+#: ../data/pcsx.glade2:2834
 msgid "label_resultsfound"
 msgstr "label_resultsfound"
 
-#: ../data/pcsx.glade2:2884
+#: ../data/pcsx.glade2:2869
 msgid "Search"
 msgstr "搜尋"
 
-#: ../data/pcsx.glade2:2920
+#: ../data/pcsx.glade2:2905
 msgid "Restart"
 msgstr "重新開始"
 
-#: ../data/pcsx.glade2:2949
+#: ../data/pcsx.glade2:2934
 msgid "<b>Cheat Search</b>"
 msgstr "<b>金手指碼搜尋</b>"
 
@@ -2708,6 +2702,10 @@ msgstr "<b>按鍵設定</b>"
 msgid "Based on PadJoy by Erich Kitzmüller (ammoq@ammoq.com)"
 msgstr "基於由 Erich Kitzmüller (ammoq@ammoq.com) 編寫的 PadJoy"
 
+#~ msgid "Controller _1..."
+#~ msgstr "控制器 _1..."
+#~ msgid "Controller _2..."
+#~ msgstr "控制器 _2..."
 #~ msgid "_Graphics"
 #~ msgstr "圖像(_G)"
 #~ msgid "_Sound"