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

7 files changed, 93 insertions, 172 deletions

diff --git a/ChangeLog b/ChangeLog
index e128fd57..8cac7eb4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
 April 11, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
 
  * libpcsxcore/cdriso.c: Check the CRC value of subchannel after reading.
+ * gui/DebugMemory.c: Allow using a hexa string instead of one value for
+   Memory Patch.
+ * po/zh_CN.po, po/zh_TW.po, po/it.po, po/pt_BR.po, po/pcsx.pot: Updated.
 
 April 10, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
 
diff --git a/gui/DebugMemory.c b/gui/DebugMemory.c
index e39f4a7b..4dff00d8 100644
--- a/gui/DebugMemory.c
+++ b/gui/DebugMemory.c
@@ -62,7 +62,7 @@ static void UpdateMemViewDlg() {
 		sprintf(bufaddr, "%.8X", start);
 
 		for (i = 0; i < 16; i++) {
-			buftext[i] = PSXMs8(start + i);
+			buftext[i] = psxMs8(start + i);
 			sprintf(bufdata[i], "%.2X", (u8)buftext[i]);
 			if ((s8)buftext[i] < 32) buftext[i] = '.';
 		}
@@ -98,6 +98,7 @@ static void MemView_Go() {
 static void MemView_Dump() {
 	GtkWidget *dlg;
 	GtkWidget *box, *table, *label, *start_edit, *length_edit;
+	char buf[10];
 
 	dlg = gtk_dialog_new_with_buttons(_("Memory Dump"), GTK_WINDOW(MemViewDlg),
 		GTK_DIALOG_MODAL, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
@@ -111,7 +112,9 @@ static void MemView_Dump() {
 	gtk_table_attach(GTK_TABLE(table), label, 0, 1, 0, 1, 0, 0, 5, 5);
 	gtk_widget_show(label);
 
-	start_edit = gtk_entry_new();
+	start_edit = gtk_entry_new_with_max_length(8);
+	sprintf(buf, "%.8X", MemViewAddress);
+	gtk_entry_set_text(GTK_ENTRY(start_edit), buf);
 	gtk_table_attach(GTK_TABLE(table), start_edit, 1, 2, 0, 1, 0, 0, 5, 5);
 	gtk_widget_show(start_edit);
 
@@ -153,7 +156,7 @@ static void MemView_Dump() {
 				FILE *fp = fopen(file, "wb");
 
 				if (fp != NULL) {
-					fwrite(PSXM(start), 1, length, fp);
+					fwrite(&psxM[start], 1, length, fp);
 					fclose(fp);
 				} else {
 					SysMessage(_("Error writing to %s!"), file);
@@ -171,7 +174,8 @@ static void MemView_Dump() {
 
 static void MemView_Patch() {
 	GtkWidget *dlg;
-	GtkWidget *box, *table, *label, *addr_edit, *val_edit, *type_combo;
+	GtkWidget *box, *table, *label, *addr_edit, *val_edit;
+	char buf[10];
 
 	dlg = gtk_dialog_new_with_buttons(_("Memory Patch"), GTK_WINDOW(MemViewDlg),
 		GTK_DIALOG_MODAL, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
@@ -179,17 +183,19 @@ static void MemView_Patch() {
 
 	box = GTK_WIDGET(GTK_DIALOG(dlg)->vbox);
 
-	table = gtk_table_new(2, 3, FALSE);
+	table = gtk_table_new(2, 2, 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();
+	addr_edit = gtk_entry_new_with_max_length(8);
+	sprintf(buf, "%.8X", MemViewAddress);
+	gtk_entry_set_text(GTK_ENTRY(addr_edit), buf);
 	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):"));
+	label = gtk_label_new(_("Value (Hexa string):"));
 	gtk_table_attach(GTK_TABLE(table), label, 0, 1, 1, 2, 0, 0, 5, 5);
 	gtk_widget_show(label);
 
@@ -197,18 +203,6 @@ static void MemView_Patch() {
 	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);
@@ -216,26 +210,29 @@ static void MemView_Patch() {
 
 	if (gtk_dialog_run(GTK_DIALOG(dlg)) == GTK_RESPONSE_ACCEPT) {
 		u32 addr = 0xffffffff, val = 0;
+		const char *p = gtk_entry_get_text(GTK_ENTRY(val_edit));
+		int r = strlen(p);
+
 		sscanf(gtk_entry_get_text(GTK_ENTRY(addr_edit)), "%x", &addr);
-		if (addr != 0xffffffff) {
+
+		if (r > 0 && addr != 0xffffffff) {
 			addr &= 0x1fffff;
-			sscanf(gtk_entry_get_text(GTK_ENTRY(val_edit)), "%x", &val);
+			MemViewAddress = addr;
 
-			switch (gtk_combo_box_get_active(GTK_COMBO_BOX(type_combo))) {
-				case 0: // 8-bit
-					psxMemWrite8(addr, (u8)val);
-					break;
+			while (r > 0 && addr <= 0x1fffff) {
+				sscanf(p, "%2x", &val);
+				p += 2;
+				r -= 2;
 
-				case 1: // 16-bit
-					psxMemWrite16(addr, (u16)val);
-					break;
+				while (r > 0 && (*p == '\t' || *p == ' ')) {
+					p++;
+					r--;
+				}
 
-				case 2: // 32-bit
-					psxMemWrite32(addr, (u32)val);
-					break;
+				psxMemWrite8(addr, (u8)val);
+				addr++;
 			}
 
-			MemViewAddress = addr;
 			UpdateMemViewDlg();
 		}
 	}
diff --git a/po/it.po b/po/it.po
index 2b7681ba..3bdd0980 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 22:46+0800\n"
+"POT-Creation-Date: 2010-04-11 20:17+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,8 +251,7 @@ msgstr "Cerca cheat"
 msgid "Search For:"
 msgstr "Cerca per:"
 
-#: ../win32/gui/CheatDlg.c:682 ../gui/DebugMemory.c:200
-#: ../data/pcsx.glade2:2853
+#: ../win32/gui/CheatDlg.c:682 ../data/pcsx.glade2:2853
 msgid "Data Type:"
 msgstr "Tipo di dato:"
 
@@ -288,15 +287,15 @@ msgstr "&Nuova ricerca"
 msgid "C&lose"
 msgstr "C&hiudi"
 
-#: ../win32/gui/CheatDlg.c:693 ../gui/DebugMemory.c:205
+#: ../win32/gui/CheatDlg.c:693
 msgid "8-bit"
 msgstr "8-bit"
 
-#: ../win32/gui/CheatDlg.c:694 ../gui/DebugMemory.c:206
+#: ../win32/gui/CheatDlg.c:694
 msgid "16-bit"
 msgstr "16-bit"
 
-#: ../win32/gui/CheatDlg.c:695 ../gui/DebugMemory.c:207
+#: ../win32/gui/CheatDlg.c:695
 msgid "32-bit"
 msgstr "32-bit"
 
@@ -1006,7 +1005,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:262
+#: ../gui/ConfDlg.c:200 ../gui/DebugMemory.c:256
 msgid "Error: Glade interface could not be loaded!"
 msgstr "Errore: impossibile caricare l'interfaccia di glade!"
 
@@ -1080,32 +1079,32 @@ msgstr ""
 msgid "Error writing to %s!"
 msgstr "Si è verificato un errore durante il salvataggio dello stato %s!"
 
-#: ../gui/DebugMemory.c:176
+#: ../gui/DebugMemory.c:177
 #, fuzzy
 msgid "Memory Patch"
 msgstr "Memory card 1"
 
-#: ../gui/DebugMemory.c:184 ../data/pcsx.glade2:3292
+#: ../gui/DebugMemory.c:185 ../data/pcsx.glade2:3292
 #, fuzzy
 msgid "Address (Hexadecimal):"
 msgstr "Esadecimale"
 
-#: ../gui/DebugMemory.c:192
+#: ../gui/DebugMemory.c:195
 #, fuzzy
-msgid "Value (Hexadecimal):"
+msgid "Value (Hexa string):"
 msgstr "Esadecimale"
 
-#: ../gui/DebugMemory.c:267
+#: ../gui/DebugMemory.c:261
 #, fuzzy
 msgid "Memory Viewer"
 msgstr "Memory card 1"
 
-#: ../gui/DebugMemory.c:272
+#: ../gui/DebugMemory.c:266
 #, fuzzy
 msgid "Address"
 msgstr "Indirizzo:"
 
-#: ../gui/DebugMemory.c:290
+#: ../gui/DebugMemory.c:284
 #, fuzzy
 msgid "Text"
 msgstr "Strutture"
diff --git a/po/pcsx.pot b/po/pcsx.pot
index b84dede4..57853734 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 22:46+0800\n"
+"POT-Creation-Date: 2010-04-11 20:17+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,8 +237,7 @@ msgstr ""
 msgid "Search For:"
 msgstr ""
 
-#: ../win32/gui/CheatDlg.c:682 ../gui/DebugMemory.c:200
-#: ../data/pcsx.glade2:2853
+#: ../win32/gui/CheatDlg.c:682 ../data/pcsx.glade2:2853
 msgid "Data Type:"
 msgstr ""
 
@@ -274,15 +273,15 @@ msgstr ""
 msgid "C&lose"
 msgstr ""
 
-#: ../win32/gui/CheatDlg.c:693 ../gui/DebugMemory.c:205
+#: ../win32/gui/CheatDlg.c:693
 msgid "8-bit"
 msgstr ""
 
-#: ../win32/gui/CheatDlg.c:694 ../gui/DebugMemory.c:206
+#: ../win32/gui/CheatDlg.c:694
 msgid "16-bit"
 msgstr ""
 
-#: ../win32/gui/CheatDlg.c:695 ../gui/DebugMemory.c:207
+#: ../win32/gui/CheatDlg.c:695
 msgid "32-bit"
 msgstr ""
 
@@ -985,7 +984,7 @@ msgid "All Files (*.*)"
 msgstr ""
 
 #: ../gui/Cheat.c:395 ../gui/Cheat.c:1125 ../gui/ConfDlg.c:104
-#: ../gui/ConfDlg.c:200 ../gui/DebugMemory.c:262
+#: ../gui/ConfDlg.c:200 ../gui/DebugMemory.c:256
 msgid "Error: Glade interface could not be loaded!"
 msgstr ""
 
@@ -1058,27 +1057,27 @@ msgstr ""
 msgid "Error writing to %s!"
 msgstr ""
 
-#: ../gui/DebugMemory.c:176
+#: ../gui/DebugMemory.c:177
 msgid "Memory Patch"
 msgstr ""
 
-#: ../gui/DebugMemory.c:184 ../data/pcsx.glade2:3292
+#: ../gui/DebugMemory.c:185 ../data/pcsx.glade2:3292
 msgid "Address (Hexadecimal):"
 msgstr ""
 
-#: ../gui/DebugMemory.c:192
-msgid "Value (Hexadecimal):"
+#: ../gui/DebugMemory.c:195
+msgid "Value (Hexa string):"
 msgstr ""
 
-#: ../gui/DebugMemory.c:267
+#: ../gui/DebugMemory.c:261
 msgid "Memory Viewer"
 msgstr ""
 
-#: ../gui/DebugMemory.c:272
+#: ../gui/DebugMemory.c:266
 msgid "Address"
 msgstr ""
 
-#: ../gui/DebugMemory.c:290
+#: ../gui/DebugMemory.c:284
 msgid "Text"
 msgstr ""
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 005f02cb..f3ba5062 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 22:46+0800\n"
+"POT-Creation-Date: 2010-04-11 20:17+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,8 +250,7 @@ msgstr "Procurar por trapaça"
 msgid "Search For:"
 msgstr "Buscar por:"
 
-#: ../win32/gui/CheatDlg.c:682 ../gui/DebugMemory.c:200
-#: ../data/pcsx.glade2:2853
+#: ../win32/gui/CheatDlg.c:682 ../data/pcsx.glade2:2853
 msgid "Data Type:"
 msgstr "Tipo de dados:"
 
@@ -287,15 +286,15 @@ msgstr "&Nova busca"
 msgid "C&lose"
 msgstr "Fe&char"
 
-#: ../win32/gui/CheatDlg.c:693 ../gui/DebugMemory.c:205
+#: ../win32/gui/CheatDlg.c:693
 msgid "8-bit"
 msgstr "8-bit"
 
-#: ../win32/gui/CheatDlg.c:694 ../gui/DebugMemory.c:206
+#: ../win32/gui/CheatDlg.c:694
 msgid "16-bit"
 msgstr "16-bit"
 
-#: ../win32/gui/CheatDlg.c:695 ../gui/DebugMemory.c:207
+#: ../win32/gui/CheatDlg.c:695
 msgid "32-bit"
 msgstr "32-bit"
 
@@ -1001,7 +1000,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:262
+#: ../gui/ConfDlg.c:200 ../gui/DebugMemory.c:256
 msgid "Error: Glade interface could not be loaded!"
 msgstr "Erro: o ambiente Glade não pôde ser carregado!"
 
@@ -1075,32 +1074,32 @@ msgstr ""
 msgid "Error writing to %s!"
 msgstr "Erro ao salvar o arquivo de estado \"%s\"!"
 
-#: ../gui/DebugMemory.c:176
+#: ../gui/DebugMemory.c:177
 #, fuzzy
 msgid "Memory Patch"
 msgstr "Cartão de memória 1"
 
-#: ../gui/DebugMemory.c:184 ../data/pcsx.glade2:3292
+#: ../gui/DebugMemory.c:185 ../data/pcsx.glade2:3292
 #, fuzzy
 msgid "Address (Hexadecimal):"
 msgstr "Hexadecimal"
 
-#: ../gui/DebugMemory.c:192
+#: ../gui/DebugMemory.c:195
 #, fuzzy
-msgid "Value (Hexadecimal):"
+msgid "Value (Hexa string):"
 msgstr "Hexadecimal"
 
-#: ../gui/DebugMemory.c:267
+#: ../gui/DebugMemory.c:261
 #, fuzzy
 msgid "Memory Viewer"
 msgstr "Cartão de memória 1"
 
-#: ../gui/DebugMemory.c:272
+#: ../gui/DebugMemory.c:266
 #, fuzzy
 msgid "Address"
 msgstr "Endereço:"
 
-#: ../gui/DebugMemory.c:290
+#: ../gui/DebugMemory.c:284
 #, fuzzy
 msgid "Text"
 msgstr "Texturas"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 53e79162..db41ee76 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 22:46+0800\n"
-"PO-Revision-Date: 2010-04-10 22:46+0700\n"
+"POT-Creation-Date: 2010-04-11 20:17+0800\n"
+"PO-Revision-Date: 2010-04-11 20:18+0700\n"
 "Last-Translator: Wei Mingzhi <whistler@openoffice.org>\n"
 "Language-Team: Simplified Chinese <whistler@openoffice.org>\n"
 "MIME-Version: 1.0\n"
@@ -288,7 +288,6 @@ msgid "Search For:"
 msgstr "查找:"
 
 #: ../win32/gui/CheatDlg.c:682
-#: ../gui/DebugMemory.c:200
 #: ../data/pcsx.glade2:2853
 msgid "Data Type:"
 msgstr "数据类型:"
@@ -328,17 +327,14 @@ 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 位"
 
@@ -1096,7 +1092,7 @@ msgstr "所有文件 (*.*)"
 #: ../gui/Cheat.c:1125
 #: ../gui/ConfDlg.c:104
 #: ../gui/ConfDlg.c:200
-#: ../gui/DebugMemory.c:262
+#: ../gui/DebugMemory.c:256
 msgid "Error: Glade interface could not be loaded!"
 msgstr "错误：无法加载 Glade 界面!"
 
@@ -1179,28 +1175,28 @@ msgstr "转储至文件"
 msgid "Error writing to %s!"
 msgstr "写入到 %s 时出错!"
 
-#: ../gui/DebugMemory.c:176
+#: ../gui/DebugMemory.c:177
 msgid "Memory Patch"
 msgstr "内存修改"
 
-#: ../gui/DebugMemory.c:184
+#: ../gui/DebugMemory.c:185
 #: ../data/pcsx.glade2:3292
 msgid "Address (Hexadecimal):"
 msgstr "地址 (十六进制):"
 
-#: ../gui/DebugMemory.c:192
-msgid "Value (Hexadecimal):"
-msgstr "数值 (十六进制):"
+#: ../gui/DebugMemory.c:195
+msgid "Value (Hexa string):"
+msgstr "数值 (十六进制串):"
 
-#: ../gui/DebugMemory.c:267
+#: ../gui/DebugMemory.c:261
 msgid "Memory Viewer"
 msgstr "内存查看器"
 
-#: ../gui/DebugMemory.c:272
+#: ../gui/DebugMemory.c:266
 msgid "Address"
 msgstr "地址"
 
-#: ../gui/DebugMemory.c:290
+#: ../gui/DebugMemory.c:284
 msgid "Text"
 msgstr "文本"
 
@@ -3100,37 +3096,3 @@ msgstr "控制器 2"
 #: ../plugins/dfinput/dfinput.glade2:427
 msgid "Multi-Threaded (Recommended)"
 msgstr "多线程 (推荐)"
-
-#~ msgid "Dump Memory..."
-#~ msgstr "转储内存..."
-#~ msgid ""
-#~ "(C) 1999-2003  PCSX Team\n"
-#~ "(C) 2005-2006 Ryan Schultz\n"
-#~ "(C) 2005-2006 Andrew Burton\n"
-#~ "(C) 2008-2009 Wei Mingzhi"
-#~ msgstr ""
-#~ "(C) 1999-2003  PCSX 开发组\n"
-#~ "(C) 2005-2006 Ryan Schultz\n"
-#~ "(C) 2005-2006 Andrew Burton\n"
-#~ "(C) 2008-2009 Wei Mingzhi"
-#~ msgid "PulseAudio Simple Sound"
-#~ msgstr "PulseAudio Simple 声音"
-#~ msgid "L-Stick Y"
-#~ msgstr "左摇杆 Y"
-#~ msgid "R-Stick Y"
-#~ msgstr "右摇杆 Y"
-#~ msgid "Joystick: Axis %d%s"
-#~ msgstr "手柄: 轴 %d%s"
-#~ msgid " (Reversed)"
-#~ msgstr " (反向)"
-#~ msgid "Device not set"
-#~ msgstr "设备未设置"
-#~ msgid "Please select a valid Joystick Device"
-#~ msgstr "请选择一个合法的手柄设备"
-#~ msgid "Device open error"
-#~ msgstr "设备打开错误"
-#~ msgid "Unable to open Joystick Device"
-#~ msgstr "无法打开手柄设备"
-#~ msgid "Gamepad/Keyboard Input (ePSXe)"
-#~ msgstr "手柄/键盘输入 (ePSXe)"
-
diff --git a/po/zh_TW.po b/po/zh_TW.po
index cdf0b00e..9800bec3 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 22:46+0800\n"
-"PO-Revision-Date: 2010-04-10 22:46+0700\n"
+"POT-Creation-Date: 2010-04-11 20:17+0800\n"
+"PO-Revision-Date: 2010-04-11 20:18+0700\n"
 "Last-Translator: Wei Mingzhi <whistler@openoffice.org>\n"
 "Language-Team: Traditional Chinese <whistler@openoffice.org>\n"
 "MIME-Version: 1.0\n"
@@ -288,7 +288,6 @@ msgid "Search For:"
 msgstr "搜尋:"
 
 #: ../win32/gui/CheatDlg.c:682
-#: ../gui/DebugMemory.c:200
 #: ../data/pcsx.glade2:2853
 msgid "Data Type:"
 msgstr "數值類型:"
@@ -328,17 +327,14 @@ 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 位元"
 
@@ -1096,7 +1092,7 @@ msgstr "所有檔案 (*.*)"
 #: ../gui/Cheat.c:1125
 #: ../gui/ConfDlg.c:104
 #: ../gui/ConfDlg.c:200
-#: ../gui/DebugMemory.c:262
+#: ../gui/DebugMemory.c:256
 msgid "Error: Glade interface could not be loaded!"
 msgstr "錯誤：無法加載 Glade 界面!"
 
@@ -1179,28 +1175,28 @@ msgstr "轉儲至檔案"
 msgid "Error writing to %s!"
 msgstr "存儲至 %s 時出錯!"
 
-#: ../gui/DebugMemory.c:176
+#: ../gui/DebugMemory.c:177
 msgid "Memory Patch"
 msgstr "記憶體修改"
 
-#: ../gui/DebugMemory.c:184
+#: ../gui/DebugMemory.c:185
 #: ../data/pcsx.glade2:3292
 msgid "Address (Hexadecimal):"
 msgstr "位址 (十六進制):"
 
-#: ../gui/DebugMemory.c:192
-msgid "Value (Hexadecimal):"
-msgstr "數值 (十六進制):"
+#: ../gui/DebugMemory.c:195
+msgid "Value (Hexa string):"
+msgstr "數值 (十六進制串):"
 
-#: ../gui/DebugMemory.c:267
+#: ../gui/DebugMemory.c:261
 msgid "Memory Viewer"
 msgstr "記憶體檢視"
 
-#: ../gui/DebugMemory.c:272
+#: ../gui/DebugMemory.c:266
 msgid "Address"
 msgstr "位址"
 
-#: ../gui/DebugMemory.c:290
+#: ../gui/DebugMemory.c:284
 msgid "Text"
 msgstr "文字"
 
@@ -3100,37 +3096,3 @@ msgstr "控制器 2"
 #: ../plugins/dfinput/dfinput.glade2:427
 msgid "Multi-Threaded (Recommended)"
 msgstr "多執行緒 (建議使用)"
-
-#~ msgid "Dump Memory..."
-#~ msgstr "轉儲記憶體..."
-#~ msgid ""
-#~ "(C) 1999-2003  PCSX Team\n"
-#~ "(C) 2005-2006 Ryan Schultz\n"
-#~ "(C) 2005-2006 Andrew Burton\n"
-#~ "(C) 2008-2009 Wei Mingzhi"
-#~ msgstr ""
-#~ "(C) 1999-2003  PCSX 開發組\n"
-#~ "(C) 2005-2006 Ryan Schultz\n"
-#~ "(C) 2005-2006 Andrew Burton\n"
-#~ "(C) 2008-2009 Wei Mingzhi"
-#~ msgid "PulseAudio Simple Sound"
-#~ msgstr "PulseAudio Simple 聲音"
-#~ msgid "L-Stick Y"
-#~ msgstr "左搖桿 Y"
-#~ msgid "R-Stick Y"
-#~ msgstr "右搖桿 Y"
-#~ msgid "Joystick: Axis %d%s"
-#~ msgstr "手把: 軸 %d%s"
-#~ msgid " (Reversed)"
-#~ msgstr " (反向)"
-#~ msgid "Device not set"
-#~ msgstr "裝置未設定"
-#~ msgid "Please select a valid Joystick Device"
-#~ msgstr "請選擇一個合法的手把裝置"
-#~ msgid "Device open error"
-#~ msgstr "裝置開啟錯誤"
-#~ msgid "Unable to open Joystick Device"
-#~ msgstr "無法開啟手把裝置"
-#~ msgid "Gamepad/Keyboard Input (ePSXe)"
-#~ msgstr "手把/鍵盤輸入 (ePSXe)"
-