BIAS was moved into rec/int.

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

12 files changed, 73 insertions, 62 deletions

diff --git a/ChangeLog b/ChangeLog
index 03e70d8d..053307ba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+May 14, 2010 edgbla <edgbla@yandex.ru>
+
+ * libpcsxcore/psxinterpreter.c: Bias was moved into rec/int.
+ * libpcsxcore/ppc/pR3000A.c: Likewise.
+ * libpcsxcore/cdrom.c: Likewise.
+ * libpcsxcore/ix86_64/iR3000A-64.c: Likewise.
+ * libpcsxcore/mdec.c: Likewise.
+ * libpcsxcore/ix86/iR3000A.c: Likewise.
+ * libpcsxcore/psxcommon.h: Likewise.
+ * libpcsxcore/sio.c: Likewise.
+ * libpcsxcore/psxdma.c: Likewise.
+ * libpcsxcore/psxcounters.c: Likewise.
+ * po/ru_RU.po: Updated.
+
 May 14, 2010 Wei Mingzhi <whistler_wmz@users.sf.net>
 
  * data/pcsx.glade2: Moved About dialog box out of glade2 file.
diff --git a/libpcsxcore/cdrom.c b/libpcsxcore/cdrom.c
index 75d1b5a1..db449103 100644
--- a/libpcsxcore/cdrom.c
+++ b/libpcsxcore/cdrom.c
@@ -85,8 +85,8 @@ unsigned char Test23[] = { 0x43, 0x58, 0x44, 0x32, 0x39 ,0x34, 0x30, 0x51 };
 
 // 1x = 75 sectors per second
 // PSXCLK = 1 sec in the ps
-// so (PSXCLK / 75) / BIAS = cdr read time (linuzappz)
-#define cdReadTime ((PSXCLK / 75) / BIAS)
+// so (PSXCLK / 75) = cdr read time (linuzappz)
+#define cdReadTime (PSXCLK / 75)
 
 static struct CdrStat stat;
 static struct SubQ *subq;
