summaryrefslogtreecommitdiffstatshomepage
path: root/language/Chinese_Simplified/strings.po
diff options
context:
space:
mode:
Diffstat (limited to 'language/Chinese_Simplified/strings.po')
-rw-r--r--language/Chinese_Simplified/strings.po8
1 files changed, 4 insertions, 4 deletions
diff --git a/language/Chinese_Simplified/strings.po b/language/Chinese_Simplified/strings.po
index 76044cebd42..f6735bf78be 100644
--- a/language/Chinese_Simplified/strings.po
+++ b/language/Chinese_Simplified/strings.po
@@ -2470,14 +2470,14 @@ msgid ""
"[This option is currently mounted in the running system]\n"
"\n"
"Option: %1$s\n"
-"Device: %1$s\n"
+"Device: %2$s\n"
"\n"
"The selected option enables the following items:\n"
msgstr ""
"[ 此选项当前已挂载於运行中的系统 ]\n"
"\n"
"选项: %1$s\n"
-"装置: %1$s\n"
+"装置: %2$s\n"
"\n"
"已选用的选项启用下列项目:\n"
@@ -2487,14 +2487,14 @@ msgid ""
"[This option is NOT currently mounted in the running system]\n"
"\n"
"Option: %1$s\n"
-"Device: %1$s\n"
+"Device: %2$s\n"
"\n"
"If you select this option, the following items will be enabled:\n"
msgstr ""
"[ 此选项当前「尚未」挂载於运行中的系统 ]\n"
"\n"
"选项: %1$s\n"
-"装置: %1$s\n"
+"装置: %2$s\n"
"\n"
"如选用此选项,下列项目將启用:\n"
/span> | | | | | | | mc6845.cpp: Fix mk88 machine AmatCoder2019-03-081-0/+2 | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Regression caused by commit c4f0852c. Thanks to Tafoid for catch it. * | | | | | | | | | Merge pull request #4732 from schnitzeltony/pokey-fixup ajrhacker2019-03-071-0/+1 |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | pokey: force recalculation of raw sound output after reset | * | | | | | | | | | pokey: force recalculation of raw sound output after reset Andreas Müller2019-03-071-0/+1 | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * This fixes a regression introduced by [1] * Could not detect a performance change introduced by this [1] https://github.com/mamedev/mame/pull/4702/commits/308c3c2d04ce8f3af09f620f524579145cbbcaf0 Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> * | | | | | | | | | | -spg2xx: Fixed audio channel stop behavior. [Ryan Holtz] mooglyguy2019-03-081-5/+3 |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixes bad or missing music/effects in jak_sbfc, jak_mpac, jak_wof, jak_wwe, and many others. * | | | | | | | | | geneve: Fix GPL mode lockup, caused by prior interrupt latch modifications. Michael Zapf2019-03-071-4/+7 | | | | | | | | | | * | | | | | | | | | added mm5445_device (nw) hap2019-03-076-51/+249 | |/ / / / / / / / |/| | | | | | | | * | | | | | | | | i2cmem: fix page write logic [O. Galibert] Olivier Galibert2019-03-072-12/+24 |/ / / / / / / / * | | | | | | | Merge pull request #4729 from schnitzeltony/atari-pokey-performance-III ajrhacker2019-03-071-5/+4 |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | pokey_device::step_pot: remove operations with no effect | * | | | | | | | pokey_device::step_pot: remove operations with no effect Andreas Müller2019-03-071-5/+4 | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * step_pot is called from step_one_clock only and just in case pokey is not in reset state -> No need to check reset state again * in case there were no bits in 'upd' latched to one, there is no need to call synchronize(SYNC_POT, 0) because m_ALLPOT won't change. Performance results with missile / starwars (no pots): Before: ./mame64 -bench 50 missile -> Average speed: 1171.67% (49 seconds) ./mame64 -bench 50 starwars -> Average speed: 551.66% (49 seconds) After: ./mame64 -bench 50 missile -> Average speed: 1321.16% (49 seconds) ./mame64 -bench 50 starwars -> Average speed: 551.10% (49 seconds) Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> * | | | | | | | | i8155, nsc810: Simplify read/write handlers (nw) AJR2019-03-074-24/+24 | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | i8155: Rename "read" and "write" handlers to data_r and data_w, since these are neither complete nor typically-used accessors (nw) * | | | | | | | | ncr5380n, ncr5385, ncr5390, ncr539x: Simplify read/write handlers (nw) AJR2019-03-0710-177/+177 | | | | | | | | | * | | | | | | | | am9513, am9517a, am9519, at_keybc, cs4031, ds128x, mc141618, wd7600: ↵ AJR2019-03-0730-300/+316 |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simplify read/write handlers (nw) Note that the VME handler installing routines can and should be redone later; this is merely enough for now. * | | | | | | | ef9345, ef9365: Simplify read/write handlers (nw) AJR2019-03-078-14/+14 | | | | | | | | * | | | | | | | bus/ti99, geneve, ti99_[various]: Eliminate address space and mem_mask ↵ AJR2019-03-0767-436/+416 | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | arguments in all handlers (nw) at29x, hdc92x4, mm58274c, rtc65271, strata, tms9901, tms9902: Simplify read/write handlers (nw) * | | | | | | | Merge branch 'master' of https://github.com/mamedev/mame.git Couriersud2019-03-0625-235/+265 |\ \ \ \ \ \ \ \ | * \ \ \ \ \ \ \ Merge pull request #4480 from ajrhacker/crushift ajrhacker2019-03-0618-173/+180 | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | tms9900, tms9980a, tms9995: CRU addressing change | | * | | | | | | | tms9900: Notes on CRU addressing (nw) AJR2019-03-021-1/+14 | | | | | | | | | | | | * | | | | | | | x2201: Remove no longer needed byte read handler (nw)