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

8 files changed, 505 insertions, 229 deletions

diff --git a/data/pcsx.glade2 b/data/pcsx.glade2
index a26eff75..7e5d15ab 100644
--- a/data/pcsx.glade2
+++ b/data/pcsx.glade2
@@ -3381,7 +3381,7 @@ Hexadecimal</property>
                     <child>
                       <widget class="GtkLabel" id="label3">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">Dump Memory...</property>
+                        <property name="label" translatable="yes">Raw Dump...</property>
                       </widget>
                       <packing>
                         <property name="position">1</property>
diff --git a/gui/DebugMemory.c b/gui/DebugMemory.c
index c2a4fcb0..5b89fbe3 100644
--- a/gui/DebugMemory.c
+++ b/gui/DebugMemory.c
@@ -96,12 +96,151 @@ static void MemView_Go() {
 }
 
 static void MemView_Dump() {
-	// TODO
+	GtkWidget *dlg;
+	GtkWidget *box, *table, *label, *start_edit, *length_edit;
+
+	dlg = gtk_dialog_new_with_buttons(_("Memory Dump"), GTK_WINDOW(MemViewDlg),
+		GTK_DIALOG_MODAL, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+		GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL);
+
+	box = GTK_WIDGET(GTK_DIALOG(dlg)->vbox);
+
+	table = gtk_table_new(2, 2, FALSE);
+
+	label = gtk_label_new(_("Start Address (Hexadecimal):"));
+	gtk_table_attach(GTK_TABLE(table), label, 0, 1, 0, 1, 0, 0, 5, 5);
+	gtk_widget_show(label);
+
+	start_edit = gtk_entry_new();
+	gtk_table_attach(GTK_TABLE(table), start_edit, 1, 2, 0, 1, 0, 0, 5, 5);
+	gtk_widget_show(start_edit);
+
+	label = gtk_label_new(_("Length (Decimal):"));
+	gtk_table_attach(GTK_TABLE(table), label, 0, 1, 1, 2, 0, 0, 5, 5);
+	gtk_widget_show(label);
+
+	length_edit = gtk_entry_new();
+	gtk_table_attach(GTK_TABLE(table), length_edit, 1, 2, 1, 2, 0, 0, 5, 5);
+	gtk_widget_show(length_edit);
+
+	gtk_box_pack_start(GTK_BOX(box), table, FALSE, FALSE, 5);
+
+	gtk_window_set_position(GTK_WINDOW(dlg), GTK_WIN_POS_CENTER);
+	gtk_widget_show_all(dlg);
+
+	if (gtk_dialog_run(GTK_DIALOG(dlg)) == GTK_RESPONSE_ACCEPT) {
+		s32 start = 0, length = 0;
+
+		sscanf(gtk_entry_get_text(GTK_ENTRY(start_edit)), "%x", &start);
+		sscanf(gtk_entry_get_text(GTK_ENTRY(length_edit)), "%d", &length);
+
+		start &= 0x1fffff;
+
+		if (start + length > 0x1fffff) {
+			length = 0x1fffff - start;
+		}
+
+		if (length > 0) {
+			GtkWidget *file_chooser = gtk_file_chooser_dialog_new(_("Select PSX EXE File"),
+				NULL, GTK_FILE_CHOOSER_ACTION_SAVE,
+				GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+				GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, NULL);
+
+			gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(file_chooser), getenv("HOME"));
+
+			if (gtk_dialog_run(GTK_DIALOG(file_chooser)) == GTK_RESPONSE_ACCEPT) {
+				gchar *file = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(file_chooser));
+				FILE *fp = fopen(file, "wb");
+
+				if (fp != NULL) {
+					fwrite(PSXM(start), 1, length, fp);
+					fclose(fp);
+				} else {
+					SysMessage(_("Error writing to %s!"), file);
+				}
+				
+				g_free(file);
+			}
+
+			gtk_widget_destroy(file_chooser);
+		}
+	}
+
+	gtk_widget_destroy(dlg);
 }
 
 static void MemView_Patch() {
-	// TODO
-	UpdateMemViewDlg();
+	GtkWidget *dlg;
+	GtkWidget *box, *table, *label, *addr_edit, *val_edit, *type_combo;
+
+	dlg = gtk_dialog_new_with_buttons(_("Memory Patch"), GTK_WINDOW(MemViewDlg),
+		GTK_DIALOG_MODAL, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+		GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL);
+
+	box = GTK_WIDGET(GTK_DIALOG(dlg)->vbox);
+
+	table = gtk_table_new(2, 3, FALSE);
+
+	label = gtk_label_new(_("Address (Hexadecimal):"));
+	gtk_table_attach(GTK_TABLE(table), label, 0, 1, 0, 1, 0, 0, 5, 5);
+	gtk_widget_show(label);
+
+	addr_edit = gtk_entry_new();
+	gtk_table_attach(GTK_TABLE(table), addr_edit, 1, 2, 0, 1, 0, 0, 5, 5);
+	gtk_widget_show(addr_edit);
+
+	label = gtk_label_new(_("Value (Hexadecimal):"));
+	gtk_table_attach(GTK_TABLE(table), label, 0, 1, 1, 2, 0, 0, 5, 5);
+	gtk_widget_show(label);
+
+	val_edit = gtk_entry_new();
+	gtk_table_attach(GTK_TABLE(table), val_edit, 1, 2, 1, 2, 0, 0, 5, 5);
+	gtk_widget_show(val_edit);
+
+	label = gtk_label_new(_("Data Type:"));
+	gtk_table_attach(GTK_TABLE(table), label, 0, 1, 2, 3, 0, 0, 5, 5);
+	gtk_widget_show(label);
+
+	type_combo = gtk_combo_box_new_text();
+	gtk_combo_box_append_text(GTK_COMBO_BOX(type_combo), _("8-bit"));
+	gtk_combo_box_append_text(GTK_COMBO_BOX(type_combo), _("16-bit"));
+	gtk_combo_box_append_text(GTK_COMBO_BOX(type_combo), _("32-bit"));
+	gtk_combo_box_set_active(GTK_COMBO_BOX(type_combo), 0);
+	gtk_table_attach(GTK_TABLE(table), type_combo, 1, 2, 2, 3, 0, 0, 5, 5);
+	gtk_widget_show(type_combo);
+
+	gtk_box_pack_start(GTK_BOX(box), table, FALSE, FALSE, 5);
+
+	gtk_window_set_position(GTK_WINDOW(dlg), GTK_WIN_POS_CENTER);
+	gtk_widget_show_all(dlg);
+
+	if (gtk_dialog_run(GTK_DIALOG(dlg)) == GTK_RESPONSE_ACCEPT) {
+		u32 addr = 0xffffffff, val = 0;
+		sscanf(gtk_entry_get_text(GTK_ENTRY(addr_edit)), "%x", &addr);
+		if (addr != 0xffffffff) {
+			addr &= 0x1fffff;
+			sscanf(gtk_entry_get_text(GTK_ENTRY(val_edit)), "%x", &val);
+			
+			switch (gtk_combo_box_get_active(GTK_COMBO_BOX(type_combo))) {
+				case 0: // 8-bit
+					psxMemWrite8(addr, (u8)val);
+					break;
+
+				case 1: // 16-bit
+					psxMemWrite16(addr, (u16)val);
+					break;
+
+				case 2: // 32-bit
+					psxMemWrite32(addr, (u32)val);
+					break;
+			}
+
+			MemViewAddress = addr;
+			UpdateMemViewDlg();
+		}
+	}
+
+	gtk_widget_destroy(dlg);
 }
 
 // close the memory viewer window
