Merge remote-tracking branch 'upstream/release0249' into rel249

mahlemiut · Oct 24, 2022 · f9b2c72 · f9b2c72
2 parents 42bae01 + f9bbb11
commit f9b2c72
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 22 deletions.
diff --git a/docs/source/advanced/devicemap.rst b/docs/source/advanced/devicemap.rst
@@ -120,9 +120,6 @@ such as:
 |     Input: Remapped joystick #2: XInput Player 2 (device id: XInput Player 2)
 |
 
-Note that the devices numbers in the verbose log output are zero-based, while
-the device numbers shown in MAME’s user interface and set in configuration files
-
 
 Limitations
 -----------

diff --git a/hash/a7800.xml b/hash/a7800.xml
@@ -302,7 +302,7 @@ type of rom dumps.  Effort will be made at a later date to split them and docume
 		</part>
 	</software>
 
-	<software name="astdelux" cloneof="asteroid">
+	<software name="astdeluxu" cloneof="astdelux">
 		<description>Asteroids Deluxe (NTSC)</description>
 		<year>2007</year>
 		<publisher>&lt;homebrew&gt;</publisher>
@@ -316,7 +316,7 @@ type of rom dumps.  Effort will be made at a later date to split them and docume
 		</part>
 	</software>
 
-	<software name="astdeluxp" cloneof="asteroid">
+	<software name="astdelux">
 		<description>Asteroids Deluxe (PAL)</description>
 		<year>2007</year>
 		<publisher>&lt;homebrew&gt;</publisher>

diff --git a/language/Ukrainian/strings.po b/language/Ukrainian/strings.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2022-10-16 02:30+1100\n"
-"PO-Revision-Date: 2022-09-03 11:52+0300\n"
+"PO-Revision-Date: 2022-10-17 23:14+0300\n"
 "Last-Translator: Stanley Kid <[email protected]>\n"
 "Language-Team: MAME Language Team\n"
 "Language: uk\n"
@@ -942,8 +942,8 @@ msgid ""
 "This system was never completed. It may exhibit strange behavior or missing "
 "elements that are not bugs in the emulation.\n"
 msgstr ""
-"Систему не завершено. Її поведінка дивна чи відсутні елементи, які не є "
-"помилками емуляції.\n"
+"Систему не завершено. Її поведінка дивна чи відсутні елементи - не помилки "
+"емуляції.\n"
 
 #: src/frontend/mame/ui/info.cpp:139
 msgid ""
@@ -971,6 +971,10 @@ msgid ""
 "physical interaction or consist of mechanical devices. It is not possible to "
 "fully experience this system.\n"
 msgstr ""
+"\n"
+"Елементи системи неможливо точно емулювати, необхідна фізична взаємодія чи "
+"вони складаються з механічних пристроїв. Повністю випробувати систему "
+"неможливо.\n"
 
 #: src/frontend/mame/ui/info.cpp:167
 #, c-format
@@ -1881,7 +1885,7 @@ msgstr "Копіювати ID пристрою"
 #: src/frontend/mame/ui/inputdevices.cpp:122
 msgctxt "menu-inputdev"
 msgid "Copied device ID to clipboard"
-msgstr "Копіювати ID пристрою до буфера обміну."
+msgstr "Копіювати ID пристрою до буфера обміну"
 
 #: src/frontend/mame/ui/inputdevices.cpp:124
 msgctxt "menu-inputdev"
@@ -6510,14 +6514,3 @@ msgid ""
 msgstr ""
 "Укажи комбінацію чи натисни %s для скасування.\n"
 "%s"
-
-#~ msgid ""
-#~ "\n"
-#~ "Elements of this system cannot be emulated as they require physical "
-#~ "interaction or consist of mechanical devices. It is not possible to fully "
-#~ "experience this system.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Елементи системи неможливо емулювати, необхідна фізична взаємодія чи вони "
-#~ "складаються з механічних пристроїв. Повністю випробувати систему "
-#~ "неможливо.\n"
diff --git a/src/mame/skeleton/gameking.cpp b/src/mame/skeleton/gameking.cpp
@@ -346,9 +346,9 @@ ROM_START(gamekin3)
 	ROM_LOAD("gm220.bin", 0x00000, 0x80000, CRC(1dc43bd5) SHA1(f9dcd3cb76bb7cb10565a1acb070ab375c082b4c) )
 ROM_END
 
-CONS( 2003, gameking, 0, 0, gameking1, gameking, gameking_state, init_gameking, "TimeTop", "GameKing GM-218", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
+CONS( 2003, gameking, 0, 0, gameking1, gameking, gameking_state, init_gameking, "TimeTop", "GameKing GM-218", MACHINE_IMPERFECT_SOUND )
 // the GameKing 2 (GM-219) is probably identical HW
 
-CONS( 2003, gamekin3, 0, 0, gameking3, gameking3, gameking_state, init_gameking, "TimeTop", "GameKing 3",      MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
+CONS( 2003, gamekin3, 0, 0, gameking3, gameking3, gameking_state, init_gameking, "TimeTop", "GameKing 3",     MACHINE_IMPERFECT_SOUND )
 // gameking 3: similiar cartridges, accepts gameking cartridges, gameking3 cartridges not working on gameking (illegal cartridge scroller)
 // my gameking bios backup solution might work on it