From 2a27d420c067220804a81ce65c961a4ace2b9533 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Tue, 5 Jul 2022 16:30:43 +1000 Subject: [PATCH] -Made parent/clone terminology consistent in Chinese translations. [YuiFAN] -bus/nubus: Made Macintosh Display Card round away from zero in 1:2:1 convolution mode. [Vas Crabb] --- language/Chinese_Simplified/strings.po | 12 +++++----- language/Chinese_Traditional/strings.po | 30 ++++++++++++------------- src/devices/bus/nubus/nubus_48gc.cpp | 24 ++++++++++---------- 3 files changed, 33 insertions(+), 33 deletions(-) diff --git a/language/Chinese_Simplified/strings.po b/language/Chinese_Simplified/strings.po index 6fda6a75988..8e89694d97a 100644 --- a/language/Chinese_Simplified/strings.po +++ b/language/Chinese_Simplified/strings.po @@ -1310,7 +1310,7 @@ msgstr "非 BIOS" #: src/frontend/mame/ui/utils.cpp:95 msgctxt "machine-filter" msgid "Parents" -msgstr "母档" +msgstr "主档" #: src/frontend/mame/ui/utils.cpp:96 msgctxt "machine-filter" @@ -1385,7 +1385,7 @@ msgstr "最爱" #: src/frontend/mame/ui/utils.cpp:113 msgctxt "software-filter" msgid "Parents" -msgstr "母档" +msgstr "主档" #: src/frontend/mame/ui/utils.cpp:114 msgctxt "software-filter" @@ -2407,7 +2407,7 @@ msgstr " (%1$u %2$u) = GFX%3$u #%4$X:%5$X" #, c-format msgctxt "gfxview" msgid " %1$d×%2$d origin (%3$d %4$d)" -msgstr "" +msgstr " %1$d×%2$d 原点 (%3$d %4$d)" #: src/frontend/mame/ui/selgame.cpp:442 msgid "System Settings" @@ -3090,7 +3090,7 @@ msgstr "软件克隆于： %1$s" #: src/frontend/mame/ui/selmenu.cpp:650 msgid "Software is parent" -msgstr "" +msgstr "软件为主档" #: src/frontend/mame/ui/selmenu.cpp:655 msgid "Supported: No" @@ -3106,7 +3106,7 @@ msgstr "已支援： 是" #: src/frontend/mame/ui/selmenu.cpp:681 msgid "System is parent" -msgstr "" +msgstr "系统为主档" #: src/frontend/mame/ui/selmenu.cpp:683 src/frontend/mame/ui/selmenu.cpp:685 #, c-format @@ -3198,7 +3198,7 @@ msgstr "系统克隆于\t%1$s\n" #: src/frontend/mame/ui/selmenu.cpp:2878 msgid "System is Parent\t\n" -msgstr "" +msgstr "系统为主档\t\n" #: src/frontend/mame/ui/selmenu.cpp:2882 msgid "Analog Controls\tYes\n" diff --git a/language/Chinese_Traditional/strings.po b/language/Chinese_Traditional/strings.po index 806464817f0..445a73bfabc 100644 --- a/language/Chinese_Traditional/strings.po +++ b/language/Chinese_Traditional/strings.po @@ -976,7 +976,7 @@ msgid "" msgstr "" "\n" "\n" -"本系統尚有可執行的仿製版： %s" +"本系統尚有可執行的相容版： %s" #: src/frontend/mame/ui/info.cpp:365 #, c-format @@ -1310,12 +1310,12 @@ msgstr "非 BIOS" #: src/frontend/mame/ui/utils.cpp:95 msgctxt "machine-filter" msgid "Parents" -msgstr "母檔" +msgstr "主檔" #: src/frontend/mame/ui/utils.cpp:96 msgctxt "machine-filter" msgid "Clones" -msgstr "仿製版" +msgstr "相容版" #: src/frontend/mame/ui/utils.cpp:97 msgctxt "machine-filter" @@ -1385,12 +1385,12 @@ msgstr "最愛" #: src/frontend/mame/ui/utils.cpp:113 msgctxt "software-filter" msgid "Parents" -msgstr "母檔" +msgstr "主檔" #: src/frontend/mame/ui/utils.cpp:114 msgctxt "software-filter" msgid "Clones" -msgstr "仿製版" +msgstr "相容版" #: src/frontend/mame/ui/utils.cpp:115 msgctxt "software-filter" @@ -1508,7 +1508,7 @@ msgstr "群組" #: src/frontend/mame/ui/utils.cpp:1070 msgid "Include clones" -msgstr "包含仿製版" +msgstr "包含相容版" #: src/frontend/mame/ui/utils.cpp:1130 msgid "Category File" @@ -2407,7 +2407,7 @@ msgstr " (%1$u %2$u) = GFX%3$u #%4$X:%5$X" #, c-format msgctxt "gfxview" msgid " %1$d×%2$d origin (%3$d %4$d)" -msgstr "" +msgstr " %1$d×%2$d 原點 (%3$d %4$d)" #: src/frontend/mame/ui/selgame.cpp:442 msgid "System Settings" @@ -2599,7 +2599,7 @@ msgstr "子項目顏色" #: src/frontend/mame/ui/custui.cpp:613 msgctxt "color-option" msgid "Clone" -msgstr "仿製版" +msgstr "相容版" #: src/frontend/mame/ui/custui.cpp:614 msgctxt "color-option" @@ -2687,7 +2687,7 @@ msgstr "滑鼠經過" #: src/frontend/mame/ui/custui.cpp:665 msgctxt "color-sample" msgid "Clone" -msgstr "仿製版" +msgstr "相容版" #: src/frontend/mame/ui/custui.cpp:880 msgid "ARGB Settings" @@ -3086,11 +3086,11 @@ msgstr "%1$s, %2$s" #: src/frontend/mame/ui/selmenu.cpp:648 #, c-format msgid "Software is clone of: %1$s" -msgstr "" +msgstr "軟體相容於： %1$s" #: src/frontend/mame/ui/selmenu.cpp:650 msgid "Software is parent" -msgstr "" +msgstr "軟體為主檔" #: src/frontend/mame/ui/selmenu.cpp:655 msgid "Supported: No" @@ -3106,12 +3106,12 @@ msgstr "已支援： 是" #: src/frontend/mame/ui/selmenu.cpp:681 msgid "System is parent" -msgstr "" +msgstr "系統為主檔" #: src/frontend/mame/ui/selmenu.cpp:683 src/frontend/mame/ui/selmenu.cpp:685 #, c-format msgid "System is clone of: %1$s" -msgstr "" +msgstr "系統相容於: %1$s" #: src/frontend/mame/ui/selmenu.cpp:721 #, c-format @@ -3194,11 +3194,11 @@ msgstr "製造商\t%1$s\n" #: src/frontend/mame/ui/selmenu.cpp:2873 #, c-format msgid "System is Clone of\t%1$s\n" -msgstr "" +msgstr "系統相容於\t%1$s\n" #: src/frontend/mame/ui/selmenu.cpp:2878 msgid "System is Parent\t\n" -msgstr "" +msgstr "系統為主檔\t\n" #: src/frontend/mame/ui/selmenu.cpp:2882 msgid "Analog Controls\tYes\n" diff --git a/src/devices/bus/nubus/nubus_48gc.cpp b/src/devices/bus/nubus/nubus_48gc.cpp index 2c28388faaf..60a28c513e6 100644 --- a/src/devices/bus/nubus/nubus_48gc.cpp +++ b/src/devices/bus/nubus/nubus_48gc.cpp @@ -694,9 +694,9 @@ void jmfb_device::update_screen(screen_device &screen, bitmap_rgb32 &bitmap, con rgb_t const c = pen_color(BIT(pixbelow, p)); *scanline++ = trans( rgb_t( - (a.r() + (uint16_t(b.r()) << 1) + c.r()) >> 2, - (a.g() + (uint16_t(b.g()) << 1) + c.g()) >> 2, - (a.b() + (uint16_t(b.b()) << 1) + c.b()) >> 2)); + (a.r() + (uint16_t(b.r()) << 1) + c.r() + 2) >> 2, + (a.g() + (uint16_t(b.g()) << 1) + c.g() + 2) >> 2, + (a.b() + (uint16_t(b.b()) << 1) + c.b() + 2) >> 2)); } } else if (0x4 == Mode) // 2bpp @@ -708,9 +708,9 @@ void jmfb_device::update_screen(screen_device &screen, bitmap_rgb32 &bitmap, con rgb_t const c = pen_color(BIT(pixbelow, p, 2)); *scanline++ = trans( rgb_t( - (a.r() + (uint16_t(b.r()) << 1) + c.r()) >> 2, - (a.g() + (uint16_t(b.g()) << 1) + c.g()) >> 2, - (a.b() + (uint16_t(b.b()) << 1) + c.b()) >> 2)); + (a.r() + (uint16_t(b.r()) << 1) + c.r() + 2) >> 2, + (a.g() + (uint16_t(b.g()) << 1) + c.g() + 2) >> 2, + (a.b() + (uint16_t(b.b()) << 1) + c.b() + 2) >> 2)); } } else if (0x8 == Mode) // 4bpp @@ -722,9 +722,9 @@ void jmfb_device::update_screen(screen_device &screen, bitmap_rgb32 &bitmap, con rgb_t const c = pen_color(BIT(pixbelow, p, 4)); *scanline++ = trans( rgb_t( - (a.r() + (uint16_t(b.r()) << 1) + c.r()) >> 2, - (a.g() + (uint16_t(b.g()) << 1) + c.g()) >> 2, - (a.b() + (uint16_t(b.b()) << 1) + c.b()) >> 2)); + (a.r() + (uint16_t(b.r()) << 1) + c.r() + 2) >> 2, + (a.g() + (uint16_t(b.g()) << 1) + c.g() + 2) >> 2, + (a.b() + (uint16_t(b.b()) << 1) + c.b() + 2) >> 2)); } } else if (0xc == Mode) // 8bpp @@ -734,9 +734,9 @@ void jmfb_device::update_screen(screen_device &screen, bitmap_rgb32 &bitmap, con rgb_t const c = pen_color(pixbelow); *scanline++ = trans( rgb_t( - (a.r() + (uint16_t(b.r()) << 1) + c.r()) >> 2, - (a.g() + (uint16_t(b.g()) << 1) + c.g()) >> 2, - (a.b() + (uint16_t(b.b()) << 1) + c.b()) >> 2)); + (a.r() + (uint16_t(b.r()) << 1) + c.r() + 2) >> 2, + (a.g() + (uint16_t(b.g()) << 1) + c.g() + 2) >> 2, + (a.b() + (uint16_t(b.b()) << 1) + c.b() + 2) >> 2)); } } }