diff options
| author | SND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2010-04-10 12:27:28 +0000 |
|---|---|---|
| committer | SND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2010-04-10 12:27:28 +0000 |
| commit | 998248e80d1c8b1d86007de27ba8baae83ffd986 (patch) | |
| tree | 73700f93687a2340a57c1582806e1ecbb0ff341f | |
| parent | 902986217a71665d8d293ea2532c2df8c9f4962e (diff) | |
| download | pcsxr-998248e80d1c8b1d86007de27ba8baae83ffd986.tar.gz | |
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@44492 e17a0e51-4ae3-4d35-97c3-1a29b211df97
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | data/pcsx.glade2 | 6 | ||||
| -rw-r--r-- | libpcsxcore/cdrom.c | 129 | ||||
| -rw-r--r-- | po/it.po | 72 | ||||
| -rw-r--r-- | po/pcsx.pot | 57 | ||||
| -rw-r--r-- | po/pt_BR.po | 72 | ||||
| -rw-r--r-- | po/zh_CN.po | 76 | ||||
| -rw-r--r-- | po/zh_TW.po | 76 |
8 files changed, 266 insertions, 223 deletions
@@ -8,6 +8,7 @@ April 10, 2010 Wei Mingzhi <whistler_wmz@users.sf.net> * libpcsxcore/psxmem.c: Minor cleanup (thanks Sebun). * libpcsxcore/spu.c: Likewise. * gui/Cheat.c: Likewise. + * libpcsxcore/cdrom.c: Check case open/close in CdlStop (courtesy of shalma). * po/zh_CN.po, po/zh_TW.po, po/it.po, po/pt_BR.po, po/pcsx.pot: Updated. March 21, 2010 Wei Mingzhi <whistler_wmz@users.sf.net> diff --git a/data/pcsx.glade2 b/data/pcsx.glade2 index f84386cc..a26eff75 100644 --- a/data/pcsx.glade2 +++ b/data/pcsx.glade2 @@ -2548,8 +2548,8 @@ PAL</property> <property name="destroy_with_parent">True</property> <property name="type_hint">normal</property> <property name="program_name">PCSX-Reloaded</property> - <property name="version">1.9.91</property> - <property name="copyright" translatable="yes">(C) 1999-2003 PCSX Team + <property name="version">1.9.91+</property> + <property name="copyright" translatable="yes">(C) 1999-2003 PCSX Development Team (C) 2005-2009 PCSX-df Team (C) 2009-2010 PCSX-Reloaded Team</property> <property name="comments" translatable="yes">A PlayStation emulator.</property> @@ -2571,7 +2571,7 @@ 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.</property> <property name="authors">PCSX-Reloaded Maintainer: -Wei Mingzhi <whistler_wmz@users.sourceforge.net> +Wei Mingzhi <whistler_wmz@users.sf.net> PCSX-Reloaded Contributors: avlex (Help on xcode project) diff --git a/libpcsxcore/cdrom.c b/libpcsxcore/cdrom.c index 2df2e25e..558140f0 100644 --- a/libpcsxcore/cdrom.c +++ b/libpcsxcore/cdrom.c @@ -112,7 +112,7 @@ static struct SubQ *subq; cdr.Reading = 0; \ psxRegs.interrupt &= ~0x40000; \ } \ - cdr.StatP &= ~0x20;\
+ cdr.StatP &= ~0x20;\ } #define StopCdda() { \ @@ -171,19 +171,19 @@ void cdrInterrupt() { cdr.Ctrl &= ~0x80; switch (Irq) { - case CdlSync: + case CdlSync: SetResultSize(1); cdr.StatP |= 0x2; - cdr.Result[0] = cdr.StatP; - cdr.Stat = Acknowledge; + cdr.Result[0] = cdr.StatP; + cdr.Stat = Acknowledge; break; - case CdlNop: + case CdlNop: SetResultSize(1); - cdr.Result[0] = cdr.StatP; - cdr.Stat = Acknowledge; + cdr.Result[0] = cdr.StatP; + cdr.Stat = Acknowledge; i = stat.Status; - if (CDR_getStatus(&stat) != -1) { + if (CDR_getStatus(&stat) != -1) { if (stat.Type == 0xff) cdr.Stat = DiskError; if (stat.Status & 0x10) { cdr.Stat = DiskError; @@ -202,8 +202,8 @@ void cdrInterrupt() { cdr.CmdProcess = 0; SetResultSize(1); cdr.StatP |= 0x2; - cdr.Result[0] = cdr.StatP; - cdr.Stat = Acknowledge; + cdr.Result[0] = cdr.StatP; + cdr.Stat = Acknowledge; break; case CdlPlay: @@ -236,17 +236,32 @@ void cdrInterrupt() { cdr.CmdProcess = 0; SetResultSize(1); cdr.StatP |= 0x2; - cdr.Result[0] = cdr.StatP; - cdr.Stat = Complete; + cdr.Result[0] = cdr.StatP; + cdr.Stat = Complete; break; case CdlStop: cdr.CmdProcess = 0; SetResultSize(1); - cdr.StatP &= ~0x2; + cdr.StatP &= ~0x2; cdr.Result[0] = cdr.StatP; - cdr.Stat = Complete; -// cdr.Stat = Acknowledge; + cdr.Stat = Complete; +// cdr.Stat = Acknowledge; + + // check case open/close -shalma + i = stat.Status; + if (CDR_getStatus(&stat) != -1) { + if (stat.Type == 0xff) cdr.Stat = DiskError; + if (stat.Status & 0x10) { + cdr.Stat = DiskError; + cdr.Result[0] |= 0x11; + cdr.Result[0] &= ~0x02; + } else if (i & 0x10) { + cdr.StatP |= 0x2; + cdr.Result[0] |= 0x2; + CheckCdrom(); + } + } break; case CdlPause: @@ -331,47 +346,47 @@ void cdrInterrupt() { cdr.Stat = Acknowledge; break; - case CdlGetlocP:
- SetResultSize(8);
- subq = (struct SubQ *)CDR_getBufferSub();
-
- cdr_localTime[0] = btoi(cdr.Prev[0]);
- cdr_localTime[1] = btoi(cdr.Prev[1]) - 2;
- cdr_localTime[2] = cdr.Prev[2];
-
- // m:s adjustment
- if (cdr_localTime[1] < 0) {
- cdr_localTime[1] += 60;
- cdr_localTime[0] -= 1;
- }
-
- cdr_localTime[1] = itob(cdr_localTime[1]);
- cdr_localTime[0] = itob(cdr_localTime[0]);
-
- if (subq != NULL) {
- cdr.Result[0] = subq->TrackNumber;
- cdr.Result[1] = subq->IndexNumber;
- memcpy(cdr.Result + 2, subq->TrackRelativeAddress, 3);
- memcpy(cdr.Result + 5, subq->AbsoluteAddress, 3);
-
- // subQ integrity check
- if (cdr_localTime[0] != cdr.Result[2] ||
- cdr_localTime[1] != cdr.Result[3] ||
- cdr_localTime[2] != cdr.Result[4] ||
- cdr.Prev[0] != cdr.Result[5] ||
- cdr.Prev[1] != cdr.Result[6] ||
- cdr.Prev[2] != cdr.Result[7]) {
- // wipe out time data
- memset(cdr.Result + 2, 0, 3 + 3);
- }
- } else {
- cdr.Result[0] = 1;
- cdr.Result[1] = 1;
- memcpy(cdr.Result + 2, cdr_localTime, 3);
- memcpy(cdr.Result + 5, cdr.Prev, 3);
- }
-
- cdr.Stat = Acknowledge;
+ case CdlGetlocP: + SetResultSize(8); + subq = (struct SubQ *)CDR_getBufferSub(); + + cdr_localTime[0] = btoi(cdr.Prev[0]); + cdr_localTime[1] = btoi(cdr.Prev[1]) - 2; + cdr_localTime[2] = cdr.Prev[2]; + + // m:s adjustment + if (cdr_localTime[1] < 0) { + cdr_localTime[1] += 60; + cdr_localTime[0] -= 1; + } + + cdr_localTime[1] = itob(cdr_localTime[1]); + cdr_localTime[0] = itob(cdr_localTime[0]); + + if (subq != NULL) { + cdr.Result[0] = subq->TrackNumber; + cdr.Result[1] = subq->IndexNumber; + memcpy(cdr.Result + 2, subq->TrackRelativeAddress, 3); + memcpy(cdr.Result + 5, subq->AbsoluteAddress, 3); + + // subQ integrity check + if (cdr_localTime[0] != cdr.Result[2] || + cdr_localTime[1] != cdr.Result[3] || + cdr_localTime[2] != cdr.Result[4] || + cdr.Prev[0] != cdr.Result[5] || + cdr.Prev[1] != cdr.Result[6] || + cdr.Prev[2] != cdr.Result[7]) { + // wipe out time data + memset(cdr.Result + 2, 0, 3 + 3); + } + } else { + cdr.Result[0] = 1; + cdr.Result[1] = 1; + memcpy(cdr.Result + 2, cdr_localTime, 3); + memcpy(cdr.Result + 5, cdr.Prev, 3); + } + + cdr.Stat = Acknowledge; break; case CdlGetTN: @@ -605,7 +620,7 @@ void cdrReadInterrupt() { cdr.StatP &= ~0x40; cdr.Result[0] = cdr.StatP; - ReadTrack();
+ ReadTrack(); buf = CDR_getBuffer(); if (buf == NULL) @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: pcsxr 1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-10 18:00+0800\n" +"POT-Creation-Date: 2010-04-10 20:25+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" @@ -109,7 +109,7 @@ msgstr "Codice del cheat non valido!" msgid "Add New Cheat" msgstr "Aggiungi un nuovo cheat" -#: ../win32/gui/CheatDlg.c:167 ../data/pcsx.glade2:2609 +#: ../win32/gui/CheatDlg.c:167 ../data/pcsx.glade2:2622 msgid "Edit Cheat Codes" msgstr "Modifica i codici dei cheat" @@ -221,7 +221,7 @@ msgstr "%.8X Attuale: %u (%.8X), Precedente: %u (%.8X)" msgid "Founded Addresses: %d" msgstr "Indirizzi trovati: %d" -#: ../win32/gui/CheatDlg.c:505 ../data/pcsx.glade2:3009 +#: ../win32/gui/CheatDlg.c:505 ../data/pcsx.glade2:3022 msgid "Freeze" msgstr "Blocca" @@ -230,7 +230,7 @@ msgid "Address:" msgstr "Indirizzo:" #: ../win32/gui/CheatDlg.c:507 ../win32/gui/CheatDlg.c:598 -#: ../win32/gui/CheatDlg.c:683 ../gui/Cheat.c:648 ../data/pcsx.glade2:2852 +#: ../win32/gui/CheatDlg.c:683 ../gui/Cheat.c:648 ../data/pcsx.glade2:2865 msgid "Value:" msgstr "Valore:" @@ -239,27 +239,27 @@ msgstr "Valore:" msgid "Freeze %.8X" msgstr "Blocca %.8x" -#: ../win32/gui/CheatDlg.c:596 ../data/pcsx.glade2:3045 +#: ../win32/gui/CheatDlg.c:596 ../data/pcsx.glade2:3058 msgid "Modify" msgstr "Modifica" -#: ../win32/gui/CheatDlg.c:679 ../gui/Cheat.c:1130 ../data/pcsx.glade2:2780 +#: ../win32/gui/CheatDlg.c:679 ../gui/Cheat.c:1130 ../data/pcsx.glade2:2793 msgid "Cheat Search" msgstr "Cerca cheat" -#: ../win32/gui/CheatDlg.c:681 ../data/pcsx.glade2:2830 +#: ../win32/gui/CheatDlg.c:681 ../data/pcsx.glade2:2843 msgid "Search For:" msgstr "Cerca per:" -#: ../win32/gui/CheatDlg.c:682 ../data/pcsx.glade2:2840 +#: ../win32/gui/CheatDlg.c:682 ../data/pcsx.glade2:2853 msgid "Data Type:" msgstr "Tipo di dato:" -#: ../win32/gui/CheatDlg.c:684 ../data/pcsx.glade2:2864 +#: ../win32/gui/CheatDlg.c:684 ../data/pcsx.glade2:2877 msgid "Data Base:" msgstr "Base di dato:" -#: ../win32/gui/CheatDlg.c:685 ../data/pcsx.glade2:2924 +#: ../win32/gui/CheatDlg.c:685 ../data/pcsx.glade2:2937 msgid "To:" msgstr "A:" @@ -2058,7 +2058,7 @@ msgstr "Non/Elimina" msgid "<b>Memory Card 1</b>" msgstr "<b>Memory card 1</b>" -#: ../data/pcsx.glade2:2151 ../data/pcsx.glade2:2201 ../data/pcsx.glade2:3081 +#: ../data/pcsx.glade2:2151 ../data/pcsx.glade2:2201 ../data/pcsx.glade2:3094 msgid "Copy" msgstr "Copia" @@ -2066,17 +2066,12 @@ msgstr "Copia" msgid "<b>Memory Card 2</b>" msgstr "<b>Memory card 2</b>" -#: ../data/pcsx.glade2:2551 +#: ../data/pcsx.glade2:2552 msgid "" -"(C) 1999-2003 PCSX Team\n" -"(C) 2005-2006 Ryan Schultz\n" -"(C) 2005-2006 Andrew Burton\n" -"(C) 2008-2009 Wei Mingzhi" +"(C) 1999-2003 PCSX Development Team\n" +"(C) 2005-2009 PCSX-df Team\n" +"(C) 2009-2010 PCSX-Reloaded Team" msgstr "" -"(C) 1999-2003 PCSX Team\n" -"(C) 2005-2006 Ryan Schultz\n" -"(C) 2005-2006 Andrew Burton\n" -"(C) 2008-2009 Wei Mingzhi" #: ../data/pcsx.glade2:2555 msgid "A PlayStation emulator." @@ -2116,16 +2111,16 @@ msgstr "" "Public License along with this program; if not, write to\n" "the Free Software Foundation, Inc." -#: ../data/pcsx.glade2:2587 +#: ../data/pcsx.glade2:2600 msgid "translator-credits" msgstr "" "Traduzione italiana a cura di Giovanni Scafora <giovanni@archlinux.org>" -#: ../data/pcsx.glade2:2649 +#: ../data/pcsx.glade2:2662 msgid "<b>Cheat Codes</b>" msgstr "<b>Codici cheat</b>" -#: ../data/pcsx.glade2:2815 +#: ../data/pcsx.glade2:2828 msgid "" "8-bit\n" "16-bit\n" @@ -2135,7 +2130,7 @@ msgstr "" "16-bit\n" "32-bit" -#: ../data/pcsx.glade2:2878 +#: ../data/pcsx.glade2:2891 msgid "" "Equal Value\n" "Not Equal Value\n" @@ -2157,7 +2152,7 @@ msgstr "" "Differente\n" "Nessun cambio" -#: ../data/pcsx.glade2:2910 +#: ../data/pcsx.glade2:2923 msgid "" "Decimal\n" "Hexadecimal" @@ -2165,37 +2160,37 @@ msgstr "" "Decimale\n" "Esadecimale" -#: ../data/pcsx.glade2:3114 +#: ../data/pcsx.glade2:3127 msgid "label_resultsfound" msgstr "etichetta_risultatitrovati" -#: ../data/pcsx.glade2:3149 +#: ../data/pcsx.glade2:3162 msgid "Search" msgstr "Cerca" -#: ../data/pcsx.glade2:3185 +#: ../data/pcsx.glade2:3198 msgid "Restart" msgstr "Riavvia" -#: ../data/pcsx.glade2:3214 +#: ../data/pcsx.glade2:3227 msgid "<b>Cheat Search</b>" msgstr "<b>Cerca cheat</b>" -#: ../data/pcsx.glade2:3257 +#: ../data/pcsx.glade2:3270 msgid "Memory Dump" msgstr "" -#: ../data/pcsx.glade2:3279 +#: ../data/pcsx.glade2:3292 #, fuzzy msgid "Address (Hexadecimal):" msgstr "Esadecimale" -#: ../data/pcsx.glade2:3371 +#: ../data/pcsx.glade2:3384 #, fuzzy msgid "Dump Memory..." msgstr "&Memory card..." -#: ../data/pcsx.glade2:3406 +#: ../data/pcsx.glade2:3419 msgid "Patch Memory..." msgstr "" @@ -2972,5 +2967,16 @@ msgstr "Controller 2" msgid "Multi-Threaded (Recommended)" msgstr "Multi-Threaded (consigliato)" +#~ msgid "" +#~ "(C) 1999-2003 PCSX Team\n" +#~ "(C) 2005-2006 Ryan Schultz\n" +#~ "(C) 2005-2006 Andrew Burton\n" +#~ "(C) 2008-2009 Wei Mingzhi" +#~ msgstr "" +#~ "(C) 1999-2003 PCSX Team\n" +#~ "(C) 2005-2006 Ryan Schultz\n" +#~ "(C) 2005-2006 Andrew Burton\n" +#~ "(C) 2008-2009 Wei Mingzhi" + #~ msgid "PulseAudio Simple Sound" #~ msgstr "Audio PulseAudio semplice" diff --git a/po/pcsx.pot b/po/pcsx.pot index e5158019..35ef9e60 100644 --- a/po/pcsx.pot +++ b/po/pcsx.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-10 18:00+0800\n" +"POT-Creation-Date: 2010-04-10 20:25+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -95,7 +95,7 @@ msgstr "" msgid "Add New Cheat" msgstr "" -#: ../win32/gui/CheatDlg.c:167 ../data/pcsx.glade2:2609 +#: ../win32/gui/CheatDlg.c:167 ../data/pcsx.glade2:2622 msgid "Edit Cheat Codes" msgstr "" @@ -207,7 +207,7 @@ msgstr "" msgid "Founded Addresses: %d" msgstr "" -#: ../win32/gui/CheatDlg.c:505 ../data/pcsx.glade2:3009 +#: ../win32/gui/CheatDlg.c:505 ../data/pcsx.glade2:3022 msgid "Freeze" msgstr "" @@ -216,7 +216,7 @@ msgid "Address:" msgstr "" #: ../win32/gui/CheatDlg.c:507 ../win32/gui/CheatDlg.c:598 -#: ../win32/gui/CheatDlg.c:683 ../gui/Cheat.c:648 ../data/pcsx.glade2:2852 +#: ../win32/gui/CheatDlg.c:683 ../gui/Cheat.c:648 ../data/pcsx.glade2:2865 msgid "Value:" msgstr "" @@ -225,27 +225,27 @@ msgstr "" msgid "Freeze %.8X" msgstr "" -#: ../win32/gui/CheatDlg.c:596 ../data/pcsx.glade2:3045 +#: ../win32/gui/CheatDlg.c:596 ../data/pcsx.glade2:3058 msgid "Modify" msgstr "" -#: ../win32/gui/CheatDlg.c:679 ../gui/Cheat.c:1130 ../data/pcsx.glade2:2780 +#: ../win32/gui/CheatDlg.c:679 ../gui/Cheat.c:1130 ../data/pcsx.glade2:2793 msgid "Cheat Search" msgstr "" -#: ../win32/gui/CheatDlg.c:681 ../data/pcsx.glade2:2830 +#: ../win32/gui/CheatDlg.c:681 ../data/pcsx.glade2:2843 msgid "Search For:" msgstr "" -#: ../win32/gui/CheatDlg.c:682 ../data/pcsx.glade2:2840 +#: ../win32/gui/CheatDlg.c:682 ../data/pcsx.glade2:2853 msgid "Data Type:" msgstr "" -#: ../win32/gui/CheatDlg.c:684 ../data/pcsx.glade2:2864 +#: ../win32/gui/CheatDlg.c:684 ../data/pcsx.glade2:2877 msgid "Data Base:" msgstr "" -#: ../win32/gui/CheatDlg.c:685 ../data/pcsx.glade2:2924 +#: ../win32/gui/CheatDlg.c:685 ../data/pcsx.glade2:2937 msgid "To:" msgstr "" @@ -1977,7 +1977,7 @@ msgstr "" msgid "<b>Memory Card 1</b>" msgstr "" -#: ../data/pcsx.glade2:2151 ../data/pcsx.glade2:2201 ../data/pcsx.glade2:3081 +#: ../data/pcsx.glade2:2151 ../data/pcsx.glade2:2201 ../data/pcsx.glade2:3094 msgid "Copy" msgstr "" @@ -1985,12 +1985,11 @@ msgstr "" msgid "<b>Memory Card 2</b>" msgstr "" -#: ../data/pcsx.glade2:2551 +#: ../data/pcsx.glade2:2552 msgid "" -"(C) 1999-2003 PCSX Team\n" -"(C) 2005-2006 Ryan Schultz\n" -"(C) 2005-2006 Andrew Burton\n" -"(C) 2008-2009 Wei Mingzhi" +"(C) 1999-2003 PCSX Development Team\n" +"(C) 2005-2009 PCSX-df Team\n" +"(C) 2009-2010 PCSX-Reloaded Team" msgstr "" #: ../data/pcsx.glade2:2555 @@ -2016,22 +2015,22 @@ msgid "" "the Free Software Foundation, Inc." msgstr "" -#: ../data/pcsx.glade2:2587 +#: ../data/pcsx.glade2:2600 msgid "translator-credits" msgstr "" -#: ../data/pcsx.glade2:2649 +#: ../data/pcsx.glade2:2662 msgid "<b>Cheat Codes</b>" msgstr "" -#: ../data/pcsx.glade2:2815 +#: ../data/pcsx.glade2:2828 msgid "" "8-bit\n" "16-bit\n" "32-bit" msgstr "" -#: ../data/pcsx.glade2:2878 +#: ../data/pcsx.glade2:2891 msgid "" "Equal Value\n" "Not Equal Value\n" @@ -2044,41 +2043,41 @@ msgid "" "No Change" msgstr "" -#: ../data/pcsx.glade2:2910 +#: ../data/pcsx.glade2:2923 msgid "" "Decimal\n" "Hexadecimal" msgstr "" -#: ../data/pcsx.glade2:3114 +#: ../data/pcsx.glade2:3127 msgid "label_resultsfound" msgstr "" -#: ../data/pcsx.glade2:3149 +#: ../data/pcsx.glade2:3162 msgid "Search" msgstr "" -#: ../data/pcsx.glade2:3185 +#: ../data/pcsx.glade2:3198 msgid "Restart" msgstr "" -#: ../data/pcsx.glade2:3214 +#: ../data/pcsx.glade2:3227 msgid "<b>Cheat Search</b>" msgstr "" -#: ../data/pcsx.glade2:3257 +#: ../data/pcsx.glade2:3270 msgid "Memory Dump" msgstr "" -#: ../data/pcsx.glade2:3279 +#: ../data/pcsx.glade2:3292 msgid "Address (Hexadecimal):" msgstr "" -#: ../data/pcsx.glade2:3371 +#: ../data/pcsx.glade2:3384 msgid "Dump Memory..." msgstr "" -#: ../data/pcsx.glade2:3406 +#: ../data/pcsx.glade2:3419 msgid "Patch Memory..." msgstr "" diff --git a/po/pt_BR.po b/po/pt_BR.po index 3b2232ff..d5099f04 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: pcsx-df\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-10 18:00+0800\n" +"POT-Creation-Date: 2010-04-10 20:25+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" @@ -108,7 +108,7 @@ msgstr "Código de trapaça inválido!" msgid "Add New Cheat" msgstr "Adicionar nova Trapaça" -#: ../win32/gui/CheatDlg.c:167 ../data/pcsx.glade2:2609 +#: ../win32/gui/CheatDlg.c:167 ../data/pcsx.glade2:2622 msgid "Edit Cheat Codes" msgstr "Editar Códigos de Trapaça" @@ -220,7 +220,7 @@ msgstr "%.8X Atual: %u (%.8X), Anterior: %u (%.8X)" msgid "Founded Addresses: %d" msgstr "Endereços com o número: %d" -#: ../win32/gui/CheatDlg.c:505 ../data/pcsx.glade2:3009 +#: ../win32/gui/CheatDlg.c:505 ../data/pcsx.glade2:3022 msgid "Freeze" msgstr "Parar" @@ -229,7 +229,7 @@ msgid "Address:" msgstr "Endereço:" #: ../win32/gui/CheatDlg.c:507 ../win32/gui/CheatDlg.c:598 -#: ../win32/gui/CheatDlg.c:683 ../gui/Cheat.c:648 ../data/pcsx.glade2:2852 +#: ../win32/gui/CheatDlg.c:683 ../gui/Cheat.c:648 ../data/pcsx.glade2:2865 msgid "Value:" msgstr "Valor:" @@ -238,27 +238,27 @@ msgstr "Valor:" msgid "Freeze %.8X" msgstr "Parar %.8X" -#: ../win32/gui/CheatDlg.c:596 ../data/pcsx.glade2:3045 +#: ../win32/gui/CheatDlg.c:596 ../data/pcsx.glade2:3058 msgid "Modify" msgstr "Modificar" -#: ../win32/gui/CheatDlg.c:679 ../gui/Cheat.c:1130 ../data/pcsx.glade2:2780 +#: ../win32/gui/CheatDlg.c:679 ../gui/Cheat.c:1130 ../data/pcsx.glade2:2793 msgid "Cheat Search" msgstr "Procurar por trapaça" -#: ../win32/gui/CheatDlg.c:681 ../data/pcsx.glade2:2830 +#: ../win32/gui/CheatDlg.c:681 ../data/pcsx.glade2:2843 msgid "Search For:" msgstr "Buscar por:" -#: ../win32/gui/CheatDlg.c:682 ../data/pcsx.glade2:2840 +#: ../win32/gui/CheatDlg.c:682 ../data/pcsx.glade2:2853 msgid "Data Type:" msgstr "Tipo de dados:" -#: ../win32/gui/CheatDlg.c:684 ../data/pcsx.glade2:2864 +#: ../win32/gui/CheatDlg.c:684 ../data/pcsx.glade2:2877 msgid "Data Base:" msgstr "Banco de dados:" -#: ../win32/gui/CheatDlg.c:685 ../data/pcsx.glade2:2924 +#: ../win32/gui/CheatDlg.c:685 ../data/pcsx.glade2:2937 msgid "To:" msgstr "Para:" @@ -2030,7 +2030,7 @@ msgstr "Apagar/Desfazer" msgid "<b>Memory Card 1</b>" msgstr "<b>Cartão de memória 1</b>" -#: ../data/pcsx.glade2:2151 ../data/pcsx.glade2:2201 ../data/pcsx.glade2:3081 +#: ../data/pcsx.glade2:2151 ../data/pcsx.glade2:2201 ../data/pcsx.glade2:3094 msgid "Copy" msgstr "Copiar" @@ -2038,17 +2038,12 @@ msgstr "Copiar" msgid "<b>Memory Card 2</b>" msgstr "<b>Cartão de memória 2</b>" -#: ../data/pcsx.glade2:2551 +#: ../data/pcsx.glade2:2552 msgid "" -"(C) 1999-2003 PCSX Team\n" -"(C) 2005-2006 Ryan Schultz\n" -"(C) 2005-2006 Andrew Burton\n" -"(C) 2008-2009 Wei Mingzhi" +"(C) 1999-2003 PCSX Development Team\n" +"(C) 2005-2009 PCSX-df Team\n" +"(C) 2009-2010 PCSX-Reloaded Team" msgstr "" -"(C) 1999-2003 Equipe do PCSX\n" -"(C) 2005-2006 Ryan Schultz\n" -"(C) 2005-2006 Andrew Burton\n" -"(C) 2008-2009 Wei Mingzhi" #: ../data/pcsx.glade2:2555 msgid "A PlayStation emulator." @@ -2088,16 +2083,16 @@ msgstr "" "Public License along with this program; if not, write to\n" "the Free Software Foundation, Inc." -#: ../data/pcsx.glade2:2587 +#: ../data/pcsx.glade2:2600 msgid "translator-credits" msgstr "" "Tradução para português brasileiro por Tibério Vítor (tvtoon@gmail.com)" -#: ../data/pcsx.glade2:2649 +#: ../data/pcsx.glade2:2662 msgid "<b>Cheat Codes</b>" msgstr "<b>Códigos de trapaça</b>" -#: ../data/pcsx.glade2:2815 +#: ../data/pcsx.glade2:2828 msgid "" "8-bit\n" "16-bit\n" @@ -2107,7 +2102,7 @@ msgstr "" "16-bit\n" "32-bit" -#: ../data/pcsx.glade2:2878 +#: ../data/pcsx.glade2:2891 msgid "" "Equal Value\n" "Not Equal Value\n" @@ -2129,7 +2124,7 @@ msgstr "" "Diferente\n" "Sem mudanças" -#: ../data/pcsx.glade2:2910 +#: ../data/pcsx.glade2:2923 msgid "" "Decimal\n" "Hexadecimal" @@ -2137,37 +2132,37 @@ msgstr "" "Decimal\n" "Hexadecimal" -#: ../data/pcsx.glade2:3114 +#: ../data/pcsx.glade2:3127 msgid "label_resultsfound" msgstr "Resultados encontrados:" -#: ../data/pcsx.glade2:3149 +#: ../data/pcsx.glade2:3162 msgid "Search" msgstr "Buscar" -#: ../data/pcsx.glade2:3185 +#: ../data/pcsx.glade2:3198 msgid "Restart" msgstr "Reiniciar" -#: ../data/pcsx.glade2:3214 +#: ../data/pcsx.glade2:3227 msgid "<b>Cheat Search</b>" msgstr "<b>Busca de trapaças</b>" -#: ../data/pcsx.glade2:3257 +#: ../data/pcsx.glade2:3270 msgid "Memory Dump" msgstr "" -#: ../data/pcsx.glade2:3279 +#: ../data/pcsx.glade2:3292 #, fuzzy msgid "Address (Hexadecimal):" msgstr "Hexadecimal" -#: ../data/pcsx.glade2:3371 +#: ../data/pcsx.glade2:3384 #, fuzzy msgid "Dump Memory..." msgstr "&Cartões de memória..." -#: ../data/pcsx.glade2:3406 +#: ../data/pcsx.glade2:3419 msgid "Patch Memory..." msgstr "" @@ -2923,3 +2918,14 @@ msgstr "Controle 2" #: ../plugins/dfinput/dfinput.glade2:427 msgid "Multi-Threaded (Recommended)" msgstr "" + +#~ msgid "" +#~ "(C) 1999-2003 PCSX Team\n" +#~ "(C) 2005-2006 Ryan Schultz\n" +#~ "(C) 2005-2006 Andrew Burton\n" +#~ "(C) 2008-2009 Wei Mingzhi" +#~ msgstr "" +#~ "(C) 1999-2003 Equipe do PCSX\n" +#~ "(C) 2005-2006 Ryan Schultz\n" +#~ "(C) 2005-2006 Andrew Burton\n" +#~ "(C) 2008-2009 Wei Mingzhi" diff --git a/po/zh_CN.po b/po/zh_CN.po index 387d396b..2e089766 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: pcsxr 1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-10 18:00+0800\n" -"PO-Revision-Date: 2010-04-10 18:01+0700\n" +"POT-Creation-Date: 2010-04-10 20:25+0800\n" +"PO-Revision-Date: 2010-04-10 20:25+0700\n" "Last-Translator: Wei Mingzhi <whistler@openoffice.org>\n" "Language-Team: Simplified Chinese <whistler@openoffice.org>\n" "MIME-Version: 1.0\n" @@ -128,7 +128,7 @@ msgid "Add New Cheat" msgstr "添加新作弊码" #: ../win32/gui/CheatDlg.c:167 -#: ../data/pcsx.glade2:2609 +#: ../data/pcsx.glade2:2622 msgid "Edit Cheat Codes" msgstr "编辑作弊码" @@ -249,7 +249,7 @@ msgid "Founded Addresses: %d" msgstr "找到地址个数: %d" #: ../win32/gui/CheatDlg.c:505 -#: ../data/pcsx.glade2:3009 +#: ../data/pcsx.glade2:3022 msgid "Freeze" msgstr "固定" @@ -262,7 +262,7 @@ msgstr "地址:" #: ../win32/gui/CheatDlg.c:598 #: ../win32/gui/CheatDlg.c:683 #: ../gui/Cheat.c:648 -#: ../data/pcsx.glade2:2852 +#: ../data/pcsx.glade2:2865 msgid "Value:" msgstr "值:" @@ -272,33 +272,33 @@ msgid "Freeze %.8X" msgstr "固定 %.8X" #: ../win32/gui/CheatDlg.c:596 -#: ../data/pcsx.glade2:3045 +#: ../data/pcsx.glade2:3058 msgid "Modify" msgstr "修改" #: ../win32/gui/CheatDlg.c:679 #: ../gui/Cheat.c:1130 -#: ../data/pcsx.glade2:2780 +#: ../data/pcsx.glade2:2793 msgid "Cheat Search" msgstr "查找作弊码" #: ../win32/gui/CheatDlg.c:681 -#: ../data/pcsx.glade2:2830 +#: ../data/pcsx.glade2:2843 msgid "Search For:" msgstr "查找:" #: ../win32/gui/CheatDlg.c:682 -#: ../data/pcsx.glade2:2840 +#: ../data/pcsx.glade2:2853 msgid "Data Type:" msgstr "数据类型:" #: ../win32/gui/CheatDlg.c:684 -#: ../data/pcsx.glade2:2864 +#: ../data/pcsx.glade2:2877 msgid "Data Base:" msgstr "数据基:" #: ../win32/gui/CheatDlg.c:685 -#: ../data/pcsx.glade2:2924 +#: ../data/pcsx.glade2:2937 msgid "To:" msgstr "到:" @@ -2141,7 +2141,7 @@ msgstr "<b>记忆卡 1</b>" #: ../data/pcsx.glade2:2151 #: ../data/pcsx.glade2:2201 -#: ../data/pcsx.glade2:3081 +#: ../data/pcsx.glade2:3094 msgid "Copy" msgstr "复制" @@ -2149,17 +2149,15 @@ msgstr "复制" msgid "<b>Memory Card 2</b>" msgstr "<b>记忆卡 2</b>" -#: ../data/pcsx.glade2:2551 +#: ../data/pcsx.glade2:2552 msgid "" -"(C) 1999-2003 PCSX Team\n" -"(C) 2005-2006 Ryan Schultz\n" -"(C) 2005-2006 Andrew Burton\n" -"(C) 2008-2009 Wei Mingzhi" +"(C) 1999-2003 PCSX Development Team\n" +"(C) 2005-2009 PCSX-df Team\n" +"(C) 2009-2010 PCSX-Reloaded Team" msgstr "" -"(C) 1999-2003 PCSX 开发组\n" -"(C) 2005-2006 Ryan Schultz\n" -"(C) 2005-2006 Andrew Burton\n" -"(C) 2008-2009 Wei Mingzhi" +"(C) 1999-2003 PCSX 开发组\n" +"(C) 2005-2009 PCSX-df 开发组\n" +"(C) 2009-2010 PCSX-Reloaded 开发组" #: ../data/pcsx.glade2:2555 msgid "A PlayStation emulator." @@ -2199,15 +2197,15 @@ msgstr "" "Public License along with this program; if not, write to\n" "the Free Software Foundation, Inc." -#: ../data/pcsx.glade2:2587 +#: ../data/pcsx.glade2:2600 msgid "translator-credits" msgstr "Wei Mingzhi <whistler@openoffice.org>" -#: ../data/pcsx.glade2:2649 +#: ../data/pcsx.glade2:2662 msgid "<b>Cheat Codes</b>" msgstr "<b>作弊码</b>" -#: ../data/pcsx.glade2:2815 +#: ../data/pcsx.glade2:2828 msgid "" "8-bit\n" "16-bit\n" @@ -2217,7 +2215,7 @@ msgstr "" "16 位\n" "32 位" -#: ../data/pcsx.glade2:2878 +#: ../data/pcsx.glade2:2891 msgid "" "Equal Value\n" "Not Equal Value\n" @@ -2239,7 +2237,7 @@ msgstr "" "改变\n" "无改变" -#: ../data/pcsx.glade2:2910 +#: ../data/pcsx.glade2:2923 msgid "" "Decimal\n" "Hexadecimal" @@ -2247,35 +2245,35 @@ msgstr "" "十进制\n" "十六进制" -#: ../data/pcsx.glade2:3114 +#: ../data/pcsx.glade2:3127 msgid "label_resultsfound" msgstr "label_resultsfound" -#: ../data/pcsx.glade2:3149 +#: ../data/pcsx.glade2:3162 msgid "Search" msgstr "查找" -#: ../data/pcsx.glade2:3185 +#: ../data/pcsx.glade2:3198 msgid "Restart" msgstr "复位" -#: ../data/pcsx.glade2:3214 +#: ../data/pcsx.glade2:3227 msgid "<b>Cheat Search</b>" msgstr "<b>作弊码查找</b>" -#: ../data/pcsx.glade2:3257 +#: ../data/pcsx.glade2:3270 msgid "Memory Dump" msgstr "内存转储" -#: ../data/pcsx.glade2:3279 +#: ../data/pcsx.glade2:3292 msgid "Address (Hexadecimal):" msgstr "地址 (十六进制):" -#: ../data/pcsx.glade2:3371 +#: ../data/pcsx.glade2:3384 msgid "Dump Memory..." msgstr "转储内存..." -#: ../data/pcsx.glade2:3406 +#: ../data/pcsx.glade2:3419 msgid "Patch Memory..." msgstr "修改内存..." @@ -3072,6 +3070,16 @@ msgstr "控制器 2" msgid "Multi-Threaded (Recommended)" msgstr "多线程 (推荐)" +#~ msgid "" +#~ "(C) 1999-2003 PCSX Team\n" +#~ "(C) 2005-2006 Ryan Schultz\n" +#~ "(C) 2005-2006 Andrew Burton\n" +#~ "(C) 2008-2009 Wei Mingzhi" +#~ msgstr "" +#~ "(C) 1999-2003 PCSX 开发组\n" +#~ "(C) 2005-2006 Ryan Schultz\n" +#~ "(C) 2005-2006 Andrew Burton\n" +#~ "(C) 2008-2009 Wei Mingzhi" #~ msgid "PulseAudio Simple Sound" #~ msgstr "PulseAudio Simple 声音" #~ msgid "L-Stick Y" diff --git a/po/zh_TW.po b/po/zh_TW.po index c4e89ef2..ac037cc5 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: pcsxr 1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-10 18:00+0800\n" -"PO-Revision-Date: 2010-04-10 18:03+0700\n" +"POT-Creation-Date: 2010-04-10 20:25+0800\n" +"PO-Revision-Date: 2010-04-10 20:26+0700\n" "Last-Translator: Wei Mingzhi <whistler@openoffice.org>\n" "Language-Team: Traditional Chinese <whistler@openoffice.org>\n" "MIME-Version: 1.0\n" @@ -128,7 +128,7 @@ msgid "Add New Cheat" msgstr "添加新金手指" #: ../win32/gui/CheatDlg.c:167 -#: ../data/pcsx.glade2:2609 +#: ../data/pcsx.glade2:2622 msgid "Edit Cheat Codes" msgstr "編輯金手指" @@ -249,7 +249,7 @@ msgid "Founded Addresses: %d" msgstr "找到位址: %d" #: ../win32/gui/CheatDlg.c:505 -#: ../data/pcsx.glade2:3009 +#: ../data/pcsx.glade2:3022 msgid "Freeze" msgstr "固定" @@ -262,7 +262,7 @@ msgstr "位址:" #: ../win32/gui/CheatDlg.c:598 #: ../win32/gui/CheatDlg.c:683 #: ../gui/Cheat.c:648 -#: ../data/pcsx.glade2:2852 +#: ../data/pcsx.glade2:2865 msgid "Value:" msgstr "值:" @@ -272,33 +272,33 @@ msgid "Freeze %.8X" msgstr "固定 %.8X" #: ../win32/gui/CheatDlg.c:596 -#: ../data/pcsx.glade2:3045 +#: ../data/pcsx.glade2:3058 msgid "Modify" msgstr "更改" #: ../win32/gui/CheatDlg.c:679 #: ../gui/Cheat.c:1130 -#: ../data/pcsx.glade2:2780 +#: ../data/pcsx.glade2:2793 msgid "Cheat Search" msgstr "搜尋金手指碼" #: ../win32/gui/CheatDlg.c:681 -#: ../data/pcsx.glade2:2830 +#: ../data/pcsx.glade2:2843 msgid "Search For:" msgstr "搜尋:" #: ../win32/gui/CheatDlg.c:682 -#: ../data/pcsx.glade2:2840 +#: ../data/pcsx.glade2:2853 msgid "Data Type:" msgstr "數值類型:" #: ../win32/gui/CheatDlg.c:684 -#: ../data/pcsx.glade2:2864 +#: ../data/pcsx.glade2:2877 msgid "Data Base:" msgstr "數值基:" #: ../win32/gui/CheatDlg.c:685 -#: ../data/pcsx.glade2:2924 +#: ../data/pcsx.glade2:2937 msgid "To:" msgstr "至:" @@ -2141,7 +2141,7 @@ msgstr "<b>記憶卡 1</b>" #: ../data/pcsx.glade2:2151 #: ../data/pcsx.glade2:2201 -#: ../data/pcsx.glade2:3081 +#: ../data/pcsx.glade2:3094 msgid "Copy" msgstr "複制" @@ -2149,17 +2149,15 @@ msgstr "複制" msgid "<b>Memory Card 2</b>" msgstr "<b>記憶卡 2</b>" -#: ../data/pcsx.glade2:2551 +#: ../data/pcsx.glade2:2552 msgid "" -"(C) 1999-2003 PCSX Team\n" -"(C) 2005-2006 Ryan Schultz\n" -"(C) 2005-2006 Andrew Burton\n" -"(C) 2008-2009 Wei Mingzhi" +"(C) 1999-2003 PCSX Development Team\n" +"(C) 2005-2009 PCSX-df Team\n" +"(C) 2009-2010 PCSX-Reloaded Team" msgstr "" -"(C) 1999-2003 PCSX 開發組\n" -"(C) 2005-2006 Ryan Schultz\n" -"(C) 2005-2006 Andrew Burton\n" -"(C) 2008-2009 Wei Mingzhi" +"(C) 1999-2003 PCSX 開發組\n" +"(C) 2005-2009 PCSX-df 開發組\n" +"(C) 2009-2010 PCSX-Reloaded 開發組" #: ../data/pcsx.glade2:2555 msgid "A PlayStation emulator." @@ -2199,15 +2197,15 @@ msgstr "" "Public License along with this program; if not, write to\n" "the Free Software Foundation, Inc." -#: ../data/pcsx.glade2:2587 +#: ../data/pcsx.glade2:2600 msgid "translator-credits" msgstr "Wei Mingzhi <whistler@openoffice.org>" -#: ../data/pcsx.glade2:2649 +#: ../data/pcsx.glade2:2662 msgid "<b>Cheat Codes</b>" msgstr "<b>金手指碼</b>" -#: ../data/pcsx.glade2:2815 +#: ../data/pcsx.glade2:2828 msgid "" "8-bit\n" "16-bit\n" @@ -2217,7 +2215,7 @@ msgstr "" "16 位元\n" "32 位元" -#: ../data/pcsx.glade2:2878 +#: ../data/pcsx.glade2:2891 msgid "" "Equal Value\n" "Not Equal Value\n" @@ -2239,7 +2237,7 @@ msgstr "" "不同\n" "無變動" -#: ../data/pcsx.glade2:2910 +#: ../data/pcsx.glade2:2923 msgid "" "Decimal\n" "Hexadecimal" @@ -2247,35 +2245,35 @@ msgstr "" "十進制\n" "十六進制" -#: ../data/pcsx.glade2:3114 +#: ../data/pcsx.glade2:3127 msgid "label_resultsfound" msgstr "label_resultsfound" -#: ../data/pcsx.glade2:3149 +#: ../data/pcsx.glade2:3162 msgid "Search" msgstr "搜尋" -#: ../data/pcsx.glade2:3185 +#: ../data/pcsx.glade2:3198 msgid "Restart" msgstr "重新開始" -#: ../data/pcsx.glade2:3214 +#: ../data/pcsx.glade2:3227 msgid "<b>Cheat Search</b>" msgstr "<b>金手指碼搜尋</b>" -#: ../data/pcsx.glade2:3257 +#: ../data/pcsx.glade2:3270 msgid "Memory Dump" msgstr "記憶體轉儲" -#: ../data/pcsx.glade2:3279 +#: ../data/pcsx.glade2:3292 msgid "Address (Hexadecimal):" msgstr "位址 (十六進制):" -#: ../data/pcsx.glade2:3371 +#: ../data/pcsx.glade2:3384 msgid "Dump Memory..." msgstr "轉儲記憶體..." -#: ../data/pcsx.glade2:3406 +#: ../data/pcsx.glade2:3419 msgid "Patch Memory..." msgstr "修改記憶體..." @@ -3072,6 +3070,16 @@ msgstr "控制器 2" msgid "Multi-Threaded (Recommended)" msgstr "多執行緒 (建議使用)" +#~ msgid "" +#~ "(C) 1999-2003 PCSX Team\n" +#~ "(C) 2005-2006 Ryan Schultz\n" +#~ "(C) 2005-2006 Andrew Burton\n" +#~ "(C) 2008-2009 Wei Mingzhi" +#~ msgstr "" +#~ "(C) 1999-2003 PCSX 開發組\n" +#~ "(C) 2005-2006 Ryan Schultz\n" +#~ "(C) 2005-2006 Andrew Burton\n" +#~ "(C) 2008-2009 Wei Mingzhi" #~ msgid "PulseAudio Simple Sound" #~ msgstr "PulseAudio Simple 聲音" #~ msgid "L-Stick Y" |