diff --git a/libpcsxcore/ix86/iR3000A.c b/libpcsxcore/ix86/iR3000A.c
index b8076409..f8583d84 100644
--- a/libpcsxcore/ix86/iR3000A.c
+++ b/libpcsxcore/ix86/iR3000A.c
@@ -97,7 +97,7 @@ static void iFlushRegs() {
 
 static void iRet() {
 	/* store cycle */
-	count = (pc - pcold)/4;
+	count = ((pc - pcold) / 4) * BIAS;
 	ADD32ItoM((u32)&psxRegs.cycle, count);
 	if (resp) ADD32ItoR(ESP, resp);
 	RET();
@@ -148,7 +148,7 @@ static void SetBranch() {
 		iFlushRegs();
 		MOV32ItoM((u32)&psxRegs.code, psxRegs.code);
 		/* store cycle */
-		count = (pc - pcold) / 4;
+		count = ((pc - pcold) / 4) * BIAS;
 		ADD32ItoM((u32)&psxRegs.cycle, count);
 		if (resp) ADD32ItoR(ESP, resp);
 
@@ -180,7 +180,7 @@ static void iJump(u32 branchPC) {
 		iFlushRegs();
 		MOV32ItoM((u32)&psxRegs.code, psxRegs.code);
 		/* store cycle */
-		count = (pc - pcold)/4;
+		count = ((pc - pcold) / 4) * BIAS;
 		ADD32ItoM((u32)&psxRegs.cycle, count);
 		if (resp) ADD32ItoR(ESP, resp);
 
@@ -199,7 +199,7 @@ static void iJump(u32 branchPC) {
 	MOV32ItoM((u32)&psxRegs.pc, branchPC);
 	CALLFunc((u32)psxBranchTest);
 	/* store cycle */
-	count = (pc - pcold)/4;
+	count = ((pc - pcold) / 4) * BIAS;
 	ADD32ItoM((u32)&psxRegs.cycle, count);
 	if (resp) ADD32ItoR(ESP, resp);
 
@@ -236,7 +236,7 @@ static void iBranch(u32 branchPC, int savectx) {
 		iFlushRegs();
 		MOV32ItoM((u32)&psxRegs.code, psxRegs.code);
 		/* store cycle */
-		count = ((pc+4) - pcold)/4;
+		count = (((pc+4) - pcold) / 4) * BIAS;
 		ADD32ItoM((u32)&psxRegs.cycle, count);
 		if (resp) ADD32ItoR(ESP, resp);
 
@@ -256,7 +256,7 @@ static void iBranch(u32 branchPC, int savectx) {
 	MOV32ItoM((u32)&psxRegs.pc, branchPC);
 	CALLFunc((u32)psxBranchTest);
 	/* store cycle */
-	count = (pc - pcold)/4;
+	count = ((pc - pcold) / 4) * BIAS;
 	ADD32ItoM((u32)&psxRegs.cycle, count);
 	if (resp) ADD32ItoR(ESP, resp);
 
diff --git a/libpcsxcore/ix86_64/iR3000A-64.c b/libpcsxcore/ix86_64/iR3000A-64.c
index 37cce7dd..a0ffd0d2 100644
--- a/libpcsxcore/ix86_64/iR3000A-64.c
+++ b/libpcsxcore/ix86_64/iR3000A-64.c
@@ -110,7 +110,7 @@ static void iFlushRegs() {
 
 static void iRet() {
 	/* store cycle */
-	count = (pc - pcold)/4;
+	count = ((pc - pcold) / 4) * BIAS;
 	ADD32ItoM((uptr)&psxRegs.cycle, count);
 	StackRes();
 	RET();
@@ -161,7 +161,7 @@ static void SetBranch() {
 		iFlushRegs();
 		MOV32ItoM((uptr)&psxRegs.code, psxRegs.code);
 		/* store cycle */
-		count = (pc - pcold)/4;
+		count = ((pc - pcold) / 4) * BIAS;
 		ADD32ItoM((uptr)&psxRegs.cycle, count);
 
 		//PUSH64M((uptr)&target);
@@ -193,7 +193,7 @@ static void iJump(u32 branchPC) {
 		iFlushRegs();
 		MOV32ItoM((uptr)&psxRegs.code, psxRegs.code);
 		/* store cycle */
-		count = (pc - pcold)/4;
+		count = ((pc - pcold) / 4) * BIAS;
 		ADD32ItoM((uptr)&psxRegs.cycle, count);
 
 		//PUSHI(branchPC);
@@ -213,7 +213,7 @@ static void iJump(u32 branchPC) {
 	MOV32ItoM((uptr)&psxRegs.pc, branchPC);
 	CALLFunc((uptr)psxBranchTest);
 	/* store cycle */
-	count = (pc - pcold)/4;
+	count = ((pc - pcold) / 4) * BIAS;
 	ADD32ItoM((uptr)&psxRegs.cycle, count);
 	StackRes();
 
@@ -257,7 +257,7 @@ static void iBranch(u32 branchPC, int savectx) {
 		iFlushRegs();
 		MOV32ItoM((uptr)&psxRegs.code, psxRegs.code);
 		/* store cycle */
-		count = ((pc+4) - pcold)/4;
+		count = (((pc+4) - pcold) / 4) * BIAS;
 		ADD32ItoM((uptr)&psxRegs.cycle, count);
 		//if (resp) ADD32ItoR(ESP, resp);
 
@@ -278,7 +278,7 @@ static void iBranch(u32 branchPC, int savectx) {
 	MOV32ItoM((uptr)&psxRegs.pc, branchPC);
 	CALLFunc((uptr)psxBranchTest);
 	/* store cycle */
-	count = (pc - pcold)/4;
+	count = ((pc - pcold) / 4) * BIAS;
 	ADD32ItoM((uptr)&psxRegs.cycle, count);
 	
 	StackRes();
diff --git a/libpcsxcore/mdec.c b/libpcsxcore/mdec.c
index 5cba2796..8048cf32 100644
--- a/libpcsxcore/mdec.c
+++ b/libpcsxcore/mdec.c
@@ -516,16 +516,16 @@ void psxDma1(u32 adr, u32 bcr, u32 chcr) {
 	image = (u16 *)PSXM(adr);
 
 	if (mdec.reg0 & MDEC0_RGB24) { // 15-b decoding
-		// MDECOUTDMA_INT(((size * (1000000 / 9000)) / 4) /** 4*/ / BIAS);
-		MDECOUTDMA_INT((size / 4) / BIAS);
+		// MDECOUTDMA_INT(((size * (1000000 / 9000)) / 4) /** 4*/);
+		MDECOUTDMA_INT((size / 4));
 		size = size / ((16 * 16) / 2);
 		for (; size > 0; size--, image += (16 * 16)) {
 			mdec.rl = rl2blk(blk, mdec.rl);
 			yuv2rgb15(blk, image);
 		}
 	} else { // 24-b decoding
-		// MDECOUTDMA_INT(((size * (1000000 / 9000)) / 4) /** 4*/ / BIAS);
-		MDECOUTDMA_INT((size / 4) / BIAS);
+		// MDECOUTDMA_INT(((size * (1000000 / 9000)) / 4) /** 4*/);
+		MDECOUTDMA_INT((size / 4));
 		size = size / ((24 * 16) / 2);
 		for (; size>0; size--, image += (24 * 16)) {
 			mdec.rl = rl2blk(blk, mdec.rl);
diff --git a/libpcsxcore/ppc/pR3000A.c b/libpcsxcore/ppc/pR3000A.c
index d0037b64..93745f82 100644
--- a/libpcsxcore/ppc/pR3000A.c
+++ b/libpcsxcore/ppc/pR3000A.c
@@ -741,7 +741,7 @@ static void Return()
 
 static void iRet() {
     /* store cycle */
-    count = idlecyclecount + (pc - pcold)/4;
+    count = (idlecyclecount + (pc - pcold) / 4) * BIAS;
     ADDI(PutHWRegSpecial(CYCLECOUNT), GetHWRegSpecial(CYCLECOUNT), count);
     Return();
 }
@@ -793,7 +793,7 @@ static void SetBranch() {
 		LIW(0, psxRegs.code);
 		STW(0, OFFSET(&psxRegs, &psxRegs.code), GetHWRegSpecial(PSXREGS));
 		/* store cycle */
-		count = idlecyclecount + (pc - pcold)/4;
+		count = (idlecyclecount + (pc - pcold) / 4) * BIAS;
 		ADDI(PutHWRegSpecial(CYCLECOUNT), GetHWRegSpecial(CYCLECOUNT), count);
 		
 		treg = GetHWRegSpecial(TARGET);
@@ -816,7 +816,7 @@ static void SetBranch() {
 	DisposeHWReg(GetHWRegFromCPUReg(treg));
 	FlushAllHWReg();
 
-	count = idlecyclecount + (pc - pcold)/4;
+	count = (idlecyclecount + (pc - pcold) / 4) * BIAS;
         ADDI(PutHWRegSpecial(CYCLECOUNT), GetHWRegSpecial(CYCLECOUNT), count);
 	FlushAllHWReg();
 	CALLFunc((u32)psxBranchTest);
@@ -836,7 +836,7 @@ static void iJump(u32 branchPC) {
 		LIW(0, psxRegs.code);
 		STW(0, OFFSET(&psxRegs, &psxRegs.code), GetHWRegSpecial(PSXREGS));
 		/* store cycle */
-		count = idlecyclecount + (pc - pcold)/4;
+		count = (idlecyclecount + (pc - pcold) / 4) * BIAS;
 		ADDI(PutHWRegSpecial(CYCLECOUNT), GetHWRegSpecial(CYCLECOUNT), count);
 
 		LIW(PutHWRegSpecial(ARG2), branchPC);
@@ -855,7 +855,7 @@ static void iJump(u32 branchPC) {
 	LIW(PutHWRegSpecial(PSXPC), branchPC);
 	FlushAllHWReg();
 
-	count = idlecyclecount + (pc - pcold)/4;
+	count = (idlecyclecount + (pc - pcold) / 4) * BIAS;
         //if (/*psxRegs.code == 0 &&*/ count == 2 && branchPC == pcold) {
         //    LIW(PutHWRegSpecial(CYCLECOUNT), 0);
         //} else {
@@ -916,7 +916,7 @@ static void iBranch(u32 branchPC, int savectx) {
 		LIW(0, psxRegs.code);
 		STW(0, OFFSET(&psxRegs, &psxRegs.code), GetHWRegSpecial(PSXREGS));
 		/* store cycle */
-		count = idlecyclecount + ((pc+4) - pcold)/4;
+		count = (idlecyclecount + ((pc+4) - pcold) / 4) * BIAS;
 		ADDI(PutHWRegSpecial(CYCLECOUNT), GetHWRegSpecial(CYCLECOUNT), count);
 
 		LIW(PutHWRegSpecial(ARG2), branchPC);
@@ -937,7 +937,7 @@ static void iBranch(u32 branchPC, int savectx) {
 	FlushAllHWReg();
 
 	/* store cycle */
-	count = idlecyclecount + (pc - pcold)/4;
+	count = (idlecyclecount + (pc - pcold) / 4) * BIAS;
         //if (/*psxRegs.code == 0 &&*/ count == 2 && branchPC == pcold) {
         //    LIW(PutHWRegSpecial(CYCLECOUNT), 0);
         //} else {
@@ -3324,7 +3324,7 @@ static void recHLE() {
 		CALLFunc((u32)psxHLEt[0]); // call dummy function
 	}
 	
-	count = idlecyclecount + (pc - pcold)/4 + 20;
+	count = (idlecyclecount + (pc - pcold) / 4 + 20) * BIAS;
 	ADDI(PutHWRegSpecial(CYCLECOUNT), GetHWRegSpecial(CYCLECOUNT), count);
 	FlushAllHWReg();
 	CALLFunc((u32)psxBranchTest);
diff --git a/libpcsxcore/psxcommon.h b/libpcsxcore/psxcommon.h
index d04be1e8..1d60c3e5 100644
--- a/libpcsxcore/psxcommon.h
+++ b/libpcsxcore/psxcommon.h
@@ -140,7 +140,6 @@ extern boolean NetOpened;
 	if (Mode == 1) gzwrite(f, ptr, size); \
 	if (Mode == 0) gzread(f, ptr, size);
 
-//#define BIAS	4
 #define BIAS	2
 #define PSXCLK	33868800	/* 33.8688 Mhz */
 
diff --git a/libpcsxcore/psxcounters.c b/libpcsxcore/psxcounters.c
index d26a3d93..d1089b66 100644
--- a/libpcsxcore/psxcounters.c
+++ b/libpcsxcore/psxcounters.c
@@ -116,7 +116,7 @@ void _psxRcntWcount( u32 index, u32 value )
         value &= 0xffff;
     }
 
-    rcnts[index].cycleStart  = psxRegs.cycle * BIAS;
+    rcnts[index].cycleStart  = psxRegs.cycle;
     rcnts[index].cycleStart -= value * rcnts[index].rate;
 
     // TODO: <=.
@@ -137,7 +137,7 @@ u32 _psxRcntRcount( u32 index )
 {
     u32 count;
 
-    count  = psxRegs.cycle * BIAS;
+    count  = psxRegs.cycle;
     count -= rcnts[index].cycleStart;
     count /= rcnts[index].rate;
 
@@ -158,7 +158,7 @@ void psxRcntSet()
     s32 countToUpdate;
     u32 i;
 
-    psxNextsCounter = psxRegs.cycle * BIAS;
+    psxNextsCounter = psxRegs.cycle;
     psxNextCounter  = 0x7fffffff;
 
     for( i = 0; i < CounterQuantity; ++i )
@@ -189,7 +189,7 @@ void psxRcntReset( u32 index )
     {
         if( rcnts[index].mode & RcCountToTarget )
         {
-            count  = psxRegs.cycle * BIAS;
+            count  = psxRegs.cycle;
             count -= rcnts[index].cycleStart;
             count /= rcnts[index].rate;
             count -= rcnts[index].target;
@@ -215,7 +215,7 @@ void psxRcntReset( u32 index )
     }
     else if( rcnts[index].counterState == CountToOverflow )
     {
-        count  = psxRegs.cycle * BIAS;
+        count  = psxRegs.cycle;
         count -= rcnts[index].cycleStart;
         count /= rcnts[index].rate;
         count -= 0xffff;
@@ -244,7 +244,7 @@ void psxRcntUpdate()
 {
     u32 cycle;
 
-    cycle = psxRegs.cycle * BIAS;
+    cycle = psxRegs.cycle;
 
     // rcnt 0.
     if( cycle - rcnts[0].cycleStart >= rcnts[0].cycle )
@@ -291,7 +291,7 @@ void psxRcntUpdate()
         }
         */
         // Update lace. (with InuYasha fix)
-        if( hSyncCount == (Config.VSyncWA ? HSyncTotal[Config.PsxType] / 2 : HSyncTotal[Config.PsxType]) )
+        if( hSyncCount == (Config.VSyncWA ? HSyncTotal[Config.PsxType] / BIAS : HSyncTotal[Config.PsxType]) )
         {
             hSyncCount = 0;
 
diff --git a/libpcsxcore/psxdma.c b/libpcsxcore/psxdma.c
index 7a1d2ae0..e5222be9 100644
--- a/libpcsxcore/psxdma.c
+++ b/libpcsxcore/psxdma.c
@@ -106,7 +106,7 @@ void psxDma2(u32 madr, u32 bcr, u32 chcr) { // GPU
 			}
 			size = (bcr >> 16) * (bcr & 0xffff);
 			GPU_writeDataMem(ptr, size);
-			GPUDMA_INT((size / 4) / BIAS);
+			GPUDMA_INT((size / 4));
 			return;
 //			break;
 
diff --git a/libpcsxcore/psxinterpreter.c b/libpcsxcore/psxinterpreter.c
index dabec103..af352823 100644
--- a/libpcsxcore/psxinterpreter.c
+++ b/libpcsxcore/psxinterpreter.c
@@ -286,7 +286,7 @@ __inline void doBranch(u32 tar) {
 	debugI();
 
 	psxRegs.pc += 4;
-	psxRegs.cycle++;
+	psxRegs.cycle += BIAS;
 
 	// check for load delay
 	tmp = psxRegs.code >> 26;
@@ -789,7 +789,7 @@ inline void execI() {
 	if (Config.Debug) ProcessDebug();
 
 	psxRegs.pc += 4;
-	psxRegs.cycle++;
+	psxRegs.cycle += BIAS;
 
 	psxBSC[psxRegs.code >> 26]();
 }
diff --git a/libpcsxcore/sio.c b/libpcsxcore/sio.c
index 4f4552ea..cc179e25 100644
--- a/libpcsxcore/sio.c
+++ b/libpcsxcore/sio.c
@@ -66,11 +66,12 @@ static unsigned int padst;
 char Mcd1Data[MCD_SIZE], Mcd2Data[MCD_SIZE];
 
 // clk cycle byte
-// 4us * 8bits = ((PSXCLK / 1000000) * 32) / BIAS; (linuzappz)
+// 4us * 8bits = ((PSXCLK / 1000000) * 32); (linuzappz)
+// TODO: add SioModePrescaler and BaudReg
 #define SIO_INT() { \
 	if (!Config.Sio) { \
 		psxRegs.interrupt |= 0x80; \
-		psxRegs.intCycle[7 + 1] = 200; /*271;*/ \
+		psxRegs.intCycle[7 + 1] = 400; \
 		psxRegs.intCycle[7] = psxRegs.cycle; \
 	} \
 }
diff --git a/po/ru_RU.po b/po/ru_RU.po
index c5e2637d..3d8281f5 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: pcsxr 1.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-05-14 10:55+0800\n"
-"PO-Revision-Date: 2010-05-13 09:19+0400\n"
+"PO-Revision-Date: 2010-05-14 06:01+0400\n"
 "Last-Translator: Blade_Arma <edgbla@yandex.ru>\n"
 "Language-Team: American English <kde-i18n-doc@kde.org>\n"
 "MIME-Version: 1.0\n"
@@ -387,8 +387,7 @@ msgid "NetPlay"
 msgstr "Сетевая игра"
 
 #: ../win32/gui/ConfigurePlugins.c:620
-msgid ""
-"Note: The NetPlay Plugin Directory should be the same as the other Plugins."
+msgid "Note: The NetPlay Plugin Directory should be the same as the other Plugins."
 msgstr ""
 "Внимание! NetPlay плагин должен находится в том же каталоге что и остальные "
 "плагины."
@@ -635,7 +634,7 @@ msgstr "Выключить CD музыку"
 
 #: ../win32/gui/WndMain.c:1209 ../data/pcsx.glade2:1595
 msgid "Autodetect"
-msgstr "Автоопределение"
+msgstr "Авто-определение"
 
 #: ../win32/gui/WndMain.c:1210
 msgid "Enable Interpreter Cpu"
@@ -1273,8 +1272,7 @@ msgstr "Отформатировать карту памяти?"
 msgid ""
 "If you format the memory card, the card will be empty, and any existing data "
 "overwritten."
-msgstr ""
-"При форматировании все данные на карте памяти будут безвозвратно утеряны."
+msgstr "При форматировании все данные на карте памяти будут безвозвратно утеряны."
 
 #: ../gui/MemcardDlg.c:363
 msgid "Format card"
@@ -1651,15 +1649,15 @@ msgstr "Отображать FPS"
 
 #: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:220
 msgid "Toggle whether the FPS will be shown."
-msgstr "Toggle whether the FPS will be shown."
+msgstr "Отображать FPS при старте эмуляции."
 
 #: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:232
 msgid "Autodetect FPS limit"
-msgstr "Автоопределение FPS"
+msgstr "Авто-определение FPS"
 
 #: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:236
 msgid "Enable this if games display too quickly."
-msgstr "Enable this if games display too quickly."
+msgstr "Следует включить для автоматического определения и ограничения скорости игры."
 
 #: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:249
 msgid "Enable frame skipping"
@@ -1704,7 +1702,7 @@ msgstr ""
 
 #: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:426
 msgid "Disable CPU Saving"
-msgstr ""
+msgstr "Выключить экономию ресурсов ЦПУ"
 
 #: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:442
 msgid "Odd/even bit hack"
@@ -1716,7 +1714,7 @@ msgstr "Для повышения точности частоты смены к�
 
 #: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:473
 msgid "Better FPS limit in some"
-msgstr ""
+msgstr "Возможно более точное ограничение FPS"
 
 #: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:486
 msgid "PC FPS calculation"
@@ -1741,7 +1739,7 @@ msgstr "Старый режим пропуска кадров"
 
 #: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:564
 msgid "Expand screen width"
-msgstr ""
+msgstr "Увеличить ширину экрана"
 
 #: ../plugins/dfxvideo/gpucfg-0.1df/dfxvideo.glade2:580
 msgid "Ignore brightness color"
@@ -1814,7 +1812,7 @@ msgstr "Сброс(_R)"
 
 #: ../data/pcsx.glade2:168
 msgid "S_witch ISO..."
-msgstr "Изменить ISO..."
+msgstr "Сменить ISO..."
 
 #: ../data/pcsx.glade2:190
 msgid "_Save State"
@@ -1930,11 +1928,11 @@ msgstr "Продолжить..."
 
 #: ../data/pcsx.glade2:661
 msgid "Switch ISO Image"
-msgstr "Изменить образ ISO"
+msgstr "Сменить образ ISO"
 
 #: ../data/pcsx.glade2:662
 msgid "Switch ISO..."
-msgstr "Изменить ISO..."
+msgstr "Сменить ISO..."
 
 #: ../data/pcsx.glade2:683 ../data/pcsx.glade2:1810
 msgid "Configure Memory Cards"
@@ -2002,7 +2000,7 @@ msgstr "Контроллер 2:"
 
 #: ../data/pcsx.glade2:1226
 msgid "CD-ROM:"
-msgstr "CD-ROM:"
+msgstr "CD-привод:"
 
 #: ../data/pcsx.glade2:1264
 msgid "<b>Plugins</b>"
@@ -2277,8 +2275,7 @@ msgstr "Настройка CDR"
 
 #: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2:33
 msgid "Choose your CD-ROM device or type its path if it's not listed"
-msgstr ""
-"Выберите CD-привод или введите свой путь, если устройства нету в списке"
+msgstr "Выберите CD-привод или введите свой путь, если устройства нету в списке"
 
 #: ../plugins/dfcdrom/cdrcfg-0.1df/dfcdrom.glade2:44
 msgid "Select CD-ROM device"
@@ -2495,7 +2492,7 @@ msgstr "Включить ограничение FPS"
 
 #: ../plugins/peopsxgl/gpucfg/interface.c:402
 msgid "FPS limit auto-detection"
-msgstr "Автоопределение FPS"
+msgstr "Авто-определение FPS"
 
 #: ../plugins/peopsxgl/gpucfg/interface.c:411
 msgid "Use Frame skipping"
@@ -2928,7 +2925,7 @@ msgstr ""
 #: ../plugins/dfnet/dfnet.c:161
 #, c-format
 msgid "error connecting to %s: %s\n"
-msgstr "Ошибка загрузки %s: %s\n"
+msgstr "Ошибка соединения с %s: %s\n"
 
 #: ../plugins/dfnet/dfnet.c:186
 msgid "Error allocating memory!\n"
@@ -2949,7 +2946,7 @@ msgstr "Ожидание соединения..."
 
 #: ../plugins/dfnet/gui.c:168
 msgid "The Client should now Start a Connection, waiting..."
-msgstr "Ожидаем соединения с клиентом..."
+msgstr "Ожидание соединения с клиентом..."
 
 #: ../plugins/dfnet/dfnet.glade2:23
 msgid ""
@@ -2982,8 +2979,7 @@ msgid "Client (Player2)"
 msgstr "Клиент (Игрок 2)"
 
 #: ../plugins/dfnet/dfnet.glade2:130
-msgid ""
-"Do not change if not necessary (remember it must be changed on both sides)."
+msgid "Do not change if not necessary (remember it must be changed on both sides)."
 msgstr ""
 "Не меняйте без особой необходимости (помните что порты должны быть одинаковы "
 "для обеих сторон)"
@@ -2999,3 +2995,4 @@ msgstr "Начать сетевую игру"
 #: ../plugins/dfnet/dfnet.glade2:240
 msgid "Play Offline"
 msgstr "Начать без использования сети"
+