diff --git a/gui/Gtk2Gui.c b/gui/Gtk2Gui.c
index 6517ed82..0b7ba584 100644
--- a/gui/Gtk2Gui.c
+++ b/gui/Gtk2Gui.c
@@ -401,11 +401,10 @@ void OnFile_RunExe() {
 	if (plugins_configured() == FALSE) {
 		ConfigurePlugins();
 	} else {
-		file_chooser = gtk_file_chooser_dialog_new (_("Select PSX EXE File"),
-				NULL, GTK_FILE_CHOOSER_ACTION_OPEN,
-				GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-				GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
-				NULL);
+		file_chooser = gtk_file_chooser_dialog_new(_("Select PSX EXE File"),
+			NULL, GTK_FILE_CHOOSER_ACTION_OPEN,
+			GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+			GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, NULL);
 
 		// Add file filters
 		GtkFileFilter *exefilter = gtk_file_filter_new ();
diff --git a/po/it.po b/po/it.po
index 72255f9b..75d57a01 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pcsxr 1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-10 20:25+0800\n"
+"POT-Creation-Date: 2010-04-10 22:41+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"
@@ -251,7 +251,8 @@ msgstr "Cerca cheat"
 msgid "Search For:"
 msgstr "Cerca per:"
 
-#: ../win32/gui/CheatDlg.c:682 ../data/pcsx.glade2:2853
+#: ../win32/gui/CheatDlg.c:682 ../gui/DebugMemory.c:200
+#: ../data/pcsx.glade2:2853
 msgid "Data Type:"
 msgstr "Tipo di dato:"
 
@@ -287,15 +288,15 @@ msgstr "&Nuova ricerca"
 msgid "C&lose"
 msgstr "C&hiudi"
 
-#: ../win32/gui/CheatDlg.c:693
+#: ../win32/gui/CheatDlg.c:693 ../gui/DebugMemory.c:205
 msgid "8-bit"
 msgstr "8-bit"
 
-#: ../win32/gui/CheatDlg.c:694
+#: ../win32/gui/CheatDlg.c:694 ../gui/DebugMemory.c:206
 msgid "16-bit"
 msgstr "16-bit"
 
-#: ../win32/gui/CheatDlg.c:695
+#: ../win32/gui/CheatDlg.c:695 ../gui/DebugMemory.c:207
 msgid "32-bit"
 msgstr "32-bit"
 
@@ -639,13 +640,13 @@ msgid "*PCSX*: Error Saving State %s"
 msgstr ""
 "*PCSX*: si è verificato un errore durante il salvataggio dello stato %s"
 
-#: ../win32/gui/WndMain.c:429 ../win32/gui/WndMain.c:478 ../gui/Gtk2Gui.c:485
-#: ../gui/Gtk2Gui.c:610
+#: ../win32/gui/WndMain.c:429 ../win32/gui/WndMain.c:478 ../gui/Gtk2Gui.c:484
+#: ../gui/Gtk2Gui.c:609
 msgid "The CD does not appear to be a valid Playstation CD"
 msgstr "Il CD inserito non sembra essere un valido CD della Playstation"
 
-#: ../win32/gui/WndMain.c:435 ../win32/gui/WndMain.c:484 ../gui/Gtk2Gui.c:493
-#: ../gui/Gtk2Gui.c:618
+#: ../win32/gui/WndMain.c:435 ../win32/gui/WndMain.c:484 ../gui/Gtk2Gui.c:492
+#: ../gui/Gtk2Gui.c:617
 msgid "Could not load CD-ROM!"
 msgstr "Impossibile caricare il CD-ROM!"
 
@@ -832,7 +833,7 @@ msgid "DataDeck Memory Card (*.ddf)"
 msgstr "Memory card DataDeck (*.ddf)"
 
 #: ../win32/gui/WndMain.c:1353 ../win32/gui/WndMain.c:1434 ../gui/Cheat.c:322
-#: ../gui/Gtk2Gui.c:422 ../gui/Gtk2Gui.c:561
+#: ../gui/Gtk2Gui.c:421 ../gui/Gtk2Gui.c:560
 msgid "All Files"
 msgstr "Tutti i file"
 
@@ -1005,7 +1006,7 @@ msgid "All Files (*.*)"
 msgstr "Tutti i file (*.*)"
 
 #: ../gui/Cheat.c:395 ../gui/Cheat.c:1125 ../gui/ConfDlg.c:104
-#: ../gui/ConfDlg.c:200 ../gui/DebugMemory.c:123
+#: ../gui/ConfDlg.c:200 ../gui/DebugMemory.c:262
 msgid "Error: Glade interface could not be loaded!"
 msgstr "Errore: impossibile caricare l'interfaccia di glade!"
 
@@ -1057,17 +1058,54 @@ msgstr "Impossibile aprire la cartella del BIOS: '%s'\n"
 msgid "Could not open directory: '%s'\n"
 msgstr "Impossibile aprire la cartella: '%s'\n"
 
-#: ../gui/DebugMemory.c:128
+#: ../gui/DebugMemory.c:102 ../data/pcsx.glade2:3270
+msgid "Memory Dump"
+msgstr ""
+
+#: ../gui/DebugMemory.c:110
+#, fuzzy
+msgid "Start Address (Hexadecimal):"
+msgstr "Esadecimale"
+
+#: ../gui/DebugMemory.c:118
+msgid "Length (Decimal):"
+msgstr ""
+
+#: ../gui/DebugMemory.c:144 ../gui/Gtk2Gui.c:404
+msgid "Select PSX EXE File"
+msgstr "Seleziona un file EXE della PSX"
+
+#: ../gui/DebugMemory.c:159
+#, fuzzy, c-format
+msgid "Error writing to %s!"
+msgstr "Si è verificato un errore durante il salvataggio dello stato %s!"
+
+#: ../gui/DebugMemory.c:176
+#, fuzzy
+msgid "Memory Patch"
+msgstr "Memory card 1"
+
+#: ../gui/DebugMemory.c:184 ../data/pcsx.glade2:3292
+#, fuzzy
+msgid "Address (Hexadecimal):"
+msgstr "Esadecimale"
+
+#: ../gui/DebugMemory.c:192
+#, fuzzy
+msgid "Value (Hexadecimal):"
+msgstr "Esadecimale"
+
+#: ../gui/DebugMemory.c:267
 #, fuzzy
 msgid "Memory Viewer"
 msgstr "Memory card 1"
 
-#: ../gui/DebugMemory.c:133
+#: ../gui/DebugMemory.c:272
 #, fuzzy
 msgid "Address"
 msgstr "Indirizzo:"
 
-#: ../gui/DebugMemory.c:151
+#: ../gui/DebugMemory.c:290
 #, fuzzy
 msgid "Text"
 msgstr "Strutture"
@@ -1080,71 +1118,67 @@ msgstr "Pronto"
 msgid "Emulation Paused."
 msgstr "L'emulazione è stata messa in pausa."
 
-#: ../gui/Gtk2Gui.c:404
-msgid "Select PSX EXE File"
-msgstr "Seleziona un file EXE della PSX"
-
-#: ../gui/Gtk2Gui.c:418
+#: ../gui/Gtk2Gui.c:417
 msgid "PlayStation Executable Files"
 msgstr "File eseguibili della PlayStation"
 
-#: ../gui/Gtk2Gui.c:454
+#: ../gui/Gtk2Gui.c:453
 msgid "Not a valid PSX file"
 msgstr "Non è un file valido della PSX"
 
-#: ../gui/Gtk2Gui.c:454
+#: ../gui/Gtk2Gui.c:453
 msgid "The file does not appear to be a valid Playstation executable"
 msgstr "Il file non sembra essere un eseguibile valido della Playstation"
 
-#: ../gui/Gtk2Gui.c:485 ../gui/Gtk2Gui.c:610
+#: ../gui/Gtk2Gui.c:484 ../gui/Gtk2Gui.c:609
 msgid "CD ROM failed"
 msgstr "Si è verificato un problema con il CD ROM"
 
-#: ../gui/Gtk2Gui.c:493 ../gui/Gtk2Gui.c:618
+#: ../gui/Gtk2Gui.c:492 ../gui/Gtk2Gui.c:617
 msgid "The CD-ROM could not be loaded"
 msgstr "Impossibile caricare il CD-ROM"
 
-#: ../gui/Gtk2Gui.c:507
+#: ../gui/Gtk2Gui.c:506
 msgid "Could not run BIOS"
 msgstr "Impossibile avviare il BIOS"
 
-#: ../gui/Gtk2Gui.c:507
+#: ../gui/Gtk2Gui.c:506
 msgid "Running BIOS is not supported with Internal HLE BIOS."
 msgstr "L'avvio del BIOS non è supportato con il BIOS HLE interno."
 
-#: ../gui/Gtk2Gui.c:536
+#: ../gui/Gtk2Gui.c:535
 msgid "Open PSX Disc Image File"
 msgstr "Apri il file immagine del disco PSX"
 
-#: ../gui/Gtk2Gui.c:556
+#: ../gui/Gtk2Gui.c:555
 msgid "PSX Image Files (*.bin, *.img, *.mdf, *.iso)"
 msgstr "File immagine PSX (*.bin, *.img, *.mdf, *.iso)"
 
-#: ../gui/Gtk2Gui.c:767
+#: ../gui/Gtk2Gui.c:766
 #, c-format
 msgid "Loaded state %s."
 msgstr "È stato caricato lo stato %s."
 
-#: ../gui/Gtk2Gui.c:771
+#: ../gui/Gtk2Gui.c:770
 #, c-format
 msgid "Error loading state %s!"
 msgstr "Si è verificato un errore durante il caricamento dello stato %s!"
 
-#: ../gui/Gtk2Gui.c:782
+#: ../gui/Gtk2Gui.c:781
 #, c-format
 msgid "Saved state %s."
 msgstr "È stato salvato lo stato %s."
 
-#: ../gui/Gtk2Gui.c:784
+#: ../gui/Gtk2Gui.c:783
 #, c-format
 msgid "Error saving state %s!"
 msgstr "Si è verificato un errore durante il salvataggio dello stato %s!"
 
-#: ../gui/Gtk2Gui.c:817 ../gui/Gtk2Gui.c:844
+#: ../gui/Gtk2Gui.c:816 ../gui/Gtk2Gui.c:843
 msgid "Select State File"
 msgstr "Seleziona il file dello stato"
 
-#: ../gui/Gtk2Gui.c:901
+#: ../gui/Gtk2Gui.c:900
 msgid "Notice"
 msgstr "Avviso"
 
@@ -2176,19 +2210,9 @@ msgstr "Riavvia"
 msgid "<b>Cheat Search</b>"
 msgstr "<b>Cerca cheat</b>"
 
-#: ../data/pcsx.glade2:3270
-msgid "Memory Dump"
-msgstr ""
-
-#: ../data/pcsx.glade2:3292
-#, fuzzy
-msgid "Address (Hexadecimal):"
-msgstr "Esadecimale"
-
 #: ../data/pcsx.glade2:3384
-#, fuzzy
-msgid "Dump Memory..."
-msgstr "&Memory card..."
+msgid "Raw Dump..."
+msgstr ""
 
 #: ../data/pcsx.glade2:3419
 msgid "Patch Memory..."
@@ -2967,6 +2991,10 @@ msgstr "Controller 2"
 msgid "Multi-Threaded (Recommended)"
 msgstr "Multi-Threaded (consigliato)"
 
+#, fuzzy
+#~ msgid "Dump Memory..."
+#~ msgstr "&Memory card..."
+
 #~ msgid ""
 #~ "(C) 1999-2003  PCSX Team\n"
 #~ "(C) 2005-2006 Ryan Schultz\n"
diff --git a/po/pcsx.pot b/po/pcsx.pot
index 35ef9e60..a5bd0ac2 100644
--- a/po/pcsx.pot
+++ b/po/pcsx.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-10 20:25+0800\n"
+"POT-Creation-Date: 2010-04-10 22:41+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"
@@ -237,7 +237,8 @@ msgstr ""
 msgid "Search For:"
 msgstr ""
 
-#: ../win32/gui/CheatDlg.c:682 ../data/pcsx.glade2:2853
+#: ../win32/gui/CheatDlg.c:682 ../gui/DebugMemory.c:200
+#: ../data/pcsx.glade2:2853
 msgid "Data Type:"
 msgstr ""
 
@@ -273,15 +274,15 @@ msgstr ""
 msgid "C&lose"
 msgstr ""
 
-#: ../win32/gui/CheatDlg.c:693
+#: ../win32/gui/CheatDlg.c:693 ../gui/DebugMemory.c:205
 msgid "8-bit"
 msgstr ""
 
-#: ../win32/gui/CheatDlg.c:694
+#: ../win32/gui/CheatDlg.c:694 ../gui/DebugMemory.c:206
 msgid "16-bit"
 msgstr ""
 
-#: ../win32/gui/CheatDlg.c:695
+#: ../win32/gui/CheatDlg.c:695 ../gui/DebugMemory.c:207
 msgid "32-bit"
 msgstr ""
 
@@ -619,13 +620,13 @@ msgstr ""
 msgid "*PCSX*: Error Saving State %s"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:429 ../win32/gui/WndMain.c:478 ../gui/Gtk2Gui.c:485
-#: ../gui/Gtk2Gui.c:610
+#: ../win32/gui/WndMain.c:429 ../win32/gui/WndMain.c:478 ../gui/Gtk2Gui.c:484
+#: ../gui/Gtk2Gui.c:609
 msgid "The CD does not appear to be a valid Playstation CD"
 msgstr ""
 
-#: ../win32/gui/WndMain.c:435 ../win32/gui/WndMain.c:484 ../gui/Gtk2Gui.c:493
-#: ../gui/Gtk2Gui.c:618
+#: ../win32/gui/WndMain.c:435 ../win32/gui/WndMain.c:484 ../gui/Gtk2Gui.c:492
+#: ../gui/Gtk2Gui.c:617
 msgid "Could not load CD-ROM!"
 msgstr ""
 
@@ -811,7 +812,7 @@ msgid "DataDeck Memory Card (*.ddf)"
 msgstr ""
 
 #: ../win32/gui/WndMain.c:1353 ../win32/gui/WndMain.c:1434 ../gui/Cheat.c:322
-#: ../gui/Gtk2Gui.c:422 ../gui/Gtk2Gui.c:561
+#: ../gui/Gtk2Gui.c:421 ../gui/Gtk2Gui.c:560
 msgid "All Files"
 msgstr ""
 
@@ -984,7 +985,7 @@ msgid "All Files (*.*)"
 msgstr ""
 
 #: ../gui/Cheat.c:395 ../gui/Cheat.c:1125 ../gui/ConfDlg.c:104
-#: ../gui/ConfDlg.c:200 ../gui/DebugMemory.c:123
+#: ../gui/ConfDlg.c:200 ../gui/DebugMemory.c:262
 msgid "Error: Glade interface could not be loaded!"
 msgstr ""
 
@@ -1036,15 +1037,48 @@ msgstr ""
 msgid "Could not open directory: '%s'\n"
 msgstr ""
 
-#: ../gui/DebugMemory.c:128
+#: ../gui/DebugMemory.c:102 ../data/pcsx.glade2:3270
+msgid "Memory Dump"
+msgstr ""
+
+#: ../gui/DebugMemory.c:110
+msgid "Start Address (Hexadecimal):"
+msgstr ""
+
+#: ../gui/DebugMemory.c:118
+msgid "Length (Decimal):"
+msgstr ""
+
+#: ../gui/DebugMemory.c:144 ../gui/Gtk2Gui.c:404
+msgid "Select PSX EXE File"
+msgstr ""
+
+#: ../gui/DebugMemory.c:159
+#, c-format
+msgid "Error writing to %s!"
+msgstr ""
+
+#: ../gui/DebugMemory.c:176
+msgid "Memory Patch"
+msgstr ""
+
+#: ../gui/DebugMemory.c:184 ../data/pcsx.glade2:3292
+msgid "Address (Hexadecimal):"
+msgstr ""
+
+#: ../gui/DebugMemory.c:192
+msgid "Value (Hexadecimal):"
+msgstr ""
+
+#: ../gui/DebugMemory.c:267
 msgid "Memory Viewer"
 msgstr ""
 
-#: ../gui/DebugMemory.c:133
+#: ../gui/DebugMemory.c:272
 msgid "Address"
 msgstr ""
 
-#: ../gui/DebugMemory.c:151
+#: ../gui/DebugMemory.c:290
 msgid "Text"
 msgstr ""
 
@@ -1056,71 +1090,67 @@ msgstr ""
 msgid "Emulation Paused."
 msgstr ""
 
-#: ../gui/Gtk2Gui.c:404
-msgid "Select PSX EXE File"
-msgstr ""
-
-#: ../gui/Gtk2Gui.c:418
+#: ../gui/Gtk2Gui.c:417
 msgid "PlayStation Executable Files"
 msgstr ""
 
-#: ../gui/Gtk2Gui.c:454
+#: ../gui/Gtk2Gui.c:453
 msgid "Not a valid PSX file"
 msgstr ""
 
-#: ../gui/Gtk2Gui.c:454
+#: ../gui/Gtk2Gui.c:453
 msgid "The file does not appear to be a valid Playstation executable"
 msgstr ""
 
-#: ../gui/Gtk2Gui.c:485 ../gui/Gtk2Gui.c:610
+#: ../gui/Gtk2Gui.c:484 ../gui/Gtk2Gui.c:609
 msgid "CD ROM failed"
 msgstr ""
 
-#: ../gui/Gtk2Gui.c:493 ../gui/Gtk2Gui.c:618
+#: ../gui/Gtk2Gui.c:492 ../gui/Gtk2Gui.c:617
 msgid "The CD-ROM could not be loaded"
 msgstr ""
 
-#: ../gui/Gtk2Gui.c:507
+#: ../gui/Gtk2Gui.c:506
 msgid "Could not run BIOS"
 msgstr ""
 
-#: ../gui/Gtk2Gui.c:507
+#: ../gui/Gtk2Gui.c:506
 msgid "Running BIOS is not supported with Internal HLE BIOS."
 msgstr ""
 
-#: ../gui/Gtk2Gui.c:536
+#: ../gui/Gtk2Gui.c:535
 msgid "Open PSX Disc Image File"
 msgstr ""
 
-#: ../gui/Gtk2Gui.c:556
+#: ../gui/Gtk2Gui.c:555
 msgid "PSX Image Files (*.bin, *.img, *.mdf, *.iso)"
 msgstr ""
 
-#: ../gui/Gtk2Gui.c:767
+#: ../gui/Gtk2Gui.c:766
 #, c-format
 msgid "Loaded state %s."
 msgstr ""
 
-#: ../gui/Gtk2Gui.c:771
+#: ../gui/Gtk2Gui.c:770
 #, c-format
 msgid "Error loading state %s!"
 msgstr ""
 
-#: ../gui/Gtk2Gui.c:782
+#: ../gui/Gtk2Gui.c:781
 #, c-format
 msgid "Saved state %s."
 msgstr ""
 
-#: ../gui/Gtk2Gui.c:784
+#: ../gui/Gtk2Gui.c:783
 #, c-format
 msgid "Error saving state %s!"
 msgstr ""
 
-#: ../gui/Gtk2Gui.c:817 ../gui/Gtk2Gui.c:844
+#: ../gui/Gtk2Gui.c:816 ../gui/Gtk2Gui.c:843
 msgid "Select State File"
 msgstr ""
 
-#: ../gui/Gtk2Gui.c:901
+#: ../gui/Gtk2Gui.c:900
 msgid "Notice"
 msgstr ""
 
@@ -2065,16 +2095,8 @@ msgstr ""
 msgid "<b>Cheat Search</b>"
 msgstr ""
 
-#: ../data/pcsx.glade2:3270
-msgid "Memory Dump"
-msgstr ""
-
-#: ../data/pcsx.glade2:3292
-msgid "Address (Hexadecimal):"
-msgstr ""
-
 #: ../data/pcsx.glade2:3384
-msgid "Dump Memory..."
+msgid "Raw Dump..."
 msgstr ""
 
 #: ../data/pcsx.glade2:3419
diff --git a/po/pt_BR.po b/po/pt_BR.po
index d5099f04..9b4f4644 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pcsx-df\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-10 20:25+0800\n"
+"POT-Creation-Date: 2010-04-10 22:41+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"
@@ -250,7 +250,8 @@ msgstr "Procurar por trapaça"
 msgid "Search For:"
 msgstr "Buscar por:"
 
-#: ../win32/gui/CheatDlg.c:682 ../data/pcsx.glade2:2853
+#: ../win32/gui/CheatDlg.c:682 ../gui/DebugMemory.c:200
+#: ../data/pcsx.glade2:2853
 msgid "Data Type:"
 msgstr "Tipo de dados:"
 
@@ -286,15 +287,15 @@ msgstr "&Nova busca"
 msgid "C&lose"
 msgstr "Fe&char"
 
-#: ../win32/gui/CheatDlg.c:693
+#: ../win32/gui/CheatDlg.c:693 ../gui/DebugMemory.c:205
 msgid "8-bit"
 msgstr "8-bit"
 
-#: ../win32/gui/CheatDlg.c:694
+#: ../win32/gui/CheatDlg.c:694 ../gui/DebugMemory.c:206
 msgid "16-bit"
 msgstr "16-bit"
 
-#: ../win32/gui/CheatDlg.c:695
+#: ../win32/gui/CheatDlg.c:695 ../gui/DebugMemory.c:207
 msgid "32-bit"
 msgstr "32-bit"
 
@@ -635,13 +636,13 @@ msgstr "PCSX: Arquivo de estado \"%s\" salvo."
 msgid "*PCSX*: Error Saving State %s"
 msgstr "PCSX: Erro ao salvar o arquivo de estado \"%s\"!"
 
-#: ../win32/gui/WndMain.c:429 ../win32/gui/WndMain.c:478 ../gui/Gtk2Gui.c:485
-#: ../gui/Gtk2Gui.c:610
+#: ../win32/gui/WndMain.c:429 ../win32/gui/WndMain.c:478 ../gui/Gtk2Gui.c:484
+#: ../gui/Gtk2Gui.c:609
 msgid "The CD does not appear to be a valid Playstation CD"
 msgstr "Esse CD não parece ser um CD de PlayStation!"
 
-#: ../win32/gui/WndMain.c:435 ../win32/gui/WndMain.c:484 ../gui/Gtk2Gui.c:493
-#: ../gui/Gtk2Gui.c:618
+#: ../win32/gui/WndMain.c:435 ../win32/gui/WndMain.c:484 ../gui/Gtk2Gui.c:492
+#: ../gui/Gtk2Gui.c:617
 msgid "Could not load CD-ROM!"
 msgstr "Não pôde carregar o CDROM!"
 
@@ -827,7 +828,7 @@ msgid "DataDeck Memory Card (*.ddf)"
 msgstr "Cartão de memória do DataDeck (*.ddf)"
 
 #: ../win32/gui/WndMain.c:1353 ../win32/gui/WndMain.c:1434 ../gui/Cheat.c:322
-#: ../gui/Gtk2Gui.c:422 ../gui/Gtk2Gui.c:561
+#: ../gui/Gtk2Gui.c:421 ../gui/Gtk2Gui.c:560
 msgid "All Files"
 msgstr "Todos os arquivos"
 
@@ -1000,7 +1001,7 @@ msgid "All Files (*.*)"
 msgstr "Todos os arquivos (*.*)"
 
 #: ../gui/Cheat.c:395 ../gui/Cheat.c:1125 ../gui/ConfDlg.c:104
-#: ../gui/ConfDlg.c:200 ../gui/DebugMemory.c:123
+#: ../gui/ConfDlg.c:200 ../gui/DebugMemory.c:262
 msgid "Error: Glade interface could not be loaded!"
 msgstr "Erro: o ambiente Glade não pôde ser carregado!"
 
@@ -1052,17 +1053,54 @@ msgstr "Não conseguiu abrir o diretório \"%s\", da BIOS!\n"
 msgid "Could not open directory: '%s'\n"
 msgstr "Não conseguiu abrir o diretório \"%s\"!\n"
 
-#: ../gui/DebugMemory.c:128
+#: ../gui/DebugMemory.c:102 ../data/pcsx.glade2:3270
+msgid "Memory Dump"
+msgstr ""
+
+#: ../gui/DebugMemory.c:110
+#, fuzzy
+msgid "Start Address (Hexadecimal):"
+msgstr "Hexadecimal"
+
+#: ../gui/DebugMemory.c:118
+msgid "Length (Decimal):"
+msgstr ""
+
+#: ../gui/DebugMemory.c:144 ../gui/Gtk2Gui.c:404
+msgid "Select PSX EXE File"
+msgstr "Selecione o arquivo executável de PSX"
+
+#: ../gui/DebugMemory.c:159
+#, fuzzy, c-format
+msgid "Error writing to %s!"
+msgstr "Erro ao salvar o arquivo de estado \"%s\"!"
+
+#: ../gui/DebugMemory.c:176
+#, fuzzy
+msgid "Memory Patch"
+msgstr "Cartão de memória 1"
+
+#: ../gui/DebugMemory.c:184 ../data/pcsx.glade2:3292
+#, fuzzy
+msgid "Address (Hexadecimal):"
+msgstr "Hexadecimal"
+
+#: ../gui/DebugMemory.c:192
+#, fuzzy
+msgid "Value (Hexadecimal):"
+msgstr "Hexadecimal"
+
+#: ../gui/DebugMemory.c:267
 #, fuzzy
 msgid "Memory Viewer"
 msgstr "Cartão de memória 1"
 
-#: ../gui/DebugMemory.c:133
+#: ../gui/DebugMemory.c:272
 #, fuzzy
 msgid "Address"
 msgstr "Endereço:"
 
-#: ../gui/DebugMemory.c:151
+#: ../gui/DebugMemory.c:290
 #, fuzzy
 msgid "Text"
 msgstr "Texturas"
@@ -1075,71 +1113,67 @@ msgstr ""
 msgid "Emulation Paused."
 msgstr ""
 
-#: ../gui/Gtk2Gui.c:404
-msgid "Select PSX EXE File"
-msgstr "Selecione o arquivo executável de PSX"
-
-#: ../gui/Gtk2Gui.c:418
+#: ../gui/Gtk2Gui.c:417
 msgid "PlayStation Executable Files"
 msgstr "Arquivos executáveis do PlayStation"
 
-#: ../gui/Gtk2Gui.c:454
+#: ../gui/Gtk2Gui.c:453
 msgid "Not a valid PSX file"
 msgstr "Não é um arquivo válido de PSX"
 
-#: ../gui/Gtk2Gui.c:454
+#: ../gui/Gtk2Gui.c:453
 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:485 ../gui/Gtk2Gui.c:610
+#: ../gui/Gtk2Gui.c:484 ../gui/Gtk2Gui.c:609
 msgid "CD ROM failed"
 msgstr "CDROM falhou"
 
-#: ../gui/Gtk2Gui.c:493 ../gui/Gtk2Gui.c:618
+#: ../gui/Gtk2Gui.c:492 ../gui/Gtk2Gui.c:617
 msgid "The CD-ROM could not be loaded"
 msgstr ""
 
-#: ../gui/Gtk2Gui.c:507
+#: ../gui/Gtk2Gui.c:506
 msgid "Could not run BIOS"
 msgstr "Não conseguiu iniciar a BIOS"
 
-#: ../gui/Gtk2Gui.c:507
+#: ../gui/Gtk2Gui.c:506
 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:536
+#: ../gui/Gtk2Gui.c:535
 msgid "Open PSX Disc Image File"
 msgstr "Abrir arquivo de imagem de CD de PSX"
 
-#: ../gui/Gtk2Gui.c:556
+#: ../gui/Gtk2Gui.c:555
 msgid "PSX Image Files (*.bin, *.img, *.mdf, *.iso)"
 msgstr "Arquivo de imagens de CD de PSX (*.bin, *.img, *.mdf, *.iso)"
 
-#: ../gui/Gtk2Gui.c:767
+#: ../gui/Gtk2Gui.c:766
 #, c-format
 msgid "Loaded state %s."
 msgstr "Arquivo de estado \"%s\" carregado."
 
-#: ../gui/Gtk2Gui.c:771
+#: ../gui/Gtk2Gui.c:770
 #, c-format
 msgid "Error loading state %s!"
 msgstr "Erro ao carregar o arquivo de estado \"%s\"!"
 
-#: ../gui/Gtk2Gui.c:782
+#: ../gui/Gtk2Gui.c:781
 #, c-format
 msgid "Saved state %s."
 msgstr "Arquivo de estado \"%s\" salvo."
 
-#: ../gui/Gtk2Gui.c:784
+#: ../gui/Gtk2Gui.c:783
 #, c-format
 msgid "Error saving state %s!"
 msgstr "Erro ao salvar o arquivo de estado \"%s\"!"
 
-#: ../gui/Gtk2Gui.c:817 ../gui/Gtk2Gui.c:844
+#: ../gui/Gtk2Gui.c:816 ../gui/Gtk2Gui.c:843
 msgid "Select State File"
 msgstr "Selecione o arquivo de estado"
 
-#: ../gui/Gtk2Gui.c:901
+#: ../gui/Gtk2Gui.c:900
 msgid "Notice"
 msgstr "Aviso"
 
@@ -2148,19 +2182,9 @@ msgstr "Reiniciar"
 msgid "<b>Cheat Search</b>"
 msgstr "<b>Busca de trapaças</b>"
 
-#: ../data/pcsx.glade2:3270
-msgid "Memory Dump"
-msgstr ""
-
-#: ../data/pcsx.glade2:3292
-#, fuzzy
-msgid "Address (Hexadecimal):"
-msgstr "Hexadecimal"
-
 #: ../data/pcsx.glade2:3384
-#, fuzzy
-msgid "Dump Memory..."
-msgstr "&Cartões de memória..."
+msgid "Raw Dump..."
+msgstr ""
 
 #: ../data/pcsx.glade2:3419
 msgid "Patch Memory..."
@@ -2919,6 +2943,10 @@ msgstr "Controle 2"
 msgid "Multi-Threaded (Recommended)"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Dump Memory..."
+#~ msgstr "&Cartões de memória..."
+
 #~ msgid ""
 #~ "(C) 1999-2003  PCSX Team\n"
 #~ "(C) 2005-2006 Ryan Schultz\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 2e089766..798ed8d6 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: 2010-04-10 20:25+0800\n"
-"PO-Revision-Date: 2010-04-10 20:25+0700\n"
+"POT-Creation-Date: 2010-04-10 22:41+0800\n"
+"PO-Revision-Date: 2010-04-10 22:42+0700\n"
 "Last-Translator: Wei Mingzhi <whistler@openoffice.org>\n"
 "Language-Team: Simplified Chinese <whistler@openoffice.org>\n"
 "MIME-Version: 1.0\n"
@@ -288,6 +288,7 @@ msgid "Search For:"
 msgstr "查找:"
 
 #: ../win32/gui/CheatDlg.c:682
+#: ../gui/DebugMemory.c:200
 #: ../data/pcsx.glade2:2853
 msgid "Data Type:"
 msgstr "数据类型:"
@@ -327,14 +328,17 @@ msgid "C&lose"
 msgstr "关闭(&L)"
 
 #: ../win32/gui/CheatDlg.c:693
+#: ../gui/DebugMemory.c:205
 msgid "8-bit"
 msgstr "8 位"
 
 #: ../win32/gui/CheatDlg.c:694
+#: ../gui/DebugMemory.c:206
 msgid "16-bit"
 msgstr "16 位"
 
 #: ../win32/gui/CheatDlg.c:695
+#: ../gui/DebugMemory.c:207
 msgid "32-bit"
 msgstr "32 位"
 
@@ -692,15 +696,15 @@ msgstr "*PCSX*: Error Saving State %s"
 
 #: ../win32/gui/WndMain.c:429
 #: ../win32/gui/WndMain.c:478
-#: ../gui/Gtk2Gui.c:485
-#: ../gui/Gtk2Gui.c:610
+#: ../gui/Gtk2Gui.c:484
+#: ../gui/Gtk2Gui.c:609
 msgid "The CD does not appear to be a valid Playstation CD"
 msgstr "此光盘不是一张合法的 PlayStation 光盘。"
 
 #: ../win32/gui/WndMain.c:435
 #: ../win32/gui/WndMain.c:484
-#: ../gui/Gtk2Gui.c:493
-#: ../gui/Gtk2Gui.c:618
+#: ../gui/Gtk2Gui.c:492
+#: ../gui/Gtk2Gui.c:617
 msgid "Could not load CD-ROM!"
 msgstr "无法加载光盘!"
 
@@ -907,8 +911,8 @@ msgstr "DataDeck 记忆卡 (*.ddl)"
 #: ../win32/gui/WndMain.c:1353
 #: ../win32/gui/WndMain.c:1434
 #: ../gui/Cheat.c:322
-#: ../gui/Gtk2Gui.c:422
-#: ../gui/Gtk2Gui.c:561
+#: ../gui/Gtk2Gui.c:421
+#: ../gui/Gtk2Gui.c:560
 msgid "All Files"
 msgstr "所有文件"
 
@@ -1092,7 +1096,7 @@ msgstr "所有文件 (*.*)"
 #: ../gui/Cheat.c:1125
 #: ../gui/ConfDlg.c:104
 #: ../gui/ConfDlg.c:200
-#: ../gui/DebugMemory.c:123
+#: ../gui/DebugMemory.c:262
 msgid "Error: Glade interface could not be loaded!"
 msgstr "错误：无法加载 Glade 界面!"
 
@@ -1153,15 +1157,51 @@ msgstr "无法打开 BIOS 目录: \"%s\"\n"
 msgid "Could not open directory: '%s'\n"
 msgstr "无法打开目录: \"%s\"\n"
 
-#: ../gui/DebugMemory.c:128
+#: ../gui/DebugMemory.c:102
+#: ../data/pcsx.glade2:3270
+msgid "Memory Dump"
+msgstr "内存转储"
+
+#: ../gui/DebugMemory.c:110
+msgid "Start Address (Hexadecimal):"
+msgstr "开始地址 (十六进制):"
+
+#: ../gui/DebugMemory.c:118
+msgid "Length (Decimal):"
+msgstr "长度 (十进制):"
+
+#: ../gui/DebugMemory.c:144
+#: ../gui/Gtk2Gui.c:404
+msgid "Select PSX EXE File"
+msgstr "选择 PSX EXE 文件"
+
+#: ../gui/DebugMemory.c:159
+#, c-format
+msgid "Error writing to %s!"
+msgstr "写入到 %s 时出错!"
+
+#: ../gui/DebugMemory.c:176
+msgid "Memory Patch"
+msgstr "内存修改"
+
+#: ../gui/DebugMemory.c:184
+#: ../data/pcsx.glade2:3292
+msgid "Address (Hexadecimal):"
+msgstr "地址 (十六进制):"
+
+#: ../gui/DebugMemory.c:192
+msgid "Value (Hexadecimal):"
+msgstr "数值 (十六进制):"
+
+#: ../gui/DebugMemory.c:267
 msgid "Memory Viewer"
 msgstr "内存查看器"
 
-#: ../gui/DebugMemory.c:133
+#: ../gui/DebugMemory.c:272
 msgid "Address"
 msgstr "地址"
 
-#: ../gui/DebugMemory.c:151
+#: ../gui/DebugMemory.c:290
 msgid "Text"
 msgstr "文本"
 
@@ -1173,74 +1213,70 @@ msgstr "就绪"
 msgid "Emulation Paused."
 msgstr "模拟器已暂停。"
 
-#: ../gui/Gtk2Gui.c:404
-msgid "Select PSX EXE File"
-msgstr "选择 PSX EXE 文件"
-
-#: ../gui/Gtk2Gui.c:418
+#: ../gui/Gtk2Gui.c:417
 msgid "PlayStation Executable Files"
 msgstr "PlayStation 可执行文件"
 
-#: ../gui/Gtk2Gui.c:454
+#: ../gui/Gtk2Gui.c:453
 msgid "Not a valid PSX file"
 msgstr "不是一个合法的 PSX 文件"
 
-#: ../gui/Gtk2Gui.c:454
+#: ../gui/Gtk2Gui.c:453
 msgid "The file does not appear to be a valid Playstation executable"
 msgstr "此文件不是一个合法的 PlayStation 可执行文件"
 
-#: ../gui/Gtk2Gui.c:485
-#: ../gui/Gtk2Gui.c:610
+#: ../gui/Gtk2Gui.c:484
+#: ../gui/Gtk2Gui.c:609
 msgid "CD ROM failed"
 msgstr "CD-ROM 失败"
 
-#: ../gui/Gtk2Gui.c:493
-#: ../gui/Gtk2Gui.c:618
+#: ../gui/Gtk2Gui.c:492
+#: ../gui/Gtk2Gui.c:617
 msgid "The CD-ROM could not be loaded"
 msgstr "无法加载 CD-ROM"
 
-#: ../gui/Gtk2Gui.c:507
+#: ../gui/Gtk2Gui.c:506
 msgid "Could not run BIOS"
 msgstr "无法运行 BIOS"
 
-#: ../gui/Gtk2Gui.c:507
+#: ../gui/Gtk2Gui.c:506
 msgid "Running BIOS is not supported with Internal HLE BIOS."
 msgstr "内部 HLE BIOS 不支持直接运行。"
 
-#: ../gui/Gtk2Gui.c:536
+#: ../gui/Gtk2Gui.c:535
 msgid "Open PSX Disc Image File"
 msgstr "打开 PSX 光盘镜像文件"
 
-#: ../gui/Gtk2Gui.c:556
+#: ../gui/Gtk2Gui.c:555
 msgid "PSX Image Files (*.bin, *.img, *.mdf, *.iso)"
 msgstr "PS 镜像文件 (*.bin, *.img, *.mdf, *.iso)"
 
-#: ../gui/Gtk2Gui.c:767
+#: ../gui/Gtk2Gui.c:766
 #, c-format
 msgid "Loaded state %s."
 msgstr "已读取存档 %s。"
 
-#: ../gui/Gtk2Gui.c:771
+#: ../gui/Gtk2Gui.c:770
 #, c-format
 msgid "Error loading state %s!"
 msgstr "读取存档 %s 时出错。"
 
-#: ../gui/Gtk2Gui.c:782
+#: ../gui/Gtk2Gui.c:781
 #, c-format
 msgid "Saved state %s."
 msgstr "已保存存档 %s"
 
-#: ../gui/Gtk2Gui.c:784
+#: ../gui/Gtk2Gui.c:783
 #, c-format
 msgid "Error saving state %s!"
 msgstr "保存存档 %s 时出错。"
 
-#: ../gui/Gtk2Gui.c:817
-#: ../gui/Gtk2Gui.c:844
+#: ../gui/Gtk2Gui.c:816
+#: ../gui/Gtk2Gui.c:843
 msgid "Select State File"
 msgstr "选择存档文件"
 
-#: ../gui/Gtk2Gui.c:901
+#: ../gui/Gtk2Gui.c:900
 msgid "Notice"
 msgstr "警告"
 
@@ -2261,17 +2297,9 @@ msgstr "复位"
 msgid "<b>Cheat Search</b>"
 msgstr "<b>作弊码查找</b>"
 
-#: ../data/pcsx.glade2:3270
-msgid "Memory Dump"
-msgstr "内存转储"
-
-#: ../data/pcsx.glade2:3292
-msgid "Address (Hexadecimal):"
-msgstr "地址 (十六进制):"
-
 #: ../data/pcsx.glade2:3384
-msgid "Dump Memory..."
-msgstr "转储内存..."
+msgid "Raw Dump..."
+msgstr "Raw 转储..."
 
 #: ../data/pcsx.glade2:3419
 msgid "Patch Memory..."
@@ -3070,6 +3098,8 @@ msgstr "控制器 2"
 msgid "Multi-Threaded (Recommended)"
 msgstr "多线程 (推荐)"
 
+#~ msgid "Dump Memory..."
+#~ msgstr "转储内存..."
 #~ msgid ""
 #~ "(C) 1999-2003  PCSX Team\n"
 #~ "(C) 2005-2006 Ryan Schultz\n"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index ac037cc5..9d459ec0 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: 2010-04-10 20:25+0800\n"
-"PO-Revision-Date: 2010-04-10 20:26+0700\n"
+"POT-Creation-Date: 2010-04-10 22:41+0800\n"
+"PO-Revision-Date: 2010-04-10 22:43+0700\n"
 "Last-Translator: Wei Mingzhi <whistler@openoffice.org>\n"
 "Language-Team: Traditional Chinese <whistler@openoffice.org>\n"
 "MIME-Version: 1.0\n"
@@ -288,6 +288,7 @@ msgid "Search For:"
 msgstr "搜尋:"
 
 #: ../win32/gui/CheatDlg.c:682
+#: ../gui/DebugMemory.c:200
 #: ../data/pcsx.glade2:2853
 msgid "Data Type:"
 msgstr "數值類型:"
@@ -327,14 +328,17 @@ msgid "C&lose"
 msgstr "關閉(&L)"
 
 #: ../win32/gui/CheatDlg.c:693
+#: ../gui/DebugMemory.c:205
 msgid "8-bit"
 msgstr "8 位元"
 
 #: ../win32/gui/CheatDlg.c:694
+#: ../gui/DebugMemory.c:206
 msgid "16-bit"
 msgstr "16 位元"
 
 #: ../win32/gui/CheatDlg.c:695
+#: ../gui/DebugMemory.c:207
 msgid "32-bit"
 msgstr "32 位元"
 
@@ -692,15 +696,15 @@ msgstr "*PCSX*: Error Saving State %s"
 
 #: ../win32/gui/WndMain.c:429
 #: ../win32/gui/WndMain.c:478
-#: ../gui/Gtk2Gui.c:485
-#: ../gui/Gtk2Gui.c:610
+#: ../gui/Gtk2Gui.c:484
+#: ../gui/Gtk2Gui.c:609
 msgid "The CD does not appear to be a valid Playstation CD"
 msgstr "此光碟不是一張合法的 PlayStation 光碟。"
 
 #: ../win32/gui/WndMain.c:435
 #: ../win32/gui/WndMain.c:484
-#: ../gui/Gtk2Gui.c:493
-#: ../gui/Gtk2Gui.c:618
+#: ../gui/Gtk2Gui.c:492
+#: ../gui/Gtk2Gui.c:617
 msgid "Could not load CD-ROM!"
 msgstr "無法加載光碟!"
 
@@ -907,8 +911,8 @@ msgstr "DataDeck 記憶卡 (*.ddl)"
 #: ../win32/gui/WndMain.c:1353
 #: ../win32/gui/WndMain.c:1434
 #: ../gui/Cheat.c:322
-#: ../gui/Gtk2Gui.c:422
-#: ../gui/Gtk2Gui.c:561
+#: ../gui/Gtk2Gui.c:421
+#: ../gui/Gtk2Gui.c:560
 msgid "All Files"
 msgstr "所有檔案"
 
@@ -1092,7 +1096,7 @@ msgstr "所有檔案 (*.*)"
 #: ../gui/Cheat.c:1125
 #: ../gui/ConfDlg.c:104
 #: ../gui/ConfDlg.c:200
-#: ../gui/DebugMemory.c:123
+#: ../gui/DebugMemory.c:262
 msgid "Error: Glade interface could not be loaded!"
 msgstr "錯誤：無法加載 Glade 界面!"
 
@@ -1153,15 +1157,51 @@ msgstr "無法開啟 BIOS 目錄: \"%s\"\n"
 msgid "Could not open directory: '%s'\n"
 msgstr "無法開啟目錄: \"%s\"\n"
 
-#: ../gui/DebugMemory.c:128
+#: ../gui/DebugMemory.c:102
+#: ../data/pcsx.glade2:3270
+msgid "Memory Dump"
+msgstr "記憶體轉儲"
+
+#: ../gui/DebugMemory.c:110
+msgid "Start Address (Hexadecimal):"
+msgstr "起始位址 (十六進制):"
+
+#: ../gui/DebugMemory.c:118
+msgid "Length (Decimal):"
+msgstr "長度 (十進制):"
+
+#: ../gui/DebugMemory.c:144
+#: ../gui/Gtk2Gui.c:404
+msgid "Select PSX EXE File"
+msgstr "選擇 PS EXE 檔案"
+
+#: ../gui/DebugMemory.c:159
+#, c-format
+msgid "Error writing to %s!"
+msgstr "存儲至 %s 時出錯!"
+
+#: ../gui/DebugMemory.c:176
+msgid "Memory Patch"
+msgstr "記憶體修改"
+
+#: ../gui/DebugMemory.c:184
+#: ../data/pcsx.glade2:3292
+msgid "Address (Hexadecimal):"
+msgstr "位址 (十六進制):"
+
+#: ../gui/DebugMemory.c:192
+msgid "Value (Hexadecimal):"
+msgstr "數值 (十六進制):"
+
+#: ../gui/DebugMemory.c:267
 msgid "Memory Viewer"
 msgstr "記憶體檢視"
 
-#: ../gui/DebugMemory.c:133
+#: ../gui/DebugMemory.c:272
 msgid "Address"
 msgstr "位址"
 
-#: ../gui/DebugMemory.c:151
+#: ../gui/DebugMemory.c:290
 msgid "Text"
 msgstr "文字"
 
@@ -1173,74 +1213,70 @@ msgstr "就緒"
 msgid "Emulation Paused."
 msgstr "模擬器已暫停。"
 
-#: ../gui/Gtk2Gui.c:404
-msgid "Select PSX EXE File"
-msgstr "選擇 PS EXE 檔案"
-
-#: ../gui/Gtk2Gui.c:418
+#: ../gui/Gtk2Gui.c:417
 msgid "PlayStation Executable Files"
 msgstr "PlayStation 執行檔"
 
-#: ../gui/Gtk2Gui.c:454
+#: ../gui/Gtk2Gui.c:453
 msgid "Not a valid PSX file"
 msgstr "不是一個合法的 PSX 檔"
 
-#: ../gui/Gtk2Gui.c:454
+#: ../gui/Gtk2Gui.c:453
 msgid "The file does not appear to be a valid Playstation executable"
 msgstr "此文件不是一個合法的 PlayStation 執行檔"
 
-#: ../gui/Gtk2Gui.c:485
-#: ../gui/Gtk2Gui.c:610
+#: ../gui/Gtk2Gui.c:484
+#: ../gui/Gtk2Gui.c:609
 msgid "CD ROM failed"
 msgstr "CD-ROM 失敗"
 
-#: ../gui/Gtk2Gui.c:493
-#: ../gui/Gtk2Gui.c:618
+#: ../gui/Gtk2Gui.c:492
+#: ../gui/Gtk2Gui.c:617
 msgid "The CD-ROM could not be loaded"
 msgstr "無法加載 CD-ROM"
 
-#: ../gui/Gtk2Gui.c:507
+#: ../gui/Gtk2Gui.c:506
 msgid "Could not run BIOS"
 msgstr "無法執行 BIOS"
 
-#: ../gui/Gtk2Gui.c:507
+#: ../gui/Gtk2Gui.c:506
 msgid "Running BIOS is not supported with Internal HLE BIOS."
 msgstr "內部 HLE BIOS 不支援直接執行。"
 
-#: ../gui/Gtk2Gui.c:536
+#: ../gui/Gtk2Gui.c:535
 msgid "Open PSX Disc Image File"
 msgstr "打開 PSX 光碟映像檔"
 
-#: ../gui/Gtk2Gui.c:556
+#: ../gui/Gtk2Gui.c:555
 msgid "PSX Image Files (*.bin, *.img, *.mdf, *.iso)"
 msgstr "PSX 鏡像檔 (*.bin, *.img, *.mdf, *.iso)"
 
-#: ../gui/Gtk2Gui.c:767
+#: ../gui/Gtk2Gui.c:766
 #, c-format
 msgid "Loaded state %s."
 msgstr "已讀取記錄 %s。"
 
-#: ../gui/Gtk2Gui.c:771
+#: ../gui/Gtk2Gui.c:770
 #, c-format
 msgid "Error loading state %s!"
 msgstr "讀取記錄 %s 時出錯。"
 
-#: ../gui/Gtk2Gui.c:782
+#: ../gui/Gtk2Gui.c:781
 #, c-format
 msgid "Saved state %s."
 msgstr "已存儲記錄 %s"
 
-#: ../gui/Gtk2Gui.c:784
+#: ../gui/Gtk2Gui.c:783
 #, c-format
 msgid "Error saving state %s!"
 msgstr "存儲記錄 %s 時出錯。"
 
-#: ../gui/Gtk2Gui.c:817
-#: ../gui/Gtk2Gui.c:844
+#: ../gui/Gtk2Gui.c:816
+#: ../gui/Gtk2Gui.c:843
 msgid "Select State File"
 msgstr "選擇記錄檔案"
 
-#: ../gui/Gtk2Gui.c:901
+#: ../gui/Gtk2Gui.c:900
 msgid "Notice"
 msgstr "警告"
 
@@ -2261,17 +2297,9 @@ msgstr "重新開始"
 msgid "<b>Cheat Search</b>"
 msgstr "<b>金手指碼搜尋</b>"
 
-#: ../data/pcsx.glade2:3270
-msgid "Memory Dump"
-msgstr "記憶體轉儲"
-
-#: ../data/pcsx.glade2:3292
-msgid "Address (Hexadecimal):"
-msgstr "位址 (十六進制):"
-
 #: ../data/pcsx.glade2:3384
-msgid "Dump Memory..."
-msgstr "轉儲記憶體..."
+msgid "Raw Dump..."
+msgstr "Raw 轉儲..."
 
 #: ../data/pcsx.glade2:3419
 msgid "Patch Memory..."
@@ -3070,6 +3098,8 @@ msgstr "控制器 2"
 msgid "Multi-Threaded (Recommended)"
 msgstr "多執行緒 (建議使用)"
 
+#~ msgid "Dump Memory..."
+#~ msgstr "轉儲記憶體..."
 #~ msgid ""
 #~ "(C) 1999-2003  PCSX Team\n"
 #~ "(C) 2005-2006 Ryan Schultz\n"