summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSND\edgbla_cp <SND\edgbla_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2011-06-08 09:27:25 +0000
committerSND\edgbla_cp <SND\edgbla_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2011-06-08 09:27:25 +0000
commit5f868fa161d5827e45a060a0b17b44a997625315 (patch)
tree1694ae3dfcb0189abdf098edbf6dae0bf2a18e4d
parentc7eb23ccf1813fb4ca47c309c40baff308151237 (diff)
downloadpcsxr-5f868fa161d5827e45a060a0b17b44a997625315.tar.gz
Rebranding.
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@67621 e17a0e51-4ae3-4d35-97c3-1a29b211df97
-rw-r--r--Makefile.am2
-rw-r--r--configure.ac4
-rw-r--r--data/Makefile.am8
-rw-r--r--data/pcsxr.desktop (renamed from data/pcsx.desktop)6
-rw-r--r--data/pcsxr.glade2 (renamed from data/pcsx.glade2)12
-rw-r--r--debian-upstream/pcsxr.menu4
-rw-r--r--doc/Makefile.am5
-rw-r--r--doc/pcsxr.1 (renamed from doc/pcsx.1)14
-rw-r--r--doc/tweaks.txt2
-rw-r--r--gui/Cheat.c8
-rw-r--r--gui/ConfDlg.c10
-rw-r--r--gui/Config.c4
-rw-r--r--gui/DebugMemory.c2
-rw-r--r--gui/Gtk2Gui.c12
-rw-r--r--gui/Linux.h20
-rw-r--r--gui/LnxMain.c30
-rw-r--r--gui/Makefile.am18
-rw-r--r--gui/MemcardDlg.c6
-rw-r--r--gui/Plugin.c6
-rw-r--r--libpcsxcore/Makefile.am3
-rw-r--r--libpcsxcore/debug.c8
-rw-r--r--libpcsxcore/misc.c8
-rw-r--r--libpcsxcore/r3000a.c380
-rw-r--r--libpcsxcore/socket.c2
-rw-r--r--macosx/ConfigurationController.m12
-rw-r--r--macosx/EmuThread.h2
-rw-r--r--macosx/EmuThread.m794
-rw-r--r--macosx/English.lproj/AddPluginSheet.nib/classes.nib2
-rw-r--r--macosx/English.lproj/InfoPlist.strings4
-rw-r--r--macosx/English.lproj/PCSX.nib/classes.nib25
-rw-r--r--macosx/English.lproj/PCSX.nib/info.nib21
-rw-r--r--macosx/English.lproj/PCSX.nib/objects.nibbin3850 -> 0 bytes
-rw-r--r--macosx/Info.plist20
-rw-r--r--macosx/Pcsx.xcodeproj/project.pbxproj976
-rw-r--r--macosx/PcsxrController.h (renamed from macosx/PcsxController.h)4
-rw-r--r--macosx/PcsxrController.m (renamed from macosx/PcsxController.m)38
-rw-r--r--macosx/PcsxrPlugin.h (renamed from macosx/PcsxPlugin.h)6
-rw-r--r--macosx/PcsxrPlugin.m (renamed from macosx/PcsxPlugin.m)24
-rw-r--r--macosx/PcsxrPluginDocument.h (renamed from macosx/PcsxPluginDocument.h)6
-rw-r--r--macosx/PcsxrPluginDocument.m (renamed from macosx/PcsxPluginDocument.m)10
-rw-r--r--macosx/Plugin.c4
-rw-r--r--macosx/PluginController.m12
-rw-r--r--macosx/PluginList.h16
-rw-r--r--macosx/PluginList.m26
-rwxr-xr-x[-rw-r--r--]macosx/icons/PCSXR.icns (renamed from macosx/icons/PCSX.icns)bin50301 -> 50301 bytes
-rwxr-xr-x[-rw-r--r--]macosx/icons/pcsxrfreeze.icns (renamed from macosx/icons/pcsxfreeze.icns)bin49422 -> 49422 bytes
-rwxr-xr-x[-rw-r--r--]macosx/icons/pcsxrmemcard.icns (renamed from macosx/icons/pcsxmemcard.icns)bin49442 -> 49442 bytes
-rw-r--r--macosx/plugins/DFCdrom/Info.plist2
-rw-r--r--macosx/plugins/DFCdrom/macsrc/PluginConfigController.m2
-rw-r--r--macosx/plugins/DFInput/DFInput.xcodeproj/project.pbxproj12
-rw-r--r--macosx/plugins/DFInput/English.lproj/NetPcsxHIDInputPluginMain.nib/classes.nib33
-rw-r--r--macosx/plugins/DFInput/English.lproj/NetPcsxHIDInputPluginMain.nib/info.nib21
-rw-r--r--macosx/plugins/DFInput/English.lproj/NetPcsxHIDInputPluginMain.nib/keyedobjects.nibbin12060 -> 0 bytes
-rw-r--r--macosx/plugins/DFInput/macsrc/ControllerList.h2
-rw-r--r--macosx/plugins/DFInput/macsrc/MappingCell.h2
-rw-r--r--macosx/plugins/DFInput/macsrc/PadController.h2
-rw-r--r--macosx/plugins/DFInput/macsrc/PadController.m4
-rw-r--r--macosx/plugins/DFInput/macsrc/PadView.h2
-rw-r--r--macosx/plugins/DFInput/macsrc/cfg.c4
-rwxr-xr-xmacosx/plugins/DFSound/English.lproj/InfoPlist.stringsbin526 -> 528 bytes
-rw-r--r--macosx/plugins/PeopsXgl/macsrc/NetSfPeopsOpenGLPluginConfigController.m12
-rw-r--r--macosx/plugins/PeopsXgl/macsrc/PluginWindowController.h4
-rw-r--r--macosx/plugins/PeopsXgl/macsrc/PluginWindowController.m2
-rw-r--r--pixmaps/Makefile.am8
-rwxr-xr-xpixmaps/pcsxr-icon.png (renamed from pixmaps/pcsx-icon.png)bin15923 -> 15923 bytes
-rwxr-xr-xpixmaps/pcsxr.jpg (renamed from pixmaps/pcsx.jpg)bin46736 -> 46736 bytes
-rw-r--r--plugins/bladesio1/Makefile.am2
-rw-r--r--plugins/dfcdrom/Makefile.am6
-rw-r--r--plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui (renamed from plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2)246
-rw-r--r--plugins/dfcdrom/cdrcfg-0.1df/main.c56
-rw-r--r--plugins/dfinput/Makefile.am2
-rw-r--r--plugins/dfinput/pad.c2
-rw-r--r--plugins/dfnet/Makefile.am2
-rw-r--r--plugins/dfsound/Makefile.am8
-rw-r--r--plugins/dfsound/pulseaudio.c4
-rw-r--r--plugins/dfsound/spucfg-0.1df/dfsound.ui (renamed from plugins/dfsound/spucfg-0.1df/dfsound.glade2)233
-rw-r--r--plugins/dfsound/spucfg-0.1df/main.c64
-rw-r--r--plugins/dfxvideo/Makefile.am4
-rw-r--r--plugins/dfxvideo/cfg.c6
-rw-r--r--plugins/dfxvideo/gpu.c8
-rw-r--r--plugins/dfxvideo/gpucfg-0.1df/main.c4
-rw-r--r--plugins/gxvideo/Makefile.am6
-rw-r--r--plugins/gxvideo/cfg.c6
-rw-r--r--plugins/gxvideo/gpu.c4
-rw-r--r--plugins/gxvideo/gpucfg/main.c2
-rw-r--r--plugins/peopsxgl/gpu.c10
-rw-r--r--po/POTFILES.in8
-rw-r--r--po/fr_FR.po1096
-rw-r--r--po/hu_HU.po1106
-rw-r--r--po/it.po1142
-rw-r--r--po/pcsxr.pot (renamed from po/pcsx.pot)908
-rw-r--r--po/pt_BR.po1086
-rw-r--r--po/ru_RU.po1091
-rw-r--r--po/zh_CN.po1359
-rw-r--r--po/zh_TW.po1102
-rw-r--r--win32/gui/AboutDlg.c8
-rw-r--r--win32/gui/CheatDlg.c4
-rw-r--r--win32/gui/Win32.h2
-rw-r--r--win32/gui/WndMain.c38
-rwxr-xr-xwin32/gui/pcsxr.bmp (renamed from win32/gui/pcsx.bmp)bin185190 -> 185190 bytes
-rw-r--r--win32/gui/pcsxr.exe.manifest (renamed from win32/gui/pcsx.exe.manifest)0
-rw-r--r--win32/gui/plugin.c32
-rw-r--r--win32/pcsxr.dev (renamed from win32/pcsx.dev)26
-rw-r--r--win32/pcsxr.dsp (renamed from win32/pcsx.dsp)32
-rw-r--r--win32/pcsxr.dsw (renamed from win32/pcsx.dsw)2
-rw-r--r--win32/pcsxr.rc (renamed from win32/pcsx.rc)14
-rw-r--r--win32/pcsxr.sln (renamed from win32/pcsx.sln)2
-rw-r--r--win32/pcsxr.vcproj (renamed from win32/pcsx.vcproj)32
-rw-r--r--win32/resource.h8
109 files changed, 6082 insertions, 6379 deletions
diff --git a/Makefile.am b/Makefile.am
index 1425f840..3a7bb981 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,4 +6,4 @@ SUBDIRS += plugins/bladesio1 plugins/gxvideo
SUBDIRS += $(PEOPSXGL)
-EXTRA_DIST = AUTHORS COPYING INSTALL NEWS README ChangeLog ChangeLog.df
+EXTRA_DIST = AUTHORS COPYING INSTALL NEWS README ChangeLog ChangeLog.df strip_fPIC.sh
diff --git a/configure.ac b/configure.ac
index 2b21da01..a1ebc6fb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([pcsx], [1.9])
+AC_INIT([pcsxr], [1.9.93])
AC_CANONICAL_HOST
AC_CANONICAL_BUILD
@@ -19,7 +19,7 @@ LT_INIT([disable-static])
AM_GLIB_GNU_GETTEXT
IT_PROG_INTLTOOL([0.35.0])
-GETTEXT_PACKAGE=pcsx
+GETTEXT_PACKAGE=pcsxr
AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["${GETTEXT_PACKAGE}"], [gettext domain])
diff --git a/data/Makefile.am b/data/Makefile.am
index 99303203..e2b3ef55 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,7 +1,7 @@
-glade_DATA = pcsx.glade2
-gladedir = $(datadir)/pcsx
+glade_DATA = pcsxr.glade2
+gladedir = $(datadir)/pcsxr
desktopdir = $(datadir)/applications
-desktop_DATA = pcsx.desktop
+desktop_DATA = pcsxr.desktop
-EXTRA_DIST = $(glade_DATA) pcsx.desktop
+EXTRA_DIST = $(glade_DATA) pcsxr.desktop
diff --git a/data/pcsx.desktop b/data/pcsxr.desktop
index 4058a2f7..2e6a9a7c 100644
--- a/data/pcsx.desktop
+++ b/data/pcsxr.desktop
@@ -2,7 +2,7 @@
Version=1.0
Encoding=UTF-8
Type=Application
-Name=PCSX
+Name=PCSXR
GenericName=PlayStation Emulator
GenericName[ru_RU]=Эмулятор PlayStation
GenericName[zh_CN]=PlayStation 模拟器
@@ -11,6 +11,6 @@ Comment=Sony PlayStation emulator
Comment[ru_RU]=Эмулятор Sony PlayStation
Comment[zh_CN]=Sony PlayStation 模拟器
Comment[zh_TW]=Sony PlayStation 模擬器
-Exec=pcsx
-Icon=pcsx-icon
+Exec=pcsxr
+Icon=pcsxr-icon
Categories=Game;
diff --git a/data/pcsx.glade2 b/data/pcsxr.glade2
index 9f29d7c3..0769a149 100644
--- a/data/pcsx.glade2
+++ b/data/pcsxr.glade2
@@ -4,10 +4,10 @@
<!-- interface-naming-policy project-wide -->
<widget class="GtkWindow" id="MainWindow">
<property name="visible">True</property>
- <property name="title" translatable="yes">PCSX</property>
+ <property name="title" translatable="yes">PCSXR</property>
<property name="resizable">False</property>
<property name="window_position">center</property>
- <property name="icon_name">pcsx-icon.png</property>
+ <property name="icon_name">pcsxr-icon.png</property>
<signal name="destroy" handler="OnDestroy"/>
<child>
<widget class="GtkVBox" id="vbox18">
@@ -641,8 +641,8 @@
<child>
<widget class="GtkMenu" id="help1_menu">
<child>
- <widget class="GtkImageMenuItem" id="about_pcsx1">
- <property name="label" translatable="yes">_About PCSX...</property>
+ <widget class="GtkImageMenuItem" id="about_pcsxr1">
+ <property name="label" translatable="yes">_About PCSXR...</property>
<property name="visible">True</property>
<property name="use_underline">True</property>
<property name="use_stock">False</property>
@@ -818,7 +818,7 @@
<property name="width_request">354</property>
<property name="height_request">174</property>
<property name="visible">True</property>
- <property name="pixbuf">pcsx.jpg</property>
+ <property name="pixbuf">pcsxr.jpg</property>
</widget>
<packing>
<property name="position">2</property>
@@ -840,7 +840,7 @@
</widget>
<widget class="GtkDialog" id="ConfDlg">
<property name="visible">True</property>
- <property name="title" translatable="yes">Configure PCSX</property>
+ <property name="title" translatable="yes">Configure PCSXR</property>
<property name="resizable">False</property>
<property name="modal">True</property>
<property name="type_hint">dialog</property>
diff --git a/debian-upstream/pcsxr.menu b/debian-upstream/pcsxr.menu
index 7fccc89b..f6ea0f32 100644
--- a/debian-upstream/pcsxr.menu
+++ b/debian-upstream/pcsxr.menu
@@ -1,5 +1,5 @@
?package(pcsxr): \
needs="X11" \
section="Applications/Emulators" \
- title="PCSX PlayStation Emulator" \
- command="/usr/games/pcsx"
+ title="PCSXR PlayStation Emulator" \
+ command="/usr/games/pcsxr"
diff --git a/doc/Makefile.am b/doc/Makefile.am
index f2baf277..6603ffa4 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,3 +1,2 @@
-EXTRA_DIST = keys.txt tweaks.txt
-
-man_MANS = pcsx.1
+man_MANS = pcsxr.1
+EXTRA_DIST = keys.txt tweaks.txt $(man_MANS)
diff --git a/doc/pcsx.1 b/doc/pcsxr.1
index 27d86e08..450e51a9 100644
--- a/doc/pcsx.1
+++ b/doc/pcsxr.1
@@ -1,14 +1,15 @@
.\" Hey, EMACS: -*- nroff -*-
-.TH PCSX 1 "October 01, 2005"
+.TH PCSXR 1 "October 01, 2005"
.SH NAME
-pcsx - Playstation emulator
+pcsxr - Playstation emulator
.SH SYPNOSIS
-.B pcsx
+.B pcsxr
.I [options] [file]
.SH DESCRIPTION
-PCSX is a plugin-based Playstation emulator able to play most PSX games. It provides CPU, BIOS, and basic system emulation and relies on plugins for sound, input, and graphics emulation.
+PCSXR is a plugin-based PlayStation emulator able to play most PSX games. It provides CPU, BIOS, and basic system emulation and relies on plugins for sound, input, and graphics emulation.
.PP
.SH OPTIONS
+.TP
.B -runcd
Runs CD-ROM from drive
.TP
@@ -24,6 +25,9 @@ Specify a different config file
.B -psxout
Enable PSX output
.TP
+.B -slowboot
+Enable BIOS Logo
+.TP
.B -load STATENUM
Loads savestate STATENUM
.TP
@@ -31,5 +35,5 @@ Loads savestate STATENUM
Display help message
.TP
.SH AUTHOR
-pcsx was written by Linuzappz <linuzappz@pcsx.net>. PCSX-df was written by Ryan Schultz <schultz.ryan@gmail.com> and Andrew Burton <adb@iinet.net.au>. PCSX-Reloaded was written by Wei Mingzhi <weimingzhi@gmail.com>.
+PCSX was written by Linuzappz <linuzappz@pcsx.net>. PCSX-df was written by Ryan Schultz <schultz.ryan@gmail.com> and Andrew Burton <adb@iinet.net.au>. PCSX-Reloaded was written by Wei Mingzhi <weimingzhi@gmail.com>.
This manual page was written by Ryan Schultz <schultz.ryan@gmail.com> for the Debian Project.
diff --git a/doc/tweaks.txt b/doc/tweaks.txt
index ad6e1854..dd7c53c4 100644
--- a/doc/tweaks.txt
+++ b/doc/tweaks.txt
@@ -1,4 +1,4 @@
-There are several toggles in PCSX to allow you to modify emulation
+There are several toggles in PCSXR to allow you to modify emulation
behavior; this may allow certain games to work that would not otherwise
function. These can all be found at Configuration -> CPU.
diff --git a/gui/Cheat.c b/gui/Cheat.c
index 3848e9f2..89e2c0fa 100644
--- a/gui/Cheat.c
+++ b/gui/Cheat.c
@@ -313,7 +313,7 @@ static void OnCheatListDlg_OpenClicked(GtkWidget *widget, gpointer user_data) {
filter = gtk_file_filter_new ();
gtk_file_filter_add_pattern (filter, "*.cht");
- gtk_file_filter_set_name (filter, _("PCSX Cheat Code Files (*.cht)"));
+ gtk_file_filter_set_name (filter, _("PCSXR Cheat Code Files (*.cht)"));
gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (chooser), filter);
filter = gtk_file_filter_new ();
@@ -353,7 +353,7 @@ static void OnCheatListDlg_SaveClicked(GtkWidget *widget, gpointer user_data) {
filter = gtk_file_filter_new();
gtk_file_filter_add_pattern(filter, "*.cht");
- gtk_file_filter_set_name(filter, _("PCSX Cheat Code Files (*.cht)"));
+ gtk_file_filter_set_name(filter, _("PCSXR Cheat Code Files (*.cht)"));
gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(chooser), filter);
filter = gtk_file_filter_new();
@@ -389,7 +389,7 @@ void RunCheatListDialog() {
GtkTreeViewColumn *column;
GtkCellRenderer *renderer;
- xml = glade_xml_new(PACKAGE_DATA_DIR "pcsx.glade2", "CheatListDlg", NULL);
+ xml = glade_xml_new(PACKAGE_DATA_DIR "pcsxr.glade2", "CheatListDlg", NULL);
if (!xml) {
g_warning(_("Error: Glade interface could not be loaded!"));
return;
@@ -1119,7 +1119,7 @@ void RunCheatSearchDialog() {
GtkTreeSelection *treesel;
GtkTreeViewColumn *column;
- xml = glade_xml_new(PACKAGE_DATA_DIR "pcsx.glade2", "CheatSearchDlg", NULL);
+ xml = glade_xml_new(PACKAGE_DATA_DIR "pcsxr.glade2", "CheatSearchDlg", NULL);
if (!xml) {
g_warning(_("Error: Glade interface could not be loaded!"));
return;
diff --git a/gui/ConfDlg.c b/gui/ConfDlg.c
index 533159b2..b4265fd2 100644
--- a/gui/ConfDlg.c
+++ b/gui/ConfDlg.c
@@ -98,7 +98,7 @@ void ConfigurePlugins() {
UpdatePluginsBIOS();
- xml = glade_xml_new(PACKAGE_DATA_DIR "pcsx.glade2", "ConfDlg", NULL);
+ xml = glade_xml_new(PACKAGE_DATA_DIR "pcsxr.glade2", "ConfDlg", NULL);
if (!xml) {
g_warning(_("Error: Glade interface could not be loaded!"));
@@ -109,7 +109,7 @@ void ConfigurePlugins() {
ConfDlg = glade_xml_get_widget(xml, "ConfDlg");
- gtk_window_set_title(GTK_WINDOW(ConfDlg), _("Configure PCSX"));
+ gtk_window_set_title(GTK_WINDOW(ConfDlg), _("Configure PCSXR"));
/* Set the paths in the file choosers to be based on the saved configurations */
widget = glade_xml_get_widget(xml, "GtkFileChooser_Bios");
@@ -194,7 +194,7 @@ void OnConf_Net() {
return;
}
- xml = glade_xml_new(PACKAGE_DATA_DIR "pcsx.glade2", "NetDlg", NULL);
+ xml = glade_xml_new(PACKAGE_DATA_DIR "pcsxr.glade2", "NetDlg", NULL);
if (!xml) {
g_warning(_("Error: Glade interface could not be loaded!"));
@@ -671,7 +671,7 @@ void UpdatePluginsBIOS() {
scan_bios_dir(Config.BiosDir);
- // The BIOS list always contains the PCSX internal BIOS
+ // The BIOS list always contains the PCSXR internal BIOS
add_bios_to_list(_("Simulate PSX BIOS"), "HLE");
}
@@ -842,7 +842,7 @@ void OnCpu_Clicked(GtkDialog *dialog, gint arg1, gpointer user_data) {
void OnConf_Cpu() {
GladeXML *xml;
- xml = glade_xml_new(PACKAGE_DATA_DIR "pcsx.glade2", "CpuDlg", NULL);
+ xml = glade_xml_new(PACKAGE_DATA_DIR "pcsxr.glade2", "CpuDlg", NULL);
if (!xml) {
g_warning("We could not load the interface!");
diff --git a/gui/Config.c b/gui/Config.c
index f4b71d81..86038729 100644
--- a/gui/Config.c
+++ b/gui/Config.c
@@ -82,13 +82,13 @@ int LoadConfig(PcsxConfig *Conf) {
// Ryan says: use dotdir, dotdir is GOOD
// No giant homedir names
strncpy(cfgfile, getenv("HOME"), 200);
- strcat(cfgfile, PCSX_DOT_DIR);
+ strcat(cfgfile, PCSXR_DOT_DIR);
// proceed to load the cfg file
// append its name
strcat(cfgfile, cfgfile_basename);
- // file is now ~/.pcsx/pcsx.cfg (or whatever cfgfile_basename is)
+ // file is now ~/.pcsxr/pcsxr.cfg (or whatever cfgfile_basename is)
if (stat(cfgfile, &buf) == -1) {
// the config file doesn't exist!
/* TODO Error checking? */
diff --git a/gui/DebugMemory.c b/gui/DebugMemory.c
index bbce1f17..d9437a9a 100644
--- a/gui/DebugMemory.c
+++ b/gui/DebugMemory.c
@@ -254,7 +254,7 @@ void RunDebugMemoryDialog() {
PangoFontDescription *pfd;
int i;
- xml = glade_xml_new(PACKAGE_DATA_DIR "pcsx.glade2", "MemViewDlg", NULL);
+ xml = glade_xml_new(PACKAGE_DATA_DIR "pcsxr.glade2", "MemViewDlg", NULL);
if (!xml) {
g_warning(_("Error: Glade interface could not be loaded!"));
return;
diff --git a/gui/Gtk2Gui.c b/gui/Gtk2Gui.c
index 2847f216..4c38d3da 100644
--- a/gui/Gtk2Gui.c
+++ b/gui/Gtk2Gui.c
@@ -213,7 +213,7 @@ void StartGui() {
return;
}*/
- xml = glade_xml_new(PACKAGE_DATA_DIR "pcsx.glade2", "MainWindow", NULL);
+ xml = glade_xml_new(PACKAGE_DATA_DIR "pcsxr.glade2", "MainWindow", NULL);
if (!xml) {
g_warning("We could not load the interface!");
@@ -221,9 +221,9 @@ void StartGui() {
}
Window = glade_xml_get_widget(xml, "MainWindow");
- gtk_window_set_title(GTK_WINDOW(Window), "PCSX");
- gtk_window_set_icon_from_file(GTK_WINDOW(Window), PIXMAPDIR "pcsx-icon.png", NULL);
- gtk_window_set_default_icon_from_file(PIXMAPDIR "pcsx-icon.png", NULL);
+ gtk_window_set_title(GTK_WINDOW(Window), "PCSXR");
+ gtk_window_set_icon_from_file(GTK_WINDOW(Window), PIXMAPDIR "pcsxr-icon.png", NULL);
+ gtk_window_set_default_icon_from_file(PIXMAPDIR "pcsxr-icon.png", NULL);
ResetMenuSlots(xml);
// Set up callbacks
@@ -363,7 +363,7 @@ void StartGui() {
G_CALLBACK(RunCheatSearchDialog), NULL, NULL, G_CONNECT_AFTER);
// Help menu
- widget = glade_xml_get_widget(xml, "about_pcsx1");
+ widget = glade_xml_get_widget(xml, "about_pcsxr1");
g_signal_connect_data(GTK_OBJECT(widget), "activate",
G_CALLBACK(OnHelp_About), NULL, NULL, G_CONNECT_AFTER);
@@ -786,7 +786,7 @@ void state_load(gchar *state_filename) {
fclose(fp);
// If the window exists, then we are loading the state from within
- // within the PCSX GUI. We need to initialise the plugins first
+ // within the PCSXR GUI. We need to initialise the plugins first
if (Window) {
destroy_main_window();
diff --git a/gui/Linux.h b/gui/Linux.h
index 29620b45..352a0f72 100644
--- a/gui/Linux.h
+++ b/gui/Linux.h
@@ -26,16 +26,16 @@
#include "Cheat.h"
-#define DEFAULT_MEM_CARD_1 "/.pcsx/memcards/card1.mcd"
-#define DEFAULT_MEM_CARD_2 "/.pcsx/memcards/card2.mcd"
-#define MEMCARD_DIR "/.pcsx/memcards/"
-#define PLUGINS_DIR "/.pcsx/plugins/"
-#define PLUGINS_CFG_DIR "/.pcsx/plugins/cfg/"
-#define PCSX_DOT_DIR "/.pcsx/"
-#define BIOS_DIR "/.pcsx/bios/"
-#define STATES_DIR "/.pcsx/sstates/"
-#define CHEATS_DIR "/.pcsx/cheats/"
-#define PATCHES_DIR "/.pcsx/patches/"
+#define DEFAULT_MEM_CARD_1 "/.pcsxr/memcards/card1.mcd"
+#define DEFAULT_MEM_CARD_2 "/.pcsxr/memcards/card2.mcd"
+#define MEMCARD_DIR "/.pcsxr/memcards/"
+#define PLUGINS_DIR "/.pcsxr/plugins/"
+#define PLUGINS_CFG_DIR "/.pcsxr/plugins/cfg/"
+#define PCSXR_DOT_DIR "/.pcsxr/"
+#define BIOS_DIR "/.pcsxr/bios/"
+#define STATES_DIR "/.pcsxr/sstates/"
+#define CHEATS_DIR "/.pcsxr/cheats/"
+#define PATCHES_DIR "/.pcsxr/patches/"
extern gboolean UseGui;
extern int StatesC;
diff --git a/gui/LnxMain.c b/gui/LnxMain.c
index 8016ea18..4209cbbd 100644
--- a/gui/LnxMain.c
+++ b/gui/LnxMain.c
@@ -78,8 +78,8 @@ static void CreateHomeConfigDir(char *directory) {
}
static void CheckSubDir() {
- // make sure that ~/.pcsx exists
- CreateHomeConfigDir(PCSX_DOT_DIR);
+ // make sure that ~/.pcsxr exists
+ CreateHomeConfigDir(PCSXR_DOT_DIR);
CreateHomeConfigDir(BIOS_DIR);
CreateHomeConfigDir(MEMCARD_DIR);
@@ -109,7 +109,7 @@ static void ScanPlugins(gchar* scandir) {
match(filename, "cfg.*") == 0) {
continue; /* Skip this file */
} else {
- /* Create a symlink from this file to the directory ~/.pcsx/plugin */
+ /* Create a symlink from this file to the directory ~/.pcsxr/plugin */
linkname = g_build_filename (getenv("HOME"), PLUGINS_DIR, ent->d_name, NULL);
symlink(filename, linkname);
@@ -145,7 +145,7 @@ static void ScanBios(gchar* scandir) {
match(filename, ".*\\.BIN$") == 0) {
continue; /* Skip this file */
} else {
- /* Create a symlink from this file to the directory ~/.pcsx/plugin */
+ /* Create a symlink from this file to the directory ~/.pcsxr/plugin */
linkname = g_build_filename(getenv("HOME"), BIOS_DIR, ent->d_name, NULL);
symlink(filename, linkname);
@@ -220,8 +220,8 @@ static void ScanAllPlugins (void) {
ScanBios("/usr/lib32/games/psemu/bios");
ScanBios("/usr/share/psemu");
ScanBios("/usr/share/psemu/bios");
- ScanBios("/usr/share/pcsx");
- ScanBios("/usr/share/pcsx/bios");
+ ScanBios("/usr/share/pcsxr");
+ ScanBios("/usr/share/pcsxr/bios");
ScanBios("/usr/local/lib/games/psemu");
ScanBios("/usr/local/lib/games/psemu/bios");
ScanBios("/usr/local/lib64/games/psemu");
@@ -230,8 +230,8 @@ static void ScanAllPlugins (void) {
ScanBios("/usr/local/lib32/games/psemu/bios");
ScanBios("/usr/local/share/psemu");
ScanBios("/usr/local/share/psemu/bios");
- ScanBios("/usr/local/share/pcsx");
- ScanBios("/usr/local/share/pcsx/bios");
+ ScanBios("/usr/local/share/pcsxr");
+ ScanBios("/usr/local/share/pcsxr/bios");
ScanBios(PACKAGE_DATA_DIR);
ScanBios(PSEMU_DATA_DIR);
ScanBios(PACKAGE_DATA_DIR "/bios");
@@ -245,17 +245,17 @@ static void ScanAllPlugins (void) {
ScanPlugins(currentdir);
g_free(currentdir);
- // Check for bad links in ~/.pcsx/plugins/
+ // Check for bad links in ~/.pcsxr/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 ~/.pcsxr/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 ~/.pcsxr/bios
currentdir = g_build_filename(getenv("HOME"), BIOS_DIR, NULL);
CheckSymlinksInPath(currentdir);
g_free(currentdir);
@@ -288,7 +288,7 @@ int main(int argc, char *argv[]) {
// what is the name of the config file?
// it may be redefined by -cfg on the command line
- strcpy(cfgfile_basename, "pcsx.cfg");
+ strcpy(cfgfile_basename, "pcsxr.cfg");
// read command line options
for (i = 1; i < argc; i++) {
@@ -325,12 +325,12 @@ int main(int argc, char *argv[]) {
!strcmp(argv[i], "--help")) {
printf(PACKAGE_STRING "\n");
printf("%s\n", _(
- " pcsx [options] [file]\n"
+ " pcsxr [options] [file]\n"
"\toptions:\n"
"\t-runcd\t\tRuns CD-ROM\n"
"\t-cdfile FILE\tRuns a CD image file\n"
"\t-nogui\t\tDon't open the GTK GUI\n"
- "\t-cfg FILE\tLoads desired configuration file (default: ~/.pcsx/pcsx.cfg)\n"
+ "\t-cfg FILE\tLoads desired configuration file (default: ~/.pcsxr/pcsxr.cfg)\n"
"\t-psxout\t\tEnable PSX output\n"
"\t-slowboot\tEnable BIOS Logo\n"
"\t-load STATENUM\tLoads savestate STATENUM (1-9)\n"
@@ -362,7 +362,7 @@ int main(int argc, char *argv[]) {
// if the config file doesn't exist
if (LoadConfig() == -1) {
if (!UseGui) {
- printf(_("PCSX cannot be configured without using the GUI -- you should restart without -nogui.\n"));
+ printf(_("PCSXR cannot be configured without using the GUI -- you should restart without -nogui.\n"));
return 1;
}
diff --git a/gui/Makefile.am b/gui/Makefile.am
index db3daa3f..17ef8927 100644
--- a/gui/Makefile.am
+++ b/gui/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -DPACKAGE_DATA_DIR=\"${datadir}/pcsx/\" \
+AM_CPPFLAGS = -DPACKAGE_DATA_DIR=\"${datadir}/pcsxr/\" \
-DPIXMAPDIR=\"${datadir}/pixmaps/\" \
-DLOCALE_DIR=\"${datadir}/locale/\" \
$(GTK2_CFLAGS) $(GLADE2_CFLAGS) \
@@ -6,19 +6,27 @@ AM_CPPFLAGS = -DPACKAGE_DATA_DIR=\"${datadir}/pcsx/\" \
-DPSEMU_DATA_DIR=\"${datadir}/psemu\" \
-DDEF_PLUGIN_DIR=\"${libdir}/games/psemu\"
-bin_PROGRAMS = pcsx
+bin_PROGRAMS = pcsxr
-pcsx_SOURCES = \
+pcsxr_SOURCES = \
LnxMain.c \
+ Linux.h \
+ nopic.h \
Plugin.c \
Config.c \
Gtk2Gui.c \
MemcardDlg.c \
+ MemcardDlg.h \
ConfDlg.c \
+ ConfDlg.h \
Cheat.c \
+ Cheat.h \
DebugMemory.c \
- AboutDlg.c
+ DebugMemory.h \
+ AboutDlg.c \
+ AboutDlg.h \
+ gdk-compat.h
-pcsx_LDADD = \
+pcsxr_LDADD = \
../libpcsxcore/libpcsxcore.a \
$(GTK2_LIBS) $(GLADE2_LIBS) -lpthread -lz -lm -lXext -lXtst
diff --git a/gui/MemcardDlg.c b/gui/MemcardDlg.c
index f799f76f..6f8f3404 100644
--- a/gui/MemcardDlg.c
+++ b/gui/MemcardDlg.c
@@ -433,8 +433,8 @@ static void OnMcd_New(GtkWidget *widget, gpointer user_data) {
GTK_STOCK_SAVE, GTK_RESPONSE_OK,
NULL);
- // Card should be put into $HOME/.pcsx/memcards
- path = g_build_filename(g_get_home_dir(), ".pcsx", "memcards", NULL);
+ // Card should be put into $HOME/.pcsxr/memcards
+ path = g_build_filename(g_get_home_dir(), ".pcsxr", "memcards", NULL);
gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(chooser), path);
gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(chooser), _("New Memory Card.mcd"));
gtk_file_chooser_set_do_overwrite_confirmation(GTK_FILE_CHOOSER(chooser), TRUE);
@@ -692,7 +692,7 @@ void OnConf_Mcds() {
GtkTreeSelection *treesel1, *treesel2;
gchar *str;
- xml = glade_xml_new(PACKAGE_DATA_DIR "pcsx.glade2", "McdsDlg", NULL);
+ xml = glade_xml_new(PACKAGE_DATA_DIR "pcsxr.glade2", "McdsDlg", NULL);
if (!xml) {
g_warning("We could not load the interface!");
diff --git a/gui/Plugin.c b/gui/Plugin.c
index 74c71051..42d9b1d9 100644
--- a/gui/Plugin.c
+++ b/gui/Plugin.c
@@ -324,7 +324,7 @@ int _OpenPlugins() {
ret = SPU_open();
if (ret < 0) { SysMessage(_("Error opening SPU plugin!")); return -1; }
SPU_registerCallback(SPUirq);
- ret = GPU_open(&gpuDisp, "PCSX", NULL);
+ ret = GPU_open(&gpuDisp, "PCSXR", NULL);
if (ret < 0) { SysMessage(_("Error opening GPU plugin!")); return -1; }
GPU_registerCallback(GPUbusy);
ret = PAD1_open(&gpuDisp);
@@ -342,9 +342,9 @@ int _OpenPlugins() {
char dotdir[MAXPATHLEN];
strncpy(dotdir, getenv("HOME"), MAXPATHLEN-100);
- strcat(dotdir, "/.pcsx/plugins/");
+ strcat(dotdir, "/.pcsxr/plugins/");
- strcpy(info.EmuName, "PCSX " PACKAGE_VERSION);
+ strcpy(info.EmuName, "PCSXR " PACKAGE_VERSION);
strncpy(info.CdromID, CdromId, 9);
strncpy(info.CdromLabel, CdromLabel, 9);
info.psxMem = psxM;
diff --git a/libpcsxcore/Makefile.am b/libpcsxcore/Makefile.am
index 6c84e354..1ae5389e 100644
--- a/libpcsxcore/Makefile.am
+++ b/libpcsxcore/Makefile.am
@@ -10,6 +10,7 @@ libpcsxcore_a_SOURCES = \
$(top_builddir)/libpcsxcore/psxdma.c \
$(top_builddir)/libpcsxcore/disr3000a.c \
$(top_builddir)/libpcsxcore/gpu.c \
+ $(top_builddir)/libpcsxcore/gpu.h \
$(top_builddir)/libpcsxcore/spu.c \
$(top_builddir)/libpcsxcore/sio.c \
$(top_builddir)/libpcsxcore/psxhw.c \
@@ -68,8 +69,10 @@ libpcsxcore_a_SOURCES += \
else
if ARCH_X86
libpcsxcore_a_SOURCES += \
+ $(top_builddir)/libpcsxcore/ix86/iGte.h \
$(top_builddir)/libpcsxcore/ix86/iR3000A.c \
$(top_builddir)/libpcsxcore/ix86/ix86.c \
+ $(top_builddir)/libpcsxcore/ix86/ix86.h \
$(top_builddir)/libpcsxcore/
endif
endif
diff --git a/libpcsxcore/debug.c b/libpcsxcore/debug.c
index 08abd41f..bcf0ddb4 100644
--- a/libpcsxcore/debug.c
+++ b/libpcsxcore/debug.c
@@ -21,7 +21,7 @@
#include "socket.h"
/*
-PCSX Debug console protocol description, version 1.0
+PCSXR Debug console protocol description, version 1.0
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Commands number are formatted using %03X (yes)
@@ -37,7 +37,7 @@ Basic commands (1xx):
100 <message>
Sends a dumb message. Will be replied with a 200 reply, followed by the message.
101
- Gets PCSX version.
+ Gets PCSXR version.
102
Gets protocol version.
103
@@ -143,14 +143,14 @@ Spontaneous messages (0xx):
010 / 011 / 012 / 013 / 014 / 015 / 016
Execution hit mapping flow automatic breakpoint.
030 <number>@<PC>
- Execution hit breakpoint, PCSX is paused. Displays PC's value.
+ Execution hit breakpoint, PCSXR is paused. Displays PC's value.
Basic commands acknowledge (2xx):
--------------------------------
200 <message>
Sends a dumb message.
201 <message>
- Returns PCSX version.
+ Returns PCSXR version.
202 <message>
Returns protocol version.
203 <status>
diff --git a/libpcsxcore/misc.c b/libpcsxcore/misc.c
index 0269a8d4..e7f4a2ca 100644
--- a/libpcsxcore/misc.c
+++ b/libpcsxcore/misc.c
@@ -494,7 +494,7 @@ int Load(const char *ExePath) {
// STATES
-static const char PcsxHeader[32] = "STv4 PCSX v" PACKAGE_VERSION;
+static const char PcsxrHeader[32] = "STv4 PCSXR v" PACKAGE_VERSION;
// Savestate Versioning!
// If you make changes to the savestate version, please increment the value below.
@@ -510,7 +510,7 @@ int SaveState(const char *file) {
f = gzopen(file, "wb");
if (f == NULL) return -1;
- gzwrite(f, (void *)PcsxHeader, 32);
+ gzwrite(f, (void *)PcsxrHeader, 32);
gzwrite(f, (void *)&SaveVersion, sizeof(u32));
gzwrite(f, (void *)&Config.HLE, sizeof(boolean));
@@ -572,7 +572,7 @@ int LoadState(const char *file) {
gzread(f, &version, sizeof(u32));
gzread(f, &hle, sizeof(boolean));
- if (strncmp("STv4 PCSX", header, 9) != 0 || version != SaveVersion || hle != Config.HLE) {
+ if (strncmp("STv4 PCSXR", header, 10) != 0 || version != SaveVersion || hle != Config.HLE) {
gzclose(f);
return -1;
}
@@ -627,7 +627,7 @@ int CheckState(const char *file) {
gzclose(f);
- if (strncmp("STv4 PCSX", header, 9) != 0 || version != SaveVersion || hle != Config.HLE)
+ if (strncmp("STv4 PCSXR", header, 10) != 0 || version != SaveVersion || hle != Config.HLE)
return -1;
return 0;
diff --git a/libpcsxcore/r3000a.c b/libpcsxcore/r3000a.c
index d5616cbe..a44bc369 100644
--- a/libpcsxcore/r3000a.c
+++ b/libpcsxcore/r3000a.c
@@ -1,111 +1,111 @@
-/***************************************************************************
- * Copyright (C) 2007 Ryan Schultz, PCSX-df Team, PCSX team *
- * *
- * 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 Street, Fifth Floor, Boston, MA 02111-1307 USA. *
- ***************************************************************************/
-
-/*
-* R3000A CPU functions.
-*/
-
-#include "r3000a.h"
-#include "cdrom.h"
-#include "mdec.h"
-#include "gpu.h"
+/***************************************************************************
+ * Copyright (C) 2007 Ryan Schultz, PCSX-df Team, PCSX team *
+ * *
+ * 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 Street, Fifth Floor, Boston, MA 02111-1307 USA. *
+ ***************************************************************************/
+
+/*
+* R3000A CPU functions.
+*/
+
+#include "r3000a.h"
+#include "cdrom.h"
+#include "mdec.h"
+#include "gpu.h"
#include "gte.h"
-R3000Acpu *psxCpu = NULL;
-psxRegisters psxRegs;
-
-int psxInit() {
- SysPrintf(_("Running PCSX Version %s (%s).\n"), PACKAGE_VERSION, __DATE__);
-
-#ifdef PSXREC
- if (Config.Cpu == CPU_INTERPRETER) {
- psxCpu = &psxInt;
- } else psxCpu = &psxRec;
-#else
- psxCpu = &psxInt;
-#endif
-
- Log = 0;
-
- if (psxMemInit() == -1) return -1;
-
- return psxCpu->Init();
-}
-
-void psxReset() {
- psxCpu->Reset();
-
- psxMemReset();
-
- memset(&psxRegs, 0, sizeof(psxRegs));
-
- psxRegs.pc = 0xbfc00000; // Start in bootstrap
-
- psxRegs.CP0.r[12] = 0x10900000; // COP0 enabled | BEV = 1 | TS = 1
- psxRegs.CP0.r[15] = 0x00000002; // PRevID = Revision ID, same as R3000A
-
- psxHwReset();
- psxBiosInit();
-
- if (!Config.HLE)
- psxExecuteBios();
-
-#ifdef EMU_LOG
- EMU_LOG("*BIOS END*\n");
-#endif
- Log = 0;
-}
-
-void psxShutdown() {
- psxMemShutdown();
- psxBiosShutdown();
-
- psxCpu->Shutdown();
-}
-
-void psxException(u32 code, u32 bd) {
- // Set the Cause
- psxRegs.CP0.n.Cause = code;
-
- // Set the EPC & PC
- if (bd) {
-#ifdef PSXCPU_LOG
- PSXCPU_LOG("bd set!!!\n");
-#endif
- SysPrintf("bd set!!!\n");
- psxRegs.CP0.n.Cause |= 0x80000000;
- psxRegs.CP0.n.EPC = (psxRegs.pc - 4);
- } else
- psxRegs.CP0.n.EPC = (psxRegs.pc);
-
- if (psxRegs.CP0.n.Status & 0x400000)
- psxRegs.pc = 0xbfc00180;
- else
- psxRegs.pc = 0x80000080;
-
- // Set the Status
- psxRegs.CP0.n.Status = (psxRegs.CP0.n.Status &~0x3f) |
- ((psxRegs.CP0.n.Status & 0xf) << 2);
-
- if (Config.HLE) psxBiosException();
-}
-
+R3000Acpu *psxCpu = NULL;
+psxRegisters psxRegs;
+
+int psxInit() {
+ SysPrintf(_("Running PCSXR Version %s (%s).\n"), PACKAGE_VERSION, __DATE__);
+
+#ifdef PSXREC
+ if (Config.Cpu == CPU_INTERPRETER) {
+ psxCpu = &psxInt;
+ } else psxCpu = &psxRec;
+#else
+ psxCpu = &psxInt;
+#endif
+
+ Log = 0;
+
+ if (psxMemInit() == -1) return -1;
+
+ return psxCpu->Init();
+}
+
+void psxReset() {
+ psxCpu->Reset();
+
+ psxMemReset();
+
+ memset(&psxRegs, 0, sizeof(psxRegs));
+
+ psxRegs.pc = 0xbfc00000; // Start in bootstrap
+
+ psxRegs.CP0.r[12] = 0x10900000; // COP0 enabled | BEV = 1 | TS = 1
+ psxRegs.CP0.r[15] = 0x00000002; // PRevID = Revision ID, same as R3000A
+
+ psxHwReset();
+ psxBiosInit();
+
+ if (!Config.HLE)
+ psxExecuteBios();
+
+#ifdef EMU_LOG
+ EMU_LOG("*BIOS END*\n");
+#endif
+ Log = 0;
+}
+
+void psxShutdown() {
+ psxMemShutdown();
+ psxBiosShutdown();
+
+ psxCpu->Shutdown();
+}
+
+void psxException(u32 code, u32 bd) {
+ // Set the Cause
+ psxRegs.CP0.n.Cause = code;
+
+ // Set the EPC & PC
+ if (bd) {
+#ifdef PSXCPU_LOG
+ PSXCPU_LOG("bd set!!!\n");
+#endif
+ SysPrintf("bd set!!!\n");
+ psxRegs.CP0.n.Cause |= 0x80000000;
+ psxRegs.CP0.n.EPC = (psxRegs.pc - 4);
+ } else
+ psxRegs.CP0.n.EPC = (psxRegs.pc);
+
+ if (psxRegs.CP0.n.Status & 0x400000)
+ psxRegs.pc = 0xbfc00180;
+ else
+ psxRegs.pc = 0x80000080;
+
+ // Set the Status
+ psxRegs.CP0.n.Status = (psxRegs.CP0.n.Status &~0x3f) |
+ ((psxRegs.CP0.n.Status & 0xf) << 2);
+
+ if (Config.HLE) psxBiosException();
+}
+
void psxBranchTest() {
// GameShark Sampler: Give VSync pin some delay before exception eats it
if (psxHu32(0x1070) & psxHu32(0x1074)) {
@@ -146,53 +146,53 @@ void psxBranchTest() {
}
#endif
- if ((psxRegs.cycle - psxNextsCounter) >= psxNextCounter)
- psxRcntUpdate();
-
+ if ((psxRegs.cycle - psxNextsCounter) >= psxNextCounter)
+ psxRcntUpdate();
+
if (psxRegs.interrupt) {
- if ((psxRegs.interrupt & (1 << PSXINT_SIO)) && !Config.Sio) { // sio
- if ((psxRegs.cycle - psxRegs.intCycle[PSXINT_SIO].sCycle) >= psxRegs.intCycle[PSXINT_SIO].cycle) {
- psxRegs.interrupt &= ~(1 << PSXINT_SIO);
- sioInterrupt();
- }
- }
- if (psxRegs.interrupt & (1 << PSXINT_CDR)) { // cdr
- if ((psxRegs.cycle - psxRegs.intCycle[PSXINT_CDR].sCycle) >= psxRegs.intCycle[PSXINT_CDR].cycle) {
- psxRegs.interrupt &= ~(1 << PSXINT_CDR);
- cdrInterrupt();
- }
- }
- if (psxRegs.interrupt & (1 << PSXINT_CDREAD)) { // cdr read
- if ((psxRegs.cycle - psxRegs.intCycle[PSXINT_CDREAD].sCycle) >= psxRegs.intCycle[PSXINT_CDREAD].cycle) {
- psxRegs.interrupt &= ~(1 << PSXINT_CDREAD);
- cdrReadInterrupt();
- }
- }
- if (psxRegs.interrupt & (1 << PSXINT_GPUDMA)) { // gpu dma
- if ((psxRegs.cycle - psxRegs.intCycle[PSXINT_GPUDMA].sCycle) >= psxRegs.intCycle[PSXINT_GPUDMA].cycle) {
- psxRegs.interrupt &= ~(1 << PSXINT_GPUDMA);
- gpuInterrupt();
- }
- }
- if (psxRegs.interrupt & (1 << PSXINT_MDECOUTDMA)) { // mdec out dma
- if ((psxRegs.cycle - psxRegs.intCycle[PSXINT_MDECOUTDMA].sCycle) >= psxRegs.intCycle[PSXINT_MDECOUTDMA].cycle) {
- psxRegs.interrupt &= ~(1 << PSXINT_MDECOUTDMA);
- mdec1Interrupt();
- }
- }
- if (psxRegs.interrupt & (1 << PSXINT_SPUDMA)) { // spu dma
- if ((psxRegs.cycle - psxRegs.intCycle[PSXINT_SPUDMA].sCycle) >= psxRegs.intCycle[PSXINT_SPUDMA].cycle) {
- psxRegs.interrupt &= ~(1 << PSXINT_SPUDMA);
- spuInterrupt();
- }
- }
- if (psxRegs.interrupt & (1 << PSXINT_GPUBUSY)) { // gpu busy
- if ((psxRegs.cycle - psxRegs.intCycle[PSXINT_GPUBUSY].sCycle) >= psxRegs.intCycle[PSXINT_GPUBUSY].cycle) {
- psxRegs.interrupt &= ~(1 << PSXINT_GPUBUSY);
- GPU_idle();
- }
+ if ((psxRegs.interrupt & (1 << PSXINT_SIO)) && !Config.Sio) { // sio
+ if ((psxRegs.cycle - psxRegs.intCycle[PSXINT_SIO].sCycle) >= psxRegs.intCycle[PSXINT_SIO].cycle) {
+ psxRegs.interrupt &= ~(1 << PSXINT_SIO);
+ sioInterrupt();
+ }
+ }
+ if (psxRegs.interrupt & (1 << PSXINT_CDR)) { // cdr
+ if ((psxRegs.cycle - psxRegs.intCycle[PSXINT_CDR].sCycle) >= psxRegs.intCycle[PSXINT_CDR].cycle) {
+ psxRegs.interrupt &= ~(1 << PSXINT_CDR);
+ cdrInterrupt();
+ }
+ }
+ if (psxRegs.interrupt & (1 << PSXINT_CDREAD)) { // cdr read
+ if ((psxRegs.cycle - psxRegs.intCycle[PSXINT_CDREAD].sCycle) >= psxRegs.intCycle[PSXINT_CDREAD].cycle) {
+ psxRegs.interrupt &= ~(1 << PSXINT_CDREAD);
+ cdrReadInterrupt();
+ }
+ }
+ if (psxRegs.interrupt & (1 << PSXINT_GPUDMA)) { // gpu dma
+ if ((psxRegs.cycle - psxRegs.intCycle[PSXINT_GPUDMA].sCycle) >= psxRegs.intCycle[PSXINT_GPUDMA].cycle) {
+ psxRegs.interrupt &= ~(1 << PSXINT_GPUDMA);
+ gpuInterrupt();
+ }
+ }
+ if (psxRegs.interrupt & (1 << PSXINT_MDECOUTDMA)) { // mdec out dma
+ if ((psxRegs.cycle - psxRegs.intCycle[PSXINT_MDECOUTDMA].sCycle) >= psxRegs.intCycle[PSXINT_MDECOUTDMA].cycle) {
+ psxRegs.interrupt &= ~(1 << PSXINT_MDECOUTDMA);
+ mdec1Interrupt();
+ }
+ }
+ if (psxRegs.interrupt & (1 << PSXINT_SPUDMA)) { // spu dma
+ if ((psxRegs.cycle - psxRegs.intCycle[PSXINT_SPUDMA].sCycle) >= psxRegs.intCycle[PSXINT_SPUDMA].cycle) {
+ psxRegs.interrupt &= ~(1 << PSXINT_SPUDMA);
+ spuInterrupt();
+ }
+ }
+ if (psxRegs.interrupt & (1 << PSXINT_GPUBUSY)) { // gpu busy
+ if ((psxRegs.cycle - psxRegs.intCycle[PSXINT_GPUBUSY].sCycle) >= psxRegs.intCycle[PSXINT_GPUBUSY].cycle) {
+ psxRegs.interrupt &= ~(1 << PSXINT_GPUBUSY);
+ GPU_idle();
+ }
}
-
+
if (psxRegs.interrupt & (1 << PSXINT_MDECINDMA)) { // mdec in
if ((psxRegs.cycle - psxRegs.intCycle[PSXINT_MDECINDMA].sCycle) >= psxRegs.intCycle[PSXINT_MDECINDMA].cycle) {
psxRegs.interrupt &= ~(1 << PSXINT_MDECINDMA);
@@ -234,42 +234,42 @@ void psxBranchTest() {
cdrLidSeekInterrupt();
}
}
- }
-}
-
-void psxJumpTest() {
- if (!Config.HLE && Config.PsxOut) {
- u32 call = psxRegs.GPR.n.t1 & 0xff;
- switch (psxRegs.pc & 0x1fffff) {
- case 0xa0:
-#ifdef PSXBIOS_LOG
- if (call != 0x28 && call != 0xe) {
- PSXBIOS_LOG("Bios call a0: %s (%x) %x,%x,%x,%x\n", biosA0n[call], call, psxRegs.GPR.n.a0, psxRegs.GPR.n.a1, psxRegs.GPR.n.a2, psxRegs.GPR.n.a3); }
-#endif
- if (biosA0[call])
- biosA0[call]();
- break;
- case 0xb0:
-#ifdef PSXBIOS_LOG
- if (call != 0x17 && call != 0xb) {
- PSXBIOS_LOG("Bios call b0: %s (%x) %x,%x,%x,%x\n", biosB0n[call], call, psxRegs.GPR.n.a0, psxRegs.GPR.n.a1, psxRegs.GPR.n.a2, psxRegs.GPR.n.a3); }
-#endif
- if (biosB0[call])
- biosB0[call]();
- break;
- case 0xc0:
-#ifdef PSXBIOS_LOG
- PSXBIOS_LOG("Bios call c0: %s (%x) %x,%x,%x,%x\n", biosC0n[call], call, psxRegs.GPR.n.a0, psxRegs.GPR.n.a1, psxRegs.GPR.n.a2, psxRegs.GPR.n.a3);
-#endif
- if (biosC0[call])
- biosC0[call]();
- break;
- }
- }
-}
-
-void psxExecuteBios() {
- while (psxRegs.pc != 0x80030000)
- psxCpu->ExecuteBlock();
-}
-
+ }
+}
+
+void psxJumpTest() {
+ if (!Config.HLE && Config.PsxOut) {
+ u32 call = psxRegs.GPR.n.t1 & 0xff;
+ switch (psxRegs.pc & 0x1fffff) {
+ case 0xa0:
+#ifdef PSXBIOS_LOG
+ if (call != 0x28 && call != 0xe) {
+ PSXBIOS_LOG("Bios call a0: %s (%x) %x,%x,%x,%x\n", biosA0n[call], call, psxRegs.GPR.n.a0, psxRegs.GPR.n.a1, psxRegs.GPR.n.a2, psxRegs.GPR.n.a3); }
+#endif
+ if (biosA0[call])
+ biosA0[call]();
+ break;
+ case 0xb0:
+#ifdef PSXBIOS_LOG
+ if (call != 0x17 && call != 0xb) {
+ PSXBIOS_LOG("Bios call b0: %s (%x) %x,%x,%x,%x\n", biosB0n[call], call, psxRegs.GPR.n.a0, psxRegs.GPR.n.a1, psxRegs.GPR.n.a2, psxRegs.GPR.n.a3); }
+#endif
+ if (biosB0[call])
+ biosB0[call]();
+ break;
+ case 0xc0:
+#ifdef PSXBIOS_LOG
+ PSXBIOS_LOG("Bios call c0: %s (%x) %x,%x,%x,%x\n", biosC0n[call], call, psxRegs.GPR.n.a0, psxRegs.GPR.n.a1, psxRegs.GPR.n.a2, psxRegs.GPR.n.a3);
+#endif
+ if (biosC0[call])
+ biosC0[call]();
+ break;
+ }
+ }
+}
+
+void psxExecuteBios() {
+ while (psxRegs.pc != 0x80030000)
+ psxCpu->ExecuteBlock();
+}
+
diff --git a/libpcsxcore/socket.c b/libpcsxcore/socket.c
index eb4b6f45..4edf7f0c 100644
--- a/libpcsxcore/socket.c
+++ b/libpcsxcore/socket.c
@@ -119,7 +119,7 @@ void GetClient() {
}
#endif
- sprintf(hello, "000 PCSX Version %s - Debug console\r\n", PACKAGE_VERSION);
+ sprintf(hello, "000 PCSXR Version %s - Debug console\r\n", PACKAGE_VERSION);
WriteSocket(hello, strlen(hello));
ptr = 0;
}
diff --git a/macosx/ConfigurationController.m b/macosx/ConfigurationController.m
index 9f692ca3..a1623cde 100644
--- a/macosx/ConfigurationController.m
+++ b/macosx/ConfigurationController.m
@@ -1,7 +1,7 @@
#import "ConfigurationController.h"
-#import "PcsxController.h"
+#import "PcsxrController.h"
#import "PluginList.h"
-#import "PcsxPlugin.h"
+#import "PcsxrPlugin.h"
#include "psxcommon.h"
#include "plugins.h"
@@ -16,7 +16,7 @@
NSString *key = [self keyForSender:sender];
if (key) {
[[NSUserDefaults standardUserDefaults] setInteger:[sender intValue] forKey:key];
- [PcsxController setConfigFromDefaults];
+ [PcsxrController setConfigFromDefaults];
}
}
@@ -29,7 +29,7 @@
NSString *key = [self keyForSender:sender];
if (key) {
[[NSUserDefaults standardUserDefaults] setInteger:![sender intValue] forKey:key];
- [PcsxController setConfigFromDefaults];
+ [PcsxrController setConfigFromDefaults];
}
}
@@ -101,7 +101,7 @@
} else {
return;
}
- [PcsxController setConfigFromDefaults];
+ [PcsxrController setConfigFromDefaults];
if ([sender pullsDown]) {
NSArray *items = [sender itemArray];
@@ -148,7 +148,7 @@
}
// special cases
- if (![PcsxController biosAvailable]) {
+ if (![PcsxrController biosAvailable]) {
// no bios means always use HLE
[usesHleCell setState:NSOnState];
[usesHleCell setEnabled:NO];
diff --git a/macosx/EmuThread.h b/macosx/EmuThread.h
index 21b031fb..e307bc5e 100644
--- a/macosx/EmuThread.h
+++ b/macosx/EmuThread.h
@@ -1,6 +1,6 @@
//
// EmuThread.h
-// Pcsx
+// Pcsxr
//
// Created by Gil Pedersen on Sun Sep 21 2003.
// Copyright (c) 2003 __MyCompanyName__. All rights reserved.
diff --git a/macosx/EmuThread.m b/macosx/EmuThread.m
index dfcf6141..384e542b 100644
--- a/macosx/EmuThread.m
+++ b/macosx/EmuThread.m
@@ -1,399 +1,399 @@
-//
-// EmuThread.m
-// Pcsx
-//
-// Created by Gil Pedersen on Sun Sep 21 2003.
-// Copyright (c) 2003 __MyCompanyName__. All rights reserved.
-//
-
-#import <ExceptionHandling/NSExceptionHandler.h>
-#import <AppKit/NSApplication.h>
-#include <pthread.h>
-#include <setjmp.h>
-#import "EmuThread.h"
-#include "psxcommon.h"
-#include "plugins.h"
-#include "misc.h"
-
-EmuThread *emuThread;
-NSString *defrostPath = nil;
-static int safeEvent;
-static int paused;
-static int runbios;
-
-static pthread_cond_t eventCond;
-static pthread_mutex_t eventMutex;
-
-#define EMUEVENT_NONE 0
-#define EMUEVENT_PAUSE (1<<0)
-#define EMUEVENT_RESET (1<<1)
-#define EMUEVENT_STOP (1<<2)
-
-@implementation EmuThread
-
-- (void)EmuThreadRun:(id)anObject
-{
- pool = [[NSAutoreleasePool alloc] init];
-
- [[NSNotificationCenter defaultCenter] addObserver:self
- selector:@selector(emuWindowDidClose:)
- name:@"emuWindowDidClose" object:nil];
-
- [[NSNotificationCenter defaultCenter] addObserver:self
- selector:@selector(emuWindowWantPause:)
- name:@"emuWindowWantPause" object:nil];
-
- [[NSNotificationCenter defaultCenter] addObserver:self
- selector:@selector(emuWindowWantResume:)
- name:@"emuWindowWantResume" object:nil];
-
- // we shouldn't change the priority, since we might depend on subthreads
- //[NSThread setThreadPriority:1.0-((1.0-[NSThread threadPriority])/4.0)];
-
- // Do processing here
- if (OpenPlugins() == -1)
- goto done;
-
- setjmp(restartJmp);
-
- int res = CheckCdrom();
- if (res == -1) {
- ClosePlugins();
- SysMessage(_("Could not check CD-ROM!\n"));
- goto done;
- }
-
- // Auto-detect: region first, then rcnt reset
+//
+// EmuThread.m
+// Pcsxr
+//
+// Created by Gil Pedersen on Sun Sep 21 2003.
+// Copyright (c) 2003 __MyCompanyName__. All rights reserved.
+//
+
+#import <ExceptionHandling/NSExceptionHandler.h>
+#import <AppKit/NSApplication.h>
+#include <pthread.h>
+#include <setjmp.h>
+#import "EmuThread.h"
+#include "psxcommon.h"
+#include "plugins.h"
+#include "misc.h"
+
+EmuThread *emuThread;
+NSString *defrostPath = nil;
+static int safeEvent;
+static int paused;
+static int runbios;
+
+static pthread_cond_t eventCond;
+static pthread_mutex_t eventMutex;
+
+#define EMUEVENT_NONE 0
+#define EMUEVENT_PAUSE (1<<0)
+#define EMUEVENT_RESET (1<<1)
+#define EMUEVENT_STOP (1<<2)
+
+@implementation EmuThread
+
+- (void)EmuThreadRun:(id)anObject
+{
+ pool = [[NSAutoreleasePool alloc] init];
+
+ [[NSNotificationCenter defaultCenter] addObserver:self
+ selector:@selector(emuWindowDidClose:)
+ name:@"emuWindowDidClose" object:nil];
+
+ [[NSNotificationCenter defaultCenter] addObserver:self
+ selector:@selector(emuWindowWantPause:)
+ name:@"emuWindowWantPause" object:nil];
+
+ [[NSNotificationCenter defaultCenter] addObserver:self
+ selector:@selector(emuWindowWantResume:)
+ name:@"emuWindowWantResume" object:nil];
+
+ // we shouldn't change the priority, since we might depend on subthreads
+ //[NSThread setThreadPriority:1.0-((1.0-[NSThread threadPriority])/4.0)];
+
+ // Do processing here
+ if (OpenPlugins() == -1)
+ goto done;
+
+ setjmp(restartJmp);
+
+ int res = CheckCdrom();
+ if (res == -1) {
+ ClosePlugins();
+ SysMessage(_("Could not check CD-ROM!\n"));
+ goto done;
+ }
+
+ // Auto-detect: region first, then rcnt reset
EmuReset();
- LoadCdrom();
-
- if (defrostPath) {
- LoadState([defrostPath fileSystemRepresentation]);
- [defrostPath release]; defrostPath = nil;
- }
-
- psxCpu->Execute();
-
-done:
- [pool release]; pool = nil;
- emuThread = nil;
-
- return;
-}
-
-- (void)EmuThreadRunBios:(id)anObject
-{
- pool = [[NSAutoreleasePool alloc] init];
-
- [[NSNotificationCenter defaultCenter] addObserver:self
- selector:@selector(emuWindowDidClose:)
- name:@"emuWindowDidClose" object:nil];
-
- [[NSNotificationCenter defaultCenter] addObserver:self
- selector:@selector(emuWindowWantPause:)
- name:@"emuWindowWantPause" object:nil];
-
- [[NSNotificationCenter defaultCenter] addObserver:self
- selector:@selector(emuWindowWantResume:)
- name:@"emuWindowWantResume" object:nil];
-
- // we shouldn't change the priority, since we might depend on subthreads
- //[NSThread setThreadPriority:1.0-((1.0-[NSThread threadPriority])/4.0)];
-
- // Do processing here
- if (OpenPlugins() == -1)
- goto done;
-
- EmuReset();
-
- psxCpu->Execute();
-
-done:
- [pool release]; pool = nil;
- emuThread = nil;
-
- return;
-}
-
-- (void)dealloc
-{
- // remove all registered observers
- [[NSNotificationCenter defaultCenter] removeObserver:self name:nil object:nil];
-
- if (pool)
- [pool release];
-
- [super dealloc];
-}
-
-- (void)emuWindowDidClose:(NSNotification *)aNotification
-{
- [EmuThread stop];
-}
-
-- (void)emuWindowWantPause:(NSNotification *)aNotification
-{
- wasPaused = [EmuThread pause];
-}
-
-- (void)emuWindowWantResume:(NSNotification *)aNotification
-{
- if (!wasPaused) {
- [EmuThread resume];
- }
- wasPaused = NO;
-}
-
-/* called periodically from the emulation thread */
-- (void)handleEvents
-{
- /* only do a trylock here, since we're not interested in blocking,
- and we can just handle events next time round */
- if (pthread_mutex_trylock(&eventMutex) == 0) {
- while (safeEvent) {
- if (safeEvent & EMUEVENT_STOP) {
- /* signify that the emulation has stopped */
- [emuThread autorelease];
- emuThread = nil;
- paused = NO;
-
- /* better unlock the mutex before killing ourself */
- pthread_mutex_unlock(&eventMutex);
-
- ClosePlugins();
- SysClose();
-
- //[[NSThread currentThread] autorelease];
- [NSThread exit];
- return;
- }
-
- if (safeEvent & EMUEVENT_RESET) {
-#if 0
- /* signify that the emulation has stopped */
- [emuThread autorelease];
- emuThread = nil;
-
- /* better unlock the mutex before killing ourself */
- pthread_mutex_unlock(&eventMutex);
-
- ClosePlugins();
-
- // start a new emulation thread
- [EmuThread run];
-
- //[[NSThread currentThread] autorelease];
- [NSThread exit];
- return;
-#else
- safeEvent &= ~EMUEVENT_RESET;
- pthread_mutex_unlock(&eventMutex);
-
- longjmp(restartJmp, 0);
-#endif
- }
-
- if (safeEvent & EMUEVENT_PAUSE) {
- paused = 2;
- /* wait until we're signalled */
- pthread_cond_wait(&eventCond, &eventMutex);
- }
- }
- pthread_mutex_unlock(&eventMutex);
- }
-}
-
-+ (void)run
-{
- int err;
-
- if (emuThread) {
- [EmuThread resume];
- return;
- }
-
- if (pthread_mutex_lock(&eventMutex) != 0) {
- err = pthread_cond_init(&eventCond, NULL);
- if (err) return;
-
- err = pthread_mutex_init(&eventMutex, NULL);
- if (err) return;
-
- pthread_mutex_lock(&eventMutex);
- }
-
- safeEvent = EMUEVENT_NONE;
- paused = NO;
- runbios = NO;
-
- if (SysInit() != 0) {
- pthread_mutex_unlock(&eventMutex);
- return;
- }
-
- emuThread = [[EmuThread alloc] init];
-
- [NSThread detachNewThreadSelector:@selector(EmuThreadRun:)
- toTarget:emuThread withObject:nil];
-
- pthread_mutex_unlock(&eventMutex);
-}
-
-+ (void)runBios
-{
- int err;
-
- if (emuThread) {
- [EmuThread resume];
- return;
- }
-
- if (pthread_mutex_lock(&eventMutex) != 0) {
- err = pthread_cond_init(&eventCond, NULL);
- if (err) return;
-
- err = pthread_mutex_init(&eventMutex, NULL);
- if (err) return;
-
- pthread_mutex_lock(&eventMutex);
- }
-
- safeEvent = EMUEVENT_NONE;
- paused = NO;
- runbios = YES;
-
- if (SysInit() != 0) {
- pthread_mutex_unlock(&eventMutex);
- return;
- }
-
- emuThread = [[EmuThread alloc] init];
-
- [NSThread detachNewThreadSelector:@selector(EmuThreadRunBios:)
- toTarget:emuThread withObject:nil];
-
- pthread_mutex_unlock(&eventMutex);
-}
-
-+ (void)stop
-{
- pthread_mutex_lock(&eventMutex);
- safeEvent = EMUEVENT_STOP;
- pthread_mutex_unlock(&eventMutex);
-
- // wake it if it's sleeping
- pthread_cond_broadcast(&eventCond);
-}
-
-+ (BOOL)pause
-{
- if (paused || ![EmuThread active])
- return YES;
-
- pthread_mutex_lock(&eventMutex);
- safeEvent |= EMUEVENT_PAUSE;
- paused = 1;
- pthread_mutex_unlock(&eventMutex);
-
- pthread_cond_broadcast(&eventCond);
-
- return NO;
-}
-
-+ (BOOL)pauseSafe
-{
- if ((paused == 2) || ![EmuThread active])
- return YES;
-
- [EmuThread pause];
- while ([EmuThread isPaused] != 2) [NSThread sleepUntilDate:[[NSDate date] addTimeInterval:0.05]];
-
- return NO;
-}
-
-+ (void)resume
-{
- if (!paused || ![EmuThread active])
- return;
-
- pthread_mutex_lock(&eventMutex);
-
- safeEvent &= ~EMUEVENT_PAUSE;
- paused = NO;
- pthread_mutex_unlock(&eventMutex);
-
- pthread_cond_broadcast(&eventCond);
-}
-
-+ (void)reset
-{
- pthread_mutex_lock(&eventMutex);
- safeEvent = EMUEVENT_RESET;
- pthread_mutex_unlock(&eventMutex);
-
- pthread_cond_broadcast(&eventCond);
-}
-
-// must only be called from within the emulation thread!!!
-+ (void)resetNow
-{
- /* signify that the emulation has stopped */
- [emuThread autorelease];
- emuThread = nil;
-
- ClosePlugins();
-
- // start a new emulation thread
- [EmuThread run];
-
- //[[NSThread currentThread] autorelease];
- [NSThread exit];
- return;
-}
-
-+ (BOOL)isPaused
-{
- return paused;
-}
-
-+ (BOOL)isRunBios
-{
- return runbios;
-}
-
-+ (BOOL)active
-{
- return emuThread ? YES : NO;
-}
-
-+ (void)freezeAt:(NSString *)path which:(int)num
-{
- BOOL emuWasPaused = [EmuThread pauseSafe];
- char Text[256];
-
- GPU_freeze(2, (GPUFreeze_t *)&num);
- int ret = SaveState([path fileSystemRepresentation]);
- if (ret == 0) sprintf (Text, _("*PCSX*: Saved State %d"), num+1);
- else sprintf (Text, _("*PCSX*: Error Saving State %d"), num+1);
- GPU_displayText(Text);
-
- if (!emuWasPaused) {
- [EmuThread resume];
- }
-}
-
-+ (BOOL)defrostAt:(NSString *)path
-{
- const char *cPath = [path fileSystemRepresentation];
- if (CheckState(cPath) != 0)
- return NO;
-
- defrostPath = [path retain];
- [EmuThread reset];
-
- GPU_displayText(_("*PCSX*: Loaded State"));
- return YES;
-}
-
-@end
+ LoadCdrom();
+
+ if (defrostPath) {
+ LoadState([defrostPath fileSystemRepresentation]);
+ [defrostPath release]; defrostPath = nil;
+ }
+
+ psxCpu->Execute();
+
+done:
+ [pool release]; pool = nil;
+ emuThread = nil;
+
+ return;
+}
+
+- (void)EmuThreadRunBios:(id)anObject
+{
+ pool = [[NSAutoreleasePool alloc] init];
+
+ [[NSNotificationCenter defaultCenter] addObserver:self
+ selector:@selector(emuWindowDidClose:)
+ name:@"emuWindowDidClose" object:nil];
+
+ [[NSNotificationCenter defaultCenter] addObserver:self
+ selector:@selector(emuWindowWantPause:)
+ name:@"emuWindowWantPause" object:nil];
+
+ [[NSNotificationCenter defaultCenter] addObserver:self
+ selector:@selector(emuWindowWantResume:)
+ name:@"emuWindowWantResume" object:nil];
+
+ // we shouldn't change the priority, since we might depend on subthreads
+ //[NSThread setThreadPriority:1.0-((1.0-[NSThread threadPriority])/4.0)];
+
+ // Do processing here
+ if (OpenPlugins() == -1)
+ goto done;
+
+ EmuReset();
+
+ psxCpu->Execute();
+
+done:
+ [pool release]; pool = nil;
+ emuThread = nil;
+
+ return;
+}
+
+- (void)dealloc
+{
+ // remove all registered observers
+ [[NSNotificationCenter defaultCenter] removeObserver:self name:nil object:nil];
+
+ if (pool)
+ [pool release];
+
+ [super dealloc];
+}
+
+- (void)emuWindowDidClose:(NSNotification *)aNotification
+{
+ [EmuThread stop];
+}
+
+- (void)emuWindowWantPause:(NSNotification *)aNotification
+{
+ wasPaused = [EmuThread pause];
+}
+
+- (void)emuWindowWantResume:(NSNotification *)aNotification
+{
+ if (!wasPaused) {
+ [EmuThread resume];
+ }
+ wasPaused = NO;
+}
+
+/* called periodically from the emulation thread */
+- (void)handleEvents
+{
+ /* only do a trylock here, since we're not interested in blocking,
+ and we can just handle events next time round */
+ if (pthread_mutex_trylock(&eventMutex) == 0) {
+ while (safeEvent) {
+ if (safeEvent & EMUEVENT_STOP) {
+ /* signify that the emulation has stopped */
+ [emuThread autorelease];
+ emuThread = nil;
+ paused = NO;
+
+ /* better unlock the mutex before killing ourself */
+ pthread_mutex_unlock(&eventMutex);
+
+ ClosePlugins();
+ SysClose();
+
+ //[[NSThread currentThread] autorelease];
+ [NSThread exit];
+ return;
+ }
+
+ if (safeEvent & EMUEVENT_RESET) {
+#if 0
+ /* signify that the emulation has stopped */
+ [emuThread autorelease];
+ emuThread = nil;
+
+ /* better unlock the mutex before killing ourself */
+ pthread_mutex_unlock(&eventMutex);
+
+ ClosePlugins();
+
+ // start a new emulation thread
+ [EmuThread run];
+
+ //[[NSThread currentThread] autorelease];
+ [NSThread exit];
+ return;
+#else
+ safeEvent &= ~EMUEVENT_RESET;
+ pthread_mutex_unlock(&eventMutex);
+
+ longjmp(restartJmp, 0);
+#endif
+ }
+
+ if (safeEvent & EMUEVENT_PAUSE) {
+ paused = 2;
+ /* wait until we're signalled */
+ pthread_cond_wait(&eventCond, &eventMutex);
+ }
+ }
+ pthread_mutex_unlock(&eventMutex);
+ }
+}
+
++ (void)run
+{
+ int err;
+
+ if (emuThread) {
+ [EmuThread resume];
+ return;
+ }
+
+ if (pthread_mutex_lock(&eventMutex) != 0) {
+ err = pthread_cond_init(&eventCond, NULL);
+ if (err) return;
+
+ err = pthread_mutex_init(&eventMutex, NULL);
+ if (err) return;
+
+ pthread_mutex_lock(&eventMutex);
+ }
+
+ safeEvent = EMUEVENT_NONE;
+ paused = NO;
+ runbios = NO;
+
+ if (SysInit() != 0) {
+ pthread_mutex_unlock(&eventMutex);
+ return;
+ }
+
+ emuThread = [[EmuThread alloc] init];
+
+ [NSThread detachNewThreadSelector:@selector(EmuThreadRun:)
+ toTarget:emuThread withObject:nil];
+
+ pthread_mutex_unlock(&eventMutex);
+}
+
++ (void)runBios
+{
+ int err;
+
+ if (emuThread) {
+ [EmuThread resume];
+ return;
+ }
+
+ if (pthread_mutex_lock(&eventMutex) != 0) {
+ err = pthread_cond_init(&eventCond, NULL);
+ if (err) return;
+
+ err = pthread_mutex_init(&eventMutex, NULL);
+ if (err) return;
+
+ pthread_mutex_lock(&eventMutex);
+ }
+
+ safeEvent = EMUEVENT_NONE;
+ paused = NO;
+ runbios = YES;
+
+ if (SysInit() != 0) {
+ pthread_mutex_unlock(&eventMutex);
+ return;
+ }
+
+ emuThread = [[EmuThread alloc] init];
+
+ [NSThread detachNewThreadSelector:@selector(EmuThreadRunBios:)
+ toTarget:emuThread withObject:nil];
+
+ pthread_mutex_unlock(&eventMutex);
+}
+
++ (void)stop
+{
+ pthread_mutex_lock(&eventMutex);
+ safeEvent = EMUEVENT_STOP;
+ pthread_mutex_unlock(&eventMutex);
+
+ // wake it if it's sleeping
+ pthread_cond_broadcast(&eventCond);
+}
+
++ (BOOL)pause
+{
+ if (paused || ![EmuThread active])
+ return YES;
+
+ pthread_mutex_lock(&eventMutex);
+ safeEvent |= EMUEVENT_PAUSE;
+ paused = 1;
+ pthread_mutex_unlock(&eventMutex);
+
+ pthread_cond_broadcast(&eventCond);
+
+ return NO;
+}
+
++ (BOOL)pauseSafe
+{
+ if ((paused == 2) || ![EmuThread active])
+ return YES;
+
+ [EmuThread pause];
+ while ([EmuThread isPaused] != 2) [NSThread sleepUntilDate:[[NSDate date] addTimeInterval:0.05]];
+
+ return NO;
+}
+
++ (void)resume
+{
+ if (!paused || ![EmuThread active])
+ return;
+
+ pthread_mutex_lock(&eventMutex);
+
+ safeEvent &= ~EMUEVENT_PAUSE;
+ paused = NO;
+ pthread_mutex_unlock(&eventMutex);
+
+ pthread_cond_broadcast(&eventCond);
+}
+
++ (void)reset
+{
+ pthread_mutex_lock(&eventMutex);
+ safeEvent = EMUEVENT_RESET;
+ pthread_mutex_unlock(&eventMutex);
+
+ pthread_cond_broadcast(&eventCond);
+}
+
+// must only be called from within the emulation thread!!!
++ (void)resetNow
+{
+ /* signify that the emulation has stopped */
+ [emuThread autorelease];
+ emuThread = nil;
+
+ ClosePlugins();
+
+ // start a new emulation thread
+ [EmuThread run];
+
+ //[[NSThread currentThread] autorelease];
+ [NSThread exit];
+ return;
+}
+
++ (BOOL)isPaused
+{
+ return paused;
+}
+
++ (BOOL)isRunBios
+{
+ return runbios;
+}
+
++ (BOOL)active
+{
+ return emuThread ? YES : NO;
+}
+
++ (void)freezeAt:(NSString *)path which:(int)num
+{
+ BOOL emuWasPaused = [EmuThread pauseSafe];
+ char Text[256];
+
+ GPU_freeze(2, (GPUFreeze_t *)&num);
+ int ret = SaveState([path fileSystemRepresentation]);
+ if (ret == 0) sprintf (Text, _("*PCSXR*: Saved State %d"), num+1);
+ else sprintf (Text, _("*PCSXR*: Error Saving State %d"), num+1);
+ GPU_displayText(Text);
+
+ if (!emuWasPaused) {
+ [EmuThread resume];
+ }
+}
+
++ (BOOL)defrostAt:(NSString *)path
+{
+ const char *cPath = [path fileSystemRepresentation];
+ if (CheckState(cPath) != 0)
+ return NO;
+
+ defrostPath = [path retain];
+ [EmuThread reset];
+
+ GPU_displayText(_("*PCSXR*: Loaded State"));
+ return YES;
+}
+
+@end
diff --git a/macosx/English.lproj/AddPluginSheet.nib/classes.nib b/macosx/English.lproj/AddPluginSheet.nib/classes.nib
index ae53771c..2ba5ac33 100644
--- a/macosx/English.lproj/AddPluginSheet.nib/classes.nib
+++ b/macosx/English.lproj/AddPluginSheet.nib/classes.nib
@@ -3,7 +3,7 @@
{CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; },
{
ACTIONS = {closeAddPluginSheet = id; };
- CLASS = PcsxPluginDocument;
+ CLASS = PcsxrPluginDocument;
LANGUAGE = ObjC;
OUTLETS = {addPluginSheet = NSWindow; pluginName = NSTextField; };
SUPERCLASS = NSDocument;
diff --git a/macosx/English.lproj/InfoPlist.strings b/macosx/English.lproj/InfoPlist.strings
index 4c55ed90..5e371bdf 100644
--- a/macosx/English.lproj/InfoPlist.strings
+++ b/macosx/English.lproj/InfoPlist.strings
@@ -1,6 +1,6 @@
/* Localized versions of Info.plist keys */
-CFBundleName = "PCSX";
+CFBundleName = "PCSXR";
CFBundleShortVersionString = "PCSX-Reloaded";
-CFBundleGetInfoString = "Playstation Emulator based on PCSX-df Project.";
+CFBundleGetInfoString = "PlayStation Emulator based on PCSX-df Project.";
NSHumanReadableCopyright = "Copyright (c) 2003-2005 PCSX Team, Gil Pedersen.\nCopyright (c) 2009-2010 PCSX-Reloaded Team.";
diff --git a/macosx/English.lproj/PCSX.nib/classes.nib b/macosx/English.lproj/PCSX.nib/classes.nib
deleted file mode 100644
index 4b25fcc2..00000000
--- a/macosx/English.lproj/PCSX.nib/classes.nib
+++ /dev/null
@@ -1,25 +0,0 @@
-{
- IBClasses = (
- {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; },
- {
- ACTIONS = {
- defrost = id;
- ejectCD = id;
- freeze = id;
- fullscreen = id;
- pause = id;
- preferences = id;
- reset = id;
- runBios = id;
- runCD = id;
- runExe = id;
- runIso = id;
- };
- CLASS = PcsxController;
- LANGUAGE = ObjC;
- OUTLETS = {memCardWindow = NSWindow; preferenceWindow = NSWindow; };
- SUPERCLASS = NSObject;
- }
- );
- IBVersion = 1;
-} \ No newline at end of file
diff --git a/macosx/English.lproj/PCSX.nib/info.nib b/macosx/English.lproj/PCSX.nib/info.nib
deleted file mode 100644
index a5d6a496..00000000
--- a/macosx/English.lproj/PCSX.nib/info.nib
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
- <key>IBDocumentLocation</key>
- <string>442 353 492 320 0 0 1024 746 </string>
- <key>IBEditorPositions</key>
- <dict>
- <key>29</key>
- <string>134 613 219 44 0 0 1024 746 </string>
- </dict>
- <key>IBFramework Version</key>
- <string>446.1</string>
- <key>IBOpenObjects</key>
- <array>
- <integer>29</integer>
- </array>
- <key>IBSystem Version</key>
- <string>8P2137</string>
-</dict>
-</plist>
diff --git a/macosx/English.lproj/PCSX.nib/objects.nib b/macosx/English.lproj/PCSX.nib/objects.nib
deleted file mode 100644
index cd38d74a..00000000
--- a/macosx/English.lproj/PCSX.nib/objects.nib
+++ /dev/null
Binary files differ
diff --git a/macosx/Info.plist b/macosx/Info.plist
index 5f732354..19af2d20 100644
--- a/macosx/Info.plist
+++ b/macosx/Info.plist
@@ -24,7 +24,7 @@
<key>LSTypeIsPackage</key>
<true/>
<key>NSDocumentClass</key>
- <string>PcsxPluginDocument</string>
+ <string>PcsxrPluginDocument</string>
</dict>
<dict>
<key>CFBundleTypeExtensions</key>
@@ -50,9 +50,9 @@
<string>mcr</string>
</array>
<key>CFBundleTypeIconFile</key>
- <string>pcsxmemcard</string>
+ <string>pcsxrmemcard</string>
<key>CFBundleTypeName</key>
- <string>PCSX Memory Card</string>
+ <string>PCSXR Memory Card</string>
<key>CFBundleTypeOSTypes</key>
<array>
<string>Pmcr</string>
@@ -65,12 +65,12 @@
<dict>
<key>CFBundleTypeExtensions</key>
<array>
- <string>pcsxstate</string>
+ <string>pcsxrstate</string>
</array>
<key>CFBundleTypeIconFile</key>
- <string>pcsxfreeze</string>
+ <string>pcsxrfreeze</string>
<key>CFBundleTypeName</key>
- <string>PCSX Freeze State</string>
+ <string>PCSXR Freeze State</string>
<key>CFBundleTypeOSTypes</key>
<array>
<string>Pfrz</string>
@@ -84,23 +84,23 @@
<key>CFBundleExecutable</key>
<string>${EXECUTABLE_NAME}</string>
<key>CFBundleIconFile</key>
- <string>PCSX.icns</string>
+ <string>PCSXR.icns</string>
<key>CFBundleIdentifier</key>
<string>com.codeplex.pcsxr</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
- <string>PCSX</string>
+ <string>PCSXR</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>PCSX-Reloaded SVN</string>
<key>CFBundleSignature</key>
- <string>Pcsx</string>
+ <string>Pcsxr</string>
<key>CFBundleVersion</key>
<string>SVN</string>
<key>NSMainNibFile</key>
- <string>PCSX</string>
+ <string>PCSXR</string>
<key>NSPrincipalClass</key>
<string>NSApplication</string>
</dict>
diff --git a/macosx/Pcsx.xcodeproj/project.pbxproj b/macosx/Pcsx.xcodeproj/project.pbxproj
deleted file mode 100644
index aa461cc9..00000000
--- a/macosx/Pcsx.xcodeproj/project.pbxproj
+++ /dev/null
@@ -1,976 +0,0 @@
-// !$*UTF8*$!
-{
- archiveVersion = 1;
- classes = {
- };
- objectVersion = 42;
- objects = {
-
-/* Begin PBXBuildFile section */
- 2B143D06078A2CBD00AF745A /* PCSX.icns in Resources */ = {isa = PBXBuildFile; fileRef = 2B143D01078A2CBD00AF745A /* PCSX.icns */; };
- 2B143D07078A2CBD00AF745A /* pcsxfreeze.icns in Resources */ = {isa = PBXBuildFile; fileRef = 2B143D02078A2CBD00AF745A /* pcsxfreeze.icns */; };
- 2B143D08078A2CBD00AF745A /* pcsxmemcard.icns in Resources */ = {isa = PBXBuildFile; fileRef = 2B143D03078A2CBD00AF745A /* pcsxmemcard.icns */; };
- 2B143D09078A2CBD00AF745A /* psxbios.icns in Resources */ = {isa = PBXBuildFile; fileRef = 2B143D04078A2CBD00AF745A /* psxbios.icns */; };
- 2B143D0A078A2CBD00AF745A /* psxplugin.icns in Resources */ = {isa = PBXBuildFile; fileRef = 2B143D05078A2CBD00AF745A /* psxplugin.icns */; };
- 2B3E356D06937D1C00763C7D /* PcsxPluginDocument.m in Sources */ = {isa = PBXBuildFile; fileRef = 2B3E356B06937D1C00763C7D /* PcsxPluginDocument.m */; };
- 2B3E35BC069384D100763C7D /* AddPluginSheet.nib in Resources */ = {isa = PBXBuildFile; fileRef = 2B3E35BA069384D100763C7D /* AddPluginSheet.nib */; };
- 2B400D910789F58A00BA271E /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2B02C04304E145D000880C5B /* Carbon.framework */; };
- 2B4DE99205FF9307003EFEF0 /* PluginController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2B4DE98E05FF9307003EFEF0 /* PluginController.m */; };
- 2BB3D6A305427FE200831ACB /* Configuration.nib in Resources */ = {isa = PBXBuildFile; fileRef = 2BA178B00514CE260026D74D /* Configuration.nib */; };
- 2BB3D6A405427FE200831ACB /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 2BA178B20514CE260026D74D /* InfoPlist.strings */; };
- 2BB3D6A505427FE200831ACB /* PCSX.nib in Resources */ = {isa = PBXBuildFile; fileRef = 2BA178B40514CE260026D74D /* PCSX.nib */; };
- 2BB3D6A705427FE200831ACB /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 2BBB1786051E0D9700B84448 /* Credits.rtf */; };
- 2BB3D6BE05427FE200831ACB /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 2BA178A505148D9D0026D74D /* main.m */; };
- 2BB3D6BF05427FE200831ACB /* PcsxController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2B75FD3D051C56D200D12034 /* PcsxController.m */; };
- 2BB3D6C005427FE200831ACB /* ConfigurationController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2B75FD4B051C8A7400D12034 /* ConfigurationController.m */; };
- 2BB3D6C105427FE200831ACB /* PluginList.m in Sources */ = {isa = PBXBuildFile; fileRef = 2BBB1127051DC00500B84448 /* PluginList.m */; };
- 2BB3D6C205427FE200831ACB /* EmuThread.m in Sources */ = {isa = PBXBuildFile; fileRef = 2BBB1792051E113B00B84448 /* EmuThread.m */; };
- 2BB3D6C305427FE200831ACB /* Plugin.c in Sources */ = {isa = PBXBuildFile; fileRef = 2BBB17DA051E4D0F00B84448 /* Plugin.c */; };
- 2BB3D6C405427FE200831ACB /* PcsxPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 2BA44361052DB2EA00E21DDD /* PcsxPlugin.m */; };
- 2BB3D6C605427FE200831ACB /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2BC4786204C7FD3600CAB520 /* Cocoa.framework */; };
- 2BB3D6C705427FE200831ACB /* System.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2B6E8AAE04C832040017A3B1 /* System.framework */; };
- 2BB3D6C805427FE200831ACB /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2B6E8AB404C8327C0017A3B1 /* IOKit.framework */; };
- 556A148312B6DE1A007DE998 /* pasm.s in Sources */ = {isa = PBXBuildFile; fileRef = 556A147B12B6DE1A007DE998 /* pasm.s */; };
- 556A148412B6DE1A007DE998 /* ppc.c in Sources */ = {isa = PBXBuildFile; fileRef = 556A147D12B6DE1A007DE998 /* ppc.c */; };
- 556A148512B6DE1A007DE998 /* pR3000A.c in Sources */ = {isa = PBXBuildFile; fileRef = 556A148012B6DE1A007DE998 /* pR3000A.c */; };
- 556A148612B6DE1A007DE998 /* reguse.c in Sources */ = {isa = PBXBuildFile; fileRef = 556A148112B6DE1A007DE998 /* reguse.c */; };
- 559366CA12B694DF004ACC1E /* iR3000A-64.c in Sources */ = {isa = PBXBuildFile; fileRef = 559366C112B694DF004ACC1E /* iR3000A-64.c */; };
- 559366CB12B694DF004ACC1E /* ix86-64.c in Sources */ = {isa = PBXBuildFile; fileRef = 559366C212B694DF004ACC1E /* ix86-64.c */; };
- 559366CD12B694DF004ACC1E /* ix86_cpudetect.c in Sources */ = {isa = PBXBuildFile; fileRef = 559366C512B694DF004ACC1E /* ix86_cpudetect.c */; };
- 559366CE12B694DF004ACC1E /* ix86_fpu.c in Sources */ = {isa = PBXBuildFile; fileRef = 559366C612B694DF004ACC1E /* ix86_fpu.c */; };
- 559366CF12B694DF004ACC1E /* ix86_mmx.c in Sources */ = {isa = PBXBuildFile; fileRef = 559366C712B694DF004ACC1E /* ix86_mmx.c */; };
- 559366D012B694DF004ACC1E /* ix86_sse.c in Sources */ = {isa = PBXBuildFile; fileRef = 559366C812B694DF004ACC1E /* ix86_sse.c */; };
- 712FD1E81093096F00575A92 /* debug.c in Sources */ = {isa = PBXBuildFile; fileRef = 712FD1E51093096F00575A92 /* debug.c */; };
- 712FD1E91093096F00575A92 /* socket.c in Sources */ = {isa = PBXBuildFile; fileRef = 712FD1E61093096F00575A92 /* socket.c */; };
- 713B530E110B75650002F164 /* ppf.c in Sources */ = {isa = PBXBuildFile; fileRef = 713B530C110B75650002F164 /* ppf.c */; };
- 713CB2E411FC49DA0033B6A8 /* DFCdrom.psxplugin in Copy PlugIns */ = {isa = PBXBuildFile; fileRef = 71F93F6C11FB8E9D007A5A7C /* DFCdrom.psxplugin */; };
- 7192F42A129C412E0042D946 /* gpu.c in Sources */ = {isa = PBXBuildFile; fileRef = 7192F428129C412E0042D946 /* gpu.c */; };
- 719594B211AEFE8C004AD686 /* psxcommon.c in Sources */ = {isa = PBXBuildFile; fileRef = 719594B011AEFE8C004AD686 /* psxcommon.c */; };
- 71AD2DF410C3575300365243 /* PeopsSPU.psxplugin in Copy PlugIns */ = {isa = PBXBuildFile; fileRef = 71AD2DD110C356FD00365243 /* PeopsSPU.psxplugin */; };
- 71AD2DF510C3575C00365243 /* PeopsSoftGL.psxplugin in Copy PlugIns */ = {isa = PBXBuildFile; fileRef = 71AD2DDC10C3570900365243 /* PeopsSoftGL.psxplugin */; };
- 71D888D6130F04F100F150FF /* PeopsXGL.psxplugin in Copy PlugIns */ = {isa = PBXBuildFile; fileRef = 71D888D4130F04DC00F150FF /* PeopsXGL.psxplugin */; };
- 71F2C0881200B6B000322AD9 /* DFInput.psxplugin in Copy PlugIns */ = {isa = PBXBuildFile; fileRef = 71F2C0861200B69B00322AD9 /* DFInput.psxplugin */; };
- 71F4C5890FDED12800529849 /* cdriso.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F4C5600FDED12800529849 /* cdriso.c */; };
- 71F4C58B0FDED12800529849 /* cdrom.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F4C5620FDED12800529849 /* cdrom.c */; };
- 71F4C58D0FDED12800529849 /* cheat.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F4C5640FDED12800529849 /* cheat.c */; };
- 71F4C5910FDED12800529849 /* decode_xa.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F4C5680FDED12800529849 /* decode_xa.c */; };
- 71F4C5930FDED12800529849 /* disr3000a.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F4C56A0FDED12800529849 /* disr3000a.c */; };
- 71F4C5940FDED12800529849 /* gte.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F4C56B0FDED12800529849 /* gte.c */; };
- 71F4C5960FDED12800529849 /* mdec.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F4C56D0FDED12800529849 /* mdec.c */; };
- 71F4C5980FDED12800529849 /* misc.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F4C56F0FDED12800529849 /* misc.c */; };
- 71F4C59A0FDED12800529849 /* plugins.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F4C5710FDED12800529849 /* plugins.c */; };
- 71F4C59D0FDED12800529849 /* psxbios.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F4C5740FDED12800529849 /* psxbios.c */; };
- 71F4C5A00FDED12800529849 /* psxcounters.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F4C5770FDED12800529849 /* psxcounters.c */; };
- 71F4C5A20FDED12800529849 /* psxdma.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F4C5790FDED12800529849 /* psxdma.c */; };
- 71F4C5A40FDED12800529849 /* psxhle.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F4C57B0FDED12800529849 /* psxhle.c */; };
- 71F4C5A60FDED12800529849 /* psxhw.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F4C57D0FDED12800529849 /* psxhw.c */; };
- 71F4C5A80FDED12800529849 /* psxinterpreter.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F4C57F0FDED12800529849 /* psxinterpreter.c */; };
- 71F4C5A90FDED12800529849 /* psxmem.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F4C5800FDED12800529849 /* psxmem.c */; };
- 71F4C5AB0FDED12800529849 /* r3000a.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F4C5820FDED12800529849 /* r3000a.c */; };
- 71F4C5AD0FDED12800529849 /* sio.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F4C5840FDED12800529849 /* sio.c */; };
- 71F4C5AF0FDED12800529849 /* spu.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F4C5860FDED12800529849 /* spu.c */; };
- 71F4C5B90FDED16D00529849 /* iR3000A.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F4C5B50FDED16D00529849 /* iR3000A.c */; };
- 71F4C5BA0FDED16D00529849 /* ix86.c in Sources */ = {isa = PBXBuildFile; fileRef = 71F4C5B60FDED16D00529849 /* ix86.c */; };
-/* End PBXBuildFile section */
-
-/* Begin PBXBuildRule section */
- 2BB3D6D005427FE200831ACB /* PBXBuildRule */ = {
- isa = PBXBuildRule;
- compilerSpec = com.apple.compilers.gcc;
- fileType = sourcecode.c;
- isEditable = 1;
- outputFiles = (
- );
- };
- 2BD707B705559AE300CB5D9B /* PBXBuildRule */ = {
- isa = PBXBuildRule;
- compilerSpec = com.apple.compilers.gcc;
- filePatterns = pasm.s;
- fileType = sourcecode.asm;
- isEditable = 1;
- outputFiles = (
- "$(DERIVED_FILES_DIR)/$(INPUT_FILE_BASE).o",
- );
- script = "as -o $(DERIVED_FILES_DIR)/$(INPUT_FILE_BASE).o $(INPUT_FILE_PATH)";
- };
-/* End PBXBuildRule section */
-
-/* Begin PBXContainerItemProxy section */
- 713CB2DD11FC49720033B6A8 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 71F93F6311FB8E9D007A5A7C /* DFCdrom.xcodeproj */;
- proxyType = 1;
- remoteGlobalIDString = 8D57630D048677EA00EA77CD;
- remoteInfo = DFCdrom;
- };
- 71AD2DD010C356FD00365243 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 71AD2DC710C356FD00365243 /* PeopsSPU.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 8D576316048677EA00EA77CD;
- remoteInfo = PeopsSPU;
- };
- 71AD2DDB10C3570900365243 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 71AD2DD210C3570900365243 /* PeopsSoftGPU.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 2BAF50930632BB1A00DB9A16;
- remoteInfo = gpuPeopsSoftGL;
- };
- 71AD2DE810C3572200365243 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 71AD2DC710C356FD00365243 /* PeopsSPU.xcodeproj */;
- proxyType = 1;
- remoteGlobalIDString = 8D57630D048677EA00EA77CD;
- remoteInfo = PeopsSPU;
- };
- 71AD2DEA10C3572500365243 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 71AD2DD210C3570900365243 /* PeopsSoftGPU.xcodeproj */;
- proxyType = 1;
- remoteGlobalIDString = 2BAF50920632BB1A00DB9A16;
- remoteInfo = gpuPeopsSoftGL;
- };
- 71D888D3130F04DC00F150FF /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 71D888CE130F04DC00F150FF /* PeopsXGL.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 2BAF50930632BB1A00DB9A16;
- remoteInfo = gpuPeopsXGL;
- };
- 71D88A00130F090400F150FF /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 71D888CE130F04DC00F150FF /* PeopsXGL.xcodeproj */;
- proxyType = 1;
- remoteGlobalIDString = 2BAF50920632BB1A00DB9A16;
- remoteInfo = gpuPeopsXGL;
- };
- 71F2C0851200B69B00322AD9 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 71F2C07E1200B69B00322AD9 /* DFInput.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 8D576316048677EA00EA77CD;
- remoteInfo = DFInput;
- };
- 71F2C0BB1200B75100322AD9 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 71F2C07E1200B69B00322AD9 /* DFInput.xcodeproj */;
- proxyType = 1;
- remoteGlobalIDString = 8D57630D048677EA00EA77CD;
- remoteInfo = DFInput;
- };
- 71F93F6B11FB8E9D007A5A7C /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 71F93F6311FB8E9D007A5A7C /* DFCdrom.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = 8D576316048677EA00EA77CD;
- remoteInfo = DFCdrom;
- };
-/* End PBXContainerItemProxy section */
-
-/* Begin PBXCopyFilesBuildPhase section */
- 71AD2DF010C3573400365243 /* Copy PlugIns */ = {
- isa = PBXCopyFilesBuildPhase;
- buildActionMask = 2147483647;
- dstPath = "";
- dstSubfolderSpec = 13;
- files = (
- 71D888D6130F04F100F150FF /* PeopsXGL.psxplugin in Copy PlugIns */,
- 71F2C0881200B6B000322AD9 /* DFInput.psxplugin in Copy PlugIns */,
- 713CB2E411FC49DA0033B6A8 /* DFCdrom.psxplugin in Copy PlugIns */,
- 71AD2DF510C3575C00365243 /* PeopsSoftGL.psxplugin in Copy PlugIns */,
- 71AD2DF410C3575300365243 /* PeopsSPU.psxplugin in Copy PlugIns */,
- );
- name = "Copy PlugIns";
- runOnlyForDeploymentPostprocessing = 0;
- };
-/* End PBXCopyFilesBuildPhase section */
-
-/* Begin PBXFileReference section */
- 2B02C04304E145D000880C5B /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = "<absolute>"; };
- 2B143D01078A2CBD00AF745A /* PCSX.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = PCSX.icns; sourceTree = "<group>"; };
- 2B143D02078A2CBD00AF745A /* pcsxfreeze.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = pcsxfreeze.icns; sourceTree = "<group>"; };
- 2B143D03078A2CBD00AF745A /* pcsxmemcard.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = pcsxmemcard.icns; sourceTree = "<group>"; };
- 2B143D04078A2CBD00AF745A /* psxbios.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = psxbios.icns; sourceTree = "<group>"; };
- 2B143D05078A2CBD00AF745A /* psxplugin.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = psxplugin.icns; sourceTree = "<group>"; };
- 2B2189D204D96C7A00179945 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = /System/Library/Frameworks/CoreFoundation.framework; sourceTree = "<absolute>"; };
- 2B3E356A06937D1C00763C7D /* PcsxPluginDocument.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PcsxPluginDocument.h; sourceTree = "<group>"; };
- 2B3E356B06937D1C00763C7D /* PcsxPluginDocument.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PcsxPluginDocument.m; sourceTree = "<group>"; };
- 2B3E35BB069384D100763C7D /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = AddPluginSheet.nib; sourceTree = "<group>"; };
- 2B4DE98D05FF9307003EFEF0 /* PluginController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PluginController.h; sourceTree = "<group>"; };
- 2B4DE98E05FF9307003EFEF0 /* PluginController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = PluginController.m; sourceTree = "<group>"; };
- 2B690C760635C65C00CDA575 /* ExceptionHandling.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ExceptionHandling.framework; path = /System/Library/Frameworks/ExceptionHandling.framework; sourceTree = "<absolute>"; };
- 2B6E8AAE04C832040017A3B1 /* System.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = System.framework; path = /System/Library/Frameworks/System.framework; sourceTree = "<absolute>"; };
- 2B6E8AB404C8327C0017A3B1 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = /System/Library/Frameworks/IOKit.framework; sourceTree = "<absolute>"; };
- 2B75FD3C051C56D200D12034 /* PcsxController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PcsxController.h; sourceTree = "<group>"; };
- 2B75FD3D051C56D200D12034 /* PcsxController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = PcsxController.m; sourceTree = "<group>"; };
- 2B75FD4A051C8A7400D12034 /* ConfigurationController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ConfigurationController.h; sourceTree = "<group>"; };
- 2B75FD4B051C8A7400D12034 /* ConfigurationController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = ConfigurationController.m; sourceTree = "<group>"; };
- 2B976C00074C14B4007C050A /* Kernel.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Kernel.framework; path = /System/Library/Frameworks/Kernel.framework; sourceTree = "<absolute>"; };
- 2BA178A505148D9D0026D74D /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
- 2BA178B10514CE260026D74D /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = Configuration.nib; sourceTree = "<group>"; };
- 2BA178B30514CE260026D74D /* English */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = English; path = InfoPlist.strings; sourceTree = "<group>"; };
- 2BA178B50514CE260026D74D /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = PCSX.nib; sourceTree = "<group>"; };
- 2BA44360052DB2EA00E21DDD /* PcsxPlugin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PcsxPlugin.h; sourceTree = "<group>"; };
- 2BA44361052DB2EA00E21DDD /* PcsxPlugin.m */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.objc; path = PcsxPlugin.m; sourceTree = "<group>"; tabWidth = 4; usesTabs = 0; };
- 2BB3D6CF05427FE200831ACB /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
- 2BB3D6D105427FE200831ACB /* PCSX.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = PCSX.app; sourceTree = BUILT_PRODUCTS_DIR; };
- 2BBB1126051DC00500B84448 /* PluginList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PluginList.h; sourceTree = "<group>"; };
- 2BBB1127051DC00500B84448 /* PluginList.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PluginList.m; sourceTree = "<group>"; };
- 2BBB1787051E0D9700B84448 /* English */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = English; path = Credits.rtf; sourceTree = "<group>"; };
- 2BBB1791051E113B00B84448 /* EmuThread.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EmuThread.h; sourceTree = "<group>"; };
- 2BBB1792051E113B00B84448 /* EmuThread.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EmuThread.m; sourceTree = "<group>"; };
- 2BBB17DA051E4D0F00B84448 /* Plugin.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = Plugin.c; sourceTree = SOURCE_ROOT; };
- 2BC4786204C7FD3600CAB520 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
- 556A147B12B6DE1A007DE998 /* pasm.s */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; path = pasm.s; sourceTree = "<group>"; };
- 556A147C12B6DE1A007DE998 /* pGte.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = pGte.h; sourceTree = "<group>"; };
- 556A147D12B6DE1A007DE998 /* ppc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ppc.c; sourceTree = "<group>"; };
- 556A147E12B6DE1A007DE998 /* ppc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ppc.h; sourceTree = "<group>"; };
- 556A147F12B6DE1A007DE998 /* ppc_mnemonics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ppc_mnemonics.h; sourceTree = "<group>"; };
- 556A148012B6DE1A007DE998 /* pR3000A.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = pR3000A.c; sourceTree = "<group>"; };
- 556A148112B6DE1A007DE998 /* reguse.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = reguse.c; sourceTree = "<group>"; };
- 556A148212B6DE1A007DE998 /* reguse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = reguse.h; sourceTree = "<group>"; };
- 559366C012B694DF004ACC1E /* iGte.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = iGte.h; sourceTree = "<group>"; };
- 559366C112B694DF004ACC1E /* iR3000A-64.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "iR3000A-64.c"; sourceTree = "<group>"; };
- 559366C212B694DF004ACC1E /* ix86-64.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "ix86-64.c"; sourceTree = "<group>"; };
- 559366C312B694DF004ACC1E /* ix86-64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "ix86-64.h"; sourceTree = "<group>"; };
- 559366C412B694DF004ACC1E /* ix86_3dnow.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ix86_3dnow.c; sourceTree = "<group>"; };
- 559366C512B694DF004ACC1E /* ix86_cpudetect.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ix86_cpudetect.c; sourceTree = "<group>"; };
- 559366C612B694DF004ACC1E /* ix86_fpu.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ix86_fpu.c; sourceTree = "<group>"; };
- 559366C712B694DF004ACC1E /* ix86_mmx.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ix86_mmx.c; sourceTree = "<group>"; };
- 559366C812B694DF004ACC1E /* ix86_sse.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ix86_sse.c; sourceTree = "<group>"; };
- 712FD1E51093096F00575A92 /* debug.c */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.c; path = debug.c; sourceTree = "<group>"; };
- 712FD1E61093096F00575A92 /* socket.c */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.c; path = socket.c; sourceTree = "<group>"; };
- 712FD1E71093096F00575A92 /* socket.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; path = socket.h; sourceTree = "<group>"; };
- 713B530C110B75650002F164 /* ppf.c */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.c; path = ppf.c; sourceTree = "<group>"; };
- 713B530D110B75650002F164 /* ppf.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; path = ppf.h; sourceTree = "<group>"; };
- 7161C2810FDED6D000225F97 /* config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = config.h; sourceTree = "<group>"; };
- 7161C2970FDED75300225F97 /* ExtendedKeys.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ExtendedKeys.h; sourceTree = "<group>"; };
- 7192F428129C412E0042D946 /* gpu.c */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.c; path = gpu.c; sourceTree = "<group>"; };
- 7192F429129C412E0042D946 /* gpu.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; path = gpu.h; sourceTree = "<group>"; };
- 719594AF11AEFE8C004AD686 /* gte_divider.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; path = gte_divider.h; sourceTree = "<group>"; };
- 719594B011AEFE8C004AD686 /* psxcommon.c */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.c; path = psxcommon.c; sourceTree = "<group>"; };
- 71AD2DC710C356FD00365243 /* PeopsSPU.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = PeopsSPU.xcodeproj; path = plugins/DFSound/PeopsSPU.xcodeproj; sourceTree = SOURCE_ROOT; };
- 71AD2DD210C3570900365243 /* PeopsSoftGPU.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = PeopsSoftGPU.xcodeproj; path = plugins/DFXVideo/PeopsSoftGPU.xcodeproj; sourceTree = SOURCE_ROOT; };
- 71D888CE130F04DC00F150FF /* PeopsXGL.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = PeopsXGL.xcodeproj; path = plugins/PeopsXgl/PeopsXGL.xcodeproj; sourceTree = "<group>"; };
- 71F2C07E1200B69B00322AD9 /* DFInput.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = DFInput.xcodeproj; path = plugins/DFInput/DFInput.xcodeproj; sourceTree = "<group>"; };
- 71F4C5600FDED12800529849 /* cdriso.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = cdriso.c; sourceTree = "<group>"; };
- 71F4C5610FDED12800529849 /* cdriso.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cdriso.h; sourceTree = "<group>"; };
- 71F4C5620FDED12800529849 /* cdrom.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = cdrom.c; sourceTree = "<group>"; };
- 71F4C5630FDED12800529849 /* cdrom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cdrom.h; sourceTree = "<group>"; };
- 71F4C5640FDED12800529849 /* cheat.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = cheat.c; sourceTree = "<group>"; };
- 71F4C5650FDED12800529849 /* cheat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cheat.h; sourceTree = "<group>"; };
- 71F4C5660FDED12800529849 /* coff.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = coff.h; sourceTree = "<group>"; };
- 71F4C5670FDED12800529849 /* debug.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = debug.h; sourceTree = "<group>"; };
- 71F4C5680FDED12800529849 /* decode_xa.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = decode_xa.c; sourceTree = "<group>"; };
- 71F4C5690FDED12800529849 /* decode_xa.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = decode_xa.h; sourceTree = "<group>"; };
- 71F4C56A0FDED12800529849 /* disr3000a.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = disr3000a.c; sourceTree = "<group>"; };
- 71F4C56B0FDED12800529849 /* gte.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = gte.c; sourceTree = "<group>"; };
- 71F4C56C0FDED12800529849 /* gte.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gte.h; sourceTree = "<group>"; };
- 71F4C56D0FDED12800529849 /* mdec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mdec.c; sourceTree = "<group>"; };
- 71F4C56E0FDED12800529849 /* mdec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mdec.h; sourceTree = "<group>"; };
- 71F4C56F0FDED12800529849 /* misc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = misc.c; sourceTree = "<group>"; };
- 71F4C5700FDED12800529849 /* misc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = misc.h; sourceTree = "<group>"; };
- 71F4C5710FDED12800529849 /* plugins.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = plugins.c; sourceTree = "<group>"; };
- 71F4C5720FDED12800529849 /* plugins.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = plugins.h; sourceTree = "<group>"; };
- 71F4C5730FDED12800529849 /* psemu_plugin_defs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = psemu_plugin_defs.h; sourceTree = "<group>"; };
- 71F4C5740FDED12800529849 /* psxbios.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = psxbios.c; sourceTree = "<group>"; };
- 71F4C5750FDED12800529849 /* psxbios.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = psxbios.h; sourceTree = "<group>"; };
- 71F4C5760FDED12800529849 /* psxcommon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = psxcommon.h; sourceTree = "<group>"; };
- 71F4C5770FDED12800529849 /* psxcounters.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = psxcounters.c; sourceTree = "<group>"; };
- 71F4C5780FDED12800529849 /* psxcounters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = psxcounters.h; sourceTree = "<group>"; };
- 71F4C5790FDED12800529849 /* psxdma.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = psxdma.c; sourceTree = "<group>"; };
- 71F4C57A0FDED12800529849 /* psxdma.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = psxdma.h; sourceTree = "<group>"; };
- 71F4C57B0FDED12800529849 /* psxhle.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = psxhle.c; sourceTree = "<group>"; };
- 71F4C57C0FDED12800529849 /* psxhle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = psxhle.h; sourceTree = "<group>"; };
- 71F4C57D0FDED12800529849 /* psxhw.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = psxhw.c; sourceTree = "<group>"; };
- 71F4C57E0FDED12800529849 /* psxhw.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = psxhw.h; sourceTree = "<group>"; };
- 71F4C57F0FDED12800529849 /* psxinterpreter.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = psxinterpreter.c; sourceTree = "<group>"; };
- 71F4C5800FDED12800529849 /* psxmem.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = psxmem.c; sourceTree = "<group>"; };
- 71F4C5810FDED12800529849 /* psxmem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = psxmem.h; sourceTree = "<group>"; };
- 71F4C5820FDED12800529849 /* r3000a.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = r3000a.c; sourceTree = "<group>"; };
- 71F4C5830FDED12800529849 /* r3000a.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = r3000a.h; sourceTree = "<group>"; };
- 71F4C5840FDED12800529849 /* sio.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sio.c; sourceTree = "<group>"; };
- 71F4C5850FDED12800529849 /* sio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sio.h; sourceTree = "<group>"; };
- 71F4C5860FDED12800529849 /* spu.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = spu.c; sourceTree = "<group>"; };
- 71F4C5870FDED12800529849 /* spu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = spu.h; sourceTree = "<group>"; };
- 71F4C5880FDED12800529849 /* system.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = system.h; sourceTree = "<group>"; };
- 71F4C5B40FDED16D00529849 /* iGte.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = iGte.h; sourceTree = "<group>"; };
- 71F4C5B50FDED16D00529849 /* iR3000A.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = iR3000A.c; sourceTree = "<group>"; };
- 71F4C5B60FDED16D00529849 /* ix86.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ix86.c; sourceTree = "<group>"; };
- 71F4C5B70FDED16D00529849 /* ix86.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ix86.h; sourceTree = "<group>"; };
- 71F703A611B3A673007DD5C5 /* sjisfont.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; path = sjisfont.h; sourceTree = "<group>"; };
- 71F93F6311FB8E9D007A5A7C /* DFCdrom.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = DFCdrom.xcodeproj; path = plugins/DFCdrom/DFCdrom.xcodeproj; sourceTree = "<group>"; };
-/* End PBXFileReference section */
-
-/* Begin PBXFrameworksBuildPhase section */
- 2BB3D6C505427FE200831ACB /* Frameworks */ = {
- isa = PBXFrameworksBuildPhase;
- buildActionMask = 2147483647;
- files = (
- 2BB3D6C605427FE200831ACB /* Cocoa.framework in Frameworks */,
- 2BB3D6C705427FE200831ACB /* System.framework in Frameworks */,
- 2BB3D6C805427FE200831ACB /* IOKit.framework in Frameworks */,
- 2B400D910789F58A00BA271E /* Carbon.framework in Frameworks */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
-/* End PBXFrameworksBuildPhase section */
-
-/* Begin PBXGroup section */
- 0249A662FF388D9811CA2CEA /* External Frameworks and Libraries */ = {
- isa = PBXGroup;
- children = (
- 2B976C00074C14B4007C050A /* Kernel.framework */,
- 2B02C04304E145D000880C5B /* Carbon.framework */,
- 2BC4786204C7FD3600CAB520 /* Cocoa.framework */,
- 2B6E8AAE04C832040017A3B1 /* System.framework */,
- 2B6E8AB404C8327C0017A3B1 /* IOKit.framework */,
- 2B2189D204D96C7A00179945 /* CoreFoundation.framework */,
- 2B690C760635C65C00CDA575 /* ExceptionHandling.framework */,
- );
- name = "External Frameworks and Libraries";
- sourceTree = "<group>";
- };
- 08FB7794FE84155DC02AAC07 /* Pcsx */ = {
- isa = PBXGroup;
- children = (
- 08FB7795FE84155DC02AAC07 /* Source */,
- 0249A662FF388D9811CA2CEA /* External Frameworks and Libraries */,
- 1AB674ADFE9D54B511CA2CBB /* Products */,
- 2BB3D6CF05427FE200831ACB /* Info.plist */,
- );
- name = Pcsx;
- sourceTree = "<group>";
- };
- 08FB7795FE84155DC02AAC07 /* Source */ = {
- isa = PBXGroup;
- children = (
- 2BCE23B204C6B52C007C2DA3 /* libpcsxcore */,
- 2BC4787804C7FDBD00CAB520 /* MacOSX */,
- );
- name = Source;
- sourceTree = "<group>";
- };
- 1AB674ADFE9D54B511CA2CBB /* Products */ = {
- isa = PBXGroup;
- children = (
- 2BBD6C1D04C893F500A83E33 /* PlugIns */,
- 2BB3D6D105427FE200831ACB /* PCSX.app */,
- );
- name = Products;
- sourceTree = "<group>";
- };
- 2B143D00078A2CBD00AF745A /* icons */ = {
- isa = PBXGroup;
- children = (
- 2B143D01078A2CBD00AF745A /* PCSX.icns */,
- 2B143D02078A2CBD00AF745A /* pcsxfreeze.icns */,
- 2B143D03078A2CBD00AF745A /* pcsxmemcard.icns */,
- 2B143D04078A2CBD00AF745A /* psxbios.icns */,
- 2B143D05078A2CBD00AF745A /* psxplugin.icns */,
- );
- path = icons;
- sourceTree = "<group>";
- };
- 2BA178AD0514CE260026D74D /* Resources */ = {
- isa = PBXGroup;
- children = (
- 2BBB1786051E0D9700B84448 /* Credits.rtf */,
- 2BA178B00514CE260026D74D /* Configuration.nib */,
- 2BA178B20514CE260026D74D /* InfoPlist.strings */,
- 2BA178B40514CE260026D74D /* PCSX.nib */,
- 2B3E35BA069384D100763C7D /* AddPluginSheet.nib */,
- );
- name = Resources;
- path = English.lproj;
- sourceTree = "<group>";
- };
- 2BBD6C1D04C893F500A83E33 /* PlugIns */ = {
- isa = PBXGroup;
- children = (
- 71D888CE130F04DC00F150FF /* PeopsXGL.xcodeproj */,
- 71F2C07E1200B69B00322AD9 /* DFInput.xcodeproj */,
- 71F93F6311FB8E9D007A5A7C /* DFCdrom.xcodeproj */,
- 71AD2DD210C3570900365243 /* PeopsSoftGPU.xcodeproj */,
- 71AD2DC710C356FD00365243 /* PeopsSPU.xcodeproj */,
- );
- name = PlugIns;
- sourceTree = "<group>";
- };
- 2BC4787804C7FDBD00CAB520 /* MacOSX */ = {
- isa = PBXGroup;
- children = (
- 2BA178AD0514CE260026D74D /* Resources */,
- 2B143D00078A2CBD00AF745A /* icons */,
- 7161C2810FDED6D000225F97 /* config.h */,
- 2BA178A505148D9D0026D74D /* main.m */,
- 2BBB17DA051E4D0F00B84448 /* Plugin.c */,
- 2B75FD3C051C56D200D12034 /* PcsxController.h */,
- 2B75FD3D051C56D200D12034 /* PcsxController.m */,
- 2B75FD4A051C8A7400D12034 /* ConfigurationController.h */,
- 2B75FD4B051C8A7400D12034 /* ConfigurationController.m */,
- 2B4DE98D05FF9307003EFEF0 /* PluginController.h */,
- 2B4DE98E05FF9307003EFEF0 /* PluginController.m */,
- 2BBB1791051E113B00B84448 /* EmuThread.h */,
- 2BBB1792051E113B00B84448 /* EmuThread.m */,
- 7161C2970FDED75300225F97 /* ExtendedKeys.h */,
- 2BBB1126051DC00500B84448 /* PluginList.h */,
- 2BBB1127051DC00500B84448 /* PluginList.m */,
- 2BA44360052DB2EA00E21DDD /* PcsxPlugin.h */,
- 2BA44361052DB2EA00E21DDD /* PcsxPlugin.m */,
- 2B3E356A06937D1C00763C7D /* PcsxPluginDocument.h */,
- 2B3E356B06937D1C00763C7D /* PcsxPluginDocument.m */,
- );
- name = MacOSX;
- sourceTree = "<group>";
- };
- 2BCE23B204C6B52C007C2DA3 /* libpcsxcore */ = {
- isa = PBXGroup;
- children = (
- 71F4C5B30FDED15800529849 /* ix86 */,
- 559366BF12B694DF004ACC1E /* ix86_64 */,
- 556A147A12B6DE1A007DE998 /* ppc */,
- 71F4C5600FDED12800529849 /* cdriso.c */,
- 71F4C5610FDED12800529849 /* cdriso.h */,
- 71F4C5620FDED12800529849 /* cdrom.c */,
- 71F4C5630FDED12800529849 /* cdrom.h */,
- 71F4C5640FDED12800529849 /* cheat.c */,
- 71F4C5650FDED12800529849 /* cheat.h */,
- 71F4C5660FDED12800529849 /* coff.h */,
- 712FD1E51093096F00575A92 /* debug.c */,
- 71F4C5670FDED12800529849 /* debug.h */,
- 71F4C5680FDED12800529849 /* decode_xa.c */,
- 71F4C5690FDED12800529849 /* decode_xa.h */,
- 71F4C56A0FDED12800529849 /* disr3000a.c */,
- 7192F428129C412E0042D946 /* gpu.c */,
- 7192F429129C412E0042D946 /* gpu.h */,
- 71F4C56B0FDED12800529849 /* gte.c */,
- 71F4C56C0FDED12800529849 /* gte.h */,
- 719594AF11AEFE8C004AD686 /* gte_divider.h */,
- 71F4C56D0FDED12800529849 /* mdec.c */,
- 71F4C56E0FDED12800529849 /* mdec.h */,
- 71F4C56F0FDED12800529849 /* misc.c */,
- 71F4C5700FDED12800529849 /* misc.h */,
- 71F4C5710FDED12800529849 /* plugins.c */,
- 71F4C5720FDED12800529849 /* plugins.h */,
- 713B530C110B75650002F164 /* ppf.c */,
- 713B530D110B75650002F164 /* ppf.h */,
- 71F4C5730FDED12800529849 /* psemu_plugin_defs.h */,
- 71F4C5740FDED12800529849 /* psxbios.c */,
- 71F4C5750FDED12800529849 /* psxbios.h */,
- 719594B011AEFE8C004AD686 /* psxcommon.c */,
- 71F4C5760FDED12800529849 /* psxcommon.h */,
- 71F4C5770FDED12800529849 /* psxcounters.c */,
- 71F4C5780FDED12800529849 /* psxcounters.h */,
- 71F4C5790FDED12800529849 /* psxdma.c */,
- 71F4C57A0FDED12800529849 /* psxdma.h */,
- 71F4C57B0FDED12800529849 /* psxhle.c */,
- 71F4C57C0FDED12800529849 /* psxhle.h */,
- 71F4C57D0FDED12800529849 /* psxhw.c */,
- 71F4C57E0FDED12800529849 /* psxhw.h */,
- 71F4C57F0FDED12800529849 /* psxinterpreter.c */,
- 71F4C5800FDED12800529849 /* psxmem.c */,
- 71F4C5810FDED12800529849 /* psxmem.h */,
- 71F4C5820FDED12800529849 /* r3000a.c */,
- 71F4C5830FDED12800529849 /* r3000a.h */,
- 71F4C5840FDED12800529849 /* sio.c */,
- 71F4C5850FDED12800529849 /* sio.h */,
- 71F703A611B3A673007DD5C5 /* sjisfont.h */,
- 712FD1E61093096F00575A92 /* socket.c */,
- 712FD1E71093096F00575A92 /* socket.h */,
- 71F4C5860FDED12800529849 /* spu.c */,
- 71F4C5870FDED12800529849 /* spu.h */,
- 71F4C5880FDED12800529849 /* system.h */,
- );
- name = libpcsxcore;
- path = ../libpcsxcore;
- sourceTree = "<group>";
- };
- 556A147A12B6DE1A007DE998 /* ppc */ = {
- isa = PBXGroup;
- children = (
- 556A147B12B6DE1A007DE998 /* pasm.s */,
- 556A147C12B6DE1A007DE998 /* pGte.h */,
- 556A147D12B6DE1A007DE998 /* ppc.c */,
- 556A147E12B6DE1A007DE998 /* ppc.h */,
- 556A147F12B6DE1A007DE998 /* ppc_mnemonics.h */,
- 556A148012B6DE1A007DE998 /* pR3000A.c */,
- 556A148112B6DE1A007DE998 /* reguse.c */,
- 556A148212B6DE1A007DE998 /* reguse.h */,
- );
- path = ppc;
- sourceTree = "<group>";
- };
- 559366BF12B694DF004ACC1E /* ix86_64 */ = {
- isa = PBXGroup;
- children = (
- 559366C012B694DF004ACC1E /* iGte.h */,
- 559366C112B694DF004ACC1E /* iR3000A-64.c */,
- 559366C212B694DF004ACC1E /* ix86-64.c */,
- 559366C312B694DF004ACC1E /* ix86-64.h */,
- 559366C412B694DF004ACC1E /* ix86_3dnow.c */,
- 559366C512B694DF004ACC1E /* ix86_cpudetect.c */,
- 559366C612B694DF004ACC1E /* ix86_fpu.c */,
- 559366C712B694DF004ACC1E /* ix86_mmx.c */,
- 559366C812B694DF004ACC1E /* ix86_sse.c */,
- );
- path = ix86_64;
- sourceTree = "<group>";
- };
- 71AD2DCD10C356FD00365243 /* Products */ = {
- isa = PBXGroup;
- children = (
- 71AD2DD110C356FD00365243 /* PeopsSPU.psxplugin */,
- );
- name = Products;
- sourceTree = "<group>";
- };
- 71AD2DD810C3570900365243 /* Products */ = {
- isa = PBXGroup;
- children = (
- 71AD2DDC10C3570900365243 /* PeopsSoftGL.psxplugin */,
- );
- name = Products;
- sourceTree = "<group>";
- };
- 71D888CF130F04DC00F150FF /* Products */ = {
- isa = PBXGroup;
- children = (
- 71D888D4130F04DC00F150FF /* PeopsXGL.psxplugin */,
- );
- name = Products;
- sourceTree = "<group>";
- };
- 71F2C07F1200B69B00322AD9 /* Products */ = {
- isa = PBXGroup;
- children = (
- 71F2C0861200B69B00322AD9 /* DFInput.psxplugin */,
- );
- name = Products;
- sourceTree = "<group>";
- };
- 71F4C5B30FDED15800529849 /* ix86 */ = {
- isa = PBXGroup;
- children = (
- 71F4C5B40FDED16D00529849 /* iGte.h */,
- 71F4C5B50FDED16D00529849 /* iR3000A.c */,
- 71F4C5B60FDED16D00529849 /* ix86.c */,
- 71F4C5B70FDED16D00529849 /* ix86.h */,
- );
- path = ix86;
- sourceTree = "<group>";
- };
- 71F93F6411FB8E9D007A5A7C /* Products */ = {
- isa = PBXGroup;
- children = (
- 71F93F6C11FB8E9D007A5A7C /* DFCdrom.psxplugin */,
- );
- name = Products;
- sourceTree = "<group>";
- };
-/* End PBXGroup section */
-
-/* Begin PBXNativeTarget section */
- 2BB3D68205427FE200831ACB /* PCSX */ = {
- isa = PBXNativeTarget;
- buildConfigurationList = 71F353F30FD98DFE00CBEC28 /* Build configuration list for PBXNativeTarget "PCSX" */;
- buildPhases = (
- 2BB3D6A205427FE200831ACB /* Resources */,
- 2BB3D6A805427FE200831ACB /* Sources */,
- 2BB3D6C505427FE200831ACB /* Frameworks */,
- 71AD2DF010C3573400365243 /* Copy PlugIns */,
- );
- buildRules = (
- 2BD707B705559AE300CB5D9B /* PBXBuildRule */,
- 2BB3D6D005427FE200831ACB /* PBXBuildRule */,
- );
- dependencies = (
- 71AD2DE910C3572200365243 /* PBXTargetDependency */,
- 71AD2DEB10C3572500365243 /* PBXTargetDependency */,
- 713CB2DE11FC49720033B6A8 /* PBXTargetDependency */,
- 71F2C0BC1200B75100322AD9 /* PBXTargetDependency */,
- 71D88A01130F090400F150FF /* PBXTargetDependency */,
- );
- name = PCSX;
- productInstallPath = "$(USER_APPS_DIR)";
- productName = "Pcsx-MacOSX";
- productReference = 2BB3D6D105427FE200831ACB /* PCSX.app */;
- productType = "com.apple.product-type.application";
- };
-/* End PBXNativeTarget section */
-
-/* Begin PBXProject section */
- 08FB7793FE84155DC02AAC07 /* Project object */ = {
- isa = PBXProject;
- buildConfigurationList = 71F353F80FD98DFE00CBEC28 /* Build configuration list for PBXProject "Pcsx" */;
- compatibilityVersion = "Xcode 2.4";
- developmentRegion = English;
- hasScannedForEncodings = 1;
- knownRegions = (
- English,
- Japanese,
- French,
- German,
- );
- mainGroup = 08FB7794FE84155DC02AAC07 /* Pcsx */;
- projectDirPath = "";
- projectReferences = (
- {
- ProductGroup = 71F93F6411FB8E9D007A5A7C /* Products */;
- ProjectRef = 71F93F6311FB8E9D007A5A7C /* DFCdrom.xcodeproj */;
- },
- {
- ProductGroup = 71F2C07F1200B69B00322AD9 /* Products */;
- ProjectRef = 71F2C07E1200B69B00322AD9 /* DFInput.xcodeproj */;
- },
- {
- ProductGroup = 71AD2DD810C3570900365243 /* Products */;
- ProjectRef = 71AD2DD210C3570900365243 /* PeopsSoftGPU.xcodeproj */;
- },
- {
- ProductGroup = 71AD2DCD10C356FD00365243 /* Products */;
- ProjectRef = 71AD2DC710C356FD00365243 /* PeopsSPU.xcodeproj */;
- },
- {
- ProductGroup = 71D888CF130F04DC00F150FF /* Products */;
- ProjectRef = 71D888CE130F04DC00F150FF /* PeopsXGL.xcodeproj */;
- },
- );
- projectRoot = "";
- targets = (
- 2BB3D68205427FE200831ACB /* PCSX */,
- );
- };
-/* End PBXProject section */
-
-/* Begin PBXReferenceProxy section */
- 71AD2DD110C356FD00365243 /* PeopsSPU.psxplugin */ = {
- isa = PBXReferenceProxy;
- fileType = wrapper.cfbundle;
- path = PeopsSPU.psxplugin;
- remoteRef = 71AD2DD010C356FD00365243 /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- 71AD2DDC10C3570900365243 /* PeopsSoftGL.psxplugin */ = {
- isa = PBXReferenceProxy;
- fileType = wrapper.cfbundle;
- path = PeopsSoftGL.psxplugin;
- remoteRef = 71AD2DDB10C3570900365243 /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- 71D888D4130F04DC00F150FF /* PeopsXGL.psxplugin */ = {
- isa = PBXReferenceProxy;
- fileType = wrapper.cfbundle;
- path = PeopsXGL.psxplugin;
- remoteRef = 71D888D3130F04DC00F150FF /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- 71F2C0861200B69B00322AD9 /* DFInput.psxplugin */ = {
- isa = PBXReferenceProxy;
- fileType = wrapper.cfbundle;
- path = DFInput.psxplugin;
- remoteRef = 71F2C0851200B69B00322AD9 /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- 71F93F6C11FB8E9D007A5A7C /* DFCdrom.psxplugin */ = {
- isa = PBXReferenceProxy;
- fileType = wrapper.cfbundle;
- path = DFCdrom.psxplugin;
- remoteRef = 71F93F6B11FB8E9D007A5A7C /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
-/* End PBXReferenceProxy section */
-
-/* Begin PBXResourcesBuildPhase section */
- 2BB3D6A205427FE200831ACB /* Resources */ = {
- isa = PBXResourcesBuildPhase;
- buildActionMask = 2147483647;
- files = (
- 2BB3D6A305427FE200831ACB /* Configuration.nib in Resources */,
- 2BB3D6A405427FE200831ACB /* InfoPlist.strings in Resources */,
- 2BB3D6A505427FE200831ACB /* PCSX.nib in Resources */,
- 2BB3D6A705427FE200831ACB /* Credits.rtf in Resources */,
- 2B3E35BC069384D100763C7D /* AddPluginSheet.nib in Resources */,
- 2B143D06078A2CBD00AF745A /* PCSX.icns in Resources */,
- 2B143D07078A2CBD00AF745A /* pcsxfreeze.icns in Resources */,
- 2B143D08078A2CBD00AF745A /* pcsxmemcard.icns in Resources */,
- 2B143D09078A2CBD00AF745A /* psxbios.icns in Resources */,
- 2B143D0A078A2CBD00AF745A /* psxplugin.icns in Resources */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
-/* End PBXResourcesBuildPhase section */
-
-/* Begin PBXSourcesBuildPhase section */
- 2BB3D6A805427FE200831ACB /* Sources */ = {
- isa = PBXSourcesBuildPhase;
- buildActionMask = 2147483647;
- files = (
- 2BB3D6BE05427FE200831ACB /* main.m in Sources */,
- 2BB3D6BF05427FE200831ACB /* PcsxController.m in Sources */,
- 2BB3D6C005427FE200831ACB /* ConfigurationController.m in Sources */,
- 2BB3D6C105427FE200831ACB /* PluginList.m in Sources */,
- 2BB3D6C205427FE200831ACB /* EmuThread.m in Sources */,
- 2BB3D6C305427FE200831ACB /* Plugin.c in Sources */,
- 2BB3D6C405427FE200831ACB /* PcsxPlugin.m in Sources */,
- 2B4DE99205FF9307003EFEF0 /* PluginController.m in Sources */,
- 2B3E356D06937D1C00763C7D /* PcsxPluginDocument.m in Sources */,
- 71F4C5890FDED12800529849 /* cdriso.c in Sources */,
- 71F4C58B0FDED12800529849 /* cdrom.c in Sources */,
- 71F4C58D0FDED12800529849 /* cheat.c in Sources */,
- 71F4C5910FDED12800529849 /* decode_xa.c in Sources */,
- 71F4C5930FDED12800529849 /* disr3000a.c in Sources */,
- 71F4C5940FDED12800529849 /* gte.c in Sources */,
- 71F4C5960FDED12800529849 /* mdec.c in Sources */,
- 71F4C5980FDED12800529849 /* misc.c in Sources */,
- 71F4C59A0FDED12800529849 /* plugins.c in Sources */,
- 71F4C59D0FDED12800529849 /* psxbios.c in Sources */,
- 71F4C5A00FDED12800529849 /* psxcounters.c in Sources */,
- 71F4C5A20FDED12800529849 /* psxdma.c in Sources */,
- 71F4C5A40FDED12800529849 /* psxhle.c in Sources */,
- 71F4C5A60FDED12800529849 /* psxhw.c in Sources */,
- 71F4C5A80FDED12800529849 /* psxinterpreter.c in Sources */,
- 71F4C5A90FDED12800529849 /* psxmem.c in Sources */,
- 71F4C5AB0FDED12800529849 /* r3000a.c in Sources */,
- 71F4C5AD0FDED12800529849 /* sio.c in Sources */,
- 71F4C5AF0FDED12800529849 /* spu.c in Sources */,
- 71F4C5B90FDED16D00529849 /* iR3000A.c in Sources */,
- 71F4C5BA0FDED16D00529849 /* ix86.c in Sources */,
- 712FD1E81093096F00575A92 /* debug.c in Sources */,
- 712FD1E91093096F00575A92 /* socket.c in Sources */,
- 713B530E110B75650002F164 /* ppf.c in Sources */,
- 719594B211AEFE8C004AD686 /* psxcommon.c in Sources */,
- 7192F42A129C412E0042D946 /* gpu.c in Sources */,
- 559366CA12B694DF004ACC1E /* iR3000A-64.c in Sources */,
- 559366CB12B694DF004ACC1E /* ix86-64.c in Sources */,
- 559366CD12B694DF004ACC1E /* ix86_cpudetect.c in Sources */,
- 559366CE12B694DF004ACC1E /* ix86_fpu.c in Sources */,
- 559366CF12B694DF004ACC1E /* ix86_mmx.c in Sources */,
- 559366D012B694DF004ACC1E /* ix86_sse.c in Sources */,
- 556A148312B6DE1A007DE998 /* pasm.s in Sources */,
- 556A148412B6DE1A007DE998 /* ppc.c in Sources */,
- 556A148512B6DE1A007DE998 /* pR3000A.c in Sources */,
- 556A148612B6DE1A007DE998 /* reguse.c in Sources */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
-/* End PBXSourcesBuildPhase section */
-
-/* Begin PBXTargetDependency section */
- 713CB2DE11FC49720033B6A8 /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- name = DFCdrom;
- targetProxy = 713CB2DD11FC49720033B6A8 /* PBXContainerItemProxy */;
- };
- 71AD2DE910C3572200365243 /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- name = PeopsSPU;
- targetProxy = 71AD2DE810C3572200365243 /* PBXContainerItemProxy */;
- };
- 71AD2DEB10C3572500365243 /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- name = gpuPeopsSoftGL;
- targetProxy = 71AD2DEA10C3572500365243 /* PBXContainerItemProxy */;
- };
- 71D88A01130F090400F150FF /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- name = gpuPeopsXGL;
- targetProxy = 71D88A00130F090400F150FF /* PBXContainerItemProxy */;
- };
- 71F2C0BC1200B75100322AD9 /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- name = DFInput;
- targetProxy = 71F2C0BB1200B75100322AD9 /* PBXContainerItemProxy */;
- };
-/* End PBXTargetDependency section */
-
-/* Begin PBXVariantGroup section */
- 2B3E35BA069384D100763C7D /* AddPluginSheet.nib */ = {
- isa = PBXVariantGroup;
- children = (
- 2B3E35BB069384D100763C7D /* English */,
- );
- name = AddPluginSheet.nib;
- sourceTree = "<group>";
- };
- 2BA178B00514CE260026D74D /* Configuration.nib */ = {
- isa = PBXVariantGroup;
- children = (
- 2BA178B10514CE260026D74D /* English */,
- );
- name = Configuration.nib;
- sourceTree = "<group>";
- };
- 2BA178B20514CE260026D74D /* InfoPlist.strings */ = {
- isa = PBXVariantGroup;
- children = (
- 2BA178B30514CE260026D74D /* English */,
- );
- name = InfoPlist.strings;
- sourceTree = "<group>";
- };
- 2BA178B40514CE260026D74D /* PCSX.nib */ = {
- isa = PBXVariantGroup;
- children = (
- 2BA178B50514CE260026D74D /* English */,
- );
- name = PCSX.nib;
- sourceTree = "<group>";
- };
- 2BBB1786051E0D9700B84448 /* Credits.rtf */ = {
- isa = PBXVariantGroup;
- children = (
- 2BBB1787051E0D9700B84448 /* English */,
- );
- name = Credits.rtf;
- sourceTree = "<group>";
- };
-/* End PBXVariantGroup section */
-
-/* Begin XCBuildConfiguration section */
- 71F353F40FD98DFE00CBEC28 /* Development */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- COPY_PHASE_STRIP = NO;
- DEBUGGING_SYMBOLS = YES;
- GCC_DYNAMIC_NO_PIC = NO;
- GCC_ENABLE_ASM_KEYWORD = YES;
- GCC_ENABLE_CPP_EXCEPTIONS = NO;
- GCC_ENABLE_FIX_AND_CONTINUE = YES;
- GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
- GCC_MODEL_TUNING = G3;
- GCC_OPTIMIZATION_LEVEL = 0;
- GCC_PREPROCESSOR_DEFINITIONS = (
- "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_1)",
- __MACOSX__,
- );
- GCC_PREPROCESSOR_DEFINITIONS_QUOTED_1 = "PCSX_VERSION=\\\"1.5\\\" XA_HACK=1";
- GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
- GCC_WARN_UNKNOWN_PRAGMAS = NO;
- INFOPLIST_FILE = Info.plist;
- OTHER_CFLAGS = (
- "-fomit-frame-pointer",
- "-funroll-loops",
- "-falign-loops=16",
- );
- OTHER_REZFLAGS = "";
- PRODUCT_NAME = PCSX;
- SECTORDER_FLAGS = "";
- WARNING_CFLAGS = "-Wmost";
- WRAPPER_EXTENSION = app;
- ZERO_LINK = NO;
- };
- name = Development;
- };
- 71F353F50FD98DFE00CBEC28 /* Deployment */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- COPY_PHASE_STRIP = YES;
- DEBUGGING_SYMBOLS = NO;
- GCC_DYNAMIC_NO_PIC = YES;
- GCC_ENABLE_ASM_KEYWORD = YES;
- GCC_ENABLE_CPP_EXCEPTIONS = NO;
- GCC_ENABLE_FIX_AND_CONTINUE = NO;
- GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
- GCC_MODEL_CPU = "";
- GCC_MODEL_TUNING = "";
- GCC_OPTIMIZATION_LEVEL = s;
- GCC_PREPROCESSOR_DEFINITIONS = (
- "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_1)",
- __MACOSX__,
- );
- GCC_PREPROCESSOR_DEFINITIONS_QUOTED_1 = "PCSX_VERSION=\\\"1.5\\\" XA_HACK=1";
- GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
- GCC_WARN_UNKNOWN_PRAGMAS = NO;
- INFOPLIST_FILE = Info.plist;
- OTHER_CFLAGS = (
- "-fomit-frame-pointer",
- "-funroll-loops",
- "-falign-loops=16",
- );
- OTHER_REZFLAGS = "";
- PRODUCT_NAME = PCSX;
- SECTORDER_FLAGS = "";
- WARNING_CFLAGS = "-Wmost";
- WRAPPER_EXTENSION = app;
- ZERO_LINK = NO;
- };
- name = Deployment;
- };
- 71F353F90FD98DFE00CBEC28 /* Development */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- GCC_MODEL_TUNING = "";
- GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
- HEADER_SEARCH_PATHS = (
- ../include,
- ../libpcsxcore,
- ../macosx,
- );
- MACOSX_DEPLOYMENT_TARGET = 10.4;
- ONLY_ACTIVE_ARCH_PRE_XCODE_3_1 = "$(NATIVE_ARCH_ACTUAL)";
- OTHER_LDFLAGS = (
- "-lz",
- "-lSystemStubs",
- );
- SDKROOT = "";
- };
- name = Development;
- };
- 71F353FA0FD98DFE00CBEC28 /* Deployment */ = {
- isa = XCBuildConfiguration;
- buildSettings = {
- ARCHS = (
- i386,
- ppc,
- );
- ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = "x86_64 i386 ppc";
- GCC_DYNAMIC_NO_PIC = YES;
- GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
- GCC_INLINES_ARE_PRIVATE_EXTERN = YES;
- GCC_MODEL_TUNING = "";
- GCC_OPTIMIZATION_LEVEL = 2;
- GCC_SYMBOLS_PRIVATE_EXTERN = YES;
- GCC_UNROLL_LOOPS = YES;
- GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
- HEADER_SEARCH_PATHS = (
- ../include,
- ../libpcsxcore,
- ../macosx,
- );
- MACOSX_DEPLOYMENT_TARGET = 10.4;
- OTHER_CFLAGS = "-fomit-frame-pointer";
- OTHER_LDFLAGS = (
- "-lz",
- "-lSystemStubs",
- );
- SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
- };
- name = Deployment;
- };
-/* End XCBuildConfiguration section */
-
-/* Begin XCConfigurationList section */
- 71F353F30FD98DFE00CBEC28 /* Build configuration list for PBXNativeTarget "PCSX" */ = {
- isa = XCConfigurationList;
- buildConfigurations = (
- 71F353F40FD98DFE00CBEC28 /* Development */,
- 71F353F50FD98DFE00CBEC28 /* Deployment */,
- );
- defaultConfigurationIsVisible = 0;
- defaultConfigurationName = Development;
- };
- 71F353F80FD98DFE00CBEC28 /* Build configuration list for PBXProject "Pcsx" */ = {
- isa = XCConfigurationList;
- buildConfigurations = (
- 71F353F90FD98DFE00CBEC28 /* Development */,
- 71F353FA0FD98DFE00CBEC28 /* Deployment */,
- );
- defaultConfigurationIsVisible = 0;
- defaultConfigurationName = Development;
- };
-/* End XCConfigurationList section */
- };
- rootObject = 08FB7793FE84155DC02AAC07 /* Project object */;
-}
diff --git a/macosx/PcsxController.h b/macosx/PcsxrController.h
index 70e81e19..f686021f 100644
--- a/macosx/PcsxController.h
+++ b/macosx/PcsxrController.h
@@ -1,10 +1,10 @@
-/* PcsxController */
+/* PcsxrController */
#import <Cocoa/Cocoa.h>
#import "EmuThread.h"
#import "PluginList.h"
-@interface PcsxController : NSObject
+@interface PcsxrController : NSObject
{
NSWindowController *preferencesController;
NSWindowController *memCardController;
diff --git a/macosx/PcsxController.m b/macosx/PcsxrController.m
index 0bb91449..83e8c9da 100644
--- a/macosx/PcsxController.m
+++ b/macosx/PcsxrController.m
@@ -1,5 +1,5 @@
#import <Cocoa/Cocoa.h>
-#import "PcsxController.h"
+#import "PcsxrController.h"
#import "ConfigurationController.h"
#import "EmuThread.h"
#include "psxcommon.h"
@@ -12,7 +12,7 @@ NSDictionary *prefByteKeys;
NSMutableArray *biosList;
NSString *saveStatePath;
-@implementation PcsxController
+@implementation PcsxrController
- (IBAction)ejectCD:(id)sender
{
@@ -124,14 +124,14 @@ NSString *saveStatePath;
- (IBAction)freeze:(id)sender
{
int num = [sender tag];
- NSString *path = [NSString stringWithFormat:@"%@/%s-%3.3d.pcsxstate", saveStatePath, CdromId, num];
+ NSString *path = [NSString stringWithFormat:@"%@/%s-%3.3d.pcsxrstate", saveStatePath, CdromId, num];
[EmuThread freezeAt:path which:num-1];
}
- (IBAction)defrost:(id)sender
{
- NSString *path = [NSString stringWithFormat:@"%@/%s-%3.3d.pcsxstate", saveStatePath, CdromId, [sender tag]];
+ NSString *path = [NSString stringWithFormat:@"%@/%s-%3.3d.pcsxrstate", saveStatePath, CdromId, [sender tag]];
[EmuThread defrostAt:path];
}
@@ -169,7 +169,7 @@ NSString *saveStatePath;
if (![EmuThread active] || [EmuThread isRunBios])
return NO;
- NSString *path = [NSString stringWithFormat:@"%@/%s-%3.3d.pcsxstate", saveStatePath, CdromId, [menuItem tag]];
+ NSString *path = [NSString stringWithFormat:@"%@/%s-%3.3d.pcsxrstate", saveStatePath, CdromId, [menuItem tag]];
return (CheckState((char *)[path fileSystemRepresentation]) == 0);
}
@@ -203,14 +203,14 @@ NSString *saveStatePath;
[self preferences:nil];
NSRunCriticalAlertPanel(NSLocalizedString(@"Missing plugins!", nil),
- NSLocalizedString(@"Pcsx is missing one or more critical plugins. You will need to install these in order to play games.", nil),
+ NSLocalizedString(@"Pcsxr is missing one or more critical plugins. You will need to install these in order to play games.", nil),
nil, nil, nil);
}
- if (![PcsxController biosAvailable]) {
+ if (![PcsxrController biosAvailable]) {
NSRunInformationalAlertPanel(NSLocalizedString(@"Missing BIOS!", nil),
- NSLocalizedString(@"Pcsx wasn't able to locate any Playstation BIOS ROM files. This means that it will run in BIOS simulation mode which is less stable and compatible than using a real Playstation BIOS.\n"
- @"If you have a BIOS available, please copy it to\n~/Library/Application Support/Pcsx/Bios/", nil),
+ NSLocalizedString(@"Pcsxr wasn't able to locate any Playstation BIOS ROM files. This means that it will run in BIOS simulation mode which is less stable and compatible than using a real Playstation BIOS.\n"
+ @"If you have a BIOS available, please copy it to\n~/Library/Application Support/Pcsxr/Bios/", nil),
nil, nil, nil);
}
@@ -351,39 +351,39 @@ NSString *saveStatePath;
if (![dfm fileExistsAtPath:supportPath isDirectory:&dir])
[dfm createDirectoryAtPath:supportPath attributes:nil];
- path = [NSString stringWithFormat:@"%@/Pcsx", supportPath];
+ path = [NSString stringWithFormat:@"%@/Pcsxr", supportPath];
if (![dfm fileExistsAtPath:path isDirectory:&dir])
[dfm createDirectoryAtPath:path attributes:nil];
- path = [NSString stringWithFormat:@"%@/Pcsx/Bios", supportPath];
+ path = [NSString stringWithFormat:@"%@/Pcsxr/Bios", supportPath];
if (![dfm fileExistsAtPath:path isDirectory:&dir])
[dfm createDirectoryAtPath:path attributes:nil];
- path = [NSString stringWithFormat:@"%@/Pcsx/Memory Cards", supportPath];
+ path = [NSString stringWithFormat:@"%@/Pcsxr/Memory Cards", supportPath];
if (![dfm fileExistsAtPath:path isDirectory:&dir])
[dfm createDirectoryAtPath:path attributes:nil];
- path = [NSString stringWithFormat:@"%@/Pcsx/Patches", supportPath];
+ path = [NSString stringWithFormat:@"%@/Pcsxr/Patches", supportPath];
if (![dfm fileExistsAtPath:path isDirectory:&dir])
[dfm createDirectoryAtPath:path attributes:nil];
- saveStatePath = [[NSString stringWithFormat:@"%@/Pcsx/Save States", supportPath] retain];
+ saveStatePath = [[NSString stringWithFormat:@"%@/Pcsxr/Save States", supportPath] retain];
if (![dfm fileExistsAtPath:saveStatePath isDirectory:&dir])
[dfm createDirectoryAtPath:saveStatePath attributes:nil];
- path = [NSString stringWithFormat:@"%@/Pcsx/Memory Cards/Mcd001.mcr", supportPath];
+ path = [NSString stringWithFormat:@"%@/Pcsxr/Memory Cards/Mcd001.mcr", supportPath];
str = [path fileSystemRepresentation];
if (str != nil) strncpy(Config.Mcd1, str, 255);
- path = [NSString stringWithFormat:@"%@/Pcsx/Memory Cards/Mcd002.mcr", supportPath];
+ path = [NSString stringWithFormat:@"%@/Pcsxr/Memory Cards/Mcd002.mcr", supportPath];
str = [path fileSystemRepresentation];
if (str != nil) strncpy(Config.Mcd2, str, 255);
- path = [NSString stringWithFormat:@"%@/Pcsx/Bios/", supportPath];
+ path = [NSString stringWithFormat:@"%@/Pcsxr/Bios/", supportPath];
str = [path fileSystemRepresentation];
if (str != nil) strncpy(Config.BiosDir, str, 255);
- path = [NSString stringWithFormat:@"%@/Pcsx/Patches/", supportPath];
+ path = [NSString stringWithFormat:@"%@/Pcsxr/Patches/", supportPath];
str = [path fileSystemRepresentation];
if (str != nil) strncpy(Config.PatchesDir, str, 255);
} else {
@@ -418,7 +418,7 @@ NSString *saveStatePath;
}
}
- [PcsxController setConfigFromDefaults];
+ [PcsxrController setConfigFromDefaults];
}
diff --git a/macosx/PcsxPlugin.h b/macosx/PcsxrPlugin.h
index 6fd2d85b..d17dc54e 100644
--- a/macosx/PcsxPlugin.h
+++ b/macosx/PcsxrPlugin.h
@@ -1,6 +1,6 @@
//
-// PcsxPlugin.h
-// Pcsx
+// PcsxrPlugin.h
+// Pcsxr
//
// Created by Gil Pedersen on Fri Oct 03 2003.
// Copyright (c) 2003 __MyCompanyName__. All rights reserved.
@@ -9,7 +9,7 @@
#import <Foundation/Foundation.h>
-@interface PcsxPlugin : NSObject {
+@interface PcsxrPlugin : NSObject {
CFBundleRef pluginRef;
NSString *path;
diff --git a/macosx/PcsxPlugin.m b/macosx/PcsxrPlugin.m
index 87cfbe6f..b112a5ed 100644
--- a/macosx/PcsxPlugin.m
+++ b/macosx/PcsxrPlugin.m
@@ -1,17 +1,17 @@
//
-// PcsxPlugin.m
-// Pcsx
+// PcsxrPlugin.m
+// Pcsxr
//
// Created by Gil Pedersen on Fri Oct 03 2003.
// Copyright (c) 2003 __MyCompanyName__. All rights reserved.
//
#import <Cocoa/Cocoa.h>
-#import "PcsxPlugin.h"
+#import "PcsxrPlugin.h"
#include "psxcommon.h"
#include "plugins.h"
-@implementation PcsxPlugin
+@implementation PcsxrPlugin
+ (NSString *)getPrefixForType:(int)aType
{
@@ -28,7 +28,7 @@
+ (NSString *)getDefaultKeyForType:(int)aType
{
- //return @"Plugin" [PcsxPlugin getPrefixForType:aType];
+ //return @"Plugin" [PcsxrPlugin getPrefixForType:aType];
switch (aType) {
case PSE_LT_GPU: return @"PluginGPU";
case PSE_LT_CDR: return @"PluginCDR";
@@ -173,7 +173,7 @@
return 0;
}
- sprintf(symbol, "%sinit", [[PcsxPlugin getPrefixForType:aType] lossyCString]);
+ sprintf(symbol, "%sinit", [[PcsxrPlugin getPrefixForType:aType] lossyCString]);
init = initArg = SysLoadSym(pluginRef, symbol);
if (SysLibError() == nil) {
if (aType != PSE_LT_PAD)
@@ -186,7 +186,7 @@
active |= aType;
} else {
NSRunCriticalAlertPanel(NSLocalizedString(@"Plugin Initialization Failed!", nil),
- [NSString stringWithFormat:NSLocalizedString(@"Pcsx failed to initialize the selected %s plugin (error=%i).\nThe plugin might not work with your system.", nil), [PcsxPlugin getPrefixForType:aType], res],
+ [NSString stringWithFormat:NSLocalizedString(@"Pcsxr failed to initialize the selected %s plugin (error=%i).\nThe plugin might not work with your system.", nil), [PcsxrPlugin getPrefixForType:aType], res],
nil, nil, nil);
}
@@ -198,7 +198,7 @@
char symbol[255];
long (*shutdown)(void);
- sprintf(symbol, "%sshutdown", [[PcsxPlugin getPrefixForType:aType] lossyCString]);
+ sprintf(symbol, "%sshutdown", [[PcsxrPlugin getPrefixForType:aType] lossyCString]);
shutdown = SysLoadSym(pluginRef, symbol);
if (SysLibError() == nil) {
active &= ~aType;
@@ -212,7 +212,7 @@
{
char symbol[255];
- sprintf(symbol, "%sabout", [[PcsxPlugin getPrefixForType:aType] lossyCString]);
+ sprintf(symbol, "%sabout", [[PcsxrPlugin getPrefixForType:aType] lossyCString]);
SysLoadSym(pluginRef, symbol);
return (SysLibError() == nil);
@@ -222,7 +222,7 @@
{
char symbol[255];
- sprintf(symbol, "%sconfigure", [[PcsxPlugin getPrefixForType:aType] lossyCString]);
+ sprintf(symbol, "%sconfigure", [[PcsxrPlugin getPrefixForType:aType] lossyCString]);
SysLoadSym(pluginRef, symbol);
return (SysLibError() == nil);
@@ -233,7 +233,7 @@
NSArray *arg;
char symbol[255];
- sprintf(symbol, "%sabout", [[PcsxPlugin getPrefixForType:aType] lossyCString]);
+ sprintf(symbol, "%sabout", [[PcsxrPlugin getPrefixForType:aType] lossyCString]);
arg = [[NSArray alloc] initWithObjects:[NSString stringWithCString:symbol],
[NSNumber numberWithInt:0], nil];
@@ -247,7 +247,7 @@
NSArray *arg;
char symbol[255];
- sprintf(symbol, "%sconfigure", [[PcsxPlugin getPrefixForType:aType] lossyCString]);
+ sprintf(symbol, "%sconfigure", [[PcsxrPlugin getPrefixForType:aType] lossyCString]);
arg = [[NSArray alloc] initWithObjects:[NSString stringWithCString:symbol],
[NSNumber numberWithInt:1], nil];
diff --git a/macosx/PcsxPluginDocument.h b/macosx/PcsxrPluginDocument.h
index bf4f8028..dc6baef5 100644
--- a/macosx/PcsxPluginDocument.h
+++ b/macosx/PcsxrPluginDocument.h
@@ -1,6 +1,6 @@
//
-// PcsxPluginDocument.h
-// Pcsx
+// PcsxrPluginDocument.h
+// Pcsxr
//
// Created by Gil Pedersen on Thu Jul 01 2004.
// Copyright (c) 2004 __MyCompanyName__. All rights reserved.
@@ -9,7 +9,7 @@
#import <AppKit/AppKit.h>
-@interface PcsxPluginDocument : NSDocument {
+@interface PcsxrPluginDocument : NSDocument {
IBOutlet NSWindow *addPluginSheet;
IBOutlet NSTextField *pluginName;
diff --git a/macosx/PcsxPluginDocument.m b/macosx/PcsxrPluginDocument.m
index 6cbe0fae..3d19f491 100644
--- a/macosx/PcsxPluginDocument.m
+++ b/macosx/PcsxrPluginDocument.m
@@ -1,15 +1,15 @@
//
-// PcsxPluginDocument.m
-// Pcsx
+// PcsxrPluginDocument.m
+// Pcsxr
//
// Created by Gil Pedersen on Thu Jul 01 2004.
// Copyright (c) 2004 __MyCompanyName__. All rights reserved.
//
-#import "PcsxPluginDocument.h"
+#import "PcsxrPluginDocument.h"
-@implementation PcsxPluginDocument
+@implementation PcsxrPluginDocument
- (BOOL)showAddPluginSheet:(NSWindow *)window forName:(NSString *)name
// User has asked to see the custom display. Display it.
@@ -79,7 +79,7 @@
- (NSString *)windowNibName {
// Implement this to return a nib to load OR implement -makeWindowControllers to manually create your controllers.
- return @"PcsxPluginDocument";
+ return @"PcsxrPluginDocument";
}
- (NSData *)dataRepresentationOfType:(NSString *)type {
diff --git a/macosx/Plugin.c b/macosx/Plugin.c
index 73769a7f..5bcf7229 100644
--- a/macosx/Plugin.c
+++ b/macosx/Plugin.c
@@ -1,4 +1,4 @@
-/* Pcsx - Pc Psx Emulator
+/* Pcsxr - Pc Psx Emulator
* Copyright (C) 1999-2002 Pcsx Team
*
* This program is free software; you can redistribute it and/or modify
@@ -78,7 +78,7 @@ int _OpenPlugins() {
ret = SPU_open();
if (ret < 0) { SysMessage(_("Error Opening SPU Plugin")); return -1; }
SPU_registerCallback(SPUirq);
- ret = GPU_open(&gpuDisp, "PCSX", NULL);
+ ret = GPU_open(&gpuDisp, "PCSXR", NULL);
if (ret < 0) { SysMessage(_("Error Opening GPU Plugin")); return -1; }
GPU_registerCallback(GPUbusy);
ret = PAD1_open(&gpuDisp);
diff --git a/macosx/PluginController.m b/macosx/PluginController.m
index 4bd5e4aa..d9858fae 100644
--- a/macosx/PluginController.m
+++ b/macosx/PluginController.m
@@ -1,18 +1,18 @@
#import "PluginController.h"
-#import "PcsxPlugin.h"
-#import "PcsxController.h"
+#import "PcsxrPlugin.h"
+#import "PcsxrController.h"
@implementation PluginController
- (IBAction)doAbout:(id)sender
{
- PcsxPlugin *plugin = [plugins objectAtIndex:[pluginMenu indexOfSelectedItem]];
+ PcsxrPlugin *plugin = [plugins objectAtIndex:[pluginMenu indexOfSelectedItem]];
[plugin aboutAs:pluginType];
}
- (IBAction)doConfigure:(id)sender
{
- PcsxPlugin *plugin = [plugins objectAtIndex:[pluginMenu indexOfSelectedItem]];
+ PcsxrPlugin *plugin = [plugins objectAtIndex:[pluginMenu indexOfSelectedItem]];
[plugin configureAs:pluginType];
}
@@ -22,7 +22,7 @@
if (sender==pluginMenu) {
int index = [pluginMenu indexOfSelectedItem];
if (index != -1) {
- PcsxPlugin *plugin = [plugins objectAtIndex:index];
+ PcsxrPlugin *plugin = [plugins objectAtIndex:index];
if (![[PluginList list] setActivePlugin:plugin forType:pluginType]) {
/* plugin won't initialize */
@@ -51,7 +51,7 @@
// remember the list
pluginType = type;
plugins = [list retain];
- defaultKey = [[PcsxPlugin getDefaultKeyForType:pluginType] retain];
+ defaultKey = [[PcsxrPlugin getDefaultKeyForType:pluginType] retain];
// clear the previous menu items
[pluginMenu removeAllItems];
diff --git a/macosx/PluginList.h b/macosx/PluginList.h
index fecc4b13..1f5fc890 100644
--- a/macosx/PluginList.h
+++ b/macosx/PluginList.h
@@ -1,13 +1,13 @@
//
// PluginList.h
-// Pcsx
+// Pcsxr
//
// Created by Gil Pedersen on Sun Sep 21 2003.
// Copyright (c) 2003 __MyCompanyName__. All rights reserved.
//
#import <Cocoa/Cocoa.h>
-#import "PcsxPlugin.h"
+#import "PcsxrPlugin.h"
//extern NSMutableArray *plugins;
@@ -16,10 +16,10 @@
@private
NSMutableArray *pluginList;
- PcsxPlugin *activeGpuPlugin;
- PcsxPlugin *activeSpuPlugin;
- PcsxPlugin *activeCdrPlugin;
- PcsxPlugin *activePadPlugin;
+ PcsxrPlugin *activeGpuPlugin;
+ PcsxrPlugin *activeSpuPlugin;
+ PcsxrPlugin *activeCdrPlugin;
+ PcsxrPlugin *activePadPlugin;
BOOL missingPlugins;
}
@@ -30,7 +30,7 @@
- (NSArray *)pluginsForType:(int)typeMask;
- (BOOL)hasPluginAtPath:(NSString *)path;
- (BOOL)configured;
-- (PcsxPlugin *)activePluginForType:(int)type;
-- (BOOL)setActivePlugin:(PcsxPlugin *)plugin forType:(int)type;
+- (PcsxrPlugin *)activePluginForType:(int)type;
+- (BOOL)setActivePlugin:(PcsxrPlugin *)plugin forType:(int)type;
@end
diff --git a/macosx/PluginList.m b/macosx/PluginList.m
index 62c877c1..3df8ea4d 100644
--- a/macosx/PluginList.m
+++ b/macosx/PluginList.m
@@ -1,6 +1,6 @@
//
// PluginList.m
-// Pcsx
+// Pcsxr
//
// Created by Gil Pedersen on Sun Sep 21 2003.
// Copyright (c) 2003 __MyCompanyName__. All rights reserved.
@@ -8,7 +8,7 @@
#import "EmuThread.h"
#import "PluginList.h"
-#import "PcsxPlugin.h"
+#import "PcsxrPlugin.h"
#include "psxcommon.h"
#include "plugins.h"
@@ -44,7 +44,7 @@ const static int typeList[4] = {PSE_LT_GPU, PSE_LT_SPU, PSE_LT_CDR, PSE_LT_PAD};
[dirEnum skipDescendents]; /* don't enumerate this
directory */
- PcsxPlugin *plugin = [[PcsxPlugin alloc] initWithPath:pname];
+ PcsxrPlugin *plugin = [[PcsxrPlugin alloc] initWithPath:pname];
if (plugin != nil) {
[plugins addObject:plugin];
}
@@ -63,7 +63,7 @@ const static int typeList[4] = {PSE_LT_GPU, PSE_LT_SPU, PSE_LT_CDR, PSE_LT_PAD};
type = typeMask;
for (i=0; i<[plugins count]; i++) {
- PcsxPlugin *plugin = [plugins objectAtIndex:i];
+ PcsxrPlugin *plugin = [plugins objectAtIndex:i];
if ([plugin getType] == type) {
[list addObject:plugin];
}
@@ -99,7 +99,7 @@ const static int typeList[4] = {PSE_LT_GPU, PSE_LT_SPU, PSE_LT_CDR, PSE_LT_PAD};
missingPlugins = NO;
for (i=0; i<sizeof(*typeList); i++) {
- NSString *path = [defaults stringForKey:[PcsxPlugin getDefaultKeyForType:typeList[i]]];
+ NSString *path = [defaults stringForKey:[PcsxrPlugin getDefaultKeyForType:typeList[i]]];
if (nil == path) {
missingPlugins = YES;
continue;
@@ -108,7 +108,7 @@ const static int typeList[4] = {PSE_LT_GPU, PSE_LT_SPU, PSE_LT_CDR, PSE_LT_PAD};
continue;
if (![self hasPluginAtPath:path]) {
- PcsxPlugin *plugin = [[PcsxPlugin alloc] initWithPath:path];
+ PcsxrPlugin *plugin = [[PcsxrPlugin alloc] initWithPath:path];
if (plugin) {
[pluginList addObject:plugin];
if (![self setActivePlugin:plugin forType:typeList[i]])
@@ -167,7 +167,7 @@ const static int typeList[4] = {PSE_LT_GPU, PSE_LT_SPU, PSE_LT_CDR, PSE_LT_PAD};
directory */
if (![self hasPluginAtPath:pname]) {
- PcsxPlugin *plugin = [[PcsxPlugin alloc] initWithPath:pname];
+ PcsxrPlugin *plugin = [[PcsxrPlugin alloc] initWithPath:pname];
if (plugin != nil) {
[pluginList addObject:plugin];
}
@@ -178,7 +178,7 @@ const static int typeList[4] = {PSE_LT_GPU, PSE_LT_SPU, PSE_LT_CDR, PSE_LT_PAD};
// check the we have the needed plugins
missingPlugins = NO;
for (i=0; i<sizeof(*typeList); i++) {
- PcsxPlugin *plugin = [self activePluginForType:typeList[i]];
+ PcsxrPlugin *plugin = [self activePluginForType:typeList[i]];
if (nil == plugin) {
NSArray *list = [self pluginsForType:typeList[i]];
int j;
@@ -199,7 +199,7 @@ const static int typeList[4] = {PSE_LT_GPU, PSE_LT_SPU, PSE_LT_CDR, PSE_LT_PAD};
int i;
for (i=0; i<[pluginList count]; i++) {
- PcsxPlugin *plugin = [pluginList objectAtIndex:i];
+ PcsxrPlugin *plugin = [pluginList objectAtIndex:i];
if ([plugin getType] & typeMask) {
[types addObject:plugin];
@@ -241,7 +241,7 @@ const static int typeList[4] = {PSE_LT_GPU, PSE_LT_SPU, PSE_LT_CDR, PSE_LT_PAD};
return !bad;
}
-- (PcsxPlugin *)activePluginForType:(int)type
+- (PcsxrPlugin *)activePluginForType:(int)type
{
switch (type) {
case PSE_LT_GPU: return activeGpuPlugin;
@@ -254,9 +254,9 @@ const static int typeList[4] = {PSE_LT_GPU, PSE_LT_SPU, PSE_LT_CDR, PSE_LT_PAD};
return nil;
}
-- (BOOL)setActivePlugin:(PcsxPlugin *)plugin forType:(int)type
+- (BOOL)setActivePlugin:(PcsxrPlugin *)plugin forType:(int)type
{
- PcsxPlugin **pluginPtr;
+ PcsxrPlugin **pluginPtr;
switch (type) {
case PSE_LT_GPU: pluginPtr = &activeGpuPlugin; break;
case PSE_LT_CDR: pluginPtr = &activeCdrPlugin; break;
@@ -303,7 +303,7 @@ const static int typeList[4] = {PSE_LT_GPU, PSE_LT_SPU, PSE_LT_CDR, PSE_LT_PAD};
str = "Invalid Plugin";
}
- char **dst = [PcsxPlugin getConfigEntriesForType:type];
+ char **dst = [PcsxrPlugin getConfigEntriesForType:type];
while (*dst) {
strncpy(*dst, str, 255);
dst++;
diff --git a/macosx/icons/PCSX.icns b/macosx/icons/PCSXR.icns
index 3f57a340..3f57a340 100644..100755
--- a/macosx/icons/PCSX.icns
+++ b/macosx/icons/PCSXR.icns
Binary files differ
diff --git a/macosx/icons/pcsxfreeze.icns b/macosx/icons/pcsxrfreeze.icns
index bcb21e60..bcb21e60 100644..100755
--- a/macosx/icons/pcsxfreeze.icns
+++ b/macosx/icons/pcsxrfreeze.icns
Binary files differ
diff --git a/macosx/icons/pcsxmemcard.icns b/macosx/icons/pcsxrmemcard.icns
index f3e47b9b..f3e47b9b 100644..100755
--- a/macosx/icons/pcsxmemcard.icns
+++ b/macosx/icons/pcsxrmemcard.icns
Binary files differ
diff --git a/macosx/plugins/DFCdrom/Info.plist b/macosx/plugins/DFCdrom/Info.plist
index ee25402f..6556485a 100644
--- a/macosx/plugins/DFCdrom/Info.plist
+++ b/macosx/plugins/DFCdrom/Info.plist
@@ -9,7 +9,7 @@
<key>CFBundleIconFile</key>
<string></string>
<key>CFBundleIdentifier</key>
- <string>net.pcsx.DFCdrom</string>
+ <string>net.pcsxr.DFCdrom</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundlePackageType</key>
diff --git a/macosx/plugins/DFCdrom/macsrc/PluginConfigController.m b/macosx/plugins/DFCdrom/macsrc/PluginConfigController.m
index 3b288fa8..86146a24 100644
--- a/macosx/plugins/DFCdrom/macsrc/PluginConfigController.m
+++ b/macosx/plugins/DFCdrom/macsrc/PluginConfigController.m
@@ -22,7 +22,7 @@
#import "PluginConfigController.h"
#include "cdr.h"
-#define APP_ID @"net.pcsx.DFCdrom"
+#define APP_ID @"net.pcsxr.DFCdrom"
#define PrefsKey APP_ID @" Settings"
static PluginConfigController *windowController;
diff --git a/macosx/plugins/DFInput/DFInput.xcodeproj/project.pbxproj b/macosx/plugins/DFInput/DFInput.xcodeproj/project.pbxproj
index 9af9d261..61c11670 100644
--- a/macosx/plugins/DFInput/DFInput.xcodeproj/project.pbxproj
+++ b/macosx/plugins/DFInput/DFInput.xcodeproj/project.pbxproj
@@ -63,7 +63,7 @@
71D88862130F032700F150FF /* SDL_error_c.h in Headers */ = {isa = PBXBuildFile; fileRef = 71D8882C130F032700F150FF /* SDL_error_c.h */; };
71E861B611FF75AC001C1826 /* PadView.h in Headers */ = {isa = PBXBuildFile; fileRef = 71E861AC11FF75AC001C1826 /* PadView.h */; };
71E861B711FF75AC001C1826 /* PadView.m in Sources */ = {isa = PBXBuildFile; fileRef = 71E861AD11FF75AC001C1826 /* PadView.m */; };
- 71E861BC11FF75BA001C1826 /* NetPcsxHIDInputPluginMain.nib in Resources */ = {isa = PBXBuildFile; fileRef = 71E861BA11FF75BA001C1826 /* NetPcsxHIDInputPluginMain.nib */; };
+ 71E861BC11FF75BA001C1826 /* NetPcsxrHIDInputPluginMain.nib in Resources */ = {isa = PBXBuildFile; fileRef = 71E861BA11FF75BA001C1826 /* NetPcsxrHIDInputPluginMain.nib */; };
8D576314048677EA00EA77CD /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0AA1909FFE8422F4C02AAC07 /* CoreFoundation.framework */; };
8D5B49A804867FD3000E48DA /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 8D5B49A704867FD3000E48DA /* InfoPlist.strings */; };
/* End PBXBuildFile section */
@@ -127,7 +127,7 @@
71E861AB11FF75AC001C1826 /* PadController.m */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.objc; name = PadController.m; path = macsrc/PadController.m; sourceTree = "<group>"; };
71E861AC11FF75AC001C1826 /* PadView.h */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.h; name = PadView.h; path = macsrc/PadView.h; sourceTree = "<group>"; };
71E861AD11FF75AC001C1826 /* PadView.m */ = {isa = PBXFileReference; fileEncoding = 0; lastKnownFileType = sourcecode.c.objc; name = PadView.m; path = macsrc/PadView.m; sourceTree = "<group>"; };
- 71E861BB11FF75BA001C1826 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/NetPcsxHIDInputPluginMain.nib; sourceTree = "<group>"; };
+ 71E861BB11FF75BA001C1826 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/NetPcsxrHIDInputPluginMain.nib; sourceTree = "<group>"; };
8D576316048677EA00EA77CD /* DFInput.psxplugin */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = DFInput.psxplugin; sourceTree = BUILT_PRODUCTS_DIR; };
8D576317048677EA00EA77CD /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
/* End PBXFileReference section */
@@ -177,7 +177,7 @@
isa = PBXGroup;
children = (
7136F51812011BB4001973D9 /* Credits.rtf */,
- 71E861BA11FF75BA001C1826 /* NetPcsxHIDInputPluginMain.nib */,
+ 71E861BA11FF75BA001C1826 /* NetPcsxrHIDInputPluginMain.nib */,
8D576317048677EA00EA77CD /* Info.plist */,
8D5B49A704867FD3000E48DA /* InfoPlist.strings */,
);
@@ -431,7 +431,7 @@
buildActionMask = 2147483647;
files = (
8D5B49A804867FD3000E48DA /* InfoPlist.strings in Resources */,
- 71E861BC11FF75BA001C1826 /* NetPcsxHIDInputPluginMain.nib in Resources */,
+ 71E861BC11FF75BA001C1826 /* NetPcsxrHIDInputPluginMain.nib in Resources */,
7136F51A12011BB4001973D9 /* Credits.rtf in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
@@ -487,12 +487,12 @@
name = Credits.rtf;
sourceTree = "<group>";
};
- 71E861BA11FF75BA001C1826 /* NetPcsxHIDInputPluginMain.nib */ = {
+ 71E861BA11FF75BA001C1826 /* NetPcsxrHIDInputPluginMain.nib */ = {
isa = PBXVariantGroup;
children = (
71E861BB11FF75BA001C1826 /* English */,
);
- name = NetPcsxHIDInputPluginMain.nib;
+ name = NetPcsxrHIDInputPluginMain.nib;
sourceTree = "<group>";
};
8D5B49A704867FD3000E48DA /* InfoPlist.strings */ = {
diff --git a/macosx/plugins/DFInput/English.lproj/NetPcsxHIDInputPluginMain.nib/classes.nib b/macosx/plugins/DFInput/English.lproj/NetPcsxHIDInputPluginMain.nib/classes.nib
deleted file mode 100644
index ac067a68..00000000
--- a/macosx/plugins/DFInput/English.lproj/NetPcsxHIDInputPluginMain.nib/classes.nib
+++ /dev/null
@@ -1,33 +0,0 @@
-{
- IBClasses = (
- {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; },
- {
- CLASS = NetPcsxHIDInputPluginMappingCell;
- LANGUAGE = ObjC;
- SUPERCLASS = NSTextFieldCell;
- },
- {
- ACTIONS = {cancel = id; ok = id; setKey = id; };
- CLASS = NetPcsxHIDInputPluginPadController;
- LANGUAGE = ObjC;
- OUTLETS = {
- controllerView = NetPcsxHIDInputPluginPadView;
- controllerView1 = id;
- controllerView2 = id;
- };
- SUPERCLASS = NSWindowController;
- },
- {
- ACTIONS = {setDevice = id; setType = id; };
- CLASS = NetPcsxHIDInputPluginPadView;
- LANGUAGE = ObjC;
- OUTLETS = {
- deviceMenu = NSPopUpButton;
- tableView = NSTableView;
- typeMenu = NSPopUpButton;
- };
- SUPERCLASS = NSView;
- }
- );
- IBVersion = 1;
-} \ No newline at end of file
diff --git a/macosx/plugins/DFInput/English.lproj/NetPcsxHIDInputPluginMain.nib/info.nib b/macosx/plugins/DFInput/English.lproj/NetPcsxHIDInputPluginMain.nib/info.nib
deleted file mode 100644
index 27f6df15..00000000
--- a/macosx/plugins/DFInput/English.lproj/NetPcsxHIDInputPluginMain.nib/info.nib
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
- <key>IBDocumentLocation</key>
- <string>54 67 576 240 0 0 1024 746 </string>
- <key>IBEditorPositions</key>
- <dict>
- <key>16</key>
- <string>293 323 437 378 0 0 1024 746 </string>
- </dict>
- <key>IBFramework Version</key>
- <string>446.1</string>
- <key>IBOpenObjects</key>
- <array>
- <integer>16</integer>
- </array>
- <key>IBSystem Version</key>
- <string>8P2137</string>
-</dict>
-</plist>
diff --git a/macosx/plugins/DFInput/English.lproj/NetPcsxHIDInputPluginMain.nib/keyedobjects.nib b/macosx/plugins/DFInput/English.lproj/NetPcsxHIDInputPluginMain.nib/keyedobjects.nib
deleted file mode 100644
index 793f3948..00000000
--- a/macosx/plugins/DFInput/English.lproj/NetPcsxHIDInputPluginMain.nib/keyedobjects.nib
+++ /dev/null
Binary files differ
diff --git a/macosx/plugins/DFInput/macsrc/ControllerList.h b/macosx/plugins/DFInput/macsrc/ControllerList.h
index 176d403b..af0d0407 100644
--- a/macosx/plugins/DFInput/macsrc/ControllerList.h
+++ b/macosx/plugins/DFInput/macsrc/ControllerList.h
@@ -19,7 +19,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses>.
*/
-#define ControllerList NetPcsxHIDInputPluginControllerList
+#define ControllerList NetPcsxrHIDInputPluginControllerList
#import <Foundation/Foundation.h>
#import <AppKit/NSTableView.h>
diff --git a/macosx/plugins/DFInput/macsrc/MappingCell.h b/macosx/plugins/DFInput/macsrc/MappingCell.h
index f803696a..311d0c46 100644
--- a/macosx/plugins/DFInput/macsrc/MappingCell.h
+++ b/macosx/plugins/DFInput/macsrc/MappingCell.h
@@ -19,7 +19,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses>.
*/
-#define MappingCell NetPcsxHIDInputPluginMappingCell
+#define MappingCell NetPcsxrHIDInputPluginMappingCell
#import <AppKit/AppKit.h>
diff --git a/macosx/plugins/DFInput/macsrc/PadController.h b/macosx/plugins/DFInput/macsrc/PadController.h
index 26a5a152..63a1b1d2 100644
--- a/macosx/plugins/DFInput/macsrc/PadController.h
+++ b/macosx/plugins/DFInput/macsrc/PadController.h
@@ -19,7 +19,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses>.
*/
-#define PadController NetPcsxHIDInputPluginPadController
+#define PadController NetPcsxrHIDInputPluginPadController
#import <Cocoa/Cocoa.h>
#import "PadView.h"
diff --git a/macosx/plugins/DFInput/macsrc/PadController.m b/macosx/plugins/DFInput/macsrc/PadController.m
index 06bce2eb..49edcf21 100644
--- a/macosx/plugins/DFInput/macsrc/PadController.m
+++ b/macosx/plugins/DFInput/macsrc/PadController.m
@@ -26,7 +26,7 @@
static NSWindow *padWindow;
static PadController *padController;
-#define APP_ID @"net.pcsx.DFInputPlugin"
+#define APP_ID @"net.pcsxr.DFInputPlugin"
void DoAbout() {
// Get parent application instance
@@ -63,7 +63,7 @@ long DoConfiguration() {
if (padWindow == nil) {
if (padController == nil) {
- padController = [[PadController alloc] initWithWindowNibName:@"NetPcsxHIDInputPluginMain"];
+ padController = [[PadController alloc] initWithWindowNibName:@"NetPcsxrHIDInputPluginMain"];
}
padWindow = [padController window];
}
diff --git a/macosx/plugins/DFInput/macsrc/PadView.h b/macosx/plugins/DFInput/macsrc/PadView.h
index f99686c9..1d8d4a09 100644
--- a/macosx/plugins/DFInput/macsrc/PadView.h
+++ b/macosx/plugins/DFInput/macsrc/PadView.h
@@ -19,7 +19,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses>.
*/
-#define PadView NetPcsxHIDInputPluginPadView
+#define PadView NetPcsxrHIDInputPluginPadView
#import <Cocoa/Cocoa.h>
#import "ControllerList.h"
diff --git a/macosx/plugins/DFInput/macsrc/cfg.c b/macosx/plugins/DFInput/macsrc/cfg.c
index 9465426c..dec4ff3f 100644
--- a/macosx/plugins/DFInput/macsrc/cfg.c
+++ b/macosx/plugins/DFInput/macsrc/cfg.c
@@ -118,7 +118,7 @@ void LoadPADConfig() {
SetDefaultConfig();
- sprintf(buf, "%s/Library/Preferences/net.pcsx.DFInput.plist", getenv("HOME"));
+ sprintf(buf, "%s/Library/Preferences/net.pcsxr.DFInput.plist", getenv("HOME"));
fp = fopen(buf, "r");
if (fp == NULL) {
@@ -272,7 +272,7 @@ void SavePADConfig() {
int i;
char buf[256];
- sprintf(buf, "%s/Library/Preferences/net.pcsx.DFInput.plist", getenv("HOME"));
+ sprintf(buf, "%s/Library/Preferences/net.pcsxr.DFInput.plist", getenv("HOME"));
fp = fopen(buf, "w");
if (fp == NULL) {
diff --git a/macosx/plugins/DFSound/English.lproj/InfoPlist.strings b/macosx/plugins/DFSound/English.lproj/InfoPlist.strings
index d4f51d87..e29789b1 100755
--- a/macosx/plugins/DFSound/English.lproj/InfoPlist.strings
+++ b/macosx/plugins/DFSound/English.lproj/InfoPlist.strings
Binary files differ
diff --git a/macosx/plugins/PeopsXgl/macsrc/NetSfPeopsOpenGLPluginConfigController.m b/macosx/plugins/PeopsXgl/macsrc/NetSfPeopsOpenGLPluginConfigController.m
index 781508be..73c85711 100644
--- a/macosx/plugins/PeopsXgl/macsrc/NetSfPeopsOpenGLPluginConfigController.m
+++ b/macosx/plugins/PeopsXgl/macsrc/NetSfPeopsOpenGLPluginConfigController.m
@@ -1,7 +1,7 @@
/* All the various stuff needed for configuration is done here,
including reading the Config file and displaying a dialog box
- AboutDlgProc() is a plug-in function called from the PCSX app, as is
+ AboutDlgProc() is a plug-in function called from the PCSXR app, as is
DlgProc()
*/
@@ -74,7 +74,7 @@ void PrepFactoryDefaultPreferences(void)
// THE place to find the names of settings.
// If it's not here, you can't set it.
- // create or read a sub-dictionary beneath the main PCSX app prefs.
+ // create or read a sub-dictionary beneath the main PCSXR app prefs.
// dictionary is named "net.sf.GpuOpenGLPlugin Settings"
// and contains all our key/values
// the prefs .plist will store this dictionary ("net.sf...") as an object
@@ -125,12 +125,12 @@ void PrepFactoryDefaultPreferences(void)
void ReadConfig(void)
{
- // set up PCSX GPU plug's global variables according to user preferences.
- // this is called from the PCSX GPU plugin thread via GPUOpen.
+ // set up PCSXR GPU plug's global variables according to user preferences.
+ // this is called from the PCSXR GPU plugin thread via GPUOpen.
// has nothing to do with the Configuration dialog box, btw., other than the
// fact that the config dialog writes to user prefs. This only reads, which
- // is important because PCSX will change its globals on the fly
+ // is important because PCSXR will change its globals on the fly
// and saving those new ad hoc changes is Bad for the user.
PrepFactoryDefaultPreferences(); // in case user deletes, or on new startup
@@ -139,7 +139,7 @@ void ReadConfig(void)
NSDictionary* keyValues = [[NSUserDefaults standardUserDefaults] dictionaryForKey:PrefsKey];
- // bind all prefs settings to their PCSX counterparts
+ // bind all prefs settings to their PCSXR counterparts
// with a little finagling to make it work as expected
iShowFPS = [[keyValues objectForKey:@"FPS Counter"] boolValue];
diff --git a/macosx/plugins/PeopsXgl/macsrc/PluginWindowController.h b/macosx/plugins/PeopsXgl/macsrc/PluginWindowController.h
index 9322a01f..a60a4b81 100644
--- a/macosx/plugins/PeopsXgl/macsrc/PluginWindowController.h
+++ b/macosx/plugins/PeopsXgl/macsrc/PluginWindowController.h
@@ -1,7 +1,7 @@
/***************************************************************************
PluginWindowController.h
The big bad boy that controls/creates the game window, the openGLView, and
- communicates with PCSX itself
+ communicates with PCSXR itself
PeopsOpenGPU
Created by Gil Pedersen on Mon April 11 2004.
@@ -20,7 +20,7 @@
/*
In truth, this controller should be the ONLY place that glues between the
- running PCSX gpu and the mac interface.
+ running PCSXR gpu and the mac interface.
ATM, some of the glue is here, some of it in drawgl.m, and a couple
of bits are in the config controller...
*/
diff --git a/macosx/plugins/PeopsXgl/macsrc/PluginWindowController.m b/macosx/plugins/PeopsXgl/macsrc/PluginWindowController.m
index 88bfa7db..0636490a 100644
--- a/macosx/plugins/PeopsXgl/macsrc/PluginWindowController.m
+++ b/macosx/plugins/PeopsXgl/macsrc/PluginWindowController.m
@@ -1,7 +1,7 @@
/***************************************************************************
PluginWindowController.m
The big bad boy that controls/creates the game window, the openGLView, and
- communicates with PCSX itself
+ communicates with PCSXR itself
PeopsOpenGPU
diff --git a/pixmaps/Makefile.am b/pixmaps/Makefile.am
index ea6e2d2c..aec6f0d4 100644
--- a/pixmaps/Makefile.am
+++ b/pixmaps/Makefile.am
@@ -1,7 +1,7 @@
-pixmapdir = "$(datadir)/pcsx"
-pixmap_DATA = pcsx.jpg
+pixmapdir = "$(datadir)/pcsxr"
+pixmap_DATA = pcsxr.jpg
icondir = "$(datadir)/pixmaps"
-icon_DATA = pcsx-icon.png
+icon_DATA = pcsxr-icon.png
-EXTRA_DIST = pcsx.jpg pcsx-icon.png
+EXTRA_DIST = pcsxr.jpg pcsxr-icon.png
diff --git a/pixmaps/pcsx-icon.png b/pixmaps/pcsxr-icon.png
index 7a0c0ed7..7a0c0ed7 100755
--- a/pixmaps/pcsx-icon.png
+++ b/pixmaps/pcsxr-icon.png
Binary files differ
diff --git a/pixmaps/pcsx.jpg b/pixmaps/pcsxr.jpg
index 7aa535ba..7aa535ba 100755
--- a/pixmaps/pcsx.jpg
+++ b/pixmaps/pcsxr.jpg
Binary files differ
diff --git a/plugins/bladesio1/Makefile.am b/plugins/bladesio1/Makefile.am
index f6d4e5a3..0a51c332 100644
--- a/plugins/bladesio1/Makefile.am
+++ b/plugins/bladesio1/Makefile.am
@@ -3,7 +3,7 @@ libdir = @libdir@/games/psemu/
lib_LTLIBRARIES = libBladeSio1.la
-libBladeSio1_la_SOURCES = sio1.c settings.c
+libBladeSio1_la_SOURCES = sio1.c sio1.h settings.c settings.h
libBladeSio1_la_LDFLAGS = -module -avoid-version
AM_CPPFLAGS = -DLOCALE_DIR=\"${datadir}/locale/\" \
diff --git a/plugins/dfcdrom/Makefile.am b/plugins/dfcdrom/Makefile.am
index 387a3544..b001ab0f 100644
--- a/plugins/dfcdrom/Makefile.am
+++ b/plugins/dfcdrom/Makefile.am
@@ -23,13 +23,13 @@ endif
AM_CPPFLAGS = -DLOCALE_DIR=\"${datadir}/locale/\" \
-DDATADIR=\"${datadir}/psemu/\" \
- $(GTK2_CFLAGS) $(GLADE2_CFLAGS) \
+ $(GTK2_CFLAGS) \
-I../../libpcsxcore -I../../include
bin_PROGRAMS = cfgDFCdrom
cfgDFCdrom_SOURCES = cdrcfg-0.1df/main.c
-cfgDFCdrom_LDADD = $(GTK2_LIBS) $(GLADE2_LIBS)
+cfgDFCdrom_LDADD = $(GTK2_LIBS)
-glade_DATA = cdrcfg-0.1df/dfcdrom.glade2
+glade_DATA = cdrcfg-0.1df/dfcdrom.ui
gladedir = $(datadir)/psemu/
EXTRA_DIST = $(glade_DATA)
diff --git a/plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2 b/plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui
index 25610e2e..c16dfd17 100644
--- a/plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2
+++ b/plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui
@@ -1,76 +1,66 @@
<?xml version="1.0"?>
-<glade-interface>
- <!-- interface-requires gtk+ 2.6 -->
+<interface>
+ <requires lib="gtk+" version="2.16"/>
<!-- interface-naming-policy toplevel-contextual -->
- <widget class="GtkDialog" id="CfgWnd">
+ <object class="GtkDialog" id="CfgWnd">
<property name="visible">True</property>
<property name="border_width">5</property>
<property name="title" translatable="yes">CDR configuration</property>
<property name="modal">True</property>
<property name="window_position">center</property>
<property name="type_hint">normal</property>
- <property name="has_separator">False</property>
<signal name="show" handler="on_cfg_dialog_show"/>
<child internal-child="vbox">
- <widget class="GtkVBox" id="dialog-vbox1">
+ <object class="GtkVBox" id="dialog-vbox1">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<child>
- <widget class="GtkVBox" id="vbox1">
+ <object class="GtkVBox" id="vbox1">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<child>
- <widget class="GtkFrame" id="frame1">
+ <object class="GtkFrame" id="frame1">
<property name="visible">True</property>
<property name="label_xalign">0</property>
<child>
- <widget class="GtkHBox" id="hbox5">
+ <object class="GtkHBox" id="hbox5">
<property name="visible">True</property>
<property name="border_width">10</property>
<child>
- <widget class="GtkComboBoxEntry" id="cddev_comboboxentry">
+ <object class="GtkComboBoxEntry" id="cddev_comboboxentry">
<property name="visible">True</property>
- <property name="tooltip" translatable="yes">Choose your CD-ROM device or type its path if it's not listed</property>
- </widget>
+ <property name="tooltip_text" translatable="yes">Choose your CD-ROM device or type its path if it's not listed</property>
+ </object>
<packing>
<property name="position">0</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- <child>
- <widget class="GtkLabel" id="cdr_label">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Select CD-ROM device</property>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
- </child>
- </widget>
+ </object>
<packing>
<property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkFrame" id="frame2">
+ <object class="GtkFrame" id="frame2">
<property name="visible">True</property>
<property name="label_xalign">0</property>
<child>
- <widget class="GtkVBox" id="vbox2">
+ <object class="GtkVBox" id="vbox2">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<child>
- <widget class="GtkHBox" id="hbox1">
+ <object class="GtkHBox" id="hbox1">
<property name="visible">True</property>
<property name="border_width">5</property>
<child>
- <widget class="GtkLabel" id="readmode_label">
+ <object class="GtkLabel" id="readmode_label">
<property name="visible">True</property>
<property name="xpad">5</property>
<property name="ypad">5</property>
<property name="label" translatable="yes">Select read mode:</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -78,16 +68,21 @@
</packing>
</child>
<child>
- <widget class="GtkComboBox" id="readmode_combobox">
+ <object class="GtkComboBox" id="readmode_combobox">
<property name="visible">True</property>
- <property name="items" translatable="yes">Normal (No Cache)
-Threaded - Faster (With Cache)</property>
- </widget>
+ <property name="model">liststoreReadMode</property>
+ <child>
+ <object class="GtkCellRendererText" id="cellrenderertextReadMode"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
+ </child>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -95,24 +90,24 @@ Threaded - Faster (With Cache)</property>
</packing>
</child>
<child>
- <widget class="GtkHSeparator" id="hseparator1">
+ <object class="GtkHSeparator" id="hseparator1">
<property name="visible">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="position">1</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox2">
+ <object class="GtkHBox" id="hbox2">
<property name="visible">True</property>
<property name="border_width">5</property>
<property name="spacing">5</property>
<child>
- <widget class="GtkLabel" id="label4">
+ <object class="GtkLabel" id="label4">
<property name="visible">True</property>
<property name="label" translatable="yes">Cache Size (Def. 64):</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -120,13 +115,12 @@ Threaded - Faster (With Cache)</property>
</packing>
</child>
<child>
- <widget class="GtkSpinButton" id="spinCacheSize">
+ <object class="GtkSpinButton" id="spinCacheSize">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="adjustment">32 32 2048 1 16 0</property>
<property name="climb_rate">1</property>
<property name="numeric">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -134,30 +128,30 @@ Threaded - Faster (With Cache)</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="position">2</property>
</packing>
</child>
<child>
- <widget class="GtkHSeparator" id="hseparator2">
+ <object class="GtkHSeparator" id="hseparator2">
<property name="visible">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="position">3</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox4">
+ <object class="GtkHBox" id="hbox4">
<property name="visible">True</property>
<property name="border_width">5</property>
<property name="spacing">5</property>
<child>
- <widget class="GtkLabel" id="label7">
+ <object class="GtkLabel" id="label7">
<property name="visible">True</property>
<property name="label" translatable="yes">Spindown Time:</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -165,25 +159,16 @@ Threaded - Faster (With Cache)</property>
</packing>
</child>
<child>
- <widget class="GtkComboBox" id="comboSpinDown">
+ <object class="GtkComboBox" id="comboSpinDown">
<property name="visible">True</property>
- <property name="items" translatable="yes">Default
-125ms
-250ms
-500ms
-1s
-2s
-4s
-8s
-16s
-32s
-1min
-2min
-4min
-8min
-16min
-32min</property>
- </widget>
+ <property name="model">liststoreSpindownTime</property>
+ <child>
+ <object class="GtkCellRendererText" id="cellrenderertextSpindownTime"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
+ </child>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -191,30 +176,30 @@ Threaded - Faster (With Cache)</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="position">4</property>
</packing>
</child>
<child>
- <widget class="GtkHSeparator" id="hseparator3">
+ <object class="GtkHSeparator" id="hseparator3">
<property name="visible">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="position">5</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox3">
+ <object class="GtkHBox" id="hbox3">
<property name="visible">True</property>
<property name="border_width">5</property>
<property name="spacing">5</property>
<child>
- <widget class="GtkLabel" id="label5">
+ <object class="GtkLabel" id="label5">
<property name="visible">True</property>
<property name="label" translatable="yes">Cdrom Speed (Def. 0 = MAX):</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -222,13 +207,12 @@ Threaded - Faster (With Cache)</property>
</packing>
</child>
<child>
- <widget class="GtkSpinButton" id="spinCdrSpeed">
+ <object class="GtkSpinButton" id="spinCdrSpeed">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="adjustment">0 0 100 1 4 0</property>
<property name="climb_rate">1</property>
<property name="numeric">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -236,25 +220,22 @@ Threaded - Faster (With Cache)</property>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="position">6</property>
</packing>
</child>
<child>
- <widget class="GtkHSeparator" id="cfg_hseparator">
+ <object class="GtkHSeparator" id="cfg_hseparator">
<property name="visible">True</property>
- <accessibility>
- <atkproperty name="AtkObject::accessible-name" translatable="yes">hseparator</atkproperty>
- </accessibility>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="position">7</property>
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="subQ_button">
+ <object class="GtkCheckButton" id="subQ_button">
<property name="label" translatable="yes">Enable subchannel read</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -262,63 +243,126 @@ Threaded - Faster (With Cache)</property>
<property name="border_width">10</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">8</property>
</packing>
</child>
- </widget>
- </child>
- <child>
- <widget class="GtkLabel" id="options_label">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Options</property>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
+ </object>
</child>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
<child internal-child="action_area">
- <widget class="GtkHButtonBox" id="cfg_dialog-action_area">
+ <object class="GtkHButtonBox" id="cfg_dialog-action_area">
<property name="visible">True</property>
<property name="layout_style">end</property>
<child>
- <widget class="GtkButton" id="cfg_closebutton">
+ <object class="GtkButton" id="cfg_closebutton">
<property name="label">gtk-close</property>
- <property name="response_id">-6</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
<signal name="clicked" handler="on_cfg_cancelbutton_clicked"/>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="pack_type">end</property>
<property name="position">0</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
-</glade-interface>
+ <action-widgets>
+ <action-widget response="-6">cfg_closebutton</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkListStore" id="liststoreReadMode">
+ <columns>
+ <!-- column-name Item -->
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0" translatable="yes">Normal (No Cache)</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Threaded - Faster (With Cache)</col>
+ </row>
+ </data>
+ </object>
+ <object class="GtkListStore" id="liststoreSpindownTime">
+ <columns>
+ <!-- column-name Item -->
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0" translatable="yes">Default</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">125ms</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">250ms</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">500ms</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">1s</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">2s</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">4s</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">8s</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">16s</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">32s</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">1min</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">2min</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">4min</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">8min</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">16min</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">32min</col>
+ </row>
+ </data>
+ </object>
+</interface>
diff --git a/plugins/dfcdrom/cdrcfg-0.1df/main.c b/plugins/dfcdrom/cdrcfg-0.1df/main.c
index fbbe29d5..0b62a801 100644
--- a/plugins/dfcdrom/cdrcfg-0.1df/main.c
+++ b/plugins/dfcdrom/cdrcfg-0.1df/main.c
@@ -22,9 +22,9 @@
#include "../cfg.c"
#include <gtk/gtk.h>
-#include <glade/glade.h>
-GtkWidget *MainWindow;
+GtkBuilder *builder;
+GtkWidget *widget, *MainWindow;
// function to check if the device is a cdrom
int is_cdrom(const char *device) {
@@ -174,27 +174,23 @@ void fill_drives_list(GtkWidget *widget) {
}
static void OnConfigExit(GtkWidget *widget, gpointer user_data) {
- GladeXML *xml;
-
- xml = glade_get_widget_tree(MainWindow);
-
- widget = glade_xml_get_widget(xml, "cddev_comboboxentry");
+ widget = gtk_builder_get_object(builder, "cddev_comboboxentry");
strncpy(CdromDev, gtk_entry_get_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(widget)))), 255);
CdromDev[255] = '\0';
- widget = glade_xml_get_widget(xml, "readmode_combobox");
+ widget = gtk_builder_get_object(builder, "readmode_combobox");
ReadMode = gtk_combo_box_get_active(GTK_COMBO_BOX(widget));
- widget = glade_xml_get_widget(xml, "subQ_button");
+ widget = gtk_builder_get_object(builder, "subQ_button");
UseSubQ = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
- widget = glade_xml_get_widget(xml, "spinCacheSize");
+ widget = gtk_builder_get_object(builder, "spinCacheSize");
CacheSize = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(widget));
- widget = glade_xml_get_widget(xml, "spinCdrSpeed");
+ widget = gtk_builder_get_object(builder, "spinCdrSpeed");
CdrSpeed = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(widget));
- widget = glade_xml_get_widget(xml, "comboSpinDown");
+ widget = gtk_builder_get_object(builder, "comboSpinDown");
SpinDown = gtk_combo_box_get_active(GTK_COMBO_BOX(widget));
SaveConf();
@@ -204,45 +200,36 @@ static void OnConfigExit(GtkWidget *widget, gpointer user_data) {
}
long CDRconfigure() {
- GladeXML *xml;
- GtkWidget *widget;
-
LoadConf();
- xml = glade_xml_new(DATADIR "dfcdrom.glade2", "CfgWnd", NULL);
- if (xml == NULL) {
- g_warning("We could not load the interface!");
- return -1;
- }
-
- MainWindow = glade_xml_get_widget(xml, "CfgWnd");
+ MainWindow = gtk_builder_get_object(builder, "CfgWnd");
gtk_window_set_title(GTK_WINDOW(MainWindow), _("CDR configuration"));
- widget = glade_xml_get_widget(xml, "CfgWnd");
+ widget = gtk_builder_get_object(builder, "CfgWnd");
g_signal_connect_data(GTK_OBJECT(widget), "delete_event",
G_CALLBACK(OnConfigExit), NULL, NULL, G_CONNECT_AFTER);
- widget = glade_xml_get_widget(xml, "cfg_closebutton");
+ widget = gtk_builder_get_object(builder, "cfg_closebutton");
g_signal_connect_data(GTK_OBJECT(widget), "clicked",
G_CALLBACK(OnConfigExit), NULL, NULL, G_CONNECT_AFTER);
- widget = glade_xml_get_widget(xml, "cddev_comboboxentry");
+ widget = gtk_builder_get_object(builder, "cddev_comboboxentry");
fill_drives_list(widget);
gtk_entry_set_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(widget))), CdromDev);
- widget = glade_xml_get_widget(xml, "readmode_combobox");
+ widget = gtk_builder_get_object(builder, "readmode_combobox");
gtk_combo_box_set_active(GTK_COMBO_BOX(widget), ReadMode);
- widget = glade_xml_get_widget(xml, "subQ_button");
+ widget = gtk_builder_get_object(builder, "subQ_button");
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), UseSubQ);
- widget = glade_xml_get_widget(xml, "spinCacheSize");
+ widget = gtk_builder_get_object(builder, "spinCacheSize");
gtk_spin_button_set_value(GTK_SPIN_BUTTON(widget), (float)CacheSize);
- widget = glade_xml_get_widget(xml, "spinCdrSpeed");
+ widget = gtk_builder_get_object(builder, "spinCdrSpeed");
gtk_spin_button_set_value(GTK_SPIN_BUTTON(widget), (float)CdrSpeed);
- widget = glade_xml_get_widget(xml, "comboSpinDown");
+ widget = gtk_builder_get_object(builder, "comboSpinDown");
gtk_combo_box_set_active(GTK_COMBO_BOX(widget), SpinDown);
gtk_widget_show(MainWindow);
@@ -279,8 +266,15 @@ int main(int argc, char *argv[]) {
gtk_init(&argc, &argv);
if (argc != 2) return 0;
-
+
if (strcmp(argv[1], "configure") == 0) {
+ builder = gtk_builder_new();
+
+ if (!gtk_builder_add_from_file(builder, DATADIR "dfcdrom.ui", NULL)) {
+ g_warning("We could not load the interface!");
+ return 0;
+ }
+
CDRconfigure();
} else {
CDRabout();
diff --git a/plugins/dfinput/Makefile.am b/plugins/dfinput/Makefile.am
index c9ea709d..cceed304 100644
--- a/plugins/dfinput/Makefile.am
+++ b/plugins/dfinput/Makefile.am
@@ -3,7 +3,7 @@ libdir = @libdir@/games/psemu/
lib_LTLIBRARIES = libDFInput.la
-libDFInput_la_SOURCES = cfg.c pad.c pad.h sdljoy.c xkb.c analog.c util.c
+libDFInput_la_SOURCES = cfg.c pad.c pad.h sdljoy.c xkb.c analog.c util.c util.h
libDFInput_la_LDFLAGS = -module -avoid-version
libDFInput_la_LIBADD = -lpthread -lX11 $(SDL_LIBS)
diff --git a/plugins/dfinput/pad.c b/plugins/dfinput/pad.c
index fcb86b5e..501ba008 100644
--- a/plugins/dfinput/pad.c
+++ b/plugins/dfinput/pad.c
@@ -578,7 +578,7 @@ static long PADreadPort(int num, PadDataS *pad) {
pad->buttonStatus = (g.PadState[num].KeyStatus & g.PadState[num].JoyKeyStatus);
- // ePSXe different from pcsx, swap bytes
+ // ePSXe different from pcsxr, swap bytes
pad->buttonStatus = (pad->buttonStatus >> 8) | (pad->buttonStatus << 8);
switch (g.cfg.PadDef[num].Type) {
diff --git a/plugins/dfnet/Makefile.am b/plugins/dfnet/Makefile.am
index 4db81928..d67a106b 100644
--- a/plugins/dfnet/Makefile.am
+++ b/plugins/dfnet/Makefile.am
@@ -3,7 +3,7 @@ libdir = @libdir@/games/psemu/
lib_LTLIBRARIES = libDFNet.la
-libDFNet_la_SOURCES = dfnet.c unix.c cfg.c
+libDFNet_la_SOURCES = dfnet.c dfnet.h unix.c cfg.c
libDFNet_la_LDFLAGS = -module -avoid-version
AM_CPPFLAGS = -DLOCALE_DIR=\"${datadir}/locale/\" \
diff --git a/plugins/dfsound/Makefile.am b/plugins/dfsound/Makefile.am
index 3b48eefd..54ee4315 100644
--- a/plugins/dfsound/Makefile.am
+++ b/plugins/dfsound/Makefile.am
@@ -5,7 +5,7 @@ libdir = @libdir@/games/psemu/
lib_LTLIBRARIES = libDFSound.la
-libDFSound_la_SOURCES = spu.c cfg.c dma.c freeze.c registers.c externals.c
+libDFSound_la_SOURCES = adsr.c adsr.h spu.c spu.h cfg.c cfg.h dma.c dma.h gauss_i.h freeze.c reverb.c reverb.h registers.c registers.h externals.c externals.h dsoundoss.h psemuxa.h regs.h xa.c xa.h stdafx.h
libDFSound_la_CPPFLAGS = $(AM_CPPFLAGS)
libDFSound_la_LDFLAGS = -module -avoid-version
@@ -42,10 +42,10 @@ endif
bin_PROGRAMS = cfgDFSound
cfgDFSound_CPPFLAGS = -DLOCALE_DIR=\"${datadir}/locale/\" \
-DDATADIR=\"${datadir}/psemu/\" \
- $(GTK2_CFLAGS) $(GLADE2_CFLAGS) $(AM_CPPFLAGS)
+ $(GTK2_CFLAGS) $(AM_CPPFLAGS)
cfgDFSound_SOURCES = spucfg-0.1df/main.c
-cfgDFSound_LDADD = $(GTK2_LIBS) $(GLADE2_LIBS)
+cfgDFSound_LDADD = $(GTK2_LIBS)
-glade_DATA = spucfg-0.1df/dfsound.glade2
+glade_DATA = spucfg-0.1df/dfsound.ui
gladedir = $(datadir)/psemu/
EXTRA_DIST = $(glade_DATA)
diff --git a/plugins/dfsound/pulseaudio.c b/plugins/dfsound/pulseaudio.c
index 19b1e0b8..bd43bb5a 100644
--- a/plugins/dfsound/pulseaudio.c
+++ b/plugins/dfsound/pulseaudio.c
@@ -150,7 +150,7 @@ void SetupSound (void)
// Acquire context ////////////////////////////////////////////////////////
device.api = pa_threaded_mainloop_get_api (device.mainloop);
- device.context = pa_context_new (device.api, "PCSX");
+ device.context = pa_context_new (device.api, "PCSXR");
pa_context_set_state_callback (device.context, context_state_cb, &device);
if (device.context == NULL)
@@ -214,7 +214,7 @@ void SetupSound (void)
//fprintf (stderr, "Target buffer size: %lu\n", buffer_attributes.tlength);
// Acquire new stream using spec //////////////////////////////////////////
- device.stream = pa_stream_new (device.context, "PCSX", &device.spec, NULL);
+ device.stream = pa_stream_new (device.context, "PCSXR", &device.spec, NULL);
if (device.stream == NULL)
{
error_number = pa_context_errno (device.context);
diff --git a/plugins/dfsound/spucfg-0.1df/dfsound.glade2 b/plugins/dfsound/spucfg-0.1df/dfsound.ui
index d2729bb8..e0012de4 100644
--- a/plugins/dfsound/spucfg-0.1df/dfsound.glade2
+++ b/plugins/dfsound/spucfg-0.1df/dfsound.ui
@@ -1,8 +1,8 @@
<?xml version="1.0"?>
-<glade-interface>
- <!-- interface-requires gtk+ 2.8 -->
+<interface>
+ <requires lib="gtk+" version="2.16"/>
<!-- interface-naming-policy project-wide -->
- <widget class="GtkWindow" id="CfgWnd">
+ <object class="GtkWindow" id="CfgWnd">
<property name="visible">True</property>
<property name="border_width">10</property>
<property name="title" translatable="yes">Configure Sound</property>
@@ -12,23 +12,23 @@
<property name="type_hint">dialog</property>
<signal name="destroy" handler="on_CfgWnd_destroy"/>
<child>
- <widget class="GtkVBox" id="vbox1">
+ <object class="GtkVBox" id="vbox1">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkFrame" id="frame1">
+ <object class="GtkFrame" id="frame1">
<property name="visible">True</property>
<property name="label_xalign">0</property>
<child>
- <widget class="GtkAlignment" id="alignment4">
+ <object class="GtkAlignment" id="alignment4">
<property name="visible">True</property>
<property name="top_padding">6</property>
<property name="bottom_padding">6</property>
<property name="left_padding">12</property>
<property name="right_padding">12</property>
<child>
- <widget class="GtkTable" id="table1">
+ <object class="GtkTable" id="table1">
<property name="visible">True</property>
<property name="border_width">6</property>
<property name="n_rows">3</property>
@@ -36,24 +36,24 @@
<property name="column_spacing">6</property>
<property name="row_spacing">6</property>
<child>
- <widget class="GtkLabel" id="label1v">
+ <object class="GtkLabel" id="label1v">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Volume:</property>
<property name="justify">right</property>
- </widget>
+ </object>
<packing>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label9">
+ <object class="GtkLabel" id="label9">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Interpolation:</property>
<property name="justify">right</property>
- </widget>
+ </object>
<packing>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
@@ -62,12 +62,12 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label8">
+ <object class="GtkLabel" id="label8">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Reverb:</property>
<property name="justify">right</property>
- </widget>
+ </object>
<packing>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
@@ -76,14 +76,16 @@
</packing>
</child>
<child>
- <widget class="GtkComboBox" id="cbVolume2">
+ <object class="GtkComboBox" id="cbVolume2">
<property name="visible">True</property>
- <property name="items" translatable="yes">None
-Low
-Medium
-Loud
-Loudest</property>
- </widget>
+ <property name="model">liststoreVolume</property>
+ <child>
+ <object class="GtkCellRendererText" id="cellrenderertextVolume"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
+ </child>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
@@ -91,12 +93,16 @@ Loudest</property>
</packing>
</child>
<child>
- <widget class="GtkComboBox" id="cbReverb2">
+ <object class="GtkComboBox" id="cbReverb2">
<property name="visible">True</property>
- <property name="items" translatable="yes">Off
-Simple
-Playstation</property>
- </widget>
+ <property name="model">liststoreReverb</property>
+ <child>
+ <object class="GtkCellRendererText" id="cellrenderertextReverb"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
+ </child>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
@@ -107,13 +113,16 @@ Playstation</property>
</packing>
</child>
<child>
- <widget class="GtkComboBox" id="cbInterpolation2">
+ <object class="GtkComboBox" id="cbInterpolation2">
<property name="visible">True</property>
- <property name="items" translatable="yes">None
-Simple
-Gaussian
-Cubic</property>
- </widget>
+ <property name="model">liststoreInterpolation</property>
+ <child>
+ <object class="GtkCellRendererText" id="cellrenderertextInterpolation"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
+ </child>
+ </object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
@@ -123,104 +132,84 @@ Cubic</property>
<property name="y_options">GTK_FILL</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
</child>
- <child>
- <widget class="GtkLabel" id="label10">
- <property name="visible">True</property>
- <property name="label" translatable="yes">&lt;b&gt;General&lt;/b&gt;</property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
- </child>
- </widget>
+ </object>
<packing>
<property name="position">0</property>
</packing>
</child>
<child>
- <widget class="GtkFrame" id="frame2">
+ <object class="GtkFrame" id="frame2">
<property name="visible">True</property>
<property name="label_xalign">0</property>
<child>
- <widget class="GtkAlignment" id="alignment2">
+ <object class="GtkAlignment" id="alignment2">
<property name="visible">True</property>
<property name="top_padding">6</property>
<property name="bottom_padding">6</property>
<property name="left_padding">12</property>
<property name="right_padding">12</property>
<child>
- <widget class="GtkVBox" id="vbox3">
+ <object class="GtkVBox" id="vbox3">
<property name="visible">True</property>
<property name="border_width">6</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkCheckButton" id="chkXASpeed">
+ <object class="GtkCheckButton" id="chkXASpeed">
<property name="label" translatable="yes">Adjust XA speed</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="tooltip" translatable="yes">Choose this if XA music is played too quickly.</property>
+ <property name="tooltip_text" translatable="yes">Choose this if XA music is played too quickly.</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
+ </object>
</child>
- <child>
- <widget class="GtkLabel" id="label11">
- <property name="visible">True</property>
- <property name="label" translatable="yes">&lt;b&gt;XA Music&lt;/b&gt;</property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
- </child>
- </widget>
+ </object>
<packing>
<property name="position">1</property>
</packing>
</child>
<child>
- <widget class="GtkFrame" id="frame3">
+ <object class="GtkFrame" id="frame3">
<property name="visible">True</property>
<property name="label_xalign">0</property>
<child>
- <widget class="GtkAlignment" id="alignment3">
+ <object class="GtkAlignment" id="alignment3">
<property name="visible">True</property>
<property name="top_padding">6</property>
<property name="bottom_padding">6</property>
<property name="left_padding">12</property>
<property name="right_padding">12</property>
<child>
- <widget class="GtkVBox" id="vbox4">
+ <object class="GtkVBox" id="vbox4">
<property name="visible">True</property>
<property name="border_width">6</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkCheckButton" id="chkHiCompat">
+ <object class="GtkCheckButton" id="chkHiCompat">
<property name="label" translatable="yes">High compatibility mode</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="tooltip" translatable="yes">Use the asynchronous SPU interface.</property>
+ <property name="tooltip_text" translatable="yes">Use the asynchronous SPU interface.</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -228,15 +217,15 @@ Cubic</property>
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="chkIRQWait">
+ <object class="GtkCheckButton" id="chkIRQWait">
<property name="label" translatable="yes">SPU IRQ Wait</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="tooltip" translatable="yes">Wait for CPU; only useful for some games.</property>
+ <property name="tooltip_text" translatable="yes">Wait for CPU; only useful for some games.</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -244,15 +233,15 @@ Cubic</property>
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="chkDisStereo">
+ <object class="GtkCheckButton" id="chkDisStereo">
<property name="label" translatable="yes">Single channel sound</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="tooltip" translatable="yes">Play only one channel for a performance boost.</property>
+ <property name="tooltip_text" translatable="yes">Play only one channel for a performance boost.</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
@@ -260,62 +249,112 @@ Cubic</property>
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="chkFreqResponse">
+ <object class="GtkCheckButton" id="chkFreqResponse">
<property name="label" translatable="yes">Frequency Response - Output Filter</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="draw_indicator">True</property>
- </widget>
+ </object>
<packing>
<property name="position">3</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
- </child>
- <child>
- <widget class="GtkLabel" id="label12">
- <property name="visible">True</property>
- <property name="label" translatable="yes">&lt;b&gt;Compatibility&lt;/b&gt;</property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="type">label_item</property>
- </packing>
+ </object>
</child>
- </widget>
+ </object>
<packing>
<property name="position">2</property>
</packing>
</child>
<child>
- <widget class="GtkHButtonBox" id="hbuttonbox1">
+ <object class="GtkHButtonBox" id="hbuttonbox1">
<property name="visible">True</property>
<property name="spacing">12</property>
<property name="layout_style">end</property>
<child>
- <widget class="GtkButton" id="btn_close">
+ <object class="GtkButton" id="btn_close">
<property name="label">gtk-close</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
<property name="use_stock">True</property>
- </widget>
+ </object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
- </widget>
+ </object>
<packing>
<property name="position">3</property>
</packing>
</child>
- </widget>
+ </object>
</child>
- </widget>
-</glade-interface>
+ </object>
+ <object class="GtkListStore" id="liststoreVolume">
+ <columns>
+ <!-- column-name Item -->
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0" translatable="yes">None</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Low</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Medium</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Loud</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Loudest</col>
+ </row>
+ </data>
+ </object>
+ <object class="GtkListStore" id="liststoreReverb">
+ <columns>
+ <!-- column-name Item -->
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0" translatable="yes">Off</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Simple</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Playstation</col>
+ </row>
+ </data>
+ </object>
+ <object class="GtkListStore" id="liststoreInterpolation">
+ <columns>
+ <!-- column-name Item -->
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0" translatable="yes">None</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Simple</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Gaussian</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Cubic</col>
+ </row>
+ </data>
+ </object>
+</interface>
diff --git a/plugins/dfsound/spucfg-0.1df/main.c b/plugins/dfsound/spucfg-0.1df/main.c
index fc5976cb..f8a85bb8 100644
--- a/plugins/dfsound/spucfg-0.1df/main.c
+++ b/plugins/dfsound/spucfg-0.1df/main.c
@@ -6,7 +6,6 @@
#include <string.h>
#include <sys/stat.h>
-#include <glade/glade.h>
#include <gtk/gtk.h>
#ifdef ENABLE_NLS
@@ -18,6 +17,9 @@
#define WRITEBINARY "wb"
#define CONFIG_FILENAME "dfsound.cfg"
+GtkBuilder *builder;
+GtkWidget *widget, *MainWindow;
+
void SaveConfig(GtkWidget *widget, gpointer user_datal);
/* This function checks for the value being outside the accepted range,
@@ -45,16 +47,12 @@ void on_about_clicked (GtkWidget *widget, gpointer user_data)
void OnConfigClose(GtkWidget *widget, gpointer user_data)
{
- GladeXML *xml = (GladeXML *)user_data;
-
- gtk_widget_destroy(glade_xml_get_widget(xml, "CfgWnd"));
+ gtk_widget_destroy(gtk_builder_get_object(builder, "CfgWnd"));
gtk_exit(0);
}
int main(int argc, char *argv[])
{
- GtkWidget *widget;
- GladeXML *xml;
FILE *in;
char t[256];
int len, val = 0;
@@ -84,7 +82,7 @@ int main(int argc, char *argv[])
if (strcmp(argv[1], "ABOUT") == 0) {
const char *authors[]= {"Pete Bernert and the P.E.Op.S. team", "Ryan Schultz", "Andrew Burton", NULL};
widget = gtk_about_dialog_new ();
- gtk_about_dialog_set_name (GTK_ABOUT_DIALOG (widget), "dfsound PCSX Sound Plugin");
+ gtk_about_dialog_set_name (GTK_ABOUT_DIALOG (widget), "dfsound PCSXR Sound Plugin");
gtk_about_dialog_set_version (GTK_ABOUT_DIALOG (widget), "1.6");
gtk_about_dialog_set_authors (GTK_ABOUT_DIALOG (widget), authors);
gtk_about_dialog_set_website (GTK_ABOUT_DIALOG (widget), "http://pcsx-df.sourceforge.net/");
@@ -98,11 +96,14 @@ int main(int argc, char *argv[])
return 0;
}
- xml = glade_xml_new(DATADIR "dfsound.glade2", "CfgWnd", NULL);
- if (!xml) {
+ builder = gtk_builder_new();
+
+ if (!gtk_builder_add_from_file(builder, DATADIR "dfsound.ui", NULL)) {
g_warning("We could not load the interface!");
- return 255;
- }
+ return 0;
+ }
+
+ MainWindow = gtk_builder_get_object(builder, "CfgWnd");
strcpy(cfg, CONFIG_FILENAME);
@@ -129,7 +130,7 @@ int main(int argc, char *argv[])
val = set_limit (p, len, -1, 4) + 1;
} else val = 2;
- gtk_combo_box_set_active(GTK_COMBO_BOX (glade_xml_get_widget(xml, "cbVolume2")), val);
+ gtk_combo_box_set_active(GTK_COMBO_BOX (gtk_builder_get_object(builder, "cbVolume2")), val);
if (pB) {
strcpy(t, "\nUseInterpolation");
@@ -141,7 +142,7 @@ int main(int argc, char *argv[])
val = set_limit (p, len, 0, 3);
} else val = 2;
- gtk_combo_box_set_active(GTK_COMBO_BOX (glade_xml_get_widget(xml, "cbInterpolation2")), val);
+ gtk_combo_box_set_active(GTK_COMBO_BOX (gtk_builder_get_object(builder, "cbInterpolation2")), val);
if (pB) {
strcpy(t, "\nXAPitch");
@@ -153,7 +154,7 @@ int main(int argc, char *argv[])
val = set_limit (p, len, 0, 1);
} else val = 0;
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (glade_xml_get_widget(xml, "chkXASpeed")), val);
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (gtk_builder_get_object(builder, "chkXASpeed")), val);
if (pB) {
strcpy(t, "\nHighCompMode");
@@ -165,7 +166,7 @@ int main(int argc, char *argv[])
val = set_limit (p, len, 0, 1);
} else val = 1;
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (glade_xml_get_widget(xml, "chkHiCompat")), val);
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (gtk_builder_get_object(builder, "chkHiCompat")), val);
if (pB) {
strcpy(t, "\nSPUIRQWait");
@@ -178,7 +179,7 @@ int main(int argc, char *argv[])
val = set_limit (p, len, 0, 1);
} else val = 1;
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (glade_xml_get_widget(xml, "chkIRQWait")), val);
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (gtk_builder_get_object(builder, "chkIRQWait")), val);
if (pB) {
strcpy(t, "\nDisStereo");
@@ -191,7 +192,7 @@ int main(int argc, char *argv[])
val = set_limit (p, len, 0, 1);
} else val = 0;
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (glade_xml_get_widget(xml, "chkDisStereo")), val);
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (gtk_builder_get_object(builder, "chkDisStereo")), val);
if (pB) {
strcpy(t, "\nFreqResponse");
@@ -204,7 +205,7 @@ int main(int argc, char *argv[])
val = set_limit (p, len, 0, 1);
} else val = 0;
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (glade_xml_get_widget(xml, "chkFreqResponse")), val);
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (gtk_builder_get_object(builder, "chkFreqResponse")), val);
if (pB) {
strcpy(t, "\nUseReverb");
@@ -216,18 +217,18 @@ int main(int argc, char *argv[])
val = set_limit (p, len, 0, 2);
} else val = 2;
- gtk_combo_box_set_active(GTK_COMBO_BOX(glade_xml_get_widget(xml, "cbReverb2")), val);
+ gtk_combo_box_set_active(GTK_COMBO_BOX(gtk_builder_get_object(builder, "cbReverb2")), val);
if (pB)
free(pB);
- widget = glade_xml_get_widget(xml, "CfgWnd");
+ widget = gtk_builder_get_object(builder, "CfgWnd");
g_signal_connect_data(GTK_OBJECT(widget), "destroy",
- G_CALLBACK(SaveConfig), xml, NULL, 0);
+ G_CALLBACK(SaveConfig), builder, NULL, 0);
- widget = glade_xml_get_widget(xml, "btn_close");
+ widget = gtk_builder_get_object(builder, "btn_close");
g_signal_connect_data(GTK_OBJECT(widget), "clicked",
- G_CALLBACK(OnConfigClose), xml, NULL, G_CONNECT_AFTER);
+ G_CALLBACK(OnConfigClose), builder, NULL, G_CONNECT_AFTER);
gtk_main();
return 0;
@@ -235,7 +236,6 @@ int main(int argc, char *argv[])
void SaveConfig(GtkWidget *widget, gpointer user_data)
{
- GladeXML *xml = (GladeXML *)user_data;
FILE *fp;
int val;
@@ -245,28 +245,28 @@ void SaveConfig(GtkWidget *widget, gpointer user_data)
gtk_exit(0);
}
- val = gtk_combo_box_get_active(GTK_COMBO_BOX(glade_xml_get_widget(xml, "cbVolume2")));
+ val = gtk_combo_box_get_active(GTK_COMBO_BOX(gtk_builder_get_object(builder, "cbVolume2")));
fprintf(fp, "\nVolume = %d\n", val - 1);
- val = gtk_combo_box_get_active(GTK_COMBO_BOX(glade_xml_get_widget(xml, "cbInterpolation2")));
+ val = gtk_combo_box_get_active(GTK_COMBO_BOX(gtk_builder_get_object(builder, "cbInterpolation2")));
fprintf(fp, "\nUseInterpolation = %d\n", val);
- val = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(glade_xml_get_widget(xml, "chkXASpeed")));
+ val = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "chkXASpeed")));
fprintf(fp, "\nXAPitch = %d\n", val);
- val = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(glade_xml_get_widget(xml, "chkHiCompat")));
+ val = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "chkHiCompat")));
fprintf(fp, "\nHighCompMode = %d\n", val);
- val = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(glade_xml_get_widget(xml, "chkIRQWait")));
+ val = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "chkIRQWait")));
fprintf(fp, "\nSPUIRQWait = %d\n", val);
- val = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(glade_xml_get_widget(xml, "chkDisStereo")));
+ val = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "chkDisStereo")));
fprintf(fp, "\nDisStereo = %d\n", val);
- val = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(glade_xml_get_widget(xml, "chkFreqResponse")));
+ val = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "chkFreqResponse")));
fprintf(fp, "\nFreqResponse = %d\n", val);
- val = gtk_combo_box_get_active(GTK_COMBO_BOX(glade_xml_get_widget(xml, "cbReverb2")));
+ val = gtk_combo_box_get_active(GTK_COMBO_BOX(gtk_builder_get_object(builder, "cbReverb2")));
fprintf(fp, "\nUseReverb = %d\n", val);
fclose(fp);
diff --git a/plugins/dfxvideo/Makefile.am b/plugins/dfxvideo/Makefile.am
index a7515a21..7e56a9c6 100644
--- a/plugins/dfxvideo/Makefile.am
+++ b/plugins/dfxvideo/Makefile.am
@@ -17,9 +17,9 @@ libdir = @libdir@/games/psemu/
lib_LTLIBRARIES = libDFXVideo.la
-libDFXVideo_la_SOURCES = gpu.c cfg.c draw.c fps.c key.c menu.c prim.c soft.c zn.c
+libDFXVideo_la_SOURCES = gpu.c gpu.h cfg.c cfg.h draw.c draw.h fps.c fps.h key.c key.h menu.c menu.h prim.c prim.h soft.c soft.h zn.c swap.h externals.h hq2x.h hq3x.h interp.h
if X86_NASM
-libDFXVideo_la_SOURCES += i386.asm
+libDFXVideo_la_SOURCES += i386.asm macros.inc
AM_CPPFLAGS += -DUSE_NASM=1
endif
libDFXVideo_la_LDFLAGS = -module -avoid-version
diff --git a/plugins/dfxvideo/cfg.c b/plugins/dfxvideo/cfg.c
index 70c08461..09d0485c 100644
--- a/plugins/dfxvideo/cfg.c
+++ b/plugins/dfxvideo/cfg.c
@@ -96,7 +96,7 @@ void ReadConfigFile()
{
strcpy(t,"cfg/dfxvideo.cfg");
in = fopen(t,"rb");
- if(!in) sprintf(t,"%s/.pcsx/plugins/dfxvideo.cfg",getenv("HOME"));
+ if(!in) sprintf(t,"%s/.pcsxr/plugins/dfxvideo.cfg",getenv("HOME"));
else fclose(in);
}
else fclose(in);
@@ -188,7 +188,7 @@ void ExecCfg(char *arg) {
return;
}
- sprintf(cfg, "%s/.pcsx/plugins/cfg/cfgDFXVideo", getenv("HOME"));
+ sprintf(cfg, "%s/.pcsxr/plugins/cfg/cfgDFXVideo", getenv("HOME"));
if (stat(cfg, &buf) != -1) {
if (fork() == 0) {
execl(cfg, "cfgDFXVideo", arg, NULL);
@@ -256,7 +256,7 @@ void WriteConfig(void) {
{
strcpy(t,"cfg/dfxvideo.cfg");
out = fopen(t,"rb");
- if(!out) sprintf(t,"%s/.pcsx/plugins/dfxvideo.cfg",getenv("HOME"));
+ if(!out) sprintf(t,"%s/.pcsxr/plugins/dfxvideo.cfg",getenv("HOME"));
else fclose(out);
}
else fclose(out);
diff --git a/plugins/dfxvideo/gpu.c b/plugins/dfxvideo/gpu.c
index bd14f28f..ef06be1a 100644
--- a/plugins/dfxvideo/gpu.c
+++ b/plugins/dfxvideo/gpu.c
@@ -294,9 +294,9 @@ static void DoTextSnapShot(int iNum)
char *pB;
#ifdef _WINDOWS
- sprintf(szTxt,"snap\\pcsx%04d.txt",iNum);
+ sprintf(szTxt,"snap\\pcsxr%04d.txt",iNum);
#else
- sprintf(szTxt,"%s/pcsx%04d.txt",getenv("HOME"),iNum);
+ sprintf(szTxt,"%s/pcsxr%04d.txt",getenv("HOME"),iNum);
#endif
if ((txtfile = fopen(szTxt, "wb")) == NULL)
@@ -356,9 +356,9 @@ void CALLBACK GPUmakeSnapshot(void)
{
snapshotnr++;
#ifdef _WINDOWS
- sprintf(filename,"snap\\pcsx%04ld.bmp",snapshotnr);
+ sprintf(filename,"snap\\pcsxr%04ld.bmp",snapshotnr);
#else
- sprintf(filename, "%s/pcsx%04ld.bmp", getenv("HOME"), snapshotnr);
+ sprintf(filename, "%s/pcsxr%04ld.bmp", getenv("HOME"), snapshotnr);
#endif
bmpfile = fopen(filename,"rb");
diff --git a/plugins/dfxvideo/gpucfg-0.1df/main.c b/plugins/dfxvideo/gpucfg-0.1df/main.c
index 07d362e3..4edc0a25 100644
--- a/plugins/dfxvideo/gpucfg-0.1df/main.c
+++ b/plugins/dfxvideo/gpucfg-0.1df/main.c
@@ -144,7 +144,7 @@ main (int argc, char *argv[])
if (strcmp(argv[1], "ABOUT") == 0) {
const char *authors[]= {"Pete Bernert and the P.E.Op.S. team", "Ryan Schultz", "Andrew Burton", NULL};
widget = gtk_about_dialog_new ();
- gtk_about_dialog_set_name (GTK_ABOUT_DIALOG (widget), "P.E.Op.S PCSX Video Plugin");
+ gtk_about_dialog_set_name (GTK_ABOUT_DIALOG (widget), "P.E.Op.S PCSXR Video Plugin");
gtk_about_dialog_set_version (GTK_ABOUT_DIALOG (widget), "1.17");
gtk_about_dialog_set_authors (GTK_ABOUT_DIALOG (widget), authors);
gtk_about_dialog_set_website (GTK_ABOUT_DIALOG (widget), "http://pcsx-df.sourceforge.net/");
@@ -178,7 +178,7 @@ main (int argc, char *argv[])
fclose(in);
}
else{ pB=0;printf("Couldn't find config file %s\n", cfg);}
-/* ADB TODO Parse this like we parse the config file in PCSX - use common functions! */
+/* ADB TODO Parse this like we parse the config file in PCSXR - use common functions! */
val=1;
if(pB)
{
diff --git a/plugins/gxvideo/Makefile.am b/plugins/gxvideo/Makefile.am
index 0f6499c1..9f753f91 100644
--- a/plugins/gxvideo/Makefile.am
+++ b/plugins/gxvideo/Makefile.am
@@ -16,15 +16,15 @@ bindir = @libdir@/games/psemu/
libdir = @libdir@/games/psemu/
noinst_LTLIBRARIES = libcfg.la libglobals.la
-libcfg_la_SOURCES = cfg.c
+libcfg_la_SOURCES = cfg.c cfg.h globals.h
libglobals_la_SOURCES = globals.c
lib_LTLIBRARIES = libGXVideo.la
-libGXVideo_la_SOURCES = gpu.c draw.c fps.c key.c menu.c prim.c soft.c
+libGXVideo_la_SOURCES = gpu.c gpu.h draw.c draw.h fps.c fps.h key.c key.h menu.c menu.h prim.c prim.h soft.c soft.h gpu_utils.h interp.h swap.h
if X86_NASM
-libGXVideo_la_SOURCES += i386.asm
+libGXVideo_la_SOURCES += i386.asm macros.inc
AM_CPPFLAGS += -DUSE_NASM=1
endif
libGXVideo_la_LDFLAGS = -module -avoid-version
diff --git a/plugins/gxvideo/cfg.c b/plugins/gxvideo/cfg.c
index 7b18327a..b64bd99d 100644
--- a/plugins/gxvideo/cfg.c
+++ b/plugins/gxvideo/cfg.c
@@ -78,7 +78,7 @@ void ReadConfigFile() {
strcpy(cfg_file_name, "cfg/" DEFAULT_CFG_NAME);
f_in = fopen(cfg_file_name, "rb");
if (!f_in)
- snprintf(cfg_file_name, 255, "%s/.pcsx/plugins/" DEFAULT_CFG_NAME, getenv("HOME"));
+ snprintf(cfg_file_name, 255, "%s/.pcsxr/plugins/" DEFAULT_CFG_NAME, getenv("HOME"));
else
fclose(f_in);
} else
@@ -175,7 +175,7 @@ void ExecCfg(char const * arg) {
return;
}
- sprintf(cfg, "%s/.pcsx/plugins/cfg/cfgGXVideo", getenv("HOME"));
+ sprintf(cfg, "%s/.pcsxr/plugins/cfg/cfgGXVideo", getenv("HOME"));
if (stat(cfg, &buf) != -1) {
if (fork() == 0) {
execl(cfg, "cfgGXVideo", arg, NULL);
@@ -230,7 +230,7 @@ void WriteConfig(void) {
strcpy(cfg_file_name, "cfg/" DEFAULT_CFG_NAME);
f_out = fopen(cfg_file_name, "rb");
if (!f_out)
- snprintf(cfg_file_name, 255, "%s/.pcsx/plugins/" DEFAULT_CFG_NAME, getenv("HOME"));
+ snprintf(cfg_file_name, 255, "%s/.pcsxr/plugins/" DEFAULT_CFG_NAME, getenv("HOME"));
else
fclose(f_out);
} else
diff --git a/plugins/gxvideo/gpu.c b/plugins/gxvideo/gpu.c
index 22544950..853c7da3 100644
--- a/plugins/gxvideo/gpu.c
+++ b/plugins/gxvideo/gpu.c
@@ -217,9 +217,9 @@ void CALLBACK GPUmakeSnapshot(void) {
// do {
// snapshotnr++;
//#ifdef _WINDOWS
- // sprintf(filename,"snap\\pcsx%04ld.bmp",snapshotnr);
+ // sprintf(filename,"snap\\pcsxr%04ld.bmp",snapshotnr);
//#else
- // sprintf(filename, "%s/pcsx%04ld.bmp", getenv("HOME"), snapshotnr);
+ // sprintf(filename, "%s/pcsxr%04ld.bmp", getenv("HOME"), snapshotnr);
//#endif
//
// bmpfile = fopen(filename, "rb");
diff --git a/plugins/gxvideo/gpucfg/main.c b/plugins/gxvideo/gpucfg/main.c
index 64691e56..d3d4f93d 100644
--- a/plugins/gxvideo/gpucfg/main.c
+++ b/plugins/gxvideo/gpucfg/main.c
@@ -165,7 +165,7 @@ int main(int argc, char *argv[]) {
"Ryan Schultz", "Andrew Burton", NULL };
widget = gtk_about_dialog_new();
gtk_about_dialog_set_name(GTK_ABOUT_DIALOG (widget),
- "P.E.Op.S PCSX Video Plugin");
+ "P.E.Op.S PCSXR Video Plugin");
gtk_about_dialog_set_version(GTK_ABOUT_DIALOG (widget), "1.17");
gtk_about_dialog_set_authors(GTK_ABOUT_DIALOG (widget), authors);
gtk_about_dialog_set_website(GTK_ABOUT_DIALOG (widget),
diff --git a/plugins/peopsxgl/gpu.c b/plugins/peopsxgl/gpu.c
index 04710bcd..2527fe39 100644
--- a/plugins/peopsxgl/gpu.c
+++ b/plugins/peopsxgl/gpu.c
@@ -371,9 +371,9 @@ void DoTextSnapShot(int iNum)
FILE *txtfile;char szTxt[256];char * pB;
#ifdef _WINDOWS
- sprintf(szTxt,"snap\\pcsx%04d.txt",iNum);
+ sprintf(szTxt,"snap\\pcsxr%04d.txt",iNum);
#else
- sprintf(szTxt,"%s/pcsx%04d.txt",getenv("HOME"),iNum);
+ sprintf(szTxt,"%s/pcsxr%04d.txt",getenv("HOME"),iNum);
#endif
if((txtfile=fopen(szTxt,"wb"))==NULL)
@@ -440,9 +440,9 @@ void DoSnapShot(void)
{
snapshotnr++;
#ifdef _WINDOWS
- sprintf(filename,"snap/pcsx%04d.bmp",snapshotnr);
+ sprintf(filename,"snap/pcsxr%04d.bmp",snapshotnr);
#else
- sprintf(filename,"%s/pcsx%04d.bmp",getenv("HOME"),snapshotnr);
+ sprintf(filename,"%s/pcsxr%04d.bmp",getenv("HOME"),snapshotnr);
#endif
bmpfile=fopen(filename,"rb");
if(bmpfile==NULL)break;
@@ -2980,7 +2980,7 @@ void StartCfgTool(char *arg) // linux: start external cfg tool
return;
}
- sprintf(cfg, "%s/.pcsx/plugins/cfg/cfgpeopsxgl", getenv("HOME"));
+ sprintf(cfg, "%s/.pcsxr/plugins/cfg/cfgpeopsxgl", getenv("HOME"));
if (stat(cfg, &buf) != -1) {
if (fork() == 0) {
execl(cfg, "cfgpeopsxgl", arg, NULL);
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 5040a539..b7227d53 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,4 +1,4 @@
-[type: gettext/glade]data/pcsx.glade2
+[type: gettext/glade]data/pcsxr.glade2
gui/AboutDlg.c
gui/AboutDlg.h
gui/Cheat.c
@@ -39,7 +39,7 @@ libpcsxcore/sio.c
libpcsxcore/socket.c
libpcsxcore/spu.c
plugins/dfcdrom/cdr.c
-[type: gettext/glade]plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2
+[type: gettext/glade]plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui
plugins/dfcdrom/cdrcfg-0.1df/main.c
plugins/dfcdrom/cdr-linux.c
plugins/dfcdrom/cdr-null.c
@@ -68,7 +68,7 @@ plugins/dfsound/pulseaudio.c
plugins/dfsound/registers.c
plugins/dfsound/reverb.c
plugins/dfsound/spu.c
-[type: gettext/glade]plugins/dfsound/spucfg-0.1df/dfsound.glade2
+[type: gettext/glade]plugins/dfsound/spucfg-0.1df/dfsound.ui
plugins/dfsound/xa.c
plugins/dfxvideo/cfg.c
plugins/dfxvideo/draw.c
@@ -95,7 +95,7 @@ plugins/bladesio1/gui.c
plugins/bladesio1/settings.c
plugins/bladesio1/settings.h
plugins/bladesio1/sio1.c
-[type: gettext/glade]plugins/bladesio1/sio1.glade2
+[type: gettext/glade]plugins/bladesio1/sio1.ui
plugins/bladesio1/sio1.h
win32/gui/AboutDlg.c
win32/gui/CheatDlg.c
diff --git a/po/fr_FR.po b/po/fr_FR.po
index 0d3947e7..b0b53ee2 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -1,22 +1,25 @@
# French translation of pcsxr.
# Copyright (C) 2010 Jean-André Santoni
# This file is distributed under the same license as the pcsxr package.
-# Jean-André Santoni <jean.andre.santoni@gmail.com>, 2010.
#
+# Jean-André Santoni <jean.andre.santoni@gmail.com>, 2010.
+# Blade_Arma <edgbla@yandex.ru>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: pcsxr 1.0\n"
"Report-Msgid-Bugs-To: whistler_wmz@users.sf.net\n"
-"POT-Creation-Date: 2011-02-18 17:11+0800\n"
-"PO-Revision-Date: 2010-12-30 12:51+0100\n"
-"Last-Translator: Jean-André Santoni <jean.andre.santoni@gmail.com>\n"
+"POT-Creation-Date: 2011-06-04 23:04+0400\n"
+"PO-Revision-Date: 2011-06-04 13:44+0400\n"
+"Last-Translator: Blade_Arma <edgbla@yandex.ru>\n"
"Language-Team: French <jean.andre.santoni@gmail.com>\n"
"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 1.2\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: ../data/pcsx.glade2.h:1
+#: ../data/pcsxr.glade2.h:1
msgid ""
"8-bit\n"
"16-bit\n"
@@ -26,143 +29,143 @@ msgstr ""
"16-bit\n"
"32-bit"
-#: ../data/pcsx.glade2.h:4
+#: ../data/pcsxr.glade2.h:4
msgid "<b>BIOS</b>"
msgstr "<b>BIOS</b>"
-#: ../data/pcsx.glade2.h:5
+#: ../data/pcsxr.glade2.h:5
msgid "<b>Cheat Codes</b>"
msgstr "<b>Codes de triche</b>"
-#: ../data/pcsx.glade2.h:6
+#: ../data/pcsxr.glade2.h:6
msgid "<b>Cheat Search</b>"
msgstr "<b>Recherche de codes</b>"
-#: ../data/pcsx.glade2.h:7
+#: ../data/pcsxr.glade2.h:7
msgid "<b>Memory Card 1</b>"
msgstr "<b>Carte mémoire 1</b>"
-#: ../data/pcsx.glade2.h:8
+#: ../data/pcsxr.glade2.h:8
msgid "<b>Memory Card 2</b>"
msgstr "<b>Carte mémoire 2</b>"
-#: ../data/pcsx.glade2.h:9
+#: ../data/pcsxr.glade2.h:9
msgid "<b>NetPlay</b>"
msgstr "<b>Jeu en réseau</b>"
-#: ../data/pcsx.glade2.h:10
+#: ../data/pcsxr.glade2.h:10
msgid "<b>Options</b>"
msgstr "<b>Options</b>"
-#: ../data/pcsx.glade2.h:11
+#: ../data/pcsxr.glade2.h:11
msgid "<b>Plugins</b>"
msgstr "<b>Greffons</b>"
-#: ../data/pcsx.glade2.h:12
+#: ../data/pcsxr.glade2.h:12
msgid "<b>System Type</b>"
msgstr "<b>Type de système</b>"
-#: ../data/pcsx.glade2.h:13 ../gui/DebugMemory.c:188
+#: ../data/pcsxr.glade2.h:13 ../gui/DebugMemory.c:188
msgid "Address (Hexadecimal):"
msgstr "Adresse (Hexadécimal) :"
-#: ../data/pcsx.glade2.h:14 ../win32/gui/WndMain.c:1302
+#: ../data/pcsxr.glade2.h:14 ../win32/gui/WndMain.c:1308
msgid "Autodetect"
msgstr "Autodétection"
-#: ../data/pcsx.glade2.h:15
+#: ../data/pcsxr.glade2.h:15
msgid "Black & White Movies"
msgstr "Films en noir & blanc"
-#: ../data/pcsx.glade2.h:16
+#: ../data/pcsxr.glade2.h:16
msgid "CD-ROM..."
msgstr "CD-ROM..."
-#: ../data/pcsx.glade2.h:17
+#: ../data/pcsxr.glade2.h:17
msgid "CD-ROM:"
msgstr "CD-ROM :"
-#: ../data/pcsx.glade2.h:18
+#: ../data/pcsxr.glade2.h:18
msgid "CD-_ROM..."
msgstr "CD-_ROM..."
-#: ../data/pcsx.glade2.h:19
+#: ../data/pcsxr.glade2.h:19
msgid "C_ontrollers..."
msgstr "C_ontrôleurs..."
-#: ../data/pcsx.glade2.h:20
+#: ../data/pcsxr.glade2.h:20
msgid "Chea_t"
msgstr "_Triche"
-#: ../data/pcsx.glade2.h:21 ../gui/Cheat.c:1129 ../win32/gui/CheatDlg.c:678
+#: ../data/pcsxr.glade2.h:21 ../gui/Cheat.c:1129 ../win32/gui/CheatDlg.c:678
msgid "Cheat Search"
msgstr "Recherche de code"
-#: ../data/pcsx.glade2.h:22
+#: ../data/pcsxr.glade2.h:22
msgid "Configure CD-ROM"
msgstr "Configurer le CD-ROM"
-#: ../data/pcsx.glade2.h:23
+#: ../data/pcsxr.glade2.h:23
msgid "Configure CPU"
msgstr "Configurer le CPU"
-#: ../data/pcsx.glade2.h:24
+#: ../data/pcsxr.glade2.h:24
msgid "Configure Controllers"
msgstr "Configurer les contrôleurs"
-#: ../data/pcsx.glade2.h:25
+#: ../data/pcsxr.glade2.h:25
msgid "Configure Graphics"
msgstr "Configurer les graphismes"
-#: ../data/pcsx.glade2.h:26
+#: ../data/pcsxr.glade2.h:26
msgid "Configure Memory Cards"
msgstr "Configurer les cartes mémoires"
-#: ../data/pcsx.glade2.h:27
+#: ../data/pcsxr.glade2.h:27
msgid "Configure NetPlay"
msgstr "Configurer le jeu en réseau"
-#: ../data/pcsx.glade2.h:28 ../gui/ConfDlg.c:112
-msgid "Configure PCSX"
-msgstr "Configurer PCSX"
+#: ../data/pcsxr.glade2.h:28 ../gui/ConfDlg.c:112
+msgid "Configure PCSXR"
+msgstr "Configurer PCSXR"
-#: ../data/pcsx.glade2.h:29 ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:6
+#: ../data/pcsxr.glade2.h:29 ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:3
msgid "Configure Sound"
msgstr "Configurer le son"
-#: ../data/pcsx.glade2.h:30
+#: ../data/pcsxr.glade2.h:30
msgid "Continue Emulation"
msgstr "Continuer l'émulation"
-#: ../data/pcsx.glade2.h:31
+#: ../data/pcsxr.glade2.h:31
msgid "Continue..."
msgstr "Continuer..."
-#: ../data/pcsx.glade2.h:32
+#: ../data/pcsxr.glade2.h:32
msgid "Controller 1: "
msgstr "Contrôleur 1: "
-#: ../data/pcsx.glade2.h:33
+#: ../data/pcsxr.glade2.h:33
msgid "Controller 2:"
msgstr "Contrôleur 2:"
-#: ../data/pcsx.glade2.h:34
+#: ../data/pcsxr.glade2.h:34
msgid "Controllers..."
msgstr "Contrôleurs..."
-#: ../data/pcsx.glade2.h:35
+#: ../data/pcsxr.glade2.h:35
msgid "Copy"
msgstr "Copier"
-#: ../data/pcsx.glade2.h:36 ../win32/gui/CheatDlg.c:683
+#: ../data/pcsxr.glade2.h:36 ../win32/gui/CheatDlg.c:683
msgid "Data Base:"
msgstr "Base numérique :"
-#: ../data/pcsx.glade2.h:37 ../win32/gui/CheatDlg.c:681
+#: ../data/pcsxr.glade2.h:37 ../win32/gui/CheatDlg.c:681
msgid "Data Type:"
msgstr "Type de donnée :"
-#: ../data/pcsx.glade2.h:38
+#: ../data/pcsxr.glade2.h:38
msgid ""
"Decimal\n"
"Hexadecimal"
@@ -170,35 +173,35 @@ msgstr ""
"Décimale\n"
"Héxadecimale"
-#: ../data/pcsx.glade2.h:40
+#: ../data/pcsxr.glade2.h:40
msgid "Disable CD Audio"
msgstr "Désactiver CD Audio"
-#: ../data/pcsx.glade2.h:41
+#: ../data/pcsxr.glade2.h:41
msgid "Disable XA Decoding"
msgstr "Désativer le décodage XA"
-#: ../data/pcsx.glade2.h:42
+#: ../data/pcsxr.glade2.h:42
msgid "E_xit"
msgstr "Quitter"
-#: ../data/pcsx.glade2.h:43 ../win32/gui/CheatDlg.c:166
+#: ../data/pcsxr.glade2.h:43 ../win32/gui/CheatDlg.c:166
msgid "Edit Cheat Codes"
msgstr "Modifier les codes"
-#: ../data/pcsx.glade2.h:44 ../win32/gui/WndMain.c:1304
+#: ../data/pcsxr.glade2.h:44 ../win32/gui/WndMain.c:1310
msgid "Enable Console Output"
msgstr "Activer la sortie console"
-#: ../data/pcsx.glade2.h:45 ../win32/gui/WndMain.c:1305
+#: ../data/pcsxr.glade2.h:45 ../win32/gui/WndMain.c:1311
msgid "Enable Debugger"
msgstr "Activer le débuggeur"
-#: ../data/pcsx.glade2.h:46
+#: ../data/pcsxr.glade2.h:46
msgid "Enable Interpreter CPU"
msgstr "Activer l'interpréteur CPU"
-#: ../data/pcsx.glade2.h:47
+#: ../data/pcsxr.glade2.h:47
msgid ""
"Equal Value\n"
"Not Equal Value\n"
@@ -220,43 +223,43 @@ msgstr ""
"Différente\n"
"Inchangée"
-#: ../data/pcsx.glade2.h:56
+#: ../data/pcsxr.glade2.h:56
msgid "Format"
msgstr "Formater"
-#: ../data/pcsx.glade2.h:57 ../win32/gui/CheatDlg.c:504
+#: ../data/pcsxr.glade2.h:57 ../win32/gui/CheatDlg.c:504
msgid "Freeze"
msgstr "Geler"
-#: ../data/pcsx.glade2.h:58
+#: ../data/pcsxr.glade2.h:58
msgid "Graphics..."
msgstr "Graphismes..."
-#: ../data/pcsx.glade2.h:59
+#: ../data/pcsxr.glade2.h:59
msgid "Graphics:"
msgstr "Graphismes:"
-#: ../data/pcsx.glade2.h:60 ../win32/gui/WndMain.c:1308
+#: ../data/pcsxr.glade2.h:60 ../win32/gui/WndMain.c:1314
msgid "InuYasha Sengoku Battle Fix"
msgstr ""
-#: ../data/pcsx.glade2.h:61
+#: ../data/pcsxr.glade2.h:61
msgid "Memcards..."
msgstr "Cartes mémoires..."
-#: ../data/pcsx.glade2.h:62 ../gui/DebugMemory.c:103
+#: ../data/pcsxr.glade2.h:62 ../gui/DebugMemory.c:103
msgid "Memory Dump"
msgstr "Dump mémoire"
-#: ../data/pcsx.glade2.h:63
+#: ../data/pcsxr.glade2.h:63
msgid "Memory _Dump"
msgstr "_Dump mémoire"
-#: ../data/pcsx.glade2.h:64 ../win32/gui/CheatDlg.c:595
+#: ../data/pcsxr.glade2.h:64 ../win32/gui/CheatDlg.c:595
msgid "Modify"
msgstr "Modifier"
-#: ../data/pcsx.glade2.h:65
+#: ../data/pcsxr.glade2.h:65
msgid ""
"NTSC\n"
"PAL"
@@ -264,225 +267,229 @@ msgstr ""
"NTSC\n"
"PAL"
-#: ../data/pcsx.glade2.h:67
+#: ../data/pcsxr.glade2.h:67
msgid "New"
msgstr "Nouveau"
-#: ../data/pcsx.glade2.h:68
-msgid "PCSX"
-msgstr "PCSX"
+#: ../data/pcsxr.glade2.h:68
+msgid "PCSXR"
+msgstr ""
-#: ../data/pcsx.glade2.h:69 ../win32/gui/WndMain.c:1307
+#: ../data/pcsxr.glade2.h:69 ../win32/gui/WndMain.c:1313
msgid "Parasite Eve 2, Vandal Hearts 1/2 Fix"
msgstr ""
-#: ../data/pcsx.glade2.h:70
+#: ../data/pcsxr.glade2.h:70
msgid "Patch Memory..."
msgstr "Patcher la mémoire..."
-#: ../data/pcsx.glade2.h:71
+#: ../data/pcsxr.glade2.h:71
msgid "Raw Dump..."
msgstr "Dump brut..."
-#: ../data/pcsx.glade2.h:72
+#: ../data/pcsxr.glade2.h:72
msgid "Restart"
msgstr "Redémarrer"
-#: ../data/pcsx.glade2.h:73
+#: ../data/pcsxr.glade2.h:73
msgid "Run CD"
msgstr "Lancer à partir du CD"
-#: ../data/pcsx.glade2.h:74
+#: ../data/pcsxr.glade2.h:74
msgid "Run ISO Image"
msgstr "Lancer une image ISO"
-#: ../data/pcsx.glade2.h:75
+#: ../data/pcsxr.glade2.h:75
msgid "Run ISO..."
msgstr "Lancer une image ISO..."
-#: ../data/pcsx.glade2.h:76
+#: ../data/pcsxr.glade2.h:76
msgid "Run _BIOS"
msgstr "Lancer le _BIOS"
-#: ../data/pcsx.glade2.h:77
+#: ../data/pcsxr.glade2.h:77
msgid "Run _CD"
msgstr "Lancer à partir du _CD"
-#: ../data/pcsx.glade2.h:78
+#: ../data/pcsxr.glade2.h:78
msgid "Run _EXE..."
msgstr "Lancer un _EXE"
-#: ../data/pcsx.glade2.h:79
+#: ../data/pcsxr.glade2.h:79
msgid "Run _ISO..."
msgstr "Lancer un _ISO"
-#: ../data/pcsx.glade2.h:80 ../gui/Plugin.c:239
+#: ../data/pcsxr.glade2.h:80 ../gui/Plugin.c:239
#, c-format
msgid "SIO IRQ Always Enabled"
msgstr "SIO IRQ toujours activé"
-#: ../data/pcsx.glade2.h:81
+#: ../data/pcsxr.glade2.h:81
msgid "SPU IRQ Always Enabled"
msgstr "SPU IRQ toujours activé"
-#: ../data/pcsx.glade2.h:82
+#: ../data/pcsxr.glade2.h:82
msgid "S_witch ISO..."
msgstr "Changer d'ISO"
-#: ../data/pcsx.glade2.h:83
+#: ../data/pcsxr.glade2.h:83
msgid "Search"
msgstr "Rechercher"
-#: ../data/pcsx.glade2.h:84 ../win32/gui/CheatDlg.c:680
+#: ../data/pcsxr.glade2.h:84 ../win32/gui/CheatDlg.c:680
msgid "Search For:"
msgstr "Critère de recherche"
-#: ../data/pcsx.glade2.h:85
+#: ../data/pcsxr.glade2.h:85
msgid "Search in:"
msgstr "Chercher dans :"
-#: ../data/pcsx.glade2.h:86
+#: ../data/pcsxr.glade2.h:86
msgid "Select Folder to Search"
msgstr "Sélectionnez un dossier"
-#: ../data/pcsx.glade2.h:87
+#: ../data/pcsxr.glade2.h:87
msgid "Slot _1"
msgstr "Emplacement _1"
-#: ../data/pcsx.glade2.h:88
+#: ../data/pcsxr.glade2.h:88
msgid "Slot _2"
msgstr "Emplacement _2"
-#: ../data/pcsx.glade2.h:89
+#: ../data/pcsxr.glade2.h:89
msgid "Slot _3"
msgstr "Emplacement _3"
-#: ../data/pcsx.glade2.h:90
+#: ../data/pcsxr.glade2.h:90
msgid "Slot _4"
msgstr "Emplacement _4"
-#: ../data/pcsx.glade2.h:91
+#: ../data/pcsxr.glade2.h:91
msgid "Slot _5"
msgstr "Emplacement _5"
-#: ../data/pcsx.glade2.h:92
+#: ../data/pcsxr.glade2.h:92
msgid "Slot _6"
msgstr "Emplacement _6"
-#: ../data/pcsx.glade2.h:93
+#: ../data/pcsxr.glade2.h:93
msgid "Slot _7"
msgstr "Emplacement _7"
-#: ../data/pcsx.glade2.h:94
+#: ../data/pcsxr.glade2.h:94
msgid "Slot _8"
msgstr "Emplacement _8"
-#: ../data/pcsx.glade2.h:95
+#: ../data/pcsxr.glade2.h:95
msgid "Slot _9"
msgstr "Emplacement _9"
-#: ../data/pcsx.glade2.h:96
+#: ../data/pcsxr.glade2.h:96 ../win32/gui/WndMain.c:1307
+msgid "Slow Boot"
+msgstr ""
+
+#: ../data/pcsxr.glade2.h:97
msgid "Sound..."
msgstr "Son..."
-#: ../data/pcsx.glade2.h:97
+#: ../data/pcsxr.glade2.h:98
msgid "Sound:"
msgstr "Son :"
-#: ../data/pcsx.glade2.h:98
+#: ../data/pcsxr.glade2.h:99
msgid "Switch ISO Image"
msgstr "Changer d'image ISO"
-#: ../data/pcsx.glade2.h:99
+#: ../data/pcsxr.glade2.h:100
msgid "Switch ISO..."
msgstr "Changer d'ISO..."
-#: ../data/pcsx.glade2.h:100 ../win32/gui/CheatDlg.c:684
+#: ../data/pcsxr.glade2.h:101 ../win32/gui/CheatDlg.c:684
msgid "To:"
msgstr "A:"
-#: ../data/pcsx.glade2.h:101
+#: ../data/pcsxr.glade2.h:102
msgid "Un/Delete"
msgstr ""
-#: ../data/pcsx.glade2.h:102 ../gui/Cheat.c:647 ../win32/gui/CheatDlg.c:506
+#: ../data/pcsxr.glade2.h:103 ../gui/Cheat.c:647 ../win32/gui/CheatDlg.c:506
#: ../win32/gui/CheatDlg.c:597 ../win32/gui/CheatDlg.c:682
msgid "Value:"
msgstr "Valeur :"
-#: ../data/pcsx.glade2.h:103
-msgid "_About PCSX..."
+#: ../data/pcsxr.glade2.h:104
+msgid "_About PCSXR..."
msgstr "À propos"
-#: ../data/pcsx.glade2.h:104
+#: ../data/pcsxr.glade2.h:105
msgid "_Browse..."
msgstr "Parcourrir"
-#: ../data/pcsx.glade2.h:105
+#: ../data/pcsxr.glade2.h:106
msgid "_CPU..."
msgstr "_CPU..."
-#: ../data/pcsx.glade2.h:106
+#: ../data/pcsxr.glade2.h:107
msgid "_Configuration"
msgstr "_Configuration"
-#: ../data/pcsx.glade2.h:107
+#: ../data/pcsxr.glade2.h:108
msgid "_Continue"
msgstr "_Continuer"
-#: ../data/pcsx.glade2.h:108
+#: ../data/pcsxr.glade2.h:109
msgid "_Emulator"
msgstr "Émulateur"
-#: ../data/pcsx.glade2.h:109
+#: ../data/pcsxr.glade2.h:110
msgid "_File"
msgstr "_Fichier"
-#: ../data/pcsx.glade2.h:110
+#: ../data/pcsxr.glade2.h:111
msgid "_Graphics..."
msgstr "_Graphismes..."
-#: ../data/pcsx.glade2.h:111
+#: ../data/pcsxr.glade2.h:112
msgid "_Help"
msgstr "Aide"
-#: ../data/pcsx.glade2.h:112
+#: ../data/pcsxr.glade2.h:113
msgid "_Load State"
msgstr "Charger un état"
-#: ../data/pcsx.glade2.h:113
+#: ../data/pcsxr.glade2.h:114
msgid "_Memory Cards..."
msgstr "Cartes _mémoires..."
-#: ../data/pcsx.glade2.h:114
+#: ../data/pcsxr.glade2.h:115
msgid "_Netplay..."
msgstr "Jeu en réseau..."
-#: ../data/pcsx.glade2.h:115
+#: ../data/pcsxr.glade2.h:116
msgid "_Other..."
msgstr "Autre..."
-#: ../data/pcsx.glade2.h:116
+#: ../data/pcsxr.glade2.h:117
msgid "_Plugins & BIOS..."
msgstr "Greffons & BIOS..."
-#: ../data/pcsx.glade2.h:117
+#: ../data/pcsxr.glade2.h:118
msgid "_Reset"
msgstr "_Rétablir"
-#: ../data/pcsx.glade2.h:118
+#: ../data/pcsxr.glade2.h:119
msgid "_Save State"
msgstr "_Sauver un état"
-#: ../data/pcsx.glade2.h:119
+#: ../data/pcsxr.glade2.h:120
msgid "_Search..."
msgstr "Rechercher..."
-#: ../data/pcsx.glade2.h:120
+#: ../data/pcsxr.glade2.h:121
msgid "_Sound..."
msgstr "_Son"
-#: ../data/pcsx.glade2.h:121
+#: ../data/pcsxr.glade2.h:122
msgid "label_resultsfound"
msgstr ""
@@ -490,11 +497,11 @@ msgstr ""
msgid ""
"(C) 1999-2003 PCSX Team\n"
"(C) 2005-2009 PCSX-df Team\n"
-"(C) 2009-2010 PCSX-Reloaded Team"
+"(C) 2009-2011 PCSX-Reloaded Team"
msgstr ""
"(C) 1999-2003 L'équipe PCSX\n"
"(C) 2005-2009 L'équipe PCSX-df\n"
-"(C) 2009-2010 L'équipe PCSX-Reloaded"
+"(C) 2009-2010 L'équipe PCSX-Reloaded "
#: ../gui/AboutDlg.c:77
msgid ""
@@ -534,8 +541,8 @@ msgstr "Description du code :"
msgid "Cheat Code:"
msgstr "Code de triche :"
-#: ../gui/Cheat.c:155 ../gui/Cheat.c:251 ../gui/LnxMain.c:422
-#: ../win32/gui/ConfigurePlugins.c:305
+#: ../gui/Cheat.c:155 ../gui/Cheat.c:251 ../gui/LnxMain.c:421
+#: ../win32/gui/ConfigurePlugins.c:307
msgid "Error"
msgstr "Erreur"
@@ -553,11 +560,11 @@ msgid "Open Cheat File"
msgstr "Ouvrir un fichier de codes"
#: ../gui/Cheat.c:316 ../gui/Cheat.c:356
-msgid "PCSX Cheat Code Files (*.cht)"
-msgstr "Codes de triche PCSX (*.cht)"
+msgid "PCSXR Cheat Code Files (*.cht)"
+msgstr "Codes de triche PCSXR (*.cht)"
#: ../gui/Cheat.c:321 ../gui/Gtk2Gui.c:446 ../gui/Gtk2Gui.c:587
-#: ../win32/gui/WndMain.c:1445 ../win32/gui/WndMain.c:1526
+#: ../win32/gui/WndMain.c:1453 ../win32/gui/WndMain.c:1534
msgid "All Files"
msgstr "Tous les fichiers"
@@ -659,7 +666,7 @@ msgstr "Impossible d'ouvrir le dossier des BIOS : '%s'\n"
msgid "Could not open directory: '%s'\n"
msgstr "Impossible d'ouvrir le dossier : '%s'\n"
-#. The BIOS list always contains the PCSX internal BIOS
+#. The BIOS list always contains the PCSXR internal BIOS
#: ../gui/ConfDlg.c:675
msgid "Simulate PSX BIOS"
msgstr "Simuler le BIOS PSX"
@@ -729,14 +736,14 @@ msgstr "Le fichier n'est pas un exécutable PlayStation valide"
msgid "CD ROM failed"
msgstr "Plantage du CD ROM"
-#: ../gui/Gtk2Gui.c:508 ../gui/Gtk2Gui.c:649 ../win32/gui/WndMain.c:464
-#: ../win32/gui/WndMain.c:516 ../win32/gui/WndMain.c:585
+#: ../gui/Gtk2Gui.c:508 ../gui/Gtk2Gui.c:649 ../win32/gui/WndMain.c:469
+#: ../win32/gui/WndMain.c:521 ../win32/gui/WndMain.c:590
#, c-format
msgid "The CD does not appear to be a valid Playstation CD"
msgstr "Ce CD n'est pas un CD de PlayStation valide"
-#: ../gui/Gtk2Gui.c:519 ../gui/Gtk2Gui.c:660 ../win32/gui/WndMain.c:474
-#: ../win32/gui/WndMain.c:526 ../win32/gui/WndMain.c:595
+#: ../gui/Gtk2Gui.c:519 ../gui/Gtk2Gui.c:660 ../win32/gui/WndMain.c:479
+#: ../win32/gui/WndMain.c:531 ../win32/gui/WndMain.c:600
#, c-format
msgid "Could not load CD-ROM!"
msgstr "Impossible de charger le CD-ROM !"
@@ -794,52 +801,52 @@ msgstr ""
msgid "Creating memory card: %s\n"
msgstr "Création de la carte mémoire : %s\n"
-#: ../gui/LnxMain.c:329
+#: ../gui/LnxMain.c:328
#, fuzzy
msgid ""
-" pcsx [options] [file]\n"
+" pcsxr [options] [file]\n"
"\toptions:\n"
"\t-runcd\t\tRuns CD-ROM\n"
"\t-cdfile FILE\tRuns a CD image file\n"
"\t-nogui\t\tDon't open the GTK GUI\n"
-"\t-cfg FILE\tLoads desired configuration file (default: ~/.pcsx/pcsx.cfg)\n"
+"\t-cfg FILE\tLoads desired configuration file (default: ~/.pcsxr/pcsxr.cfg)\n"
"\t-psxout\t\tEnable PSX output\n"
"\t-slowboot\tEnable BIOS Logo\n"
"\t-load STATENUM\tLoads savestate STATENUM (1-9)\n"
"\t-h -help\tDisplay this message\n"
"\tfile\t\tLoads file\n"
msgstr ""
-" pcsx [options] [fichier]\n"
+" pcsxr [options] [fichier]\n"
"\toptions:\n"
"\t-runcd\t\tLance à partir du CD-ROM\n"
"\t-cdfile FILE\tLance une image CD\n"
"\t-nogui\t\tDésactiver l'interface graphique\n"
-"\t-cfg FILE\tCharge le fichier de configuration désiré (par défaut: ~/.pcsx/"
-"pcsx.cfg)\n"
+"\t-cfg FILE\tCharge le fichier de configuration désiré (par défaut: ~/.pcsxr/"
+"pcsxr.cfg)\n"
"\t-psxout\t\tActiver la sortie PSX\n"
"\t-load STATENUM\tCharge la sauvegarde d'état STATENUM (1-9)\n"
"\t-h -help\tAffiche ce message\n"
"\tfile\t\tFichier a charger\n"
-#: ../gui/LnxMain.c:366
+#: ../gui/LnxMain.c:365
#, c-format
msgid ""
-"PCSX cannot be configured without using the GUI -- you should restart "
+"PCSXR cannot be configured without using the GUI -- you should restart "
"without -nogui.\n"
msgstr ""
-"PCSX ne peut pas être configuré sans l'interface graphique -- recommencez "
+"PCSXR ne peut pas être configuré sans l'interface graphique -- recommencez "
"sans -nogui.\n"
-#: ../gui/LnxMain.c:422
+#: ../gui/LnxMain.c:421
msgid "Failed loading plugins!"
msgstr "Impossible de charger les greffons !"
-#: ../gui/LnxMain.c:441
+#: ../gui/LnxMain.c:440
#, c-format
msgid "Could not load CD-ROM!\n"
msgstr "Impossible de charger le CD-ROM !\n"
-#: ../gui/LnxMain.c:472
+#: ../gui/LnxMain.c:471
#, c-format
msgid "PSX emulator couldn't be initialized.\n"
msgstr "L'émulateur PSX n'a pas pu être initialisé.\n"
@@ -848,11 +855,11 @@ msgstr "L'émulateur PSX n'a pas pu être initialisé.\n"
msgid "Icon"
msgstr "Icone"
-#: ../gui/MemcardDlg.c:66 ../win32/gui/WndMain.c:749
+#: ../gui/MemcardDlg.c:66 ../win32/gui/WndMain.c:754
msgid "Title"
msgstr "Titre"
-#: ../gui/MemcardDlg.c:72 ../win32/gui/WndMain.c:755
+#: ../gui/MemcardDlg.c:72 ../win32/gui/WndMain.c:760
msgid "Status"
msgstr "Statut"
@@ -864,17 +871,17 @@ msgstr "ID"
msgid "Name"
msgstr "Nom"
-#: ../gui/MemcardDlg.c:192 ../gui/MemcardDlg.c:297 ../win32/gui/WndMain.c:960
+#: ../gui/MemcardDlg.c:192 ../gui/MemcardDlg.c:297 ../win32/gui/WndMain.c:965
msgid "Deleted"
msgstr "Supprimé"
#: ../gui/MemcardDlg.c:194 ../gui/MemcardDlg.c:198 ../gui/MemcardDlg.c:299
-#: ../gui/MemcardDlg.c:303 ../win32/gui/WndMain.c:961
-#: ../win32/gui/WndMain.c:964
+#: ../gui/MemcardDlg.c:303 ../win32/gui/WndMain.c:966
+#: ../win32/gui/WndMain.c:969
msgid "Free"
msgstr "Libre"
-#: ../gui/MemcardDlg.c:196 ../gui/MemcardDlg.c:301 ../win32/gui/WndMain.c:963
+#: ../gui/MemcardDlg.c:196 ../gui/MemcardDlg.c:301 ../win32/gui/WndMain.c:968
msgid "Used"
msgstr "Utilisé"
@@ -1133,23 +1140,23 @@ msgstr "Erreur lors de l'initialisation du greffon SIO1 : %d"
msgid "Plugins loaded.\n"
msgstr "Greffons chargés.\n"
-#: ../libpcsxcore/ppf.c:217
+#: ../libpcsxcore/ppf.c:219
#, c-format
msgid "Invalid PPF patch: %s.\n"
msgstr "Patch PPF invalide / %s.\n"
-#: ../libpcsxcore/ppf.c:293
+#: ../libpcsxcore/ppf.c:295
#, c-format
msgid "Unsupported PPF version (%d).\n"
msgstr "Version PPF non supportée (%d).\n"
#. build address array
-#: ../libpcsxcore/ppf.c:332
+#: ../libpcsxcore/ppf.c:334
#, c-format
msgid "Loaded PPF %d.0 patch: %s.\n"
msgstr "Patch PPF %d.0 chargé : %s.\n"
-#: ../libpcsxcore/ppf.c:377
+#: ../libpcsxcore/ppf.c:381
#, fuzzy, c-format
msgid "Loaded SBI file: %s.\n"
msgstr "Image CD Chargée : %s"
@@ -1165,30 +1172,30 @@ msgstr "Impossible d'ouvrir le BIOS : \"%s\". Activation du BIOS HLE !\n"
#: ../libpcsxcore/r3000a.c:34
#, c-format
-msgid "Running PCSX Version %s (%s).\n"
-msgstr "Version PCSX Lancée %s (%s).\n"
+msgid "Running PCSXR Version %s (%s).\n"
+msgstr "Version PCSXR Lancée %s (%s).\n"
-#: ../libpcsxcore/sio.c:839
+#: ../libpcsxcore/sio.c:843
msgid "Connection closed!\n"
msgstr "Connection fermée !\n"
-#: ../libpcsxcore/sio.c:872
+#: ../libpcsxcore/sio.c:876
#, c-format
msgid "No memory card value was specified - creating a default card %s\n"
msgstr ""
"Pas de carte mémoire spécifiée - création d'une carte mémoire par défaut %s\n"
-#: ../libpcsxcore/sio.c:876
+#: ../libpcsxcore/sio.c:880
#, c-format
msgid "The memory card %s doesn't exist - creating it\n"
msgstr "La carte mémoire %s n'existe pas - création de la carte mémoire\n"
-#: ../libpcsxcore/sio.c:892
+#: ../libpcsxcore/sio.c:896
#, c-format
msgid "Memory card %s failed to load!\n"
msgstr "Problème lors du chargement de la carte mémoire %s!\n"
-#: ../libpcsxcore/sio.c:896
+#: ../libpcsxcore/sio.c:900
#, c-format
msgid "Loading memory card %s\n"
msgstr "Chargement de la carte mémoire %s\n"
@@ -1201,262 +1208,288 @@ msgstr "Lecteur CR-ROM"
msgid "CDR NULL Plugin"
msgstr "Greffon CDR NULL"
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:1
-#: ../plugins/dfcdrom/cdrcfg-0.1df/main.c:219
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:1
+msgid "125ms"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:2
+msgid "16min"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:3
+msgid "16s"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:4
+msgid "1min"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:5
+msgid "1s"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:6
+msgid "250ms"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:7
+msgid "2min"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:8
+msgid "2s"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:9
+msgid "32min"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:10
+msgid "32s"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:11
+msgid "4min"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:12
+msgid "4s"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:13
+msgid "500ms"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:14
+msgid "8min"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:15
+msgid "8s"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:16
+#: ../plugins/dfcdrom/cdrcfg-0.1df/main.c:206
msgid "CDR configuration"
msgstr "Configuration CDR"
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:2
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:17
msgid "Cache Size (Def. 64):"
msgstr "Taille du cache (Def. 64) :"
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:3
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:18
msgid "Cdrom Speed (Def. 0 = MAX):"
msgstr "Vitesse de lecture (Def. 0 = MAX) :"
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:4
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:19
msgid "Choose your CD-ROM device or type its path if it's not listed"
msgstr ""
"Choisissez votre lecteur de CD-ROM ou entrez son chemin s'il n'est pas listé"
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:5
-msgid ""
-"Default\n"
-"125ms\n"
-"250ms\n"
-"500ms\n"
-"1s\n"
-"2s\n"
-"4s\n"
-"8s\n"
-"16s\n"
-"32s\n"
-"1min\n"
-"2min\n"
-"4min\n"
-"8min\n"
-"16min\n"
-"32min"
-msgstr ""
-"Défaut\n"
-"125ms\n"
-"250ms\n"
-"500ms\n"
-"1s\n"
-"2s\n"
-"4s\n"
-"8s\n"
-"16s\n"
-"32s\n"
-"1min\n"
-"2min\n"
-"4min\n"
-"8min\n"
-"16min\n"
-"32min"
-
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:21
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:20
+msgid "Default"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:21
msgid "Enable subchannel read"
msgstr "Activer la lecture sous-canal"
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:22
-msgid ""
-"Normal (No Cache)\n"
-"Threaded - Faster (With Cache)"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:22
+msgid "Normal (No Cache)"
msgstr ""
-"Normal (Sans Cache)\n"
-"Threadé - Plus rapide (Avec Cache)"
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:24
-#: ../plugins/dfinput/dfinput.ui.h:8 ../win32/gui/WndMain.c:1310
-msgid "Options"
-msgstr "Options"
-
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:25
-msgid "Select CD-ROM device"
-msgstr "Sélectionner un lecteur CD-ROM"
-
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:26
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:23
msgid "Select read mode:"
msgstr "Mode de lecture :"
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:27
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:24
msgid "Spindown Time:"
msgstr "Temps de rotation :"
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:28
-msgid "hseparator"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:25
+#, fuzzy
+msgid "Threaded - Faster (With Cache)"
msgstr ""
+"Normal (Sans Cache)\n"
+"Threadé - Plus rapide (Avec Cache)"
-#: ../plugins/dfinput/cfg-gtk2.c:48
+#: ../plugins/dfinput/cfg-gtk2.c:49
msgid "D-Pad Up"
msgstr "Pavé directionnel Haut"
-#: ../plugins/dfinput/cfg-gtk2.c:49
+#: ../plugins/dfinput/cfg-gtk2.c:50
msgid "D-Pad Down"
msgstr "Pavé directionnel Bas"
-#: ../plugins/dfinput/cfg-gtk2.c:50
+#: ../plugins/dfinput/cfg-gtk2.c:51
msgid "D-Pad Left"
msgstr "Pavé directionnel Gauche"
-#: ../plugins/dfinput/cfg-gtk2.c:51
+#: ../plugins/dfinput/cfg-gtk2.c:52
msgid "D-Pad Right"
msgstr "Pavé directionnel Droite"
-#: ../plugins/dfinput/cfg-gtk2.c:52
+#: ../plugins/dfinput/cfg-gtk2.c:53
msgid "Cross"
msgstr "Croix"
-#: ../plugins/dfinput/cfg-gtk2.c:53
+#: ../plugins/dfinput/cfg-gtk2.c:54
msgid "Circle"
msgstr "Rond"
-#: ../plugins/dfinput/cfg-gtk2.c:54
+#: ../plugins/dfinput/cfg-gtk2.c:55
msgid "Square"
msgstr "Carré"
-#: ../plugins/dfinput/cfg-gtk2.c:55
+#: ../plugins/dfinput/cfg-gtk2.c:56
msgid "Triangle"
msgstr "Triangle"
-#: ../plugins/dfinput/cfg-gtk2.c:56
+#: ../plugins/dfinput/cfg-gtk2.c:57
msgid "L1"
msgstr "L1"
-#: ../plugins/dfinput/cfg-gtk2.c:57
+#: ../plugins/dfinput/cfg-gtk2.c:58
msgid "R1"
msgstr "R1"
-#: ../plugins/dfinput/cfg-gtk2.c:58
+#: ../plugins/dfinput/cfg-gtk2.c:59
msgid "L2"
msgstr "L2"
-#: ../plugins/dfinput/cfg-gtk2.c:59
+#: ../plugins/dfinput/cfg-gtk2.c:60
msgid "R2"
msgstr "R2"
-#: ../plugins/dfinput/cfg-gtk2.c:60
+#: ../plugins/dfinput/cfg-gtk2.c:61
msgid "Select"
msgstr "Select"
-#: ../plugins/dfinput/cfg-gtk2.c:61
+#: ../plugins/dfinput/cfg-gtk2.c:62
msgid "Start"
msgstr "Start"
-#: ../plugins/dfinput/cfg-gtk2.c:62
+#: ../plugins/dfinput/cfg-gtk2.c:63
msgid "L3"
msgstr "L3"
-#: ../plugins/dfinput/cfg-gtk2.c:63
+#: ../plugins/dfinput/cfg-gtk2.c:64
msgid "R3"
msgstr "R3"
-#: ../plugins/dfinput/cfg-gtk2.c:67
+#: ../plugins/dfinput/cfg-gtk2.c:65
+#, fuzzy
+msgid "Analog"
+msgstr ""
+"Pavé digital\n"
+"Pavé analogique"
+
+#: ../plugins/dfinput/cfg-gtk2.c:69
msgid "L-Stick Right"
msgstr "L-Stick Droite"
-#: ../plugins/dfinput/cfg-gtk2.c:68
+#: ../plugins/dfinput/cfg-gtk2.c:70
msgid "L-Stick Left"
msgstr "L-Stick Gauche"
-#: ../plugins/dfinput/cfg-gtk2.c:69
+#: ../plugins/dfinput/cfg-gtk2.c:71
msgid "L-Stick Down"
msgstr "L-Stick Bas"
-#: ../plugins/dfinput/cfg-gtk2.c:70
+#: ../plugins/dfinput/cfg-gtk2.c:72
msgid "L-Stick Up"
msgstr "L-Stick Haut"
-#: ../plugins/dfinput/cfg-gtk2.c:71
+#: ../plugins/dfinput/cfg-gtk2.c:73
msgid "R-Stick Right"
msgstr "R-Stick Droite"
-#: ../plugins/dfinput/cfg-gtk2.c:72
+#: ../plugins/dfinput/cfg-gtk2.c:74
msgid "R-Stick Left"
msgstr "R-Stick Gauche"
-#: ../plugins/dfinput/cfg-gtk2.c:73
+#: ../plugins/dfinput/cfg-gtk2.c:75
msgid "R-Stick Down"
msgstr "R-Stick Bas"
-#: ../plugins/dfinput/cfg-gtk2.c:74
+#: ../plugins/dfinput/cfg-gtk2.c:76
msgid "R-Stick Up"
msgstr "R-Stick Haut"
-#: ../plugins/dfinput/cfg-gtk2.c:100 ../plugins/dfinput/cfg-gtk2.c:139
+#: ../plugins/dfinput/cfg-gtk2.c:102 ../plugins/dfinput/cfg-gtk2.c:141
msgid "Centered"
msgstr "Centré"
-#: ../plugins/dfinput/cfg-gtk2.c:100 ../plugins/dfinput/cfg-gtk2.c:139
+#: ../plugins/dfinput/cfg-gtk2.c:102 ../plugins/dfinput/cfg-gtk2.c:141
msgid "Up"
msgstr "Haut"
-#: ../plugins/dfinput/cfg-gtk2.c:100 ../plugins/dfinput/cfg-gtk2.c:139
+#: ../plugins/dfinput/cfg-gtk2.c:102 ../plugins/dfinput/cfg-gtk2.c:141
msgid "Right"
msgstr "Droite"
-#: ../plugins/dfinput/cfg-gtk2.c:100 ../plugins/dfinput/cfg-gtk2.c:139
+#: ../plugins/dfinput/cfg-gtk2.c:102 ../plugins/dfinput/cfg-gtk2.c:141
msgid "Rightup"
msgstr "Droite-haut"
-#: ../plugins/dfinput/cfg-gtk2.c:101 ../plugins/dfinput/cfg-gtk2.c:140
+#: ../plugins/dfinput/cfg-gtk2.c:103 ../plugins/dfinput/cfg-gtk2.c:142
msgid "Down"
msgstr "Bas"
-#: ../plugins/dfinput/cfg-gtk2.c:101 ../plugins/dfinput/cfg-gtk2.c:140
+#: ../plugins/dfinput/cfg-gtk2.c:103 ../plugins/dfinput/cfg-gtk2.c:142
msgid "Rightdown"
msgstr "Droite-bas"
-#: ../plugins/dfinput/cfg-gtk2.c:101 ../plugins/dfinput/cfg-gtk2.c:140
+#: ../plugins/dfinput/cfg-gtk2.c:103 ../plugins/dfinput/cfg-gtk2.c:142
msgid "Left"
msgstr "Gauche"
-#: ../plugins/dfinput/cfg-gtk2.c:101 ../plugins/dfinput/cfg-gtk2.c:140
+#: ../plugins/dfinput/cfg-gtk2.c:103 ../plugins/dfinput/cfg-gtk2.c:142
msgid "Leftup"
msgstr "Gauche-haut"
-#: ../plugins/dfinput/cfg-gtk2.c:102 ../plugins/dfinput/cfg-gtk2.c:141
+#: ../plugins/dfinput/cfg-gtk2.c:104 ../plugins/dfinput/cfg-gtk2.c:143
msgid "Leftdown"
msgstr "Gauche-bas"
-#: ../plugins/dfinput/cfg-gtk2.c:106 ../plugins/dfinput/cfg-gtk2.c:145
+#: ../plugins/dfinput/cfg-gtk2.c:108 ../plugins/dfinput/cfg-gtk2.c:147
#, c-format
msgid "Joystick: Button %d"
msgstr "Joystick : Bouton %d"
-#: ../plugins/dfinput/cfg-gtk2.c:110 ../plugins/dfinput/cfg-gtk2.c:149
+#: ../plugins/dfinput/cfg-gtk2.c:112 ../plugins/dfinput/cfg-gtk2.c:151
#, c-format
msgid "Joystick: Axis %d%c"
msgstr "Joystick: Axe %d%c"
-#: ../plugins/dfinput/cfg-gtk2.c:115 ../plugins/dfinput/cfg-gtk2.c:154
+#: ../plugins/dfinput/cfg-gtk2.c:117 ../plugins/dfinput/cfg-gtk2.c:156
#, c-format
msgid "Joystick: Hat %d %s"
msgstr "Joystick: Tête %d %s"
-#: ../plugins/dfinput/cfg-gtk2.c:130 ../plugins/dfinput/cfg-gtk2.c:169
+#: ../plugins/dfinput/cfg-gtk2.c:132 ../plugins/dfinput/cfg-gtk2.c:171
msgid "Keyboard:"
msgstr "Clavier :"
-#: ../plugins/dfinput/cfg-gtk2.c:134 ../plugins/dfinput/cfg-gtk2.c:173
+#: ../plugins/dfinput/cfg-gtk2.c:136 ../plugins/dfinput/cfg-gtk2.c:175
msgid "(Not Set)"
msgstr "(Non défini)"
-#: ../plugins/dfinput/cfg-gtk2.c:542
+#: ../plugins/dfinput/cfg-gtk2.c:562
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:13
#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:55
msgid "None"
msgstr "Aucun"
-#: ../plugins/dfinput/cfg-gtk2.c:584
+#: ../plugins/dfinput/cfg-gtk2.c:604
msgid "Gamepad/Keyboard Input Configuration"
msgstr "Configuration clavier/manette"
-#: ../plugins/dfinput/cfg-gtk2.c:590 ../plugins/dfinput/cfg-gtk2.c:610
+#: ../plugins/dfinput/cfg-gtk2.c:610 ../plugins/dfinput/cfg-gtk2.c:630
msgid "Key"
msgstr "Touche"
-#: ../plugins/dfinput/cfg-gtk2.c:596 ../plugins/dfinput/cfg-gtk2.c:616
+#: ../plugins/dfinput/cfg-gtk2.c:616 ../plugins/dfinput/cfg-gtk2.c:636
msgid "Button"
msgstr "Bouton"
@@ -1491,19 +1524,28 @@ msgstr ""
"Pavé analogique"
#: ../plugins/dfinput/dfinput.ui.h:7
+msgid "Mouse"
+msgstr ""
+
+#: ../plugins/dfinput/dfinput.ui.h:8
msgid "Multi-Threaded (Recommended)"
msgstr "Multi-Threadé (Recommandé)"
-#: ../plugins/dfinput/dfinput.ui.h:9
+#: ../plugins/dfinput/dfinput.ui.h:9 ../win32/gui/WndMain.c:1316
+msgid "Options"
+msgstr "Options"
+
+#: ../plugins/dfinput/dfinput.ui.h:10
msgid "Reset"
msgstr "Reset"
-#: ../plugins/dfinput/dfinput.ui.h:10
+#: ../plugins/dfinput/dfinput.ui.h:11
msgid "Type:"
msgstr "Type :"
-#: ../plugins/dfinput/pad.c:24
-msgid "Gamepad/Keyboard Input"
+#: ../plugins/dfinput/pad.c:29
+#, fuzzy
+msgid "Gamepad/Keyboard/Mouse Input"
msgstr "Entrées clavier/manette"
#. increase that with each version
@@ -1520,28 +1562,29 @@ msgstr "erreur lors de la connection à %s: %s\n"
msgid "Error allocating memory!\n"
msgstr "Erreur d'allocation mémoire !\n"
-#: ../plugins/dfnet/dfnet.ui.h:1
+#. ****************************************************************************
+#: ../plugins/dfnet/dfnet.ui.h:1 ../plugins/bladesio1/sio1.ui.h:1
msgid "Client (Player2)"
msgstr "Client (Joueur 2)"
-#: ../plugins/dfnet/dfnet.ui.h:2
+#: ../plugins/dfnet/dfnet.ui.h:2 ../plugins/bladesio1/sio1.ui.h:2
msgid "Copy PC IP to Clipboard"
msgstr "Copier l'IP du PC dans le presse-papier"
-#: ../plugins/dfnet/dfnet.ui.h:3
+#: ../plugins/dfnet/dfnet.ui.h:3 ../plugins/bladesio1/sio1.ui.h:3
msgid ""
"Do not change if not necessary (remember it must be changed on both sides)."
msgstr "Ne changer que si nécessaire (doit être modifié des deux cotés)."
-#: ../plugins/dfnet/dfnet.ui.h:4
+#: ../plugins/dfnet/dfnet.ui.h:4 ../plugins/bladesio1/sio1.ui.h:4
msgid "Play Offline"
msgstr "Jouer hors-ligne"
-#: ../plugins/dfnet/dfnet.ui.h:5
+#: ../plugins/dfnet/dfnet.ui.h:5 ../plugins/bladesio1/sio1.ui.h:5
msgid "Port Number"
msgstr "Numéro de port"
-#: ../plugins/dfnet/dfnet.ui.h:6
+#: ../plugins/dfnet/dfnet.ui.h:6 ../plugins/bladesio1/sio1.ui.h:6
msgid ""
"Select here if you'll be Server (Player1) or Client (Player2).\n"
"\n"
@@ -1559,16 +1602,16 @@ msgstr ""
"Si vous avez choisi client, veuillez entrer l'adresse IP que le serveur "
"vousaura fournie dans la zone Adresse IP."
-#: ../plugins/dfnet/dfnet.ui.h:11
+#: ../plugins/dfnet/dfnet.ui.h:11 ../plugins/bladesio1/sio1.ui.h:11
msgid "Server (Player1)"
msgstr "Serveur (Joueur 1)"
-#: ../plugins/dfnet/dfnet.ui.h:12
+#: ../plugins/dfnet/dfnet.ui.h:12 ../plugins/bladesio1/sio1.ui.h:12
msgid "Start Game"
msgstr "Lancer le jeu"
#: ../plugins/dfnet/gui.c:30 ../plugins/dfnet/gui.c:112
-#: ../win32/gui/ConfigurePlugins.c:616
+#: ../win32/gui/ConfigurePlugins.c:618
msgid "NetPlay"
msgstr "Jeu en réseau"
@@ -1625,100 +1668,92 @@ msgstr ""
"Pilote de son P.E.Op.S. V1.7\n"
"Codé par Pete Bernert et l'équipe P.E.Op.S.\n"
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:1
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2.h:20
-msgid "<b>Compatibility</b>"
-msgstr "<b>Compatibilité</b>"
-
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:2
-msgid "<b>General</b>"
-msgstr "<b>Général</b>"
-
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:3
-msgid "<b>XA Music</b>"
-msgstr "<b>Musique XA</b>"
-
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:4
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:1
msgid "Adjust XA speed"
msgstr "Ajuster la vitesse XA"
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:5
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:2
msgid "Choose this if XA music is played too quickly."
msgstr "À sélectionner si la musique XA est jouée trop rapidement."
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:7
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:4
+msgid "Cubic"
+msgstr ""
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:5
msgid "Frequency Response - Output Filter"
msgstr "Fréquence de réponse - Filtre de sortie"
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:8
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:6
+#, fuzzy
+msgid "Gaussian"
+msgstr "Russe"
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:7
msgid "High compatibility mode"
msgstr "Mode haute compatibilité"
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:9
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:8
msgid "Interpolation:"
msgstr "Interpolation :"
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:10
-msgid ""
-"None\n"
-"Low\n"
-"Medium\n"
-"Loud\n"
-"Loudest"
-msgstr ""
-"Muet\n"
-"Bas\n"
-"Moyen\n"
-"Fort\n"
-"Le plus fort"
-
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:15
-msgid ""
-"None\n"
-"Simple\n"
-"Gaussian\n"
-"Cubic"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:9
+msgid "Loud"
msgstr ""
-"Aucune\n"
-"Simple\n"
-"Gaussienne\n"
-"Cubique"
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:19
-msgid ""
-"Off\n"
-"Simple\n"
-"Playstation"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:10
+msgid "Loudest"
+msgstr ""
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:11
+msgid "Low"
msgstr ""
-"Désactivée\n"
-"Simple\n"
-"PlayStation"
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:22
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:12
+msgid "Medium"
+msgstr ""
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:14
+msgid "Off"
+msgstr ""
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:15
msgid "Play only one channel for a performance boost."
msgstr "Joueur seulement un canal pour de meilleures performances."
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:23
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:16
+#, fuzzy
+msgid "Playstation"
+msgstr ""
+"Désactivée\n"
+"Simple\n"
+"PlayStation"
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:17
msgid "Reverb:"
msgstr "Réverbération :"
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:24
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:18
msgid "SPU IRQ Wait"
msgstr "Attente SPU IRQ"
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:25
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:19
+msgid "Simple"
+msgstr ""
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:20
msgid "Single channel sound"
msgstr "Mono"
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:26
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:21
msgid "Use the asynchronous SPU interface."
msgstr "Utiliser l'interface SPU asynchrone."
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:27
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:22
msgid "Volume:"
msgstr "Volume :"
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:28
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:23
msgid "Wait for CPU; only useful for some games."
msgstr "Attendre le CPU; utile pour quelques jeux."
@@ -1814,6 +1849,10 @@ msgstr ""
"1280x1024\n"
"1600x1200"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2.h:20
+msgid "<b>Compatibility</b>"
+msgstr "<b>Compatibilité</b>"
+
#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2.h:21
msgid "<b>Framerate</b>"
msgstr "<b>Taux de rafraichissement</b>"
@@ -2334,6 +2373,11 @@ msgstr "Options d'écran"
msgid "Yellow rect (FF9)"
msgstr ""
+#: ../plugins/bladesio1/gui.c:32
+#, fuzzy
+msgid "Link cable"
+msgstr "Activer"
+
#. ****************************************************************************
#: ../plugins/bladesio1/sio1.c:29
msgid "Sio1 Driver"
@@ -2341,7 +2385,7 @@ msgstr "Pilote SIO1"
#: ../win32/gui/AboutDlg.c:26
msgid ""
-"PCSX - A PlayStation Emulator\n"
+"PCSXR - A PlayStation Emulator\n"
"\n"
"Original Authors:\n"
"main coder: linuzappz\n"
@@ -2349,7 +2393,7 @@ msgid ""
"ex-coders: Nocomp, Pete Bernett, nik3d\n"
"Webmaster: AkumaX"
msgstr ""
-"PCSX - Un émulateur PlayStation\n"
+"PCSXR - Un émulateur PlayStation\n"
"\n"
"Auteurs originaux :\n"
"principal développeur : linuzappz\n"
@@ -2364,7 +2408,7 @@ msgid ""
"Marcus Comstedt, Stefan Sikora\n"
"\n"
"PCSX-Reloaded By:\n"
-"Blade_Arma, shalma, Wei Mingzhi, et al.\n"
+"edgbla, shalma, Wei Mingzhi, et al.\n"
"\n"
"http://pcsxr.codeplex.com/"
msgstr ""
@@ -2373,7 +2417,7 @@ msgstr ""
"Marcus Comstedt, Stefan Sikora\n"
"\n"
"PCSX-Reloaded par :\n"
-"Blade_Arma, shalma, Wei Mingzhi, et al.\n"
+"edgbla, shalma, Wei Mingzhi, et al.\n"
"\n"
"http://pcsxr.codeplex.com/"
@@ -2383,14 +2427,14 @@ msgstr "À propos"
#: ../win32/gui/AboutDlg.c:48 ../win32/gui/AboutDlg.c:52
#: ../win32/gui/CheatDlg.c:69 ../win32/gui/CheatDlg.c:119
-#: ../win32/gui/ConfigurePlugins.c:483 ../win32/gui/ConfigurePlugins.c:614
-#: ../win32/gui/WndMain.c:1059 ../win32/gui/WndMain.c:1295
+#: ../win32/gui/ConfigurePlugins.c:485 ../win32/gui/ConfigurePlugins.c:616
+#: ../win32/gui/WndMain.c:1064 ../win32/gui/WndMain.c:1300
msgid "OK"
msgstr "OK"
#: ../win32/gui/AboutDlg.c:49
-msgid "PCSX EMU\n"
-msgstr "PCSX EMU\n"
+msgid "PCSXR EMU\n"
+msgstr "PCSXR EMU\n"
#: ../win32/gui/CheatDlg.c:51 ../win32/gui/CheatDlg.c:223
#: ../win32/gui/CheatDlg.c:270
@@ -2403,8 +2447,8 @@ msgid "No"
msgstr "Non"
#: ../win32/gui/CheatDlg.c:70 ../win32/gui/CheatDlg.c:120
-#: ../win32/gui/ConfigurePlugins.c:484 ../win32/gui/ConfigurePlugins.c:615
-#: ../win32/gui/WndMain.c:1060 ../win32/gui/WndMain.c:1296
+#: ../win32/gui/ConfigurePlugins.c:486 ../win32/gui/ConfigurePlugins.c:617
+#: ../win32/gui/WndMain.c:1065 ../win32/gui/WndMain.c:1301
msgid "Cancel"
msgstr "Annuler"
@@ -2441,8 +2485,8 @@ msgid "Enabled"
msgstr "Activé"
#: ../win32/gui/CheatDlg.c:282 ../win32/gui/CheatDlg.c:311
-msgid "PCSX Cheat Code Files"
-msgstr "Fichier de codes de triche PCSX"
+msgid "PCSXR Cheat Code Files"
+msgstr "Fichier de codes de triche PCSXR"
#: ../win32/gui/CheatDlg.c:402
msgid "Equal Value"
@@ -2537,152 +2581,152 @@ msgstr "Décimal"
msgid "Hexadecimal"
msgstr "Hexadécimal"
-#: ../win32/gui/ConfigurePlugins.c:219
+#: ../win32/gui/ConfigurePlugins.c:221
msgid "Simulate Psx Bios"
msgstr "Simuler le BIOS PSX"
-#: ../win32/gui/ConfigurePlugins.c:305
+#: ../win32/gui/ConfigurePlugins.c:307
msgid "Configuration not OK!"
msgstr "Problème de configuration !"
-#: ../win32/gui/ConfigurePlugins.c:406
+#: ../win32/gui/ConfigurePlugins.c:408
msgid "This plugin reports that should work correctly"
msgstr "Ce greffon devrait fonctionner correctement"
-#: ../win32/gui/ConfigurePlugins.c:407
+#: ../win32/gui/ConfigurePlugins.c:409
msgid "This plugin reports that should not work correctly"
msgstr "Ce greffon ne va pas fonctionner correctement"
-#: ../win32/gui/ConfigurePlugins.c:463
+#: ../win32/gui/ConfigurePlugins.c:465
msgid "Select Plugins Directory"
msgstr "Sélectionner un dossier de plugins"
-#: ../win32/gui/ConfigurePlugins.c:472
+#: ../win32/gui/ConfigurePlugins.c:474
msgid "Select Bios Directory"
msgstr "Slectionner un dossier de BIOS"
-#: ../win32/gui/ConfigurePlugins.c:481
+#: ../win32/gui/ConfigurePlugins.c:483
msgid "Configuration"
msgstr "Configuration"
-#: ../win32/gui/ConfigurePlugins.c:485
+#: ../win32/gui/ConfigurePlugins.c:487
msgid "Graphics"
msgstr "Graphismes"
-#: ../win32/gui/ConfigurePlugins.c:486
+#: ../win32/gui/ConfigurePlugins.c:488
msgid "First Controller"
msgstr "Contrôleur 1"
-#: ../win32/gui/ConfigurePlugins.c:487
+#: ../win32/gui/ConfigurePlugins.c:489
msgid "Second Controller"
msgstr "Contrôleur 2"
-#: ../win32/gui/ConfigurePlugins.c:488
+#: ../win32/gui/ConfigurePlugins.c:490
msgid "Sound"
msgstr "Son"
-#: ../win32/gui/ConfigurePlugins.c:489
+#: ../win32/gui/ConfigurePlugins.c:491
msgid "Cdrom"
msgstr "CD-ROM"
-#: ../win32/gui/ConfigurePlugins.c:490
+#: ../win32/gui/ConfigurePlugins.c:492
msgid "Bios"
msgstr "BIOS"
-#: ../win32/gui/ConfigurePlugins.c:491
+#: ../win32/gui/ConfigurePlugins.c:493
msgid "Set Bios Directory"
msgstr "Définir le dossier des BIOS"
-#: ../win32/gui/ConfigurePlugins.c:492
+#: ../win32/gui/ConfigurePlugins.c:494
msgid "Set Plugins Directory"
msgstr "Définir le dossier des greffons"
-#: ../win32/gui/ConfigurePlugins.c:493 ../win32/gui/ConfigurePlugins.c:496
-#: ../win32/gui/ConfigurePlugins.c:499 ../win32/gui/ConfigurePlugins.c:502
-#: ../win32/gui/ConfigurePlugins.c:505 ../win32/gui/ConfigurePlugins.c:617
+#: ../win32/gui/ConfigurePlugins.c:495 ../win32/gui/ConfigurePlugins.c:498
+#: ../win32/gui/ConfigurePlugins.c:501 ../win32/gui/ConfigurePlugins.c:504
+#: ../win32/gui/ConfigurePlugins.c:507 ../win32/gui/ConfigurePlugins.c:619
msgid "Configure..."
msgstr "Configurer..."
-#: ../win32/gui/ConfigurePlugins.c:494 ../win32/gui/ConfigurePlugins.c:497
-#: ../win32/gui/ConfigurePlugins.c:500 ../win32/gui/ConfigurePlugins.c:503
-#: ../win32/gui/ConfigurePlugins.c:506 ../win32/gui/ConfigurePlugins.c:618
+#: ../win32/gui/ConfigurePlugins.c:496 ../win32/gui/ConfigurePlugins.c:499
+#: ../win32/gui/ConfigurePlugins.c:502 ../win32/gui/ConfigurePlugins.c:505
+#: ../win32/gui/ConfigurePlugins.c:508 ../win32/gui/ConfigurePlugins.c:620
msgid "Test..."
msgstr "Tester..."
-#: ../win32/gui/ConfigurePlugins.c:495 ../win32/gui/ConfigurePlugins.c:498
-#: ../win32/gui/ConfigurePlugins.c:501 ../win32/gui/ConfigurePlugins.c:504
-#: ../win32/gui/ConfigurePlugins.c:507 ../win32/gui/ConfigurePlugins.c:619
+#: ../win32/gui/ConfigurePlugins.c:497 ../win32/gui/ConfigurePlugins.c:500
+#: ../win32/gui/ConfigurePlugins.c:503 ../win32/gui/ConfigurePlugins.c:506
+#: ../win32/gui/ConfigurePlugins.c:509 ../win32/gui/ConfigurePlugins.c:621
msgid "About..."
msgstr "À propos..."
-#: ../win32/gui/ConfigurePlugins.c:612
+#: ../win32/gui/ConfigurePlugins.c:614
msgid "NetPlay Configuration"
msgstr "Configuration du jeu en réseau"
-#: ../win32/gui/ConfigurePlugins.c:620
+#: ../win32/gui/ConfigurePlugins.c:622
msgid ""
"Note: The NetPlay Plugin Directory should be the same as the other Plugins."
msgstr ""
"NB : Le dossier du greffon de jeu en réseau doit être le même que pour les "
"autres greffons."
-#: ../win32/gui/plugin.c:94 ../win32/gui/WndMain.c:323
+#: ../win32/gui/plugin.c:94 ../win32/gui/WndMain.c:328
#, c-format
-msgid "*PCSX*: Saved State %d"
-msgstr "*PCSX*: État sauvé %d"
+msgid "*PCSXR*: Saved State %d"
+msgstr "*PCSXR*: État sauvé %d"
-#: ../win32/gui/plugin.c:95 ../win32/gui/WndMain.c:324
+#: ../win32/gui/plugin.c:95 ../win32/gui/WndMain.c:329
#, c-format
-msgid "*PCSX*: Error Saving State %d"
-msgstr "*PCSX*: Erreur lors de la sauvegarde de l'état %d"
+msgid "*PCSXR*: Error Saving State %d"
+msgstr "*PCSXR*: Erreur lors de la sauvegarde de l'état %d"
-#: ../win32/gui/plugin.c:111 ../win32/gui/WndMain.c:301
+#: ../win32/gui/plugin.c:111 ../win32/gui/WndMain.c:306
#, c-format
-msgid "*PCSX*: Loaded State %d"
-msgstr "*PCSX*: État chargé %d"
+msgid "*PCSXR*: Loaded State %d"
+msgstr "*PCSXR*: État chargé %d"
-#: ../win32/gui/plugin.c:112 ../win32/gui/WndMain.c:302
+#: ../win32/gui/plugin.c:112 ../win32/gui/WndMain.c:307
#, c-format
-msgid "*PCSX*: Error Loading State %d"
-msgstr "*PCSX*: Erreur lors du chargement de l'état %d"
+msgid "*PCSXR*: Error Loading State %d"
+msgstr "*PCSXR*: Erreur lors du chargement de l'état %d"
#: ../win32/gui/plugin.c:123
#, c-format
-msgid "*PCSX*: Sio Irq Always Enabled"
-msgstr "*PCSX*: SIO IRQ toujours activé"
+msgid "*PCSXR*: Sio Irq Always Enabled"
+msgstr "*PCSXR*: SIO IRQ toujours activé"
#: ../win32/gui/plugin.c:124
#, c-format
-msgid "*PCSX*: Sio Irq Not Always Enabled"
-msgstr "*PCSX*: SIO IRQ pas toujours activé"
+msgid "*PCSXR*: Sio Irq Not Always Enabled"
+msgstr "*PCSXR*: SIO IRQ pas toujours activé"
#: ../win32/gui/plugin.c:131
#, c-format
-msgid "*PCSX*: Black&White Mdecs Only Enabled"
+msgid "*PCSXR*: Black&White Mdecs Only Enabled"
msgstr ""
#: ../win32/gui/plugin.c:132
#, c-format
-msgid "*PCSX*: Black&White Mdecs Only Disabled"
+msgid "*PCSXR*: Black&White Mdecs Only Disabled"
msgstr ""
#: ../win32/gui/plugin.c:139
#, c-format
-msgid "*PCSX*: Xa Enabled"
-msgstr "*PCSX*: XA Activé"
+msgid "*PCSXR*: Xa Enabled"
+msgstr "*PCSXR*: XA Activé"
#: ../win32/gui/plugin.c:140
#, c-format
-msgid "*PCSX*: Xa Disabled"
-msgstr "*PCSX*: XA Désactivé"
+msgid "*PCSXR*: Xa Disabled"
+msgstr "*PCSXR*: XA Désactivé"
#: ../win32/gui/plugin.c:149
-msgid "*PCSX*: CdRom Case Opened"
-msgstr "*PCSX*: Lecteur CD-ROM ouvert"
+msgid "*PCSXR*: CdRom Case Opened"
+msgstr "*PCSXR*: Lecteur CD-ROM ouvert"
#: ../win32/gui/plugin.c:155
-msgid "*PCSX*: CdRom Case Closed"
-msgstr "*PCSX*: Lecteur CD-ROM fermé"
+msgid "*PCSXR*: CdRom Case Closed"
+msgstr "*PCSXR*: Lecteur CD-ROM fermé"
#: ../win32/gui/plugin.c:183
msgid "Connecting..."
@@ -2775,8 +2819,8 @@ msgstr "Allemand"
msgid "Greek"
msgstr "Grec"
-#: ../win32/gui/WndMain.c:81 ../win32/gui/WndMain.c:1659
-#: ../win32/gui/WndMain.c:1661
+#: ../win32/gui/WndMain.c:81 ../win32/gui/WndMain.c:1667
+#: ../win32/gui/WndMain.c:1669
msgid "English"
msgstr "Anglais"
@@ -2827,7 +2871,7 @@ msgstr "Koréen"
#: ../win32/gui/WndMain.c:215
#, fuzzy
msgid ""
-"Usage: pcsx [options]\n"
+"Usage: pcsxr [options]\n"
"\toptions:\n"
"\t-nogui\t\tDon't open the GUI\n"
"\t-psxout\t\tEnable PSX output\n"
@@ -2836,7 +2880,7 @@ msgid ""
"\t-cdfile FILE\tRuns a CD image file (requires -nogui)\n"
"\t-help\t\tDisplay this message"
msgstr ""
-"Usage: pcsx [options]\n"
+"Usage: pcsxr [options]\n"
"\toptions:\n"
"\t-nogui\t\tDésactiver l'interface graphique\n"
"\t-psxout\t\tActiver la sortie PSX\n"
@@ -2844,327 +2888,395 @@ msgstr ""
"\t-cdfile FILE\tLance une image CD (requière -nogui)\n"
"\t-help\tAffiche ce message"
-#: ../win32/gui/WndMain.c:342 ../win32/gui/WndMain.c:388
-msgid "PCSX State Format"
-msgstr "Format d'état PCSX"
+#: ../win32/gui/WndMain.c:347 ../win32/gui/WndMain.c:393
+msgid "PCSXR State Format"
+msgstr "Format d'état PCSXR"
-#: ../win32/gui/WndMain.c:369
+#: ../win32/gui/WndMain.c:374
#, c-format
-msgid "*PCSX*: Loaded State %s"
-msgstr "*PCSX*: État chargé %s"
+msgid "*PCSXR*: Loaded State %s"
+msgstr "*PCSXR*: État chargé %s"
-#: ../win32/gui/WndMain.c:370
+#: ../win32/gui/WndMain.c:375
#, c-format
-msgid "*PCSX*: Error Loading State %s"
-msgstr "*PCSX*: Erreur lors du chargement de l'état %s"
+msgid "*PCSXR*: Error Loading State %s"
+msgstr "*PCSXR*: Erreur lors du chargement de l'état %s"
-#: ../win32/gui/WndMain.c:415
+#: ../win32/gui/WndMain.c:420
#, c-format
-msgid "*PCSX*: Saved State %s"
-msgstr "*PCSX*: État %s sauvegardé"
+msgid "*PCSXR*: Saved State %s"
+msgstr "*PCSXR*: État %s sauvegardé"
-#: ../win32/gui/WndMain.c:416
+#: ../win32/gui/WndMain.c:421
#, c-format
-msgid "*PCSX*: Error Saving State %s"
-msgstr "*PCSX*: Erreur lors de la sauvegarde de l'état %s"
+msgid "*PCSXR*: Error Saving State %s"
+msgstr "*PCSXR*: Erreur lors de la sauvegarde de l'état %s"
-#: ../win32/gui/WndMain.c:484
+#: ../win32/gui/WndMain.c:489
msgid "Running BIOS is not supported with Internal HLE Bios."
msgstr "Le lancement du BIOS n'est pas supporté en mode Internal HLE BIOS."
-#: ../win32/gui/WndMain.c:761
+#: ../win32/gui/WndMain.c:766
msgid "Game ID"
msgstr "ID du jeu"
-#: ../win32/gui/WndMain.c:767
+#: ../win32/gui/WndMain.c:772
msgid "Game"
msgstr "Jeu"
-#: ../win32/gui/WndMain.c:949
+#: ../win32/gui/WndMain.c:954
msgid "mid link block"
msgstr ""
-#: ../win32/gui/WndMain.c:952
+#: ../win32/gui/WndMain.c:957
msgid "terminiting link block"
msgstr ""
-#: ../win32/gui/WndMain.c:1057
+#: ../win32/gui/WndMain.c:1062
msgid "Memcard Manager"
msgstr "Gestionnaire de carte mémoire"
-#: ../win32/gui/WndMain.c:1061 ../win32/gui/WndMain.c:1064
+#: ../win32/gui/WndMain.c:1066 ../win32/gui/WndMain.c:1069
msgid "Select Mcd"
msgstr "Sélectionner une carte mémoire"
-#: ../win32/gui/WndMain.c:1062 ../win32/gui/WndMain.c:1065
+#: ../win32/gui/WndMain.c:1067 ../win32/gui/WndMain.c:1070
msgid "Format Mcd"
msgstr "Formater la carte mémoire"
-#: ../win32/gui/WndMain.c:1063 ../win32/gui/WndMain.c:1066
+#: ../win32/gui/WndMain.c:1068 ../win32/gui/WndMain.c:1071
msgid "Reload Mcd"
msgstr "Recharger la carte mémoire"
-#: ../win32/gui/WndMain.c:1067
+#: ../win32/gui/WndMain.c:1072
msgid "-> Copy ->"
msgstr "-> Copier ->"
-#: ../win32/gui/WndMain.c:1068
+#: ../win32/gui/WndMain.c:1073
msgid "<- Copy <-"
msgstr "<- Copier <-"
-#: ../win32/gui/WndMain.c:1069
+#: ../win32/gui/WndMain.c:1074
msgid "Paste"
msgstr "Coller"
-#: ../win32/gui/WndMain.c:1070
+#: ../win32/gui/WndMain.c:1075
msgid "<- Un/Delete"
msgstr ""
-#: ../win32/gui/WndMain.c:1071
+#: ../win32/gui/WndMain.c:1076
msgid "Un/Delete ->"
msgstr ""
-#: ../win32/gui/WndMain.c:1073
+#: ../win32/gui/WndMain.c:1078
msgid "Memory Card 1"
msgstr "Carte mémoire 1"
-#: ../win32/gui/WndMain.c:1074
+#: ../win32/gui/WndMain.c:1079
msgid "Memory Card 2"
msgstr "Carte mémoire 2"
-#: ../win32/gui/WndMain.c:1129
+#: ../win32/gui/WndMain.c:1134
msgid "Are you sure you want to paste this selection?"
msgstr "Êtes-vous sûr de vouloir coller cette sélection ?"
-#: ../win32/gui/WndMain.c:1129 ../win32/gui/WndMain.c:1240
-#: ../win32/gui/WndMain.c:1247
+#: ../win32/gui/WndMain.c:1134 ../win32/gui/WndMain.c:1245
+#: ../win32/gui/WndMain.c:1252
msgid "Confirmation"
msgstr "Confirmation"
-#: ../win32/gui/WndMain.c:1240 ../win32/gui/WndMain.c:1247
+#: ../win32/gui/WndMain.c:1245 ../win32/gui/WndMain.c:1252
msgid "Are you sure you want to format this Memory Card?"
msgstr "Êtes vous sûr de vouloir formater cette carte mémoire ?"
-#: ../win32/gui/WndMain.c:1293
+#: ../win32/gui/WndMain.c:1298
msgid "Cpu Config"
msgstr "Configuration CPU"
-#: ../win32/gui/WndMain.c:1298
+#: ../win32/gui/WndMain.c:1303
msgid "Disable Xa Decoding"
msgstr "Désactiver le décodage XA"
-#: ../win32/gui/WndMain.c:1299
+#: ../win32/gui/WndMain.c:1304
msgid "Sio Irq Always Enabled"
msgstr "SIO IRQ toujours activé"
-#: ../win32/gui/WndMain.c:1300
+#: ../win32/gui/WndMain.c:1305
msgid "Black && White Movies"
msgstr "Films en noir et blanc"
-#: ../win32/gui/WndMain.c:1301
+#: ../win32/gui/WndMain.c:1306
msgid "Disable Cd audio"
msgstr "Désactiver CD Audio"
-#: ../win32/gui/WndMain.c:1303
+#: ../win32/gui/WndMain.c:1309
msgid "Enable Interpreter Cpu"
msgstr "Activer l'interpréteur CPU"
-#: ../win32/gui/WndMain.c:1306
+#: ../win32/gui/WndMain.c:1312
msgid "Spu Irq Always Enabled"
msgstr "SPU IRQ toujours activé"
-#: ../win32/gui/WndMain.c:1311
+#: ../win32/gui/WndMain.c:1317
msgid "Psx System Type"
msgstr "Type de système PSX"
-#: ../win32/gui/WndMain.c:1415
+#: ../win32/gui/WndMain.c:1423
msgid "Psx Mcd Format (*.mcr;*.mc;*.mem;*.vgs;*.mcd;*.gme;*.ddf)"
msgstr "Format de carte mémoire PSX (*.mcr;*.mc;*.mem;*.vgs;*.mcd;*.gme;*.ddf)"
-#: ../win32/gui/WndMain.c:1420
+#: ../win32/gui/WndMain.c:1428
msgid "Psx Memory Card (*.mcr;*.mc)"
msgstr "Carte mémoire PSX (*.mcr;*.mc)"
-#: ../win32/gui/WndMain.c:1425
+#: ../win32/gui/WndMain.c:1433
msgid "CVGS Memory Card (*.mem;*.vgs)"
msgstr "Carte mémoire CVGS (*.mem;*.vgs)"
-#: ../win32/gui/WndMain.c:1430
+#: ../win32/gui/WndMain.c:1438
msgid "Bleem Memory Card (*.mcd)"
msgstr "Carte mémoire Bleem (*.mcd)"
-#: ../win32/gui/WndMain.c:1435
+#: ../win32/gui/WndMain.c:1443
msgid "DexDrive Memory Card (*.gme)"
msgstr "Carte mémoire DexDrive (*.gme)"
-#: ../win32/gui/WndMain.c:1440
+#: ../win32/gui/WndMain.c:1448
msgid "DataDeck Memory Card (*.ddf)"
msgstr "Carte mémoire DataDeck (*.ddf)"
-#: ../win32/gui/WndMain.c:1484
+#: ../win32/gui/WndMain.c:1492
msgid "Psx Exe Format"
msgstr "Format EXE PSX"
-#: ../win32/gui/WndMain.c:1521
+#: ../win32/gui/WndMain.c:1529
msgid "Psx Isos (*.iso;*.mdf;*.img;*.bin)"
msgstr "ISOs PSX (*.iso;*.mdf;*.img;*.bin)"
-#: ../win32/gui/WndMain.c:1597
+#: ../win32/gui/WndMain.c:1605
msgid "&File"
msgstr "&Fichier"
-#: ../win32/gui/WndMain.c:1598
+#: ../win32/gui/WndMain.c:1606
msgid "E&xit"
msgstr "Quitter"
-#: ../win32/gui/WndMain.c:1600
+#: ../win32/gui/WndMain.c:1608
msgid "Run &EXE..."
msgstr "Lancer un EXE..."
-#: ../win32/gui/WndMain.c:1601
+#: ../win32/gui/WndMain.c:1609
msgid "Run &BIOS"
msgstr "Lancer le BIOS"
-#: ../win32/gui/WndMain.c:1602
+#: ../win32/gui/WndMain.c:1610
msgid "Run &ISO..."
msgstr "Lancer un ISO..."
-#: ../win32/gui/WndMain.c:1603
+#: ../win32/gui/WndMain.c:1611
msgid "Run &CD"
msgstr "Lancer à partir du CD"
-#: ../win32/gui/WndMain.c:1605
+#: ../win32/gui/WndMain.c:1613
msgid "&Emulator"
msgstr "Émulateur"
-#: ../win32/gui/WndMain.c:1606
+#: ../win32/gui/WndMain.c:1614
msgid "&States"
msgstr "États"
-#: ../win32/gui/WndMain.c:1608
+#: ../win32/gui/WndMain.c:1616
msgid "S&witch ISO..."
msgstr "Changer d'ISO..."
-#: ../win32/gui/WndMain.c:1610
+#: ../win32/gui/WndMain.c:1618
msgid "Re&set"
msgstr "&Reset"
-#: ../win32/gui/WndMain.c:1611
+#: ../win32/gui/WndMain.c:1619
msgid "&Run"
msgstr "&Lancer"
-#: ../win32/gui/WndMain.c:1612
+#: ../win32/gui/WndMain.c:1620
msgid "&Save"
msgstr "&Sauvegarder"
-#: ../win32/gui/WndMain.c:1613
+#: ../win32/gui/WndMain.c:1621
msgid "&Load"
msgstr "&Charger"
-#: ../win32/gui/WndMain.c:1614 ../win32/gui/WndMain.c:1624
+#: ../win32/gui/WndMain.c:1622 ../win32/gui/WndMain.c:1632
msgid "&Other..."
msgstr "&Autre..."
-#: ../win32/gui/WndMain.c:1615 ../win32/gui/WndMain.c:1625
+#: ../win32/gui/WndMain.c:1623 ../win32/gui/WndMain.c:1633
msgid "Slot &9"
msgstr "Emplacement &9"
-#: ../win32/gui/WndMain.c:1616 ../win32/gui/WndMain.c:1626
+#: ../win32/gui/WndMain.c:1624 ../win32/gui/WndMain.c:1634
msgid "Slot &8"
msgstr "Emplacement &8"
-#: ../win32/gui/WndMain.c:1617 ../win32/gui/WndMain.c:1627
+#: ../win32/gui/WndMain.c:1625 ../win32/gui/WndMain.c:1635
msgid "Slot &7"
msgstr "Emplacement &7"
-#: ../win32/gui/WndMain.c:1618 ../win32/gui/WndMain.c:1628
+#: ../win32/gui/WndMain.c:1626 ../win32/gui/WndMain.c:1636
msgid "Slot &6"
msgstr "Emplacement &6"
-#: ../win32/gui/WndMain.c:1619 ../win32/gui/WndMain.c:1629
+#: ../win32/gui/WndMain.c:1627 ../win32/gui/WndMain.c:1637
msgid "Slot &5"
msgstr "Emplacement &5"
-#: ../win32/gui/WndMain.c:1620 ../win32/gui/WndMain.c:1630
+#: ../win32/gui/WndMain.c:1628 ../win32/gui/WndMain.c:1638
msgid "Slot &4"
msgstr "Emplacement &4"
-#: ../win32/gui/WndMain.c:1621 ../win32/gui/WndMain.c:1631
+#: ../win32/gui/WndMain.c:1629 ../win32/gui/WndMain.c:1639
msgid "Slot &3"
msgstr "Emplacement &3"
-#: ../win32/gui/WndMain.c:1622 ../win32/gui/WndMain.c:1632
+#: ../win32/gui/WndMain.c:1630 ../win32/gui/WndMain.c:1640
msgid "Slot &2"
msgstr "Emplacement &2"
-#: ../win32/gui/WndMain.c:1623 ../win32/gui/WndMain.c:1633
+#: ../win32/gui/WndMain.c:1631 ../win32/gui/WndMain.c:1641
msgid "Slot &1"
msgstr "Emplacement &1"
-#: ../win32/gui/WndMain.c:1635
+#: ../win32/gui/WndMain.c:1643
msgid "&Configuration"
msgstr "&Configuration"
-#: ../win32/gui/WndMain.c:1636
+#: ../win32/gui/WndMain.c:1644
msgid "Cheat &Search..."
msgstr "&Recherche de codes..."
-#: ../win32/gui/WndMain.c:1637
+#: ../win32/gui/WndMain.c:1645
msgid "Ch&eat Code..."
msgstr "Cod&es de triche..."
-#: ../win32/gui/WndMain.c:1640
+#: ../win32/gui/WndMain.c:1648
msgid "&Language"
msgstr "&Langue"
-#: ../win32/gui/WndMain.c:1665
+#: ../win32/gui/WndMain.c:1673
msgid "&Memory cards..."
msgstr "Cartes &Mémoires..."
-#: ../win32/gui/WndMain.c:1666
+#: ../win32/gui/WndMain.c:1674
msgid "C&PU..."
msgstr "C&PU..."
-#: ../win32/gui/WndMain.c:1668
+#: ../win32/gui/WndMain.c:1676
msgid "&NetPlay..."
msgstr "&Jeu en réseau..."
-#: ../win32/gui/WndMain.c:1670
+#: ../win32/gui/WndMain.c:1678
msgid "&Controllers..."
msgstr "&Contrôleurs..."
-#: ../win32/gui/WndMain.c:1671
+#: ../win32/gui/WndMain.c:1679
msgid "CD-&ROM..."
msgstr "CD-&ROM..."
-#: ../win32/gui/WndMain.c:1672
+#: ../win32/gui/WndMain.c:1680
msgid "&Sound..."
msgstr "&Son..."
-#: ../win32/gui/WndMain.c:1673
+#: ../win32/gui/WndMain.c:1681
msgid "&Graphics..."
msgstr "&Graphismes..."
-#: ../win32/gui/WndMain.c:1675
+#: ../win32/gui/WndMain.c:1683
msgid "&Plugins && Bios..."
msgstr "&Greffons && BIOS..."
-#: ../win32/gui/WndMain.c:1677
+#: ../win32/gui/WndMain.c:1685
msgid "&Help"
msgstr "&Aide"
-#: ../win32/gui/WndMain.c:1678
+#: ../win32/gui/WndMain.c:1686
msgid "&About..."
msgstr "À propos..."
-#: ../win32/gui/WndMain.c:1866
-msgid "Pcsx Msg"
-msgstr "Message PCSX"
+#: ../win32/gui/WndMain.c:1874
+msgid "Pcsxr Msg"
+msgstr "Message PCSXR"
-#: ../win32/gui/WndMain.c:1869
+#: ../win32/gui/WndMain.c:1877
msgid "Error Loading Symbol"
msgstr "Erreur au chargement du symbole"
+#~ msgid "<b>General</b>"
+#~ msgstr "<b>Général</b>"
+
+#~ msgid "<b>XA Music</b>"
+#~ msgstr "<b>Musique XA</b>"
+
+#~ msgid ""
+#~ "None\n"
+#~ "Low\n"
+#~ "Medium\n"
+#~ "Loud\n"
+#~ "Loudest"
+#~ msgstr ""
+#~ "Muet\n"
+#~ "Bas\n"
+#~ "Moyen\n"
+#~ "Fort\n"
+#~ "Le plus fort"
+
+#~ msgid ""
+#~ "None\n"
+#~ "Simple\n"
+#~ "Gaussian\n"
+#~ "Cubic"
+#~ msgstr ""
+#~ "Aucune\n"
+#~ "Simple\n"
+#~ "Gaussienne\n"
+#~ "Cubique"
+
+#~ msgid ""
+#~ "Default\n"
+#~ "125ms\n"
+#~ "250ms\n"
+#~ "500ms\n"
+#~ "1s\n"
+#~ "2s\n"
+#~ "4s\n"
+#~ "8s\n"
+#~ "16s\n"
+#~ "32s\n"
+#~ "1min\n"
+#~ "2min\n"
+#~ "4min\n"
+#~ "8min\n"
+#~ "16min\n"
+#~ "32min"
+#~ msgstr ""
+#~ "Défaut\n"
+#~ "125ms\n"
+#~ "250ms\n"
+#~ "500ms\n"
+#~ "1s\n"
+#~ "2s\n"
+#~ "4s\n"
+#~ "8s\n"
+#~ "16s\n"
+#~ "32s\n"
+#~ "1min\n"
+#~ "2min\n"
+#~ "4min\n"
+#~ "8min\n"
+#~ "16min\n"
+#~ "32min"
+
+#~ msgid "Select CD-ROM device"
+#~ msgstr "Sélectionner un lecteur CD-ROM"
+
#~ msgid "0: None"
#~ msgstr "0: Aucun"
diff --git a/po/hu_HU.po b/po/hu_HU.po
index 5fc995cd..39b7cd3e 100644
--- a/po/hu_HU.po
+++ b/po/hu_HU.po
@@ -1,23 +1,27 @@
# Italian translation of pcsxr
# Copyright (C) 2010 Giovanni Scafora
# This file is distributed under the same license as the pcsxr package.
-# Giovanni Scafora <giovanni@archlinux.org>, 2010.
#
+# Giovanni Scafora <giovanni@archlinux.org>, 2010.
+# Blade_Arma <edgbla@yandex.ru>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: pcsxr 1.0\n"
"Report-Msgid-Bugs-To: whistler_wmz@users.sf.net\n"
-"POT-Creation-Date: 2011-02-18 17:11+0800\n"
-"PO-Revision-Date: 2011-02-08 15:14+0100\n"
-"Last-Translator: Delirious <delirious@freemail.hu>\n"
-"Language-Team: Delirious <delirious@freemail.hu>\n"
+"POT-Creation-Date: 2011-06-04 23:04+0400\n"
+"PO-Revision-Date: 2011-06-04 13:43+0400\n"
+"Last-Translator: Blade_Arma <edgbla@yandex.ru>\n"
+"Language-Team: Russian <kde-i18n-doc@kde.org>\n"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Poedit-Language: Hungarian\n"
+"X-Generator: Lokalize 1.2\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: ../data/pcsx.glade2.h:1
+#: ../data/pcsxr.glade2.h:1
msgid ""
"8-bit\n"
"16-bit\n"
@@ -27,143 +31,143 @@ msgstr ""
"16-bit\n"
"32-bit"
-#: ../data/pcsx.glade2.h:4
+#: ../data/pcsxr.glade2.h:4
msgid "<b>BIOS</b>"
msgstr "<b>BIOS</b>"
-#: ../data/pcsx.glade2.h:5
+#: ../data/pcsxr.glade2.h:5
msgid "<b>Cheat Codes</b>"
msgstr "<b>Csalás kódok</b>"
-#: ../data/pcsx.glade2.h:6
+#: ../data/pcsxr.glade2.h:6
msgid "<b>Cheat Search</b>"
msgstr "<b>Csalás keresés</b>"
-#: ../data/pcsx.glade2.h:7
+#: ../data/pcsxr.glade2.h:7
msgid "<b>Memory Card 1</b>"
msgstr "<b>Memória kártya 1</b>"
-#: ../data/pcsx.glade2.h:8
+#: ../data/pcsxr.glade2.h:8
msgid "<b>Memory Card 2</b>"
msgstr "<b>Memória kártya 2</b>"
-#: ../data/pcsx.glade2.h:9
+#: ../data/pcsxr.glade2.h:9
msgid "<b>NetPlay</b>"
msgstr "<b>Internetes játék</b>"
-#: ../data/pcsx.glade2.h:10
+#: ../data/pcsxr.glade2.h:10
msgid "<b>Options</b>"
msgstr "<b>Beállítások</b>"
-#: ../data/pcsx.glade2.h:11
+#: ../data/pcsxr.glade2.h:11
msgid "<b>Plugins</b>"
msgstr "<b>Plugin</b>"
-#: ../data/pcsx.glade2.h:12
+#: ../data/pcsxr.glade2.h:12
msgid "<b>System Type</b>"
msgstr "<b>Rendszer típus</b>"
-#: ../data/pcsx.glade2.h:13 ../gui/DebugMemory.c:188
+#: ../data/pcsxr.glade2.h:13 ../gui/DebugMemory.c:188
msgid "Address (Hexadecimal):"
msgstr "Címzés (hexadecimális):"
-#: ../data/pcsx.glade2.h:14 ../win32/gui/WndMain.c:1302
+#: ../data/pcsxr.glade2.h:14 ../win32/gui/WndMain.c:1308
msgid "Autodetect"
msgstr "Automatikus észlelés"
-#: ../data/pcsx.glade2.h:15
+#: ../data/pcsxr.glade2.h:15
msgid "Black & White Movies"
msgstr "Fekete-fehér videók"
-#: ../data/pcsx.glade2.h:16
+#: ../data/pcsxr.glade2.h:16
msgid "CD-ROM..."
msgstr "CD-ROM..."
-#: ../data/pcsx.glade2.h:17
+#: ../data/pcsxr.glade2.h:17
msgid "CD-ROM:"
msgstr "CD-ROM:"
-#: ../data/pcsx.glade2.h:18
+#: ../data/pcsxr.glade2.h:18
msgid "CD-_ROM..."
msgstr "CD-_ROM..."
-#: ../data/pcsx.glade2.h:19
+#: ../data/pcsxr.glade2.h:19
msgid "C_ontrollers..."
msgstr "C_ontrollers..."
-#: ../data/pcsx.glade2.h:20
+#: ../data/pcsxr.glade2.h:20
msgid "Chea_t"
msgstr "Chea_t"
-#: ../data/pcsx.glade2.h:21 ../gui/Cheat.c:1129 ../win32/gui/CheatDlg.c:678
+#: ../data/pcsxr.glade2.h:21 ../gui/Cheat.c:1129 ../win32/gui/CheatDlg.c:678
msgid "Cheat Search"
msgstr "Csalás keresés"
-#: ../data/pcsx.glade2.h:22
+#: ../data/pcsxr.glade2.h:22
msgid "Configure CD-ROM"
msgstr "CD-ROM beállítás"
-#: ../data/pcsx.glade2.h:23
+#: ../data/pcsxr.glade2.h:23
msgid "Configure CPU"
msgstr "Processzor beállítások"
-#: ../data/pcsx.glade2.h:24
+#: ../data/pcsxr.glade2.h:24
msgid "Configure Controllers"
msgstr "Irányítók beállítása"
-#: ../data/pcsx.glade2.h:25
+#: ../data/pcsxr.glade2.h:25
msgid "Configure Graphics"
msgstr "Grafikai beállítások"
-#: ../data/pcsx.glade2.h:26
+#: ../data/pcsxr.glade2.h:26
msgid "Configure Memory Cards"
msgstr "Memóriakártyák beállításai"
-#: ../data/pcsx.glade2.h:27
+#: ../data/pcsxr.glade2.h:27
msgid "Configure NetPlay"
msgstr "Internetes játék beállításai"
-#: ../data/pcsx.glade2.h:28 ../gui/ConfDlg.c:112
-msgid "Configure PCSX"
-msgstr "PCSX beállítása"
+#: ../data/pcsxr.glade2.h:28 ../gui/ConfDlg.c:112
+msgid "Configure PCSXR"
+msgstr "PCSXR beállítása"
-#: ../data/pcsx.glade2.h:29 ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:6
+#: ../data/pcsxr.glade2.h:29 ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:3
msgid "Configure Sound"
msgstr "Hang beállítások"
-#: ../data/pcsx.glade2.h:30
+#: ../data/pcsxr.glade2.h:30
msgid "Continue Emulation"
msgstr "Emuláció folytatása"
-#: ../data/pcsx.glade2.h:31
+#: ../data/pcsxr.glade2.h:31
msgid "Continue..."
msgstr "Folytatása..."
-#: ../data/pcsx.glade2.h:32
+#: ../data/pcsxr.glade2.h:32
msgid "Controller 1: "
msgstr "1. irányító: "
-#: ../data/pcsx.glade2.h:33
+#: ../data/pcsxr.glade2.h:33
msgid "Controller 2:"
msgstr "2. irányító:"
-#: ../data/pcsx.glade2.h:34
+#: ../data/pcsxr.glade2.h:34
msgid "Controllers..."
msgstr "Irányítók..."
-#: ../data/pcsx.glade2.h:35
+#: ../data/pcsxr.glade2.h:35
msgid "Copy"
msgstr "Másolás"
-#: ../data/pcsx.glade2.h:36 ../win32/gui/CheatDlg.c:683
+#: ../data/pcsxr.glade2.h:36 ../win32/gui/CheatDlg.c:683
msgid "Data Base:"
msgstr "Adatbázis:"
-#: ../data/pcsx.glade2.h:37 ../win32/gui/CheatDlg.c:681
+#: ../data/pcsxr.glade2.h:37 ../win32/gui/CheatDlg.c:681
msgid "Data Type:"
msgstr "Adat fajta:"
-#: ../data/pcsx.glade2.h:38
+#: ../data/pcsxr.glade2.h:38
msgid ""
"Decimal\n"
"Hexadecimal"
@@ -171,35 +175,35 @@ msgstr ""
"Decimális\n"
"Hexadecimális"
-#: ../data/pcsx.glade2.h:40
+#: ../data/pcsxr.glade2.h:40
msgid "Disable CD Audio"
msgstr "CD hang kikapcsolása"
-#: ../data/pcsx.glade2.h:41
+#: ../data/pcsxr.glade2.h:41
msgid "Disable XA Decoding"
msgstr "XA kódolás kikapcsolása"
-#: ../data/pcsx.glade2.h:42
+#: ../data/pcsxr.glade2.h:42
msgid "E_xit"
msgstr "E_xit"
-#: ../data/pcsx.glade2.h:43 ../win32/gui/CheatDlg.c:166
+#: ../data/pcsxr.glade2.h:43 ../win32/gui/CheatDlg.c:166
msgid "Edit Cheat Codes"
msgstr "Csalás kódok szerkesztése"
-#: ../data/pcsx.glade2.h:44 ../win32/gui/WndMain.c:1304
+#: ../data/pcsxr.glade2.h:44 ../win32/gui/WndMain.c:1310
msgid "Enable Console Output"
msgstr "Konzol kimenet bekapcsolása"
-#: ../data/pcsx.glade2.h:45 ../win32/gui/WndMain.c:1305
+#: ../data/pcsxr.glade2.h:45 ../win32/gui/WndMain.c:1311
msgid "Enable Debugger"
msgstr "Hibakereső bekapcsolása"
-#: ../data/pcsx.glade2.h:46
+#: ../data/pcsxr.glade2.h:46
msgid "Enable Interpreter CPU"
msgstr "Processzor interpreter használata"
-#: ../data/pcsx.glade2.h:47
+#: ../data/pcsxr.glade2.h:47
msgid ""
"Equal Value\n"
"Not Equal Value\n"
@@ -222,43 +226,43 @@ msgstr ""
"Különböző\n"
"Változatlan"
-#: ../data/pcsx.glade2.h:56
+#: ../data/pcsxr.glade2.h:56
msgid "Format"
msgstr "Formátum"
-#: ../data/pcsx.glade2.h:57 ../win32/gui/CheatDlg.c:504
+#: ../data/pcsxr.glade2.h:57 ../win32/gui/CheatDlg.c:504
msgid "Freeze"
msgstr "Fagyasztás"
-#: ../data/pcsx.glade2.h:58
+#: ../data/pcsxr.glade2.h:58
msgid "Graphics..."
msgstr "Kép..."
-#: ../data/pcsx.glade2.h:59
+#: ../data/pcsxr.glade2.h:59
msgid "Graphics:"
msgstr "Kép:"
-#: ../data/pcsx.glade2.h:60 ../win32/gui/WndMain.c:1308
+#: ../data/pcsxr.glade2.h:60 ../win32/gui/WndMain.c:1314
msgid "InuYasha Sengoku Battle Fix"
msgstr "InuYasha Sengoku Battle javítás"
-#: ../data/pcsx.glade2.h:61
+#: ../data/pcsxr.glade2.h:61
msgid "Memcards..."
msgstr "Memória kártyák..."
-#: ../data/pcsx.glade2.h:62 ../gui/DebugMemory.c:103
+#: ../data/pcsxr.glade2.h:62 ../gui/DebugMemory.c:103
msgid "Memory Dump"
msgstr "Mentett memóriatartalom"
-#: ../data/pcsx.glade2.h:63
+#: ../data/pcsxr.glade2.h:63
msgid "Memory _Dump"
msgstr "Memória _mentés"
-#: ../data/pcsx.glade2.h:64 ../win32/gui/CheatDlg.c:595
+#: ../data/pcsxr.glade2.h:64 ../win32/gui/CheatDlg.c:595
msgid "Modify"
msgstr "Módosítás"
-#: ../data/pcsx.glade2.h:65
+#: ../data/pcsxr.glade2.h:65
msgid ""
"NTSC\n"
"PAL"
@@ -266,225 +270,229 @@ msgstr ""
"NTSC\n"
"PAL"
-#: ../data/pcsx.glade2.h:67
+#: ../data/pcsxr.glade2.h:67
msgid "New"
msgstr "Új"
-#: ../data/pcsx.glade2.h:68
-msgid "PCSX"
-msgstr "PCSX"
+#: ../data/pcsxr.glade2.h:68
+msgid "PCSXR"
+msgstr "PCSXR"
-#: ../data/pcsx.glade2.h:69 ../win32/gui/WndMain.c:1307
+#: ../data/pcsxr.glade2.h:69 ../win32/gui/WndMain.c:1313
msgid "Parasite Eve 2, Vandal Hearts 1/2 Fix"
msgstr "Parasite Eve 2, Vandal Hearts 1/2 javítás"
-#: ../data/pcsx.glade2.h:70
+#: ../data/pcsxr.glade2.h:70
msgid "Patch Memory..."
msgstr "Memória hibajavítás..."
-#: ../data/pcsx.glade2.h:71
+#: ../data/pcsxr.glade2.h:71
msgid "Raw Dump..."
msgstr "Nyers mentés..."
-#: ../data/pcsx.glade2.h:72
+#: ../data/pcsxr.glade2.h:72
msgid "Restart"
msgstr "Újraindítás"
-#: ../data/pcsx.glade2.h:73
+#: ../data/pcsxr.glade2.h:73
msgid "Run CD"
msgstr "CD indítása"
-#: ../data/pcsx.glade2.h:74
+#: ../data/pcsxr.glade2.h:74
msgid "Run ISO Image"
msgstr "ISO képfájl futtatása"
-#: ../data/pcsx.glade2.h:75
+#: ../data/pcsxr.glade2.h:75
msgid "Run ISO..."
msgstr "ISO futtatása..."
-#: ../data/pcsx.glade2.h:76
+#: ../data/pcsxr.glade2.h:76
msgid "Run _BIOS"
msgstr "BIOS _futtatása"
-#: ../data/pcsx.glade2.h:77
+#: ../data/pcsxr.glade2.h:77
msgid "Run _CD"
msgstr "CD _indítása"
-#: ../data/pcsx.glade2.h:78
+#: ../data/pcsxr.glade2.h:78
msgid "Run _EXE..."
msgstr "EXE _futtatása..."
-#: ../data/pcsx.glade2.h:79
+#: ../data/pcsxr.glade2.h:79
msgid "Run _ISO..."
msgstr "ISO _futtatása......"
-#: ../data/pcsx.glade2.h:80 ../gui/Plugin.c:239
+#: ../data/pcsxr.glade2.h:80 ../gui/Plugin.c:239
#, c-format
msgid "SIO IRQ Always Enabled"
msgstr "SIO IRQ mindig bekapcsolva"
-#: ../data/pcsx.glade2.h:81
+#: ../data/pcsxr.glade2.h:81
msgid "SPU IRQ Always Enabled"
msgstr "Hang IRQ mindig bekacsolva"
-#: ../data/pcsx.glade2.h:82
+#: ../data/pcsxr.glade2.h:82
msgid "S_witch ISO..."
msgstr "S_ami ISO..."
-#: ../data/pcsx.glade2.h:83
+#: ../data/pcsxr.glade2.h:83
msgid "Search"
msgstr "Keresés"
-#: ../data/pcsx.glade2.h:84 ../win32/gui/CheatDlg.c:680
+#: ../data/pcsxr.glade2.h:84 ../win32/gui/CheatDlg.c:680
msgid "Search For:"
msgstr "A következő keresése:"
-#: ../data/pcsx.glade2.h:85
+#: ../data/pcsxr.glade2.h:85
msgid "Search in:"
msgstr "Keresés itt:"
-#: ../data/pcsx.glade2.h:86
+#: ../data/pcsxr.glade2.h:86
msgid "Select Folder to Search"
msgstr "Keresési mappa kiválasztása"
-#: ../data/pcsx.glade2.h:87
+#: ../data/pcsxr.glade2.h:87
msgid "Slot _1"
msgstr "Slot _1"
-#: ../data/pcsx.glade2.h:88
+#: ../data/pcsxr.glade2.h:88
msgid "Slot _2"
msgstr "Slot _2"
-#: ../data/pcsx.glade2.h:89
+#: ../data/pcsxr.glade2.h:89
msgid "Slot _3"
msgstr "Slot _3"
-#: ../data/pcsx.glade2.h:90
+#: ../data/pcsxr.glade2.h:90
msgid "Slot _4"
msgstr "Slot _4"
-#: ../data/pcsx.glade2.h:91
+#: ../data/pcsxr.glade2.h:91
msgid "Slot _5"
msgstr "Slot _5"
-#: ../data/pcsx.glade2.h:92
+#: ../data/pcsxr.glade2.h:92
msgid "Slot _6"
msgstr "Slot _6"
-#: ../data/pcsx.glade2.h:93
+#: ../data/pcsxr.glade2.h:93
msgid "Slot _7"
msgstr "Slot _7"
-#: ../data/pcsx.glade2.h:94
+#: ../data/pcsxr.glade2.h:94
msgid "Slot _8"
msgstr "Slot _8"
-#: ../data/pcsx.glade2.h:95
+#: ../data/pcsxr.glade2.h:95
msgid "Slot _9"
msgstr "Slot _9"
-#: ../data/pcsx.glade2.h:96
+#: ../data/pcsxr.glade2.h:96 ../win32/gui/WndMain.c:1307
+msgid "Slow Boot"
+msgstr ""
+
+#: ../data/pcsxr.glade2.h:97
msgid "Sound..."
msgstr "Hang..."
-#: ../data/pcsx.glade2.h:97
+#: ../data/pcsxr.glade2.h:98
msgid "Sound:"
msgstr "Hang:"
-#: ../data/pcsx.glade2.h:98
+#: ../data/pcsxr.glade2.h:99
msgid "Switch ISO Image"
msgstr "ISO képfájl csere"
-#: ../data/pcsx.glade2.h:99
+#: ../data/pcsxr.glade2.h:100
msgid "Switch ISO..."
msgstr "ISO váltás..."
-#: ../data/pcsx.glade2.h:100 ../win32/gui/CheatDlg.c:684
+#: ../data/pcsxr.glade2.h:101 ../win32/gui/CheatDlg.c:684
msgid "To:"
msgstr "Ide:"
-#: ../data/pcsx.glade2.h:101
+#: ../data/pcsxr.glade2.h:102
msgid "Un/Delete"
msgstr "Nem/törlés"
-#: ../data/pcsx.glade2.h:102 ../gui/Cheat.c:647 ../win32/gui/CheatDlg.c:506
+#: ../data/pcsxr.glade2.h:103 ../gui/Cheat.c:647 ../win32/gui/CheatDlg.c:506
#: ../win32/gui/CheatDlg.c:597 ../win32/gui/CheatDlg.c:682
msgid "Value:"
msgstr "Érték:"
-#: ../data/pcsx.glade2.h:103
-msgid "_About PCSX..."
-msgstr "_A PCSX névjegye..."
+#: ../data/pcsxr.glade2.h:104
+msgid "_About PCSXR..."
+msgstr "_A PCSXR névjegye..."
-#: ../data/pcsx.glade2.h:104
+#: ../data/pcsxr.glade2.h:105
msgid "_Browse..."
msgstr "_Tallózás..."
-#: ../data/pcsx.glade2.h:105
+#: ../data/pcsxr.glade2.h:106
msgid "_CPU..."
msgstr "_Processzor..."
-#: ../data/pcsx.glade2.h:106
+#: ../data/pcsxr.glade2.h:107
msgid "_Configuration"
msgstr "_Beállítások"
-#: ../data/pcsx.glade2.h:107
+#: ../data/pcsxr.glade2.h:108
msgid "_Continue"
msgstr "_Folytatás"
-#: ../data/pcsx.glade2.h:108
+#: ../data/pcsxr.glade2.h:109
msgid "_Emulator"
msgstr "_Emulátor"
-#: ../data/pcsx.glade2.h:109
+#: ../data/pcsxr.glade2.h:110
msgid "_File"
msgstr "_Fájl"
-#: ../data/pcsx.glade2.h:110
+#: ../data/pcsxr.glade2.h:111
msgid "_Graphics..."
msgstr "_Kép..."
-#: ../data/pcsx.glade2.h:111
+#: ../data/pcsxr.glade2.h:112
msgid "_Help"
msgstr "_Súgó"
-#: ../data/pcsx.glade2.h:112
+#: ../data/pcsxr.glade2.h:113
msgid "_Load State"
msgstr "_Állás betöltése"
-#: ../data/pcsx.glade2.h:113
+#: ../data/pcsxr.glade2.h:114
msgid "_Memory Cards..."
msgstr "_Memória kártyák..."
-#: ../data/pcsx.glade2.h:114
+#: ../data/pcsxr.glade2.h:115
msgid "_Netplay..."
msgstr "_Netplay..."
-#: ../data/pcsx.glade2.h:115
+#: ../data/pcsxr.glade2.h:116
msgid "_Other..."
msgstr "_Egyebek..."
-#: ../data/pcsx.glade2.h:116
+#: ../data/pcsxr.glade2.h:117
msgid "_Plugins & BIOS..."
msgstr "_Pluginok és BIOS..."
-#: ../data/pcsx.glade2.h:117
+#: ../data/pcsxr.glade2.h:118
msgid "_Reset"
msgstr "_Alapra állítás"
-#: ../data/pcsx.glade2.h:118
+#: ../data/pcsxr.glade2.h:119
msgid "_Save State"
msgstr "_Állás mentés"
-#: ../data/pcsx.glade2.h:119
+#: ../data/pcsxr.glade2.h:120
msgid "_Search..."
msgstr "_Keresés..."
-#: ../data/pcsx.glade2.h:120
+#: ../data/pcsxr.glade2.h:121
msgid "_Sound..."
msgstr "_Hang..."
-#: ../data/pcsx.glade2.h:121
+#: ../data/pcsxr.glade2.h:122
msgid "label_resultsfound"
msgstr "címke_eredmény találva"
@@ -492,11 +500,8 @@ msgstr "címke_eredmény találva"
msgid ""
"(C) 1999-2003 PCSX Team\n"
"(C) 2005-2009 PCSX-df Team\n"
-"(C) 2009-2010 PCSX-Reloaded Team"
+"(C) 2009-2011 PCSX-Reloaded Team"
msgstr ""
-"(C) 1999-2003 PCSX Team\n"
-"(C) 2005-2009 PCSX-df Team\n"
-"(C) 2009-2010 PCSX-Reloaded Team"
#: ../gui/AboutDlg.c:77
msgid ""
@@ -549,8 +554,8 @@ msgstr "Csalás leírás:"
msgid "Cheat Code:"
msgstr "Csalás kód:"
-#: ../gui/Cheat.c:155 ../gui/Cheat.c:251 ../gui/LnxMain.c:422
-#: ../win32/gui/ConfigurePlugins.c:305
+#: ../gui/Cheat.c:155 ../gui/Cheat.c:251 ../gui/LnxMain.c:421
+#: ../win32/gui/ConfigurePlugins.c:307
msgid "Error"
msgstr "Hiba"
@@ -568,11 +573,11 @@ msgid "Open Cheat File"
msgstr "Csalás fájl megnyitása"
#: ../gui/Cheat.c:316 ../gui/Cheat.c:356
-msgid "PCSX Cheat Code Files (*.cht)"
-msgstr "PCSX csalás kód fájlok (*.cht)"
+msgid "PCSXR Cheat Code Files (*.cht)"
+msgstr "PCSXR csalás kód fájlok (*.cht)"
#: ../gui/Cheat.c:321 ../gui/Gtk2Gui.c:446 ../gui/Gtk2Gui.c:587
-#: ../win32/gui/WndMain.c:1445 ../win32/gui/WndMain.c:1526
+#: ../win32/gui/WndMain.c:1453 ../win32/gui/WndMain.c:1534
msgid "All Files"
msgstr "Minden fájl"
@@ -674,7 +679,7 @@ msgstr "A BIOS könyvtár nem nyitható meg: '%s'\n"
msgid "Could not open directory: '%s'\n"
msgstr "A könyvtár nem nyitható meg: '%s'\n"
-#. The BIOS list always contains the PCSX internal BIOS
+#. The BIOS list always contains the PCSXR internal BIOS
#: ../gui/ConfDlg.c:675
msgid "Simulate PSX BIOS"
msgstr "PSX BIOS szimulálása"
@@ -744,14 +749,14 @@ msgstr "A fájl nem tűnik PlayStation futtatható fájlnak"
msgid "CD ROM failed"
msgstr "CD ROM hiba"
-#: ../gui/Gtk2Gui.c:508 ../gui/Gtk2Gui.c:649 ../win32/gui/WndMain.c:464
-#: ../win32/gui/WndMain.c:516 ../win32/gui/WndMain.c:585
+#: ../gui/Gtk2Gui.c:508 ../gui/Gtk2Gui.c:649 ../win32/gui/WndMain.c:469
+#: ../win32/gui/WndMain.c:521 ../win32/gui/WndMain.c:590
#, c-format
msgid "The CD does not appear to be a valid Playstation CD"
msgstr "Úgy tűnik a CD lemez nem PlayStation CD formátum"
-#: ../gui/Gtk2Gui.c:519 ../gui/Gtk2Gui.c:660 ../win32/gui/WndMain.c:474
-#: ../win32/gui/WndMain.c:526 ../win32/gui/WndMain.c:595
+#: ../gui/Gtk2Gui.c:519 ../gui/Gtk2Gui.c:660 ../win32/gui/WndMain.c:479
+#: ../win32/gui/WndMain.c:531 ../win32/gui/WndMain.c:600
#, c-format
msgid "Could not load CD-ROM!"
msgstr "CD-ROM betöltése sikertelen!"
@@ -809,51 +814,52 @@ msgstr "Megjegyzés"
msgid "Creating memory card: %s\n"
msgstr "Memória kártya létrehozása: %s\n"
-#: ../gui/LnxMain.c:329
+#: ../gui/LnxMain.c:328
#, fuzzy
msgid ""
-" pcsx [options] [file]\n"
+" pcsxr [options] [file]\n"
"\toptions:\n"
"\t-runcd\t\tRuns CD-ROM\n"
"\t-cdfile FILE\tRuns a CD image file\n"
"\t-nogui\t\tDon't open the GTK GUI\n"
-"\t-cfg FILE\tLoads desired configuration file (default: ~/.pcsx/pcsx.cfg)\n"
+"\t-cfg FILE\tLoads desired configuration file (default: ~/.pcsxr/pcsxr.cfg)\n"
"\t-psxout\t\tEnable PSX output\n"
"\t-slowboot\tEnable BIOS Logo\n"
"\t-load STATENUM\tLoads savestate STATENUM (1-9)\n"
"\t-h -help\tDisplay this message\n"
"\tfile\t\tLoads file\n"
msgstr ""
-" pcsx [beállítások] [fájl]\n"
+" pcsxr [beállítások] [fájl]\n"
"\toptions:\n"
"\t-runcd\t\tCD-ROM futtatása\n"
"\t-cdfile FILE\tCD képfájl futtatása\n"
"\t-nogui\t\tNe nyíljon meg a GTK GUI\n"
-"\t-cfg FILE\tA kívánt konfigurációs fájl betöltése (alap: ~/.pcsx/pcsx.cfg)\n"
+"\t-cfg FILE\tA kívánt konfigurációs fájl betöltése (alap: ~/.pcsxr/pcsxr."
+"cfg)\n"
"\t-psxout\t\tPSX kimenet bekapcsolása\n"
"\t-load STATENUM\tÁllásmentés betöltése STATENUM (1-9)\n"
"\t-h -help\tAz üzenet megjelenítése\n"
"\tfile\t\tFájl betöltése\n"
-#: ../gui/LnxMain.c:366
+#: ../gui/LnxMain.c:365
#, c-format
msgid ""
-"PCSX cannot be configured without using the GUI -- you should restart "
+"PCSXR cannot be configured without using the GUI -- you should restart "
"without -nogui.\n"
msgstr ""
-"PCSX nem konfigurálható a GUI használata nélkül -- újraindítás szükséges -"
+"PCSXR nem konfigurálható a GUI használata nélkül -- újraindítás szükséges -"
"nogui nélkül.\n"
-#: ../gui/LnxMain.c:422
+#: ../gui/LnxMain.c:421
msgid "Failed loading plugins!"
msgstr "Pluginok betöltése sikertelen!"
-#: ../gui/LnxMain.c:441
+#: ../gui/LnxMain.c:440
#, c-format
msgid "Could not load CD-ROM!\n"
msgstr "CD-ROM nem tölthető be!\n"
-#: ../gui/LnxMain.c:472
+#: ../gui/LnxMain.c:471
#, c-format
msgid "PSX emulator couldn't be initialized.\n"
msgstr "PSX emulátor incializálása sikertelen.\n"
@@ -862,11 +868,11 @@ msgstr "PSX emulátor incializálása sikertelen.\n"
msgid "Icon"
msgstr "Ikon"
-#: ../gui/MemcardDlg.c:66 ../win32/gui/WndMain.c:749
+#: ../gui/MemcardDlg.c:66 ../win32/gui/WndMain.c:754
msgid "Title"
msgstr "Cím"
-#: ../gui/MemcardDlg.c:72 ../win32/gui/WndMain.c:755
+#: ../gui/MemcardDlg.c:72 ../win32/gui/WndMain.c:760
msgid "Status"
msgstr "Állapot"
@@ -878,17 +884,17 @@ msgstr "Azonosító"
msgid "Name"
msgstr "Név"
-#: ../gui/MemcardDlg.c:192 ../gui/MemcardDlg.c:297 ../win32/gui/WndMain.c:960
+#: ../gui/MemcardDlg.c:192 ../gui/MemcardDlg.c:297 ../win32/gui/WndMain.c:965
msgid "Deleted"
msgstr "Törölve"
#: ../gui/MemcardDlg.c:194 ../gui/MemcardDlg.c:198 ../gui/MemcardDlg.c:299
-#: ../gui/MemcardDlg.c:303 ../win32/gui/WndMain.c:961
-#: ../win32/gui/WndMain.c:964
+#: ../gui/MemcardDlg.c:303 ../win32/gui/WndMain.c:966
+#: ../win32/gui/WndMain.c:969
msgid "Free"
msgstr "Üres"
-#: ../gui/MemcardDlg.c:196 ../gui/MemcardDlg.c:301 ../win32/gui/WndMain.c:963
+#: ../gui/MemcardDlg.c:196 ../gui/MemcardDlg.c:301 ../win32/gui/WndMain.c:968
msgid "Used"
msgstr "Foglalt"
@@ -1146,23 +1152,23 @@ msgstr "Hiba a SIO1 plugin iniciálásakor: %d"
msgid "Plugins loaded.\n"
msgstr "Pluginok betöltve.\n"
-#: ../libpcsxcore/ppf.c:217
+#: ../libpcsxcore/ppf.c:219
#, c-format
msgid "Invalid PPF patch: %s.\n"
msgstr "Érvénytelen PPF patch: %s.\n"
-#: ../libpcsxcore/ppf.c:293
+#: ../libpcsxcore/ppf.c:295
#, c-format
msgid "Unsupported PPF version (%d).\n"
msgstr "Nem támogatott PPF verzió (%d).\n"
#. build address array
-#: ../libpcsxcore/ppf.c:332
+#: ../libpcsxcore/ppf.c:334
#, c-format
msgid "Loaded PPF %d.0 patch: %s.\n"
msgstr "PPF %d.0 patch betöltve: %s.\n"
-#: ../libpcsxcore/ppf.c:377
+#: ../libpcsxcore/ppf.c:381
#, c-format
msgid "Loaded SBI file: %s.\n"
msgstr "SBI fájl betöltve: %s.\n"
@@ -1178,31 +1184,31 @@ msgstr "BIOS nem nyitható meg:\"%s\". HLE Bios használata!\n"
#: ../libpcsxcore/r3000a.c:34
#, c-format
-msgid "Running PCSX Version %s (%s).\n"
-msgstr "PCSX %s (%s) verzió fut.\n"
+msgid "Running PCSXR Version %s (%s).\n"
+msgstr "PCSXR %s (%s) verzió fut.\n"
-#: ../libpcsxcore/sio.c:839
+#: ../libpcsxcore/sio.c:843
msgid "Connection closed!\n"
msgstr "Kapcsolat lezárva!\n"
-#: ../libpcsxcore/sio.c:872
+#: ../libpcsxcore/sio.c:876
#, c-format
msgid "No memory card value was specified - creating a default card %s\n"
msgstr ""
"Nincs megadva memóriakártyához tartozó érték - alapértelmezett kártya "
"létrehozása %s\n"
-#: ../libpcsxcore/sio.c:876
+#: ../libpcsxcore/sio.c:880
#, c-format
msgid "The memory card %s doesn't exist - creating it\n"
msgstr "Nincs %s. memóriakártya - létrehozása folyamatban\n"
-#: ../libpcsxcore/sio.c:892
+#: ../libpcsxcore/sio.c:896
#, c-format
msgid "Memory card %s failed to load!\n"
msgstr "%s. memóriakártya betöltése sikertelen!\n"
-#: ../libpcsxcore/sio.c:896
+#: ../libpcsxcore/sio.c:900
#, c-format
msgid "Loading memory card %s\n"
msgstr "%s. memóriakártya betöltése\n"
@@ -1215,263 +1221,287 @@ msgstr "CD-ROM olvasó"
msgid "CDR NULL Plugin"
msgstr "CDR NULL plugin"
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:1
-#: ../plugins/dfcdrom/cdrcfg-0.1df/main.c:219
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:1
+msgid "125ms"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:2
+msgid "16min"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:3
+msgid "16s"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:4
+msgid "1min"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:5
+msgid "1s"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:6
+msgid "250ms"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:7
+msgid "2min"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:8
+msgid "2s"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:9
+msgid "32min"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:10
+msgid "32s"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:11
+msgid "4min"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:12
+msgid "4s"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:13
+msgid "500ms"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:14
+msgid "8min"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:15
+msgid "8s"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:16
+#: ../plugins/dfcdrom/cdrcfg-0.1df/main.c:206
msgid "CDR configuration"
msgstr "CD-ROM beállítások"
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:2
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:17
msgid "Cache Size (Def. 64):"
msgstr "Gyorsítótár mérete (Def. 64):"
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:3
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:18
msgid "Cdrom Speed (Def. 0 = MAX):"
msgstr "CD-ROM sebessége (alap. 0 = MAX):"
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:4
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:19
msgid "Choose your CD-ROM device or type its path if it's not listed"
msgstr ""
"Válassz CD-ROM eszközt vagy gépeld be az elérési útját ha nincs a "
"felsoroltak közt"
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:5
-msgid ""
-"Default\n"
-"125ms\n"
-"250ms\n"
-"500ms\n"
-"1s\n"
-"2s\n"
-"4s\n"
-"8s\n"
-"16s\n"
-"32s\n"
-"1min\n"
-"2min\n"
-"4min\n"
-"8min\n"
-"16min\n"
-"32min"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:20
+msgid "Default"
msgstr ""
-"Alapérték\n"
-"125 ms\n"
-"250 ms\n"
-"500 ms\n"
-"1 s\n"
-"2 s\n"
-"4 s\n"
-"8 s\n"
-"16 s\n"
-"32 s\n"
-"1 perc\n"
-"2 perc\n"
-"4 perc\n"
-"8 perc\n"
-"16 perc\n"
-"32 perc"
-
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:21
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:21
msgid "Enable subchannel read"
msgstr "Segéd csatorna olvasás használata"
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:22
-msgid ""
-"Normal (No Cache)\n"
-"Threaded - Faster (With Cache)"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:22
+msgid "Normal (No Cache)"
msgstr ""
-"Normál (gyorsítótár nélkül)\n"
-"Szálanként - Gyorsabb (gyorsítótárral)"
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:24
-#: ../plugins/dfinput/dfinput.ui.h:8 ../win32/gui/WndMain.c:1310
-msgid "Options"
-msgstr "Lehetőségek"
-
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:25
-msgid "Select CD-ROM device"
-msgstr "Válassz CD-ROM eszközt"
-
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:26
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:23
msgid "Select read mode:"
msgstr "Válassz olvasási módot:"
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:27
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:24
msgid "Spindown Time:"
msgstr "Lelassulási idő:"
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:28
-msgid "hseparator"
-msgstr "hseparator"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:25
+#, fuzzy
+msgid "Threaded - Faster (With Cache)"
+msgstr ""
+"Normál (gyorsítótár nélkül)\n"
+"Szálanként - Gyorsabb (gyorsítótárral)"
-#: ../plugins/dfinput/cfg-gtk2.c:48
+#: ../plugins/dfinput/cfg-gtk2.c:49
msgid "D-Pad Up"
msgstr "Digitális FEL"
-#: ../plugins/dfinput/cfg-gtk2.c:49
+#: ../plugins/dfinput/cfg-gtk2.c:50
msgid "D-Pad Down"
msgstr "Digitális LE"
-#: ../plugins/dfinput/cfg-gtk2.c:50
+#: ../plugins/dfinput/cfg-gtk2.c:51
msgid "D-Pad Left"
msgstr "Digitális BALRA"
-#: ../plugins/dfinput/cfg-gtk2.c:51
+#: ../plugins/dfinput/cfg-gtk2.c:52
msgid "D-Pad Right"
msgstr "Digitális JOBBRA"
-#: ../plugins/dfinput/cfg-gtk2.c:52
+#: ../plugins/dfinput/cfg-gtk2.c:53
msgid "Cross"
msgstr "KERESZT"
-#: ../plugins/dfinput/cfg-gtk2.c:53
+#: ../plugins/dfinput/cfg-gtk2.c:54
msgid "Circle"
msgstr "KÖR"
-#: ../plugins/dfinput/cfg-gtk2.c:54
+#: ../plugins/dfinput/cfg-gtk2.c:55
msgid "Square"
msgstr "NÉGYSZÖG"
-#: ../plugins/dfinput/cfg-gtk2.c:55
+#: ../plugins/dfinput/cfg-gtk2.c:56
msgid "Triangle"
msgstr "HÁROMSZÖG"
-#: ../plugins/dfinput/cfg-gtk2.c:56
+#: ../plugins/dfinput/cfg-gtk2.c:57
msgid "L1"
msgstr "L1"
-#: ../plugins/dfinput/cfg-gtk2.c:57
+#: ../plugins/dfinput/cfg-gtk2.c:58
msgid "R1"
msgstr "R1"
-#: ../plugins/dfinput/cfg-gtk2.c:58
+#: ../plugins/dfinput/cfg-gtk2.c:59
msgid "L2"
msgstr "L2"
-#: ../plugins/dfinput/cfg-gtk2.c:59
+#: ../plugins/dfinput/cfg-gtk2.c:60
msgid "R2"
msgstr "R2"
-#: ../plugins/dfinput/cfg-gtk2.c:60
+#: ../plugins/dfinput/cfg-gtk2.c:61
msgid "Select"
msgstr "Select"
-#: ../plugins/dfinput/cfg-gtk2.c:61
+#: ../plugins/dfinput/cfg-gtk2.c:62
msgid "Start"
msgstr "Start"
-#: ../plugins/dfinput/cfg-gtk2.c:62
+#: ../plugins/dfinput/cfg-gtk2.c:63
msgid "L3"
msgstr "L3"
-#: ../plugins/dfinput/cfg-gtk2.c:63
+#: ../plugins/dfinput/cfg-gtk2.c:64
msgid "R3"
msgstr "R3"
-#: ../plugins/dfinput/cfg-gtk2.c:67
+#: ../plugins/dfinput/cfg-gtk2.c:65
+#, fuzzy
+msgid "Analog"
+msgstr "Analóg irányító"
+
+#: ../plugins/dfinput/cfg-gtk2.c:69
msgid "L-Stick Right"
msgstr "Bal kar jobbra"
-#: ../plugins/dfinput/cfg-gtk2.c:68
+#: ../plugins/dfinput/cfg-gtk2.c:70
msgid "L-Stick Left"
msgstr "Bal kar jobbra"
-#: ../plugins/dfinput/cfg-gtk2.c:69
+#: ../plugins/dfinput/cfg-gtk2.c:71
msgid "L-Stick Down"
msgstr "Bal kar le"
-#: ../plugins/dfinput/cfg-gtk2.c:70
+#: ../plugins/dfinput/cfg-gtk2.c:72
msgid "L-Stick Up"
msgstr "Bal kar fel"
-#: ../plugins/dfinput/cfg-gtk2.c:71
+#: ../plugins/dfinput/cfg-gtk2.c:73
msgid "R-Stick Right"
msgstr "Jobb kar jobbra"
-#: ../plugins/dfinput/cfg-gtk2.c:72
+#: ../plugins/dfinput/cfg-gtk2.c:74
msgid "R-Stick Left"
msgstr "Jobb kar balra"
-#: ../plugins/dfinput/cfg-gtk2.c:73
+#: ../plugins/dfinput/cfg-gtk2.c:75
msgid "R-Stick Down"
msgstr "Jobb kar le"
-#: ../plugins/dfinput/cfg-gtk2.c:74
+#: ../plugins/dfinput/cfg-gtk2.c:76
msgid "R-Stick Up"
msgstr "Jobb kar fel"
-#: ../plugins/dfinput/cfg-gtk2.c:100 ../plugins/dfinput/cfg-gtk2.c:139
+#: ../plugins/dfinput/cfg-gtk2.c:102 ../plugins/dfinput/cfg-gtk2.c:141
msgid "Centered"
msgstr "Középen"
-#: ../plugins/dfinput/cfg-gtk2.c:100 ../plugins/dfinput/cfg-gtk2.c:139
+#: ../plugins/dfinput/cfg-gtk2.c:102 ../plugins/dfinput/cfg-gtk2.c:141
msgid "Up"
msgstr "Fel"
-#: ../plugins/dfinput/cfg-gtk2.c:100 ../plugins/dfinput/cfg-gtk2.c:139
+#: ../plugins/dfinput/cfg-gtk2.c:102 ../plugins/dfinput/cfg-gtk2.c:141
msgid "Right"
msgstr "Jobbra"
-#: ../plugins/dfinput/cfg-gtk2.c:100 ../plugins/dfinput/cfg-gtk2.c:139
+#: ../plugins/dfinput/cfg-gtk2.c:102 ../plugins/dfinput/cfg-gtk2.c:141
msgid "Rightup"
msgstr "Jobbra fel"
-#: ../plugins/dfinput/cfg-gtk2.c:101 ../plugins/dfinput/cfg-gtk2.c:140
+#: ../plugins/dfinput/cfg-gtk2.c:103 ../plugins/dfinput/cfg-gtk2.c:142
msgid "Down"
msgstr "Le"
-#: ../plugins/dfinput/cfg-gtk2.c:101 ../plugins/dfinput/cfg-gtk2.c:140
+#: ../plugins/dfinput/cfg-gtk2.c:103 ../plugins/dfinput/cfg-gtk2.c:142
msgid "Rightdown"
msgstr "Jobbra le"
-#: ../plugins/dfinput/cfg-gtk2.c:101 ../plugins/dfinput/cfg-gtk2.c:140
+#: ../plugins/dfinput/cfg-gtk2.c:103 ../plugins/dfinput/cfg-gtk2.c:142
msgid "Left"
msgstr "Balra"
-#: ../plugins/dfinput/cfg-gtk2.c:101 ../plugins/dfinput/cfg-gtk2.c:140
+#: ../plugins/dfinput/cfg-gtk2.c:103 ../plugins/dfinput/cfg-gtk2.c:142
msgid "Leftup"
msgstr "Balra fel"
-#: ../plugins/dfinput/cfg-gtk2.c:102 ../plugins/dfinput/cfg-gtk2.c:141
+#: ../plugins/dfinput/cfg-gtk2.c:104 ../plugins/dfinput/cfg-gtk2.c:143
msgid "Leftdown"
msgstr "Balra le"
-#: ../plugins/dfinput/cfg-gtk2.c:106 ../plugins/dfinput/cfg-gtk2.c:145
+#: ../plugins/dfinput/cfg-gtk2.c:108 ../plugins/dfinput/cfg-gtk2.c:147
#, c-format
msgid "Joystick: Button %d"
msgstr "Joystick: %d gomb"
-#: ../plugins/dfinput/cfg-gtk2.c:110 ../plugins/dfinput/cfg-gtk2.c:149
+#: ../plugins/dfinput/cfg-gtk2.c:112 ../plugins/dfinput/cfg-gtk2.c:151
#, c-format
msgid "Joystick: Axis %d%c"
msgstr "Joystick: %d%c irány"
-#: ../plugins/dfinput/cfg-gtk2.c:115 ../plugins/dfinput/cfg-gtk2.c:154
+#: ../plugins/dfinput/cfg-gtk2.c:117 ../plugins/dfinput/cfg-gtk2.c:156
#, c-format
msgid "Joystick: Hat %d %s"
msgstr "Joystick: %d %s hat"
-#: ../plugins/dfinput/cfg-gtk2.c:130 ../plugins/dfinput/cfg-gtk2.c:169
+#: ../plugins/dfinput/cfg-gtk2.c:132 ../plugins/dfinput/cfg-gtk2.c:171
msgid "Keyboard:"
msgstr "Billentyűzet:"
-#: ../plugins/dfinput/cfg-gtk2.c:134 ../plugins/dfinput/cfg-gtk2.c:173
+#: ../plugins/dfinput/cfg-gtk2.c:136 ../plugins/dfinput/cfg-gtk2.c:175
msgid "(Not Set)"
msgstr "(Nincs beállítva)"
-#: ../plugins/dfinput/cfg-gtk2.c:542
+#: ../plugins/dfinput/cfg-gtk2.c:562
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:13
#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:55
msgid "None"
msgstr "Nincs"
-#: ../plugins/dfinput/cfg-gtk2.c:584
+#: ../plugins/dfinput/cfg-gtk2.c:604
msgid "Gamepad/Keyboard Input Configuration"
msgstr "Játékirányító/Billentyűzet bemeneti beállítás"
-#: ../plugins/dfinput/cfg-gtk2.c:590 ../plugins/dfinput/cfg-gtk2.c:610
+#: ../plugins/dfinput/cfg-gtk2.c:610 ../plugins/dfinput/cfg-gtk2.c:630
msgid "Key"
msgstr "Billentyű"
-#: ../plugins/dfinput/cfg-gtk2.c:596 ../plugins/dfinput/cfg-gtk2.c:616
+#: ../plugins/dfinput/cfg-gtk2.c:616 ../plugins/dfinput/cfg-gtk2.c:636
msgid "Button"
msgstr "Gomb"
@@ -1500,19 +1530,28 @@ msgid "Digital Pad"
msgstr "Digitális irányító"
#: ../plugins/dfinput/dfinput.ui.h:7
+msgid "Mouse"
+msgstr ""
+
+#: ../plugins/dfinput/dfinput.ui.h:8
msgid "Multi-Threaded (Recommended)"
msgstr "Többszálas (ajánlott)"
-#: ../plugins/dfinput/dfinput.ui.h:9
+#: ../plugins/dfinput/dfinput.ui.h:9 ../win32/gui/WndMain.c:1316
+msgid "Options"
+msgstr "Lehetőségek"
+
+#: ../plugins/dfinput/dfinput.ui.h:10
msgid "Reset"
msgstr "Alapra állítás"
-#: ../plugins/dfinput/dfinput.ui.h:10
+#: ../plugins/dfinput/dfinput.ui.h:11
msgid "Type:"
msgstr "Típus:"
-#: ../plugins/dfinput/pad.c:24
-msgid "Gamepad/Keyboard Input"
+#: ../plugins/dfinput/pad.c:29
+#, fuzzy
+msgid "Gamepad/Keyboard/Mouse Input"
msgstr "Játékirányító/Billentyűzet bemenet"
#. increase that with each version
@@ -1529,29 +1568,30 @@ msgstr "hiba a következőhöz történő kapcsolódáskor: %s: %s\n"
msgid "Error allocating memory!\n"
msgstr "Memória kiosztási hiba!\n"
-#: ../plugins/dfnet/dfnet.ui.h:1
+#. ****************************************************************************
+#: ../plugins/dfnet/dfnet.ui.h:1 ../plugins/bladesio1/sio1.ui.h:1
msgid "Client (Player2)"
msgstr "Kliens (2. játékos)"
-#: ../plugins/dfnet/dfnet.ui.h:2
+#: ../plugins/dfnet/dfnet.ui.h:2 ../plugins/bladesio1/sio1.ui.h:2
msgid "Copy PC IP to Clipboard"
msgstr "A számítógép IP címének másolása vágólapra"
-#: ../plugins/dfnet/dfnet.ui.h:3
+#: ../plugins/dfnet/dfnet.ui.h:3 ../plugins/bladesio1/sio1.ui.h:3
msgid ""
"Do not change if not necessary (remember it must be changed on both sides)."
msgstr ""
"Ne változtasd ha nem muszály (ne feledd, mindkét oldalon módosítani kell)."
-#: ../plugins/dfnet/dfnet.ui.h:4
+#: ../plugins/dfnet/dfnet.ui.h:4 ../plugins/bladesio1/sio1.ui.h:4
msgid "Play Offline"
msgstr "Offline játék"
-#: ../plugins/dfnet/dfnet.ui.h:5
+#: ../plugins/dfnet/dfnet.ui.h:5 ../plugins/bladesio1/sio1.ui.h:5
msgid "Port Number"
msgstr "Port száma"
-#: ../plugins/dfnet/dfnet.ui.h:6
+#: ../plugins/dfnet/dfnet.ui.h:6 ../plugins/bladesio1/sio1.ui.h:6
msgid ""
"Select here if you'll be Server (Player1) or Client (Player2).\n"
"\n"
@@ -1570,16 +1610,16 @@ msgstr ""
"Ha klienset választottál, írd be az IP címedet amit a szerver adott az IP "
"cím vezérlőnél."
-#: ../plugins/dfnet/dfnet.ui.h:11
+#: ../plugins/dfnet/dfnet.ui.h:11 ../plugins/bladesio1/sio1.ui.h:11
msgid "Server (Player1)"
msgstr "Szerver (1. játékos)"
-#: ../plugins/dfnet/dfnet.ui.h:12
+#: ../plugins/dfnet/dfnet.ui.h:12 ../plugins/bladesio1/sio1.ui.h:12
msgid "Start Game"
msgstr "Játék indítása"
#: ../plugins/dfnet/gui.c:30 ../plugins/dfnet/gui.c:112
-#: ../win32/gui/ConfigurePlugins.c:616
+#: ../win32/gui/ConfigurePlugins.c:618
msgid "NetPlay"
msgstr "Internetes játék"
@@ -1636,100 +1676,92 @@ msgstr ""
"P.E.Op.S. Sound Driver V1.7\n"
"Fejlesztő Pete Bernert és a P.E.Op.S. team\n"
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:1
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2.h:20
-msgid "<b>Compatibility</b>"
-msgstr "<b>Kompatibilitás</b>"
-
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:2
-msgid "<b>General</b>"
-msgstr "<b>Általános</b>"
-
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:3
-msgid "<b>XA Music</b>"
-msgstr "<b>XA zene</b>"
-
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:4
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:1
msgid "Adjust XA speed"
msgstr "XA sebesség beállítása"
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:5
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:2
msgid "Choose this if XA music is played too quickly."
msgstr "Válaszd ezt, ha az XA zene túl gyors."
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:7
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:4
+msgid "Cubic"
+msgstr ""
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:5
msgid "Frequency Response - Output Filter"
msgstr "Frekvencia reakció - Kimeneti szűrő"
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:8
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:6
+#, fuzzy
+msgid "Gaussian"
+msgstr "Orosz"
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:7
msgid "High compatibility mode"
msgstr "Magas kompatibilitási mód"
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:9
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:8
msgid "Interpolation:"
msgstr "Interpoláció:"
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:10
-msgid ""
-"None\n"
-"Low\n"
-"Medium\n"
-"Loud\n"
-"Loudest"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:9
+msgid "Loud"
msgstr ""
-"Nincs\n"
-"Halk\n"
-"Közepes\n"
-"Hangos\n"
-"Leghangosabb"
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:15
-msgid ""
-"None\n"
-"Simple\n"
-"Gaussian\n"
-"Cubic"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:10
+msgid "Loudest"
msgstr ""
-"Nincs\n"
-"Egyszerű\n"
-"Gauss\n"
-"Köbös"
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:19
-msgid ""
-"Off\n"
-"Simple\n"
-"Playstation"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:11
+msgid "Low"
msgstr ""
-"Ki\n"
-"Egyszerű\n"
-"PlayStation"
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:22
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:12
+msgid "Medium"
+msgstr ""
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:14
+msgid "Off"
+msgstr ""
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:15
msgid "Play only one channel for a performance boost."
msgstr "Csupán egy csatorna lejátszása a teljesítmény növelés érdekében."
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:23
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:16
+#, fuzzy
+msgid "Playstation"
+msgstr ""
+"Ki\n"
+"Egyszerű\n"
+"PlayStation"
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:17
msgid "Reverb:"
msgstr "Utózengés:"
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:24
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:18
msgid "SPU IRQ Wait"
msgstr "Hang IRQ várakozás"
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:25
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:19
+msgid "Simple"
+msgstr ""
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:20
msgid "Single channel sound"
msgstr "Egycsatornás hang"
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:26
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:21
msgid "Use the asynchronous SPU interface."
msgstr "Aszinkron hang interfész használata."
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:27
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:22
msgid "Volume:"
msgstr "Hangerő:"
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:28
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:23
msgid "Wait for CPU; only useful for some games."
msgstr "Processzorra várás; csak néhány játéknál hasznos."
@@ -1825,6 +1857,10 @@ msgstr ""
"1280x1024\n"
"1600x1200"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2.h:20
+msgid "<b>Compatibility</b>"
+msgstr "<b>Kompatibilitás</b>"
+
#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2.h:21
msgid "<b>Framerate</b>"
msgstr "<b>Képfrissítési frekvencia</b>"
@@ -2329,6 +2365,11 @@ msgstr "Ablak beállítások"
msgid "Yellow rect (FF9)"
msgstr "Sárga háromszögek (Final Fantasy 9)"
+#: ../plugins/bladesio1/gui.c:32
+#, fuzzy
+msgid "Link cable"
+msgstr "Bekapcsolás"
+
#. ****************************************************************************
#: ../plugins/bladesio1/sio1.c:29
msgid "Sio1 Driver"
@@ -2336,7 +2377,7 @@ msgstr "Sio1 Driver"
#: ../win32/gui/AboutDlg.c:26
msgid ""
-"PCSX - A PlayStation Emulator\n"
+"PCSXR - A PlayStation Emulator\n"
"\n"
"Original Authors:\n"
"main coder: linuzappz\n"
@@ -2344,7 +2385,7 @@ msgid ""
"ex-coders: Nocomp, Pete Bernett, nik3d\n"
"Webmaster: AkumaX"
msgstr ""
-"PCSX - A PlayStation Emulátor\n"
+"PCSXR - A PlayStation Emulátor\n"
"\n"
"Eredeti fejlesztők:\n"
"Vezető programozó: linuzappz\n"
@@ -2359,7 +2400,7 @@ msgid ""
"Marcus Comstedt, Stefan Sikora\n"
"\n"
"PCSX-Reloaded By:\n"
-"Blade_Arma, shalma, Wei Mingzhi, et al.\n"
+"edgbla, shalma, Wei Mingzhi, et al.\n"
"\n"
"http://pcsxr.codeplex.com/"
msgstr ""
@@ -2368,7 +2409,7 @@ msgstr ""
"Marcus Comstedt, Stefan Sikora\n"
"\n"
"PCSX-Reloaded fejlesztők:\n"
-"Blade_Arma, Wei Mingzhi, et al.\n"
+"edgbla, Wei Mingzhi, et al.\n"
"http://pcsxr.codeplex.com/\n"
"Magyar fordítás: Delirious"
@@ -2378,14 +2419,14 @@ msgstr "A program névjegye"
#: ../win32/gui/AboutDlg.c:48 ../win32/gui/AboutDlg.c:52
#: ../win32/gui/CheatDlg.c:69 ../win32/gui/CheatDlg.c:119
-#: ../win32/gui/ConfigurePlugins.c:483 ../win32/gui/ConfigurePlugins.c:614
-#: ../win32/gui/WndMain.c:1059 ../win32/gui/WndMain.c:1295
+#: ../win32/gui/ConfigurePlugins.c:485 ../win32/gui/ConfigurePlugins.c:616
+#: ../win32/gui/WndMain.c:1064 ../win32/gui/WndMain.c:1300
msgid "OK"
msgstr "Rendben"
#: ../win32/gui/AboutDlg.c:49
-msgid "PCSX EMU\n"
-msgstr "PCSX EMULÁTOR\n"
+msgid "PCSXR EMU\n"
+msgstr "PCSXR EMULÁTOR\n"
#: ../win32/gui/CheatDlg.c:51 ../win32/gui/CheatDlg.c:223
#: ../win32/gui/CheatDlg.c:270
@@ -2398,8 +2439,8 @@ msgid "No"
msgstr "Nem"
#: ../win32/gui/CheatDlg.c:70 ../win32/gui/CheatDlg.c:120
-#: ../win32/gui/ConfigurePlugins.c:484 ../win32/gui/ConfigurePlugins.c:615
-#: ../win32/gui/WndMain.c:1060 ../win32/gui/WndMain.c:1296
+#: ../win32/gui/ConfigurePlugins.c:486 ../win32/gui/ConfigurePlugins.c:617
+#: ../win32/gui/WndMain.c:1065 ../win32/gui/WndMain.c:1301
msgid "Cancel"
msgstr "Mégsem"
@@ -2436,8 +2477,8 @@ msgid "Enabled"
msgstr "Bekapcsolva"
#: ../win32/gui/CheatDlg.c:282 ../win32/gui/CheatDlg.c:311
-msgid "PCSX Cheat Code Files"
-msgstr "PCSX csalás kód fájlok"
+msgid "PCSXR Cheat Code Files"
+msgstr "PCSXR csalás kód fájlok"
#: ../win32/gui/CheatDlg.c:402
msgid "Equal Value"
@@ -2532,151 +2573,151 @@ msgstr "Decimális"
msgid "Hexadecimal"
msgstr "Hexadecimális"
-#: ../win32/gui/ConfigurePlugins.c:219
+#: ../win32/gui/ConfigurePlugins.c:221
msgid "Simulate Psx Bios"
msgstr "PSX BIOS szimulálása"
-#: ../win32/gui/ConfigurePlugins.c:305
+#: ../win32/gui/ConfigurePlugins.c:307
msgid "Configuration not OK!"
msgstr "Nem megfelelő beállítás!"
-#: ../win32/gui/ConfigurePlugins.c:406
+#: ../win32/gui/ConfigurePlugins.c:408
msgid "This plugin reports that should work correctly"
msgstr "Ez a plugin megfelelően fog működni"
-#: ../win32/gui/ConfigurePlugins.c:407
+#: ../win32/gui/ConfigurePlugins.c:409
msgid "This plugin reports that should not work correctly"
msgstr "Ez a plugin nem fog megfelelően működni"
-#: ../win32/gui/ConfigurePlugins.c:463
+#: ../win32/gui/ConfigurePlugins.c:465
msgid "Select Plugins Directory"
msgstr "Plugin könyvtár megadása"
-#: ../win32/gui/ConfigurePlugins.c:472
+#: ../win32/gui/ConfigurePlugins.c:474
msgid "Select Bios Directory"
msgstr "BIOS könyvtár megadása"
-#: ../win32/gui/ConfigurePlugins.c:481
+#: ../win32/gui/ConfigurePlugins.c:483
msgid "Configuration"
msgstr "Beállítás"
-#: ../win32/gui/ConfigurePlugins.c:485
+#: ../win32/gui/ConfigurePlugins.c:487
msgid "Graphics"
msgstr "Kép"
-#: ../win32/gui/ConfigurePlugins.c:486
+#: ../win32/gui/ConfigurePlugins.c:488
msgid "First Controller"
msgstr "Egyes irányító"
-#: ../win32/gui/ConfigurePlugins.c:487
+#: ../win32/gui/ConfigurePlugins.c:489
msgid "Second Controller"
msgstr "Kettes irányító"
-#: ../win32/gui/ConfigurePlugins.c:488
+#: ../win32/gui/ConfigurePlugins.c:490
msgid "Sound"
msgstr "Hang"
-#: ../win32/gui/ConfigurePlugins.c:489
+#: ../win32/gui/ConfigurePlugins.c:491
msgid "Cdrom"
msgstr "CD-ROM"
-#: ../win32/gui/ConfigurePlugins.c:490
+#: ../win32/gui/ConfigurePlugins.c:492
msgid "Bios"
msgstr "BIOS"
-#: ../win32/gui/ConfigurePlugins.c:491
+#: ../win32/gui/ConfigurePlugins.c:493
msgid "Set Bios Directory"
msgstr "BIOS könyvtára"
-#: ../win32/gui/ConfigurePlugins.c:492
+#: ../win32/gui/ConfigurePlugins.c:494
msgid "Set Plugins Directory"
msgstr "Pluginok könyvtára"
-#: ../win32/gui/ConfigurePlugins.c:493 ../win32/gui/ConfigurePlugins.c:496
-#: ../win32/gui/ConfigurePlugins.c:499 ../win32/gui/ConfigurePlugins.c:502
-#: ../win32/gui/ConfigurePlugins.c:505 ../win32/gui/ConfigurePlugins.c:617
+#: ../win32/gui/ConfigurePlugins.c:495 ../win32/gui/ConfigurePlugins.c:498
+#: ../win32/gui/ConfigurePlugins.c:501 ../win32/gui/ConfigurePlugins.c:504
+#: ../win32/gui/ConfigurePlugins.c:507 ../win32/gui/ConfigurePlugins.c:619
msgid "Configure..."
msgstr "Beállítás..."
-#: ../win32/gui/ConfigurePlugins.c:494 ../win32/gui/ConfigurePlugins.c:497
-#: ../win32/gui/ConfigurePlugins.c:500 ../win32/gui/ConfigurePlugins.c:503
-#: ../win32/gui/ConfigurePlugins.c:506 ../win32/gui/ConfigurePlugins.c:618
+#: ../win32/gui/ConfigurePlugins.c:496 ../win32/gui/ConfigurePlugins.c:499
+#: ../win32/gui/ConfigurePlugins.c:502 ../win32/gui/ConfigurePlugins.c:505
+#: ../win32/gui/ConfigurePlugins.c:508 ../win32/gui/ConfigurePlugins.c:620
msgid "Test..."
msgstr "Tesztelés..."
-#: ../win32/gui/ConfigurePlugins.c:495 ../win32/gui/ConfigurePlugins.c:498
-#: ../win32/gui/ConfigurePlugins.c:501 ../win32/gui/ConfigurePlugins.c:504
-#: ../win32/gui/ConfigurePlugins.c:507 ../win32/gui/ConfigurePlugins.c:619
+#: ../win32/gui/ConfigurePlugins.c:497 ../win32/gui/ConfigurePlugins.c:500
+#: ../win32/gui/ConfigurePlugins.c:503 ../win32/gui/ConfigurePlugins.c:506
+#: ../win32/gui/ConfigurePlugins.c:509 ../win32/gui/ConfigurePlugins.c:621
msgid "About..."
msgstr "Névjegy..."
-#: ../win32/gui/ConfigurePlugins.c:612
+#: ../win32/gui/ConfigurePlugins.c:614
msgid "NetPlay Configuration"
msgstr "Internetes játék beállítása"
-#: ../win32/gui/ConfigurePlugins.c:620
+#: ../win32/gui/ConfigurePlugins.c:622
msgid ""
"Note: The NetPlay Plugin Directory should be the same as the other Plugins."
msgstr ""
"Megjegyzés: A NetPlay plugin könyvtár azonos a többi plugin könyvtárával."
-#: ../win32/gui/plugin.c:94 ../win32/gui/WndMain.c:323
+#: ../win32/gui/plugin.c:94 ../win32/gui/WndMain.c:328
#, c-format
-msgid "*PCSX*: Saved State %d"
-msgstr "*PCSX*: Elmentett állás %d"
+msgid "*PCSXR*: Saved State %d"
+msgstr "*PCSXR*: Elmentett állás %d"
-#: ../win32/gui/plugin.c:95 ../win32/gui/WndMain.c:324
+#: ../win32/gui/plugin.c:95 ../win32/gui/WndMain.c:329
#, c-format
-msgid "*PCSX*: Error Saving State %d"
-msgstr "*PCSX*: Hiba az állás mentése közben %d"
+msgid "*PCSXR*: Error Saving State %d"
+msgstr "*PCSXR*: Hiba az állás mentése közben %d"
-#: ../win32/gui/plugin.c:111 ../win32/gui/WndMain.c:301
+#: ../win32/gui/plugin.c:111 ../win32/gui/WndMain.c:306
#, c-format
-msgid "*PCSX*: Loaded State %d"
-msgstr "*PCSX*: Betöltött elmentett állás %d"
+msgid "*PCSXR*: Loaded State %d"
+msgstr "*PCSXR*: Betöltött elmentett állás %d"
-#: ../win32/gui/plugin.c:112 ../win32/gui/WndMain.c:302
+#: ../win32/gui/plugin.c:112 ../win32/gui/WndMain.c:307
#, c-format
-msgid "*PCSX*: Error Loading State %d"
-msgstr "*PCSX*: Hiba a mentett állás betöltése közben %d"
+msgid "*PCSXR*: Error Loading State %d"
+msgstr "*PCSXR*: Hiba a mentett állás betöltése közben %d"
#: ../win32/gui/plugin.c:123
#, c-format
-msgid "*PCSX*: Sio Irq Always Enabled"
-msgstr "*PCSX*: Sio IRQ mindig bekapcsolva"
+msgid "*PCSXR*: Sio Irq Always Enabled"
+msgstr "*PCSXR*: Sio IRQ mindig bekapcsolva"
#: ../win32/gui/plugin.c:124
#, c-format
-msgid "*PCSX*: Sio Irq Not Always Enabled"
-msgstr "*PCSX*: Sio IRQ nincs mindig bekapcsolva"
+msgid "*PCSXR*: Sio Irq Not Always Enabled"
+msgstr "*PCSXR*: Sio IRQ nincs mindig bekapcsolva"
#: ../win32/gui/plugin.c:131
#, c-format
-msgid "*PCSX*: Black&White Mdecs Only Enabled"
-msgstr "*PCSX*: Csak fekete és fehér Mdecs használata"
+msgid "*PCSXR*: Black&White Mdecs Only Enabled"
+msgstr "*PCSXR*: Csak fekete és fehér Mdecs használata"
#: ../win32/gui/plugin.c:132
#, c-format
-msgid "*PCSX*: Black&White Mdecs Only Disabled"
-msgstr "*PCSX*: Csak fekete és fehér Mdecs nincs használva"
+msgid "*PCSXR*: Black&White Mdecs Only Disabled"
+msgstr "*PCSXR*: Csak fekete és fehér Mdecs nincs használva"
#: ../win32/gui/plugin.c:139
#, c-format
-msgid "*PCSX*: Xa Enabled"
-msgstr "*PCSX*: Xa bekapcsolva"
+msgid "*PCSXR*: Xa Enabled"
+msgstr "*PCSXR*: Xa bekapcsolva"
#: ../win32/gui/plugin.c:140
#, c-format
-msgid "*PCSX*: Xa Disabled"
-msgstr "*PCSX*: Xa kikapcsolva"
+msgid "*PCSXR*: Xa Disabled"
+msgstr "*PCSXR*: Xa kikapcsolva"
#: ../win32/gui/plugin.c:149
-msgid "*PCSX*: CdRom Case Opened"
-msgstr "*PCSX*: CD-ROM tálca nyitva"
+msgid "*PCSXR*: CdRom Case Opened"
+msgstr "*PCSXR*: CD-ROM tálca nyitva"
#: ../win32/gui/plugin.c:155
-msgid "*PCSX*: CdRom Case Closed"
-msgstr "*PCSX*: CD-ROM tálca zárva"
+msgid "*PCSXR*: CdRom Case Closed"
+msgstr "*PCSXR*: CD-ROM tálca zárva"
#: ../win32/gui/plugin.c:183
msgid "Connecting..."
@@ -2769,8 +2810,8 @@ msgstr "Német"
msgid "Greek"
msgstr "Görög"
-#: ../win32/gui/WndMain.c:81 ../win32/gui/WndMain.c:1659
-#: ../win32/gui/WndMain.c:1661
+#: ../win32/gui/WndMain.c:81 ../win32/gui/WndMain.c:1667
+#: ../win32/gui/WndMain.c:1669
msgid "English"
msgstr "Angol"
@@ -2821,7 +2862,7 @@ msgstr "Koreai"
#: ../win32/gui/WndMain.c:215
#, fuzzy
msgid ""
-"Usage: pcsx [options]\n"
+"Usage: pcsxr [options]\n"
"\toptions:\n"
"\t-nogui\t\tDon't open the GUI\n"
"\t-psxout\t\tEnable PSX output\n"
@@ -2830,7 +2871,7 @@ msgid ""
"\t-cdfile FILE\tRuns a CD image file (requires -nogui)\n"
"\t-help\t\tDisplay this message"
msgstr ""
-"Használat: pcsx [beállítások]\n"
+"Használat: pcsxr [beállítások]\n"
"\toptions:\n"
"\t-nogui\t\tNe nyíljon meg a GUI\n"
"\t-psxout\t\tPSX kimenet bekapcsolása\n"
@@ -2838,327 +2879,398 @@ msgstr ""
"\t-cdfile FILE\tCD képfájl futtatása (-nogui szükséges)\n"
"\t-help\t\tAz üzenet megjelenítése"
-#: ../win32/gui/WndMain.c:342 ../win32/gui/WndMain.c:388
-msgid "PCSX State Format"
-msgstr "PCSX állás mentés formátum"
+#: ../win32/gui/WndMain.c:347 ../win32/gui/WndMain.c:393
+msgid "PCSXR State Format"
+msgstr "PCSXR állás mentés formátum"
-#: ../win32/gui/WndMain.c:369
+#: ../win32/gui/WndMain.c:374
#, c-format
-msgid "*PCSX*: Loaded State %s"
-msgstr "*PCSX*: Betöltött állás %s"
+msgid "*PCSXR*: Loaded State %s"
+msgstr "*PCSXR*: Betöltött állás %s"
-#: ../win32/gui/WndMain.c:370
+#: ../win32/gui/WndMain.c:375
#, c-format
-msgid "*PCSX*: Error Loading State %s"
-msgstr "*PCSX*: Hiba a mentett állás betöltése közben %s"
+msgid "*PCSXR*: Error Loading State %s"
+msgstr "*PCSXR*: Hiba a mentett állás betöltése közben %s"
-#: ../win32/gui/WndMain.c:415
+#: ../win32/gui/WndMain.c:420
#, c-format
-msgid "*PCSX*: Saved State %s"
-msgstr "*PCSX*: Mentett állás %s"
+msgid "*PCSXR*: Saved State %s"
+msgstr "*PCSXR*: Mentett állás %s"
-#: ../win32/gui/WndMain.c:416
+#: ../win32/gui/WndMain.c:421
#, c-format
-msgid "*PCSX*: Error Saving State %s"
-msgstr "*PCSX*: Hiba az állás mentése közben %s"
+msgid "*PCSXR*: Error Saving State %s"
+msgstr "*PCSXR*: Hiba az állás mentése közben %s"
-#: ../win32/gui/WndMain.c:484
+#: ../win32/gui/WndMain.c:489
msgid "Running BIOS is not supported with Internal HLE Bios."
msgstr "BIOS használata nem támogatott belső HLE Bios esetén."
-#: ../win32/gui/WndMain.c:761
+#: ../win32/gui/WndMain.c:766
msgid "Game ID"
msgstr "Játék azonosító"
-#: ../win32/gui/WndMain.c:767
+#: ../win32/gui/WndMain.c:772
msgid "Game"
msgstr "Játék"
-#: ../win32/gui/WndMain.c:949
+#: ../win32/gui/WndMain.c:954
msgid "mid link block"
msgstr "mid link block"
-#: ../win32/gui/WndMain.c:952
+#: ../win32/gui/WndMain.c:957
msgid "terminiting link block"
msgstr "link block megszakítása"
-#: ../win32/gui/WndMain.c:1057
+#: ../win32/gui/WndMain.c:1062
msgid "Memcard Manager"
msgstr "Memória kártya kezelő"
-#: ../win32/gui/WndMain.c:1061 ../win32/gui/WndMain.c:1064
+#: ../win32/gui/WndMain.c:1066 ../win32/gui/WndMain.c:1069
msgid "Select Mcd"
msgstr "Választás"
-#: ../win32/gui/WndMain.c:1062 ../win32/gui/WndMain.c:1065
+#: ../win32/gui/WndMain.c:1067 ../win32/gui/WndMain.c:1070
msgid "Format Mcd"
msgstr "Formázás"
-#: ../win32/gui/WndMain.c:1063 ../win32/gui/WndMain.c:1066
+#: ../win32/gui/WndMain.c:1068 ../win32/gui/WndMain.c:1071
msgid "Reload Mcd"
msgstr "Újratöltés"
-#: ../win32/gui/WndMain.c:1067
+#: ../win32/gui/WndMain.c:1072
msgid "-> Copy ->"
msgstr "-> Másolás ->"
-#: ../win32/gui/WndMain.c:1068
+#: ../win32/gui/WndMain.c:1073
msgid "<- Copy <-"
msgstr "<- Másolás <-"
-#: ../win32/gui/WndMain.c:1069
+#: ../win32/gui/WndMain.c:1074
msgid "Paste"
msgstr "Beszúrás"
-#: ../win32/gui/WndMain.c:1070
+#: ../win32/gui/WndMain.c:1075
msgid "<- Un/Delete"
msgstr "<- Nem/törlés"
-#: ../win32/gui/WndMain.c:1071
+#: ../win32/gui/WndMain.c:1076
msgid "Un/Delete ->"
msgstr "Nem/törlés ->"
-#: ../win32/gui/WndMain.c:1073
+#: ../win32/gui/WndMain.c:1078
msgid "Memory Card 1"
msgstr "Memória kártya 1"
-#: ../win32/gui/WndMain.c:1074
+#: ../win32/gui/WndMain.c:1079
msgid "Memory Card 2"
msgstr "Memória kártya 2"
-#: ../win32/gui/WndMain.c:1129
+#: ../win32/gui/WndMain.c:1134
msgid "Are you sure you want to paste this selection?"
msgstr "Valóban be akarod szúrni a kijelölést?"
-#: ../win32/gui/WndMain.c:1129 ../win32/gui/WndMain.c:1240
-#: ../win32/gui/WndMain.c:1247
+#: ../win32/gui/WndMain.c:1134 ../win32/gui/WndMain.c:1245
+#: ../win32/gui/WndMain.c:1252
msgid "Confirmation"
msgstr "Megerősítés"
-#: ../win32/gui/WndMain.c:1240 ../win32/gui/WndMain.c:1247
+#: ../win32/gui/WndMain.c:1245 ../win32/gui/WndMain.c:1252
msgid "Are you sure you want to format this Memory Card?"
msgstr "Valóban le kívánod formázni ezt a Memória kártyát?"
-#: ../win32/gui/WndMain.c:1293
+#: ../win32/gui/WndMain.c:1298
msgid "Cpu Config"
msgstr "Processzor beállítás"
-#: ../win32/gui/WndMain.c:1298
+#: ../win32/gui/WndMain.c:1303
msgid "Disable Xa Decoding"
msgstr "Xa kódolás kikapcsolása"
-#: ../win32/gui/WndMain.c:1299
+#: ../win32/gui/WndMain.c:1304
msgid "Sio Irq Always Enabled"
msgstr "Sio IRQ mindig bekapcsolva"
-#: ../win32/gui/WndMain.c:1300
+#: ../win32/gui/WndMain.c:1305
msgid "Black && White Movies"
msgstr "Fekete &fehér videók"
-#: ../win32/gui/WndMain.c:1301
+#: ../win32/gui/WndMain.c:1306
msgid "Disable Cd audio"
msgstr "CD hang kikapcsolása"
-#: ../win32/gui/WndMain.c:1303
+#: ../win32/gui/WndMain.c:1309
msgid "Enable Interpreter Cpu"
msgstr "Processzor interpretáló rutin bekapcsolása"
-#: ../win32/gui/WndMain.c:1306
+#: ../win32/gui/WndMain.c:1312
msgid "Spu Irq Always Enabled"
msgstr "Hang IRQ mindig bekapcsolva"
-#: ../win32/gui/WndMain.c:1311
+#: ../win32/gui/WndMain.c:1317
msgid "Psx System Type"
msgstr "PSX régió"
-#: ../win32/gui/WndMain.c:1415
+#: ../win32/gui/WndMain.c:1423
msgid "Psx Mcd Format (*.mcr;*.mc;*.mem;*.vgs;*.mcd;*.gme;*.ddf)"
msgstr "Psx memória kártya formátum (*.mcr;*.mc;*.mem;*.vgs;*.mcd;*.gme;*.ddf)"
-#: ../win32/gui/WndMain.c:1420
+#: ../win32/gui/WndMain.c:1428
msgid "Psx Memory Card (*.mcr;*.mc)"
msgstr "Psx memória kártya (*.mcr;*.mc)"
-#: ../win32/gui/WndMain.c:1425
+#: ../win32/gui/WndMain.c:1433
msgid "CVGS Memory Card (*.mem;*.vgs)"
msgstr "CVSG memória kártya (*.mem;*.vgs)"
-#: ../win32/gui/WndMain.c:1430
+#: ../win32/gui/WndMain.c:1438
msgid "Bleem Memory Card (*.mcd)"
msgstr "Bleem memória kártya (*.mcd)"
-#: ../win32/gui/WndMain.c:1435
+#: ../win32/gui/WndMain.c:1443
msgid "DexDrive Memory Card (*.gme)"
msgstr "DexDrive memória kártya (*.gme)"
-#: ../win32/gui/WndMain.c:1440
+#: ../win32/gui/WndMain.c:1448
msgid "DataDeck Memory Card (*.ddf)"
msgstr "DataDeck memória kártya (*.ddf)"
-#: ../win32/gui/WndMain.c:1484
+#: ../win32/gui/WndMain.c:1492
msgid "Psx Exe Format"
msgstr "Psx exe formátum"
-#: ../win32/gui/WndMain.c:1521
+#: ../win32/gui/WndMain.c:1529
msgid "Psx Isos (*.iso;*.mdf;*.img;*.bin)"
msgstr "Psx képfájlok (*.iso;*.mdf;*.img;*.bin)"
-#: ../win32/gui/WndMain.c:1597
+#: ../win32/gui/WndMain.c:1605
msgid "&File"
msgstr "&Fájl"
-#: ../win32/gui/WndMain.c:1598
+#: ../win32/gui/WndMain.c:1606
msgid "E&xit"
msgstr "K&ilépés"
-#: ../win32/gui/WndMain.c:1600
+#: ../win32/gui/WndMain.c:1608
msgid "Run &EXE..."
msgstr "&EXE indítása..."
-#: ../win32/gui/WndMain.c:1601
+#: ../win32/gui/WndMain.c:1609
msgid "Run &BIOS"
msgstr "&BIOS indítása"
-#: ../win32/gui/WndMain.c:1602
+#: ../win32/gui/WndMain.c:1610
msgid "Run &ISO..."
msgstr "&ISO megnyitása..."
-#: ../win32/gui/WndMain.c:1603
+#: ../win32/gui/WndMain.c:1611
msgid "Run &CD"
msgstr "&CD indítása"
-#: ../win32/gui/WndMain.c:1605
+#: ../win32/gui/WndMain.c:1613
msgid "&Emulator"
msgstr "&Emulátor"
-#: ../win32/gui/WndMain.c:1606
+#: ../win32/gui/WndMain.c:1614
msgid "&States"
msgstr "&Állapot"
-#: ../win32/gui/WndMain.c:1608
+#: ../win32/gui/WndMain.c:1616
msgid "S&witch ISO..."
msgstr "ISO v&áltás..."
-#: ../win32/gui/WndMain.c:1610
+#: ../win32/gui/WndMain.c:1618
msgid "Re&set"
msgstr "Al&apra állítás"
-#: ../win32/gui/WndMain.c:1611
+#: ../win32/gui/WndMain.c:1619
msgid "&Run"
msgstr "&Indítás"
-#: ../win32/gui/WndMain.c:1612
+#: ../win32/gui/WndMain.c:1620
msgid "&Save"
msgstr "&Mentés"
-#: ../win32/gui/WndMain.c:1613
+#: ../win32/gui/WndMain.c:1621
msgid "&Load"
msgstr "&Betöltés"
-#: ../win32/gui/WndMain.c:1614 ../win32/gui/WndMain.c:1624
+#: ../win32/gui/WndMain.c:1622 ../win32/gui/WndMain.c:1632
msgid "&Other..."
msgstr "&Más..."
-#: ../win32/gui/WndMain.c:1615 ../win32/gui/WndMain.c:1625
+#: ../win32/gui/WndMain.c:1623 ../win32/gui/WndMain.c:1633
msgid "Slot &9"
msgstr "&Kilencedik hely"
-#: ../win32/gui/WndMain.c:1616 ../win32/gui/WndMain.c:1626
+#: ../win32/gui/WndMain.c:1624 ../win32/gui/WndMain.c:1634
msgid "Slot &8"
msgstr "&Nyolcadik hely"
-#: ../win32/gui/WndMain.c:1617 ../win32/gui/WndMain.c:1627
+#: ../win32/gui/WndMain.c:1625 ../win32/gui/WndMain.c:1635
msgid "Slot &7"
msgstr "&Hetedik hely"
-#: ../win32/gui/WndMain.c:1618 ../win32/gui/WndMain.c:1628
+#: ../win32/gui/WndMain.c:1626 ../win32/gui/WndMain.c:1636
msgid "Slot &6"
msgstr "&Hatodik hely"
-#: ../win32/gui/WndMain.c:1619 ../win32/gui/WndMain.c:1629
+#: ../win32/gui/WndMain.c:1627 ../win32/gui/WndMain.c:1637
msgid "Slot &5"
msgstr "&Ötödik hely"
-#: ../win32/gui/WndMain.c:1620 ../win32/gui/WndMain.c:1630
+#: ../win32/gui/WndMain.c:1628 ../win32/gui/WndMain.c:1638
msgid "Slot &4"
msgstr "&Negyedik hely"
-#: ../win32/gui/WndMain.c:1621 ../win32/gui/WndMain.c:1631
+#: ../win32/gui/WndMain.c:1629 ../win32/gui/WndMain.c:1639
msgid "Slot &3"
msgstr "&Harmadik hely"
-#: ../win32/gui/WndMain.c:1622 ../win32/gui/WndMain.c:1632
+#: ../win32/gui/WndMain.c:1630 ../win32/gui/WndMain.c:1640
msgid "Slot &2"
msgstr "&Második hely"
-#: ../win32/gui/WndMain.c:1623 ../win32/gui/WndMain.c:1633
+#: ../win32/gui/WndMain.c:1631 ../win32/gui/WndMain.c:1641
msgid "Slot &1"
msgstr "&Első hely"
-#: ../win32/gui/WndMain.c:1635
+#: ../win32/gui/WndMain.c:1643
msgid "&Configuration"
msgstr "&Beállítások"
-#: ../win32/gui/WndMain.c:1636
+#: ../win32/gui/WndMain.c:1644
msgid "Cheat &Search..."
msgstr "Csalás &keresése..."
-#: ../win32/gui/WndMain.c:1637
+#: ../win32/gui/WndMain.c:1645
msgid "Ch&eat Code..."
msgstr "Cs&alás kód..."
-#: ../win32/gui/WndMain.c:1640
+#: ../win32/gui/WndMain.c:1648
msgid "&Language"
msgstr "&Nyelv"
-#: ../win32/gui/WndMain.c:1665
+#: ../win32/gui/WndMain.c:1673
msgid "&Memory cards..."
msgstr "&Memória kártyák..."
-#: ../win32/gui/WndMain.c:1666
+#: ../win32/gui/WndMain.c:1674
msgid "C&PU..."
msgstr "P&rocesszor..."
-#: ../win32/gui/WndMain.c:1668
+#: ../win32/gui/WndMain.c:1676
msgid "&NetPlay..."
msgstr "&Internetes játék..."
-#: ../win32/gui/WndMain.c:1670
+#: ../win32/gui/WndMain.c:1678
msgid "&Controllers..."
msgstr "&Irányítók..."
-#: ../win32/gui/WndMain.c:1671
+#: ../win32/gui/WndMain.c:1679
msgid "CD-&ROM..."
msgstr "CD-&ROM..."
-#: ../win32/gui/WndMain.c:1672
+#: ../win32/gui/WndMain.c:1680
msgid "&Sound..."
msgstr "&Hang..."
-#: ../win32/gui/WndMain.c:1673
+#: ../win32/gui/WndMain.c:1681
msgid "&Graphics..."
msgstr "&Kép..."
-#: ../win32/gui/WndMain.c:1675
+#: ../win32/gui/WndMain.c:1683
msgid "&Plugins && Bios..."
msgstr "&Pluginok és BIOS..."
-#: ../win32/gui/WndMain.c:1677
+#: ../win32/gui/WndMain.c:1685
msgid "&Help"
msgstr "&Súgó"
-#: ../win32/gui/WndMain.c:1678
+#: ../win32/gui/WndMain.c:1686
msgid "&About..."
msgstr "&A program névjegye..."
-#: ../win32/gui/WndMain.c:1866
-msgid "Pcsx Msg"
-msgstr "Pcsx üzenet"
+#: ../win32/gui/WndMain.c:1874
+msgid "Pcsxr Msg"
+msgstr "Pcsxr üzenet"
-#: ../win32/gui/WndMain.c:1869
+#: ../win32/gui/WndMain.c:1877
msgid "Error Loading Symbol"
msgstr "Hiba a szimbólum betöltése közben"
+#~ msgid "<b>General</b>"
+#~ msgstr "<b>Általános</b>"
+
+#~ msgid "<b>XA Music</b>"
+#~ msgstr "<b>XA zene</b>"
+
+#~ msgid ""
+#~ "None\n"
+#~ "Low\n"
+#~ "Medium\n"
+#~ "Loud\n"
+#~ "Loudest"
+#~ msgstr ""
+#~ "Nincs\n"
+#~ "Halk\n"
+#~ "Közepes\n"
+#~ "Hangos\n"
+#~ "Leghangosabb"
+
+#~ msgid ""
+#~ "None\n"
+#~ "Simple\n"
+#~ "Gaussian\n"
+#~ "Cubic"
+#~ msgstr ""
+#~ "Nincs\n"
+#~ "Egyszerű\n"
+#~ "Gauss\n"
+#~ "Köbös"
+
+#~ msgid ""
+#~ "Default\n"
+#~ "125ms\n"
+#~ "250ms\n"
+#~ "500ms\n"
+#~ "1s\n"
+#~ "2s\n"
+#~ "4s\n"
+#~ "8s\n"
+#~ "16s\n"
+#~ "32s\n"
+#~ "1min\n"
+#~ "2min\n"
+#~ "4min\n"
+#~ "8min\n"
+#~ "16min\n"
+#~ "32min"
+#~ msgstr ""
+#~ "Alapérték\n"
+#~ "125 ms\n"
+#~ "250 ms\n"
+#~ "500 ms\n"
+#~ "1 s\n"
+#~ "2 s\n"
+#~ "4 s\n"
+#~ "8 s\n"
+#~ "16 s\n"
+#~ "32 s\n"
+#~ "1 perc\n"
+#~ "2 perc\n"
+#~ "4 perc\n"
+#~ "8 perc\n"
+#~ "16 perc\n"
+#~ "32 perc"
+
+#~ msgid "Select CD-ROM device"
+#~ msgstr "Válassz CD-ROM eszközt"
+
+#~ msgid "hseparator"
+#~ msgstr "hseparator"
+
#, fuzzy
#~ msgid "COFF files not supported.\n"
#~ msgstr "File COFF non supportato.\n"
@@ -3201,12 +3313,12 @@ msgstr "Hiba a szimbólum betöltése közben"
#~ msgstr "&Memory card..."
#~ msgid ""
-#~ "(C) 1999-2003 PCSX Team\n"
+#~ "(C) 1999-2003 PCSX Team\n"
#~ "(C) 2005-2006 Ryan Schultz\n"
#~ "(C) 2005-2006 Andrew Burton\n"
#~ "(C) 2008-2009 Wei Mingzhi"
#~ msgstr ""
-#~ "(C) 1999-2003 PCSX Team\n"
+#~ "(C) 1999-2003 PCSX Team\n"
#~ "(C) 2005-2006 Ryan Schultz\n"
#~ "(C) 2005-2006 Andrew Burton\n"
#~ "(C) 2008-2009 Wei Mingzhi"
diff --git a/po/it.po b/po/it.po
index e24e8f53..fec93242 100644
--- a/po/it.po
+++ b/po/it.po
@@ -1,22 +1,26 @@
-# Italian translation of pcsxr
-# Copyright (C) 2010 Giovanni Scafora
-# This file is distributed under the same license as the pcsxr package.
-# Giovanni Scafora <giovanni@archlinux.org>, 2010.
-#
+# Italian translation of pcsxr
+# Copyright (C) 2010 Giovanni Scafora
+# This file is distributed under the same license as the pcsxr package.
+#
+# Giovanni Scafora <giovanni@archlinux.org>, 2010.
+# Blade_Arma <edgbla@yandex.ru>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: pcsxr 1.0\n"
"Report-Msgid-Bugs-To: whistler_wmz@users.sf.net\n"
-"POT-Creation-Date: 2011-02-18 17:11+0800\n"
-"PO-Revision-Date: 2010-03-15 16:00+0200\n"
-"Last-Translator: Giovanni Scafora <giovanni@archlinux.org>\n"
-"Language-Team: Arch Linux Italian Team <giovanni@archlinux.org>\n"
+"POT-Creation-Date: 2011-06-04 23:04+0400\n"
+"PO-Revision-Date: 2011-06-04 13:45+0400\n"
+"Last-Translator: Blade_Arma <edgbla@yandex.ru>\n"
+"Language-Team: Russian <kde-i18n-doc@kde.org>\n"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 1.2\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: ../data/pcsx.glade2.h:1
+#: ../data/pcsxr.glade2.h:1
msgid ""
"8-bit\n"
"16-bit\n"
@@ -26,144 +30,144 @@ msgstr ""
"16-bit\n"
"32-bit"
-#: ../data/pcsx.glade2.h:4
+#: ../data/pcsxr.glade2.h:4
msgid "<b>BIOS</b>"
msgstr "<b>BIOS</b>"
-#: ../data/pcsx.glade2.h:5
+#: ../data/pcsxr.glade2.h:5
msgid "<b>Cheat Codes</b>"
msgstr "<b>Codici cheat</b>"
-#: ../data/pcsx.glade2.h:6
+#: ../data/pcsxr.glade2.h:6
msgid "<b>Cheat Search</b>"
msgstr "<b>Cerca cheat</b>"
-#: ../data/pcsx.glade2.h:7
+#: ../data/pcsxr.glade2.h:7
msgid "<b>Memory Card 1</b>"
msgstr "<b>Memory card 1</b>"
-#: ../data/pcsx.glade2.h:8
+#: ../data/pcsxr.glade2.h:8
msgid "<b>Memory Card 2</b>"
msgstr "<b>Memory card 2</b>"
-#: ../data/pcsx.glade2.h:9
+#: ../data/pcsxr.glade2.h:9
msgid "<b>NetPlay</b>"
msgstr "<b>NetPlay</b>"
-#: ../data/pcsx.glade2.h:10
+#: ../data/pcsxr.glade2.h:10
msgid "<b>Options</b>"
msgstr "<b>Opzioni</b>"
-#: ../data/pcsx.glade2.h:11
+#: ../data/pcsxr.glade2.h:11
msgid "<b>Plugins</b>"
msgstr "<b>Plugin</b>"
-#: ../data/pcsx.glade2.h:12
+#: ../data/pcsxr.glade2.h:12
msgid "<b>System Type</b>"
msgstr "<b>Regione del sistema</b>"
-#: ../data/pcsx.glade2.h:13 ../gui/DebugMemory.c:188
+#: ../data/pcsxr.glade2.h:13 ../gui/DebugMemory.c:188
#, fuzzy
msgid "Address (Hexadecimal):"
msgstr "Esadecimale"
-#: ../data/pcsx.glade2.h:14 ../win32/gui/WndMain.c:1302
+#: ../data/pcsxr.glade2.h:14 ../win32/gui/WndMain.c:1308
msgid "Autodetect"
msgstr "Rileva automaticamente"
-#: ../data/pcsx.glade2.h:15
+#: ../data/pcsxr.glade2.h:15
msgid "Black & White Movies"
msgstr "Filmati in bianco e nero"
-#: ../data/pcsx.glade2.h:16
+#: ../data/pcsxr.glade2.h:16
msgid "CD-ROM..."
msgstr "CD-ROM..."
-#: ../data/pcsx.glade2.h:17
+#: ../data/pcsxr.glade2.h:17
msgid "CD-ROM:"
msgstr "CD-ROM:"
-#: ../data/pcsx.glade2.h:18
+#: ../data/pcsxr.glade2.h:18
msgid "CD-_ROM..."
msgstr "CD-_ROM..."
-#: ../data/pcsx.glade2.h:19
+#: ../data/pcsxr.glade2.h:19
msgid "C_ontrollers..."
msgstr "C_ontroller..."
-#: ../data/pcsx.glade2.h:20
+#: ../data/pcsxr.glade2.h:20
msgid "Chea_t"
msgstr "Chea_t"
-#: ../data/pcsx.glade2.h:21 ../gui/Cheat.c:1129 ../win32/gui/CheatDlg.c:678
+#: ../data/pcsxr.glade2.h:21 ../gui/Cheat.c:1129 ../win32/gui/CheatDlg.c:678
msgid "Cheat Search"
msgstr "Cerca cheat"
-#: ../data/pcsx.glade2.h:22
+#: ../data/pcsxr.glade2.h:22
msgid "Configure CD-ROM"
msgstr "Configura il CD-ROM"
-#: ../data/pcsx.glade2.h:23
+#: ../data/pcsxr.glade2.h:23
msgid "Configure CPU"
msgstr "Configura la CPU"
-#: ../data/pcsx.glade2.h:24
+#: ../data/pcsxr.glade2.h:24
msgid "Configure Controllers"
msgstr "Configura i controller"
-#: ../data/pcsx.glade2.h:25
+#: ../data/pcsxr.glade2.h:25
msgid "Configure Graphics"
msgstr "Configura il video"
-#: ../data/pcsx.glade2.h:26
+#: ../data/pcsxr.glade2.h:26
msgid "Configure Memory Cards"
msgstr "Configura la memory card"
-#: ../data/pcsx.glade2.h:27
+#: ../data/pcsxr.glade2.h:27
msgid "Configure NetPlay"
msgstr "Configura il NetPlay"
-#: ../data/pcsx.glade2.h:28 ../gui/ConfDlg.c:112
-msgid "Configure PCSX"
-msgstr "Configura PCSX"
+#: ../data/pcsxr.glade2.h:28 ../gui/ConfDlg.c:112
+msgid "Configure PCSXR"
+msgstr "Configura PCSXR"
-#: ../data/pcsx.glade2.h:29 ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:6
+#: ../data/pcsxr.glade2.h:29 ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:3
msgid "Configure Sound"
msgstr "Configura l'audio"
-#: ../data/pcsx.glade2.h:30
+#: ../data/pcsxr.glade2.h:30
msgid "Continue Emulation"
msgstr "Continua l'emulazione"
-#: ../data/pcsx.glade2.h:31
+#: ../data/pcsxr.glade2.h:31
msgid "Continue..."
msgstr "Continua..."
-#: ../data/pcsx.glade2.h:32
+#: ../data/pcsxr.glade2.h:32
msgid "Controller 1: "
msgstr "Controller 1: "
-#: ../data/pcsx.glade2.h:33
+#: ../data/pcsxr.glade2.h:33
msgid "Controller 2:"
msgstr "Controller 2:"
-#: ../data/pcsx.glade2.h:34
+#: ../data/pcsxr.glade2.h:34
msgid "Controllers..."
msgstr "Controller..."
-#: ../data/pcsx.glade2.h:35
+#: ../data/pcsxr.glade2.h:35
msgid "Copy"
msgstr "Copia"
-#: ../data/pcsx.glade2.h:36 ../win32/gui/CheatDlg.c:683
+#: ../data/pcsxr.glade2.h:36 ../win32/gui/CheatDlg.c:683
msgid "Data Base:"
msgstr "Base di dato:"
-#: ../data/pcsx.glade2.h:37 ../win32/gui/CheatDlg.c:681
+#: ../data/pcsxr.glade2.h:37 ../win32/gui/CheatDlg.c:681
msgid "Data Type:"
msgstr "Tipo di dato:"
-#: ../data/pcsx.glade2.h:38
+#: ../data/pcsxr.glade2.h:38
msgid ""
"Decimal\n"
"Hexadecimal"
@@ -171,35 +175,35 @@ msgstr ""
"Decimale\n"
"Esadecimale"
-#: ../data/pcsx.glade2.h:40
+#: ../data/pcsxr.glade2.h:40
msgid "Disable CD Audio"
msgstr "Disabilita CD audio"
-#: ../data/pcsx.glade2.h:41
+#: ../data/pcsxr.glade2.h:41
msgid "Disable XA Decoding"
msgstr "Disabilita il decoding XA"
-#: ../data/pcsx.glade2.h:42
+#: ../data/pcsxr.glade2.h:42
msgid "E_xit"
msgstr "E_sci"
-#: ../data/pcsx.glade2.h:43 ../win32/gui/CheatDlg.c:166
+#: ../data/pcsxr.glade2.h:43 ../win32/gui/CheatDlg.c:166
msgid "Edit Cheat Codes"
msgstr "Modifica i codici dei cheat"
-#: ../data/pcsx.glade2.h:44 ../win32/gui/WndMain.c:1304
+#: ../data/pcsxr.glade2.h:44 ../win32/gui/WndMain.c:1310
msgid "Enable Console Output"
msgstr "Abilita l'output sulla console"
-#: ../data/pcsx.glade2.h:45 ../win32/gui/WndMain.c:1305
+#: ../data/pcsxr.glade2.h:45 ../win32/gui/WndMain.c:1311
msgid "Enable Debugger"
msgstr "Abilita il debugger"
-#: ../data/pcsx.glade2.h:46
+#: ../data/pcsxr.glade2.h:46
msgid "Enable Interpreter CPU"
msgstr "Abilita l'interprete della CPU"
-#: ../data/pcsx.glade2.h:47
+#: ../data/pcsxr.glade2.h:47
msgid ""
"Equal Value\n"
"Not Equal Value\n"
@@ -221,43 +225,43 @@ msgstr ""
"Differente\n"
"Nessun cambio"
-#: ../data/pcsx.glade2.h:56
+#: ../data/pcsxr.glade2.h:56
msgid "Format"
msgstr "Formatta"
-#: ../data/pcsx.glade2.h:57 ../win32/gui/CheatDlg.c:504
+#: ../data/pcsxr.glade2.h:57 ../win32/gui/CheatDlg.c:504
msgid "Freeze"
msgstr "Blocca"
-#: ../data/pcsx.glade2.h:58
+#: ../data/pcsxr.glade2.h:58
msgid "Graphics..."
msgstr "Video..."
-#: ../data/pcsx.glade2.h:59
+#: ../data/pcsxr.glade2.h:59
msgid "Graphics:"
msgstr "Video:"
-#: ../data/pcsx.glade2.h:60 ../win32/gui/WndMain.c:1308
+#: ../data/pcsxr.glade2.h:60 ../win32/gui/WndMain.c:1314
msgid "InuYasha Sengoku Battle Fix"
msgstr "InuYasha Sengoku Battle Fix"
-#: ../data/pcsx.glade2.h:61
+#: ../data/pcsxr.glade2.h:61
msgid "Memcards..."
msgstr "Memory card..."
-#: ../data/pcsx.glade2.h:62 ../gui/DebugMemory.c:103
+#: ../data/pcsxr.glade2.h:62 ../gui/DebugMemory.c:103
msgid "Memory Dump"
msgstr ""
-#: ../data/pcsx.glade2.h:63
+#: ../data/pcsxr.glade2.h:63
msgid "Memory _Dump"
msgstr ""
-#: ../data/pcsx.glade2.h:64 ../win32/gui/CheatDlg.c:595
+#: ../data/pcsxr.glade2.h:64 ../win32/gui/CheatDlg.c:595
msgid "Modify"
msgstr "Modifica"
-#: ../data/pcsx.glade2.h:65
+#: ../data/pcsxr.glade2.h:65
msgid ""
"NTSC\n"
"PAL"
@@ -265,229 +269,229 @@ msgstr ""
"NTSC\n"
"PAL"
-#: ../data/pcsx.glade2.h:67
+#: ../data/pcsxr.glade2.h:67
msgid "New"
msgstr "Nuovo"
-#: ../data/pcsx.glade2.h:68
-msgid "PCSX"
-msgstr "PCSX"
+#: ../data/pcsxr.glade2.h:68
+msgid "PCSXR"
+msgstr "PCSXR"
-#: ../data/pcsx.glade2.h:69 ../win32/gui/WndMain.c:1307
+#: ../data/pcsxr.glade2.h:69 ../win32/gui/WndMain.c:1313
msgid "Parasite Eve 2, Vandal Hearts 1/2 Fix"
msgstr "Parasite Eve 2, Vandal Hearts 1/2 Fix"
-#: ../data/pcsx.glade2.h:70
+#: ../data/pcsxr.glade2.h:70
msgid "Patch Memory..."
msgstr ""
-#: ../data/pcsx.glade2.h:71
+#: ../data/pcsxr.glade2.h:71
msgid "Raw Dump..."
msgstr ""
-#: ../data/pcsx.glade2.h:72
+#: ../data/pcsxr.glade2.h:72
msgid "Restart"
msgstr "Riavvia"
-#: ../data/pcsx.glade2.h:73
+#: ../data/pcsxr.glade2.h:73
msgid "Run CD"
msgstr "Avvia il CD"
-#: ../data/pcsx.glade2.h:74
+#: ../data/pcsxr.glade2.h:74
msgid "Run ISO Image"
msgstr "Avvia l'immagine ISO"
-#: ../data/pcsx.glade2.h:75
+#: ../data/pcsxr.glade2.h:75
msgid "Run ISO..."
msgstr "Avvia ISO..."
-#: ../data/pcsx.glade2.h:76
+#: ../data/pcsxr.glade2.h:76
msgid "Run _BIOS"
msgstr "Avvia _BIOS"
-#: ../data/pcsx.glade2.h:77
+#: ../data/pcsxr.glade2.h:77
msgid "Run _CD"
msgstr "Avvia _CD"
-#: ../data/pcsx.glade2.h:78
+#: ../data/pcsxr.glade2.h:78
msgid "Run _EXE..."
msgstr "Avvia _EXE..."
-#: ../data/pcsx.glade2.h:79
+#: ../data/pcsxr.glade2.h:79
msgid "Run _ISO..."
msgstr "Avvia _ISO..."
-#: ../data/pcsx.glade2.h:80 ../gui/Plugin.c:239
+#: ../data/pcsxr.glade2.h:80 ../gui/Plugin.c:239
#, c-format
msgid "SIO IRQ Always Enabled"
msgstr "SIO IRQ sempre abilitato"
-#: ../data/pcsx.glade2.h:81
+#: ../data/pcsxr.glade2.h:81
msgid "SPU IRQ Always Enabled"
msgstr "SPU IRQ sempre abilitato"
-#: ../data/pcsx.glade2.h:82
+#: ../data/pcsxr.glade2.h:82
msgid "S_witch ISO..."
msgstr "C_ambia ISO..."
-#: ../data/pcsx.glade2.h:83
+#: ../data/pcsxr.glade2.h:83
msgid "Search"
msgstr "Cerca"
-#: ../data/pcsx.glade2.h:84 ../win32/gui/CheatDlg.c:680
+#: ../data/pcsxr.glade2.h:84 ../win32/gui/CheatDlg.c:680
msgid "Search For:"
msgstr "Cerca per:"
-#: ../data/pcsx.glade2.h:85
+#: ../data/pcsxr.glade2.h:85
msgid "Search in:"
msgstr "Cerca in:"
-#: ../data/pcsx.glade2.h:86
+#: ../data/pcsxr.glade2.h:86
msgid "Select Folder to Search"
msgstr "Seleziona una cartella per la ricerca"
-#: ../data/pcsx.glade2.h:87
+#: ../data/pcsxr.glade2.h:87
msgid "Slot _1"
msgstr "Slot _1"
-#: ../data/pcsx.glade2.h:88
+#: ../data/pcsxr.glade2.h:88
msgid "Slot _2"
msgstr "Slot _2"
-#: ../data/pcsx.glade2.h:89
+#: ../data/pcsxr.glade2.h:89
msgid "Slot _3"
msgstr "Slot _3"
-#: ../data/pcsx.glade2.h:90
+#: ../data/pcsxr.glade2.h:90
msgid "Slot _4"
msgstr "Slot _4"
-#: ../data/pcsx.glade2.h:91
+#: ../data/pcsxr.glade2.h:91
msgid "Slot _5"
msgstr "Slot _5"
-#: ../data/pcsx.glade2.h:92
-#, fuzzy
+#: ../data/pcsxr.glade2.h:92
msgid "Slot _6"
-msgstr "Slot _1"
+msgstr ""
-#: ../data/pcsx.glade2.h:93
-#, fuzzy
+#: ../data/pcsxr.glade2.h:93
msgid "Slot _7"
-msgstr "Slot _1"
+msgstr ""
-#: ../data/pcsx.glade2.h:94
-#, fuzzy
+#: ../data/pcsxr.glade2.h:94
msgid "Slot _8"
-msgstr "Slot _1"
+msgstr ""
-#: ../data/pcsx.glade2.h:95
-#, fuzzy
+#: ../data/pcsxr.glade2.h:95
msgid "Slot _9"
-msgstr "Slot _1"
+msgstr ""
-#: ../data/pcsx.glade2.h:96
+#: ../data/pcsxr.glade2.h:96 ../win32/gui/WndMain.c:1307
+msgid "Slow Boot"
+msgstr ""
+
+#: ../data/pcsxr.glade2.h:97
msgid "Sound..."
msgstr "Audio..."
-#: ../data/pcsx.glade2.h:97
+#: ../data/pcsxr.glade2.h:98
msgid "Sound:"
msgstr "Audio:"
-#: ../data/pcsx.glade2.h:98
+#: ../data/pcsxr.glade2.h:99
msgid "Switch ISO Image"
msgstr "Cambia l'immagine ISO"
-#: ../data/pcsx.glade2.h:99
+#: ../data/pcsxr.glade2.h:100
msgid "Switch ISO..."
msgstr "Cambia ISO..."
-#: ../data/pcsx.glade2.h:100 ../win32/gui/CheatDlg.c:684
+#: ../data/pcsxr.glade2.h:101 ../win32/gui/CheatDlg.c:684
msgid "To:"
msgstr "A:"
-#: ../data/pcsx.glade2.h:101
+#: ../data/pcsxr.glade2.h:102
msgid "Un/Delete"
msgstr "Non/Elimina"
-#: ../data/pcsx.glade2.h:102 ../gui/Cheat.c:647 ../win32/gui/CheatDlg.c:506
+#: ../data/pcsxr.glade2.h:103 ../gui/Cheat.c:647 ../win32/gui/CheatDlg.c:506
#: ../win32/gui/CheatDlg.c:597 ../win32/gui/CheatDlg.c:682
msgid "Value:"
msgstr "Valore:"
-#: ../data/pcsx.glade2.h:103
-msgid "_About PCSX..."
-msgstr "_Informazioni su PCSX..."
+#: ../data/pcsxr.glade2.h:104
+msgid "_About PCSXR..."
+msgstr "_Informazioni su PCSXR..."
-#: ../data/pcsx.glade2.h:104
+#: ../data/pcsxr.glade2.h:105
msgid "_Browse..."
msgstr "_Visualizza..."
-#: ../data/pcsx.glade2.h:105
+#: ../data/pcsxr.glade2.h:106
msgid "_CPU..."
msgstr "_CPU..."
-#: ../data/pcsx.glade2.h:106
+#: ../data/pcsxr.glade2.h:107
msgid "_Configuration"
msgstr "_Configurazione"
-#: ../data/pcsx.glade2.h:107
+#: ../data/pcsxr.glade2.h:108
msgid "_Continue"
msgstr "_Continua"
-#: ../data/pcsx.glade2.h:108
+#: ../data/pcsxr.glade2.h:109
msgid "_Emulator"
msgstr "_Emulatore"
-#: ../data/pcsx.glade2.h:109
+#: ../data/pcsxr.glade2.h:110
msgid "_File"
msgstr "_File"
-#: ../data/pcsx.glade2.h:110
+#: ../data/pcsxr.glade2.h:111
msgid "_Graphics..."
msgstr "_Video..."
-#: ../data/pcsx.glade2.h:111
+#: ../data/pcsxr.glade2.h:112
msgid "_Help"
msgstr "_Aiuto"
-#: ../data/pcsx.glade2.h:112
+#: ../data/pcsxr.glade2.h:113
msgid "_Load State"
msgstr "_Carica stato"
-#: ../data/pcsx.glade2.h:113
+#: ../data/pcsxr.glade2.h:114
msgid "_Memory Cards..."
msgstr "_Memory card..."
-#: ../data/pcsx.glade2.h:114
+#: ../data/pcsxr.glade2.h:115
msgid "_Netplay..."
msgstr "_Netplay..."
-#: ../data/pcsx.glade2.h:115
+#: ../data/pcsxr.glade2.h:116
msgid "_Other..."
msgstr "_Altri..."
-#: ../data/pcsx.glade2.h:116
+#: ../data/pcsxr.glade2.h:117
msgid "_Plugins & BIOS..."
msgstr "_Plugin e BIOS..."
-#: ../data/pcsx.glade2.h:117
+#: ../data/pcsxr.glade2.h:118
msgid "_Reset"
msgstr "_Resetta"
-#: ../data/pcsx.glade2.h:118
+#: ../data/pcsxr.glade2.h:119
msgid "_Save State"
msgstr "_Salva stato"
-#: ../data/pcsx.glade2.h:119
+#: ../data/pcsxr.glade2.h:120
msgid "_Search..."
msgstr "_Cerca..."
-#: ../data/pcsx.glade2.h:120
+#: ../data/pcsxr.glade2.h:121
msgid "_Sound..."
msgstr "_Audio..."
-#: ../data/pcsx.glade2.h:121
+#: ../data/pcsxr.glade2.h:122
msgid "label_resultsfound"
msgstr "etichetta_risultatitrovati"
@@ -495,7 +499,7 @@ msgstr "etichetta_risultatitrovati"
msgid ""
"(C) 1999-2003 PCSX Team\n"
"(C) 2005-2009 PCSX-df Team\n"
-"(C) 2009-2010 PCSX-Reloaded Team"
+"(C) 2009-2011 PCSX-Reloaded Team"
msgstr ""
#: ../gui/AboutDlg.c:77
@@ -553,8 +557,8 @@ msgstr "Descrizione del cheat:"
msgid "Cheat Code:"
msgstr "Codice cheat:"
-#: ../gui/Cheat.c:155 ../gui/Cheat.c:251 ../gui/LnxMain.c:422
-#: ../win32/gui/ConfigurePlugins.c:305
+#: ../gui/Cheat.c:155 ../gui/Cheat.c:251 ../gui/LnxMain.c:421
+#: ../win32/gui/ConfigurePlugins.c:307
msgid "Error"
msgstr "Errore"
@@ -572,11 +576,11 @@ msgid "Open Cheat File"
msgstr "Apri il file del cheat"
#: ../gui/Cheat.c:316 ../gui/Cheat.c:356
-msgid "PCSX Cheat Code Files (*.cht)"
-msgstr "File cheat di PCSX (*.cht)"
+msgid "PCSXR Cheat Code Files (*.cht)"
+msgstr "File cheat di PCSXR (*.cht)"
#: ../gui/Cheat.c:321 ../gui/Gtk2Gui.c:446 ../gui/Gtk2Gui.c:587
-#: ../win32/gui/WndMain.c:1445 ../win32/gui/WndMain.c:1526
+#: ../win32/gui/WndMain.c:1453 ../win32/gui/WndMain.c:1534
msgid "All Files"
msgstr "Tutti i file"
@@ -678,7 +682,7 @@ msgstr "Impossibile aprire la cartella del BIOS: '%s'\n"
msgid "Could not open directory: '%s'\n"
msgstr "Impossibile aprire la cartella: '%s'\n"
-#. The BIOS list always contains the PCSX internal BIOS
+#. The BIOS list always contains the PCSXR internal BIOS
#: ../gui/ConfDlg.c:675
msgid "Simulate PSX BIOS"
msgstr ""
@@ -754,14 +758,14 @@ msgstr "Il file non sembra essere un eseguibile valido della Playstation"
msgid "CD ROM failed"
msgstr "Si è verificato un problema con il CD ROM"
-#: ../gui/Gtk2Gui.c:508 ../gui/Gtk2Gui.c:649 ../win32/gui/WndMain.c:464
-#: ../win32/gui/WndMain.c:516 ../win32/gui/WndMain.c:585
+#: ../gui/Gtk2Gui.c:508 ../gui/Gtk2Gui.c:649 ../win32/gui/WndMain.c:469
+#: ../win32/gui/WndMain.c:521 ../win32/gui/WndMain.c:590
#, c-format
msgid "The CD does not appear to be a valid Playstation CD"
msgstr "Il CD inserito non sembra essere un valido CD della Playstation"
-#: ../gui/Gtk2Gui.c:519 ../gui/Gtk2Gui.c:660 ../win32/gui/WndMain.c:474
-#: ../win32/gui/WndMain.c:526 ../win32/gui/WndMain.c:595
+#: ../gui/Gtk2Gui.c:519 ../gui/Gtk2Gui.c:660 ../win32/gui/WndMain.c:479
+#: ../win32/gui/WndMain.c:531 ../win32/gui/WndMain.c:600
#, c-format
msgid "Could not load CD-ROM!"
msgstr "Impossibile caricare il CD-ROM!"
@@ -819,52 +823,52 @@ msgstr "Avviso"
msgid "Creating memory card: %s\n"
msgstr "Creazione in corso della memory card: %s\n"
-#: ../gui/LnxMain.c:329
+#: ../gui/LnxMain.c:328
#, fuzzy
msgid ""
-" pcsx [options] [file]\n"
+" pcsxr [options] [file]\n"
"\toptions:\n"
"\t-runcd\t\tRuns CD-ROM\n"
"\t-cdfile FILE\tRuns a CD image file\n"
"\t-nogui\t\tDon't open the GTK GUI\n"
-"\t-cfg FILE\tLoads desired configuration file (default: ~/.pcsx/pcsx.cfg)\n"
+"\t-cfg FILE\tLoads desired configuration file (default: ~/.pcsxr/pcsxr.cfg)\n"
"\t-psxout\t\tEnable PSX output\n"
"\t-slowboot\tEnable BIOS Logo\n"
"\t-load STATENUM\tLoads savestate STATENUM (1-9)\n"
"\t-h -help\tDisplay this message\n"
"\tfile\t\tLoads file\n"
msgstr ""
-" pcsx [opzioni] [file]\n"
+" pcsxr [opzioni] [file]\n"
"\topzioni:\n"
"\t-runcd\t\tAvvia il CD-ROM\n"
"\t-cdfile FILE\tAvvia un immagine del CD\n"
"\t-nogui\t\tNon apre la GUI GTK\n"
"\t-cfg FILE\tCarica il file della configurazione desiderata (default: ~/."
-"pcsx/pcsx.cfg)\n"
+"pcsxr/pcsxr.cfg)\n"
"\t-psxout\t\tAbilita l'output della PSX\n"
"\t-load STATENUM\tCarica salvataggio (1-5)\n"
"\t-h -help\tVisualizza questo messaggio\n"
"\tfile\t\tCarica un file\n"
-#: ../gui/LnxMain.c:366
+#: ../gui/LnxMain.c:365
#, c-format
msgid ""
-"PCSX cannot be configured without using the GUI -- you should restart "
+"PCSXR cannot be configured without using the GUI -- you should restart "
"without -nogui.\n"
msgstr ""
-"PCSX non può essere configurato senza una GUI, dovresti riavviare senza "
+"PCSXR non può essere configurato senza una GUI, dovresti riavviare senza "
"l'opzione -nogui.\n"
-#: ../gui/LnxMain.c:422
+#: ../gui/LnxMain.c:421
msgid "Failed loading plugins!"
msgstr "Il caricamento dei plugin non è andato a buon fine!"
-#: ../gui/LnxMain.c:441
+#: ../gui/LnxMain.c:440
#, c-format
msgid "Could not load CD-ROM!\n"
msgstr "Impossibile caricare il CD-ROM!\n"
-#: ../gui/LnxMain.c:472
+#: ../gui/LnxMain.c:471
#, c-format
msgid "PSX emulator couldn't be initialized.\n"
msgstr "Impossibile inizializzare l'emulatore PSX.\n"
@@ -873,11 +877,11 @@ msgstr "Impossibile inizializzare l'emulatore PSX.\n"
msgid "Icon"
msgstr "Icona"
-#: ../gui/MemcardDlg.c:66 ../win32/gui/WndMain.c:749
+#: ../gui/MemcardDlg.c:66 ../win32/gui/WndMain.c:754
msgid "Title"
msgstr "Titolo"
-#: ../gui/MemcardDlg.c:72 ../win32/gui/WndMain.c:755
+#: ../gui/MemcardDlg.c:72 ../win32/gui/WndMain.c:760
msgid "Status"
msgstr "Stato"
@@ -889,17 +893,17 @@ msgstr "ID"
msgid "Name"
msgstr "Nome"
-#: ../gui/MemcardDlg.c:192 ../gui/MemcardDlg.c:297 ../win32/gui/WndMain.c:960
+#: ../gui/MemcardDlg.c:192 ../gui/MemcardDlg.c:297 ../win32/gui/WndMain.c:965
msgid "Deleted"
msgstr "Eliminato"
#: ../gui/MemcardDlg.c:194 ../gui/MemcardDlg.c:198 ../gui/MemcardDlg.c:299
-#: ../gui/MemcardDlg.c:303 ../win32/gui/WndMain.c:961
-#: ../win32/gui/WndMain.c:964
+#: ../gui/MemcardDlg.c:303 ../win32/gui/WndMain.c:966
+#: ../win32/gui/WndMain.c:969
msgid "Free"
msgstr "Libero"
-#: ../gui/MemcardDlg.c:196 ../gui/MemcardDlg.c:301 ../win32/gui/WndMain.c:963
+#: ../gui/MemcardDlg.c:196 ../gui/MemcardDlg.c:301 ../win32/gui/WndMain.c:968
msgid "Used"
msgstr "Usato"
@@ -1065,9 +1069,9 @@ msgid "CD-ROM Label: %.32s\n"
msgstr ""
#: ../libpcsxcore/misc.c:346
-#, fuzzy, c-format
+#, c-format
msgid "CD-ROM ID: %.9s\n"
-msgstr "CD-ROM:"
+msgstr ""
#: ../libpcsxcore/misc.c:410
#, c-format
@@ -1119,9 +1123,9 @@ msgid "Could not load NetPlay plugin %s!"
msgstr "Impossibile caricare il plugin %s di NetPlay!"
#: ../libpcsxcore/plugins.c:688
-#, fuzzy, c-format
+#, c-format
msgid "Could not load SIO1 plugin %s!"
-msgstr "Impossibile caricare il plugin %s della SPU!"
+msgstr "Impossibile caricare il plugin %s della SIO1!"
#: ../libpcsxcore/plugins.c:773
#, c-format
@@ -1164,32 +1168,33 @@ msgstr ""
"%d"
#: ../libpcsxcore/plugins.c:790
-#, fuzzy, c-format
+#, c-format
msgid "Error initializing SIO1 plugin: %d"
msgstr ""
-"Si è verificato un errore durante l'inizializzazione del plugin della SPU: %d"
+"Si è verificato un errore durante l'inizializzazione del plugin della SIO1: "
+"%d"
#: ../libpcsxcore/plugins.c:793
msgid "Plugins loaded.\n"
msgstr "Plugin caricati.\n"
-#: ../libpcsxcore/ppf.c:217
+#: ../libpcsxcore/ppf.c:219
#, c-format
msgid "Invalid PPF patch: %s.\n"
msgstr "Patch PPF non valida: %s.\n"
-#: ../libpcsxcore/ppf.c:293
+#: ../libpcsxcore/ppf.c:295
#, c-format
msgid "Unsupported PPF version (%d).\n"
msgstr "Versione PPF non supportata (%d).\n"
#. build address array
-#: ../libpcsxcore/ppf.c:332
+#: ../libpcsxcore/ppf.c:334
#, c-format
msgid "Loaded PPF %d.0 patch: %s.\n"
msgstr "Caricata la patch PPF %d.0: %s.\n"
-#: ../libpcsxcore/ppf.c:377
+#: ../libpcsxcore/ppf.c:381
#, fuzzy, c-format
msgid "Loaded SBI file: %s.\n"
msgstr "È stata caricata l'immagine del CD: %s"
@@ -1205,31 +1210,31 @@ msgstr "Impossibile aprire il BIOS:\"%s\". Sto abilitando il bios HLE!\n"
#: ../libpcsxcore/r3000a.c:34
#, c-format
-msgid "Running PCSX Version %s (%s).\n"
-msgstr "Avvio in corso di PCSX versione %s (%s).\n"
+msgid "Running PCSXR Version %s (%s).\n"
+msgstr "Avvio in corso di PCSXR versione %s (%s).\n"
-#: ../libpcsxcore/sio.c:839
+#: ../libpcsxcore/sio.c:843
msgid "Connection closed!\n"
msgstr "Connessione chiusa!\n"
-#: ../libpcsxcore/sio.c:872
+#: ../libpcsxcore/sio.c:876
#, c-format
msgid "No memory card value was specified - creating a default card %s\n"
msgstr ""
"Nessun valore specificato per la memory card, sto creando una card di "
"default %s\n"
-#: ../libpcsxcore/sio.c:876
+#: ../libpcsxcore/sio.c:880
#, c-format
msgid "The memory card %s doesn't exist - creating it\n"
msgstr "La memory card %s non esiste, la sto creando\n"
-#: ../libpcsxcore/sio.c:892
+#: ../libpcsxcore/sio.c:896
#, c-format
msgid "Memory card %s failed to load!\n"
msgstr "Impossibile caricare la memory card %s!\n"
-#: ../libpcsxcore/sio.c:896
+#: ../libpcsxcore/sio.c:900
#, c-format
msgid "Loading memory card %s\n"
msgstr "Sto caricando la memory card %s\n"
@@ -1242,262 +1247,288 @@ msgstr "Lettore del dispositivo CD-ROM"
msgid "CDR NULL Plugin"
msgstr "Plugin NULL CDR"
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:1
-#: ../plugins/dfcdrom/cdrcfg-0.1df/main.c:219
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:1
+msgid "125ms"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:2
+msgid "16min"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:3
+msgid "16s"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:4
+msgid "1min"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:5
+msgid "1s"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:6
+msgid "250ms"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:7
+msgid "2min"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:8
+msgid "2s"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:9
+msgid "32min"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:10
+msgid "32s"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:11
+msgid "4min"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:12
+msgid "4s"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:13
+msgid "500ms"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:14
+msgid "8min"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:15
+msgid "8s"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:16
+#: ../plugins/dfcdrom/cdrcfg-0.1df/main.c:206
msgid "CDR configuration"
msgstr "Configurazione del CD-ROM"
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:2
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:17
msgid "Cache Size (Def. 64):"
msgstr "Dimensione della cache (def. 64)"
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:3
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:18
msgid "Cdrom Speed (Def. 0 = MAX):"
msgstr "Velocità del cdrom (def. 0 = MAX):"
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:4
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:19
msgid "Choose your CD-ROM device or type its path if it's not listed"
msgstr ""
"Scegli il tuo dispositivo CD-ROM o digita il suo path se non è elencato"
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:5
-msgid ""
-"Default\n"
-"125ms\n"
-"250ms\n"
-"500ms\n"
-"1s\n"
-"2s\n"
-"4s\n"
-"8s\n"
-"16s\n"
-"32s\n"
-"1min\n"
-"2min\n"
-"4min\n"
-"8min\n"
-"16min\n"
-"32min"
-msgstr ""
-"Default\n"
-"125ms\n"
-"250ms\n"
-"500ms\n"
-"1s\n"
-"2s\n"
-"4s\n"
-"8s\n"
-"16s\n"
-"32s\n"
-"1min\n"
-"2min\n"
-"4min\n"
-"8min\n"
-"16min\n"
-"32min"
-
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:21
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:20
+msgid "Default"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:21
msgid "Enable subchannel read"
msgstr "Abilita la lettura del subchannel"
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:22
-msgid ""
-"Normal (No Cache)\n"
-"Threaded - Faster (With Cache)"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:22
+msgid "Normal (No Cache)"
msgstr ""
-"Normale (senza cache)\n"
-"Threaded, veloce (con la cache)"
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:24
-#: ../plugins/dfinput/dfinput.ui.h:8 ../win32/gui/WndMain.c:1310
-msgid "Options"
-msgstr "Opzioni"
-
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:25
-msgid "Select CD-ROM device"
-msgstr "Seleziona il dispositivo CD-ROM"
-
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:26
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:23
msgid "Select read mode:"
msgstr "Seleziona la modalità di lettura:"
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:27
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:24
msgid "Spindown Time:"
msgstr "Tempo di spindown:"
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:28
-msgid "hseparator"
-msgstr "hseparator"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:25
+#, fuzzy
+msgid "Threaded - Faster (With Cache)"
+msgstr ""
+"Normale (senza cache)\n"
+"Threaded, veloce (con la cache)"
-#: ../plugins/dfinput/cfg-gtk2.c:48
+#: ../plugins/dfinput/cfg-gtk2.c:49
msgid "D-Pad Up"
msgstr "D-Pad Su"
-#: ../plugins/dfinput/cfg-gtk2.c:49
+#: ../plugins/dfinput/cfg-gtk2.c:50
msgid "D-Pad Down"
msgstr "D-Pad Giù"
-#: ../plugins/dfinput/cfg-gtk2.c:50
+#: ../plugins/dfinput/cfg-gtk2.c:51
msgid "D-Pad Left"
msgstr "D-Pad Sinistra"
-#: ../plugins/dfinput/cfg-gtk2.c:51
+#: ../plugins/dfinput/cfg-gtk2.c:52
msgid "D-Pad Right"
msgstr "D-Pad Destra"
-#: ../plugins/dfinput/cfg-gtk2.c:52
+#: ../plugins/dfinput/cfg-gtk2.c:53
msgid "Cross"
msgstr "Croce"
-#: ../plugins/dfinput/cfg-gtk2.c:53
+#: ../plugins/dfinput/cfg-gtk2.c:54
msgid "Circle"
msgstr "Cerchio"
-#: ../plugins/dfinput/cfg-gtk2.c:54
+#: ../plugins/dfinput/cfg-gtk2.c:55
msgid "Square"
msgstr "Quadrato"
-#: ../plugins/dfinput/cfg-gtk2.c:55
+#: ../plugins/dfinput/cfg-gtk2.c:56
msgid "Triangle"
msgstr "Triangolo"
-#: ../plugins/dfinput/cfg-gtk2.c:56
+#: ../plugins/dfinput/cfg-gtk2.c:57
msgid "L1"
msgstr "L1"
-#: ../plugins/dfinput/cfg-gtk2.c:57
+#: ../plugins/dfinput/cfg-gtk2.c:58
msgid "R1"
msgstr "R1"
-#: ../plugins/dfinput/cfg-gtk2.c:58
+#: ../plugins/dfinput/cfg-gtk2.c:59
msgid "L2"
msgstr "L2"
-#: ../plugins/dfinput/cfg-gtk2.c:59
+#: ../plugins/dfinput/cfg-gtk2.c:60
msgid "R2"
msgstr "R2"
-#: ../plugins/dfinput/cfg-gtk2.c:60
+#: ../plugins/dfinput/cfg-gtk2.c:61
msgid "Select"
msgstr "Tasto Select"
-#: ../plugins/dfinput/cfg-gtk2.c:61
+#: ../plugins/dfinput/cfg-gtk2.c:62
msgid "Start"
msgstr "Tasto Start"
-#: ../plugins/dfinput/cfg-gtk2.c:62
+#: ../plugins/dfinput/cfg-gtk2.c:63
msgid "L3"
msgstr "L3"
-#: ../plugins/dfinput/cfg-gtk2.c:63
+#: ../plugins/dfinput/cfg-gtk2.c:64
msgid "R3"
msgstr "R3"
-#: ../plugins/dfinput/cfg-gtk2.c:67
+#: ../plugins/dfinput/cfg-gtk2.c:65
+#, fuzzy
+msgid "Analog"
+msgstr ""
+"Pad digitale\n"
+"Pad analogico"
+
+#: ../plugins/dfinput/cfg-gtk2.c:69
msgid "L-Stick Right"
msgstr "L-Stick Destra"
-#: ../plugins/dfinput/cfg-gtk2.c:68
+#: ../plugins/dfinput/cfg-gtk2.c:70
msgid "L-Stick Left"
msgstr "L-Stick Sinistra"
-#: ../plugins/dfinput/cfg-gtk2.c:69
+#: ../plugins/dfinput/cfg-gtk2.c:71
msgid "L-Stick Down"
msgstr "L-Stick Giù"
-#: ../plugins/dfinput/cfg-gtk2.c:70
+#: ../plugins/dfinput/cfg-gtk2.c:72
msgid "L-Stick Up"
msgstr "L-Stick Su"
-#: ../plugins/dfinput/cfg-gtk2.c:71
+#: ../plugins/dfinput/cfg-gtk2.c:73
msgid "R-Stick Right"
msgstr "R-Stick Destra"
-#: ../plugins/dfinput/cfg-gtk2.c:72
+#: ../plugins/dfinput/cfg-gtk2.c:74
msgid "R-Stick Left"
msgstr "R-Stick Sinistra"
-#: ../plugins/dfinput/cfg-gtk2.c:73
+#: ../plugins/dfinput/cfg-gtk2.c:75
msgid "R-Stick Down"
msgstr "R-Stick Giù"
-#: ../plugins/dfinput/cfg-gtk2.c:74
+#: ../plugins/dfinput/cfg-gtk2.c:76
msgid "R-Stick Up"
msgstr "R-Stick Su"
-#: ../plugins/dfinput/cfg-gtk2.c:100 ../plugins/dfinput/cfg-gtk2.c:139
+#: ../plugins/dfinput/cfg-gtk2.c:102 ../plugins/dfinput/cfg-gtk2.c:141
msgid "Centered"
msgstr "Centrato"
-#: ../plugins/dfinput/cfg-gtk2.c:100 ../plugins/dfinput/cfg-gtk2.c:139
+#: ../plugins/dfinput/cfg-gtk2.c:102 ../plugins/dfinput/cfg-gtk2.c:141
msgid "Up"
msgstr "Su"
-#: ../plugins/dfinput/cfg-gtk2.c:100 ../plugins/dfinput/cfg-gtk2.c:139
+#: ../plugins/dfinput/cfg-gtk2.c:102 ../plugins/dfinput/cfg-gtk2.c:141
msgid "Right"
msgstr "Destra"
-#: ../plugins/dfinput/cfg-gtk2.c:100 ../plugins/dfinput/cfg-gtk2.c:139
+#: ../plugins/dfinput/cfg-gtk2.c:102 ../plugins/dfinput/cfg-gtk2.c:141
msgid "Rightup"
msgstr "In alto a destra"
-#: ../plugins/dfinput/cfg-gtk2.c:101 ../plugins/dfinput/cfg-gtk2.c:140
+#: ../plugins/dfinput/cfg-gtk2.c:103 ../plugins/dfinput/cfg-gtk2.c:142
msgid "Down"
msgstr "Giù"
-#: ../plugins/dfinput/cfg-gtk2.c:101 ../plugins/dfinput/cfg-gtk2.c:140
+#: ../plugins/dfinput/cfg-gtk2.c:103 ../plugins/dfinput/cfg-gtk2.c:142
msgid "Rightdown"
msgstr "In basso a destra"
-#: ../plugins/dfinput/cfg-gtk2.c:101 ../plugins/dfinput/cfg-gtk2.c:140
+#: ../plugins/dfinput/cfg-gtk2.c:103 ../plugins/dfinput/cfg-gtk2.c:142
msgid "Left"
msgstr "Sinistra"
-#: ../plugins/dfinput/cfg-gtk2.c:101 ../plugins/dfinput/cfg-gtk2.c:140
+#: ../plugins/dfinput/cfg-gtk2.c:103 ../plugins/dfinput/cfg-gtk2.c:142
msgid "Leftup"
msgstr "In alto a sinistra"
-#: ../plugins/dfinput/cfg-gtk2.c:102 ../plugins/dfinput/cfg-gtk2.c:141
+#: ../plugins/dfinput/cfg-gtk2.c:104 ../plugins/dfinput/cfg-gtk2.c:143
msgid "Leftdown"
msgstr "In basso a sinistra"
-#: ../plugins/dfinput/cfg-gtk2.c:106 ../plugins/dfinput/cfg-gtk2.c:145
+#: ../plugins/dfinput/cfg-gtk2.c:108 ../plugins/dfinput/cfg-gtk2.c:147
#, c-format
msgid "Joystick: Button %d"
msgstr "Joystick: Pulsante %d"
-#: ../plugins/dfinput/cfg-gtk2.c:110 ../plugins/dfinput/cfg-gtk2.c:149
+#: ../plugins/dfinput/cfg-gtk2.c:112 ../plugins/dfinput/cfg-gtk2.c:151
#, c-format
msgid "Joystick: Axis %d%c"
msgstr "Joystick: Asse %d%c"
-#: ../plugins/dfinput/cfg-gtk2.c:115 ../plugins/dfinput/cfg-gtk2.c:154
+#: ../plugins/dfinput/cfg-gtk2.c:117 ../plugins/dfinput/cfg-gtk2.c:156
#, c-format
msgid "Joystick: Hat %d %s"
msgstr "Joystick: hat %d %s"
-#: ../plugins/dfinput/cfg-gtk2.c:130 ../plugins/dfinput/cfg-gtk2.c:169
+#: ../plugins/dfinput/cfg-gtk2.c:132 ../plugins/dfinput/cfg-gtk2.c:171
msgid "Keyboard:"
msgstr "Tastiera:"
-#: ../plugins/dfinput/cfg-gtk2.c:134 ../plugins/dfinput/cfg-gtk2.c:173
+#: ../plugins/dfinput/cfg-gtk2.c:136 ../plugins/dfinput/cfg-gtk2.c:175
msgid "(Not Set)"
msgstr "(Nessuna impostazione)"
-#: ../plugins/dfinput/cfg-gtk2.c:542
+#: ../plugins/dfinput/cfg-gtk2.c:562
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:13
#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:55
msgid "None"
msgstr "Nessuno"
-#: ../plugins/dfinput/cfg-gtk2.c:584
+#: ../plugins/dfinput/cfg-gtk2.c:604
msgid "Gamepad/Keyboard Input Configuration"
msgstr "Configurazione input del gamepad/tastiera"
-#: ../plugins/dfinput/cfg-gtk2.c:590 ../plugins/dfinput/cfg-gtk2.c:610
+#: ../plugins/dfinput/cfg-gtk2.c:610 ../plugins/dfinput/cfg-gtk2.c:630
msgid "Key"
msgstr "Tasto"
-#: ../plugins/dfinput/cfg-gtk2.c:596 ../plugins/dfinput/cfg-gtk2.c:616
+#: ../plugins/dfinput/cfg-gtk2.c:616 ../plugins/dfinput/cfg-gtk2.c:636
msgid "Button"
msgstr "Pulsante"
@@ -1532,19 +1563,28 @@ msgstr ""
"Pad analogico"
#: ../plugins/dfinput/dfinput.ui.h:7
+msgid "Mouse"
+msgstr ""
+
+#: ../plugins/dfinput/dfinput.ui.h:8
msgid "Multi-Threaded (Recommended)"
msgstr "Multi-Threaded (consigliato)"
-#: ../plugins/dfinput/dfinput.ui.h:9
+#: ../plugins/dfinput/dfinput.ui.h:9 ../win32/gui/WndMain.c:1316
+msgid "Options"
+msgstr "Opzioni"
+
+#: ../plugins/dfinput/dfinput.ui.h:10
msgid "Reset"
msgstr "Resetta"
-#: ../plugins/dfinput/dfinput.ui.h:10
+#: ../plugins/dfinput/dfinput.ui.h:11
msgid "Type:"
msgstr "Tipo:"
-#: ../plugins/dfinput/pad.c:24
-msgid "Gamepad/Keyboard Input"
+#: ../plugins/dfinput/pad.c:29
+#, fuzzy
+msgid "Gamepad/Keyboard/Mouse Input"
msgstr "Input del gamepad/tastiera"
#. increase that with each version
@@ -1563,28 +1603,29 @@ msgstr "Si è verificato un errore durante il caricamento di %s: %s"
msgid "Error allocating memory!\n"
msgstr "Si è verificato un errore durante l'allocazione della memoria!"
-#: ../plugins/dfnet/dfnet.ui.h:1
+#. ****************************************************************************
+#: ../plugins/dfnet/dfnet.ui.h:1 ../plugins/bladesio1/sio1.ui.h:1
msgid "Client (Player2)"
msgstr ""
-#: ../plugins/dfnet/dfnet.ui.h:2
+#: ../plugins/dfnet/dfnet.ui.h:2 ../plugins/bladesio1/sio1.ui.h:2
msgid "Copy PC IP to Clipboard"
msgstr ""
-#: ../plugins/dfnet/dfnet.ui.h:3
+#: ../plugins/dfnet/dfnet.ui.h:3 ../plugins/bladesio1/sio1.ui.h:3
msgid ""
"Do not change if not necessary (remember it must be changed on both sides)."
msgstr ""
-#: ../plugins/dfnet/dfnet.ui.h:4
+#: ../plugins/dfnet/dfnet.ui.h:4 ../plugins/bladesio1/sio1.ui.h:4
msgid "Play Offline"
msgstr ""
-#: ../plugins/dfnet/dfnet.ui.h:5
+#: ../plugins/dfnet/dfnet.ui.h:5 ../plugins/bladesio1/sio1.ui.h:5
msgid "Port Number"
msgstr ""
-#: ../plugins/dfnet/dfnet.ui.h:6
+#: ../plugins/dfnet/dfnet.ui.h:6 ../plugins/bladesio1/sio1.ui.h:6
msgid ""
"Select here if you'll be Server (Player1) or Client (Player2).\n"
"\n"
@@ -1595,17 +1636,17 @@ msgid ""
"the IP Address Control."
msgstr ""
-#: ../plugins/dfnet/dfnet.ui.h:11
+#: ../plugins/dfnet/dfnet.ui.h:11 ../plugins/bladesio1/sio1.ui.h:11
msgid "Server (Player1)"
msgstr ""
-#: ../plugins/dfnet/dfnet.ui.h:12
+#: ../plugins/dfnet/dfnet.ui.h:12 ../plugins/bladesio1/sio1.ui.h:12
#, fuzzy
msgid "Start Game"
msgstr "Tasto Start"
#: ../plugins/dfnet/gui.c:30 ../plugins/dfnet/gui.c:112
-#: ../win32/gui/ConfigurePlugins.c:616
+#: ../win32/gui/ConfigurePlugins.c:618
msgid "NetPlay"
msgstr "NetPlay"
@@ -1666,100 +1707,92 @@ msgstr ""
"P.E.Op.S. OSS Driver V1.7\n"
"Scritto da Pete Bernert e dal team P.E.Op.S.\n"
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:1
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2.h:20
-msgid "<b>Compatibility</b>"
-msgstr "<b>Compatibilità</b>"
-
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:2
-msgid "<b>General</b>"
-msgstr "<b>Generale</b>"
-
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:3
-msgid "<b>XA Music</b>"
-msgstr "<b>Musica XA</b>"
-
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:4
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:1
msgid "Adjust XA speed"
msgstr "Aggiusta la velocità di XA"
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:5
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:2
msgid "Choose this if XA music is played too quickly."
msgstr "Seleziona se la musica di XA si ascoltasse troppo rapidamente."
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:7
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:4
+msgid "Cubic"
+msgstr ""
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:5
msgid "Frequency Response - Output Filter"
msgstr ""
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:8
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:6
+#, fuzzy
+msgid "Gaussian"
+msgstr "Russo"
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:7
msgid "High compatibility mode"
msgstr "Alto modo di compatibilità"
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:9
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:8
msgid "Interpolation:"
msgstr "Interpolazione:"
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:10
-#, fuzzy
-msgid ""
-"None\n"
-"Low\n"
-"Medium\n"
-"Loud\n"
-"Loudest"
-msgstr ""
-"Basso\n"
-"Medio\n"
-"Alto\n"
-"Altissimo"
-
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:15
-msgid ""
-"None\n"
-"Simple\n"
-"Gaussian\n"
-"Cubic"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:9
+msgid "Loud"
msgstr ""
-"Nessuno\n"
-"Semplice\n"
-"Gaussiano\n"
-"Cubico"
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:19
-msgid ""
-"Off\n"
-"Simple\n"
-"Playstation"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:10
+msgid "Loudest"
+msgstr ""
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:11
+msgid "Low"
msgstr ""
-"Disattivato\n"
-"Semplice\n"
-"Playstation"
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:22
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:12
+msgid "Medium"
+msgstr ""
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:14
+msgid "Off"
+msgstr ""
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:15
msgid "Play only one channel for a performance boost."
msgstr "Suona solo un canale, per una prestazione migliore."
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:23
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:16
+#, fuzzy
+msgid "Playstation"
+msgstr ""
+"Disattivato\n"
+"Semplice\n"
+"Playstation"
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:17
msgid "Reverb:"
msgstr "Riverbero:"
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:24
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:18
msgid "SPU IRQ Wait"
msgstr "Attesa dell'IRQ della SPU"
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:25
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:19
+msgid "Simple"
+msgstr ""
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:20
msgid "Single channel sound"
msgstr "Audio del singolo canale"
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:26
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:21
msgid "Use the asynchronous SPU interface."
msgstr "Usa l'interfaccia asincrona della SPU."
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:27
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:22
msgid "Volume:"
msgstr "Volume:"
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:28
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:23
msgid "Wait for CPU; only useful for some games."
msgstr "Attende la CPU; utile solo per alcuni giochi."
@@ -1857,6 +1890,10 @@ msgstr ""
"1280x1024\n"
"1600x1200"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2.h:20
+msgid "<b>Compatibility</b>"
+msgstr "<b>Compatibilità</b>"
+
#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2.h:21
msgid "<b>Framerate</b>"
msgstr "<b>Framerate</b>"
@@ -2417,6 +2454,11 @@ msgstr "Opzioni della finestra"
msgid "Yellow rect (FF9)"
msgstr "Rettangolo giallo (Final Fantasy 9)"
+#: ../plugins/bladesio1/gui.c:32
+#, fuzzy
+msgid "Link cable"
+msgstr "Abilita"
+
#. ****************************************************************************
#: ../plugins/bladesio1/sio1.c:29
#, fuzzy
@@ -2425,7 +2467,7 @@ msgstr "Driver SoftGL"
#: ../win32/gui/AboutDlg.c:26
msgid ""
-"PCSX - A PlayStation Emulator\n"
+"PCSXR - A PlayStation Emulator\n"
"\n"
"Original Authors:\n"
"main coder: linuzappz\n"
@@ -2433,7 +2475,7 @@ msgid ""
"ex-coders: Nocomp, Pete Bernett, nik3d\n"
"Webmaster: AkumaX"
msgstr ""
-"PCSX, un emulatore della PlayStation\n"
+"PCSXR, un emulatore della PlayStation\n"
"\n"
"Autori originari:\n"
"programmatore principale: linuzappz\n"
@@ -2442,14 +2484,13 @@ msgstr ""
"Webmaster: AkumaX"
#: ../win32/gui/AboutDlg.c:35
-#, fuzzy
msgid ""
"PCSX-df Authors:\n"
"Ryan Schultz, Andrew Burton, Stephen Chao,\n"
"Marcus Comstedt, Stefan Sikora\n"
"\n"
"PCSX-Reloaded By:\n"
-"Blade_Arma, shalma, Wei Mingzhi, et al.\n"
+"edgbla, shalma, Wei Mingzhi, et al.\n"
"\n"
"http://pcsxr.codeplex.com/"
msgstr ""
@@ -2458,7 +2499,7 @@ msgstr ""
"Marcus Comstedt, Stefan Sikora\n"
"\n"
"PCSX-Reloaded di:\n"
-"Wei Mingzhi\n"
+"edgbla, shalma, Wei Mingzhi\n"
"\n"
"http://www.codeplex.com/pcsxr"
@@ -2468,14 +2509,14 @@ msgstr "Informazioni"
#: ../win32/gui/AboutDlg.c:48 ../win32/gui/AboutDlg.c:52
#: ../win32/gui/CheatDlg.c:69 ../win32/gui/CheatDlg.c:119
-#: ../win32/gui/ConfigurePlugins.c:483 ../win32/gui/ConfigurePlugins.c:614
-#: ../win32/gui/WndMain.c:1059 ../win32/gui/WndMain.c:1295
+#: ../win32/gui/ConfigurePlugins.c:485 ../win32/gui/ConfigurePlugins.c:616
+#: ../win32/gui/WndMain.c:1064 ../win32/gui/WndMain.c:1300
msgid "OK"
msgstr "OK"
#: ../win32/gui/AboutDlg.c:49
-msgid "PCSX EMU\n"
-msgstr "PCSX EMU\n"
+msgid "PCSXR EMU\n"
+msgstr "PCSXR EMU\n"
#: ../win32/gui/CheatDlg.c:51 ../win32/gui/CheatDlg.c:223
#: ../win32/gui/CheatDlg.c:270
@@ -2488,8 +2529,8 @@ msgid "No"
msgstr "No"
#: ../win32/gui/CheatDlg.c:70 ../win32/gui/CheatDlg.c:120
-#: ../win32/gui/ConfigurePlugins.c:484 ../win32/gui/ConfigurePlugins.c:615
-#: ../win32/gui/WndMain.c:1060 ../win32/gui/WndMain.c:1296
+#: ../win32/gui/ConfigurePlugins.c:486 ../win32/gui/ConfigurePlugins.c:617
+#: ../win32/gui/WndMain.c:1065 ../win32/gui/WndMain.c:1301
msgid "Cancel"
msgstr "Annulla"
@@ -2526,8 +2567,8 @@ msgid "Enabled"
msgstr "Abilitato"
#: ../win32/gui/CheatDlg.c:282 ../win32/gui/CheatDlg.c:311
-msgid "PCSX Cheat Code Files"
-msgstr "File del codice dei cheat di PCSX"
+msgid "PCSXR Cheat Code Files"
+msgstr "File del codice dei cheat di PCSXR"
#: ../win32/gui/CheatDlg.c:402
msgid "Equal Value"
@@ -2622,154 +2663,154 @@ msgstr "Decimale"
msgid "Hexadecimal"
msgstr "Esadecimale"
-#: ../win32/gui/ConfigurePlugins.c:219
+#: ../win32/gui/ConfigurePlugins.c:221
msgid "Simulate Psx Bios"
msgstr ""
-#: ../win32/gui/ConfigurePlugins.c:305
+#: ../win32/gui/ConfigurePlugins.c:307
msgid "Configuration not OK!"
msgstr "La configurazione non è corretta!"
-#: ../win32/gui/ConfigurePlugins.c:406
+#: ../win32/gui/ConfigurePlugins.c:408
msgid "This plugin reports that should work correctly"
msgstr "Questo plugin dovrebbe funzionare correttamente"
-#: ../win32/gui/ConfigurePlugins.c:407
+#: ../win32/gui/ConfigurePlugins.c:409
msgid "This plugin reports that should not work correctly"
msgstr "Questo plugin potrebbe non funzionare correttamente"
-#: ../win32/gui/ConfigurePlugins.c:463
+#: ../win32/gui/ConfigurePlugins.c:465
msgid "Select Plugins Directory"
msgstr "Seleziona la cartella dei plugin"
-#: ../win32/gui/ConfigurePlugins.c:472
+#: ../win32/gui/ConfigurePlugins.c:474
msgid "Select Bios Directory"
msgstr "Seleziona la cartella del bios"
-#: ../win32/gui/ConfigurePlugins.c:481
+#: ../win32/gui/ConfigurePlugins.c:483
msgid "Configuration"
msgstr "Configurazione"
-#: ../win32/gui/ConfigurePlugins.c:485
+#: ../win32/gui/ConfigurePlugins.c:487
msgid "Graphics"
msgstr "Video"
-#: ../win32/gui/ConfigurePlugins.c:486
+#: ../win32/gui/ConfigurePlugins.c:488
msgid "First Controller"
msgstr "Primo controller"
-#: ../win32/gui/ConfigurePlugins.c:487
+#: ../win32/gui/ConfigurePlugins.c:489
msgid "Second Controller"
msgstr "Secondo controller"
-#: ../win32/gui/ConfigurePlugins.c:488
+#: ../win32/gui/ConfigurePlugins.c:490
msgid "Sound"
msgstr "Audio"
-#: ../win32/gui/ConfigurePlugins.c:489
+#: ../win32/gui/ConfigurePlugins.c:491
msgid "Cdrom"
msgstr "Cdrom"
-#: ../win32/gui/ConfigurePlugins.c:490
+#: ../win32/gui/ConfigurePlugins.c:492
msgid "Bios"
msgstr "Bios"
-#: ../win32/gui/ConfigurePlugins.c:491
+#: ../win32/gui/ConfigurePlugins.c:493
msgid "Set Bios Directory"
msgstr "Imposta la cartella del bios"
-#: ../win32/gui/ConfigurePlugins.c:492
+#: ../win32/gui/ConfigurePlugins.c:494
msgid "Set Plugins Directory"
msgstr "Imposta la cartella dei plugin"
-#: ../win32/gui/ConfigurePlugins.c:493 ../win32/gui/ConfigurePlugins.c:496
-#: ../win32/gui/ConfigurePlugins.c:499 ../win32/gui/ConfigurePlugins.c:502
-#: ../win32/gui/ConfigurePlugins.c:505 ../win32/gui/ConfigurePlugins.c:617
+#: ../win32/gui/ConfigurePlugins.c:495 ../win32/gui/ConfigurePlugins.c:498
+#: ../win32/gui/ConfigurePlugins.c:501 ../win32/gui/ConfigurePlugins.c:504
+#: ../win32/gui/ConfigurePlugins.c:507 ../win32/gui/ConfigurePlugins.c:619
msgid "Configure..."
msgstr "Configura..."
-#: ../win32/gui/ConfigurePlugins.c:494 ../win32/gui/ConfigurePlugins.c:497
-#: ../win32/gui/ConfigurePlugins.c:500 ../win32/gui/ConfigurePlugins.c:503
-#: ../win32/gui/ConfigurePlugins.c:506 ../win32/gui/ConfigurePlugins.c:618
+#: ../win32/gui/ConfigurePlugins.c:496 ../win32/gui/ConfigurePlugins.c:499
+#: ../win32/gui/ConfigurePlugins.c:502 ../win32/gui/ConfigurePlugins.c:505
+#: ../win32/gui/ConfigurePlugins.c:508 ../win32/gui/ConfigurePlugins.c:620
msgid "Test..."
msgstr "Prova..."
-#: ../win32/gui/ConfigurePlugins.c:495 ../win32/gui/ConfigurePlugins.c:498
-#: ../win32/gui/ConfigurePlugins.c:501 ../win32/gui/ConfigurePlugins.c:504
-#: ../win32/gui/ConfigurePlugins.c:507 ../win32/gui/ConfigurePlugins.c:619
+#: ../win32/gui/ConfigurePlugins.c:497 ../win32/gui/ConfigurePlugins.c:500
+#: ../win32/gui/ConfigurePlugins.c:503 ../win32/gui/ConfigurePlugins.c:506
+#: ../win32/gui/ConfigurePlugins.c:509 ../win32/gui/ConfigurePlugins.c:621
msgid "About..."
msgstr "Informazioni..."
-#: ../win32/gui/ConfigurePlugins.c:612
+#: ../win32/gui/ConfigurePlugins.c:614
msgid "NetPlay Configuration"
msgstr "Configurazione del NetPlay"
-#: ../win32/gui/ConfigurePlugins.c:620
+#: ../win32/gui/ConfigurePlugins.c:622
msgid ""
"Note: The NetPlay Plugin Directory should be the same as the other Plugins."
msgstr ""
"Nota: la cartella del plugin NetPlay dovrebbe essere la stessa degli altri "
"plugin."
-#: ../win32/gui/plugin.c:94 ../win32/gui/WndMain.c:323
+#: ../win32/gui/plugin.c:94 ../win32/gui/WndMain.c:328
#, c-format
-msgid "*PCSX*: Saved State %d"
-msgstr "*PCSX*: è stato salvato lo stato %d"
+msgid "*PCSXR*: Saved State %d"
+msgstr "*PCSXR*: è stato salvato lo stato %d"
-#: ../win32/gui/plugin.c:95 ../win32/gui/WndMain.c:324
+#: ../win32/gui/plugin.c:95 ../win32/gui/WndMain.c:329
#, c-format
-msgid "*PCSX*: Error Saving State %d"
+msgid "*PCSXR*: Error Saving State %d"
msgstr ""
-"*PCSX*: si è verificato un errore durante il salvataggio dello stato %d"
+"*PCSXR*: si è verificato un errore durante il salvataggio dello stato %d"
-#: ../win32/gui/plugin.c:111 ../win32/gui/WndMain.c:301
+#: ../win32/gui/plugin.c:111 ../win32/gui/WndMain.c:306
#, c-format
-msgid "*PCSX*: Loaded State %d"
-msgstr "*PCSX*: è stato caricato lo stato %d"
+msgid "*PCSXR*: Loaded State %d"
+msgstr "*PCSXR*: è stato caricato lo stato %d"
-#: ../win32/gui/plugin.c:112 ../win32/gui/WndMain.c:302
+#: ../win32/gui/plugin.c:112 ../win32/gui/WndMain.c:307
#, c-format
-msgid "*PCSX*: Error Loading State %d"
+msgid "*PCSXR*: Error Loading State %d"
msgstr ""
-"*PCSX*: si è verificato un errore durante il caricamento dello stato %d"
+"*PCSXR*: si è verificato un errore durante il caricamento dello stato %d"
#: ../win32/gui/plugin.c:123
#, c-format
-msgid "*PCSX*: Sio Irq Always Enabled"
-msgstr "*PCSX*: sio irq è sempre abilitato"
+msgid "*PCSXR*: Sio Irq Always Enabled"
+msgstr "*PCSXR*: sio irq è sempre abilitato"
#: ../win32/gui/plugin.c:124
#, c-format
-msgid "*PCSX*: Sio Irq Not Always Enabled"
-msgstr "*PCSX*: sio irq non è sempre abilitato"
+msgid "*PCSXR*: Sio Irq Not Always Enabled"
+msgstr "*PCSXR*: sio irq non è sempre abilitato"
#: ../win32/gui/plugin.c:131
#, c-format
-msgid "*PCSX*: Black&White Mdecs Only Enabled"
-msgstr "*PCSX*: abilita solo i filmati in bianco e nero"
+msgid "*PCSXR*: Black&White Mdecs Only Enabled"
+msgstr "*PCSXR*: abilita solo i filmati in bianco e nero"
#: ../win32/gui/plugin.c:132
#, c-format
-msgid "*PCSX*: Black&White Mdecs Only Disabled"
-msgstr "*PCSX*: disabilita solo i filmati in bianco e nero"
+msgid "*PCSXR*: Black&White Mdecs Only Disabled"
+msgstr "*PCSXR*: disabilita solo i filmati in bianco e nero"
#: ../win32/gui/plugin.c:139
#, c-format
-msgid "*PCSX*: Xa Enabled"
-msgstr "*PCSX*: abilita Xa"
+msgid "*PCSXR*: Xa Enabled"
+msgstr "*PCSXR*: abilita Xa"
#: ../win32/gui/plugin.c:140
#, c-format
-msgid "*PCSX*: Xa Disabled"
-msgstr "*PCSX*: disabilita Xa"
+msgid "*PCSXR*: Xa Disabled"
+msgstr "*PCSXR*: disabilita Xa"
#: ../win32/gui/plugin.c:149
-msgid "*PCSX*: CdRom Case Opened"
-msgstr "*PCSX*: il vano del CdRom è aperto"
+msgid "*PCSXR*: CdRom Case Opened"
+msgstr "*PCSXR*: il vano del CdRom è aperto"
#: ../win32/gui/plugin.c:155
-msgid "*PCSX*: CdRom Case Closed"
-msgstr "*PCSX*: il vano del CdRom è chiuso"
+msgid "*PCSXR*: CdRom Case Closed"
+msgstr "*PCSXR*: il vano del CdRom è chiuso"
#: ../win32/gui/plugin.c:183
msgid "Connecting..."
@@ -2862,8 +2903,8 @@ msgstr "Tedesco"
msgid "Greek"
msgstr "Greco"
-#: ../win32/gui/WndMain.c:81 ../win32/gui/WndMain.c:1659
-#: ../win32/gui/WndMain.c:1661
+#: ../win32/gui/WndMain.c:81 ../win32/gui/WndMain.c:1667
+#: ../win32/gui/WndMain.c:1669
msgid "English"
msgstr "Inglese"
@@ -2913,7 +2954,7 @@ msgstr "Coreano"
#: ../win32/gui/WndMain.c:215
msgid ""
-"Usage: pcsx [options]\n"
+"Usage: pcsxr [options]\n"
"\toptions:\n"
"\t-nogui\t\tDon't open the GUI\n"
"\t-psxout\t\tEnable PSX output\n"
@@ -2923,334 +2964,405 @@ msgid ""
"\t-help\t\tDisplay this message"
msgstr ""
-#: ../win32/gui/WndMain.c:342 ../win32/gui/WndMain.c:388
-msgid "PCSX State Format"
-msgstr "Formato dei salvataggi di PCSX"
+#: ../win32/gui/WndMain.c:347 ../win32/gui/WndMain.c:393
+msgid "PCSXR State Format"
+msgstr "Formato dei salvataggi di PCSXR"
-#: ../win32/gui/WndMain.c:369
+#: ../win32/gui/WndMain.c:374
#, c-format
-msgid "*PCSX*: Loaded State %s"
-msgstr "*PCSX*: è stato caricato lo stato %s"
+msgid "*PCSXR*: Loaded State %s"
+msgstr "*PCSXR*: è stato caricato lo stato %s"
-#: ../win32/gui/WndMain.c:370
+#: ../win32/gui/WndMain.c:375
#, c-format
-msgid "*PCSX*: Error Loading State %s"
+msgid "*PCSXR*: Error Loading State %s"
msgstr ""
-"*PCSX*: si è verificato un errore durante il caricamento dello stato %s"
+"*PCSXR*: si è verificato un errore durante il caricamento dello stato %s"
-#: ../win32/gui/WndMain.c:415
+#: ../win32/gui/WndMain.c:420
#, c-format
-msgid "*PCSX*: Saved State %s"
-msgstr "*PCSX*: è stato salvato lo stato %s"
+msgid "*PCSXR*: Saved State %s"
+msgstr "*PCSXR*: è stato salvato lo stato %s"
-#: ../win32/gui/WndMain.c:416
+#: ../win32/gui/WndMain.c:421
#, c-format
-msgid "*PCSX*: Error Saving State %s"
+msgid "*PCSXR*: Error Saving State %s"
msgstr ""
-"*PCSX*: si è verificato un errore durante il salvataggio dello stato %s"
+"*PCSXR*: si è verificato un errore durante il salvataggio dello stato %s"
-#: ../win32/gui/WndMain.c:484
+#: ../win32/gui/WndMain.c:489
msgid "Running BIOS is not supported with Internal HLE Bios."
msgstr "L'avvio del BIOS non è supportato dal bios interno HLE."
-#: ../win32/gui/WndMain.c:761
+#: ../win32/gui/WndMain.c:766
msgid "Game ID"
msgstr "ID del gioco"
-#: ../win32/gui/WndMain.c:767
+#: ../win32/gui/WndMain.c:772
msgid "Game"
msgstr "Gioco"
-#: ../win32/gui/WndMain.c:949
+#: ../win32/gui/WndMain.c:954
msgid "mid link block"
msgstr "mid link block"
-#: ../win32/gui/WndMain.c:952
+#: ../win32/gui/WndMain.c:957
msgid "terminiting link block"
msgstr "terminiting link block"
-#: ../win32/gui/WndMain.c:1057
+#: ../win32/gui/WndMain.c:1062
msgid "Memcard Manager"
msgstr "Gestore della memory card"
-#: ../win32/gui/WndMain.c:1061 ../win32/gui/WndMain.c:1064
+#: ../win32/gui/WndMain.c:1066 ../win32/gui/WndMain.c:1069
msgid "Select Mcd"
msgstr "Seleziona la memory card"
-#: ../win32/gui/WndMain.c:1062 ../win32/gui/WndMain.c:1065
+#: ../win32/gui/WndMain.c:1067 ../win32/gui/WndMain.c:1070
msgid "Format Mcd"
msgstr "Formatta la memory card"
-#: ../win32/gui/WndMain.c:1063 ../win32/gui/WndMain.c:1066
+#: ../win32/gui/WndMain.c:1068 ../win32/gui/WndMain.c:1071
msgid "Reload Mcd"
msgstr "Ricarica la memory card"
-#: ../win32/gui/WndMain.c:1067
+#: ../win32/gui/WndMain.c:1072
msgid "-> Copy ->"
msgstr "-> Copia ->"
-#: ../win32/gui/WndMain.c:1068
+#: ../win32/gui/WndMain.c:1073
msgid "<- Copy <-"
msgstr "<- Copia <-"
-#: ../win32/gui/WndMain.c:1069
+#: ../win32/gui/WndMain.c:1074
msgid "Paste"
msgstr "Incolla"
-#: ../win32/gui/WndMain.c:1070
+#: ../win32/gui/WndMain.c:1075
msgid "<- Un/Delete"
msgstr "<- Non/Elimina"
-#: ../win32/gui/WndMain.c:1071
+#: ../win32/gui/WndMain.c:1076
msgid "Un/Delete ->"
msgstr "Non/Elimina ->"
-#: ../win32/gui/WndMain.c:1073
+#: ../win32/gui/WndMain.c:1078
msgid "Memory Card 1"
msgstr "Memory card 1"
-#: ../win32/gui/WndMain.c:1074
+#: ../win32/gui/WndMain.c:1079
msgid "Memory Card 2"
msgstr "Memory card 2"
-#: ../win32/gui/WndMain.c:1129
+#: ../win32/gui/WndMain.c:1134
msgid "Are you sure you want to paste this selection?"
msgstr "Sei sicuro di voler incollare questa selezione?"
-#: ../win32/gui/WndMain.c:1129 ../win32/gui/WndMain.c:1240
-#: ../win32/gui/WndMain.c:1247
+#: ../win32/gui/WndMain.c:1134 ../win32/gui/WndMain.c:1245
+#: ../win32/gui/WndMain.c:1252
msgid "Confirmation"
msgstr "Conferma"
-#: ../win32/gui/WndMain.c:1240 ../win32/gui/WndMain.c:1247
+#: ../win32/gui/WndMain.c:1245 ../win32/gui/WndMain.c:1252
msgid "Are you sure you want to format this Memory Card?"
msgstr "Sei sicuro di voler formattare questa memory card?"
-#: ../win32/gui/WndMain.c:1293
+#: ../win32/gui/WndMain.c:1298
msgid "Cpu Config"
msgstr "Configurazione della Cpu"
-#: ../win32/gui/WndMain.c:1298
+#: ../win32/gui/WndMain.c:1303
msgid "Disable Xa Decoding"
msgstr "Disabilita il decoding Xa"
-#: ../win32/gui/WndMain.c:1299
+#: ../win32/gui/WndMain.c:1304
msgid "Sio Irq Always Enabled"
msgstr "Sio irq sempre abilitato"
-#: ../win32/gui/WndMain.c:1300
+#: ../win32/gui/WndMain.c:1305
msgid "Black && White Movies"
msgstr "Filmati in bianco e nero"
-#: ../win32/gui/WndMain.c:1301
+#: ../win32/gui/WndMain.c:1306
msgid "Disable Cd audio"
msgstr "Disabilita cd audio"
-#: ../win32/gui/WndMain.c:1303
+#: ../win32/gui/WndMain.c:1309
msgid "Enable Interpreter Cpu"
msgstr "Abilita l'interprete della cpu"
-#: ../win32/gui/WndMain.c:1306
+#: ../win32/gui/WndMain.c:1312
msgid "Spu Irq Always Enabled"
msgstr "Spu irq sempre abilitato"
-#: ../win32/gui/WndMain.c:1311
+#: ../win32/gui/WndMain.c:1317
msgid "Psx System Type"
msgstr "Regione del sistema"
-#: ../win32/gui/WndMain.c:1415
+#: ../win32/gui/WndMain.c:1423
msgid "Psx Mcd Format (*.mcr;*.mc;*.mem;*.vgs;*.mcd;*.gme;*.ddf)"
msgstr ""
"Formato memory card della psx (*.mcr;*.mc;*.mem;*.vgs;*.mcd;*.gme;*.ddf)"
-#: ../win32/gui/WndMain.c:1420
+#: ../win32/gui/WndMain.c:1428
msgid "Psx Memory Card (*.mcr;*.mc)"
msgstr "Memory card psx (*.mcr;*.mc)"
-#: ../win32/gui/WndMain.c:1425
+#: ../win32/gui/WndMain.c:1433
msgid "CVGS Memory Card (*.mem;*.vgs)"
msgstr "Memory card CVSG (*.mem;*.vgs)"
-#: ../win32/gui/WndMain.c:1430
+#: ../win32/gui/WndMain.c:1438
msgid "Bleem Memory Card (*.mcd)"
msgstr "Memory card bleem (*.mcd)"
-#: ../win32/gui/WndMain.c:1435
+#: ../win32/gui/WndMain.c:1443
msgid "DexDrive Memory Card (*.gme)"
msgstr "Memory card DexDrive (*.gme)"
-#: ../win32/gui/WndMain.c:1440
+#: ../win32/gui/WndMain.c:1448
msgid "DataDeck Memory Card (*.ddf)"
msgstr "Memory card DataDeck (*.ddf)"
-#: ../win32/gui/WndMain.c:1484
+#: ../win32/gui/WndMain.c:1492
msgid "Psx Exe Format"
msgstr "Formato exe della Psx"
-#: ../win32/gui/WndMain.c:1521
+#: ../win32/gui/WndMain.c:1529
msgid "Psx Isos (*.iso;*.mdf;*.img;*.bin)"
msgstr "ISO della psx (*.iso;*.mdf;*.img;*.bin)"
-#: ../win32/gui/WndMain.c:1597
+#: ../win32/gui/WndMain.c:1605
msgid "&File"
msgstr "&File"
-#: ../win32/gui/WndMain.c:1598
+#: ../win32/gui/WndMain.c:1606
msgid "E&xit"
msgstr "E&sci"
-#: ../win32/gui/WndMain.c:1600
+#: ../win32/gui/WndMain.c:1608
msgid "Run &EXE..."
msgstr "Avvia &EXE..."
-#: ../win32/gui/WndMain.c:1601
+#: ../win32/gui/WndMain.c:1609
msgid "Run &BIOS"
msgstr "Avvia &BIOS"
-#: ../win32/gui/WndMain.c:1602
+#: ../win32/gui/WndMain.c:1610
msgid "Run &ISO..."
msgstr "Avvia &ISO..."
-#: ../win32/gui/WndMain.c:1603
+#: ../win32/gui/WndMain.c:1611
msgid "Run &CD"
msgstr "Avvia &CD"
-#: ../win32/gui/WndMain.c:1605
+#: ../win32/gui/WndMain.c:1613
msgid "&Emulator"
msgstr "&Emulatore"
-#: ../win32/gui/WndMain.c:1606
+#: ../win32/gui/WndMain.c:1614
msgid "&States"
msgstr "&Stati"
-#: ../win32/gui/WndMain.c:1608
+#: ../win32/gui/WndMain.c:1616
msgid "S&witch ISO..."
msgstr "C&ambia ISO..."
-#: ../win32/gui/WndMain.c:1610
+#: ../win32/gui/WndMain.c:1618
msgid "Re&set"
msgstr "Re&setta"
-#: ../win32/gui/WndMain.c:1611
+#: ../win32/gui/WndMain.c:1619
msgid "&Run"
msgstr "&Avvia"
-#: ../win32/gui/WndMain.c:1612
+#: ../win32/gui/WndMain.c:1620
msgid "&Save"
msgstr "&Salva"
-#: ../win32/gui/WndMain.c:1613
+#: ../win32/gui/WndMain.c:1621
msgid "&Load"
msgstr "&Carica"
-#: ../win32/gui/WndMain.c:1614 ../win32/gui/WndMain.c:1624
+#: ../win32/gui/WndMain.c:1622 ../win32/gui/WndMain.c:1632
msgid "&Other..."
msgstr "&Altro..."
-#: ../win32/gui/WndMain.c:1615 ../win32/gui/WndMain.c:1625
+#: ../win32/gui/WndMain.c:1623 ../win32/gui/WndMain.c:1633
#, fuzzy
msgid "Slot &9"
msgstr "Slot &5"
-#: ../win32/gui/WndMain.c:1616 ../win32/gui/WndMain.c:1626
+#: ../win32/gui/WndMain.c:1624 ../win32/gui/WndMain.c:1634
#, fuzzy
msgid "Slot &8"
msgstr "Slot &5"
-#: ../win32/gui/WndMain.c:1617 ../win32/gui/WndMain.c:1627
+#: ../win32/gui/WndMain.c:1625 ../win32/gui/WndMain.c:1635
#, fuzzy
msgid "Slot &7"
msgstr "Slot &5"
-#: ../win32/gui/WndMain.c:1618 ../win32/gui/WndMain.c:1628
+#: ../win32/gui/WndMain.c:1626 ../win32/gui/WndMain.c:1636
#, fuzzy
msgid "Slot &6"
msgstr "Slot &5"
-#: ../win32/gui/WndMain.c:1619 ../win32/gui/WndMain.c:1629
+#: ../win32/gui/WndMain.c:1627 ../win32/gui/WndMain.c:1637
msgid "Slot &5"
msgstr "Slot &5"
-#: ../win32/gui/WndMain.c:1620 ../win32/gui/WndMain.c:1630
+#: ../win32/gui/WndMain.c:1628 ../win32/gui/WndMain.c:1638
msgid "Slot &4"
msgstr "Slot &4"
-#: ../win32/gui/WndMain.c:1621 ../win32/gui/WndMain.c:1631
+#: ../win32/gui/WndMain.c:1629 ../win32/gui/WndMain.c:1639
msgid "Slot &3"
msgstr "Slot &3"
-#: ../win32/gui/WndMain.c:1622 ../win32/gui/WndMain.c:1632
+#: ../win32/gui/WndMain.c:1630 ../win32/gui/WndMain.c:1640
msgid "Slot &2"
msgstr "Slot &2"
-#: ../win32/gui/WndMain.c:1623 ../win32/gui/WndMain.c:1633
+#: ../win32/gui/WndMain.c:1631 ../win32/gui/WndMain.c:1641
msgid "Slot &1"
msgstr "Slot &1"
-#: ../win32/gui/WndMain.c:1635
+#: ../win32/gui/WndMain.c:1643
msgid "&Configuration"
msgstr "&Configurazione"
-#: ../win32/gui/WndMain.c:1636
+#: ../win32/gui/WndMain.c:1644
msgid "Cheat &Search..."
msgstr "Cerca &cheat..."
-#: ../win32/gui/WndMain.c:1637
+#: ../win32/gui/WndMain.c:1645
msgid "Ch&eat Code..."
msgstr "Codice ch&eat..."
-#: ../win32/gui/WndMain.c:1640
+#: ../win32/gui/WndMain.c:1648
msgid "&Language"
msgstr "&Lingua"
-#: ../win32/gui/WndMain.c:1665
+#: ../win32/gui/WndMain.c:1673
msgid "&Memory cards..."
msgstr "&Memory card..."
-#: ../win32/gui/WndMain.c:1666
+#: ../win32/gui/WndMain.c:1674
msgid "C&PU..."
msgstr "C&PU..."
-#: ../win32/gui/WndMain.c:1668
+#: ../win32/gui/WndMain.c:1676
msgid "&NetPlay..."
msgstr "&NetPlay..."
-#: ../win32/gui/WndMain.c:1670
+#: ../win32/gui/WndMain.c:1678
msgid "&Controllers..."
msgstr "&Controller..."
-#: ../win32/gui/WndMain.c:1671
+#: ../win32/gui/WndMain.c:1679
msgid "CD-&ROM..."
msgstr "CD-&ROM..."
-#: ../win32/gui/WndMain.c:1672
+#: ../win32/gui/WndMain.c:1680
msgid "&Sound..."
msgstr "&Audio..."
-#: ../win32/gui/WndMain.c:1673
+#: ../win32/gui/WndMain.c:1681
msgid "&Graphics..."
msgstr "&Video..."
-#: ../win32/gui/WndMain.c:1675
+#: ../win32/gui/WndMain.c:1683
msgid "&Plugins && Bios..."
msgstr "&Plugin e Bios..."
-#: ../win32/gui/WndMain.c:1677
+#: ../win32/gui/WndMain.c:1685
msgid "&Help"
msgstr "&Aiuto"
-#: ../win32/gui/WndMain.c:1678
+#: ../win32/gui/WndMain.c:1686
msgid "&About..."
msgstr "&Informazioni..."
-#: ../win32/gui/WndMain.c:1866
-msgid "Pcsx Msg"
-msgstr "Messaggio di pcsx"
+#: ../win32/gui/WndMain.c:1874
+msgid "Pcsxr Msg"
+msgstr "Messaggio di pcsxr"
-#: ../win32/gui/WndMain.c:1869
+#: ../win32/gui/WndMain.c:1877
msgid "Error Loading Symbol"
msgstr "Si è verificato un errore durante il caricamento del simbolo"
+#~ msgid "<b>General</b>"
+#~ msgstr "<b>Generale</b>"
+
+#~ msgid "<b>XA Music</b>"
+#~ msgstr "<b>Musica XA</b>"
+
+#, fuzzy
+#~ msgid ""
+#~ "None\n"
+#~ "Low\n"
+#~ "Medium\n"
+#~ "Loud\n"
+#~ "Loudest"
+#~ msgstr ""
+#~ "Basso\n"
+#~ "Medio\n"
+#~ "Alto\n"
+#~ "Altissimo"
+
+#~ msgid ""
+#~ "None\n"
+#~ "Simple\n"
+#~ "Gaussian\n"
+#~ "Cubic"
+#~ msgstr ""
+#~ "Nessuno\n"
+#~ "Semplice\n"
+#~ "Gaussiano\n"
+#~ "Cubico"
+
+#~ msgid ""
+#~ "Default\n"
+#~ "125ms\n"
+#~ "250ms\n"
+#~ "500ms\n"
+#~ "1s\n"
+#~ "2s\n"
+#~ "4s\n"
+#~ "8s\n"
+#~ "16s\n"
+#~ "32s\n"
+#~ "1min\n"
+#~ "2min\n"
+#~ "4min\n"
+#~ "8min\n"
+#~ "16min\n"
+#~ "32min"
+#~ msgstr ""
+#~ "Default\n"
+#~ "125ms\n"
+#~ "250ms\n"
+#~ "500ms\n"
+#~ "1s\n"
+#~ "2s\n"
+#~ "4s\n"
+#~ "8s\n"
+#~ "16s\n"
+#~ "32s\n"
+#~ "1min\n"
+#~ "2min\n"
+#~ "4min\n"
+#~ "8min\n"
+#~ "16min\n"
+#~ "32min"
+
+#~ msgid "Select CD-ROM device"
+#~ msgstr "Seleziona il dispositivo CD-ROM"
+
+#~ msgid "hseparator"
+#~ msgstr "hseparator"
+
#~ msgid "0: None"
#~ msgstr "0: Nessuno"
@@ -3320,12 +3432,12 @@ msgstr "Si è verificato un errore durante il caricamento del simbolo"
#~ msgstr "&Memory card..."
#~ msgid ""
-#~ "(C) 1999-2003 PCSX Team\n"
+#~ "(C) 1999-2003 PCSX Team\n"
#~ "(C) 2005-2006 Ryan Schultz\n"
#~ "(C) 2005-2006 Andrew Burton\n"
#~ "(C) 2008-2009 Wei Mingzhi"
#~ msgstr ""
-#~ "(C) 1999-2003 PCSX Team\n"
+#~ "(C) 1999-2003 PCSX Team\n"
#~ "(C) 2005-2006 Ryan Schultz\n"
#~ "(C) 2005-2006 Andrew Burton\n"
#~ "(C) 2008-2009 Wei Mingzhi"
diff --git a/po/pcsx.pot b/po/pcsxr.pot
index 0b70ab5f..cb6adb8b 100644
--- a/po/pcsx.pot
+++ b/po/pcsxr.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: whistler_wmz@users.sf.net\n"
-"POT-Creation-Date: 2011-02-18 17:11+0800\n"
+"POT-Creation-Date: 2011-06-04 23:04+0400\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"
@@ -17,184 +17,184 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../data/pcsx.glade2.h:1
+#: ../data/pcsxr.glade2.h:1
msgid ""
"8-bit\n"
"16-bit\n"
"32-bit"
msgstr ""
-#: ../data/pcsx.glade2.h:4
+#: ../data/pcsxr.glade2.h:4
msgid "<b>BIOS</b>"
msgstr ""
-#: ../data/pcsx.glade2.h:5
+#: ../data/pcsxr.glade2.h:5
msgid "<b>Cheat Codes</b>"
msgstr ""
-#: ../data/pcsx.glade2.h:6
+#: ../data/pcsxr.glade2.h:6
msgid "<b>Cheat Search</b>"
msgstr ""
-#: ../data/pcsx.glade2.h:7
+#: ../data/pcsxr.glade2.h:7
msgid "<b>Memory Card 1</b>"
msgstr ""
-#: ../data/pcsx.glade2.h:8
+#: ../data/pcsxr.glade2.h:8
msgid "<b>Memory Card 2</b>"
msgstr ""
-#: ../data/pcsx.glade2.h:9
+#: ../data/pcsxr.glade2.h:9
msgid "<b>NetPlay</b>"
msgstr ""
-#: ../data/pcsx.glade2.h:10
+#: ../data/pcsxr.glade2.h:10
msgid "<b>Options</b>"
msgstr ""
-#: ../data/pcsx.glade2.h:11
+#: ../data/pcsxr.glade2.h:11
msgid "<b>Plugins</b>"
msgstr ""
-#: ../data/pcsx.glade2.h:12
+#: ../data/pcsxr.glade2.h:12
msgid "<b>System Type</b>"
msgstr ""
-#: ../data/pcsx.glade2.h:13 ../gui/DebugMemory.c:188
+#: ../data/pcsxr.glade2.h:13 ../gui/DebugMemory.c:188
msgid "Address (Hexadecimal):"
msgstr ""
-#: ../data/pcsx.glade2.h:14 ../win32/gui/WndMain.c:1302
+#: ../data/pcsxr.glade2.h:14 ../win32/gui/WndMain.c:1308
msgid "Autodetect"
msgstr ""
-#: ../data/pcsx.glade2.h:15
+#: ../data/pcsxr.glade2.h:15
msgid "Black & White Movies"
msgstr ""
-#: ../data/pcsx.glade2.h:16
+#: ../data/pcsxr.glade2.h:16
msgid "CD-ROM..."
msgstr ""
-#: ../data/pcsx.glade2.h:17
+#: ../data/pcsxr.glade2.h:17
msgid "CD-ROM:"
msgstr ""
-#: ../data/pcsx.glade2.h:18
+#: ../data/pcsxr.glade2.h:18
msgid "CD-_ROM..."
msgstr ""
-#: ../data/pcsx.glade2.h:19
+#: ../data/pcsxr.glade2.h:19
msgid "C_ontrollers..."
msgstr ""
-#: ../data/pcsx.glade2.h:20
+#: ../data/pcsxr.glade2.h:20
msgid "Chea_t"
msgstr ""
-#: ../data/pcsx.glade2.h:21 ../gui/Cheat.c:1129 ../win32/gui/CheatDlg.c:678
+#: ../data/pcsxr.glade2.h:21 ../gui/Cheat.c:1129 ../win32/gui/CheatDlg.c:678
msgid "Cheat Search"
msgstr ""
-#: ../data/pcsx.glade2.h:22
+#: ../data/pcsxr.glade2.h:22
msgid "Configure CD-ROM"
msgstr ""
-#: ../data/pcsx.glade2.h:23
+#: ../data/pcsxr.glade2.h:23
msgid "Configure CPU"
msgstr ""
-#: ../data/pcsx.glade2.h:24
+#: ../data/pcsxr.glade2.h:24
msgid "Configure Controllers"
msgstr ""
-#: ../data/pcsx.glade2.h:25
+#: ../data/pcsxr.glade2.h:25
msgid "Configure Graphics"
msgstr ""
-#: ../data/pcsx.glade2.h:26
+#: ../data/pcsxr.glade2.h:26
msgid "Configure Memory Cards"
msgstr ""
-#: ../data/pcsx.glade2.h:27
+#: ../data/pcsxr.glade2.h:27
msgid "Configure NetPlay"
msgstr ""
-#: ../data/pcsx.glade2.h:28 ../gui/ConfDlg.c:112
-msgid "Configure PCSX"
+#: ../data/pcsxr.glade2.h:28 ../gui/ConfDlg.c:112
+msgid "Configure PCSXR"
msgstr ""
-#: ../data/pcsx.glade2.h:29 ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:6
+#: ../data/pcsxr.glade2.h:29 ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:3
msgid "Configure Sound"
msgstr ""
-#: ../data/pcsx.glade2.h:30
+#: ../data/pcsxr.glade2.h:30
msgid "Continue Emulation"
msgstr ""
-#: ../data/pcsx.glade2.h:31
+#: ../data/pcsxr.glade2.h:31
msgid "Continue..."
msgstr ""
-#: ../data/pcsx.glade2.h:32
+#: ../data/pcsxr.glade2.h:32
msgid "Controller 1: "
msgstr ""
-#: ../data/pcsx.glade2.h:33
+#: ../data/pcsxr.glade2.h:33
msgid "Controller 2:"
msgstr ""
-#: ../data/pcsx.glade2.h:34
+#: ../data/pcsxr.glade2.h:34
msgid "Controllers..."
msgstr ""
-#: ../data/pcsx.glade2.h:35
+#: ../data/pcsxr.glade2.h:35
msgid "Copy"
msgstr ""
-#: ../data/pcsx.glade2.h:36 ../win32/gui/CheatDlg.c:683
+#: ../data/pcsxr.glade2.h:36 ../win32/gui/CheatDlg.c:683
msgid "Data Base:"
msgstr ""
-#: ../data/pcsx.glade2.h:37 ../win32/gui/CheatDlg.c:681
+#: ../data/pcsxr.glade2.h:37 ../win32/gui/CheatDlg.c:681
msgid "Data Type:"
msgstr ""
-#: ../data/pcsx.glade2.h:38
+#: ../data/pcsxr.glade2.h:38
msgid ""
"Decimal\n"
"Hexadecimal"
msgstr ""
-#: ../data/pcsx.glade2.h:40
+#: ../data/pcsxr.glade2.h:40
msgid "Disable CD Audio"
msgstr ""
-#: ../data/pcsx.glade2.h:41
+#: ../data/pcsxr.glade2.h:41
msgid "Disable XA Decoding"
msgstr ""
-#: ../data/pcsx.glade2.h:42
+#: ../data/pcsxr.glade2.h:42
msgid "E_xit"
msgstr ""
-#: ../data/pcsx.glade2.h:43 ../win32/gui/CheatDlg.c:166
+#: ../data/pcsxr.glade2.h:43 ../win32/gui/CheatDlg.c:166
msgid "Edit Cheat Codes"
msgstr ""
-#: ../data/pcsx.glade2.h:44 ../win32/gui/WndMain.c:1304
+#: ../data/pcsxr.glade2.h:44 ../win32/gui/WndMain.c:1310
msgid "Enable Console Output"
msgstr ""
-#: ../data/pcsx.glade2.h:45 ../win32/gui/WndMain.c:1305
+#: ../data/pcsxr.glade2.h:45 ../win32/gui/WndMain.c:1311
msgid "Enable Debugger"
msgstr ""
-#: ../data/pcsx.glade2.h:46
+#: ../data/pcsxr.glade2.h:46
msgid "Enable Interpreter CPU"
msgstr ""
-#: ../data/pcsx.glade2.h:47
+#: ../data/pcsxr.glade2.h:47
msgid ""
"Equal Value\n"
"Not Equal Value\n"
@@ -207,267 +207,271 @@ msgid ""
"No Change"
msgstr ""
-#: ../data/pcsx.glade2.h:56
+#: ../data/pcsxr.glade2.h:56
msgid "Format"
msgstr ""
-#: ../data/pcsx.glade2.h:57 ../win32/gui/CheatDlg.c:504
+#: ../data/pcsxr.glade2.h:57 ../win32/gui/CheatDlg.c:504
msgid "Freeze"
msgstr ""
-#: ../data/pcsx.glade2.h:58
+#: ../data/pcsxr.glade2.h:58
msgid "Graphics..."
msgstr ""
-#: ../data/pcsx.glade2.h:59
+#: ../data/pcsxr.glade2.h:59
msgid "Graphics:"
msgstr ""
-#: ../data/pcsx.glade2.h:60 ../win32/gui/WndMain.c:1308
+#: ../data/pcsxr.glade2.h:60 ../win32/gui/WndMain.c:1314
msgid "InuYasha Sengoku Battle Fix"
msgstr ""
-#: ../data/pcsx.glade2.h:61
+#: ../data/pcsxr.glade2.h:61
msgid "Memcards..."
msgstr ""
-#: ../data/pcsx.glade2.h:62 ../gui/DebugMemory.c:103
+#: ../data/pcsxr.glade2.h:62 ../gui/DebugMemory.c:103
msgid "Memory Dump"
msgstr ""
-#: ../data/pcsx.glade2.h:63
+#: ../data/pcsxr.glade2.h:63
msgid "Memory _Dump"
msgstr ""
-#: ../data/pcsx.glade2.h:64 ../win32/gui/CheatDlg.c:595
+#: ../data/pcsxr.glade2.h:64 ../win32/gui/CheatDlg.c:595
msgid "Modify"
msgstr ""
-#: ../data/pcsx.glade2.h:65
+#: ../data/pcsxr.glade2.h:65
msgid ""
"NTSC\n"
"PAL"
msgstr ""
-#: ../data/pcsx.glade2.h:67
+#: ../data/pcsxr.glade2.h:67
msgid "New"
msgstr ""
-#: ../data/pcsx.glade2.h:68
-msgid "PCSX"
+#: ../data/pcsxr.glade2.h:68
+msgid "PCSXR"
msgstr ""
-#: ../data/pcsx.glade2.h:69 ../win32/gui/WndMain.c:1307
+#: ../data/pcsxr.glade2.h:69 ../win32/gui/WndMain.c:1313
msgid "Parasite Eve 2, Vandal Hearts 1/2 Fix"
msgstr ""
-#: ../data/pcsx.glade2.h:70
+#: ../data/pcsxr.glade2.h:70
msgid "Patch Memory..."
msgstr ""
-#: ../data/pcsx.glade2.h:71
+#: ../data/pcsxr.glade2.h:71
msgid "Raw Dump..."
msgstr ""
-#: ../data/pcsx.glade2.h:72
+#: ../data/pcsxr.glade2.h:72
msgid "Restart"
msgstr ""
-#: ../data/pcsx.glade2.h:73
+#: ../data/pcsxr.glade2.h:73
msgid "Run CD"
msgstr ""
-#: ../data/pcsx.glade2.h:74
+#: ../data/pcsxr.glade2.h:74
msgid "Run ISO Image"
msgstr ""
-#: ../data/pcsx.glade2.h:75
+#: ../data/pcsxr.glade2.h:75
msgid "Run ISO..."
msgstr ""
-#: ../data/pcsx.glade2.h:76
+#: ../data/pcsxr.glade2.h:76
msgid "Run _BIOS"
msgstr ""
-#: ../data/pcsx.glade2.h:77
+#: ../data/pcsxr.glade2.h:77
msgid "Run _CD"
msgstr ""
-#: ../data/pcsx.glade2.h:78
+#: ../data/pcsxr.glade2.h:78
msgid "Run _EXE..."
msgstr ""
-#: ../data/pcsx.glade2.h:79
+#: ../data/pcsxr.glade2.h:79
msgid "Run _ISO..."
msgstr ""
-#: ../data/pcsx.glade2.h:80 ../gui/Plugin.c:239
+#: ../data/pcsxr.glade2.h:80 ../gui/Plugin.c:239
#, c-format
msgid "SIO IRQ Always Enabled"
msgstr ""
-#: ../data/pcsx.glade2.h:81
+#: ../data/pcsxr.glade2.h:81
msgid "SPU IRQ Always Enabled"
msgstr ""
-#: ../data/pcsx.glade2.h:82
+#: ../data/pcsxr.glade2.h:82
msgid "S_witch ISO..."
msgstr ""
-#: ../data/pcsx.glade2.h:83
+#: ../data/pcsxr.glade2.h:83
msgid "Search"
msgstr ""
-#: ../data/pcsx.glade2.h:84 ../win32/gui/CheatDlg.c:680
+#: ../data/pcsxr.glade2.h:84 ../win32/gui/CheatDlg.c:680
msgid "Search For:"
msgstr ""
-#: ../data/pcsx.glade2.h:85
+#: ../data/pcsxr.glade2.h:85
msgid "Search in:"
msgstr ""
-#: ../data/pcsx.glade2.h:86
+#: ../data/pcsxr.glade2.h:86
msgid "Select Folder to Search"
msgstr ""
-#: ../data/pcsx.glade2.h:87
+#: ../data/pcsxr.glade2.h:87
msgid "Slot _1"
msgstr ""
-#: ../data/pcsx.glade2.h:88
+#: ../data/pcsxr.glade2.h:88
msgid "Slot _2"
msgstr ""
-#: ../data/pcsx.glade2.h:89
+#: ../data/pcsxr.glade2.h:89
msgid "Slot _3"
msgstr ""
-#: ../data/pcsx.glade2.h:90
+#: ../data/pcsxr.glade2.h:90
msgid "Slot _4"
msgstr ""
-#: ../data/pcsx.glade2.h:91
+#: ../data/pcsxr.glade2.h:91
msgid "Slot _5"
msgstr ""
-#: ../data/pcsx.glade2.h:92
+#: ../data/pcsxr.glade2.h:92
msgid "Slot _6"
msgstr ""
-#: ../data/pcsx.glade2.h:93
+#: ../data/pcsxr.glade2.h:93
msgid "Slot _7"
msgstr ""
-#: ../data/pcsx.glade2.h:94
+#: ../data/pcsxr.glade2.h:94
msgid "Slot _8"
msgstr ""
-#: ../data/pcsx.glade2.h:95
+#: ../data/pcsxr.glade2.h:95
msgid "Slot _9"
msgstr ""
-#: ../data/pcsx.glade2.h:96
+#: ../data/pcsxr.glade2.h:96 ../win32/gui/WndMain.c:1307
+msgid "Slow Boot"
+msgstr ""
+
+#: ../data/pcsxr.glade2.h:97
msgid "Sound..."
msgstr ""
-#: ../data/pcsx.glade2.h:97
+#: ../data/pcsxr.glade2.h:98
msgid "Sound:"
msgstr ""
-#: ../data/pcsx.glade2.h:98
+#: ../data/pcsxr.glade2.h:99
msgid "Switch ISO Image"
msgstr ""
-#: ../data/pcsx.glade2.h:99
+#: ../data/pcsxr.glade2.h:100
msgid "Switch ISO..."
msgstr ""
-#: ../data/pcsx.glade2.h:100 ../win32/gui/CheatDlg.c:684
+#: ../data/pcsxr.glade2.h:101 ../win32/gui/CheatDlg.c:684
msgid "To:"
msgstr ""
-#: ../data/pcsx.glade2.h:101
+#: ../data/pcsxr.glade2.h:102
msgid "Un/Delete"
msgstr ""
-#: ../data/pcsx.glade2.h:102 ../gui/Cheat.c:647 ../win32/gui/CheatDlg.c:506
+#: ../data/pcsxr.glade2.h:103 ../gui/Cheat.c:647 ../win32/gui/CheatDlg.c:506
#: ../win32/gui/CheatDlg.c:597 ../win32/gui/CheatDlg.c:682
msgid "Value:"
msgstr ""
-#: ../data/pcsx.glade2.h:103
-msgid "_About PCSX..."
+#: ../data/pcsxr.glade2.h:104
+msgid "_About PCSXR..."
msgstr ""
-#: ../data/pcsx.glade2.h:104
+#: ../data/pcsxr.glade2.h:105
msgid "_Browse..."
msgstr ""
-#: ../data/pcsx.glade2.h:105
+#: ../data/pcsxr.glade2.h:106
msgid "_CPU..."
msgstr ""
-#: ../data/pcsx.glade2.h:106
+#: ../data/pcsxr.glade2.h:107
msgid "_Configuration"
msgstr ""
-#: ../data/pcsx.glade2.h:107
+#: ../data/pcsxr.glade2.h:108
msgid "_Continue"
msgstr ""
-#: ../data/pcsx.glade2.h:108
+#: ../data/pcsxr.glade2.h:109
msgid "_Emulator"
msgstr ""
-#: ../data/pcsx.glade2.h:109
+#: ../data/pcsxr.glade2.h:110
msgid "_File"
msgstr ""
-#: ../data/pcsx.glade2.h:110
+#: ../data/pcsxr.glade2.h:111
msgid "_Graphics..."
msgstr ""
-#: ../data/pcsx.glade2.h:111
+#: ../data/pcsxr.glade2.h:112
msgid "_Help"
msgstr ""
-#: ../data/pcsx.glade2.h:112
+#: ../data/pcsxr.glade2.h:113
msgid "_Load State"
msgstr ""
-#: ../data/pcsx.glade2.h:113
+#: ../data/pcsxr.glade2.h:114
msgid "_Memory Cards..."
msgstr ""
-#: ../data/pcsx.glade2.h:114
+#: ../data/pcsxr.glade2.h:115
msgid "_Netplay..."
msgstr ""
-#: ../data/pcsx.glade2.h:115
+#: ../data/pcsxr.glade2.h:116
msgid "_Other..."
msgstr ""
-#: ../data/pcsx.glade2.h:116
+#: ../data/pcsxr.glade2.h:117
msgid "_Plugins & BIOS..."
msgstr ""
-#: ../data/pcsx.glade2.h:117
+#: ../data/pcsxr.glade2.h:118
msgid "_Reset"
msgstr ""
-#: ../data/pcsx.glade2.h:118
+#: ../data/pcsxr.glade2.h:119
msgid "_Save State"
msgstr ""
-#: ../data/pcsx.glade2.h:119
+#: ../data/pcsxr.glade2.h:120
msgid "_Search..."
msgstr ""
-#: ../data/pcsx.glade2.h:120
+#: ../data/pcsxr.glade2.h:121
msgid "_Sound..."
msgstr ""
-#: ../data/pcsx.glade2.h:121
+#: ../data/pcsxr.glade2.h:122
msgid "label_resultsfound"
msgstr ""
@@ -475,7 +479,7 @@ msgstr ""
msgid ""
"(C) 1999-2003 PCSX Team\n"
"(C) 2005-2009 PCSX-df Team\n"
-"(C) 2009-2010 PCSX-Reloaded Team"
+"(C) 2009-2011 PCSX-Reloaded Team"
msgstr ""
#: ../gui/AboutDlg.c:77
@@ -516,8 +520,8 @@ msgstr ""
msgid "Cheat Code:"
msgstr ""
-#: ../gui/Cheat.c:155 ../gui/Cheat.c:251 ../gui/LnxMain.c:422
-#: ../win32/gui/ConfigurePlugins.c:305
+#: ../gui/Cheat.c:155 ../gui/Cheat.c:251 ../gui/LnxMain.c:421
+#: ../win32/gui/ConfigurePlugins.c:307
msgid "Error"
msgstr ""
@@ -535,11 +539,11 @@ msgid "Open Cheat File"
msgstr ""
#: ../gui/Cheat.c:316 ../gui/Cheat.c:356
-msgid "PCSX Cheat Code Files (*.cht)"
+msgid "PCSXR Cheat Code Files (*.cht)"
msgstr ""
#: ../gui/Cheat.c:321 ../gui/Gtk2Gui.c:446 ../gui/Gtk2Gui.c:587
-#: ../win32/gui/WndMain.c:1445 ../win32/gui/WndMain.c:1526
+#: ../win32/gui/WndMain.c:1453 ../win32/gui/WndMain.c:1534
msgid "All Files"
msgstr ""
@@ -641,7 +645,7 @@ msgstr ""
msgid "Could not open directory: '%s'\n"
msgstr ""
-#. The BIOS list always contains the PCSX internal BIOS
+#. The BIOS list always contains the PCSXR internal BIOS
#: ../gui/ConfDlg.c:675
msgid "Simulate PSX BIOS"
msgstr ""
@@ -711,14 +715,14 @@ msgstr ""
msgid "CD ROM failed"
msgstr ""
-#: ../gui/Gtk2Gui.c:508 ../gui/Gtk2Gui.c:649 ../win32/gui/WndMain.c:464
-#: ../win32/gui/WndMain.c:516 ../win32/gui/WndMain.c:585
+#: ../gui/Gtk2Gui.c:508 ../gui/Gtk2Gui.c:649 ../win32/gui/WndMain.c:469
+#: ../win32/gui/WndMain.c:521 ../win32/gui/WndMain.c:590
#, c-format
msgid "The CD does not appear to be a valid Playstation CD"
msgstr ""
-#: ../gui/Gtk2Gui.c:519 ../gui/Gtk2Gui.c:660 ../win32/gui/WndMain.c:474
-#: ../win32/gui/WndMain.c:526 ../win32/gui/WndMain.c:595
+#: ../gui/Gtk2Gui.c:519 ../gui/Gtk2Gui.c:660 ../win32/gui/WndMain.c:479
+#: ../win32/gui/WndMain.c:531 ../win32/gui/WndMain.c:600
#, c-format
msgid "Could not load CD-ROM!"
msgstr ""
@@ -776,14 +780,14 @@ msgstr ""
msgid "Creating memory card: %s\n"
msgstr ""
-#: ../gui/LnxMain.c:329
+#: ../gui/LnxMain.c:328
msgid ""
-" pcsx [options] [file]\n"
+" pcsxr [options] [file]\n"
"\toptions:\n"
"\t-runcd\t\tRuns CD-ROM\n"
"\t-cdfile FILE\tRuns a CD image file\n"
"\t-nogui\t\tDon't open the GTK GUI\n"
-"\t-cfg FILE\tLoads desired configuration file (default: ~/.pcsx/pcsx.cfg)\n"
+"\t-cfg FILE\tLoads desired configuration file (default: ~/.pcsxr/pcsxr.cfg)\n"
"\t-psxout\t\tEnable PSX output\n"
"\t-slowboot\tEnable BIOS Logo\n"
"\t-load STATENUM\tLoads savestate STATENUM (1-9)\n"
@@ -791,23 +795,23 @@ msgid ""
"\tfile\t\tLoads file\n"
msgstr ""
-#: ../gui/LnxMain.c:366
+#: ../gui/LnxMain.c:365
#, c-format
msgid ""
-"PCSX cannot be configured without using the GUI -- you should restart "
+"PCSXR cannot be configured without using the GUI -- you should restart "
"without -nogui.\n"
msgstr ""
-#: ../gui/LnxMain.c:422
+#: ../gui/LnxMain.c:421
msgid "Failed loading plugins!"
msgstr ""
-#: ../gui/LnxMain.c:441
+#: ../gui/LnxMain.c:440
#, c-format
msgid "Could not load CD-ROM!\n"
msgstr ""
-#: ../gui/LnxMain.c:472
+#: ../gui/LnxMain.c:471
#, c-format
msgid "PSX emulator couldn't be initialized.\n"
msgstr ""
@@ -816,11 +820,11 @@ msgstr ""
msgid "Icon"
msgstr ""
-#: ../gui/MemcardDlg.c:66 ../win32/gui/WndMain.c:749
+#: ../gui/MemcardDlg.c:66 ../win32/gui/WndMain.c:754
msgid "Title"
msgstr ""
-#: ../gui/MemcardDlg.c:72 ../win32/gui/WndMain.c:755
+#: ../gui/MemcardDlg.c:72 ../win32/gui/WndMain.c:760
msgid "Status"
msgstr ""
@@ -832,17 +836,17 @@ msgstr ""
msgid "Name"
msgstr ""
-#: ../gui/MemcardDlg.c:192 ../gui/MemcardDlg.c:297 ../win32/gui/WndMain.c:960
+#: ../gui/MemcardDlg.c:192 ../gui/MemcardDlg.c:297 ../win32/gui/WndMain.c:965
msgid "Deleted"
msgstr ""
#: ../gui/MemcardDlg.c:194 ../gui/MemcardDlg.c:198 ../gui/MemcardDlg.c:299
-#: ../gui/MemcardDlg.c:303 ../win32/gui/WndMain.c:961
-#: ../win32/gui/WndMain.c:964
+#: ../gui/MemcardDlg.c:303 ../win32/gui/WndMain.c:966
+#: ../win32/gui/WndMain.c:969
msgid "Free"
msgstr ""
-#: ../gui/MemcardDlg.c:196 ../gui/MemcardDlg.c:301 ../win32/gui/WndMain.c:963
+#: ../gui/MemcardDlg.c:196 ../gui/MemcardDlg.c:301 ../win32/gui/WndMain.c:968
msgid "Used"
msgstr ""
@@ -1097,23 +1101,23 @@ msgstr ""
msgid "Plugins loaded.\n"
msgstr ""
-#: ../libpcsxcore/ppf.c:217
+#: ../libpcsxcore/ppf.c:219
#, c-format
msgid "Invalid PPF patch: %s.\n"
msgstr ""
-#: ../libpcsxcore/ppf.c:293
+#: ../libpcsxcore/ppf.c:295
#, c-format
msgid "Unsupported PPF version (%d).\n"
msgstr ""
#. build address array
-#: ../libpcsxcore/ppf.c:332
+#: ../libpcsxcore/ppf.c:334
#, c-format
msgid "Loaded PPF %d.0 patch: %s.\n"
msgstr ""
-#: ../libpcsxcore/ppf.c:377
+#: ../libpcsxcore/ppf.c:381
#, c-format
msgid "Loaded SBI file: %s.\n"
msgstr ""
@@ -1129,29 +1133,29 @@ msgstr ""
#: ../libpcsxcore/r3000a.c:34
#, c-format
-msgid "Running PCSX Version %s (%s).\n"
+msgid "Running PCSXR Version %s (%s).\n"
msgstr ""
-#: ../libpcsxcore/sio.c:839
+#: ../libpcsxcore/sio.c:843
msgid "Connection closed!\n"
msgstr ""
-#: ../libpcsxcore/sio.c:872
+#: ../libpcsxcore/sio.c:876
#, c-format
msgid "No memory card value was specified - creating a default card %s\n"
msgstr ""
-#: ../libpcsxcore/sio.c:876
+#: ../libpcsxcore/sio.c:880
#, c-format
msgid "The memory card %s doesn't exist - creating it\n"
msgstr ""
-#: ../libpcsxcore/sio.c:892
+#: ../libpcsxcore/sio.c:896
#, c-format
msgid "Memory card %s failed to load!\n"
msgstr ""
-#: ../libpcsxcore/sio.c:896
+#: ../libpcsxcore/sio.c:900
#, c-format
msgid "Loading memory card %s\n"
msgstr ""
@@ -1164,243 +1168,281 @@ msgstr ""
msgid "CDR NULL Plugin"
msgstr ""
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:1
-#: ../plugins/dfcdrom/cdrcfg-0.1df/main.c:219
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:1
+msgid "125ms"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:2
+msgid "16min"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:3
+msgid "16s"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:4
+msgid "1min"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:5
+msgid "1s"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:6
+msgid "250ms"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:7
+msgid "2min"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:8
+msgid "2s"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:9
+msgid "32min"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:10
+msgid "32s"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:11
+msgid "4min"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:12
+msgid "4s"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:13
+msgid "500ms"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:14
+msgid "8min"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:15
+msgid "8s"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:16
+#: ../plugins/dfcdrom/cdrcfg-0.1df/main.c:206
msgid "CDR configuration"
msgstr ""
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:2
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:17
msgid "Cache Size (Def. 64):"
msgstr ""
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:3
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:18
msgid "Cdrom Speed (Def. 0 = MAX):"
msgstr ""
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:4
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:19
msgid "Choose your CD-ROM device or type its path if it's not listed"
msgstr ""
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:5
-msgid ""
-"Default\n"
-"125ms\n"
-"250ms\n"
-"500ms\n"
-"1s\n"
-"2s\n"
-"4s\n"
-"8s\n"
-"16s\n"
-"32s\n"
-"1min\n"
-"2min\n"
-"4min\n"
-"8min\n"
-"16min\n"
-"32min"
-msgstr ""
-
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:21
-msgid "Enable subchannel read"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:20
+msgid "Default"
msgstr ""
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:22
-msgid ""
-"Normal (No Cache)\n"
-"Threaded - Faster (With Cache)"
-msgstr ""
-
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:24
-#: ../plugins/dfinput/dfinput.ui.h:8 ../win32/gui/WndMain.c:1310
-msgid "Options"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:21
+msgid "Enable subchannel read"
msgstr ""
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:25
-msgid "Select CD-ROM device"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:22
+msgid "Normal (No Cache)"
msgstr ""
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:26
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:23
msgid "Select read mode:"
msgstr ""
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:27
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:24
msgid "Spindown Time:"
msgstr ""
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:28
-msgid "hseparator"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:25
+msgid "Threaded - Faster (With Cache)"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:48
+#: ../plugins/dfinput/cfg-gtk2.c:49
msgid "D-Pad Up"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:49
+#: ../plugins/dfinput/cfg-gtk2.c:50
msgid "D-Pad Down"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:50
+#: ../plugins/dfinput/cfg-gtk2.c:51
msgid "D-Pad Left"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:51
+#: ../plugins/dfinput/cfg-gtk2.c:52
msgid "D-Pad Right"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:52
+#: ../plugins/dfinput/cfg-gtk2.c:53
msgid "Cross"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:53
+#: ../plugins/dfinput/cfg-gtk2.c:54
msgid "Circle"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:54
+#: ../plugins/dfinput/cfg-gtk2.c:55
msgid "Square"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:55
+#: ../plugins/dfinput/cfg-gtk2.c:56
msgid "Triangle"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:56
+#: ../plugins/dfinput/cfg-gtk2.c:57
msgid "L1"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:57
+#: ../plugins/dfinput/cfg-gtk2.c:58
msgid "R1"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:58
+#: ../plugins/dfinput/cfg-gtk2.c:59
msgid "L2"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:59
+#: ../plugins/dfinput/cfg-gtk2.c:60
msgid "R2"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:60
+#: ../plugins/dfinput/cfg-gtk2.c:61
msgid "Select"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:61
+#: ../plugins/dfinput/cfg-gtk2.c:62
msgid "Start"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:62
+#: ../plugins/dfinput/cfg-gtk2.c:63
msgid "L3"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:63
+#: ../plugins/dfinput/cfg-gtk2.c:64
msgid "R3"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:67
+#: ../plugins/dfinput/cfg-gtk2.c:65
+msgid "Analog"
+msgstr ""
+
+#: ../plugins/dfinput/cfg-gtk2.c:69
msgid "L-Stick Right"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:68
+#: ../plugins/dfinput/cfg-gtk2.c:70
msgid "L-Stick Left"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:69
+#: ../plugins/dfinput/cfg-gtk2.c:71
msgid "L-Stick Down"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:70
+#: ../plugins/dfinput/cfg-gtk2.c:72
msgid "L-Stick Up"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:71
+#: ../plugins/dfinput/cfg-gtk2.c:73
msgid "R-Stick Right"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:72
+#: ../plugins/dfinput/cfg-gtk2.c:74
msgid "R-Stick Left"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:73
+#: ../plugins/dfinput/cfg-gtk2.c:75
msgid "R-Stick Down"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:74
+#: ../plugins/dfinput/cfg-gtk2.c:76
msgid "R-Stick Up"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:100 ../plugins/dfinput/cfg-gtk2.c:139
+#: ../plugins/dfinput/cfg-gtk2.c:102 ../plugins/dfinput/cfg-gtk2.c:141
msgid "Centered"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:100 ../plugins/dfinput/cfg-gtk2.c:139
+#: ../plugins/dfinput/cfg-gtk2.c:102 ../plugins/dfinput/cfg-gtk2.c:141
msgid "Up"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:100 ../plugins/dfinput/cfg-gtk2.c:139
+#: ../plugins/dfinput/cfg-gtk2.c:102 ../plugins/dfinput/cfg-gtk2.c:141
msgid "Right"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:100 ../plugins/dfinput/cfg-gtk2.c:139
+#: ../plugins/dfinput/cfg-gtk2.c:102 ../plugins/dfinput/cfg-gtk2.c:141
msgid "Rightup"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:101 ../plugins/dfinput/cfg-gtk2.c:140
+#: ../plugins/dfinput/cfg-gtk2.c:103 ../plugins/dfinput/cfg-gtk2.c:142
msgid "Down"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:101 ../plugins/dfinput/cfg-gtk2.c:140
+#: ../plugins/dfinput/cfg-gtk2.c:103 ../plugins/dfinput/cfg-gtk2.c:142
msgid "Rightdown"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:101 ../plugins/dfinput/cfg-gtk2.c:140
+#: ../plugins/dfinput/cfg-gtk2.c:103 ../plugins/dfinput/cfg-gtk2.c:142
msgid "Left"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:101 ../plugins/dfinput/cfg-gtk2.c:140
+#: ../plugins/dfinput/cfg-gtk2.c:103 ../plugins/dfinput/cfg-gtk2.c:142
msgid "Leftup"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:102 ../plugins/dfinput/cfg-gtk2.c:141
+#: ../plugins/dfinput/cfg-gtk2.c:104 ../plugins/dfinput/cfg-gtk2.c:143
msgid "Leftdown"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:106 ../plugins/dfinput/cfg-gtk2.c:145
+#: ../plugins/dfinput/cfg-gtk2.c:108 ../plugins/dfinput/cfg-gtk2.c:147
#, c-format
msgid "Joystick: Button %d"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:110 ../plugins/dfinput/cfg-gtk2.c:149
+#: ../plugins/dfinput/cfg-gtk2.c:112 ../plugins/dfinput/cfg-gtk2.c:151
#, c-format
msgid "Joystick: Axis %d%c"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:115 ../plugins/dfinput/cfg-gtk2.c:154
+#: ../plugins/dfinput/cfg-gtk2.c:117 ../plugins/dfinput/cfg-gtk2.c:156
#, c-format
msgid "Joystick: Hat %d %s"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:130 ../plugins/dfinput/cfg-gtk2.c:169
+#: ../plugins/dfinput/cfg-gtk2.c:132 ../plugins/dfinput/cfg-gtk2.c:171
msgid "Keyboard:"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:134 ../plugins/dfinput/cfg-gtk2.c:173
+#: ../plugins/dfinput/cfg-gtk2.c:136 ../plugins/dfinput/cfg-gtk2.c:175
msgid "(Not Set)"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:542
+#: ../plugins/dfinput/cfg-gtk2.c:562
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:13
#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:55
msgid "None"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:584
+#: ../plugins/dfinput/cfg-gtk2.c:604
msgid "Gamepad/Keyboard Input Configuration"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:590 ../plugins/dfinput/cfg-gtk2.c:610
+#: ../plugins/dfinput/cfg-gtk2.c:610 ../plugins/dfinput/cfg-gtk2.c:630
msgid "Key"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:596 ../plugins/dfinput/cfg-gtk2.c:616
+#: ../plugins/dfinput/cfg-gtk2.c:616 ../plugins/dfinput/cfg-gtk2.c:636
msgid "Button"
msgstr ""
@@ -1429,19 +1471,27 @@ msgid "Digital Pad"
msgstr ""
#: ../plugins/dfinput/dfinput.ui.h:7
+msgid "Mouse"
+msgstr ""
+
+#: ../plugins/dfinput/dfinput.ui.h:8
msgid "Multi-Threaded (Recommended)"
msgstr ""
-#: ../plugins/dfinput/dfinput.ui.h:9
-msgid "Reset"
+#: ../plugins/dfinput/dfinput.ui.h:9 ../win32/gui/WndMain.c:1316
+msgid "Options"
msgstr ""
#: ../plugins/dfinput/dfinput.ui.h:10
+msgid "Reset"
+msgstr ""
+
+#: ../plugins/dfinput/dfinput.ui.h:11
msgid "Type:"
msgstr ""
-#: ../plugins/dfinput/pad.c:24
-msgid "Gamepad/Keyboard Input"
+#: ../plugins/dfinput/pad.c:29
+msgid "Gamepad/Keyboard/Mouse Input"
msgstr ""
#. increase that with each version
@@ -1458,28 +1508,29 @@ msgstr ""
msgid "Error allocating memory!\n"
msgstr ""
-#: ../plugins/dfnet/dfnet.ui.h:1
+#. ****************************************************************************
+#: ../plugins/dfnet/dfnet.ui.h:1 ../plugins/bladesio1/sio1.ui.h:1
msgid "Client (Player2)"
msgstr ""
-#: ../plugins/dfnet/dfnet.ui.h:2
+#: ../plugins/dfnet/dfnet.ui.h:2 ../plugins/bladesio1/sio1.ui.h:2
msgid "Copy PC IP to Clipboard"
msgstr ""
-#: ../plugins/dfnet/dfnet.ui.h:3
+#: ../plugins/dfnet/dfnet.ui.h:3 ../plugins/bladesio1/sio1.ui.h:3
msgid ""
"Do not change if not necessary (remember it must be changed on both sides)."
msgstr ""
-#: ../plugins/dfnet/dfnet.ui.h:4
+#: ../plugins/dfnet/dfnet.ui.h:4 ../plugins/bladesio1/sio1.ui.h:4
msgid "Play Offline"
msgstr ""
-#: ../plugins/dfnet/dfnet.ui.h:5
+#: ../plugins/dfnet/dfnet.ui.h:5 ../plugins/bladesio1/sio1.ui.h:5
msgid "Port Number"
msgstr ""
-#: ../plugins/dfnet/dfnet.ui.h:6
+#: ../plugins/dfnet/dfnet.ui.h:6 ../plugins/bladesio1/sio1.ui.h:6
msgid ""
"Select here if you'll be Server (Player1) or Client (Player2).\n"
"\n"
@@ -1490,16 +1541,16 @@ msgid ""
"the IP Address Control."
msgstr ""
-#: ../plugins/dfnet/dfnet.ui.h:11
+#: ../plugins/dfnet/dfnet.ui.h:11 ../plugins/bladesio1/sio1.ui.h:11
msgid "Server (Player1)"
msgstr ""
-#: ../plugins/dfnet/dfnet.ui.h:12
+#: ../plugins/dfnet/dfnet.ui.h:12 ../plugins/bladesio1/sio1.ui.h:12
msgid "Start Game"
msgstr ""
#: ../plugins/dfnet/gui.c:30 ../plugins/dfnet/gui.c:112
-#: ../win32/gui/ConfigurePlugins.c:616
+#: ../win32/gui/ConfigurePlugins.c:618
msgid "NetPlay"
msgstr ""
@@ -1554,88 +1605,87 @@ msgid ""
"Coded by Pete Bernert and the P.E.Op.S. team\n"
msgstr ""
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:1
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2.h:20
-msgid "<b>Compatibility</b>"
-msgstr ""
-
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:2
-msgid "<b>General</b>"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:1
+msgid "Adjust XA speed"
msgstr ""
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:3
-msgid "<b>XA Music</b>"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:2
+msgid "Choose this if XA music is played too quickly."
msgstr ""
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:4
-msgid "Adjust XA speed"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:4
+msgid "Cubic"
msgstr ""
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:5
-msgid "Choose this if XA music is played too quickly."
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:5
+msgid "Frequency Response - Output Filter"
msgstr ""
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:7
-msgid "Frequency Response - Output Filter"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:6
+msgid "Gaussian"
msgstr ""
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:8
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:7
msgid "High compatibility mode"
msgstr ""
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:9
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:8
msgid "Interpolation:"
msgstr ""
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:10
-msgid ""
-"None\n"
-"Low\n"
-"Medium\n"
-"Loud\n"
-"Loudest"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:9
+msgid "Loud"
msgstr ""
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:15
-msgid ""
-"None\n"
-"Simple\n"
-"Gaussian\n"
-"Cubic"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:10
+msgid "Loudest"
msgstr ""
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:19
-msgid ""
-"Off\n"
-"Simple\n"
-"Playstation"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:11
+msgid "Low"
msgstr ""
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:22
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:12
+msgid "Medium"
+msgstr ""
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:14
+msgid "Off"
+msgstr ""
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:15
msgid "Play only one channel for a performance boost."
msgstr ""
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:23
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:16
+msgid "Playstation"
+msgstr ""
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:17
msgid "Reverb:"
msgstr ""
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:24
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:18
msgid "SPU IRQ Wait"
msgstr ""
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:25
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:19
+msgid "Simple"
+msgstr ""
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:20
msgid "Single channel sound"
msgstr ""
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:26
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:21
msgid "Use the asynchronous SPU interface."
msgstr ""
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:27
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:22
msgid "Volume:"
msgstr ""
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:28
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:23
msgid "Wait for CPU; only useful for some games."
msgstr ""
@@ -1707,6 +1757,10 @@ msgid ""
"1600x1200"
msgstr ""
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2.h:20
+msgid "<b>Compatibility</b>"
+msgstr ""
+
#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2.h:21
msgid "<b>Framerate</b>"
msgstr ""
@@ -2209,6 +2263,10 @@ msgstr ""
msgid "Yellow rect (FF9)"
msgstr ""
+#: ../plugins/bladesio1/gui.c:32
+msgid "Link cable"
+msgstr ""
+
#. ****************************************************************************
#: ../plugins/bladesio1/sio1.c:29
msgid "Sio1 Driver"
@@ -2216,7 +2274,7 @@ msgstr ""
#: ../win32/gui/AboutDlg.c:26
msgid ""
-"PCSX - A PlayStation Emulator\n"
+"PCSXR - A PlayStation Emulator\n"
"\n"
"Original Authors:\n"
"main coder: linuzappz\n"
@@ -2232,7 +2290,7 @@ msgid ""
"Marcus Comstedt, Stefan Sikora\n"
"\n"
"PCSX-Reloaded By:\n"
-"Blade_Arma, shalma, Wei Mingzhi, et al.\n"
+"edgbla, shalma, Wei Mingzhi, et al.\n"
"\n"
"http://pcsxr.codeplex.com/"
msgstr ""
@@ -2243,13 +2301,13 @@ msgstr ""
#: ../win32/gui/AboutDlg.c:48 ../win32/gui/AboutDlg.c:52
#: ../win32/gui/CheatDlg.c:69 ../win32/gui/CheatDlg.c:119
-#: ../win32/gui/ConfigurePlugins.c:483 ../win32/gui/ConfigurePlugins.c:614
-#: ../win32/gui/WndMain.c:1059 ../win32/gui/WndMain.c:1295
+#: ../win32/gui/ConfigurePlugins.c:485 ../win32/gui/ConfigurePlugins.c:616
+#: ../win32/gui/WndMain.c:1064 ../win32/gui/WndMain.c:1300
msgid "OK"
msgstr ""
#: ../win32/gui/AboutDlg.c:49
-msgid "PCSX EMU\n"
+msgid "PCSXR EMU\n"
msgstr ""
#: ../win32/gui/CheatDlg.c:51 ../win32/gui/CheatDlg.c:223
@@ -2263,8 +2321,8 @@ msgid "No"
msgstr ""
#: ../win32/gui/CheatDlg.c:70 ../win32/gui/CheatDlg.c:120
-#: ../win32/gui/ConfigurePlugins.c:484 ../win32/gui/ConfigurePlugins.c:615
-#: ../win32/gui/WndMain.c:1060 ../win32/gui/WndMain.c:1296
+#: ../win32/gui/ConfigurePlugins.c:486 ../win32/gui/ConfigurePlugins.c:617
+#: ../win32/gui/WndMain.c:1065 ../win32/gui/WndMain.c:1301
msgid "Cancel"
msgstr ""
@@ -2301,7 +2359,7 @@ msgid "Enabled"
msgstr ""
#: ../win32/gui/CheatDlg.c:282 ../win32/gui/CheatDlg.c:311
-msgid "PCSX Cheat Code Files"
+msgid "PCSXR Cheat Code Files"
msgstr ""
#: ../win32/gui/CheatDlg.c:402
@@ -2397,149 +2455,149 @@ msgstr ""
msgid "Hexadecimal"
msgstr ""
-#: ../win32/gui/ConfigurePlugins.c:219
+#: ../win32/gui/ConfigurePlugins.c:221
msgid "Simulate Psx Bios"
msgstr ""
-#: ../win32/gui/ConfigurePlugins.c:305
+#: ../win32/gui/ConfigurePlugins.c:307
msgid "Configuration not OK!"
msgstr ""
-#: ../win32/gui/ConfigurePlugins.c:406
+#: ../win32/gui/ConfigurePlugins.c:408
msgid "This plugin reports that should work correctly"
msgstr ""
-#: ../win32/gui/ConfigurePlugins.c:407
+#: ../win32/gui/ConfigurePlugins.c:409
msgid "This plugin reports that should not work correctly"
msgstr ""
-#: ../win32/gui/ConfigurePlugins.c:463
+#: ../win32/gui/ConfigurePlugins.c:465
msgid "Select Plugins Directory"
msgstr ""
-#: ../win32/gui/ConfigurePlugins.c:472
+#: ../win32/gui/ConfigurePlugins.c:474
msgid "Select Bios Directory"
msgstr ""
-#: ../win32/gui/ConfigurePlugins.c:481
+#: ../win32/gui/ConfigurePlugins.c:483
msgid "Configuration"
msgstr ""
-#: ../win32/gui/ConfigurePlugins.c:485
+#: ../win32/gui/ConfigurePlugins.c:487
msgid "Graphics"
msgstr ""
-#: ../win32/gui/ConfigurePlugins.c:486
+#: ../win32/gui/ConfigurePlugins.c:488
msgid "First Controller"
msgstr ""
-#: ../win32/gui/ConfigurePlugins.c:487
+#: ../win32/gui/ConfigurePlugins.c:489
msgid "Second Controller"
msgstr ""
-#: ../win32/gui/ConfigurePlugins.c:488
+#: ../win32/gui/ConfigurePlugins.c:490
msgid "Sound"
msgstr ""
-#: ../win32/gui/ConfigurePlugins.c:489
+#: ../win32/gui/ConfigurePlugins.c:491
msgid "Cdrom"
msgstr ""
-#: ../win32/gui/ConfigurePlugins.c:490
+#: ../win32/gui/ConfigurePlugins.c:492
msgid "Bios"
msgstr ""
-#: ../win32/gui/ConfigurePlugins.c:491
+#: ../win32/gui/ConfigurePlugins.c:493
msgid "Set Bios Directory"
msgstr ""
-#: ../win32/gui/ConfigurePlugins.c:492
+#: ../win32/gui/ConfigurePlugins.c:494
msgid "Set Plugins Directory"
msgstr ""
-#: ../win32/gui/ConfigurePlugins.c:493 ../win32/gui/ConfigurePlugins.c:496
-#: ../win32/gui/ConfigurePlugins.c:499 ../win32/gui/ConfigurePlugins.c:502
-#: ../win32/gui/ConfigurePlugins.c:505 ../win32/gui/ConfigurePlugins.c:617
+#: ../win32/gui/ConfigurePlugins.c:495 ../win32/gui/ConfigurePlugins.c:498
+#: ../win32/gui/ConfigurePlugins.c:501 ../win32/gui/ConfigurePlugins.c:504
+#: ../win32/gui/ConfigurePlugins.c:507 ../win32/gui/ConfigurePlugins.c:619
msgid "Configure..."
msgstr ""
-#: ../win32/gui/ConfigurePlugins.c:494 ../win32/gui/ConfigurePlugins.c:497
-#: ../win32/gui/ConfigurePlugins.c:500 ../win32/gui/ConfigurePlugins.c:503
-#: ../win32/gui/ConfigurePlugins.c:506 ../win32/gui/ConfigurePlugins.c:618
+#: ../win32/gui/ConfigurePlugins.c:496 ../win32/gui/ConfigurePlugins.c:499
+#: ../win32/gui/ConfigurePlugins.c:502 ../win32/gui/ConfigurePlugins.c:505
+#: ../win32/gui/ConfigurePlugins.c:508 ../win32/gui/ConfigurePlugins.c:620
msgid "Test..."
msgstr ""
-#: ../win32/gui/ConfigurePlugins.c:495 ../win32/gui/ConfigurePlugins.c:498
-#: ../win32/gui/ConfigurePlugins.c:501 ../win32/gui/ConfigurePlugins.c:504
-#: ../win32/gui/ConfigurePlugins.c:507 ../win32/gui/ConfigurePlugins.c:619
+#: ../win32/gui/ConfigurePlugins.c:497 ../win32/gui/ConfigurePlugins.c:500
+#: ../win32/gui/ConfigurePlugins.c:503 ../win32/gui/ConfigurePlugins.c:506
+#: ../win32/gui/ConfigurePlugins.c:509 ../win32/gui/ConfigurePlugins.c:621
msgid "About..."
msgstr ""
-#: ../win32/gui/ConfigurePlugins.c:612
+#: ../win32/gui/ConfigurePlugins.c:614
msgid "NetPlay Configuration"
msgstr ""
-#: ../win32/gui/ConfigurePlugins.c:620
+#: ../win32/gui/ConfigurePlugins.c:622
msgid ""
"Note: The NetPlay Plugin Directory should be the same as the other Plugins."
msgstr ""
-#: ../win32/gui/plugin.c:94 ../win32/gui/WndMain.c:323
+#: ../win32/gui/plugin.c:94 ../win32/gui/WndMain.c:328
#, c-format
-msgid "*PCSX*: Saved State %d"
+msgid "*PCSXR*: Saved State %d"
msgstr ""
-#: ../win32/gui/plugin.c:95 ../win32/gui/WndMain.c:324
+#: ../win32/gui/plugin.c:95 ../win32/gui/WndMain.c:329
#, c-format
-msgid "*PCSX*: Error Saving State %d"
+msgid "*PCSXR*: Error Saving State %d"
msgstr ""
-#: ../win32/gui/plugin.c:111 ../win32/gui/WndMain.c:301
+#: ../win32/gui/plugin.c:111 ../win32/gui/WndMain.c:306
#, c-format
-msgid "*PCSX*: Loaded State %d"
+msgid "*PCSXR*: Loaded State %d"
msgstr ""
-#: ../win32/gui/plugin.c:112 ../win32/gui/WndMain.c:302
+#: ../win32/gui/plugin.c:112 ../win32/gui/WndMain.c:307
#, c-format
-msgid "*PCSX*: Error Loading State %d"
+msgid "*PCSXR*: Error Loading State %d"
msgstr ""
#: ../win32/gui/plugin.c:123
#, c-format
-msgid "*PCSX*: Sio Irq Always Enabled"
+msgid "*PCSXR*: Sio Irq Always Enabled"
msgstr ""
#: ../win32/gui/plugin.c:124
#, c-format
-msgid "*PCSX*: Sio Irq Not Always Enabled"
+msgid "*PCSXR*: Sio Irq Not Always Enabled"
msgstr ""
#: ../win32/gui/plugin.c:131
#, c-format
-msgid "*PCSX*: Black&White Mdecs Only Enabled"
+msgid "*PCSXR*: Black&White Mdecs Only Enabled"
msgstr ""
#: ../win32/gui/plugin.c:132
#, c-format
-msgid "*PCSX*: Black&White Mdecs Only Disabled"
+msgid "*PCSXR*: Black&White Mdecs Only Disabled"
msgstr ""
#: ../win32/gui/plugin.c:139
#, c-format
-msgid "*PCSX*: Xa Enabled"
+msgid "*PCSXR*: Xa Enabled"
msgstr ""
#: ../win32/gui/plugin.c:140
#, c-format
-msgid "*PCSX*: Xa Disabled"
+msgid "*PCSXR*: Xa Disabled"
msgstr ""
#: ../win32/gui/plugin.c:149
-msgid "*PCSX*: CdRom Case Opened"
+msgid "*PCSXR*: CdRom Case Opened"
msgstr ""
#: ../win32/gui/plugin.c:155
-msgid "*PCSX*: CdRom Case Closed"
+msgid "*PCSXR*: CdRom Case Closed"
msgstr ""
#: ../win32/gui/plugin.c:183
@@ -2633,8 +2691,8 @@ msgstr ""
msgid "Greek"
msgstr ""
-#: ../win32/gui/WndMain.c:81 ../win32/gui/WndMain.c:1659
-#: ../win32/gui/WndMain.c:1661
+#: ../win32/gui/WndMain.c:81 ../win32/gui/WndMain.c:1667
+#: ../win32/gui/WndMain.c:1669
msgid "English"
msgstr ""
@@ -2684,7 +2742,7 @@ msgstr ""
#: ../win32/gui/WndMain.c:215
msgid ""
-"Usage: pcsx [options]\n"
+"Usage: pcsxr [options]\n"
"\toptions:\n"
"\t-nogui\t\tDon't open the GUI\n"
"\t-psxout\t\tEnable PSX output\n"
@@ -2694,323 +2752,323 @@ msgid ""
"\t-help\t\tDisplay this message"
msgstr ""
-#: ../win32/gui/WndMain.c:342 ../win32/gui/WndMain.c:388
-msgid "PCSX State Format"
+#: ../win32/gui/WndMain.c:347 ../win32/gui/WndMain.c:393
+msgid "PCSXR State Format"
msgstr ""
-#: ../win32/gui/WndMain.c:369
+#: ../win32/gui/WndMain.c:374
#, c-format
-msgid "*PCSX*: Loaded State %s"
+msgid "*PCSXR*: Loaded State %s"
msgstr ""
-#: ../win32/gui/WndMain.c:370
+#: ../win32/gui/WndMain.c:375
#, c-format
-msgid "*PCSX*: Error Loading State %s"
+msgid "*PCSXR*: Error Loading State %s"
msgstr ""
-#: ../win32/gui/WndMain.c:415
+#: ../win32/gui/WndMain.c:420
#, c-format
-msgid "*PCSX*: Saved State %s"
+msgid "*PCSXR*: Saved State %s"
msgstr ""
-#: ../win32/gui/WndMain.c:416
+#: ../win32/gui/WndMain.c:421
#, c-format
-msgid "*PCSX*: Error Saving State %s"
+msgid "*PCSXR*: Error Saving State %s"
msgstr ""
-#: ../win32/gui/WndMain.c:484
+#: ../win32/gui/WndMain.c:489
msgid "Running BIOS is not supported with Internal HLE Bios."
msgstr ""
-#: ../win32/gui/WndMain.c:761
+#: ../win32/gui/WndMain.c:766
msgid "Game ID"
msgstr ""
-#: ../win32/gui/WndMain.c:767
+#: ../win32/gui/WndMain.c:772
msgid "Game"
msgstr ""
-#: ../win32/gui/WndMain.c:949
+#: ../win32/gui/WndMain.c:954
msgid "mid link block"
msgstr ""
-#: ../win32/gui/WndMain.c:952
+#: ../win32/gui/WndMain.c:957
msgid "terminiting link block"
msgstr ""
-#: ../win32/gui/WndMain.c:1057
+#: ../win32/gui/WndMain.c:1062
msgid "Memcard Manager"
msgstr ""
-#: ../win32/gui/WndMain.c:1061 ../win32/gui/WndMain.c:1064
+#: ../win32/gui/WndMain.c:1066 ../win32/gui/WndMain.c:1069
msgid "Select Mcd"
msgstr ""
-#: ../win32/gui/WndMain.c:1062 ../win32/gui/WndMain.c:1065
+#: ../win32/gui/WndMain.c:1067 ../win32/gui/WndMain.c:1070
msgid "Format Mcd"
msgstr ""
-#: ../win32/gui/WndMain.c:1063 ../win32/gui/WndMain.c:1066
+#: ../win32/gui/WndMain.c:1068 ../win32/gui/WndMain.c:1071
msgid "Reload Mcd"
msgstr ""
-#: ../win32/gui/WndMain.c:1067
+#: ../win32/gui/WndMain.c:1072
msgid "-> Copy ->"
msgstr ""
-#: ../win32/gui/WndMain.c:1068
+#: ../win32/gui/WndMain.c:1073
msgid "<- Copy <-"
msgstr ""
-#: ../win32/gui/WndMain.c:1069
+#: ../win32/gui/WndMain.c:1074
msgid "Paste"
msgstr ""
-#: ../win32/gui/WndMain.c:1070
+#: ../win32/gui/WndMain.c:1075
msgid "<- Un/Delete"
msgstr ""
-#: ../win32/gui/WndMain.c:1071
+#: ../win32/gui/WndMain.c:1076
msgid "Un/Delete ->"
msgstr ""
-#: ../win32/gui/WndMain.c:1073
+#: ../win32/gui/WndMain.c:1078
msgid "Memory Card 1"
msgstr ""
-#: ../win32/gui/WndMain.c:1074
+#: ../win32/gui/WndMain.c:1079
msgid "Memory Card 2"
msgstr ""
-#: ../win32/gui/WndMain.c:1129
+#: ../win32/gui/WndMain.c:1134
msgid "Are you sure you want to paste this selection?"
msgstr ""
-#: ../win32/gui/WndMain.c:1129 ../win32/gui/WndMain.c:1240
-#: ../win32/gui/WndMain.c:1247
+#: ../win32/gui/WndMain.c:1134 ../win32/gui/WndMain.c:1245
+#: ../win32/gui/WndMain.c:1252
msgid "Confirmation"
msgstr ""
-#: ../win32/gui/WndMain.c:1240 ../win32/gui/WndMain.c:1247
+#: ../win32/gui/WndMain.c:1245 ../win32/gui/WndMain.c:1252
msgid "Are you sure you want to format this Memory Card?"
msgstr ""
-#: ../win32/gui/WndMain.c:1293
+#: ../win32/gui/WndMain.c:1298
msgid "Cpu Config"
msgstr ""
-#: ../win32/gui/WndMain.c:1298
+#: ../win32/gui/WndMain.c:1303
msgid "Disable Xa Decoding"
msgstr ""
-#: ../win32/gui/WndMain.c:1299
+#: ../win32/gui/WndMain.c:1304
msgid "Sio Irq Always Enabled"
msgstr ""
-#: ../win32/gui/WndMain.c:1300
+#: ../win32/gui/WndMain.c:1305
msgid "Black && White Movies"
msgstr ""
-#: ../win32/gui/WndMain.c:1301
+#: ../win32/gui/WndMain.c:1306
msgid "Disable Cd audio"
msgstr ""
-#: ../win32/gui/WndMain.c:1303
+#: ../win32/gui/WndMain.c:1309
msgid "Enable Interpreter Cpu"
msgstr ""
-#: ../win32/gui/WndMain.c:1306
+#: ../win32/gui/WndMain.c:1312
msgid "Spu Irq Always Enabled"
msgstr ""
-#: ../win32/gui/WndMain.c:1311
+#: ../win32/gui/WndMain.c:1317
msgid "Psx System Type"
msgstr ""
-#: ../win32/gui/WndMain.c:1415
+#: ../win32/gui/WndMain.c:1423
msgid "Psx Mcd Format (*.mcr;*.mc;*.mem;*.vgs;*.mcd;*.gme;*.ddf)"
msgstr ""
-#: ../win32/gui/WndMain.c:1420
+#: ../win32/gui/WndMain.c:1428
msgid "Psx Memory Card (*.mcr;*.mc)"
msgstr ""
-#: ../win32/gui/WndMain.c:1425
+#: ../win32/gui/WndMain.c:1433
msgid "CVGS Memory Card (*.mem;*.vgs)"
msgstr ""
-#: ../win32/gui/WndMain.c:1430
+#: ../win32/gui/WndMain.c:1438
msgid "Bleem Memory Card (*.mcd)"
msgstr ""
-#: ../win32/gui/WndMain.c:1435
+#: ../win32/gui/WndMain.c:1443
msgid "DexDrive Memory Card (*.gme)"
msgstr ""
-#: ../win32/gui/WndMain.c:1440
+#: ../win32/gui/WndMain.c:1448
msgid "DataDeck Memory Card (*.ddf)"
msgstr ""
-#: ../win32/gui/WndMain.c:1484
+#: ../win32/gui/WndMain.c:1492
msgid "Psx Exe Format"
msgstr ""
-#: ../win32/gui/WndMain.c:1521
+#: ../win32/gui/WndMain.c:1529
msgid "Psx Isos (*.iso;*.mdf;*.img;*.bin)"
msgstr ""
-#: ../win32/gui/WndMain.c:1597
+#: ../win32/gui/WndMain.c:1605
msgid "&File"
msgstr ""
-#: ../win32/gui/WndMain.c:1598
+#: ../win32/gui/WndMain.c:1606
msgid "E&xit"
msgstr ""
-#: ../win32/gui/WndMain.c:1600
+#: ../win32/gui/WndMain.c:1608
msgid "Run &EXE..."
msgstr ""
-#: ../win32/gui/WndMain.c:1601
+#: ../win32/gui/WndMain.c:1609
msgid "Run &BIOS"
msgstr ""
-#: ../win32/gui/WndMain.c:1602
+#: ../win32/gui/WndMain.c:1610
msgid "Run &ISO..."
msgstr ""
-#: ../win32/gui/WndMain.c:1603
+#: ../win32/gui/WndMain.c:1611
msgid "Run &CD"
msgstr ""
-#: ../win32/gui/WndMain.c:1605
+#: ../win32/gui/WndMain.c:1613
msgid "&Emulator"
msgstr ""
-#: ../win32/gui/WndMain.c:1606
+#: ../win32/gui/WndMain.c:1614
msgid "&States"
msgstr ""
-#: ../win32/gui/WndMain.c:1608
+#: ../win32/gui/WndMain.c:1616
msgid "S&witch ISO..."
msgstr ""
-#: ../win32/gui/WndMain.c:1610
+#: ../win32/gui/WndMain.c:1618
msgid "Re&set"
msgstr ""
-#: ../win32/gui/WndMain.c:1611
+#: ../win32/gui/WndMain.c:1619
msgid "&Run"
msgstr ""
-#: ../win32/gui/WndMain.c:1612
+#: ../win32/gui/WndMain.c:1620
msgid "&Save"
msgstr ""
-#: ../win32/gui/WndMain.c:1613
+#: ../win32/gui/WndMain.c:1621
msgid "&Load"
msgstr ""
-#: ../win32/gui/WndMain.c:1614 ../win32/gui/WndMain.c:1624
+#: ../win32/gui/WndMain.c:1622 ../win32/gui/WndMain.c:1632
msgid "&Other..."
msgstr ""
-#: ../win32/gui/WndMain.c:1615 ../win32/gui/WndMain.c:1625
+#: ../win32/gui/WndMain.c:1623 ../win32/gui/WndMain.c:1633
msgid "Slot &9"
msgstr ""
-#: ../win32/gui/WndMain.c:1616 ../win32/gui/WndMain.c:1626
+#: ../win32/gui/WndMain.c:1624 ../win32/gui/WndMain.c:1634
msgid "Slot &8"
msgstr ""
-#: ../win32/gui/WndMain.c:1617 ../win32/gui/WndMain.c:1627
+#: ../win32/gui/WndMain.c:1625 ../win32/gui/WndMain.c:1635
msgid "Slot &7"
msgstr ""
-#: ../win32/gui/WndMain.c:1618 ../win32/gui/WndMain.c:1628
+#: ../win32/gui/WndMain.c:1626 ../win32/gui/WndMain.c:1636
msgid "Slot &6"
msgstr ""
-#: ../win32/gui/WndMain.c:1619 ../win32/gui/WndMain.c:1629
+#: ../win32/gui/WndMain.c:1627 ../win32/gui/WndMain.c:1637
msgid "Slot &5"
msgstr ""
-#: ../win32/gui/WndMain.c:1620 ../win32/gui/WndMain.c:1630
+#: ../win32/gui/WndMain.c:1628 ../win32/gui/WndMain.c:1638
msgid "Slot &4"
msgstr ""
-#: ../win32/gui/WndMain.c:1621 ../win32/gui/WndMain.c:1631
+#: ../win32/gui/WndMain.c:1629 ../win32/gui/WndMain.c:1639
msgid "Slot &3"
msgstr ""
-#: ../win32/gui/WndMain.c:1622 ../win32/gui/WndMain.c:1632
+#: ../win32/gui/WndMain.c:1630 ../win32/gui/WndMain.c:1640
msgid "Slot &2"
msgstr ""
-#: ../win32/gui/WndMain.c:1623 ../win32/gui/WndMain.c:1633
+#: ../win32/gui/WndMain.c:1631 ../win32/gui/WndMain.c:1641
msgid "Slot &1"
msgstr ""
-#: ../win32/gui/WndMain.c:1635
+#: ../win32/gui/WndMain.c:1643
msgid "&Configuration"
msgstr ""
-#: ../win32/gui/WndMain.c:1636
+#: ../win32/gui/WndMain.c:1644
msgid "Cheat &Search..."
msgstr ""
-#: ../win32/gui/WndMain.c:1637
+#: ../win32/gui/WndMain.c:1645
msgid "Ch&eat Code..."
msgstr ""
-#: ../win32/gui/WndMain.c:1640
+#: ../win32/gui/WndMain.c:1648
msgid "&Language"
msgstr ""
-#: ../win32/gui/WndMain.c:1665
+#: ../win32/gui/WndMain.c:1673
msgid "&Memory cards..."
msgstr ""
-#: ../win32/gui/WndMain.c:1666
+#: ../win32/gui/WndMain.c:1674
msgid "C&PU..."
msgstr ""
-#: ../win32/gui/WndMain.c:1668
+#: ../win32/gui/WndMain.c:1676
msgid "&NetPlay..."
msgstr ""
-#: ../win32/gui/WndMain.c:1670
+#: ../win32/gui/WndMain.c:1678
msgid "&Controllers..."
msgstr ""
-#: ../win32/gui/WndMain.c:1671
+#: ../win32/gui/WndMain.c:1679
msgid "CD-&ROM..."
msgstr ""
-#: ../win32/gui/WndMain.c:1672
+#: ../win32/gui/WndMain.c:1680
msgid "&Sound..."
msgstr ""
-#: ../win32/gui/WndMain.c:1673
+#: ../win32/gui/WndMain.c:1681
msgid "&Graphics..."
msgstr ""
-#: ../win32/gui/WndMain.c:1675
+#: ../win32/gui/WndMain.c:1683
msgid "&Plugins && Bios..."
msgstr ""
-#: ../win32/gui/WndMain.c:1677
+#: ../win32/gui/WndMain.c:1685
msgid "&Help"
msgstr ""
-#: ../win32/gui/WndMain.c:1678
+#: ../win32/gui/WndMain.c:1686
msgid "&About..."
msgstr ""
-#: ../win32/gui/WndMain.c:1866
-msgid "Pcsx Msg"
+#: ../win32/gui/WndMain.c:1874
+msgid "Pcsxr Msg"
msgstr ""
-#: ../win32/gui/WndMain.c:1869
+#: ../win32/gui/WndMain.c:1877
msgid "Error Loading Symbol"
msgstr ""
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 74c05adb..1c86da62 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -1,21 +1,24 @@
-# Translation of pcsx.pot to Portuguese from Brazil
-# This file is distributed under the same license as the pcsx reloaded package.
-# Tibério Vítor <tvtoon@gmail.com>, 2009.
+# Translation of pcsx.pot to Portuguese from Brazil
+# This file is distributed under the same license as the pcsx reloaded package.
+# Tibério Vítor <tvtoon@gmail.com>, 2009.
+# Blade_Arma <edgbla@yandex.ru>, 2011.
msgid ""
msgstr ""
-"Project-Id-Version: pcsx-df\n"
+"Project-Id-Version: pcsxr 1.0\n"
"Report-Msgid-Bugs-To: whistler_wmz@users.sf.net\n"
-"POT-Creation-Date: 2011-02-18 17:11+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"
+"POT-Creation-Date: 2011-06-04 23:04+0400\n"
+"PO-Revision-Date: 2011-06-04 13:45+0400\n"
+"Last-Translator: Blade_Arma <edgbla@yandex.ru>\n"
+"Language-Team: Russian <kde-i18n-doc@kde.org>\n"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.2\n"
+"X-Generator: Lokalize 1.2\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: ../data/pcsx.glade2.h:1
+#: ../data/pcsxr.glade2.h:1
msgid ""
"8-bit\n"
"16-bit\n"
@@ -25,144 +28,144 @@ msgstr ""
"16-bit\n"
"32-bit"
-#: ../data/pcsx.glade2.h:4
+#: ../data/pcsxr.glade2.h:4
msgid "<b>BIOS</b>"
msgstr "<b>BIOS</b>"
-#: ../data/pcsx.glade2.h:5
+#: ../data/pcsxr.glade2.h:5
msgid "<b>Cheat Codes</b>"
msgstr "<b>Códigos de trapaça</b>"
-#: ../data/pcsx.glade2.h:6
+#: ../data/pcsxr.glade2.h:6
msgid "<b>Cheat Search</b>"
msgstr "<b>Busca de trapaças</b>"
-#: ../data/pcsx.glade2.h:7
+#: ../data/pcsxr.glade2.h:7
msgid "<b>Memory Card 1</b>"
msgstr "<b>Cartão de memória 1</b>"
-#: ../data/pcsx.glade2.h:8
+#: ../data/pcsxr.glade2.h:8
msgid "<b>Memory Card 2</b>"
msgstr "<b>Cartão de memória 2</b>"
-#: ../data/pcsx.glade2.h:9
+#: ../data/pcsxr.glade2.h:9
msgid "<b>NetPlay</b>"
msgstr "<b>Jogo em rede</b>"
-#: ../data/pcsx.glade2.h:10
+#: ../data/pcsxr.glade2.h:10
msgid "<b>Options</b>"
msgstr "<b>Opções</b>"
-#: ../data/pcsx.glade2.h:11
+#: ../data/pcsxr.glade2.h:11
msgid "<b>Plugins</b>"
msgstr "<b>Extensões</b>"
-#: ../data/pcsx.glade2.h:12
+#: ../data/pcsxr.glade2.h:12
msgid "<b>System Type</b>"
msgstr "<b>Tipo do sistema</b>"
-#: ../data/pcsx.glade2.h:13 ../gui/DebugMemory.c:188
+#: ../data/pcsxr.glade2.h:13 ../gui/DebugMemory.c:188
#, fuzzy
msgid "Address (Hexadecimal):"
msgstr "Hexadecimal"
-#: ../data/pcsx.glade2.h:14 ../win32/gui/WndMain.c:1302
+#: ../data/pcsxr.glade2.h:14 ../win32/gui/WndMain.c:1308
msgid "Autodetect"
msgstr "Detectar Automaticamente"
-#: ../data/pcsx.glade2.h:15
+#: ../data/pcsxr.glade2.h:15
msgid "Black & White Movies"
msgstr "Filmes em preto e branco"
-#: ../data/pcsx.glade2.h:16
+#: ../data/pcsxr.glade2.h:16
msgid "CD-ROM..."
msgstr "CD-ROM..."
-#: ../data/pcsx.glade2.h:17
+#: ../data/pcsxr.glade2.h:17
msgid "CD-ROM:"
msgstr "CD-ROM:"
-#: ../data/pcsx.glade2.h:18
+#: ../data/pcsxr.glade2.h:18
msgid "CD-_ROM..."
msgstr "CD_ROM..."
-#: ../data/pcsx.glade2.h:19
+#: ../data/pcsxr.glade2.h:19
msgid "C_ontrollers..."
msgstr "C_ontroles..."
-#: ../data/pcsx.glade2.h:20
+#: ../data/pcsxr.glade2.h:20
msgid "Chea_t"
msgstr "T_rapaça"
-#: ../data/pcsx.glade2.h:21 ../gui/Cheat.c:1129 ../win32/gui/CheatDlg.c:678
+#: ../data/pcsxr.glade2.h:21 ../gui/Cheat.c:1129 ../win32/gui/CheatDlg.c:678
msgid "Cheat Search"
msgstr "Procurar por trapaça"
-#: ../data/pcsx.glade2.h:22
+#: ../data/pcsxr.glade2.h:22
msgid "Configure CD-ROM"
msgstr "Configurar CD-ROM"
-#: ../data/pcsx.glade2.h:23
+#: ../data/pcsxr.glade2.h:23
msgid "Configure CPU"
msgstr "Configurar CPU"
-#: ../data/pcsx.glade2.h:24
+#: ../data/pcsxr.glade2.h:24
msgid "Configure Controllers"
msgstr ""
-#: ../data/pcsx.glade2.h:25
+#: ../data/pcsxr.glade2.h:25
msgid "Configure Graphics"
msgstr ""
-#: ../data/pcsx.glade2.h:26
+#: ../data/pcsxr.glade2.h:26
msgid "Configure Memory Cards"
msgstr "Configurar cartões de memória"
-#: ../data/pcsx.glade2.h:27
+#: ../data/pcsxr.glade2.h:27
msgid "Configure NetPlay"
msgstr "Configurar jogo em rede"
-#: ../data/pcsx.glade2.h:28 ../gui/ConfDlg.c:112
-msgid "Configure PCSX"
-msgstr "Configurar PCSX"
+#: ../data/pcsxr.glade2.h:28 ../gui/ConfDlg.c:112
+msgid "Configure PCSXR"
+msgstr "Configurar PCSXR"
-#: ../data/pcsx.glade2.h:29 ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:6
+#: ../data/pcsxr.glade2.h:29 ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:3
msgid "Configure Sound"
msgstr "Configurar áudio"
-#: ../data/pcsx.glade2.h:30
+#: ../data/pcsxr.glade2.h:30
msgid "Continue Emulation"
msgstr ""
-#: ../data/pcsx.glade2.h:31
+#: ../data/pcsxr.glade2.h:31
msgid "Continue..."
msgstr ""
-#: ../data/pcsx.glade2.h:32
+#: ../data/pcsxr.glade2.h:32
msgid "Controller 1: "
msgstr "Controle 1:"
-#: ../data/pcsx.glade2.h:33
+#: ../data/pcsxr.glade2.h:33
msgid "Controller 2:"
msgstr "Controle 2:"
-#: ../data/pcsx.glade2.h:34
+#: ../data/pcsxr.glade2.h:34
msgid "Controllers..."
msgstr "Controles..."
-#: ../data/pcsx.glade2.h:35
+#: ../data/pcsxr.glade2.h:35
msgid "Copy"
msgstr "Copiar"
-#: ../data/pcsx.glade2.h:36 ../win32/gui/CheatDlg.c:683
+#: ../data/pcsxr.glade2.h:36 ../win32/gui/CheatDlg.c:683
msgid "Data Base:"
msgstr "Banco de dados:"
-#: ../data/pcsx.glade2.h:37 ../win32/gui/CheatDlg.c:681
+#: ../data/pcsxr.glade2.h:37 ../win32/gui/CheatDlg.c:681
msgid "Data Type:"
msgstr "Tipo de dados:"
-#: ../data/pcsx.glade2.h:38
+#: ../data/pcsxr.glade2.h:38
msgid ""
"Decimal\n"
"Hexadecimal"
@@ -170,35 +173,35 @@ msgstr ""
"Decimal\n"
"Hexadecimal"
-#: ../data/pcsx.glade2.h:40
+#: ../data/pcsxr.glade2.h:40
msgid "Disable CD Audio"
msgstr "Desativar áudio de CD"
-#: ../data/pcsx.glade2.h:41
+#: ../data/pcsxr.glade2.h:41
msgid "Disable XA Decoding"
msgstr "Desativar decodificação de XA"
-#: ../data/pcsx.glade2.h:42
+#: ../data/pcsxr.glade2.h:42
msgid "E_xit"
msgstr "_Sair"
-#: ../data/pcsx.glade2.h:43 ../win32/gui/CheatDlg.c:166
+#: ../data/pcsxr.glade2.h:43 ../win32/gui/CheatDlg.c:166
msgid "Edit Cheat Codes"
msgstr "Editar Códigos de Trapaça"
-#: ../data/pcsx.glade2.h:44 ../win32/gui/WndMain.c:1304
+#: ../data/pcsxr.glade2.h:44 ../win32/gui/WndMain.c:1310
msgid "Enable Console Output"
msgstr "Ativar saída no terminal"
-#: ../data/pcsx.glade2.h:45 ../win32/gui/WndMain.c:1305
+#: ../data/pcsxr.glade2.h:45 ../win32/gui/WndMain.c:1311
msgid "Enable Debugger"
msgstr "Ligar debugger"
-#: ../data/pcsx.glade2.h:46
+#: ../data/pcsxr.glade2.h:46
msgid "Enable Interpreter CPU"
msgstr "Ativar interpretador da CPU"
-#: ../data/pcsx.glade2.h:47
+#: ../data/pcsxr.glade2.h:47
msgid ""
"Equal Value\n"
"Not Equal Value\n"
@@ -220,43 +223,43 @@ msgstr ""
"Diferente\n"
"Sem mudanças"
-#: ../data/pcsx.glade2.h:56
+#: ../data/pcsxr.glade2.h:56
msgid "Format"
msgstr "Formatar"
-#: ../data/pcsx.glade2.h:57 ../win32/gui/CheatDlg.c:504
+#: ../data/pcsxr.glade2.h:57 ../win32/gui/CheatDlg.c:504
msgid "Freeze"
msgstr "Parar"
-#: ../data/pcsx.glade2.h:58
+#: ../data/pcsxr.glade2.h:58
msgid "Graphics..."
msgstr "Gráficos..."
-#: ../data/pcsx.glade2.h:59
+#: ../data/pcsxr.glade2.h:59
msgid "Graphics:"
msgstr "Gráficos:"
-#: ../data/pcsx.glade2.h:60 ../win32/gui/WndMain.c:1308
+#: ../data/pcsxr.glade2.h:60 ../win32/gui/WndMain.c:1314
msgid "InuYasha Sengoku Battle Fix"
msgstr "Correção para InuYasha, Sengoku Battle..."
-#: ../data/pcsx.glade2.h:61
+#: ../data/pcsxr.glade2.h:61
msgid "Memcards..."
msgstr "Cartões de memória..."
-#: ../data/pcsx.glade2.h:62 ../gui/DebugMemory.c:103
+#: ../data/pcsxr.glade2.h:62 ../gui/DebugMemory.c:103
msgid "Memory Dump"
msgstr ""
-#: ../data/pcsx.glade2.h:63
+#: ../data/pcsxr.glade2.h:63
msgid "Memory _Dump"
msgstr ""
-#: ../data/pcsx.glade2.h:64 ../win32/gui/CheatDlg.c:595
+#: ../data/pcsxr.glade2.h:64 ../win32/gui/CheatDlg.c:595
msgid "Modify"
msgstr "Modificar"
-#: ../data/pcsx.glade2.h:65
+#: ../data/pcsxr.glade2.h:65
msgid ""
"NTSC\n"
"PAL"
@@ -264,229 +267,229 @@ msgstr ""
"NTSC\n"
"PAL"
-#: ../data/pcsx.glade2.h:67
+#: ../data/pcsxr.glade2.h:67
msgid "New"
msgstr ""
-#: ../data/pcsx.glade2.h:68
-msgid "PCSX"
-msgstr "PCSX"
+#: ../data/pcsxr.glade2.h:68
+msgid "PCSXR"
+msgstr "PCSXR"
-#: ../data/pcsx.glade2.h:69 ../win32/gui/WndMain.c:1307
+#: ../data/pcsxr.glade2.h:69 ../win32/gui/WndMain.c:1313
msgid "Parasite Eve 2, Vandal Hearts 1/2 Fix"
msgstr "Correção para Parasite Eve 2, Vandal Hearts..."
-#: ../data/pcsx.glade2.h:70
+#: ../data/pcsxr.glade2.h:70
msgid "Patch Memory..."
msgstr ""
-#: ../data/pcsx.glade2.h:71
+#: ../data/pcsxr.glade2.h:71
msgid "Raw Dump..."
msgstr ""
-#: ../data/pcsx.glade2.h:72
+#: ../data/pcsxr.glade2.h:72
msgid "Restart"
msgstr "Reiniciar"
-#: ../data/pcsx.glade2.h:73
+#: ../data/pcsxr.glade2.h:73
msgid "Run CD"
msgstr ""
-#: ../data/pcsx.glade2.h:74
+#: ../data/pcsxr.glade2.h:74
msgid "Run ISO Image"
msgstr ""
-#: ../data/pcsx.glade2.h:75
+#: ../data/pcsxr.glade2.h:75
msgid "Run ISO..."
msgstr ""
-#: ../data/pcsx.glade2.h:76
+#: ../data/pcsxr.glade2.h:76
msgid "Run _BIOS"
msgstr "Rodar pela _BIOS"
-#: ../data/pcsx.glade2.h:77
+#: ../data/pcsxr.glade2.h:77
msgid "Run _CD"
msgstr "Rodar _CD"
-#: ../data/pcsx.glade2.h:78
+#: ../data/pcsxr.glade2.h:78
msgid "Run _EXE..."
msgstr "Rodar _EXE do PSX..."
-#: ../data/pcsx.glade2.h:79
+#: ../data/pcsxr.glade2.h:79
msgid "Run _ISO..."
msgstr "Rodar _imagem de CD..."
-#: ../data/pcsx.glade2.h:80 ../gui/Plugin.c:239
+#: ../data/pcsxr.glade2.h:80 ../gui/Plugin.c:239
#, c-format
msgid "SIO IRQ Always Enabled"
msgstr "IRQ SIO sempre ativada"
-#: ../data/pcsx.glade2.h:81
+#: ../data/pcsxr.glade2.h:81
msgid "SPU IRQ Always Enabled"
msgstr "IRQ da SPU sempre ativada"
-#: ../data/pcsx.glade2.h:82
+#: ../data/pcsxr.glade2.h:82
msgid "S_witch ISO..."
msgstr "_Trocar de imagem de CD..."
-#: ../data/pcsx.glade2.h:83
+#: ../data/pcsxr.glade2.h:83
msgid "Search"
msgstr "Buscar"
-#: ../data/pcsx.glade2.h:84 ../win32/gui/CheatDlg.c:680
+#: ../data/pcsxr.glade2.h:84 ../win32/gui/CheatDlg.c:680
msgid "Search For:"
msgstr "Buscar por:"
-#: ../data/pcsx.glade2.h:85
+#: ../data/pcsxr.glade2.h:85
msgid "Search in:"
msgstr "Buscar em:"
-#: ../data/pcsx.glade2.h:86
+#: ../data/pcsxr.glade2.h:86
msgid "Select Folder to Search"
msgstr "Selecione o diretório para a busca"
-#: ../data/pcsx.glade2.h:87
+#: ../data/pcsxr.glade2.h:87
msgid "Slot _1"
msgstr "Unidade _1"
-#: ../data/pcsx.glade2.h:88
+#: ../data/pcsxr.glade2.h:88
msgid "Slot _2"
msgstr "Unidade _2"
-#: ../data/pcsx.glade2.h:89
+#: ../data/pcsxr.glade2.h:89
msgid "Slot _3"
msgstr "Unidade _3"
-#: ../data/pcsx.glade2.h:90
+#: ../data/pcsxr.glade2.h:90
msgid "Slot _4"
msgstr "Unidade _4"
-#: ../data/pcsx.glade2.h:91
+#: ../data/pcsxr.glade2.h:91
msgid "Slot _5"
msgstr "Unidade _5"
-#: ../data/pcsx.glade2.h:92
-#, fuzzy
+#: ../data/pcsxr.glade2.h:92
msgid "Slot _6"
-msgstr "Unidade _1"
+msgstr "Unidade _6"
-#: ../data/pcsx.glade2.h:93
-#, fuzzy
+#: ../data/pcsxr.glade2.h:93
msgid "Slot _7"
-msgstr "Unidade _1"
+msgstr "Unidade _7"
-#: ../data/pcsx.glade2.h:94
-#, fuzzy
+#: ../data/pcsxr.glade2.h:94
msgid "Slot _8"
-msgstr "Unidade _1"
+msgstr "Unidade _8"
-#: ../data/pcsx.glade2.h:95
-#, fuzzy
+#: ../data/pcsxr.glade2.h:95
msgid "Slot _9"
-msgstr "Unidade _1"
+msgstr "Unidade _9"
-#: ../data/pcsx.glade2.h:96
+#: ../data/pcsxr.glade2.h:96 ../win32/gui/WndMain.c:1307
+msgid "Slow Boot"
+msgstr ""
+
+#: ../data/pcsxr.glade2.h:97
msgid "Sound..."
msgstr "Áudio..."
-#: ../data/pcsx.glade2.h:97
+#: ../data/pcsxr.glade2.h:98
msgid "Sound:"
msgstr "Áudio:"
-#: ../data/pcsx.glade2.h:98
+#: ../data/pcsxr.glade2.h:99
msgid "Switch ISO Image"
msgstr ""
-#: ../data/pcsx.glade2.h:99
+#: ../data/pcsxr.glade2.h:100
msgid "Switch ISO..."
msgstr ""
-#: ../data/pcsx.glade2.h:100 ../win32/gui/CheatDlg.c:684
+#: ../data/pcsxr.glade2.h:101 ../win32/gui/CheatDlg.c:684
msgid "To:"
msgstr "Para:"
-#: ../data/pcsx.glade2.h:101
+#: ../data/pcsxr.glade2.h:102
msgid "Un/Delete"
msgstr "Apagar/Desfazer"
-#: ../data/pcsx.glade2.h:102 ../gui/Cheat.c:647 ../win32/gui/CheatDlg.c:506
+#: ../data/pcsxr.glade2.h:103 ../gui/Cheat.c:647 ../win32/gui/CheatDlg.c:506
#: ../win32/gui/CheatDlg.c:597 ../win32/gui/CheatDlg.c:682
msgid "Value:"
msgstr "Valor:"
-#: ../data/pcsx.glade2.h:103
-msgid "_About PCSX..."
-msgstr "_Sobre o PCSX..."
+#: ../data/pcsxr.glade2.h:104
+msgid "_About PCSXR..."
+msgstr "_Sobre o PCSXR..."
-#: ../data/pcsx.glade2.h:104
+#: ../data/pcsxr.glade2.h:105
msgid "_Browse..."
msgstr "_Navegar..."
-#: ../data/pcsx.glade2.h:105
+#: ../data/pcsxr.glade2.h:106
msgid "_CPU..."
msgstr "_CPU..."
-#: ../data/pcsx.glade2.h:106
+#: ../data/pcsxr.glade2.h:107
msgid "_Configuration"
msgstr "C_onfiguração"
-#: ../data/pcsx.glade2.h:107
+#: ../data/pcsxr.glade2.h:108
msgid "_Continue"
msgstr "_Continue"
-#: ../data/pcsx.glade2.h:108
+#: ../data/pcsxr.glade2.h:109
msgid "_Emulator"
msgstr "_Emulador"
-#: ../data/pcsx.glade2.h:109
+#: ../data/pcsxr.glade2.h:110
msgid "_File"
msgstr "_Arquivo"
-#: ../data/pcsx.glade2.h:110
+#: ../data/pcsxr.glade2.h:111
msgid "_Graphics..."
msgstr "_Gráficos..."
-#: ../data/pcsx.glade2.h:111
+#: ../data/pcsxr.glade2.h:112
msgid "_Help"
msgstr "_Ajuda"
-#: ../data/pcsx.glade2.h:112
+#: ../data/pcsxr.glade2.h:113
msgid "_Load State"
msgstr "_Carregar estado"
-#: ../data/pcsx.glade2.h:113
+#: ../data/pcsxr.glade2.h:114
msgid "_Memory Cards..."
msgstr "Cartões de _memória..."
-#: ../data/pcsx.glade2.h:114
+#: ../data/pcsxr.glade2.h:115
msgid "_Netplay..."
msgstr "Jogo em _rede..."
-#: ../data/pcsx.glade2.h:115
+#: ../data/pcsxr.glade2.h:116
msgid "_Other..."
msgstr "_Outros..."
-#: ../data/pcsx.glade2.h:116
+#: ../data/pcsxr.glade2.h:117
msgid "_Plugins & BIOS..."
msgstr "_Extensões e BIOS..."
-#: ../data/pcsx.glade2.h:117
+#: ../data/pcsxr.glade2.h:118
msgid "_Reset"
msgstr "_Reiniciar"
-#: ../data/pcsx.glade2.h:118
+#: ../data/pcsxr.glade2.h:119
msgid "_Save State"
msgstr "_Salvar estado"
-#: ../data/pcsx.glade2.h:119
+#: ../data/pcsxr.glade2.h:120
msgid "_Search..."
msgstr "_Buscar..."
-#: ../data/pcsx.glade2.h:120
+#: ../data/pcsxr.glade2.h:121
msgid "_Sound..."
msgstr "Á_udio..."
-#: ../data/pcsx.glade2.h:121
+#: ../data/pcsxr.glade2.h:122
msgid "label_resultsfound"
msgstr "Resultados encontrados:"
@@ -494,7 +497,7 @@ msgstr "Resultados encontrados:"
msgid ""
"(C) 1999-2003 PCSX Team\n"
"(C) 2005-2009 PCSX-df Team\n"
-"(C) 2009-2010 PCSX-Reloaded Team"
+"(C) 2009-2011 PCSX-Reloaded Team"
msgstr ""
#: ../gui/AboutDlg.c:77
@@ -552,8 +555,8 @@ msgstr "Descrição da trapaça:"
msgid "Cheat Code:"
msgstr "Código de Trapaça:"
-#: ../gui/Cheat.c:155 ../gui/Cheat.c:251 ../gui/LnxMain.c:422
-#: ../win32/gui/ConfigurePlugins.c:305
+#: ../gui/Cheat.c:155 ../gui/Cheat.c:251 ../gui/LnxMain.c:421
+#: ../win32/gui/ConfigurePlugins.c:307
msgid "Error"
msgstr "Erro"
@@ -571,11 +574,11 @@ msgid "Open Cheat File"
msgstr "Abrir arquivo de trapaça"
#: ../gui/Cheat.c:316 ../gui/Cheat.c:356
-msgid "PCSX Cheat Code Files (*.cht)"
-msgstr "Arquivos de trapaça do PCSX (*.cht)"
+msgid "PCSXR Cheat Code Files (*.cht)"
+msgstr "Arquivos de trapaça do PCSXR (*.cht)"
#: ../gui/Cheat.c:321 ../gui/Gtk2Gui.c:446 ../gui/Gtk2Gui.c:587
-#: ../win32/gui/WndMain.c:1445 ../win32/gui/WndMain.c:1526
+#: ../win32/gui/WndMain.c:1453 ../win32/gui/WndMain.c:1534
msgid "All Files"
msgstr "Todos os arquivos"
@@ -677,7 +680,7 @@ msgstr "Não conseguiu abrir o diretório \"%s\", da BIOS!\n"
msgid "Could not open directory: '%s'\n"
msgstr "Não conseguiu abrir o diretório \"%s\"!\n"
-#. The BIOS list always contains the PCSX internal BIOS
+#. The BIOS list always contains the PCSXR internal BIOS
#: ../gui/ConfDlg.c:675
msgid "Simulate PSX BIOS"
msgstr ""
@@ -753,14 +756,14 @@ msgstr "Esse arquivo não parece ser um executável válido de PlayStation!"
msgid "CD ROM failed"
msgstr "CDROM falhou"
-#: ../gui/Gtk2Gui.c:508 ../gui/Gtk2Gui.c:649 ../win32/gui/WndMain.c:464
-#: ../win32/gui/WndMain.c:516 ../win32/gui/WndMain.c:585
+#: ../gui/Gtk2Gui.c:508 ../gui/Gtk2Gui.c:649 ../win32/gui/WndMain.c:469
+#: ../win32/gui/WndMain.c:521 ../win32/gui/WndMain.c:590
#, c-format
msgid "The CD does not appear to be a valid Playstation CD"
msgstr "Esse CD não parece ser um CD de PlayStation!"
-#: ../gui/Gtk2Gui.c:519 ../gui/Gtk2Gui.c:660 ../win32/gui/WndMain.c:474
-#: ../win32/gui/WndMain.c:526 ../win32/gui/WndMain.c:595
+#: ../gui/Gtk2Gui.c:519 ../gui/Gtk2Gui.c:660 ../win32/gui/WndMain.c:479
+#: ../win32/gui/WndMain.c:531 ../win32/gui/WndMain.c:600
#, c-format
msgid "Could not load CD-ROM!"
msgstr "Não pôde carregar o CDROM!"
@@ -818,51 +821,51 @@ msgstr "Aviso"
msgid "Creating memory card: %s\n"
msgstr "Criando cartão de memória \"%s\"\n"
-#: ../gui/LnxMain.c:329
+#: ../gui/LnxMain.c:328
#, fuzzy
msgid ""
-" pcsx [options] [file]\n"
+" pcsxr [options] [file]\n"
"\toptions:\n"
"\t-runcd\t\tRuns CD-ROM\n"
"\t-cdfile FILE\tRuns a CD image file\n"
"\t-nogui\t\tDon't open the GTK GUI\n"
-"\t-cfg FILE\tLoads desired configuration file (default: ~/.pcsx/pcsx.cfg)\n"
+"\t-cfg FILE\tLoads desired configuration file (default: ~/.pcsxr/pcsxr.cfg)\n"
"\t-psxout\t\tEnable PSX output\n"
"\t-slowboot\tEnable BIOS Logo\n"
"\t-load STATENUM\tLoads savestate STATENUM (1-9)\n"
"\t-h -help\tDisplay this message\n"
"\tfile\t\tLoads file\n"
msgstr ""
-" pcsx [opções] [arquivo]\n"
+" pcsxr [opções] [arquivo]\n"
"\topções:\n"
"\t-runcd\t\tExecuta direto pelo CD-ROM\n"
"\t-cdfile ARQUIVO\tRoda um arquivo de imagem de CD\n"
"\t-nogui\t\tNão abre o GUI da GTK\n"
-"\t-cfg ARQUIVO\tCarrega uma configuração alternativa (padrão: ~/.pcsx/pcsx."
+"\t-cfg ARQUIVO\tCarrega uma configuração alternativa (padrão: ~/.pcsxr/pcsxr."
"cfg)\n"
"\t-psxout\t\tAtiva a saída do PSX no console\n"
"\t-load NÚMERO_ESTADO\tCarrega um estado entre 1-5\n"
"\t-h -help\tMostra essa mensagem\n"
"\t[arquivo]\t\tCarrega um arquivo.\n"
-#: ../gui/LnxMain.c:366
+#: ../gui/LnxMain.c:365
#, c-format
msgid ""
-"PCSX cannot be configured without using the GUI -- you should restart "
+"PCSXR cannot be configured without using the GUI -- you should restart "
"without -nogui.\n"
msgstr ""
-"PCSX não pode ser configurado sem o GUI -- reinicie sem a opção -nogui.\n"
+"PCSXR não pode ser configurado sem o GUI -- reinicie sem a opção -nogui.\n"
-#: ../gui/LnxMain.c:422
+#: ../gui/LnxMain.c:421
msgid "Failed loading plugins!"
msgstr "Não conseguiu carregar as extensões!"
-#: ../gui/LnxMain.c:441
+#: ../gui/LnxMain.c:440
#, c-format
msgid "Could not load CD-ROM!\n"
msgstr "Não pôde carregar o CD-ROM!\n"
-#: ../gui/LnxMain.c:472
+#: ../gui/LnxMain.c:471
#, c-format
msgid "PSX emulator couldn't be initialized.\n"
msgstr "O emulador não pôde ser inicializado.\n"
@@ -871,11 +874,11 @@ msgstr "O emulador não pôde ser inicializado.\n"
msgid "Icon"
msgstr "Ícone"
-#: ../gui/MemcardDlg.c:66 ../win32/gui/WndMain.c:749
+#: ../gui/MemcardDlg.c:66 ../win32/gui/WndMain.c:754
msgid "Title"
msgstr "Título"
-#: ../gui/MemcardDlg.c:72 ../win32/gui/WndMain.c:755
+#: ../gui/MemcardDlg.c:72 ../win32/gui/WndMain.c:760
msgid "Status"
msgstr "Estado"
@@ -887,17 +890,17 @@ msgstr "ID"
msgid "Name"
msgstr "Nome"
-#: ../gui/MemcardDlg.c:192 ../gui/MemcardDlg.c:297 ../win32/gui/WndMain.c:960
+#: ../gui/MemcardDlg.c:192 ../gui/MemcardDlg.c:297 ../win32/gui/WndMain.c:965
msgid "Deleted"
msgstr "Apagado"
#: ../gui/MemcardDlg.c:194 ../gui/MemcardDlg.c:198 ../gui/MemcardDlg.c:299
-#: ../gui/MemcardDlg.c:303 ../win32/gui/WndMain.c:961
-#: ../win32/gui/WndMain.c:964
+#: ../gui/MemcardDlg.c:303 ../win32/gui/WndMain.c:966
+#: ../win32/gui/WndMain.c:969
msgid "Free"
msgstr "Liberado"
-#: ../gui/MemcardDlg.c:196 ../gui/MemcardDlg.c:301 ../win32/gui/WndMain.c:963
+#: ../gui/MemcardDlg.c:196 ../gui/MemcardDlg.c:301 ../win32/gui/WndMain.c:968
msgid "Used"
msgstr "Usado"
@@ -1055,9 +1058,9 @@ msgid "CD-ROM Label: %.32s\n"
msgstr ""
#: ../libpcsxcore/misc.c:346
-#, fuzzy, c-format
+#, c-format
msgid "CD-ROM ID: %.9s\n"
-msgstr "CD-ROM:"
+msgstr ""
#: ../libpcsxcore/misc.c:410
#, c-format
@@ -1109,9 +1112,9 @@ msgid "Could not load NetPlay plugin %s!"
msgstr "Não conseguiu carregar a extensão de jogo em rede \"%s\"!"
#: ../libpcsxcore/plugins.c:688
-#, fuzzy, c-format
+#, c-format
msgid "Could not load SIO1 plugin %s!"
-msgstr "Não conseguiu carregar a extensão de SPU \"%s\"!"
+msgstr "Não conseguiu carregar a extensão de SIO1 \"%s\"!"
#: ../libpcsxcore/plugins.c:773
#, c-format
@@ -1144,31 +1147,31 @@ msgid "Error initializing NetPlay plugin: %d"
msgstr "Erro ao iniciar a extensão de jogo em rede \"%d\"!"
#: ../libpcsxcore/plugins.c:790
-#, fuzzy, c-format
+#, c-format
msgid "Error initializing SIO1 plugin: %d"
-msgstr "Erro ao iniciar a extensão de SPU \"%d\"!"
+msgstr "Erro ao iniciar a extensão de SIO1 \"%d\"!"
#: ../libpcsxcore/plugins.c:793
msgid "Plugins loaded.\n"
msgstr "Extensões carregadas.\n"
-#: ../libpcsxcore/ppf.c:217
+#: ../libpcsxcore/ppf.c:219
#, c-format
msgid "Invalid PPF patch: %s.\n"
msgstr ""
-#: ../libpcsxcore/ppf.c:293
+#: ../libpcsxcore/ppf.c:295
#, c-format
msgid "Unsupported PPF version (%d).\n"
msgstr ""
#. build address array
-#: ../libpcsxcore/ppf.c:332
+#: ../libpcsxcore/ppf.c:334
#, fuzzy, c-format
msgid "Loaded PPF %d.0 patch: %s.\n"
msgstr "Arquivo de estado \"%s\" carregado."
-#: ../libpcsxcore/ppf.c:377
+#: ../libpcsxcore/ppf.c:381
#, fuzzy, c-format
msgid "Loaded SBI file: %s.\n"
msgstr "Carregou a imagem de CD \"%s\"."
@@ -1184,29 +1187,29 @@ msgstr "Não conseguiu abrir a BIOS\"%s\". Usando BIOS HLE!\n"
#: ../libpcsxcore/r3000a.c:34
#, c-format
-msgid "Running PCSX Version %s (%s).\n"
-msgstr "Rodando o PCSX Versão %s (%s).\n"
+msgid "Running PCSXR Version %s (%s).\n"
+msgstr "Rodando o PCSXR Versão %s (%s).\n"
-#: ../libpcsxcore/sio.c:839
+#: ../libpcsxcore/sio.c:843
msgid "Connection closed!\n"
msgstr "Conexão encerrada!\n"
-#: ../libpcsxcore/sio.c:872
+#: ../libpcsxcore/sio.c:876
#, c-format
msgid "No memory card value was specified - creating a default card %s\n"
msgstr "Nenhum cartão de memória foi especificado, criando um \"%s\" padrão.\n"
-#: ../libpcsxcore/sio.c:876
+#: ../libpcsxcore/sio.c:880
#, c-format
msgid "The memory card %s doesn't exist - creating it\n"
msgstr "O cartão de memória \"%s\" não existe, será criado.\n"
-#: ../libpcsxcore/sio.c:892
+#: ../libpcsxcore/sio.c:896
#, c-format
msgid "Memory card %s failed to load!\n"
msgstr "Cartão de memória \"%s\" falhou para carregar!\n"
-#: ../libpcsxcore/sio.c:896
+#: ../libpcsxcore/sio.c:900
#, c-format
msgid "Loading memory card %s\n"
msgstr "Carregando cartão de memória \"%s\".\n"
@@ -1219,244 +1222,282 @@ msgstr "Leitor de unidade de CDROM"
msgid "CDR NULL Plugin"
msgstr "Sem unidade de CDROM"
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:1
-#: ../plugins/dfcdrom/cdrcfg-0.1df/main.c:219
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:1
+msgid "125ms"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:2
+msgid "16min"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:3
+msgid "16s"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:4
+msgid "1min"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:5
+msgid "1s"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:6
+msgid "250ms"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:7
+msgid "2min"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:8
+msgid "2s"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:9
+msgid "32min"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:10
+msgid "32s"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:11
+msgid "4min"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:12
+msgid "4s"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:13
+msgid "500ms"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:14
+msgid "8min"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:15
+msgid "8s"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:16
+#: ../plugins/dfcdrom/cdrcfg-0.1df/main.c:206
msgid "CDR configuration"
msgstr "Configuração do CDROM"
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:2
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:17
msgid "Cache Size (Def. 64):"
msgstr "Tamanho do armazenamento (o padrão é 64):"
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:3
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:18
msgid "Cdrom Speed (Def. 0 = MAX):"
msgstr "Velocidade do CDROM (o padrão é 0, ou seja, o máximo):"
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:4
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:19
msgid "Choose your CD-ROM device or type its path if it's not listed"
msgstr ""
"Escolha sua unidade de CDROM ou digite o dispositivo caso não esteja listado."
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:5
-msgid ""
-"Default\n"
-"125ms\n"
-"250ms\n"
-"500ms\n"
-"1s\n"
-"2s\n"
-"4s\n"
-"8s\n"
-"16s\n"
-"32s\n"
-"1min\n"
-"2min\n"
-"4min\n"
-"8min\n"
-"16min\n"
-"32min"
-msgstr ""
-
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:21
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:20
+msgid "Default"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:21
msgid "Enable subchannel read"
msgstr "Ligar leitura de subcanal"
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:22
-msgid ""
-"Normal (No Cache)\n"
-"Threaded - Faster (With Cache)"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:22
+msgid "Normal (No Cache)"
msgstr ""
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:24
-#: ../plugins/dfinput/dfinput.ui.h:8 ../win32/gui/WndMain.c:1310
-msgid "Options"
-msgstr "Opções"
-
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:25
-msgid "Select CD-ROM device"
-msgstr "Selecione uma unidade de CDROM"
-
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:26
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:23
msgid "Select read mode:"
msgstr "Selecione o modo de leitura:"
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:27
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:24
msgid "Spindown Time:"
msgstr ""
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:28
-msgid "hseparator"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:25
+msgid "Threaded - Faster (With Cache)"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:48
+#: ../plugins/dfinput/cfg-gtk2.c:49
msgid "D-Pad Up"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:49
+#: ../plugins/dfinput/cfg-gtk2.c:50
msgid "D-Pad Down"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:50
+#: ../plugins/dfinput/cfg-gtk2.c:51
msgid "D-Pad Left"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:51
+#: ../plugins/dfinput/cfg-gtk2.c:52
msgid "D-Pad Right"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:52
+#: ../plugins/dfinput/cfg-gtk2.c:53
msgid "Cross"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:53
+#: ../plugins/dfinput/cfg-gtk2.c:54
msgid "Circle"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:54
+#: ../plugins/dfinput/cfg-gtk2.c:55
msgid "Square"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:55
+#: ../plugins/dfinput/cfg-gtk2.c:56
msgid "Triangle"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:56
+#: ../plugins/dfinput/cfg-gtk2.c:57
msgid "L1"
msgstr "L1"
-#: ../plugins/dfinput/cfg-gtk2.c:57
+#: ../plugins/dfinput/cfg-gtk2.c:58
msgid "R1"
msgstr "R1"
-#: ../plugins/dfinput/cfg-gtk2.c:58
+#: ../plugins/dfinput/cfg-gtk2.c:59
msgid "L2"
msgstr "L2"
-#: ../plugins/dfinput/cfg-gtk2.c:59
+#: ../plugins/dfinput/cfg-gtk2.c:60
msgid "R2"
msgstr "R2"
-#: ../plugins/dfinput/cfg-gtk2.c:60
+#: ../plugins/dfinput/cfg-gtk2.c:61
msgid "Select"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:61
+#: ../plugins/dfinput/cfg-gtk2.c:62
msgid "Start"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:62
+#: ../plugins/dfinput/cfg-gtk2.c:63
msgid "L3"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:63
+#: ../plugins/dfinput/cfg-gtk2.c:64
msgid "R3"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:67
+#: ../plugins/dfinput/cfg-gtk2.c:65
+msgid "Analog"
+msgstr ""
+
+#: ../plugins/dfinput/cfg-gtk2.c:69
msgid "L-Stick Right"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:68
+#: ../plugins/dfinput/cfg-gtk2.c:70
msgid "L-Stick Left"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:69
+#: ../plugins/dfinput/cfg-gtk2.c:71
msgid "L-Stick Down"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:70
+#: ../plugins/dfinput/cfg-gtk2.c:72
msgid "L-Stick Up"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:71
+#: ../plugins/dfinput/cfg-gtk2.c:73
msgid "R-Stick Right"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:72
+#: ../plugins/dfinput/cfg-gtk2.c:74
msgid "R-Stick Left"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:73
+#: ../plugins/dfinput/cfg-gtk2.c:75
msgid "R-Stick Down"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:74
+#: ../plugins/dfinput/cfg-gtk2.c:76
msgid "R-Stick Up"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:100 ../plugins/dfinput/cfg-gtk2.c:139
+#: ../plugins/dfinput/cfg-gtk2.c:102 ../plugins/dfinput/cfg-gtk2.c:141
msgid "Centered"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:100 ../plugins/dfinput/cfg-gtk2.c:139
+#: ../plugins/dfinput/cfg-gtk2.c:102 ../plugins/dfinput/cfg-gtk2.c:141
msgid "Up"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:100 ../plugins/dfinput/cfg-gtk2.c:139
+#: ../plugins/dfinput/cfg-gtk2.c:102 ../plugins/dfinput/cfg-gtk2.c:141
msgid "Right"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:100 ../plugins/dfinput/cfg-gtk2.c:139
+#: ../plugins/dfinput/cfg-gtk2.c:102 ../plugins/dfinput/cfg-gtk2.c:141
msgid "Rightup"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:101 ../plugins/dfinput/cfg-gtk2.c:140
+#: ../plugins/dfinput/cfg-gtk2.c:103 ../plugins/dfinput/cfg-gtk2.c:142
msgid "Down"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:101 ../plugins/dfinput/cfg-gtk2.c:140
+#: ../plugins/dfinput/cfg-gtk2.c:103 ../plugins/dfinput/cfg-gtk2.c:142
msgid "Rightdown"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:101 ../plugins/dfinput/cfg-gtk2.c:140
+#: ../plugins/dfinput/cfg-gtk2.c:103 ../plugins/dfinput/cfg-gtk2.c:142
msgid "Left"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:101 ../plugins/dfinput/cfg-gtk2.c:140
+#: ../plugins/dfinput/cfg-gtk2.c:103 ../plugins/dfinput/cfg-gtk2.c:142
msgid "Leftup"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:102 ../plugins/dfinput/cfg-gtk2.c:141
+#: ../plugins/dfinput/cfg-gtk2.c:104 ../plugins/dfinput/cfg-gtk2.c:143
msgid "Leftdown"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:106 ../plugins/dfinput/cfg-gtk2.c:145
+#: ../plugins/dfinput/cfg-gtk2.c:108 ../plugins/dfinput/cfg-gtk2.c:147
#, c-format
msgid "Joystick: Button %d"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:110 ../plugins/dfinput/cfg-gtk2.c:149
+#: ../plugins/dfinput/cfg-gtk2.c:112 ../plugins/dfinput/cfg-gtk2.c:151
#, c-format
msgid "Joystick: Axis %d%c"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:115 ../plugins/dfinput/cfg-gtk2.c:154
+#: ../plugins/dfinput/cfg-gtk2.c:117 ../plugins/dfinput/cfg-gtk2.c:156
#, c-format
msgid "Joystick: Hat %d %s"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:130 ../plugins/dfinput/cfg-gtk2.c:169
+#: ../plugins/dfinput/cfg-gtk2.c:132 ../plugins/dfinput/cfg-gtk2.c:171
msgid "Keyboard:"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:134 ../plugins/dfinput/cfg-gtk2.c:173
+#: ../plugins/dfinput/cfg-gtk2.c:136 ../plugins/dfinput/cfg-gtk2.c:175
msgid "(Not Set)"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:542
+#: ../plugins/dfinput/cfg-gtk2.c:562
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:13
#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:55
msgid "None"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:584
+#: ../plugins/dfinput/cfg-gtk2.c:604
msgid "Gamepad/Keyboard Input Configuration"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:590 ../plugins/dfinput/cfg-gtk2.c:610
+#: ../plugins/dfinput/cfg-gtk2.c:610 ../plugins/dfinput/cfg-gtk2.c:630
msgid "Key"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:596 ../plugins/dfinput/cfg-gtk2.c:616
+#: ../plugins/dfinput/cfg-gtk2.c:616 ../plugins/dfinput/cfg-gtk2.c:636
msgid "Button"
msgstr ""
@@ -1485,19 +1526,28 @@ msgid "Digital Pad"
msgstr ""
#: ../plugins/dfinput/dfinput.ui.h:7
+msgid "Mouse"
+msgstr ""
+
+#: ../plugins/dfinput/dfinput.ui.h:8
msgid "Multi-Threaded (Recommended)"
msgstr ""
-#: ../plugins/dfinput/dfinput.ui.h:9
+#: ../plugins/dfinput/dfinput.ui.h:9 ../win32/gui/WndMain.c:1316
+msgid "Options"
+msgstr "Opções"
+
+#: ../plugins/dfinput/dfinput.ui.h:10
msgid "Reset"
msgstr ""
-#: ../plugins/dfinput/dfinput.ui.h:10
+#: ../plugins/dfinput/dfinput.ui.h:11
msgid "Type:"
msgstr ""
-#: ../plugins/dfinput/pad.c:24
-msgid "Gamepad/Keyboard Input"
+#: ../plugins/dfinput/pad.c:29
+#, fuzzy
+msgid "Gamepad/Keyboard/Mouse Input"
msgstr "Entrada do gamepad ou teclado"
#. increase that with each version
@@ -1516,28 +1566,29 @@ msgstr "Erro carregando \"%s\": \"%s\""
msgid "Error allocating memory!\n"
msgstr "Erro ao alocar memória!"
-#: ../plugins/dfnet/dfnet.ui.h:1
+#. ****************************************************************************
+#: ../plugins/dfnet/dfnet.ui.h:1 ../plugins/bladesio1/sio1.ui.h:1
msgid "Client (Player2)"
msgstr ""
-#: ../plugins/dfnet/dfnet.ui.h:2
+#: ../plugins/dfnet/dfnet.ui.h:2 ../plugins/bladesio1/sio1.ui.h:2
msgid "Copy PC IP to Clipboard"
msgstr ""
-#: ../plugins/dfnet/dfnet.ui.h:3
+#: ../plugins/dfnet/dfnet.ui.h:3 ../plugins/bladesio1/sio1.ui.h:3
msgid ""
"Do not change if not necessary (remember it must be changed on both sides)."
msgstr ""
-#: ../plugins/dfnet/dfnet.ui.h:4
+#: ../plugins/dfnet/dfnet.ui.h:4 ../plugins/bladesio1/sio1.ui.h:4
msgid "Play Offline"
msgstr ""
-#: ../plugins/dfnet/dfnet.ui.h:5
+#: ../plugins/dfnet/dfnet.ui.h:5 ../plugins/bladesio1/sio1.ui.h:5
msgid "Port Number"
msgstr ""
-#: ../plugins/dfnet/dfnet.ui.h:6
+#: ../plugins/dfnet/dfnet.ui.h:6 ../plugins/bladesio1/sio1.ui.h:6
msgid ""
"Select here if you'll be Server (Player1) or Client (Player2).\n"
"\n"
@@ -1548,16 +1599,16 @@ msgid ""
"the IP Address Control."
msgstr ""
-#: ../plugins/dfnet/dfnet.ui.h:11
+#: ../plugins/dfnet/dfnet.ui.h:11 ../plugins/bladesio1/sio1.ui.h:11
msgid "Server (Player1)"
msgstr ""
-#: ../plugins/dfnet/dfnet.ui.h:12
+#: ../plugins/dfnet/dfnet.ui.h:12 ../plugins/bladesio1/sio1.ui.h:12
msgid "Start Game"
msgstr ""
#: ../plugins/dfnet/gui.c:30 ../plugins/dfnet/gui.c:112
-#: ../win32/gui/ConfigurePlugins.c:616
+#: ../win32/gui/ConfigurePlugins.c:618
msgid "NetPlay"
msgstr "Jogo em rede"
@@ -1618,100 +1669,92 @@ msgstr ""
"Extensão OSS P.E.Op.S. V1.7\n"
"Programada por Pete Bernert e a equipe do P.E.Op.S.\n"
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:1
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2.h:20
-msgid "<b>Compatibility</b>"
-msgstr "<b>Compatibilidade</b>"
-
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:2
-msgid "<b>General</b>"
-msgstr "<b>Geral</b>"
-
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:3
-msgid "<b>XA Music</b>"
-msgstr "<b>Música XA</b>"
-
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:4
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:1
msgid "Adjust XA speed"
msgstr "Ajustar velocidade da XA"
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:5
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:2
msgid "Choose this if XA music is played too quickly."
msgstr "Selecione isso se a música XA estiver tocando rápido demais."
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:7
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:4
+msgid "Cubic"
+msgstr ""
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:5
msgid "Frequency Response - Output Filter"
msgstr ""
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:8
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:6
+#, fuzzy
+msgid "Gaussian"
+msgstr "Russo"
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:7
msgid "High compatibility mode"
msgstr "Modo de alta compatibilidade"
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:9
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:8
msgid "Interpolation:"
msgstr "Interpolação:"
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:10
-#, fuzzy
-msgid ""
-"None\n"
-"Low\n"
-"Medium\n"
-"Loud\n"
-"Loudest"
-msgstr ""
-"Mínimo\n"
-"Médio\n"
-"Alto\n"
-"Máximo"
-
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:15
-msgid ""
-"None\n"
-"Simple\n"
-"Gaussian\n"
-"Cubic"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:9
+msgid "Loud"
msgstr ""
-"Nenhuma\n"
-"Simples\n"
-"Gaussiana\n"
-"Cúbica"
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:19
-msgid ""
-"Off\n"
-"Simple\n"
-"Playstation"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:10
+msgid "Loudest"
+msgstr ""
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:11
+msgid "Low"
+msgstr ""
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:12
+msgid "Medium"
msgstr ""
-"Desligada\n"
-"Simples\n"
-"PlayStation"
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:22
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:14
+msgid "Off"
+msgstr ""
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:15
msgid "Play only one channel for a performance boost."
msgstr "Tocar apenas um canal para melhorar o desempenho."
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:23
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:16
+#, fuzzy
+msgid "Playstation"
+msgstr ""
+"Desligada\n"
+"Simples\n"
+"PlayStation"
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:17
msgid "Reverb:"
msgstr "Reversão:"
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:24
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:18
msgid "SPU IRQ Wait"
msgstr "Esperar pela IRQ da SPU"
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:25
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:19
+msgid "Simple"
+msgstr ""
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:20
msgid "Single channel sound"
msgstr "Som em canal único"
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:26
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:21
msgid "Use the asynchronous SPU interface."
msgstr "Usar o ambiente assíncrono da SPU."
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:27
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:22
msgid "Volume:"
msgstr "Volume:"
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:28
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:23
msgid "Wait for CPU; only useful for some games."
msgstr "Esperar pela CPU; útil apenas em alguns jogos."
@@ -1807,6 +1850,10 @@ msgstr ""
"1280x1024\n"
"1600x1200"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2.h:20
+msgid "<b>Compatibility</b>"
+msgstr "<b>Compatibilidade</b>"
+
#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2.h:21
msgid "<b>Framerate</b>"
msgstr "<b>Taxa de FPS</b>"
@@ -2367,6 +2414,11 @@ msgstr "Opções da janela"
msgid "Yellow rect (FF9)"
msgstr "Retângulo amarelo (Final Fantasy 9)"
+#: ../plugins/bladesio1/gui.c:32
+#, fuzzy
+msgid "Link cable"
+msgstr "Ligar"
+
#. ****************************************************************************
#: ../plugins/bladesio1/sio1.c:29
#, fuzzy
@@ -2375,7 +2427,7 @@ msgstr "Extensão SoftGL"
#: ../win32/gui/AboutDlg.c:26
msgid ""
-"PCSX - A PlayStation Emulator\n"
+"PCSXR - A PlayStation Emulator\n"
"\n"
"Original Authors:\n"
"main coder: linuzappz\n"
@@ -2383,7 +2435,7 @@ msgid ""
"ex-coders: Nocomp, Pete Bernett, nik3d\n"
"Webmaster: AkumaX"
msgstr ""
-"PCSX - Um Emulador de PlayStation\n"
+"PCSXR - Um Emulador de PlayStation\n"
"\n"
"Autores Originais:\n"
"Programador principal: linuzappz\n"
@@ -2392,14 +2444,13 @@ msgstr ""
"Webmaster: AkumaX"
#: ../win32/gui/AboutDlg.c:35
-#, fuzzy
msgid ""
"PCSX-df Authors:\n"
"Ryan Schultz, Andrew Burton, Stephen Chao,\n"
"Marcus Comstedt, Stefan Sikora\n"
"\n"
"PCSX-Reloaded By:\n"
-"Blade_Arma, shalma, Wei Mingzhi, et al.\n"
+"edgbla, shalma, Wei Mingzhi, et al.\n"
"\n"
"http://pcsxr.codeplex.com/"
msgstr ""
@@ -2408,7 +2459,7 @@ msgstr ""
"Marcus Comstedt, Stefan Sikora\n"
"\n"
"PCSX Reloaded por:\n"
-"Wei Mingzhi\n"
+"edgbla, shalma, Wei Mingzhi\n"
"\n"
"http://www.codeplex.com/pcsxr"
@@ -2418,14 +2469,14 @@ msgstr "Sobre"
#: ../win32/gui/AboutDlg.c:48 ../win32/gui/AboutDlg.c:52
#: ../win32/gui/CheatDlg.c:69 ../win32/gui/CheatDlg.c:119
-#: ../win32/gui/ConfigurePlugins.c:483 ../win32/gui/ConfigurePlugins.c:614
-#: ../win32/gui/WndMain.c:1059 ../win32/gui/WndMain.c:1295
+#: ../win32/gui/ConfigurePlugins.c:485 ../win32/gui/ConfigurePlugins.c:616
+#: ../win32/gui/WndMain.c:1064 ../win32/gui/WndMain.c:1300
msgid "OK"
msgstr "OK"
#: ../win32/gui/AboutDlg.c:49
-msgid "PCSX EMU\n"
-msgstr "EMULADOR PCSX\n"
+msgid "PCSXR EMU\n"
+msgstr "EMULADOR PCSXR\n"
#: ../win32/gui/CheatDlg.c:51 ../win32/gui/CheatDlg.c:223
#: ../win32/gui/CheatDlg.c:270
@@ -2438,8 +2489,8 @@ msgid "No"
msgstr "Não"
#: ../win32/gui/CheatDlg.c:70 ../win32/gui/CheatDlg.c:120
-#: ../win32/gui/ConfigurePlugins.c:484 ../win32/gui/ConfigurePlugins.c:615
-#: ../win32/gui/WndMain.c:1060 ../win32/gui/WndMain.c:1296
+#: ../win32/gui/ConfigurePlugins.c:486 ../win32/gui/ConfigurePlugins.c:617
+#: ../win32/gui/WndMain.c:1065 ../win32/gui/WndMain.c:1301
msgid "Cancel"
msgstr "Cancelar"
@@ -2476,8 +2527,8 @@ msgid "Enabled"
msgstr "Ligado"
#: ../win32/gui/CheatDlg.c:282 ../win32/gui/CheatDlg.c:311
-msgid "PCSX Cheat Code Files"
-msgstr "Arquivos de trapaça do PCSX"
+msgid "PCSXR Cheat Code Files"
+msgstr "Arquivos de trapaça do PCSXR"
#: ../win32/gui/CheatDlg.c:402
msgid "Equal Value"
@@ -2572,152 +2623,152 @@ msgstr "Decimal"
msgid "Hexadecimal"
msgstr "Hexadecimal"
-#: ../win32/gui/ConfigurePlugins.c:219
+#: ../win32/gui/ConfigurePlugins.c:221
msgid "Simulate Psx Bios"
msgstr ""
-#: ../win32/gui/ConfigurePlugins.c:305
+#: ../win32/gui/ConfigurePlugins.c:307
msgid "Configuration not OK!"
msgstr "Não configurou corretamente!"
-#: ../win32/gui/ConfigurePlugins.c:406
+#: ../win32/gui/ConfigurePlugins.c:408
msgid "This plugin reports that should work correctly"
msgstr "Esta extensão informou que deve funcionar corretamente."
-#: ../win32/gui/ConfigurePlugins.c:407
+#: ../win32/gui/ConfigurePlugins.c:409
msgid "This plugin reports that should not work correctly"
msgstr "Esta extensão informou que não deve funcionar corretamente."
-#: ../win32/gui/ConfigurePlugins.c:463
+#: ../win32/gui/ConfigurePlugins.c:465
msgid "Select Plugins Directory"
msgstr "Escolha o diretório das extensões"
-#: ../win32/gui/ConfigurePlugins.c:472
+#: ../win32/gui/ConfigurePlugins.c:474
msgid "Select Bios Directory"
msgstr "Escolha o diretório da BIOS"
-#: ../win32/gui/ConfigurePlugins.c:481
+#: ../win32/gui/ConfigurePlugins.c:483
msgid "Configuration"
msgstr "Configuração"
-#: ../win32/gui/ConfigurePlugins.c:485
+#: ../win32/gui/ConfigurePlugins.c:487
msgid "Graphics"
msgstr "Gráficos"
-#: ../win32/gui/ConfigurePlugins.c:486
+#: ../win32/gui/ConfigurePlugins.c:488
msgid "First Controller"
msgstr "Controle 1"
-#: ../win32/gui/ConfigurePlugins.c:487
+#: ../win32/gui/ConfigurePlugins.c:489
msgid "Second Controller"
msgstr "Controle 2"
-#: ../win32/gui/ConfigurePlugins.c:488
+#: ../win32/gui/ConfigurePlugins.c:490
msgid "Sound"
msgstr "Áudio"
-#: ../win32/gui/ConfigurePlugins.c:489
+#: ../win32/gui/ConfigurePlugins.c:491
msgid "Cdrom"
msgstr "CDROM"
-#: ../win32/gui/ConfigurePlugins.c:490
+#: ../win32/gui/ConfigurePlugins.c:492
msgid "Bios"
msgstr "BIOS"
-#: ../win32/gui/ConfigurePlugins.c:491
+#: ../win32/gui/ConfigurePlugins.c:493
msgid "Set Bios Directory"
msgstr "Escolher o diretório da BIOS"
-#: ../win32/gui/ConfigurePlugins.c:492
+#: ../win32/gui/ConfigurePlugins.c:494
msgid "Set Plugins Directory"
msgstr "Escolher o diretório das extensões"
-#: ../win32/gui/ConfigurePlugins.c:493 ../win32/gui/ConfigurePlugins.c:496
-#: ../win32/gui/ConfigurePlugins.c:499 ../win32/gui/ConfigurePlugins.c:502
-#: ../win32/gui/ConfigurePlugins.c:505 ../win32/gui/ConfigurePlugins.c:617
+#: ../win32/gui/ConfigurePlugins.c:495 ../win32/gui/ConfigurePlugins.c:498
+#: ../win32/gui/ConfigurePlugins.c:501 ../win32/gui/ConfigurePlugins.c:504
+#: ../win32/gui/ConfigurePlugins.c:507 ../win32/gui/ConfigurePlugins.c:619
msgid "Configure..."
msgstr "Configurar..."
-#: ../win32/gui/ConfigurePlugins.c:494 ../win32/gui/ConfigurePlugins.c:497
-#: ../win32/gui/ConfigurePlugins.c:500 ../win32/gui/ConfigurePlugins.c:503
-#: ../win32/gui/ConfigurePlugins.c:506 ../win32/gui/ConfigurePlugins.c:618
+#: ../win32/gui/ConfigurePlugins.c:496 ../win32/gui/ConfigurePlugins.c:499
+#: ../win32/gui/ConfigurePlugins.c:502 ../win32/gui/ConfigurePlugins.c:505
+#: ../win32/gui/ConfigurePlugins.c:508 ../win32/gui/ConfigurePlugins.c:620
msgid "Test..."
msgstr "Testar..."
-#: ../win32/gui/ConfigurePlugins.c:495 ../win32/gui/ConfigurePlugins.c:498
-#: ../win32/gui/ConfigurePlugins.c:501 ../win32/gui/ConfigurePlugins.c:504
-#: ../win32/gui/ConfigurePlugins.c:507 ../win32/gui/ConfigurePlugins.c:619
+#: ../win32/gui/ConfigurePlugins.c:497 ../win32/gui/ConfigurePlugins.c:500
+#: ../win32/gui/ConfigurePlugins.c:503 ../win32/gui/ConfigurePlugins.c:506
+#: ../win32/gui/ConfigurePlugins.c:509 ../win32/gui/ConfigurePlugins.c:621
msgid "About..."
msgstr "Sobre..."
-#: ../win32/gui/ConfigurePlugins.c:612
+#: ../win32/gui/ConfigurePlugins.c:614
msgid "NetPlay Configuration"
msgstr "Configuração do jogo em rede"
-#: ../win32/gui/ConfigurePlugins.c:620
+#: ../win32/gui/ConfigurePlugins.c:622
msgid ""
"Note: The NetPlay Plugin Directory should be the same as the other Plugins."
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:94 ../win32/gui/WndMain.c:323
+#: ../win32/gui/plugin.c:94 ../win32/gui/WndMain.c:328
#, c-format
-msgid "*PCSX*: Saved State %d"
-msgstr "PCSX: Estado \"%d\" salvo."
+msgid "*PCSXR*: Saved State %d"
+msgstr "PCSXR: Estado \"%d\" salvo."
-#: ../win32/gui/plugin.c:95 ../win32/gui/WndMain.c:324
+#: ../win32/gui/plugin.c:95 ../win32/gui/WndMain.c:329
#, c-format
-msgid "*PCSX*: Error Saving State %d"
-msgstr "PCSX: Erro ao salvar o estado \"%d\"!"
+msgid "*PCSXR*: Error Saving State %d"
+msgstr "PCSXR: Erro ao salvar o estado \"%d\"!"
-#: ../win32/gui/plugin.c:111 ../win32/gui/WndMain.c:301
+#: ../win32/gui/plugin.c:111 ../win32/gui/WndMain.c:306
#, c-format
-msgid "*PCSX*: Loaded State %d"
-msgstr "PCSX: Estado \"%d\" carregado."
+msgid "*PCSXR*: Loaded State %d"
+msgstr "PCSXR: Estado \"%d\" carregado."
-#: ../win32/gui/plugin.c:112 ../win32/gui/WndMain.c:302
+#: ../win32/gui/plugin.c:112 ../win32/gui/WndMain.c:307
#, c-format
-msgid "*PCSX*: Error Loading State %d"
-msgstr "PCSX: Erro ao carregar o estado \"%d\"!"
+msgid "*PCSXR*: Error Loading State %d"
+msgstr "PCSXR: Erro ao carregar o estado \"%d\"!"
#: ../win32/gui/plugin.c:123
#, c-format
-msgid "*PCSX*: Sio Irq Always Enabled"
-msgstr "PCSX: IRQ SIO sempre ativada."
+msgid "*PCSXR*: Sio Irq Always Enabled"
+msgstr "PCSXR: IRQ SIO sempre ativada."
#: ../win32/gui/plugin.c:124
#, c-format
-msgid "*PCSX*: Sio Irq Not Always Enabled"
-msgstr "PCSX: IRQ SIO nem sempre ativada."
+msgid "*PCSXR*: Sio Irq Not Always Enabled"
+msgstr "PCSXR: IRQ SIO nem sempre ativada."
#: ../win32/gui/plugin.c:131
#, c-format
-msgid "*PCSX*: Black&White Mdecs Only Enabled"
-msgstr "PCSX: Mdecs apenas em preto e branco."
+msgid "*PCSXR*: Black&White Mdecs Only Enabled"
+msgstr "PCSXR: Mdecs apenas em preto e branco."
#: ../win32/gui/plugin.c:132
#, c-format
-msgid "*PCSX*: Black&White Mdecs Only Disabled"
-msgstr "PCSX: Mdecs coloridas."
+msgid "*PCSXR*: Black&White Mdecs Only Disabled"
+msgstr "PCSXR: Mdecs coloridas."
#: ../win32/gui/plugin.c:139
#, c-format
-msgid "*PCSX*: Xa Enabled"
-msgstr "PCSX: XA Ligado."
+msgid "*PCSXR*: Xa Enabled"
+msgstr "PCSXR: XA Ligado."
#: ../win32/gui/plugin.c:140
#, c-format
-msgid "*PCSX*: Xa Disabled"
-msgstr "PCSX: XA Desligado."
+msgid "*PCSXR*: Xa Disabled"
+msgstr "PCSXR: XA Desligado."
#: ../win32/gui/plugin.c:149
-msgid "*PCSX*: CdRom Case Opened"
-msgstr "PCSX: Bandeja do CDROM aberta."
+msgid "*PCSXR*: CdRom Case Opened"
+msgstr "PCSXR: Bandeja do CDROM aberta."
#: ../win32/gui/plugin.c:155
-msgid "*PCSX*: CdRom Case Closed"
-msgstr "PCSX: Bandeja do CDROM fechada."
+msgid "*PCSXR*: CdRom Case Closed"
+msgstr "PCSXR: Bandeja do CDROM fechada."
#: ../win32/gui/plugin.c:183
msgid "Connecting..."
@@ -2810,8 +2861,8 @@ msgstr "Alemão"
msgid "Greek"
msgstr "Grego"
-#: ../win32/gui/WndMain.c:81 ../win32/gui/WndMain.c:1659
-#: ../win32/gui/WndMain.c:1661
+#: ../win32/gui/WndMain.c:81 ../win32/gui/WndMain.c:1667
+#: ../win32/gui/WndMain.c:1669
msgid "English"
msgstr "Inglês"
@@ -2862,7 +2913,7 @@ msgstr "Coreano"
#: ../win32/gui/WndMain.c:215
msgid ""
-"Usage: pcsx [options]\n"
+"Usage: pcsxr [options]\n"
"\toptions:\n"
"\t-nogui\t\tDon't open the GUI\n"
"\t-psxout\t\tEnable PSX output\n"
@@ -2872,331 +2923,360 @@ msgid ""
"\t-help\t\tDisplay this message"
msgstr ""
-#: ../win32/gui/WndMain.c:342 ../win32/gui/WndMain.c:388
-msgid "PCSX State Format"
-msgstr "Formato dos estados salvos do PCSX"
+#: ../win32/gui/WndMain.c:347 ../win32/gui/WndMain.c:393
+msgid "PCSXR State Format"
+msgstr "Formato dos estados salvos do PCSXR"
-#: ../win32/gui/WndMain.c:369
+#: ../win32/gui/WndMain.c:374
#, c-format
-msgid "*PCSX*: Loaded State %s"
-msgstr "PCSX: Arquivo de estado \"%s\" carregado."
+msgid "*PCSXR*: Loaded State %s"
+msgstr "PCSXR: Arquivo de estado \"%s\" carregado."
-#: ../win32/gui/WndMain.c:370
+#: ../win32/gui/WndMain.c:375
#, c-format
-msgid "*PCSX*: Error Loading State %s"
-msgstr "PCSX: Erro ao carregar o arquivo de estado \"%s\"!"
+msgid "*PCSXR*: Error Loading State %s"
+msgstr "PCSXR: Erro ao carregar o arquivo de estado \"%s\"!"
-#: ../win32/gui/WndMain.c:415
+#: ../win32/gui/WndMain.c:420
#, c-format
-msgid "*PCSX*: Saved State %s"
-msgstr "PCSX: Arquivo de estado \"%s\" salvo."
+msgid "*PCSXR*: Saved State %s"
+msgstr "PCSXR: Arquivo de estado \"%s\" salvo."
-#: ../win32/gui/WndMain.c:416
+#: ../win32/gui/WndMain.c:421
#, c-format
-msgid "*PCSX*: Error Saving State %s"
-msgstr "PCSX: Erro ao salvar o arquivo de estado \"%s\"!"
+msgid "*PCSXR*: Error Saving State %s"
+msgstr "PCSXR: Erro ao salvar o arquivo de estado \"%s\"!"
-#: ../win32/gui/WndMain.c:484
+#: ../win32/gui/WndMain.c:489
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:761
+#: ../win32/gui/WndMain.c:766
msgid "Game ID"
msgstr "ID do Jogo"
-#: ../win32/gui/WndMain.c:767
+#: ../win32/gui/WndMain.c:772
msgid "Game"
msgstr "Jogo"
-#: ../win32/gui/WndMain.c:949
+#: ../win32/gui/WndMain.c:954
msgid "mid link block"
msgstr "bloco de ligação intermediário"
-#: ../win32/gui/WndMain.c:952
+#: ../win32/gui/WndMain.c:957
msgid "terminiting link block"
msgstr "bloco final da ligação"
-#: ../win32/gui/WndMain.c:1057
+#: ../win32/gui/WndMain.c:1062
msgid "Memcard Manager"
msgstr "Gerenciador de cartões de memória"
-#: ../win32/gui/WndMain.c:1061 ../win32/gui/WndMain.c:1064
+#: ../win32/gui/WndMain.c:1066 ../win32/gui/WndMain.c:1069
msgid "Select Mcd"
msgstr "Selecionar cartão"
-#: ../win32/gui/WndMain.c:1062 ../win32/gui/WndMain.c:1065
+#: ../win32/gui/WndMain.c:1067 ../win32/gui/WndMain.c:1070
msgid "Format Mcd"
msgstr "Formatar cartão"
-#: ../win32/gui/WndMain.c:1063 ../win32/gui/WndMain.c:1066
+#: ../win32/gui/WndMain.c:1068 ../win32/gui/WndMain.c:1071
msgid "Reload Mcd"
msgstr "Reiniciar cartão"
-#: ../win32/gui/WndMain.c:1067
+#: ../win32/gui/WndMain.c:1072
msgid "-> Copy ->"
msgstr "-> Copiar ->"
-#: ../win32/gui/WndMain.c:1068
+#: ../win32/gui/WndMain.c:1073
msgid "<- Copy <-"
msgstr "<- Copiar <-"
-#: ../win32/gui/WndMain.c:1069
+#: ../win32/gui/WndMain.c:1074
msgid "Paste"
msgstr "Colar"
-#: ../win32/gui/WndMain.c:1070
+#: ../win32/gui/WndMain.c:1075
msgid "<- Un/Delete"
msgstr "<- Apagar/Desfazer"
-#: ../win32/gui/WndMain.c:1071
+#: ../win32/gui/WndMain.c:1076
msgid "Un/Delete ->"
msgstr "Apagar/Desfazer ->"
-#: ../win32/gui/WndMain.c:1073
+#: ../win32/gui/WndMain.c:1078
msgid "Memory Card 1"
msgstr "Cartão de memória 1"
-#: ../win32/gui/WndMain.c:1074
+#: ../win32/gui/WndMain.c:1079
msgid "Memory Card 2"
msgstr "Cartão de memória 2"
-#: ../win32/gui/WndMain.c:1129
+#: ../win32/gui/WndMain.c:1134
msgid "Are you sure you want to paste this selection?"
msgstr "Você tem certeza que quer colar o selecionado?"
-#: ../win32/gui/WndMain.c:1129 ../win32/gui/WndMain.c:1240
-#: ../win32/gui/WndMain.c:1247
+#: ../win32/gui/WndMain.c:1134 ../win32/gui/WndMain.c:1245
+#: ../win32/gui/WndMain.c:1252
msgid "Confirmation"
msgstr "Confirmação"
-#: ../win32/gui/WndMain.c:1240 ../win32/gui/WndMain.c:1247
+#: ../win32/gui/WndMain.c:1245 ../win32/gui/WndMain.c:1252
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:1293
+#: ../win32/gui/WndMain.c:1298
msgid "Cpu Config"
msgstr "Configuração da CPU"
-#: ../win32/gui/WndMain.c:1298
+#: ../win32/gui/WndMain.c:1303
msgid "Disable Xa Decoding"
msgstr "Desativar decodificação de XA"
-#: ../win32/gui/WndMain.c:1299
+#: ../win32/gui/WndMain.c:1304
msgid "Sio Irq Always Enabled"
msgstr "IRQ SIO sempre ativado"
-#: ../win32/gui/WndMain.c:1300
+#: ../win32/gui/WndMain.c:1305
msgid "Black && White Movies"
msgstr "Filmes em preto e branco"
-#: ../win32/gui/WndMain.c:1301
+#: ../win32/gui/WndMain.c:1306
msgid "Disable Cd audio"
msgstr "Desativar áudio de CD"
-#: ../win32/gui/WndMain.c:1303
+#: ../win32/gui/WndMain.c:1309
msgid "Enable Interpreter Cpu"
msgstr "Ativar interpretador da CPU"
-#: ../win32/gui/WndMain.c:1306
+#: ../win32/gui/WndMain.c:1312
msgid "Spu Irq Always Enabled"
msgstr "IRQ da SPU sempre ligada"
-#: ../win32/gui/WndMain.c:1311
+#: ../win32/gui/WndMain.c:1317
msgid "Psx System Type"
msgstr "Tipo de sistema do PSX"
-#: ../win32/gui/WndMain.c:1415
+#: ../win32/gui/WndMain.c:1423
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:1420
+#: ../win32/gui/WndMain.c:1428
msgid "Psx Memory Card (*.mcr;*.mc)"
msgstr "Cartão de memória binário (*.mcr;*.mc)"
-#: ../win32/gui/WndMain.c:1425
+#: ../win32/gui/WndMain.c:1433
msgid "CVGS Memory Card (*.mem;*.vgs)"
msgstr "Cartão de memória do CVGS (*.mem;*.vgs)"
-#: ../win32/gui/WndMain.c:1430
+#: ../win32/gui/WndMain.c:1438
msgid "Bleem Memory Card (*.mcd)"
msgstr "Cartão de memória do Bleem (*.mcd)"
-#: ../win32/gui/WndMain.c:1435
+#: ../win32/gui/WndMain.c:1443
msgid "DexDrive Memory Card (*.gme)"
msgstr "Cartão de memória do DexDrive (*.gme)"
-#: ../win32/gui/WndMain.c:1440
+#: ../win32/gui/WndMain.c:1448
msgid "DataDeck Memory Card (*.ddf)"
msgstr "Cartão de memória do DataDeck (*.ddf)"
-#: ../win32/gui/WndMain.c:1484
+#: ../win32/gui/WndMain.c:1492
msgid "Psx Exe Format"
msgstr "Formato executável do PSX"
-#: ../win32/gui/WndMain.c:1521
+#: ../win32/gui/WndMain.c:1529
msgid "Psx Isos (*.iso;*.mdf;*.img;*.bin)"
msgstr "Imagens de CD (*.iso;*.mdf;*.img;*.bin)"
-#: ../win32/gui/WndMain.c:1597
+#: ../win32/gui/WndMain.c:1605
msgid "&File"
msgstr "&Arquivo"
-#: ../win32/gui/WndMain.c:1598
+#: ../win32/gui/WndMain.c:1606
msgid "E&xit"
msgstr "&Sair"
-#: ../win32/gui/WndMain.c:1600
+#: ../win32/gui/WndMain.c:1608
msgid "Run &EXE..."
msgstr "Rodar &EXE..."
-#: ../win32/gui/WndMain.c:1601
+#: ../win32/gui/WndMain.c:1609
msgid "Run &BIOS"
msgstr "Iniciar pela &BIOS"
-#: ../win32/gui/WndMain.c:1602
+#: ../win32/gui/WndMain.c:1610
msgid "Run &ISO..."
msgstr "Rodar &imagem de CD..."
-#: ../win32/gui/WndMain.c:1603
+#: ../win32/gui/WndMain.c:1611
msgid "Run &CD"
msgstr "Rodar &CD"
-#: ../win32/gui/WndMain.c:1605
+#: ../win32/gui/WndMain.c:1613
msgid "&Emulator"
msgstr "&Emulador"
-#: ../win32/gui/WndMain.c:1606
+#: ../win32/gui/WndMain.c:1614
msgid "&States"
msgstr "&Estados"
-#: ../win32/gui/WndMain.c:1608
+#: ../win32/gui/WndMain.c:1616
msgid "S&witch ISO..."
msgstr "T&rocar de imagem de CD..."
-#: ../win32/gui/WndMain.c:1610
+#: ../win32/gui/WndMain.c:1618
msgid "Re&set"
msgstr "Re&iniciar"
-#: ../win32/gui/WndMain.c:1611
+#: ../win32/gui/WndMain.c:1619
msgid "&Run"
msgstr "&Executar"
-#: ../win32/gui/WndMain.c:1612
+#: ../win32/gui/WndMain.c:1620
msgid "&Save"
msgstr "&Salvar"
-#: ../win32/gui/WndMain.c:1613
+#: ../win32/gui/WndMain.c:1621
msgid "&Load"
msgstr "&Carregar"
-#: ../win32/gui/WndMain.c:1614 ../win32/gui/WndMain.c:1624
+#: ../win32/gui/WndMain.c:1622 ../win32/gui/WndMain.c:1632
msgid "&Other..."
msgstr "&Outros..."
-#: ../win32/gui/WndMain.c:1615 ../win32/gui/WndMain.c:1625
-#, fuzzy
+#: ../win32/gui/WndMain.c:1623 ../win32/gui/WndMain.c:1633
msgid "Slot &9"
-msgstr "Unidade &5"
+msgstr "Unidade &9"
-#: ../win32/gui/WndMain.c:1616 ../win32/gui/WndMain.c:1626
-#, fuzzy
+#: ../win32/gui/WndMain.c:1624 ../win32/gui/WndMain.c:1634
msgid "Slot &8"
-msgstr "Unidade &5"
+msgstr "Unidade &8"
-#: ../win32/gui/WndMain.c:1617 ../win32/gui/WndMain.c:1627
-#, fuzzy
+#: ../win32/gui/WndMain.c:1625 ../win32/gui/WndMain.c:1635
msgid "Slot &7"
-msgstr "Unidade &5"
+msgstr "Unidade &7"
-#: ../win32/gui/WndMain.c:1618 ../win32/gui/WndMain.c:1628
-#, fuzzy
+#: ../win32/gui/WndMain.c:1626 ../win32/gui/WndMain.c:1636
msgid "Slot &6"
-msgstr "Unidade &5"
+msgstr "Unidade &6"
-#: ../win32/gui/WndMain.c:1619 ../win32/gui/WndMain.c:1629
+#: ../win32/gui/WndMain.c:1627 ../win32/gui/WndMain.c:1637
msgid "Slot &5"
msgstr "Unidade &5"
-#: ../win32/gui/WndMain.c:1620 ../win32/gui/WndMain.c:1630
+#: ../win32/gui/WndMain.c:1628 ../win32/gui/WndMain.c:1638
msgid "Slot &4"
msgstr "Unidade &4"
-#: ../win32/gui/WndMain.c:1621 ../win32/gui/WndMain.c:1631
+#: ../win32/gui/WndMain.c:1629 ../win32/gui/WndMain.c:1639
msgid "Slot &3"
msgstr "Unidade &3"
-#: ../win32/gui/WndMain.c:1622 ../win32/gui/WndMain.c:1632
+#: ../win32/gui/WndMain.c:1630 ../win32/gui/WndMain.c:1640
msgid "Slot &2"
msgstr "Unidade &2"
-#: ../win32/gui/WndMain.c:1623 ../win32/gui/WndMain.c:1633
+#: ../win32/gui/WndMain.c:1631 ../win32/gui/WndMain.c:1641
msgid "Slot &1"
msgstr "Unidade &1"
-#: ../win32/gui/WndMain.c:1635
+#: ../win32/gui/WndMain.c:1643
msgid "&Configuration"
msgstr "&Configuração"
-#: ../win32/gui/WndMain.c:1636
+#: ../win32/gui/WndMain.c:1644
msgid "Cheat &Search..."
msgstr "Procurar por &trapaça..."
-#: ../win32/gui/WndMain.c:1637
+#: ../win32/gui/WndMain.c:1645
msgid "Ch&eat Code..."
msgstr "&Código de trapaça..."
-#: ../win32/gui/WndMain.c:1640
+#: ../win32/gui/WndMain.c:1648
msgid "&Language"
msgstr "&Linguagem"
-#: ../win32/gui/WndMain.c:1665
+#: ../win32/gui/WndMain.c:1673
msgid "&Memory cards..."
msgstr "&Cartões de memória..."
-#: ../win32/gui/WndMain.c:1666
+#: ../win32/gui/WndMain.c:1674
msgid "C&PU..."
msgstr "C&PU..."
-#: ../win32/gui/WndMain.c:1668
+#: ../win32/gui/WndMain.c:1676
msgid "&NetPlay..."
msgstr "&Jogo em rede..."
-#: ../win32/gui/WndMain.c:1670
+#: ../win32/gui/WndMain.c:1678
msgid "&Controllers..."
msgstr "&Controles..."
-#: ../win32/gui/WndMain.c:1671
+#: ../win32/gui/WndMain.c:1679
msgid "CD-&ROM..."
msgstr "CD&ROM..."
-#: ../win32/gui/WndMain.c:1672
+#: ../win32/gui/WndMain.c:1680
msgid "&Sound..."
msgstr "Á&udio..."
-#: ../win32/gui/WndMain.c:1673
+#: ../win32/gui/WndMain.c:1681
msgid "&Graphics..."
msgstr "&Gráficos..."
-#: ../win32/gui/WndMain.c:1675
+#: ../win32/gui/WndMain.c:1683
msgid "&Plugins && Bios..."
msgstr "&Extensões e BIOS..."
-#: ../win32/gui/WndMain.c:1677
+#: ../win32/gui/WndMain.c:1685
msgid "&Help"
msgstr "&Ajuda"
-#: ../win32/gui/WndMain.c:1678
+#: ../win32/gui/WndMain.c:1686
msgid "&About..."
msgstr "&Sobre..."
-#: ../win32/gui/WndMain.c:1866
-msgid "Pcsx Msg"
-msgstr "Mensagens do PCSX"
+#: ../win32/gui/WndMain.c:1874
+msgid "Pcsxr Msg"
+msgstr "Mensagens do PCSXR"
-#: ../win32/gui/WndMain.c:1869
+#: ../win32/gui/WndMain.c:1877
msgid "Error Loading Symbol"
msgstr "Erro ao carregar símbolo"
+#~ msgid "<b>General</b>"
+#~ msgstr "<b>Geral</b>"
+
+#~ msgid "<b>XA Music</b>"
+#~ msgstr "<b>Música XA</b>"
+
+#, fuzzy
+#~ msgid ""
+#~ "None\n"
+#~ "Low\n"
+#~ "Medium\n"
+#~ "Loud\n"
+#~ "Loudest"
+#~ msgstr ""
+#~ "Mínimo\n"
+#~ "Médio\n"
+#~ "Alto\n"
+#~ "Máximo"
+
+#~ msgid ""
+#~ "None\n"
+#~ "Simple\n"
+#~ "Gaussian\n"
+#~ "Cubic"
+#~ msgstr ""
+#~ "Nenhuma\n"
+#~ "Simples\n"
+#~ "Gaussiana\n"
+#~ "Cúbica"
+
+#~ msgid "Select CD-ROM device"
+#~ msgstr "Selecione uma unidade de CDROM"
+
#~ msgid "0: None"
#~ msgstr "0: Nenhum"
@@ -3266,7 +3346,7 @@ msgstr "Erro ao carregar símbolo"
#~ msgstr "&Cartões de memória..."
#~ msgid ""
-#~ "(C) 1999-2003 PCSX Team\n"
+#~ "(C) 1999-2003 PCSX Team\n"
#~ "(C) 2005-2006 Ryan Schultz\n"
#~ "(C) 2005-2006 Andrew Burton\n"
#~ "(C) 2008-2009 Wei Mingzhi"
diff --git a/po/ru_RU.po b/po/ru_RU.po
index d45a2ae0..931e9681 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -2,23 +2,23 @@
# Copyright (C) 2010 edgbla
# This file is distributed under the same license as the pcsxr package.
#
-# Blade_Arma <edgbla@yandex.ru>, 2010.
+# Blade_Arma <edgbla@yandex.ru>, 2010, 2011.
msgid ""
msgstr ""
"Project-Id-Version: pcsxr 1.0\n"
"Report-Msgid-Bugs-To: whistler_wmz@users.sf.net\n"
-"POT-Creation-Date: 2011-02-18 17:11+0800\n"
-"PO-Revision-Date: 2011-02-12 23:46+0300\n"
+"POT-Creation-Date: 2011-06-04 23:04+0400\n"
+"PO-Revision-Date: 2011-06-04 23:14+0400\n"
"Last-Translator: Blade_Arma <edgbla@yandex.ru>\n"
"Language-Team: American English <kde-i18n-doc@kde.org>\n"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.0\n"
+"X-Generator: Lokalize 1.2\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../data/pcsx.glade2.h:1
+#: ../data/pcsxr.glade2.h:1
msgid ""
"8-bit\n"
"16-bit\n"
@@ -28,143 +28,143 @@ msgstr ""
"16-бит\n"
"32-бита"
-#: ../data/pcsx.glade2.h:4
+#: ../data/pcsxr.glade2.h:4
msgid "<b>BIOS</b>"
msgstr "<b>БИОС</b>"
-#: ../data/pcsx.glade2.h:5
+#: ../data/pcsxr.glade2.h:5
msgid "<b>Cheat Codes</b>"
msgstr "<b>Чит коды</b>"
-#: ../data/pcsx.glade2.h:6
+#: ../data/pcsxr.glade2.h:6
msgid "<b>Cheat Search</b>"
msgstr "<b>Поиск читов</b>"
-#: ../data/pcsx.glade2.h:7
+#: ../data/pcsxr.glade2.h:7
msgid "<b>Memory Card 1</b>"
msgstr "<b>Карта памяти 1</b>"
-#: ../data/pcsx.glade2.h:8
+#: ../data/pcsxr.glade2.h:8
msgid "<b>Memory Card 2</b>"
msgstr "<b>Карта памяти 2</b>"
-#: ../data/pcsx.glade2.h:9
+#: ../data/pcsxr.glade2.h:9
msgid "<b>NetPlay</b>"
msgstr "<b>Сетевая игра</b>"
-#: ../data/pcsx.glade2.h:10
+#: ../data/pcsxr.glade2.h:10
msgid "<b>Options</b>"
msgstr "<b>Опции</b>"
-#: ../data/pcsx.glade2.h:11
+#: ../data/pcsxr.glade2.h:11
msgid "<b>Plugins</b>"
msgstr "<b>Плагины</b>"
-#: ../data/pcsx.glade2.h:12
+#: ../data/pcsxr.glade2.h:12
msgid "<b>System Type</b>"
msgstr "<b>Тип системы</b>"
-#: ../data/pcsx.glade2.h:13 ../gui/DebugMemory.c:188
+#: ../data/pcsxr.glade2.h:13 ../gui/DebugMemory.c:188
msgid "Address (Hexadecimal):"
msgstr "Адрес (шестнадцатиричный):"
-#: ../data/pcsx.glade2.h:14 ../win32/gui/WndMain.c:1302
+#: ../data/pcsxr.glade2.h:14 ../win32/gui/WndMain.c:1308
msgid "Autodetect"
msgstr "Авто-определение"
-#: ../data/pcsx.glade2.h:15
+#: ../data/pcsxr.glade2.h:15
msgid "Black & White Movies"
msgstr "Чёрно-белые видео заставки"
-#: ../data/pcsx.glade2.h:16
+#: ../data/pcsxr.glade2.h:16
msgid "CD-ROM..."
msgstr "CD-привод..."
-#: ../data/pcsx.glade2.h:17
+#: ../data/pcsxr.glade2.h:17
msgid "CD-ROM:"
msgstr "CD-привод:"
-#: ../data/pcsx.glade2.h:18
+#: ../data/pcsxr.glade2.h:18
msgid "CD-_ROM..."
msgstr "CD-привод..."
-#: ../data/pcsx.glade2.h:19
+#: ../data/pcsxr.glade2.h:19
msgid "C_ontrollers..."
msgstr "Управление..."
-#: ../data/pcsx.glade2.h:20
+#: ../data/pcsxr.glade2.h:20
msgid "Chea_t"
msgstr "Читы"
-#: ../data/pcsx.glade2.h:21 ../gui/Cheat.c:1129 ../win32/gui/CheatDlg.c:678
+#: ../data/pcsxr.glade2.h:21 ../gui/Cheat.c:1129 ../win32/gui/CheatDlg.c:678
msgid "Cheat Search"
msgstr "Поиск читов"
-#: ../data/pcsx.glade2.h:22
+#: ../data/pcsxr.glade2.h:22
msgid "Configure CD-ROM"
msgstr "Настройка CD-привода"
-#: ../data/pcsx.glade2.h:23
+#: ../data/pcsxr.glade2.h:23
msgid "Configure CPU"
msgstr "Настройка ЦПУ"
-#: ../data/pcsx.glade2.h:24
+#: ../data/pcsxr.glade2.h:24
msgid "Configure Controllers"
msgstr "Настройка управления"
-#: ../data/pcsx.glade2.h:25
+#: ../data/pcsxr.glade2.h:25
msgid "Configure Graphics"
msgstr "Настройка видео"
-#: ../data/pcsx.glade2.h:26
+#: ../data/pcsxr.glade2.h:26
msgid "Configure Memory Cards"
msgstr "Настройка карт памяти"
-#: ../data/pcsx.glade2.h:27
+#: ../data/pcsxr.glade2.h:27
msgid "Configure NetPlay"
msgstr "Настройка сетевой игры"
-#: ../data/pcsx.glade2.h:28 ../gui/ConfDlg.c:112
-msgid "Configure PCSX"
-msgstr "Настройка PCSX"
+#: ../data/pcsxr.glade2.h:28 ../gui/ConfDlg.c:112
+msgid "Configure PCSXR"
+msgstr "Настройка PCSXR"
-#: ../data/pcsx.glade2.h:29 ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:6
+#: ../data/pcsxr.glade2.h:29 ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:3
msgid "Configure Sound"
msgstr "Настройка звука"
-#: ../data/pcsx.glade2.h:30
+#: ../data/pcsxr.glade2.h:30
msgid "Continue Emulation"
msgstr "Продолжить эмуляцию"
-#: ../data/pcsx.glade2.h:31
+#: ../data/pcsxr.glade2.h:31
msgid "Continue..."
msgstr "Продолжить..."
-#: ../data/pcsx.glade2.h:32
+#: ../data/pcsxr.glade2.h:32
msgid "Controller 1: "
msgstr "Контроллер 1:"
-#: ../data/pcsx.glade2.h:33
+#: ../data/pcsxr.glade2.h:33
msgid "Controller 2:"
msgstr "Контроллер 2:"
-#: ../data/pcsx.glade2.h:34
+#: ../data/pcsxr.glade2.h:34
msgid "Controllers..."
msgstr "Контроллеры..."
-#: ../data/pcsx.glade2.h:35
+#: ../data/pcsxr.glade2.h:35
msgid "Copy"
msgstr "Копировать"
-#: ../data/pcsx.glade2.h:36 ../win32/gui/CheatDlg.c:683
+#: ../data/pcsxr.glade2.h:36 ../win32/gui/CheatDlg.c:683
msgid "Data Base:"
msgstr "Основание:"
-#: ../data/pcsx.glade2.h:37 ../win32/gui/CheatDlg.c:681
+#: ../data/pcsxr.glade2.h:37 ../win32/gui/CheatDlg.c:681
msgid "Data Type:"
msgstr "Тип данных:"
-#: ../data/pcsx.glade2.h:38
+#: ../data/pcsxr.glade2.h:38
msgid ""
"Decimal\n"
"Hexadecimal"
@@ -172,35 +172,35 @@ msgstr ""
"Десятичное\n"
"Шестнадцатиричное"
-#: ../data/pcsx.glade2.h:40
+#: ../data/pcsxr.glade2.h:40
msgid "Disable CD Audio"
msgstr "Выключить CD музыку"
-#: ../data/pcsx.glade2.h:41
+#: ../data/pcsxr.glade2.h:41
msgid "Disable XA Decoding"
msgstr "Выключить декодирование XA"
-#: ../data/pcsx.glade2.h:42
+#: ../data/pcsxr.glade2.h:42
msgid "E_xit"
msgstr "Выход"
-#: ../data/pcsx.glade2.h:43 ../win32/gui/CheatDlg.c:166
+#: ../data/pcsxr.glade2.h:43 ../win32/gui/CheatDlg.c:166
msgid "Edit Cheat Codes"
msgstr "Редактировать чит код"
-#: ../data/pcsx.glade2.h:44 ../win32/gui/WndMain.c:1304
+#: ../data/pcsxr.glade2.h:44 ../win32/gui/WndMain.c:1310
msgid "Enable Console Output"
msgstr "Включить вывод в консоль"
-#: ../data/pcsx.glade2.h:45 ../win32/gui/WndMain.c:1305
+#: ../data/pcsxr.glade2.h:45 ../win32/gui/WndMain.c:1311
msgid "Enable Debugger"
msgstr "Включить отладчик"
-#: ../data/pcsx.glade2.h:46
+#: ../data/pcsxr.glade2.h:46
msgid "Enable Interpreter CPU"
msgstr "Включить интерпретатор ЦПУ"
-#: ../data/pcsx.glade2.h:47
+#: ../data/pcsxr.glade2.h:47
msgid ""
"Equal Value\n"
"Not Equal Value\n"
@@ -222,267 +222,271 @@ msgstr ""
"Изменилось\n"
"Не изменилось"
-#: ../data/pcsx.glade2.h:56
+#: ../data/pcsxr.glade2.h:56
msgid "Format"
msgstr "Форматировать"
-#: ../data/pcsx.glade2.h:57 ../win32/gui/CheatDlg.c:504
+#: ../data/pcsxr.glade2.h:57 ../win32/gui/CheatDlg.c:504
msgid "Freeze"
msgstr "Заморозить"
-#: ../data/pcsx.glade2.h:58
+#: ../data/pcsxr.glade2.h:58
msgid "Graphics..."
msgstr "Графика..."
-#: ../data/pcsx.glade2.h:59
+#: ../data/pcsxr.glade2.h:59
msgid "Graphics:"
msgstr "Графика:"
-#: ../data/pcsx.glade2.h:60 ../win32/gui/WndMain.c:1308
+#: ../data/pcsxr.glade2.h:60 ../win32/gui/WndMain.c:1314
msgid "InuYasha Sengoku Battle Fix"
msgstr "Исправление для InuYasha Sengoku Battle"
-#: ../data/pcsx.glade2.h:61
+#: ../data/pcsxr.glade2.h:61
msgid "Memcards..."
msgstr "Карты памяти..."
-#: ../data/pcsx.glade2.h:62 ../gui/DebugMemory.c:103
+#: ../data/pcsxr.glade2.h:62 ../gui/DebugMemory.c:103
msgid "Memory Dump"
msgstr "Дамп памяти"
-#: ../data/pcsx.glade2.h:63
+#: ../data/pcsxr.glade2.h:63
msgid "Memory _Dump"
msgstr "Дамп памяти"
-#: ../data/pcsx.glade2.h:64 ../win32/gui/CheatDlg.c:595
+#: ../data/pcsxr.glade2.h:64 ../win32/gui/CheatDlg.c:595
msgid "Modify"
msgstr "Изменить"
-#: ../data/pcsx.glade2.h:65
+#: ../data/pcsxr.glade2.h:65
msgid ""
"NTSC\n"
"PAL"
msgstr ""
-#: ../data/pcsx.glade2.h:67
+#: ../data/pcsxr.glade2.h:67
msgid "New"
msgstr "Создать"
-#: ../data/pcsx.glade2.h:68
-msgid "PCSX"
+#: ../data/pcsxr.glade2.h:68
+msgid "PCSXR"
msgstr ""
-#: ../data/pcsx.glade2.h:69 ../win32/gui/WndMain.c:1307
+#: ../data/pcsxr.glade2.h:69 ../win32/gui/WndMain.c:1313
msgid "Parasite Eve 2, Vandal Hearts 1/2 Fix"
msgstr "Исправление для Parasite Eve 2 и Vandal Hearts"
-#: ../data/pcsx.glade2.h:70
+#: ../data/pcsxr.glade2.h:70
msgid "Patch Memory..."
msgstr "Патч памяти..."
-#: ../data/pcsx.glade2.h:71
+#: ../data/pcsxr.glade2.h:71
msgid "Raw Dump..."
msgstr "\"Сырой\" дамп"
-#: ../data/pcsx.glade2.h:72
+#: ../data/pcsxr.glade2.h:72
msgid "Restart"
msgstr "Рестарт"
-#: ../data/pcsx.glade2.h:73
+#: ../data/pcsxr.glade2.h:73
msgid "Run CD"
msgstr "Запустить CD"
-#: ../data/pcsx.glade2.h:74
+#: ../data/pcsxr.glade2.h:74
msgid "Run ISO Image"
msgstr "Запустить образ ISO"
-#: ../data/pcsx.glade2.h:75
+#: ../data/pcsxr.glade2.h:75
msgid "Run ISO..."
msgstr "Запустить ISO..."
-#: ../data/pcsx.glade2.h:76
+#: ../data/pcsxr.glade2.h:76
msgid "Run _BIOS"
msgstr "Запустить _BIOS"
-#: ../data/pcsx.glade2.h:77
+#: ../data/pcsxr.glade2.h:77
msgid "Run _CD"
msgstr "Запустить _CD"
-#: ../data/pcsx.glade2.h:78
+#: ../data/pcsxr.glade2.h:78
msgid "Run _EXE..."
msgstr "Запустить _EXE"
-#: ../data/pcsx.glade2.h:79
+#: ../data/pcsxr.glade2.h:79
msgid "Run _ISO..."
msgstr "Запустить _ISO"
-#: ../data/pcsx.glade2.h:80 ../gui/Plugin.c:239
+#: ../data/pcsxr.glade2.h:80 ../gui/Plugin.c:239
#, c-format
msgid "SIO IRQ Always Enabled"
msgstr "Удерживание линии прерывания SIO"
-#: ../data/pcsx.glade2.h:81
+#: ../data/pcsxr.glade2.h:81
msgid "SPU IRQ Always Enabled"
msgstr "Удерживание линии прерывания SPU"
-#: ../data/pcsx.glade2.h:82
+#: ../data/pcsxr.glade2.h:82
msgid "S_witch ISO..."
msgstr "Сменить ISO..."
-#: ../data/pcsx.glade2.h:83
+#: ../data/pcsxr.glade2.h:83
msgid "Search"
msgstr "Поиск"
-#: ../data/pcsx.glade2.h:84 ../win32/gui/CheatDlg.c:680
+#: ../data/pcsxr.glade2.h:84 ../win32/gui/CheatDlg.c:680
msgid "Search For:"
msgstr "Искать для:"
-#: ../data/pcsx.glade2.h:85
+#: ../data/pcsxr.glade2.h:85
msgid "Search in:"
msgstr "Каталог с плагинами:"
-#: ../data/pcsx.glade2.h:86
+#: ../data/pcsxr.glade2.h:86
msgid "Select Folder to Search"
msgstr "Выберите каталог для поиска"
-#: ../data/pcsx.glade2.h:87
+#: ../data/pcsxr.glade2.h:87
msgid "Slot _1"
msgstr "Слот _1"
-#: ../data/pcsx.glade2.h:88
+#: ../data/pcsxr.glade2.h:88
msgid "Slot _2"
msgstr "Слот _2"
-#: ../data/pcsx.glade2.h:89
+#: ../data/pcsxr.glade2.h:89
msgid "Slot _3"
msgstr "Слот _3"
-#: ../data/pcsx.glade2.h:90
+#: ../data/pcsxr.glade2.h:90
msgid "Slot _4"
msgstr "Слот _4"
-#: ../data/pcsx.glade2.h:91
+#: ../data/pcsxr.glade2.h:91
msgid "Slot _5"
msgstr "Слот _5"
-#: ../data/pcsx.glade2.h:92
+#: ../data/pcsxr.glade2.h:92
msgid "Slot _6"
msgstr "Слот _6"
-#: ../data/pcsx.glade2.h:93
+#: ../data/pcsxr.glade2.h:93
msgid "Slot _7"
msgstr "Слот _7"
-#: ../data/pcsx.glade2.h:94
+#: ../data/pcsxr.glade2.h:94
msgid "Slot _8"
msgstr "Слот _8"
-#: ../data/pcsx.glade2.h:95
+#: ../data/pcsxr.glade2.h:95
msgid "Slot _9"
msgstr "Слот _9"
-#: ../data/pcsx.glade2.h:96
+#: ../data/pcsxr.glade2.h:96 ../win32/gui/WndMain.c:1307
+msgid "Slow Boot"
+msgstr "Включить загрузку через оболочку BIOS"
+
+#: ../data/pcsxr.glade2.h:97
msgid "Sound..."
msgstr "Звук..."
-#: ../data/pcsx.glade2.h:97
+#: ../data/pcsxr.glade2.h:98
msgid "Sound:"
msgstr "Звук:"
-#: ../data/pcsx.glade2.h:98
+#: ../data/pcsxr.glade2.h:99
msgid "Switch ISO Image"
msgstr "Сменить образ ISO"
-#: ../data/pcsx.glade2.h:99
+#: ../data/pcsxr.glade2.h:100
msgid "Switch ISO..."
msgstr "Сменить ISO..."
-#: ../data/pcsx.glade2.h:100 ../win32/gui/CheatDlg.c:684
+#: ../data/pcsxr.glade2.h:101 ../win32/gui/CheatDlg.c:684
msgid "To:"
msgstr "До:"
-#: ../data/pcsx.glade2.h:101
+#: ../data/pcsxr.glade2.h:102
msgid "Un/Delete"
msgstr "Восстановить блок"
-#: ../data/pcsx.glade2.h:102 ../gui/Cheat.c:647 ../win32/gui/CheatDlg.c:506
+#: ../data/pcsxr.glade2.h:103 ../gui/Cheat.c:647 ../win32/gui/CheatDlg.c:506
#: ../win32/gui/CheatDlg.c:597 ../win32/gui/CheatDlg.c:682
msgid "Value:"
msgstr "Значение:"
-#: ../data/pcsx.glade2.h:103
-msgid "_About PCSX..."
-msgstr "О PCSX..."
+#: ../data/pcsxr.glade2.h:104
+msgid "_About PCSXR..."
+msgstr "О PCSXR..."
-#: ../data/pcsx.glade2.h:104
+#: ../data/pcsxr.glade2.h:105
msgid "_Browse..."
msgstr "Обзор..."
-#: ../data/pcsx.glade2.h:105
+#: ../data/pcsxr.glade2.h:106
msgid "_CPU..."
msgstr "ЦПУ..."
-#: ../data/pcsx.glade2.h:106
+#: ../data/pcsxr.glade2.h:107
msgid "_Configuration"
msgstr "Настройка(_C)"
-#: ../data/pcsx.glade2.h:107
+#: ../data/pcsxr.glade2.h:108
msgid "_Continue"
msgstr "Продолжить(_C)"
-#: ../data/pcsx.glade2.h:108
+#: ../data/pcsxr.glade2.h:109
msgid "_Emulator"
msgstr "Эмулятор(_E)"
-#: ../data/pcsx.glade2.h:109
+#: ../data/pcsxr.glade2.h:110
msgid "_File"
msgstr "Файл(_F)"
-#: ../data/pcsx.glade2.h:110
+#: ../data/pcsxr.glade2.h:111
msgid "_Graphics..."
msgstr "Графика..."
-#: ../data/pcsx.glade2.h:111
+#: ../data/pcsxr.glade2.h:112
msgid "_Help"
msgstr "Помошь(_H)"
-#: ../data/pcsx.glade2.h:112
+#: ../data/pcsxr.glade2.h:113
msgid "_Load State"
msgstr "Загрузить состояние(_L)"
-#: ../data/pcsx.glade2.h:113
+#: ../data/pcsxr.glade2.h:114
msgid "_Memory Cards..."
msgstr "Карты памяти..."
-#: ../data/pcsx.glade2.h:114
+#: ../data/pcsxr.glade2.h:115
msgid "_Netplay..."
msgstr "Сетевая игра..."
-#: ../data/pcsx.glade2.h:115
+#: ../data/pcsxr.glade2.h:116
msgid "_Other..."
msgstr "Другой..."
-#: ../data/pcsx.glade2.h:116
+#: ../data/pcsxr.glade2.h:117
msgid "_Plugins & BIOS..."
msgstr "Плагины и биос..."
-#: ../data/pcsx.glade2.h:117
+#: ../data/pcsxr.glade2.h:118
msgid "_Reset"
msgstr "Сброс(_R)"
-#: ../data/pcsx.glade2.h:118
+#: ../data/pcsxr.glade2.h:119
msgid "_Save State"
msgstr "Сохранить состояние"
-#: ../data/pcsx.glade2.h:119
+#: ../data/pcsxr.glade2.h:120
msgid "_Search..."
msgstr "Поиск..."
-#: ../data/pcsx.glade2.h:120
+#: ../data/pcsxr.glade2.h:121
msgid "_Sound..."
msgstr "Звук..."
-#: ../data/pcsx.glade2.h:121
+#: ../data/pcsxr.glade2.h:122
msgid "label_resultsfound"
msgstr ""
@@ -490,7 +494,7 @@ msgstr ""
msgid ""
"(C) 1999-2003 PCSX Team\n"
"(C) 2005-2009 PCSX-df Team\n"
-"(C) 2009-2010 PCSX-Reloaded Team"
+"(C) 2009-2011 PCSX-Reloaded Team"
msgstr ""
#: ../gui/AboutDlg.c:77
@@ -531,8 +535,8 @@ msgstr "Описание чита:"
msgid "Cheat Code:"
msgstr "Чит код:"
-#: ../gui/Cheat.c:155 ../gui/Cheat.c:251 ../gui/LnxMain.c:422
-#: ../win32/gui/ConfigurePlugins.c:305
+#: ../gui/Cheat.c:155 ../gui/Cheat.c:251 ../gui/LnxMain.c:421
+#: ../win32/gui/ConfigurePlugins.c:307
msgid "Error"
msgstr "Ошибка"
@@ -550,11 +554,11 @@ msgid "Open Cheat File"
msgstr "Открыть файл чита"
#: ../gui/Cheat.c:316 ../gui/Cheat.c:356
-msgid "PCSX Cheat Code Files (*.cht)"
-msgstr "Файлы читов PCSX (*.cht)"
+msgid "PCSXR Cheat Code Files (*.cht)"
+msgstr "Файлы читов PCSXR (*.cht)"
#: ../gui/Cheat.c:321 ../gui/Gtk2Gui.c:446 ../gui/Gtk2Gui.c:587
-#: ../win32/gui/WndMain.c:1445 ../win32/gui/WndMain.c:1526
+#: ../win32/gui/WndMain.c:1453 ../win32/gui/WndMain.c:1534
msgid "All Files"
msgstr "Все файлы"
@@ -656,7 +660,7 @@ msgstr "Не удалось открыть каталог с биосами BIOS
msgid "Could not open directory: '%s'\n"
msgstr "Не удалось открыть каталог: '%s'\n"
-#. The BIOS list always contains the PCSX internal BIOS
+#. The BIOS list always contains the PCSXR internal BIOS
#: ../gui/ConfDlg.c:675
msgid "Simulate PSX BIOS"
msgstr "Симулировать биос psx"
@@ -726,14 +730,14 @@ msgstr "Файл не является запускным файлом PlayStati
msgid "CD ROM failed"
msgstr "Ошибка CD-привода"
-#: ../gui/Gtk2Gui.c:508 ../gui/Gtk2Gui.c:649 ../win32/gui/WndMain.c:464
-#: ../win32/gui/WndMain.c:516 ../win32/gui/WndMain.c:585
+#: ../gui/Gtk2Gui.c:508 ../gui/Gtk2Gui.c:649 ../win32/gui/WndMain.c:469
+#: ../win32/gui/WndMain.c:521 ../win32/gui/WndMain.c:590
#, c-format
msgid "The CD does not appear to be a valid Playstation CD"
msgstr "Установленный CD-диск не является диском PlayStation"
-#: ../gui/Gtk2Gui.c:519 ../gui/Gtk2Gui.c:660 ../win32/gui/WndMain.c:474
-#: ../win32/gui/WndMain.c:526 ../win32/gui/WndMain.c:595
+#: ../gui/Gtk2Gui.c:519 ../gui/Gtk2Gui.c:660 ../win32/gui/WndMain.c:479
+#: ../win32/gui/WndMain.c:531 ../win32/gui/WndMain.c:600
#, c-format
msgid "Could not load CD-ROM!"
msgstr "Не удалось загрузить CD-ROM!"
@@ -793,52 +797,51 @@ msgstr "Сообщение"
msgid "Creating memory card: %s\n"
msgstr "Создание карты памяти: %s\n"
-#: ../gui/LnxMain.c:329
-#, fuzzy
+#: ../gui/LnxMain.c:328
msgid ""
-" pcsx [options] [file]\n"
+" pcsxr [options] [file]\n"
"\toptions:\n"
"\t-runcd\t\tRuns CD-ROM\n"
"\t-cdfile FILE\tRuns a CD image file\n"
"\t-nogui\t\tDon't open the GTK GUI\n"
-"\t-cfg FILE\tLoads desired configuration file (default: ~/.pcsx/pcsx.cfg)\n"
+"\t-cfg FILE\tLoads desired configuration file (default: ~/.pcsxr/pcsxr.cfg)\n"
"\t-psxout\t\tEnable PSX output\n"
"\t-slowboot\tEnable BIOS Logo\n"
"\t-load STATENUM\tLoads savestate STATENUM (1-9)\n"
"\t-h -help\tDisplay this message\n"
"\tfile\t\tLoads file\n"
msgstr ""
-" pcsx [опции] [файл]\n"
+" pcsxr [опции] [файл]\n"
"\tопции:\n"
"\t-runcd\t\tЗапустить с CD-привода\n"
"\t-cdfile FILE\tЗапустить с файла образа CD\n"
"\t-nogui\t\tНе использовать графический интерфейс GTK\n"
-"\t-cfg FILE\tУказать файл конфигурации (по умолчанию: ~/.pcsx/pcsx.cfg)\n"
+"\t-cfg FILE\tУказать файл конфигурации (по умолчанию: ~/.pcsxr/pcsxr.cfg)\n"
"\t-psxout\t\tВключить вывод PSX\n"
"\t-slowboot\t\tВключить загрузку через оболочку BIOS\n"
"\t-load STATENUM\tЗагрузить состояние с номером STATENUM (1-9)\n"
"\t-h -help\tПоказать это сообщение\n"
"\tfile\t\tЗагрузить файл\n"
-#: ../gui/LnxMain.c:366
+#: ../gui/LnxMain.c:365
#, c-format
msgid ""
-"PCSX cannot be configured without using the GUI -- you should restart "
+"PCSXR cannot be configured without using the GUI -- you should restart "
"without -nogui.\n"
msgstr ""
-"PCSX не может быть настроен без использования графического интерфейса -- "
+"PCSXR не может быть настроен без использования графического интерфейса -- "
"необходимо перезапустить эмулятор без опции -nogui.\n"
-#: ../gui/LnxMain.c:422
+#: ../gui/LnxMain.c:421
msgid "Failed loading plugins!"
msgstr "Ошибка загрузки плагинов!"
-#: ../gui/LnxMain.c:441
+#: ../gui/LnxMain.c:440
#, c-format
msgid "Could not load CD-ROM!\n"
msgstr "Не удалось загрузить CD-ROM!\n"
-#: ../gui/LnxMain.c:472
+#: ../gui/LnxMain.c:471
#, c-format
msgid "PSX emulator couldn't be initialized.\n"
msgstr "Ошибка инициализации эмулятора.\n"
@@ -847,11 +850,11 @@ msgstr "Ошибка инициализации эмулятора.\n"
msgid "Icon"
msgstr "Иконка"
-#: ../gui/MemcardDlg.c:66 ../win32/gui/WndMain.c:749
+#: ../gui/MemcardDlg.c:66 ../win32/gui/WndMain.c:754
msgid "Title"
msgstr "Название"
-#: ../gui/MemcardDlg.c:72 ../win32/gui/WndMain.c:755
+#: ../gui/MemcardDlg.c:72 ../win32/gui/WndMain.c:760
msgid "Status"
msgstr "Статус"
@@ -863,17 +866,17 @@ msgstr "Идентификатор"
msgid "Name"
msgstr "Название"
-#: ../gui/MemcardDlg.c:192 ../gui/MemcardDlg.c:297 ../win32/gui/WndMain.c:960
+#: ../gui/MemcardDlg.c:192 ../gui/MemcardDlg.c:297 ../win32/gui/WndMain.c:965
msgid "Deleted"
msgstr "Удалено"
#: ../gui/MemcardDlg.c:194 ../gui/MemcardDlg.c:198 ../gui/MemcardDlg.c:299
-#: ../gui/MemcardDlg.c:303 ../win32/gui/WndMain.c:961
-#: ../win32/gui/WndMain.c:964
+#: ../gui/MemcardDlg.c:303 ../win32/gui/WndMain.c:966
+#: ../win32/gui/WndMain.c:969
msgid "Free"
msgstr "Свободно"
-#: ../gui/MemcardDlg.c:196 ../gui/MemcardDlg.c:301 ../win32/gui/WndMain.c:963
+#: ../gui/MemcardDlg.c:196 ../gui/MemcardDlg.c:301 ../win32/gui/WndMain.c:968
msgid "Used"
msgstr "Использовано"
@@ -1129,23 +1132,23 @@ msgstr "Ошибка инициализации SIO1 плагина: %d"
msgid "Plugins loaded.\n"
msgstr "Плагины загружены.\n"
-#: ../libpcsxcore/ppf.c:217
+#: ../libpcsxcore/ppf.c:219
#, c-format
msgid "Invalid PPF patch: %s.\n"
msgstr "Неверный PPF патч: %s。\n"
-#: ../libpcsxcore/ppf.c:293
+#: ../libpcsxcore/ppf.c:295
#, c-format
msgid "Unsupported PPF version (%d).\n"
msgstr "Неподдерживаемая версия PPF(%d).\n"
#. build address array
-#: ../libpcsxcore/ppf.c:332
+#: ../libpcsxcore/ppf.c:334
#, c-format
msgid "Loaded PPF %d.0 patch: %s.\n"
msgstr "Загружен PPF %d.0 патч: %s。\n"
-#: ../libpcsxcore/ppf.c:377
+#: ../libpcsxcore/ppf.c:381
#, c-format
msgid "Loaded SBI file: %s.\n"
msgstr "Загружен SBI файл: %s\n"
@@ -1161,29 +1164,29 @@ msgstr "Could not open BIOS:\"%s\". Enabling HLE Bios!\n"
#: ../libpcsxcore/r3000a.c:34
#, c-format
-msgid "Running PCSX Version %s (%s).\n"
-msgstr "Запуск PCSX версии %s (%s) 執行中。\n"
+msgid "Running PCSXR Version %s (%s).\n"
+msgstr "Запуск PCSXR версии %s (%s) 執行中。\n"
-#: ../libpcsxcore/sio.c:839
+#: ../libpcsxcore/sio.c:843
msgid "Connection closed!\n"
msgstr "Соединение закрыто!\n"
-#: ../libpcsxcore/sio.c:872
+#: ../libpcsxcore/sio.c:876
#, c-format
msgid "No memory card value was specified - creating a default card %s\n"
msgstr "Карта памяти не указана - создана новая карта %s\n"
-#: ../libpcsxcore/sio.c:876
+#: ../libpcsxcore/sio.c:880
#, c-format
msgid "The memory card %s doesn't exist - creating it\n"
msgstr "Карта памяти %s не существует - создана новая\n"
-#: ../libpcsxcore/sio.c:892
+#: ../libpcsxcore/sio.c:896
#, c-format
msgid "Memory card %s failed to load!\n"
msgstr "Ошибка загрузки карты памяти %s!\n"
-#: ../libpcsxcore/sio.c:896
+#: ../libpcsxcore/sio.c:900
#, c-format
msgid "Loading memory card %s\n"
msgstr "Загрузка карты памяти %s\n"
@@ -1196,262 +1199,282 @@ msgstr ""
msgid "CDR NULL Plugin"
msgstr ""
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:1
-#: ../plugins/dfcdrom/cdrcfg-0.1df/main.c:219
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:1
+msgid "125ms"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:2
+msgid "16min"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:3
+msgid "16s"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:4
+msgid "1min"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:5
+msgid "1s"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:6
+msgid "250ms"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:7
+msgid "2min"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:8
+msgid "2s"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:9
+msgid "32min"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:10
+msgid "32s"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:11
+msgid "4min"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:12
+msgid "4s"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:13
+msgid "500ms"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:14
+msgid "8min"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:15
+msgid "8s"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:16
+#: ../plugins/dfcdrom/cdrcfg-0.1df/main.c:206
msgid "CDR configuration"
msgstr "Настройка CDR"
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:2
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:17
msgid "Cache Size (Def. 64):"
msgstr "Размер кеша (по умолчанию 64):"
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:3
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:18
msgid "Cdrom Speed (Def. 0 = MAX):"
msgstr "Скорость вращения диска (по умолчанию 0 = максимальная):"
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:4
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:19
msgid "Choose your CD-ROM device or type its path if it's not listed"
msgstr ""
"Выберите CD-привод или введите свой путь, если устройства нету в списке"
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:5
-msgid ""
-"Default\n"
-"125ms\n"
-"250ms\n"
-"500ms\n"
-"1s\n"
-"2s\n"
-"4s\n"
-"8s\n"
-"16s\n"
-"32s\n"
-"1min\n"
-"2min\n"
-"4min\n"
-"8min\n"
-"16min\n"
-"32min"
-msgstr ""
-"По умолчанию\n"
-"125мс\n"
-"250мс\n"
-"500мс\n"
-"1с\n"
-"2с\n"
-"4с\n"
-"8с\n"
-"16с\n"
-"32с\n"
-"1мин\n"
-"2мин\n"
-"4мин\n"
-"8мин\n"
-"16мин\n"
-"32мин"
-
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:21
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:20
+msgid "Default"
+msgstr "По умолчанию"
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:21
msgid "Enable subchannel read"
msgstr "Включить чтение субканальных данных"
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:22
-msgid ""
-"Normal (No Cache)\n"
-"Threaded - Faster (With Cache)"
-msgstr ""
-"Обычный (Кеширование недоступно)\n"
-"В отдельном потоке - (Кеширование)"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:22
+msgid "Normal (No Cache)"
+msgstr "Обычный (Кеширование недоступно)"
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:24
-#: ../plugins/dfinput/dfinput.ui.h:8 ../win32/gui/WndMain.c:1310
-msgid "Options"
-msgstr "Опции"
-
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:25
-msgid "Select CD-ROM device"
-msgstr "Выберите CD-привод"
-
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:26
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:23
msgid "Select read mode:"
msgstr "Режим чтения:"
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:27
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:24
msgid "Spindown Time:"
msgstr "Время до остановки шпинделя cd-привода"
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:28
-msgid "hseparator"
-msgstr ""
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:25
+msgid "Threaded - Faster (With Cache)"
+msgstr "В отдельном потоке - (Кеширование)"
-#: ../plugins/dfinput/cfg-gtk2.c:48
+#: ../plugins/dfinput/cfg-gtk2.c:49
msgid "D-Pad Up"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:49
+#: ../plugins/dfinput/cfg-gtk2.c:50
msgid "D-Pad Down"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:50
+#: ../plugins/dfinput/cfg-gtk2.c:51
msgid "D-Pad Left"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:51
+#: ../plugins/dfinput/cfg-gtk2.c:52
msgid "D-Pad Right"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:52
+#: ../plugins/dfinput/cfg-gtk2.c:53
msgid "Cross"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:53
+#: ../plugins/dfinput/cfg-gtk2.c:54
msgid "Circle"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:54
+#: ../plugins/dfinput/cfg-gtk2.c:55
msgid "Square"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:55
+#: ../plugins/dfinput/cfg-gtk2.c:56
msgid "Triangle"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:56
+#: ../plugins/dfinput/cfg-gtk2.c:57
msgid "L1"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:57
+#: ../plugins/dfinput/cfg-gtk2.c:58
msgid "R1"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:58
+#: ../plugins/dfinput/cfg-gtk2.c:59
msgid "L2"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:59
+#: ../plugins/dfinput/cfg-gtk2.c:60
msgid "R2"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:60
+#: ../plugins/dfinput/cfg-gtk2.c:61
msgid "Select"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:61
+#: ../plugins/dfinput/cfg-gtk2.c:62
msgid "Start"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:62
+#: ../plugins/dfinput/cfg-gtk2.c:63
msgid "L3"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:63
+#: ../plugins/dfinput/cfg-gtk2.c:64
msgid "R3"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:67
+#: ../plugins/dfinput/cfg-gtk2.c:65
+msgid "Analog"
+msgstr "Аналоговый контроллер "
+
+#: ../plugins/dfinput/cfg-gtk2.c:69
msgid "L-Stick Right"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:68
+#: ../plugins/dfinput/cfg-gtk2.c:70
msgid "L-Stick Left"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:69
+#: ../plugins/dfinput/cfg-gtk2.c:71
msgid "L-Stick Down"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:70
+#: ../plugins/dfinput/cfg-gtk2.c:72
msgid "L-Stick Up"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:71
+#: ../plugins/dfinput/cfg-gtk2.c:73
msgid "R-Stick Right"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:72
+#: ../plugins/dfinput/cfg-gtk2.c:74
msgid "R-Stick Left"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:73
+#: ../plugins/dfinput/cfg-gtk2.c:75
msgid "R-Stick Down"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:74
+#: ../plugins/dfinput/cfg-gtk2.c:76
msgid "R-Stick Up"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:100 ../plugins/dfinput/cfg-gtk2.c:139
+#: ../plugins/dfinput/cfg-gtk2.c:102 ../plugins/dfinput/cfg-gtk2.c:141
msgid "Centered"
msgstr "Отцентровано"
-#: ../plugins/dfinput/cfg-gtk2.c:100 ../plugins/dfinput/cfg-gtk2.c:139
+#: ../plugins/dfinput/cfg-gtk2.c:102 ../plugins/dfinput/cfg-gtk2.c:141
msgid "Up"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:100 ../plugins/dfinput/cfg-gtk2.c:139
+#: ../plugins/dfinput/cfg-gtk2.c:102 ../plugins/dfinput/cfg-gtk2.c:141
msgid "Right"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:100 ../plugins/dfinput/cfg-gtk2.c:139
+#: ../plugins/dfinput/cfg-gtk2.c:102 ../plugins/dfinput/cfg-gtk2.c:141
msgid "Rightup"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:101 ../plugins/dfinput/cfg-gtk2.c:140
+#: ../plugins/dfinput/cfg-gtk2.c:103 ../plugins/dfinput/cfg-gtk2.c:142
msgid "Down"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:101 ../plugins/dfinput/cfg-gtk2.c:140
+#: ../plugins/dfinput/cfg-gtk2.c:103 ../plugins/dfinput/cfg-gtk2.c:142
msgid "Rightdown"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:101 ../plugins/dfinput/cfg-gtk2.c:140
+#: ../plugins/dfinput/cfg-gtk2.c:103 ../plugins/dfinput/cfg-gtk2.c:142
msgid "Left"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:101 ../plugins/dfinput/cfg-gtk2.c:140
+#: ../plugins/dfinput/cfg-gtk2.c:103 ../plugins/dfinput/cfg-gtk2.c:142
msgid "Leftup"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:102 ../plugins/dfinput/cfg-gtk2.c:141
+#: ../plugins/dfinput/cfg-gtk2.c:104 ../plugins/dfinput/cfg-gtk2.c:143
msgid "Leftdown"
msgstr ""
-#: ../plugins/dfinput/cfg-gtk2.c:106 ../plugins/dfinput/cfg-gtk2.c:145
+#: ../plugins/dfinput/cfg-gtk2.c:108 ../plugins/dfinput/cfg-gtk2.c:147
#, c-format
msgid "Joystick: Button %d"
msgstr "Джойстик: Кнопка %d"
-#: ../plugins/dfinput/cfg-gtk2.c:110 ../plugins/dfinput/cfg-gtk2.c:149
+#: ../plugins/dfinput/cfg-gtk2.c:112 ../plugins/dfinput/cfg-gtk2.c:151
#, c-format
msgid "Joystick: Axis %d%c"
msgstr "Джойстик: Ось %d%c"
-#: ../plugins/dfinput/cfg-gtk2.c:115 ../plugins/dfinput/cfg-gtk2.c:154
+#: ../plugins/dfinput/cfg-gtk2.c:117 ../plugins/dfinput/cfg-gtk2.c:156
#, c-format
msgid "Joystick: Hat %d %s"
msgstr "Джойстик: Крестовина %d %s"
-#: ../plugins/dfinput/cfg-gtk2.c:130 ../plugins/dfinput/cfg-gtk2.c:169
+#: ../plugins/dfinput/cfg-gtk2.c:132 ../plugins/dfinput/cfg-gtk2.c:171
msgid "Keyboard:"
msgstr "Клавиатура:"
-#: ../plugins/dfinput/cfg-gtk2.c:134 ../plugins/dfinput/cfg-gtk2.c:173
+#: ../plugins/dfinput/cfg-gtk2.c:136 ../plugins/dfinput/cfg-gtk2.c:175
msgid "(Not Set)"
msgstr "(Не установлено)"
-#: ../plugins/dfinput/cfg-gtk2.c:542
+#: ../plugins/dfinput/cfg-gtk2.c:562
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:13
#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:55
msgid "None"
msgstr "Нету"
-#: ../plugins/dfinput/cfg-gtk2.c:584
+#: ../plugins/dfinput/cfg-gtk2.c:604
msgid "Gamepad/Keyboard Input Configuration"
msgstr "Настройка Gamepad/Keyboard"
-#: ../plugins/dfinput/cfg-gtk2.c:590 ../plugins/dfinput/cfg-gtk2.c:610
+#: ../plugins/dfinput/cfg-gtk2.c:610 ../plugins/dfinput/cfg-gtk2.c:630
msgid "Key"
msgstr "Клавиша"
-#: ../plugins/dfinput/cfg-gtk2.c:596 ../plugins/dfinput/cfg-gtk2.c:616
+#: ../plugins/dfinput/cfg-gtk2.c:616 ../plugins/dfinput/cfg-gtk2.c:636
msgid "Button"
msgstr "Кнопка"
@@ -1480,20 +1503,28 @@ msgid "Digital Pad"
msgstr "Стандартный контроллер"
#: ../plugins/dfinput/dfinput.ui.h:7
+msgid "Mouse"
+msgstr ""
+
+#: ../plugins/dfinput/dfinput.ui.h:8
msgid "Multi-Threaded (Recommended)"
msgstr "В отдельном потоке (Рекомендуется)"
-#: ../plugins/dfinput/dfinput.ui.h:9
+#: ../plugins/dfinput/dfinput.ui.h:9 ../win32/gui/WndMain.c:1316
+msgid "Options"
+msgstr "Опции"
+
+#: ../plugins/dfinput/dfinput.ui.h:10
msgid "Reset"
msgstr "Сброс"
-#: ../plugins/dfinput/dfinput.ui.h:10
+#: ../plugins/dfinput/dfinput.ui.h:11
msgid "Type:"
msgstr "Тип:"
-#: ../plugins/dfinput/pad.c:24
-msgid "Gamepad/Keyboard Input"
-msgstr ""
+#: ../plugins/dfinput/pad.c:29
+msgid "Gamepad/Keyboard/Mouse Input"
+msgstr "Настройка Gamepad/Keyboard/Mouse"
#. increase that with each version
#: ../plugins/dfnet/dfnet.c:23
@@ -1509,30 +1540,31 @@ msgstr "Ошибка соединения с %s: %s\n"
msgid "Error allocating memory!\n"
msgstr "Ошибка выделения памяти!\n"
-#: ../plugins/dfnet/dfnet.ui.h:1
+#. ****************************************************************************
+#: ../plugins/dfnet/dfnet.ui.h:1 ../plugins/bladesio1/sio1.ui.h:1
msgid "Client (Player2)"
msgstr "Клиент (Игрок 2)"
-#: ../plugins/dfnet/dfnet.ui.h:2
+#: ../plugins/dfnet/dfnet.ui.h:2 ../plugins/bladesio1/sio1.ui.h:2
msgid "Copy PC IP to Clipboard"
msgstr "Скопировать IP адрес в буфер обмена"
-#: ../plugins/dfnet/dfnet.ui.h:3
+#: ../plugins/dfnet/dfnet.ui.h:3 ../plugins/bladesio1/sio1.ui.h:3
msgid ""
"Do not change if not necessary (remember it must be changed on both sides)."
msgstr ""
"Не меняйте без особой необходимости (помните что порты должны быть одинаковы "
"для обеих сторон)"
-#: ../plugins/dfnet/dfnet.ui.h:4
+#: ../plugins/dfnet/dfnet.ui.h:4 ../plugins/bladesio1/sio1.ui.h:4
msgid "Play Offline"
msgstr "Начать без использования сети"
-#: ../plugins/dfnet/dfnet.ui.h:5
+#: ../plugins/dfnet/dfnet.ui.h:5 ../plugins/bladesio1/sio1.ui.h:5
msgid "Port Number"
msgstr "Номер порта"
-#: ../plugins/dfnet/dfnet.ui.h:6
+#: ../plugins/dfnet/dfnet.ui.h:6 ../plugins/bladesio1/sio1.ui.h:6
msgid ""
"Select here if you'll be Server (Player1) or Client (Player2).\n"
"\n"
@@ -1550,16 +1582,16 @@ msgstr ""
"Если вы выбрали Клиента - введите полученный IP адрес Сервера в "
"соответствующее поле."
-#: ../plugins/dfnet/dfnet.ui.h:11
+#: ../plugins/dfnet/dfnet.ui.h:11 ../plugins/bladesio1/sio1.ui.h:11
msgid "Server (Player1)"
msgstr "Сервер (Игрок 1)"
-#: ../plugins/dfnet/dfnet.ui.h:12
+#: ../plugins/dfnet/dfnet.ui.h:12 ../plugins/bladesio1/sio1.ui.h:12
msgid "Start Game"
msgstr "Начать сетевую игру"
#: ../plugins/dfnet/gui.c:30 ../plugins/dfnet/gui.c:112
-#: ../win32/gui/ConfigurePlugins.c:616
+#: ../win32/gui/ConfigurePlugins.c:618
msgid "NetPlay"
msgstr "Сетевая игра"
@@ -1614,100 +1646,87 @@ msgid ""
"Coded by Pete Bernert and the P.E.Op.S. team\n"
msgstr ""
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:1
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2.h:20
-msgid "<b>Compatibility</b>"
-msgstr "<b>Совместимость</b>"
-
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:2
-msgid "<b>General</b>"
-msgstr "<b>Главные</b>"
-
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:3
-msgid "<b>XA Music</b>"
-msgstr "<b>XA музыка</b>"
-
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:4
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:1
msgid "Adjust XA speed"
msgstr "Корректировка скорости проигрывания XA"
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:5
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:2
msgid "Choose this if XA music is played too quickly."
msgstr "Установить в том случае, когда XA музыка играет слишком быстро."
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:7
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:4
+msgid "Cubic"
+msgstr "Кубическая"
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:5
msgid "Frequency Response - Output Filter"
msgstr ""
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:8
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:6
+msgid "Gaussian"
+msgstr "Гаусса"
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:7
msgid "High compatibility mode"
msgstr "Режим повышенной совместимости"
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:9
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:8
msgid "Interpolation:"
msgstr "Интерполяция:"
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:10
-msgid ""
-"None\n"
-"Low\n"
-"Medium\n"
-"Loud\n"
-"Loudest"
-msgstr ""
-"Выключено\n"
-"Минимальная\n"
-"Средняя\n"
-"Сильная\n"
-"Максимальная"
-
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:15
-msgid ""
-"None\n"
-"Simple\n"
-"Gaussian\n"
-"Cubic"
-msgstr ""
-"Выключена\n"
-"Линейная\n"
-"Гаусса\n"
-"Кубическая"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:9
+msgid "Loud"
+msgstr "Сильная"
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:19
-msgid ""
-"Off\n"
-"Simple\n"
-"Playstation"
-msgstr ""
-"Выключена\n"
-"Простая\n"
-"Playstation"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:10
+msgid "Loudest"
+msgstr "Максимальная"
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:11
+msgid "Low"
+msgstr "Низкая"
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:12
+msgid "Medium"
+msgstr "Средняя"
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:22
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:14
+msgid "Off"
+msgstr "Выключена"
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:15
msgid "Play only one channel for a performance boost."
msgstr "Проигрывать только один канал, для прироста производительности"
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:23
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:16
+msgid "Playstation"
+msgstr "Playstation"
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:17
msgid "Reverb:"
msgstr "Реверберация:"
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:24
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:18
msgid "SPU IRQ Wait"
msgstr ""
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:25
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:19
+msgid "Simple"
+msgstr "Простая"
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:20
msgid "Single channel sound"
msgstr "Одноканальный звук"
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:26
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:21
msgid "Use the asynchronous SPU interface."
msgstr "Использовать асинхронный интерфейс SPU"
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:27
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:22
msgid "Volume:"
msgstr "Громкость:"
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:28
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:23
msgid "Wait for CPU; only useful for some games."
msgstr "Ожидать CPU; имеет смысл только для некоторых игр."
@@ -1790,6 +1809,10 @@ msgid ""
"1600x1200"
msgstr ""
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2.h:20
+msgid "<b>Compatibility</b>"
+msgstr "<b>Совместимость</b>"
+
#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2.h:21
msgid "<b>Framerate</b>"
msgstr "<b>Частота кадров</b>"
@@ -2295,6 +2318,10 @@ msgstr "Опции окна"
msgid "Yellow rect (FF9)"
msgstr "Жёлтый прямоугольник (FF9)"
+#: ../plugins/bladesio1/gui.c:32
+msgid "Link cable"
+msgstr "Соединительный кабель"
+
#. ****************************************************************************
#: ../plugins/bladesio1/sio1.c:29
msgid "Sio1 Driver"
@@ -2302,7 +2329,7 @@ msgstr ""
#: ../win32/gui/AboutDlg.c:26
msgid ""
-"PCSX - A PlayStation Emulator\n"
+"PCSXR - A PlayStation Emulator\n"
"\n"
"Original Authors:\n"
"main coder: linuzappz\n"
@@ -2318,25 +2345,25 @@ msgid ""
"Marcus Comstedt, Stefan Sikora\n"
"\n"
"PCSX-Reloaded By:\n"
-"Blade_Arma, shalma, Wei Mingzhi, et al.\n"
+"edgbla, shalma, Wei Mingzhi, et al.\n"
"\n"
"http://pcsxr.codeplex.com/"
msgstr ""
#: ../win32/gui/AboutDlg.c:46
msgid "About"
-msgstr "О PCSX"
+msgstr "О PCSXR"
#: ../win32/gui/AboutDlg.c:48 ../win32/gui/AboutDlg.c:52
#: ../win32/gui/CheatDlg.c:69 ../win32/gui/CheatDlg.c:119
-#: ../win32/gui/ConfigurePlugins.c:483 ../win32/gui/ConfigurePlugins.c:614
-#: ../win32/gui/WndMain.c:1059 ../win32/gui/WndMain.c:1295
+#: ../win32/gui/ConfigurePlugins.c:485 ../win32/gui/ConfigurePlugins.c:616
+#: ../win32/gui/WndMain.c:1064 ../win32/gui/WndMain.c:1300
msgid "OK"
msgstr "Ок"
#: ../win32/gui/AboutDlg.c:49
-msgid "PCSX EMU\n"
-msgstr "PCSX EMU\n"
+msgid "PCSXR EMU\n"
+msgstr "PCSXR EMU\n"
#: ../win32/gui/CheatDlg.c:51 ../win32/gui/CheatDlg.c:223
#: ../win32/gui/CheatDlg.c:270
@@ -2349,8 +2376,8 @@ msgid "No"
msgstr "Нет"
#: ../win32/gui/CheatDlg.c:70 ../win32/gui/CheatDlg.c:120
-#: ../win32/gui/ConfigurePlugins.c:484 ../win32/gui/ConfigurePlugins.c:615
-#: ../win32/gui/WndMain.c:1060 ../win32/gui/WndMain.c:1296
+#: ../win32/gui/ConfigurePlugins.c:486 ../win32/gui/ConfigurePlugins.c:617
+#: ../win32/gui/WndMain.c:1065 ../win32/gui/WndMain.c:1301
msgid "Cancel"
msgstr "Отмена"
@@ -2387,8 +2414,8 @@ msgid "Enabled"
msgstr "Включено"
#: ../win32/gui/CheatDlg.c:282 ../win32/gui/CheatDlg.c:311
-msgid "PCSX Cheat Code Files"
-msgstr "Файл чит кодов PCSX (*.cht)"
+msgid "PCSXR Cheat Code Files"
+msgstr "Файл чит кодов PCSXR (*.cht)"
#: ../win32/gui/CheatDlg.c:402
msgid "Equal Value"
@@ -2483,152 +2510,152 @@ msgstr "Десятичное"
msgid "Hexadecimal"
msgstr "Шестнадцатеричное"
-#: ../win32/gui/ConfigurePlugins.c:219
+#: ../win32/gui/ConfigurePlugins.c:221
msgid "Simulate Psx Bios"
msgstr "Симулировать биос psx"
-#: ../win32/gui/ConfigurePlugins.c:305
+#: ../win32/gui/ConfigurePlugins.c:307
msgid "Configuration not OK!"
msgstr "Настройка не завершена!"
-#: ../win32/gui/ConfigurePlugins.c:406
+#: ../win32/gui/ConfigurePlugins.c:408
msgid "This plugin reports that should work correctly"
msgstr "Плагин готов к работе"
-#: ../win32/gui/ConfigurePlugins.c:407
+#: ../win32/gui/ConfigurePlugins.c:409
msgid "This plugin reports that should not work correctly"
msgstr "Плагин вернул сообщение об ошибке"
-#: ../win32/gui/ConfigurePlugins.c:463
+#: ../win32/gui/ConfigurePlugins.c:465
msgid "Select Plugins Directory"
msgstr "Каталог с плагинами"
-#: ../win32/gui/ConfigurePlugins.c:472
+#: ../win32/gui/ConfigurePlugins.c:474
msgid "Select Bios Directory"
msgstr "Каталог с биосами"
-#: ../win32/gui/ConfigurePlugins.c:481
+#: ../win32/gui/ConfigurePlugins.c:483
msgid "Configuration"
msgstr "Настройка"
-#: ../win32/gui/ConfigurePlugins.c:485
+#: ../win32/gui/ConfigurePlugins.c:487
msgid "Graphics"
msgstr "Графика"
-#: ../win32/gui/ConfigurePlugins.c:486
+#: ../win32/gui/ConfigurePlugins.c:488
msgid "First Controller"
msgstr "Первый контроллер"
-#: ../win32/gui/ConfigurePlugins.c:487
+#: ../win32/gui/ConfigurePlugins.c:489
msgid "Second Controller"
msgstr "Второй контроллер"
-#: ../win32/gui/ConfigurePlugins.c:488
+#: ../win32/gui/ConfigurePlugins.c:490
msgid "Sound"
msgstr "Звук"
-#: ../win32/gui/ConfigurePlugins.c:489
+#: ../win32/gui/ConfigurePlugins.c:491
msgid "Cdrom"
msgstr "CD-привод"
-#: ../win32/gui/ConfigurePlugins.c:490
+#: ../win32/gui/ConfigurePlugins.c:492
msgid "Bios"
msgstr "Биос"
-#: ../win32/gui/ConfigurePlugins.c:491
+#: ../win32/gui/ConfigurePlugins.c:493
msgid "Set Bios Directory"
msgstr "Выберите каталог с биосами"
-#: ../win32/gui/ConfigurePlugins.c:492
+#: ../win32/gui/ConfigurePlugins.c:494
msgid "Set Plugins Directory"
msgstr "Выберите каталог с плагинами"
-#: ../win32/gui/ConfigurePlugins.c:493 ../win32/gui/ConfigurePlugins.c:496
-#: ../win32/gui/ConfigurePlugins.c:499 ../win32/gui/ConfigurePlugins.c:502
-#: ../win32/gui/ConfigurePlugins.c:505 ../win32/gui/ConfigurePlugins.c:617
+#: ../win32/gui/ConfigurePlugins.c:495 ../win32/gui/ConfigurePlugins.c:498
+#: ../win32/gui/ConfigurePlugins.c:501 ../win32/gui/ConfigurePlugins.c:504
+#: ../win32/gui/ConfigurePlugins.c:507 ../win32/gui/ConfigurePlugins.c:619
msgid "Configure..."
msgstr "Настройка..."
-#: ../win32/gui/ConfigurePlugins.c:494 ../win32/gui/ConfigurePlugins.c:497
-#: ../win32/gui/ConfigurePlugins.c:500 ../win32/gui/ConfigurePlugins.c:503
-#: ../win32/gui/ConfigurePlugins.c:506 ../win32/gui/ConfigurePlugins.c:618
+#: ../win32/gui/ConfigurePlugins.c:496 ../win32/gui/ConfigurePlugins.c:499
+#: ../win32/gui/ConfigurePlugins.c:502 ../win32/gui/ConfigurePlugins.c:505
+#: ../win32/gui/ConfigurePlugins.c:508 ../win32/gui/ConfigurePlugins.c:620
msgid "Test..."
msgstr "Тест..."
-#: ../win32/gui/ConfigurePlugins.c:495 ../win32/gui/ConfigurePlugins.c:498
-#: ../win32/gui/ConfigurePlugins.c:501 ../win32/gui/ConfigurePlugins.c:504
-#: ../win32/gui/ConfigurePlugins.c:507 ../win32/gui/ConfigurePlugins.c:619
+#: ../win32/gui/ConfigurePlugins.c:497 ../win32/gui/ConfigurePlugins.c:500
+#: ../win32/gui/ConfigurePlugins.c:503 ../win32/gui/ConfigurePlugins.c:506
+#: ../win32/gui/ConfigurePlugins.c:509 ../win32/gui/ConfigurePlugins.c:621
msgid "About..."
msgstr "О..."
-#: ../win32/gui/ConfigurePlugins.c:612
+#: ../win32/gui/ConfigurePlugins.c:614
msgid "NetPlay Configuration"
msgstr "Настройка сетевой игры"
-#: ../win32/gui/ConfigurePlugins.c:620
+#: ../win32/gui/ConfigurePlugins.c:622
msgid ""
"Note: The NetPlay Plugin Directory should be the same as the other Plugins."
msgstr ""
"Внимание! NetPlay плагин должен находится в том же каталоге что и остальные "
"плагины."
-#: ../win32/gui/plugin.c:94 ../win32/gui/WndMain.c:323
+#: ../win32/gui/plugin.c:94 ../win32/gui/WndMain.c:328
#, c-format
-msgid "*PCSX*: Saved State %d"
-msgstr "*PCSX*: Состояние сохранено %d"
+msgid "*PCSXR*: Saved State %d"
+msgstr "*PCSXR*: Состояние сохранено %d"
-#: ../win32/gui/plugin.c:95 ../win32/gui/WndMain.c:324
+#: ../win32/gui/plugin.c:95 ../win32/gui/WndMain.c:329
#, c-format
-msgid "*PCSX*: Error Saving State %d"
-msgstr "*PCSX*: Ошибка сохранения состояния %d"
+msgid "*PCSXR*: Error Saving State %d"
+msgstr "*PCSXR*: Ошибка сохранения состояния %d"
-#: ../win32/gui/plugin.c:111 ../win32/gui/WndMain.c:301
+#: ../win32/gui/plugin.c:111 ../win32/gui/WndMain.c:306
#, c-format
-msgid "*PCSX*: Loaded State %d"
-msgstr "PCSX*: Состояние загружено %d"
+msgid "*PCSXR*: Loaded State %d"
+msgstr "PCSXR*: Состояние загружено %d"
-#: ../win32/gui/plugin.c:112 ../win32/gui/WndMain.c:302
+#: ../win32/gui/plugin.c:112 ../win32/gui/WndMain.c:307
#, c-format
-msgid "*PCSX*: Error Loading State %d"
-msgstr "*PCSX*: Ошибка загрузки состояния %d"
+msgid "*PCSXR*: Error Loading State %d"
+msgstr "*PCSXR*: Ошибка загрузки состояния %d"
#: ../win32/gui/plugin.c:123
#, c-format
-msgid "*PCSX*: Sio Irq Always Enabled"
-msgstr "*PCSX*: Удерживание линии прерывания SIO включено"
+msgid "*PCSXR*: Sio Irq Always Enabled"
+msgstr "*PCSXR*: Удерживание линии прерывания SIO включено"
#: ../win32/gui/plugin.c:124
#, c-format
-msgid "*PCSX*: Sio Irq Not Always Enabled"
-msgstr "*PCSX*: Удерживание линии прерывания SIO выключено"
+msgid "*PCSXR*: Sio Irq Not Always Enabled"
+msgstr "*PCSXR*: Удерживание линии прерывания SIO выключено"
#: ../win32/gui/plugin.c:131
#, c-format
-msgid "*PCSX*: Black&White Mdecs Only Enabled"
-msgstr "*PCSX*: Режим чёрно-белых видео вставок (Mdecs) включен"
+msgid "*PCSXR*: Black&White Mdecs Only Enabled"
+msgstr "*PCSXR*: Режим чёрно-белых видео вставок (Mdecs) включен"
#: ../win32/gui/plugin.c:132
#, c-format
-msgid "*PCSX*: Black&White Mdecs Only Disabled"
-msgstr "*PCSX*: Режим чёрно-белых видео вставок (Mdecs) выключен"
+msgid "*PCSXR*: Black&White Mdecs Only Disabled"
+msgstr "*PCSXR*: Режим чёрно-белых видео вставок (Mdecs) выключен"
#: ../win32/gui/plugin.c:139
#, c-format
-msgid "*PCSX*: Xa Enabled"
-msgstr "*PCSX*: Xa включено"
+msgid "*PCSXR*: Xa Enabled"
+msgstr "*PCSXR*: Xa включено"
#: ../win32/gui/plugin.c:140
#, c-format
-msgid "*PCSX*: Xa Disabled"
-msgstr "*PCSX*: Xa выключено"
+msgid "*PCSXR*: Xa Disabled"
+msgstr "*PCSXR*: Xa выключено"
#: ../win32/gui/plugin.c:149
-msgid "*PCSX*: CdRom Case Opened"
-msgstr "*PCSX*: крышка CD-привода открыта"
+msgid "*PCSXR*: CdRom Case Opened"
+msgstr "*PCSXR*: крышка CD-привода открыта"
#: ../win32/gui/plugin.c:155
-msgid "*PCSX*: CdRom Case Closed"
-msgstr "*PCSX*: крышка CD-привода закрыта"
+msgid "*PCSXR*: CdRom Case Closed"
+msgstr "*PCSXR*: крышка CD-привода закрыта"
#: ../win32/gui/plugin.c:183
msgid "Connecting..."
@@ -2721,8 +2748,8 @@ msgstr "Немецкий"
msgid "Greek"
msgstr "Греческий"
-#: ../win32/gui/WndMain.c:81 ../win32/gui/WndMain.c:1659
-#: ../win32/gui/WndMain.c:1661
+#: ../win32/gui/WndMain.c:81 ../win32/gui/WndMain.c:1667
+#: ../win32/gui/WndMain.c:1669
msgid "English"
msgstr "Английский"
@@ -2771,9 +2798,8 @@ msgid "Korean"
msgstr "Корейский"
#: ../win32/gui/WndMain.c:215
-#, fuzzy
msgid ""
-"Usage: pcsx [options]\n"
+"Usage: pcsxr [options]\n"
"\toptions:\n"
"\t-nogui\t\tDon't open the GUI\n"
"\t-psxout\t\tEnable PSX output\n"
@@ -2782,337 +2808,406 @@ msgid ""
"\t-cdfile FILE\tRuns a CD image file (requires -nogui)\n"
"\t-help\t\tDisplay this message"
msgstr ""
-"Использовать: pcsx [опции] [файл]\n"
+"Использовать: pcsxr [опции] [файл]\n"
"\tопции:\n"
"\t-nogui\t\tНе использовать графический интерфейс\n"
"\t-psxout\t\tВключить вывод PSX\n"
+"\t-slowboot\t\tВключить загрузку через оболочку BIOS\n"
"\t-runcd\t\tЗапустить с CD-привода (требует -nogui)\n"
"\t-cdfile FILE\tЗапустить с файла образа CD (требует -nogui)\n"
"\t-h -help\tПоказать это сообщение"
-#: ../win32/gui/WndMain.c:342 ../win32/gui/WndMain.c:388
-msgid "PCSX State Format"
-msgstr "Формат состояния PCSX"
+#: ../win32/gui/WndMain.c:347 ../win32/gui/WndMain.c:393
+msgid "PCSXR State Format"
+msgstr "Формат состояния PCSXR"
-#: ../win32/gui/WndMain.c:369
+#: ../win32/gui/WndMain.c:374
#, c-format
-msgid "*PCSX*: Loaded State %s"
-msgstr "*PCSX*: Состояние загружено %s"
+msgid "*PCSXR*: Loaded State %s"
+msgstr "*PCSXR*: Состояние загружено %s"
-#: ../win32/gui/WndMain.c:370
+#: ../win32/gui/WndMain.c:375
#, c-format
-msgid "*PCSX*: Error Loading State %s"
-msgstr "*PCSX*: Ошибка загрузки состояния %s"
+msgid "*PCSXR*: Error Loading State %s"
+msgstr "*PCSXR*: Ошибка загрузки состояния %s"
-#: ../win32/gui/WndMain.c:415
+#: ../win32/gui/WndMain.c:420
#, c-format
-msgid "*PCSX*: Saved State %s"
-msgstr "*PCSX*: Состояние сохранено %s"
+msgid "*PCSXR*: Saved State %s"
+msgstr "*PCSXR*: Состояние сохранено %s"
-#: ../win32/gui/WndMain.c:416
+#: ../win32/gui/WndMain.c:421
#, c-format
-msgid "*PCSX*: Error Saving State %s"
-msgstr "*PCSX*: Ошибка сохранения состояния %s"
+msgid "*PCSXR*: Error Saving State %s"
+msgstr "*PCSXR*: Ошибка сохранения состояния %s"
-#: ../win32/gui/WndMain.c:484
+#: ../win32/gui/WndMain.c:489
msgid "Running BIOS is not supported with Internal HLE Bios."
msgstr ""
"Стандартная оболочка, позволяющая управлять картами памяти и проигрывать DA "
"музыку, при использовании HLE-биоса недоступна."
-#: ../win32/gui/WndMain.c:761
+#: ../win32/gui/WndMain.c:766
msgid "Game ID"
msgstr "Идентификатор игры"
-#: ../win32/gui/WndMain.c:767
+#: ../win32/gui/WndMain.c:772
msgid "Game"
msgstr "Игра"
-#: ../win32/gui/WndMain.c:949
+#: ../win32/gui/WndMain.c:954
msgid "mid link block"
msgstr "соединительный блок"
-#: ../win32/gui/WndMain.c:952
+#: ../win32/gui/WndMain.c:957
msgid "terminiting link block"
msgstr "завершающий соединительный блок"
-#: ../win32/gui/WndMain.c:1057
+#: ../win32/gui/WndMain.c:1062
msgid "Memcard Manager"
msgstr "Менеджер карт памяти"
-#: ../win32/gui/WndMain.c:1061 ../win32/gui/WndMain.c:1064
+#: ../win32/gui/WndMain.c:1066 ../win32/gui/WndMain.c:1069
msgid "Select Mcd"
msgstr "Выбрать"
-#: ../win32/gui/WndMain.c:1062 ../win32/gui/WndMain.c:1065
+#: ../win32/gui/WndMain.c:1067 ../win32/gui/WndMain.c:1070
msgid "Format Mcd"
msgstr "Форматировать"
-#: ../win32/gui/WndMain.c:1063 ../win32/gui/WndMain.c:1066
+#: ../win32/gui/WndMain.c:1068 ../win32/gui/WndMain.c:1071
msgid "Reload Mcd"
msgstr "Перезагрузить"
-#: ../win32/gui/WndMain.c:1067
+#: ../win32/gui/WndMain.c:1072
msgid "-> Copy ->"
msgstr "-> Копировать ->"
-#: ../win32/gui/WndMain.c:1068
+#: ../win32/gui/WndMain.c:1073
msgid "<- Copy <-"
msgstr "<- Копировать <-"
-#: ../win32/gui/WndMain.c:1069
+#: ../win32/gui/WndMain.c:1074
msgid "Paste"
msgstr "Вставить"
-#: ../win32/gui/WndMain.c:1070
+#: ../win32/gui/WndMain.c:1075
msgid "<- Un/Delete"
msgstr "<- Восстановить блок"
-#: ../win32/gui/WndMain.c:1071
+#: ../win32/gui/WndMain.c:1076
msgid "Un/Delete ->"
msgstr "Восстановить блок ->"
-#: ../win32/gui/WndMain.c:1073
+#: ../win32/gui/WndMain.c:1078
msgid "Memory Card 1"
msgstr "Карта памяти 1"
-#: ../win32/gui/WndMain.c:1074
+#: ../win32/gui/WndMain.c:1079
msgid "Memory Card 2"
msgstr "Карта памяти 2"
-#: ../win32/gui/WndMain.c:1129
+#: ../win32/gui/WndMain.c:1134
msgid "Are you sure you want to paste this selection?"
msgstr "Вы уверены в том, что хотите вставить выделенное?"
-#: ../win32/gui/WndMain.c:1129 ../win32/gui/WndMain.c:1240
-#: ../win32/gui/WndMain.c:1247
+#: ../win32/gui/WndMain.c:1134 ../win32/gui/WndMain.c:1245
+#: ../win32/gui/WndMain.c:1252
msgid "Confirmation"
msgstr "Подтверждение"
-#: ../win32/gui/WndMain.c:1240 ../win32/gui/WndMain.c:1247
+#: ../win32/gui/WndMain.c:1245 ../win32/gui/WndMain.c:1252
msgid "Are you sure you want to format this Memory Card?"
msgstr "Вы уверены в том, что хотите отформатировать карту памяти?"
-#: ../win32/gui/WndMain.c:1293
+#: ../win32/gui/WndMain.c:1298
msgid "Cpu Config"
msgstr "Настройка ЦПУ"
-#: ../win32/gui/WndMain.c:1298
+#: ../win32/gui/WndMain.c:1303
msgid "Disable Xa Decoding"
msgstr "Отключить декодирование XA"
-#: ../win32/gui/WndMain.c:1299
+#: ../win32/gui/WndMain.c:1304
msgid "Sio Irq Always Enabled"
msgstr "Удерживание линии прерывания SIO"
-#: ../win32/gui/WndMain.c:1300
+#: ../win32/gui/WndMain.c:1305
msgid "Black && White Movies"
msgstr "Чёрно-белые заставки"
-#: ../win32/gui/WndMain.c:1301
+#: ../win32/gui/WndMain.c:1306
msgid "Disable Cd audio"
msgstr "Выключить CD музыку"
-#: ../win32/gui/WndMain.c:1303
+#: ../win32/gui/WndMain.c:1309
msgid "Enable Interpreter Cpu"
msgstr "Включить интерпретатор ЦПУ"
-#: ../win32/gui/WndMain.c:1306
+#: ../win32/gui/WndMain.c:1312
msgid "Spu Irq Always Enabled"
msgstr "Удерживание линии прерывания SPU"
-#: ../win32/gui/WndMain.c:1311
+#: ../win32/gui/WndMain.c:1317
msgid "Psx System Type"
msgstr "Тип системы psx"
-#: ../win32/gui/WndMain.c:1415
+#: ../win32/gui/WndMain.c:1423
msgid "Psx Mcd Format (*.mcr;*.mc;*.mem;*.vgs;*.mcd;*.gme;*.ddf)"
msgstr "Форматы карт памяти psx (*.mcr;*.mc;*.mem;*.vgs;*.mcd;*.gme;*.ddf)"
-#: ../win32/gui/WndMain.c:1420
+#: ../win32/gui/WndMain.c:1428
msgid "Psx Memory Card (*.mcr;*.mc)"
msgstr "Карта памяти psx (*.mcr;*.mc)"
-#: ../win32/gui/WndMain.c:1425
+#: ../win32/gui/WndMain.c:1433
msgid "CVGS Memory Card (*.mem;*.vgs)"
msgstr "Карта памяти CVGS (*.mem;*.vgs)"
-#: ../win32/gui/WndMain.c:1430
+#: ../win32/gui/WndMain.c:1438
msgid "Bleem Memory Card (*.mcd)"
msgstr "Карта памяти Bleem (*.mcd)"
-#: ../win32/gui/WndMain.c:1435
+#: ../win32/gui/WndMain.c:1443
msgid "DexDrive Memory Card (*.gme)"
msgstr "Карта памяти DexDrive (*.gme)"
-#: ../win32/gui/WndMain.c:1440
+#: ../win32/gui/WndMain.c:1448
msgid "DataDeck Memory Card (*.ddf)"
msgstr "Карта памяти DataDeck (*.ddf)"
-#: ../win32/gui/WndMain.c:1484
+#: ../win32/gui/WndMain.c:1492
msgid "Psx Exe Format"
msgstr "Psx exe формат"
-#: ../win32/gui/WndMain.c:1521
+#: ../win32/gui/WndMain.c:1529
msgid "Psx Isos (*.iso;*.mdf;*.img;*.bin)"
msgstr "Образы диска psx (*.iso;*.mdf;*.img;*.bin)"
-#: ../win32/gui/WndMain.c:1597
+#: ../win32/gui/WndMain.c:1605
msgid "&File"
msgstr "Файл(&F)"
-#: ../win32/gui/WndMain.c:1598
+#: ../win32/gui/WndMain.c:1606
msgid "E&xit"
msgstr "Выход(&X)"
-#: ../win32/gui/WndMain.c:1600
+#: ../win32/gui/WndMain.c:1608
msgid "Run &EXE..."
msgstr "Запустить EXE"
-#: ../win32/gui/WndMain.c:1601
+#: ../win32/gui/WndMain.c:1609
msgid "Run &BIOS"
msgstr "Запустить BIOS"
-#: ../win32/gui/WndMain.c:1602
+#: ../win32/gui/WndMain.c:1610
msgid "Run &ISO..."
msgstr "Запустить ISO"
-#: ../win32/gui/WndMain.c:1603
+#: ../win32/gui/WndMain.c:1611
msgid "Run &CD"
msgstr "Запустить CD"
-#: ../win32/gui/WndMain.c:1605
+#: ../win32/gui/WndMain.c:1613
msgid "&Emulator"
msgstr "Эмулятор(&E)"
-#: ../win32/gui/WndMain.c:1606
+#: ../win32/gui/WndMain.c:1614
msgid "&States"
msgstr "Состояния(&S)"
-#: ../win32/gui/WndMain.c:1608
+#: ../win32/gui/WndMain.c:1616
msgid "S&witch ISO..."
msgstr "Изменить ISO(&W)..."
-#: ../win32/gui/WndMain.c:1610
+#: ../win32/gui/WndMain.c:1618
msgid "Re&set"
msgstr "Сброс(&S)"
-#: ../win32/gui/WndMain.c:1611
+#: ../win32/gui/WndMain.c:1619
msgid "&Run"
msgstr "Старт(&R)"
-#: ../win32/gui/WndMain.c:1612
+#: ../win32/gui/WndMain.c:1620
msgid "&Save"
msgstr "Сохранить(&S)"
-#: ../win32/gui/WndMain.c:1613
+#: ../win32/gui/WndMain.c:1621
msgid "&Load"
msgstr "Загрузить(&L)"
-#: ../win32/gui/WndMain.c:1614 ../win32/gui/WndMain.c:1624
+#: ../win32/gui/WndMain.c:1622 ../win32/gui/WndMain.c:1632
msgid "&Other..."
msgstr "Другой(&O)..."
-#: ../win32/gui/WndMain.c:1615 ../win32/gui/WndMain.c:1625
+#: ../win32/gui/WndMain.c:1623 ../win32/gui/WndMain.c:1633
msgid "Slot &9"
msgstr "Слот &9"
-#: ../win32/gui/WndMain.c:1616 ../win32/gui/WndMain.c:1626
+#: ../win32/gui/WndMain.c:1624 ../win32/gui/WndMain.c:1634
msgid "Slot &8"
msgstr "Слот &8"
-#: ../win32/gui/WndMain.c:1617 ../win32/gui/WndMain.c:1627
+#: ../win32/gui/WndMain.c:1625 ../win32/gui/WndMain.c:1635
msgid "Slot &7"
msgstr "Слот &7"
-#: ../win32/gui/WndMain.c:1618 ../win32/gui/WndMain.c:1628
+#: ../win32/gui/WndMain.c:1626 ../win32/gui/WndMain.c:1636
msgid "Slot &6"
msgstr "Слот &6"
-#: ../win32/gui/WndMain.c:1619 ../win32/gui/WndMain.c:1629
+#: ../win32/gui/WndMain.c:1627 ../win32/gui/WndMain.c:1637
msgid "Slot &5"
msgstr "Слот 5(&5)"
-#: ../win32/gui/WndMain.c:1620 ../win32/gui/WndMain.c:1630
+#: ../win32/gui/WndMain.c:1628 ../win32/gui/WndMain.c:1638
msgid "Slot &4"
msgstr "Слот 4(&4)"
-#: ../win32/gui/WndMain.c:1621 ../win32/gui/WndMain.c:1631
+#: ../win32/gui/WndMain.c:1629 ../win32/gui/WndMain.c:1639
msgid "Slot &3"
msgstr "Слот 3(&3)"
-#: ../win32/gui/WndMain.c:1622 ../win32/gui/WndMain.c:1632
+#: ../win32/gui/WndMain.c:1630 ../win32/gui/WndMain.c:1640
msgid "Slot &2"
msgstr "Слот 2(&2)"
-#: ../win32/gui/WndMain.c:1623 ../win32/gui/WndMain.c:1633
+#: ../win32/gui/WndMain.c:1631 ../win32/gui/WndMain.c:1641
msgid "Slot &1"
msgstr "Слот 1(&1)"
-#: ../win32/gui/WndMain.c:1635
+#: ../win32/gui/WndMain.c:1643
msgid "&Configuration"
msgstr "Настройка(&C)"
-#: ../win32/gui/WndMain.c:1636
+#: ../win32/gui/WndMain.c:1644
msgid "Cheat &Search..."
msgstr "Поиск читов...(&S)"
-#: ../win32/gui/WndMain.c:1637
+#: ../win32/gui/WndMain.c:1645
msgid "Ch&eat Code..."
msgstr "Чит код...(&E)"
-#: ../win32/gui/WndMain.c:1640
+#: ../win32/gui/WndMain.c:1648
msgid "&Language"
msgstr "Язык(&L)"
-#: ../win32/gui/WndMain.c:1665
+#: ../win32/gui/WndMain.c:1673
msgid "&Memory cards..."
msgstr "Карты памяти(&M)..."
-#: ../win32/gui/WndMain.c:1666
+#: ../win32/gui/WndMain.c:1674
msgid "C&PU..."
msgstr "ЦПУ(&P)..."
-#: ../win32/gui/WndMain.c:1668
+#: ../win32/gui/WndMain.c:1676
msgid "&NetPlay..."
msgstr "Сетевая игра..."
-#: ../win32/gui/WndMain.c:1670
+#: ../win32/gui/WndMain.c:1678
msgid "&Controllers..."
msgstr "Управление..."
-#: ../win32/gui/WndMain.c:1671
+#: ../win32/gui/WndMain.c:1679
msgid "CD-&ROM..."
msgstr "CD-привод(&R)..."
-#: ../win32/gui/WndMain.c:1672
+#: ../win32/gui/WndMain.c:1680
msgid "&Sound..."
msgstr "Звук..."
-#: ../win32/gui/WndMain.c:1673
+#: ../win32/gui/WndMain.c:1681
msgid "&Graphics..."
msgstr "Графика..."
-#: ../win32/gui/WndMain.c:1675
+#: ../win32/gui/WndMain.c:1683
msgid "&Plugins && Bios..."
msgstr "Плагины и биос(&P)..."
-#: ../win32/gui/WndMain.c:1677
+#: ../win32/gui/WndMain.c:1685
msgid "&Help"
msgstr "Помощь(&H)"
-#: ../win32/gui/WndMain.c:1678
+#: ../win32/gui/WndMain.c:1686
msgid "&About..."
msgstr "О(&A)..."
-#: ../win32/gui/WndMain.c:1866
-msgid "Pcsx Msg"
-msgstr "Сообщение pcsx"
+#: ../win32/gui/WndMain.c:1874
+msgid "Pcsxr Msg"
+msgstr "Сообщение pcsxr"
-#: ../win32/gui/WndMain.c:1869
+#: ../win32/gui/WndMain.c:1877
msgid "Error Loading Symbol"
msgstr "Ошибка загрузки символа"
+#~ msgid "<b>General</b>"
+#~ msgstr "<b>Главные</b>"
+
+#~ msgid "<b>XA Music</b>"
+#~ msgstr "<b>XA музыка</b>"
+
+#~ msgid ""
+#~ "None\n"
+#~ "Low\n"
+#~ "Medium\n"
+#~ "Loud\n"
+#~ "Loudest"
+#~ msgstr ""
+#~ "Выключено\n"
+#~ "Минимальная\n"
+#~ "Средняя\n"
+#~ "Сильная\n"
+#~ "Максимальная"
+
+#~ msgid ""
+#~ "None\n"
+#~ "Simple\n"
+#~ "Gaussian\n"
+#~ "Cubic"
+#~ msgstr ""
+#~ "Выключена\n"
+#~ "Линейная\n"
+#~ "Гаусса\n"
+#~ "Кубическая"
+
+#~ msgid ""
+#~ "Default\n"
+#~ "125ms\n"
+#~ "250ms\n"
+#~ "500ms\n"
+#~ "1s\n"
+#~ "2s\n"
+#~ "4s\n"
+#~ "8s\n"
+#~ "16s\n"
+#~ "32s\n"
+#~ "1min\n"
+#~ "2min\n"
+#~ "4min\n"
+#~ "8min\n"
+#~ "16min\n"
+#~ "32min"
+#~ msgstr ""
+#~ "По умолчанию\n"
+#~ "125мс\n"
+#~ "250мс\n"
+#~ "500мс\n"
+#~ "1с\n"
+#~ "2с\n"
+#~ "4с\n"
+#~ "8с\n"
+#~ "16с\n"
+#~ "32с\n"
+#~ "1мин\n"
+#~ "2мин\n"
+#~ "4мин\n"
+#~ "8мин\n"
+#~ "16мин\n"
+#~ "32мин"
+
+#~ msgid "Select CD-ROM device"
+#~ msgstr "Выберите CD-привод"
+
#, fuzzy
#~ msgid "0: None"
#~ msgstr "Нету"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 20650816..83ee1b56 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,22 +1,26 @@
# Simplified Chinese translation of pcsxr.
# Copyright (C) 2008 Wei Mingzhi
# This file is distributed under the same license as the pcsxr package.
-# Wei Mingzhi <whistler@openoffice.org>, 2008.
#
+# Wei Mingzhi <whistler@openoffice.org>, 2008.
+# Blade_Arma <edgbla@yandex.ru>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: pcsxr 1.0\n"
"Report-Msgid-Bugs-To: whistler_wmz@users.sf.net\n"
-"POT-Creation-Date: 2011-02-18 17:11+0800\n"
-"PO-Revision-Date: 2011-02-18 17:11+0800\n"
-"Last-Translator: Wei Mingzhi <whistler_wmz@users.sf.net>\n"
-"Language-Team: Simplified Chinese <whistler@openoffice.org>\n"
+"POT-Creation-Date: 2011-06-04 23:04+0400\n"
+"PO-Revision-Date: 2011-06-04 13:46+0400\n"
+"Last-Translator: Blade_Arma <edgbla@yandex.ru>\n"
+"Language-Team: Russian <kde-i18n-doc@kde.org>\n"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 1.2\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: ../data/pcsx.glade2.h:1
+#: ../data/pcsxr.glade2.h:1
msgid ""
"8-bit\n"
"16-bit\n"
@@ -26,151 +30,143 @@ msgstr ""
"16 位\n"
"32 位"
-#: ../data/pcsx.glade2.h:4
+#: ../data/pcsxr.glade2.h:4
msgid "<b>BIOS</b>"
msgstr "<b>BIOS</b>"
-#: ../data/pcsx.glade2.h:5
+#: ../data/pcsxr.glade2.h:5
msgid "<b>Cheat Codes</b>"
msgstr "<b>作弊码</b>"
-#: ../data/pcsx.glade2.h:6
+#: ../data/pcsxr.glade2.h:6
msgid "<b>Cheat Search</b>"
msgstr "<b>作弊码查找</b>"
-#: ../data/pcsx.glade2.h:7
+#: ../data/pcsxr.glade2.h:7
msgid "<b>Memory Card 1</b>"
msgstr "<b>记忆卡 1</b>"
-#: ../data/pcsx.glade2.h:8
+#: ../data/pcsxr.glade2.h:8
msgid "<b>Memory Card 2</b>"
msgstr "<b>记忆卡 2</b>"
-#: ../data/pcsx.glade2.h:9
+#: ../data/pcsxr.glade2.h:9
msgid "<b>NetPlay</b>"
msgstr "<b>联网游戏</b>"
-#: ../data/pcsx.glade2.h:10
+#: ../data/pcsxr.glade2.h:10
msgid "<b>Options</b>"
msgstr "<b>选项</b>"
-#: ../data/pcsx.glade2.h:11
+#: ../data/pcsxr.glade2.h:11
msgid "<b>Plugins</b>"
msgstr "<b>插件</b>"
-#: ../data/pcsx.glade2.h:12
+#: ../data/pcsxr.glade2.h:12
msgid "<b>System Type</b>"
msgstr "<b>系统类型</b>"
-#: ../data/pcsx.glade2.h:13
-#: ../gui/DebugMemory.c:188
+#: ../data/pcsxr.glade2.h:13 ../gui/DebugMemory.c:188
msgid "Address (Hexadecimal):"
msgstr "地址 (十六进制):"
-#: ../data/pcsx.glade2.h:14
-#: ../win32/gui/WndMain.c:1302
+#: ../data/pcsxr.glade2.h:14 ../win32/gui/WndMain.c:1308
msgid "Autodetect"
msgstr "自动检测"
-#: ../data/pcsx.glade2.h:15
+#: ../data/pcsxr.glade2.h:15
msgid "Black & White Movies"
msgstr "黑白电影"
-#: ../data/pcsx.glade2.h:16
+#: ../data/pcsxr.glade2.h:16
msgid "CD-ROM..."
msgstr "CD-ROM..."
-#: ../data/pcsx.glade2.h:17
+#: ../data/pcsxr.glade2.h:17
msgid "CD-ROM:"
msgstr "CD-ROM:"
-#: ../data/pcsx.glade2.h:18
+#: ../data/pcsxr.glade2.h:18
msgid "CD-_ROM..."
msgstr "CD-_ROM..."
-#: ../data/pcsx.glade2.h:19
+#: ../data/pcsxr.glade2.h:19
msgid "C_ontrollers..."
msgstr "控制器(_O)..."
-#: ../data/pcsx.glade2.h:20
+#: ../data/pcsxr.glade2.h:20
msgid "Chea_t"
msgstr "作弊码(_T)"
-#: ../data/pcsx.glade2.h:21
-#: ../gui/Cheat.c:1129
-#: ../win32/gui/CheatDlg.c:678
+#: ../data/pcsxr.glade2.h:21 ../gui/Cheat.c:1129 ../win32/gui/CheatDlg.c:678
msgid "Cheat Search"
msgstr "查找作弊码"
-#: ../data/pcsx.glade2.h:22
+#: ../data/pcsxr.glade2.h:22
msgid "Configure CD-ROM"
msgstr "配置 CD-ROM"
-#: ../data/pcsx.glade2.h:23
+#: ../data/pcsxr.glade2.h:23
msgid "Configure CPU"
msgstr "配置 CPU"
-#: ../data/pcsx.glade2.h:24
+#: ../data/pcsxr.glade2.h:24
msgid "Configure Controllers"
msgstr "配置控制器"
-#: ../data/pcsx.glade2.h:25
+#: ../data/pcsxr.glade2.h:25
msgid "Configure Graphics"
msgstr "配置图像"
-#: ../data/pcsx.glade2.h:26
+#: ../data/pcsxr.glade2.h:26
msgid "Configure Memory Cards"
msgstr "配置记忆卡"
-#: ../data/pcsx.glade2.h:27
+#: ../data/pcsxr.glade2.h:27
msgid "Configure NetPlay"
msgstr "配置联网游戏"
-#: ../data/pcsx.glade2.h:28
-#: ../gui/ConfDlg.c:112
-msgid "Configure PCSX"
-msgstr "配置 PCSX"
+#: ../data/pcsxr.glade2.h:28 ../gui/ConfDlg.c:112
+msgid "Configure PCSXR"
+msgstr "配置 PCSXR"
-#: ../data/pcsx.glade2.h:29
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:6
+#: ../data/pcsxr.glade2.h:29 ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:3
msgid "Configure Sound"
msgstr "配置音频"
-#: ../data/pcsx.glade2.h:30
+#: ../data/pcsxr.glade2.h:30
msgid "Continue Emulation"
msgstr "继续模拟"
-#: ../data/pcsx.glade2.h:31
+#: ../data/pcsxr.glade2.h:31
msgid "Continue..."
msgstr "继续..."
-#: ../data/pcsx.glade2.h:32
+#: ../data/pcsxr.glade2.h:32
msgid "Controller 1: "
msgstr "控制器 1:"
-#: ../data/pcsx.glade2.h:33
+#: ../data/pcsxr.glade2.h:33
msgid "Controller 2:"
msgstr "控制器 2:"
-#: ../data/pcsx.glade2.h:34
+#: ../data/pcsxr.glade2.h:34
msgid "Controllers..."
msgstr "控制器..."
-#: ../data/pcsx.glade2.h:35
+#: ../data/pcsxr.glade2.h:35
msgid "Copy"
msgstr "复制"
-#: ../data/pcsx.glade2.h:36
-#: ../win32/gui/CheatDlg.c:683
+#: ../data/pcsxr.glade2.h:36 ../win32/gui/CheatDlg.c:683
msgid "Data Base:"
msgstr "数据基:"
-#: ../data/pcsx.glade2.h:37
-#: ../win32/gui/CheatDlg.c:681
+#: ../data/pcsxr.glade2.h:37 ../win32/gui/CheatDlg.c:681
msgid "Data Type:"
msgstr "数据类型:"
-#: ../data/pcsx.glade2.h:38
+#: ../data/pcsxr.glade2.h:38
msgid ""
"Decimal\n"
"Hexadecimal"
@@ -178,38 +174,35 @@ msgstr ""
"十进制\n"
"十六进制"
-#: ../data/pcsx.glade2.h:40
+#: ../data/pcsxr.glade2.h:40
msgid "Disable CD Audio"
msgstr "禁用 CD 音频"
-#: ../data/pcsx.glade2.h:41
+#: ../data/pcsxr.glade2.h:41
msgid "Disable XA Decoding"
msgstr "禁用 XA 解码"
-#: ../data/pcsx.glade2.h:42
+#: ../data/pcsxr.glade2.h:42
msgid "E_xit"
msgstr "退出(_X)"
-#: ../data/pcsx.glade2.h:43
-#: ../win32/gui/CheatDlg.c:166
+#: ../data/pcsxr.glade2.h:43 ../win32/gui/CheatDlg.c:166
msgid "Edit Cheat Codes"
msgstr "编辑作弊码"
-#: ../data/pcsx.glade2.h:44
-#: ../win32/gui/WndMain.c:1304
+#: ../data/pcsxr.glade2.h:44 ../win32/gui/WndMain.c:1310
msgid "Enable Console Output"
msgstr "启用控制台输出"
-#: ../data/pcsx.glade2.h:45
-#: ../win32/gui/WndMain.c:1305
+#: ../data/pcsxr.glade2.h:45 ../win32/gui/WndMain.c:1311
msgid "Enable Debugger"
msgstr "启用调试器"
-#: ../data/pcsx.glade2.h:46
+#: ../data/pcsxr.glade2.h:46
msgid "Enable Interpreter CPU"
msgstr "启用解释执行 CPU"
-#: ../data/pcsx.glade2.h:47
+#: ../data/pcsxr.glade2.h:47
msgid ""
"Equal Value\n"
"Not Equal Value\n"
@@ -231,47 +224,43 @@ msgstr ""
"改变\n"
"无改变"
-#: ../data/pcsx.glade2.h:56
+#: ../data/pcsxr.glade2.h:56
msgid "Format"
msgstr "格式化"
-#: ../data/pcsx.glade2.h:57
-#: ../win32/gui/CheatDlg.c:504
+#: ../data/pcsxr.glade2.h:57 ../win32/gui/CheatDlg.c:504
msgid "Freeze"
msgstr "固定"
-#: ../data/pcsx.glade2.h:58
+#: ../data/pcsxr.glade2.h:58
msgid "Graphics..."
msgstr "图像..."
-#: ../data/pcsx.glade2.h:59
+#: ../data/pcsxr.glade2.h:59
msgid "Graphics:"
msgstr "图像:"
-#: ../data/pcsx.glade2.h:60
-#: ../win32/gui/WndMain.c:1308
+#: ../data/pcsxr.glade2.h:60 ../win32/gui/WndMain.c:1314
msgid "InuYasha Sengoku Battle Fix"
msgstr "InuYasha Sengoku Battle 修正"
-#: ../data/pcsx.glade2.h:61
+#: ../data/pcsxr.glade2.h:61
msgid "Memcards..."
msgstr "记忆卡..."
-#: ../data/pcsx.glade2.h:62
-#: ../gui/DebugMemory.c:103
+#: ../data/pcsxr.glade2.h:62 ../gui/DebugMemory.c:103
msgid "Memory Dump"
msgstr "内存转储"
-#: ../data/pcsx.glade2.h:63
+#: ../data/pcsxr.glade2.h:63
msgid "Memory _Dump"
msgstr "内存转储(_D)"
-#: ../data/pcsx.glade2.h:64
-#: ../win32/gui/CheatDlg.c:595
+#: ../data/pcsxr.glade2.h:64 ../win32/gui/CheatDlg.c:595
msgid "Modify"
msgstr "修改"
-#: ../data/pcsx.glade2.h:65
+#: ../data/pcsxr.glade2.h:65
msgid ""
"NTSC\n"
"PAL"
@@ -279,232 +268,229 @@ msgstr ""
"NTSC\n"
"PAL"
-#: ../data/pcsx.glade2.h:67
+#: ../data/pcsxr.glade2.h:67
msgid "New"
msgstr "新建"
-#: ../data/pcsx.glade2.h:68
-msgid "PCSX"
-msgstr "PCSX"
+#: ../data/pcsxr.glade2.h:68
+msgid "PCSXR"
+msgstr "PCSXR"
-#: ../data/pcsx.glade2.h:69
-#: ../win32/gui/WndMain.c:1307
+#: ../data/pcsxr.glade2.h:69 ../win32/gui/WndMain.c:1313
msgid "Parasite Eve 2, Vandal Hearts 1/2 Fix"
msgstr "Parasite Eve 2, Vandal Hearts 1/2 修正"
-#: ../data/pcsx.glade2.h:70
+#: ../data/pcsxr.glade2.h:70
msgid "Patch Memory..."
msgstr "修改内存..."
-#: ../data/pcsx.glade2.h:71
+#: ../data/pcsxr.glade2.h:71
msgid "Raw Dump..."
msgstr "Raw 转储..."
-#: ../data/pcsx.glade2.h:72
+#: ../data/pcsxr.glade2.h:72
msgid "Restart"
msgstr "复位"
-#: ../data/pcsx.glade2.h:73
+#: ../data/pcsxr.glade2.h:73
msgid "Run CD"
msgstr "运行光碟"
-#: ../data/pcsx.glade2.h:74
+#: ../data/pcsxr.glade2.h:74
msgid "Run ISO Image"
msgstr "运行 ISO 光盘镜像"
-#: ../data/pcsx.glade2.h:75
+#: ../data/pcsxr.glade2.h:75
msgid "Run ISO..."
msgstr "运行 ISO..."
-#: ../data/pcsx.glade2.h:76
+#: ../data/pcsxr.glade2.h:76
msgid "Run _BIOS"
msgstr "运行 _BIOS"
-#: ../data/pcsx.glade2.h:77
+#: ../data/pcsxr.glade2.h:77
msgid "Run _CD"
msgstr "运行光盘(_C)"
-#: ../data/pcsx.glade2.h:78
+#: ../data/pcsxr.glade2.h:78
msgid "Run _EXE..."
msgstr "运行 _EXE..."
-#: ../data/pcsx.glade2.h:79
+#: ../data/pcsxr.glade2.h:79
msgid "Run _ISO..."
msgstr "运行 _ISO..."
-#: ../data/pcsx.glade2.h:80
-#: ../gui/Plugin.c:239
+#: ../data/pcsxr.glade2.h:80 ../gui/Plugin.c:239
#, c-format
msgid "SIO IRQ Always Enabled"
msgstr "SIO IRQ 总是启用"
-#: ../data/pcsx.glade2.h:81
+#: ../data/pcsxr.glade2.h:81
msgid "SPU IRQ Always Enabled"
msgstr "SPU IRQ 总是启用"
-#: ../data/pcsx.glade2.h:82
+#: ../data/pcsxr.glade2.h:82
msgid "S_witch ISO..."
msgstr "更换 ISO(_W)..."
-#: ../data/pcsx.glade2.h:83
+#: ../data/pcsxr.glade2.h:83
msgid "Search"
msgstr "查找"
-#: ../data/pcsx.glade2.h:84
-#: ../win32/gui/CheatDlg.c:680
+#: ../data/pcsxr.glade2.h:84 ../win32/gui/CheatDlg.c:680
msgid "Search For:"
msgstr "查找:"
-#: ../data/pcsx.glade2.h:85
+#: ../data/pcsxr.glade2.h:85
msgid "Search in:"
msgstr "在此处查找插件:"
-#: ../data/pcsx.glade2.h:86
+#: ../data/pcsxr.glade2.h:86
msgid "Select Folder to Search"
msgstr "选择要查找的文件夹"
-#: ../data/pcsx.glade2.h:87
+#: ../data/pcsxr.glade2.h:87
msgid "Slot _1"
msgstr "存档 _1"
-#: ../data/pcsx.glade2.h:88
+#: ../data/pcsxr.glade2.h:88
msgid "Slot _2"
msgstr "存档 _2"
-#: ../data/pcsx.glade2.h:89
+#: ../data/pcsxr.glade2.h:89
msgid "Slot _3"
msgstr "存档 _3"
-#: ../data/pcsx.glade2.h:90
+#: ../data/pcsxr.glade2.h:90
msgid "Slot _4"
msgstr "存档 _4"
-#: ../data/pcsx.glade2.h:91
+#: ../data/pcsxr.glade2.h:91
msgid "Slot _5"
msgstr "存档 _5"
-#: ../data/pcsx.glade2.h:92
+#: ../data/pcsxr.glade2.h:92
msgid "Slot _6"
msgstr "存档 _6"
-#: ../data/pcsx.glade2.h:93
+#: ../data/pcsxr.glade2.h:93
msgid "Slot _7"
msgstr "存档 _7"
-#: ../data/pcsx.glade2.h:94
+#: ../data/pcsxr.glade2.h:94
msgid "Slot _8"
msgstr "存档 _8"
-#: ../data/pcsx.glade2.h:95
+#: ../data/pcsxr.glade2.h:95
msgid "Slot _9"
msgstr "存档 _9"
-#: ../data/pcsx.glade2.h:96
+#: ../data/pcsxr.glade2.h:96 ../win32/gui/WndMain.c:1307
+msgid "Slow Boot"
+msgstr ""
+
+#: ../data/pcsxr.glade2.h:97
msgid "Sound..."
msgstr "声音..."
-#: ../data/pcsx.glade2.h:97
+#: ../data/pcsxr.glade2.h:98
msgid "Sound:"
msgstr "声音:"
-#: ../data/pcsx.glade2.h:98
+#: ../data/pcsxr.glade2.h:99
msgid "Switch ISO Image"
msgstr "更换 ISO 光盘镜像"
-#: ../data/pcsx.glade2.h:99
+#: ../data/pcsxr.glade2.h:100
msgid "Switch ISO..."
msgstr "更换 ISO..."
-#: ../data/pcsx.glade2.h:100
-#: ../win32/gui/CheatDlg.c:684
+#: ../data/pcsxr.glade2.h:101 ../win32/gui/CheatDlg.c:684
msgid "To:"
msgstr "到:"
-#: ../data/pcsx.glade2.h:101
+#: ../data/pcsxr.glade2.h:102
msgid "Un/Delete"
msgstr "删除/恢复"
-#: ../data/pcsx.glade2.h:102
-#: ../gui/Cheat.c:647
-#: ../win32/gui/CheatDlg.c:506
-#: ../win32/gui/CheatDlg.c:597
-#: ../win32/gui/CheatDlg.c:682
+#: ../data/pcsxr.glade2.h:103 ../gui/Cheat.c:647 ../win32/gui/CheatDlg.c:506
+#: ../win32/gui/CheatDlg.c:597 ../win32/gui/CheatDlg.c:682
msgid "Value:"
msgstr "值:"
-#: ../data/pcsx.glade2.h:103
-msgid "_About PCSX..."
-msgstr "关于 PCSX(_A)..."
+#: ../data/pcsxr.glade2.h:104
+msgid "_About PCSXR..."
+msgstr "关于 PCSXR(_A)..."
-#: ../data/pcsx.glade2.h:104
+#: ../data/pcsxr.glade2.h:105
msgid "_Browse..."
msgstr "浏览(_B)..."
-#: ../data/pcsx.glade2.h:105
+#: ../data/pcsxr.glade2.h:106
msgid "_CPU..."
msgstr "_CPU..."
-#: ../data/pcsx.glade2.h:106
+#: ../data/pcsxr.glade2.h:107
msgid "_Configuration"
msgstr "配置(_C)"
-#: ../data/pcsx.glade2.h:107
+#: ../data/pcsxr.glade2.h:108
msgid "_Continue"
msgstr "继续(_C)"
-#: ../data/pcsx.glade2.h:108
+#: ../data/pcsxr.glade2.h:109
msgid "_Emulator"
msgstr "模拟器(_E)"
-#: ../data/pcsx.glade2.h:109
+#: ../data/pcsxr.glade2.h:110
msgid "_File"
msgstr "文件(_F)"
-#: ../data/pcsx.glade2.h:110
+#: ../data/pcsxr.glade2.h:111
msgid "_Graphics..."
msgstr "图像(_G)..."
-#: ../data/pcsx.glade2.h:111
+#: ../data/pcsxr.glade2.h:112
msgid "_Help"
msgstr "帮助(_H)"
-#: ../data/pcsx.glade2.h:112
+#: ../data/pcsxr.glade2.h:113
msgid "_Load State"
msgstr "即时读档(_L)"
-#: ../data/pcsx.glade2.h:113
+#: ../data/pcsxr.glade2.h:114
msgid "_Memory Cards..."
msgstr "记忆卡(_M)..."
-#: ../data/pcsx.glade2.h:114
+#: ../data/pcsxr.glade2.h:115
msgid "_Netplay..."
msgstr "联网游戏(_N)..."
-#: ../data/pcsx.glade2.h:115
+#: ../data/pcsxr.glade2.h:116
msgid "_Other..."
msgstr "其它(_O)..."
-#: ../data/pcsx.glade2.h:116
+#: ../data/pcsxr.glade2.h:117
msgid "_Plugins & BIOS..."
msgstr "插件及 BIOS(_P)..."
-#: ../data/pcsx.glade2.h:117
+#: ../data/pcsxr.glade2.h:118
msgid "_Reset"
msgstr "复位(_R)"
-#: ../data/pcsx.glade2.h:118
+#: ../data/pcsxr.glade2.h:119
msgid "_Save State"
msgstr "即时存档(_S)"
-#: ../data/pcsx.glade2.h:119
+#: ../data/pcsxr.glade2.h:120
msgid "_Search..."
msgstr "查找(_S)..."
-#: ../data/pcsx.glade2.h:120
+#: ../data/pcsxr.glade2.h:121
msgid "_Sound..."
msgstr "声音(_S)..."
-#: ../data/pcsx.glade2.h:121
+#: ../data/pcsxr.glade2.h:122
msgid "label_resultsfound"
msgstr "label_resultsfound"
@@ -512,25 +498,41 @@ msgstr "label_resultsfound"
msgid ""
"(C) 1999-2003 PCSX Team\n"
"(C) 2005-2009 PCSX-df Team\n"
-"(C) 2009-2010 PCSX-Reloaded Team"
+"(C) 2009-2011 PCSX-Reloaded Team"
msgstr ""
"(C) 1999-2003 PCSX 开发组\n"
"(C) 2005-2009 PCSX-df 开发组\n"
-"(C) 2009-2010 PCSX-Reloaded 开发组"
+"(C) 2009-2010 PCSX-Reloaded 开发组 "
#: ../gui/AboutDlg.c:77
msgid ""
-"This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\n"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
"\n"
-"This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
"\n"
-"You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA."
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA."
msgstr ""
-"This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\n"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
"\n"
-"This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
"\n"
-"You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA."
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA."
#: ../gui/AboutDlg.c:100
msgid "translator-credits"
@@ -540,39 +542,30 @@ msgstr "Wei Mingzhi <whistler@openoffice.org>"
msgid "A PlayStation emulator."
msgstr "一个 PlayStation 模拟器。"
-#: ../gui/Cheat.c:109
-#: ../win32/gui/CheatDlg.c:116
+#: ../gui/Cheat.c:109 ../win32/gui/CheatDlg.c:116
msgid "Add New Cheat"
msgstr "添加新作弊码"
-#: ../gui/Cheat.c:117
-#: ../gui/Cheat.c:202
+#: ../gui/Cheat.c:117 ../gui/Cheat.c:202
msgid "Cheat Description:"
msgstr "作弊码描述:"
-#: ../gui/Cheat.c:125
-#: ../gui/Cheat.c:211
-#: ../win32/gui/CheatDlg.c:68
+#: ../gui/Cheat.c:125 ../gui/Cheat.c:211 ../win32/gui/CheatDlg.c:68
#: ../win32/gui/CheatDlg.c:118
msgid "Cheat Code:"
msgstr "作弊码:"
-#: ../gui/Cheat.c:155
-#: ../gui/Cheat.c:251
-#: ../gui/LnxMain.c:422
-#: ../win32/gui/ConfigurePlugins.c:305
+#: ../gui/Cheat.c:155 ../gui/Cheat.c:251 ../gui/LnxMain.c:421
+#: ../win32/gui/ConfigurePlugins.c:307
msgid "Error"
msgstr "错误"
-#: ../gui/Cheat.c:155
-#: ../gui/Cheat.c:251
-#: ../win32/gui/CheatDlg.c:91
+#: ../gui/Cheat.c:155 ../gui/Cheat.c:251 ../win32/gui/CheatDlg.c:91
#: ../win32/gui/CheatDlg.c:132
msgid "Invalid cheat code!"
msgstr "非法作弊码!"
-#: ../gui/Cheat.c:194
-#: ../win32/gui/CheatDlg.c:66
+#: ../gui/Cheat.c:194 ../win32/gui/CheatDlg.c:66
msgid "Edit Cheat"
msgstr "编辑作弊码"
@@ -580,16 +573,12 @@ msgstr "编辑作弊码"
msgid "Open Cheat File"
msgstr "打开作弊码文件"
-#: ../gui/Cheat.c:316
-#: ../gui/Cheat.c:356
-msgid "PCSX Cheat Code Files (*.cht)"
-msgstr "PCSX 作弊码文件 (*.cht)"
+#: ../gui/Cheat.c:316 ../gui/Cheat.c:356
+msgid "PCSXR Cheat Code Files (*.cht)"
+msgstr "PCSXR 作弊码文件 (*.cht)"
-#: ../gui/Cheat.c:321
-#: ../gui/Gtk2Gui.c:446
-#: ../gui/Gtk2Gui.c:587
-#: ../win32/gui/WndMain.c:1445
-#: ../win32/gui/WndMain.c:1526
+#: ../gui/Cheat.c:321 ../gui/Gtk2Gui.c:446 ../gui/Gtk2Gui.c:587
+#: ../win32/gui/WndMain.c:1453 ../win32/gui/WndMain.c:1534
msgid "All Files"
msgstr "所有文件"
@@ -601,11 +590,8 @@ msgstr "保存作弊码文件"
msgid "All Files (*.*)"
msgstr "所有文件 (*.*)"
-#: ../gui/Cheat.c:394
-#: ../gui/Cheat.c:1124
-#: ../gui/ConfDlg.c:104
-#: ../gui/ConfDlg.c:200
-#: ../gui/DebugMemory.c:259
+#: ../gui/Cheat.c:394 ../gui/Cheat.c:1124 ../gui/ConfDlg.c:104
+#: ../gui/ConfDlg.c:200 ../gui/DebugMemory.c:259
msgid "Error: Glade interface could not be loaded!"
msgstr "错误:无法加载 Glade 界面!"
@@ -617,42 +603,35 @@ msgstr "作弊码"
msgid "Enable"
msgstr "启用"
-#: ../gui/Cheat.c:413
-#: ../win32/gui/CheatDlg.c:185
+#: ../gui/Cheat.c:413 ../win32/gui/CheatDlg.c:185
msgid "Description"
msgstr "描述"
-#: ../gui/Cheat.c:543
-#: ../win32/gui/CheatDlg.c:457
+#: ../gui/Cheat.c:543 ../win32/gui/CheatDlg.c:457
msgid "Too many addresses found."
msgstr "找到过多的地址。"
-#: ../gui/Cheat.c:552
-#: ../win32/gui/CheatDlg.c:466
+#: ../gui/Cheat.c:552 ../win32/gui/CheatDlg.c:466
#, c-format
msgid "%.8X Current: %u (%.2X), Previous: %u (%.2X)"
msgstr "%.8X 当前值: %u (%.2X), 前次值: %u (%.2X)"
-#: ../gui/Cheat.c:557
-#: ../win32/gui/CheatDlg.c:471
+#: ../gui/Cheat.c:557 ../win32/gui/CheatDlg.c:471
#, c-format
msgid "%.8X Current: %u (%.4X), Previous: %u (%.4X)"
msgstr "%.8X 当前值: %u (%.4X), 前次值: %u (%.4X)"
-#: ../gui/Cheat.c:562
-#: ../win32/gui/CheatDlg.c:476
+#: ../gui/Cheat.c:562 ../win32/gui/CheatDlg.c:476
#, c-format
msgid "%.8X Current: %u (%.8X), Previous: %u (%.8X)"
msgstr "%.8X 当前值: %u (%.8X), 前次值: %u (%.8X)"
-#: ../gui/Cheat.c:577
-#: ../win32/gui/CheatDlg.c:492
+#: ../gui/Cheat.c:577 ../win32/gui/CheatDlg.c:492
#, c-format
msgid "Founded Addresses: %d"
msgstr "找到地址个数: %d"
-#: ../gui/Cheat.c:585
-#: ../win32/gui/CheatDlg.c:448
+#: ../gui/Cheat.c:585 ../win32/gui/CheatDlg.c:448
msgid "Enter the values and start your search."
msgstr "输入数值并开始查找。"
@@ -660,9 +639,7 @@ msgstr "输入数值并开始查找。"
msgid "Freeze value"
msgstr "固定数值"
-#: ../gui/Cheat.c:636
-#: ../win32/gui/CheatDlg.c:67
-#: ../win32/gui/CheatDlg.c:117
+#: ../gui/Cheat.c:636 ../win32/gui/CheatDlg.c:67 ../win32/gui/CheatDlg.c:117
msgid "Description:"
msgstr "描述:"
@@ -683,19 +660,13 @@ msgstr "查找结果"
#. disabled widgets
#. TODO If combo screen hasn't been opened and the user chooses the menu config option, confs.Combo will be null and cause a segfault
#. printf("Configuring plugin %s\n", filename);
-#: ../gui/ConfDlg.c:237
-#: ../gui/ConfDlg.c:258
-#: ../gui/ConfDlg.c:279
-#: ../gui/ConfDlg.c:300
-#: ../gui/ConfDlg.c:355
+#: ../gui/ConfDlg.c:237 ../gui/ConfDlg.c:258 ../gui/ConfDlg.c:279
+#: ../gui/ConfDlg.c:300 ../gui/ConfDlg.c:355
msgid "No configuration required"
msgstr "不需要配置"
-#: ../gui/ConfDlg.c:237
-#: ../gui/ConfDlg.c:258
-#: ../gui/ConfDlg.c:279
-#: ../gui/ConfDlg.c:300
-#: ../gui/ConfDlg.c:355
+#: ../gui/ConfDlg.c:237 ../gui/ConfDlg.c:258 ../gui/ConfDlg.c:279
+#: ../gui/ConfDlg.c:300 ../gui/ConfDlg.c:355
msgid "This plugin doesn't need to be configured."
msgstr "此插件需要被配置。"
@@ -704,14 +675,12 @@ msgstr "此插件需要被配置。"
msgid "Could not open BIOS directory: '%s'\n"
msgstr "无法打开 BIOS 目录: \"%s\"\n"
-#: ../gui/ConfDlg.c:611
-#: ../gui/ConfDlg.c:704
-#: ../gui/LnxMain.c:168
+#: ../gui/ConfDlg.c:611 ../gui/ConfDlg.c:704 ../gui/LnxMain.c:168
#, c-format
msgid "Could not open directory: '%s'\n"
msgstr "无法打开目录: \"%s\"\n"
-#. The BIOS list always contains the PCSX internal BIOS
+#. The BIOS list always contains the PCSXR internal BIOS
#: ../gui/ConfDlg.c:675
msgid "Simulate PSX BIOS"
msgstr "模拟 PS BIOS"
@@ -777,31 +746,23 @@ msgstr "不是一个合法的 PSX 文件"
msgid "The file does not appear to be a valid Playstation executable"
msgstr "此文件不是一个合法的 PlayStation 可执行文件"
-#: ../gui/Gtk2Gui.c:508
-#: ../gui/Gtk2Gui.c:649
+#: ../gui/Gtk2Gui.c:508 ../gui/Gtk2Gui.c:649
msgid "CD ROM failed"
msgstr "CD-ROM 失败"
-#: ../gui/Gtk2Gui.c:508
-#: ../gui/Gtk2Gui.c:649
-#: ../win32/gui/WndMain.c:464
-#: ../win32/gui/WndMain.c:516
-#: ../win32/gui/WndMain.c:585
+#: ../gui/Gtk2Gui.c:508 ../gui/Gtk2Gui.c:649 ../win32/gui/WndMain.c:469
+#: ../win32/gui/WndMain.c:521 ../win32/gui/WndMain.c:590
#, c-format
msgid "The CD does not appear to be a valid Playstation CD"
msgstr "此光盘不是一张合法的 PlayStation 光盘。"
-#: ../gui/Gtk2Gui.c:519
-#: ../gui/Gtk2Gui.c:660
-#: ../win32/gui/WndMain.c:474
-#: ../win32/gui/WndMain.c:526
-#: ../win32/gui/WndMain.c:595
+#: ../gui/Gtk2Gui.c:519 ../gui/Gtk2Gui.c:660 ../win32/gui/WndMain.c:479
+#: ../win32/gui/WndMain.c:531 ../win32/gui/WndMain.c:600
#, c-format
msgid "Could not load CD-ROM!"
msgstr "无法加载光盘!"
-#: ../gui/Gtk2Gui.c:519
-#: ../gui/Gtk2Gui.c:660
+#: ../gui/Gtk2Gui.c:519 ../gui/Gtk2Gui.c:660
msgid "The CD-ROM could not be loaded"
msgstr "无法加载 CD-ROM"
@@ -841,8 +802,7 @@ msgstr "已保存存档 %s"
msgid "Error saving state %s!"
msgstr "保存存档 %s 时出错。"
-#: ../gui/Gtk2Gui.c:864
-#: ../gui/Gtk2Gui.c:892
+#: ../gui/Gtk2Gui.c:864 ../gui/Gtk2Gui.c:892
msgid "Select State File"
msgstr "选择存档文件"
@@ -855,47 +815,49 @@ msgstr "警告"
msgid "Creating memory card: %s\n"
msgstr "建立记忆卡: %s\n"
-#: ../gui/LnxMain.c:329
+#: ../gui/LnxMain.c:328
msgid ""
-" pcsx [options] [file]\n"
+" pcsxr [options] [file]\n"
"\toptions:\n"
"\t-runcd\t\tRuns CD-ROM\n"
"\t-cdfile FILE\tRuns a CD image file\n"
"\t-nogui\t\tDon't open the GTK GUI\n"
-"\t-cfg FILE\tLoads desired configuration file (default: ~/.pcsx/pcsx.cfg)\n"
+"\t-cfg FILE\tLoads desired configuration file (default: ~/.pcsxr/pcsxr.cfg)\n"
"\t-psxout\t\tEnable PSX output\n"
"\t-slowboot\tEnable BIOS Logo\n"
"\t-load STATENUM\tLoads savestate STATENUM (1-9)\n"
"\t-h -help\tDisplay this message\n"
"\tfile\t\tLoads file\n"
msgstr ""
-" pcsx [选项] [文件]\n"
+" pcsxr [选项] [文件]\n"
"\t选项:\n"
"\t-runcd\t\t运行 CD-ROM\n"
"\t-cdfile 文件\t运行一个 CD 镜像文件\n"
"\t-nogui\t\t不使用 GTK 图形界面\n"
-"\t-cfg 文件\t加载一个特定的配置文件 (默认为: ~/.pcsx/pcsx.cfg)\n"
+"\t-cfg 文件\t加载一个特定的配置文件 (默认为: ~/.pcsxr/pcsxr.cfg)\n"
"\t-psxout\t\t启用 PSX 输出\n"
"\t-slowboot\t显示 BIOS 启动画面\n"
"\t-load 编号\t加载指定编号的存档 (1-5)\n"
"\t-h -help\t显示此信息\n"
"\t文件\t\t加载文件\n"
-#: ../gui/LnxMain.c:366
+#: ../gui/LnxMain.c:365
#, c-format
-msgid "PCSX cannot be configured without using the GUI -- you should restart without -nogui.\n"
-msgstr "PCSX 不能在字符界面下配置 -- 请不使用 -nogui 参数重新启动程序\n"
+msgid ""
+"PCSXR cannot be configured without using the GUI -- you should restart "
+"without -nogui.\n"
+msgstr "PCSXR 不能在字符界面下配置 -- 请不使用 -nogui 参数重新启动程序\n"
-#: ../gui/LnxMain.c:422
+#: ../gui/LnxMain.c:421
msgid "Failed loading plugins!"
msgstr "加载插件失败!"
-#: ../gui/LnxMain.c:441
+#: ../gui/LnxMain.c:440
#, c-format
msgid "Could not load CD-ROM!\n"
msgstr "无法加载光盘。\n"
-#: ../gui/LnxMain.c:472
+#: ../gui/LnxMain.c:471
#, c-format
msgid "PSX emulator couldn't be initialized.\n"
msgstr "无法初始化 PS 模拟器。\n"
@@ -904,13 +866,11 @@ msgstr "无法初始化 PS 模拟器。\n"
msgid "Icon"
msgstr "图标"
-#: ../gui/MemcardDlg.c:66
-#: ../win32/gui/WndMain.c:749
+#: ../gui/MemcardDlg.c:66 ../win32/gui/WndMain.c:754
msgid "Title"
msgstr "标题"
-#: ../gui/MemcardDlg.c:72
-#: ../win32/gui/WndMain.c:755
+#: ../gui/MemcardDlg.c:72 ../win32/gui/WndMain.c:760
msgid "Status"
msgstr "状态"
@@ -922,24 +882,17 @@ msgstr "ID"
msgid "Name"
msgstr "名称"
-#: ../gui/MemcardDlg.c:192
-#: ../gui/MemcardDlg.c:297
-#: ../win32/gui/WndMain.c:960
+#: ../gui/MemcardDlg.c:192 ../gui/MemcardDlg.c:297 ../win32/gui/WndMain.c:965
msgid "Deleted"
msgstr "已删除"
-#: ../gui/MemcardDlg.c:194
-#: ../gui/MemcardDlg.c:198
-#: ../gui/MemcardDlg.c:299
-#: ../gui/MemcardDlg.c:303
-#: ../win32/gui/WndMain.c:961
-#: ../win32/gui/WndMain.c:964
+#: ../gui/MemcardDlg.c:194 ../gui/MemcardDlg.c:198 ../gui/MemcardDlg.c:299
+#: ../gui/MemcardDlg.c:303 ../win32/gui/WndMain.c:966
+#: ../win32/gui/WndMain.c:969
msgid "Free"
msgstr "空闲"
-#: ../gui/MemcardDlg.c:196
-#: ../gui/MemcardDlg.c:301
-#: ../win32/gui/WndMain.c:963
+#: ../gui/MemcardDlg.c:196 ../gui/MemcardDlg.c:301 ../win32/gui/WndMain.c:968
msgid "Used"
msgstr "已使用"
@@ -953,7 +906,9 @@ msgid "Format this Memory Card?"
msgstr "格式化此记忆卡?"
#: ../gui/MemcardDlg.c:403
-msgid "If you format the memory card, the card will be empty, and any existing data overwritten."
+msgid ""
+"If you format the memory card, the card will be empty, and any existing data "
+"overwritten."
msgstr "如果您选择格式化记忆卡,记忆卡将被清空,并且任何现有数据都将被覆盖。"
#: ../gui/MemcardDlg.c:406
@@ -975,7 +930,9 @@ msgid "No free space on memory card"
msgstr "记忆卡无空余位置"
#: ../gui/MemcardDlg.c:541
-msgid "There are no free slots available on the target memory card. Please delete a slot first."
+msgid ""
+"There are no free slots available on the target memory card. Please delete a "
+"slot first."
msgstr "目标记忆卡上无空余位置。请先删除一个存档。"
#: ../gui/MemcardDlg.c:704
@@ -1067,8 +1024,7 @@ msgstr "作弊码已加载: %s\n"
msgid "Cheats saved to: %s\n"
msgstr "作弊码己保存: %s\n"
-#: ../libpcsxcore/cheat.c:322
-#: ../libpcsxcore/cheat.c:443
+#: ../libpcsxcore/cheat.c:322 ../libpcsxcore/cheat.c:443
msgid "(Untitled)"
msgstr "(未命名)"
@@ -1191,23 +1147,23 @@ msgstr "SIO1 插件初始化错误: %d"
msgid "Plugins loaded.\n"
msgstr "插件已加载。\n"
-#: ../libpcsxcore/ppf.c:217
+#: ../libpcsxcore/ppf.c:219
#, c-format
msgid "Invalid PPF patch: %s.\n"
msgstr "非法 PPF 补丁: %s。\n"
-#: ../libpcsxcore/ppf.c:293
+#: ../libpcsxcore/ppf.c:295
#, c-format
msgid "Unsupported PPF version (%d).\n"
msgstr "不支持的 PPF 补丁版本 (%d)。\n"
#. build address array
-#: ../libpcsxcore/ppf.c:332
+#: ../libpcsxcore/ppf.c:334
#, c-format
msgid "Loaded PPF %d.0 patch: %s.\n"
msgstr "已加载 PPF %d.0 补丁文件: %s。\n"
-#: ../libpcsxcore/ppf.c:377
+#: ../libpcsxcore/ppf.c:381
#, c-format
msgid "Loaded SBI file: %s.\n"
msgstr "已加载 SBI 文件: %s。\n"
@@ -1223,29 +1179,29 @@ msgstr "无法打开 BIOS: \"%s\"。使用内部 HLE Bios。\n"
#: ../libpcsxcore/r3000a.c:34
#, c-format
-msgid "Running PCSX Version %s (%s).\n"
-msgstr "正在运行 PCSX 版本 %s (%s)。\n"
+msgid "Running PCSXR Version %s (%s).\n"
+msgstr "正在运行 PCSXR 版本 %s (%s)。\n"
-#: ../libpcsxcore/sio.c:839
+#: ../libpcsxcore/sio.c:843
msgid "Connection closed!\n"
msgstr "连接被关闭!\n"
-#: ../libpcsxcore/sio.c:872
+#: ../libpcsxcore/sio.c:876
#, c-format
msgid "No memory card value was specified - creating a default card %s\n"
msgstr "未指定记忆卡 - 创建一个默认的记忆卡 %s\n"
-#: ../libpcsxcore/sio.c:876
+#: ../libpcsxcore/sio.c:880
#, c-format
msgid "The memory card %s doesn't exist - creating it\n"
msgstr "记忆卡 %s 不存在 - 正在创建\n"
-#: ../libpcsxcore/sio.c:892
+#: ../libpcsxcore/sio.c:896
#, c-format
msgid "Memory card %s failed to load!\n"
msgstr "记忆卡 %s 读取失败!\n"
-#: ../libpcsxcore/sio.c:896
+#: ../libpcsxcore/sio.c:900
#, c-format
msgid "Loading memory card %s\n"
msgstr "加载记忆卡 %s\n"
@@ -1258,278 +1214,285 @@ msgstr "CD-ROM 设备读取插件"
msgid "CDR NULL Plugin"
msgstr "CDR 空插件"
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:1
-#: ../plugins/dfcdrom/cdrcfg-0.1df/main.c:219
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:1
+msgid "125ms"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:2
+msgid "16min"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:3
+msgid "16s"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:4
+msgid "1min"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:5
+msgid "1s"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:6
+msgid "250ms"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:7
+msgid "2min"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:8
+msgid "2s"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:9
+msgid "32min"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:10
+msgid "32s"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:11
+msgid "4min"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:12
+msgid "4s"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:13
+msgid "500ms"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:14
+msgid "8min"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:15
+msgid "8s"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:16
+#: ../plugins/dfcdrom/cdrcfg-0.1df/main.c:206
msgid "CDR configuration"
msgstr "CDR 配置"
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:2
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:17
msgid "Cache Size (Def. 64):"
msgstr "缓存大小 (默认为 64):"
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:3
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:18
msgid "Cdrom Speed (Def. 0 = MAX):"
msgstr "光驱速度 (默认 0 为最大速度):"
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:4
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:19
msgid "Choose your CD-ROM device or type its path if it's not listed"
msgstr "请选择您的 CD-ROM 设备或直接输入设备路径"
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:5
-msgid ""
-"Default\n"
-"125ms\n"
-"250ms\n"
-"500ms\n"
-"1s\n"
-"2s\n"
-"4s\n"
-"8s\n"
-"16s\n"
-"32s\n"
-"1min\n"
-"2min\n"
-"4min\n"
-"8min\n"
-"16min\n"
-"32min"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:20
+msgid "Default"
msgstr ""
-"默认\n"
-"125 毫秒\n"
-"250 毫秒\n"
-"500 毫秒\n"
-"1 秒\n"
-"2 秒\n"
-"4 秒\n"
-"8 秒\n"
-"16 秒\n"
-"32 秒\n"
-"1 分钟\n"
-"2 分钟\n"
-"4 分钟\n"
-"8 分钟\n"
-"16 分钟\n"
-"32 分钟"
-
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:21
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:21
msgid "Enable subchannel read"
msgstr "启用子通道读取"
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:22
-msgid ""
-"Normal (No Cache)\n"
-"Threaded - Faster (With Cache)"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:22
+msgid "Normal (No Cache)"
msgstr ""
-"正常 (无缓存)\n"
-"多线程 - 较快 (使用缓存)"
-
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:24
-#: ../plugins/dfinput/dfinput.ui.h:8
-#: ../win32/gui/WndMain.c:1310
-msgid "Options"
-msgstr "选项"
-
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:25
-msgid "Select CD-ROM device"
-msgstr "选择 CD-ROM 设备"
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:26
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:23
msgid "Select read mode:"
msgstr "选择读取模式:"
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:27
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:24
msgid "Spindown Time:"
msgstr "电机停转时限:"
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:28
-msgid "hseparator"
-msgstr "hseparator"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:25
+#, fuzzy
+msgid "Threaded - Faster (With Cache)"
+msgstr ""
+"正常 (无缓存)\n"
+"多线程 - 较快 (使用缓存)"
-#: ../plugins/dfinput/cfg-gtk2.c:48
+#: ../plugins/dfinput/cfg-gtk2.c:49
msgid "D-Pad Up"
msgstr "方向键上"
-#: ../plugins/dfinput/cfg-gtk2.c:49
+#: ../plugins/dfinput/cfg-gtk2.c:50
msgid "D-Pad Down"
msgstr "方向键下"
-#: ../plugins/dfinput/cfg-gtk2.c:50
+#: ../plugins/dfinput/cfg-gtk2.c:51
msgid "D-Pad Left"
msgstr "方向键左"
-#: ../plugins/dfinput/cfg-gtk2.c:51
+#: ../plugins/dfinput/cfg-gtk2.c:52
msgid "D-Pad Right"
msgstr "方向键右"
-#: ../plugins/dfinput/cfg-gtk2.c:52
+#: ../plugins/dfinput/cfg-gtk2.c:53
msgid "Cross"
msgstr "叉号键"
-#: ../plugins/dfinput/cfg-gtk2.c:53
+#: ../plugins/dfinput/cfg-gtk2.c:54
msgid "Circle"
msgstr "圆圈键"
-#: ../plugins/dfinput/cfg-gtk2.c:54
+#: ../plugins/dfinput/cfg-gtk2.c:55
msgid "Square"
msgstr "方块键"
-#: ../plugins/dfinput/cfg-gtk2.c:55
+#: ../plugins/dfinput/cfg-gtk2.c:56
msgid "Triangle"
msgstr "三角键"
-#: ../plugins/dfinput/cfg-gtk2.c:56
+#: ../plugins/dfinput/cfg-gtk2.c:57
msgid "L1"
msgstr "L1"
-#: ../plugins/dfinput/cfg-gtk2.c:57
+#: ../plugins/dfinput/cfg-gtk2.c:58
msgid "R1"
msgstr "R1"
-#: ../plugins/dfinput/cfg-gtk2.c:58
+#: ../plugins/dfinput/cfg-gtk2.c:59
msgid "L2"
msgstr "L2"
-#: ../plugins/dfinput/cfg-gtk2.c:59
+#: ../plugins/dfinput/cfg-gtk2.c:60
msgid "R2"
msgstr "R2"
-#: ../plugins/dfinput/cfg-gtk2.c:60
+#: ../plugins/dfinput/cfg-gtk2.c:61
msgid "Select"
msgstr "选择键"
-#: ../plugins/dfinput/cfg-gtk2.c:61
+#: ../plugins/dfinput/cfg-gtk2.c:62
msgid "Start"
msgstr "开始键"
-#: ../plugins/dfinput/cfg-gtk2.c:62
+#: ../plugins/dfinput/cfg-gtk2.c:63
msgid "L3"
msgstr "L3"
-#: ../plugins/dfinput/cfg-gtk2.c:63
+#: ../plugins/dfinput/cfg-gtk2.c:64
msgid "R3"
msgstr "R3"
-#: ../plugins/dfinput/cfg-gtk2.c:67
+#: ../plugins/dfinput/cfg-gtk2.c:65
+#, fuzzy
+msgid "Analog"
+msgstr "摇杆手柄"
+
+#: ../plugins/dfinput/cfg-gtk2.c:69
msgid "L-Stick Right"
msgstr "左摇杆右方向"
-#: ../plugins/dfinput/cfg-gtk2.c:68
+#: ../plugins/dfinput/cfg-gtk2.c:70
msgid "L-Stick Left"
msgstr "左摇杆左方向"
-#: ../plugins/dfinput/cfg-gtk2.c:69
+#: ../plugins/dfinput/cfg-gtk2.c:71
msgid "L-Stick Down"
msgstr "左摇杆下方向"
-#: ../plugins/dfinput/cfg-gtk2.c:70
+#: ../plugins/dfinput/cfg-gtk2.c:72
msgid "L-Stick Up"
msgstr "左摇杆上方向"
-#: ../plugins/dfinput/cfg-gtk2.c:71
+#: ../plugins/dfinput/cfg-gtk2.c:73
msgid "R-Stick Right"
msgstr "右摇杆右方向"
-#: ../plugins/dfinput/cfg-gtk2.c:72
+#: ../plugins/dfinput/cfg-gtk2.c:74
msgid "R-Stick Left"
msgstr "右摇杆左方向"
-#: ../plugins/dfinput/cfg-gtk2.c:73
+#: ../plugins/dfinput/cfg-gtk2.c:75
msgid "R-Stick Down"
msgstr "右摇杆下方向"
-#: ../plugins/dfinput/cfg-gtk2.c:74
+#: ../plugins/dfinput/cfg-gtk2.c:76
msgid "R-Stick Up"
msgstr "右摇杆上方向"
-#: ../plugins/dfinput/cfg-gtk2.c:100
-#: ../plugins/dfinput/cfg-gtk2.c:139
+#: ../plugins/dfinput/cfg-gtk2.c:102 ../plugins/dfinput/cfg-gtk2.c:141
msgid "Centered"
msgstr "居中"
-#: ../plugins/dfinput/cfg-gtk2.c:100
-#: ../plugins/dfinput/cfg-gtk2.c:139
+#: ../plugins/dfinput/cfg-gtk2.c:102 ../plugins/dfinput/cfg-gtk2.c:141
msgid "Up"
msgstr "上"
-#: ../plugins/dfinput/cfg-gtk2.c:100
-#: ../plugins/dfinput/cfg-gtk2.c:139
+#: ../plugins/dfinput/cfg-gtk2.c:102 ../plugins/dfinput/cfg-gtk2.c:141
msgid "Right"
msgstr "右方向键"
-#: ../plugins/dfinput/cfg-gtk2.c:100
-#: ../plugins/dfinput/cfg-gtk2.c:139
+#: ../plugins/dfinput/cfg-gtk2.c:102 ../plugins/dfinput/cfg-gtk2.c:141
msgid "Rightup"
msgstr "右上"
-#: ../plugins/dfinput/cfg-gtk2.c:101
-#: ../plugins/dfinput/cfg-gtk2.c:140
+#: ../plugins/dfinput/cfg-gtk2.c:103 ../plugins/dfinput/cfg-gtk2.c:142
msgid "Down"
msgstr "下"
-#: ../plugins/dfinput/cfg-gtk2.c:101
-#: ../plugins/dfinput/cfg-gtk2.c:140
+#: ../plugins/dfinput/cfg-gtk2.c:103 ../plugins/dfinput/cfg-gtk2.c:142
msgid "Rightdown"
msgstr "右下"
-#: ../plugins/dfinput/cfg-gtk2.c:101
-#: ../plugins/dfinput/cfg-gtk2.c:140
+#: ../plugins/dfinput/cfg-gtk2.c:103 ../plugins/dfinput/cfg-gtk2.c:142
msgid "Left"
msgstr "左"
-#: ../plugins/dfinput/cfg-gtk2.c:101
-#: ../plugins/dfinput/cfg-gtk2.c:140
+#: ../plugins/dfinput/cfg-gtk2.c:103 ../plugins/dfinput/cfg-gtk2.c:142
msgid "Leftup"
msgstr "左上"
-#: ../plugins/dfinput/cfg-gtk2.c:102
-#: ../plugins/dfinput/cfg-gtk2.c:141
+#: ../plugins/dfinput/cfg-gtk2.c:104 ../plugins/dfinput/cfg-gtk2.c:143
msgid "Leftdown"
msgstr "左下"
-#: ../plugins/dfinput/cfg-gtk2.c:106
-#: ../plugins/dfinput/cfg-gtk2.c:145
+#: ../plugins/dfinput/cfg-gtk2.c:108 ../plugins/dfinput/cfg-gtk2.c:147
#, c-format
msgid "Joystick: Button %d"
msgstr "手柄: 按钮 %d"
-#: ../plugins/dfinput/cfg-gtk2.c:110
-#: ../plugins/dfinput/cfg-gtk2.c:149
+#: ../plugins/dfinput/cfg-gtk2.c:112 ../plugins/dfinput/cfg-gtk2.c:151
#, c-format
msgid "Joystick: Axis %d%c"
msgstr "手柄: 轴 %d%c"
-#: ../plugins/dfinput/cfg-gtk2.c:115
-#: ../plugins/dfinput/cfg-gtk2.c:154
+#: ../plugins/dfinput/cfg-gtk2.c:117 ../plugins/dfinput/cfg-gtk2.c:156
#, c-format
msgid "Joystick: Hat %d %s"
msgstr "Joystick: 操纵杆 %d %s"
-#: ../plugins/dfinput/cfg-gtk2.c:130
-#: ../plugins/dfinput/cfg-gtk2.c:169
+#: ../plugins/dfinput/cfg-gtk2.c:132 ../plugins/dfinput/cfg-gtk2.c:171
msgid "Keyboard:"
msgstr "键盘:"
-#: ../plugins/dfinput/cfg-gtk2.c:134
-#: ../plugins/dfinput/cfg-gtk2.c:173
+#: ../plugins/dfinput/cfg-gtk2.c:136 ../plugins/dfinput/cfg-gtk2.c:175
msgid "(Not Set)"
msgstr "(未设定)"
-#: ../plugins/dfinput/cfg-gtk2.c:542
+#: ../plugins/dfinput/cfg-gtk2.c:562
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:13
#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:55
msgid "None"
msgstr "无"
-#: ../plugins/dfinput/cfg-gtk2.c:584
+#: ../plugins/dfinput/cfg-gtk2.c:604
msgid "Gamepad/Keyboard Input Configuration"
msgstr "手柄/键盘输入配置"
-#: ../plugins/dfinput/cfg-gtk2.c:590
-#: ../plugins/dfinput/cfg-gtk2.c:610
+#: ../plugins/dfinput/cfg-gtk2.c:610 ../plugins/dfinput/cfg-gtk2.c:630
msgid "Key"
msgstr "按钮"
-#: ../plugins/dfinput/cfg-gtk2.c:596
-#: ../plugins/dfinput/cfg-gtk2.c:616
+#: ../plugins/dfinput/cfg-gtk2.c:616 ../plugins/dfinput/cfg-gtk2.c:636
msgid "Button"
msgstr "按键"
@@ -1558,19 +1521,28 @@ msgid "Digital Pad"
msgstr "普通手柄"
#: ../plugins/dfinput/dfinput.ui.h:7
+msgid "Mouse"
+msgstr ""
+
+#: ../plugins/dfinput/dfinput.ui.h:8
msgid "Multi-Threaded (Recommended)"
msgstr "多线程 (推荐)"
-#: ../plugins/dfinput/dfinput.ui.h:9
+#: ../plugins/dfinput/dfinput.ui.h:9 ../win32/gui/WndMain.c:1316
+msgid "Options"
+msgstr "选项"
+
+#: ../plugins/dfinput/dfinput.ui.h:10
msgid "Reset"
msgstr "重置"
-#: ../plugins/dfinput/dfinput.ui.h:10
+#: ../plugins/dfinput/dfinput.ui.h:11
msgid "Type:"
msgstr "类型:"
-#: ../plugins/dfinput/pad.c:24
-msgid "Gamepad/Keyboard Input"
+#: ../plugins/dfinput/pad.c:29
+#, fuzzy
+msgid "Gamepad/Keyboard/Mouse Input"
msgstr "手柄/键盘输入"
#. increase that with each version
@@ -1587,33 +1559,37 @@ msgstr "无法连接到 %s: %s\n"
msgid "Error allocating memory!\n"
msgstr "分配内存错误!\n"
-#: ../plugins/dfnet/dfnet.ui.h:1
+#. ****************************************************************************
+#: ../plugins/dfnet/dfnet.ui.h:1 ../plugins/bladesio1/sio1.ui.h:1
msgid "Client (Player2)"
msgstr "客户端 (玩家 2)"
-#: ../plugins/dfnet/dfnet.ui.h:2
+#: ../plugins/dfnet/dfnet.ui.h:2 ../plugins/bladesio1/sio1.ui.h:2
msgid "Copy PC IP to Clipboard"
msgstr "将本机 IP 复制到剪贴板"
-#: ../plugins/dfnet/dfnet.ui.h:3
-msgid "Do not change if not necessary (remember it must be changed on both sides)."
+#: ../plugins/dfnet/dfnet.ui.h:3 ../plugins/bladesio1/sio1.ui.h:3
+msgid ""
+"Do not change if not necessary (remember it must be changed on both sides)."
msgstr "如非必要,请勿改动 (必须在两端都要改动)。"
-#: ../plugins/dfnet/dfnet.ui.h:4
+#: ../plugins/dfnet/dfnet.ui.h:4 ../plugins/bladesio1/sio1.ui.h:4
msgid "Play Offline"
msgstr "离线运行"
-#: ../plugins/dfnet/dfnet.ui.h:5
+#: ../plugins/dfnet/dfnet.ui.h:5 ../plugins/bladesio1/sio1.ui.h:5
msgid "Port Number"
msgstr "端口号"
-#: ../plugins/dfnet/dfnet.ui.h:6
+#: ../plugins/dfnet/dfnet.ui.h:6 ../plugins/bladesio1/sio1.ui.h:6
msgid ""
"Select here if you'll be Server (Player1) or Client (Player2).\n"
"\n"
-"If you select Server you must Copy your IP address to the Clipboard and paste if (Ctrl+V) wherever the Client can see it.\n"
+"If you select Server you must Copy your IP address to the Clipboard and "
+"paste if (Ctrl+V) wherever the Client can see it.\n"
"\n"
-"If you selected Client please enter the IP address the Server gave to you in the IP Address Control."
+"If you selected Client please enter the IP address the Server gave to you in "
+"the IP Address Control."
msgstr ""
"请在此选择作为服务器 (玩家 1) 还是作为客户端 (玩家 2) 来运行。\n"
"\n"
@@ -1621,17 +1597,16 @@ msgstr ""
"\n"
"如果您选择作为客户端,请输入服务器方提供给您的 IP 地址。"
-#: ../plugins/dfnet/dfnet.ui.h:11
+#: ../plugins/dfnet/dfnet.ui.h:11 ../plugins/bladesio1/sio1.ui.h:11
msgid "Server (Player1)"
msgstr "服务器 (玩家 1)"
-#: ../plugins/dfnet/dfnet.ui.h:12
+#: ../plugins/dfnet/dfnet.ui.h:12 ../plugins/bladesio1/sio1.ui.h:12
msgid "Start Game"
msgstr "开始游戏"
-#: ../plugins/dfnet/gui.c:30
-#: ../plugins/dfnet/gui.c:112
-#: ../win32/gui/ConfigurePlugins.c:616
+#: ../plugins/dfnet/gui.c:30 ../plugins/dfnet/gui.c:112
+#: ../win32/gui/ConfigurePlugins.c:618
msgid "NetPlay"
msgstr "联网游戏"
@@ -1688,100 +1663,92 @@ msgstr ""
"P.E.Op.S 声音驱动程序 V1.7\n"
"编写: Pete Bernert 以及 P.E.Op.S. 开发组\n"
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:1
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2.h:20
-msgid "<b>Compatibility</b>"
-msgstr "<b>兼容性</b>"
-
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:2
-msgid "<b>General</b>"
-msgstr "<b>一般</b>"
-
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:3
-msgid "<b>XA Music</b>"
-msgstr "<b>XA 音乐</b>"
-
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:4
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:1
msgid "Adjust XA speed"
msgstr "调整 XA 速度"
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:5
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:2
msgid "Choose this if XA music is played too quickly."
msgstr "如 XA 音乐播放得太快,请选择此项。"
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:7
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:4
+msgid "Cubic"
+msgstr ""
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:5
msgid "Frequency Response - Output Filter"
msgstr "频率响应 - 输出过滤"
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:8
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:6
+#, fuzzy
+msgid "Gaussian"
+msgstr "俄语"
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:7
msgid "High compatibility mode"
msgstr "高兼容性模式"
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:9
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:8
msgid "Interpolation:"
msgstr "插值:"
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:10
-msgid ""
-"None\n"
-"Low\n"
-"Medium\n"
-"Loud\n"
-"Loudest"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:9
+msgid "Loud"
msgstr ""
-"无\n"
-"低\n"
-"中\n"
-"高\n"
-"最高"
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:15
-msgid ""
-"None\n"
-"Simple\n"
-"Gaussian\n"
-"Cubic"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:10
+msgid "Loudest"
msgstr ""
-"无\n"
-"简易\n"
-"高斯\n"
-"立方"
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:19
-msgid ""
-"Off\n"
-"Simple\n"
-"Playstation"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:11
+msgid "Low"
msgstr ""
-"关\n"
-"简易\n"
-"Playstation"
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:22
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:12
+msgid "Medium"
+msgstr ""
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:14
+msgid "Off"
+msgstr ""
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:15
msgid "Play only one channel for a performance boost."
msgstr "仅播放一个声道以提升性能。"
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:23
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:16
+#, fuzzy
+msgid "Playstation"
+msgstr ""
+"关\n"
+"简易\n"
+"Playstation"
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:17
msgid "Reverb:"
msgstr "回响:"
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:24
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:18
msgid "SPU IRQ Wait"
msgstr "SPU IRQ 等待"
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:25
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:19
+msgid "Simple"
+msgstr ""
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:20
msgid "Single channel sound"
msgstr "单声道"
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:26
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:21
msgid "Use the asynchronous SPU interface."
msgstr "使用异步 SPU 接口。"
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:27
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:22
msgid "Volume:"
msgstr "音量:"
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:28
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:23
msgid "Wait for CPU; only useful for some games."
msgstr "等待 CPU; 仅在部分游戏中有用处。"
@@ -1877,6 +1844,10 @@ msgstr ""
"1280x1024\n"
"1600x1200"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2.h:20
+msgid "<b>Compatibility</b>"
+msgstr "<b>兼容性</b>"
+
#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2.h:21
msgid "<b>Framerate</b>"
msgstr "<b>帧率</b>"
@@ -2381,6 +2352,11 @@ msgstr "窗口选项"
msgid "Yellow rect (FF9)"
msgstr "黄色方块 (FF9)"
+#: ../plugins/bladesio1/gui.c:32
+#, fuzzy
+msgid "Link cable"
+msgstr "启用"
+
#. ****************************************************************************
#: ../plugins/bladesio1/sio1.c:29
msgid "Sio1 Driver"
@@ -2388,7 +2364,7 @@ msgstr "Sio1 驱动程序"
#: ../win32/gui/AboutDlg.c:26
msgid ""
-"PCSX - A PlayStation Emulator\n"
+"PCSXR - A PlayStation Emulator\n"
"\n"
"Original Authors:\n"
"main coder: linuzappz\n"
@@ -2396,7 +2372,7 @@ msgid ""
"ex-coders: Nocomp, Pete Bernett, nik3d\n"
"Webmaster: AkumaX"
msgstr ""
-"PCSX - 一个 PlayStation 模拟器\n"
+"PCSXR - 一个 PlayStation 模拟器\n"
"\n"
"原作者:\n"
"主程序员: linuzappz\n"
@@ -2411,7 +2387,7 @@ msgid ""
"Marcus Comstedt, Stefan Sikora\n"
"\n"
"PCSX-Reloaded By:\n"
-"Blade_Arma, shalma, Wei Mingzhi, et al.\n"
+"edgbla, shalma, Wei Mingzhi, et al.\n"
"\n"
"http://pcsxr.codeplex.com/"
msgstr ""
@@ -2420,47 +2396,38 @@ msgstr ""
"Marcus Comstedt, Stefan Sikora\n"
"\n"
"PCSX-Reloaded 开发者:\n"
-"Blade_Arma, shalma, Wei Mingzhi, et al.\n"
+"edgbla, shalma, Wei Mingzhi, et al.\n"
"\n"
"http://pcsxr.codeplex.com/"
#: ../win32/gui/AboutDlg.c:46
msgid "About"
-msgstr "关于 PCSX"
+msgstr "关于 PCSXR"
-#: ../win32/gui/AboutDlg.c:48
-#: ../win32/gui/AboutDlg.c:52
-#: ../win32/gui/CheatDlg.c:69
-#: ../win32/gui/CheatDlg.c:119
-#: ../win32/gui/ConfigurePlugins.c:483
-#: ../win32/gui/ConfigurePlugins.c:614
-#: ../win32/gui/WndMain.c:1059
-#: ../win32/gui/WndMain.c:1295
+#: ../win32/gui/AboutDlg.c:48 ../win32/gui/AboutDlg.c:52
+#: ../win32/gui/CheatDlg.c:69 ../win32/gui/CheatDlg.c:119
+#: ../win32/gui/ConfigurePlugins.c:485 ../win32/gui/ConfigurePlugins.c:616
+#: ../win32/gui/WndMain.c:1064 ../win32/gui/WndMain.c:1300
msgid "OK"
msgstr "确定"
#: ../win32/gui/AboutDlg.c:49
-msgid "PCSX EMU\n"
-msgstr "PCSX 模拟器\n"
+msgid "PCSXR EMU\n"
+msgstr "PCSXR 模拟器\n"
-#: ../win32/gui/CheatDlg.c:51
-#: ../win32/gui/CheatDlg.c:223
+#: ../win32/gui/CheatDlg.c:51 ../win32/gui/CheatDlg.c:223
#: ../win32/gui/CheatDlg.c:270
msgid "Yes"
msgstr "是"
-#: ../win32/gui/CheatDlg.c:51
-#: ../win32/gui/CheatDlg.c:223
+#: ../win32/gui/CheatDlg.c:51 ../win32/gui/CheatDlg.c:223
#: ../win32/gui/CheatDlg.c:270
msgid "No"
msgstr "否"
-#: ../win32/gui/CheatDlg.c:70
-#: ../win32/gui/CheatDlg.c:120
-#: ../win32/gui/ConfigurePlugins.c:484
-#: ../win32/gui/ConfigurePlugins.c:615
-#: ../win32/gui/WndMain.c:1060
-#: ../win32/gui/WndMain.c:1296
+#: ../win32/gui/CheatDlg.c:70 ../win32/gui/CheatDlg.c:120
+#: ../win32/gui/ConfigurePlugins.c:486 ../win32/gui/ConfigurePlugins.c:617
+#: ../win32/gui/WndMain.c:1065 ../win32/gui/WndMain.c:1301
msgid "Cancel"
msgstr "取消"
@@ -2496,10 +2463,9 @@ msgstr "关闭(&C)"
msgid "Enabled"
msgstr "启用"
-#: ../win32/gui/CheatDlg.c:282
-#: ../win32/gui/CheatDlg.c:311
-msgid "PCSX Cheat Code Files"
-msgstr "PCSX 作弊码文件"
+#: ../win32/gui/CheatDlg.c:282 ../win32/gui/CheatDlg.c:311
+msgid "PCSXR Cheat Code Files"
+msgstr "PCSXR 作弊码文件"
#: ../win32/gui/CheatDlg.c:402
msgid "Equal Value"
@@ -2541,8 +2507,7 @@ msgstr "无改变"
msgid "No addresses found."
msgstr "未找到地址。"
-#: ../win32/gui/CheatDlg.c:505
-#: ../win32/gui/CheatDlg.c:596
+#: ../win32/gui/CheatDlg.c:505 ../win32/gui/CheatDlg.c:596
msgid "Address:"
msgstr "地址:"
@@ -2595,169 +2560,156 @@ msgstr "十进制"
msgid "Hexadecimal"
msgstr "十六进制"
-#: ../win32/gui/ConfigurePlugins.c:219
+#: ../win32/gui/ConfigurePlugins.c:221
msgid "Simulate Psx Bios"
msgstr "模拟 PS BIOS"
-#: ../win32/gui/ConfigurePlugins.c:305
+#: ../win32/gui/ConfigurePlugins.c:307
msgid "Configuration not OK!"
msgstr "配置不正确!"
-#: ../win32/gui/ConfigurePlugins.c:406
+#: ../win32/gui/ConfigurePlugins.c:408
msgid "This plugin reports that should work correctly"
msgstr "此插件报告其可正常工作。"
-#: ../win32/gui/ConfigurePlugins.c:407
+#: ../win32/gui/ConfigurePlugins.c:409
msgid "This plugin reports that should not work correctly"
msgstr "此插件报告其不可正常工作。"
-#: ../win32/gui/ConfigurePlugins.c:463
+#: ../win32/gui/ConfigurePlugins.c:465
msgid "Select Plugins Directory"
msgstr "选择插件目录"
-#: ../win32/gui/ConfigurePlugins.c:472
+#: ../win32/gui/ConfigurePlugins.c:474
msgid "Select Bios Directory"
msgstr "选择 BIOS 目录"
-#: ../win32/gui/ConfigurePlugins.c:481
+#: ../win32/gui/ConfigurePlugins.c:483
msgid "Configuration"
msgstr "配置"
-#: ../win32/gui/ConfigurePlugins.c:485
+#: ../win32/gui/ConfigurePlugins.c:487
msgid "Graphics"
msgstr "图像"
-#: ../win32/gui/ConfigurePlugins.c:486
+#: ../win32/gui/ConfigurePlugins.c:488
msgid "First Controller"
msgstr "主控制器"
-#: ../win32/gui/ConfigurePlugins.c:487
+#: ../win32/gui/ConfigurePlugins.c:489
msgid "Second Controller"
msgstr "辅控制器"
-#: ../win32/gui/ConfigurePlugins.c:488
+#: ../win32/gui/ConfigurePlugins.c:490
msgid "Sound"
msgstr "声音"
-#: ../win32/gui/ConfigurePlugins.c:489
+#: ../win32/gui/ConfigurePlugins.c:491
msgid "Cdrom"
msgstr "CD-ROM"
-#: ../win32/gui/ConfigurePlugins.c:490
+#: ../win32/gui/ConfigurePlugins.c:492
msgid "Bios"
msgstr "BIOS"
-#: ../win32/gui/ConfigurePlugins.c:491
+#: ../win32/gui/ConfigurePlugins.c:493
msgid "Set Bios Directory"
msgstr "设置 BIOS 目录"
-#: ../win32/gui/ConfigurePlugins.c:492
+#: ../win32/gui/ConfigurePlugins.c:494
msgid "Set Plugins Directory"
msgstr "设置插件目录"
-#: ../win32/gui/ConfigurePlugins.c:493
-#: ../win32/gui/ConfigurePlugins.c:496
-#: ../win32/gui/ConfigurePlugins.c:499
-#: ../win32/gui/ConfigurePlugins.c:502
-#: ../win32/gui/ConfigurePlugins.c:505
-#: ../win32/gui/ConfigurePlugins.c:617
+#: ../win32/gui/ConfigurePlugins.c:495 ../win32/gui/ConfigurePlugins.c:498
+#: ../win32/gui/ConfigurePlugins.c:501 ../win32/gui/ConfigurePlugins.c:504
+#: ../win32/gui/ConfigurePlugins.c:507 ../win32/gui/ConfigurePlugins.c:619
msgid "Configure..."
msgstr "配置..."
-#: ../win32/gui/ConfigurePlugins.c:494
-#: ../win32/gui/ConfigurePlugins.c:497
-#: ../win32/gui/ConfigurePlugins.c:500
-#: ../win32/gui/ConfigurePlugins.c:503
-#: ../win32/gui/ConfigurePlugins.c:506
-#: ../win32/gui/ConfigurePlugins.c:618
+#: ../win32/gui/ConfigurePlugins.c:496 ../win32/gui/ConfigurePlugins.c:499
+#: ../win32/gui/ConfigurePlugins.c:502 ../win32/gui/ConfigurePlugins.c:505
+#: ../win32/gui/ConfigurePlugins.c:508 ../win32/gui/ConfigurePlugins.c:620
msgid "Test..."
msgstr "测试..."
-#: ../win32/gui/ConfigurePlugins.c:495
-#: ../win32/gui/ConfigurePlugins.c:498
-#: ../win32/gui/ConfigurePlugins.c:501
-#: ../win32/gui/ConfigurePlugins.c:504
-#: ../win32/gui/ConfigurePlugins.c:507
-#: ../win32/gui/ConfigurePlugins.c:619
+#: ../win32/gui/ConfigurePlugins.c:497 ../win32/gui/ConfigurePlugins.c:500
+#: ../win32/gui/ConfigurePlugins.c:503 ../win32/gui/ConfigurePlugins.c:506
+#: ../win32/gui/ConfigurePlugins.c:509 ../win32/gui/ConfigurePlugins.c:621
msgid "About..."
msgstr "关于..."
-#: ../win32/gui/ConfigurePlugins.c:612
+#: ../win32/gui/ConfigurePlugins.c:614
msgid "NetPlay Configuration"
msgstr "联网游戏配置"
-#: ../win32/gui/ConfigurePlugins.c:620
-msgid "Note: The NetPlay Plugin Directory should be the same as the other Plugins."
+#: ../win32/gui/ConfigurePlugins.c:622
+msgid ""
+"Note: The NetPlay Plugin Directory should be the same as the other Plugins."
msgstr "注意: 联网游戏插件应和其它插件放在同一目录中。"
-#: ../win32/gui/plugin.c:94
-#: ../win32/gui/WndMain.c:323
+#: ../win32/gui/plugin.c:94 ../win32/gui/WndMain.c:328
#, c-format
-msgid "*PCSX*: Saved State %d"
-msgstr "*PCSX*: Saved State %d"
+msgid "*PCSXR*: Saved State %d"
+msgstr "*PCSXR*: Saved State %d"
-#: ../win32/gui/plugin.c:95
-#: ../win32/gui/WndMain.c:324
+#: ../win32/gui/plugin.c:95 ../win32/gui/WndMain.c:329
#, c-format
-msgid "*PCSX*: Error Saving State %d"
-msgstr "*PCSX*: Error Saving State %d"
+msgid "*PCSXR*: Error Saving State %d"
+msgstr "*PCSXR*: Error Saving State %d"
-#: ../win32/gui/plugin.c:111
-#: ../win32/gui/WndMain.c:301
+#: ../win32/gui/plugin.c:111 ../win32/gui/WndMain.c:306
#, c-format
-msgid "*PCSX*: Loaded State %d"
-msgstr "*PCSX*: Loaded State %d"
+msgid "*PCSXR*: Loaded State %d"
+msgstr "*PCSXR*: Loaded State %d"
-#: ../win32/gui/plugin.c:112
-#: ../win32/gui/WndMain.c:302
+#: ../win32/gui/plugin.c:112 ../win32/gui/WndMain.c:307
#, c-format
-msgid "*PCSX*: Error Loading State %d"
-msgstr "*PCSX*: Error Loading State %d"
+msgid "*PCSXR*: Error Loading State %d"
+msgstr "*PCSXR*: Error Loading State %d"
#: ../win32/gui/plugin.c:123
#, c-format
-msgid "*PCSX*: Sio Irq Always Enabled"
-msgstr "*PCSX*: Sio Irq Always Enabled"
+msgid "*PCSXR*: Sio Irq Always Enabled"
+msgstr "*PCSXR*: Sio Irq Always Enabled"
#: ../win32/gui/plugin.c:124
#, c-format
-msgid "*PCSX*: Sio Irq Not Always Enabled"
-msgstr "*PCSX*: Sio Irq Not Always Enabled"
+msgid "*PCSXR*: Sio Irq Not Always Enabled"
+msgstr "*PCSXR*: Sio Irq Not Always Enabled"
#: ../win32/gui/plugin.c:131
#, c-format
-msgid "*PCSX*: Black&White Mdecs Only Enabled"
-msgstr "*PCSX*: Black&White Mdecs Only Enabled"
+msgid "*PCSXR*: Black&White Mdecs Only Enabled"
+msgstr "*PCSXR*: Black&White Mdecs Only Enabled"
#: ../win32/gui/plugin.c:132
#, c-format
-msgid "*PCSX*: Black&White Mdecs Only Disabled"
-msgstr "*PCSX*: Black&White Mdecs Only Disabled"
+msgid "*PCSXR*: Black&White Mdecs Only Disabled"
+msgstr "*PCSXR*: Black&White Mdecs Only Disabled"
#: ../win32/gui/plugin.c:139
#, c-format
-msgid "*PCSX*: Xa Enabled"
-msgstr "*PCSX*: Xa Enabled"
+msgid "*PCSXR*: Xa Enabled"
+msgstr "*PCSXR*: Xa Enabled"
#: ../win32/gui/plugin.c:140
#, c-format
-msgid "*PCSX*: Xa Disabled"
-msgstr "*PCSX*: Xa Disabled"
+msgid "*PCSXR*: Xa Disabled"
+msgstr "*PCSXR*: Xa Disabled"
#: ../win32/gui/plugin.c:149
-msgid "*PCSX*: CdRom Case Opened"
-msgstr "*PCSX*: CdRom Case Opened"
+msgid "*PCSXR*: CdRom Case Opened"
+msgstr "*PCSXR*: CdRom Case Opened"
#: ../win32/gui/plugin.c:155
-msgid "*PCSX*: CdRom Case Closed"
-msgstr "*PCSX*: CdRom Case Closed"
+msgid "*PCSXR*: CdRom Case Closed"
+msgstr "*PCSXR*: CdRom Case Closed"
#: ../win32/gui/plugin.c:183
msgid "Connecting..."
msgstr "正在连接..."
-#: ../win32/gui/plugin.c:185
-#: ../win32/gui/plugin.c:192
+#: ../win32/gui/plugin.c:185 ../win32/gui/plugin.c:192
#, c-format
msgid "Please wait while connecting... %c\n"
msgstr "请稍候,正在连接... %c\n"
@@ -2844,9 +2796,8 @@ msgstr "德语"
msgid "Greek"
msgstr "希腊语"
-#: ../win32/gui/WndMain.c:81
-#: ../win32/gui/WndMain.c:1659
-#: ../win32/gui/WndMain.c:1661
+#: ../win32/gui/WndMain.c:81 ../win32/gui/WndMain.c:1667
+#: ../win32/gui/WndMain.c:1669
msgid "English"
msgstr "英语"
@@ -2896,7 +2847,7 @@ msgstr "朝鲜语"
#: ../win32/gui/WndMain.c:215
msgid ""
-"Usage: pcsx [options]\n"
+"Usage: pcsxr [options]\n"
"\toptions:\n"
"\t-nogui\t\tDon't open the GUI\n"
"\t-psxout\t\tEnable PSX output\n"
@@ -2905,7 +2856,7 @@ msgid ""
"\t-cdfile FILE\tRuns a CD image file (requires -nogui)\n"
"\t-help\t\tDisplay this message"
msgstr ""
-"用法: pcsx [选项]\n"
+"用法: pcsxr [选项]\n"
"\t选项:\n"
"\t-nogui\t\t不打开 GUI\n"
"\t-psxout\t\t启用 PSX 控制台输出\n"
@@ -2914,340 +2865,394 @@ msgstr ""
"\t-cdfile FILE\t运行 CD 镜像文件 (需要 -nogui)\n"
"\t-help\t\t显示此信息"
-#: ../win32/gui/WndMain.c:342
-#: ../win32/gui/WndMain.c:388
-msgid "PCSX State Format"
-msgstr "PCSX 即时存档格式"
+#: ../win32/gui/WndMain.c:347 ../win32/gui/WndMain.c:393
+msgid "PCSXR State Format"
+msgstr "PCSXR 即时存档格式"
-#: ../win32/gui/WndMain.c:369
+#: ../win32/gui/WndMain.c:374
#, c-format
-msgid "*PCSX*: Loaded State %s"
-msgstr "*PCSX*: Loaded State %s"
+msgid "*PCSXR*: Loaded State %s"
+msgstr "*PCSXR*: Loaded State %s"
-#: ../win32/gui/WndMain.c:370
+#: ../win32/gui/WndMain.c:375
#, c-format
-msgid "*PCSX*: Error Loading State %s"
-msgstr "*PCSX*: Error Loading State %s"
+msgid "*PCSXR*: Error Loading State %s"
+msgstr "*PCSXR*: Error Loading State %s"
-#: ../win32/gui/WndMain.c:415
+#: ../win32/gui/WndMain.c:420
#, c-format
-msgid "*PCSX*: Saved State %s"
-msgstr "*PCSX*: Saved State %s"
+msgid "*PCSXR*: Saved State %s"
+msgstr "*PCSXR*: Saved State %s"
-#: ../win32/gui/WndMain.c:416
+#: ../win32/gui/WndMain.c:421
#, c-format
-msgid "*PCSX*: Error Saving State %s"
-msgstr "*PCSX*: Error Saving State %s"
+msgid "*PCSXR*: Error Saving State %s"
+msgstr "*PCSXR*: Error Saving State %s"
-#: ../win32/gui/WndMain.c:484
+#: ../win32/gui/WndMain.c:489
msgid "Running BIOS is not supported with Internal HLE Bios."
msgstr "内部 HLE BIOS 不支持直接运行。"
-#: ../win32/gui/WndMain.c:761
+#: ../win32/gui/WndMain.c:766
msgid "Game ID"
msgstr "游戏 ID"
-#: ../win32/gui/WndMain.c:767
+#: ../win32/gui/WndMain.c:772
msgid "Game"
msgstr "游戏"
-#: ../win32/gui/WndMain.c:949
+#: ../win32/gui/WndMain.c:954
msgid "mid link block"
msgstr "中间链接块"
-#: ../win32/gui/WndMain.c:952
+#: ../win32/gui/WndMain.c:957
msgid "terminiting link block"
msgstr "终止链接块"
-#: ../win32/gui/WndMain.c:1057
+#: ../win32/gui/WndMain.c:1062
msgid "Memcard Manager"
msgstr "记忆卡管理器"
-#: ../win32/gui/WndMain.c:1061
-#: ../win32/gui/WndMain.c:1064
+#: ../win32/gui/WndMain.c:1066 ../win32/gui/WndMain.c:1069
msgid "Select Mcd"
msgstr "选择"
-#: ../win32/gui/WndMain.c:1062
-#: ../win32/gui/WndMain.c:1065
+#: ../win32/gui/WndMain.c:1067 ../win32/gui/WndMain.c:1070
msgid "Format Mcd"
msgstr "格式化"
-#: ../win32/gui/WndMain.c:1063
-#: ../win32/gui/WndMain.c:1066
+#: ../win32/gui/WndMain.c:1068 ../win32/gui/WndMain.c:1071
msgid "Reload Mcd"
msgstr "重新加载"
-#: ../win32/gui/WndMain.c:1067
+#: ../win32/gui/WndMain.c:1072
msgid "-> Copy ->"
msgstr "-> 复制 ->"
-#: ../win32/gui/WndMain.c:1068
+#: ../win32/gui/WndMain.c:1073
msgid "<- Copy <-"
msgstr "<- 复制 <-"
-#: ../win32/gui/WndMain.c:1069
+#: ../win32/gui/WndMain.c:1074
msgid "Paste"
msgstr "粘贴"
-#: ../win32/gui/WndMain.c:1070
+#: ../win32/gui/WndMain.c:1075
msgid "<- Un/Delete"
msgstr "<- 删除/恢复"
-#: ../win32/gui/WndMain.c:1071
+#: ../win32/gui/WndMain.c:1076
msgid "Un/Delete ->"
msgstr "删除/恢复 ->"
-#: ../win32/gui/WndMain.c:1073
+#: ../win32/gui/WndMain.c:1078
msgid "Memory Card 1"
msgstr "记忆卡 1"
-#: ../win32/gui/WndMain.c:1074
+#: ../win32/gui/WndMain.c:1079
msgid "Memory Card 2"
msgstr "记忆卡 2"
-#: ../win32/gui/WndMain.c:1129
+#: ../win32/gui/WndMain.c:1134
msgid "Are you sure you want to paste this selection?"
msgstr "是否确认粘贴此选中内容?"
-#: ../win32/gui/WndMain.c:1129
-#: ../win32/gui/WndMain.c:1240
-#: ../win32/gui/WndMain.c:1247
+#: ../win32/gui/WndMain.c:1134 ../win32/gui/WndMain.c:1245
+#: ../win32/gui/WndMain.c:1252
msgid "Confirmation"
msgstr "确认"
-#: ../win32/gui/WndMain.c:1240
-#: ../win32/gui/WndMain.c:1247
+#: ../win32/gui/WndMain.c:1245 ../win32/gui/WndMain.c:1252
msgid "Are you sure you want to format this Memory Card?"
msgstr "是否确认格式化此记忆卡?"
-#: ../win32/gui/WndMain.c:1293
+#: ../win32/gui/WndMain.c:1298
msgid "Cpu Config"
msgstr "CPU 配置"
-#: ../win32/gui/WndMain.c:1298
+#: ../win32/gui/WndMain.c:1303
msgid "Disable Xa Decoding"
msgstr "禁用 XA 解码"
-#: ../win32/gui/WndMain.c:1299
+#: ../win32/gui/WndMain.c:1304
msgid "Sio Irq Always Enabled"
msgstr "SIO IRQ 总是启用"
-#: ../win32/gui/WndMain.c:1300
+#: ../win32/gui/WndMain.c:1305
msgid "Black && White Movies"
msgstr "黑白电影"
-#: ../win32/gui/WndMain.c:1301
+#: ../win32/gui/WndMain.c:1306
msgid "Disable Cd audio"
msgstr "禁用 CD 音频"
-#: ../win32/gui/WndMain.c:1303
+#: ../win32/gui/WndMain.c:1309
msgid "Enable Interpreter Cpu"
msgstr "启用解释执行 CPU"
-#: ../win32/gui/WndMain.c:1306
+#: ../win32/gui/WndMain.c:1312
msgid "Spu Irq Always Enabled"
msgstr "SPU IRQ 总是启用"
-#: ../win32/gui/WndMain.c:1311
+#: ../win32/gui/WndMain.c:1317
msgid "Psx System Type"
msgstr "PS 系统类型"
-#: ../win32/gui/WndMain.c:1415
+#: ../win32/gui/WndMain.c:1423
msgid "Psx Mcd Format (*.mcr;*.mc;*.mem;*.vgs;*.mcd;*.gme;*.ddf)"
msgstr "PS 记忆卡格式 (*.mcr;*.mc;*.mem;*.vgs;*.mcd;*.gme;*.ddf)"
-#: ../win32/gui/WndMain.c:1420
+#: ../win32/gui/WndMain.c:1428
msgid "Psx Memory Card (*.mcr;*.mc)"
msgstr "PS 记忆卡 (*.mcr;*.mc)"
-#: ../win32/gui/WndMain.c:1425
+#: ../win32/gui/WndMain.c:1433
msgid "CVGS Memory Card (*.mem;*.vgs)"
msgstr "VGS 记忆卡 (*.mem;*.vgs)"
-#: ../win32/gui/WndMain.c:1430
+#: ../win32/gui/WndMain.c:1438
msgid "Bleem Memory Card (*.mcd)"
msgstr "Bleem 记忆卡 (*.mcd)"
-#: ../win32/gui/WndMain.c:1435
+#: ../win32/gui/WndMain.c:1443
msgid "DexDrive Memory Card (*.gme)"
msgstr "DexDrive 记忆卡 (*.gme)"
-#: ../win32/gui/WndMain.c:1440
+#: ../win32/gui/WndMain.c:1448
msgid "DataDeck Memory Card (*.ddf)"
msgstr "DataDeck 记忆卡 (*.ddl)"
-#: ../win32/gui/WndMain.c:1484
+#: ../win32/gui/WndMain.c:1492
msgid "Psx Exe Format"
msgstr "PS EXE 格式"
-#: ../win32/gui/WndMain.c:1521
+#: ../win32/gui/WndMain.c:1529
msgid "Psx Isos (*.iso;*.mdf;*.img;*.bin)"
msgstr "PS 光盘镜像 (*.iso;*.mdf;*.img;*.bin)"
-#: ../win32/gui/WndMain.c:1597
+#: ../win32/gui/WndMain.c:1605
msgid "&File"
msgstr "文件(&F)"
-#: ../win32/gui/WndMain.c:1598
+#: ../win32/gui/WndMain.c:1606
msgid "E&xit"
msgstr "退出(&X)"
-#: ../win32/gui/WndMain.c:1600
+#: ../win32/gui/WndMain.c:1608
msgid "Run &EXE..."
msgstr "运行 &EXE..."
-#: ../win32/gui/WndMain.c:1601
+#: ../win32/gui/WndMain.c:1609
msgid "Run &BIOS"
msgstr "运行 BIOS(&B)"
-#: ../win32/gui/WndMain.c:1602
+#: ../win32/gui/WndMain.c:1610
msgid "Run &ISO..."
msgstr "运行 &ISO..."
-#: ../win32/gui/WndMain.c:1603
+#: ../win32/gui/WndMain.c:1611
msgid "Run &CD"
msgstr "运行光碟(&C)"
-#: ../win32/gui/WndMain.c:1605
+#: ../win32/gui/WndMain.c:1613
msgid "&Emulator"
msgstr "模拟器(&E)"
-#: ../win32/gui/WndMain.c:1606
+#: ../win32/gui/WndMain.c:1614
msgid "&States"
msgstr "存档(&S)"
-#: ../win32/gui/WndMain.c:1608
+#: ../win32/gui/WndMain.c:1616
msgid "S&witch ISO..."
msgstr "更换 ISO(&W)..."
-#: ../win32/gui/WndMain.c:1610
+#: ../win32/gui/WndMain.c:1618
msgid "Re&set"
msgstr "复位(&S)"
-#: ../win32/gui/WndMain.c:1611
+#: ../win32/gui/WndMain.c:1619
msgid "&Run"
msgstr "运行(&R)"
-#: ../win32/gui/WndMain.c:1612
+#: ../win32/gui/WndMain.c:1620
msgid "&Save"
msgstr "保存(&S)"
-#: ../win32/gui/WndMain.c:1613
+#: ../win32/gui/WndMain.c:1621
msgid "&Load"
msgstr "读取(&L)"
-#: ../win32/gui/WndMain.c:1614
-#: ../win32/gui/WndMain.c:1624
+#: ../win32/gui/WndMain.c:1622 ../win32/gui/WndMain.c:1632
msgid "&Other..."
msgstr "其它(&O)..."
-#: ../win32/gui/WndMain.c:1615
-#: ../win32/gui/WndMain.c:1625
+#: ../win32/gui/WndMain.c:1623 ../win32/gui/WndMain.c:1633
msgid "Slot &9"
msgstr "存档 9(&9)"
-#: ../win32/gui/WndMain.c:1616
-#: ../win32/gui/WndMain.c:1626
+#: ../win32/gui/WndMain.c:1624 ../win32/gui/WndMain.c:1634
msgid "Slot &8"
msgstr "存档 8(&8)"
-#: ../win32/gui/WndMain.c:1617
-#: ../win32/gui/WndMain.c:1627
+#: ../win32/gui/WndMain.c:1625 ../win32/gui/WndMain.c:1635
msgid "Slot &7"
msgstr "存档 7(&7)"
-#: ../win32/gui/WndMain.c:1618
-#: ../win32/gui/WndMain.c:1628
+#: ../win32/gui/WndMain.c:1626 ../win32/gui/WndMain.c:1636
msgid "Slot &6"
msgstr "存档 6(&6)"
-#: ../win32/gui/WndMain.c:1619
-#: ../win32/gui/WndMain.c:1629
+#: ../win32/gui/WndMain.c:1627 ../win32/gui/WndMain.c:1637
msgid "Slot &5"
msgstr "存档 5(&5)"
-#: ../win32/gui/WndMain.c:1620
-#: ../win32/gui/WndMain.c:1630
+#: ../win32/gui/WndMain.c:1628 ../win32/gui/WndMain.c:1638
msgid "Slot &4"
msgstr "存档 4(&4)"
-#: ../win32/gui/WndMain.c:1621
-#: ../win32/gui/WndMain.c:1631
+#: ../win32/gui/WndMain.c:1629 ../win32/gui/WndMain.c:1639
msgid "Slot &3"
msgstr "存档 3(&3)"
-#: ../win32/gui/WndMain.c:1622
-#: ../win32/gui/WndMain.c:1632
+#: ../win32/gui/WndMain.c:1630 ../win32/gui/WndMain.c:1640
msgid "Slot &2"
msgstr "存档 2(&2)"
-#: ../win32/gui/WndMain.c:1623
-#: ../win32/gui/WndMain.c:1633
+#: ../win32/gui/WndMain.c:1631 ../win32/gui/WndMain.c:1641
msgid "Slot &1"
msgstr "存档 1(&1)"
-#: ../win32/gui/WndMain.c:1635
+#: ../win32/gui/WndMain.c:1643
msgid "&Configuration"
msgstr "配置(&C)"
-#: ../win32/gui/WndMain.c:1636
+#: ../win32/gui/WndMain.c:1644
msgid "Cheat &Search..."
msgstr "查找作弊码(&S)..."
-#: ../win32/gui/WndMain.c:1637
+#: ../win32/gui/WndMain.c:1645
msgid "Ch&eat Code..."
msgstr "作弊码(&E)..."
-#: ../win32/gui/WndMain.c:1640
+#: ../win32/gui/WndMain.c:1648
msgid "&Language"
msgstr "语言(&L)"
-#: ../win32/gui/WndMain.c:1665
+#: ../win32/gui/WndMain.c:1673
msgid "&Memory cards..."
msgstr "记忆卡(&M)..."
-#: ../win32/gui/WndMain.c:1666
+#: ../win32/gui/WndMain.c:1674
msgid "C&PU..."
msgstr "C&PU..."
-#: ../win32/gui/WndMain.c:1668
+#: ../win32/gui/WndMain.c:1676
msgid "&NetPlay..."
msgstr "联网游戏(&N)..."
-#: ../win32/gui/WndMain.c:1670
+#: ../win32/gui/WndMain.c:1678
msgid "&Controllers..."
msgstr "控制器(&C)..."
-#: ../win32/gui/WndMain.c:1671
+#: ../win32/gui/WndMain.c:1679
msgid "CD-&ROM..."
msgstr "CD-&ROM..."
-#: ../win32/gui/WndMain.c:1672
+#: ../win32/gui/WndMain.c:1680
msgid "&Sound..."
msgstr "声音(&S)..."
-#: ../win32/gui/WndMain.c:1673
+#: ../win32/gui/WndMain.c:1681
msgid "&Graphics..."
msgstr "图像(&G)..."
-#: ../win32/gui/WndMain.c:1675
+#: ../win32/gui/WndMain.c:1683
msgid "&Plugins && Bios..."
msgstr "插件及 BIOS(&P)..."
-#: ../win32/gui/WndMain.c:1677
+#: ../win32/gui/WndMain.c:1685
msgid "&Help"
msgstr "帮助(&H)"
-#: ../win32/gui/WndMain.c:1678
+#: ../win32/gui/WndMain.c:1686
msgid "&About..."
msgstr "关于(&A)..."
-#: ../win32/gui/WndMain.c:1866
-msgid "Pcsx Msg"
-msgstr "PCSX 消息"
+#: ../win32/gui/WndMain.c:1874
+msgid "Pcsxr Msg"
+msgstr "PCSXR 消息"
-#: ../win32/gui/WndMain.c:1869
+#: ../win32/gui/WndMain.c:1877
msgid "Error Loading Symbol"
msgstr "无法加载符号"
+#~ msgid "<b>General</b>"
+#~ msgstr "<b>一般</b>"
+
+#~ msgid "<b>XA Music</b>"
+#~ msgstr "<b>XA 音乐</b>"
+
+#~ msgid ""
+#~ "None\n"
+#~ "Low\n"
+#~ "Medium\n"
+#~ "Loud\n"
+#~ "Loudest"
+#~ msgstr ""
+#~ "无\n"
+#~ "低\n"
+#~ "中\n"
+#~ "高\n"
+#~ "最高"
+
+#~ msgid ""
+#~ "None\n"
+#~ "Simple\n"
+#~ "Gaussian\n"
+#~ "Cubic"
+#~ msgstr ""
+#~ "无\n"
+#~ "简易\n"
+#~ "高斯\n"
+#~ "立方"
+
+#~ msgid ""
+#~ "Default\n"
+#~ "125ms\n"
+#~ "250ms\n"
+#~ "500ms\n"
+#~ "1s\n"
+#~ "2s\n"
+#~ "4s\n"
+#~ "8s\n"
+#~ "16s\n"
+#~ "32s\n"
+#~ "1min\n"
+#~ "2min\n"
+#~ "4min\n"
+#~ "8min\n"
+#~ "16min\n"
+#~ "32min"
+#~ msgstr ""
+#~ "默认\n"
+#~ "125 毫秒\n"
+#~ "250 毫秒\n"
+#~ "500 毫秒\n"
+#~ "1 秒\n"
+#~ "2 秒\n"
+#~ "4 秒\n"
+#~ "8 秒\n"
+#~ "16 秒\n"
+#~ "32 秒\n"
+#~ "1 分钟\n"
+#~ "2 分钟\n"
+#~ "4 分钟\n"
+#~ "8 分钟\n"
+#~ "16 分钟\n"
+#~ "32 分钟"
+
+#~ msgid "Select CD-ROM device"
+#~ msgstr "选择 CD-ROM 设备"
+
+#~ msgid "hseparator"
+#~ msgstr "hseparator"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 89e502f7..43dc9c34 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -1,22 +1,26 @@
# Traditional Chinese translation of pcsxr.
# Copyright (C) 2008 Wei Mingzhi
# This file is distributed under the same license as the pcsxr package.
-# Wei Mingzhi <whistler@openoffice.org>, 2008.
#
+# Wei Mingzhi <whistler@openoffice.org>, 2008.
+# Blade_Arma <edgbla@yandex.ru>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: pcsxr 1.0\n"
"Report-Msgid-Bugs-To: whistler_wmz@users.sf.net\n"
-"POT-Creation-Date: 2011-02-18 17:11+0800\n"
-"PO-Revision-Date: 2011-01-10 11:13+0800\n"
-"Last-Translator: Wei Mingzhi <whistler_wmz@users.sf.net>\n"
-"Language-Team: Traditional Chinese <whistler@openoffice.org>\n"
+"POT-Creation-Date: 2011-06-04 23:04+0400\n"
+"PO-Revision-Date: 2011-06-04 13:46+0400\n"
+"Last-Translator: Blade_Arma <edgbla@yandex.ru>\n"
+"Language-Team: Russian <kde-i18n-doc@kde.org>\n"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 1.2\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: ../data/pcsx.glade2.h:1
+#: ../data/pcsxr.glade2.h:1
msgid ""
"8-bit\n"
"16-bit\n"
@@ -26,143 +30,143 @@ msgstr ""
"16 位元\n"
"32 位元"
-#: ../data/pcsx.glade2.h:4
+#: ../data/pcsxr.glade2.h:4
msgid "<b>BIOS</b>"
msgstr "<b>BIOS</b>"
-#: ../data/pcsx.glade2.h:5
+#: ../data/pcsxr.glade2.h:5
msgid "<b>Cheat Codes</b>"
msgstr "<b>金手指碼</b>"
-#: ../data/pcsx.glade2.h:6
+#: ../data/pcsxr.glade2.h:6
msgid "<b>Cheat Search</b>"
msgstr "<b>金手指碼搜尋</b>"
-#: ../data/pcsx.glade2.h:7
+#: ../data/pcsxr.glade2.h:7
msgid "<b>Memory Card 1</b>"
msgstr "<b>記憶卡 1</b>"
-#: ../data/pcsx.glade2.h:8
+#: ../data/pcsxr.glade2.h:8
msgid "<b>Memory Card 2</b>"
msgstr "<b>記憶卡 2</b>"
-#: ../data/pcsx.glade2.h:9
+#: ../data/pcsxr.glade2.h:9
msgid "<b>NetPlay</b>"
msgstr "<b>聯線遊戲</b>"
-#: ../data/pcsx.glade2.h:10
+#: ../data/pcsxr.glade2.h:10
msgid "<b>Options</b>"
msgstr "<b>選項</b>"
-#: ../data/pcsx.glade2.h:11
+#: ../data/pcsxr.glade2.h:11
msgid "<b>Plugins</b>"
msgstr "<b>外掛</b>"
-#: ../data/pcsx.glade2.h:12
+#: ../data/pcsxr.glade2.h:12
msgid "<b>System Type</b>"
msgstr "<b>系統類型</b>"
-#: ../data/pcsx.glade2.h:13 ../gui/DebugMemory.c:188
+#: ../data/pcsxr.glade2.h:13 ../gui/DebugMemory.c:188
msgid "Address (Hexadecimal):"
msgstr "位址 (十六進制):"
-#: ../data/pcsx.glade2.h:14 ../win32/gui/WndMain.c:1302
+#: ../data/pcsxr.glade2.h:14 ../win32/gui/WndMain.c:1308
msgid "Autodetect"
msgstr "自動檢測"
-#: ../data/pcsx.glade2.h:15
+#: ../data/pcsxr.glade2.h:15
msgid "Black & White Movies"
msgstr "黑白電影"
-#: ../data/pcsx.glade2.h:16
+#: ../data/pcsxr.glade2.h:16
msgid "CD-ROM..."
msgstr "CD-ROM..."
-#: ../data/pcsx.glade2.h:17
+#: ../data/pcsxr.glade2.h:17
msgid "CD-ROM:"
msgstr "CD-ROM:"
-#: ../data/pcsx.glade2.h:18
+#: ../data/pcsxr.glade2.h:18
msgid "CD-_ROM..."
msgstr "CD-_ROM..."
-#: ../data/pcsx.glade2.h:19
+#: ../data/pcsxr.glade2.h:19
msgid "C_ontrollers..."
msgstr "控制器(_O)..."
-#: ../data/pcsx.glade2.h:20
+#: ../data/pcsxr.glade2.h:20
msgid "Chea_t"
msgstr "金手指(_T)"
-#: ../data/pcsx.glade2.h:21 ../gui/Cheat.c:1129 ../win32/gui/CheatDlg.c:678
+#: ../data/pcsxr.glade2.h:21 ../gui/Cheat.c:1129 ../win32/gui/CheatDlg.c:678
msgid "Cheat Search"
msgstr "搜尋金手指碼"
-#: ../data/pcsx.glade2.h:22
+#: ../data/pcsxr.glade2.h:22
msgid "Configure CD-ROM"
msgstr "CD-ROM 設定"
-#: ../data/pcsx.glade2.h:23
+#: ../data/pcsxr.glade2.h:23
msgid "Configure CPU"
msgstr "CPU 設定"
-#: ../data/pcsx.glade2.h:24
+#: ../data/pcsxr.glade2.h:24
msgid "Configure Controllers"
msgstr "控制器設定"
-#: ../data/pcsx.glade2.h:25
+#: ../data/pcsxr.glade2.h:25
msgid "Configure Graphics"
msgstr "圖像設定"
-#: ../data/pcsx.glade2.h:26
+#: ../data/pcsxr.glade2.h:26
msgid "Configure Memory Cards"
msgstr "記憶卡設定"
-#: ../data/pcsx.glade2.h:27
+#: ../data/pcsxr.glade2.h:27
msgid "Configure NetPlay"
msgstr "聯線遊戲設定"
-#: ../data/pcsx.glade2.h:28 ../gui/ConfDlg.c:112
-msgid "Configure PCSX"
-msgstr "設定 PCSX"
+#: ../data/pcsxr.glade2.h:28 ../gui/ConfDlg.c:112
+msgid "Configure PCSXR"
+msgstr "設定 PCSXR"
-#: ../data/pcsx.glade2.h:29 ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:6
+#: ../data/pcsxr.glade2.h:29 ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:3
msgid "Configure Sound"
msgstr "聲音設定"
-#: ../data/pcsx.glade2.h:30
+#: ../data/pcsxr.glade2.h:30
msgid "Continue Emulation"
msgstr "繼續模擬"
-#: ../data/pcsx.glade2.h:31
+#: ../data/pcsxr.glade2.h:31
msgid "Continue..."
msgstr "繼續..."
-#: ../data/pcsx.glade2.h:32
+#: ../data/pcsxr.glade2.h:32
msgid "Controller 1: "
msgstr "控制器 1:"
-#: ../data/pcsx.glade2.h:33
+#: ../data/pcsxr.glade2.h:33
msgid "Controller 2:"
msgstr "控制器 2:"
-#: ../data/pcsx.glade2.h:34
+#: ../data/pcsxr.glade2.h:34
msgid "Controllers..."
msgstr "控制器..."
-#: ../data/pcsx.glade2.h:35
+#: ../data/pcsxr.glade2.h:35
msgid "Copy"
msgstr "複制"
-#: ../data/pcsx.glade2.h:36 ../win32/gui/CheatDlg.c:683
+#: ../data/pcsxr.glade2.h:36 ../win32/gui/CheatDlg.c:683
msgid "Data Base:"
msgstr "數值基:"
-#: ../data/pcsx.glade2.h:37 ../win32/gui/CheatDlg.c:681
+#: ../data/pcsxr.glade2.h:37 ../win32/gui/CheatDlg.c:681
msgid "Data Type:"
msgstr "數值類型:"
-#: ../data/pcsx.glade2.h:38
+#: ../data/pcsxr.glade2.h:38
msgid ""
"Decimal\n"
"Hexadecimal"
@@ -170,35 +174,35 @@ msgstr ""
"十進制\n"
"十六進制"
-#: ../data/pcsx.glade2.h:40
+#: ../data/pcsxr.glade2.h:40
msgid "Disable CD Audio"
msgstr "禁用 CD 音頻"
-#: ../data/pcsx.glade2.h:41
+#: ../data/pcsxr.glade2.h:41
msgid "Disable XA Decoding"
msgstr "禁用 XA 解碼"
-#: ../data/pcsx.glade2.h:42
+#: ../data/pcsxr.glade2.h:42
msgid "E_xit"
msgstr "離開(_X)"
-#: ../data/pcsx.glade2.h:43 ../win32/gui/CheatDlg.c:166
+#: ../data/pcsxr.glade2.h:43 ../win32/gui/CheatDlg.c:166
msgid "Edit Cheat Codes"
msgstr "編輯金手指"
-#: ../data/pcsx.glade2.h:44 ../win32/gui/WndMain.c:1304
+#: ../data/pcsxr.glade2.h:44 ../win32/gui/WndMain.c:1310
msgid "Enable Console Output"
msgstr "開啟控制台輸出"
-#: ../data/pcsx.glade2.h:45 ../win32/gui/WndMain.c:1305
+#: ../data/pcsxr.glade2.h:45 ../win32/gui/WndMain.c:1311
msgid "Enable Debugger"
msgstr "開啟調試器"
-#: ../data/pcsx.glade2.h:46
+#: ../data/pcsxr.glade2.h:46
msgid "Enable Interpreter CPU"
msgstr "開啟解釋執行 CPU"
-#: ../data/pcsx.glade2.h:47
+#: ../data/pcsxr.glade2.h:47
msgid ""
"Equal Value\n"
"Not Equal Value\n"
@@ -220,43 +224,43 @@ msgstr ""
"不同\n"
"無變動"
-#: ../data/pcsx.glade2.h:56
+#: ../data/pcsxr.glade2.h:56
msgid "Format"
msgstr "格式化"
-#: ../data/pcsx.glade2.h:57 ../win32/gui/CheatDlg.c:504
+#: ../data/pcsxr.glade2.h:57 ../win32/gui/CheatDlg.c:504
msgid "Freeze"
msgstr "固定"
-#: ../data/pcsx.glade2.h:58
+#: ../data/pcsxr.glade2.h:58
msgid "Graphics..."
msgstr "圖像..."
-#: ../data/pcsx.glade2.h:59
+#: ../data/pcsxr.glade2.h:59
msgid "Graphics:"
msgstr "圖像:"
-#: ../data/pcsx.glade2.h:60 ../win32/gui/WndMain.c:1308
+#: ../data/pcsxr.glade2.h:60 ../win32/gui/WndMain.c:1314
msgid "InuYasha Sengoku Battle Fix"
msgstr "InuYasha Sengoku 戰斗修正"
-#: ../data/pcsx.glade2.h:61
+#: ../data/pcsxr.glade2.h:61
msgid "Memcards..."
msgstr "記憶卡..."
-#: ../data/pcsx.glade2.h:62 ../gui/DebugMemory.c:103
+#: ../data/pcsxr.glade2.h:62 ../gui/DebugMemory.c:103
msgid "Memory Dump"
msgstr "記憶體轉儲"
-#: ../data/pcsx.glade2.h:63
+#: ../data/pcsxr.glade2.h:63
msgid "Memory _Dump"
msgstr "記憶體轉儲(_D)"
-#: ../data/pcsx.glade2.h:64 ../win32/gui/CheatDlg.c:595
+#: ../data/pcsxr.glade2.h:64 ../win32/gui/CheatDlg.c:595
msgid "Modify"
msgstr "更改"
-#: ../data/pcsx.glade2.h:65
+#: ../data/pcsxr.glade2.h:65
msgid ""
"NTSC\n"
"PAL"
@@ -264,225 +268,229 @@ msgstr ""
"NTSC\n"
"PAL"
-#: ../data/pcsx.glade2.h:67
+#: ../data/pcsxr.glade2.h:67
msgid "New"
msgstr "新增"
-#: ../data/pcsx.glade2.h:68
-msgid "PCSX"
-msgstr "PCSX"
+#: ../data/pcsxr.glade2.h:68
+msgid "PCSXR"
+msgstr "PCSXR"
-#: ../data/pcsx.glade2.h:69 ../win32/gui/WndMain.c:1307
+#: ../data/pcsxr.glade2.h:69 ../win32/gui/WndMain.c:1313
msgid "Parasite Eve 2, Vandal Hearts 1/2 Fix"
msgstr "Parasite Eve 2, Vandal Hearts 1/2 修正"
-#: ../data/pcsx.glade2.h:70
+#: ../data/pcsxr.glade2.h:70
msgid "Patch Memory..."
msgstr "修改記憶體..."
-#: ../data/pcsx.glade2.h:71
+#: ../data/pcsxr.glade2.h:71
msgid "Raw Dump..."
msgstr "Raw 轉儲..."
-#: ../data/pcsx.glade2.h:72
+#: ../data/pcsxr.glade2.h:72
msgid "Restart"
msgstr "重新開始"
-#: ../data/pcsx.glade2.h:73
+#: ../data/pcsxr.glade2.h:73
msgid "Run CD"
msgstr "執行光碟"
-#: ../data/pcsx.glade2.h:74
+#: ../data/pcsxr.glade2.h:74
msgid "Run ISO Image"
msgstr "執行 ISO 光碟映像"
-#: ../data/pcsx.glade2.h:75
+#: ../data/pcsxr.glade2.h:75
msgid "Run ISO..."
msgstr "執行 ISO..."
-#: ../data/pcsx.glade2.h:76
+#: ../data/pcsxr.glade2.h:76
msgid "Run _BIOS"
msgstr "執行 _BIOS"
-#: ../data/pcsx.glade2.h:77
+#: ../data/pcsxr.glade2.h:77
msgid "Run _CD"
msgstr "執行光碟(_C)"
-#: ../data/pcsx.glade2.h:78
+#: ../data/pcsxr.glade2.h:78
msgid "Run _EXE..."
msgstr "執行 _EXE..."
-#: ../data/pcsx.glade2.h:79
+#: ../data/pcsxr.glade2.h:79
msgid "Run _ISO..."
msgstr "執行 _ISO..."
-#: ../data/pcsx.glade2.h:80 ../gui/Plugin.c:239
+#: ../data/pcsxr.glade2.h:80 ../gui/Plugin.c:239
#, c-format
msgid "SIO IRQ Always Enabled"
msgstr "SIO IRQ 總是開啟"
-#: ../data/pcsx.glade2.h:81
+#: ../data/pcsxr.glade2.h:81
msgid "SPU IRQ Always Enabled"
msgstr "SPU IRQ 總是開啟"
-#: ../data/pcsx.glade2.h:82
+#: ../data/pcsxr.glade2.h:82
msgid "S_witch ISO..."
msgstr "更換 ISO(_W)"
-#: ../data/pcsx.glade2.h:83
+#: ../data/pcsxr.glade2.h:83
msgid "Search"
msgstr "搜尋"
-#: ../data/pcsx.glade2.h:84 ../win32/gui/CheatDlg.c:680
+#: ../data/pcsxr.glade2.h:84 ../win32/gui/CheatDlg.c:680
msgid "Search For:"
msgstr "搜尋:"
-#: ../data/pcsx.glade2.h:85
+#: ../data/pcsxr.glade2.h:85
msgid "Search in:"
msgstr "在此處檢索外掛:"
-#: ../data/pcsx.glade2.h:86
+#: ../data/pcsxr.glade2.h:86
msgid "Select Folder to Search"
msgstr "選擇要檢索的資料夾"
-#: ../data/pcsx.glade2.h:87
+#: ../data/pcsxr.glade2.h:87
msgid "Slot _1"
msgstr "記錄 _1"
-#: ../data/pcsx.glade2.h:88
+#: ../data/pcsxr.glade2.h:88
msgid "Slot _2"
msgstr "記錄 _2"
-#: ../data/pcsx.glade2.h:89
+#: ../data/pcsxr.glade2.h:89
msgid "Slot _3"
msgstr "記錄 _3"
-#: ../data/pcsx.glade2.h:90
+#: ../data/pcsxr.glade2.h:90
msgid "Slot _4"
msgstr "記錄 _4"
-#: ../data/pcsx.glade2.h:91
+#: ../data/pcsxr.glade2.h:91
msgid "Slot _5"
msgstr "記錄 _5"
-#: ../data/pcsx.glade2.h:92
+#: ../data/pcsxr.glade2.h:92
msgid "Slot _6"
msgstr "記錄 _6"
-#: ../data/pcsx.glade2.h:93
+#: ../data/pcsxr.glade2.h:93
msgid "Slot _7"
msgstr "記錄 _7"
-#: ../data/pcsx.glade2.h:94
+#: ../data/pcsxr.glade2.h:94
msgid "Slot _8"
msgstr "記錄 _8"
-#: ../data/pcsx.glade2.h:95
+#: ../data/pcsxr.glade2.h:95
msgid "Slot _9"
msgstr "記錄 _9"
-#: ../data/pcsx.glade2.h:96
+#: ../data/pcsxr.glade2.h:96 ../win32/gui/WndMain.c:1307
+msgid "Slow Boot"
+msgstr ""
+
+#: ../data/pcsxr.glade2.h:97
msgid "Sound..."
msgstr "聲音..."
-#: ../data/pcsx.glade2.h:97
+#: ../data/pcsxr.glade2.h:98
msgid "Sound:"
msgstr "聲音:"
-#: ../data/pcsx.glade2.h:98
+#: ../data/pcsxr.glade2.h:99
msgid "Switch ISO Image"
msgstr "更換 ISO 光碟映像"
-#: ../data/pcsx.glade2.h:99
+#: ../data/pcsxr.glade2.h:100
msgid "Switch ISO..."
msgstr "更換 ISO..."
-#: ../data/pcsx.glade2.h:100 ../win32/gui/CheatDlg.c:684
+#: ../data/pcsxr.glade2.h:101 ../win32/gui/CheatDlg.c:684
msgid "To:"
msgstr "至:"
-#: ../data/pcsx.glade2.h:101
+#: ../data/pcsxr.glade2.h:102
msgid "Un/Delete"
msgstr "刪除/恢複"
-#: ../data/pcsx.glade2.h:102 ../gui/Cheat.c:647 ../win32/gui/CheatDlg.c:506
+#: ../data/pcsxr.glade2.h:103 ../gui/Cheat.c:647 ../win32/gui/CheatDlg.c:506
#: ../win32/gui/CheatDlg.c:597 ../win32/gui/CheatDlg.c:682
msgid "Value:"
msgstr "值:"
-#: ../data/pcsx.glade2.h:103
-msgid "_About PCSX..."
-msgstr "關於 PCSX(_A)..."
+#: ../data/pcsxr.glade2.h:104
+msgid "_About PCSXR..."
+msgstr "關於 PCSXR(_A)..."
-#: ../data/pcsx.glade2.h:104
+#: ../data/pcsxr.glade2.h:105
msgid "_Browse..."
msgstr "檢視(_B)..."
-#: ../data/pcsx.glade2.h:105
+#: ../data/pcsxr.glade2.h:106
msgid "_CPU..."
msgstr "_CPU..."
-#: ../data/pcsx.glade2.h:106
+#: ../data/pcsxr.glade2.h:107
msgid "_Configuration"
msgstr "設定(_C)"
-#: ../data/pcsx.glade2.h:107
+#: ../data/pcsxr.glade2.h:108
msgid "_Continue"
msgstr "繼續(_C)"
-#: ../data/pcsx.glade2.h:108
+#: ../data/pcsxr.glade2.h:109
msgid "_Emulator"
msgstr "模擬器(_E)"
-#: ../data/pcsx.glade2.h:109
+#: ../data/pcsxr.glade2.h:110
msgid "_File"
msgstr "檔案(_F)"
-#: ../data/pcsx.glade2.h:110
+#: ../data/pcsxr.glade2.h:111
msgid "_Graphics..."
msgstr "圖像(_G)..."
-#: ../data/pcsx.glade2.h:111
+#: ../data/pcsxr.glade2.h:112
msgid "_Help"
msgstr "說明(_H)"
-#: ../data/pcsx.glade2.h:112
+#: ../data/pcsxr.glade2.h:113
msgid "_Load State"
msgstr "讀取記錄(_L)"
-#: ../data/pcsx.glade2.h:113
+#: ../data/pcsxr.glade2.h:114
msgid "_Memory Cards..."
msgstr "記憶卡(_M)..."
-#: ../data/pcsx.glade2.h:114
+#: ../data/pcsxr.glade2.h:115
msgid "_Netplay..."
msgstr "聯線遊戲(_N)..."
-#: ../data/pcsx.glade2.h:115
+#: ../data/pcsxr.glade2.h:116
msgid "_Other..."
msgstr "其它(_O)..."
-#: ../data/pcsx.glade2.h:116
+#: ../data/pcsxr.glade2.h:117
msgid "_Plugins & BIOS..."
msgstr "外掛及 BIOS(_P)..."
-#: ../data/pcsx.glade2.h:117
+#: ../data/pcsxr.glade2.h:118
msgid "_Reset"
msgstr "複位(_R)"
-#: ../data/pcsx.glade2.h:118
+#: ../data/pcsxr.glade2.h:119
msgid "_Save State"
msgstr "存儲記錄(_S)"
-#: ../data/pcsx.glade2.h:119
+#: ../data/pcsxr.glade2.h:120
msgid "_Search..."
msgstr "搜尋(_S)..."
-#: ../data/pcsx.glade2.h:120
+#: ../data/pcsxr.glade2.h:121
msgid "_Sound..."
msgstr "聲音(_S)..."
-#: ../data/pcsx.glade2.h:121
+#: ../data/pcsxr.glade2.h:122
msgid "label_resultsfound"
msgstr "label_resultsfound"
@@ -490,11 +498,11 @@ msgstr "label_resultsfound"
msgid ""
"(C) 1999-2003 PCSX Team\n"
"(C) 2005-2009 PCSX-df Team\n"
-"(C) 2009-2010 PCSX-Reloaded Team"
+"(C) 2009-2011 PCSX-Reloaded Team"
msgstr ""
"(C) 1999-2003 PCSX 開發組\n"
"(C) 2005-2009 PCSX-df 開發組\n"
-"(C) 2009-2010 PCSX-Reloaded 開發組"
+"(C) 2009-2010 PCSX-Reloaded 開發組 "
#: ../gui/AboutDlg.c:77
msgid ""
@@ -547,8 +555,8 @@ msgstr "金手指描述:"
msgid "Cheat Code:"
msgstr "金手指碼:"
-#: ../gui/Cheat.c:155 ../gui/Cheat.c:251 ../gui/LnxMain.c:422
-#: ../win32/gui/ConfigurePlugins.c:305
+#: ../gui/Cheat.c:155 ../gui/Cheat.c:251 ../gui/LnxMain.c:421
+#: ../win32/gui/ConfigurePlugins.c:307
msgid "Error"
msgstr "錯誤"
@@ -566,11 +574,11 @@ msgid "Open Cheat File"
msgstr "打開金手指檔"
#: ../gui/Cheat.c:316 ../gui/Cheat.c:356
-msgid "PCSX Cheat Code Files (*.cht)"
-msgstr "PCSX 金手指檔 (*.cht)"
+msgid "PCSXR Cheat Code Files (*.cht)"
+msgstr "PCSXR 金手指檔 (*.cht)"
#: ../gui/Cheat.c:321 ../gui/Gtk2Gui.c:446 ../gui/Gtk2Gui.c:587
-#: ../win32/gui/WndMain.c:1445 ../win32/gui/WndMain.c:1526
+#: ../win32/gui/WndMain.c:1453 ../win32/gui/WndMain.c:1534
msgid "All Files"
msgstr "所有檔案"
@@ -672,7 +680,7 @@ msgstr "無法開啟 BIOS 目錄: \"%s\"\n"
msgid "Could not open directory: '%s'\n"
msgstr "無法開啟目錄: \"%s\"\n"
-#. The BIOS list always contains the PCSX internal BIOS
+#. The BIOS list always contains the PCSXR internal BIOS
#: ../gui/ConfDlg.c:675
msgid "Simulate PSX BIOS"
msgstr "模擬 PS BIOS"
@@ -742,14 +750,14 @@ msgstr "此文件不是一個合法的 PlayStation 執行檔"
msgid "CD ROM failed"
msgstr "CD-ROM 失敗"
-#: ../gui/Gtk2Gui.c:508 ../gui/Gtk2Gui.c:649 ../win32/gui/WndMain.c:464
-#: ../win32/gui/WndMain.c:516 ../win32/gui/WndMain.c:585
+#: ../gui/Gtk2Gui.c:508 ../gui/Gtk2Gui.c:649 ../win32/gui/WndMain.c:469
+#: ../win32/gui/WndMain.c:521 ../win32/gui/WndMain.c:590
#, c-format
msgid "The CD does not appear to be a valid Playstation CD"
msgstr "此光碟不是一張合法的 PlayStation 光碟。"
-#: ../gui/Gtk2Gui.c:519 ../gui/Gtk2Gui.c:660 ../win32/gui/WndMain.c:474
-#: ../win32/gui/WndMain.c:526 ../win32/gui/WndMain.c:595
+#: ../gui/Gtk2Gui.c:519 ../gui/Gtk2Gui.c:660 ../win32/gui/WndMain.c:479
+#: ../win32/gui/WndMain.c:531 ../win32/gui/WndMain.c:600
#, c-format
msgid "Could not load CD-ROM!"
msgstr "無法加載光碟!"
@@ -807,14 +815,14 @@ msgstr "警告"
msgid "Creating memory card: %s\n"
msgstr "創建記憶卡: %s\n"
-#: ../gui/LnxMain.c:329
+#: ../gui/LnxMain.c:328
msgid ""
-" pcsx [options] [file]\n"
+" pcsxr [options] [file]\n"
"\toptions:\n"
"\t-runcd\t\tRuns CD-ROM\n"
"\t-cdfile FILE\tRuns a CD image file\n"
"\t-nogui\t\tDon't open the GTK GUI\n"
-"\t-cfg FILE\tLoads desired configuration file (default: ~/.pcsx/pcsx.cfg)\n"
+"\t-cfg FILE\tLoads desired configuration file (default: ~/.pcsxr/pcsxr.cfg)\n"
"\t-psxout\t\tEnable PSX output\n"
"\t-slowboot\tEnable BIOS Logo\n"
"\t-load STATENUM\tLoads savestate STATENUM (1-9)\n"
@@ -822,23 +830,23 @@ msgid ""
"\tfile\t\tLoads file\n"
msgstr ""
-#: ../gui/LnxMain.c:366
+#: ../gui/LnxMain.c:365
#, c-format
msgid ""
-"PCSX cannot be configured without using the GUI -- you should restart "
+"PCSXR cannot be configured without using the GUI -- you should restart "
"without -nogui.\n"
-msgstr "PCSX 不能在字符界面下設定 -- 請不使用 -nogui 參數重新啟動程式\n"
+msgstr "PCSXR 不能在字符界面下設定 -- 請不使用 -nogui 參數重新啟動程式\n"
-#: ../gui/LnxMain.c:422
+#: ../gui/LnxMain.c:421
msgid "Failed loading plugins!"
msgstr "外掛加載失敗"
-#: ../gui/LnxMain.c:441
+#: ../gui/LnxMain.c:440
#, c-format
msgid "Could not load CD-ROM!\n"
msgstr "無法加載光碟。\n"
-#: ../gui/LnxMain.c:472
+#: ../gui/LnxMain.c:471
#, c-format
msgid "PSX emulator couldn't be initialized.\n"
msgstr "PS 模擬器無法初期化。\n"
@@ -847,11 +855,11 @@ msgstr "PS 模擬器無法初期化。\n"
msgid "Icon"
msgstr "圖符"
-#: ../gui/MemcardDlg.c:66 ../win32/gui/WndMain.c:749
+#: ../gui/MemcardDlg.c:66 ../win32/gui/WndMain.c:754
msgid "Title"
msgstr "標題"
-#: ../gui/MemcardDlg.c:72 ../win32/gui/WndMain.c:755
+#: ../gui/MemcardDlg.c:72 ../win32/gui/WndMain.c:760
msgid "Status"
msgstr "狀態"
@@ -863,17 +871,17 @@ msgstr "ID"
msgid "Name"
msgstr "名稱"
-#: ../gui/MemcardDlg.c:192 ../gui/MemcardDlg.c:297 ../win32/gui/WndMain.c:960
+#: ../gui/MemcardDlg.c:192 ../gui/MemcardDlg.c:297 ../win32/gui/WndMain.c:965
msgid "Deleted"
msgstr "已刪除"
#: ../gui/MemcardDlg.c:194 ../gui/MemcardDlg.c:198 ../gui/MemcardDlg.c:299
-#: ../gui/MemcardDlg.c:303 ../win32/gui/WndMain.c:961
-#: ../win32/gui/WndMain.c:964
+#: ../gui/MemcardDlg.c:303 ../win32/gui/WndMain.c:966
+#: ../win32/gui/WndMain.c:969
msgid "Free"
msgstr "空閑"
-#: ../gui/MemcardDlg.c:196 ../gui/MemcardDlg.c:301 ../win32/gui/WndMain.c:963
+#: ../gui/MemcardDlg.c:196 ../gui/MemcardDlg.c:301 ../win32/gui/WndMain.c:968
msgid "Used"
msgstr "已使用"
@@ -1128,23 +1136,23 @@ msgstr "SIO1 外掛初始化錯誤: %d"
msgid "Plugins loaded.\n"
msgstr "外掛已加載。\n"
-#: ../libpcsxcore/ppf.c:217
+#: ../libpcsxcore/ppf.c:219
#, c-format
msgid "Invalid PPF patch: %s.\n"
msgstr "無效 PPF 補丁: %s。\n"
-#: ../libpcsxcore/ppf.c:293
+#: ../libpcsxcore/ppf.c:295
#, c-format
msgid "Unsupported PPF version (%d).\n"
msgstr "不支援的 PPF 補丁版本 (%d)。\n"
#. build address array
-#: ../libpcsxcore/ppf.c:332
+#: ../libpcsxcore/ppf.c:334
#, c-format
msgid "Loaded PPF %d.0 patch: %s.\n"
msgstr "已加載 PPF %d.0 補丁: %s。\n"
-#: ../libpcsxcore/ppf.c:377
+#: ../libpcsxcore/ppf.c:381
#, fuzzy, c-format
msgid "Loaded SBI file: %s.\n"
msgstr "已加載 CD 映像: %s"
@@ -1160,29 +1168,29 @@ msgstr "無法開啟 BIOS: \"%s\"。使用內部 HLE Bios。\n"
#: ../libpcsxcore/r3000a.c:34
#, c-format
-msgid "Running PCSX Version %s (%s).\n"
-msgstr "PCSX 版本 %s (%s) 執行中。\n"
+msgid "Running PCSXR Version %s (%s).\n"
+msgstr "PCSXR 版本 %s (%s) 執行中。\n"
-#: ../libpcsxcore/sio.c:839
+#: ../libpcsxcore/sio.c:843
msgid "Connection closed!\n"
msgstr "連線被關閉!\n"
-#: ../libpcsxcore/sio.c:872
+#: ../libpcsxcore/sio.c:876
#, c-format
msgid "No memory card value was specified - creating a default card %s\n"
msgstr "未指定記憶卡 - 創建一個新的記憶卡 %s\n"
-#: ../libpcsxcore/sio.c:876
+#: ../libpcsxcore/sio.c:880
#, c-format
msgid "The memory card %s doesn't exist - creating it\n"
msgstr "記憶卡 %s 不存在 - 正在創建\n"
-#: ../libpcsxcore/sio.c:892
+#: ../libpcsxcore/sio.c:896
#, c-format
msgid "Memory card %s failed to load!\n"
msgstr "記憶卡 %s 讀取失敗!\n"
-#: ../libpcsxcore/sio.c:896
+#: ../libpcsxcore/sio.c:900
#, c-format
msgid "Loading memory card %s\n"
msgstr "正在加載記憶卡 %s\n"
@@ -1195,261 +1203,285 @@ msgstr "CD-ROM 裝置讀取外掛"
msgid "CDR NULL Plugin"
msgstr "CDR NULL 外掛"
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:1
-#: ../plugins/dfcdrom/cdrcfg-0.1df/main.c:219
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:1
+msgid "125ms"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:2
+msgid "16min"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:3
+msgid "16s"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:4
+msgid "1min"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:5
+msgid "1s"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:6
+msgid "250ms"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:7
+msgid "2min"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:8
+msgid "2s"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:9
+msgid "32min"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:10
+msgid "32s"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:11
+msgid "4min"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:12
+msgid "4s"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:13
+msgid "500ms"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:14
+msgid "8min"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:15
+msgid "8s"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:16
+#: ../plugins/dfcdrom/cdrcfg-0.1df/main.c:206
msgid "CDR configuration"
msgstr "CDR 設定"
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:2
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:17
msgid "Cache Size (Def. 64):"
msgstr "快取大小 (缺省 64):"
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:3
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:18
msgid "Cdrom Speed (Def. 0 = MAX):"
msgstr "Cdrom 速度 (缺省 0 = 最快):"
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:4
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:19
msgid "Choose your CD-ROM device or type its path if it's not listed"
msgstr "選擇 CD-ROM 裝置,如未列出請輸入其路徑"
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:5
-msgid ""
-"Default\n"
-"125ms\n"
-"250ms\n"
-"500ms\n"
-"1s\n"
-"2s\n"
-"4s\n"
-"8s\n"
-"16s\n"
-"32s\n"
-"1min\n"
-"2min\n"
-"4min\n"
-"8min\n"
-"16min\n"
-"32min"
-msgstr ""
-"缺省\n"
-"125 毫秒\n"
-"250 毫秒\n"
-"500 毫秒\n"
-"1 秒\n"
-"2 秒\n"
-"4 秒\n"
-"8 秒\n"
-"16 秒\n"
-"32 秒\n"
-"1 分鐘\n"
-"2 分鐘\n"
-"4 分鐘\n"
-"8 分鐘\n"
-"16 分鐘\n"
-"32 分鐘"
-
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:21
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:20
+msgid "Default"
+msgstr ""
+
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:21
msgid "Enable subchannel read"
msgstr "開啟子通道讀取"
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:22
-msgid ""
-"Normal (No Cache)\n"
-"Threaded - Faster (With Cache)"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:22
+msgid "Normal (No Cache)"
msgstr ""
-"正常 (無快取)\n"
-"多執行緒 - 較快 (使用快取)"
-
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:24
-#: ../plugins/dfinput/dfinput.ui.h:8 ../win32/gui/WndMain.c:1310
-msgid "Options"
-msgstr "選項"
-
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:25
-msgid "Select CD-ROM device"
-msgstr "選擇 CD-ROM 裝置"
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:26
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:23
msgid "Select read mode:"
msgstr "選擇讀取模式:"
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:27
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:24
msgid "Spindown Time:"
msgstr "電機停轉時限:"
-#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2.h:28
-msgid "hseparator"
-msgstr "hseparator"
+#: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.ui.h:25
+#, fuzzy
+msgid "Threaded - Faster (With Cache)"
+msgstr ""
+"正常 (無快取)\n"
+"多執行緒 - 較快 (使用快取)"
-#: ../plugins/dfinput/cfg-gtk2.c:48
+#: ../plugins/dfinput/cfg-gtk2.c:49
msgid "D-Pad Up"
msgstr "上方向鍵"
-#: ../plugins/dfinput/cfg-gtk2.c:49
+#: ../plugins/dfinput/cfg-gtk2.c:50
msgid "D-Pad Down"
msgstr "下方向鍵"
-#: ../plugins/dfinput/cfg-gtk2.c:50
+#: ../plugins/dfinput/cfg-gtk2.c:51
msgid "D-Pad Left"
msgstr "左方向鍵"
-#: ../plugins/dfinput/cfg-gtk2.c:51
+#: ../plugins/dfinput/cfg-gtk2.c:52
msgid "D-Pad Right"
msgstr "右方向鍵"
-#: ../plugins/dfinput/cfg-gtk2.c:52
+#: ../plugins/dfinput/cfg-gtk2.c:53
msgid "Cross"
msgstr "叉號鍵"
-#: ../plugins/dfinput/cfg-gtk2.c:53
+#: ../plugins/dfinput/cfg-gtk2.c:54
msgid "Circle"
msgstr "圓圈鍵"
-#: ../plugins/dfinput/cfg-gtk2.c:54
+#: ../plugins/dfinput/cfg-gtk2.c:55
msgid "Square"
msgstr "方塊鍵"
-#: ../plugins/dfinput/cfg-gtk2.c:55
+#: ../plugins/dfinput/cfg-gtk2.c:56
msgid "Triangle"
msgstr "三角鍵"
-#: ../plugins/dfinput/cfg-gtk2.c:56
+#: ../plugins/dfinput/cfg-gtk2.c:57
msgid "L1"
msgstr "L1"
-#: ../plugins/dfinput/cfg-gtk2.c:57
+#: ../plugins/dfinput/cfg-gtk2.c:58
msgid "R1"
msgstr "R1"
-#: ../plugins/dfinput/cfg-gtk2.c:58
+#: ../plugins/dfinput/cfg-gtk2.c:59
msgid "L2"
msgstr "L2"
-#: ../plugins/dfinput/cfg-gtk2.c:59
+#: ../plugins/dfinput/cfg-gtk2.c:60
msgid "R2"
msgstr "R2"
-#: ../plugins/dfinput/cfg-gtk2.c:60
+#: ../plugins/dfinput/cfg-gtk2.c:61
msgid "Select"
msgstr "選擇鍵"
-#: ../plugins/dfinput/cfg-gtk2.c:61
+#: ../plugins/dfinput/cfg-gtk2.c:62
msgid "Start"
msgstr "開始鍵"
-#: ../plugins/dfinput/cfg-gtk2.c:62
+#: ../plugins/dfinput/cfg-gtk2.c:63
msgid "L3"
msgstr "L3"
-#: ../plugins/dfinput/cfg-gtk2.c:63
+#: ../plugins/dfinput/cfg-gtk2.c:64
msgid "R3"
msgstr "R3"
-#: ../plugins/dfinput/cfg-gtk2.c:67
+#: ../plugins/dfinput/cfg-gtk2.c:65
+#, fuzzy
+msgid "Analog"
+msgstr "類比手把"
+
+#: ../plugins/dfinput/cfg-gtk2.c:69
msgid "L-Stick Right"
msgstr "左搖桿右方向"
-#: ../plugins/dfinput/cfg-gtk2.c:68
+#: ../plugins/dfinput/cfg-gtk2.c:70
msgid "L-Stick Left"
msgstr "左搖桿左方向"
-#: ../plugins/dfinput/cfg-gtk2.c:69
+#: ../plugins/dfinput/cfg-gtk2.c:71
msgid "L-Stick Down"
msgstr "左搖桿下方向"
-#: ../plugins/dfinput/cfg-gtk2.c:70
+#: ../plugins/dfinput/cfg-gtk2.c:72
msgid "L-Stick Up"
msgstr "左搖桿上方向"
-#: ../plugins/dfinput/cfg-gtk2.c:71
+#: ../plugins/dfinput/cfg-gtk2.c:73
msgid "R-Stick Right"
msgstr "右搖桿右方向"
-#: ../plugins/dfinput/cfg-gtk2.c:72
+#: ../plugins/dfinput/cfg-gtk2.c:74
msgid "R-Stick Left"
msgstr "右搖桿左方向"
-#: ../plugins/dfinput/cfg-gtk2.c:73
+#: ../plugins/dfinput/cfg-gtk2.c:75
msgid "R-Stick Down"
msgstr "右搖桿下方向"
-#: ../plugins/dfinput/cfg-gtk2.c:74
+#: ../plugins/dfinput/cfg-gtk2.c:76
msgid "R-Stick Up"
msgstr "右搖桿上方向"
-#: ../plugins/dfinput/cfg-gtk2.c:100 ../plugins/dfinput/cfg-gtk2.c:139
+#: ../plugins/dfinput/cfg-gtk2.c:102 ../plugins/dfinput/cfg-gtk2.c:141
msgid "Centered"
msgstr "居中"
-#: ../plugins/dfinput/cfg-gtk2.c:100 ../plugins/dfinput/cfg-gtk2.c:139
+#: ../plugins/dfinput/cfg-gtk2.c:102 ../plugins/dfinput/cfg-gtk2.c:141
msgid "Up"
msgstr "上"
-#: ../plugins/dfinput/cfg-gtk2.c:100 ../plugins/dfinput/cfg-gtk2.c:139
+#: ../plugins/dfinput/cfg-gtk2.c:102 ../plugins/dfinput/cfg-gtk2.c:141
msgid "Right"
msgstr "右"
-#: ../plugins/dfinput/cfg-gtk2.c:100 ../plugins/dfinput/cfg-gtk2.c:139
+#: ../plugins/dfinput/cfg-gtk2.c:102 ../plugins/dfinput/cfg-gtk2.c:141
msgid "Rightup"
msgstr "右上"
-#: ../plugins/dfinput/cfg-gtk2.c:101 ../plugins/dfinput/cfg-gtk2.c:140
+#: ../plugins/dfinput/cfg-gtk2.c:103 ../plugins/dfinput/cfg-gtk2.c:142
msgid "Down"
msgstr "下"
-#: ../plugins/dfinput/cfg-gtk2.c:101 ../plugins/dfinput/cfg-gtk2.c:140
+#: ../plugins/dfinput/cfg-gtk2.c:103 ../plugins/dfinput/cfg-gtk2.c:142
msgid "Rightdown"
msgstr "右下"
-#: ../plugins/dfinput/cfg-gtk2.c:101 ../plugins/dfinput/cfg-gtk2.c:140
+#: ../plugins/dfinput/cfg-gtk2.c:103 ../plugins/dfinput/cfg-gtk2.c:142
msgid "Left"
msgstr "左"
-#: ../plugins/dfinput/cfg-gtk2.c:101 ../plugins/dfinput/cfg-gtk2.c:140
+#: ../plugins/dfinput/cfg-gtk2.c:103 ../plugins/dfinput/cfg-gtk2.c:142
msgid "Leftup"
msgstr "左上"
-#: ../plugins/dfinput/cfg-gtk2.c:102 ../plugins/dfinput/cfg-gtk2.c:141
+#: ../plugins/dfinput/cfg-gtk2.c:104 ../plugins/dfinput/cfg-gtk2.c:143
msgid "Leftdown"
msgstr "左下"
-#: ../plugins/dfinput/cfg-gtk2.c:106 ../plugins/dfinput/cfg-gtk2.c:145
+#: ../plugins/dfinput/cfg-gtk2.c:108 ../plugins/dfinput/cfg-gtk2.c:147
#, c-format
msgid "Joystick: Button %d"
msgstr "手把: 按鈕 %d"
-#: ../plugins/dfinput/cfg-gtk2.c:110 ../plugins/dfinput/cfg-gtk2.c:149
+#: ../plugins/dfinput/cfg-gtk2.c:112 ../plugins/dfinput/cfg-gtk2.c:151
#, c-format
msgid "Joystick: Axis %d%c"
msgstr "手把: 軸 %d%c"
-#: ../plugins/dfinput/cfg-gtk2.c:115 ../plugins/dfinput/cfg-gtk2.c:154
+#: ../plugins/dfinput/cfg-gtk2.c:117 ../plugins/dfinput/cfg-gtk2.c:156
#, c-format
msgid "Joystick: Hat %d %s"
msgstr "手把: Hat %d %s"
-#: ../plugins/dfinput/cfg-gtk2.c:130 ../plugins/dfinput/cfg-gtk2.c:169
+#: ../plugins/dfinput/cfg-gtk2.c:132 ../plugins/dfinput/cfg-gtk2.c:171
msgid "Keyboard:"
msgstr "鍵盤:"
-#: ../plugins/dfinput/cfg-gtk2.c:134 ../plugins/dfinput/cfg-gtk2.c:173
+#: ../plugins/dfinput/cfg-gtk2.c:136 ../plugins/dfinput/cfg-gtk2.c:175
msgid "(Not Set)"
msgstr "(未設定)"
-#: ../plugins/dfinput/cfg-gtk2.c:542
+#: ../plugins/dfinput/cfg-gtk2.c:562
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:13
#: ../plugins/peopsxgl/gpucfg/peopsxgl.ui.h:55
msgid "None"
msgstr "無"
-#: ../plugins/dfinput/cfg-gtk2.c:584
+#: ../plugins/dfinput/cfg-gtk2.c:604
msgid "Gamepad/Keyboard Input Configuration"
msgstr "手把/鍵盤輸入設定"
-#: ../plugins/dfinput/cfg-gtk2.c:590 ../plugins/dfinput/cfg-gtk2.c:610
+#: ../plugins/dfinput/cfg-gtk2.c:610 ../plugins/dfinput/cfg-gtk2.c:630
msgid "Key"
msgstr "按鍵"
-#: ../plugins/dfinput/cfg-gtk2.c:596 ../plugins/dfinput/cfg-gtk2.c:616
+#: ../plugins/dfinput/cfg-gtk2.c:616 ../plugins/dfinput/cfg-gtk2.c:636
msgid "Button"
msgstr "按鈕"
@@ -1478,19 +1510,28 @@ msgid "Digital Pad"
msgstr "普通手把"
#: ../plugins/dfinput/dfinput.ui.h:7
+msgid "Mouse"
+msgstr ""
+
+#: ../plugins/dfinput/dfinput.ui.h:8
msgid "Multi-Threaded (Recommended)"
msgstr "多執行緒 (建議使用)"
-#: ../plugins/dfinput/dfinput.ui.h:9
+#: ../plugins/dfinput/dfinput.ui.h:9 ../win32/gui/WndMain.c:1316
+msgid "Options"
+msgstr "選項"
+
+#: ../plugins/dfinput/dfinput.ui.h:10
msgid "Reset"
msgstr "重置"
-#: ../plugins/dfinput/dfinput.ui.h:10
+#: ../plugins/dfinput/dfinput.ui.h:11
msgid "Type:"
msgstr "類型:"
-#: ../plugins/dfinput/pad.c:24
-msgid "Gamepad/Keyboard Input"
+#: ../plugins/dfinput/pad.c:29
+#, fuzzy
+msgid "Gamepad/Keyboard/Mouse Input"
msgstr "手把/鍵盤輸入"
#. increase that with each version
@@ -1507,28 +1548,29 @@ msgstr "無法連線至 %s: %s\n"
msgid "Error allocating memory!\n"
msgstr "分配記憶體錯誤!\n"
-#: ../plugins/dfnet/dfnet.ui.h:1
+#. ****************************************************************************
+#: ../plugins/dfnet/dfnet.ui.h:1 ../plugins/bladesio1/sio1.ui.h:1
msgid "Client (Player2)"
msgstr "客戶端 (玩家 2)"
-#: ../plugins/dfnet/dfnet.ui.h:2
+#: ../plugins/dfnet/dfnet.ui.h:2 ../plugins/bladesio1/sio1.ui.h:2
msgid "Copy PC IP to Clipboard"
msgstr "將本機 IP 複制到剪貼板"
-#: ../plugins/dfnet/dfnet.ui.h:3
+#: ../plugins/dfnet/dfnet.ui.h:3 ../plugins/bladesio1/sio1.ui.h:3
msgid ""
"Do not change if not necessary (remember it must be changed on both sides)."
msgstr "如非必要請勿更改 (必須在兩端都要更改)。"
-#: ../plugins/dfnet/dfnet.ui.h:4
+#: ../plugins/dfnet/dfnet.ui.h:4 ../plugins/bladesio1/sio1.ui.h:4
msgid "Play Offline"
msgstr "離線遊戲"
-#: ../plugins/dfnet/dfnet.ui.h:5
+#: ../plugins/dfnet/dfnet.ui.h:5 ../plugins/bladesio1/sio1.ui.h:5
msgid "Port Number"
msgstr "Port 號"
-#: ../plugins/dfnet/dfnet.ui.h:6
+#: ../plugins/dfnet/dfnet.ui.h:6 ../plugins/bladesio1/sio1.ui.h:6
msgid ""
"Select here if you'll be Server (Player1) or Client (Player2).\n"
"\n"
@@ -1544,16 +1586,16 @@ msgstr ""
"\n"
"如果您選擇客戶端,請輸入伺服器端提供給您的 IP 地址。"
-#: ../plugins/dfnet/dfnet.ui.h:11
+#: ../plugins/dfnet/dfnet.ui.h:11 ../plugins/bladesio1/sio1.ui.h:11
msgid "Server (Player1)"
msgstr "伺服器 (玩家 1)"
-#: ../plugins/dfnet/dfnet.ui.h:12
+#: ../plugins/dfnet/dfnet.ui.h:12 ../plugins/bladesio1/sio1.ui.h:12
msgid "Start Game"
msgstr "開始遊戲"
#: ../plugins/dfnet/gui.c:30 ../plugins/dfnet/gui.c:112
-#: ../win32/gui/ConfigurePlugins.c:616
+#: ../win32/gui/ConfigurePlugins.c:618
msgid "NetPlay"
msgstr "聯線遊戲"
@@ -1610,100 +1652,92 @@ msgstr ""
"P.E.Op.S. Sound 驅動程式 V1.7\n"
"由 Pete Bernert 及 P.E.Op.S. 開發組編寫\n"
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:1
-#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2.h:20
-msgid "<b>Compatibility</b>"
-msgstr "<b>相容性</b>"
-
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:2
-msgid "<b>General</b>"
-msgstr "<b>一般</b>"
-
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:3
-msgid "<b>XA Music</b>"
-msgstr "<b>XA 音樂</b>"
-
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:4
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:1
msgid "Adjust XA speed"
msgstr "調整 XA 速度"
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:5
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:2
msgid "Choose this if XA music is played too quickly."
msgstr "如 XA 音樂播放得過快,選中此項。"
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:7
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:4
+msgid "Cubic"
+msgstr ""
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:5
msgid "Frequency Response - Output Filter"
msgstr "頻率響應 - 輸出過濾"
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:8
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:6
+#, fuzzy
+msgid "Gaussian"
+msgstr "俄語"
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:7
msgid "High compatibility mode"
msgstr "高相容性模式"
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:9
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:8
msgid "Interpolation:"
msgstr "插值:"
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:10
-msgid ""
-"None\n"
-"Low\n"
-"Medium\n"
-"Loud\n"
-"Loudest"
-msgstr ""
-"無\n"
-"低\n"
-"中\n"
-"高\n"
-"最高"
-
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:15
-msgid ""
-"None\n"
-"Simple\n"
-"Gaussian\n"
-"Cubic"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:9
+msgid "Loud"
msgstr ""
-"無\n"
-"簡易\n"
-"高斯\n"
-"立方"
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:19
-msgid ""
-"Off\n"
-"Simple\n"
-"Playstation"
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:10
+msgid "Loudest"
+msgstr ""
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:11
+msgid "Low"
msgstr ""
-"關閉\n"
-"簡易\n"
-"Playstation"
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:22
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:12
+msgid "Medium"
+msgstr ""
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:14
+msgid "Off"
+msgstr ""
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:15
msgid "Play only one channel for a performance boost."
msgstr "僅播放一個聲道以提高性能。"
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:23
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:16
+#, fuzzy
+msgid "Playstation"
+msgstr ""
+"關閉\n"
+"簡易\n"
+"Playstation"
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:17
msgid "Reverb:"
msgstr "回響:"
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:24
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:18
msgid "SPU IRQ Wait"
msgstr "SPU IRQ 等待"
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:25
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:19
+msgid "Simple"
+msgstr ""
+
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:20
msgid "Single channel sound"
msgstr "單聲道聲音"
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:26
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:21
msgid "Use the asynchronous SPU interface."
msgstr "使用異步 SPU 介面。"
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:27
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:22
msgid "Volume:"
msgstr "音量:"
-#: ../plugins/dfsound/spucfg-0.1df/dfsound.glade2.h:28
+#: ../plugins/dfsound/spucfg-0.1df/dfsound.ui.h:23
msgid "Wait for CPU; only useful for some games."
msgstr "等待 CPU;僅在一部分遊戲中有效。"
@@ -1797,6 +1831,10 @@ msgstr ""
"1280x1024\n"
"1600x1200"
+#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2.h:20
+msgid "<b>Compatibility</b>"
+msgstr "<b>相容性</b>"
+
#: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2.h:21
msgid "<b>Framerate</b>"
msgstr "<b>幀率</b>"
@@ -2301,6 +2339,11 @@ msgstr "視窗設定"
msgid "Yellow rect (FF9)"
msgstr "黃色方塊 (FF9)"
+#: ../plugins/bladesio1/gui.c:32
+#, fuzzy
+msgid "Link cable"
+msgstr "開啟"
+
#. ****************************************************************************
#: ../plugins/bladesio1/sio1.c:29
msgid "Sio1 Driver"
@@ -2308,7 +2351,7 @@ msgstr "Sio1 驅動程式"
#: ../win32/gui/AboutDlg.c:26
msgid ""
-"PCSX - A PlayStation Emulator\n"
+"PCSXR - A PlayStation Emulator\n"
"\n"
"Original Authors:\n"
"main coder: linuzappz\n"
@@ -2316,7 +2359,7 @@ msgid ""
"ex-coders: Nocomp, Pete Bernett, nik3d\n"
"Webmaster: AkumaX"
msgstr ""
-"PCSX - 一個 PlayStation 模擬器\n"
+"PCSXR - 一個 PlayStation 模擬器\n"
"\n"
"原作者:\n"
"主程式: linuzappz\n"
@@ -2331,7 +2374,7 @@ msgid ""
"Marcus Comstedt, Stefan Sikora\n"
"\n"
"PCSX-Reloaded By:\n"
-"Blade_Arma, shalma, Wei Mingzhi, et al.\n"
+"edgbla, shalma, Wei Mingzhi, et al.\n"
"\n"
"http://pcsxr.codeplex.com/"
msgstr ""
@@ -2340,24 +2383,24 @@ msgstr ""
"Marcus Comstedt, Stefan Sikora\n"
"\n"
"PCSX-Reloaded 開發者:\n"
-"Blade_Arma, shalma, Wei Mingzhi, et al.\n"
+"edgbla, shalma, Wei Mingzhi, et al.\n"
"\n"
"http://pcsxr.codeplex.com/"
#: ../win32/gui/AboutDlg.c:46
msgid "About"
-msgstr "關於 PCSX"
+msgstr "關於 PCSXR"
#: ../win32/gui/AboutDlg.c:48 ../win32/gui/AboutDlg.c:52
#: ../win32/gui/CheatDlg.c:69 ../win32/gui/CheatDlg.c:119
-#: ../win32/gui/ConfigurePlugins.c:483 ../win32/gui/ConfigurePlugins.c:614
-#: ../win32/gui/WndMain.c:1059 ../win32/gui/WndMain.c:1295
+#: ../win32/gui/ConfigurePlugins.c:485 ../win32/gui/ConfigurePlugins.c:616
+#: ../win32/gui/WndMain.c:1064 ../win32/gui/WndMain.c:1300
msgid "OK"
msgstr "確定"
#: ../win32/gui/AboutDlg.c:49
-msgid "PCSX EMU\n"
-msgstr "PCSX 模擬器\n"
+msgid "PCSXR EMU\n"
+msgstr "PCSXR 模擬器\n"
#: ../win32/gui/CheatDlg.c:51 ../win32/gui/CheatDlg.c:223
#: ../win32/gui/CheatDlg.c:270
@@ -2370,8 +2413,8 @@ msgid "No"
msgstr "否"
#: ../win32/gui/CheatDlg.c:70 ../win32/gui/CheatDlg.c:120
-#: ../win32/gui/ConfigurePlugins.c:484 ../win32/gui/ConfigurePlugins.c:615
-#: ../win32/gui/WndMain.c:1060 ../win32/gui/WndMain.c:1296
+#: ../win32/gui/ConfigurePlugins.c:486 ../win32/gui/ConfigurePlugins.c:617
+#: ../win32/gui/WndMain.c:1065 ../win32/gui/WndMain.c:1301
msgid "Cancel"
msgstr "取消"
@@ -2408,8 +2451,8 @@ msgid "Enabled"
msgstr "開啟"
#: ../win32/gui/CheatDlg.c:282 ../win32/gui/CheatDlg.c:311
-msgid "PCSX Cheat Code Files"
-msgstr "PCSX 金手指檔 (*.cht)"
+msgid "PCSXR Cheat Code Files"
+msgstr "PCSXR 金手指檔 (*.cht)"
#: ../win32/gui/CheatDlg.c:402
msgid "Equal Value"
@@ -2504,150 +2547,150 @@ msgstr "十進制"
msgid "Hexadecimal"
msgstr "十六進制"
-#: ../win32/gui/ConfigurePlugins.c:219
+#: ../win32/gui/ConfigurePlugins.c:221
msgid "Simulate Psx Bios"
msgstr "模擬 PS BIOS"
-#: ../win32/gui/ConfigurePlugins.c:305
+#: ../win32/gui/ConfigurePlugins.c:307
msgid "Configuration not OK!"
msgstr "設定不正確!"
-#: ../win32/gui/ConfigurePlugins.c:406
+#: ../win32/gui/ConfigurePlugins.c:408
msgid "This plugin reports that should work correctly"
msgstr "此外掛報告其可正常工作。"
-#: ../win32/gui/ConfigurePlugins.c:407
+#: ../win32/gui/ConfigurePlugins.c:409
msgid "This plugin reports that should not work correctly"
msgstr "此外掛報告其不可正常工作。"
-#: ../win32/gui/ConfigurePlugins.c:463
+#: ../win32/gui/ConfigurePlugins.c:465
msgid "Select Plugins Directory"
msgstr "選擇外掛目錄"
-#: ../win32/gui/ConfigurePlugins.c:472
+#: ../win32/gui/ConfigurePlugins.c:474
msgid "Select Bios Directory"
msgstr "選擇 BIOS 目錄"
-#: ../win32/gui/ConfigurePlugins.c:481
+#: ../win32/gui/ConfigurePlugins.c:483
msgid "Configuration"
msgstr "設定"
-#: ../win32/gui/ConfigurePlugins.c:485
+#: ../win32/gui/ConfigurePlugins.c:487
msgid "Graphics"
msgstr "圖像"
-#: ../win32/gui/ConfigurePlugins.c:486
+#: ../win32/gui/ConfigurePlugins.c:488
msgid "First Controller"
msgstr "主控制器"
-#: ../win32/gui/ConfigurePlugins.c:487
+#: ../win32/gui/ConfigurePlugins.c:489
msgid "Second Controller"
msgstr "輔控制器"
-#: ../win32/gui/ConfigurePlugins.c:488
+#: ../win32/gui/ConfigurePlugins.c:490
msgid "Sound"
msgstr "聲音"
-#: ../win32/gui/ConfigurePlugins.c:489
+#: ../win32/gui/ConfigurePlugins.c:491
msgid "Cdrom"
msgstr "CD-ROM"
-#: ../win32/gui/ConfigurePlugins.c:490
+#: ../win32/gui/ConfigurePlugins.c:492
msgid "Bios"
msgstr "BIOS"
-#: ../win32/gui/ConfigurePlugins.c:491
+#: ../win32/gui/ConfigurePlugins.c:493
msgid "Set Bios Directory"
msgstr "設定 BIOS 目錄"
-#: ../win32/gui/ConfigurePlugins.c:492
+#: ../win32/gui/ConfigurePlugins.c:494
msgid "Set Plugins Directory"
msgstr "設定外掛目錄"
-#: ../win32/gui/ConfigurePlugins.c:493 ../win32/gui/ConfigurePlugins.c:496
-#: ../win32/gui/ConfigurePlugins.c:499 ../win32/gui/ConfigurePlugins.c:502
-#: ../win32/gui/ConfigurePlugins.c:505 ../win32/gui/ConfigurePlugins.c:617
+#: ../win32/gui/ConfigurePlugins.c:495 ../win32/gui/ConfigurePlugins.c:498
+#: ../win32/gui/ConfigurePlugins.c:501 ../win32/gui/ConfigurePlugins.c:504
+#: ../win32/gui/ConfigurePlugins.c:507 ../win32/gui/ConfigurePlugins.c:619
msgid "Configure..."
msgstr "設定..."
-#: ../win32/gui/ConfigurePlugins.c:494 ../win32/gui/ConfigurePlugins.c:497
-#: ../win32/gui/ConfigurePlugins.c:500 ../win32/gui/ConfigurePlugins.c:503
-#: ../win32/gui/ConfigurePlugins.c:506 ../win32/gui/ConfigurePlugins.c:618
+#: ../win32/gui/ConfigurePlugins.c:496 ../win32/gui/ConfigurePlugins.c:499
+#: ../win32/gui/ConfigurePlugins.c:502 ../win32/gui/ConfigurePlugins.c:505
+#: ../win32/gui/ConfigurePlugins.c:508 ../win32/gui/ConfigurePlugins.c:620
msgid "Test..."
msgstr "測試..."
-#: ../win32/gui/ConfigurePlugins.c:495 ../win32/gui/ConfigurePlugins.c:498
-#: ../win32/gui/ConfigurePlugins.c:501 ../win32/gui/ConfigurePlugins.c:504
-#: ../win32/gui/ConfigurePlugins.c:507 ../win32/gui/ConfigurePlugins.c:619
+#: ../win32/gui/ConfigurePlugins.c:497 ../win32/gui/ConfigurePlugins.c:500
+#: ../win32/gui/ConfigurePlugins.c:503 ../win32/gui/ConfigurePlugins.c:506
+#: ../win32/gui/ConfigurePlugins.c:509 ../win32/gui/ConfigurePlugins.c:621
msgid "About..."
msgstr "關於..."
-#: ../win32/gui/ConfigurePlugins.c:612
+#: ../win32/gui/ConfigurePlugins.c:614
msgid "NetPlay Configuration"
msgstr "聯線遊戲設定"
-#: ../win32/gui/ConfigurePlugins.c:620
+#: ../win32/gui/ConfigurePlugins.c:622
msgid ""
"Note: The NetPlay Plugin Directory should be the same as the other Plugins."
msgstr "注意: 聯線遊戲外掛應和其它外掛放在同一資料夾中。"
-#: ../win32/gui/plugin.c:94 ../win32/gui/WndMain.c:323
+#: ../win32/gui/plugin.c:94 ../win32/gui/WndMain.c:328
#, c-format
-msgid "*PCSX*: Saved State %d"
-msgstr "*PCSX*: Saved State %d"
+msgid "*PCSXR*: Saved State %d"
+msgstr "*PCSXR*: Saved State %d"
-#: ../win32/gui/plugin.c:95 ../win32/gui/WndMain.c:324
+#: ../win32/gui/plugin.c:95 ../win32/gui/WndMain.c:329
#, c-format
-msgid "*PCSX*: Error Saving State %d"
-msgstr "*PCSX*: Error Saving State %d"
+msgid "*PCSXR*: Error Saving State %d"
+msgstr "*PCSXR*: Error Saving State %d"
-#: ../win32/gui/plugin.c:111 ../win32/gui/WndMain.c:301
+#: ../win32/gui/plugin.c:111 ../win32/gui/WndMain.c:306
#, c-format
-msgid "*PCSX*: Loaded State %d"
-msgstr "*PCSX*: Loaded State %d"
+msgid "*PCSXR*: Loaded State %d"
+msgstr "*PCSXR*: Loaded State %d"
-#: ../win32/gui/plugin.c:112 ../win32/gui/WndMain.c:302
+#: ../win32/gui/plugin.c:112 ../win32/gui/WndMain.c:307
#, c-format
-msgid "*PCSX*: Error Loading State %d"
-msgstr "*PCSX*: Error Loading State %d"
+msgid "*PCSXR*: Error Loading State %d"
+msgstr "*PCSXR*: Error Loading State %d"
#: ../win32/gui/plugin.c:123
#, c-format
-msgid "*PCSX*: Sio Irq Always Enabled"
-msgstr "*PCSX*: Sio Irq Always Enabled"
+msgid "*PCSXR*: Sio Irq Always Enabled"
+msgstr "*PCSXR*: Sio Irq Always Enabled"
#: ../win32/gui/plugin.c:124
#, c-format
-msgid "*PCSX*: Sio Irq Not Always Enabled"
-msgstr "*PCSX*: Sio Irq Not Always Enabled"
+msgid "*PCSXR*: Sio Irq Not Always Enabled"
+msgstr "*PCSXR*: Sio Irq Not Always Enabled"
#: ../win32/gui/plugin.c:131
#, c-format
-msgid "*PCSX*: Black&White Mdecs Only Enabled"
-msgstr "*PCSX*: Black&White Mdecs Only Enabled"
+msgid "*PCSXR*: Black&White Mdecs Only Enabled"
+msgstr "*PCSXR*: Black&White Mdecs Only Enabled"
#: ../win32/gui/plugin.c:132
#, c-format
-msgid "*PCSX*: Black&White Mdecs Only Disabled"
-msgstr "*PCSX*: Black&White Mdecs Only Disabled"
+msgid "*PCSXR*: Black&White Mdecs Only Disabled"
+msgstr "*PCSXR*: Black&White Mdecs Only Disabled"
#: ../win32/gui/plugin.c:139
#, c-format
-msgid "*PCSX*: Xa Enabled"
-msgstr "*PCSX*: Xa Enabled"
+msgid "*PCSXR*: Xa Enabled"
+msgstr "*PCSXR*: Xa Enabled"
#: ../win32/gui/plugin.c:140
#, c-format
-msgid "*PCSX*: Xa Disabled"
-msgstr "*PCSX*: Xa Disabled"
+msgid "*PCSXR*: Xa Disabled"
+msgstr "*PCSXR*: Xa Disabled"
#: ../win32/gui/plugin.c:149
-msgid "*PCSX*: CdRom Case Opened"
-msgstr "*PCSX*: CdRom Case Opened"
+msgid "*PCSXR*: CdRom Case Opened"
+msgstr "*PCSXR*: CdRom Case Opened"
#: ../win32/gui/plugin.c:155
-msgid "*PCSX*: CdRom Case Closed"
-msgstr "*PCSX*: CdRom Case Closed"
+msgid "*PCSXR*: CdRom Case Closed"
+msgstr "*PCSXR*: CdRom Case Closed"
#: ../win32/gui/plugin.c:183
msgid "Connecting..."
@@ -2740,8 +2783,8 @@ msgstr "德語"
msgid "Greek"
msgstr "希臘語"
-#: ../win32/gui/WndMain.c:81 ../win32/gui/WndMain.c:1659
-#: ../win32/gui/WndMain.c:1661
+#: ../win32/gui/WndMain.c:81 ../win32/gui/WndMain.c:1667
+#: ../win32/gui/WndMain.c:1669
msgid "English"
msgstr "英語"
@@ -2791,7 +2834,7 @@ msgstr "韓國語"
#: ../win32/gui/WndMain.c:215
msgid ""
-"Usage: pcsx [options]\n"
+"Usage: pcsxr [options]\n"
"\toptions:\n"
"\t-nogui\t\tDon't open the GUI\n"
"\t-psxout\t\tEnable PSX output\n"
@@ -2801,323 +2844,394 @@ msgid ""
"\t-help\t\tDisplay this message"
msgstr ""
-#: ../win32/gui/WndMain.c:342 ../win32/gui/WndMain.c:388
-msgid "PCSX State Format"
-msgstr "PCSX 記錄格式"
+#: ../win32/gui/WndMain.c:347 ../win32/gui/WndMain.c:393
+msgid "PCSXR State Format"
+msgstr "PCSXR 記錄格式"
-#: ../win32/gui/WndMain.c:369
+#: ../win32/gui/WndMain.c:374
#, c-format
-msgid "*PCSX*: Loaded State %s"
-msgstr "*PCSX*: Loaded State %s"
+msgid "*PCSXR*: Loaded State %s"
+msgstr "*PCSXR*: Loaded State %s"
-#: ../win32/gui/WndMain.c:370
+#: ../win32/gui/WndMain.c:375
#, c-format
-msgid "*PCSX*: Error Loading State %s"
-msgstr "*PCSX*: Error Loading State %s"
+msgid "*PCSXR*: Error Loading State %s"
+msgstr "*PCSXR*: Error Loading State %s"
-#: ../win32/gui/WndMain.c:415
+#: ../win32/gui/WndMain.c:420
#, c-format
-msgid "*PCSX*: Saved State %s"
-msgstr "*PCSX*: Saved State %s"
+msgid "*PCSXR*: Saved State %s"
+msgstr "*PCSXR*: Saved State %s"
-#: ../win32/gui/WndMain.c:416
+#: ../win32/gui/WndMain.c:421
#, c-format
-msgid "*PCSX*: Error Saving State %s"
-msgstr "*PCSX*: Error Saving State %s"
+msgid "*PCSXR*: Error Saving State %s"
+msgstr "*PCSXR*: Error Saving State %s"
-#: ../win32/gui/WndMain.c:484
+#: ../win32/gui/WndMain.c:489
msgid "Running BIOS is not supported with Internal HLE Bios."
msgstr "內部 HLE BIOS 不支援直接執行。"
-#: ../win32/gui/WndMain.c:761
+#: ../win32/gui/WndMain.c:766
msgid "Game ID"
msgstr "遊戲 ID"
-#: ../win32/gui/WndMain.c:767
+#: ../win32/gui/WndMain.c:772
msgid "Game"
msgstr "遊戲"
-#: ../win32/gui/WndMain.c:949
+#: ../win32/gui/WndMain.c:954
msgid "mid link block"
msgstr "mid link block"
-#: ../win32/gui/WndMain.c:952
+#: ../win32/gui/WndMain.c:957
msgid "terminiting link block"
msgstr "terminiting link block"
-#: ../win32/gui/WndMain.c:1057
+#: ../win32/gui/WndMain.c:1062
msgid "Memcard Manager"
msgstr "記憶卡管理器"
-#: ../win32/gui/WndMain.c:1061 ../win32/gui/WndMain.c:1064
+#: ../win32/gui/WndMain.c:1066 ../win32/gui/WndMain.c:1069
msgid "Select Mcd"
msgstr "選擇"
-#: ../win32/gui/WndMain.c:1062 ../win32/gui/WndMain.c:1065
+#: ../win32/gui/WndMain.c:1067 ../win32/gui/WndMain.c:1070
msgid "Format Mcd"
msgstr "格式化"
-#: ../win32/gui/WndMain.c:1063 ../win32/gui/WndMain.c:1066
+#: ../win32/gui/WndMain.c:1068 ../win32/gui/WndMain.c:1071
msgid "Reload Mcd"
msgstr "重新加載"
-#: ../win32/gui/WndMain.c:1067
+#: ../win32/gui/WndMain.c:1072
msgid "-> Copy ->"
msgstr "-> 複制 ->"
-#: ../win32/gui/WndMain.c:1068
+#: ../win32/gui/WndMain.c:1073
msgid "<- Copy <-"
msgstr "<- 複制 <-"
-#: ../win32/gui/WndMain.c:1069
+#: ../win32/gui/WndMain.c:1074
msgid "Paste"
msgstr "粘貼"
-#: ../win32/gui/WndMain.c:1070
+#: ../win32/gui/WndMain.c:1075
msgid "<- Un/Delete"
msgstr "<- 刪除/恢複"
-#: ../win32/gui/WndMain.c:1071
+#: ../win32/gui/WndMain.c:1076
msgid "Un/Delete ->"
msgstr "刪除/恢複 ->"
-#: ../win32/gui/WndMain.c:1073
+#: ../win32/gui/WndMain.c:1078
msgid "Memory Card 1"
msgstr "記憶卡 1"
-#: ../win32/gui/WndMain.c:1074
+#: ../win32/gui/WndMain.c:1079
msgid "Memory Card 2"
msgstr "記憶卡 2"
-#: ../win32/gui/WndMain.c:1129
+#: ../win32/gui/WndMain.c:1134
msgid "Are you sure you want to paste this selection?"
msgstr "是否確認粘貼此選中內容?"
-#: ../win32/gui/WndMain.c:1129 ../win32/gui/WndMain.c:1240
-#: ../win32/gui/WndMain.c:1247
+#: ../win32/gui/WndMain.c:1134 ../win32/gui/WndMain.c:1245
+#: ../win32/gui/WndMain.c:1252
msgid "Confirmation"
msgstr "確認"
-#: ../win32/gui/WndMain.c:1240 ../win32/gui/WndMain.c:1247
+#: ../win32/gui/WndMain.c:1245 ../win32/gui/WndMain.c:1252
msgid "Are you sure you want to format this Memory Card?"
msgstr "是否確認格式化此記憶卡?"
-#: ../win32/gui/WndMain.c:1293
+#: ../win32/gui/WndMain.c:1298
msgid "Cpu Config"
msgstr "CPU 設定"
-#: ../win32/gui/WndMain.c:1298
+#: ../win32/gui/WndMain.c:1303
msgid "Disable Xa Decoding"
msgstr "禁用 XA 解碼"
-#: ../win32/gui/WndMain.c:1299
+#: ../win32/gui/WndMain.c:1304
msgid "Sio Irq Always Enabled"
msgstr "SIO IRQ 總是開啟"
-#: ../win32/gui/WndMain.c:1300
+#: ../win32/gui/WndMain.c:1305
msgid "Black && White Movies"
msgstr "黑白電影"
-#: ../win32/gui/WndMain.c:1301
+#: ../win32/gui/WndMain.c:1306
msgid "Disable Cd audio"
msgstr "禁用 CD 音頻"
-#: ../win32/gui/WndMain.c:1303
+#: ../win32/gui/WndMain.c:1309
msgid "Enable Interpreter Cpu"
msgstr "開啟解釋執行 CPU"
-#: ../win32/gui/WndMain.c:1306
+#: ../win32/gui/WndMain.c:1312
msgid "Spu Irq Always Enabled"
msgstr "SPU IRQ 總是開啟"
-#: ../win32/gui/WndMain.c:1311
+#: ../win32/gui/WndMain.c:1317
msgid "Psx System Type"
msgstr "PS 系統類型"
-#: ../win32/gui/WndMain.c:1415
+#: ../win32/gui/WndMain.c:1423
msgid "Psx Mcd Format (*.mcr;*.mc;*.mem;*.vgs;*.mcd;*.gme;*.ddf)"
msgstr "PS 記憶卡格式 (*.mcr;*.mc;*.mem;*.vgs;*.mcd;*.gme;*.ddf)"
-#: ../win32/gui/WndMain.c:1420
+#: ../win32/gui/WndMain.c:1428
msgid "Psx Memory Card (*.mcr;*.mc)"
msgstr "PS 記憶卡 (*.mcr;*.mc)"
-#: ../win32/gui/WndMain.c:1425
+#: ../win32/gui/WndMain.c:1433
msgid "CVGS Memory Card (*.mem;*.vgs)"
msgstr "VGS 記憶卡 (*.mem;*.vgs)"
-#: ../win32/gui/WndMain.c:1430
+#: ../win32/gui/WndMain.c:1438
msgid "Bleem Memory Card (*.mcd)"
msgstr "Bleem 記憶卡 (*.mcd)"
-#: ../win32/gui/WndMain.c:1435
+#: ../win32/gui/WndMain.c:1443
msgid "DexDrive Memory Card (*.gme)"
msgstr "DexDrive 記憶卡 (*.gme)"
-#: ../win32/gui/WndMain.c:1440
+#: ../win32/gui/WndMain.c:1448
msgid "DataDeck Memory Card (*.ddf)"
msgstr "DataDeck 記憶卡 (*.ddl)"
-#: ../win32/gui/WndMain.c:1484
+#: ../win32/gui/WndMain.c:1492
msgid "Psx Exe Format"
msgstr "PS EXE 格式"
-#: ../win32/gui/WndMain.c:1521
+#: ../win32/gui/WndMain.c:1529
msgid "Psx Isos (*.iso;*.mdf;*.img;*.bin)"
msgstr "PS 鏡像檔 (*.iso;*.mdf;*.img;*.bin)"
-#: ../win32/gui/WndMain.c:1597
+#: ../win32/gui/WndMain.c:1605
msgid "&File"
msgstr "檔案(&F)"
-#: ../win32/gui/WndMain.c:1598
+#: ../win32/gui/WndMain.c:1606
msgid "E&xit"
msgstr "離開(&X)"
-#: ../win32/gui/WndMain.c:1600
+#: ../win32/gui/WndMain.c:1608
msgid "Run &EXE..."
msgstr "執行 EXE(&E)..."
-#: ../win32/gui/WndMain.c:1601
+#: ../win32/gui/WndMain.c:1609
msgid "Run &BIOS"
msgstr "執行 BIOS(&B)"
-#: ../win32/gui/WndMain.c:1602
+#: ../win32/gui/WndMain.c:1610
msgid "Run &ISO..."
msgstr "執行 ISO(&I)..."
-#: ../win32/gui/WndMain.c:1603
+#: ../win32/gui/WndMain.c:1611
msgid "Run &CD"
msgstr "執行光碟(&C)"
-#: ../win32/gui/WndMain.c:1605
+#: ../win32/gui/WndMain.c:1613
msgid "&Emulator"
msgstr "模擬器(&E)"
-#: ../win32/gui/WndMain.c:1606
+#: ../win32/gui/WndMain.c:1614
msgid "&States"
msgstr "記錄(&S)"
-#: ../win32/gui/WndMain.c:1608
+#: ../win32/gui/WndMain.c:1616
msgid "S&witch ISO..."
msgstr "更換 ISO(&W)..."
-#: ../win32/gui/WndMain.c:1610
+#: ../win32/gui/WndMain.c:1618
msgid "Re&set"
msgstr "複位(&S)"
-#: ../win32/gui/WndMain.c:1611
+#: ../win32/gui/WndMain.c:1619
msgid "&Run"
msgstr "執行(&R)"
-#: ../win32/gui/WndMain.c:1612
+#: ../win32/gui/WndMain.c:1620
msgid "&Save"
msgstr "存儲(&S)"
-#: ../win32/gui/WndMain.c:1613
+#: ../win32/gui/WndMain.c:1621
msgid "&Load"
msgstr "讀取(&L)"
-#: ../win32/gui/WndMain.c:1614 ../win32/gui/WndMain.c:1624
+#: ../win32/gui/WndMain.c:1622 ../win32/gui/WndMain.c:1632
msgid "&Other..."
msgstr "其它(&O)..."
-#: ../win32/gui/WndMain.c:1615 ../win32/gui/WndMain.c:1625
+#: ../win32/gui/WndMain.c:1623 ../win32/gui/WndMain.c:1633
msgid "Slot &9"
msgstr "記錄 9(&9)"
-#: ../win32/gui/WndMain.c:1616 ../win32/gui/WndMain.c:1626
+#: ../win32/gui/WndMain.c:1624 ../win32/gui/WndMain.c:1634
msgid "Slot &8"
msgstr "記錄 8(&8)"
-#: ../win32/gui/WndMain.c:1617 ../win32/gui/WndMain.c:1627
+#: ../win32/gui/WndMain.c:1625 ../win32/gui/WndMain.c:1635
msgid "Slot &7"
msgstr "記錄 7(&7)"
-#: ../win32/gui/WndMain.c:1618 ../win32/gui/WndMain.c:1628
+#: ../win32/gui/WndMain.c:1626 ../win32/gui/WndMain.c:1636
msgid "Slot &6"
msgstr "記錄 6(&6)"
-#: ../win32/gui/WndMain.c:1619 ../win32/gui/WndMain.c:1629
+#: ../win32/gui/WndMain.c:1627 ../win32/gui/WndMain.c:1637
msgid "Slot &5"
msgstr "記錄 5(&5)"
-#: ../win32/gui/WndMain.c:1620 ../win32/gui/WndMain.c:1630
+#: ../win32/gui/WndMain.c:1628 ../win32/gui/WndMain.c:1638
msgid "Slot &4"
msgstr "記錄 4(&4)"
-#: ../win32/gui/WndMain.c:1621 ../win32/gui/WndMain.c:1631
+#: ../win32/gui/WndMain.c:1629 ../win32/gui/WndMain.c:1639
msgid "Slot &3"
msgstr "記錄 3(&3)"
-#: ../win32/gui/WndMain.c:1622 ../win32/gui/WndMain.c:1632
+#: ../win32/gui/WndMain.c:1630 ../win32/gui/WndMain.c:1640
msgid "Slot &2"
msgstr "記錄 2(&2)"
-#: ../win32/gui/WndMain.c:1623 ../win32/gui/WndMain.c:1633
+#: ../win32/gui/WndMain.c:1631 ../win32/gui/WndMain.c:1641
msgid "Slot &1"
msgstr "記錄 1(&1)"
-#: ../win32/gui/WndMain.c:1635
+#: ../win32/gui/WndMain.c:1643
msgid "&Configuration"
msgstr "設定(&C)"
-#: ../win32/gui/WndMain.c:1636
+#: ../win32/gui/WndMain.c:1644
msgid "Cheat &Search..."
msgstr "搜尋金手指碼(&S)..."
-#: ../win32/gui/WndMain.c:1637
+#: ../win32/gui/WndMain.c:1645
msgid "Ch&eat Code..."
msgstr "金手指碼(&E)..."
-#: ../win32/gui/WndMain.c:1640
+#: ../win32/gui/WndMain.c:1648
msgid "&Language"
msgstr "語言(&L)"
-#: ../win32/gui/WndMain.c:1665
+#: ../win32/gui/WndMain.c:1673
msgid "&Memory cards..."
msgstr "記憶卡(&M)..."
-#: ../win32/gui/WndMain.c:1666
+#: ../win32/gui/WndMain.c:1674
msgid "C&PU..."
msgstr "CPU(&P)..."
-#: ../win32/gui/WndMain.c:1668
+#: ../win32/gui/WndMain.c:1676
msgid "&NetPlay..."
msgstr "聯線遊戲(&N)..."
-#: ../win32/gui/WndMain.c:1670
+#: ../win32/gui/WndMain.c:1678
msgid "&Controllers..."
msgstr "控制器(&C)..."
-#: ../win32/gui/WndMain.c:1671
+#: ../win32/gui/WndMain.c:1679
msgid "CD-&ROM..."
msgstr "CD-ROM(&R)..."
-#: ../win32/gui/WndMain.c:1672
+#: ../win32/gui/WndMain.c:1680
msgid "&Sound..."
msgstr "聲音(&S)..."
-#: ../win32/gui/WndMain.c:1673
+#: ../win32/gui/WndMain.c:1681
msgid "&Graphics..."
msgstr "圖像(&G)..."
-#: ../win32/gui/WndMain.c:1675
+#: ../win32/gui/WndMain.c:1683
msgid "&Plugins && Bios..."
msgstr "外掛及 BIOS(&P)..."
-#: ../win32/gui/WndMain.c:1677
+#: ../win32/gui/WndMain.c:1685
msgid "&Help"
msgstr "說明(&H)"
-#: ../win32/gui/WndMain.c:1678
+#: ../win32/gui/WndMain.c:1686
msgid "&About..."
msgstr "關於(&A)..."
-#: ../win32/gui/WndMain.c:1866
-msgid "Pcsx Msg"
-msgstr "Pcsx 消息"
+#: ../win32/gui/WndMain.c:1874
+msgid "Pcsxr Msg"
+msgstr "Pcsxr 消息"
-#: ../win32/gui/WndMain.c:1869
+#: ../win32/gui/WndMain.c:1877
msgid "Error Loading Symbol"
msgstr "無法加載符號"
+
+#~ msgid "<b>General</b>"
+#~ msgstr "<b>一般</b>"
+
+#~ msgid "<b>XA Music</b>"
+#~ msgstr "<b>XA 音樂</b>"
+
+#~ msgid ""
+#~ "None\n"
+#~ "Low\n"
+#~ "Medium\n"
+#~ "Loud\n"
+#~ "Loudest"
+#~ msgstr ""
+#~ "無\n"
+#~ "低\n"
+#~ "中\n"
+#~ "高\n"
+#~ "最高"
+
+#~ msgid ""
+#~ "None\n"
+#~ "Simple\n"
+#~ "Gaussian\n"
+#~ "Cubic"
+#~ msgstr ""
+#~ "無\n"
+#~ "簡易\n"
+#~ "高斯\n"
+#~ "立方"
+
+#~ msgid ""
+#~ "Default\n"
+#~ "125ms\n"
+#~ "250ms\n"
+#~ "500ms\n"
+#~ "1s\n"
+#~ "2s\n"
+#~ "4s\n"
+#~ "8s\n"
+#~ "16s\n"
+#~ "32s\n"
+#~ "1min\n"
+#~ "2min\n"
+#~ "4min\n"
+#~ "8min\n"
+#~ "16min\n"
+#~ "32min"
+#~ msgstr ""
+#~ "缺省\n"
+#~ "125 毫秒\n"
+#~ "250 毫秒\n"
+#~ "500 毫秒\n"
+#~ "1 秒\n"
+#~ "2 秒\n"
+#~ "4 秒\n"
+#~ "8 秒\n"
+#~ "16 秒\n"
+#~ "32 秒\n"
+#~ "1 分鐘\n"
+#~ "2 分鐘\n"
+#~ "4 分鐘\n"
+#~ "8 分鐘\n"
+#~ "16 分鐘\n"
+#~ "32 分鐘"
+
+#~ msgid "Select CD-ROM device"
+#~ msgstr "選擇 CD-ROM 裝置"
+
+#~ msgid "hseparator"
+#~ msgstr "hseparator"
diff --git a/win32/gui/AboutDlg.c b/win32/gui/AboutDlg.c
index 7abae3d7..ca688d8b 100644
--- a/win32/gui/AboutDlg.c
+++ b/win32/gui/AboutDlg.c
@@ -23,7 +23,7 @@
#include "psxcommon.h"
char *LabelAuthors = { N_(
- "PCSX - A PlayStation Emulator\n\n"
+ "PCSXR - A PlayStation Emulator\n\n"
"Original Authors:\n"
"main coder: linuzappz\n"
"co-coders: shadow\n"
@@ -46,9 +46,9 @@ LRESULT WINAPI AboutDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
SetWindowText(hDlg, _("About"));
Button_SetText(GetDlgItem(hDlg, IDOK), _("OK"));
- Static_SetText(GetDlgItem(hDlg, IDC_PCSX_ABOUT_TEXT), _("PCSX EMU\n"));
- Static_SetText(GetDlgItem(hDlg, IDC_PCSX_ABOUT_AUTHORS), _(LabelAuthors));
- Static_SetText(GetDlgItem(hDlg, IDC_PCSX_ABOUT_GREETS), _(LabelGreets));
+ Static_SetText(GetDlgItem(hDlg, IDC_PCSXR_ABOUT_TEXT), _("PCSXR EMU\n"));
+ Static_SetText(GetDlgItem(hDlg, IDC_PCSXR_ABOUT_AUTHORS), _(LabelAuthors));
+ Static_SetText(GetDlgItem(hDlg, IDC_PCSXR_ABOUT_GREETS), _(LabelGreets));
Button_SetText(GetDlgItem(hDlg,IDOK), _("OK"));
return TRUE;
diff --git a/win32/gui/CheatDlg.c b/win32/gui/CheatDlg.c
index a09587a6..5dcb9394 100644
--- a/win32/gui/CheatDlg.c
+++ b/win32/gui/CheatDlg.c
@@ -279,7 +279,7 @@ LRESULT WINAPI CheatDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam) {
memset(&szFileTitle, 0, sizeof(szFileTitle));
memset(&szFilter, 0, sizeof(szFilter));
- strcpy(szFilter, _("PCSX Cheat Code Files"));
+ strcpy(szFilter, _("PCSXR Cheat Code Files"));
strcatz(szFilter, "*.*");
ofn.lStructSize = sizeof(OPENFILENAME);
@@ -308,7 +308,7 @@ LRESULT WINAPI CheatDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam) {
memset(&szFileTitle, 0, sizeof(szFileTitle));
memset(&szFilter, 0, sizeof(szFilter));
- strcpy(szFilter, _("PCSX Cheat Code Files"));
+ strcpy(szFilter, _("PCSXR Cheat Code Files"));
strcatz(szFilter, "*.*");
ofn.lStructSize = sizeof(OPENFILENAME);
diff --git a/win32/gui/Win32.h b/win32/gui/Win32.h
index 01a95d39..ad9cfea3 100644
--- a/win32/gui/Win32.h
+++ b/win32/gui/Win32.h
@@ -35,7 +35,7 @@ extern int CancelQuit;
extern char cfgfile[256];
extern int Running;
extern boolean UseGui;
-extern char PcsxDir[256];
+extern char PcsxrDir[256];
void strcatz(char *dst, char *src);
diff --git a/win32/gui/WndMain.c b/win32/gui/WndMain.c
index b557b755..f50c8b9a 100644
--- a/win32/gui/WndMain.c
+++ b/win32/gui/WndMain.c
@@ -51,7 +51,7 @@ int CancelQuit = 0;
char cfgfile[256];
int Running = 0;
boolean UseGui = TRUE;
-char PcsxDir[256];
+char PcsxrDir[256];
static HDC hDC;
static HDC hdcmem;
@@ -135,7 +135,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
char cdfile[MAXPATHLEN] = "", buf[4096];
int loadstatenum = -1;
- strcpy(cfgfile, "Software\\Pcsx");
+ strcpy(cfgfile, "Software\\Pcsxr");
gApp.hInstance = hInstance;
@@ -146,7 +146,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
Running = 0;
- GetCurrentDirectory(256, PcsxDir);
+ GetCurrentDirectory(256, PcsxrDir);
memset(&Config, 0, sizeof(PcsxConfig));
strcpy(Config.Net, "Disabled");
@@ -212,7 +212,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
Config.SlowBoot = TRUE;
} else if (strcmp(arg, "-help") == 0) {
MessageBox(gApp.hWnd, _(
- "Usage: pcsx [options]\n"
+ "Usage: pcsxr [options]\n"
"\toptions:\n"
"\t-nogui\t\tDon't open the GUI\n"
"\t-psxout\t\tEnable PSX output\n"
@@ -220,7 +220,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
"\t-runcd\t\tRuns CD-ROM (requires -nogui)\n"
"\t-cdfile FILE\tRuns a CD image file (requires -nogui)\n"
"\t-help\t\tDisplay this message"),
- "PCSX", 0);
+ "PCSXR", 0);
return 0;
}
@@ -303,8 +303,8 @@ void States_Load(int num) {
ret = LoadState(Text);
if (ret == 0)
- sprintf(Text, _("*PCSX*: Loaded State %d"), num+1);
- else sprintf(Text, _("*PCSX*: Error Loading State %d"), num+1);
+ sprintf(Text, _("*PCSXR*: Loaded State %d"), num+1);
+ else sprintf(Text, _("*PCSXR*: Error Loading State %d"), num+1);
GPU_displayText(Text);
Running = 1;
@@ -325,8 +325,8 @@ void States_Save(int num) {
GPU_freeze(2, (GPUFreeze_t *)&num);
ret = SaveState(Text);
if (ret == 0)
- sprintf(Text, _("*PCSX*: Saved State %d"), num+1);
- else sprintf(Text, _("*PCSX*: Error Saving State %d"), num+1);
+ sprintf(Text, _("*PCSXR*: Saved State %d"), num+1);
+ else sprintf(Text, _("*PCSXR*: Error Saving State %d"), num+1);
GPU_displayText(Text);
Running = 1;
@@ -344,7 +344,7 @@ void OnStates_LoadOther() {
memset(&szFileTitle, 0, sizeof(szFileTitle));
memset(&szFilter, 0, sizeof(szFilter));
- strcpy(szFilter, _("PCSX State Format"));
+ strcpy(szFilter, _("PCSXR State Format"));
strcatz(szFilter, "*.*");
ofn.lStructSize = sizeof(OPENFILENAME);
@@ -371,8 +371,8 @@ void OnStates_LoadOther() {
ret = LoadState(szFileName);
if (ret == 0)
- sprintf(Text, _("*PCSX*: Loaded State %s"), szFileName);
- else sprintf(Text, _("*PCSX*: Error Loading State %s"), szFileName);
+ sprintf(Text, _("*PCSXR*: Loaded State %s"), szFileName);
+ else sprintf(Text, _("*PCSXR*: Error Loading State %s"), szFileName);
GPU_displayText(Text);
Running = 1;
@@ -390,7 +390,7 @@ void OnStates_SaveOther() {
memset(&szFileTitle, 0, sizeof(szFileTitle));
memset(&szFilter, 0, sizeof(szFilter));
- strcpy(szFilter, _("PCSX State Format"));
+ strcpy(szFilter, _("PCSXR State Format"));
strcatz(szFilter, "*.*");
ofn.lStructSize = sizeof(OPENFILENAME);
@@ -417,8 +417,8 @@ void OnStates_SaveOther() {
ret = SaveState(szFileName);
if (ret == 0)
- sprintf(Text, _("*PCSX*: Saved State %s"), szFileName);
- else sprintf(Text, _("*PCSX*: Error Saving State %s"), szFileName);
+ sprintf(Text, _("*PCSXR*: Saved State %s"), szFileName);
+ else sprintf(Text, _("*PCSXR*: Error Saving State %s"), szFileName);
GPU_displayText(Text);
Running = 1;
@@ -1729,7 +1729,7 @@ void CreateMainWindow(int nCmdShow) {
WNDCLASS wc;
HWND hWnd;
- wc.lpszClassName = "PCSX Main";
+ wc.lpszClassName = "PCSXR Main";
wc.lpfnWndProc = MainWndProc;
wc.style = 0;
wc.hInstance = gApp.hInstance;
@@ -1742,8 +1742,8 @@ void CreateMainWindow(int nCmdShow) {
RegisterClass(&wc);
- hWnd = CreateWindow("PCSX Main",
- "PCSX",
+ hWnd = CreateWindow("PCSXR Main",
+ "PCSXR",
WS_CAPTION | WS_POPUPWINDOW | WS_MINIMIZEBOX,
CW_USEDEFAULT,
0,
@@ -1871,7 +1871,7 @@ void SysMessage(const char *fmt, ...) {
va_start(list,fmt);
vsprintf(tmp,fmt,list);
va_end(list);
- MessageBox(0, tmp, _("Pcsx Msg"), 0);
+ MessageBox(0, tmp, _("Pcsxr Msg"), 0);
}
static char *err = N_("Error Loading Symbol");
diff --git a/win32/gui/pcsx.bmp b/win32/gui/pcsxr.bmp
index fca63000..fca63000 100755
--- a/win32/gui/pcsx.bmp
+++ b/win32/gui/pcsxr.bmp
Binary files differ
diff --git a/win32/gui/pcsx.exe.manifest b/win32/gui/pcsxr.exe.manifest
index 841aa3ce..841aa3ce 100644
--- a/win32/gui/pcsx.exe.manifest
+++ b/win32/gui/pcsxr.exe.manifest
diff --git a/win32/gui/plugin.c b/win32/gui/plugin.c
index f9bfe96f..3ee3d835 100644
--- a/win32/gui/plugin.c
+++ b/win32/gui/plugin.c
@@ -91,8 +91,8 @@ void PADhandleKey(int key) {
GPU_freeze(2, (GPUFreeze_t *)&StatesC);
ret = SaveState(Text);
if (ret == 0)
- sprintf(Text, _("*PCSX*: Saved State %d"), StatesC+1);
- else sprintf(Text, _("*PCSX*: Error Saving State %d"), StatesC+1);
+ sprintf(Text, _("*PCSXR*: Saved State %d"), StatesC+1);
+ else sprintf(Text, _("*PCSXR*: Error Saving State %d"), StatesC+1);
GPU_displayText(Text);
if (ShowPic) { ShowPic = 0; gpuShowPic(); }
break;
@@ -108,8 +108,8 @@ void PADhandleKey(int key) {
GetStateFilename(Text, StatesC);
ret = LoadState(Text);
if (ret == 0)
- sprintf(Text, _("*PCSX*: Loaded State %d"), StatesC+1);
- else sprintf(Text, _("*PCSX*: Error Loading State %d"), StatesC+1);
+ sprintf(Text, _("*PCSXR*: Loaded State %d"), StatesC+1);
+ else sprintf(Text, _("*PCSXR*: Error Loading State %d"), StatesC+1);
GPU_displayText(Text);
break;
@@ -120,24 +120,24 @@ void PADhandleKey(int key) {
case VK_F5:
Config.Sio ^= 0x1;
if (Config.Sio)
- sprintf(Text, _("*PCSX*: Sio Irq Always Enabled"));
- else sprintf(Text, _("*PCSX*: Sio Irq Not Always Enabled"));
+ sprintf(Text, _("*PCSXR*: Sio Irq Always Enabled"));
+ else sprintf(Text, _("*PCSXR*: Sio Irq Not Always Enabled"));
GPU_displayText(Text);
break;
case VK_F6:
Config.Mdec ^= 0x1;
if (Config.Mdec)
- sprintf(Text, _("*PCSX*: Black&White Mdecs Only Enabled"));
- else sprintf(Text, _("*PCSX*: Black&White Mdecs Only Disabled"));
+ sprintf(Text, _("*PCSXR*: Black&White Mdecs Only Enabled"));
+ else sprintf(Text, _("*PCSXR*: Black&White Mdecs Only Disabled"));
GPU_displayText(Text);
break;
case VK_F7:
Config.Xa ^= 0x1;
if (Config.Xa == 0)
- sprintf (Text, _("*PCSX*: Xa Enabled"));
- else sprintf (Text, _("*PCSX*: Xa Disabled"));
+ sprintf (Text, _("*PCSXR*: Xa Enabled"));
+ else sprintf (Text, _("*PCSXR*: Xa Disabled"));
GPU_displayText(Text);
break;
@@ -146,19 +146,19 @@ void PADhandleKey(int key) {
return;
case VK_F9:
- GPU_displayText(_("*PCSX*: CdRom Case Opened"));
+ GPU_displayText(_("*PCSXR*: CdRom Case Opened"));
SetCdOpenCaseTime(-1);
LidInterrupt();
break;
case VK_F10:
- GPU_displayText(_("*PCSX*: CdRom Case Closed"));
+ GPU_displayText(_("*PCSXR*: CdRom Case Closed"));
SetCdOpenCaseTime(0);
LidInterrupt();
break;
case VK_F12:
- SysPrintf("*PCSX*: CpuReset\n");
+ SysPrintf("*PCSXR*: CpuReset\n");
psxReset();
break;
@@ -219,12 +219,12 @@ int _OpenPlugins(HWND hWnd) {
ret = CDR_open();
if (ret < 0) { SysMessage (_("Error Opening CDR Plugin")); return -1; }
- SetCurrentDirectory(PcsxDir);
+ SetCurrentDirectory(PcsxrDir);
if (Config.UseNet && !NetOpened) {
netInfo info;
char path[256];
- strcpy(info.EmuName, "PCSX " PACKAGE_VERSION);
+ strcpy(info.EmuName, "PCSXR " PACKAGE_VERSION);
strncpy(info.CdromID, CdromId, 9);
strncpy(info.CdromLabel, CdromLabel, 9);
info.psxMem = psxM;
@@ -294,7 +294,7 @@ int _OpenPlugins(HWND hWnd) {
PAD2_registerVibration(GPU_visualVibration);
PAD2_registerCursor(GPU_cursor);
- SetCurrentDirectory(PcsxDir);
+ SetCurrentDirectory(PcsxrDir);
ShowCursor(FALSE);
return 0;
}
diff --git a/win32/pcsx.dev b/win32/pcsxr.dev
index ed356bab..b88425d8 100644
--- a/win32/pcsx.dev
+++ b/win32/pcsxr.dev
@@ -1,25 +1,25 @@
[Project]
-FileName=pcsx.dev
-Name=pcsx
+FileName=pcsxr.dev
+Name=pcsxr
Ver=1
IsCpp=1
Type=0
-Compiler=-D__GNUWIN32__ -march=pentiumpro -D_M_IX86=600 -W -finline-functions -fomit-frame-pointer -DWIN32 -DNDEBUG -D_WINDOWS -D_MBCS -D__WIN32__ -DPCSX_VERSION=\"1.5\" -D__i386__ -DENABLE_NLS -DPACKAGE=\"pcsx\" -Dinline=__inline___@@_
-CppCompiler=-D__GNUWIN32__ -march=pentiumpro -D_M_IX86=600 -W -finline-functions -DWIN32 -DNDEBUG -D_WINDOWS -D_MBCS -D__WIN32__ -D_MSC_VER_ -DPCSX_VERSION=\"1.5\" -D__i386__ -DENABLE_NLS -DPACKAGE=\"pcsx\"_@@_
+Compiler=-D__GNUWIN32__ -march=pentiumpro -D_M_IX86=600 -W -finline-functions -fomit-frame-pointer -DWIN32 -DNDEBUG -D_WINDOWS -D_MBCS -D__WIN32__ -DPCSXR_VERSION=\"1.5\" -D__i386__ -DENABLE_NLS -DPACKAGE=\"pcsxr\" -Dinline=__inline___@@_
+CppCompiler=-D__GNUWIN32__ -march=pentiumpro -D_M_IX86=600 -W -finline-functions -DWIN32 -DNDEBUG -D_WINDOWS -D_MBCS -D__WIN32__ -D_MSC_VER_ -DPCSXR_VERSION=\"1.5\" -D__i386__ -DENABLE_NLS -DPACKAGE=\"pcsxr\"_@@_
Includes=.;./zlib;../libpcsxcore;./glue;./gui;./intl
Linker=-lkernel32 -luser32 -lgdi32 -lwinspool -lcomdlg32 -ladvapi32 -lshell32 -lole32 -loleaut32 -luuid -lodbc32 -lodbccp32 -lcomctl32 -lwsock32_@@_
Libs=
UnitCount=116
Folders=glue,glue/sys,gui,intl,libpcsxcore,libpcsxcore/ix86,zlib
ObjFiles=
-PrivateResource=pcsx_private.rc
+PrivateResource=pcsxr_private.rc
ResourceIncludes=
MakeIncludes=
Icon=
ExeOutput=
ObjectOutput=
OverrideOutput=0
-OverrideOutputName=pcsx.exe
+OverrideOutputName=pcsxr.exe
HostApplication=
CommandLine=
UseCustomMakefile=0
@@ -500,7 +500,7 @@ OverrideBuildCmd=0
BuildCmd=
[Unit48]
-FileName=gui\pcsx.bmp
+FileName=gui\pcsxr.bmp
Folder=gui
Compile=0
CompileCpp=0
@@ -510,7 +510,7 @@ OverrideBuildCmd=0
BuildCmd=
[Unit49]
-FileName=gui\pcsx.exe.manifest
+FileName=gui\pcsxr.exe.manifest
Folder=gui
Compile=0
CompileCpp=0
@@ -1022,8 +1022,8 @@ FileDescription=Developed using the Dev-C++ IDE
InternalName=
LegalCopyright=
LegalTrademarks=
-OriginalFilename=pcsx.exe
-ProductName=pcsx
+OriginalFilename=pcsxr.exe
+ProductName=pcsxr
ProductVersion=0.1
AutoIncBuildNr=0
@@ -1048,9 +1048,9 @@ BuildCmd=
CompileCpp=1
[Unit101]
-FileName=pcsx.rc
+FileName=pcsxr.rc
CompileCpp=1
-Folder=pcsx
+Folder=pcsxr
Compile=1
Link=0
Priority=1000
@@ -1060,7 +1060,7 @@ BuildCmd=
[Unit100]
FileName=resource.h
CompileCpp=1
-Folder=pcsx
+Folder=pcsxr
Compile=1
Link=1
Priority=1000
diff --git a/win32/pcsx.dsp b/win32/pcsxr.dsp
index 7c4a3766..e8275ca3 100644
--- a/win32/pcsx.dsp
+++ b/win32/pcsxr.dsp
@@ -1,24 +1,24 @@
-# Microsoft Developer Studio Project File - Name="pcsx" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="pcsxr" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Application" 0x0101
-CFG=PCSX - WIN32 RELEASE
+CFG=PCSXR - WIN32 RELEASE
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
-!MESSAGE NMAKE /f "pcsx.mak".
+!MESSAGE NMAKE /f "pcsxr.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "pcsx.mak" CFG="PCSX - WIN32 RELEASE"
+!MESSAGE NMAKE /f "pcsxr.mak" CFG="PCSXR - WIN32 RELEASE"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
-!MESSAGE "pcsx - Win32 Release" (based on "Win32 (x86) Application")
-!MESSAGE "pcsx - Win32 Debug" (based on "Win32 (x86) Application")
+!MESSAGE "pcsxr - Win32 Release" (based on "Win32 (x86) Application")
+!MESSAGE "pcsxr - Win32 Debug" (based on "Win32 (x86) Application")
!MESSAGE
# Begin Project
@@ -29,7 +29,7 @@ CPP=cl.exe
MTL=midl.exe
RSC=rc.exe
-!IF "$(CFG)" == "pcsx - Win32 Release"
+!IF "$(CFG)" == "pcsxr - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
@@ -43,7 +43,7 @@ RSC=rc.exe
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /G6 /Zp16 /MT /W3 /GX /O2 /Op /Ob2 /I "../" /I "./zlib" /I "../libpcsxcore" /I "./glue" /I "./" /I "./gui" /I "./intl" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "__WIN32__" /D "_MSC_VER_" /D PCSX_VERSION=\"1.5\" /D "__i386__" /D "ENABLE_NLS" /D PACKAGE=\"pcsx\" /D inline=__forceinline /FR /FD /Zm200 /c
+# ADD CPP /nologo /G6 /Zp16 /MT /W3 /GX /O2 /Op /Ob2 /I "../" /I "./zlib" /I "../libpcsxcore" /I "./glue" /I "./" /I "./gui" /I "./intl" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "__WIN32__" /D "_MSC_VER_" /D PCSX_VERSION=\"1.5\" /D "__i386__" /D "ENABLE_NLS" /D PACKAGE=\"pcsxr\" /D inline=__forceinline /FR /FD /Zm200 /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x408 /d "NDEBUG"
@@ -55,7 +55,7 @@ LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib wsock32.lib /nologo /subsystem:windows /pdb:none /machine:I386
-!ELSEIF "$(CFG)" == "pcsx - Win32 Debug"
+!ELSEIF "$(CFG)" == "pcsxr - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
@@ -68,8 +68,8 @@ LINK32=link.exe
# PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D PCSX_VERSION=\"1.3\" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /GX /Zi /Od /I "../" /I "./zlib" /I "../libpcsxcore" /I "./glue" /I "./" /I "./gui" /I "./intl" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "__WIN32__" /D "__i386__" /D PCSX_VERSION=\"1.5\" /D "ENABLE_NLS" /D PACKAGE=\"pcsx\" /D inline= /FR /FD /GZ /Zm200 /c
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D PCSXR_VERSION=\"1.3\" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /GX /Zi /Od /I "../" /I "./zlib" /I "../libpcsxcore" /I "./glue" /I "./" /I "./gui" /I "./intl" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "__WIN32__" /D "__i386__" /D PCSXR_VERSION=\"1.5\" /D "ENABLE_NLS" /D PACKAGE=\"pcsxr\" /D inline= /FR /FD /GZ /Zm200 /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x408 /d "_DEBUG"
@@ -85,8 +85,8 @@ LINK32=link.exe
# Begin Target
-# Name "pcsx - Win32 Release"
-# Name "pcsx - Win32 Debug"
+# Name "pcsxr - Win32 Release"
+# Name "pcsxr - Win32 Debug"
# Begin Group "libpcsxcore"
# PROP Default_Filter ""
@@ -348,11 +348,11 @@ SOURCE=.\gui\NoPic.h
# End Source File
# Begin Source File
-SOURCE=.\gui\pcsx.bmp
+SOURCE=.\gui\pcsxr.bmp
# End Source File
# Begin Source File
-SOURCE=.\gui\pcsx.exe.manifest
+SOURCE=.\gui\pcsxr.exe.manifest
# End Source File
# Begin Source File
@@ -573,7 +573,7 @@ SOURCE=.\config.h
# End Source File
# Begin Source File
-SOURCE=.\pcsx.rc
+SOURCE=.\pcsxr.rc
# End Source File
# Begin Source File
diff --git a/win32/pcsx.dsw b/win32/pcsxr.dsw
index 87b8d966..12b36c8b 100644
--- a/win32/pcsx.dsw
+++ b/win32/pcsxr.dsw
@@ -51,7 +51,7 @@ Package=<4>
###############################################################################
-Project: "pcsx"=.\pcsx.dsp - Package Owner=<4>
+Project: "pcsxr"=.\pcsxr.dsp - Package Owner=<4>
Package=<5>
{{{
diff --git a/win32/pcsx.rc b/win32/pcsxr.rc
index 81ee5964..7f25904d 100644
--- a/win32/pcsx.rc
+++ b/win32/pcsxr.rc
@@ -47,9 +47,9 @@ BEGIN
VALUE "CompanyName", "http://pcsxr.codeplex.com/\0"
VALUE "FileDescription", "Playstation Emulator based on PCSX-df\0"
VALUE "FileVersion", "1, 9, 1, 1\0"
- VALUE "InternalName", "pcsx\0"
+ VALUE "InternalName", "pcsxr\0"
VALUE "LegalCopyright", "Copyright (c) 2010\0"
- VALUE "OriginalFilename", "pcsx.exe\0"
+ VALUE "OriginalFilename", "pcsxr.exe\0"
VALUE "ProductName", "PCSX-Reloaded\0"
VALUE "ProductVersion", "1, 9, 1, 1\0"
END
@@ -102,11 +102,11 @@ CAPTION "About"
FONT 8, "MS Sans Serif", 0, 0, 0x1
BEGIN
DEFPUSHBUTTON "OK",IDOK,134,187,50,14
- CTEXT "PCSX EMU\nVersion x.x",IDC_PCSX_ABOUT_TEXT,22,10,112,15,
+ CTEXT "PCSXR EMU\nVersion x.x",IDC_PCSXR_ABOUT_TEXT,22,10,112,15,
0,WS_EX_TRANSPARENT
- CTEXT "PCSX a psx emulator...",IDC_PCSX_ABOUT_AUTHORS,10,35,
+ CTEXT "PCSXR a psx emulator...",IDC_PCSXR_ABOUT_AUTHORS,10,35,
135,63,0,WS_EX_TRANSPARENT
- CTEXT "Greets to...",IDC_PCSX_ABOUT_GREETS,45,110,232,65
+ CTEXT "Greets to...",IDC_PCSXR_ABOUT_GREETS,45,110,232,65
CONTROL 113,IDC_STATIC,"Static",SS_BITMAP | WS_BORDER,155,10,171,
101
GROUPBOX "",IDC_STATIC,5,25,145,77
@@ -379,14 +379,14 @@ IDI_APP_ICON ICON DISCARDABLE "gui\\cdrom02.ico"
//
SPLASH_LOGO BITMAP MOVEABLE PURE "gui\\about.bmp"
-MAIN_LOGO BITMAP MOVEABLE PURE "gui\\pcsx.bmp"
+MAIN_LOGO BITMAP MOVEABLE PURE "gui\\pcsxr.bmp"
/////////////////////////////////////////////////////////////////////////////
//
// 24
//
-1 24 MOVEABLE PURE "gui\\pcsx.exe.manifest"
+1 24 MOVEABLE PURE "gui\\pcsxr.exe.manifest"
#endif // English (U.S.) resources
/////////////////////////////////////////////////////////////////////////////
diff --git a/win32/pcsx.sln b/win32/pcsxr.sln
index af6c0d49..8d0b0b2d 100644
--- a/win32/pcsx.sln
+++ b/win32/pcsxr.sln
@@ -9,7 +9,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SSSPSXpad", "plugins\PadSSS
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gpuPeopsOpenGL", "plugins\peopsxgl\gpuPeopsOpenGL.vcproj", "{726BDE88-F2AD-4666-A4BC-5858F973976E}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pcsx", "pcsx.vcproj", "{9EEA62F5-46DC-4C07-AFE1-F72F9D6B9E3E}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pcsxr", "pcsxr.vcproj", "{9EEA62F5-46DC-4C07-AFE1-F72F9D6B9E3E}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/win32/pcsx.vcproj b/win32/pcsxr.vcproj
index 3bb14150..a37033a1 100644
--- a/win32/pcsx.vcproj
+++ b/win32/pcsxr.vcproj
@@ -2,9 +2,9 @@
<VisualStudioProject
ProjectType="Visual C++"
Version="9.00"
- Name="pcsx"
+ Name="pcsxr"
ProjectGUID="{9EEA62F5-46DC-4C07-AFE1-F72F9D6B9E3E}"
- RootNamespace="pcsx"
+ RootNamespace="pcsxr"
TargetFrameworkVersion="0"
>
<Platforms>
@@ -43,7 +43,7 @@
MkTypLibCompatible="true"
SuppressStartupBanner="true"
TargetEnvironment="1"
- TypeLibraryName=".\Debug/pcsx.tlb"
+ TypeLibraryName=".\Debug/pcsxr.tlb"
HeaderFileName=""
/>
<Tool
@@ -51,10 +51,10 @@
AdditionalOptions="/Zm200 "
Optimization="0"
AdditionalIncludeDirectories="../,./zlib,../libpcsxcore,./glue,./,./gui,./intl"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;__WIN32__;__i386__;PCSX_VERSION=\&quot;1.5\&quot;;ENABLE_NLS;PACKAGE=\&quot;pcsx\&quot;;inline="
+ PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;__WIN32__;__i386__;PCSXR_VERSION=\&quot;1.5\&quot;;ENABLE_NLS;PACKAGE=\&quot;pcsxr\&quot;;inline="
BasicRuntimeChecks="3"
RuntimeLibrary="1"
- PrecompiledHeaderFile=".\Debug/pcsx.pch"
+ PrecompiledHeaderFile=".\Debug/pcsxr.pch"
AssemblerListingLocation=".\Debug/"
ObjectFile=".\Debug/"
ProgramDataBaseFileName=".\Debug/"
@@ -77,11 +77,11 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="odbc32.lib odbccp32.lib comctl32.lib wsock32.lib"
- OutputFile=".\Debug/pcsx.exe"
+ OutputFile=".\Debug/pcsxr.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
GenerateDebugInformation="true"
- ProgramDatabaseFile=".\Debug/pcsx.pdb"
+ ProgramDatabaseFile=".\Debug/pcsxr.pdb"
SubSystem="2"
TargetMachine="1"
/>
@@ -98,7 +98,7 @@
<Tool
Name="VCBscMakeTool"
SuppressStartupBanner="true"
- OutputFile=".\Debug/pcsx.bsc"
+ OutputFile=".\Debug/pcsxr.bsc"
/>
<Tool
Name="VCFxCopTool"
@@ -138,7 +138,7 @@
MkTypLibCompatible="true"
SuppressStartupBanner="true"
TargetEnvironment="1"
- TypeLibraryName=".\Release/pcsx.tlb"
+ TypeLibraryName=".\Release/pcsxr.tlb"
HeaderFileName=""
/>
<Tool
@@ -147,12 +147,12 @@
Optimization="2"
InlineFunctionExpansion="2"
AdditionalIncludeDirectories="../,./zlib,../libpcsxcore,./glue,./,./gui,./intl"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;__WIN32__;_MSC_VER_;PCSX_VERSION=\&quot;1.5\&quot;;__i386__;ENABLE_NLS;PACKAGE=\&quot;pcsx\&quot;;inline=__forceinline"
+ PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;__WIN32__;_MSC_VER_;PCSXR_VERSION=\&quot;1.5\&quot;;__i386__;ENABLE_NLS;PACKAGE=\&quot;pcsxr\&quot;;inline=__forceinline"
StringPooling="true"
RuntimeLibrary="0"
StructMemberAlignment="5"
EnableFunctionLevelLinking="true"
- PrecompiledHeaderFile=".\Release/pcsx.pch"
+ PrecompiledHeaderFile=".\Release/pcsxr.pch"
AssemblerListingLocation=".\Release/"
ObjectFile=".\Release/"
ProgramDataBaseFileName=".\Release/"
@@ -174,7 +174,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="odbc32.lib odbccp32.lib comctl32.lib wsock32.lib"
- OutputFile=".\Release/pcsx.exe"
+ OutputFile=".\Release/pcsxr.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
SubSystem="2"
@@ -192,7 +192,7 @@
<Tool
Name="VCBscMakeTool"
SuppressStartupBanner="true"
- OutputFile=".\Release/pcsx.bsc"
+ OutputFile=".\Release/pcsxr.bsc"
/>
<Tool
Name="VCFxCopTool"
@@ -972,11 +972,11 @@
>
</File>
<File
- RelativePath="gui\pcsx.bmp"
+ RelativePath="gui\pcsxr.bmp"
>
</File>
<File
- RelativePath="gui\pcsx.exe.manifest"
+ RelativePath="gui\pcsxr.exe.manifest"
>
</File>
<File
@@ -1683,7 +1683,7 @@
>
</File>
<File
- RelativePath="pcsx.rc"
+ RelativePath="pcsxr.rc"
>
<FileConfiguration
Name="Debug|Win32"
diff --git a/win32/resource.h b/win32/resource.h
index 28696b11..51e88254 100644
--- a/win32/resource.h
+++ b/win32/resource.h
@@ -1,6 +1,6 @@
//{{NO_DEPENDENCIES}}
// Microsoft Visual C++ generated include file.
-// Used by pcsx.rc
+// Used by pcsxr.rc
//
#define IDS_TITLE 1
#define IDC_SEARCHFOR 100
@@ -61,7 +61,7 @@
#define IDC_DESCR 1013
#define IDC_ADDRESS 1013
#define IDC_CLOSE 1014
-#define IDC_PCSX_ABOUT_TEXT 1014
+#define IDC_PCSXR_ABOUT_TEXT 1014
#define IDC_PSXOUT 1014
#define IDC_ASM_SCROLL 1015
#define IDC_CPU 1015
@@ -101,9 +101,9 @@
#define IDC_LIST2 1028
#define IDC_CONNECTSTR 1028
#define IDC_ASMCHECK15 1029
-#define IDC_PCSX_ABOUT_AUTHORS 1029
+#define IDC_PCSXR_ABOUT_AUTHORS 1029
#define IDC_ASMCHECK16 1030
-#define IDC_PCSX_ABOUT_GREETS 1030
+#define IDC_PCSXR_ABOUT_GREETS 1030
#define IDC_ASMCHECK17 1031
#define IDC_SELPSX 1031
#define IDC_ASMCHECK18 1032