summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2010-01-23 08:44:23 +0000
committerSND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2010-01-23 08:44:23 +0000
commit912c53cda0997e17d32d0b854823c3334b419db5 (patch)
tree158f8a7ae9c68235fe4e1c14fa1efe5533242dc8
parentcd40452e610e32935cfc5bae96cc77209f79e7d9 (diff)
downloadpcsxr-912c53cda0997e17d32d0b854823c3334b419db5.tar.gz
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@40648 e17a0e51-4ae3-4d35-97c3-1a29b211df97
-rw-r--r--ChangeLog18
-rw-r--r--gui/Linux.h1
-rw-r--r--gui/LnxMain.c40
-rw-r--r--libpcsxcore/Makefile.am4
-rw-r--r--libpcsxcore/Makefile.in24
-rw-r--r--libpcsxcore/cdriso.c9
-rw-r--r--libpcsxcore/cdriso.h10
-rw-r--r--libpcsxcore/cdrom.c3
-rw-r--r--libpcsxcore/misc.c24
-rw-r--r--libpcsxcore/ppf.c322
-rw-r--r--libpcsxcore/ppf.h27
-rw-r--r--libpcsxcore/psxcommon.h1
-rw-r--r--libpcsxcore/r3000a.c2
-rw-r--r--macosx/PcsxController.m9
-rw-r--r--macosx/main.m23
-rw-r--r--po/pcsx.pot341
-rw-r--r--po/pt_BR.po341
-rw-r--r--po/zh_CN.po415
-rw-r--r--po/zh_TW.po415
-rw-r--r--win32/gui/WndMain.c4
20 files changed, 1254 insertions, 779 deletions
diff --git a/ChangeLog b/ChangeLog
index 29320f1c..5a88030f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+January 23, 2010 Wei Mingzhi <weimingzhi@gmail.com>
+
+ * libpcsxcore/cdriso.c: Moved several definations into cdriso.h.
+ * libpcsxcore/cdriso.h: Likewise.
+ * libpcsxcore/ppf.c: Added PPF patch support.
+ * libpcsxcore/ppf.h: Likewise.
+ * libpcsxcore/cdrom.c: Likewise.
+ * libpcsxcore/misc.c: Likewise.
+ * libpcsxcore/r3000a.c: Likewise.
+ * libpcsxcore/psxcommon.h: Likewise.
+ * gui/LnxMain.c: Likewise.
+ * gui/Linux.h: Likewise.
+ * win32/gui/WndMain.c: Likewise.
+ * macosx/main.m: Likewise.
+ * macosx/PcsxController.m: Likewise.
+ * libpcsxcore/Makefile.am: Added ppf.c and ppf.h.
+ * po/zh_CN.po, po/zh_TW.po, po/pt_BR.po, po/pcsx.pot: Updated.
+
January 7, 2010 Wei Mingzhi <weimingzhi@gmail.com>
* plugins/dfxvideo/draw.c: MaintainAspect() now only depends on screen
diff --git a/gui/Linux.h b/gui/Linux.h
index a592bc19..9a53ae93 100644
--- a/gui/Linux.h
+++ b/gui/Linux.h
@@ -35,6 +35,7 @@
#define BIOS_DIR "/.pcsx/bios/"
#define STATES_DIR "/.pcsx/sstates/"
#define CHEATS_DIR "/.pcsx/cheats/"
+#define PATCHES_DIR "/.pcsx/patches/"
extern gboolean UseGui;
char cfgfile[MAXPATHLEN]; /* ADB Comment this out - make a local var, or at least use gchar funcs */
diff --git a/gui/LnxMain.c b/gui/LnxMain.c
index 26497cc1..64cc36e0 100644
--- a/gui/LnxMain.c
+++ b/gui/LnxMain.c
@@ -87,6 +87,7 @@ static void CheckSubDir() {
CreateHomeConfigDir(PLUGINS_DIR);
CreateHomeConfigDir(PLUGINS_CFG_DIR);
CreateHomeConfigDir(CHEATS_DIR);
+ CreateHomeConfigDir(PATCHES_DIR);
}
static void ScanPlugins(gchar* scandir) {
@@ -244,24 +245,24 @@ static void ScanAllPlugins (void) {
ScanPlugins(currentdir);
g_free(currentdir);
- /* Check for bad links in ~/.pcsx/plugins/ */
+ // Check for bad links in ~/.pcsx/plugins/
currentdir = g_build_filename(getenv("HOME"), PLUGINS_DIR, NULL);
CheckSymlinksInPath(currentdir);
g_free(currentdir);
- /* Check for bad links in ~/.pcsx/plugins/cfg */
+ // Check for bad links in ~/.pcsx/plugins/cfg
currentdir = g_build_filename(getenv("HOME"), PLUGINS_CFG_DIR, NULL);
CheckSymlinksInPath(currentdir);
g_free(currentdir);
- /* Check for bad links in ~/.pcsx/bios */
+ // Check for bad links in ~/.pcsx/bios
currentdir = g_build_filename(getenv("HOME"), BIOS_DIR, NULL);
CheckSymlinksInPath(currentdir);
g_free(currentdir);
}
-/* Set the default plugin name */
-void set_default_plugin (char *plugin_name, char *conf_plugin_name) {
+// Set the default plugin name
+void set_default_plugin(char *plugin_name, char *conf_plugin_name) {
if (strlen(plugin_name) != 0) {
strcpy(conf_plugin_name, plugin_name);
printf("Picking default plugin: %s\n", plugin_name);
@@ -288,7 +289,7 @@ int main(int argc, char *argv[]) {
strcpy(cfgfile_basename, "pcsx.cfg");
// read command line options
- for (i=1; i<argc; i++) {
+ for (i = 1; i < argc; i++) {
if (!strcmp(argv[i], "-runcd")) runcd = RUN_CD;
else if (!strcmp(argv[i], "-nogui")) UseGui = FALSE;
else if (!strcmp(argv[i], "-psxout")) Config.PsxOut = 1;
@@ -361,12 +362,12 @@ int main(int argc, char *argv[]) {
// Uh oh, no config file found, use some defaults
Config.PsxAuto = 1;
- gchar *str_bios_dir = g_strconcat (getenv("HOME"), BIOS_DIR, NULL);
- strcpy(Config.BiosDir, str_bios_dir);
+ gchar *str_bios_dir = g_strconcat(getenv("HOME"), BIOS_DIR, NULL);
+ strcpy(Config.BiosDir, str_bios_dir);
g_free(str_bios_dir);
- gchar *str_plugin_dir = g_strconcat (getenv("HOME"), PLUGINS_DIR, NULL);
- strcpy(Config.PluginsDir, str_plugin_dir);
+ gchar *str_plugin_dir = g_strconcat(getenv("HOME"), PLUGINS_DIR, NULL);
+ strcpy(Config.PluginsDir, str_plugin_dir);
g_free(str_plugin_dir);
gtk_init(NULL, NULL);
@@ -391,10 +392,14 @@ int main(int argc, char *argv[]) {
SaveConfig();
}
+ gchar *str_patches_dir = g_strconcat(getenv("HOME"), PATCHES_DIR, NULL);
+ strcpy(Config.PatchesDir, str_patches_dir);
+ g_free(str_patches_dir);
+
// switch to plugin dotdir
// this lets plugins work without modification!
- gchar *plugin_default_dir = g_build_filename (getenv("HOME"), PLUGINS_DIR, NULL);
- chdir(plugin_default_dir); /* TODO Error checking - make sure this directory is available */
+ gchar *plugin_default_dir = g_build_filename(getenv("HOME"), PLUGINS_DIR, NULL);
+ chdir(plugin_default_dir);
g_free(plugin_default_dir);
if (!UseGui) cdrfilename[0] = '\0';
@@ -429,12 +434,12 @@ int main(int argc, char *argv[]) {
}
}
- /* If a state has been specified, then load that */
+ // If a state has been specified, then load that
if (loadst) {
StatesC = loadst - 1;
- gchar *state_filename = get_state_filename (StatesC);
- LoadState(state_filename); /* TODO Error checking */
- g_free (state_filename);
+ gchar *state_filename = get_state_filename(StatesC);
+ LoadState(state_filename);
+ g_free(state_filename);
}
psxCpu->Execute();
@@ -443,8 +448,6 @@ int main(int argc, char *argv[]) {
return 0;
}
-DIR *dir;
-
int SysInit() {
#ifdef GTE_DUMP
gteLog = fopen("gteLog.txt","wb");
@@ -461,7 +464,6 @@ int SysInit() {
#endif
if (psxInit() == -1) {
- /* TODO Error handling */
printf(_("PSX emulator couldn't be initialized.\n"));
return -1;
}
diff --git a/libpcsxcore/Makefile.am b/libpcsxcore/Makefile.am
index 5704ec5e..81c0a439 100644
--- a/libpcsxcore/Makefile.am
+++ b/libpcsxcore/Makefile.am
@@ -47,7 +47,9 @@ libpcsxcore_a_SOURCES = \
$(top_builddir)/libpcsxcore/cheat.c \
$(top_builddir)/libpcsxcore/cheat.h \
$(top_builddir)/libpcsxcore/socket.c \
- $(top_builddir)/libpcsxcore/socket.h
+ $(top_builddir)/libpcsxcore/socket.h \
+ $(top_builddir)/libpcsxcore/ppf.c \
+ $(top_builddir)/libpcsxcore/ppf.h
if ARCH_X86_64
libpcsxcore_a_SOURCES += \
diff --git a/libpcsxcore/Makefile.in b/libpcsxcore/Makefile.in
index 64f1d0b4..3b0925cf 100644
--- a/libpcsxcore/Makefile.in
+++ b/libpcsxcore/Makefile.in
@@ -113,6 +113,8 @@ am__libpcsxcore_a_SOURCES_DIST = \
$(top_builddir)/libpcsxcore/cheat.h \
$(top_builddir)/libpcsxcore/socket.c \
$(top_builddir)/libpcsxcore/socket.h \
+ $(top_builddir)/libpcsxcore/ppf.c \
+ $(top_builddir)/libpcsxcore/ppf.h \
$(top_builddir)/libpcsxcore/ix86_64/iR3000A-64.c \
$(top_builddir)/libpcsxcore/ix86_64/ix86-64.c \
$(top_builddir)/libpcsxcore/ix86_64/ix86_cpudetect.c \
@@ -142,7 +144,8 @@ am_libpcsxcore_a_OBJECTS = psxbios.$(OBJEXT) cdrom.$(OBJEXT) \
decode_xa.$(OBJEXT) r3000a.$(OBJEXT) psxinterpreter.$(OBJEXT) \
gte.$(OBJEXT) psxhle.$(OBJEXT) debug.$(OBJEXT) \
cdriso.$(OBJEXT) cheat.$(OBJEXT) socket.$(OBJEXT) \
- $(am__objects_1) $(am__objects_2) $(am__objects_3)
+ ppf.$(OBJEXT) $(am__objects_1) $(am__objects_2) \
+ $(am__objects_3)
libpcsxcore_a_OBJECTS = $(am_libpcsxcore_a_OBJECTS)
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
depcomp = $(SHELL) $(top_srcdir)/depcomp
@@ -360,7 +363,9 @@ libpcsxcore_a_SOURCES = $(top_builddir)/libpcsxcore/psxbios.c \
$(top_builddir)/libpcsxcore/cheat.c \
$(top_builddir)/libpcsxcore/cheat.h \
$(top_builddir)/libpcsxcore/socket.c \
- $(top_builddir)/libpcsxcore/socket.h $(am__append_1) \
+ $(top_builddir)/libpcsxcore/socket.h \
+ $(top_builddir)/libpcsxcore/ppf.c \
+ $(top_builddir)/libpcsxcore/ppf.h $(am__append_1) \
$(am__append_2) $(am__append_3)
@ARCH_PPC_TRUE@libpcsxcore_a_CCASFLAGS = -x assembler-with-cpp -mregnames
all: all-am
@@ -431,6 +436,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pR3000A.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/plugins.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ppc.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ppf.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/psxbios.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/psxcounters.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/psxdma.Po@am__quote@
@@ -759,6 +765,20 @@ socket.obj: $(top_builddir)/libpcsxcore/socket.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o socket.obj `if test -f '$(top_builddir)/libpcsxcore/socket.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/socket.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/socket.c'; fi`
+ppf.o: $(top_builddir)/libpcsxcore/ppf.c
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ppf.o -MD -MP -MF $(DEPDIR)/ppf.Tpo -c -o ppf.o `test -f '$(top_builddir)/libpcsxcore/ppf.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ppf.c
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/ppf.Tpo $(DEPDIR)/ppf.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_builddir)/libpcsxcore/ppf.c' object='ppf.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ppf.o `test -f '$(top_builddir)/libpcsxcore/ppf.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ppf.c
+
+ppf.obj: $(top_builddir)/libpcsxcore/ppf.c
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ppf.obj -MD -MP -MF $(DEPDIR)/ppf.Tpo -c -o ppf.obj `if test -f '$(top_builddir)/libpcsxcore/ppf.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/ppf.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/ppf.c'; fi`
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/ppf.Tpo $(DEPDIR)/ppf.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_builddir)/libpcsxcore/ppf.c' object='ppf.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ppf.obj `if test -f '$(top_builddir)/libpcsxcore/ppf.c'; then $(CYGPATH_W) '$(top_builddir)/libpcsxcore/ppf.c'; else $(CYGPATH_W) '$(srcdir)/$(top_builddir)/libpcsxcore/ppf.c'; fi`
+
iR3000A-64.o: $(top_builddir)/libpcsxcore/ix86_64/iR3000A-64.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT iR3000A-64.o -MD -MP -MF $(DEPDIR)/iR3000A-64.Tpo -c -o iR3000A-64.o `test -f '$(top_builddir)/libpcsxcore/ix86_64/iR3000A-64.c' || echo '$(srcdir)/'`$(top_builddir)/libpcsxcore/ix86_64/iR3000A-64.c
@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/iR3000A-64.Tpo $(DEPDIR)/iR3000A-64.Po
diff --git a/libpcsxcore/cdriso.c b/libpcsxcore/cdriso.c
index 159ba8db..bcb077ac 100644
--- a/libpcsxcore/cdriso.c
+++ b/libpcsxcore/cdriso.c
@@ -21,6 +21,7 @@
#include "psxcommon.h"
#include "plugins.h"
#include "cdrom.h"
+#include "cdriso.h"
#ifdef _WIN32
#include <process.h>
@@ -30,14 +31,6 @@
#include <sys/time.h>
#endif
-#define MSF2SECT(m, s, f) (((m) * 60 + (s) - 2) * 75 + (f))
-#define btoi(b) ((b) / 16 * 10 + (b) % 16) /* BCD to u_char */
-
-#define CD_FRAMESIZE_RAW 2352
-#define DATA_SIZE (CD_FRAMESIZE_RAW - 12)
-
-#define SUB_FRAMESIZE 96
-
FILE *cdHandle = NULL;
FILE *cddaHandle = NULL;
FILE *subHandle = NULL;
diff --git a/libpcsxcore/cdriso.h b/libpcsxcore/cdriso.h
index 473ff99e..896dbf82 100644
--- a/libpcsxcore/cdriso.h
+++ b/libpcsxcore/cdriso.h
@@ -21,6 +21,14 @@
#ifndef CDRISO_H
#define CDRISO_H
-int imageReaderInit(void);
+void imageReaderInit(void);
+
+#define MSF2SECT(m, s, f) (((m) * 60 + (s) - 2) * 75 + (f))
+#define btoi(b) ((b) / 16 * 10 + (b) % 16) /* BCD to u_char */
+
+#define CD_FRAMESIZE_RAW 2352
+#define DATA_SIZE (CD_FRAMESIZE_RAW - 12)
+
+#define SUB_FRAMESIZE 96
#endif
diff --git a/libpcsxcore/cdrom.c b/libpcsxcore/cdrom.c
index 9d2eb62a..63dd89b1 100644
--- a/libpcsxcore/cdrom.c
+++ b/libpcsxcore/cdrom.c
@@ -23,6 +23,7 @@
*/
#include "cdrom.h"
+#include "ppf.h"
/* CD-ROM magic numbers */
#define CdlSync 0
@@ -600,6 +601,8 @@ void cdrReadInterrupt() {
}
memcpy(cdr.Transfer, buf, 2340);
+ CheckPPFCache(cdr.Transfer, cdr.Prev[0], cdr.Prev[1], cdr.Prev[2]);
+
cdr.Stat = DataReady;
#ifdef CDR_LOG
diff --git a/libpcsxcore/misc.c b/libpcsxcore/misc.c
index cdcd6cce..4c0e6cfd 100644
--- a/libpcsxcore/misc.c
+++ b/libpcsxcore/misc.c
@@ -25,6 +25,7 @@
#include "misc.h"
#include "cdrom.h"
#include "mdec.h"
+#include "ppf.h"
int Log = 0;
@@ -95,7 +96,8 @@ void mmssdd( char *b, char *p )
#define READTRACK() \
if (CDR_readTrack(time) == -1) return -1; \
- buf = CDR_getBuffer(); if (buf == NULL) return -1;
+ buf = CDR_getBuffer(); \
+ if (buf == NULL) return -1; else CheckPPFCache(buf, time[0], time[1], time[2]);
#define READDIR(_dir) \
READTRACK(); \
@@ -112,8 +114,8 @@ int GetCdromFile(u8 *mdir, u8 *time, s8 *filename) {
int i;
// only try to scan if a filename is given
- if(!strlen(filename)) return -1;
-
+ if (!strlen(filename)) return -1;
+
i = 0;
while (i < 4096) {
dir = (struct iso_directory_record*) &mdir[i];
@@ -123,19 +125,19 @@ int GetCdromFile(u8 *mdir, u8 *time, s8 *filename) {
i += dir->length[0];
if (dir->flags[0] & 0x2) { // it's a dir
- if (!strnicmp((char*)&dir->name[0], filename, dir->name_len[0])) {
+ if (!strnicmp((char *)&dir->name[0], filename, dir->name_len[0])) {
if (filename[dir->name_len[0]] != '\\') continue;
-
- filename+= dir->name_len[0] + 1;
- mmssdd(dir->extent, (char*)time);
+ filename += dir->name_len[0] + 1;
+
+ mmssdd(dir->extent, (char *)time);
READDIR(ddir);
i = 0;
mdir = ddir;
}
} else {
- if (!strnicmp((char*)&dir->name[0], filename, strlen(filename))) {
- mmssdd(dir->extent, (char*)time);
+ if (!strnicmp((char *)&dir->name[0], filename, strlen(filename))) {
+ mmssdd(dir->extent, (char *)time);
break;
}
}
@@ -274,6 +276,8 @@ int CheckCdrom() {
char exename[256];
int i, c;
+ FreePPFCache();
+
time[0] = itob(0);
time[1] = itob(2);
time[2] = itob(0x10);
@@ -344,6 +348,8 @@ int CheckCdrom() {
SysPrintf("CD-ROM Label: %.32s\n", CdromLabel);
SysPrintf("CD-ROM ID: %.9s\n", CdromId);
+ BuildPPFCache();
+
return 0;
}
diff --git a/libpcsxcore/ppf.c b/libpcsxcore/ppf.c
new file mode 100644
index 00000000..42e41124
--- /dev/null
+++ b/libpcsxcore/ppf.c
@@ -0,0 +1,322 @@
+/* PPF Patch Support for PCSX-Reloaded
+ *
+ * Copyright (c) 2009, Wei Mingzhi <whistler_wmz@users.sf.net>.
+ *
+ * Based on P.E.Op.S CDR Plugin by Pete Bernert.
+ * Copyright (c) 2002, Pete Bernert.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Steet, Fifth Floor, Boston, MA 02111-1307 USA
+ */
+
+#include "psxcommon.h"
+#include "ppf.h"
+#include "cdrom.h"
+#include "cdriso.h"
+
+typedef struct tagPPF_DATA {
+ s32 addr;
+ s32 pos;
+ s32 anz;
+ struct tagPPF_DATA *pNext;
+} PPF_DATA;
+
+typedef struct tagPPF_CACHE {
+ s32 addr;
+ struct tagPPF_DATA *pNext;
+} PPF_CACHE;
+
+static PPF_CACHE *ppfCache = NULL;
+static PPF_DATA *ppfHead = NULL;
+static int iPPFNum = 0;
+
+// using a linked data list, and address array
+static void FillPPFCache() {
+ PPF_DATA *p;
+ PPF_CACHE *pc;
+ s32 lastaddr;
+
+ p = ppfHead;
+ lastaddr = -1;
+ iPPFNum = 0;
+
+ while (p != NULL) {
+ if (p->addr != lastaddr) iPPFNum++;
+ lastaddr = p->addr;
+ p = p->pNext;
+ }
+
+ if (iPPFNum <= 0) return;
+
+ pc = ppfCache = (PPF_CACHE *)malloc(iPPFNum * sizeof(PPF_CACHE));
+
+ iPPFNum--;
+ p = ppfHead;
+ lastaddr = -1;
+
+ while (p != NULL) {
+ if (p->addr != lastaddr) {
+ pc->addr = p->addr;
+ pc->pNext = p;
+ pc++;
+ }
+ lastaddr = p->addr;
+ p = p->pNext;
+ }
+}
+
+void FreePPFCache() {
+ PPF_DATA *p = ppfHead;
+ void *pn;
+
+ while (p != NULL) {
+ pn = p->pNext;
+ free(p);
+ p = (PPF_DATA *)pn;
+ }
+ ppfHead = NULL;
+
+ if (ppfCache != NULL) free(ppfCache);
+ ppfCache = NULL;
+}
+
+void CheckPPFCache(unsigned char *pB, int m, int s, int f) {
+ PPF_CACHE *pcstart, *pcend, *pcpos;
+ int addr = MSF2SECT(btoi(m), btoi(s), btoi(f)), pos, anz, start;
+
+ if (ppfCache == NULL) return;
+
+ pcstart = ppfCache;
+ if (addr < pcstart->addr) return;
+ pcend = ppfCache + iPPFNum;
+ if (addr > pcend->addr) return;
+
+ while (1) {
+ if (addr == pcend->addr) { pcpos = pcend; break; }
+
+ pcpos = pcstart + (pcend - pcstart) / 2;
+ if (pcpos == pcstart) break;
+ if (addr < pcpos->addr) {
+ pcend = pcpos;
+ continue;
+ }
+ if (addr > pcpos->addr) {
+ pcstart = pcpos;
+ continue;
+ }
+ break;
+ }
+
+ if (addr == pcpos->addr) {
+ PPF_DATA *p = pcpos->pNext;
+ while (p != NULL && p->addr == addr) {
+ pos = p->pos - (CD_FRAMESIZE_RAW - DATA_SIZE);
+ anz = p->anz;
+ if (pos < 0) { start = -pos; pos = 0; anz -= start; }
+ else start = 0;
+ memcpy(pB + pos, (unsigned char *)(p + 1) + start, anz);
+ p = p->pNext;
+ }
+ }
+}
+
+static void AddToPPF(s32 ladr, s32 pos, s32 anz, s8 *ppfmem) {
+ if (!ppfHead) {
+ ppfHead = (PPF_DATA *)malloc(sizeof(PPF_DATA) + anz);
+ ppfHead->addr = ladr;
+ ppfHead->pNext = NULL;
+ ppfHead->pos = pos;
+ ppfHead->anz = anz;
+ memcpy(ppfHead + 1, ppfmem, anz);
+ iPPFNum = 1;
+ } else {
+ PPF_DATA *p = ppfHead;
+ PPF_DATA *plast = NULL;
+ PPF_DATA *padd;
+ while (p != NULL) {
+ if (ladr < p->addr) break;
+ if (ladr == p->addr) {
+ while (p && ladr == p->addr && pos > p->pos) {
+ plast = p;
+ p = p->pNext;
+ }
+ break;
+ }
+ plast = p;
+ p = p->pNext;
+ }
+ padd = (PPF_DATA *)malloc(sizeof(PPF_DATA) + anz);
+ padd->addr = ladr;
+ padd->pNext = p;
+ padd->pos = pos;
+ padd->anz = anz;
+ memcpy(padd + 1, ppfmem, anz);
+ iPPFNum++;
+ if (plast == NULL) ppfHead = padd;
+ else plast->pNext = padd;
+ }
+}
+
+void BuildPPFCache() {
+ FILE *ppffile;
+ char buffer[12];
+ char method, undo = 0, blockcheck = 0;
+ int dizlen, dizyn;
+ char ppfmem[512], szPPF[MAXPATHLEN];
+ int count, seekpos, pos;
+ u32 anz; // avoids stupid overflows
+ s32 ladr, off, anx;
+
+ ppfHead = NULL;
+
+ // Generate filename in the format of SLUS_123.45
+ buffer[0] = CdromId[0];
+ buffer[1] = CdromId[1];
+ buffer[2] = CdromId[2];
+ buffer[3] = CdromId[3];
+ buffer[4] = '_';
+ buffer[5] = CdromId[4];
+ buffer[6] = CdromId[5];
+ buffer[7] = CdromId[6];
+ buffer[8] = '.';
+ buffer[9] = CdromId[7];
+ buffer[10] = CdromId[8];
+ buffer[11] = '\0';
+
+ sprintf(szPPF, "%s%s", Config.PatchesDir, buffer);
+
+ ppffile = fopen(szPPF, "rb");
+ if (ppffile == NULL) return;
+
+ memset(buffer, 0, 5);
+ fread(buffer, 3, 1, ppffile);
+
+ if (strcmp(buffer, "PPF") != 0) {
+ SysPrintf(_("Invalid PPF patch: %s.\n"), szPPF);
+ fclose(ppffile);
+ return;
+ }
+
+ fseek(ppffile, 5, SEEK_SET);
+ method = fgetc(ppffile);
+
+ switch (method) {
+ case 0: // ppf1
+ fseek(ppffile, 0, SEEK_END);
+ count = ftell(ppffile);
+ count -= 56;
+ seekpos = 56;
+ break;
+
+ case 1: // ppf2
+ fseek(ppffile, -8, SEEK_END);
+
+ memset(buffer, 0, 5);
+ fread(buffer, 4, 1, ppffile);
+
+ if (strcmp(".DIZ", buffer) != 0) {
+ dizyn = 0;
+ } else {
+ fread(&dizlen, 4, 1, ppffile);
+ dizlen = SWAP32(dizlen);
+ dizyn = 1;
+ }
+
+ fseek(ppffile, 0, SEEK_END);
+ count = ftell(ppffile);
+
+ if (dizyn == 0) {
+ count -= 1084;
+ seekpos = 1084;
+ } else {
+ count -= 1084;
+ count -= 38;
+ count -= dizlen;
+ seekpos = 1084;
+ }
+ break;
+
+ case 2: // ppf3
+ fseek(ppffile, 57, SEEK_SET);
+ blockcheck = fgetc(ppffile);
+ undo = fgetc(ppffile);
+
+ fseek(ppffile, -6, SEEK_END);
+ memset(buffer, 0, 5);
+ fread(buffer, 4, 1, ppffile);
+ dizlen = 0;
+
+ if (strcmp(".DIZ", buffer) == 0) {
+ fseek(ppffile, -2, SEEK_END);
+ fread(&dizlen, 2, 1, ppffile);
+ dizlen = SWAP32(dizlen);
+ dizlen += 36;
+ }
+
+ fseek(ppffile, 0, SEEK_END);
+ count = ftell(ppffile);
+ count -= dizlen;
+
+ if (blockcheck) {
+ seekpos = 1084;
+ count -= 1084;
+ } else {
+ seekpos = 60;
+ count -= 60;
+ }
+ break;
+
+ default:
+ fclose(ppffile);
+ SysPrintf(_("Unsupported PPF version (%d).\n"), method + 1);
+ return;
+ }
+
+ // now do the data reading
+ do {
+ fseek(ppffile, seekpos, SEEK_SET);
+ fread(&pos, 4, 1, ppffile);
+ pos = SWAP32(pos);
+
+ if (method == 2) fread(buffer, 4, 1, ppffile); // skip 4 bytes on ppf3 (no int64 support here)
+
+ anz = fgetc(ppffile);
+ fread(ppfmem, anz, 1, ppffile);
+
+ ladr = pos / CD_FRAMESIZE_RAW;
+ off = pos % CD_FRAMESIZE_RAW;
+
+ if (off + anz > CD_FRAMESIZE_RAW) {
+ anx = off + anz - CD_FRAMESIZE_RAW;
+ anz -= (unsigned char)anx;
+ AddToPPF(ladr + 1, 0, anx, ppfmem + anz);
+ }
+
+ AddToPPF(ladr, off, anz, ppfmem); // add to link list
+
+ if (method == 2) {
+ if (undo) anz += anz;
+ anz += 4;
+ }
+
+ seekpos = seekpos + 5 + anz;
+ count = count - 5 - anz;
+ } while (count != 0); // loop til end
+
+ fclose(ppffile);
+
+ FillPPFCache(); // build address array
+
+ SysPrintf(_("Loaded PPF %d.0 patch: %s.\n"), method + 1, szPPF);
+}
diff --git a/libpcsxcore/ppf.h b/libpcsxcore/ppf.h
new file mode 100644
index 00000000..79ade7d1
--- /dev/null
+++ b/libpcsxcore/ppf.h
@@ -0,0 +1,27 @@
+/* PPF Patch Support for PCSX-Reloaded
+ *
+ * Copyright (c) 2009, Wei Mingzhi <whistler_wmz@users.sf.net>.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Steet, Fifth Floor, Boston, MA 02111-1307 USA
+ */
+
+#ifndef __PPF_H__
+#define __PPF_H__
+
+void BuildPPFCache();
+void FreePPFCache();
+void CheckPPFCache(unsigned char *pB, int m, int s, int f);
+
+#endif
diff --git a/libpcsxcore/psxcommon.h b/libpcsxcore/psxcommon.h
index 4dc3bfa1..b2ea8048 100644
--- a/libpcsxcore/psxcommon.h
+++ b/libpcsxcore/psxcommon.h
@@ -98,6 +98,7 @@ typedef struct {
char Bios[MAXPATHLEN];
char BiosDir[MAXPATHLEN];
char PluginsDir[MAXPATHLEN];
+ char PatchesDir[MAXPATHLEN];
long Xa;
long Sio;
long Mdec;
diff --git a/libpcsxcore/r3000a.c b/libpcsxcore/r3000a.c
index 49e4e7f7..8873336f 100644
--- a/libpcsxcore/r3000a.c
+++ b/libpcsxcore/r3000a.c
@@ -84,6 +84,8 @@ void psxShutdown() {
ClearAllCheats();
FreeCheatSearchResults();
FreeCheatSearchMem();
+
+ FreePPFCache();
}
void psxException(u32 code, u32 bd) {
diff --git a/macosx/PcsxController.m b/macosx/PcsxController.m
index db16729b..05a6b867 100644
--- a/macosx/PcsxController.m
+++ b/macosx/PcsxController.m
@@ -372,6 +372,10 @@ NSString *saveStatePath;
if (![dfm fileExistsAtPath:path isDirectory:&dir])
[dfm createDirectoryAtPath:path attributes:nil];
+ path = [NSString stringWithFormat:@"%@/Pcsx/Patches", supportPath];
+ if (![dfm fileExistsAtPath:path isDirectory:&dir])
+ [dfm createDirectoryAtPath:path attributes:nil];
+
saveStatePath = [[NSString stringWithFormat:@"%@/Pcsx/Save States", supportPath] retain];
if (![dfm fileExistsAtPath:saveStatePath isDirectory:&dir])
[dfm createDirectoryAtPath:saveStatePath attributes:nil];
@@ -387,8 +391,13 @@ NSString *saveStatePath;
path = [NSString stringWithFormat:@"%@/Pcsx/Bios/", supportPath];
str = [path fileSystemRepresentation];
if (str != nil) strncpy(Config.BiosDir, str, 255);
+
+ path = [NSString stringWithFormat:@"%@/Pcsx/Patches/", supportPath];
+ str = [path fileSystemRepresentation];
+ if (str != nil) strncpy(Config.PatchesDir, str, 255);
} else {
strcpy(Config.BiosDir, "Bios/");
+ strcpy(Config.PatchesDir, "Patches/");
saveStatePath = @"sstates";
[saveStatePath retain];
diff --git a/macosx/main.m b/macosx/main.m
index 22efb1fc..55d33968 100644
--- a/macosx/main.m
+++ b/macosx/main.m
@@ -38,17 +38,16 @@ int main(int argc, const char *argv[])
assert ( chdir ("../../../") == 0 ); /* chdir to the .app's parent */
}
- // TODO: make this redundant
strcpy(Config.BiosDir, "Bios/");
-
- // Setup the X11 window
+ strcpy(Config.PatchesDir, "Patches/");
+
+ // Setup the X11 window
if (getenv("DISPLAY") == NULL)
setenv("DISPLAY", ":0.0", 0); // Default to first local display
return NSApplicationMain(argc, argv);
}
-
int SysInit() {
if (!sysInited) {
#ifdef GTE_DUMP
@@ -144,11 +143,11 @@ void *SysLoadLibrary(char *lib)
CFBundleRef myBundle;
CFURLRef bundleURL;
CFStringRef path;
-
+
path = CFStringCreateWithCString(kCFAllocatorDefault, lib, CFStringGetSystemEncoding());
if (!path)
goto error;
-
+
bundleURL = CFURLCreateWithFileSystemPath(
kCFAllocatorDefault,
path,
@@ -156,16 +155,16 @@ void *SysLoadLibrary(char *lib)
true );
if (!bundleURL)
goto error;
-
+
myBundle = CFBundleCreate( kCFAllocatorDefault, bundleURL );
-
+
if (!CFBundleLoadExecutable(myBundle))
goto error;
-
+
good:
if (path) CFRelease(path);
if (bundleURL) CFRelease(bundleURL);
-
+
return myBundle;
error:
@@ -214,10 +213,10 @@ void PADhandleKey(int key);
void SysUpdate()
{
UpdateSystemActivity(UsrActivity);
-
+
PADhandleKey(PAD1_keypressed());
//PADhandleKey(PAD2_keypressed());
-
+
[emuThread handleEvents];
}
diff --git a/po/pcsx.pot b/po/pcsx.pot
index c4ab6282..ccc6c3a2 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-12-19 12:58+0800\n"
+"POT-Creation-Date: 2010-01-23 16:38+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"
@@ -46,7 +46,7 @@ msgstr ""
#: ../win32/gui/AboutDlg.c:48 ../win32/gui/AboutDlg.c:52
#: ../win32/gui/CheatDlg.c:70 ../win32/gui/CheatDlg.c:120
#: ../win32/gui/ConfigurePlugins.c:470 ../win32/gui/ConfigurePlugins.c:601
-#: ../win32/gui/WndMain.c:964 ../win32/gui/WndMain.c:1200
+#: ../win32/gui/WndMain.c:966 ../win32/gui/WndMain.c:1202
#: ../plugins/peopsxgl/gpucfg/interface.c:130
#: ../plugins/peopsxgl/gpucfg/interface.c:843
msgid "OK"
@@ -81,7 +81,7 @@ msgstr ""
#: ../win32/gui/CheatDlg.c:71 ../win32/gui/CheatDlg.c:121
#: ../win32/gui/ConfigurePlugins.c:471 ../win32/gui/ConfigurePlugins.c:602
-#: ../win32/gui/WndMain.c:965 ../win32/gui/WndMain.c:1201
+#: ../win32/gui/WndMain.c:967 ../win32/gui/WndMain.c:1203
#: ../plugins/peopsxgl/gpucfg/interface.c:338
msgid "Cancel"
msgstr ""
@@ -95,7 +95,7 @@ msgstr ""
msgid "Add New Cheat"
msgstr ""
-#: ../win32/gui/CheatDlg.c:167 ../data/pcsx.glade2:2644
+#: ../win32/gui/CheatDlg.c:167 ../data/pcsx.glade2:2594
msgid "Edit Cheat Codes"
msgstr ""
@@ -207,7 +207,7 @@ msgstr ""
msgid "Founded Addresses: %d"
msgstr ""
-#: ../win32/gui/CheatDlg.c:505 ../data/pcsx.glade2:3043
+#: ../win32/gui/CheatDlg.c:505 ../data/pcsx.glade2:2993
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:648 ../data/pcsx.glade2:2887
+#: ../win32/gui/CheatDlg.c:683 ../gui/Cheat.c:648 ../data/pcsx.glade2:2837
msgid "Value:"
msgstr ""
@@ -225,27 +225,27 @@ msgstr ""
msgid "Freeze %.8X"
msgstr ""
-#: ../win32/gui/CheatDlg.c:596 ../data/pcsx.glade2:3079
+#: ../win32/gui/CheatDlg.c:596 ../data/pcsx.glade2:3029
msgid "Modify"
msgstr ""
-#: ../win32/gui/CheatDlg.c:679 ../gui/Cheat.c:1130 ../data/pcsx.glade2:2815
+#: ../win32/gui/CheatDlg.c:679 ../gui/Cheat.c:1130 ../data/pcsx.glade2:2765
msgid "Cheat Search"
msgstr ""
-#: ../win32/gui/CheatDlg.c:681 ../data/pcsx.glade2:2865
+#: ../win32/gui/CheatDlg.c:681 ../data/pcsx.glade2:2815
msgid "Search For:"
msgstr ""
-#: ../win32/gui/CheatDlg.c:682 ../data/pcsx.glade2:2875
+#: ../win32/gui/CheatDlg.c:682 ../data/pcsx.glade2:2825
msgid "Data Type:"
msgstr ""
-#: ../win32/gui/CheatDlg.c:684 ../data/pcsx.glade2:2899
+#: ../win32/gui/CheatDlg.c:684 ../data/pcsx.glade2:2849
msgid "Data Base:"
msgstr ""
-#: ../win32/gui/CheatDlg.c:685 ../data/pcsx.glade2:2959
+#: ../win32/gui/CheatDlg.c:685 ../data/pcsx.glade2:2909
msgid "To:"
msgstr ""
@@ -293,7 +293,7 @@ msgstr ""
msgid "Hexadecimal"
msgstr ""
-#: ../win32/gui/ConfigurePlugins.c:206 ../gui/ConfDlg.c:680
+#: ../win32/gui/ConfigurePlugins.c:206 ../gui/ConfDlg.c:675
msgid "Internal HLE Bios"
msgstr ""
@@ -302,7 +302,7 @@ msgid "Configuration not OK!"
msgstr ""
#: ../win32/gui/ConfigurePlugins.c:292 ../gui/Cheat.c:156 ../gui/Cheat.c:252
-#: ../gui/LnxMain.c:409
+#: ../gui/LnxMain.c:414
msgid "Error"
msgstr ""
@@ -389,22 +389,22 @@ msgid ""
"Note: The NetPlay Plugin Directory should be the same as the other Plugins."
msgstr ""
-#: ../win32/gui/plugin.c:90 ../win32/gui/WndMain.c:279
+#: ../win32/gui/plugin.c:90 ../win32/gui/WndMain.c:281
#, c-format
msgid "*PCSX*: Saved State %d"
msgstr ""
-#: ../win32/gui/plugin.c:91 ../win32/gui/WndMain.c:280
+#: ../win32/gui/plugin.c:91 ../win32/gui/WndMain.c:282
#, c-format
msgid "*PCSX*: Error Saving State %d"
msgstr ""
-#: ../win32/gui/plugin.c:107 ../win32/gui/WndMain.c:257
+#: ../win32/gui/plugin.c:107 ../win32/gui/WndMain.c:259
#, c-format
msgid "*PCSX*: Loaded State %d"
msgstr ""
-#: ../win32/gui/plugin.c:108 ../win32/gui/WndMain.c:258
+#: ../win32/gui/plugin.c:108 ../win32/gui/WndMain.c:260
#, c-format
msgid "*PCSX*: Error Loading State %d"
msgstr ""
@@ -546,8 +546,8 @@ msgstr ""
msgid "Greek"
msgstr ""
-#: ../win32/gui/WndMain.c:80 ../win32/gui/WndMain.c:1557
-#: ../win32/gui/WndMain.c:1559
+#: ../win32/gui/WndMain.c:80 ../win32/gui/WndMain.c:1559
+#: ../win32/gui/WndMain.c:1561
msgid "English"
msgstr ""
@@ -595,371 +595,371 @@ msgstr ""
msgid "Korean"
msgstr ""
-#: ../win32/gui/WndMain.c:298 ../win32/gui/WndMain.c:350
+#: ../win32/gui/WndMain.c:300 ../win32/gui/WndMain.c:352
msgid "PCSX State Format"
msgstr ""
-#: ../win32/gui/WndMain.c:325
+#: ../win32/gui/WndMain.c:327
#, c-format
msgid "*PCSX*: Loaded State %s"
msgstr ""
-#: ../win32/gui/WndMain.c:326
+#: ../win32/gui/WndMain.c:328
#, c-format
msgid "*PCSX*: Error Loading State %s"
msgstr ""
-#: ../win32/gui/WndMain.c:377
+#: ../win32/gui/WndMain.c:379
#, c-format
msgid "*PCSX*: Saved State %s"
msgstr ""
-#: ../win32/gui/WndMain.c:378
+#: ../win32/gui/WndMain.c:380
#, c-format
msgid "*PCSX*: Error Saving State %s"
msgstr ""
-#: ../win32/gui/WndMain.c:427 ../win32/gui/WndMain.c:476 ../gui/Gtk2Gui.c:479
+#: ../win32/gui/WndMain.c:429 ../win32/gui/WndMain.c:478 ../gui/Gtk2Gui.c:479
#: ../gui/Gtk2Gui.c:604
msgid "The CD does not appear to be a valid Playstation CD"
msgstr ""
-#: ../win32/gui/WndMain.c:433 ../win32/gui/WndMain.c:482 ../gui/Gtk2Gui.c:487
+#: ../win32/gui/WndMain.c:435 ../win32/gui/WndMain.c:484 ../gui/Gtk2Gui.c:487
#: ../gui/Gtk2Gui.c:612
msgid "Could not load CD-ROM!"
msgstr ""
-#: ../win32/gui/WndMain.c:443
+#: ../win32/gui/WndMain.c:445
msgid "Running BIOS is not supported with Internal HLE Bios."
msgstr ""
-#: ../win32/gui/WndMain.c:662 ../gui/MemcardDlg.c:59
+#: ../win32/gui/WndMain.c:664 ../gui/MemcardDlg.c:59
msgid "Title"
msgstr ""
-#: ../win32/gui/WndMain.c:668 ../gui/MemcardDlg.c:65
+#: ../win32/gui/WndMain.c:670 ../gui/MemcardDlg.c:65
msgid "Status"
msgstr ""
-#: ../win32/gui/WndMain.c:674
+#: ../win32/gui/WndMain.c:676
msgid "Game ID"
msgstr ""
-#: ../win32/gui/WndMain.c:680
+#: ../win32/gui/WndMain.c:682
msgid "Game"
msgstr ""
-#: ../win32/gui/WndMain.c:854
+#: ../win32/gui/WndMain.c:856
msgid "mid link block"
msgstr ""
-#: ../win32/gui/WndMain.c:857
+#: ../win32/gui/WndMain.c:859
msgid "terminiting link block"
msgstr ""
-#: ../win32/gui/WndMain.c:865 ../gui/MemcardDlg.c:147 ../gui/MemcardDlg.c:244
+#: ../win32/gui/WndMain.c:867 ../gui/MemcardDlg.c:147 ../gui/MemcardDlg.c:244
msgid "Deleted"
msgstr ""
-#: ../win32/gui/WndMain.c:866 ../win32/gui/WndMain.c:869
+#: ../win32/gui/WndMain.c:868 ../win32/gui/WndMain.c:871
#: ../gui/MemcardDlg.c:149 ../gui/MemcardDlg.c:153 ../gui/MemcardDlg.c:246
#: ../gui/MemcardDlg.c:250
msgid "Free"
msgstr ""
-#: ../win32/gui/WndMain.c:868 ../gui/MemcardDlg.c:151 ../gui/MemcardDlg.c:248
+#: ../win32/gui/WndMain.c:870 ../gui/MemcardDlg.c:151 ../gui/MemcardDlg.c:248
msgid "Used"
msgstr ""
-#: ../win32/gui/WndMain.c:962
+#: ../win32/gui/WndMain.c:964
msgid "Memcard Manager"
msgstr ""
-#: ../win32/gui/WndMain.c:966 ../win32/gui/WndMain.c:969
+#: ../win32/gui/WndMain.c:968 ../win32/gui/WndMain.c:971
msgid "Select Mcd"
msgstr ""
-#: ../win32/gui/WndMain.c:967 ../win32/gui/WndMain.c:970
+#: ../win32/gui/WndMain.c:969 ../win32/gui/WndMain.c:972
msgid "Format Mcd"
msgstr ""
-#: ../win32/gui/WndMain.c:968 ../win32/gui/WndMain.c:971
+#: ../win32/gui/WndMain.c:970 ../win32/gui/WndMain.c:973
msgid "Reload Mcd"
msgstr ""
-#: ../win32/gui/WndMain.c:972
+#: ../win32/gui/WndMain.c:974
msgid "-> Copy ->"
msgstr ""
-#: ../win32/gui/WndMain.c:973
+#: ../win32/gui/WndMain.c:975
msgid "<- Copy <-"
msgstr ""
-#: ../win32/gui/WndMain.c:974
+#: ../win32/gui/WndMain.c:976
msgid "Paste"
msgstr ""
-#: ../win32/gui/WndMain.c:975
+#: ../win32/gui/WndMain.c:977
msgid "<- Un/Delete"
msgstr ""
-#: ../win32/gui/WndMain.c:976
+#: ../win32/gui/WndMain.c:978
msgid "Un/Delete ->"
msgstr ""
-#: ../win32/gui/WndMain.c:978
+#: ../win32/gui/WndMain.c:980
msgid "Memory Card 1"
msgstr ""
-#: ../win32/gui/WndMain.c:979
+#: ../win32/gui/WndMain.c:981
msgid "Memory Card 2"
msgstr ""
-#: ../win32/gui/WndMain.c:1034
+#: ../win32/gui/WndMain.c:1036
msgid "Are you sure you want to paste this selection?"
msgstr ""
-#: ../win32/gui/WndMain.c:1034 ../win32/gui/WndMain.c:1145
-#: ../win32/gui/WndMain.c:1152
+#: ../win32/gui/WndMain.c:1036 ../win32/gui/WndMain.c:1147
+#: ../win32/gui/WndMain.c:1154
msgid "Confirmation"
msgstr ""
-#: ../win32/gui/WndMain.c:1145 ../win32/gui/WndMain.c:1152
+#: ../win32/gui/WndMain.c:1147 ../win32/gui/WndMain.c:1154
msgid "Are you sure you want to format this Memory Card?"
msgstr ""
-#: ../win32/gui/WndMain.c:1198
+#: ../win32/gui/WndMain.c:1200
msgid "Cpu Config"
msgstr ""
-#: ../win32/gui/WndMain.c:1203
+#: ../win32/gui/WndMain.c:1205
msgid "Disable Xa Decoding"
msgstr ""
-#: ../win32/gui/WndMain.c:1204
+#: ../win32/gui/WndMain.c:1206
msgid "Sio Irq Always Enabled"
msgstr ""
-#: ../win32/gui/WndMain.c:1205
+#: ../win32/gui/WndMain.c:1207
msgid "Black && White Movies"
msgstr ""
-#: ../win32/gui/WndMain.c:1206
+#: ../win32/gui/WndMain.c:1208
msgid "Disable Cd audio"
msgstr ""
-#: ../win32/gui/WndMain.c:1207 ../data/pcsx.glade2:1603
+#: ../win32/gui/WndMain.c:1209 ../data/pcsx.glade2:1586
msgid "Autodetect"
msgstr ""
-#: ../win32/gui/WndMain.c:1208
+#: ../win32/gui/WndMain.c:1210
msgid "Enable Interpreter Cpu"
msgstr ""
-#: ../win32/gui/WndMain.c:1209 ../data/pcsx.glade2:1459
+#: ../win32/gui/WndMain.c:1211 ../data/pcsx.glade2:1442
msgid "Enable Console Output"
msgstr ""
-#: ../win32/gui/WndMain.c:1210 ../data/pcsx.glade2:1409
+#: ../win32/gui/WndMain.c:1212 ../data/pcsx.glade2:1392
msgid "Enable Debugger"
msgstr ""
-#: ../win32/gui/WndMain.c:1211
+#: ../win32/gui/WndMain.c:1213
msgid "Spu Irq Always Enabled"
msgstr ""
-#: ../win32/gui/WndMain.c:1212 ../data/pcsx.glade2:1546
+#: ../win32/gui/WndMain.c:1214 ../data/pcsx.glade2:1529
msgid "Parasite Eve 2, Vandal Hearts 1/2 Fix"
msgstr ""
-#: ../win32/gui/WndMain.c:1213 ../data/pcsx.glade2:1561
+#: ../win32/gui/WndMain.c:1215 ../data/pcsx.glade2:1544
msgid "InuYasha Sengoku Battle Fix"
msgstr ""
-#: ../win32/gui/WndMain.c:1215
+#: ../win32/gui/WndMain.c:1217
#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2:277
#: ../plugins/dfinput/dfinput.glade2:448
msgid "Options"
msgstr ""
-#: ../win32/gui/WndMain.c:1216
+#: ../win32/gui/WndMain.c:1218
msgid "Psx System Type"
msgstr ""
-#: ../win32/gui/WndMain.c:1321
+#: ../win32/gui/WndMain.c:1323
msgid "Psx Mcd Format (*.mcr;*.mc;*.mem;*.vgs;*.mcd;*.gme;*.ddf)"
msgstr ""
-#: ../win32/gui/WndMain.c:1326
+#: ../win32/gui/WndMain.c:1328
msgid "Psx Memory Card (*.mcr;*.mc)"
msgstr ""
-#: ../win32/gui/WndMain.c:1331
+#: ../win32/gui/WndMain.c:1333
msgid "CVGS Memory Card (*.mem;*.vgs)"
msgstr ""
-#: ../win32/gui/WndMain.c:1336
+#: ../win32/gui/WndMain.c:1338
msgid "Bleem Memory Card (*.mcd)"
msgstr ""
-#: ../win32/gui/WndMain.c:1341
+#: ../win32/gui/WndMain.c:1343
msgid "DexDrive Memory Card (*.gme)"
msgstr ""
-#: ../win32/gui/WndMain.c:1346
+#: ../win32/gui/WndMain.c:1348
msgid "DataDeck Memory Card (*.ddf)"
msgstr ""
-#: ../win32/gui/WndMain.c:1351 ../win32/gui/WndMain.c:1432 ../gui/Cheat.c:322
+#: ../win32/gui/WndMain.c:1353 ../win32/gui/WndMain.c:1434 ../gui/Cheat.c:322
#: ../gui/Gtk2Gui.c:416 ../gui/Gtk2Gui.c:555
msgid "All Files"
msgstr ""
-#: ../win32/gui/WndMain.c:1390
+#: ../win32/gui/WndMain.c:1392
msgid "Psx Exe Format"
msgstr ""
-#: ../win32/gui/WndMain.c:1427
+#: ../win32/gui/WndMain.c:1429
msgid "Psx Isos (*.iso;*.mdf;*.img;*.bin)"
msgstr ""
-#: ../win32/gui/WndMain.c:1503
+#: ../win32/gui/WndMain.c:1505
msgid "&File"
msgstr ""
-#: ../win32/gui/WndMain.c:1504
+#: ../win32/gui/WndMain.c:1506
msgid "E&xit"
msgstr ""
-#: ../win32/gui/WndMain.c:1506
+#: ../win32/gui/WndMain.c:1508
msgid "Run &EXE..."
msgstr ""
-#: ../win32/gui/WndMain.c:1507
+#: ../win32/gui/WndMain.c:1509
msgid "Run &BIOS"
msgstr ""
-#: ../win32/gui/WndMain.c:1508
+#: ../win32/gui/WndMain.c:1510
msgid "Run &ISO..."
msgstr ""
-#: ../win32/gui/WndMain.c:1509
+#: ../win32/gui/WndMain.c:1511
msgid "Run &CD"
msgstr ""
-#: ../win32/gui/WndMain.c:1511
+#: ../win32/gui/WndMain.c:1513
msgid "&Emulator"
msgstr ""
-#: ../win32/gui/WndMain.c:1512
+#: ../win32/gui/WndMain.c:1514
msgid "&States"
msgstr ""
-#: ../win32/gui/WndMain.c:1514
+#: ../win32/gui/WndMain.c:1516
msgid "S&witch ISO..."
msgstr ""
-#: ../win32/gui/WndMain.c:1516
+#: ../win32/gui/WndMain.c:1518
msgid "Re&set"
msgstr ""
-#: ../win32/gui/WndMain.c:1517
+#: ../win32/gui/WndMain.c:1519
msgid "&Run"
msgstr ""
-#: ../win32/gui/WndMain.c:1518
+#: ../win32/gui/WndMain.c:1520
msgid "&Save"
msgstr ""
-#: ../win32/gui/WndMain.c:1519
+#: ../win32/gui/WndMain.c:1521
msgid "&Load"
msgstr ""
-#: ../win32/gui/WndMain.c:1520 ../win32/gui/WndMain.c:1526
+#: ../win32/gui/WndMain.c:1522 ../win32/gui/WndMain.c:1528
msgid "&Other..."
msgstr ""
-#: ../win32/gui/WndMain.c:1521 ../win32/gui/WndMain.c:1527
+#: ../win32/gui/WndMain.c:1523 ../win32/gui/WndMain.c:1529
msgid "Slot &5"
msgstr ""
-#: ../win32/gui/WndMain.c:1522 ../win32/gui/WndMain.c:1528
+#: ../win32/gui/WndMain.c:1524 ../win32/gui/WndMain.c:1530
msgid "Slot &4"
msgstr ""
-#: ../win32/gui/WndMain.c:1523 ../win32/gui/WndMain.c:1529
+#: ../win32/gui/WndMain.c:1525 ../win32/gui/WndMain.c:1531
msgid "Slot &3"
msgstr ""
-#: ../win32/gui/WndMain.c:1524 ../win32/gui/WndMain.c:1530
+#: ../win32/gui/WndMain.c:1526 ../win32/gui/WndMain.c:1532
msgid "Slot &2"
msgstr ""
-#: ../win32/gui/WndMain.c:1525 ../win32/gui/WndMain.c:1531
+#: ../win32/gui/WndMain.c:1527 ../win32/gui/WndMain.c:1533
msgid "Slot &1"
msgstr ""
-#: ../win32/gui/WndMain.c:1533
+#: ../win32/gui/WndMain.c:1535
msgid "&Configuration"
msgstr ""
-#: ../win32/gui/WndMain.c:1534
+#: ../win32/gui/WndMain.c:1536
msgid "Cheat &Search..."
msgstr ""
-#: ../win32/gui/WndMain.c:1535
+#: ../win32/gui/WndMain.c:1537
msgid "Ch&eat Code..."
msgstr ""
-#: ../win32/gui/WndMain.c:1538
+#: ../win32/gui/WndMain.c:1540
msgid "&Language"
msgstr ""
-#: ../win32/gui/WndMain.c:1563
+#: ../win32/gui/WndMain.c:1565
msgid "&Memory cards..."
msgstr ""
-#: ../win32/gui/WndMain.c:1564
+#: ../win32/gui/WndMain.c:1566
msgid "C&PU..."
msgstr ""
-#: ../win32/gui/WndMain.c:1566
+#: ../win32/gui/WndMain.c:1568
msgid "&NetPlay..."
msgstr ""
-#: ../win32/gui/WndMain.c:1568
+#: ../win32/gui/WndMain.c:1570
msgid "&Controllers..."
msgstr ""
-#: ../win32/gui/WndMain.c:1569
+#: ../win32/gui/WndMain.c:1571
msgid "CD-&ROM..."
msgstr ""
-#: ../win32/gui/WndMain.c:1570
+#: ../win32/gui/WndMain.c:1572
msgid "&Sound..."
msgstr ""
-#: ../win32/gui/WndMain.c:1571
+#: ../win32/gui/WndMain.c:1573
msgid "&Graphics..."
msgstr ""
-#: ../win32/gui/WndMain.c:1573
+#: ../win32/gui/WndMain.c:1575
msgid "&Plugins && Bios..."
msgstr ""
-#: ../win32/gui/WndMain.c:1575
+#: ../win32/gui/WndMain.c:1577
msgid "&Help"
msgstr ""
-#: ../win32/gui/WndMain.c:1576
+#: ../win32/gui/WndMain.c:1578
msgid "&About..."
msgstr ""
-#: ../win32/gui/WndMain.c:1762
+#: ../win32/gui/WndMain.c:1764
msgid "Pcsx Msg"
msgstr ""
-#: ../win32/gui/WndMain.c:1765
+#: ../win32/gui/WndMain.c:1767
msgid "Error Loading Symbol"
msgstr ""
@@ -984,7 +984,7 @@ msgid "All Files (*.*)"
msgstr ""
#: ../gui/Cheat.c:395 ../gui/Cheat.c:1125 ../gui/ConfDlg.c:104
-#: ../gui/ConfDlg.c:203
+#: ../gui/ConfDlg.c:200
msgid "Error: Glade interface could not be loaded!"
msgstr ""
@@ -1016,22 +1016,22 @@ msgstr ""
msgid "Configure PCSX"
msgstr ""
-#: ../gui/ConfDlg.c:240 ../gui/ConfDlg.c:261 ../gui/ConfDlg.c:282
-#: ../gui/ConfDlg.c:303 ../gui/ConfDlg.c:358
+#: ../gui/ConfDlg.c:237 ../gui/ConfDlg.c:258 ../gui/ConfDlg.c:279
+#: ../gui/ConfDlg.c:300 ../gui/ConfDlg.c:355
msgid "No configuration required"
msgstr ""
-#: ../gui/ConfDlg.c:240 ../gui/ConfDlg.c:261 ../gui/ConfDlg.c:282
-#: ../gui/ConfDlg.c:303 ../gui/ConfDlg.c:358
+#: ../gui/ConfDlg.c:237 ../gui/ConfDlg.c:258 ../gui/ConfDlg.c:279
+#: ../gui/ConfDlg.c:300 ../gui/ConfDlg.c:355
msgid "This plugin doesn't need to be configured."
msgstr ""
-#: ../gui/ConfDlg.c:586
+#: ../gui/ConfDlg.c:581
#, c-format
msgid "Could not open BIOS directory: '%s'\n"
msgstr ""
-#: ../gui/ConfDlg.c:616 ../gui/ConfDlg.c:709 ../gui/LnxMain.c:167
+#: ../gui/ConfDlg.c:611 ../gui/ConfDlg.c:704 ../gui/LnxMain.c:168
#, c-format
msgid "Could not open directory: '%s'\n"
msgstr ""
@@ -1117,7 +1117,7 @@ msgstr ""
msgid "Creating memory card: %s\n"
msgstr ""
-#: ../gui/LnxMain.c:320
+#: ../gui/LnxMain.c:321
msgid ""
" pcsx [options] [file]\n"
"\toptions:\n"
@@ -1131,23 +1131,23 @@ msgid ""
"\tfile\t\tLoads file\n"
msgstr ""
-#: ../gui/LnxMain.c:357
+#: ../gui/LnxMain.c:358
#, c-format
msgid ""
"PCSX cannot be configured without using the GUI -- you should restart "
"without -nogui.\n"
msgstr ""
-#: ../gui/LnxMain.c:409
+#: ../gui/LnxMain.c:414
msgid "Failed loading plugins!"
msgstr ""
-#: ../gui/LnxMain.c:426
+#: ../gui/LnxMain.c:431
#, c-format
msgid "Could not load CD-ROM!\n"
msgstr ""
-#: ../gui/LnxMain.c:465
+#: ../gui/LnxMain.c:467
#, c-format
msgid "PSX emulator couldn't be initialized.\n"
msgstr ""
@@ -1204,7 +1204,7 @@ msgstr ""
msgid "Memory Card Manager"
msgstr ""
-#: ../gui/Plugin.c:204 ../data/pcsx.glade2:1495
+#: ../gui/Plugin.c:204 ../data/pcsx.glade2:1478
#, c-format
msgid "SIO IRQ Always Enabled"
msgstr ""
@@ -1274,7 +1274,7 @@ msgstr ""
msgid "Error closing GPU plugin!"
msgstr ""
-#: ../libpcsxcore/cdriso.c:644
+#: ../libpcsxcore/cdriso.c:637
#, c-format
msgid "Loaded CD Image: %s"
msgstr ""
@@ -1309,21 +1309,21 @@ msgstr ""
msgid "Debugger stopped.\n"
msgstr ""
-#: ../libpcsxcore/misc.c:389
+#: ../libpcsxcore/misc.c:395
#, c-format
msgid "Error opening file: %s.\n"
msgstr ""
-#: ../libpcsxcore/misc.c:429
+#: ../libpcsxcore/misc.c:435
#, c-format
msgid "Unknown CPE opcode %02x at position %08x.\n"
msgstr ""
-#: ../libpcsxcore/misc.c:436
+#: ../libpcsxcore/misc.c:442
msgid "COFF files not supported.\n"
msgstr ""
-#: ../libpcsxcore/misc.c:440
+#: ../libpcsxcore/misc.c:446
msgid "This file does not appear to be a valid PSX file.\n"
msgstr ""
@@ -1396,6 +1396,21 @@ msgstr ""
msgid "Plugins loaded.\n"
msgstr ""
+#: ../libpcsxcore/ppf.c:206
+#, c-format
+msgid "Invalid PPF patch: %s.\n"
+msgstr ""
+
+#: ../libpcsxcore/ppf.c:282
+#, c-format
+msgid "Unsupported PPF version (%d).\n"
+msgstr ""
+
+#: ../libpcsxcore/ppf.c:321
+#, c-format
+msgid "Loaded PPF %d.0 patch: %s.\n"
+msgstr ""
+
#: ../libpcsxcore/psxmem.c:69
msgid "Error allocating memory!"
msgstr ""
@@ -1808,7 +1823,7 @@ msgstr ""
msgid "Switch ISO..."
msgstr ""
-#: ../data/pcsx.glade2:669 ../data/pcsx.glade2:1853
+#: ../data/pcsx.glade2:669 ../data/pcsx.glade2:1803
msgid "Configure Memory Cards"
msgstr ""
@@ -1884,77 +1899,77 @@ msgstr ""
msgid "<b>BIOS</b>"
msgstr ""
-#: ../data/pcsx.glade2:1380
+#: ../data/pcsx.glade2:1363
msgid "Configure CPU"
msgstr ""
-#: ../data/pcsx.glade2:1427
+#: ../data/pcsx.glade2:1410
msgid "SPU IRQ Always Enabled"
msgstr ""
-#: ../data/pcsx.glade2:1443
+#: ../data/pcsx.glade2:1426
msgid "Black & White Movies"
msgstr ""
-#: ../data/pcsx.glade2:1477
+#: ../data/pcsx.glade2:1460
msgid "Enable Interpreter CPU"
msgstr ""
-#: ../data/pcsx.glade2:1511
+#: ../data/pcsx.glade2:1494
msgid "Disable CD Audio"
msgstr ""
-#: ../data/pcsx.glade2:1527
+#: ../data/pcsx.glade2:1510
msgid "Disable XA Decoding"
msgstr ""
-#: ../data/pcsx.glade2:1579
+#: ../data/pcsx.glade2:1562
msgid "<b>Options</b>"
msgstr ""
-#: ../data/pcsx.glade2:1620
+#: ../data/pcsx.glade2:1603
msgid ""
"NTSC\n"
"PAL"
msgstr ""
-#: ../data/pcsx.glade2:1634
+#: ../data/pcsx.glade2:1617
msgid "<b>System Type</b>"
msgstr ""
-#: ../data/pcsx.glade2:1698
+#: ../data/pcsx.glade2:1665
msgid "Configure NetPlay"
msgstr ""
-#: ../data/pcsx.glade2:1786
+#: ../data/pcsx.glade2:1753
msgid "<b>NetPlay</b>"
msgstr ""
-#: ../data/pcsx.glade2:1932 ../data/pcsx.glade2:2330
+#: ../data/pcsx.glade2:1882 ../data/pcsx.glade2:2280
msgid "New"
msgstr ""
-#: ../data/pcsx.glade2:1982 ../data/pcsx.glade2:2380
+#: ../data/pcsx.glade2:1932 ../data/pcsx.glade2:2330
msgid "Format"
msgstr ""
-#: ../data/pcsx.glade2:2032 ../data/pcsx.glade2:2430
+#: ../data/pcsx.glade2:1982 ../data/pcsx.glade2:2380
msgid "Un/Delete"
msgstr ""
-#: ../data/pcsx.glade2:2125
+#: ../data/pcsx.glade2:2075
msgid "<b>Memory Card 1</b>"
msgstr ""
-#: ../data/pcsx.glade2:2186 ../data/pcsx.glade2:2236 ../data/pcsx.glade2:3115
+#: ../data/pcsx.glade2:2136 ../data/pcsx.glade2:2186 ../data/pcsx.glade2:3065
msgid "Copy"
msgstr ""
-#: ../data/pcsx.glade2:2523
+#: ../data/pcsx.glade2:2473
msgid "<b>Memory Card 2</b>"
msgstr ""
-#: ../data/pcsx.glade2:2586
+#: ../data/pcsx.glade2:2536
msgid ""
"(C) 1999-2003 PCSX Team\n"
"(C) 2005-2006 Ryan Schultz\n"
@@ -1962,11 +1977,11 @@ msgid ""
"(C) 2008-2009 Wei Mingzhi"
msgstr ""
-#: ../data/pcsx.glade2:2590
+#: ../data/pcsx.glade2:2540
msgid "A PlayStation emulator."
msgstr ""
-#: ../data/pcsx.glade2:2593
+#: ../data/pcsx.glade2:2543
msgid ""
"This program is free software; you can redistribute it\n"
"and/or modify it under the terms of the GNU General\n"
@@ -1985,22 +2000,22 @@ msgid ""
"the Free Software Foundation, Inc."
msgstr ""
-#: ../data/pcsx.glade2:2622
+#: ../data/pcsx.glade2:2572
msgid "translator-credits"
msgstr ""
-#: ../data/pcsx.glade2:2684
+#: ../data/pcsx.glade2:2634
msgid "<b>Cheat Codes</b>"
msgstr ""
-#: ../data/pcsx.glade2:2850
+#: ../data/pcsx.glade2:2800
msgid ""
"8-bit\n"
"16-bit\n"
"32-bit"
msgstr ""
-#: ../data/pcsx.glade2:2913
+#: ../data/pcsx.glade2:2863
msgid ""
"Equal Value\n"
"Not Equal Value\n"
@@ -2013,25 +2028,25 @@ msgid ""
"No Change"
msgstr ""
-#: ../data/pcsx.glade2:2945
+#: ../data/pcsx.glade2:2895
msgid ""
"Decimal\n"
"Hexadecimal"
msgstr ""
-#: ../data/pcsx.glade2:3148
+#: ../data/pcsx.glade2:3098
msgid "label_resultsfound"
msgstr ""
-#: ../data/pcsx.glade2:3183
+#: ../data/pcsx.glade2:3133
msgid "Search"
msgstr ""
-#: ../data/pcsx.glade2:3219
+#: ../data/pcsx.glade2:3169
msgid "Restart"
msgstr ""
-#: ../data/pcsx.glade2:3248
+#: ../data/pcsx.glade2:3198
msgid "<b>Cheat Search</b>"
msgstr ""
@@ -2140,7 +2155,7 @@ msgstr ""
msgid "CDR NULL Plugin"
msgstr ""
-#: ../plugins/dfcdrom/cdrcfg-0.1df/main.c:175
+#: ../plugins/dfcdrom/cdrcfg-0.1df/main.c:170
#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2:8
msgid "CDR configuration"
msgstr ""
@@ -2714,19 +2729,19 @@ msgstr ""
msgid "(Not Set)"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:546
+#: ../plugins/dfinput/cfg-gtk2.c:539
msgid "None"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:588
+#: ../plugins/dfinput/cfg-gtk2.c:581
msgid "Gamepad/Keyboard Input Configuration"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:594 ../plugins/dfinput/cfg-gtk2.c:614
+#: ../plugins/dfinput/cfg-gtk2.c:587 ../plugins/dfinput/cfg-gtk2.c:607
msgid "Key"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:600 ../plugins/dfinput/cfg-gtk2.c:620
+#: ../plugins/dfinput/cfg-gtk2.c:593 ../plugins/dfinput/cfg-gtk2.c:613
msgid "Button"
msgstr ""
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 2daeca1e..72f71458 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: 2009-12-19 12:58+0800\n"
+"POT-Creation-Date: 2010-01-23 16:38+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"
@@ -59,7 +59,7 @@ msgstr "Sobre"
#: ../win32/gui/AboutDlg.c:48 ../win32/gui/AboutDlg.c:52
#: ../win32/gui/CheatDlg.c:70 ../win32/gui/CheatDlg.c:120
#: ../win32/gui/ConfigurePlugins.c:470 ../win32/gui/ConfigurePlugins.c:601
-#: ../win32/gui/WndMain.c:964 ../win32/gui/WndMain.c:1200
+#: ../win32/gui/WndMain.c:966 ../win32/gui/WndMain.c:1202
#: ../plugins/peopsxgl/gpucfg/interface.c:130
#: ../plugins/peopsxgl/gpucfg/interface.c:843
msgid "OK"
@@ -94,7 +94,7 @@ msgstr "Código de Trapaça:"
#: ../win32/gui/CheatDlg.c:71 ../win32/gui/CheatDlg.c:121
#: ../win32/gui/ConfigurePlugins.c:471 ../win32/gui/ConfigurePlugins.c:602
-#: ../win32/gui/WndMain.c:965 ../win32/gui/WndMain.c:1201
+#: ../win32/gui/WndMain.c:967 ../win32/gui/WndMain.c:1203
#: ../plugins/peopsxgl/gpucfg/interface.c:338
msgid "Cancel"
msgstr "Cancelar"
@@ -108,7 +108,7 @@ msgstr "Código de trapaça inválido!"
msgid "Add New Cheat"
msgstr "Adicionar nova Trapaça"
-#: ../win32/gui/CheatDlg.c:167 ../data/pcsx.glade2:2644
+#: ../win32/gui/CheatDlg.c:167 ../data/pcsx.glade2:2594
msgid "Edit Cheat Codes"
msgstr "Editar Códigos de Trapaça"
@@ -220,7 +220,7 @@ msgstr "%.8X Atual: %u (%.8X), Anterior: %u (%.8X)"
msgid "Founded Addresses: %d"
msgstr "Endereços com o número: %d"
-#: ../win32/gui/CheatDlg.c:505 ../data/pcsx.glade2:3043
+#: ../win32/gui/CheatDlg.c:505 ../data/pcsx.glade2:2993
msgid "Freeze"
msgstr "Parar"
@@ -229,7 +229,7 @@ msgid "Address:"
msgstr "Endereço:"
#: ../win32/gui/CheatDlg.c:507 ../win32/gui/CheatDlg.c:598
-#: ../win32/gui/CheatDlg.c:683 ../gui/Cheat.c:648 ../data/pcsx.glade2:2887
+#: ../win32/gui/CheatDlg.c:683 ../gui/Cheat.c:648 ../data/pcsx.glade2:2837
msgid "Value:"
msgstr "Valor:"
@@ -238,27 +238,27 @@ msgstr "Valor:"
msgid "Freeze %.8X"
msgstr "Parar %.8X"
-#: ../win32/gui/CheatDlg.c:596 ../data/pcsx.glade2:3079
+#: ../win32/gui/CheatDlg.c:596 ../data/pcsx.glade2:3029
msgid "Modify"
msgstr "Modificar"
-#: ../win32/gui/CheatDlg.c:679 ../gui/Cheat.c:1130 ../data/pcsx.glade2:2815
+#: ../win32/gui/CheatDlg.c:679 ../gui/Cheat.c:1130 ../data/pcsx.glade2:2765
msgid "Cheat Search"
msgstr "Procurar por trapaça"
-#: ../win32/gui/CheatDlg.c:681 ../data/pcsx.glade2:2865
+#: ../win32/gui/CheatDlg.c:681 ../data/pcsx.glade2:2815
msgid "Search For:"
msgstr "Buscar por:"
-#: ../win32/gui/CheatDlg.c:682 ../data/pcsx.glade2:2875
+#: ../win32/gui/CheatDlg.c:682 ../data/pcsx.glade2:2825
msgid "Data Type:"
msgstr "Tipo de dados:"
-#: ../win32/gui/CheatDlg.c:684 ../data/pcsx.glade2:2899
+#: ../win32/gui/CheatDlg.c:684 ../data/pcsx.glade2:2849
msgid "Data Base:"
msgstr "Banco de dados:"
-#: ../win32/gui/CheatDlg.c:685 ../data/pcsx.glade2:2959
+#: ../win32/gui/CheatDlg.c:685 ../data/pcsx.glade2:2909
msgid "To:"
msgstr "Para:"
@@ -306,7 +306,7 @@ msgstr "Decimal"
msgid "Hexadecimal"
msgstr "Hexadecimal"
-#: ../win32/gui/ConfigurePlugins.c:206 ../gui/ConfDlg.c:680
+#: ../win32/gui/ConfigurePlugins.c:206 ../gui/ConfDlg.c:675
msgid "Internal HLE Bios"
msgstr "BIOS HLE interna"
@@ -315,7 +315,7 @@ msgid "Configuration not OK!"
msgstr "Não configurou corretamente!"
#: ../win32/gui/ConfigurePlugins.c:292 ../gui/Cheat.c:156 ../gui/Cheat.c:252
-#: ../gui/LnxMain.c:409
+#: ../gui/LnxMain.c:414
msgid "Error"
msgstr "Erro"
@@ -404,22 +404,22 @@ msgstr ""
"Observação: o diretório da extensão de jogo em rede deve ser o mesmo que "
"odas outras extensões."
-#: ../win32/gui/plugin.c:90 ../win32/gui/WndMain.c:279
+#: ../win32/gui/plugin.c:90 ../win32/gui/WndMain.c:281
#, c-format
msgid "*PCSX*: Saved State %d"
msgstr "PCSX: Estado \"%d\" salvo."
-#: ../win32/gui/plugin.c:91 ../win32/gui/WndMain.c:280
+#: ../win32/gui/plugin.c:91 ../win32/gui/WndMain.c:282
#, c-format
msgid "*PCSX*: Error Saving State %d"
msgstr "PCSX: Erro ao salvar o estado \"%d\"!"
-#: ../win32/gui/plugin.c:107 ../win32/gui/WndMain.c:257
+#: ../win32/gui/plugin.c:107 ../win32/gui/WndMain.c:259
#, c-format
msgid "*PCSX*: Loaded State %d"
msgstr "PCSX: Estado \"%d\" carregado."
-#: ../win32/gui/plugin.c:108 ../win32/gui/WndMain.c:258
+#: ../win32/gui/plugin.c:108 ../win32/gui/WndMain.c:260
#, c-format
msgid "*PCSX*: Error Loading State %d"
msgstr "PCSX: Erro ao carregar o estado \"%d\"!"
@@ -561,8 +561,8 @@ msgstr "Alemão"
msgid "Greek"
msgstr "Grego"
-#: ../win32/gui/WndMain.c:80 ../win32/gui/WndMain.c:1557
-#: ../win32/gui/WndMain.c:1559
+#: ../win32/gui/WndMain.c:80 ../win32/gui/WndMain.c:1559
+#: ../win32/gui/WndMain.c:1561
msgid "English"
msgstr "Inglês"
@@ -611,371 +611,371 @@ msgstr "Japonês"
msgid "Korean"
msgstr "Coreano"
-#: ../win32/gui/WndMain.c:298 ../win32/gui/WndMain.c:350
+#: ../win32/gui/WndMain.c:300 ../win32/gui/WndMain.c:352
msgid "PCSX State Format"
msgstr "Formato dos estados salvos do PCSX"
-#: ../win32/gui/WndMain.c:325
+#: ../win32/gui/WndMain.c:327
#, c-format
msgid "*PCSX*: Loaded State %s"
msgstr "PCSX: Arquivo de estado \"%s\" carregado."
-#: ../win32/gui/WndMain.c:326
+#: ../win32/gui/WndMain.c:328
#, c-format
msgid "*PCSX*: Error Loading State %s"
msgstr "PCSX: Erro ao carregar o arquivo de estado \"%s\"!"
-#: ../win32/gui/WndMain.c:377
+#: ../win32/gui/WndMain.c:379
#, c-format
msgid "*PCSX*: Saved State %s"
msgstr "PCSX: Arquivo de estado \"%s\" salvo."
-#: ../win32/gui/WndMain.c:378
+#: ../win32/gui/WndMain.c:380
#, c-format
msgid "*PCSX*: Error Saving State %s"
msgstr "PCSX: Erro ao salvar o arquivo de estado \"%s\"!"
-#: ../win32/gui/WndMain.c:427 ../win32/gui/WndMain.c:476 ../gui/Gtk2Gui.c:479
+#: ../win32/gui/WndMain.c:429 ../win32/gui/WndMain.c:478 ../gui/Gtk2Gui.c:479
#: ../gui/Gtk2Gui.c:604
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:433 ../win32/gui/WndMain.c:482 ../gui/Gtk2Gui.c:487
+#: ../win32/gui/WndMain.c:435 ../win32/gui/WndMain.c:484 ../gui/Gtk2Gui.c:487
#: ../gui/Gtk2Gui.c:612
msgid "Could not load CD-ROM!"
msgstr "Não pôde carregar o CDROM!"
-#: ../win32/gui/WndMain.c:443
+#: ../win32/gui/WndMain.c:445
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:662 ../gui/MemcardDlg.c:59
+#: ../win32/gui/WndMain.c:664 ../gui/MemcardDlg.c:59
msgid "Title"
msgstr "Título"
-#: ../win32/gui/WndMain.c:668 ../gui/MemcardDlg.c:65
+#: ../win32/gui/WndMain.c:670 ../gui/MemcardDlg.c:65
msgid "Status"
msgstr "Estado"
-#: ../win32/gui/WndMain.c:674
+#: ../win32/gui/WndMain.c:676
msgid "Game ID"
msgstr "ID do Jogo"
-#: ../win32/gui/WndMain.c:680
+#: ../win32/gui/WndMain.c:682
msgid "Game"
msgstr "Jogo"
-#: ../win32/gui/WndMain.c:854
+#: ../win32/gui/WndMain.c:856
msgid "mid link block"
msgstr "bloco de ligação intermediário"
-#: ../win32/gui/WndMain.c:857
+#: ../win32/gui/WndMain.c:859
msgid "terminiting link block"
msgstr "bloco final da ligação"
-#: ../win32/gui/WndMain.c:865 ../gui/MemcardDlg.c:147 ../gui/MemcardDlg.c:244
+#: ../win32/gui/WndMain.c:867 ../gui/MemcardDlg.c:147 ../gui/MemcardDlg.c:244
msgid "Deleted"
msgstr "Apagado"
-#: ../win32/gui/WndMain.c:866 ../win32/gui/WndMain.c:869
+#: ../win32/gui/WndMain.c:868 ../win32/gui/WndMain.c:871
#: ../gui/MemcardDlg.c:149 ../gui/MemcardDlg.c:153 ../gui/MemcardDlg.c:246
#: ../gui/MemcardDlg.c:250
msgid "Free"
msgstr "Liberado"
-#: ../win32/gui/WndMain.c:868 ../gui/MemcardDlg.c:151 ../gui/MemcardDlg.c:248
+#: ../win32/gui/WndMain.c:870 ../gui/MemcardDlg.c:151 ../gui/MemcardDlg.c:248
msgid "Used"
msgstr "Usado"
-#: ../win32/gui/WndMain.c:962
+#: ../win32/gui/WndMain.c:964
msgid "Memcard Manager"
msgstr "Gerenciador de cartões de memória"
-#: ../win32/gui/WndMain.c:966 ../win32/gui/WndMain.c:969
+#: ../win32/gui/WndMain.c:968 ../win32/gui/WndMain.c:971
msgid "Select Mcd"
msgstr "Selecionar cartão"
-#: ../win32/gui/WndMain.c:967 ../win32/gui/WndMain.c:970
+#: ../win32/gui/WndMain.c:969 ../win32/gui/WndMain.c:972
msgid "Format Mcd"
msgstr "Formatar cartão"
-#: ../win32/gui/WndMain.c:968 ../win32/gui/WndMain.c:971
+#: ../win32/gui/WndMain.c:970 ../win32/gui/WndMain.c:973
msgid "Reload Mcd"
msgstr "Reiniciar cartão"
-#: ../win32/gui/WndMain.c:972
+#: ../win32/gui/WndMain.c:974
msgid "-> Copy ->"
msgstr "-> Copiar ->"
-#: ../win32/gui/WndMain.c:973
+#: ../win32/gui/WndMain.c:975
msgid "<- Copy <-"
msgstr "<- Copiar <-"
-#: ../win32/gui/WndMain.c:974
+#: ../win32/gui/WndMain.c:976
msgid "Paste"
msgstr "Colar"
-#: ../win32/gui/WndMain.c:975
+#: ../win32/gui/WndMain.c:977
msgid "<- Un/Delete"
msgstr "<- Apagar/Desfazer"
-#: ../win32/gui/WndMain.c:976
+#: ../win32/gui/WndMain.c:978
msgid "Un/Delete ->"
msgstr "Apagar/Desfazer ->"
-#: ../win32/gui/WndMain.c:978
+#: ../win32/gui/WndMain.c:980
msgid "Memory Card 1"
msgstr "Cartão de memória 1"
-#: ../win32/gui/WndMain.c:979
+#: ../win32/gui/WndMain.c:981
msgid "Memory Card 2"
msgstr "Cartão de memória 2"
-#: ../win32/gui/WndMain.c:1034
+#: ../win32/gui/WndMain.c:1036
msgid "Are you sure you want to paste this selection?"
msgstr "Você tem certeza que quer colar o selecionado?"
-#: ../win32/gui/WndMain.c:1034 ../win32/gui/WndMain.c:1145
-#: ../win32/gui/WndMain.c:1152
+#: ../win32/gui/WndMain.c:1036 ../win32/gui/WndMain.c:1147
+#: ../win32/gui/WndMain.c:1154
msgid "Confirmation"
msgstr "Confirmação"
-#: ../win32/gui/WndMain.c:1145 ../win32/gui/WndMain.c:1152
+#: ../win32/gui/WndMain.c:1147 ../win32/gui/WndMain.c:1154
msgid "Are you sure you want to format this Memory Card?"
msgstr "Você tem certeza que quer formatar esse Cartão de Memória?"
-#: ../win32/gui/WndMain.c:1198
+#: ../win32/gui/WndMain.c:1200
msgid "Cpu Config"
msgstr "Configuração da CPU"
-#: ../win32/gui/WndMain.c:1203
+#: ../win32/gui/WndMain.c:1205
msgid "Disable Xa Decoding"
msgstr "Desativar decodificação de XA"
-#: ../win32/gui/WndMain.c:1204
+#: ../win32/gui/WndMain.c:1206
msgid "Sio Irq Always Enabled"
msgstr "IRQ SIO sempre ativado"
-#: ../win32/gui/WndMain.c:1205
+#: ../win32/gui/WndMain.c:1207
msgid "Black && White Movies"
msgstr "Filmes em preto e branco"
-#: ../win32/gui/WndMain.c:1206
+#: ../win32/gui/WndMain.c:1208
msgid "Disable Cd audio"
msgstr "Desativar áudio de CD"
-#: ../win32/gui/WndMain.c:1207 ../data/pcsx.glade2:1603
+#: ../win32/gui/WndMain.c:1209 ../data/pcsx.glade2:1586
msgid "Autodetect"
msgstr "Detectar Automaticamente"
-#: ../win32/gui/WndMain.c:1208
+#: ../win32/gui/WndMain.c:1210
msgid "Enable Interpreter Cpu"
msgstr "Ativar interpretador da CPU"
-#: ../win32/gui/WndMain.c:1209 ../data/pcsx.glade2:1459
+#: ../win32/gui/WndMain.c:1211 ../data/pcsx.glade2:1442
msgid "Enable Console Output"
msgstr "Ativar saída no terminal"
-#: ../win32/gui/WndMain.c:1210 ../data/pcsx.glade2:1409
+#: ../win32/gui/WndMain.c:1212 ../data/pcsx.glade2:1392
msgid "Enable Debugger"
msgstr "Ligar debugger"
-#: ../win32/gui/WndMain.c:1211
+#: ../win32/gui/WndMain.c:1213
msgid "Spu Irq Always Enabled"
msgstr "IRQ da SPU sempre ligada"
-#: ../win32/gui/WndMain.c:1212 ../data/pcsx.glade2:1546
+#: ../win32/gui/WndMain.c:1214 ../data/pcsx.glade2:1529
msgid "Parasite Eve 2, Vandal Hearts 1/2 Fix"
msgstr "Correção para Parasite Eve 2, Vandal Hearts..."
-#: ../win32/gui/WndMain.c:1213 ../data/pcsx.glade2:1561
+#: ../win32/gui/WndMain.c:1215 ../data/pcsx.glade2:1544
msgid "InuYasha Sengoku Battle Fix"
msgstr "Correção para InuYasha, Sengoku Battle..."
-#: ../win32/gui/WndMain.c:1215
+#: ../win32/gui/WndMain.c:1217
#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2:277
#: ../plugins/dfinput/dfinput.glade2:448
msgid "Options"
msgstr "Opções"
-#: ../win32/gui/WndMain.c:1216
+#: ../win32/gui/WndMain.c:1218
msgid "Psx System Type"
msgstr "Tipo de sistema do PSX"
-#: ../win32/gui/WndMain.c:1321
+#: ../win32/gui/WndMain.c:1323
msgid "Psx Mcd Format (*.mcr;*.mc;*.mem;*.vgs;*.mcd;*.gme;*.ddf)"
msgstr "Qualquer formato (*.mcr;*.mc;*.mem;*.vgs;*.mcd;*.gme;*.ddf)"
-#: ../win32/gui/WndMain.c:1326
+#: ../win32/gui/WndMain.c:1328
msgid "Psx Memory Card (*.mcr;*.mc)"
msgstr "Cartão de memória binário (*.mcr;*.mc)"
-#: ../win32/gui/WndMain.c:1331
+#: ../win32/gui/WndMain.c:1333
msgid "CVGS Memory Card (*.mem;*.vgs)"
msgstr "Cartão de memória do CVGS (*.mem;*.vgs)"
-#: ../win32/gui/WndMain.c:1336
+#: ../win32/gui/WndMain.c:1338
msgid "Bleem Memory Card (*.mcd)"
msgstr "Cartão de memória do Bleem (*.mcd)"
-#: ../win32/gui/WndMain.c:1341
+#: ../win32/gui/WndMain.c:1343
msgid "DexDrive Memory Card (*.gme)"
msgstr "Cartão de memória do DexDrive (*.gme)"
-#: ../win32/gui/WndMain.c:1346
+#: ../win32/gui/WndMain.c:1348
msgid "DataDeck Memory Card (*.ddf)"
msgstr "Cartão de memória do DataDeck (*.ddf)"
-#: ../win32/gui/WndMain.c:1351 ../win32/gui/WndMain.c:1432 ../gui/Cheat.c:322
+#: ../win32/gui/WndMain.c:1353 ../win32/gui/WndMain.c:1434 ../gui/Cheat.c:322
#: ../gui/Gtk2Gui.c:416 ../gui/Gtk2Gui.c:555
msgid "All Files"
msgstr "Todos os arquivos"
-#: ../win32/gui/WndMain.c:1390
+#: ../win32/gui/WndMain.c:1392
msgid "Psx Exe Format"
msgstr "Formato executável do PSX"
-#: ../win32/gui/WndMain.c:1427
+#: ../win32/gui/WndMain.c:1429
msgid "Psx Isos (*.iso;*.mdf;*.img;*.bin)"
msgstr "Imagens de CD (*.iso;*.mdf;*.img;*.bin)"
-#: ../win32/gui/WndMain.c:1503
+#: ../win32/gui/WndMain.c:1505
msgid "&File"
msgstr "&Arquivo"
-#: ../win32/gui/WndMain.c:1504
+#: ../win32/gui/WndMain.c:1506
msgid "E&xit"
msgstr "&Sair"
-#: ../win32/gui/WndMain.c:1506
+#: ../win32/gui/WndMain.c:1508
msgid "Run &EXE..."
msgstr "Rodar &EXE..."
-#: ../win32/gui/WndMain.c:1507
+#: ../win32/gui/WndMain.c:1509
msgid "Run &BIOS"
msgstr "Iniciar pela &BIOS"
-#: ../win32/gui/WndMain.c:1508
+#: ../win32/gui/WndMain.c:1510
msgid "Run &ISO..."
msgstr "Rodar &imagem de CD..."
-#: ../win32/gui/WndMain.c:1509
+#: ../win32/gui/WndMain.c:1511
msgid "Run &CD"
msgstr "Rodar &CD"
-#: ../win32/gui/WndMain.c:1511
+#: ../win32/gui/WndMain.c:1513
msgid "&Emulator"
msgstr "&Emulador"
-#: ../win32/gui/WndMain.c:1512
+#: ../win32/gui/WndMain.c:1514
msgid "&States"
msgstr "&Estados"
-#: ../win32/gui/WndMain.c:1514
+#: ../win32/gui/WndMain.c:1516
msgid "S&witch ISO..."
msgstr "T&rocar de imagem de CD..."
-#: ../win32/gui/WndMain.c:1516
+#: ../win32/gui/WndMain.c:1518
msgid "Re&set"
msgstr "Re&iniciar"
-#: ../win32/gui/WndMain.c:1517
+#: ../win32/gui/WndMain.c:1519
msgid "&Run"
msgstr "&Executar"
-#: ../win32/gui/WndMain.c:1518
+#: ../win32/gui/WndMain.c:1520
msgid "&Save"
msgstr "&Salvar"
-#: ../win32/gui/WndMain.c:1519
+#: ../win32/gui/WndMain.c:1521
msgid "&Load"
msgstr "&Carregar"
-#: ../win32/gui/WndMain.c:1520 ../win32/gui/WndMain.c:1526
+#: ../win32/gui/WndMain.c:1522 ../win32/gui/WndMain.c:1528
msgid "&Other..."
msgstr "&Outros..."
-#: ../win32/gui/WndMain.c:1521 ../win32/gui/WndMain.c:1527
+#: ../win32/gui/WndMain.c:1523 ../win32/gui/WndMain.c:1529
msgid "Slot &5"
msgstr "Unidade &5"
-#: ../win32/gui/WndMain.c:1522 ../win32/gui/WndMain.c:1528
+#: ../win32/gui/WndMain.c:1524 ../win32/gui/WndMain.c:1530
msgid "Slot &4"
msgstr "Unidade &4"
-#: ../win32/gui/WndMain.c:1523 ../win32/gui/WndMain.c:1529
+#: ../win32/gui/WndMain.c:1525 ../win32/gui/WndMain.c:1531
msgid "Slot &3"
msgstr "Unidade &3"
-#: ../win32/gui/WndMain.c:1524 ../win32/gui/WndMain.c:1530
+#: ../win32/gui/WndMain.c:1526 ../win32/gui/WndMain.c:1532
msgid "Slot &2"
msgstr "Unidade &2"
-#: ../win32/gui/WndMain.c:1525 ../win32/gui/WndMain.c:1531
+#: ../win32/gui/WndMain.c:1527 ../win32/gui/WndMain.c:1533
msgid "Slot &1"
msgstr "Unidade &1"
-#: ../win32/gui/WndMain.c:1533
+#: ../win32/gui/WndMain.c:1535
msgid "&Configuration"
msgstr "&Configuração"
-#: ../win32/gui/WndMain.c:1534
+#: ../win32/gui/WndMain.c:1536
msgid "Cheat &Search..."
msgstr "Procurar por &trapaça..."
-#: ../win32/gui/WndMain.c:1535
+#: ../win32/gui/WndMain.c:1537
msgid "Ch&eat Code..."
msgstr "&Código de trapaça..."
-#: ../win32/gui/WndMain.c:1538
+#: ../win32/gui/WndMain.c:1540
msgid "&Language"
msgstr "&Linguagem"
-#: ../win32/gui/WndMain.c:1563
+#: ../win32/gui/WndMain.c:1565
msgid "&Memory cards..."
msgstr "&Cartões de memória..."
-#: ../win32/gui/WndMain.c:1564
+#: ../win32/gui/WndMain.c:1566
msgid "C&PU..."
msgstr "C&PU..."
-#: ../win32/gui/WndMain.c:1566
+#: ../win32/gui/WndMain.c:1568
msgid "&NetPlay..."
msgstr "&Jogo em rede..."
-#: ../win32/gui/WndMain.c:1568
+#: ../win32/gui/WndMain.c:1570
msgid "&Controllers..."
msgstr "&Controles..."
-#: ../win32/gui/WndMain.c:1569
+#: ../win32/gui/WndMain.c:1571
msgid "CD-&ROM..."
msgstr "CD&ROM..."
-#: ../win32/gui/WndMain.c:1570
+#: ../win32/gui/WndMain.c:1572
msgid "&Sound..."
msgstr "Á&udio..."
-#: ../win32/gui/WndMain.c:1571
+#: ../win32/gui/WndMain.c:1573
msgid "&Graphics..."
msgstr "&Gráficos..."
-#: ../win32/gui/WndMain.c:1573
+#: ../win32/gui/WndMain.c:1575
msgid "&Plugins && Bios..."
msgstr "&Extensões e BIOS..."
-#: ../win32/gui/WndMain.c:1575
+#: ../win32/gui/WndMain.c:1577
msgid "&Help"
msgstr "&Ajuda"
-#: ../win32/gui/WndMain.c:1576
+#: ../win32/gui/WndMain.c:1578
msgid "&About..."
msgstr "&Sobre..."
-#: ../win32/gui/WndMain.c:1762
+#: ../win32/gui/WndMain.c:1764
msgid "Pcsx Msg"
msgstr "Mensagens do PCSX"
-#: ../win32/gui/WndMain.c:1765
+#: ../win32/gui/WndMain.c:1767
msgid "Error Loading Symbol"
msgstr "Erro ao carregar símbolo"
@@ -1000,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:203
+#: ../gui/ConfDlg.c:200
msgid "Error: Glade interface could not be loaded!"
msgstr "Erro: o ambiente Glade não pôde ser carregado!"
@@ -1032,22 +1032,22 @@ msgstr "Resultados da busca"
msgid "Configure PCSX"
msgstr "Configurar PCSX"
-#: ../gui/ConfDlg.c:240 ../gui/ConfDlg.c:261 ../gui/ConfDlg.c:282
-#: ../gui/ConfDlg.c:303 ../gui/ConfDlg.c:358
+#: ../gui/ConfDlg.c:237 ../gui/ConfDlg.c:258 ../gui/ConfDlg.c:279
+#: ../gui/ConfDlg.c:300 ../gui/ConfDlg.c:355
msgid "No configuration required"
msgstr "Não necessita de configuração"
-#: ../gui/ConfDlg.c:240 ../gui/ConfDlg.c:261 ../gui/ConfDlg.c:282
-#: ../gui/ConfDlg.c:303 ../gui/ConfDlg.c:358
+#: ../gui/ConfDlg.c:237 ../gui/ConfDlg.c:258 ../gui/ConfDlg.c:279
+#: ../gui/ConfDlg.c:300 ../gui/ConfDlg.c:355
msgid "This plugin doesn't need to be configured."
msgstr "Esta extensão não pode ser configurada."
-#: ../gui/ConfDlg.c:586
+#: ../gui/ConfDlg.c:581
#, c-format
msgid "Could not open BIOS directory: '%s'\n"
msgstr "Não conseguiu abrir o diretório \"%s\", da BIOS!\n"
-#: ../gui/ConfDlg.c:616 ../gui/ConfDlg.c:709 ../gui/LnxMain.c:167
+#: ../gui/ConfDlg.c:611 ../gui/ConfDlg.c:704 ../gui/LnxMain.c:168
#, c-format
msgid "Could not open directory: '%s'\n"
msgstr "Não conseguiu abrir o diretório \"%s\"!\n"
@@ -1133,7 +1133,7 @@ msgstr "Aviso"
msgid "Creating memory card: %s\n"
msgstr "Criando cartão de memória \"%s\"\n"
-#: ../gui/LnxMain.c:320
+#: ../gui/LnxMain.c:321
msgid ""
" pcsx [options] [file]\n"
"\toptions:\n"
@@ -1158,7 +1158,7 @@ msgstr ""
"\t-h -help\tMostra essa mensagem\n"
"\t[arquivo]\t\tCarrega um arquivo.\n"
-#: ../gui/LnxMain.c:357
+#: ../gui/LnxMain.c:358
#, c-format
msgid ""
"PCSX cannot be configured without using the GUI -- you should restart "
@@ -1166,16 +1166,16 @@ msgid ""
msgstr ""
"PCSX não pode ser configurado sem o GUI -- reinicie sem a opção -nogui.\n"
-#: ../gui/LnxMain.c:409
+#: ../gui/LnxMain.c:414
msgid "Failed loading plugins!"
msgstr "Não conseguiu carregar as extensões!"
-#: ../gui/LnxMain.c:426
+#: ../gui/LnxMain.c:431
#, c-format
msgid "Could not load CD-ROM!\n"
msgstr "Não pôde carregar o CD-ROM!\n"
-#: ../gui/LnxMain.c:465
+#: ../gui/LnxMain.c:467
#, c-format
msgid "PSX emulator couldn't be initialized.\n"
msgstr "O emulador não pôde ser inicializado.\n"
@@ -1232,7 +1232,7 @@ msgstr ""
msgid "Memory Card Manager"
msgstr "Gerenciador de cartões de memória"
-#: ../gui/Plugin.c:204 ../data/pcsx.glade2:1495
+#: ../gui/Plugin.c:204 ../data/pcsx.glade2:1478
#, c-format
msgid "SIO IRQ Always Enabled"
msgstr "IRQ SIO sempre ativada"
@@ -1302,7 +1302,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:644
+#: ../libpcsxcore/cdriso.c:637
#, c-format
msgid "Loaded CD Image: %s"
msgstr "Carregou a imagem de CD \"%s\"."
@@ -1337,21 +1337,21 @@ msgstr ""
msgid "Debugger stopped.\n"
msgstr ""
-#: ../libpcsxcore/misc.c:389
+#: ../libpcsxcore/misc.c:395
#, c-format
msgid "Error opening file: %s.\n"
msgstr "Erro ao abrir o arquivo \"%s\"!\n"
-#: ../libpcsxcore/misc.c:429
+#: ../libpcsxcore/misc.c:435
#, c-format
msgid "Unknown CPE opcode %02x at position %08x.\n"
msgstr "Código operacional CPE %02x desconhecido, na posição %08x.\n"
-#: ../libpcsxcore/misc.c:436
+#: ../libpcsxcore/misc.c:442
msgid "COFF files not supported.\n"
msgstr "Arquivos COFF não são suportados!\n"
-#: ../libpcsxcore/misc.c:440
+#: ../libpcsxcore/misc.c:446
msgid "This file does not appear to be a valid PSX file.\n"
msgstr "Esse arquivo não parece ser um arquivo válido de PSX!\n"
@@ -1424,6 +1424,21 @@ msgstr "Erro ao iniciar a extensão de jogo em rede \"%d\"!"
msgid "Plugins loaded.\n"
msgstr "Extensões carregadas.\n"
+#: ../libpcsxcore/ppf.c:206
+#, c-format
+msgid "Invalid PPF patch: %s.\n"
+msgstr ""
+
+#: ../libpcsxcore/ppf.c:282
+#, c-format
+msgid "Unsupported PPF version (%d).\n"
+msgstr ""
+
+#: ../libpcsxcore/ppf.c:321
+#, fuzzy, c-format
+msgid "Loaded PPF %d.0 patch: %s.\n"
+msgstr "Arquivo de estado \"%s\" carregado."
+
#: ../libpcsxcore/psxmem.c:69
msgid "Error allocating memory!"
msgstr "Erro ao alocar memória!"
@@ -1856,7 +1871,7 @@ msgstr ""
msgid "Switch ISO..."
msgstr ""
-#: ../data/pcsx.glade2:669 ../data/pcsx.glade2:1853
+#: ../data/pcsx.glade2:669 ../data/pcsx.glade2:1803
msgid "Configure Memory Cards"
msgstr "Configurar cartões de memória"
@@ -1932,35 +1947,35 @@ msgstr "<b>Extensões</b>"
msgid "<b>BIOS</b>"
msgstr "<b>BIOS</b>"
-#: ../data/pcsx.glade2:1380
+#: ../data/pcsx.glade2:1363
msgid "Configure CPU"
msgstr "Configurar CPU"
-#: ../data/pcsx.glade2:1427
+#: ../data/pcsx.glade2:1410
msgid "SPU IRQ Always Enabled"
msgstr "IRQ da SPU sempre ativada"
-#: ../data/pcsx.glade2:1443
+#: ../data/pcsx.glade2:1426
msgid "Black & White Movies"
msgstr "Filmes em preto e branco"
-#: ../data/pcsx.glade2:1477
+#: ../data/pcsx.glade2:1460
msgid "Enable Interpreter CPU"
msgstr "Ativar interpretador da CPU"
-#: ../data/pcsx.glade2:1511
+#: ../data/pcsx.glade2:1494
msgid "Disable CD Audio"
msgstr "Desativar áudio de CD"
-#: ../data/pcsx.glade2:1527
+#: ../data/pcsx.glade2:1510
msgid "Disable XA Decoding"
msgstr "Desativar decodificação de XA"
-#: ../data/pcsx.glade2:1579
+#: ../data/pcsx.glade2:1562
msgid "<b>Options</b>"
msgstr "<b>Opções</b>"
-#: ../data/pcsx.glade2:1620
+#: ../data/pcsx.glade2:1603
msgid ""
"NTSC\n"
"PAL"
@@ -1968,43 +1983,43 @@ msgstr ""
"NTSC\n"
"PAL"
-#: ../data/pcsx.glade2:1634
+#: ../data/pcsx.glade2:1617
msgid "<b>System Type</b>"
msgstr "<b>Tipo do sistema</b>"
-#: ../data/pcsx.glade2:1698
+#: ../data/pcsx.glade2:1665
msgid "Configure NetPlay"
msgstr "Configurar jogo em rede"
-#: ../data/pcsx.glade2:1786
+#: ../data/pcsx.glade2:1753
msgid "<b>NetPlay</b>"
msgstr "<b>Jogo em rede</b>"
-#: ../data/pcsx.glade2:1932 ../data/pcsx.glade2:2330
+#: ../data/pcsx.glade2:1882 ../data/pcsx.glade2:2280
msgid "New"
msgstr ""
-#: ../data/pcsx.glade2:1982 ../data/pcsx.glade2:2380
+#: ../data/pcsx.glade2:1932 ../data/pcsx.glade2:2330
msgid "Format"
msgstr "Formatar"
-#: ../data/pcsx.glade2:2032 ../data/pcsx.glade2:2430
+#: ../data/pcsx.glade2:1982 ../data/pcsx.glade2:2380
msgid "Un/Delete"
msgstr "Apagar/Desfazer"
-#: ../data/pcsx.glade2:2125
+#: ../data/pcsx.glade2:2075
msgid "<b>Memory Card 1</b>"
msgstr "<b>Cartão de memória 1</b>"
-#: ../data/pcsx.glade2:2186 ../data/pcsx.glade2:2236 ../data/pcsx.glade2:3115
+#: ../data/pcsx.glade2:2136 ../data/pcsx.glade2:2186 ../data/pcsx.glade2:3065
msgid "Copy"
msgstr "Copiar"
-#: ../data/pcsx.glade2:2523
+#: ../data/pcsx.glade2:2473
msgid "<b>Memory Card 2</b>"
msgstr "<b>Cartão de memória 2</b>"
-#: ../data/pcsx.glade2:2586
+#: ../data/pcsx.glade2:2536
msgid ""
"(C) 1999-2003 PCSX Team\n"
"(C) 2005-2006 Ryan Schultz\n"
@@ -2016,11 +2031,11 @@ msgstr ""
"(C) 2005-2006 Andrew Burton\n"
"(C) 2008-2009 Wei Mingzhi"
-#: ../data/pcsx.glade2:2590
+#: ../data/pcsx.glade2:2540
msgid "A PlayStation emulator."
msgstr "Um emulador de PlayStation."
-#: ../data/pcsx.glade2:2593
+#: ../data/pcsx.glade2:2543
msgid ""
"This program is free software; you can redistribute it\n"
"and/or modify it under the terms of the GNU General\n"
@@ -2054,16 +2069,16 @@ msgstr ""
"Public License along with this program; if not, write to\n"
"the Free Software Foundation, Inc."
-#: ../data/pcsx.glade2:2622
+#: ../data/pcsx.glade2:2572
msgid "translator-credits"
msgstr ""
"Tradução para português brasileiro por Tibério Vítor (tvtoon@gmail.com)"
-#: ../data/pcsx.glade2:2684
+#: ../data/pcsx.glade2:2634
msgid "<b>Cheat Codes</b>"
msgstr "<b>Códigos de trapaça</b>"
-#: ../data/pcsx.glade2:2850
+#: ../data/pcsx.glade2:2800
msgid ""
"8-bit\n"
"16-bit\n"
@@ -2073,7 +2088,7 @@ msgstr ""
"16-bit\n"
"32-bit"
-#: ../data/pcsx.glade2:2913
+#: ../data/pcsx.glade2:2863
msgid ""
"Equal Value\n"
"Not Equal Value\n"
@@ -2095,7 +2110,7 @@ msgstr ""
"Diferente\n"
"Sem mudanças"
-#: ../data/pcsx.glade2:2945
+#: ../data/pcsx.glade2:2895
msgid ""
"Decimal\n"
"Hexadecimal"
@@ -2103,19 +2118,19 @@ msgstr ""
"Decimal\n"
"Hexadecimal"
-#: ../data/pcsx.glade2:3148
+#: ../data/pcsx.glade2:3098
msgid "label_resultsfound"
msgstr "Resultados encontrados:"
-#: ../data/pcsx.glade2:3183
+#: ../data/pcsx.glade2:3133
msgid "Search"
msgstr "Buscar"
-#: ../data/pcsx.glade2:3219
+#: ../data/pcsx.glade2:3169
msgid "Restart"
msgstr "Reiniciar"
-#: ../data/pcsx.glade2:3248
+#: ../data/pcsx.glade2:3198
msgid "<b>Cheat Search</b>"
msgstr "<b>Busca de trapaças</b>"
@@ -2237,7 +2252,7 @@ msgstr "Leitor de unidade de CDROM"
msgid "CDR NULL Plugin"
msgstr "Sem unidade de CDROM"
-#: ../plugins/dfcdrom/cdrcfg-0.1df/main.c:175
+#: ../plugins/dfcdrom/cdrcfg-0.1df/main.c:170
#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2:8
msgid "CDR configuration"
msgstr "Configuração do CDROM"
@@ -2814,19 +2829,19 @@ msgstr ""
msgid "(Not Set)"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:546
+#: ../plugins/dfinput/cfg-gtk2.c:539
msgid "None"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:588
+#: ../plugins/dfinput/cfg-gtk2.c:581
msgid "Gamepad/Keyboard Input Configuration"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:594 ../plugins/dfinput/cfg-gtk2.c:614
+#: ../plugins/dfinput/cfg-gtk2.c:587 ../plugins/dfinput/cfg-gtk2.c:607
msgid "Key"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:600 ../plugins/dfinput/cfg-gtk2.c:620
+#: ../plugins/dfinput/cfg-gtk2.c:593 ../plugins/dfinput/cfg-gtk2.c:613
msgid "Button"
msgstr ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index c7d88e0d..7badfdec 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-12-19 12:58+0800\n"
-"PO-Revision-Date: 2009-12-19 12:58+0700\n"
+"POT-Creation-Date: 2010-01-23 16:38+0800\n"
+"PO-Revision-Date: 2010-01-23 16:39+0700\n"
"Last-Translator: Wei Mingzhi <whistler@openoffice.org>\n"
"Language-Team: Simplified Chinese <whistler@openoffice.org>\n"
"MIME-Version: 1.0\n"
@@ -64,8 +64,8 @@ msgstr "关于 PCSX"
#: ../win32/gui/CheatDlg.c:120
#: ../win32/gui/ConfigurePlugins.c:470
#: ../win32/gui/ConfigurePlugins.c:601
-#: ../win32/gui/WndMain.c:964
-#: ../win32/gui/WndMain.c:1200
+#: ../win32/gui/WndMain.c:966
+#: ../win32/gui/WndMain.c:1202
#: ../plugins/peopsxgl/gpucfg/interface.c:130
#: ../plugins/peopsxgl/gpucfg/interface.c:843
msgid "OK"
@@ -109,8 +109,8 @@ msgstr "作弊码:"
#: ../win32/gui/CheatDlg.c:121
#: ../win32/gui/ConfigurePlugins.c:471
#: ../win32/gui/ConfigurePlugins.c:602
-#: ../win32/gui/WndMain.c:965
-#: ../win32/gui/WndMain.c:1201
+#: ../win32/gui/WndMain.c:967
+#: ../win32/gui/WndMain.c:1203
#: ../plugins/peopsxgl/gpucfg/interface.c:338
msgid "Cancel"
msgstr "取消"
@@ -128,7 +128,7 @@ msgid "Add New Cheat"
msgstr "添加新作弊码"
#: ../win32/gui/CheatDlg.c:167
-#: ../data/pcsx.glade2:2644
+#: ../data/pcsx.glade2:2594
msgid "Edit Cheat Codes"
msgstr "编辑作弊码"
@@ -249,7 +249,7 @@ msgid "Founded Addresses: %d"
msgstr "找到地址个数: %d"
#: ../win32/gui/CheatDlg.c:505
-#: ../data/pcsx.glade2:3043
+#: ../data/pcsx.glade2:2993
msgid "Freeze"
msgstr "固定"
@@ -262,7 +262,7 @@ msgstr "地址:"
#: ../win32/gui/CheatDlg.c:598
#: ../win32/gui/CheatDlg.c:683
#: ../gui/Cheat.c:648
-#: ../data/pcsx.glade2:2887
+#: ../data/pcsx.glade2:2837
msgid "Value:"
msgstr "值:"
@@ -272,33 +272,33 @@ msgid "Freeze %.8X"
msgstr "固定 %.8X"
#: ../win32/gui/CheatDlg.c:596
-#: ../data/pcsx.glade2:3079
+#: ../data/pcsx.glade2:3029
msgid "Modify"
msgstr "修改"
#: ../win32/gui/CheatDlg.c:679
#: ../gui/Cheat.c:1130
-#: ../data/pcsx.glade2:2815
+#: ../data/pcsx.glade2:2765
msgid "Cheat Search"
msgstr "查找作弊码"
#: ../win32/gui/CheatDlg.c:681
-#: ../data/pcsx.glade2:2865
+#: ../data/pcsx.glade2:2815
msgid "Search For:"
msgstr "查找:"
#: ../win32/gui/CheatDlg.c:682
-#: ../data/pcsx.glade2:2875
+#: ../data/pcsx.glade2:2825
msgid "Data Type:"
msgstr "数据类型:"
#: ../win32/gui/CheatDlg.c:684
-#: ../data/pcsx.glade2:2899
+#: ../data/pcsx.glade2:2849
msgid "Data Base:"
msgstr "数据基:"
#: ../win32/gui/CheatDlg.c:685
-#: ../data/pcsx.glade2:2959
+#: ../data/pcsx.glade2:2909
msgid "To:"
msgstr "到:"
@@ -347,7 +347,7 @@ msgid "Hexadecimal"
msgstr "十六进制"
#: ../win32/gui/ConfigurePlugins.c:206
-#: ../gui/ConfDlg.c:680
+#: ../gui/ConfDlg.c:675
msgid "Internal HLE Bios"
msgstr "内部 HLE-Bios"
@@ -358,7 +358,7 @@ msgstr "配置不正确!"
#: ../win32/gui/ConfigurePlugins.c:292
#: ../gui/Cheat.c:156
#: ../gui/Cheat.c:252
-#: ../gui/LnxMain.c:409
+#: ../gui/LnxMain.c:414
msgid "Error"
msgstr "错误"
@@ -454,25 +454,25 @@ msgid "Note: The NetPlay Plugin Directory should be the same as the other Plugin
msgstr "注意: 联网游戏插件应和其它插件放在同一目录中。"
#: ../win32/gui/plugin.c:90
-#: ../win32/gui/WndMain.c:279
+#: ../win32/gui/WndMain.c:281
#, c-format
msgid "*PCSX*: Saved State %d"
msgstr "*PCSX*: Saved State %d"
#: ../win32/gui/plugin.c:91
-#: ../win32/gui/WndMain.c:280
+#: ../win32/gui/WndMain.c:282
#, c-format
msgid "*PCSX*: Error Saving State %d"
msgstr "*PCSX*: Error Saving State %d"
#: ../win32/gui/plugin.c:107
-#: ../win32/gui/WndMain.c:257
+#: ../win32/gui/WndMain.c:259
#, c-format
msgid "*PCSX*: Loaded State %d"
msgstr "*PCSX*: Loaded State %d"
#: ../win32/gui/plugin.c:108
-#: ../win32/gui/WndMain.c:258
+#: ../win32/gui/WndMain.c:260
#, c-format
msgid "*PCSX*: Error Loading State %d"
msgstr "*PCSX*: Error Loading State %d"
@@ -616,8 +616,8 @@ msgid "Greek"
msgstr "希腊语"
#: ../win32/gui/WndMain.c:80
-#: ../win32/gui/WndMain.c:1557
#: ../win32/gui/WndMain.c:1559
+#: ../win32/gui/WndMain.c:1561
msgid "English"
msgstr "英语"
@@ -665,83 +665,83 @@ msgstr "日语"
msgid "Korean"
msgstr "朝鲜语"
-#: ../win32/gui/WndMain.c:298
-#: ../win32/gui/WndMain.c:350
+#: ../win32/gui/WndMain.c:300
+#: ../win32/gui/WndMain.c:352
msgid "PCSX State Format"
msgstr "PCSX 存档格式"
-#: ../win32/gui/WndMain.c:325
+#: ../win32/gui/WndMain.c:327
#, c-format
msgid "*PCSX*: Loaded State %s"
msgstr "*PCSX*: Loaded State %s"
-#: ../win32/gui/WndMain.c:326
+#: ../win32/gui/WndMain.c:328
#, c-format
msgid "*PCSX*: Error Loading State %s"
msgstr "*PCSX*: Error Loading State %s"
-#: ../win32/gui/WndMain.c:377
+#: ../win32/gui/WndMain.c:379
#, c-format
msgid "*PCSX*: Saved State %s"
msgstr "*PCSX*: Saved State %s"
-#: ../win32/gui/WndMain.c:378
+#: ../win32/gui/WndMain.c:380
#, c-format
msgid "*PCSX*: Error Saving State %s"
msgstr "*PCSX*: Error Saving State %s"
-#: ../win32/gui/WndMain.c:427
-#: ../win32/gui/WndMain.c:476
+#: ../win32/gui/WndMain.c:429
+#: ../win32/gui/WndMain.c:478
#: ../gui/Gtk2Gui.c:479
#: ../gui/Gtk2Gui.c:604
msgid "The CD does not appear to be a valid Playstation CD"
msgstr "此光盘不是一张合法的 PlayStation 光盘。"
-#: ../win32/gui/WndMain.c:433
-#: ../win32/gui/WndMain.c:482
+#: ../win32/gui/WndMain.c:435
+#: ../win32/gui/WndMain.c:484
#: ../gui/Gtk2Gui.c:487
#: ../gui/Gtk2Gui.c:612
msgid "Could not load CD-ROM!"
msgstr "无法加载光盘!"
-#: ../win32/gui/WndMain.c:443
+#: ../win32/gui/WndMain.c:445
msgid "Running BIOS is not supported with Internal HLE Bios."
msgstr "内部 HLE BIOS 不支持直接运行。"
-#: ../win32/gui/WndMain.c:662
+#: ../win32/gui/WndMain.c:664
#: ../gui/MemcardDlg.c:59
msgid "Title"
msgstr "标题"
-#: ../win32/gui/WndMain.c:668
+#: ../win32/gui/WndMain.c:670
#: ../gui/MemcardDlg.c:65
msgid "Status"
msgstr "状态"
-#: ../win32/gui/WndMain.c:674
+#: ../win32/gui/WndMain.c:676
msgid "Game ID"
msgstr "游戏 ID"
-#: ../win32/gui/WndMain.c:680
+#: ../win32/gui/WndMain.c:682
msgid "Game"
msgstr "游戏"
-#: ../win32/gui/WndMain.c:854
+#: ../win32/gui/WndMain.c:856
msgid "mid link block"
msgstr "mid link block"
-#: ../win32/gui/WndMain.c:857
+#: ../win32/gui/WndMain.c:859
msgid "terminiting link block"
msgstr "terminiting link block"
-#: ../win32/gui/WndMain.c:865
+#: ../win32/gui/WndMain.c:867
#: ../gui/MemcardDlg.c:147
#: ../gui/MemcardDlg.c:244
msgid "Deleted"
msgstr "已删除"
-#: ../win32/gui/WndMain.c:866
-#: ../win32/gui/WndMain.c:869
+#: ../win32/gui/WndMain.c:868
+#: ../win32/gui/WndMain.c:871
#: ../gui/MemcardDlg.c:149
#: ../gui/MemcardDlg.c:153
#: ../gui/MemcardDlg.c:246
@@ -749,320 +749,320 @@ msgstr "已删除"
msgid "Free"
msgstr "空闲"
-#: ../win32/gui/WndMain.c:868
+#: ../win32/gui/WndMain.c:870
#: ../gui/MemcardDlg.c:151
#: ../gui/MemcardDlg.c:248
msgid "Used"
msgstr "已使用"
-#: ../win32/gui/WndMain.c:962
+#: ../win32/gui/WndMain.c:964
msgid "Memcard Manager"
msgstr "记忆卡管理器"
-#: ../win32/gui/WndMain.c:966
-#: ../win32/gui/WndMain.c:969
+#: ../win32/gui/WndMain.c:968
+#: ../win32/gui/WndMain.c:971
msgid "Select Mcd"
msgstr "选择"
-#: ../win32/gui/WndMain.c:967
-#: ../win32/gui/WndMain.c:970
+#: ../win32/gui/WndMain.c:969
+#: ../win32/gui/WndMain.c:972
msgid "Format Mcd"
msgstr "格式化"
-#: ../win32/gui/WndMain.c:968
-#: ../win32/gui/WndMain.c:971
+#: ../win32/gui/WndMain.c:970
+#: ../win32/gui/WndMain.c:973
msgid "Reload Mcd"
msgstr "重新加载"
-#: ../win32/gui/WndMain.c:972
+#: ../win32/gui/WndMain.c:974
msgid "-> Copy ->"
msgstr "-> 复制 ->"
-#: ../win32/gui/WndMain.c:973
+#: ../win32/gui/WndMain.c:975
msgid "<- Copy <-"
msgstr "<- 复制 <-"
-#: ../win32/gui/WndMain.c:974
+#: ../win32/gui/WndMain.c:976
msgid "Paste"
msgstr "粘贴"
-#: ../win32/gui/WndMain.c:975
+#: ../win32/gui/WndMain.c:977
msgid "<- Un/Delete"
msgstr "<- 删除/恢复"
-#: ../win32/gui/WndMain.c:976
+#: ../win32/gui/WndMain.c:978
msgid "Un/Delete ->"
msgstr "删除/恢复 ->"
-#: ../win32/gui/WndMain.c:978
+#: ../win32/gui/WndMain.c:980
msgid "Memory Card 1"
msgstr "记忆卡 1"
-#: ../win32/gui/WndMain.c:979
+#: ../win32/gui/WndMain.c:981
msgid "Memory Card 2"
msgstr "记忆卡 2"
-#: ../win32/gui/WndMain.c:1034
+#: ../win32/gui/WndMain.c:1036
msgid "Are you sure you want to paste this selection?"
msgstr "是否确认粘贴此选中内容?"
-#: ../win32/gui/WndMain.c:1034
-#: ../win32/gui/WndMain.c:1145
-#: ../win32/gui/WndMain.c:1152
+#: ../win32/gui/WndMain.c:1036
+#: ../win32/gui/WndMain.c:1147
+#: ../win32/gui/WndMain.c:1154
msgid "Confirmation"
msgstr "确认"
-#: ../win32/gui/WndMain.c:1145
-#: ../win32/gui/WndMain.c:1152
+#: ../win32/gui/WndMain.c:1147
+#: ../win32/gui/WndMain.c:1154
msgid "Are you sure you want to format this Memory Card?"
msgstr "是否确认格式化此记忆卡?"
-#: ../win32/gui/WndMain.c:1198
+#: ../win32/gui/WndMain.c:1200
msgid "Cpu Config"
msgstr "CPU 配置"
-#: ../win32/gui/WndMain.c:1203
+#: ../win32/gui/WndMain.c:1205
msgid "Disable Xa Decoding"
msgstr "禁用 XA 解码"
-#: ../win32/gui/WndMain.c:1204
+#: ../win32/gui/WndMain.c:1206
msgid "Sio Irq Always Enabled"
msgstr "SIO IRQ 总是启用"
-#: ../win32/gui/WndMain.c:1205
+#: ../win32/gui/WndMain.c:1207
msgid "Black && White Movies"
msgstr "黑白电影"
-#: ../win32/gui/WndMain.c:1206
+#: ../win32/gui/WndMain.c:1208
msgid "Disable Cd audio"
msgstr "禁用 CD 音频"
-#: ../win32/gui/WndMain.c:1207
-#: ../data/pcsx.glade2:1603
+#: ../win32/gui/WndMain.c:1209
+#: ../data/pcsx.glade2:1586
msgid "Autodetect"
msgstr "自动检测"
-#: ../win32/gui/WndMain.c:1208
+#: ../win32/gui/WndMain.c:1210
msgid "Enable Interpreter Cpu"
msgstr "启用解释执行 CPU"
-#: ../win32/gui/WndMain.c:1209
-#: ../data/pcsx.glade2:1459
+#: ../win32/gui/WndMain.c:1211
+#: ../data/pcsx.glade2:1442
msgid "Enable Console Output"
msgstr "启用控制台输出"
-#: ../win32/gui/WndMain.c:1210
-#: ../data/pcsx.glade2:1409
+#: ../win32/gui/WndMain.c:1212
+#: ../data/pcsx.glade2:1392
msgid "Enable Debugger"
msgstr "启用调试器"
-#: ../win32/gui/WndMain.c:1211
+#: ../win32/gui/WndMain.c:1213
msgid "Spu Irq Always Enabled"
msgstr "SPU IRQ 总是启用"
-#: ../win32/gui/WndMain.c:1212
-#: ../data/pcsx.glade2:1546
+#: ../win32/gui/WndMain.c:1214
+#: ../data/pcsx.glade2:1529
msgid "Parasite Eve 2, Vandal Hearts 1/2 Fix"
msgstr "Parasite Eve 2, Vandal Hearts 1/2 修正"
-#: ../win32/gui/WndMain.c:1213
-#: ../data/pcsx.glade2:1561
+#: ../win32/gui/WndMain.c:1215
+#: ../data/pcsx.glade2:1544
msgid "InuYasha Sengoku Battle Fix"
msgstr "InuYasha Sengoku 战斗修正"
-#: ../win32/gui/WndMain.c:1215
+#: ../win32/gui/WndMain.c:1217
#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2:277
#: ../plugins/dfinput/dfinput.glade2:448
msgid "Options"
msgstr "选项"
-#: ../win32/gui/WndMain.c:1216
+#: ../win32/gui/WndMain.c:1218
msgid "Psx System Type"
msgstr "Psx 系统类型"
-#: ../win32/gui/WndMain.c:1321
+#: ../win32/gui/WndMain.c:1323
msgid "Psx Mcd Format (*.mcr;*.mc;*.mem;*.vgs;*.mcd;*.gme;*.ddf)"
msgstr "Psx 记忆卡格式 (*.mcr;*.mc;*.mem;*.vgs;*.mcd;*.gme;*.ddf)"
-#: ../win32/gui/WndMain.c:1326
+#: ../win32/gui/WndMain.c:1328
msgid "Psx Memory Card (*.mcr;*.mc)"
msgstr "Psx 记忆卡 (*.mcr;*.mc)"
-#: ../win32/gui/WndMain.c:1331
+#: ../win32/gui/WndMain.c:1333
msgid "CVGS Memory Card (*.mem;*.vgs)"
msgstr "VGS 记忆卡 (*.mem;*.vgs)"
-#: ../win32/gui/WndMain.c:1336
+#: ../win32/gui/WndMain.c:1338
msgid "Bleem Memory Card (*.mcd)"
msgstr "Bleem 记忆卡 (*.mcd)"
-#: ../win32/gui/WndMain.c:1341
+#: ../win32/gui/WndMain.c:1343
msgid "DexDrive Memory Card (*.gme)"
msgstr "DexDrive 记忆卡 (*.gme)"
-#: ../win32/gui/WndMain.c:1346
+#: ../win32/gui/WndMain.c:1348
msgid "DataDeck Memory Card (*.ddf)"
msgstr "DataDeck 记忆卡 (*.ddl)"
-#: ../win32/gui/WndMain.c:1351
-#: ../win32/gui/WndMain.c:1432
+#: ../win32/gui/WndMain.c:1353
+#: ../win32/gui/WndMain.c:1434
#: ../gui/Cheat.c:322
#: ../gui/Gtk2Gui.c:416
#: ../gui/Gtk2Gui.c:555
msgid "All Files"
msgstr "所有文件"
-#: ../win32/gui/WndMain.c:1390
+#: ../win32/gui/WndMain.c:1392
msgid "Psx Exe Format"
msgstr "PSX EXE 格式"
-#: ../win32/gui/WndMain.c:1427
+#: ../win32/gui/WndMain.c:1429
msgid "Psx Isos (*.iso;*.mdf;*.img;*.bin)"
msgstr "Psx 光盘镜像 (*.iso;*.mdf;*.img;*.bin)"
-#: ../win32/gui/WndMain.c:1503
+#: ../win32/gui/WndMain.c:1505
msgid "&File"
msgstr "文件(&F)"
-#: ../win32/gui/WndMain.c:1504
+#: ../win32/gui/WndMain.c:1506
msgid "E&xit"
msgstr "退出(&X)"
-#: ../win32/gui/WndMain.c:1506
+#: ../win32/gui/WndMain.c:1508
msgid "Run &EXE..."
msgstr "运行 &EXE..."
-#: ../win32/gui/WndMain.c:1507
+#: ../win32/gui/WndMain.c:1509
msgid "Run &BIOS"
msgstr "运行 BIOS(&B)"
-#: ../win32/gui/WndMain.c:1508
+#: ../win32/gui/WndMain.c:1510
msgid "Run &ISO..."
msgstr "运行 &ISO..."
-#: ../win32/gui/WndMain.c:1509
+#: ../win32/gui/WndMain.c:1511
msgid "Run &CD"
msgstr "运行光碟(&C)"
-#: ../win32/gui/WndMain.c:1511
+#: ../win32/gui/WndMain.c:1513
msgid "&Emulator"
msgstr "模拟器(&E)"
-#: ../win32/gui/WndMain.c:1512
+#: ../win32/gui/WndMain.c:1514
msgid "&States"
msgstr "存档(&S)"
-#: ../win32/gui/WndMain.c:1514
+#: ../win32/gui/WndMain.c:1516
msgid "S&witch ISO..."
msgstr "更换 ISO(&W)..."
-#: ../win32/gui/WndMain.c:1516
+#: ../win32/gui/WndMain.c:1518
msgid "Re&set"
msgstr "复位(&S)"
-#: ../win32/gui/WndMain.c:1517
+#: ../win32/gui/WndMain.c:1519
msgid "&Run"
msgstr "运行(&R)"
-#: ../win32/gui/WndMain.c:1518
+#: ../win32/gui/WndMain.c:1520
msgid "&Save"
msgstr "保存(&S)"
-#: ../win32/gui/WndMain.c:1519
+#: ../win32/gui/WndMain.c:1521
msgid "&Load"
msgstr "读取(&L)"
-#: ../win32/gui/WndMain.c:1520
-#: ../win32/gui/WndMain.c:1526
+#: ../win32/gui/WndMain.c:1522
+#: ../win32/gui/WndMain.c:1528
msgid "&Other..."
msgstr "其它(&O)..."
-#: ../win32/gui/WndMain.c:1521
-#: ../win32/gui/WndMain.c:1527
+#: ../win32/gui/WndMain.c:1523
+#: ../win32/gui/WndMain.c:1529
msgid "Slot &5"
msgstr "存档 5(&5)"
-#: ../win32/gui/WndMain.c:1522
-#: ../win32/gui/WndMain.c:1528
+#: ../win32/gui/WndMain.c:1524
+#: ../win32/gui/WndMain.c:1530
msgid "Slot &4"
msgstr "存档 4(&4)"
-#: ../win32/gui/WndMain.c:1523
-#: ../win32/gui/WndMain.c:1529
+#: ../win32/gui/WndMain.c:1525
+#: ../win32/gui/WndMain.c:1531
msgid "Slot &3"
msgstr "存档 3(&3)"
-#: ../win32/gui/WndMain.c:1524
-#: ../win32/gui/WndMain.c:1530
+#: ../win32/gui/WndMain.c:1526
+#: ../win32/gui/WndMain.c:1532
msgid "Slot &2"
msgstr "存档 2(&2)"
-#: ../win32/gui/WndMain.c:1525
-#: ../win32/gui/WndMain.c:1531
+#: ../win32/gui/WndMain.c:1527
+#: ../win32/gui/WndMain.c:1533
msgid "Slot &1"
msgstr "存档 1(&1)"
-#: ../win32/gui/WndMain.c:1533
+#: ../win32/gui/WndMain.c:1535
msgid "&Configuration"
msgstr "配置(&C)"
-#: ../win32/gui/WndMain.c:1534
+#: ../win32/gui/WndMain.c:1536
msgid "Cheat &Search..."
msgstr "查找作弊码(&S)..."
-#: ../win32/gui/WndMain.c:1535
+#: ../win32/gui/WndMain.c:1537
msgid "Ch&eat Code..."
msgstr "作弊码(&E)..."
-#: ../win32/gui/WndMain.c:1538
+#: ../win32/gui/WndMain.c:1540
msgid "&Language"
msgstr "语言(&L)"
-#: ../win32/gui/WndMain.c:1563
+#: ../win32/gui/WndMain.c:1565
msgid "&Memory cards..."
msgstr "记忆卡(&M)..."
-#: ../win32/gui/WndMain.c:1564
+#: ../win32/gui/WndMain.c:1566
msgid "C&PU..."
msgstr "C&PU..."
-#: ../win32/gui/WndMain.c:1566
+#: ../win32/gui/WndMain.c:1568
msgid "&NetPlay..."
msgstr "联网游戏(&N)..."
-#: ../win32/gui/WndMain.c:1568
+#: ../win32/gui/WndMain.c:1570
msgid "&Controllers..."
msgstr "控制器(&C)..."
-#: ../win32/gui/WndMain.c:1569
+#: ../win32/gui/WndMain.c:1571
msgid "CD-&ROM..."
msgstr "CD-&ROM..."
-#: ../win32/gui/WndMain.c:1570
+#: ../win32/gui/WndMain.c:1572
msgid "&Sound..."
msgstr "声音(&S)..."
-#: ../win32/gui/WndMain.c:1571
+#: ../win32/gui/WndMain.c:1573
msgid "&Graphics..."
msgstr "图像(&G)..."
-#: ../win32/gui/WndMain.c:1573
+#: ../win32/gui/WndMain.c:1575
msgid "&Plugins && Bios..."
msgstr "插件及 BIOS(&P)..."
-#: ../win32/gui/WndMain.c:1575
+#: ../win32/gui/WndMain.c:1577
msgid "&Help"
msgstr "帮助(&H)"
-#: ../win32/gui/WndMain.c:1576
+#: ../win32/gui/WndMain.c:1578
msgid "&About..."
msgstr "关于(&A)..."
-#: ../win32/gui/WndMain.c:1762
+#: ../win32/gui/WndMain.c:1764
msgid "Pcsx Msg"
msgstr "PCSX 消息"
-#: ../win32/gui/WndMain.c:1765
+#: ../win32/gui/WndMain.c:1767
msgid "Error Loading Symbol"
msgstr "无法加载符号"
@@ -1091,7 +1091,7 @@ msgstr "所有文件 (*.*)"
#: ../gui/Cheat.c:395
#: ../gui/Cheat.c:1125
#: ../gui/ConfDlg.c:104
-#: ../gui/ConfDlg.c:203
+#: ../gui/ConfDlg.c:200
msgid "Error: Glade interface could not be loaded!"
msgstr "错误:无法加载 Glade 界面!"
@@ -1124,30 +1124,30 @@ msgstr "查找结果"
msgid "Configure PCSX"
msgstr "配置 PCSX"
-#: ../gui/ConfDlg.c:240
-#: ../gui/ConfDlg.c:261
-#: ../gui/ConfDlg.c:282
-#: ../gui/ConfDlg.c:303
-#: ../gui/ConfDlg.c:358
+#: ../gui/ConfDlg.c:237
+#: ../gui/ConfDlg.c:258
+#: ../gui/ConfDlg.c:279
+#: ../gui/ConfDlg.c:300
+#: ../gui/ConfDlg.c:355
msgid "No configuration required"
msgstr "不需要配置"
-#: ../gui/ConfDlg.c:240
-#: ../gui/ConfDlg.c:261
-#: ../gui/ConfDlg.c:282
-#: ../gui/ConfDlg.c:303
-#: ../gui/ConfDlg.c:358
+#: ../gui/ConfDlg.c:237
+#: ../gui/ConfDlg.c:258
+#: ../gui/ConfDlg.c:279
+#: ../gui/ConfDlg.c:300
+#: ../gui/ConfDlg.c:355
msgid "This plugin doesn't need to be configured."
msgstr "此插件需要被配置。"
-#: ../gui/ConfDlg.c:586
+#: ../gui/ConfDlg.c:581
#, c-format
msgid "Could not open BIOS directory: '%s'\n"
msgstr "无法打开 BIOS 目录: \"%s\"\n"
-#: ../gui/ConfDlg.c:616
-#: ../gui/ConfDlg.c:709
-#: ../gui/LnxMain.c:167
+#: ../gui/ConfDlg.c:611
+#: ../gui/ConfDlg.c:704
+#: ../gui/LnxMain.c:168
#, c-format
msgid "Could not open directory: '%s'\n"
msgstr "无法打开目录: \"%s\"\n"
@@ -1236,7 +1236,7 @@ msgstr "警告"
msgid "Creating memory card: %s\n"
msgstr "建立记忆卡: %s\n"
-#: ../gui/LnxMain.c:320
+#: ../gui/LnxMain.c:321
msgid ""
" pcsx [options] [file]\n"
"\toptions:\n"
@@ -1260,21 +1260,21 @@ msgstr ""
"\t-h -help\t显示此信息\n"
"\t文件\t\t加载文件\n"
-#: ../gui/LnxMain.c:357
+#: ../gui/LnxMain.c:358
#, c-format
msgid "PCSX cannot be configured without using the GUI -- you should restart without -nogui.\n"
msgstr "PCSX 不能在字符界面下配置 -- 请不使用 -nogui 参数重新启动程序\n"
-#: ../gui/LnxMain.c:409
+#: ../gui/LnxMain.c:414
msgid "Failed loading plugins!"
msgstr "加载插件失败!"
-#: ../gui/LnxMain.c:426
+#: ../gui/LnxMain.c:431
#, c-format
msgid "Could not load CD-ROM!\n"
msgstr "无法加载光盘。\n"
-#: ../gui/LnxMain.c:465
+#: ../gui/LnxMain.c:467
#, c-format
msgid "PSX emulator couldn't be initialized.\n"
msgstr "无法初始化 PSX 模拟器。\n"
@@ -1328,7 +1328,7 @@ msgid "Memory Card Manager"
msgstr "记忆卡管理器"
#: ../gui/Plugin.c:204
-#: ../data/pcsx.glade2:1495
+#: ../data/pcsx.glade2:1478
#, c-format
msgid "SIO IRQ Always Enabled"
msgstr "SIO IRQ 总是启用"
@@ -1398,7 +1398,7 @@ msgstr "无法关闭 \"控制器 2\" 插件!"
msgid "Error closing GPU plugin!"
msgstr "无法关闭 GPU 插件!"
-#: ../libpcsxcore/cdriso.c:644
+#: ../libpcsxcore/cdriso.c:637
#, c-format
msgid "Loaded CD Image: %s"
msgstr "已加载 CD 镜像: %s"
@@ -1434,21 +1434,21 @@ msgstr "调试器已启动。\n"
msgid "Debugger stopped.\n"
msgstr "调试器已停止。\n"
-#: ../libpcsxcore/misc.c:389
+#: ../libpcsxcore/misc.c:395
#, c-format
msgid "Error opening file: %s.\n"
msgstr "打开文件错误: %s。\n"
-#: ../libpcsxcore/misc.c:429
+#: ../libpcsxcore/misc.c:435
#, c-format
msgid "Unknown CPE opcode %02x at position %08x.\n"
msgstr "未知 CPE 指令码 %02x 位于 %08x。\n"
-#: ../libpcsxcore/misc.c:436
+#: ../libpcsxcore/misc.c:442
msgid "COFF files not supported.\n"
msgstr "COFF 文件尚未支持。\n"
-#: ../libpcsxcore/misc.c:440
+#: ../libpcsxcore/misc.c:446
msgid "This file does not appear to be a valid PSX file.\n"
msgstr "此文件不是一个合法的 PSX 文件。\n"
@@ -1521,6 +1521,21 @@ msgstr "联网游戏插件初始化错误: %d"
msgid "Plugins loaded.\n"
msgstr "插件已加载。\n"
+#: ../libpcsxcore/ppf.c:206
+#, c-format
+msgid "Invalid PPF patch: %s.\n"
+msgstr "非法 PPF 补丁: %s。\n"
+
+#: ../libpcsxcore/ppf.c:282
+#, c-format
+msgid "Unsupported PPF version (%d).\n"
+msgstr "不支持的 PPF 补丁版本 (%d)。\n"
+
+#: ../libpcsxcore/ppf.c:321
+#, c-format
+msgid "Loaded PPF %d.0 patch: %s.\n"
+msgstr "已加载 PPF %d.0 补丁文件: %s。\n"
+
#: ../libpcsxcore/psxmem.c:69
msgid "Error allocating memory!"
msgstr "分配内存错误!"
@@ -1963,7 +1978,7 @@ msgid "Switch ISO..."
msgstr "更换 ISO..."
#: ../data/pcsx.glade2:669
-#: ../data/pcsx.glade2:1853
+#: ../data/pcsx.glade2:1803
msgid "Configure Memory Cards"
msgstr "配置记忆卡"
@@ -2040,35 +2055,35 @@ msgstr "<b>插件</b>"
msgid "<b>BIOS</b>"
msgstr "<b>BIOS</b>"
-#: ../data/pcsx.glade2:1380
+#: ../data/pcsx.glade2:1363
msgid "Configure CPU"
msgstr "配置 CPU"
-#: ../data/pcsx.glade2:1427
+#: ../data/pcsx.glade2:1410
msgid "SPU IRQ Always Enabled"
msgstr "SPU IRQ 总是启用"
-#: ../data/pcsx.glade2:1443
+#: ../data/pcsx.glade2:1426
msgid "Black & White Movies"
msgstr "黑白电影"
-#: ../data/pcsx.glade2:1477
+#: ../data/pcsx.glade2:1460
msgid "Enable Interpreter CPU"
msgstr "启用解释执行 CPU"
-#: ../data/pcsx.glade2:1511
+#: ../data/pcsx.glade2:1494
msgid "Disable CD Audio"
msgstr "禁用 CD 音频"
-#: ../data/pcsx.glade2:1527
+#: ../data/pcsx.glade2:1510
msgid "Disable XA Decoding"
msgstr "禁用 XA 解码"
-#: ../data/pcsx.glade2:1579
+#: ../data/pcsx.glade2:1562
msgid "<b>Options</b>"
msgstr "<b>选项</b>"
-#: ../data/pcsx.glade2:1620
+#: ../data/pcsx.glade2:1603
msgid ""
"NTSC\n"
"PAL"
@@ -2076,48 +2091,48 @@ msgstr ""
"NTSC\n"
"PAL"
-#: ../data/pcsx.glade2:1634
+#: ../data/pcsx.glade2:1617
msgid "<b>System Type</b>"
msgstr "<b>系统类型</b>"
-#: ../data/pcsx.glade2:1698
+#: ../data/pcsx.glade2:1665
msgid "Configure NetPlay"
msgstr "配置联网游戏"
-#: ../data/pcsx.glade2:1786
+#: ../data/pcsx.glade2:1753
msgid "<b>NetPlay</b>"
msgstr "<b>联网游戏</b>"
-#: ../data/pcsx.glade2:1932
-#: ../data/pcsx.glade2:2330
+#: ../data/pcsx.glade2:1882
+#: ../data/pcsx.glade2:2280
msgid "New"
msgstr "新建"
-#: ../data/pcsx.glade2:1982
-#: ../data/pcsx.glade2:2380
+#: ../data/pcsx.glade2:1932
+#: ../data/pcsx.glade2:2330
msgid "Format"
msgstr "格式化"
-#: ../data/pcsx.glade2:2032
-#: ../data/pcsx.glade2:2430
+#: ../data/pcsx.glade2:1982
+#: ../data/pcsx.glade2:2380
msgid "Un/Delete"
msgstr "删除/恢复"
-#: ../data/pcsx.glade2:2125
+#: ../data/pcsx.glade2:2075
msgid "<b>Memory Card 1</b>"
msgstr "<b>记忆卡 1</b>"
+#: ../data/pcsx.glade2:2136
#: ../data/pcsx.glade2:2186
-#: ../data/pcsx.glade2:2236
-#: ../data/pcsx.glade2:3115
+#: ../data/pcsx.glade2:3065
msgid "Copy"
msgstr "复制"
-#: ../data/pcsx.glade2:2523
+#: ../data/pcsx.glade2:2473
msgid "<b>Memory Card 2</b>"
msgstr "<b>记忆卡 2</b>"
-#: ../data/pcsx.glade2:2586
+#: ../data/pcsx.glade2:2536
msgid ""
"(C) 1999-2003 PCSX Team\n"
"(C) 2005-2006 Ryan Schultz\n"
@@ -2129,11 +2144,11 @@ msgstr ""
"(C) 2005-2006 Andrew Burton\n"
"(C) 2008-2009 Wei Mingzhi"
-#: ../data/pcsx.glade2:2590
+#: ../data/pcsx.glade2:2540
msgid "A PlayStation emulator."
msgstr "一个 PlayStation 模拟器。"
-#: ../data/pcsx.glade2:2593
+#: ../data/pcsx.glade2:2543
msgid ""
"This program is free software; you can redistribute it\n"
"and/or modify it under the terms of the GNU General\n"
@@ -2167,15 +2182,15 @@ msgstr ""
"Public License along with this program; if not, write to\n"
"the Free Software Foundation, Inc."
-#: ../data/pcsx.glade2:2622
+#: ../data/pcsx.glade2:2572
msgid "translator-credits"
msgstr "Wei Mingzhi <whistler@openoffice.org>"
-#: ../data/pcsx.glade2:2684
+#: ../data/pcsx.glade2:2634
msgid "<b>Cheat Codes</b>"
msgstr "<b>作弊码</b>"
-#: ../data/pcsx.glade2:2850
+#: ../data/pcsx.glade2:2800
msgid ""
"8-bit\n"
"16-bit\n"
@@ -2185,7 +2200,7 @@ msgstr ""
"16 位\n"
"32 位"
-#: ../data/pcsx.glade2:2913
+#: ../data/pcsx.glade2:2863
msgid ""
"Equal Value\n"
"Not Equal Value\n"
@@ -2207,7 +2222,7 @@ msgstr ""
"改变\n"
"无改变"
-#: ../data/pcsx.glade2:2945
+#: ../data/pcsx.glade2:2895
msgid ""
"Decimal\n"
"Hexadecimal"
@@ -2215,19 +2230,19 @@ msgstr ""
"十进制\n"
"十六进制"
-#: ../data/pcsx.glade2:3148
+#: ../data/pcsx.glade2:3098
msgid "label_resultsfound"
msgstr "label_resultsfound"
-#: ../data/pcsx.glade2:3183
+#: ../data/pcsx.glade2:3133
msgid "Search"
msgstr "查找"
-#: ../data/pcsx.glade2:3219
+#: ../data/pcsx.glade2:3169
msgid "Restart"
msgstr "复位"
-#: ../data/pcsx.glade2:3248
+#: ../data/pcsx.glade2:3198
msgid "<b>Cheat Search</b>"
msgstr "<b>作弊码查找</b>"
@@ -2349,7 +2364,7 @@ msgstr "CD-ROM 设备读取插件"
msgid "CDR NULL Plugin"
msgstr "CDR 空插件"
-#: ../plugins/dfcdrom/cdrcfg-0.1df/main.c:175
+#: ../plugins/dfcdrom/cdrcfg-0.1df/main.c:170
#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2:8
msgid "CDR configuration"
msgstr "CDR 配置"
@@ -2957,21 +2972,21 @@ msgstr "键盘:"
msgid "(Not Set)"
msgstr "(未设定)"
-#: ../plugins/dfinput/cfg-gtk2.c:546
+#: ../plugins/dfinput/cfg-gtk2.c:539
msgid "None"
msgstr "无"
-#: ../plugins/dfinput/cfg-gtk2.c:588
+#: ../plugins/dfinput/cfg-gtk2.c:581
msgid "Gamepad/Keyboard Input Configuration"
msgstr "手柄/键盘输入配置"
-#: ../plugins/dfinput/cfg-gtk2.c:594
-#: ../plugins/dfinput/cfg-gtk2.c:614
+#: ../plugins/dfinput/cfg-gtk2.c:587
+#: ../plugins/dfinput/cfg-gtk2.c:607
msgid "Key"
msgstr "按钮"
-#: ../plugins/dfinput/cfg-gtk2.c:600
-#: ../plugins/dfinput/cfg-gtk2.c:620
+#: ../plugins/dfinput/cfg-gtk2.c:593
+#: ../plugins/dfinput/cfg-gtk2.c:613
msgid "Button"
msgstr "按键"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index aee310ab..d68c244c 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-12-19 12:58+0800\n"
-"PO-Revision-Date: 2009-12-28 17:04+0700\n"
+"POT-Creation-Date: 2010-01-23 16:38+0800\n"
+"PO-Revision-Date: 2010-01-23 16:40+0700\n"
"Last-Translator: Wei Mingzhi <whistler@openoffice.org>\n"
"Language-Team: Traditional Chinese <whistler@openoffice.org>\n"
"MIME-Version: 1.0\n"
@@ -64,8 +64,8 @@ msgstr "關於 PCSX"
#: ../win32/gui/CheatDlg.c:120
#: ../win32/gui/ConfigurePlugins.c:470
#: ../win32/gui/ConfigurePlugins.c:601
-#: ../win32/gui/WndMain.c:964
-#: ../win32/gui/WndMain.c:1200
+#: ../win32/gui/WndMain.c:966
+#: ../win32/gui/WndMain.c:1202
#: ../plugins/peopsxgl/gpucfg/interface.c:130
#: ../plugins/peopsxgl/gpucfg/interface.c:843
msgid "OK"
@@ -109,8 +109,8 @@ msgstr "金手指碼:"
#: ../win32/gui/CheatDlg.c:121
#: ../win32/gui/ConfigurePlugins.c:471
#: ../win32/gui/ConfigurePlugins.c:602
-#: ../win32/gui/WndMain.c:965
-#: ../win32/gui/WndMain.c:1201
+#: ../win32/gui/WndMain.c:967
+#: ../win32/gui/WndMain.c:1203
#: ../plugins/peopsxgl/gpucfg/interface.c:338
msgid "Cancel"
msgstr "取消"
@@ -128,7 +128,7 @@ msgid "Add New Cheat"
msgstr "添加新金手指"
#: ../win32/gui/CheatDlg.c:167
-#: ../data/pcsx.glade2:2644
+#: ../data/pcsx.glade2:2594
msgid "Edit Cheat Codes"
msgstr "編輯金手指"
@@ -249,7 +249,7 @@ msgid "Founded Addresses: %d"
msgstr "找到位址: %d"
#: ../win32/gui/CheatDlg.c:505
-#: ../data/pcsx.glade2:3043
+#: ../data/pcsx.glade2:2993
msgid "Freeze"
msgstr "固定"
@@ -262,7 +262,7 @@ msgstr "位址:"
#: ../win32/gui/CheatDlg.c:598
#: ../win32/gui/CheatDlg.c:683
#: ../gui/Cheat.c:648
-#: ../data/pcsx.glade2:2887
+#: ../data/pcsx.glade2:2837
msgid "Value:"
msgstr "值:"
@@ -272,33 +272,33 @@ msgid "Freeze %.8X"
msgstr "固定 %.8X"
#: ../win32/gui/CheatDlg.c:596
-#: ../data/pcsx.glade2:3079
+#: ../data/pcsx.glade2:3029
msgid "Modify"
msgstr "更改"
#: ../win32/gui/CheatDlg.c:679
#: ../gui/Cheat.c:1130
-#: ../data/pcsx.glade2:2815
+#: ../data/pcsx.glade2:2765
msgid "Cheat Search"
msgstr "搜尋金手指碼"
#: ../win32/gui/CheatDlg.c:681
-#: ../data/pcsx.glade2:2865
+#: ../data/pcsx.glade2:2815
msgid "Search For:"
msgstr "搜尋:"
#: ../win32/gui/CheatDlg.c:682
-#: ../data/pcsx.glade2:2875
+#: ../data/pcsx.glade2:2825
msgid "Data Type:"
msgstr "數值類型:"
#: ../win32/gui/CheatDlg.c:684
-#: ../data/pcsx.glade2:2899
+#: ../data/pcsx.glade2:2849
msgid "Data Base:"
msgstr "數值基:"
#: ../win32/gui/CheatDlg.c:685
-#: ../data/pcsx.glade2:2959
+#: ../data/pcsx.glade2:2909
msgid "To:"
msgstr "至:"
@@ -347,7 +347,7 @@ msgid "Hexadecimal"
msgstr "十六進制"
#: ../win32/gui/ConfigurePlugins.c:206
-#: ../gui/ConfDlg.c:680
+#: ../gui/ConfDlg.c:675
msgid "Internal HLE Bios"
msgstr "內部 HLE-Bios"
@@ -358,7 +358,7 @@ msgstr "設定不正確!"
#: ../win32/gui/ConfigurePlugins.c:292
#: ../gui/Cheat.c:156
#: ../gui/Cheat.c:252
-#: ../gui/LnxMain.c:409
+#: ../gui/LnxMain.c:414
msgid "Error"
msgstr "錯誤"
@@ -454,25 +454,25 @@ msgid "Note: The NetPlay Plugin Directory should be the same as the other Plugin
msgstr "注意: 聯網遊戲外掛應和其它外掛放在同一資料夾中。"
#: ../win32/gui/plugin.c:90
-#: ../win32/gui/WndMain.c:279
+#: ../win32/gui/WndMain.c:281
#, c-format
msgid "*PCSX*: Saved State %d"
msgstr "*PCSX*: Saved State %d"
#: ../win32/gui/plugin.c:91
-#: ../win32/gui/WndMain.c:280
+#: ../win32/gui/WndMain.c:282
#, c-format
msgid "*PCSX*: Error Saving State %d"
msgstr "*PCSX*: Error Saving State %d"
#: ../win32/gui/plugin.c:107
-#: ../win32/gui/WndMain.c:257
+#: ../win32/gui/WndMain.c:259
#, c-format
msgid "*PCSX*: Loaded State %d"
msgstr "*PCSX*: Loaded State %d"
#: ../win32/gui/plugin.c:108
-#: ../win32/gui/WndMain.c:258
+#: ../win32/gui/WndMain.c:260
#, c-format
msgid "*PCSX*: Error Loading State %d"
msgstr "*PCSX*: Error Loading State %d"
@@ -616,8 +616,8 @@ msgid "Greek"
msgstr "希臘語"
#: ../win32/gui/WndMain.c:80
-#: ../win32/gui/WndMain.c:1557
#: ../win32/gui/WndMain.c:1559
+#: ../win32/gui/WndMain.c:1561
msgid "English"
msgstr "英語"
@@ -665,83 +665,83 @@ msgstr "日語"
msgid "Korean"
msgstr "韓國語"
-#: ../win32/gui/WndMain.c:298
-#: ../win32/gui/WndMain.c:350
+#: ../win32/gui/WndMain.c:300
+#: ../win32/gui/WndMain.c:352
msgid "PCSX State Format"
msgstr "PCSX 記錄格式"
-#: ../win32/gui/WndMain.c:325
+#: ../win32/gui/WndMain.c:327
#, c-format
msgid "*PCSX*: Loaded State %s"
msgstr "*PCSX*: Loaded State %s"
-#: ../win32/gui/WndMain.c:326
+#: ../win32/gui/WndMain.c:328
#, c-format
msgid "*PCSX*: Error Loading State %s"
msgstr "*PCSX*: Error Loading State %s"
-#: ../win32/gui/WndMain.c:377
+#: ../win32/gui/WndMain.c:379
#, c-format
msgid "*PCSX*: Saved State %s"
msgstr "*PCSX*: Saved State %s"
-#: ../win32/gui/WndMain.c:378
+#: ../win32/gui/WndMain.c:380
#, c-format
msgid "*PCSX*: Error Saving State %s"
msgstr "*PCSX*: Error Saving State %s"
-#: ../win32/gui/WndMain.c:427
-#: ../win32/gui/WndMain.c:476
+#: ../win32/gui/WndMain.c:429
+#: ../win32/gui/WndMain.c:478
#: ../gui/Gtk2Gui.c:479
#: ../gui/Gtk2Gui.c:604
msgid "The CD does not appear to be a valid Playstation CD"
msgstr "此光碟不是一張合法的 PlayStation 光碟。"
-#: ../win32/gui/WndMain.c:433
-#: ../win32/gui/WndMain.c:482
+#: ../win32/gui/WndMain.c:435
+#: ../win32/gui/WndMain.c:484
#: ../gui/Gtk2Gui.c:487
#: ../gui/Gtk2Gui.c:612
msgid "Could not load CD-ROM!"
msgstr "無法加載光碟!"
-#: ../win32/gui/WndMain.c:443
+#: ../win32/gui/WndMain.c:445
msgid "Running BIOS is not supported with Internal HLE Bios."
msgstr "內部 HLE BIOS 不支援直接執行。"
-#: ../win32/gui/WndMain.c:662
+#: ../win32/gui/WndMain.c:664
#: ../gui/MemcardDlg.c:59
msgid "Title"
msgstr "標題"
-#: ../win32/gui/WndMain.c:668
+#: ../win32/gui/WndMain.c:670
#: ../gui/MemcardDlg.c:65
msgid "Status"
msgstr "狀態"
-#: ../win32/gui/WndMain.c:674
+#: ../win32/gui/WndMain.c:676
msgid "Game ID"
msgstr "遊戲 ID"
-#: ../win32/gui/WndMain.c:680
+#: ../win32/gui/WndMain.c:682
msgid "Game"
msgstr "遊戲"
-#: ../win32/gui/WndMain.c:854
+#: ../win32/gui/WndMain.c:856
msgid "mid link block"
msgstr "mid link block"
-#: ../win32/gui/WndMain.c:857
+#: ../win32/gui/WndMain.c:859
msgid "terminiting link block"
msgstr "terminiting link block"
-#: ../win32/gui/WndMain.c:865
+#: ../win32/gui/WndMain.c:867
#: ../gui/MemcardDlg.c:147
#: ../gui/MemcardDlg.c:244
msgid "Deleted"
msgstr "已刪除"
-#: ../win32/gui/WndMain.c:866
-#: ../win32/gui/WndMain.c:869
+#: ../win32/gui/WndMain.c:868
+#: ../win32/gui/WndMain.c:871
#: ../gui/MemcardDlg.c:149
#: ../gui/MemcardDlg.c:153
#: ../gui/MemcardDlg.c:246
@@ -749,320 +749,320 @@ msgstr "已刪除"
msgid "Free"
msgstr "空閑"
-#: ../win32/gui/WndMain.c:868
+#: ../win32/gui/WndMain.c:870
#: ../gui/MemcardDlg.c:151
#: ../gui/MemcardDlg.c:248
msgid "Used"
msgstr "已使用"
-#: ../win32/gui/WndMain.c:962
+#: ../win32/gui/WndMain.c:964
msgid "Memcard Manager"
msgstr "記憶卡管理器"
-#: ../win32/gui/WndMain.c:966
-#: ../win32/gui/WndMain.c:969
+#: ../win32/gui/WndMain.c:968
+#: ../win32/gui/WndMain.c:971
msgid "Select Mcd"
msgstr "選擇"
-#: ../win32/gui/WndMain.c:967
-#: ../win32/gui/WndMain.c:970
+#: ../win32/gui/WndMain.c:969
+#: ../win32/gui/WndMain.c:972
msgid "Format Mcd"
msgstr "格式化"
-#: ../win32/gui/WndMain.c:968
-#: ../win32/gui/WndMain.c:971
+#: ../win32/gui/WndMain.c:970
+#: ../win32/gui/WndMain.c:973
msgid "Reload Mcd"
msgstr "重新加載"
-#: ../win32/gui/WndMain.c:972
+#: ../win32/gui/WndMain.c:974
msgid "-> Copy ->"
msgstr "-> 複制 ->"
-#: ../win32/gui/WndMain.c:973
+#: ../win32/gui/WndMain.c:975
msgid "<- Copy <-"
msgstr "<- 複制 <-"
-#: ../win32/gui/WndMain.c:974
+#: ../win32/gui/WndMain.c:976
msgid "Paste"
msgstr "粘貼"
-#: ../win32/gui/WndMain.c:975
+#: ../win32/gui/WndMain.c:977
msgid "<- Un/Delete"
msgstr "<- 刪除/恢複"
-#: ../win32/gui/WndMain.c:976
+#: ../win32/gui/WndMain.c:978
msgid "Un/Delete ->"
msgstr "刪除/恢複 ->"
-#: ../win32/gui/WndMain.c:978
+#: ../win32/gui/WndMain.c:980
msgid "Memory Card 1"
msgstr "記憶卡 1"
-#: ../win32/gui/WndMain.c:979
+#: ../win32/gui/WndMain.c:981
msgid "Memory Card 2"
msgstr "記憶卡 2"
-#: ../win32/gui/WndMain.c:1034
+#: ../win32/gui/WndMain.c:1036
msgid "Are you sure you want to paste this selection?"
msgstr "是否確認粘貼此選中內容?"
-#: ../win32/gui/WndMain.c:1034
-#: ../win32/gui/WndMain.c:1145
-#: ../win32/gui/WndMain.c:1152
+#: ../win32/gui/WndMain.c:1036
+#: ../win32/gui/WndMain.c:1147
+#: ../win32/gui/WndMain.c:1154
msgid "Confirmation"
msgstr "確認"
-#: ../win32/gui/WndMain.c:1145
-#: ../win32/gui/WndMain.c:1152
+#: ../win32/gui/WndMain.c:1147
+#: ../win32/gui/WndMain.c:1154
msgid "Are you sure you want to format this Memory Card?"
msgstr "是否確認格式化此記憶卡?"
-#: ../win32/gui/WndMain.c:1198
+#: ../win32/gui/WndMain.c:1200
msgid "Cpu Config"
msgstr "CPU 設定"
-#: ../win32/gui/WndMain.c:1203
+#: ../win32/gui/WndMain.c:1205
msgid "Disable Xa Decoding"
msgstr "禁用 XA 解碼"
-#: ../win32/gui/WndMain.c:1204
+#: ../win32/gui/WndMain.c:1206
msgid "Sio Irq Always Enabled"
msgstr "SIO IRQ 總是開啟"
-#: ../win32/gui/WndMain.c:1205
+#: ../win32/gui/WndMain.c:1207
msgid "Black && White Movies"
msgstr "黑白電影"
-#: ../win32/gui/WndMain.c:1206
+#: ../win32/gui/WndMain.c:1208
msgid "Disable Cd audio"
msgstr "禁用 CD 音頻"
-#: ../win32/gui/WndMain.c:1207
-#: ../data/pcsx.glade2:1603
+#: ../win32/gui/WndMain.c:1209
+#: ../data/pcsx.glade2:1586
msgid "Autodetect"
msgstr "自動檢測"
-#: ../win32/gui/WndMain.c:1208
+#: ../win32/gui/WndMain.c:1210
msgid "Enable Interpreter Cpu"
msgstr "開啟解釋執行 CPU"
-#: ../win32/gui/WndMain.c:1209
-#: ../data/pcsx.glade2:1459
+#: ../win32/gui/WndMain.c:1211
+#: ../data/pcsx.glade2:1442
msgid "Enable Console Output"
msgstr "開啟控制台輸出"
-#: ../win32/gui/WndMain.c:1210
-#: ../data/pcsx.glade2:1409
+#: ../win32/gui/WndMain.c:1212
+#: ../data/pcsx.glade2:1392
msgid "Enable Debugger"
msgstr "開啟調試器"
-#: ../win32/gui/WndMain.c:1211
+#: ../win32/gui/WndMain.c:1213
msgid "Spu Irq Always Enabled"
msgstr "SPU IRQ 總是開啟"
-#: ../win32/gui/WndMain.c:1212
-#: ../data/pcsx.glade2:1546
+#: ../win32/gui/WndMain.c:1214
+#: ../data/pcsx.glade2:1529
msgid "Parasite Eve 2, Vandal Hearts 1/2 Fix"
msgstr "Parasite Eve 2, Vandal Hearts 1/2 修正"
-#: ../win32/gui/WndMain.c:1213
-#: ../data/pcsx.glade2:1561
+#: ../win32/gui/WndMain.c:1215
+#: ../data/pcsx.glade2:1544
msgid "InuYasha Sengoku Battle Fix"
msgstr "InuYasha Sengoku 戰斗修正"
-#: ../win32/gui/WndMain.c:1215
+#: ../win32/gui/WndMain.c:1217
#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2:277
#: ../plugins/dfinput/dfinput.glade2:448
msgid "Options"
msgstr "選項"
-#: ../win32/gui/WndMain.c:1216
+#: ../win32/gui/WndMain.c:1218
msgid "Psx System Type"
msgstr "Psx 系統類型"
-#: ../win32/gui/WndMain.c:1321
+#: ../win32/gui/WndMain.c:1323
msgid "Psx Mcd Format (*.mcr;*.mc;*.mem;*.vgs;*.mcd;*.gme;*.ddf)"
msgstr "Psx 記憶卡格式 (*.mcr;*.mc;*.mem;*.vgs;*.mcd;*.gme;*.ddf)"
-#: ../win32/gui/WndMain.c:1326
+#: ../win32/gui/WndMain.c:1328
msgid "Psx Memory Card (*.mcr;*.mc)"
msgstr "Psx 記憶卡 (*.mcr;*.mc)"
-#: ../win32/gui/WndMain.c:1331
+#: ../win32/gui/WndMain.c:1333
msgid "CVGS Memory Card (*.mem;*.vgs)"
msgstr "VGS 記憶卡 (*.mem;*.vgs)"
-#: ../win32/gui/WndMain.c:1336
+#: ../win32/gui/WndMain.c:1338
msgid "Bleem Memory Card (*.mcd)"
msgstr "Bleem 記憶卡 (*.mcd)"
-#: ../win32/gui/WndMain.c:1341
+#: ../win32/gui/WndMain.c:1343
msgid "DexDrive Memory Card (*.gme)"
msgstr "DexDrive 記憶卡 (*.gme)"
-#: ../win32/gui/WndMain.c:1346
+#: ../win32/gui/WndMain.c:1348
msgid "DataDeck Memory Card (*.ddf)"
msgstr "DataDeck 記憶卡 (*.ddl)"
-#: ../win32/gui/WndMain.c:1351
-#: ../win32/gui/WndMain.c:1432
+#: ../win32/gui/WndMain.c:1353
+#: ../win32/gui/WndMain.c:1434
#: ../gui/Cheat.c:322
#: ../gui/Gtk2Gui.c:416
#: ../gui/Gtk2Gui.c:555
msgid "All Files"
msgstr "所有檔案"
-#: ../win32/gui/WndMain.c:1390
+#: ../win32/gui/WndMain.c:1392
msgid "Psx Exe Format"
msgstr "PSX EXE 格式"
-#: ../win32/gui/WndMain.c:1427
+#: ../win32/gui/WndMain.c:1429
msgid "Psx Isos (*.iso;*.mdf;*.img;*.bin)"
msgstr "Psx 鏡像檔 (*.iso;*.mdf;*.img;*.bin)"
-#: ../win32/gui/WndMain.c:1503
+#: ../win32/gui/WndMain.c:1505
msgid "&File"
msgstr "檔案(&F)"
-#: ../win32/gui/WndMain.c:1504
+#: ../win32/gui/WndMain.c:1506
msgid "E&xit"
msgstr "離開(&X)"
-#: ../win32/gui/WndMain.c:1506
+#: ../win32/gui/WndMain.c:1508
msgid "Run &EXE..."
msgstr "執行 EXE(&E)..."
-#: ../win32/gui/WndMain.c:1507
+#: ../win32/gui/WndMain.c:1509
msgid "Run &BIOS"
msgstr "執行 BIOS(&B)"
-#: ../win32/gui/WndMain.c:1508
+#: ../win32/gui/WndMain.c:1510
msgid "Run &ISO..."
msgstr "執行 ISO(&I)..."
-#: ../win32/gui/WndMain.c:1509
+#: ../win32/gui/WndMain.c:1511
msgid "Run &CD"
msgstr "執行光碟(&C)"
-#: ../win32/gui/WndMain.c:1511
+#: ../win32/gui/WndMain.c:1513
msgid "&Emulator"
msgstr "模擬器(&E)"
-#: ../win32/gui/WndMain.c:1512
+#: ../win32/gui/WndMain.c:1514
msgid "&States"
msgstr "記錄(&S)"
-#: ../win32/gui/WndMain.c:1514
+#: ../win32/gui/WndMain.c:1516
msgid "S&witch ISO..."
msgstr "更換 ISO(&W)..."
-#: ../win32/gui/WndMain.c:1516
+#: ../win32/gui/WndMain.c:1518
msgid "Re&set"
msgstr "複位(&S)"
-#: ../win32/gui/WndMain.c:1517
+#: ../win32/gui/WndMain.c:1519
msgid "&Run"
msgstr "執行(&R)"
-#: ../win32/gui/WndMain.c:1518
+#: ../win32/gui/WndMain.c:1520
msgid "&Save"
msgstr "存儲(&S)"
-#: ../win32/gui/WndMain.c:1519
+#: ../win32/gui/WndMain.c:1521
msgid "&Load"
msgstr "讀取(&L)"
-#: ../win32/gui/WndMain.c:1520
-#: ../win32/gui/WndMain.c:1526
+#: ../win32/gui/WndMain.c:1522
+#: ../win32/gui/WndMain.c:1528
msgid "&Other..."
msgstr "其它(&O)..."
-#: ../win32/gui/WndMain.c:1521
-#: ../win32/gui/WndMain.c:1527
+#: ../win32/gui/WndMain.c:1523
+#: ../win32/gui/WndMain.c:1529
msgid "Slot &5"
msgstr "記錄 5(&5)"
-#: ../win32/gui/WndMain.c:1522
-#: ../win32/gui/WndMain.c:1528
+#: ../win32/gui/WndMain.c:1524
+#: ../win32/gui/WndMain.c:1530
msgid "Slot &4"
msgstr "記錄 4(&4)"
-#: ../win32/gui/WndMain.c:1523
-#: ../win32/gui/WndMain.c:1529
+#: ../win32/gui/WndMain.c:1525
+#: ../win32/gui/WndMain.c:1531
msgid "Slot &3"
msgstr "記錄 3(&3)"
-#: ../win32/gui/WndMain.c:1524
-#: ../win32/gui/WndMain.c:1530
+#: ../win32/gui/WndMain.c:1526
+#: ../win32/gui/WndMain.c:1532
msgid "Slot &2"
msgstr "記錄 2(&2)"
-#: ../win32/gui/WndMain.c:1525
-#: ../win32/gui/WndMain.c:1531
+#: ../win32/gui/WndMain.c:1527
+#: ../win32/gui/WndMain.c:1533
msgid "Slot &1"
msgstr "記錄 1(&1)"
-#: ../win32/gui/WndMain.c:1533
+#: ../win32/gui/WndMain.c:1535
msgid "&Configuration"
msgstr "設定(&C)"
-#: ../win32/gui/WndMain.c:1534
+#: ../win32/gui/WndMain.c:1536
msgid "Cheat &Search..."
msgstr "搜尋金手指碼(&S)..."
-#: ../win32/gui/WndMain.c:1535
+#: ../win32/gui/WndMain.c:1537
msgid "Ch&eat Code..."
msgstr "金手指碼(&E)..."
-#: ../win32/gui/WndMain.c:1538
+#: ../win32/gui/WndMain.c:1540
msgid "&Language"
msgstr "語言(&L)"
-#: ../win32/gui/WndMain.c:1563
+#: ../win32/gui/WndMain.c:1565
msgid "&Memory cards..."
msgstr "記憶卡(&M)..."
-#: ../win32/gui/WndMain.c:1564
+#: ../win32/gui/WndMain.c:1566
msgid "C&PU..."
msgstr "CPU(&P)..."
-#: ../win32/gui/WndMain.c:1566
+#: ../win32/gui/WndMain.c:1568
msgid "&NetPlay..."
msgstr "聯網遊戲(&N)..."
-#: ../win32/gui/WndMain.c:1568
+#: ../win32/gui/WndMain.c:1570
msgid "&Controllers..."
msgstr "控制器(&C)..."
-#: ../win32/gui/WndMain.c:1569
+#: ../win32/gui/WndMain.c:1571
msgid "CD-&ROM..."
msgstr "CD-ROM(&R)..."
-#: ../win32/gui/WndMain.c:1570
+#: ../win32/gui/WndMain.c:1572
msgid "&Sound..."
msgstr "聲音(&S)..."
-#: ../win32/gui/WndMain.c:1571
+#: ../win32/gui/WndMain.c:1573
msgid "&Graphics..."
msgstr "圖像(&G)..."
-#: ../win32/gui/WndMain.c:1573
+#: ../win32/gui/WndMain.c:1575
msgid "&Plugins && Bios..."
msgstr "外掛及 BIOS(&P)..."
-#: ../win32/gui/WndMain.c:1575
+#: ../win32/gui/WndMain.c:1577
msgid "&Help"
msgstr "說明(&H)"
-#: ../win32/gui/WndMain.c:1576
+#: ../win32/gui/WndMain.c:1578
msgid "&About..."
msgstr "關於(&A)..."
-#: ../win32/gui/WndMain.c:1762
+#: ../win32/gui/WndMain.c:1764
msgid "Pcsx Msg"
msgstr "Pcsx 消息"
-#: ../win32/gui/WndMain.c:1765
+#: ../win32/gui/WndMain.c:1767
msgid "Error Loading Symbol"
msgstr "無法加載符號"
@@ -1091,7 +1091,7 @@ msgstr "所有檔案 (*.*)"
#: ../gui/Cheat.c:395
#: ../gui/Cheat.c:1125
#: ../gui/ConfDlg.c:104
-#: ../gui/ConfDlg.c:203
+#: ../gui/ConfDlg.c:200
msgid "Error: Glade interface could not be loaded!"
msgstr "錯誤:無法加載 Glade 界面!"
@@ -1124,30 +1124,30 @@ msgstr "搜尋結果"
msgid "Configure PCSX"
msgstr "設定 PCSX"
-#: ../gui/ConfDlg.c:240
-#: ../gui/ConfDlg.c:261
-#: ../gui/ConfDlg.c:282
-#: ../gui/ConfDlg.c:303
-#: ../gui/ConfDlg.c:358
+#: ../gui/ConfDlg.c:237
+#: ../gui/ConfDlg.c:258
+#: ../gui/ConfDlg.c:279
+#: ../gui/ConfDlg.c:300
+#: ../gui/ConfDlg.c:355
msgid "No configuration required"
msgstr "不需要設定"
-#: ../gui/ConfDlg.c:240
-#: ../gui/ConfDlg.c:261
-#: ../gui/ConfDlg.c:282
-#: ../gui/ConfDlg.c:303
-#: ../gui/ConfDlg.c:358
+#: ../gui/ConfDlg.c:237
+#: ../gui/ConfDlg.c:258
+#: ../gui/ConfDlg.c:279
+#: ../gui/ConfDlg.c:300
+#: ../gui/ConfDlg.c:355
msgid "This plugin doesn't need to be configured."
msgstr "此外掛不需要被設定。"
-#: ../gui/ConfDlg.c:586
+#: ../gui/ConfDlg.c:581
#, c-format
msgid "Could not open BIOS directory: '%s'\n"
msgstr "無法開啟 BIOS 目錄: \"%s\"\n"
-#: ../gui/ConfDlg.c:616
-#: ../gui/ConfDlg.c:709
-#: ../gui/LnxMain.c:167
+#: ../gui/ConfDlg.c:611
+#: ../gui/ConfDlg.c:704
+#: ../gui/LnxMain.c:168
#, c-format
msgid "Could not open directory: '%s'\n"
msgstr "無法開啟目錄: \"%s\"\n"
@@ -1236,7 +1236,7 @@ msgstr "警告"
msgid "Creating memory card: %s\n"
msgstr "創建記憶卡: %s\n"
-#: ../gui/LnxMain.c:320
+#: ../gui/LnxMain.c:321
msgid ""
" pcsx [options] [file]\n"
"\toptions:\n"
@@ -1260,21 +1260,21 @@ msgstr ""
"\t-h -help\t顯示此說明\n"
"\t檔案\t\t加載檔案\n"
-#: ../gui/LnxMain.c:357
+#: ../gui/LnxMain.c:358
#, c-format
msgid "PCSX cannot be configured without using the GUI -- you should restart without -nogui.\n"
msgstr "PCSX 不能在字符界面下設定 -- 請不使用 -nogui 參數重新啟動程式\n"
-#: ../gui/LnxMain.c:409
+#: ../gui/LnxMain.c:414
msgid "Failed loading plugins!"
msgstr "外掛加載失敗"
-#: ../gui/LnxMain.c:426
+#: ../gui/LnxMain.c:431
#, c-format
msgid "Could not load CD-ROM!\n"
msgstr "無法加載光碟。\n"
-#: ../gui/LnxMain.c:465
+#: ../gui/LnxMain.c:467
#, c-format
msgid "PSX emulator couldn't be initialized.\n"
msgstr "PSX 模擬器無法初期化。\n"
@@ -1328,7 +1328,7 @@ msgid "Memory Card Manager"
msgstr "記憶卡管理器"
#: ../gui/Plugin.c:204
-#: ../data/pcsx.glade2:1495
+#: ../data/pcsx.glade2:1478
#, c-format
msgid "SIO IRQ Always Enabled"
msgstr "SIO IRQ 總是開啟"
@@ -1398,7 +1398,7 @@ msgstr "無法關閉 \"控制器 2\" 外掛!"
msgid "Error closing GPU plugin!"
msgstr "無法關閉 GPU 外掛!"
-#: ../libpcsxcore/cdriso.c:644
+#: ../libpcsxcore/cdriso.c:637
#, c-format
msgid "Loaded CD Image: %s"
msgstr "已加載 CD 映像: %s"
@@ -1434,21 +1434,21 @@ msgstr "調試器已啟動。\n"
msgid "Debugger stopped.\n"
msgstr "調試器已停止。\n"
-#: ../libpcsxcore/misc.c:389
+#: ../libpcsxcore/misc.c:395
#, c-format
msgid "Error opening file: %s.\n"
msgstr "開啟檔案錯誤: %s.\n"
-#: ../libpcsxcore/misc.c:429
+#: ../libpcsxcore/misc.c:435
#, c-format
msgid "Unknown CPE opcode %02x at position %08x.\n"
msgstr "未知 CPE opcode %02x 位於 %08x.\n"
-#: ../libpcsxcore/misc.c:436
+#: ../libpcsxcore/misc.c:442
msgid "COFF files not supported.\n"
msgstr "COFF 檔案不被支援.\n"
-#: ../libpcsxcore/misc.c:440
+#: ../libpcsxcore/misc.c:446
msgid "This file does not appear to be a valid PSX file.\n"
msgstr "此檔案不是一個合法的 PSX 檔案。\n"
@@ -1521,6 +1521,21 @@ msgstr "聯網遊戲外掛初始化錯誤: %d"
msgid "Plugins loaded.\n"
msgstr "外掛已加載。\n"
+#: ../libpcsxcore/ppf.c:206
+#, c-format
+msgid "Invalid PPF patch: %s.\n"
+msgstr "無效 PPF 補丁: %s。\n"
+
+#: ../libpcsxcore/ppf.c:282
+#, c-format
+msgid "Unsupported PPF version (%d).\n"
+msgstr "不支援的 PPF 補丁版本 (%d)。\n"
+
+#: ../libpcsxcore/ppf.c:321
+#, c-format
+msgid "Loaded PPF %d.0 patch: %s.\n"
+msgstr "已加載 PPF %d.0 補丁: %s。\n"
+
#: ../libpcsxcore/psxmem.c:69
msgid "Error allocating memory!"
msgstr "分配內存錯誤!"
@@ -1963,7 +1978,7 @@ msgid "Switch ISO..."
msgstr "更換 ISO..."
#: ../data/pcsx.glade2:669
-#: ../data/pcsx.glade2:1853
+#: ../data/pcsx.glade2:1803
msgid "Configure Memory Cards"
msgstr "記憶卡設定"
@@ -2040,35 +2055,35 @@ msgstr "<b>外掛</b>"
msgid "<b>BIOS</b>"
msgstr "<b>BIOS</b>"
-#: ../data/pcsx.glade2:1380
+#: ../data/pcsx.glade2:1363
msgid "Configure CPU"
msgstr "CPU 設定"
-#: ../data/pcsx.glade2:1427
+#: ../data/pcsx.glade2:1410
msgid "SPU IRQ Always Enabled"
msgstr "SPU IRQ 總是開啟"
-#: ../data/pcsx.glade2:1443
+#: ../data/pcsx.glade2:1426
msgid "Black & White Movies"
msgstr "黑白電影"
-#: ../data/pcsx.glade2:1477
+#: ../data/pcsx.glade2:1460
msgid "Enable Interpreter CPU"
msgstr "開啟解釋執行 CPU"
-#: ../data/pcsx.glade2:1511
+#: ../data/pcsx.glade2:1494
msgid "Disable CD Audio"
msgstr "禁用 CD 音頻"
-#: ../data/pcsx.glade2:1527
+#: ../data/pcsx.glade2:1510
msgid "Disable XA Decoding"
msgstr "禁用 XA 解碼"
-#: ../data/pcsx.glade2:1579
+#: ../data/pcsx.glade2:1562
msgid "<b>Options</b>"
msgstr "<b>選項</b>"
-#: ../data/pcsx.glade2:1620
+#: ../data/pcsx.glade2:1603
msgid ""
"NTSC\n"
"PAL"
@@ -2076,48 +2091,48 @@ msgstr ""
"NTSC\n"
"PAL"
-#: ../data/pcsx.glade2:1634
+#: ../data/pcsx.glade2:1617
msgid "<b>System Type</b>"
msgstr "<b>系統類型</b>"
-#: ../data/pcsx.glade2:1698
+#: ../data/pcsx.glade2:1665
msgid "Configure NetPlay"
msgstr "聯網遊戲設定"
-#: ../data/pcsx.glade2:1786
+#: ../data/pcsx.glade2:1753
msgid "<b>NetPlay</b>"
msgstr "<b>聯網遊戲</b>"
-#: ../data/pcsx.glade2:1932
-#: ../data/pcsx.glade2:2330
+#: ../data/pcsx.glade2:1882
+#: ../data/pcsx.glade2:2280
msgid "New"
msgstr "新增"
-#: ../data/pcsx.glade2:1982
-#: ../data/pcsx.glade2:2380
+#: ../data/pcsx.glade2:1932
+#: ../data/pcsx.glade2:2330
msgid "Format"
msgstr "格式化"
-#: ../data/pcsx.glade2:2032
-#: ../data/pcsx.glade2:2430
+#: ../data/pcsx.glade2:1982
+#: ../data/pcsx.glade2:2380
msgid "Un/Delete"
msgstr "刪除/恢複"
-#: ../data/pcsx.glade2:2125
+#: ../data/pcsx.glade2:2075
msgid "<b>Memory Card 1</b>"
msgstr "<b>記憶卡 1</b>"
+#: ../data/pcsx.glade2:2136
#: ../data/pcsx.glade2:2186
-#: ../data/pcsx.glade2:2236
-#: ../data/pcsx.glade2:3115
+#: ../data/pcsx.glade2:3065
msgid "Copy"
msgstr "複制"
-#: ../data/pcsx.glade2:2523
+#: ../data/pcsx.glade2:2473
msgid "<b>Memory Card 2</b>"
msgstr "<b>記憶卡 2</b>"
-#: ../data/pcsx.glade2:2586
+#: ../data/pcsx.glade2:2536
msgid ""
"(C) 1999-2003 PCSX Team\n"
"(C) 2005-2006 Ryan Schultz\n"
@@ -2129,11 +2144,11 @@ msgstr ""
"(C) 2005-2006 Andrew Burton\n"
"(C) 2008-2009 Wei Mingzhi"
-#: ../data/pcsx.glade2:2590
+#: ../data/pcsx.glade2:2540
msgid "A PlayStation emulator."
msgstr "一個 PlayStation 模擬器。"
-#: ../data/pcsx.glade2:2593
+#: ../data/pcsx.glade2:2543
msgid ""
"This program is free software; you can redistribute it\n"
"and/or modify it under the terms of the GNU General\n"
@@ -2167,15 +2182,15 @@ msgstr ""
"Public License along with this program; if not, write to\n"
"the Free Software Foundation, Inc."
-#: ../data/pcsx.glade2:2622
+#: ../data/pcsx.glade2:2572
msgid "translator-credits"
msgstr "Wei Mingzhi <whistler@openoffice.org>"
-#: ../data/pcsx.glade2:2684
+#: ../data/pcsx.glade2:2634
msgid "<b>Cheat Codes</b>"
msgstr "<b>金手指碼</b>"
-#: ../data/pcsx.glade2:2850
+#: ../data/pcsx.glade2:2800
msgid ""
"8-bit\n"
"16-bit\n"
@@ -2185,7 +2200,7 @@ msgstr ""
"16 位元\n"
"32 位元"
-#: ../data/pcsx.glade2:2913
+#: ../data/pcsx.glade2:2863
msgid ""
"Equal Value\n"
"Not Equal Value\n"
@@ -2207,7 +2222,7 @@ msgstr ""
"不同\n"
"無變動"
-#: ../data/pcsx.glade2:2945
+#: ../data/pcsx.glade2:2895
msgid ""
"Decimal\n"
"Hexadecimal"
@@ -2215,19 +2230,19 @@ msgstr ""
"十進制\n"
"十六進制"
-#: ../data/pcsx.glade2:3148
+#: ../data/pcsx.glade2:3098
msgid "label_resultsfound"
msgstr "label_resultsfound"
-#: ../data/pcsx.glade2:3183
+#: ../data/pcsx.glade2:3133
msgid "Search"
msgstr "搜尋"
-#: ../data/pcsx.glade2:3219
+#: ../data/pcsx.glade2:3169
msgid "Restart"
msgstr "重新開始"
-#: ../data/pcsx.glade2:3248
+#: ../data/pcsx.glade2:3198
msgid "<b>Cheat Search</b>"
msgstr "<b>金手指碼搜尋</b>"
@@ -2349,7 +2364,7 @@ msgstr "CD-ROM 裝置讀取外掛"
msgid "CDR NULL Plugin"
msgstr "CDR NULL 外掛"
-#: ../plugins/dfcdrom/cdrcfg-0.1df/main.c:175
+#: ../plugins/dfcdrom/cdrcfg-0.1df/main.c:170
#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2:8
msgid "CDR configuration"
msgstr "CDR 設定"
@@ -2957,21 +2972,21 @@ msgstr "鍵盤:"
msgid "(Not Set)"
msgstr "(未設定)"
-#: ../plugins/dfinput/cfg-gtk2.c:546
+#: ../plugins/dfinput/cfg-gtk2.c:539
msgid "None"
msgstr "無"
-#: ../plugins/dfinput/cfg-gtk2.c:588
+#: ../plugins/dfinput/cfg-gtk2.c:581
msgid "Gamepad/Keyboard Input Configuration"
msgstr "手把/鍵盤輸入設定"
-#: ../plugins/dfinput/cfg-gtk2.c:594
-#: ../plugins/dfinput/cfg-gtk2.c:614
+#: ../plugins/dfinput/cfg-gtk2.c:587
+#: ../plugins/dfinput/cfg-gtk2.c:607
msgid "Key"
msgstr "按鍵"
-#: ../plugins/dfinput/cfg-gtk2.c:600
-#: ../plugins/dfinput/cfg-gtk2.c:620
+#: ../plugins/dfinput/cfg-gtk2.c:593
+#: ../plugins/dfinput/cfg-gtk2.c:613
msgid "Button"
msgstr "按鈕"
diff --git a/win32/gui/WndMain.c b/win32/gui/WndMain.c
index d164b635..9856c534 100644
--- a/win32/gui/WndMain.c
+++ b/win32/gui/WndMain.c
@@ -169,7 +169,9 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
if (LoadConfig() == -1) {
return 0;
}
- }
+ }
+
+ strcpy(Config.PatchesDir, "Patches\\");
#ifdef ENABLE_NLS
if (Config.Lang[0] == 0) {