diff --git a/language/Afrikaans/strings.po b/language/Afrikaans/strings.po
index e3e8f66a723..db14805a8de 100644
--- a/language/Afrikaans/strings.po
+++ b/language/Afrikaans/strings.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-19 02:50+1100\n"
+"POT-Creation-Date: 2021-12-09 04:44+1100\n"
 "PO-Revision-Date: 2016-02-20 18:03+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: MAME Language Team\n"
@@ -259,12 +259,12 @@ msgstr ""
 msgid "Driver: \"%1$s\" software list "
 msgstr ""
 
-#: src/frontend/mame/ui/selsoft.cpp:711 src/frontend/mame/ui/selgame.cpp:1066
+#: src/frontend/mame/ui/selsoft.cpp:711 src/frontend/mame/ui/selgame.cpp:1076
 #, c-format
 msgid "%1$s: %2$s - Search: %3$s_"
 msgstr ""
 
-#: src/frontend/mame/ui/selsoft.cpp:713 src/frontend/mame/ui/selgame.cpp:1068
+#: src/frontend/mame/ui/selsoft.cpp:713 src/frontend/mame/ui/selgame.cpp:1078
 #, c-format
 msgid "Search: %1$s_"
 msgstr ""
@@ -274,7 +274,7 @@ msgstr ""
 msgid "Software list/item: %1$s:%2$s"
 msgstr ""
 
-#: src/frontend/mame/ui/optsmenu.cpp:73 src/frontend/mame/ui/sndmenu.cpp:165
+#: src/frontend/mame/ui/optsmenu.cpp:73 src/frontend/mame/ui/sndmenu.cpp:161
 msgid "Sound Options"
 msgstr ""
 
@@ -369,11 +369,11 @@ msgid "Show mouse pointer"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:39
-msgid "Confirm quit from machines"
+msgid "Confirm quit from emulation"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:40
-msgid "Skip information screen at startup"
+msgid "Skip system information screen"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:41
@@ -389,7 +389,7 @@ msgid "Skip BIOS selection menu"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:44
-msgid "Skip software parts selection menu"
+msgid "Skip software part selection menu"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:45
@@ -541,7 +541,7 @@ msgid "UI active"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:91
-msgid "Offscreen reload"
+msgid "Off-screen reload"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:92
@@ -557,7 +557,7 @@ msgid "Natural keyboard"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:95
-msgid "Simultaneous contradictory"
+msgid "Allow contradictory joystick inputs"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:96
@@ -581,7 +581,7 @@ msgid "Pedal Device Assignment"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:106
-msgid "Adstick Device Assignment"
+msgid "AD Stick Device Assignment"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:107
@@ -668,14 +668,14 @@ msgstr ""
 msgid "Wait Vertical Sync"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:687
+#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:689
 #: src/frontend/mame/ui/videoopt.cpp:191 src/frontend/mame/ui/custui.cpp:490
 #: src/frontend/mame/ui/analogipt.cpp:471 plugins/cheatfind/init.lua:766
 #: plugins/cheatfind/init.lua:777 plugins/cheat/init.lua:668
 msgid "On"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:690
+#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:692
 #: src/frontend/mame/ui/videoopt.cpp:207 src/frontend/mame/ui/custui.cpp:490
 #: src/frontend/mame/ui/analogipt.cpp:471 plugins/cheatfind/init.lua:763
 #: plugins/cheatfind/init.lua:774 plugins/cheat/init.lua:671
@@ -683,11 +683,11 @@ msgstr ""
 msgid "Off"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:693
+#: src/frontend/mame/ui/menu.cpp:695
 msgid "Auto"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:1195
+#: src/frontend/mame/ui/menu.cpp:1197
 #: src/frontend/mame/ui/simpleselgame.cpp:278
 #: src/frontend/mame/ui/selmenu.cpp:1280
 msgid "Return to Previous Menu"
@@ -695,7 +695,7 @@ msgstr ""
 
 #: src/frontend/mame/ui/filemngr.cpp:139
 #: src/frontend/mame/ui/confswitch.cpp:119
-#: src/frontend/mame/ui/inputmap.cpp:559 src/frontend/mame/ui/analogipt.cpp:360
+#: src/frontend/mame/ui/inputmap.cpp:563 src/frontend/mame/ui/analogipt.cpp:360
 #, c-format
 msgid "[root%1$s]"
 msgstr ""
@@ -938,22 +938,22 @@ msgid ""
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "GHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "MHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "kHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "Hz"
 msgstr ""
 
@@ -977,38 +977,38 @@ msgstr ""
 msgid "Vector"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:480
+#: src/frontend/mame/ui/info.cpp:483
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:480
+#: src/frontend/mame/ui/info.cpp:483
 msgid "%2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:497
+#: src/frontend/mame/ui/info.cpp:500
 #, c-format
 msgid "Screen '%1$s'"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:499
+#: src/frontend/mame/ui/info.cpp:502
 msgid "Screen"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:570 src/frontend/mame/ui/info.cpp:581
+#: src/frontend/mame/ui/info.cpp:573 src/frontend/mame/ui/info.cpp:584
 #, c-format
 msgid "%1$s:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:662
+#: src/frontend/mame/ui/info.cpp:665
 msgid "Not supported"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:665
+#: src/frontend/mame/ui/info.cpp:668
 msgid "Partially supported"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:674
+#: src/frontend/mame/ui/info.cpp:677
 msgid "[empty]"
 msgstr ""
 
@@ -1081,7 +1081,7 @@ msgid "Emulated"
 msgstr ""
 
 #: src/frontend/mame/ui/keyboard.cpp:59 src/frontend/mame/ui/confswitch.cpp:117
-#: src/frontend/mame/ui/inputmap.cpp:557 src/frontend/mame/ui/analogipt.cpp:358
+#: src/frontend/mame/ui/inputmap.cpp:561 src/frontend/mame/ui/analogipt.cpp:358
 #, c-format
 msgid "%1$s [root%2$s]"
 msgstr ""
@@ -1441,7 +1441,7 @@ msgctxt "swlist-info"
 msgid "Software list/item"
 msgstr ""
 
-#: src/frontend/mame/ui/datmenu.cpp:88 src/frontend/mame/ui/selmenu.cpp:2698
+#: src/frontend/mame/ui/datmenu.cpp:88 src/frontend/mame/ui/selmenu.cpp:2707
 msgid "Software List Info"
 msgstr ""
 
@@ -1556,7 +1556,7 @@ msgstr ""
 msgid "Configure Machine:"
 msgstr ""
 
-#: src/frontend/mame/ui/miscmenu.cpp:858 src/frontend/mame/ui/selmenu.cpp:2638
+#: src/frontend/mame/ui/miscmenu.cpp:858 src/frontend/mame/ui/selmenu.cpp:2647
 msgid " (default)"
 msgstr ""
 
@@ -1573,7 +1573,7 @@ msgid ""
 "Press %2$s to return to emulation"
 msgstr ""
 
-#: src/frontend/mame/ui/info_pty.cpp:30 src/frontend/mame/ui/mainmenu.cpp:155
+#: src/frontend/mame/ui/info_pty.cpp:30
 msgid "Pseudo terminals"
 msgstr ""
 
@@ -1641,52 +1641,52 @@ msgstr ""
 msgid "Other Controls"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:227
+#: src/frontend/mame/ui/inputmap.cpp:231
 msgid "This machine has no configurable inputs."
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:327
+#: src/frontend/mame/ui/inputmap.cpp:331
 msgid "Pressed"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:397
+#: src/frontend/mame/ui/inputmap.cpp:401
 msgid "Invalid sequence entered"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:542
+#: src/frontend/mame/ui/inputmap.cpp:546
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:543
+#: src/frontend/mame/ui/inputmap.cpp:547
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog Inc"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:544
+#: src/frontend/mame/ui/inputmap.cpp:548
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog Dec"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:586
+#: src/frontend/mame/ui/inputmap.cpp:590
 #, c-format
 msgid "Press %1$s to set\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:587
+#: src/frontend/mame/ui/inputmap.cpp:591
 #, c-format
 msgid "Press %1$s to append\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:588
+#: src/frontend/mame/ui/inputmap.cpp:592
 #, c-format
 msgid "Press %1$s to clear\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:589
+#: src/frontend/mame/ui/inputmap.cpp:593
 #, c-format
 msgid "Press %1$s to restore default\n"
 msgstr ""
@@ -1750,7 +1750,7 @@ msgid ""
 msgstr ""
 
 #: src/frontend/mame/ui/simpleselgame.cpp:273
-#: src/frontend/mame/ui/selgame.cpp:436
+#: src/frontend/mame/ui/selgame.cpp:443
 msgid "Configure Options"
 msgstr ""
 
@@ -2078,16 +2078,16 @@ msgstr ""
 msgid "Expand to fit"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:437
+#: src/frontend/mame/ui/selgame.cpp:444
 msgid "Configure Machine"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:1050
+#: src/frontend/mame/ui/selgame.cpp:1060
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d machines (%5$d BIOS) )"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:1078
+#: src/frontend/mame/ui/selgame.cpp:1088
 #, c-format
 msgid "System: %1$-.100s"
 msgstr ""
@@ -2109,7 +2109,7 @@ msgstr ""
 #: src/frontend/mame/ui/auditmenu.cpp:98
 #, c-format
 msgid ""
-"Auditing ROMs for machine %2$u of %3$u...\n"
+"Auditing media for machine %2$u of %3$u...\n"
 "%1$s"
 msgstr ""
 
@@ -2124,12 +2124,12 @@ msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:136
 #, c-format
-msgid "Audit ROMs for %1$u machines marked unavailable"
+msgid "Audit media for %1$u machines marked unavailable"
 msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:137
 #, c-format
-msgid "Audit ROMs for all %1$u machines"
+msgid "Audit media for all %1$u machines"
 msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:154
@@ -2335,84 +2335,84 @@ msgctxt "color-sample"
 msgid "Clone"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:914
+#: src/frontend/mame/ui/custui.cpp:906
 msgid "ARGB Settings"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:919 src/frontend/mame/ui/custui.cpp:922
+#: src/frontend/mame/ui/custui.cpp:911 src/frontend/mame/ui/custui.cpp:914
 msgctxt "color-channel"
 msgid "Alpha"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:927 src/frontend/mame/ui/custui.cpp:930
+#: src/frontend/mame/ui/custui.cpp:919 src/frontend/mame/ui/custui.cpp:922
 msgctxt "color-channel"
 msgid "Red"
 msgstr ""
 
+#: src/frontend/mame/ui/custui.cpp:927 src/frontend/mame/ui/custui.cpp:930
+msgctxt "color-channel"
+msgid "Green"
+msgstr ""
+
 #: src/frontend/mame/ui/custui.cpp:935 src/frontend/mame/ui/custui.cpp:938
 msgctxt "color-channel"
-msgid "Green"
-msgstr ""
-
-#: src/frontend/mame/ui/custui.cpp:943 src/frontend/mame/ui/custui.cpp:946
-msgctxt "color-channel"
 msgid "Blue"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:949
+#: src/frontend/mame/ui/custui.cpp:941
 msgid "Choose from palette"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:996
+#: src/frontend/mame/ui/custui.cpp:988
 msgid "Color preview:"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1093
+#: src/frontend/mame/ui/custui.cpp:1085
 msgctxt "color-preset"
 msgid "White"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1094
+#: src/frontend/mame/ui/custui.cpp:1086
 msgctxt "color-preset"
 msgid "Silver"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1095
+#: src/frontend/mame/ui/custui.cpp:1087
 msgctxt "color-preset"
 msgid "Gray"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1096
+#: src/frontend/mame/ui/custui.cpp:1088
 msgctxt "color-preset"
 msgid "Black"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1097
+#: src/frontend/mame/ui/custui.cpp:1089
 msgctxt "color-preset"
 msgid "Red"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1098
+#: src/frontend/mame/ui/custui.cpp:1090
 msgctxt "color-preset"
 msgid "Orange"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1099
+#: src/frontend/mame/ui/custui.cpp:1091
 msgctxt "color-preset"
 msgid "Yellow"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1100
+#: src/frontend/mame/ui/custui.cpp:1092
 msgctxt "color-preset"
 msgid "Green"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1101
+#: src/frontend/mame/ui/custui.cpp:1093
 msgctxt "color-preset"
 msgid "Blue"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1102
+#: src/frontend/mame/ui/custui.cpp:1094
 msgctxt "color-preset"
 msgid "Violet"
 msgstr ""
@@ -2477,7 +2477,7 @@ msgid "Input (general)"
 msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:123
-msgid "Input (this Machine)"
+msgid "Input (this machine)"
 msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:126
@@ -2516,6 +2516,10 @@ msgstr ""
 msgid "Tape Control"
 msgstr ""
 
+#: src/frontend/mame/ui/mainmenu.cpp:155
+msgid "Pseudo Terminals"
+msgstr ""
+
 #: src/frontend/mame/ui/mainmenu.cpp:158
 msgid "BIOS Selection"
 msgstr ""
@@ -2554,7 +2558,7 @@ msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:200
 #, c-format
-msgid "About %s"
+msgid "About %1$s"
 msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:212
@@ -2714,373 +2718,373 @@ msgstr ""
 msgid "%1$s %2$s"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2235
+#: src/frontend/mame/ui/selmenu.cpp:2244
 msgid "Images"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2236
+#: src/frontend/mame/ui/selmenu.cpp:2245
 msgid "Infos"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2551
+#: src/frontend/mame/ui/selmenu.cpp:2560
 msgid ""
 "Required ROM/disk images for the selected system are missing or incorrect. "
 "Please acquire the correct files or select a different system.\n"
 "\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2567
+#: src/frontend/mame/ui/selmenu.cpp:2576
 msgid ""
 "Required ROM/disk images for the selected software are missing or incorrect. "
 "Please acquire the correct files or select a different software item.\n"
 "\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2583
+#: src/frontend/mame/ui/selmenu.cpp:2592
 msgid "incorrect checksum"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2586
+#: src/frontend/mame/ui/selmenu.cpp:2595
 msgid "incorrect length"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2589
+#: src/frontend/mame/ui/selmenu.cpp:2598
 msgid "not found"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2600
+#: src/frontend/mame/ui/selmenu.cpp:2609
 #, c-format
 msgid "%1$s (%2$s) - %3$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2602
+#: src/frontend/mame/ui/selmenu.cpp:2611
 #, c-format
 msgid "%1$s - %2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2606
+#: src/frontend/mame/ui/selmenu.cpp:2615
 msgid "Press any key to continue."
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2735
+#: src/frontend/mame/ui/selmenu.cpp:2744
 msgid "General Info"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2887
-#, c-format
-msgid "Romset\t%1$s\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2888
-#, c-format
-msgid "Year\t%1$s\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2889
-#, c-format
-msgid "Manufacturer\t%1$s\n"
-msgstr ""
-
 #: src/frontend/mame/ui/selmenu.cpp:2896
 #, c-format
-msgid "Driver is Clone of\t%1$s\n"
+msgid "Romset\t%1$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2901
-msgid "Driver is Parent\t\n"
+#: src/frontend/mame/ui/selmenu.cpp:2897
+#, c-format
+msgid "Year\t%1$s\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2898
+#, c-format
+msgid "Manufacturer\t%1$s\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2905
-msgid "Analog Controls\tYes\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2907
-msgid "Keyboard Inputs\tYes\n"
+#, c-format
+msgid "Driver is Clone of\t%1$s\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2910
-msgid "Overall\tNOT WORKING\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2912
-msgid "Overall\tUnemulated Protection\n"
+msgid "Driver is Parent\t\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2914
-msgid "Overall\tWorking\n"
+msgid "Analog Controls\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2917
-msgid "Graphics\tUnimplemented\n"
+#: src/frontend/mame/ui/selmenu.cpp:2916
+msgid "Keyboard Inputs\tYes\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2919
-msgid "Graphics\tWrong Colors\n"
+msgid "Overall\tNOT WORKING\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2921
-msgid "Graphics\tImperfect Colors\n"
+msgid "Overall\tUnemulated Protection\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2923
-msgid "Graphics\tImperfect\n"
+msgid "Overall\tWorking\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2925
-msgid "Graphics\tOK\n"
+#: src/frontend/mame/ui/selmenu.cpp:2926
+msgid "Graphics\tUnimplemented\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2928
-msgid "Sound\tNone\n"
+msgid "Graphics\tWrong Colors\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2930
-msgid "Sound\tUnimplemented\n"
+msgid "Graphics\tImperfect Colors\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2932
-msgid "Sound\tImperfect\n"
+msgid "Graphics\tImperfect\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2934
-msgid "Sound\tOK\n"
+msgid "Graphics\tOK\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2937
-msgid "Capture\tUnimplemented\n"
+msgid "Sound\tNone\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2939
+msgid "Sound\tUnimplemented\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2941
+msgid "Sound\tImperfect\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2943
+msgid "Sound\tOK\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2946
+msgid "Capture\tUnimplemented\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2948
 msgid "Capture\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2942
+#: src/frontend/mame/ui/selmenu.cpp:2951
 msgid "Camera\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2944
+#: src/frontend/mame/ui/selmenu.cpp:2953
 msgid "Camera\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2947
+#: src/frontend/mame/ui/selmenu.cpp:2956
 msgid "Microphone\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2949
+#: src/frontend/mame/ui/selmenu.cpp:2958
 msgid "Microphone\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2952
+#: src/frontend/mame/ui/selmenu.cpp:2961
 msgid "Controls\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2954
+#: src/frontend/mame/ui/selmenu.cpp:2963
 msgid "Controls\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2957
+#: src/frontend/mame/ui/selmenu.cpp:2966
 msgid "Keyboard\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2959
+#: src/frontend/mame/ui/selmenu.cpp:2968
 msgid "Keyboard\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2962
+#: src/frontend/mame/ui/selmenu.cpp:2971
 msgid "Mouse\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2964
+#: src/frontend/mame/ui/selmenu.cpp:2973
 msgid "Mouse\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2967
+#: src/frontend/mame/ui/selmenu.cpp:2976
 msgid "Media\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2969
+#: src/frontend/mame/ui/selmenu.cpp:2978
 msgid "Media\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2972
+#: src/frontend/mame/ui/selmenu.cpp:2981
 msgid "Disk\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2974
+#: src/frontend/mame/ui/selmenu.cpp:2983
 msgid "Disk\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2977
+#: src/frontend/mame/ui/selmenu.cpp:2986
 msgid "Printer\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2979
+#: src/frontend/mame/ui/selmenu.cpp:2988
 msgid "Printer\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2982
+#: src/frontend/mame/ui/selmenu.cpp:2991
 msgid "Mag. Tape\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2984
+#: src/frontend/mame/ui/selmenu.cpp:2993
 msgid "Mag. Tape\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2987
+#: src/frontend/mame/ui/selmenu.cpp:2996
 msgid "Punch Tape\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2989
+#: src/frontend/mame/ui/selmenu.cpp:2998
 msgid "Punch Tape\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2992
+#: src/frontend/mame/ui/selmenu.cpp:3001
 msgid "Mag. Drum\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2994
+#: src/frontend/mame/ui/selmenu.cpp:3003
 msgid "Mag. Drum\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2997
+#: src/frontend/mame/ui/selmenu.cpp:3006
 msgid "(EP)ROM\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2999
+#: src/frontend/mame/ui/selmenu.cpp:3008
 msgid "(EP)ROM\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3002
+#: src/frontend/mame/ui/selmenu.cpp:3011
 msgid "Communications\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3004
+#: src/frontend/mame/ui/selmenu.cpp:3013
 msgid "Communications\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3007
+#: src/frontend/mame/ui/selmenu.cpp:3016
 msgid "LAN\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3009
+#: src/frontend/mame/ui/selmenu.cpp:3018
 msgid "LAN\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3012
+#: src/frontend/mame/ui/selmenu.cpp:3021
 msgid "WAN\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3014
+#: src/frontend/mame/ui/selmenu.cpp:3023
 msgid "WAN\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3017
+#: src/frontend/mame/ui/selmenu.cpp:3026
 msgid "Timing\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3019
+#: src/frontend/mame/ui/selmenu.cpp:3028
 msgid "Timing\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3021
+#: src/frontend/mame/ui/selmenu.cpp:3030
 msgid "Mechanical Machine\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3021
+#: src/frontend/mame/ui/selmenu.cpp:3030
 msgid "Mechanical Machine\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3022
+#: src/frontend/mame/ui/selmenu.cpp:3031
 msgid "Requires Artwork\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3022
+#: src/frontend/mame/ui/selmenu.cpp:3031
 msgid "Requires Artwork\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3023
+#: src/frontend/mame/ui/selmenu.cpp:3032
 msgid "Requires Clickable Artwork\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3023
+#: src/frontend/mame/ui/selmenu.cpp:3032
 msgid "Requires Clickable Artwork\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3025
+#: src/frontend/mame/ui/selmenu.cpp:3034
 msgid "Support Cocktail\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3026
+#: src/frontend/mame/ui/selmenu.cpp:3035
 msgid "Driver is BIOS\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3026
+#: src/frontend/mame/ui/selmenu.cpp:3035
 msgid "Driver is BIOS\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3027
+#: src/frontend/mame/ui/selmenu.cpp:3036
 msgid "Support Save\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3027
+#: src/frontend/mame/ui/selmenu.cpp:3036
 msgid "Support Save\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3028
+#: src/frontend/mame/ui/selmenu.cpp:3037
 msgid "Screen Orientation\tVertical\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3028
+#: src/frontend/mame/ui/selmenu.cpp:3037
 msgid "Screen Orientation\tHorizontal\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3038
+#: src/frontend/mame/ui/selmenu.cpp:3047
 msgid "Requires CHD\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3038
+#: src/frontend/mame/ui/selmenu.cpp:3047
 msgid "Requires CHD\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3051
-msgid "ROM Audit Result\tOK\n"
+#: src/frontend/mame/ui/selmenu.cpp:3060
+msgid "Media Audit Result\tOK\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3053
-msgid "ROM Audit Result\tBAD\n"
+#: src/frontend/mame/ui/selmenu.cpp:3062
+msgid "Media Audit Result\tBAD\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3056
+#: src/frontend/mame/ui/selmenu.cpp:3065
 msgid "Samples Audit Result\tNone Needed\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3058
+#: src/frontend/mame/ui/selmenu.cpp:3067
 msgid "Samples Audit Result\tOK\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3060
+#: src/frontend/mame/ui/selmenu.cpp:3069
 msgid "Samples Audit Result\tBAD\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3064
+#: src/frontend/mame/ui/selmenu.cpp:3073
 msgid ""
-"ROM Audit \tDisabled\n"
-"Samples Audit \tDisabled\n"
+"Media Audit\tDisabled\n"
+"Samples Audit\tDisabled\n"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:150
+#: src/frontend/mame/ui/sndmenu.cpp:146
 msgid "Sound"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:151
+#: src/frontend/mame/ui/sndmenu.cpp:147
 msgid "Compressor"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:152
+#: src/frontend/mame/ui/sndmenu.cpp:148
 msgid "Sample Rate"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:153
+#: src/frontend/mame/ui/sndmenu.cpp:149
 msgid "Use External Samples"
 msgstr ""
 
@@ -3119,511 +3123,681 @@ msgstr ""
 msgid "  Screen '%1$s': Vector\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:132
+#: src/frontend/mame/ui/devopt.cpp:135
 #, c-format
 msgid "  Screen '%1$s': %2$d × %3$d (V) %4$s Hz\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:133
+#: src/frontend/mame/ui/devopt.cpp:136
 #, c-format
 msgid "  Screen '%1$s': %2$d × %3$d (H) %4$s Hz\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:147
+#: src/frontend/mame/ui/devopt.cpp:150
 msgid "* Sound:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:211
+#: src/frontend/mame/ui/devopt.cpp:214
 #, c-format
 msgid ""
 "* BIOS settings:\n"
 "  %1$d options    [default: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:255 src/frontend/mame/ui/devopt.cpp:271
-#: src/frontend/mame/ui/devopt.cpp:332
+#: src/frontend/mame/ui/devopt.cpp:258 src/frontend/mame/ui/devopt.cpp:274
+#: src/frontend/mame/ui/devopt.cpp:335
 #, c-format
 msgid "  %1$s    [default: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:260 src/frontend/mame/ui/devopt.cpp:276
+#: src/frontend/mame/ui/devopt.cpp:263 src/frontend/mame/ui/devopt.cpp:279
 #, c-format
 msgid "  %1$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:282
+#: src/frontend/mame/ui/devopt.cpp:285
 msgid "* DIP switch settings:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:287
+#: src/frontend/mame/ui/devopt.cpp:290
 msgid "* Configuration settings:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:291
+#: src/frontend/mame/ui/devopt.cpp:294
 msgid "* Input device(s):\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:293
+#: src/frontend/mame/ui/devopt.cpp:296
 #, c-format
 msgid "  User inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:295
+#: src/frontend/mame/ui/devopt.cpp:298
 #, c-format
 msgid "  Mahjong inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:297
+#: src/frontend/mame/ui/devopt.cpp:300
 #, c-format
 msgid "  Hanafuda inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:299
+#: src/frontend/mame/ui/devopt.cpp:302
 #, c-format
 msgid "  Gambling inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:301
+#: src/frontend/mame/ui/devopt.cpp:304
 #, c-format
 msgid "  Analog inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:303
+#: src/frontend/mame/ui/devopt.cpp:306
 #, c-format
 msgid "  Adjuster inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:305
+#: src/frontend/mame/ui/devopt.cpp:308
 #, c-format
 msgid "  Keypad inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:307
+#: src/frontend/mame/ui/devopt.cpp:310
 #, c-format
 msgid "  Keyboard inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:312
+#: src/frontend/mame/ui/devopt.cpp:315
 msgid "* Media Options:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:317
+#: src/frontend/mame/ui/devopt.cpp:320
 #, c-format
 msgid "  %1$s    [tag: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:327
+#: src/frontend/mame/ui/devopt.cpp:330
 msgid "* Slot Options:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:341
+#: src/frontend/mame/ui/devopt.cpp:344
 msgid "[None]\n"
 msgstr ""
 
-#: src/emu/render.cpp:1847
+#: src/emu/render.cpp:1796
 #, c-format
 msgctxt "view-name"
 msgid "Screen %1$u Standard (%2$u:%3$u)"
 msgstr ""
 
-#: src/emu/render.cpp:1873
+#: src/emu/render.cpp:1822
 #, c-format
 msgctxt "view-name"
 msgid "Screen %1$u Pixel Aspect (%2$u:%3$u)"
 msgstr ""
 
-#: src/emu/render.cpp:1895 src/emu/render.cpp:2030
+#: src/emu/render.cpp:1844 src/emu/render.cpp:1979
 msgctxt "view-name"
 msgid "Cocktail"
 msgstr ""
 
-#: src/emu/render.cpp:2015
+#: src/emu/render.cpp:1964
 msgctxt "view-name"
 msgid "Left-to-Right"
 msgstr ""
 
-#: src/emu/render.cpp:2016
+#: src/emu/render.cpp:1965
 msgctxt "view-name"
 msgid "Left-to-Right (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2017
+#: src/emu/render.cpp:1966
 msgctxt "view-name"
 msgid "Top-to-Bottom"
 msgstr ""
 
-#: src/emu/render.cpp:2018
+#: src/emu/render.cpp:1967
 msgctxt "view-name"
 msgid "Top-to-Bottom (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2069
+#: src/emu/render.cpp:2018
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Left-to-Right, Top-to-Bottom"
 msgstr ""
 
-#: src/emu/render.cpp:2078
+#: src/emu/render.cpp:2027
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Left-to-Right, Top-to-Bottom (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2087
+#: src/emu/render.cpp:2036
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Top-to-Bottom, Left-to-Right"
 msgstr ""
 
-#: src/emu/render.cpp:2096
+#: src/emu/render.cpp:2045
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Top-to-Bottom, Left-to-Right (Gapless)"
 msgstr ""
 
-#: src/emu/inpttype.ipp:22
+#: src/emu/ioport.cpp:332
+#, c-format
 msgctxt "input-name"
-msgid "P1 Up"
+msgid "P%1$u"
 msgstr ""
 
-#: src/emu/inpttype.ipp:23
+#: src/emu/ioport.cpp:1924
 msgctxt "input-name"
-msgid "P1 Down"
+msgid "???"
 msgstr ""
 
-#: src/emu/inpttype.ipp:24
+#: src/emu/inpttype.ipp:22 src/emu/inpttype.ipp:140 src/emu/inpttype.ipp:221
+#: src/emu/inpttype.ipp:255 src/emu/inpttype.ipp:289 src/emu/inpttype.ipp:323
+#: src/emu/inpttype.ipp:357 src/emu/inpttype.ipp:391 src/emu/inpttype.ipp:425
+#: src/emu/inpttype.ipp:459
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left"
+msgid "%p Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:25
+#: src/emu/inpttype.ipp:23 src/emu/inpttype.ipp:141 src/emu/inpttype.ipp:222
+#: src/emu/inpttype.ipp:256 src/emu/inpttype.ipp:290 src/emu/inpttype.ipp:324
+#: src/emu/inpttype.ipp:358 src/emu/inpttype.ipp:392 src/emu/inpttype.ipp:426
+#: src/emu/inpttype.ipp:460
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right"
+msgid "%p Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:26
+#: src/emu/inpttype.ipp:24 src/emu/inpttype.ipp:142 src/emu/inpttype.ipp:223
+#: src/emu/inpttype.ipp:257 src/emu/inpttype.ipp:291 src/emu/inpttype.ipp:325
+#: src/emu/inpttype.ipp:359 src/emu/inpttype.ipp:393 src/emu/inpttype.ipp:427
+#: src/emu/inpttype.ipp:461
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Up"
+msgid "%p Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:27
+#: src/emu/inpttype.ipp:25 src/emu/inpttype.ipp:143 src/emu/inpttype.ipp:224
+#: src/emu/inpttype.ipp:258 src/emu/inpttype.ipp:292 src/emu/inpttype.ipp:326
+#: src/emu/inpttype.ipp:360 src/emu/inpttype.ipp:394 src/emu/inpttype.ipp:428
+#: src/emu/inpttype.ipp:462
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Down"
+msgid "%p Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:28
+#: src/emu/inpttype.ipp:26 src/emu/inpttype.ipp:144 src/emu/inpttype.ipp:225
+#: src/emu/inpttype.ipp:259 src/emu/inpttype.ipp:293 src/emu/inpttype.ipp:327
+#: src/emu/inpttype.ipp:361 src/emu/inpttype.ipp:395 src/emu/inpttype.ipp:429
+#: src/emu/inpttype.ipp:463
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Left"
+msgid "%p Right Stick/Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:29
+#: src/emu/inpttype.ipp:27 src/emu/inpttype.ipp:145 src/emu/inpttype.ipp:226
+#: src/emu/inpttype.ipp:260 src/emu/inpttype.ipp:294 src/emu/inpttype.ipp:328
+#: src/emu/inpttype.ipp:362 src/emu/inpttype.ipp:396 src/emu/inpttype.ipp:430
+#: src/emu/inpttype.ipp:464
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Right"
+msgid "%p Right Stick/Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:30
+#: src/emu/inpttype.ipp:28 src/emu/inpttype.ipp:146 src/emu/inpttype.ipp:227
+#: src/emu/inpttype.ipp:261 src/emu/inpttype.ipp:295 src/emu/inpttype.ipp:329
+#: src/emu/inpttype.ipp:363 src/emu/inpttype.ipp:397 src/emu/inpttype.ipp:431
+#: src/emu/inpttype.ipp:465
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Up"
+msgid "%p Right Stick/Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:31
+#: src/emu/inpttype.ipp:29 src/emu/inpttype.ipp:147 src/emu/inpttype.ipp:228
+#: src/emu/inpttype.ipp:262 src/emu/inpttype.ipp:296 src/emu/inpttype.ipp:330
+#: src/emu/inpttype.ipp:364 src/emu/inpttype.ipp:398 src/emu/inpttype.ipp:432
+#: src/emu/inpttype.ipp:466
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Down"
+msgid "%p Right Stick/Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:32
+#: src/emu/inpttype.ipp:30 src/emu/inpttype.ipp:148 src/emu/inpttype.ipp:229
+#: src/emu/inpttype.ipp:263 src/emu/inpttype.ipp:297 src/emu/inpttype.ipp:331
+#: src/emu/inpttype.ipp:365 src/emu/inpttype.ipp:399 src/emu/inpttype.ipp:433
+#: src/emu/inpttype.ipp:467
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Left"
+msgid "%p Left Stick/Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:33
+#: src/emu/inpttype.ipp:31 src/emu/inpttype.ipp:149 src/emu/inpttype.ipp:230
+#: src/emu/inpttype.ipp:264 src/emu/inpttype.ipp:298 src/emu/inpttype.ipp:332
+#: src/emu/inpttype.ipp:366 src/emu/inpttype.ipp:400 src/emu/inpttype.ipp:434
+#: src/emu/inpttype.ipp:468
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Right"
+msgid "%p Left Stick/Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:34
+#: src/emu/inpttype.ipp:32 src/emu/inpttype.ipp:150 src/emu/inpttype.ipp:231
+#: src/emu/inpttype.ipp:265 src/emu/inpttype.ipp:299 src/emu/inpttype.ipp:333
+#: src/emu/inpttype.ipp:367 src/emu/inpttype.ipp:401 src/emu/inpttype.ipp:435
+#: src/emu/inpttype.ipp:469
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 1"
+msgid "%p Left Stick/Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:35
+#: src/emu/inpttype.ipp:33 src/emu/inpttype.ipp:151 src/emu/inpttype.ipp:232
+#: src/emu/inpttype.ipp:266 src/emu/inpttype.ipp:300 src/emu/inpttype.ipp:334
+#: src/emu/inpttype.ipp:368 src/emu/inpttype.ipp:402 src/emu/inpttype.ipp:436
+#: src/emu/inpttype.ipp:470
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 2"
+msgid "%p Left Stick/Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:36
+#: src/emu/inpttype.ipp:34 src/emu/inpttype.ipp:152 src/emu/inpttype.ipp:233
+#: src/emu/inpttype.ipp:267 src/emu/inpttype.ipp:301 src/emu/inpttype.ipp:335
+#: src/emu/inpttype.ipp:369 src/emu/inpttype.ipp:403 src/emu/inpttype.ipp:437
+#: src/emu/inpttype.ipp:471
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 3"
+msgid "%p Button 1"
 msgstr ""
 
-#: src/emu/inpttype.ipp:37
+#: src/emu/inpttype.ipp:35 src/emu/inpttype.ipp:153 src/emu/inpttype.ipp:234
+#: src/emu/inpttype.ipp:268 src/emu/inpttype.ipp:302 src/emu/inpttype.ipp:336
+#: src/emu/inpttype.ipp:370 src/emu/inpttype.ipp:404 src/emu/inpttype.ipp:438
+#: src/emu/inpttype.ipp:472
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 4"
+msgid "%p Button 2"
 msgstr ""
 
-#: src/emu/inpttype.ipp:38
+#: src/emu/inpttype.ipp:36 src/emu/inpttype.ipp:154 src/emu/inpttype.ipp:235
+#: src/emu/inpttype.ipp:269 src/emu/inpttype.ipp:303 src/emu/inpttype.ipp:337
+#: src/emu/inpttype.ipp:371 src/emu/inpttype.ipp:405 src/emu/inpttype.ipp:439
+#: src/emu/inpttype.ipp:473
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 5"
+msgid "%p Button 3"
 msgstr ""
 
-#: src/emu/inpttype.ipp:39
+#: src/emu/inpttype.ipp:37 src/emu/inpttype.ipp:155 src/emu/inpttype.ipp:236
+#: src/emu/inpttype.ipp:270 src/emu/inpttype.ipp:304 src/emu/inpttype.ipp:338
+#: src/emu/inpttype.ipp:372 src/emu/inpttype.ipp:406 src/emu/inpttype.ipp:440
+#: src/emu/inpttype.ipp:474
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 6"
+msgid "%p Button 4"
 msgstr ""
 
-#: src/emu/inpttype.ipp:40
+#: src/emu/inpttype.ipp:38 src/emu/inpttype.ipp:156 src/emu/inpttype.ipp:237
+#: src/emu/inpttype.ipp:271 src/emu/inpttype.ipp:305 src/emu/inpttype.ipp:339
+#: src/emu/inpttype.ipp:373 src/emu/inpttype.ipp:407 src/emu/inpttype.ipp:441
+#: src/emu/inpttype.ipp:475
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 7"
+msgid "%p Button 5"
 msgstr ""
 
-#: src/emu/inpttype.ipp:41
+#: src/emu/inpttype.ipp:39 src/emu/inpttype.ipp:157 src/emu/inpttype.ipp:238
+#: src/emu/inpttype.ipp:272 src/emu/inpttype.ipp:306 src/emu/inpttype.ipp:340
+#: src/emu/inpttype.ipp:374 src/emu/inpttype.ipp:408 src/emu/inpttype.ipp:442
+#: src/emu/inpttype.ipp:476
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 8"
+msgid "%p Button 6"
 msgstr ""
 
-#: src/emu/inpttype.ipp:42
+#: src/emu/inpttype.ipp:40 src/emu/inpttype.ipp:158 src/emu/inpttype.ipp:239
+#: src/emu/inpttype.ipp:273 src/emu/inpttype.ipp:307 src/emu/inpttype.ipp:341
+#: src/emu/inpttype.ipp:375 src/emu/inpttype.ipp:409 src/emu/inpttype.ipp:443
+#: src/emu/inpttype.ipp:477
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 9"
+msgid "%p Button 7"
 msgstr ""
 
-#: src/emu/inpttype.ipp:43
+#: src/emu/inpttype.ipp:41 src/emu/inpttype.ipp:159 src/emu/inpttype.ipp:240
+#: src/emu/inpttype.ipp:274 src/emu/inpttype.ipp:308 src/emu/inpttype.ipp:342
+#: src/emu/inpttype.ipp:376 src/emu/inpttype.ipp:410 src/emu/inpttype.ipp:444
+#: src/emu/inpttype.ipp:478
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 10"
+msgid "%p Button 8"
 msgstr ""
 
-#: src/emu/inpttype.ipp:44
+#: src/emu/inpttype.ipp:42 src/emu/inpttype.ipp:160 src/emu/inpttype.ipp:241
+#: src/emu/inpttype.ipp:275 src/emu/inpttype.ipp:309 src/emu/inpttype.ipp:343
+#: src/emu/inpttype.ipp:377 src/emu/inpttype.ipp:411 src/emu/inpttype.ipp:445
+#: src/emu/inpttype.ipp:479
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 11"
+msgid "%p Button 9"
 msgstr ""
 
-#: src/emu/inpttype.ipp:45
+#: src/emu/inpttype.ipp:43 src/emu/inpttype.ipp:161 src/emu/inpttype.ipp:242
+#: src/emu/inpttype.ipp:276 src/emu/inpttype.ipp:310 src/emu/inpttype.ipp:344
+#: src/emu/inpttype.ipp:378 src/emu/inpttype.ipp:412 src/emu/inpttype.ipp:446
+#: src/emu/inpttype.ipp:480
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 12"
+msgid "%p Button 10"
 msgstr ""
 
-#: src/emu/inpttype.ipp:46
+#: src/emu/inpttype.ipp:44 src/emu/inpttype.ipp:162 src/emu/inpttype.ipp:243
+#: src/emu/inpttype.ipp:277 src/emu/inpttype.ipp:311 src/emu/inpttype.ipp:345
+#: src/emu/inpttype.ipp:379 src/emu/inpttype.ipp:413 src/emu/inpttype.ipp:447
+#: src/emu/inpttype.ipp:481
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 13"
+msgid "%p Button 11"
 msgstr ""
 
-#: src/emu/inpttype.ipp:47
+#: src/emu/inpttype.ipp:45 src/emu/inpttype.ipp:163 src/emu/inpttype.ipp:244
+#: src/emu/inpttype.ipp:278 src/emu/inpttype.ipp:312 src/emu/inpttype.ipp:346
+#: src/emu/inpttype.ipp:380 src/emu/inpttype.ipp:414 src/emu/inpttype.ipp:448
+#: src/emu/inpttype.ipp:482
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 14"
+msgid "%p Button 12"
 msgstr ""
 
-#: src/emu/inpttype.ipp:48
+#: src/emu/inpttype.ipp:46 src/emu/inpttype.ipp:164 src/emu/inpttype.ipp:245
+#: src/emu/inpttype.ipp:279 src/emu/inpttype.ipp:313 src/emu/inpttype.ipp:347
+#: src/emu/inpttype.ipp:381 src/emu/inpttype.ipp:415 src/emu/inpttype.ipp:449
+#: src/emu/inpttype.ipp:483
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 15"
+msgid "%p Button 13"
 msgstr ""
 
-#: src/emu/inpttype.ipp:49
+#: src/emu/inpttype.ipp:47 src/emu/inpttype.ipp:165 src/emu/inpttype.ipp:246
+#: src/emu/inpttype.ipp:280 src/emu/inpttype.ipp:314 src/emu/inpttype.ipp:348
+#: src/emu/inpttype.ipp:382 src/emu/inpttype.ipp:416 src/emu/inpttype.ipp:450
+#: src/emu/inpttype.ipp:484
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 16"
+msgid "%p Button 14"
 msgstr ""
 
-#: src/emu/inpttype.ipp:50
+#: src/emu/inpttype.ipp:48 src/emu/inpttype.ipp:166 src/emu/inpttype.ipp:247
+#: src/emu/inpttype.ipp:281 src/emu/inpttype.ipp:315 src/emu/inpttype.ipp:349
+#: src/emu/inpttype.ipp:383 src/emu/inpttype.ipp:417 src/emu/inpttype.ipp:451
+#: src/emu/inpttype.ipp:485
+#, c-format
 msgctxt "input-name"
-msgid "P1 Start"
+msgid "%p Button 15"
 msgstr ""
 
-#: src/emu/inpttype.ipp:51
+#: src/emu/inpttype.ipp:49 src/emu/inpttype.ipp:167 src/emu/inpttype.ipp:248
+#: src/emu/inpttype.ipp:282 src/emu/inpttype.ipp:316 src/emu/inpttype.ipp:350
+#: src/emu/inpttype.ipp:384 src/emu/inpttype.ipp:418 src/emu/inpttype.ipp:452
+#: src/emu/inpttype.ipp:486
+#, c-format
 msgctxt "input-name"
-msgid "P1 Select"
+msgid "%p Button 16"
 msgstr ""
 
-#: src/emu/inpttype.ipp:56
+#: src/emu/inpttype.ipp:50 src/emu/inpttype.ipp:168 src/emu/inpttype.ipp:249
+#: src/emu/inpttype.ipp:283 src/emu/inpttype.ipp:317 src/emu/inpttype.ipp:351
+#: src/emu/inpttype.ipp:385 src/emu/inpttype.ipp:419 src/emu/inpttype.ipp:453
+#: src/emu/inpttype.ipp:487
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong A"
+msgid "%p Start"
 msgstr ""
 
-#: src/emu/inpttype.ipp:57
+#: src/emu/inpttype.ipp:51 src/emu/inpttype.ipp:169 src/emu/inpttype.ipp:250
+#: src/emu/inpttype.ipp:284 src/emu/inpttype.ipp:318 src/emu/inpttype.ipp:352
+#: src/emu/inpttype.ipp:386 src/emu/inpttype.ipp:420 src/emu/inpttype.ipp:454
+#: src/emu/inpttype.ipp:488
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong B"
+msgid "%p Select"
 msgstr ""
 
-#: src/emu/inpttype.ipp:58
+#: src/emu/inpttype.ipp:56 src/emu/inpttype.ipp:174
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong C"
+msgid "%p Mahjong A"
 msgstr ""
 
-#: src/emu/inpttype.ipp:59
+#: src/emu/inpttype.ipp:57 src/emu/inpttype.ipp:175
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong D"
+msgid "%p Mahjong B"
 msgstr ""
 
-#: src/emu/inpttype.ipp:60
+#: src/emu/inpttype.ipp:58 src/emu/inpttype.ipp:176
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong E"
+msgid "%p Mahjong C"
 msgstr ""
 
-#: src/emu/inpttype.ipp:61
+#: src/emu/inpttype.ipp:59 src/emu/inpttype.ipp:177
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong F"
+msgid "%p Mahjong D"
 msgstr ""
 
-#: src/emu/inpttype.ipp:62
+#: src/emu/inpttype.ipp:60 src/emu/inpttype.ipp:178
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong G"
+msgid "%p Mahjong E"
 msgstr ""
 
-#: src/emu/inpttype.ipp:63
+#: src/emu/inpttype.ipp:61 src/emu/inpttype.ipp:179
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong H"
+msgid "%p Mahjong F"
 msgstr ""
 
-#: src/emu/inpttype.ipp:64
+#: src/emu/inpttype.ipp:62 src/emu/inpttype.ipp:180
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong I"
+msgid "%p Mahjong G"
 msgstr ""
 
-#: src/emu/inpttype.ipp:65
+#: src/emu/inpttype.ipp:63 src/emu/inpttype.ipp:181
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong J"
+msgid "%p Mahjong H"
 msgstr ""
 
-#: src/emu/inpttype.ipp:66
+#: src/emu/inpttype.ipp:64 src/emu/inpttype.ipp:182
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong K"
+msgid "%p Mahjong I"
 msgstr ""
 
-#: src/emu/inpttype.ipp:67
+#: src/emu/inpttype.ipp:65 src/emu/inpttype.ipp:183
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong L"
+msgid "%p Mahjong J"
 msgstr ""
 
-#: src/emu/inpttype.ipp:68
+#: src/emu/inpttype.ipp:66 src/emu/inpttype.ipp:184
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong M"
+msgid "%p Mahjong K"
 msgstr ""
 
-#: src/emu/inpttype.ipp:69
+#: src/emu/inpttype.ipp:67 src/emu/inpttype.ipp:185
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong N"
+msgid "%p Mahjong L"
 msgstr ""
 
-#: src/emu/inpttype.ipp:70
+#: src/emu/inpttype.ipp:68 src/emu/inpttype.ipp:186
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong O"
+msgid "%p Mahjong M"
 msgstr ""
 
-#: src/emu/inpttype.ipp:71
+#: src/emu/inpttype.ipp:69 src/emu/inpttype.ipp:187
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong P"
+msgid "%p Mahjong N"
 msgstr ""
 
-#: src/emu/inpttype.ipp:72
+#: src/emu/inpttype.ipp:70 src/emu/inpttype.ipp:188
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Q"
+msgid "%p Mahjong O"
 msgstr ""
 
-#: src/emu/inpttype.ipp:73
+#: src/emu/inpttype.ipp:71 src/emu/inpttype.ipp:189
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Kan"
+msgid "%p Mahjong P"
 msgstr ""
 
-#: src/emu/inpttype.ipp:74
+#: src/emu/inpttype.ipp:72 src/emu/inpttype.ipp:190
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Pon"
+msgid "%p Mahjong Q"
 msgstr ""
 
-#: src/emu/inpttype.ipp:75
+#: src/emu/inpttype.ipp:73 src/emu/inpttype.ipp:191
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Chi"
+msgid "%p Mahjong Kan"
 msgstr ""
 
-#: src/emu/inpttype.ipp:76
+#: src/emu/inpttype.ipp:74 src/emu/inpttype.ipp:192
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Reach"
+msgid "%p Mahjong Pon"
 msgstr ""
 
-#: src/emu/inpttype.ipp:77
+#: src/emu/inpttype.ipp:75 src/emu/inpttype.ipp:193
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Ron"
+msgid "%p Mahjong Chi"
 msgstr ""
 
-#: src/emu/inpttype.ipp:78
+#: src/emu/inpttype.ipp:76 src/emu/inpttype.ipp:194
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Flip Flop"
+msgid "%p Mahjong Reach"
 msgstr ""
 
-#: src/emu/inpttype.ipp:79
+#: src/emu/inpttype.ipp:77 src/emu/inpttype.ipp:195
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Bet"
+msgid "%p Mahjong Ron"
 msgstr ""
 
-#: src/emu/inpttype.ipp:80
+#: src/emu/inpttype.ipp:78 src/emu/inpttype.ipp:200
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Take Score"
+msgid "%p Mahjong Flip Flop"
 msgstr ""
 
-#: src/emu/inpttype.ipp:81
+#: src/emu/inpttype.ipp:79 src/emu/inpttype.ipp:196
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Double Up"
+msgid "%p Mahjong Bet"
 msgstr ""
 
-#: src/emu/inpttype.ipp:82
+#: src/emu/inpttype.ipp:80 src/emu/inpttype.ipp:198
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Big"
+msgid "%p Mahjong Take Score"
 msgstr ""
 
-#: src/emu/inpttype.ipp:83
+#: src/emu/inpttype.ipp:81 src/emu/inpttype.ipp:199
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Small"
+msgid "%p Mahjong Double Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:84
+#: src/emu/inpttype.ipp:82 src/emu/inpttype.ipp:201
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Last Chance"
+msgid "%p Mahjong Big"
 msgstr ""
 
-#: src/emu/inpttype.ipp:89
+#: src/emu/inpttype.ipp:83 src/emu/inpttype.ipp:202
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda A/1"
+msgid "%p Mahjong Small"
 msgstr ""
 
-#: src/emu/inpttype.ipp:90
+#: src/emu/inpttype.ipp:84 src/emu/inpttype.ipp:197
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda B/2"
+msgid "%p Mahjong Last Chance"
 msgstr ""
 
-#: src/emu/inpttype.ipp:91
+#: src/emu/inpttype.ipp:89 src/emu/inpttype.ipp:207
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda C/3"
+msgid "%p Hanafuda A/1"
 msgstr ""
 
-#: src/emu/inpttype.ipp:92
+#: src/emu/inpttype.ipp:90 src/emu/inpttype.ipp:208
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda D/4"
+msgid "%p Hanafuda B/2"
 msgstr ""
 
-#: src/emu/inpttype.ipp:93
+#: src/emu/inpttype.ipp:91 src/emu/inpttype.ipp:209
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda E/5"
+msgid "%p Hanafuda C/3"
 msgstr ""
 
-#: src/emu/inpttype.ipp:94
+#: src/emu/inpttype.ipp:92 src/emu/inpttype.ipp:210
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda F/6"
+msgid "%p Hanafuda D/4"
 msgstr ""
 
-#: src/emu/inpttype.ipp:95
+#: src/emu/inpttype.ipp:93 src/emu/inpttype.ipp:211
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda G/7"
+msgid "%p Hanafuda E/5"
 msgstr ""
 
-#: src/emu/inpttype.ipp:96
+#: src/emu/inpttype.ipp:94 src/emu/inpttype.ipp:212
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda H/8"
+msgid "%p Hanafuda F/6"
 msgstr ""
 
-#: src/emu/inpttype.ipp:97
+#: src/emu/inpttype.ipp:95 src/emu/inpttype.ipp:213
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda Yes"
+msgid "%p Hanafuda G/7"
 msgstr ""
 
-#: src/emu/inpttype.ipp:98
+#: src/emu/inpttype.ipp:96 src/emu/inpttype.ipp:214
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda No"
+msgid "%p Hanafuda H/8"
+msgstr ""
+
+#: src/emu/inpttype.ipp:97 src/emu/inpttype.ipp:215
+#, c-format
+msgctxt "input-name"
+msgid "%p Hanafuda Yes"
+msgstr ""
+
+#: src/emu/inpttype.ipp:98 src/emu/inpttype.ipp:216
+#, c-format
+msgctxt "input-name"
+msgid "%p Hanafuda No"
 msgstr ""
 
 #: src/emu/inpttype.ipp:103
@@ -3751,1551 +3925,6 @@ msgctxt "input-name"
 msgid "Stop All Reels"
 msgstr ""
 
-#: src/emu/inpttype.ipp:140
-msgctxt "input-name"
-msgid "P2 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:141
-msgctxt "input-name"
-msgid "P2 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:142
-msgctxt "input-name"
-msgid "P2 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:143
-msgctxt "input-name"
-msgid "P2 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:144
-msgctxt "input-name"
-msgid "P2 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:145
-msgctxt "input-name"
-msgid "P2 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:146
-msgctxt "input-name"
-msgid "P2 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:147
-msgctxt "input-name"
-msgid "P2 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:148
-msgctxt "input-name"
-msgid "P2 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:149
-msgctxt "input-name"
-msgid "P2 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:150
-msgctxt "input-name"
-msgid "P2 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:151
-msgctxt "input-name"
-msgid "P2 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:152
-msgctxt "input-name"
-msgid "P2 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:153
-msgctxt "input-name"
-msgid "P2 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:154
-msgctxt "input-name"
-msgid "P2 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:155
-msgctxt "input-name"
-msgid "P2 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:156
-msgctxt "input-name"
-msgid "P2 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:157
-msgctxt "input-name"
-msgid "P2 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:158
-msgctxt "input-name"
-msgid "P2 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:159
-msgctxt "input-name"
-msgid "P2 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:160
-msgctxt "input-name"
-msgid "P2 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:161
-msgctxt "input-name"
-msgid "P2 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:162
-msgctxt "input-name"
-msgid "P2 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:163
-msgctxt "input-name"
-msgid "P2 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:164
-msgctxt "input-name"
-msgid "P2 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:165
-msgctxt "input-name"
-msgid "P2 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:166
-msgctxt "input-name"
-msgid "P2 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:167
-msgctxt "input-name"
-msgid "P2 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:168
-msgctxt "input-name"
-msgid "P2 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:169
-msgctxt "input-name"
-msgid "P2 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:174
-msgctxt "input-name"
-msgid "P2 Mahjong A"
-msgstr ""
-
-#: src/emu/inpttype.ipp:175
-msgctxt "input-name"
-msgid "P2 Mahjong B"
-msgstr ""
-
-#: src/emu/inpttype.ipp:176
-msgctxt "input-name"
-msgid "P2 Mahjong C"
-msgstr ""
-
-#: src/emu/inpttype.ipp:177
-msgctxt "input-name"
-msgid "P2 Mahjong D"
-msgstr ""
-
-#: src/emu/inpttype.ipp:178
-msgctxt "input-name"
-msgid "P2 Mahjong E"
-msgstr ""
-
-#: src/emu/inpttype.ipp:179
-msgctxt "input-name"
-msgid "P2 Mahjong F"
-msgstr ""
-
-#: src/emu/inpttype.ipp:180
-msgctxt "input-name"
-msgid "P2 Mahjong G"
-msgstr ""
-
-#: src/emu/inpttype.ipp:181
-msgctxt "input-name"
-msgid "P2 Mahjong H"
-msgstr ""
-
-#: src/emu/inpttype.ipp:182
-msgctxt "input-name"
-msgid "P2 Mahjong I"
-msgstr ""
-
-#: src/emu/inpttype.ipp:183
-msgctxt "input-name"
-msgid "P2 Mahjong J"
-msgstr ""
-
-#: src/emu/inpttype.ipp:184
-msgctxt "input-name"
-msgid "P2 Mahjong K"
-msgstr ""
-
-#: src/emu/inpttype.ipp:185
-msgctxt "input-name"
-msgid "P2 Mahjong L"
-msgstr ""
-
-#: src/emu/inpttype.ipp:186
-msgctxt "input-name"
-msgid "P2 Mahjong M"
-msgstr ""
-
-#: src/emu/inpttype.ipp:187
-msgctxt "input-name"
-msgid "P2 Mahjong N"
-msgstr ""
-
-#: src/emu/inpttype.ipp:188
-msgctxt "input-name"
-msgid "P2 Mahjong O"
-msgstr ""
-
-#: src/emu/inpttype.ipp:189
-msgctxt "input-name"
-msgid "P2 Mahjong P"
-msgstr ""
-
-#: src/emu/inpttype.ipp:190
-msgctxt "input-name"
-msgid "P2 Mahjong Q"
-msgstr ""
-
-#: src/emu/inpttype.ipp:191
-msgctxt "input-name"
-msgid "P2 Mahjong Kan"
-msgstr ""
-
-#: src/emu/inpttype.ipp:192
-msgctxt "input-name"
-msgid "P2 Mahjong Pon"
-msgstr ""
-
-#: src/emu/inpttype.ipp:193
-msgctxt "input-name"
-msgid "P2 Mahjong Chi"
-msgstr ""
-
-#: src/emu/inpttype.ipp:194
-msgctxt "input-name"
-msgid "P2 Mahjong Reach"
-msgstr ""
-
-#: src/emu/inpttype.ipp:195
-msgctxt "input-name"
-msgid "P2 Mahjong Ron"
-msgstr ""
-
-#: src/emu/inpttype.ipp:196
-msgctxt "input-name"
-msgid "P2 Mahjong Bet"
-msgstr ""
-
-#: src/emu/inpttype.ipp:197
-msgctxt "input-name"
-msgid "P2 Mahjong Last Chance"
-msgstr ""
-
-#: src/emu/inpttype.ipp:198
-msgctxt "input-name"
-msgid "P2 Mahjong Take Score"
-msgstr ""
-
-#: src/emu/inpttype.ipp:199
-msgctxt "input-name"
-msgid "P2 Mahjong Double Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:200
-msgctxt "input-name"
-msgid "P2 Mahjong Flip Flop"
-msgstr ""
-
-#: src/emu/inpttype.ipp:201
-msgctxt "input-name"
-msgid "P2 Mahjong Big"
-msgstr ""
-
-#: src/emu/inpttype.ipp:202
-msgctxt "input-name"
-msgid "P2 Mahjong Small"
-msgstr ""
-
-#: src/emu/inpttype.ipp:207
-msgctxt "input-name"
-msgid "P2 Hanafuda A/1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:208
-msgctxt "input-name"
-msgid "P2 Hanafuda B/2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:209
-msgctxt "input-name"
-msgid "P2 Hanafuda C/3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:210
-msgctxt "input-name"
-msgid "P2 Hanafuda D/4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:211
-msgctxt "input-name"
-msgid "P2 Hanafuda E/5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:212
-msgctxt "input-name"
-msgid "P2 Hanafuda F/6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:213
-msgctxt "input-name"
-msgid "P2 Hanafuda G/7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:214
-msgctxt "input-name"
-msgid "P2 Hanafuda H/8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:215
-msgctxt "input-name"
-msgid "P2 Hanafuda Yes"
-msgstr ""
-
-#: src/emu/inpttype.ipp:216
-msgctxt "input-name"
-msgid "P2 Hanafuda No"
-msgstr ""
-
-#: src/emu/inpttype.ipp:221
-msgctxt "input-name"
-msgid "P3 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:222
-msgctxt "input-name"
-msgid "P3 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:223
-msgctxt "input-name"
-msgid "P3 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:224
-msgctxt "input-name"
-msgid "P3 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:225
-msgctxt "input-name"
-msgid "P3 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:226
-msgctxt "input-name"
-msgid "P3 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:227
-msgctxt "input-name"
-msgid "P3 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:228
-msgctxt "input-name"
-msgid "P3 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:229
-msgctxt "input-name"
-msgid "P3 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:230
-msgctxt "input-name"
-msgid "P3 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:231
-msgctxt "input-name"
-msgid "P3 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:232
-msgctxt "input-name"
-msgid "P3 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:233
-msgctxt "input-name"
-msgid "P3 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:234
-msgctxt "input-name"
-msgid "P3 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:235
-msgctxt "input-name"
-msgid "P3 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:236
-msgctxt "input-name"
-msgid "P3 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:237
-msgctxt "input-name"
-msgid "P3 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:238
-msgctxt "input-name"
-msgid "P3 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:239
-msgctxt "input-name"
-msgid "P3 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:240
-msgctxt "input-name"
-msgid "P3 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:241
-msgctxt "input-name"
-msgid "P3 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:242
-msgctxt "input-name"
-msgid "P3 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:243
-msgctxt "input-name"
-msgid "P3 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:244
-msgctxt "input-name"
-msgid "P3 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:245
-msgctxt "input-name"
-msgid "P3 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:246
-msgctxt "input-name"
-msgid "P3 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:247
-msgctxt "input-name"
-msgid "P3 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:248
-msgctxt "input-name"
-msgid "P3 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:249
-msgctxt "input-name"
-msgid "P3 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:250
-msgctxt "input-name"
-msgid "P3 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:255
-msgctxt "input-name"
-msgid "P4 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:256
-msgctxt "input-name"
-msgid "P4 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:257
-msgctxt "input-name"
-msgid "P4 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:258
-msgctxt "input-name"
-msgid "P4 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:259
-msgctxt "input-name"
-msgid "P4 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:260
-msgctxt "input-name"
-msgid "P4 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:261
-msgctxt "input-name"
-msgid "P4 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:262
-msgctxt "input-name"
-msgid "P4 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:263
-msgctxt "input-name"
-msgid "P4 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:264
-msgctxt "input-name"
-msgid "P4 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:265
-msgctxt "input-name"
-msgid "P4 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:266
-msgctxt "input-name"
-msgid "P4 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:267
-msgctxt "input-name"
-msgid "P4 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:268
-msgctxt "input-name"
-msgid "P4 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:269
-msgctxt "input-name"
-msgid "P4 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:270
-msgctxt "input-name"
-msgid "P4 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:271
-msgctxt "input-name"
-msgid "P4 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:272
-msgctxt "input-name"
-msgid "P4 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:273
-msgctxt "input-name"
-msgid "P4 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:274
-msgctxt "input-name"
-msgid "P4 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:275
-msgctxt "input-name"
-msgid "P4 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:276
-msgctxt "input-name"
-msgid "P4 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:277
-msgctxt "input-name"
-msgid "P4 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:278
-msgctxt "input-name"
-msgid "P4 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:279
-msgctxt "input-name"
-msgid "P4 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:280
-msgctxt "input-name"
-msgid "P4 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:281
-msgctxt "input-name"
-msgid "P4 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:282
-msgctxt "input-name"
-msgid "P4 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:283
-msgctxt "input-name"
-msgid "P4 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:284
-msgctxt "input-name"
-msgid "P4 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:289
-msgctxt "input-name"
-msgid "P5 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:290
-msgctxt "input-name"
-msgid "P5 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:291
-msgctxt "input-name"
-msgid "P5 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:292
-msgctxt "input-name"
-msgid "P5 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:293
-msgctxt "input-name"
-msgid "P5 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:294
-msgctxt "input-name"
-msgid "P5 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:295
-msgctxt "input-name"
-msgid "P5 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:296
-msgctxt "input-name"
-msgid "P5 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:297
-msgctxt "input-name"
-msgid "P5 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:298
-msgctxt "input-name"
-msgid "P5 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:299
-msgctxt "input-name"
-msgid "P5 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:300
-msgctxt "input-name"
-msgid "P5 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:301
-msgctxt "input-name"
-msgid "P5 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:302
-msgctxt "input-name"
-msgid "P5 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:303
-msgctxt "input-name"
-msgid "P5 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:304
-msgctxt "input-name"
-msgid "P5 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:305
-msgctxt "input-name"
-msgid "P5 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:306
-msgctxt "input-name"
-msgid "P5 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:307
-msgctxt "input-name"
-msgid "P5 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:308
-msgctxt "input-name"
-msgid "P5 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:309
-msgctxt "input-name"
-msgid "P5 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:310
-msgctxt "input-name"
-msgid "P5 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:311
-msgctxt "input-name"
-msgid "P5 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:312
-msgctxt "input-name"
-msgid "P5 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:313
-msgctxt "input-name"
-msgid "P5 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:314
-msgctxt "input-name"
-msgid "P5 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:315
-msgctxt "input-name"
-msgid "P5 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:316
-msgctxt "input-name"
-msgid "P5 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:317
-msgctxt "input-name"
-msgid "P5 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:318
-msgctxt "input-name"
-msgid "P5 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:323
-msgctxt "input-name"
-msgid "P6 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:324
-msgctxt "input-name"
-msgid "P6 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:325
-msgctxt "input-name"
-msgid "P6 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:326
-msgctxt "input-name"
-msgid "P6 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:327
-msgctxt "input-name"
-msgid "P6 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:328
-msgctxt "input-name"
-msgid "P6 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:329
-msgctxt "input-name"
-msgid "P6 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:330
-msgctxt "input-name"
-msgid "P6 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:331
-msgctxt "input-name"
-msgid "P6 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:332
-msgctxt "input-name"
-msgid "P6 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:333
-msgctxt "input-name"
-msgid "P6 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:334
-msgctxt "input-name"
-msgid "P6 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:335
-msgctxt "input-name"
-msgid "P6 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:336
-msgctxt "input-name"
-msgid "P6 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:337
-msgctxt "input-name"
-msgid "P6 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:338
-msgctxt "input-name"
-msgid "P6 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:339
-msgctxt "input-name"
-msgid "P6 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:340
-msgctxt "input-name"
-msgid "P6 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:341
-msgctxt "input-name"
-msgid "P6 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:342
-msgctxt "input-name"
-msgid "P6 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:343
-msgctxt "input-name"
-msgid "P6 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:344
-msgctxt "input-name"
-msgid "P6 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:345
-msgctxt "input-name"
-msgid "P6 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:346
-msgctxt "input-name"
-msgid "P6 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:347
-msgctxt "input-name"
-msgid "P6 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:348
-msgctxt "input-name"
-msgid "P6 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:349
-msgctxt "input-name"
-msgid "P6 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:350
-msgctxt "input-name"
-msgid "P6 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:351
-msgctxt "input-name"
-msgid "P6 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:352
-msgctxt "input-name"
-msgid "P6 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:357
-msgctxt "input-name"
-msgid "P7 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:358
-msgctxt "input-name"
-msgid "P7 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:359
-msgctxt "input-name"
-msgid "P7 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:360
-msgctxt "input-name"
-msgid "P7 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:361
-msgctxt "input-name"
-msgid "P7 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:362
-msgctxt "input-name"
-msgid "P7 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:363
-msgctxt "input-name"
-msgid "P7 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:364
-msgctxt "input-name"
-msgid "P7 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:365
-msgctxt "input-name"
-msgid "P7 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:366
-msgctxt "input-name"
-msgid "P7 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:367
-msgctxt "input-name"
-msgid "P7 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:368
-msgctxt "input-name"
-msgid "P7 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:369
-msgctxt "input-name"
-msgid "P7 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:370
-msgctxt "input-name"
-msgid "P7 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:371
-msgctxt "input-name"
-msgid "P7 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:372
-msgctxt "input-name"
-msgid "P7 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:373
-msgctxt "input-name"
-msgid "P7 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:374
-msgctxt "input-name"
-msgid "P7 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:375
-msgctxt "input-name"
-msgid "P7 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:376
-msgctxt "input-name"
-msgid "P7 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:377
-msgctxt "input-name"
-msgid "P7 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:378
-msgctxt "input-name"
-msgid "P7 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:379
-msgctxt "input-name"
-msgid "P7 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:380
-msgctxt "input-name"
-msgid "P7 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:381
-msgctxt "input-name"
-msgid "P7 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:382
-msgctxt "input-name"
-msgid "P7 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:383
-msgctxt "input-name"
-msgid "P7 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:384
-msgctxt "input-name"
-msgid "P7 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:385
-msgctxt "input-name"
-msgid "P7 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:386
-msgctxt "input-name"
-msgid "P7 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:391
-msgctxt "input-name"
-msgid "P8 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:392
-msgctxt "input-name"
-msgid "P8 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:393
-msgctxt "input-name"
-msgid "P8 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:394
-msgctxt "input-name"
-msgid "P8 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:395
-msgctxt "input-name"
-msgid "P8 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:396
-msgctxt "input-name"
-msgid "P8 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:397
-msgctxt "input-name"
-msgid "P8 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:398
-msgctxt "input-name"
-msgid "P8 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:399
-msgctxt "input-name"
-msgid "P8 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:400
-msgctxt "input-name"
-msgid "P8 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:401
-msgctxt "input-name"
-msgid "P8 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:402
-msgctxt "input-name"
-msgid "P8 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:403
-msgctxt "input-name"
-msgid "P8 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:404
-msgctxt "input-name"
-msgid "P8 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:405
-msgctxt "input-name"
-msgid "P8 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:406
-msgctxt "input-name"
-msgid "P8 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:407
-msgctxt "input-name"
-msgid "P8 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:408
-msgctxt "input-name"
-msgid "P8 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:409
-msgctxt "input-name"
-msgid "P8 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:410
-msgctxt "input-name"
-msgid "P8 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:411
-msgctxt "input-name"
-msgid "P8 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:412
-msgctxt "input-name"
-msgid "P8 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:413
-msgctxt "input-name"
-msgid "P8 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:414
-msgctxt "input-name"
-msgid "P8 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:415
-msgctxt "input-name"
-msgid "P8 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:416
-msgctxt "input-name"
-msgid "P8 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:417
-msgctxt "input-name"
-msgid "P8 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:418
-msgctxt "input-name"
-msgid "P8 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:419
-msgctxt "input-name"
-msgid "P8 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:420
-msgctxt "input-name"
-msgid "P8 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:425
-msgctxt "input-name"
-msgid "P9 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:426
-msgctxt "input-name"
-msgid "P9 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:427
-msgctxt "input-name"
-msgid "P9 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:428
-msgctxt "input-name"
-msgid "P9 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:429
-msgctxt "input-name"
-msgid "P9 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:430
-msgctxt "input-name"
-msgid "P9 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:431
-msgctxt "input-name"
-msgid "P9 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:432
-msgctxt "input-name"
-msgid "P9 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:433
-msgctxt "input-name"
-msgid "P9 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:434
-msgctxt "input-name"
-msgid "P9 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:435
-msgctxt "input-name"
-msgid "P9 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:436
-msgctxt "input-name"
-msgid "P9 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:437
-msgctxt "input-name"
-msgid "P9 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:438
-msgctxt "input-name"
-msgid "P9 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:439
-msgctxt "input-name"
-msgid "P9 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:440
-msgctxt "input-name"
-msgid "P9 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:441
-msgctxt "input-name"
-msgid "P9 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:442
-msgctxt "input-name"
-msgid "P9 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:443
-msgctxt "input-name"
-msgid "P9 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:444
-msgctxt "input-name"
-msgid "P9 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:445
-msgctxt "input-name"
-msgid "P9 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:446
-msgctxt "input-name"
-msgid "P9 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:447
-msgctxt "input-name"
-msgid "P9 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:448
-msgctxt "input-name"
-msgid "P9 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:449
-msgctxt "input-name"
-msgid "P9 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:450
-msgctxt "input-name"
-msgid "P9 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:451
-msgctxt "input-name"
-msgid "P9 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:452
-msgctxt "input-name"
-msgid "P9 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:453
-msgctxt "input-name"
-msgid "P9 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:454
-msgctxt "input-name"
-msgid "P9 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:459
-msgctxt "input-name"
-msgid "P10 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:460
-msgctxt "input-name"
-msgid "P10 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:461
-msgctxt "input-name"
-msgid "P10 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:462
-msgctxt "input-name"
-msgid "P10 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:463
-msgctxt "input-name"
-msgid "P10 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:464
-msgctxt "input-name"
-msgid "P10 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:465
-msgctxt "input-name"
-msgid "P10 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:466
-msgctxt "input-name"
-msgid "P10 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:467
-msgctxt "input-name"
-msgid "P10 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:468
-msgctxt "input-name"
-msgid "P10 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:469
-msgctxt "input-name"
-msgid "P10 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:470
-msgctxt "input-name"
-msgid "P10 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:471
-msgctxt "input-name"
-msgid "P10 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:472
-msgctxt "input-name"
-msgid "P10 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:473
-msgctxt "input-name"
-msgid "P10 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:474
-msgctxt "input-name"
-msgid "P10 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:475
-msgctxt "input-name"
-msgid "P10 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:476
-msgctxt "input-name"
-msgid "P10 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:477
-msgctxt "input-name"
-msgid "P10 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:478
-msgctxt "input-name"
-msgid "P10 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:479
-msgctxt "input-name"
-msgid "P10 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:480
-msgctxt "input-name"
-msgid "P10 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:481
-msgctxt "input-name"
-msgid "P10 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:482
-msgctxt "input-name"
-msgid "P10 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:483
-msgctxt "input-name"
-msgid "P10 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:484
-msgctxt "input-name"
-msgid "P10 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:485
-msgctxt "input-name"
-msgid "P10 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:486
-msgctxt "input-name"
-msgid "P10 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:487
-msgctxt "input-name"
-msgid "P10 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:488
-msgctxt "input-name"
-msgid "P10 Select"
-msgstr ""
-
 #: src/emu/inpttype.ipp:493
 msgctxt "input-name"
 msgid "1 Player Start"
@@ -5476,154 +4105,31 @@ msgctxt "input-name"
 msgid "Volume Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:550
-msgctxt "input-name"
-msgid "P1 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:551
-msgctxt "input-name"
-msgid "P2 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:552
-msgctxt "input-name"
-msgid "P3 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:553
-msgctxt "input-name"
-msgid "P4 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:554
-msgctxt "input-name"
-msgid "P5 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:555
-msgctxt "input-name"
-msgid "P6 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:556
-msgctxt "input-name"
-msgid "P7 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:557
-msgctxt "input-name"
-msgid "P8 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:558
-msgctxt "input-name"
-msgid "P9 Pedal 1"
-msgstr ""
-
+#: src/emu/inpttype.ipp:550 src/emu/inpttype.ipp:551 src/emu/inpttype.ipp:552
+#: src/emu/inpttype.ipp:553 src/emu/inpttype.ipp:554 src/emu/inpttype.ipp:555
+#: src/emu/inpttype.ipp:556 src/emu/inpttype.ipp:557 src/emu/inpttype.ipp:558
 #: src/emu/inpttype.ipp:559
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:564
-msgctxt "input-name"
-msgid "P1 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:565
-msgctxt "input-name"
-msgid "P2 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:566
-msgctxt "input-name"
-msgid "P3 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:567
-msgctxt "input-name"
-msgid "P4 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:568
-msgctxt "input-name"
-msgid "P5 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:569
-msgctxt "input-name"
-msgid "P6 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:570
-msgctxt "input-name"
-msgid "P7 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:571
-msgctxt "input-name"
-msgid "P8 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:572
-msgctxt "input-name"
-msgid "P9 Pedal 2"
+msgid "%p Pedal 1"
 msgstr ""
 
+#: src/emu/inpttype.ipp:564 src/emu/inpttype.ipp:565 src/emu/inpttype.ipp:566
+#: src/emu/inpttype.ipp:567 src/emu/inpttype.ipp:568 src/emu/inpttype.ipp:569
+#: src/emu/inpttype.ipp:570 src/emu/inpttype.ipp:571 src/emu/inpttype.ipp:572
 #: src/emu/inpttype.ipp:573
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:578
-msgctxt "input-name"
-msgid "P1 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:579
-msgctxt "input-name"
-msgid "P2 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:580
-msgctxt "input-name"
-msgid "P3 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:581
-msgctxt "input-name"
-msgid "P4 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:582
-msgctxt "input-name"
-msgid "P5 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:583
-msgctxt "input-name"
-msgid "P6 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:584
-msgctxt "input-name"
-msgid "P7 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:585
-msgctxt "input-name"
-msgid "P8 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:586
-msgctxt "input-name"
-msgid "P9 Pedal 3"
+msgid "%p Pedal 2"
 msgstr ""
 
+#: src/emu/inpttype.ipp:578 src/emu/inpttype.ipp:579 src/emu/inpttype.ipp:580
+#: src/emu/inpttype.ipp:581 src/emu/inpttype.ipp:582 src/emu/inpttype.ipp:583
+#: src/emu/inpttype.ipp:584 src/emu/inpttype.ipp:585 src/emu/inpttype.ipp:586
 #: src/emu/inpttype.ipp:587
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 3"
+msgid "%p Pedal 3"
 msgstr ""
 
 #: src/emu/inpttype.ipp:592
diff --git a/language/Albanian/strings.po b/language/Albanian/strings.po
index 3b57a927ae2..dfbc9a28515 100644
--- a/language/Albanian/strings.po
+++ b/language/Albanian/strings.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-19 02:50+1100\n"
+"POT-Creation-Date: 2021-12-09 04:44+1100\n"
 "PO-Revision-Date: 2016-02-20 18:03+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: MAME Language Team\n"
@@ -259,12 +259,12 @@ msgstr ""
 msgid "Driver: \"%1$s\" software list "
 msgstr ""
 
-#: src/frontend/mame/ui/selsoft.cpp:711 src/frontend/mame/ui/selgame.cpp:1066
+#: src/frontend/mame/ui/selsoft.cpp:711 src/frontend/mame/ui/selgame.cpp:1076
 #, c-format
 msgid "%1$s: %2$s - Search: %3$s_"
 msgstr ""
 
-#: src/frontend/mame/ui/selsoft.cpp:713 src/frontend/mame/ui/selgame.cpp:1068
+#: src/frontend/mame/ui/selsoft.cpp:713 src/frontend/mame/ui/selgame.cpp:1078
 #, c-format
 msgid "Search: %1$s_"
 msgstr ""
@@ -274,7 +274,7 @@ msgstr ""
 msgid "Software list/item: %1$s:%2$s"
 msgstr ""
 
-#: src/frontend/mame/ui/optsmenu.cpp:73 src/frontend/mame/ui/sndmenu.cpp:165
+#: src/frontend/mame/ui/optsmenu.cpp:73 src/frontend/mame/ui/sndmenu.cpp:161
 msgid "Sound Options"
 msgstr ""
 
@@ -369,11 +369,11 @@ msgid "Show mouse pointer"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:39
-msgid "Confirm quit from machines"
+msgid "Confirm quit from emulation"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:40
-msgid "Skip information screen at startup"
+msgid "Skip system information screen"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:41
@@ -389,7 +389,7 @@ msgid "Skip BIOS selection menu"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:44
-msgid "Skip software parts selection menu"
+msgid "Skip software part selection menu"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:45
@@ -541,7 +541,7 @@ msgid "UI active"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:91
-msgid "Offscreen reload"
+msgid "Off-screen reload"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:92
@@ -557,7 +557,7 @@ msgid "Natural keyboard"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:95
-msgid "Simultaneous contradictory"
+msgid "Allow contradictory joystick inputs"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:96
@@ -581,7 +581,7 @@ msgid "Pedal Device Assignment"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:106
-msgid "Adstick Device Assignment"
+msgid "AD Stick Device Assignment"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:107
@@ -668,14 +668,14 @@ msgstr ""
 msgid "Wait Vertical Sync"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:687
+#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:689
 #: src/frontend/mame/ui/videoopt.cpp:191 src/frontend/mame/ui/custui.cpp:490
 #: src/frontend/mame/ui/analogipt.cpp:471 plugins/cheatfind/init.lua:766
 #: plugins/cheatfind/init.lua:777 plugins/cheat/init.lua:668
 msgid "On"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:690
+#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:692
 #: src/frontend/mame/ui/videoopt.cpp:207 src/frontend/mame/ui/custui.cpp:490
 #: src/frontend/mame/ui/analogipt.cpp:471 plugins/cheatfind/init.lua:763
 #: plugins/cheatfind/init.lua:774 plugins/cheat/init.lua:671
@@ -683,11 +683,11 @@ msgstr ""
 msgid "Off"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:693
+#: src/frontend/mame/ui/menu.cpp:695
 msgid "Auto"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:1195
+#: src/frontend/mame/ui/menu.cpp:1197
 #: src/frontend/mame/ui/simpleselgame.cpp:278
 #: src/frontend/mame/ui/selmenu.cpp:1280
 msgid "Return to Previous Menu"
@@ -695,7 +695,7 @@ msgstr ""
 
 #: src/frontend/mame/ui/filemngr.cpp:139
 #: src/frontend/mame/ui/confswitch.cpp:119
-#: src/frontend/mame/ui/inputmap.cpp:559 src/frontend/mame/ui/analogipt.cpp:360
+#: src/frontend/mame/ui/inputmap.cpp:563 src/frontend/mame/ui/analogipt.cpp:360
 #, c-format
 msgid "[root%1$s]"
 msgstr ""
@@ -938,22 +938,22 @@ msgid ""
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "GHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "MHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "kHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "Hz"
 msgstr ""
 
@@ -977,38 +977,38 @@ msgstr ""
 msgid "Vector"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:480
+#: src/frontend/mame/ui/info.cpp:483
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:480
+#: src/frontend/mame/ui/info.cpp:483
 msgid "%2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:497
+#: src/frontend/mame/ui/info.cpp:500
 #, c-format
 msgid "Screen '%1$s'"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:499
+#: src/frontend/mame/ui/info.cpp:502
 msgid "Screen"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:570 src/frontend/mame/ui/info.cpp:581
+#: src/frontend/mame/ui/info.cpp:573 src/frontend/mame/ui/info.cpp:584
 #, c-format
 msgid "%1$s:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:662
+#: src/frontend/mame/ui/info.cpp:665
 msgid "Not supported"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:665
+#: src/frontend/mame/ui/info.cpp:668
 msgid "Partially supported"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:674
+#: src/frontend/mame/ui/info.cpp:677
 msgid "[empty]"
 msgstr ""
 
@@ -1081,7 +1081,7 @@ msgid "Emulated"
 msgstr ""
 
 #: src/frontend/mame/ui/keyboard.cpp:59 src/frontend/mame/ui/confswitch.cpp:117
-#: src/frontend/mame/ui/inputmap.cpp:557 src/frontend/mame/ui/analogipt.cpp:358
+#: src/frontend/mame/ui/inputmap.cpp:561 src/frontend/mame/ui/analogipt.cpp:358
 #, c-format
 msgid "%1$s [root%2$s]"
 msgstr ""
@@ -1441,7 +1441,7 @@ msgctxt "swlist-info"
 msgid "Software list/item"
 msgstr ""
 
-#: src/frontend/mame/ui/datmenu.cpp:88 src/frontend/mame/ui/selmenu.cpp:2698
+#: src/frontend/mame/ui/datmenu.cpp:88 src/frontend/mame/ui/selmenu.cpp:2707
 msgid "Software List Info"
 msgstr ""
 
@@ -1556,7 +1556,7 @@ msgstr ""
 msgid "Configure Machine:"
 msgstr ""
 
-#: src/frontend/mame/ui/miscmenu.cpp:858 src/frontend/mame/ui/selmenu.cpp:2638
+#: src/frontend/mame/ui/miscmenu.cpp:858 src/frontend/mame/ui/selmenu.cpp:2647
 msgid " (default)"
 msgstr ""
 
@@ -1573,7 +1573,7 @@ msgid ""
 "Press %2$s to return to emulation"
 msgstr ""
 
-#: src/frontend/mame/ui/info_pty.cpp:30 src/frontend/mame/ui/mainmenu.cpp:155
+#: src/frontend/mame/ui/info_pty.cpp:30
 msgid "Pseudo terminals"
 msgstr ""
 
@@ -1641,52 +1641,52 @@ msgstr ""
 msgid "Other Controls"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:227
+#: src/frontend/mame/ui/inputmap.cpp:231
 msgid "This machine has no configurable inputs."
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:327
+#: src/frontend/mame/ui/inputmap.cpp:331
 msgid "Pressed"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:397
+#: src/frontend/mame/ui/inputmap.cpp:401
 msgid "Invalid sequence entered"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:542
+#: src/frontend/mame/ui/inputmap.cpp:546
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:543
+#: src/frontend/mame/ui/inputmap.cpp:547
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog Inc"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:544
+#: src/frontend/mame/ui/inputmap.cpp:548
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog Dec"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:586
+#: src/frontend/mame/ui/inputmap.cpp:590
 #, c-format
 msgid "Press %1$s to set\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:587
+#: src/frontend/mame/ui/inputmap.cpp:591
 #, c-format
 msgid "Press %1$s to append\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:588
+#: src/frontend/mame/ui/inputmap.cpp:592
 #, c-format
 msgid "Press %1$s to clear\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:589
+#: src/frontend/mame/ui/inputmap.cpp:593
 #, c-format
 msgid "Press %1$s to restore default\n"
 msgstr ""
@@ -1750,7 +1750,7 @@ msgid ""
 msgstr ""
 
 #: src/frontend/mame/ui/simpleselgame.cpp:273
-#: src/frontend/mame/ui/selgame.cpp:436
+#: src/frontend/mame/ui/selgame.cpp:443
 msgid "Configure Options"
 msgstr ""
 
@@ -2078,16 +2078,16 @@ msgstr ""
 msgid "Expand to fit"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:437
+#: src/frontend/mame/ui/selgame.cpp:444
 msgid "Configure Machine"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:1050
+#: src/frontend/mame/ui/selgame.cpp:1060
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d machines (%5$d BIOS) )"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:1078
+#: src/frontend/mame/ui/selgame.cpp:1088
 #, c-format
 msgid "System: %1$-.100s"
 msgstr ""
@@ -2109,7 +2109,7 @@ msgstr ""
 #: src/frontend/mame/ui/auditmenu.cpp:98
 #, c-format
 msgid ""
-"Auditing ROMs for machine %2$u of %3$u...\n"
+"Auditing media for machine %2$u of %3$u...\n"
 "%1$s"
 msgstr ""
 
@@ -2124,12 +2124,12 @@ msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:136
 #, c-format
-msgid "Audit ROMs for %1$u machines marked unavailable"
+msgid "Audit media for %1$u machines marked unavailable"
 msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:137
 #, c-format
-msgid "Audit ROMs for all %1$u machines"
+msgid "Audit media for all %1$u machines"
 msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:154
@@ -2335,84 +2335,84 @@ msgctxt "color-sample"
 msgid "Clone"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:914
+#: src/frontend/mame/ui/custui.cpp:906
 msgid "ARGB Settings"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:919 src/frontend/mame/ui/custui.cpp:922
+#: src/frontend/mame/ui/custui.cpp:911 src/frontend/mame/ui/custui.cpp:914
 msgctxt "color-channel"
 msgid "Alpha"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:927 src/frontend/mame/ui/custui.cpp:930
+#: src/frontend/mame/ui/custui.cpp:919 src/frontend/mame/ui/custui.cpp:922
 msgctxt "color-channel"
 msgid "Red"
 msgstr ""
 
+#: src/frontend/mame/ui/custui.cpp:927 src/frontend/mame/ui/custui.cpp:930
+msgctxt "color-channel"
+msgid "Green"
+msgstr ""
+
 #: src/frontend/mame/ui/custui.cpp:935 src/frontend/mame/ui/custui.cpp:938
 msgctxt "color-channel"
-msgid "Green"
-msgstr ""
-
-#: src/frontend/mame/ui/custui.cpp:943 src/frontend/mame/ui/custui.cpp:946
-msgctxt "color-channel"
 msgid "Blue"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:949
+#: src/frontend/mame/ui/custui.cpp:941
 msgid "Choose from palette"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:996
+#: src/frontend/mame/ui/custui.cpp:988
 msgid "Color preview:"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1093
+#: src/frontend/mame/ui/custui.cpp:1085
 msgctxt "color-preset"
 msgid "White"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1094
+#: src/frontend/mame/ui/custui.cpp:1086
 msgctxt "color-preset"
 msgid "Silver"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1095
+#: src/frontend/mame/ui/custui.cpp:1087
 msgctxt "color-preset"
 msgid "Gray"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1096
+#: src/frontend/mame/ui/custui.cpp:1088
 msgctxt "color-preset"
 msgid "Black"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1097
+#: src/frontend/mame/ui/custui.cpp:1089
 msgctxt "color-preset"
 msgid "Red"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1098
+#: src/frontend/mame/ui/custui.cpp:1090
 msgctxt "color-preset"
 msgid "Orange"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1099
+#: src/frontend/mame/ui/custui.cpp:1091
 msgctxt "color-preset"
 msgid "Yellow"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1100
+#: src/frontend/mame/ui/custui.cpp:1092
 msgctxt "color-preset"
 msgid "Green"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1101
+#: src/frontend/mame/ui/custui.cpp:1093
 msgctxt "color-preset"
 msgid "Blue"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1102
+#: src/frontend/mame/ui/custui.cpp:1094
 msgctxt "color-preset"
 msgid "Violet"
 msgstr ""
@@ -2477,7 +2477,7 @@ msgid "Input (general)"
 msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:123
-msgid "Input (this Machine)"
+msgid "Input (this machine)"
 msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:126
@@ -2516,6 +2516,10 @@ msgstr ""
 msgid "Tape Control"
 msgstr ""
 
+#: src/frontend/mame/ui/mainmenu.cpp:155
+msgid "Pseudo Terminals"
+msgstr ""
+
 #: src/frontend/mame/ui/mainmenu.cpp:158
 msgid "BIOS Selection"
 msgstr ""
@@ -2554,7 +2558,7 @@ msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:200
 #, c-format
-msgid "About %s"
+msgid "About %1$s"
 msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:212
@@ -2714,373 +2718,373 @@ msgstr ""
 msgid "%1$s %2$s"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2235
+#: src/frontend/mame/ui/selmenu.cpp:2244
 msgid "Images"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2236
+#: src/frontend/mame/ui/selmenu.cpp:2245
 msgid "Infos"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2551
+#: src/frontend/mame/ui/selmenu.cpp:2560
 msgid ""
 "Required ROM/disk images for the selected system are missing or incorrect. "
 "Please acquire the correct files or select a different system.\n"
 "\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2567
+#: src/frontend/mame/ui/selmenu.cpp:2576
 msgid ""
 "Required ROM/disk images for the selected software are missing or incorrect. "
 "Please acquire the correct files or select a different software item.\n"
 "\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2583
+#: src/frontend/mame/ui/selmenu.cpp:2592
 msgid "incorrect checksum"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2586
+#: src/frontend/mame/ui/selmenu.cpp:2595
 msgid "incorrect length"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2589
+#: src/frontend/mame/ui/selmenu.cpp:2598
 msgid "not found"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2600
+#: src/frontend/mame/ui/selmenu.cpp:2609
 #, c-format
 msgid "%1$s (%2$s) - %3$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2602
+#: src/frontend/mame/ui/selmenu.cpp:2611
 #, c-format
 msgid "%1$s - %2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2606
+#: src/frontend/mame/ui/selmenu.cpp:2615
 msgid "Press any key to continue."
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2735
+#: src/frontend/mame/ui/selmenu.cpp:2744
 msgid "General Info"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2887
-#, c-format
-msgid "Romset\t%1$s\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2888
-#, c-format
-msgid "Year\t%1$s\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2889
-#, c-format
-msgid "Manufacturer\t%1$s\n"
-msgstr ""
-
 #: src/frontend/mame/ui/selmenu.cpp:2896
 #, c-format
-msgid "Driver is Clone of\t%1$s\n"
+msgid "Romset\t%1$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2901
-msgid "Driver is Parent\t\n"
+#: src/frontend/mame/ui/selmenu.cpp:2897
+#, c-format
+msgid "Year\t%1$s\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2898
+#, c-format
+msgid "Manufacturer\t%1$s\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2905
-msgid "Analog Controls\tYes\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2907
-msgid "Keyboard Inputs\tYes\n"
+#, c-format
+msgid "Driver is Clone of\t%1$s\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2910
-msgid "Overall\tNOT WORKING\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2912
-msgid "Overall\tUnemulated Protection\n"
+msgid "Driver is Parent\t\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2914
-msgid "Overall\tWorking\n"
+msgid "Analog Controls\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2917
-msgid "Graphics\tUnimplemented\n"
+#: src/frontend/mame/ui/selmenu.cpp:2916
+msgid "Keyboard Inputs\tYes\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2919
-msgid "Graphics\tWrong Colors\n"
+msgid "Overall\tNOT WORKING\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2921
-msgid "Graphics\tImperfect Colors\n"
+msgid "Overall\tUnemulated Protection\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2923
-msgid "Graphics\tImperfect\n"
+msgid "Overall\tWorking\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2925
-msgid "Graphics\tOK\n"
+#: src/frontend/mame/ui/selmenu.cpp:2926
+msgid "Graphics\tUnimplemented\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2928
-msgid "Sound\tNone\n"
+msgid "Graphics\tWrong Colors\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2930
-msgid "Sound\tUnimplemented\n"
+msgid "Graphics\tImperfect Colors\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2932
-msgid "Sound\tImperfect\n"
+msgid "Graphics\tImperfect\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2934
-msgid "Sound\tOK\n"
+msgid "Graphics\tOK\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2937
-msgid "Capture\tUnimplemented\n"
+msgid "Sound\tNone\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2939
+msgid "Sound\tUnimplemented\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2941
+msgid "Sound\tImperfect\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2943
+msgid "Sound\tOK\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2946
+msgid "Capture\tUnimplemented\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2948
 msgid "Capture\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2942
+#: src/frontend/mame/ui/selmenu.cpp:2951
 msgid "Camera\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2944
+#: src/frontend/mame/ui/selmenu.cpp:2953
 msgid "Camera\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2947
+#: src/frontend/mame/ui/selmenu.cpp:2956
 msgid "Microphone\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2949
+#: src/frontend/mame/ui/selmenu.cpp:2958
 msgid "Microphone\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2952
+#: src/frontend/mame/ui/selmenu.cpp:2961
 msgid "Controls\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2954
+#: src/frontend/mame/ui/selmenu.cpp:2963
 msgid "Controls\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2957
+#: src/frontend/mame/ui/selmenu.cpp:2966
 msgid "Keyboard\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2959
+#: src/frontend/mame/ui/selmenu.cpp:2968
 msgid "Keyboard\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2962
+#: src/frontend/mame/ui/selmenu.cpp:2971
 msgid "Mouse\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2964
+#: src/frontend/mame/ui/selmenu.cpp:2973
 msgid "Mouse\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2967
+#: src/frontend/mame/ui/selmenu.cpp:2976
 msgid "Media\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2969
+#: src/frontend/mame/ui/selmenu.cpp:2978
 msgid "Media\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2972
+#: src/frontend/mame/ui/selmenu.cpp:2981
 msgid "Disk\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2974
+#: src/frontend/mame/ui/selmenu.cpp:2983
 msgid "Disk\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2977
+#: src/frontend/mame/ui/selmenu.cpp:2986
 msgid "Printer\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2979
+#: src/frontend/mame/ui/selmenu.cpp:2988
 msgid "Printer\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2982
+#: src/frontend/mame/ui/selmenu.cpp:2991
 msgid "Mag. Tape\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2984
+#: src/frontend/mame/ui/selmenu.cpp:2993
 msgid "Mag. Tape\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2987
+#: src/frontend/mame/ui/selmenu.cpp:2996
 msgid "Punch Tape\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2989
+#: src/frontend/mame/ui/selmenu.cpp:2998
 msgid "Punch Tape\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2992
+#: src/frontend/mame/ui/selmenu.cpp:3001
 msgid "Mag. Drum\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2994
+#: src/frontend/mame/ui/selmenu.cpp:3003
 msgid "Mag. Drum\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2997
+#: src/frontend/mame/ui/selmenu.cpp:3006
 msgid "(EP)ROM\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2999
+#: src/frontend/mame/ui/selmenu.cpp:3008
 msgid "(EP)ROM\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3002
+#: src/frontend/mame/ui/selmenu.cpp:3011
 msgid "Communications\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3004
+#: src/frontend/mame/ui/selmenu.cpp:3013
 msgid "Communications\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3007
+#: src/frontend/mame/ui/selmenu.cpp:3016
 msgid "LAN\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3009
+#: src/frontend/mame/ui/selmenu.cpp:3018
 msgid "LAN\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3012
+#: src/frontend/mame/ui/selmenu.cpp:3021
 msgid "WAN\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3014
+#: src/frontend/mame/ui/selmenu.cpp:3023
 msgid "WAN\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3017
+#: src/frontend/mame/ui/selmenu.cpp:3026
 msgid "Timing\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3019
+#: src/frontend/mame/ui/selmenu.cpp:3028
 msgid "Timing\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3021
+#: src/frontend/mame/ui/selmenu.cpp:3030
 msgid "Mechanical Machine\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3021
+#: src/frontend/mame/ui/selmenu.cpp:3030
 msgid "Mechanical Machine\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3022
+#: src/frontend/mame/ui/selmenu.cpp:3031
 msgid "Requires Artwork\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3022
+#: src/frontend/mame/ui/selmenu.cpp:3031
 msgid "Requires Artwork\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3023
+#: src/frontend/mame/ui/selmenu.cpp:3032
 msgid "Requires Clickable Artwork\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3023
+#: src/frontend/mame/ui/selmenu.cpp:3032
 msgid "Requires Clickable Artwork\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3025
+#: src/frontend/mame/ui/selmenu.cpp:3034
 msgid "Support Cocktail\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3026
+#: src/frontend/mame/ui/selmenu.cpp:3035
 msgid "Driver is BIOS\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3026
+#: src/frontend/mame/ui/selmenu.cpp:3035
 msgid "Driver is BIOS\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3027
+#: src/frontend/mame/ui/selmenu.cpp:3036
 msgid "Support Save\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3027
+#: src/frontend/mame/ui/selmenu.cpp:3036
 msgid "Support Save\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3028
+#: src/frontend/mame/ui/selmenu.cpp:3037
 msgid "Screen Orientation\tVertical\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3028
+#: src/frontend/mame/ui/selmenu.cpp:3037
 msgid "Screen Orientation\tHorizontal\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3038
+#: src/frontend/mame/ui/selmenu.cpp:3047
 msgid "Requires CHD\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3038
+#: src/frontend/mame/ui/selmenu.cpp:3047
 msgid "Requires CHD\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3051
-msgid "ROM Audit Result\tOK\n"
+#: src/frontend/mame/ui/selmenu.cpp:3060
+msgid "Media Audit Result\tOK\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3053
-msgid "ROM Audit Result\tBAD\n"
+#: src/frontend/mame/ui/selmenu.cpp:3062
+msgid "Media Audit Result\tBAD\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3056
+#: src/frontend/mame/ui/selmenu.cpp:3065
 msgid "Samples Audit Result\tNone Needed\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3058
+#: src/frontend/mame/ui/selmenu.cpp:3067
 msgid "Samples Audit Result\tOK\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3060
+#: src/frontend/mame/ui/selmenu.cpp:3069
 msgid "Samples Audit Result\tBAD\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3064
+#: src/frontend/mame/ui/selmenu.cpp:3073
 msgid ""
-"ROM Audit \tDisabled\n"
-"Samples Audit \tDisabled\n"
+"Media Audit\tDisabled\n"
+"Samples Audit\tDisabled\n"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:150
+#: src/frontend/mame/ui/sndmenu.cpp:146
 msgid "Sound"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:151
+#: src/frontend/mame/ui/sndmenu.cpp:147
 msgid "Compressor"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:152
+#: src/frontend/mame/ui/sndmenu.cpp:148
 msgid "Sample Rate"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:153
+#: src/frontend/mame/ui/sndmenu.cpp:149
 msgid "Use External Samples"
 msgstr ""
 
@@ -3119,511 +3123,681 @@ msgstr ""
 msgid "  Screen '%1$s': Vector\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:132
+#: src/frontend/mame/ui/devopt.cpp:135
 #, c-format
 msgid "  Screen '%1$s': %2$d × %3$d (V) %4$s Hz\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:133
+#: src/frontend/mame/ui/devopt.cpp:136
 #, c-format
 msgid "  Screen '%1$s': %2$d × %3$d (H) %4$s Hz\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:147
+#: src/frontend/mame/ui/devopt.cpp:150
 msgid "* Sound:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:211
+#: src/frontend/mame/ui/devopt.cpp:214
 #, c-format
 msgid ""
 "* BIOS settings:\n"
 "  %1$d options    [default: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:255 src/frontend/mame/ui/devopt.cpp:271
-#: src/frontend/mame/ui/devopt.cpp:332
+#: src/frontend/mame/ui/devopt.cpp:258 src/frontend/mame/ui/devopt.cpp:274
+#: src/frontend/mame/ui/devopt.cpp:335
 #, c-format
 msgid "  %1$s    [default: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:260 src/frontend/mame/ui/devopt.cpp:276
+#: src/frontend/mame/ui/devopt.cpp:263 src/frontend/mame/ui/devopt.cpp:279
 #, c-format
 msgid "  %1$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:282
+#: src/frontend/mame/ui/devopt.cpp:285
 msgid "* DIP switch settings:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:287
+#: src/frontend/mame/ui/devopt.cpp:290
 msgid "* Configuration settings:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:291
+#: src/frontend/mame/ui/devopt.cpp:294
 msgid "* Input device(s):\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:293
+#: src/frontend/mame/ui/devopt.cpp:296
 #, c-format
 msgid "  User inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:295
+#: src/frontend/mame/ui/devopt.cpp:298
 #, c-format
 msgid "  Mahjong inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:297
+#: src/frontend/mame/ui/devopt.cpp:300
 #, c-format
 msgid "  Hanafuda inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:299
+#: src/frontend/mame/ui/devopt.cpp:302
 #, c-format
 msgid "  Gambling inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:301
+#: src/frontend/mame/ui/devopt.cpp:304
 #, c-format
 msgid "  Analog inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:303
+#: src/frontend/mame/ui/devopt.cpp:306
 #, c-format
 msgid "  Adjuster inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:305
+#: src/frontend/mame/ui/devopt.cpp:308
 #, c-format
 msgid "  Keypad inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:307
+#: src/frontend/mame/ui/devopt.cpp:310
 #, c-format
 msgid "  Keyboard inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:312
+#: src/frontend/mame/ui/devopt.cpp:315
 msgid "* Media Options:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:317
+#: src/frontend/mame/ui/devopt.cpp:320
 #, c-format
 msgid "  %1$s    [tag: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:327
+#: src/frontend/mame/ui/devopt.cpp:330
 msgid "* Slot Options:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:341
+#: src/frontend/mame/ui/devopt.cpp:344
 msgid "[None]\n"
 msgstr ""
 
-#: src/emu/render.cpp:1847
+#: src/emu/render.cpp:1796
 #, c-format
 msgctxt "view-name"
 msgid "Screen %1$u Standard (%2$u:%3$u)"
 msgstr ""
 
-#: src/emu/render.cpp:1873
+#: src/emu/render.cpp:1822
 #, c-format
 msgctxt "view-name"
 msgid "Screen %1$u Pixel Aspect (%2$u:%3$u)"
 msgstr ""
 
-#: src/emu/render.cpp:1895 src/emu/render.cpp:2030
+#: src/emu/render.cpp:1844 src/emu/render.cpp:1979
 msgctxt "view-name"
 msgid "Cocktail"
 msgstr ""
 
-#: src/emu/render.cpp:2015
+#: src/emu/render.cpp:1964
 msgctxt "view-name"
 msgid "Left-to-Right"
 msgstr ""
 
-#: src/emu/render.cpp:2016
+#: src/emu/render.cpp:1965
 msgctxt "view-name"
 msgid "Left-to-Right (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2017
+#: src/emu/render.cpp:1966
 msgctxt "view-name"
 msgid "Top-to-Bottom"
 msgstr ""
 
-#: src/emu/render.cpp:2018
+#: src/emu/render.cpp:1967
 msgctxt "view-name"
 msgid "Top-to-Bottom (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2069
+#: src/emu/render.cpp:2018
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Left-to-Right, Top-to-Bottom"
 msgstr ""
 
-#: src/emu/render.cpp:2078
+#: src/emu/render.cpp:2027
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Left-to-Right, Top-to-Bottom (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2087
+#: src/emu/render.cpp:2036
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Top-to-Bottom, Left-to-Right"
 msgstr ""
 
-#: src/emu/render.cpp:2096
+#: src/emu/render.cpp:2045
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Top-to-Bottom, Left-to-Right (Gapless)"
 msgstr ""
 
-#: src/emu/inpttype.ipp:22
+#: src/emu/ioport.cpp:332
+#, c-format
 msgctxt "input-name"
-msgid "P1 Up"
+msgid "P%1$u"
 msgstr ""
 
-#: src/emu/inpttype.ipp:23
+#: src/emu/ioport.cpp:1924
 msgctxt "input-name"
-msgid "P1 Down"
+msgid "???"
 msgstr ""
 
-#: src/emu/inpttype.ipp:24
+#: src/emu/inpttype.ipp:22 src/emu/inpttype.ipp:140 src/emu/inpttype.ipp:221
+#: src/emu/inpttype.ipp:255 src/emu/inpttype.ipp:289 src/emu/inpttype.ipp:323
+#: src/emu/inpttype.ipp:357 src/emu/inpttype.ipp:391 src/emu/inpttype.ipp:425
+#: src/emu/inpttype.ipp:459
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left"
+msgid "%p Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:25
+#: src/emu/inpttype.ipp:23 src/emu/inpttype.ipp:141 src/emu/inpttype.ipp:222
+#: src/emu/inpttype.ipp:256 src/emu/inpttype.ipp:290 src/emu/inpttype.ipp:324
+#: src/emu/inpttype.ipp:358 src/emu/inpttype.ipp:392 src/emu/inpttype.ipp:426
+#: src/emu/inpttype.ipp:460
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right"
+msgid "%p Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:26
+#: src/emu/inpttype.ipp:24 src/emu/inpttype.ipp:142 src/emu/inpttype.ipp:223
+#: src/emu/inpttype.ipp:257 src/emu/inpttype.ipp:291 src/emu/inpttype.ipp:325
+#: src/emu/inpttype.ipp:359 src/emu/inpttype.ipp:393 src/emu/inpttype.ipp:427
+#: src/emu/inpttype.ipp:461
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Up"
+msgid "%p Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:27
+#: src/emu/inpttype.ipp:25 src/emu/inpttype.ipp:143 src/emu/inpttype.ipp:224
+#: src/emu/inpttype.ipp:258 src/emu/inpttype.ipp:292 src/emu/inpttype.ipp:326
+#: src/emu/inpttype.ipp:360 src/emu/inpttype.ipp:394 src/emu/inpttype.ipp:428
+#: src/emu/inpttype.ipp:462
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Down"
+msgid "%p Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:28
+#: src/emu/inpttype.ipp:26 src/emu/inpttype.ipp:144 src/emu/inpttype.ipp:225
+#: src/emu/inpttype.ipp:259 src/emu/inpttype.ipp:293 src/emu/inpttype.ipp:327
+#: src/emu/inpttype.ipp:361 src/emu/inpttype.ipp:395 src/emu/inpttype.ipp:429
+#: src/emu/inpttype.ipp:463
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Left"
+msgid "%p Right Stick/Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:29
+#: src/emu/inpttype.ipp:27 src/emu/inpttype.ipp:145 src/emu/inpttype.ipp:226
+#: src/emu/inpttype.ipp:260 src/emu/inpttype.ipp:294 src/emu/inpttype.ipp:328
+#: src/emu/inpttype.ipp:362 src/emu/inpttype.ipp:396 src/emu/inpttype.ipp:430
+#: src/emu/inpttype.ipp:464
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Right"
+msgid "%p Right Stick/Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:30
+#: src/emu/inpttype.ipp:28 src/emu/inpttype.ipp:146 src/emu/inpttype.ipp:227
+#: src/emu/inpttype.ipp:261 src/emu/inpttype.ipp:295 src/emu/inpttype.ipp:329
+#: src/emu/inpttype.ipp:363 src/emu/inpttype.ipp:397 src/emu/inpttype.ipp:431
+#: src/emu/inpttype.ipp:465
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Up"
+msgid "%p Right Stick/Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:31
+#: src/emu/inpttype.ipp:29 src/emu/inpttype.ipp:147 src/emu/inpttype.ipp:228
+#: src/emu/inpttype.ipp:262 src/emu/inpttype.ipp:296 src/emu/inpttype.ipp:330
+#: src/emu/inpttype.ipp:364 src/emu/inpttype.ipp:398 src/emu/inpttype.ipp:432
+#: src/emu/inpttype.ipp:466
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Down"
+msgid "%p Right Stick/Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:32
+#: src/emu/inpttype.ipp:30 src/emu/inpttype.ipp:148 src/emu/inpttype.ipp:229
+#: src/emu/inpttype.ipp:263 src/emu/inpttype.ipp:297 src/emu/inpttype.ipp:331
+#: src/emu/inpttype.ipp:365 src/emu/inpttype.ipp:399 src/emu/inpttype.ipp:433
+#: src/emu/inpttype.ipp:467
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Left"
+msgid "%p Left Stick/Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:33
+#: src/emu/inpttype.ipp:31 src/emu/inpttype.ipp:149 src/emu/inpttype.ipp:230
+#: src/emu/inpttype.ipp:264 src/emu/inpttype.ipp:298 src/emu/inpttype.ipp:332
+#: src/emu/inpttype.ipp:366 src/emu/inpttype.ipp:400 src/emu/inpttype.ipp:434
+#: src/emu/inpttype.ipp:468
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Right"
+msgid "%p Left Stick/Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:34
+#: src/emu/inpttype.ipp:32 src/emu/inpttype.ipp:150 src/emu/inpttype.ipp:231
+#: src/emu/inpttype.ipp:265 src/emu/inpttype.ipp:299 src/emu/inpttype.ipp:333
+#: src/emu/inpttype.ipp:367 src/emu/inpttype.ipp:401 src/emu/inpttype.ipp:435
+#: src/emu/inpttype.ipp:469
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 1"
+msgid "%p Left Stick/Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:35
+#: src/emu/inpttype.ipp:33 src/emu/inpttype.ipp:151 src/emu/inpttype.ipp:232
+#: src/emu/inpttype.ipp:266 src/emu/inpttype.ipp:300 src/emu/inpttype.ipp:334
+#: src/emu/inpttype.ipp:368 src/emu/inpttype.ipp:402 src/emu/inpttype.ipp:436
+#: src/emu/inpttype.ipp:470
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 2"
+msgid "%p Left Stick/Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:36
+#: src/emu/inpttype.ipp:34 src/emu/inpttype.ipp:152 src/emu/inpttype.ipp:233
+#: src/emu/inpttype.ipp:267 src/emu/inpttype.ipp:301 src/emu/inpttype.ipp:335
+#: src/emu/inpttype.ipp:369 src/emu/inpttype.ipp:403 src/emu/inpttype.ipp:437
+#: src/emu/inpttype.ipp:471
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 3"
+msgid "%p Button 1"
 msgstr ""
 
-#: src/emu/inpttype.ipp:37
+#: src/emu/inpttype.ipp:35 src/emu/inpttype.ipp:153 src/emu/inpttype.ipp:234
+#: src/emu/inpttype.ipp:268 src/emu/inpttype.ipp:302 src/emu/inpttype.ipp:336
+#: src/emu/inpttype.ipp:370 src/emu/inpttype.ipp:404 src/emu/inpttype.ipp:438
+#: src/emu/inpttype.ipp:472
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 4"
+msgid "%p Button 2"
 msgstr ""
 
-#: src/emu/inpttype.ipp:38
+#: src/emu/inpttype.ipp:36 src/emu/inpttype.ipp:154 src/emu/inpttype.ipp:235
+#: src/emu/inpttype.ipp:269 src/emu/inpttype.ipp:303 src/emu/inpttype.ipp:337
+#: src/emu/inpttype.ipp:371 src/emu/inpttype.ipp:405 src/emu/inpttype.ipp:439
+#: src/emu/inpttype.ipp:473
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 5"
+msgid "%p Button 3"
 msgstr ""
 
-#: src/emu/inpttype.ipp:39
+#: src/emu/inpttype.ipp:37 src/emu/inpttype.ipp:155 src/emu/inpttype.ipp:236
+#: src/emu/inpttype.ipp:270 src/emu/inpttype.ipp:304 src/emu/inpttype.ipp:338
+#: src/emu/inpttype.ipp:372 src/emu/inpttype.ipp:406 src/emu/inpttype.ipp:440
+#: src/emu/inpttype.ipp:474
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 6"
+msgid "%p Button 4"
 msgstr ""
 
-#: src/emu/inpttype.ipp:40
+#: src/emu/inpttype.ipp:38 src/emu/inpttype.ipp:156 src/emu/inpttype.ipp:237
+#: src/emu/inpttype.ipp:271 src/emu/inpttype.ipp:305 src/emu/inpttype.ipp:339
+#: src/emu/inpttype.ipp:373 src/emu/inpttype.ipp:407 src/emu/inpttype.ipp:441
+#: src/emu/inpttype.ipp:475
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 7"
+msgid "%p Button 5"
 msgstr ""
 
-#: src/emu/inpttype.ipp:41
+#: src/emu/inpttype.ipp:39 src/emu/inpttype.ipp:157 src/emu/inpttype.ipp:238
+#: src/emu/inpttype.ipp:272 src/emu/inpttype.ipp:306 src/emu/inpttype.ipp:340
+#: src/emu/inpttype.ipp:374 src/emu/inpttype.ipp:408 src/emu/inpttype.ipp:442
+#: src/emu/inpttype.ipp:476
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 8"
+msgid "%p Button 6"
 msgstr ""
 
-#: src/emu/inpttype.ipp:42
+#: src/emu/inpttype.ipp:40 src/emu/inpttype.ipp:158 src/emu/inpttype.ipp:239
+#: src/emu/inpttype.ipp:273 src/emu/inpttype.ipp:307 src/emu/inpttype.ipp:341
+#: src/emu/inpttype.ipp:375 src/emu/inpttype.ipp:409 src/emu/inpttype.ipp:443
+#: src/emu/inpttype.ipp:477
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 9"
+msgid "%p Button 7"
 msgstr ""
 
-#: src/emu/inpttype.ipp:43
+#: src/emu/inpttype.ipp:41 src/emu/inpttype.ipp:159 src/emu/inpttype.ipp:240
+#: src/emu/inpttype.ipp:274 src/emu/inpttype.ipp:308 src/emu/inpttype.ipp:342
+#: src/emu/inpttype.ipp:376 src/emu/inpttype.ipp:410 src/emu/inpttype.ipp:444
+#: src/emu/inpttype.ipp:478
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 10"
+msgid "%p Button 8"
 msgstr ""
 
-#: src/emu/inpttype.ipp:44
+#: src/emu/inpttype.ipp:42 src/emu/inpttype.ipp:160 src/emu/inpttype.ipp:241
+#: src/emu/inpttype.ipp:275 src/emu/inpttype.ipp:309 src/emu/inpttype.ipp:343
+#: src/emu/inpttype.ipp:377 src/emu/inpttype.ipp:411 src/emu/inpttype.ipp:445
+#: src/emu/inpttype.ipp:479
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 11"
+msgid "%p Button 9"
 msgstr ""
 
-#: src/emu/inpttype.ipp:45
+#: src/emu/inpttype.ipp:43 src/emu/inpttype.ipp:161 src/emu/inpttype.ipp:242
+#: src/emu/inpttype.ipp:276 src/emu/inpttype.ipp:310 src/emu/inpttype.ipp:344
+#: src/emu/inpttype.ipp:378 src/emu/inpttype.ipp:412 src/emu/inpttype.ipp:446
+#: src/emu/inpttype.ipp:480
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 12"
+msgid "%p Button 10"
 msgstr ""
 
-#: src/emu/inpttype.ipp:46
+#: src/emu/inpttype.ipp:44 src/emu/inpttype.ipp:162 src/emu/inpttype.ipp:243
+#: src/emu/inpttype.ipp:277 src/emu/inpttype.ipp:311 src/emu/inpttype.ipp:345
+#: src/emu/inpttype.ipp:379 src/emu/inpttype.ipp:413 src/emu/inpttype.ipp:447
+#: src/emu/inpttype.ipp:481
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 13"
+msgid "%p Button 11"
 msgstr ""
 
-#: src/emu/inpttype.ipp:47
+#: src/emu/inpttype.ipp:45 src/emu/inpttype.ipp:163 src/emu/inpttype.ipp:244
+#: src/emu/inpttype.ipp:278 src/emu/inpttype.ipp:312 src/emu/inpttype.ipp:346
+#: src/emu/inpttype.ipp:380 src/emu/inpttype.ipp:414 src/emu/inpttype.ipp:448
+#: src/emu/inpttype.ipp:482
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 14"
+msgid "%p Button 12"
 msgstr ""
 
-#: src/emu/inpttype.ipp:48
+#: src/emu/inpttype.ipp:46 src/emu/inpttype.ipp:164 src/emu/inpttype.ipp:245
+#: src/emu/inpttype.ipp:279 src/emu/inpttype.ipp:313 src/emu/inpttype.ipp:347
+#: src/emu/inpttype.ipp:381 src/emu/inpttype.ipp:415 src/emu/inpttype.ipp:449
+#: src/emu/inpttype.ipp:483
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 15"
+msgid "%p Button 13"
 msgstr ""
 
-#: src/emu/inpttype.ipp:49
+#: src/emu/inpttype.ipp:47 src/emu/inpttype.ipp:165 src/emu/inpttype.ipp:246
+#: src/emu/inpttype.ipp:280 src/emu/inpttype.ipp:314 src/emu/inpttype.ipp:348
+#: src/emu/inpttype.ipp:382 src/emu/inpttype.ipp:416 src/emu/inpttype.ipp:450
+#: src/emu/inpttype.ipp:484
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 16"
+msgid "%p Button 14"
 msgstr ""
 
-#: src/emu/inpttype.ipp:50
+#: src/emu/inpttype.ipp:48 src/emu/inpttype.ipp:166 src/emu/inpttype.ipp:247
+#: src/emu/inpttype.ipp:281 src/emu/inpttype.ipp:315 src/emu/inpttype.ipp:349
+#: src/emu/inpttype.ipp:383 src/emu/inpttype.ipp:417 src/emu/inpttype.ipp:451
+#: src/emu/inpttype.ipp:485
+#, c-format
 msgctxt "input-name"
-msgid "P1 Start"
+msgid "%p Button 15"
 msgstr ""
 
-#: src/emu/inpttype.ipp:51
+#: src/emu/inpttype.ipp:49 src/emu/inpttype.ipp:167 src/emu/inpttype.ipp:248
+#: src/emu/inpttype.ipp:282 src/emu/inpttype.ipp:316 src/emu/inpttype.ipp:350
+#: src/emu/inpttype.ipp:384 src/emu/inpttype.ipp:418 src/emu/inpttype.ipp:452
+#: src/emu/inpttype.ipp:486
+#, c-format
 msgctxt "input-name"
-msgid "P1 Select"
+msgid "%p Button 16"
 msgstr ""
 
-#: src/emu/inpttype.ipp:56
+#: src/emu/inpttype.ipp:50 src/emu/inpttype.ipp:168 src/emu/inpttype.ipp:249
+#: src/emu/inpttype.ipp:283 src/emu/inpttype.ipp:317 src/emu/inpttype.ipp:351
+#: src/emu/inpttype.ipp:385 src/emu/inpttype.ipp:419 src/emu/inpttype.ipp:453
+#: src/emu/inpttype.ipp:487
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong A"
+msgid "%p Start"
 msgstr ""
 
-#: src/emu/inpttype.ipp:57
+#: src/emu/inpttype.ipp:51 src/emu/inpttype.ipp:169 src/emu/inpttype.ipp:250
+#: src/emu/inpttype.ipp:284 src/emu/inpttype.ipp:318 src/emu/inpttype.ipp:352
+#: src/emu/inpttype.ipp:386 src/emu/inpttype.ipp:420 src/emu/inpttype.ipp:454
+#: src/emu/inpttype.ipp:488
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong B"
+msgid "%p Select"
 msgstr ""
 
-#: src/emu/inpttype.ipp:58
+#: src/emu/inpttype.ipp:56 src/emu/inpttype.ipp:174
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong C"
+msgid "%p Mahjong A"
 msgstr ""
 
-#: src/emu/inpttype.ipp:59
+#: src/emu/inpttype.ipp:57 src/emu/inpttype.ipp:175
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong D"
+msgid "%p Mahjong B"
 msgstr ""
 
-#: src/emu/inpttype.ipp:60
+#: src/emu/inpttype.ipp:58 src/emu/inpttype.ipp:176
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong E"
+msgid "%p Mahjong C"
 msgstr ""
 
-#: src/emu/inpttype.ipp:61
+#: src/emu/inpttype.ipp:59 src/emu/inpttype.ipp:177
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong F"
+msgid "%p Mahjong D"
 msgstr ""
 
-#: src/emu/inpttype.ipp:62
+#: src/emu/inpttype.ipp:60 src/emu/inpttype.ipp:178
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong G"
+msgid "%p Mahjong E"
 msgstr ""
 
-#: src/emu/inpttype.ipp:63
+#: src/emu/inpttype.ipp:61 src/emu/inpttype.ipp:179
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong H"
+msgid "%p Mahjong F"
 msgstr ""
 
-#: src/emu/inpttype.ipp:64
+#: src/emu/inpttype.ipp:62 src/emu/inpttype.ipp:180
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong I"
+msgid "%p Mahjong G"
 msgstr ""
 
-#: src/emu/inpttype.ipp:65
+#: src/emu/inpttype.ipp:63 src/emu/inpttype.ipp:181
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong J"
+msgid "%p Mahjong H"
 msgstr ""
 
-#: src/emu/inpttype.ipp:66
+#: src/emu/inpttype.ipp:64 src/emu/inpttype.ipp:182
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong K"
+msgid "%p Mahjong I"
 msgstr ""
 
-#: src/emu/inpttype.ipp:67
+#: src/emu/inpttype.ipp:65 src/emu/inpttype.ipp:183
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong L"
+msgid "%p Mahjong J"
 msgstr ""
 
-#: src/emu/inpttype.ipp:68
+#: src/emu/inpttype.ipp:66 src/emu/inpttype.ipp:184
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong M"
+msgid "%p Mahjong K"
 msgstr ""
 
-#: src/emu/inpttype.ipp:69
+#: src/emu/inpttype.ipp:67 src/emu/inpttype.ipp:185
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong N"
+msgid "%p Mahjong L"
 msgstr ""
 
-#: src/emu/inpttype.ipp:70
+#: src/emu/inpttype.ipp:68 src/emu/inpttype.ipp:186
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong O"
+msgid "%p Mahjong M"
 msgstr ""
 
-#: src/emu/inpttype.ipp:71
+#: src/emu/inpttype.ipp:69 src/emu/inpttype.ipp:187
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong P"
+msgid "%p Mahjong N"
 msgstr ""
 
-#: src/emu/inpttype.ipp:72
+#: src/emu/inpttype.ipp:70 src/emu/inpttype.ipp:188
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Q"
+msgid "%p Mahjong O"
 msgstr ""
 
-#: src/emu/inpttype.ipp:73
+#: src/emu/inpttype.ipp:71 src/emu/inpttype.ipp:189
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Kan"
+msgid "%p Mahjong P"
 msgstr ""
 
-#: src/emu/inpttype.ipp:74
+#: src/emu/inpttype.ipp:72 src/emu/inpttype.ipp:190
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Pon"
+msgid "%p Mahjong Q"
 msgstr ""
 
-#: src/emu/inpttype.ipp:75
+#: src/emu/inpttype.ipp:73 src/emu/inpttype.ipp:191
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Chi"
+msgid "%p Mahjong Kan"
 msgstr ""
 
-#: src/emu/inpttype.ipp:76
+#: src/emu/inpttype.ipp:74 src/emu/inpttype.ipp:192
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Reach"
+msgid "%p Mahjong Pon"
 msgstr ""
 
-#: src/emu/inpttype.ipp:77
+#: src/emu/inpttype.ipp:75 src/emu/inpttype.ipp:193
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Ron"
+msgid "%p Mahjong Chi"
 msgstr ""
 
-#: src/emu/inpttype.ipp:78
+#: src/emu/inpttype.ipp:76 src/emu/inpttype.ipp:194
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Flip Flop"
+msgid "%p Mahjong Reach"
 msgstr ""
 
-#: src/emu/inpttype.ipp:79
+#: src/emu/inpttype.ipp:77 src/emu/inpttype.ipp:195
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Bet"
+msgid "%p Mahjong Ron"
 msgstr ""
 
-#: src/emu/inpttype.ipp:80
+#: src/emu/inpttype.ipp:78 src/emu/inpttype.ipp:200
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Take Score"
+msgid "%p Mahjong Flip Flop"
 msgstr ""
 
-#: src/emu/inpttype.ipp:81
+#: src/emu/inpttype.ipp:79 src/emu/inpttype.ipp:196
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Double Up"
+msgid "%p Mahjong Bet"
 msgstr ""
 
-#: src/emu/inpttype.ipp:82
+#: src/emu/inpttype.ipp:80 src/emu/inpttype.ipp:198
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Big"
+msgid "%p Mahjong Take Score"
 msgstr ""
 
-#: src/emu/inpttype.ipp:83
+#: src/emu/inpttype.ipp:81 src/emu/inpttype.ipp:199
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Small"
+msgid "%p Mahjong Double Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:84
+#: src/emu/inpttype.ipp:82 src/emu/inpttype.ipp:201
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Last Chance"
+msgid "%p Mahjong Big"
 msgstr ""
 
-#: src/emu/inpttype.ipp:89
+#: src/emu/inpttype.ipp:83 src/emu/inpttype.ipp:202
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda A/1"
+msgid "%p Mahjong Small"
 msgstr ""
 
-#: src/emu/inpttype.ipp:90
+#: src/emu/inpttype.ipp:84 src/emu/inpttype.ipp:197
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda B/2"
+msgid "%p Mahjong Last Chance"
 msgstr ""
 
-#: src/emu/inpttype.ipp:91
+#: src/emu/inpttype.ipp:89 src/emu/inpttype.ipp:207
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda C/3"
+msgid "%p Hanafuda A/1"
 msgstr ""
 
-#: src/emu/inpttype.ipp:92
+#: src/emu/inpttype.ipp:90 src/emu/inpttype.ipp:208
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda D/4"
+msgid "%p Hanafuda B/2"
 msgstr ""
 
-#: src/emu/inpttype.ipp:93
+#: src/emu/inpttype.ipp:91 src/emu/inpttype.ipp:209
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda E/5"
+msgid "%p Hanafuda C/3"
 msgstr ""
 
-#: src/emu/inpttype.ipp:94
+#: src/emu/inpttype.ipp:92 src/emu/inpttype.ipp:210
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda F/6"
+msgid "%p Hanafuda D/4"
 msgstr ""
 
-#: src/emu/inpttype.ipp:95
+#: src/emu/inpttype.ipp:93 src/emu/inpttype.ipp:211
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda G/7"
+msgid "%p Hanafuda E/5"
 msgstr ""
 
-#: src/emu/inpttype.ipp:96
+#: src/emu/inpttype.ipp:94 src/emu/inpttype.ipp:212
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda H/8"
+msgid "%p Hanafuda F/6"
 msgstr ""
 
-#: src/emu/inpttype.ipp:97
+#: src/emu/inpttype.ipp:95 src/emu/inpttype.ipp:213
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda Yes"
+msgid "%p Hanafuda G/7"
 msgstr ""
 
-#: src/emu/inpttype.ipp:98
+#: src/emu/inpttype.ipp:96 src/emu/inpttype.ipp:214
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda No"
+msgid "%p Hanafuda H/8"
+msgstr ""
+
+#: src/emu/inpttype.ipp:97 src/emu/inpttype.ipp:215
+#, c-format
+msgctxt "input-name"
+msgid "%p Hanafuda Yes"
+msgstr ""
+
+#: src/emu/inpttype.ipp:98 src/emu/inpttype.ipp:216
+#, c-format
+msgctxt "input-name"
+msgid "%p Hanafuda No"
 msgstr ""
 
 #: src/emu/inpttype.ipp:103
@@ -3751,1551 +3925,6 @@ msgctxt "input-name"
 msgid "Stop All Reels"
 msgstr ""
 
-#: src/emu/inpttype.ipp:140
-msgctxt "input-name"
-msgid "P2 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:141
-msgctxt "input-name"
-msgid "P2 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:142
-msgctxt "input-name"
-msgid "P2 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:143
-msgctxt "input-name"
-msgid "P2 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:144
-msgctxt "input-name"
-msgid "P2 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:145
-msgctxt "input-name"
-msgid "P2 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:146
-msgctxt "input-name"
-msgid "P2 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:147
-msgctxt "input-name"
-msgid "P2 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:148
-msgctxt "input-name"
-msgid "P2 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:149
-msgctxt "input-name"
-msgid "P2 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:150
-msgctxt "input-name"
-msgid "P2 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:151
-msgctxt "input-name"
-msgid "P2 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:152
-msgctxt "input-name"
-msgid "P2 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:153
-msgctxt "input-name"
-msgid "P2 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:154
-msgctxt "input-name"
-msgid "P2 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:155
-msgctxt "input-name"
-msgid "P2 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:156
-msgctxt "input-name"
-msgid "P2 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:157
-msgctxt "input-name"
-msgid "P2 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:158
-msgctxt "input-name"
-msgid "P2 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:159
-msgctxt "input-name"
-msgid "P2 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:160
-msgctxt "input-name"
-msgid "P2 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:161
-msgctxt "input-name"
-msgid "P2 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:162
-msgctxt "input-name"
-msgid "P2 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:163
-msgctxt "input-name"
-msgid "P2 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:164
-msgctxt "input-name"
-msgid "P2 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:165
-msgctxt "input-name"
-msgid "P2 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:166
-msgctxt "input-name"
-msgid "P2 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:167
-msgctxt "input-name"
-msgid "P2 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:168
-msgctxt "input-name"
-msgid "P2 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:169
-msgctxt "input-name"
-msgid "P2 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:174
-msgctxt "input-name"
-msgid "P2 Mahjong A"
-msgstr ""
-
-#: src/emu/inpttype.ipp:175
-msgctxt "input-name"
-msgid "P2 Mahjong B"
-msgstr ""
-
-#: src/emu/inpttype.ipp:176
-msgctxt "input-name"
-msgid "P2 Mahjong C"
-msgstr ""
-
-#: src/emu/inpttype.ipp:177
-msgctxt "input-name"
-msgid "P2 Mahjong D"
-msgstr ""
-
-#: src/emu/inpttype.ipp:178
-msgctxt "input-name"
-msgid "P2 Mahjong E"
-msgstr ""
-
-#: src/emu/inpttype.ipp:179
-msgctxt "input-name"
-msgid "P2 Mahjong F"
-msgstr ""
-
-#: src/emu/inpttype.ipp:180
-msgctxt "input-name"
-msgid "P2 Mahjong G"
-msgstr ""
-
-#: src/emu/inpttype.ipp:181
-msgctxt "input-name"
-msgid "P2 Mahjong H"
-msgstr ""
-
-#: src/emu/inpttype.ipp:182
-msgctxt "input-name"
-msgid "P2 Mahjong I"
-msgstr ""
-
-#: src/emu/inpttype.ipp:183
-msgctxt "input-name"
-msgid "P2 Mahjong J"
-msgstr ""
-
-#: src/emu/inpttype.ipp:184
-msgctxt "input-name"
-msgid "P2 Mahjong K"
-msgstr ""
-
-#: src/emu/inpttype.ipp:185
-msgctxt "input-name"
-msgid "P2 Mahjong L"
-msgstr ""
-
-#: src/emu/inpttype.ipp:186
-msgctxt "input-name"
-msgid "P2 Mahjong M"
-msgstr ""
-
-#: src/emu/inpttype.ipp:187
-msgctxt "input-name"
-msgid "P2 Mahjong N"
-msgstr ""
-
-#: src/emu/inpttype.ipp:188
-msgctxt "input-name"
-msgid "P2 Mahjong O"
-msgstr ""
-
-#: src/emu/inpttype.ipp:189
-msgctxt "input-name"
-msgid "P2 Mahjong P"
-msgstr ""
-
-#: src/emu/inpttype.ipp:190
-msgctxt "input-name"
-msgid "P2 Mahjong Q"
-msgstr ""
-
-#: src/emu/inpttype.ipp:191
-msgctxt "input-name"
-msgid "P2 Mahjong Kan"
-msgstr ""
-
-#: src/emu/inpttype.ipp:192
-msgctxt "input-name"
-msgid "P2 Mahjong Pon"
-msgstr ""
-
-#: src/emu/inpttype.ipp:193
-msgctxt "input-name"
-msgid "P2 Mahjong Chi"
-msgstr ""
-
-#: src/emu/inpttype.ipp:194
-msgctxt "input-name"
-msgid "P2 Mahjong Reach"
-msgstr ""
-
-#: src/emu/inpttype.ipp:195
-msgctxt "input-name"
-msgid "P2 Mahjong Ron"
-msgstr ""
-
-#: src/emu/inpttype.ipp:196
-msgctxt "input-name"
-msgid "P2 Mahjong Bet"
-msgstr ""
-
-#: src/emu/inpttype.ipp:197
-msgctxt "input-name"
-msgid "P2 Mahjong Last Chance"
-msgstr ""
-
-#: src/emu/inpttype.ipp:198
-msgctxt "input-name"
-msgid "P2 Mahjong Take Score"
-msgstr ""
-
-#: src/emu/inpttype.ipp:199
-msgctxt "input-name"
-msgid "P2 Mahjong Double Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:200
-msgctxt "input-name"
-msgid "P2 Mahjong Flip Flop"
-msgstr ""
-
-#: src/emu/inpttype.ipp:201
-msgctxt "input-name"
-msgid "P2 Mahjong Big"
-msgstr ""
-
-#: src/emu/inpttype.ipp:202
-msgctxt "input-name"
-msgid "P2 Mahjong Small"
-msgstr ""
-
-#: src/emu/inpttype.ipp:207
-msgctxt "input-name"
-msgid "P2 Hanafuda A/1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:208
-msgctxt "input-name"
-msgid "P2 Hanafuda B/2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:209
-msgctxt "input-name"
-msgid "P2 Hanafuda C/3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:210
-msgctxt "input-name"
-msgid "P2 Hanafuda D/4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:211
-msgctxt "input-name"
-msgid "P2 Hanafuda E/5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:212
-msgctxt "input-name"
-msgid "P2 Hanafuda F/6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:213
-msgctxt "input-name"
-msgid "P2 Hanafuda G/7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:214
-msgctxt "input-name"
-msgid "P2 Hanafuda H/8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:215
-msgctxt "input-name"
-msgid "P2 Hanafuda Yes"
-msgstr ""
-
-#: src/emu/inpttype.ipp:216
-msgctxt "input-name"
-msgid "P2 Hanafuda No"
-msgstr ""
-
-#: src/emu/inpttype.ipp:221
-msgctxt "input-name"
-msgid "P3 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:222
-msgctxt "input-name"
-msgid "P3 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:223
-msgctxt "input-name"
-msgid "P3 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:224
-msgctxt "input-name"
-msgid "P3 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:225
-msgctxt "input-name"
-msgid "P3 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:226
-msgctxt "input-name"
-msgid "P3 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:227
-msgctxt "input-name"
-msgid "P3 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:228
-msgctxt "input-name"
-msgid "P3 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:229
-msgctxt "input-name"
-msgid "P3 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:230
-msgctxt "input-name"
-msgid "P3 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:231
-msgctxt "input-name"
-msgid "P3 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:232
-msgctxt "input-name"
-msgid "P3 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:233
-msgctxt "input-name"
-msgid "P3 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:234
-msgctxt "input-name"
-msgid "P3 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:235
-msgctxt "input-name"
-msgid "P3 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:236
-msgctxt "input-name"
-msgid "P3 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:237
-msgctxt "input-name"
-msgid "P3 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:238
-msgctxt "input-name"
-msgid "P3 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:239
-msgctxt "input-name"
-msgid "P3 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:240
-msgctxt "input-name"
-msgid "P3 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:241
-msgctxt "input-name"
-msgid "P3 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:242
-msgctxt "input-name"
-msgid "P3 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:243
-msgctxt "input-name"
-msgid "P3 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:244
-msgctxt "input-name"
-msgid "P3 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:245
-msgctxt "input-name"
-msgid "P3 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:246
-msgctxt "input-name"
-msgid "P3 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:247
-msgctxt "input-name"
-msgid "P3 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:248
-msgctxt "input-name"
-msgid "P3 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:249
-msgctxt "input-name"
-msgid "P3 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:250
-msgctxt "input-name"
-msgid "P3 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:255
-msgctxt "input-name"
-msgid "P4 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:256
-msgctxt "input-name"
-msgid "P4 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:257
-msgctxt "input-name"
-msgid "P4 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:258
-msgctxt "input-name"
-msgid "P4 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:259
-msgctxt "input-name"
-msgid "P4 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:260
-msgctxt "input-name"
-msgid "P4 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:261
-msgctxt "input-name"
-msgid "P4 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:262
-msgctxt "input-name"
-msgid "P4 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:263
-msgctxt "input-name"
-msgid "P4 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:264
-msgctxt "input-name"
-msgid "P4 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:265
-msgctxt "input-name"
-msgid "P4 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:266
-msgctxt "input-name"
-msgid "P4 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:267
-msgctxt "input-name"
-msgid "P4 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:268
-msgctxt "input-name"
-msgid "P4 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:269
-msgctxt "input-name"
-msgid "P4 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:270
-msgctxt "input-name"
-msgid "P4 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:271
-msgctxt "input-name"
-msgid "P4 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:272
-msgctxt "input-name"
-msgid "P4 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:273
-msgctxt "input-name"
-msgid "P4 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:274
-msgctxt "input-name"
-msgid "P4 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:275
-msgctxt "input-name"
-msgid "P4 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:276
-msgctxt "input-name"
-msgid "P4 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:277
-msgctxt "input-name"
-msgid "P4 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:278
-msgctxt "input-name"
-msgid "P4 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:279
-msgctxt "input-name"
-msgid "P4 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:280
-msgctxt "input-name"
-msgid "P4 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:281
-msgctxt "input-name"
-msgid "P4 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:282
-msgctxt "input-name"
-msgid "P4 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:283
-msgctxt "input-name"
-msgid "P4 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:284
-msgctxt "input-name"
-msgid "P4 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:289
-msgctxt "input-name"
-msgid "P5 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:290
-msgctxt "input-name"
-msgid "P5 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:291
-msgctxt "input-name"
-msgid "P5 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:292
-msgctxt "input-name"
-msgid "P5 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:293
-msgctxt "input-name"
-msgid "P5 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:294
-msgctxt "input-name"
-msgid "P5 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:295
-msgctxt "input-name"
-msgid "P5 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:296
-msgctxt "input-name"
-msgid "P5 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:297
-msgctxt "input-name"
-msgid "P5 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:298
-msgctxt "input-name"
-msgid "P5 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:299
-msgctxt "input-name"
-msgid "P5 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:300
-msgctxt "input-name"
-msgid "P5 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:301
-msgctxt "input-name"
-msgid "P5 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:302
-msgctxt "input-name"
-msgid "P5 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:303
-msgctxt "input-name"
-msgid "P5 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:304
-msgctxt "input-name"
-msgid "P5 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:305
-msgctxt "input-name"
-msgid "P5 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:306
-msgctxt "input-name"
-msgid "P5 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:307
-msgctxt "input-name"
-msgid "P5 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:308
-msgctxt "input-name"
-msgid "P5 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:309
-msgctxt "input-name"
-msgid "P5 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:310
-msgctxt "input-name"
-msgid "P5 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:311
-msgctxt "input-name"
-msgid "P5 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:312
-msgctxt "input-name"
-msgid "P5 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:313
-msgctxt "input-name"
-msgid "P5 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:314
-msgctxt "input-name"
-msgid "P5 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:315
-msgctxt "input-name"
-msgid "P5 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:316
-msgctxt "input-name"
-msgid "P5 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:317
-msgctxt "input-name"
-msgid "P5 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:318
-msgctxt "input-name"
-msgid "P5 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:323
-msgctxt "input-name"
-msgid "P6 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:324
-msgctxt "input-name"
-msgid "P6 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:325
-msgctxt "input-name"
-msgid "P6 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:326
-msgctxt "input-name"
-msgid "P6 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:327
-msgctxt "input-name"
-msgid "P6 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:328
-msgctxt "input-name"
-msgid "P6 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:329
-msgctxt "input-name"
-msgid "P6 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:330
-msgctxt "input-name"
-msgid "P6 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:331
-msgctxt "input-name"
-msgid "P6 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:332
-msgctxt "input-name"
-msgid "P6 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:333
-msgctxt "input-name"
-msgid "P6 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:334
-msgctxt "input-name"
-msgid "P6 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:335
-msgctxt "input-name"
-msgid "P6 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:336
-msgctxt "input-name"
-msgid "P6 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:337
-msgctxt "input-name"
-msgid "P6 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:338
-msgctxt "input-name"
-msgid "P6 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:339
-msgctxt "input-name"
-msgid "P6 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:340
-msgctxt "input-name"
-msgid "P6 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:341
-msgctxt "input-name"
-msgid "P6 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:342
-msgctxt "input-name"
-msgid "P6 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:343
-msgctxt "input-name"
-msgid "P6 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:344
-msgctxt "input-name"
-msgid "P6 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:345
-msgctxt "input-name"
-msgid "P6 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:346
-msgctxt "input-name"
-msgid "P6 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:347
-msgctxt "input-name"
-msgid "P6 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:348
-msgctxt "input-name"
-msgid "P6 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:349
-msgctxt "input-name"
-msgid "P6 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:350
-msgctxt "input-name"
-msgid "P6 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:351
-msgctxt "input-name"
-msgid "P6 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:352
-msgctxt "input-name"
-msgid "P6 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:357
-msgctxt "input-name"
-msgid "P7 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:358
-msgctxt "input-name"
-msgid "P7 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:359
-msgctxt "input-name"
-msgid "P7 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:360
-msgctxt "input-name"
-msgid "P7 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:361
-msgctxt "input-name"
-msgid "P7 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:362
-msgctxt "input-name"
-msgid "P7 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:363
-msgctxt "input-name"
-msgid "P7 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:364
-msgctxt "input-name"
-msgid "P7 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:365
-msgctxt "input-name"
-msgid "P7 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:366
-msgctxt "input-name"
-msgid "P7 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:367
-msgctxt "input-name"
-msgid "P7 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:368
-msgctxt "input-name"
-msgid "P7 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:369
-msgctxt "input-name"
-msgid "P7 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:370
-msgctxt "input-name"
-msgid "P7 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:371
-msgctxt "input-name"
-msgid "P7 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:372
-msgctxt "input-name"
-msgid "P7 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:373
-msgctxt "input-name"
-msgid "P7 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:374
-msgctxt "input-name"
-msgid "P7 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:375
-msgctxt "input-name"
-msgid "P7 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:376
-msgctxt "input-name"
-msgid "P7 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:377
-msgctxt "input-name"
-msgid "P7 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:378
-msgctxt "input-name"
-msgid "P7 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:379
-msgctxt "input-name"
-msgid "P7 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:380
-msgctxt "input-name"
-msgid "P7 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:381
-msgctxt "input-name"
-msgid "P7 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:382
-msgctxt "input-name"
-msgid "P7 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:383
-msgctxt "input-name"
-msgid "P7 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:384
-msgctxt "input-name"
-msgid "P7 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:385
-msgctxt "input-name"
-msgid "P7 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:386
-msgctxt "input-name"
-msgid "P7 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:391
-msgctxt "input-name"
-msgid "P8 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:392
-msgctxt "input-name"
-msgid "P8 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:393
-msgctxt "input-name"
-msgid "P8 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:394
-msgctxt "input-name"
-msgid "P8 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:395
-msgctxt "input-name"
-msgid "P8 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:396
-msgctxt "input-name"
-msgid "P8 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:397
-msgctxt "input-name"
-msgid "P8 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:398
-msgctxt "input-name"
-msgid "P8 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:399
-msgctxt "input-name"
-msgid "P8 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:400
-msgctxt "input-name"
-msgid "P8 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:401
-msgctxt "input-name"
-msgid "P8 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:402
-msgctxt "input-name"
-msgid "P8 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:403
-msgctxt "input-name"
-msgid "P8 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:404
-msgctxt "input-name"
-msgid "P8 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:405
-msgctxt "input-name"
-msgid "P8 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:406
-msgctxt "input-name"
-msgid "P8 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:407
-msgctxt "input-name"
-msgid "P8 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:408
-msgctxt "input-name"
-msgid "P8 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:409
-msgctxt "input-name"
-msgid "P8 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:410
-msgctxt "input-name"
-msgid "P8 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:411
-msgctxt "input-name"
-msgid "P8 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:412
-msgctxt "input-name"
-msgid "P8 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:413
-msgctxt "input-name"
-msgid "P8 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:414
-msgctxt "input-name"
-msgid "P8 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:415
-msgctxt "input-name"
-msgid "P8 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:416
-msgctxt "input-name"
-msgid "P8 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:417
-msgctxt "input-name"
-msgid "P8 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:418
-msgctxt "input-name"
-msgid "P8 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:419
-msgctxt "input-name"
-msgid "P8 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:420
-msgctxt "input-name"
-msgid "P8 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:425
-msgctxt "input-name"
-msgid "P9 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:426
-msgctxt "input-name"
-msgid "P9 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:427
-msgctxt "input-name"
-msgid "P9 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:428
-msgctxt "input-name"
-msgid "P9 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:429
-msgctxt "input-name"
-msgid "P9 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:430
-msgctxt "input-name"
-msgid "P9 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:431
-msgctxt "input-name"
-msgid "P9 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:432
-msgctxt "input-name"
-msgid "P9 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:433
-msgctxt "input-name"
-msgid "P9 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:434
-msgctxt "input-name"
-msgid "P9 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:435
-msgctxt "input-name"
-msgid "P9 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:436
-msgctxt "input-name"
-msgid "P9 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:437
-msgctxt "input-name"
-msgid "P9 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:438
-msgctxt "input-name"
-msgid "P9 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:439
-msgctxt "input-name"
-msgid "P9 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:440
-msgctxt "input-name"
-msgid "P9 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:441
-msgctxt "input-name"
-msgid "P9 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:442
-msgctxt "input-name"
-msgid "P9 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:443
-msgctxt "input-name"
-msgid "P9 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:444
-msgctxt "input-name"
-msgid "P9 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:445
-msgctxt "input-name"
-msgid "P9 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:446
-msgctxt "input-name"
-msgid "P9 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:447
-msgctxt "input-name"
-msgid "P9 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:448
-msgctxt "input-name"
-msgid "P9 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:449
-msgctxt "input-name"
-msgid "P9 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:450
-msgctxt "input-name"
-msgid "P9 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:451
-msgctxt "input-name"
-msgid "P9 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:452
-msgctxt "input-name"
-msgid "P9 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:453
-msgctxt "input-name"
-msgid "P9 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:454
-msgctxt "input-name"
-msgid "P9 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:459
-msgctxt "input-name"
-msgid "P10 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:460
-msgctxt "input-name"
-msgid "P10 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:461
-msgctxt "input-name"
-msgid "P10 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:462
-msgctxt "input-name"
-msgid "P10 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:463
-msgctxt "input-name"
-msgid "P10 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:464
-msgctxt "input-name"
-msgid "P10 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:465
-msgctxt "input-name"
-msgid "P10 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:466
-msgctxt "input-name"
-msgid "P10 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:467
-msgctxt "input-name"
-msgid "P10 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:468
-msgctxt "input-name"
-msgid "P10 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:469
-msgctxt "input-name"
-msgid "P10 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:470
-msgctxt "input-name"
-msgid "P10 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:471
-msgctxt "input-name"
-msgid "P10 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:472
-msgctxt "input-name"
-msgid "P10 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:473
-msgctxt "input-name"
-msgid "P10 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:474
-msgctxt "input-name"
-msgid "P10 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:475
-msgctxt "input-name"
-msgid "P10 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:476
-msgctxt "input-name"
-msgid "P10 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:477
-msgctxt "input-name"
-msgid "P10 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:478
-msgctxt "input-name"
-msgid "P10 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:479
-msgctxt "input-name"
-msgid "P10 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:480
-msgctxt "input-name"
-msgid "P10 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:481
-msgctxt "input-name"
-msgid "P10 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:482
-msgctxt "input-name"
-msgid "P10 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:483
-msgctxt "input-name"
-msgid "P10 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:484
-msgctxt "input-name"
-msgid "P10 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:485
-msgctxt "input-name"
-msgid "P10 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:486
-msgctxt "input-name"
-msgid "P10 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:487
-msgctxt "input-name"
-msgid "P10 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:488
-msgctxt "input-name"
-msgid "P10 Select"
-msgstr ""
-
 #: src/emu/inpttype.ipp:493
 msgctxt "input-name"
 msgid "1 Player Start"
@@ -5476,154 +4105,31 @@ msgctxt "input-name"
 msgid "Volume Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:550
-msgctxt "input-name"
-msgid "P1 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:551
-msgctxt "input-name"
-msgid "P2 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:552
-msgctxt "input-name"
-msgid "P3 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:553
-msgctxt "input-name"
-msgid "P4 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:554
-msgctxt "input-name"
-msgid "P5 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:555
-msgctxt "input-name"
-msgid "P6 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:556
-msgctxt "input-name"
-msgid "P7 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:557
-msgctxt "input-name"
-msgid "P8 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:558
-msgctxt "input-name"
-msgid "P9 Pedal 1"
-msgstr ""
-
+#: src/emu/inpttype.ipp:550 src/emu/inpttype.ipp:551 src/emu/inpttype.ipp:552
+#: src/emu/inpttype.ipp:553 src/emu/inpttype.ipp:554 src/emu/inpttype.ipp:555
+#: src/emu/inpttype.ipp:556 src/emu/inpttype.ipp:557 src/emu/inpttype.ipp:558
 #: src/emu/inpttype.ipp:559
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:564
-msgctxt "input-name"
-msgid "P1 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:565
-msgctxt "input-name"
-msgid "P2 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:566
-msgctxt "input-name"
-msgid "P3 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:567
-msgctxt "input-name"
-msgid "P4 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:568
-msgctxt "input-name"
-msgid "P5 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:569
-msgctxt "input-name"
-msgid "P6 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:570
-msgctxt "input-name"
-msgid "P7 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:571
-msgctxt "input-name"
-msgid "P8 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:572
-msgctxt "input-name"
-msgid "P9 Pedal 2"
+msgid "%p Pedal 1"
 msgstr ""
 
+#: src/emu/inpttype.ipp:564 src/emu/inpttype.ipp:565 src/emu/inpttype.ipp:566
+#: src/emu/inpttype.ipp:567 src/emu/inpttype.ipp:568 src/emu/inpttype.ipp:569
+#: src/emu/inpttype.ipp:570 src/emu/inpttype.ipp:571 src/emu/inpttype.ipp:572
 #: src/emu/inpttype.ipp:573
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:578
-msgctxt "input-name"
-msgid "P1 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:579
-msgctxt "input-name"
-msgid "P2 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:580
-msgctxt "input-name"
-msgid "P3 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:581
-msgctxt "input-name"
-msgid "P4 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:582
-msgctxt "input-name"
-msgid "P5 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:583
-msgctxt "input-name"
-msgid "P6 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:584
-msgctxt "input-name"
-msgid "P7 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:585
-msgctxt "input-name"
-msgid "P8 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:586
-msgctxt "input-name"
-msgid "P9 Pedal 3"
+msgid "%p Pedal 2"
 msgstr ""
 
+#: src/emu/inpttype.ipp:578 src/emu/inpttype.ipp:579 src/emu/inpttype.ipp:580
+#: src/emu/inpttype.ipp:581 src/emu/inpttype.ipp:582 src/emu/inpttype.ipp:583
+#: src/emu/inpttype.ipp:584 src/emu/inpttype.ipp:585 src/emu/inpttype.ipp:586
 #: src/emu/inpttype.ipp:587
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 3"
+msgid "%p Pedal 3"
 msgstr ""
 
 #: src/emu/inpttype.ipp:592
diff --git a/language/Arabic/strings.po b/language/Arabic/strings.po
index 251fada5eec..d9bbfa1b11c 100644
--- a/language/Arabic/strings.po
+++ b/language/Arabic/strings.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-19 02:50+1100\n"
+"POT-Creation-Date: 2021-12-09 04:44+1100\n"
 "PO-Revision-Date: 2016-02-20 18:03+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: MAME Language Team\n"
@@ -259,12 +259,12 @@ msgstr ""
 msgid "Driver: \"%1$s\" software list "
 msgstr ""
 
-#: src/frontend/mame/ui/selsoft.cpp:711 src/frontend/mame/ui/selgame.cpp:1066
+#: src/frontend/mame/ui/selsoft.cpp:711 src/frontend/mame/ui/selgame.cpp:1076
 #, c-format
 msgid "%1$s: %2$s - Search: %3$s_"
 msgstr ""
 
-#: src/frontend/mame/ui/selsoft.cpp:713 src/frontend/mame/ui/selgame.cpp:1068
+#: src/frontend/mame/ui/selsoft.cpp:713 src/frontend/mame/ui/selgame.cpp:1078
 #, c-format
 msgid "Search: %1$s_"
 msgstr ""
@@ -274,7 +274,7 @@ msgstr ""
 msgid "Software list/item: %1$s:%2$s"
 msgstr ""
 
-#: src/frontend/mame/ui/optsmenu.cpp:73 src/frontend/mame/ui/sndmenu.cpp:165
+#: src/frontend/mame/ui/optsmenu.cpp:73 src/frontend/mame/ui/sndmenu.cpp:161
 msgid "Sound Options"
 msgstr ""
 
@@ -369,11 +369,11 @@ msgid "Show mouse pointer"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:39
-msgid "Confirm quit from machines"
+msgid "Confirm quit from emulation"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:40
-msgid "Skip information screen at startup"
+msgid "Skip system information screen"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:41
@@ -389,7 +389,7 @@ msgid "Skip BIOS selection menu"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:44
-msgid "Skip software parts selection menu"
+msgid "Skip software part selection menu"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:45
@@ -541,7 +541,7 @@ msgid "UI active"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:91
-msgid "Offscreen reload"
+msgid "Off-screen reload"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:92
@@ -557,7 +557,7 @@ msgid "Natural keyboard"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:95
-msgid "Simultaneous contradictory"
+msgid "Allow contradictory joystick inputs"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:96
@@ -581,7 +581,7 @@ msgid "Pedal Device Assignment"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:106
-msgid "Adstick Device Assignment"
+msgid "AD Stick Device Assignment"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:107
@@ -668,14 +668,14 @@ msgstr ""
 msgid "Wait Vertical Sync"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:687
+#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:689
 #: src/frontend/mame/ui/videoopt.cpp:191 src/frontend/mame/ui/custui.cpp:490
 #: src/frontend/mame/ui/analogipt.cpp:471 plugins/cheatfind/init.lua:766
 #: plugins/cheatfind/init.lua:777 plugins/cheat/init.lua:668
 msgid "On"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:690
+#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:692
 #: src/frontend/mame/ui/videoopt.cpp:207 src/frontend/mame/ui/custui.cpp:490
 #: src/frontend/mame/ui/analogipt.cpp:471 plugins/cheatfind/init.lua:763
 #: plugins/cheatfind/init.lua:774 plugins/cheat/init.lua:671
@@ -683,11 +683,11 @@ msgstr ""
 msgid "Off"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:693
+#: src/frontend/mame/ui/menu.cpp:695
 msgid "Auto"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:1195
+#: src/frontend/mame/ui/menu.cpp:1197
 #: src/frontend/mame/ui/simpleselgame.cpp:278
 #: src/frontend/mame/ui/selmenu.cpp:1280
 msgid "Return to Previous Menu"
@@ -695,7 +695,7 @@ msgstr ""
 
 #: src/frontend/mame/ui/filemngr.cpp:139
 #: src/frontend/mame/ui/confswitch.cpp:119
-#: src/frontend/mame/ui/inputmap.cpp:559 src/frontend/mame/ui/analogipt.cpp:360
+#: src/frontend/mame/ui/inputmap.cpp:563 src/frontend/mame/ui/analogipt.cpp:360
 #, c-format
 msgid "[root%1$s]"
 msgstr ""
@@ -938,22 +938,22 @@ msgid ""
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "GHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "MHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "kHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "Hz"
 msgstr ""
 
@@ -977,38 +977,38 @@ msgstr ""
 msgid "Vector"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:480
+#: src/frontend/mame/ui/info.cpp:483
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:480
+#: src/frontend/mame/ui/info.cpp:483
 msgid "%2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:497
+#: src/frontend/mame/ui/info.cpp:500
 #, c-format
 msgid "Screen '%1$s'"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:499
+#: src/frontend/mame/ui/info.cpp:502
 msgid "Screen"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:570 src/frontend/mame/ui/info.cpp:581
+#: src/frontend/mame/ui/info.cpp:573 src/frontend/mame/ui/info.cpp:584
 #, c-format
 msgid "%1$s:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:662
+#: src/frontend/mame/ui/info.cpp:665
 msgid "Not supported"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:665
+#: src/frontend/mame/ui/info.cpp:668
 msgid "Partially supported"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:674
+#: src/frontend/mame/ui/info.cpp:677
 msgid "[empty]"
 msgstr ""
 
@@ -1081,7 +1081,7 @@ msgid "Emulated"
 msgstr ""
 
 #: src/frontend/mame/ui/keyboard.cpp:59 src/frontend/mame/ui/confswitch.cpp:117
-#: src/frontend/mame/ui/inputmap.cpp:557 src/frontend/mame/ui/analogipt.cpp:358
+#: src/frontend/mame/ui/inputmap.cpp:561 src/frontend/mame/ui/analogipt.cpp:358
 #, c-format
 msgid "%1$s [root%2$s]"
 msgstr ""
@@ -1441,7 +1441,7 @@ msgctxt "swlist-info"
 msgid "Software list/item"
 msgstr ""
 
-#: src/frontend/mame/ui/datmenu.cpp:88 src/frontend/mame/ui/selmenu.cpp:2698
+#: src/frontend/mame/ui/datmenu.cpp:88 src/frontend/mame/ui/selmenu.cpp:2707
 msgid "Software List Info"
 msgstr ""
 
@@ -1556,7 +1556,7 @@ msgstr ""
 msgid "Configure Machine:"
 msgstr ""
 
-#: src/frontend/mame/ui/miscmenu.cpp:858 src/frontend/mame/ui/selmenu.cpp:2638
+#: src/frontend/mame/ui/miscmenu.cpp:858 src/frontend/mame/ui/selmenu.cpp:2647
 msgid " (default)"
 msgstr ""
 
@@ -1573,7 +1573,7 @@ msgid ""
 "Press %2$s to return to emulation"
 msgstr ""
 
-#: src/frontend/mame/ui/info_pty.cpp:30 src/frontend/mame/ui/mainmenu.cpp:155
+#: src/frontend/mame/ui/info_pty.cpp:30
 msgid "Pseudo terminals"
 msgstr ""
 
@@ -1641,52 +1641,52 @@ msgstr ""
 msgid "Other Controls"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:227
+#: src/frontend/mame/ui/inputmap.cpp:231
 msgid "This machine has no configurable inputs."
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:327
+#: src/frontend/mame/ui/inputmap.cpp:331
 msgid "Pressed"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:397
+#: src/frontend/mame/ui/inputmap.cpp:401
 msgid "Invalid sequence entered"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:542
+#: src/frontend/mame/ui/inputmap.cpp:546
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:543
+#: src/frontend/mame/ui/inputmap.cpp:547
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog Inc"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:544
+#: src/frontend/mame/ui/inputmap.cpp:548
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog Dec"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:586
+#: src/frontend/mame/ui/inputmap.cpp:590
 #, c-format
 msgid "Press %1$s to set\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:587
+#: src/frontend/mame/ui/inputmap.cpp:591
 #, c-format
 msgid "Press %1$s to append\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:588
+#: src/frontend/mame/ui/inputmap.cpp:592
 #, c-format
 msgid "Press %1$s to clear\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:589
+#: src/frontend/mame/ui/inputmap.cpp:593
 #, c-format
 msgid "Press %1$s to restore default\n"
 msgstr ""
@@ -1750,7 +1750,7 @@ msgid ""
 msgstr ""
 
 #: src/frontend/mame/ui/simpleselgame.cpp:273
-#: src/frontend/mame/ui/selgame.cpp:436
+#: src/frontend/mame/ui/selgame.cpp:443
 msgid "Configure Options"
 msgstr ""
 
@@ -2078,16 +2078,16 @@ msgstr ""
 msgid "Expand to fit"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:437
+#: src/frontend/mame/ui/selgame.cpp:444
 msgid "Configure Machine"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:1050
+#: src/frontend/mame/ui/selgame.cpp:1060
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d machines (%5$d BIOS) )"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:1078
+#: src/frontend/mame/ui/selgame.cpp:1088
 #, c-format
 msgid "System: %1$-.100s"
 msgstr ""
@@ -2109,7 +2109,7 @@ msgstr ""
 #: src/frontend/mame/ui/auditmenu.cpp:98
 #, c-format
 msgid ""
-"Auditing ROMs for machine %2$u of %3$u...\n"
+"Auditing media for machine %2$u of %3$u...\n"
 "%1$s"
 msgstr ""
 
@@ -2124,12 +2124,12 @@ msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:136
 #, c-format
-msgid "Audit ROMs for %1$u machines marked unavailable"
+msgid "Audit media for %1$u machines marked unavailable"
 msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:137
 #, c-format
-msgid "Audit ROMs for all %1$u machines"
+msgid "Audit media for all %1$u machines"
 msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:154
@@ -2335,84 +2335,84 @@ msgctxt "color-sample"
 msgid "Clone"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:914
+#: src/frontend/mame/ui/custui.cpp:906
 msgid "ARGB Settings"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:919 src/frontend/mame/ui/custui.cpp:922
+#: src/frontend/mame/ui/custui.cpp:911 src/frontend/mame/ui/custui.cpp:914
 msgctxt "color-channel"
 msgid "Alpha"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:927 src/frontend/mame/ui/custui.cpp:930
+#: src/frontend/mame/ui/custui.cpp:919 src/frontend/mame/ui/custui.cpp:922
 msgctxt "color-channel"
 msgid "Red"
 msgstr ""
 
+#: src/frontend/mame/ui/custui.cpp:927 src/frontend/mame/ui/custui.cpp:930
+msgctxt "color-channel"
+msgid "Green"
+msgstr ""
+
 #: src/frontend/mame/ui/custui.cpp:935 src/frontend/mame/ui/custui.cpp:938
 msgctxt "color-channel"
-msgid "Green"
-msgstr ""
-
-#: src/frontend/mame/ui/custui.cpp:943 src/frontend/mame/ui/custui.cpp:946
-msgctxt "color-channel"
 msgid "Blue"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:949
+#: src/frontend/mame/ui/custui.cpp:941
 msgid "Choose from palette"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:996
+#: src/frontend/mame/ui/custui.cpp:988
 msgid "Color preview:"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1093
+#: src/frontend/mame/ui/custui.cpp:1085
 msgctxt "color-preset"
 msgid "White"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1094
+#: src/frontend/mame/ui/custui.cpp:1086
 msgctxt "color-preset"
 msgid "Silver"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1095
+#: src/frontend/mame/ui/custui.cpp:1087
 msgctxt "color-preset"
 msgid "Gray"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1096
+#: src/frontend/mame/ui/custui.cpp:1088
 msgctxt "color-preset"
 msgid "Black"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1097
+#: src/frontend/mame/ui/custui.cpp:1089
 msgctxt "color-preset"
 msgid "Red"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1098
+#: src/frontend/mame/ui/custui.cpp:1090
 msgctxt "color-preset"
 msgid "Orange"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1099
+#: src/frontend/mame/ui/custui.cpp:1091
 msgctxt "color-preset"
 msgid "Yellow"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1100
+#: src/frontend/mame/ui/custui.cpp:1092
 msgctxt "color-preset"
 msgid "Green"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1101
+#: src/frontend/mame/ui/custui.cpp:1093
 msgctxt "color-preset"
 msgid "Blue"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1102
+#: src/frontend/mame/ui/custui.cpp:1094
 msgctxt "color-preset"
 msgid "Violet"
 msgstr ""
@@ -2477,7 +2477,7 @@ msgid "Input (general)"
 msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:123
-msgid "Input (this Machine)"
+msgid "Input (this machine)"
 msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:126
@@ -2516,6 +2516,10 @@ msgstr ""
 msgid "Tape Control"
 msgstr ""
 
+#: src/frontend/mame/ui/mainmenu.cpp:155
+msgid "Pseudo Terminals"
+msgstr ""
+
 #: src/frontend/mame/ui/mainmenu.cpp:158
 msgid "BIOS Selection"
 msgstr ""
@@ -2554,7 +2558,7 @@ msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:200
 #, c-format
-msgid "About %s"
+msgid "About %1$s"
 msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:212
@@ -2714,373 +2718,373 @@ msgstr ""
 msgid "%1$s %2$s"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2235
+#: src/frontend/mame/ui/selmenu.cpp:2244
 msgid "Images"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2236
+#: src/frontend/mame/ui/selmenu.cpp:2245
 msgid "Infos"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2551
+#: src/frontend/mame/ui/selmenu.cpp:2560
 msgid ""
 "Required ROM/disk images for the selected system are missing or incorrect. "
 "Please acquire the correct files or select a different system.\n"
 "\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2567
+#: src/frontend/mame/ui/selmenu.cpp:2576
 msgid ""
 "Required ROM/disk images for the selected software are missing or incorrect. "
 "Please acquire the correct files or select a different software item.\n"
 "\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2583
+#: src/frontend/mame/ui/selmenu.cpp:2592
 msgid "incorrect checksum"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2586
+#: src/frontend/mame/ui/selmenu.cpp:2595
 msgid "incorrect length"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2589
+#: src/frontend/mame/ui/selmenu.cpp:2598
 msgid "not found"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2600
+#: src/frontend/mame/ui/selmenu.cpp:2609
 #, c-format
 msgid "%1$s (%2$s) - %3$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2602
+#: src/frontend/mame/ui/selmenu.cpp:2611
 #, c-format
 msgid "%1$s - %2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2606
+#: src/frontend/mame/ui/selmenu.cpp:2615
 msgid "Press any key to continue."
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2735
+#: src/frontend/mame/ui/selmenu.cpp:2744
 msgid "General Info"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2887
-#, c-format
-msgid "Romset\t%1$s\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2888
-#, c-format
-msgid "Year\t%1$s\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2889
-#, c-format
-msgid "Manufacturer\t%1$s\n"
-msgstr ""
-
 #: src/frontend/mame/ui/selmenu.cpp:2896
 #, c-format
-msgid "Driver is Clone of\t%1$s\n"
+msgid "Romset\t%1$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2901
-msgid "Driver is Parent\t\n"
+#: src/frontend/mame/ui/selmenu.cpp:2897
+#, c-format
+msgid "Year\t%1$s\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2898
+#, c-format
+msgid "Manufacturer\t%1$s\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2905
-msgid "Analog Controls\tYes\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2907
-msgid "Keyboard Inputs\tYes\n"
+#, c-format
+msgid "Driver is Clone of\t%1$s\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2910
-msgid "Overall\tNOT WORKING\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2912
-msgid "Overall\tUnemulated Protection\n"
+msgid "Driver is Parent\t\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2914
-msgid "Overall\tWorking\n"
+msgid "Analog Controls\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2917
-msgid "Graphics\tUnimplemented\n"
+#: src/frontend/mame/ui/selmenu.cpp:2916
+msgid "Keyboard Inputs\tYes\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2919
-msgid "Graphics\tWrong Colors\n"
+msgid "Overall\tNOT WORKING\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2921
-msgid "Graphics\tImperfect Colors\n"
+msgid "Overall\tUnemulated Protection\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2923
-msgid "Graphics\tImperfect\n"
+msgid "Overall\tWorking\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2925
-msgid "Graphics\tOK\n"
+#: src/frontend/mame/ui/selmenu.cpp:2926
+msgid "Graphics\tUnimplemented\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2928
-msgid "Sound\tNone\n"
+msgid "Graphics\tWrong Colors\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2930
-msgid "Sound\tUnimplemented\n"
+msgid "Graphics\tImperfect Colors\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2932
-msgid "Sound\tImperfect\n"
+msgid "Graphics\tImperfect\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2934
-msgid "Sound\tOK\n"
+msgid "Graphics\tOK\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2937
-msgid "Capture\tUnimplemented\n"
+msgid "Sound\tNone\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2939
+msgid "Sound\tUnimplemented\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2941
+msgid "Sound\tImperfect\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2943
+msgid "Sound\tOK\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2946
+msgid "Capture\tUnimplemented\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2948
 msgid "Capture\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2942
+#: src/frontend/mame/ui/selmenu.cpp:2951
 msgid "Camera\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2944
+#: src/frontend/mame/ui/selmenu.cpp:2953
 msgid "Camera\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2947
+#: src/frontend/mame/ui/selmenu.cpp:2956
 msgid "Microphone\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2949
+#: src/frontend/mame/ui/selmenu.cpp:2958
 msgid "Microphone\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2952
+#: src/frontend/mame/ui/selmenu.cpp:2961
 msgid "Controls\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2954
+#: src/frontend/mame/ui/selmenu.cpp:2963
 msgid "Controls\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2957
+#: src/frontend/mame/ui/selmenu.cpp:2966
 msgid "Keyboard\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2959
+#: src/frontend/mame/ui/selmenu.cpp:2968
 msgid "Keyboard\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2962
+#: src/frontend/mame/ui/selmenu.cpp:2971
 msgid "Mouse\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2964
+#: src/frontend/mame/ui/selmenu.cpp:2973
 msgid "Mouse\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2967
+#: src/frontend/mame/ui/selmenu.cpp:2976
 msgid "Media\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2969
+#: src/frontend/mame/ui/selmenu.cpp:2978
 msgid "Media\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2972
+#: src/frontend/mame/ui/selmenu.cpp:2981
 msgid "Disk\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2974
+#: src/frontend/mame/ui/selmenu.cpp:2983
 msgid "Disk\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2977
+#: src/frontend/mame/ui/selmenu.cpp:2986
 msgid "Printer\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2979
+#: src/frontend/mame/ui/selmenu.cpp:2988
 msgid "Printer\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2982
+#: src/frontend/mame/ui/selmenu.cpp:2991
 msgid "Mag. Tape\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2984
+#: src/frontend/mame/ui/selmenu.cpp:2993
 msgid "Mag. Tape\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2987
+#: src/frontend/mame/ui/selmenu.cpp:2996
 msgid "Punch Tape\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2989
+#: src/frontend/mame/ui/selmenu.cpp:2998
 msgid "Punch Tape\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2992
+#: src/frontend/mame/ui/selmenu.cpp:3001
 msgid "Mag. Drum\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2994
+#: src/frontend/mame/ui/selmenu.cpp:3003
 msgid "Mag. Drum\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2997
+#: src/frontend/mame/ui/selmenu.cpp:3006
 msgid "(EP)ROM\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2999
+#: src/frontend/mame/ui/selmenu.cpp:3008
 msgid "(EP)ROM\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3002
+#: src/frontend/mame/ui/selmenu.cpp:3011
 msgid "Communications\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3004
+#: src/frontend/mame/ui/selmenu.cpp:3013
 msgid "Communications\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3007
+#: src/frontend/mame/ui/selmenu.cpp:3016
 msgid "LAN\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3009
+#: src/frontend/mame/ui/selmenu.cpp:3018
 msgid "LAN\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3012
+#: src/frontend/mame/ui/selmenu.cpp:3021
 msgid "WAN\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3014
+#: src/frontend/mame/ui/selmenu.cpp:3023
 msgid "WAN\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3017
+#: src/frontend/mame/ui/selmenu.cpp:3026
 msgid "Timing\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3019
+#: src/frontend/mame/ui/selmenu.cpp:3028
 msgid "Timing\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3021
+#: src/frontend/mame/ui/selmenu.cpp:3030
 msgid "Mechanical Machine\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3021
+#: src/frontend/mame/ui/selmenu.cpp:3030
 msgid "Mechanical Machine\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3022
+#: src/frontend/mame/ui/selmenu.cpp:3031
 msgid "Requires Artwork\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3022
+#: src/frontend/mame/ui/selmenu.cpp:3031
 msgid "Requires Artwork\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3023
+#: src/frontend/mame/ui/selmenu.cpp:3032
 msgid "Requires Clickable Artwork\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3023
+#: src/frontend/mame/ui/selmenu.cpp:3032
 msgid "Requires Clickable Artwork\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3025
+#: src/frontend/mame/ui/selmenu.cpp:3034
 msgid "Support Cocktail\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3026
+#: src/frontend/mame/ui/selmenu.cpp:3035
 msgid "Driver is BIOS\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3026
+#: src/frontend/mame/ui/selmenu.cpp:3035
 msgid "Driver is BIOS\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3027
+#: src/frontend/mame/ui/selmenu.cpp:3036
 msgid "Support Save\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3027
+#: src/frontend/mame/ui/selmenu.cpp:3036
 msgid "Support Save\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3028
+#: src/frontend/mame/ui/selmenu.cpp:3037
 msgid "Screen Orientation\tVertical\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3028
+#: src/frontend/mame/ui/selmenu.cpp:3037
 msgid "Screen Orientation\tHorizontal\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3038
+#: src/frontend/mame/ui/selmenu.cpp:3047
 msgid "Requires CHD\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3038
+#: src/frontend/mame/ui/selmenu.cpp:3047
 msgid "Requires CHD\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3051
-msgid "ROM Audit Result\tOK\n"
+#: src/frontend/mame/ui/selmenu.cpp:3060
+msgid "Media Audit Result\tOK\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3053
-msgid "ROM Audit Result\tBAD\n"
+#: src/frontend/mame/ui/selmenu.cpp:3062
+msgid "Media Audit Result\tBAD\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3056
+#: src/frontend/mame/ui/selmenu.cpp:3065
 msgid "Samples Audit Result\tNone Needed\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3058
+#: src/frontend/mame/ui/selmenu.cpp:3067
 msgid "Samples Audit Result\tOK\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3060
+#: src/frontend/mame/ui/selmenu.cpp:3069
 msgid "Samples Audit Result\tBAD\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3064
+#: src/frontend/mame/ui/selmenu.cpp:3073
 msgid ""
-"ROM Audit \tDisabled\n"
-"Samples Audit \tDisabled\n"
+"Media Audit\tDisabled\n"
+"Samples Audit\tDisabled\n"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:150
+#: src/frontend/mame/ui/sndmenu.cpp:146
 msgid "Sound"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:151
+#: src/frontend/mame/ui/sndmenu.cpp:147
 msgid "Compressor"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:152
+#: src/frontend/mame/ui/sndmenu.cpp:148
 msgid "Sample Rate"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:153
+#: src/frontend/mame/ui/sndmenu.cpp:149
 msgid "Use External Samples"
 msgstr ""
 
@@ -3119,511 +3123,681 @@ msgstr ""
 msgid "  Screen '%1$s': Vector\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:132
+#: src/frontend/mame/ui/devopt.cpp:135
 #, c-format
 msgid "  Screen '%1$s': %2$d × %3$d (V) %4$s Hz\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:133
+#: src/frontend/mame/ui/devopt.cpp:136
 #, c-format
 msgid "  Screen '%1$s': %2$d × %3$d (H) %4$s Hz\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:147
+#: src/frontend/mame/ui/devopt.cpp:150
 msgid "* Sound:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:211
+#: src/frontend/mame/ui/devopt.cpp:214
 #, c-format
 msgid ""
 "* BIOS settings:\n"
 "  %1$d options    [default: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:255 src/frontend/mame/ui/devopt.cpp:271
-#: src/frontend/mame/ui/devopt.cpp:332
+#: src/frontend/mame/ui/devopt.cpp:258 src/frontend/mame/ui/devopt.cpp:274
+#: src/frontend/mame/ui/devopt.cpp:335
 #, c-format
 msgid "  %1$s    [default: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:260 src/frontend/mame/ui/devopt.cpp:276
+#: src/frontend/mame/ui/devopt.cpp:263 src/frontend/mame/ui/devopt.cpp:279
 #, c-format
 msgid "  %1$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:282
+#: src/frontend/mame/ui/devopt.cpp:285
 msgid "* DIP switch settings:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:287
+#: src/frontend/mame/ui/devopt.cpp:290
 msgid "* Configuration settings:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:291
+#: src/frontend/mame/ui/devopt.cpp:294
 msgid "* Input device(s):\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:293
+#: src/frontend/mame/ui/devopt.cpp:296
 #, c-format
 msgid "  User inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:295
+#: src/frontend/mame/ui/devopt.cpp:298
 #, c-format
 msgid "  Mahjong inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:297
+#: src/frontend/mame/ui/devopt.cpp:300
 #, c-format
 msgid "  Hanafuda inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:299
+#: src/frontend/mame/ui/devopt.cpp:302
 #, c-format
 msgid "  Gambling inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:301
+#: src/frontend/mame/ui/devopt.cpp:304
 #, c-format
 msgid "  Analog inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:303
+#: src/frontend/mame/ui/devopt.cpp:306
 #, c-format
 msgid "  Adjuster inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:305
+#: src/frontend/mame/ui/devopt.cpp:308
 #, c-format
 msgid "  Keypad inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:307
+#: src/frontend/mame/ui/devopt.cpp:310
 #, c-format
 msgid "  Keyboard inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:312
+#: src/frontend/mame/ui/devopt.cpp:315
 msgid "* Media Options:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:317
+#: src/frontend/mame/ui/devopt.cpp:320
 #, c-format
 msgid "  %1$s    [tag: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:327
+#: src/frontend/mame/ui/devopt.cpp:330
 msgid "* Slot Options:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:341
+#: src/frontend/mame/ui/devopt.cpp:344
 msgid "[None]\n"
 msgstr ""
 
-#: src/emu/render.cpp:1847
+#: src/emu/render.cpp:1796
 #, c-format
 msgctxt "view-name"
 msgid "Screen %1$u Standard (%2$u:%3$u)"
 msgstr ""
 
-#: src/emu/render.cpp:1873
+#: src/emu/render.cpp:1822
 #, c-format
 msgctxt "view-name"
 msgid "Screen %1$u Pixel Aspect (%2$u:%3$u)"
 msgstr ""
 
-#: src/emu/render.cpp:1895 src/emu/render.cpp:2030
+#: src/emu/render.cpp:1844 src/emu/render.cpp:1979
 msgctxt "view-name"
 msgid "Cocktail"
 msgstr ""
 
-#: src/emu/render.cpp:2015
+#: src/emu/render.cpp:1964
 msgctxt "view-name"
 msgid "Left-to-Right"
 msgstr ""
 
-#: src/emu/render.cpp:2016
+#: src/emu/render.cpp:1965
 msgctxt "view-name"
 msgid "Left-to-Right (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2017
+#: src/emu/render.cpp:1966
 msgctxt "view-name"
 msgid "Top-to-Bottom"
 msgstr ""
 
-#: src/emu/render.cpp:2018
+#: src/emu/render.cpp:1967
 msgctxt "view-name"
 msgid "Top-to-Bottom (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2069
+#: src/emu/render.cpp:2018
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Left-to-Right, Top-to-Bottom"
 msgstr ""
 
-#: src/emu/render.cpp:2078
+#: src/emu/render.cpp:2027
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Left-to-Right, Top-to-Bottom (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2087
+#: src/emu/render.cpp:2036
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Top-to-Bottom, Left-to-Right"
 msgstr ""
 
-#: src/emu/render.cpp:2096
+#: src/emu/render.cpp:2045
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Top-to-Bottom, Left-to-Right (Gapless)"
 msgstr ""
 
-#: src/emu/inpttype.ipp:22
+#: src/emu/ioport.cpp:332
+#, c-format
 msgctxt "input-name"
-msgid "P1 Up"
+msgid "P%1$u"
 msgstr ""
 
-#: src/emu/inpttype.ipp:23
+#: src/emu/ioport.cpp:1924
 msgctxt "input-name"
-msgid "P1 Down"
+msgid "???"
 msgstr ""
 
-#: src/emu/inpttype.ipp:24
+#: src/emu/inpttype.ipp:22 src/emu/inpttype.ipp:140 src/emu/inpttype.ipp:221
+#: src/emu/inpttype.ipp:255 src/emu/inpttype.ipp:289 src/emu/inpttype.ipp:323
+#: src/emu/inpttype.ipp:357 src/emu/inpttype.ipp:391 src/emu/inpttype.ipp:425
+#: src/emu/inpttype.ipp:459
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left"
+msgid "%p Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:25
+#: src/emu/inpttype.ipp:23 src/emu/inpttype.ipp:141 src/emu/inpttype.ipp:222
+#: src/emu/inpttype.ipp:256 src/emu/inpttype.ipp:290 src/emu/inpttype.ipp:324
+#: src/emu/inpttype.ipp:358 src/emu/inpttype.ipp:392 src/emu/inpttype.ipp:426
+#: src/emu/inpttype.ipp:460
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right"
+msgid "%p Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:26
+#: src/emu/inpttype.ipp:24 src/emu/inpttype.ipp:142 src/emu/inpttype.ipp:223
+#: src/emu/inpttype.ipp:257 src/emu/inpttype.ipp:291 src/emu/inpttype.ipp:325
+#: src/emu/inpttype.ipp:359 src/emu/inpttype.ipp:393 src/emu/inpttype.ipp:427
+#: src/emu/inpttype.ipp:461
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Up"
+msgid "%p Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:27
+#: src/emu/inpttype.ipp:25 src/emu/inpttype.ipp:143 src/emu/inpttype.ipp:224
+#: src/emu/inpttype.ipp:258 src/emu/inpttype.ipp:292 src/emu/inpttype.ipp:326
+#: src/emu/inpttype.ipp:360 src/emu/inpttype.ipp:394 src/emu/inpttype.ipp:428
+#: src/emu/inpttype.ipp:462
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Down"
+msgid "%p Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:28
+#: src/emu/inpttype.ipp:26 src/emu/inpttype.ipp:144 src/emu/inpttype.ipp:225
+#: src/emu/inpttype.ipp:259 src/emu/inpttype.ipp:293 src/emu/inpttype.ipp:327
+#: src/emu/inpttype.ipp:361 src/emu/inpttype.ipp:395 src/emu/inpttype.ipp:429
+#: src/emu/inpttype.ipp:463
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Left"
+msgid "%p Right Stick/Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:29
+#: src/emu/inpttype.ipp:27 src/emu/inpttype.ipp:145 src/emu/inpttype.ipp:226
+#: src/emu/inpttype.ipp:260 src/emu/inpttype.ipp:294 src/emu/inpttype.ipp:328
+#: src/emu/inpttype.ipp:362 src/emu/inpttype.ipp:396 src/emu/inpttype.ipp:430
+#: src/emu/inpttype.ipp:464
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Right"
+msgid "%p Right Stick/Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:30
+#: src/emu/inpttype.ipp:28 src/emu/inpttype.ipp:146 src/emu/inpttype.ipp:227
+#: src/emu/inpttype.ipp:261 src/emu/inpttype.ipp:295 src/emu/inpttype.ipp:329
+#: src/emu/inpttype.ipp:363 src/emu/inpttype.ipp:397 src/emu/inpttype.ipp:431
+#: src/emu/inpttype.ipp:465
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Up"
+msgid "%p Right Stick/Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:31
+#: src/emu/inpttype.ipp:29 src/emu/inpttype.ipp:147 src/emu/inpttype.ipp:228
+#: src/emu/inpttype.ipp:262 src/emu/inpttype.ipp:296 src/emu/inpttype.ipp:330
+#: src/emu/inpttype.ipp:364 src/emu/inpttype.ipp:398 src/emu/inpttype.ipp:432
+#: src/emu/inpttype.ipp:466
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Down"
+msgid "%p Right Stick/Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:32
+#: src/emu/inpttype.ipp:30 src/emu/inpttype.ipp:148 src/emu/inpttype.ipp:229
+#: src/emu/inpttype.ipp:263 src/emu/inpttype.ipp:297 src/emu/inpttype.ipp:331
+#: src/emu/inpttype.ipp:365 src/emu/inpttype.ipp:399 src/emu/inpttype.ipp:433
+#: src/emu/inpttype.ipp:467
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Left"
+msgid "%p Left Stick/Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:33
+#: src/emu/inpttype.ipp:31 src/emu/inpttype.ipp:149 src/emu/inpttype.ipp:230
+#: src/emu/inpttype.ipp:264 src/emu/inpttype.ipp:298 src/emu/inpttype.ipp:332
+#: src/emu/inpttype.ipp:366 src/emu/inpttype.ipp:400 src/emu/inpttype.ipp:434
+#: src/emu/inpttype.ipp:468
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Right"
+msgid "%p Left Stick/Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:34
+#: src/emu/inpttype.ipp:32 src/emu/inpttype.ipp:150 src/emu/inpttype.ipp:231
+#: src/emu/inpttype.ipp:265 src/emu/inpttype.ipp:299 src/emu/inpttype.ipp:333
+#: src/emu/inpttype.ipp:367 src/emu/inpttype.ipp:401 src/emu/inpttype.ipp:435
+#: src/emu/inpttype.ipp:469
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 1"
+msgid "%p Left Stick/Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:35
+#: src/emu/inpttype.ipp:33 src/emu/inpttype.ipp:151 src/emu/inpttype.ipp:232
+#: src/emu/inpttype.ipp:266 src/emu/inpttype.ipp:300 src/emu/inpttype.ipp:334
+#: src/emu/inpttype.ipp:368 src/emu/inpttype.ipp:402 src/emu/inpttype.ipp:436
+#: src/emu/inpttype.ipp:470
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 2"
+msgid "%p Left Stick/Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:36
+#: src/emu/inpttype.ipp:34 src/emu/inpttype.ipp:152 src/emu/inpttype.ipp:233
+#: src/emu/inpttype.ipp:267 src/emu/inpttype.ipp:301 src/emu/inpttype.ipp:335
+#: src/emu/inpttype.ipp:369 src/emu/inpttype.ipp:403 src/emu/inpttype.ipp:437
+#: src/emu/inpttype.ipp:471
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 3"
+msgid "%p Button 1"
 msgstr ""
 
-#: src/emu/inpttype.ipp:37
+#: src/emu/inpttype.ipp:35 src/emu/inpttype.ipp:153 src/emu/inpttype.ipp:234
+#: src/emu/inpttype.ipp:268 src/emu/inpttype.ipp:302 src/emu/inpttype.ipp:336
+#: src/emu/inpttype.ipp:370 src/emu/inpttype.ipp:404 src/emu/inpttype.ipp:438
+#: src/emu/inpttype.ipp:472
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 4"
+msgid "%p Button 2"
 msgstr ""
 
-#: src/emu/inpttype.ipp:38
+#: src/emu/inpttype.ipp:36 src/emu/inpttype.ipp:154 src/emu/inpttype.ipp:235
+#: src/emu/inpttype.ipp:269 src/emu/inpttype.ipp:303 src/emu/inpttype.ipp:337
+#: src/emu/inpttype.ipp:371 src/emu/inpttype.ipp:405 src/emu/inpttype.ipp:439
+#: src/emu/inpttype.ipp:473
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 5"
+msgid "%p Button 3"
 msgstr ""
 
-#: src/emu/inpttype.ipp:39
+#: src/emu/inpttype.ipp:37 src/emu/inpttype.ipp:155 src/emu/inpttype.ipp:236
+#: src/emu/inpttype.ipp:270 src/emu/inpttype.ipp:304 src/emu/inpttype.ipp:338
+#: src/emu/inpttype.ipp:372 src/emu/inpttype.ipp:406 src/emu/inpttype.ipp:440
+#: src/emu/inpttype.ipp:474
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 6"
+msgid "%p Button 4"
 msgstr ""
 
-#: src/emu/inpttype.ipp:40
+#: src/emu/inpttype.ipp:38 src/emu/inpttype.ipp:156 src/emu/inpttype.ipp:237
+#: src/emu/inpttype.ipp:271 src/emu/inpttype.ipp:305 src/emu/inpttype.ipp:339
+#: src/emu/inpttype.ipp:373 src/emu/inpttype.ipp:407 src/emu/inpttype.ipp:441
+#: src/emu/inpttype.ipp:475
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 7"
+msgid "%p Button 5"
 msgstr ""
 
-#: src/emu/inpttype.ipp:41
+#: src/emu/inpttype.ipp:39 src/emu/inpttype.ipp:157 src/emu/inpttype.ipp:238
+#: src/emu/inpttype.ipp:272 src/emu/inpttype.ipp:306 src/emu/inpttype.ipp:340
+#: src/emu/inpttype.ipp:374 src/emu/inpttype.ipp:408 src/emu/inpttype.ipp:442
+#: src/emu/inpttype.ipp:476
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 8"
+msgid "%p Button 6"
 msgstr ""
 
-#: src/emu/inpttype.ipp:42
+#: src/emu/inpttype.ipp:40 src/emu/inpttype.ipp:158 src/emu/inpttype.ipp:239
+#: src/emu/inpttype.ipp:273 src/emu/inpttype.ipp:307 src/emu/inpttype.ipp:341
+#: src/emu/inpttype.ipp:375 src/emu/inpttype.ipp:409 src/emu/inpttype.ipp:443
+#: src/emu/inpttype.ipp:477
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 9"
+msgid "%p Button 7"
 msgstr ""
 
-#: src/emu/inpttype.ipp:43
+#: src/emu/inpttype.ipp:41 src/emu/inpttype.ipp:159 src/emu/inpttype.ipp:240
+#: src/emu/inpttype.ipp:274 src/emu/inpttype.ipp:308 src/emu/inpttype.ipp:342
+#: src/emu/inpttype.ipp:376 src/emu/inpttype.ipp:410 src/emu/inpttype.ipp:444
+#: src/emu/inpttype.ipp:478
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 10"
+msgid "%p Button 8"
 msgstr ""
 
-#: src/emu/inpttype.ipp:44
+#: src/emu/inpttype.ipp:42 src/emu/inpttype.ipp:160 src/emu/inpttype.ipp:241
+#: src/emu/inpttype.ipp:275 src/emu/inpttype.ipp:309 src/emu/inpttype.ipp:343
+#: src/emu/inpttype.ipp:377 src/emu/inpttype.ipp:411 src/emu/inpttype.ipp:445
+#: src/emu/inpttype.ipp:479
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 11"
+msgid "%p Button 9"
 msgstr ""
 
-#: src/emu/inpttype.ipp:45
+#: src/emu/inpttype.ipp:43 src/emu/inpttype.ipp:161 src/emu/inpttype.ipp:242
+#: src/emu/inpttype.ipp:276 src/emu/inpttype.ipp:310 src/emu/inpttype.ipp:344
+#: src/emu/inpttype.ipp:378 src/emu/inpttype.ipp:412 src/emu/inpttype.ipp:446
+#: src/emu/inpttype.ipp:480
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 12"
+msgid "%p Button 10"
 msgstr ""
 
-#: src/emu/inpttype.ipp:46
+#: src/emu/inpttype.ipp:44 src/emu/inpttype.ipp:162 src/emu/inpttype.ipp:243
+#: src/emu/inpttype.ipp:277 src/emu/inpttype.ipp:311 src/emu/inpttype.ipp:345
+#: src/emu/inpttype.ipp:379 src/emu/inpttype.ipp:413 src/emu/inpttype.ipp:447
+#: src/emu/inpttype.ipp:481
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 13"
+msgid "%p Button 11"
 msgstr ""
 
-#: src/emu/inpttype.ipp:47
+#: src/emu/inpttype.ipp:45 src/emu/inpttype.ipp:163 src/emu/inpttype.ipp:244
+#: src/emu/inpttype.ipp:278 src/emu/inpttype.ipp:312 src/emu/inpttype.ipp:346
+#: src/emu/inpttype.ipp:380 src/emu/inpttype.ipp:414 src/emu/inpttype.ipp:448
+#: src/emu/inpttype.ipp:482
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 14"
+msgid "%p Button 12"
 msgstr ""
 
-#: src/emu/inpttype.ipp:48
+#: src/emu/inpttype.ipp:46 src/emu/inpttype.ipp:164 src/emu/inpttype.ipp:245
+#: src/emu/inpttype.ipp:279 src/emu/inpttype.ipp:313 src/emu/inpttype.ipp:347
+#: src/emu/inpttype.ipp:381 src/emu/inpttype.ipp:415 src/emu/inpttype.ipp:449
+#: src/emu/inpttype.ipp:483
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 15"
+msgid "%p Button 13"
 msgstr ""
 
-#: src/emu/inpttype.ipp:49
+#: src/emu/inpttype.ipp:47 src/emu/inpttype.ipp:165 src/emu/inpttype.ipp:246
+#: src/emu/inpttype.ipp:280 src/emu/inpttype.ipp:314 src/emu/inpttype.ipp:348
+#: src/emu/inpttype.ipp:382 src/emu/inpttype.ipp:416 src/emu/inpttype.ipp:450
+#: src/emu/inpttype.ipp:484
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 16"
+msgid "%p Button 14"
 msgstr ""
 
-#: src/emu/inpttype.ipp:50
+#: src/emu/inpttype.ipp:48 src/emu/inpttype.ipp:166 src/emu/inpttype.ipp:247
+#: src/emu/inpttype.ipp:281 src/emu/inpttype.ipp:315 src/emu/inpttype.ipp:349
+#: src/emu/inpttype.ipp:383 src/emu/inpttype.ipp:417 src/emu/inpttype.ipp:451
+#: src/emu/inpttype.ipp:485
+#, c-format
 msgctxt "input-name"
-msgid "P1 Start"
+msgid "%p Button 15"
 msgstr ""
 
-#: src/emu/inpttype.ipp:51
+#: src/emu/inpttype.ipp:49 src/emu/inpttype.ipp:167 src/emu/inpttype.ipp:248
+#: src/emu/inpttype.ipp:282 src/emu/inpttype.ipp:316 src/emu/inpttype.ipp:350
+#: src/emu/inpttype.ipp:384 src/emu/inpttype.ipp:418 src/emu/inpttype.ipp:452
+#: src/emu/inpttype.ipp:486
+#, c-format
 msgctxt "input-name"
-msgid "P1 Select"
+msgid "%p Button 16"
 msgstr ""
 
-#: src/emu/inpttype.ipp:56
+#: src/emu/inpttype.ipp:50 src/emu/inpttype.ipp:168 src/emu/inpttype.ipp:249
+#: src/emu/inpttype.ipp:283 src/emu/inpttype.ipp:317 src/emu/inpttype.ipp:351
+#: src/emu/inpttype.ipp:385 src/emu/inpttype.ipp:419 src/emu/inpttype.ipp:453
+#: src/emu/inpttype.ipp:487
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong A"
+msgid "%p Start"
 msgstr ""
 
-#: src/emu/inpttype.ipp:57
+#: src/emu/inpttype.ipp:51 src/emu/inpttype.ipp:169 src/emu/inpttype.ipp:250
+#: src/emu/inpttype.ipp:284 src/emu/inpttype.ipp:318 src/emu/inpttype.ipp:352
+#: src/emu/inpttype.ipp:386 src/emu/inpttype.ipp:420 src/emu/inpttype.ipp:454
+#: src/emu/inpttype.ipp:488
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong B"
+msgid "%p Select"
 msgstr ""
 
-#: src/emu/inpttype.ipp:58
+#: src/emu/inpttype.ipp:56 src/emu/inpttype.ipp:174
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong C"
+msgid "%p Mahjong A"
 msgstr ""
 
-#: src/emu/inpttype.ipp:59
+#: src/emu/inpttype.ipp:57 src/emu/inpttype.ipp:175
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong D"
+msgid "%p Mahjong B"
 msgstr ""
 
-#: src/emu/inpttype.ipp:60
+#: src/emu/inpttype.ipp:58 src/emu/inpttype.ipp:176
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong E"
+msgid "%p Mahjong C"
 msgstr ""
 
-#: src/emu/inpttype.ipp:61
+#: src/emu/inpttype.ipp:59 src/emu/inpttype.ipp:177
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong F"
+msgid "%p Mahjong D"
 msgstr ""
 
-#: src/emu/inpttype.ipp:62
+#: src/emu/inpttype.ipp:60 src/emu/inpttype.ipp:178
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong G"
+msgid "%p Mahjong E"
 msgstr ""
 
-#: src/emu/inpttype.ipp:63
+#: src/emu/inpttype.ipp:61 src/emu/inpttype.ipp:179
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong H"
+msgid "%p Mahjong F"
 msgstr ""
 
-#: src/emu/inpttype.ipp:64
+#: src/emu/inpttype.ipp:62 src/emu/inpttype.ipp:180
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong I"
+msgid "%p Mahjong G"
 msgstr ""
 
-#: src/emu/inpttype.ipp:65
+#: src/emu/inpttype.ipp:63 src/emu/inpttype.ipp:181
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong J"
+msgid "%p Mahjong H"
 msgstr ""
 
-#: src/emu/inpttype.ipp:66
+#: src/emu/inpttype.ipp:64 src/emu/inpttype.ipp:182
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong K"
+msgid "%p Mahjong I"
 msgstr ""
 
-#: src/emu/inpttype.ipp:67
+#: src/emu/inpttype.ipp:65 src/emu/inpttype.ipp:183
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong L"
+msgid "%p Mahjong J"
 msgstr ""
 
-#: src/emu/inpttype.ipp:68
+#: src/emu/inpttype.ipp:66 src/emu/inpttype.ipp:184
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong M"
+msgid "%p Mahjong K"
 msgstr ""
 
-#: src/emu/inpttype.ipp:69
+#: src/emu/inpttype.ipp:67 src/emu/inpttype.ipp:185
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong N"
+msgid "%p Mahjong L"
 msgstr ""
 
-#: src/emu/inpttype.ipp:70
+#: src/emu/inpttype.ipp:68 src/emu/inpttype.ipp:186
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong O"
+msgid "%p Mahjong M"
 msgstr ""
 
-#: src/emu/inpttype.ipp:71
+#: src/emu/inpttype.ipp:69 src/emu/inpttype.ipp:187
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong P"
+msgid "%p Mahjong N"
 msgstr ""
 
-#: src/emu/inpttype.ipp:72
+#: src/emu/inpttype.ipp:70 src/emu/inpttype.ipp:188
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Q"
+msgid "%p Mahjong O"
 msgstr ""
 
-#: src/emu/inpttype.ipp:73
+#: src/emu/inpttype.ipp:71 src/emu/inpttype.ipp:189
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Kan"
+msgid "%p Mahjong P"
 msgstr ""
 
-#: src/emu/inpttype.ipp:74
+#: src/emu/inpttype.ipp:72 src/emu/inpttype.ipp:190
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Pon"
+msgid "%p Mahjong Q"
 msgstr ""
 
-#: src/emu/inpttype.ipp:75
+#: src/emu/inpttype.ipp:73 src/emu/inpttype.ipp:191
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Chi"
+msgid "%p Mahjong Kan"
 msgstr ""
 
-#: src/emu/inpttype.ipp:76
+#: src/emu/inpttype.ipp:74 src/emu/inpttype.ipp:192
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Reach"
+msgid "%p Mahjong Pon"
 msgstr ""
 
-#: src/emu/inpttype.ipp:77
+#: src/emu/inpttype.ipp:75 src/emu/inpttype.ipp:193
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Ron"
+msgid "%p Mahjong Chi"
 msgstr ""
 
-#: src/emu/inpttype.ipp:78
+#: src/emu/inpttype.ipp:76 src/emu/inpttype.ipp:194
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Flip Flop"
+msgid "%p Mahjong Reach"
 msgstr ""
 
-#: src/emu/inpttype.ipp:79
+#: src/emu/inpttype.ipp:77 src/emu/inpttype.ipp:195
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Bet"
+msgid "%p Mahjong Ron"
 msgstr ""
 
-#: src/emu/inpttype.ipp:80
+#: src/emu/inpttype.ipp:78 src/emu/inpttype.ipp:200
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Take Score"
+msgid "%p Mahjong Flip Flop"
 msgstr ""
 
-#: src/emu/inpttype.ipp:81
+#: src/emu/inpttype.ipp:79 src/emu/inpttype.ipp:196
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Double Up"
+msgid "%p Mahjong Bet"
 msgstr ""
 
-#: src/emu/inpttype.ipp:82
+#: src/emu/inpttype.ipp:80 src/emu/inpttype.ipp:198
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Big"
+msgid "%p Mahjong Take Score"
 msgstr ""
 
-#: src/emu/inpttype.ipp:83
+#: src/emu/inpttype.ipp:81 src/emu/inpttype.ipp:199
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Small"
+msgid "%p Mahjong Double Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:84
+#: src/emu/inpttype.ipp:82 src/emu/inpttype.ipp:201
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Last Chance"
+msgid "%p Mahjong Big"
 msgstr ""
 
-#: src/emu/inpttype.ipp:89
+#: src/emu/inpttype.ipp:83 src/emu/inpttype.ipp:202
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda A/1"
+msgid "%p Mahjong Small"
 msgstr ""
 
-#: src/emu/inpttype.ipp:90
+#: src/emu/inpttype.ipp:84 src/emu/inpttype.ipp:197
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda B/2"
+msgid "%p Mahjong Last Chance"
 msgstr ""
 
-#: src/emu/inpttype.ipp:91
+#: src/emu/inpttype.ipp:89 src/emu/inpttype.ipp:207
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda C/3"
+msgid "%p Hanafuda A/1"
 msgstr ""
 
-#: src/emu/inpttype.ipp:92
+#: src/emu/inpttype.ipp:90 src/emu/inpttype.ipp:208
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda D/4"
+msgid "%p Hanafuda B/2"
 msgstr ""
 
-#: src/emu/inpttype.ipp:93
+#: src/emu/inpttype.ipp:91 src/emu/inpttype.ipp:209
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda E/5"
+msgid "%p Hanafuda C/3"
 msgstr ""
 
-#: src/emu/inpttype.ipp:94
+#: src/emu/inpttype.ipp:92 src/emu/inpttype.ipp:210
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda F/6"
+msgid "%p Hanafuda D/4"
 msgstr ""
 
-#: src/emu/inpttype.ipp:95
+#: src/emu/inpttype.ipp:93 src/emu/inpttype.ipp:211
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda G/7"
+msgid "%p Hanafuda E/5"
 msgstr ""
 
-#: src/emu/inpttype.ipp:96
+#: src/emu/inpttype.ipp:94 src/emu/inpttype.ipp:212
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda H/8"
+msgid "%p Hanafuda F/6"
 msgstr ""
 
-#: src/emu/inpttype.ipp:97
+#: src/emu/inpttype.ipp:95 src/emu/inpttype.ipp:213
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda Yes"
+msgid "%p Hanafuda G/7"
 msgstr ""
 
-#: src/emu/inpttype.ipp:98
+#: src/emu/inpttype.ipp:96 src/emu/inpttype.ipp:214
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda No"
+msgid "%p Hanafuda H/8"
+msgstr ""
+
+#: src/emu/inpttype.ipp:97 src/emu/inpttype.ipp:215
+#, c-format
+msgctxt "input-name"
+msgid "%p Hanafuda Yes"
+msgstr ""
+
+#: src/emu/inpttype.ipp:98 src/emu/inpttype.ipp:216
+#, c-format
+msgctxt "input-name"
+msgid "%p Hanafuda No"
 msgstr ""
 
 #: src/emu/inpttype.ipp:103
@@ -3751,1551 +3925,6 @@ msgctxt "input-name"
 msgid "Stop All Reels"
 msgstr ""
 
-#: src/emu/inpttype.ipp:140
-msgctxt "input-name"
-msgid "P2 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:141
-msgctxt "input-name"
-msgid "P2 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:142
-msgctxt "input-name"
-msgid "P2 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:143
-msgctxt "input-name"
-msgid "P2 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:144
-msgctxt "input-name"
-msgid "P2 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:145
-msgctxt "input-name"
-msgid "P2 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:146
-msgctxt "input-name"
-msgid "P2 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:147
-msgctxt "input-name"
-msgid "P2 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:148
-msgctxt "input-name"
-msgid "P2 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:149
-msgctxt "input-name"
-msgid "P2 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:150
-msgctxt "input-name"
-msgid "P2 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:151
-msgctxt "input-name"
-msgid "P2 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:152
-msgctxt "input-name"
-msgid "P2 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:153
-msgctxt "input-name"
-msgid "P2 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:154
-msgctxt "input-name"
-msgid "P2 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:155
-msgctxt "input-name"
-msgid "P2 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:156
-msgctxt "input-name"
-msgid "P2 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:157
-msgctxt "input-name"
-msgid "P2 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:158
-msgctxt "input-name"
-msgid "P2 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:159
-msgctxt "input-name"
-msgid "P2 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:160
-msgctxt "input-name"
-msgid "P2 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:161
-msgctxt "input-name"
-msgid "P2 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:162
-msgctxt "input-name"
-msgid "P2 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:163
-msgctxt "input-name"
-msgid "P2 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:164
-msgctxt "input-name"
-msgid "P2 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:165
-msgctxt "input-name"
-msgid "P2 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:166
-msgctxt "input-name"
-msgid "P2 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:167
-msgctxt "input-name"
-msgid "P2 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:168
-msgctxt "input-name"
-msgid "P2 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:169
-msgctxt "input-name"
-msgid "P2 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:174
-msgctxt "input-name"
-msgid "P2 Mahjong A"
-msgstr ""
-
-#: src/emu/inpttype.ipp:175
-msgctxt "input-name"
-msgid "P2 Mahjong B"
-msgstr ""
-
-#: src/emu/inpttype.ipp:176
-msgctxt "input-name"
-msgid "P2 Mahjong C"
-msgstr ""
-
-#: src/emu/inpttype.ipp:177
-msgctxt "input-name"
-msgid "P2 Mahjong D"
-msgstr ""
-
-#: src/emu/inpttype.ipp:178
-msgctxt "input-name"
-msgid "P2 Mahjong E"
-msgstr ""
-
-#: src/emu/inpttype.ipp:179
-msgctxt "input-name"
-msgid "P2 Mahjong F"
-msgstr ""
-
-#: src/emu/inpttype.ipp:180
-msgctxt "input-name"
-msgid "P2 Mahjong G"
-msgstr ""
-
-#: src/emu/inpttype.ipp:181
-msgctxt "input-name"
-msgid "P2 Mahjong H"
-msgstr ""
-
-#: src/emu/inpttype.ipp:182
-msgctxt "input-name"
-msgid "P2 Mahjong I"
-msgstr ""
-
-#: src/emu/inpttype.ipp:183
-msgctxt "input-name"
-msgid "P2 Mahjong J"
-msgstr ""
-
-#: src/emu/inpttype.ipp:184
-msgctxt "input-name"
-msgid "P2 Mahjong K"
-msgstr ""
-
-#: src/emu/inpttype.ipp:185
-msgctxt "input-name"
-msgid "P2 Mahjong L"
-msgstr ""
-
-#: src/emu/inpttype.ipp:186
-msgctxt "input-name"
-msgid "P2 Mahjong M"
-msgstr ""
-
-#: src/emu/inpttype.ipp:187
-msgctxt "input-name"
-msgid "P2 Mahjong N"
-msgstr ""
-
-#: src/emu/inpttype.ipp:188
-msgctxt "input-name"
-msgid "P2 Mahjong O"
-msgstr ""
-
-#: src/emu/inpttype.ipp:189
-msgctxt "input-name"
-msgid "P2 Mahjong P"
-msgstr ""
-
-#: src/emu/inpttype.ipp:190
-msgctxt "input-name"
-msgid "P2 Mahjong Q"
-msgstr ""
-
-#: src/emu/inpttype.ipp:191
-msgctxt "input-name"
-msgid "P2 Mahjong Kan"
-msgstr ""
-
-#: src/emu/inpttype.ipp:192
-msgctxt "input-name"
-msgid "P2 Mahjong Pon"
-msgstr ""
-
-#: src/emu/inpttype.ipp:193
-msgctxt "input-name"
-msgid "P2 Mahjong Chi"
-msgstr ""
-
-#: src/emu/inpttype.ipp:194
-msgctxt "input-name"
-msgid "P2 Mahjong Reach"
-msgstr ""
-
-#: src/emu/inpttype.ipp:195
-msgctxt "input-name"
-msgid "P2 Mahjong Ron"
-msgstr ""
-
-#: src/emu/inpttype.ipp:196
-msgctxt "input-name"
-msgid "P2 Mahjong Bet"
-msgstr ""
-
-#: src/emu/inpttype.ipp:197
-msgctxt "input-name"
-msgid "P2 Mahjong Last Chance"
-msgstr ""
-
-#: src/emu/inpttype.ipp:198
-msgctxt "input-name"
-msgid "P2 Mahjong Take Score"
-msgstr ""
-
-#: src/emu/inpttype.ipp:199
-msgctxt "input-name"
-msgid "P2 Mahjong Double Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:200
-msgctxt "input-name"
-msgid "P2 Mahjong Flip Flop"
-msgstr ""
-
-#: src/emu/inpttype.ipp:201
-msgctxt "input-name"
-msgid "P2 Mahjong Big"
-msgstr ""
-
-#: src/emu/inpttype.ipp:202
-msgctxt "input-name"
-msgid "P2 Mahjong Small"
-msgstr ""
-
-#: src/emu/inpttype.ipp:207
-msgctxt "input-name"
-msgid "P2 Hanafuda A/1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:208
-msgctxt "input-name"
-msgid "P2 Hanafuda B/2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:209
-msgctxt "input-name"
-msgid "P2 Hanafuda C/3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:210
-msgctxt "input-name"
-msgid "P2 Hanafuda D/4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:211
-msgctxt "input-name"
-msgid "P2 Hanafuda E/5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:212
-msgctxt "input-name"
-msgid "P2 Hanafuda F/6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:213
-msgctxt "input-name"
-msgid "P2 Hanafuda G/7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:214
-msgctxt "input-name"
-msgid "P2 Hanafuda H/8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:215
-msgctxt "input-name"
-msgid "P2 Hanafuda Yes"
-msgstr ""
-
-#: src/emu/inpttype.ipp:216
-msgctxt "input-name"
-msgid "P2 Hanafuda No"
-msgstr ""
-
-#: src/emu/inpttype.ipp:221
-msgctxt "input-name"
-msgid "P3 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:222
-msgctxt "input-name"
-msgid "P3 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:223
-msgctxt "input-name"
-msgid "P3 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:224
-msgctxt "input-name"
-msgid "P3 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:225
-msgctxt "input-name"
-msgid "P3 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:226
-msgctxt "input-name"
-msgid "P3 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:227
-msgctxt "input-name"
-msgid "P3 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:228
-msgctxt "input-name"
-msgid "P3 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:229
-msgctxt "input-name"
-msgid "P3 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:230
-msgctxt "input-name"
-msgid "P3 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:231
-msgctxt "input-name"
-msgid "P3 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:232
-msgctxt "input-name"
-msgid "P3 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:233
-msgctxt "input-name"
-msgid "P3 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:234
-msgctxt "input-name"
-msgid "P3 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:235
-msgctxt "input-name"
-msgid "P3 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:236
-msgctxt "input-name"
-msgid "P3 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:237
-msgctxt "input-name"
-msgid "P3 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:238
-msgctxt "input-name"
-msgid "P3 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:239
-msgctxt "input-name"
-msgid "P3 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:240
-msgctxt "input-name"
-msgid "P3 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:241
-msgctxt "input-name"
-msgid "P3 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:242
-msgctxt "input-name"
-msgid "P3 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:243
-msgctxt "input-name"
-msgid "P3 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:244
-msgctxt "input-name"
-msgid "P3 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:245
-msgctxt "input-name"
-msgid "P3 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:246
-msgctxt "input-name"
-msgid "P3 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:247
-msgctxt "input-name"
-msgid "P3 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:248
-msgctxt "input-name"
-msgid "P3 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:249
-msgctxt "input-name"
-msgid "P3 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:250
-msgctxt "input-name"
-msgid "P3 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:255
-msgctxt "input-name"
-msgid "P4 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:256
-msgctxt "input-name"
-msgid "P4 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:257
-msgctxt "input-name"
-msgid "P4 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:258
-msgctxt "input-name"
-msgid "P4 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:259
-msgctxt "input-name"
-msgid "P4 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:260
-msgctxt "input-name"
-msgid "P4 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:261
-msgctxt "input-name"
-msgid "P4 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:262
-msgctxt "input-name"
-msgid "P4 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:263
-msgctxt "input-name"
-msgid "P4 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:264
-msgctxt "input-name"
-msgid "P4 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:265
-msgctxt "input-name"
-msgid "P4 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:266
-msgctxt "input-name"
-msgid "P4 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:267
-msgctxt "input-name"
-msgid "P4 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:268
-msgctxt "input-name"
-msgid "P4 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:269
-msgctxt "input-name"
-msgid "P4 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:270
-msgctxt "input-name"
-msgid "P4 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:271
-msgctxt "input-name"
-msgid "P4 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:272
-msgctxt "input-name"
-msgid "P4 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:273
-msgctxt "input-name"
-msgid "P4 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:274
-msgctxt "input-name"
-msgid "P4 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:275
-msgctxt "input-name"
-msgid "P4 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:276
-msgctxt "input-name"
-msgid "P4 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:277
-msgctxt "input-name"
-msgid "P4 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:278
-msgctxt "input-name"
-msgid "P4 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:279
-msgctxt "input-name"
-msgid "P4 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:280
-msgctxt "input-name"
-msgid "P4 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:281
-msgctxt "input-name"
-msgid "P4 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:282
-msgctxt "input-name"
-msgid "P4 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:283
-msgctxt "input-name"
-msgid "P4 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:284
-msgctxt "input-name"
-msgid "P4 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:289
-msgctxt "input-name"
-msgid "P5 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:290
-msgctxt "input-name"
-msgid "P5 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:291
-msgctxt "input-name"
-msgid "P5 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:292
-msgctxt "input-name"
-msgid "P5 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:293
-msgctxt "input-name"
-msgid "P5 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:294
-msgctxt "input-name"
-msgid "P5 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:295
-msgctxt "input-name"
-msgid "P5 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:296
-msgctxt "input-name"
-msgid "P5 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:297
-msgctxt "input-name"
-msgid "P5 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:298
-msgctxt "input-name"
-msgid "P5 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:299
-msgctxt "input-name"
-msgid "P5 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:300
-msgctxt "input-name"
-msgid "P5 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:301
-msgctxt "input-name"
-msgid "P5 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:302
-msgctxt "input-name"
-msgid "P5 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:303
-msgctxt "input-name"
-msgid "P5 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:304
-msgctxt "input-name"
-msgid "P5 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:305
-msgctxt "input-name"
-msgid "P5 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:306
-msgctxt "input-name"
-msgid "P5 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:307
-msgctxt "input-name"
-msgid "P5 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:308
-msgctxt "input-name"
-msgid "P5 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:309
-msgctxt "input-name"
-msgid "P5 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:310
-msgctxt "input-name"
-msgid "P5 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:311
-msgctxt "input-name"
-msgid "P5 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:312
-msgctxt "input-name"
-msgid "P5 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:313
-msgctxt "input-name"
-msgid "P5 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:314
-msgctxt "input-name"
-msgid "P5 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:315
-msgctxt "input-name"
-msgid "P5 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:316
-msgctxt "input-name"
-msgid "P5 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:317
-msgctxt "input-name"
-msgid "P5 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:318
-msgctxt "input-name"
-msgid "P5 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:323
-msgctxt "input-name"
-msgid "P6 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:324
-msgctxt "input-name"
-msgid "P6 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:325
-msgctxt "input-name"
-msgid "P6 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:326
-msgctxt "input-name"
-msgid "P6 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:327
-msgctxt "input-name"
-msgid "P6 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:328
-msgctxt "input-name"
-msgid "P6 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:329
-msgctxt "input-name"
-msgid "P6 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:330
-msgctxt "input-name"
-msgid "P6 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:331
-msgctxt "input-name"
-msgid "P6 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:332
-msgctxt "input-name"
-msgid "P6 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:333
-msgctxt "input-name"
-msgid "P6 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:334
-msgctxt "input-name"
-msgid "P6 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:335
-msgctxt "input-name"
-msgid "P6 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:336
-msgctxt "input-name"
-msgid "P6 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:337
-msgctxt "input-name"
-msgid "P6 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:338
-msgctxt "input-name"
-msgid "P6 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:339
-msgctxt "input-name"
-msgid "P6 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:340
-msgctxt "input-name"
-msgid "P6 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:341
-msgctxt "input-name"
-msgid "P6 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:342
-msgctxt "input-name"
-msgid "P6 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:343
-msgctxt "input-name"
-msgid "P6 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:344
-msgctxt "input-name"
-msgid "P6 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:345
-msgctxt "input-name"
-msgid "P6 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:346
-msgctxt "input-name"
-msgid "P6 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:347
-msgctxt "input-name"
-msgid "P6 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:348
-msgctxt "input-name"
-msgid "P6 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:349
-msgctxt "input-name"
-msgid "P6 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:350
-msgctxt "input-name"
-msgid "P6 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:351
-msgctxt "input-name"
-msgid "P6 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:352
-msgctxt "input-name"
-msgid "P6 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:357
-msgctxt "input-name"
-msgid "P7 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:358
-msgctxt "input-name"
-msgid "P7 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:359
-msgctxt "input-name"
-msgid "P7 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:360
-msgctxt "input-name"
-msgid "P7 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:361
-msgctxt "input-name"
-msgid "P7 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:362
-msgctxt "input-name"
-msgid "P7 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:363
-msgctxt "input-name"
-msgid "P7 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:364
-msgctxt "input-name"
-msgid "P7 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:365
-msgctxt "input-name"
-msgid "P7 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:366
-msgctxt "input-name"
-msgid "P7 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:367
-msgctxt "input-name"
-msgid "P7 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:368
-msgctxt "input-name"
-msgid "P7 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:369
-msgctxt "input-name"
-msgid "P7 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:370
-msgctxt "input-name"
-msgid "P7 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:371
-msgctxt "input-name"
-msgid "P7 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:372
-msgctxt "input-name"
-msgid "P7 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:373
-msgctxt "input-name"
-msgid "P7 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:374
-msgctxt "input-name"
-msgid "P7 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:375
-msgctxt "input-name"
-msgid "P7 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:376
-msgctxt "input-name"
-msgid "P7 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:377
-msgctxt "input-name"
-msgid "P7 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:378
-msgctxt "input-name"
-msgid "P7 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:379
-msgctxt "input-name"
-msgid "P7 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:380
-msgctxt "input-name"
-msgid "P7 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:381
-msgctxt "input-name"
-msgid "P7 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:382
-msgctxt "input-name"
-msgid "P7 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:383
-msgctxt "input-name"
-msgid "P7 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:384
-msgctxt "input-name"
-msgid "P7 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:385
-msgctxt "input-name"
-msgid "P7 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:386
-msgctxt "input-name"
-msgid "P7 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:391
-msgctxt "input-name"
-msgid "P8 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:392
-msgctxt "input-name"
-msgid "P8 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:393
-msgctxt "input-name"
-msgid "P8 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:394
-msgctxt "input-name"
-msgid "P8 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:395
-msgctxt "input-name"
-msgid "P8 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:396
-msgctxt "input-name"
-msgid "P8 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:397
-msgctxt "input-name"
-msgid "P8 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:398
-msgctxt "input-name"
-msgid "P8 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:399
-msgctxt "input-name"
-msgid "P8 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:400
-msgctxt "input-name"
-msgid "P8 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:401
-msgctxt "input-name"
-msgid "P8 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:402
-msgctxt "input-name"
-msgid "P8 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:403
-msgctxt "input-name"
-msgid "P8 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:404
-msgctxt "input-name"
-msgid "P8 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:405
-msgctxt "input-name"
-msgid "P8 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:406
-msgctxt "input-name"
-msgid "P8 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:407
-msgctxt "input-name"
-msgid "P8 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:408
-msgctxt "input-name"
-msgid "P8 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:409
-msgctxt "input-name"
-msgid "P8 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:410
-msgctxt "input-name"
-msgid "P8 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:411
-msgctxt "input-name"
-msgid "P8 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:412
-msgctxt "input-name"
-msgid "P8 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:413
-msgctxt "input-name"
-msgid "P8 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:414
-msgctxt "input-name"
-msgid "P8 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:415
-msgctxt "input-name"
-msgid "P8 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:416
-msgctxt "input-name"
-msgid "P8 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:417
-msgctxt "input-name"
-msgid "P8 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:418
-msgctxt "input-name"
-msgid "P8 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:419
-msgctxt "input-name"
-msgid "P8 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:420
-msgctxt "input-name"
-msgid "P8 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:425
-msgctxt "input-name"
-msgid "P9 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:426
-msgctxt "input-name"
-msgid "P9 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:427
-msgctxt "input-name"
-msgid "P9 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:428
-msgctxt "input-name"
-msgid "P9 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:429
-msgctxt "input-name"
-msgid "P9 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:430
-msgctxt "input-name"
-msgid "P9 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:431
-msgctxt "input-name"
-msgid "P9 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:432
-msgctxt "input-name"
-msgid "P9 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:433
-msgctxt "input-name"
-msgid "P9 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:434
-msgctxt "input-name"
-msgid "P9 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:435
-msgctxt "input-name"
-msgid "P9 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:436
-msgctxt "input-name"
-msgid "P9 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:437
-msgctxt "input-name"
-msgid "P9 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:438
-msgctxt "input-name"
-msgid "P9 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:439
-msgctxt "input-name"
-msgid "P9 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:440
-msgctxt "input-name"
-msgid "P9 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:441
-msgctxt "input-name"
-msgid "P9 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:442
-msgctxt "input-name"
-msgid "P9 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:443
-msgctxt "input-name"
-msgid "P9 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:444
-msgctxt "input-name"
-msgid "P9 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:445
-msgctxt "input-name"
-msgid "P9 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:446
-msgctxt "input-name"
-msgid "P9 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:447
-msgctxt "input-name"
-msgid "P9 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:448
-msgctxt "input-name"
-msgid "P9 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:449
-msgctxt "input-name"
-msgid "P9 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:450
-msgctxt "input-name"
-msgid "P9 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:451
-msgctxt "input-name"
-msgid "P9 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:452
-msgctxt "input-name"
-msgid "P9 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:453
-msgctxt "input-name"
-msgid "P9 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:454
-msgctxt "input-name"
-msgid "P9 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:459
-msgctxt "input-name"
-msgid "P10 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:460
-msgctxt "input-name"
-msgid "P10 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:461
-msgctxt "input-name"
-msgid "P10 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:462
-msgctxt "input-name"
-msgid "P10 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:463
-msgctxt "input-name"
-msgid "P10 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:464
-msgctxt "input-name"
-msgid "P10 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:465
-msgctxt "input-name"
-msgid "P10 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:466
-msgctxt "input-name"
-msgid "P10 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:467
-msgctxt "input-name"
-msgid "P10 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:468
-msgctxt "input-name"
-msgid "P10 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:469
-msgctxt "input-name"
-msgid "P10 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:470
-msgctxt "input-name"
-msgid "P10 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:471
-msgctxt "input-name"
-msgid "P10 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:472
-msgctxt "input-name"
-msgid "P10 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:473
-msgctxt "input-name"
-msgid "P10 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:474
-msgctxt "input-name"
-msgid "P10 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:475
-msgctxt "input-name"
-msgid "P10 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:476
-msgctxt "input-name"
-msgid "P10 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:477
-msgctxt "input-name"
-msgid "P10 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:478
-msgctxt "input-name"
-msgid "P10 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:479
-msgctxt "input-name"
-msgid "P10 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:480
-msgctxt "input-name"
-msgid "P10 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:481
-msgctxt "input-name"
-msgid "P10 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:482
-msgctxt "input-name"
-msgid "P10 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:483
-msgctxt "input-name"
-msgid "P10 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:484
-msgctxt "input-name"
-msgid "P10 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:485
-msgctxt "input-name"
-msgid "P10 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:486
-msgctxt "input-name"
-msgid "P10 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:487
-msgctxt "input-name"
-msgid "P10 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:488
-msgctxt "input-name"
-msgid "P10 Select"
-msgstr ""
-
 #: src/emu/inpttype.ipp:493
 msgctxt "input-name"
 msgid "1 Player Start"
@@ -5476,154 +4105,31 @@ msgctxt "input-name"
 msgid "Volume Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:550
-msgctxt "input-name"
-msgid "P1 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:551
-msgctxt "input-name"
-msgid "P2 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:552
-msgctxt "input-name"
-msgid "P3 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:553
-msgctxt "input-name"
-msgid "P4 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:554
-msgctxt "input-name"
-msgid "P5 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:555
-msgctxt "input-name"
-msgid "P6 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:556
-msgctxt "input-name"
-msgid "P7 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:557
-msgctxt "input-name"
-msgid "P8 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:558
-msgctxt "input-name"
-msgid "P9 Pedal 1"
-msgstr ""
-
+#: src/emu/inpttype.ipp:550 src/emu/inpttype.ipp:551 src/emu/inpttype.ipp:552
+#: src/emu/inpttype.ipp:553 src/emu/inpttype.ipp:554 src/emu/inpttype.ipp:555
+#: src/emu/inpttype.ipp:556 src/emu/inpttype.ipp:557 src/emu/inpttype.ipp:558
 #: src/emu/inpttype.ipp:559
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:564
-msgctxt "input-name"
-msgid "P1 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:565
-msgctxt "input-name"
-msgid "P2 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:566
-msgctxt "input-name"
-msgid "P3 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:567
-msgctxt "input-name"
-msgid "P4 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:568
-msgctxt "input-name"
-msgid "P5 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:569
-msgctxt "input-name"
-msgid "P6 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:570
-msgctxt "input-name"
-msgid "P7 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:571
-msgctxt "input-name"
-msgid "P8 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:572
-msgctxt "input-name"
-msgid "P9 Pedal 2"
+msgid "%p Pedal 1"
 msgstr ""
 
+#: src/emu/inpttype.ipp:564 src/emu/inpttype.ipp:565 src/emu/inpttype.ipp:566
+#: src/emu/inpttype.ipp:567 src/emu/inpttype.ipp:568 src/emu/inpttype.ipp:569
+#: src/emu/inpttype.ipp:570 src/emu/inpttype.ipp:571 src/emu/inpttype.ipp:572
 #: src/emu/inpttype.ipp:573
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:578
-msgctxt "input-name"
-msgid "P1 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:579
-msgctxt "input-name"
-msgid "P2 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:580
-msgctxt "input-name"
-msgid "P3 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:581
-msgctxt "input-name"
-msgid "P4 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:582
-msgctxt "input-name"
-msgid "P5 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:583
-msgctxt "input-name"
-msgid "P6 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:584
-msgctxt "input-name"
-msgid "P7 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:585
-msgctxt "input-name"
-msgid "P8 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:586
-msgctxt "input-name"
-msgid "P9 Pedal 3"
+msgid "%p Pedal 2"
 msgstr ""
 
+#: src/emu/inpttype.ipp:578 src/emu/inpttype.ipp:579 src/emu/inpttype.ipp:580
+#: src/emu/inpttype.ipp:581 src/emu/inpttype.ipp:582 src/emu/inpttype.ipp:583
+#: src/emu/inpttype.ipp:584 src/emu/inpttype.ipp:585 src/emu/inpttype.ipp:586
 #: src/emu/inpttype.ipp:587
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 3"
+msgid "%p Pedal 3"
 msgstr ""
 
 #: src/emu/inpttype.ipp:592
diff --git a/language/Basque/strings.po b/language/Basque/strings.po
index 13ce58805b3..78b662e279b 100644
--- a/language/Basque/strings.po
+++ b/language/Basque/strings.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-19 02:50+1100\n"
+"POT-Creation-Date: 2021-12-09 04:44+1100\n"
 "PO-Revision-Date: 2016-02-20 18:03+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: MAME Language Team\n"
@@ -260,12 +260,12 @@ msgstr ""
 msgid "Driver: \"%1$s\" software list "
 msgstr ""
 
-#: src/frontend/mame/ui/selsoft.cpp:711 src/frontend/mame/ui/selgame.cpp:1066
+#: src/frontend/mame/ui/selsoft.cpp:711 src/frontend/mame/ui/selgame.cpp:1076
 #, c-format
 msgid "%1$s: %2$s - Search: %3$s_"
 msgstr ""
 
-#: src/frontend/mame/ui/selsoft.cpp:713 src/frontend/mame/ui/selgame.cpp:1068
+#: src/frontend/mame/ui/selsoft.cpp:713 src/frontend/mame/ui/selgame.cpp:1078
 #, c-format
 msgid "Search: %1$s_"
 msgstr ""
@@ -275,7 +275,7 @@ msgstr ""
 msgid "Software list/item: %1$s:%2$s"
 msgstr ""
 
-#: src/frontend/mame/ui/optsmenu.cpp:73 src/frontend/mame/ui/sndmenu.cpp:165
+#: src/frontend/mame/ui/optsmenu.cpp:73 src/frontend/mame/ui/sndmenu.cpp:161
 msgid "Sound Options"
 msgstr ""
 
@@ -370,11 +370,11 @@ msgid "Show mouse pointer"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:39
-msgid "Confirm quit from machines"
+msgid "Confirm quit from emulation"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:40
-msgid "Skip information screen at startup"
+msgid "Skip system information screen"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:41
@@ -390,7 +390,7 @@ msgid "Skip BIOS selection menu"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:44
-msgid "Skip software parts selection menu"
+msgid "Skip software part selection menu"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:45
@@ -542,7 +542,7 @@ msgid "UI active"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:91
-msgid "Offscreen reload"
+msgid "Off-screen reload"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:92
@@ -558,7 +558,7 @@ msgid "Natural keyboard"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:95
-msgid "Simultaneous contradictory"
+msgid "Allow contradictory joystick inputs"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:96
@@ -582,7 +582,7 @@ msgid "Pedal Device Assignment"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:106
-msgid "Adstick Device Assignment"
+msgid "AD Stick Device Assignment"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:107
@@ -669,14 +669,14 @@ msgstr ""
 msgid "Wait Vertical Sync"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:687
+#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:689
 #: src/frontend/mame/ui/videoopt.cpp:191 src/frontend/mame/ui/custui.cpp:490
 #: src/frontend/mame/ui/analogipt.cpp:471 plugins/cheatfind/init.lua:766
 #: plugins/cheatfind/init.lua:777 plugins/cheat/init.lua:668
 msgid "On"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:690
+#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:692
 #: src/frontend/mame/ui/videoopt.cpp:207 src/frontend/mame/ui/custui.cpp:490
 #: src/frontend/mame/ui/analogipt.cpp:471 plugins/cheatfind/init.lua:763
 #: plugins/cheatfind/init.lua:774 plugins/cheat/init.lua:671
@@ -684,11 +684,11 @@ msgstr ""
 msgid "Off"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:693
+#: src/frontend/mame/ui/menu.cpp:695
 msgid "Auto"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:1195
+#: src/frontend/mame/ui/menu.cpp:1197
 #: src/frontend/mame/ui/simpleselgame.cpp:278
 #: src/frontend/mame/ui/selmenu.cpp:1280
 msgid "Return to Previous Menu"
@@ -696,7 +696,7 @@ msgstr ""
 
 #: src/frontend/mame/ui/filemngr.cpp:139
 #: src/frontend/mame/ui/confswitch.cpp:119
-#: src/frontend/mame/ui/inputmap.cpp:559 src/frontend/mame/ui/analogipt.cpp:360
+#: src/frontend/mame/ui/inputmap.cpp:563 src/frontend/mame/ui/analogipt.cpp:360
 #, c-format
 msgid "[root%1$s]"
 msgstr ""
@@ -939,22 +939,22 @@ msgid ""
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "GHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "MHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "kHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "Hz"
 msgstr ""
 
@@ -978,38 +978,38 @@ msgstr ""
 msgid "Vector"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:480
+#: src/frontend/mame/ui/info.cpp:483
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:480
+#: src/frontend/mame/ui/info.cpp:483
 msgid "%2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:497
+#: src/frontend/mame/ui/info.cpp:500
 #, c-format
 msgid "Screen '%1$s'"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:499
+#: src/frontend/mame/ui/info.cpp:502
 msgid "Screen"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:570 src/frontend/mame/ui/info.cpp:581
+#: src/frontend/mame/ui/info.cpp:573 src/frontend/mame/ui/info.cpp:584
 #, c-format
 msgid "%1$s:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:662
+#: src/frontend/mame/ui/info.cpp:665
 msgid "Not supported"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:665
+#: src/frontend/mame/ui/info.cpp:668
 msgid "Partially supported"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:674
+#: src/frontend/mame/ui/info.cpp:677
 msgid "[empty]"
 msgstr ""
 
@@ -1082,7 +1082,7 @@ msgid "Emulated"
 msgstr ""
 
 #: src/frontend/mame/ui/keyboard.cpp:59 src/frontend/mame/ui/confswitch.cpp:117
-#: src/frontend/mame/ui/inputmap.cpp:557 src/frontend/mame/ui/analogipt.cpp:358
+#: src/frontend/mame/ui/inputmap.cpp:561 src/frontend/mame/ui/analogipt.cpp:358
 #, c-format
 msgid "%1$s [root%2$s]"
 msgstr ""
@@ -1442,7 +1442,7 @@ msgctxt "swlist-info"
 msgid "Software list/item"
 msgstr ""
 
-#: src/frontend/mame/ui/datmenu.cpp:88 src/frontend/mame/ui/selmenu.cpp:2698
+#: src/frontend/mame/ui/datmenu.cpp:88 src/frontend/mame/ui/selmenu.cpp:2707
 msgid "Software List Info"
 msgstr ""
 
@@ -1557,7 +1557,7 @@ msgstr ""
 msgid "Configure Machine:"
 msgstr ""
 
-#: src/frontend/mame/ui/miscmenu.cpp:858 src/frontend/mame/ui/selmenu.cpp:2638
+#: src/frontend/mame/ui/miscmenu.cpp:858 src/frontend/mame/ui/selmenu.cpp:2647
 msgid " (default)"
 msgstr ""
 
@@ -1574,7 +1574,7 @@ msgid ""
 "Press %2$s to return to emulation"
 msgstr ""
 
-#: src/frontend/mame/ui/info_pty.cpp:30 src/frontend/mame/ui/mainmenu.cpp:155
+#: src/frontend/mame/ui/info_pty.cpp:30
 msgid "Pseudo terminals"
 msgstr ""
 
@@ -1642,52 +1642,52 @@ msgstr ""
 msgid "Other Controls"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:227
+#: src/frontend/mame/ui/inputmap.cpp:231
 msgid "This machine has no configurable inputs."
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:327
+#: src/frontend/mame/ui/inputmap.cpp:331
 msgid "Pressed"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:397
+#: src/frontend/mame/ui/inputmap.cpp:401
 msgid "Invalid sequence entered"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:542
+#: src/frontend/mame/ui/inputmap.cpp:546
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:543
+#: src/frontend/mame/ui/inputmap.cpp:547
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog Inc"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:544
+#: src/frontend/mame/ui/inputmap.cpp:548
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog Dec"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:586
+#: src/frontend/mame/ui/inputmap.cpp:590
 #, c-format
 msgid "Press %1$s to set\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:587
+#: src/frontend/mame/ui/inputmap.cpp:591
 #, c-format
 msgid "Press %1$s to append\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:588
+#: src/frontend/mame/ui/inputmap.cpp:592
 #, c-format
 msgid "Press %1$s to clear\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:589
+#: src/frontend/mame/ui/inputmap.cpp:593
 #, c-format
 msgid "Press %1$s to restore default\n"
 msgstr ""
@@ -1751,7 +1751,7 @@ msgid ""
 msgstr ""
 
 #: src/frontend/mame/ui/simpleselgame.cpp:273
-#: src/frontend/mame/ui/selgame.cpp:436
+#: src/frontend/mame/ui/selgame.cpp:443
 msgid "Configure Options"
 msgstr ""
 
@@ -2079,16 +2079,16 @@ msgstr ""
 msgid "Expand to fit"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:437
+#: src/frontend/mame/ui/selgame.cpp:444
 msgid "Configure Machine"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:1050
+#: src/frontend/mame/ui/selgame.cpp:1060
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d machines (%5$d BIOS) )"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:1078
+#: src/frontend/mame/ui/selgame.cpp:1088
 #, c-format
 msgid "System: %1$-.100s"
 msgstr ""
@@ -2110,7 +2110,7 @@ msgstr ""
 #: src/frontend/mame/ui/auditmenu.cpp:98
 #, c-format
 msgid ""
-"Auditing ROMs for machine %2$u of %3$u...\n"
+"Auditing media for machine %2$u of %3$u...\n"
 "%1$s"
 msgstr ""
 
@@ -2125,12 +2125,12 @@ msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:136
 #, c-format
-msgid "Audit ROMs for %1$u machines marked unavailable"
+msgid "Audit media for %1$u machines marked unavailable"
 msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:137
 #, c-format
-msgid "Audit ROMs for all %1$u machines"
+msgid "Audit media for all %1$u machines"
 msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:154
@@ -2336,84 +2336,84 @@ msgctxt "color-sample"
 msgid "Clone"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:914
+#: src/frontend/mame/ui/custui.cpp:906
 msgid "ARGB Settings"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:919 src/frontend/mame/ui/custui.cpp:922
+#: src/frontend/mame/ui/custui.cpp:911 src/frontend/mame/ui/custui.cpp:914
 msgctxt "color-channel"
 msgid "Alpha"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:927 src/frontend/mame/ui/custui.cpp:930
+#: src/frontend/mame/ui/custui.cpp:919 src/frontend/mame/ui/custui.cpp:922
 msgctxt "color-channel"
 msgid "Red"
 msgstr ""
 
+#: src/frontend/mame/ui/custui.cpp:927 src/frontend/mame/ui/custui.cpp:930
+msgctxt "color-channel"
+msgid "Green"
+msgstr ""
+
 #: src/frontend/mame/ui/custui.cpp:935 src/frontend/mame/ui/custui.cpp:938
 msgctxt "color-channel"
-msgid "Green"
-msgstr ""
-
-#: src/frontend/mame/ui/custui.cpp:943 src/frontend/mame/ui/custui.cpp:946
-msgctxt "color-channel"
 msgid "Blue"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:949
+#: src/frontend/mame/ui/custui.cpp:941
 msgid "Choose from palette"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:996
+#: src/frontend/mame/ui/custui.cpp:988
 msgid "Color preview:"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1093
+#: src/frontend/mame/ui/custui.cpp:1085
 msgctxt "color-preset"
 msgid "White"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1094
+#: src/frontend/mame/ui/custui.cpp:1086
 msgctxt "color-preset"
 msgid "Silver"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1095
+#: src/frontend/mame/ui/custui.cpp:1087
 msgctxt "color-preset"
 msgid "Gray"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1096
+#: src/frontend/mame/ui/custui.cpp:1088
 msgctxt "color-preset"
 msgid "Black"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1097
+#: src/frontend/mame/ui/custui.cpp:1089
 msgctxt "color-preset"
 msgid "Red"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1098
+#: src/frontend/mame/ui/custui.cpp:1090
 msgctxt "color-preset"
 msgid "Orange"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1099
+#: src/frontend/mame/ui/custui.cpp:1091
 msgctxt "color-preset"
 msgid "Yellow"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1100
+#: src/frontend/mame/ui/custui.cpp:1092
 msgctxt "color-preset"
 msgid "Green"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1101
+#: src/frontend/mame/ui/custui.cpp:1093
 msgctxt "color-preset"
 msgid "Blue"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1102
+#: src/frontend/mame/ui/custui.cpp:1094
 msgctxt "color-preset"
 msgid "Violet"
 msgstr ""
@@ -2478,7 +2478,7 @@ msgid "Input (general)"
 msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:123
-msgid "Input (this Machine)"
+msgid "Input (this machine)"
 msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:126
@@ -2517,6 +2517,10 @@ msgstr ""
 msgid "Tape Control"
 msgstr ""
 
+#: src/frontend/mame/ui/mainmenu.cpp:155
+msgid "Pseudo Terminals"
+msgstr ""
+
 #: src/frontend/mame/ui/mainmenu.cpp:158
 msgid "BIOS Selection"
 msgstr ""
@@ -2555,7 +2559,7 @@ msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:200
 #, c-format
-msgid "About %s"
+msgid "About %1$s"
 msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:212
@@ -2715,373 +2719,373 @@ msgstr ""
 msgid "%1$s %2$s"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2235
+#: src/frontend/mame/ui/selmenu.cpp:2244
 msgid "Images"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2236
+#: src/frontend/mame/ui/selmenu.cpp:2245
 msgid "Infos"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2551
+#: src/frontend/mame/ui/selmenu.cpp:2560
 msgid ""
 "Required ROM/disk images for the selected system are missing or incorrect. "
 "Please acquire the correct files or select a different system.\n"
 "\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2567
+#: src/frontend/mame/ui/selmenu.cpp:2576
 msgid ""
 "Required ROM/disk images for the selected software are missing or incorrect. "
 "Please acquire the correct files or select a different software item.\n"
 "\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2583
+#: src/frontend/mame/ui/selmenu.cpp:2592
 msgid "incorrect checksum"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2586
+#: src/frontend/mame/ui/selmenu.cpp:2595
 msgid "incorrect length"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2589
+#: src/frontend/mame/ui/selmenu.cpp:2598
 msgid "not found"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2600
+#: src/frontend/mame/ui/selmenu.cpp:2609
 #, c-format
 msgid "%1$s (%2$s) - %3$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2602
+#: src/frontend/mame/ui/selmenu.cpp:2611
 #, c-format
 msgid "%1$s - %2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2606
+#: src/frontend/mame/ui/selmenu.cpp:2615
 msgid "Press any key to continue."
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2735
+#: src/frontend/mame/ui/selmenu.cpp:2744
 msgid "General Info"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2887
-#, c-format
-msgid "Romset\t%1$s\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2888
-#, c-format
-msgid "Year\t%1$s\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2889
-#, c-format
-msgid "Manufacturer\t%1$s\n"
-msgstr ""
-
 #: src/frontend/mame/ui/selmenu.cpp:2896
 #, c-format
-msgid "Driver is Clone of\t%1$s\n"
+msgid "Romset\t%1$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2901
-msgid "Driver is Parent\t\n"
+#: src/frontend/mame/ui/selmenu.cpp:2897
+#, c-format
+msgid "Year\t%1$s\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2898
+#, c-format
+msgid "Manufacturer\t%1$s\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2905
-msgid "Analog Controls\tYes\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2907
-msgid "Keyboard Inputs\tYes\n"
+#, c-format
+msgid "Driver is Clone of\t%1$s\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2910
-msgid "Overall\tNOT WORKING\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2912
-msgid "Overall\tUnemulated Protection\n"
+msgid "Driver is Parent\t\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2914
-msgid "Overall\tWorking\n"
+msgid "Analog Controls\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2917
-msgid "Graphics\tUnimplemented\n"
+#: src/frontend/mame/ui/selmenu.cpp:2916
+msgid "Keyboard Inputs\tYes\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2919
-msgid "Graphics\tWrong Colors\n"
+msgid "Overall\tNOT WORKING\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2921
-msgid "Graphics\tImperfect Colors\n"
+msgid "Overall\tUnemulated Protection\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2923
-msgid "Graphics\tImperfect\n"
+msgid "Overall\tWorking\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2925
-msgid "Graphics\tOK\n"
+#: src/frontend/mame/ui/selmenu.cpp:2926
+msgid "Graphics\tUnimplemented\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2928
-msgid "Sound\tNone\n"
+msgid "Graphics\tWrong Colors\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2930
-msgid "Sound\tUnimplemented\n"
+msgid "Graphics\tImperfect Colors\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2932
-msgid "Sound\tImperfect\n"
+msgid "Graphics\tImperfect\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2934
-msgid "Sound\tOK\n"
+msgid "Graphics\tOK\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2937
-msgid "Capture\tUnimplemented\n"
+msgid "Sound\tNone\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2939
+msgid "Sound\tUnimplemented\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2941
+msgid "Sound\tImperfect\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2943
+msgid "Sound\tOK\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2946
+msgid "Capture\tUnimplemented\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2948
 msgid "Capture\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2942
+#: src/frontend/mame/ui/selmenu.cpp:2951
 msgid "Camera\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2944
+#: src/frontend/mame/ui/selmenu.cpp:2953
 msgid "Camera\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2947
+#: src/frontend/mame/ui/selmenu.cpp:2956
 msgid "Microphone\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2949
+#: src/frontend/mame/ui/selmenu.cpp:2958
 msgid "Microphone\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2952
+#: src/frontend/mame/ui/selmenu.cpp:2961
 msgid "Controls\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2954
+#: src/frontend/mame/ui/selmenu.cpp:2963
 msgid "Controls\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2957
+#: src/frontend/mame/ui/selmenu.cpp:2966
 msgid "Keyboard\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2959
+#: src/frontend/mame/ui/selmenu.cpp:2968
 msgid "Keyboard\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2962
+#: src/frontend/mame/ui/selmenu.cpp:2971
 msgid "Mouse\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2964
+#: src/frontend/mame/ui/selmenu.cpp:2973
 msgid "Mouse\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2967
+#: src/frontend/mame/ui/selmenu.cpp:2976
 msgid "Media\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2969
+#: src/frontend/mame/ui/selmenu.cpp:2978
 msgid "Media\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2972
+#: src/frontend/mame/ui/selmenu.cpp:2981
 msgid "Disk\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2974
+#: src/frontend/mame/ui/selmenu.cpp:2983
 msgid "Disk\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2977
+#: src/frontend/mame/ui/selmenu.cpp:2986
 msgid "Printer\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2979
+#: src/frontend/mame/ui/selmenu.cpp:2988
 msgid "Printer\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2982
+#: src/frontend/mame/ui/selmenu.cpp:2991
 msgid "Mag. Tape\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2984
+#: src/frontend/mame/ui/selmenu.cpp:2993
 msgid "Mag. Tape\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2987
+#: src/frontend/mame/ui/selmenu.cpp:2996
 msgid "Punch Tape\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2989
+#: src/frontend/mame/ui/selmenu.cpp:2998
 msgid "Punch Tape\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2992
+#: src/frontend/mame/ui/selmenu.cpp:3001
 msgid "Mag. Drum\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2994
+#: src/frontend/mame/ui/selmenu.cpp:3003
 msgid "Mag. Drum\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2997
+#: src/frontend/mame/ui/selmenu.cpp:3006
 msgid "(EP)ROM\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2999
+#: src/frontend/mame/ui/selmenu.cpp:3008
 msgid "(EP)ROM\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3002
+#: src/frontend/mame/ui/selmenu.cpp:3011
 msgid "Communications\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3004
+#: src/frontend/mame/ui/selmenu.cpp:3013
 msgid "Communications\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3007
+#: src/frontend/mame/ui/selmenu.cpp:3016
 msgid "LAN\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3009
+#: src/frontend/mame/ui/selmenu.cpp:3018
 msgid "LAN\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3012
+#: src/frontend/mame/ui/selmenu.cpp:3021
 msgid "WAN\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3014
+#: src/frontend/mame/ui/selmenu.cpp:3023
 msgid "WAN\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3017
+#: src/frontend/mame/ui/selmenu.cpp:3026
 msgid "Timing\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3019
+#: src/frontend/mame/ui/selmenu.cpp:3028
 msgid "Timing\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3021
+#: src/frontend/mame/ui/selmenu.cpp:3030
 msgid "Mechanical Machine\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3021
+#: src/frontend/mame/ui/selmenu.cpp:3030
 msgid "Mechanical Machine\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3022
+#: src/frontend/mame/ui/selmenu.cpp:3031
 msgid "Requires Artwork\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3022
+#: src/frontend/mame/ui/selmenu.cpp:3031
 msgid "Requires Artwork\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3023
+#: src/frontend/mame/ui/selmenu.cpp:3032
 msgid "Requires Clickable Artwork\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3023
+#: src/frontend/mame/ui/selmenu.cpp:3032
 msgid "Requires Clickable Artwork\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3025
+#: src/frontend/mame/ui/selmenu.cpp:3034
 msgid "Support Cocktail\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3026
+#: src/frontend/mame/ui/selmenu.cpp:3035
 msgid "Driver is BIOS\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3026
+#: src/frontend/mame/ui/selmenu.cpp:3035
 msgid "Driver is BIOS\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3027
+#: src/frontend/mame/ui/selmenu.cpp:3036
 msgid "Support Save\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3027
+#: src/frontend/mame/ui/selmenu.cpp:3036
 msgid "Support Save\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3028
+#: src/frontend/mame/ui/selmenu.cpp:3037
 msgid "Screen Orientation\tVertical\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3028
+#: src/frontend/mame/ui/selmenu.cpp:3037
 msgid "Screen Orientation\tHorizontal\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3038
+#: src/frontend/mame/ui/selmenu.cpp:3047
 msgid "Requires CHD\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3038
+#: src/frontend/mame/ui/selmenu.cpp:3047
 msgid "Requires CHD\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3051
-msgid "ROM Audit Result\tOK\n"
+#: src/frontend/mame/ui/selmenu.cpp:3060
+msgid "Media Audit Result\tOK\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3053
-msgid "ROM Audit Result\tBAD\n"
+#: src/frontend/mame/ui/selmenu.cpp:3062
+msgid "Media Audit Result\tBAD\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3056
+#: src/frontend/mame/ui/selmenu.cpp:3065
 msgid "Samples Audit Result\tNone Needed\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3058
+#: src/frontend/mame/ui/selmenu.cpp:3067
 msgid "Samples Audit Result\tOK\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3060
+#: src/frontend/mame/ui/selmenu.cpp:3069
 msgid "Samples Audit Result\tBAD\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3064
+#: src/frontend/mame/ui/selmenu.cpp:3073
 msgid ""
-"ROM Audit \tDisabled\n"
-"Samples Audit \tDisabled\n"
+"Media Audit\tDisabled\n"
+"Samples Audit\tDisabled\n"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:150
+#: src/frontend/mame/ui/sndmenu.cpp:146
 msgid "Sound"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:151
+#: src/frontend/mame/ui/sndmenu.cpp:147
 msgid "Compressor"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:152
+#: src/frontend/mame/ui/sndmenu.cpp:148
 msgid "Sample Rate"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:153
+#: src/frontend/mame/ui/sndmenu.cpp:149
 msgid "Use External Samples"
 msgstr ""
 
@@ -3120,511 +3124,681 @@ msgstr ""
 msgid "  Screen '%1$s': Vector\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:132
+#: src/frontend/mame/ui/devopt.cpp:135
 #, c-format
 msgid "  Screen '%1$s': %2$d × %3$d (V) %4$s Hz\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:133
+#: src/frontend/mame/ui/devopt.cpp:136
 #, c-format
 msgid "  Screen '%1$s': %2$d × %3$d (H) %4$s Hz\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:147
+#: src/frontend/mame/ui/devopt.cpp:150
 msgid "* Sound:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:211
+#: src/frontend/mame/ui/devopt.cpp:214
 #, c-format
 msgid ""
 "* BIOS settings:\n"
 "  %1$d options    [default: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:255 src/frontend/mame/ui/devopt.cpp:271
-#: src/frontend/mame/ui/devopt.cpp:332
+#: src/frontend/mame/ui/devopt.cpp:258 src/frontend/mame/ui/devopt.cpp:274
+#: src/frontend/mame/ui/devopt.cpp:335
 #, c-format
 msgid "  %1$s    [default: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:260 src/frontend/mame/ui/devopt.cpp:276
+#: src/frontend/mame/ui/devopt.cpp:263 src/frontend/mame/ui/devopt.cpp:279
 #, c-format
 msgid "  %1$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:282
+#: src/frontend/mame/ui/devopt.cpp:285
 msgid "* DIP switch settings:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:287
+#: src/frontend/mame/ui/devopt.cpp:290
 msgid "* Configuration settings:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:291
+#: src/frontend/mame/ui/devopt.cpp:294
 msgid "* Input device(s):\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:293
+#: src/frontend/mame/ui/devopt.cpp:296
 #, c-format
 msgid "  User inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:295
+#: src/frontend/mame/ui/devopt.cpp:298
 #, c-format
 msgid "  Mahjong inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:297
+#: src/frontend/mame/ui/devopt.cpp:300
 #, c-format
 msgid "  Hanafuda inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:299
+#: src/frontend/mame/ui/devopt.cpp:302
 #, c-format
 msgid "  Gambling inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:301
+#: src/frontend/mame/ui/devopt.cpp:304
 #, c-format
 msgid "  Analog inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:303
+#: src/frontend/mame/ui/devopt.cpp:306
 #, c-format
 msgid "  Adjuster inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:305
+#: src/frontend/mame/ui/devopt.cpp:308
 #, c-format
 msgid "  Keypad inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:307
+#: src/frontend/mame/ui/devopt.cpp:310
 #, c-format
 msgid "  Keyboard inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:312
+#: src/frontend/mame/ui/devopt.cpp:315
 msgid "* Media Options:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:317
+#: src/frontend/mame/ui/devopt.cpp:320
 #, c-format
 msgid "  %1$s    [tag: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:327
+#: src/frontend/mame/ui/devopt.cpp:330
 msgid "* Slot Options:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:341
+#: src/frontend/mame/ui/devopt.cpp:344
 msgid "[None]\n"
 msgstr ""
 
-#: src/emu/render.cpp:1847
+#: src/emu/render.cpp:1796
 #, c-format
 msgctxt "view-name"
 msgid "Screen %1$u Standard (%2$u:%3$u)"
 msgstr ""
 
-#: src/emu/render.cpp:1873
+#: src/emu/render.cpp:1822
 #, c-format
 msgctxt "view-name"
 msgid "Screen %1$u Pixel Aspect (%2$u:%3$u)"
 msgstr ""
 
-#: src/emu/render.cpp:1895 src/emu/render.cpp:2030
+#: src/emu/render.cpp:1844 src/emu/render.cpp:1979
 msgctxt "view-name"
 msgid "Cocktail"
 msgstr ""
 
-#: src/emu/render.cpp:2015
+#: src/emu/render.cpp:1964
 msgctxt "view-name"
 msgid "Left-to-Right"
 msgstr ""
 
-#: src/emu/render.cpp:2016
+#: src/emu/render.cpp:1965
 msgctxt "view-name"
 msgid "Left-to-Right (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2017
+#: src/emu/render.cpp:1966
 msgctxt "view-name"
 msgid "Top-to-Bottom"
 msgstr ""
 
-#: src/emu/render.cpp:2018
+#: src/emu/render.cpp:1967
 msgctxt "view-name"
 msgid "Top-to-Bottom (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2069
+#: src/emu/render.cpp:2018
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Left-to-Right, Top-to-Bottom"
 msgstr ""
 
-#: src/emu/render.cpp:2078
+#: src/emu/render.cpp:2027
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Left-to-Right, Top-to-Bottom (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2087
+#: src/emu/render.cpp:2036
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Top-to-Bottom, Left-to-Right"
 msgstr ""
 
-#: src/emu/render.cpp:2096
+#: src/emu/render.cpp:2045
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Top-to-Bottom, Left-to-Right (Gapless)"
 msgstr ""
 
-#: src/emu/inpttype.ipp:22
+#: src/emu/ioport.cpp:332
+#, c-format
 msgctxt "input-name"
-msgid "P1 Up"
+msgid "P%1$u"
 msgstr ""
 
-#: src/emu/inpttype.ipp:23
+#: src/emu/ioport.cpp:1924
 msgctxt "input-name"
-msgid "P1 Down"
+msgid "???"
 msgstr ""
 
-#: src/emu/inpttype.ipp:24
+#: src/emu/inpttype.ipp:22 src/emu/inpttype.ipp:140 src/emu/inpttype.ipp:221
+#: src/emu/inpttype.ipp:255 src/emu/inpttype.ipp:289 src/emu/inpttype.ipp:323
+#: src/emu/inpttype.ipp:357 src/emu/inpttype.ipp:391 src/emu/inpttype.ipp:425
+#: src/emu/inpttype.ipp:459
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left"
+msgid "%p Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:25
+#: src/emu/inpttype.ipp:23 src/emu/inpttype.ipp:141 src/emu/inpttype.ipp:222
+#: src/emu/inpttype.ipp:256 src/emu/inpttype.ipp:290 src/emu/inpttype.ipp:324
+#: src/emu/inpttype.ipp:358 src/emu/inpttype.ipp:392 src/emu/inpttype.ipp:426
+#: src/emu/inpttype.ipp:460
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right"
+msgid "%p Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:26
+#: src/emu/inpttype.ipp:24 src/emu/inpttype.ipp:142 src/emu/inpttype.ipp:223
+#: src/emu/inpttype.ipp:257 src/emu/inpttype.ipp:291 src/emu/inpttype.ipp:325
+#: src/emu/inpttype.ipp:359 src/emu/inpttype.ipp:393 src/emu/inpttype.ipp:427
+#: src/emu/inpttype.ipp:461
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Up"
+msgid "%p Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:27
+#: src/emu/inpttype.ipp:25 src/emu/inpttype.ipp:143 src/emu/inpttype.ipp:224
+#: src/emu/inpttype.ipp:258 src/emu/inpttype.ipp:292 src/emu/inpttype.ipp:326
+#: src/emu/inpttype.ipp:360 src/emu/inpttype.ipp:394 src/emu/inpttype.ipp:428
+#: src/emu/inpttype.ipp:462
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Down"
+msgid "%p Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:28
+#: src/emu/inpttype.ipp:26 src/emu/inpttype.ipp:144 src/emu/inpttype.ipp:225
+#: src/emu/inpttype.ipp:259 src/emu/inpttype.ipp:293 src/emu/inpttype.ipp:327
+#: src/emu/inpttype.ipp:361 src/emu/inpttype.ipp:395 src/emu/inpttype.ipp:429
+#: src/emu/inpttype.ipp:463
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Left"
+msgid "%p Right Stick/Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:29
+#: src/emu/inpttype.ipp:27 src/emu/inpttype.ipp:145 src/emu/inpttype.ipp:226
+#: src/emu/inpttype.ipp:260 src/emu/inpttype.ipp:294 src/emu/inpttype.ipp:328
+#: src/emu/inpttype.ipp:362 src/emu/inpttype.ipp:396 src/emu/inpttype.ipp:430
+#: src/emu/inpttype.ipp:464
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Right"
+msgid "%p Right Stick/Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:30
+#: src/emu/inpttype.ipp:28 src/emu/inpttype.ipp:146 src/emu/inpttype.ipp:227
+#: src/emu/inpttype.ipp:261 src/emu/inpttype.ipp:295 src/emu/inpttype.ipp:329
+#: src/emu/inpttype.ipp:363 src/emu/inpttype.ipp:397 src/emu/inpttype.ipp:431
+#: src/emu/inpttype.ipp:465
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Up"
+msgid "%p Right Stick/Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:31
+#: src/emu/inpttype.ipp:29 src/emu/inpttype.ipp:147 src/emu/inpttype.ipp:228
+#: src/emu/inpttype.ipp:262 src/emu/inpttype.ipp:296 src/emu/inpttype.ipp:330
+#: src/emu/inpttype.ipp:364 src/emu/inpttype.ipp:398 src/emu/inpttype.ipp:432
+#: src/emu/inpttype.ipp:466
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Down"
+msgid "%p Right Stick/Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:32
+#: src/emu/inpttype.ipp:30 src/emu/inpttype.ipp:148 src/emu/inpttype.ipp:229
+#: src/emu/inpttype.ipp:263 src/emu/inpttype.ipp:297 src/emu/inpttype.ipp:331
+#: src/emu/inpttype.ipp:365 src/emu/inpttype.ipp:399 src/emu/inpttype.ipp:433
+#: src/emu/inpttype.ipp:467
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Left"
+msgid "%p Left Stick/Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:33
+#: src/emu/inpttype.ipp:31 src/emu/inpttype.ipp:149 src/emu/inpttype.ipp:230
+#: src/emu/inpttype.ipp:264 src/emu/inpttype.ipp:298 src/emu/inpttype.ipp:332
+#: src/emu/inpttype.ipp:366 src/emu/inpttype.ipp:400 src/emu/inpttype.ipp:434
+#: src/emu/inpttype.ipp:468
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Right"
+msgid "%p Left Stick/Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:34
+#: src/emu/inpttype.ipp:32 src/emu/inpttype.ipp:150 src/emu/inpttype.ipp:231
+#: src/emu/inpttype.ipp:265 src/emu/inpttype.ipp:299 src/emu/inpttype.ipp:333
+#: src/emu/inpttype.ipp:367 src/emu/inpttype.ipp:401 src/emu/inpttype.ipp:435
+#: src/emu/inpttype.ipp:469
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 1"
+msgid "%p Left Stick/Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:35
+#: src/emu/inpttype.ipp:33 src/emu/inpttype.ipp:151 src/emu/inpttype.ipp:232
+#: src/emu/inpttype.ipp:266 src/emu/inpttype.ipp:300 src/emu/inpttype.ipp:334
+#: src/emu/inpttype.ipp:368 src/emu/inpttype.ipp:402 src/emu/inpttype.ipp:436
+#: src/emu/inpttype.ipp:470
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 2"
+msgid "%p Left Stick/Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:36
+#: src/emu/inpttype.ipp:34 src/emu/inpttype.ipp:152 src/emu/inpttype.ipp:233
+#: src/emu/inpttype.ipp:267 src/emu/inpttype.ipp:301 src/emu/inpttype.ipp:335
+#: src/emu/inpttype.ipp:369 src/emu/inpttype.ipp:403 src/emu/inpttype.ipp:437
+#: src/emu/inpttype.ipp:471
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 3"
+msgid "%p Button 1"
 msgstr ""
 
-#: src/emu/inpttype.ipp:37
+#: src/emu/inpttype.ipp:35 src/emu/inpttype.ipp:153 src/emu/inpttype.ipp:234
+#: src/emu/inpttype.ipp:268 src/emu/inpttype.ipp:302 src/emu/inpttype.ipp:336
+#: src/emu/inpttype.ipp:370 src/emu/inpttype.ipp:404 src/emu/inpttype.ipp:438
+#: src/emu/inpttype.ipp:472
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 4"
+msgid "%p Button 2"
 msgstr ""
 
-#: src/emu/inpttype.ipp:38
+#: src/emu/inpttype.ipp:36 src/emu/inpttype.ipp:154 src/emu/inpttype.ipp:235
+#: src/emu/inpttype.ipp:269 src/emu/inpttype.ipp:303 src/emu/inpttype.ipp:337
+#: src/emu/inpttype.ipp:371 src/emu/inpttype.ipp:405 src/emu/inpttype.ipp:439
+#: src/emu/inpttype.ipp:473
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 5"
+msgid "%p Button 3"
 msgstr ""
 
-#: src/emu/inpttype.ipp:39
+#: src/emu/inpttype.ipp:37 src/emu/inpttype.ipp:155 src/emu/inpttype.ipp:236
+#: src/emu/inpttype.ipp:270 src/emu/inpttype.ipp:304 src/emu/inpttype.ipp:338
+#: src/emu/inpttype.ipp:372 src/emu/inpttype.ipp:406 src/emu/inpttype.ipp:440
+#: src/emu/inpttype.ipp:474
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 6"
+msgid "%p Button 4"
 msgstr ""
 
-#: src/emu/inpttype.ipp:40
+#: src/emu/inpttype.ipp:38 src/emu/inpttype.ipp:156 src/emu/inpttype.ipp:237
+#: src/emu/inpttype.ipp:271 src/emu/inpttype.ipp:305 src/emu/inpttype.ipp:339
+#: src/emu/inpttype.ipp:373 src/emu/inpttype.ipp:407 src/emu/inpttype.ipp:441
+#: src/emu/inpttype.ipp:475
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 7"
+msgid "%p Button 5"
 msgstr ""
 
-#: src/emu/inpttype.ipp:41
+#: src/emu/inpttype.ipp:39 src/emu/inpttype.ipp:157 src/emu/inpttype.ipp:238
+#: src/emu/inpttype.ipp:272 src/emu/inpttype.ipp:306 src/emu/inpttype.ipp:340
+#: src/emu/inpttype.ipp:374 src/emu/inpttype.ipp:408 src/emu/inpttype.ipp:442
+#: src/emu/inpttype.ipp:476
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 8"
+msgid "%p Button 6"
 msgstr ""
 
-#: src/emu/inpttype.ipp:42
+#: src/emu/inpttype.ipp:40 src/emu/inpttype.ipp:158 src/emu/inpttype.ipp:239
+#: src/emu/inpttype.ipp:273 src/emu/inpttype.ipp:307 src/emu/inpttype.ipp:341
+#: src/emu/inpttype.ipp:375 src/emu/inpttype.ipp:409 src/emu/inpttype.ipp:443
+#: src/emu/inpttype.ipp:477
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 9"
+msgid "%p Button 7"
 msgstr ""
 
-#: src/emu/inpttype.ipp:43
+#: src/emu/inpttype.ipp:41 src/emu/inpttype.ipp:159 src/emu/inpttype.ipp:240
+#: src/emu/inpttype.ipp:274 src/emu/inpttype.ipp:308 src/emu/inpttype.ipp:342
+#: src/emu/inpttype.ipp:376 src/emu/inpttype.ipp:410 src/emu/inpttype.ipp:444
+#: src/emu/inpttype.ipp:478
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 10"
+msgid "%p Button 8"
 msgstr ""
 
-#: src/emu/inpttype.ipp:44
+#: src/emu/inpttype.ipp:42 src/emu/inpttype.ipp:160 src/emu/inpttype.ipp:241
+#: src/emu/inpttype.ipp:275 src/emu/inpttype.ipp:309 src/emu/inpttype.ipp:343
+#: src/emu/inpttype.ipp:377 src/emu/inpttype.ipp:411 src/emu/inpttype.ipp:445
+#: src/emu/inpttype.ipp:479
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 11"
+msgid "%p Button 9"
 msgstr ""
 
-#: src/emu/inpttype.ipp:45
+#: src/emu/inpttype.ipp:43 src/emu/inpttype.ipp:161 src/emu/inpttype.ipp:242
+#: src/emu/inpttype.ipp:276 src/emu/inpttype.ipp:310 src/emu/inpttype.ipp:344
+#: src/emu/inpttype.ipp:378 src/emu/inpttype.ipp:412 src/emu/inpttype.ipp:446
+#: src/emu/inpttype.ipp:480
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 12"
+msgid "%p Button 10"
 msgstr ""
 
-#: src/emu/inpttype.ipp:46
+#: src/emu/inpttype.ipp:44 src/emu/inpttype.ipp:162 src/emu/inpttype.ipp:243
+#: src/emu/inpttype.ipp:277 src/emu/inpttype.ipp:311 src/emu/inpttype.ipp:345
+#: src/emu/inpttype.ipp:379 src/emu/inpttype.ipp:413 src/emu/inpttype.ipp:447
+#: src/emu/inpttype.ipp:481
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 13"
+msgid "%p Button 11"
 msgstr ""
 
-#: src/emu/inpttype.ipp:47
+#: src/emu/inpttype.ipp:45 src/emu/inpttype.ipp:163 src/emu/inpttype.ipp:244
+#: src/emu/inpttype.ipp:278 src/emu/inpttype.ipp:312 src/emu/inpttype.ipp:346
+#: src/emu/inpttype.ipp:380 src/emu/inpttype.ipp:414 src/emu/inpttype.ipp:448
+#: src/emu/inpttype.ipp:482
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 14"
+msgid "%p Button 12"
 msgstr ""
 
-#: src/emu/inpttype.ipp:48
+#: src/emu/inpttype.ipp:46 src/emu/inpttype.ipp:164 src/emu/inpttype.ipp:245
+#: src/emu/inpttype.ipp:279 src/emu/inpttype.ipp:313 src/emu/inpttype.ipp:347
+#: src/emu/inpttype.ipp:381 src/emu/inpttype.ipp:415 src/emu/inpttype.ipp:449
+#: src/emu/inpttype.ipp:483
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 15"
+msgid "%p Button 13"
 msgstr ""
 
-#: src/emu/inpttype.ipp:49
+#: src/emu/inpttype.ipp:47 src/emu/inpttype.ipp:165 src/emu/inpttype.ipp:246
+#: src/emu/inpttype.ipp:280 src/emu/inpttype.ipp:314 src/emu/inpttype.ipp:348
+#: src/emu/inpttype.ipp:382 src/emu/inpttype.ipp:416 src/emu/inpttype.ipp:450
+#: src/emu/inpttype.ipp:484
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 16"
+msgid "%p Button 14"
 msgstr ""
 
-#: src/emu/inpttype.ipp:50
+#: src/emu/inpttype.ipp:48 src/emu/inpttype.ipp:166 src/emu/inpttype.ipp:247
+#: src/emu/inpttype.ipp:281 src/emu/inpttype.ipp:315 src/emu/inpttype.ipp:349
+#: src/emu/inpttype.ipp:383 src/emu/inpttype.ipp:417 src/emu/inpttype.ipp:451
+#: src/emu/inpttype.ipp:485
+#, c-format
 msgctxt "input-name"
-msgid "P1 Start"
+msgid "%p Button 15"
 msgstr ""
 
-#: src/emu/inpttype.ipp:51
+#: src/emu/inpttype.ipp:49 src/emu/inpttype.ipp:167 src/emu/inpttype.ipp:248
+#: src/emu/inpttype.ipp:282 src/emu/inpttype.ipp:316 src/emu/inpttype.ipp:350
+#: src/emu/inpttype.ipp:384 src/emu/inpttype.ipp:418 src/emu/inpttype.ipp:452
+#: src/emu/inpttype.ipp:486
+#, c-format
 msgctxt "input-name"
-msgid "P1 Select"
+msgid "%p Button 16"
 msgstr ""
 
-#: src/emu/inpttype.ipp:56
+#: src/emu/inpttype.ipp:50 src/emu/inpttype.ipp:168 src/emu/inpttype.ipp:249
+#: src/emu/inpttype.ipp:283 src/emu/inpttype.ipp:317 src/emu/inpttype.ipp:351
+#: src/emu/inpttype.ipp:385 src/emu/inpttype.ipp:419 src/emu/inpttype.ipp:453
+#: src/emu/inpttype.ipp:487
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong A"
+msgid "%p Start"
 msgstr ""
 
-#: src/emu/inpttype.ipp:57
+#: src/emu/inpttype.ipp:51 src/emu/inpttype.ipp:169 src/emu/inpttype.ipp:250
+#: src/emu/inpttype.ipp:284 src/emu/inpttype.ipp:318 src/emu/inpttype.ipp:352
+#: src/emu/inpttype.ipp:386 src/emu/inpttype.ipp:420 src/emu/inpttype.ipp:454
+#: src/emu/inpttype.ipp:488
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong B"
+msgid "%p Select"
 msgstr ""
 
-#: src/emu/inpttype.ipp:58
+#: src/emu/inpttype.ipp:56 src/emu/inpttype.ipp:174
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong C"
+msgid "%p Mahjong A"
 msgstr ""
 
-#: src/emu/inpttype.ipp:59
+#: src/emu/inpttype.ipp:57 src/emu/inpttype.ipp:175
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong D"
+msgid "%p Mahjong B"
 msgstr ""
 
-#: src/emu/inpttype.ipp:60
+#: src/emu/inpttype.ipp:58 src/emu/inpttype.ipp:176
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong E"
+msgid "%p Mahjong C"
 msgstr ""
 
-#: src/emu/inpttype.ipp:61
+#: src/emu/inpttype.ipp:59 src/emu/inpttype.ipp:177
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong F"
+msgid "%p Mahjong D"
 msgstr ""
 
-#: src/emu/inpttype.ipp:62
+#: src/emu/inpttype.ipp:60 src/emu/inpttype.ipp:178
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong G"
+msgid "%p Mahjong E"
 msgstr ""
 
-#: src/emu/inpttype.ipp:63
+#: src/emu/inpttype.ipp:61 src/emu/inpttype.ipp:179
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong H"
+msgid "%p Mahjong F"
 msgstr ""
 
-#: src/emu/inpttype.ipp:64
+#: src/emu/inpttype.ipp:62 src/emu/inpttype.ipp:180
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong I"
+msgid "%p Mahjong G"
 msgstr ""
 
-#: src/emu/inpttype.ipp:65
+#: src/emu/inpttype.ipp:63 src/emu/inpttype.ipp:181
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong J"
+msgid "%p Mahjong H"
 msgstr ""
 
-#: src/emu/inpttype.ipp:66
+#: src/emu/inpttype.ipp:64 src/emu/inpttype.ipp:182
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong K"
+msgid "%p Mahjong I"
 msgstr ""
 
-#: src/emu/inpttype.ipp:67
+#: src/emu/inpttype.ipp:65 src/emu/inpttype.ipp:183
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong L"
+msgid "%p Mahjong J"
 msgstr ""
 
-#: src/emu/inpttype.ipp:68
+#: src/emu/inpttype.ipp:66 src/emu/inpttype.ipp:184
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong M"
+msgid "%p Mahjong K"
 msgstr ""
 
-#: src/emu/inpttype.ipp:69
+#: src/emu/inpttype.ipp:67 src/emu/inpttype.ipp:185
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong N"
+msgid "%p Mahjong L"
 msgstr ""
 
-#: src/emu/inpttype.ipp:70
+#: src/emu/inpttype.ipp:68 src/emu/inpttype.ipp:186
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong O"
+msgid "%p Mahjong M"
 msgstr ""
 
-#: src/emu/inpttype.ipp:71
+#: src/emu/inpttype.ipp:69 src/emu/inpttype.ipp:187
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong P"
+msgid "%p Mahjong N"
 msgstr ""
 
-#: src/emu/inpttype.ipp:72
+#: src/emu/inpttype.ipp:70 src/emu/inpttype.ipp:188
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Q"
+msgid "%p Mahjong O"
 msgstr ""
 
-#: src/emu/inpttype.ipp:73
+#: src/emu/inpttype.ipp:71 src/emu/inpttype.ipp:189
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Kan"
+msgid "%p Mahjong P"
 msgstr ""
 
-#: src/emu/inpttype.ipp:74
+#: src/emu/inpttype.ipp:72 src/emu/inpttype.ipp:190
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Pon"
+msgid "%p Mahjong Q"
 msgstr ""
 
-#: src/emu/inpttype.ipp:75
+#: src/emu/inpttype.ipp:73 src/emu/inpttype.ipp:191
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Chi"
+msgid "%p Mahjong Kan"
 msgstr ""
 
-#: src/emu/inpttype.ipp:76
+#: src/emu/inpttype.ipp:74 src/emu/inpttype.ipp:192
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Reach"
+msgid "%p Mahjong Pon"
 msgstr ""
 
-#: src/emu/inpttype.ipp:77
+#: src/emu/inpttype.ipp:75 src/emu/inpttype.ipp:193
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Ron"
+msgid "%p Mahjong Chi"
 msgstr ""
 
-#: src/emu/inpttype.ipp:78
+#: src/emu/inpttype.ipp:76 src/emu/inpttype.ipp:194
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Flip Flop"
+msgid "%p Mahjong Reach"
 msgstr ""
 
-#: src/emu/inpttype.ipp:79
+#: src/emu/inpttype.ipp:77 src/emu/inpttype.ipp:195
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Bet"
+msgid "%p Mahjong Ron"
 msgstr ""
 
-#: src/emu/inpttype.ipp:80
+#: src/emu/inpttype.ipp:78 src/emu/inpttype.ipp:200
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Take Score"
+msgid "%p Mahjong Flip Flop"
 msgstr ""
 
-#: src/emu/inpttype.ipp:81
+#: src/emu/inpttype.ipp:79 src/emu/inpttype.ipp:196
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Double Up"
+msgid "%p Mahjong Bet"
 msgstr ""
 
-#: src/emu/inpttype.ipp:82
+#: src/emu/inpttype.ipp:80 src/emu/inpttype.ipp:198
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Big"
+msgid "%p Mahjong Take Score"
 msgstr ""
 
-#: src/emu/inpttype.ipp:83
+#: src/emu/inpttype.ipp:81 src/emu/inpttype.ipp:199
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Small"
+msgid "%p Mahjong Double Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:84
+#: src/emu/inpttype.ipp:82 src/emu/inpttype.ipp:201
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Last Chance"
+msgid "%p Mahjong Big"
 msgstr ""
 
-#: src/emu/inpttype.ipp:89
+#: src/emu/inpttype.ipp:83 src/emu/inpttype.ipp:202
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda A/1"
+msgid "%p Mahjong Small"
 msgstr ""
 
-#: src/emu/inpttype.ipp:90
+#: src/emu/inpttype.ipp:84 src/emu/inpttype.ipp:197
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda B/2"
+msgid "%p Mahjong Last Chance"
 msgstr ""
 
-#: src/emu/inpttype.ipp:91
+#: src/emu/inpttype.ipp:89 src/emu/inpttype.ipp:207
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda C/3"
+msgid "%p Hanafuda A/1"
 msgstr ""
 
-#: src/emu/inpttype.ipp:92
+#: src/emu/inpttype.ipp:90 src/emu/inpttype.ipp:208
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda D/4"
+msgid "%p Hanafuda B/2"
 msgstr ""
 
-#: src/emu/inpttype.ipp:93
+#: src/emu/inpttype.ipp:91 src/emu/inpttype.ipp:209
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda E/5"
+msgid "%p Hanafuda C/3"
 msgstr ""
 
-#: src/emu/inpttype.ipp:94
+#: src/emu/inpttype.ipp:92 src/emu/inpttype.ipp:210
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda F/6"
+msgid "%p Hanafuda D/4"
 msgstr ""
 
-#: src/emu/inpttype.ipp:95
+#: src/emu/inpttype.ipp:93 src/emu/inpttype.ipp:211
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda G/7"
+msgid "%p Hanafuda E/5"
 msgstr ""
 
-#: src/emu/inpttype.ipp:96
+#: src/emu/inpttype.ipp:94 src/emu/inpttype.ipp:212
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda H/8"
+msgid "%p Hanafuda F/6"
 msgstr ""
 
-#: src/emu/inpttype.ipp:97
+#: src/emu/inpttype.ipp:95 src/emu/inpttype.ipp:213
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda Yes"
+msgid "%p Hanafuda G/7"
 msgstr ""
 
-#: src/emu/inpttype.ipp:98
+#: src/emu/inpttype.ipp:96 src/emu/inpttype.ipp:214
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda No"
+msgid "%p Hanafuda H/8"
+msgstr ""
+
+#: src/emu/inpttype.ipp:97 src/emu/inpttype.ipp:215
+#, c-format
+msgctxt "input-name"
+msgid "%p Hanafuda Yes"
+msgstr ""
+
+#: src/emu/inpttype.ipp:98 src/emu/inpttype.ipp:216
+#, c-format
+msgctxt "input-name"
+msgid "%p Hanafuda No"
 msgstr ""
 
 #: src/emu/inpttype.ipp:103
@@ -3752,1551 +3926,6 @@ msgctxt "input-name"
 msgid "Stop All Reels"
 msgstr ""
 
-#: src/emu/inpttype.ipp:140
-msgctxt "input-name"
-msgid "P2 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:141
-msgctxt "input-name"
-msgid "P2 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:142
-msgctxt "input-name"
-msgid "P2 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:143
-msgctxt "input-name"
-msgid "P2 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:144
-msgctxt "input-name"
-msgid "P2 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:145
-msgctxt "input-name"
-msgid "P2 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:146
-msgctxt "input-name"
-msgid "P2 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:147
-msgctxt "input-name"
-msgid "P2 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:148
-msgctxt "input-name"
-msgid "P2 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:149
-msgctxt "input-name"
-msgid "P2 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:150
-msgctxt "input-name"
-msgid "P2 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:151
-msgctxt "input-name"
-msgid "P2 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:152
-msgctxt "input-name"
-msgid "P2 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:153
-msgctxt "input-name"
-msgid "P2 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:154
-msgctxt "input-name"
-msgid "P2 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:155
-msgctxt "input-name"
-msgid "P2 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:156
-msgctxt "input-name"
-msgid "P2 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:157
-msgctxt "input-name"
-msgid "P2 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:158
-msgctxt "input-name"
-msgid "P2 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:159
-msgctxt "input-name"
-msgid "P2 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:160
-msgctxt "input-name"
-msgid "P2 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:161
-msgctxt "input-name"
-msgid "P2 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:162
-msgctxt "input-name"
-msgid "P2 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:163
-msgctxt "input-name"
-msgid "P2 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:164
-msgctxt "input-name"
-msgid "P2 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:165
-msgctxt "input-name"
-msgid "P2 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:166
-msgctxt "input-name"
-msgid "P2 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:167
-msgctxt "input-name"
-msgid "P2 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:168
-msgctxt "input-name"
-msgid "P2 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:169
-msgctxt "input-name"
-msgid "P2 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:174
-msgctxt "input-name"
-msgid "P2 Mahjong A"
-msgstr ""
-
-#: src/emu/inpttype.ipp:175
-msgctxt "input-name"
-msgid "P2 Mahjong B"
-msgstr ""
-
-#: src/emu/inpttype.ipp:176
-msgctxt "input-name"
-msgid "P2 Mahjong C"
-msgstr ""
-
-#: src/emu/inpttype.ipp:177
-msgctxt "input-name"
-msgid "P2 Mahjong D"
-msgstr ""
-
-#: src/emu/inpttype.ipp:178
-msgctxt "input-name"
-msgid "P2 Mahjong E"
-msgstr ""
-
-#: src/emu/inpttype.ipp:179
-msgctxt "input-name"
-msgid "P2 Mahjong F"
-msgstr ""
-
-#: src/emu/inpttype.ipp:180
-msgctxt "input-name"
-msgid "P2 Mahjong G"
-msgstr ""
-
-#: src/emu/inpttype.ipp:181
-msgctxt "input-name"
-msgid "P2 Mahjong H"
-msgstr ""
-
-#: src/emu/inpttype.ipp:182
-msgctxt "input-name"
-msgid "P2 Mahjong I"
-msgstr ""
-
-#: src/emu/inpttype.ipp:183
-msgctxt "input-name"
-msgid "P2 Mahjong J"
-msgstr ""
-
-#: src/emu/inpttype.ipp:184
-msgctxt "input-name"
-msgid "P2 Mahjong K"
-msgstr ""
-
-#: src/emu/inpttype.ipp:185
-msgctxt "input-name"
-msgid "P2 Mahjong L"
-msgstr ""
-
-#: src/emu/inpttype.ipp:186
-msgctxt "input-name"
-msgid "P2 Mahjong M"
-msgstr ""
-
-#: src/emu/inpttype.ipp:187
-msgctxt "input-name"
-msgid "P2 Mahjong N"
-msgstr ""
-
-#: src/emu/inpttype.ipp:188
-msgctxt "input-name"
-msgid "P2 Mahjong O"
-msgstr ""
-
-#: src/emu/inpttype.ipp:189
-msgctxt "input-name"
-msgid "P2 Mahjong P"
-msgstr ""
-
-#: src/emu/inpttype.ipp:190
-msgctxt "input-name"
-msgid "P2 Mahjong Q"
-msgstr ""
-
-#: src/emu/inpttype.ipp:191
-msgctxt "input-name"
-msgid "P2 Mahjong Kan"
-msgstr ""
-
-#: src/emu/inpttype.ipp:192
-msgctxt "input-name"
-msgid "P2 Mahjong Pon"
-msgstr ""
-
-#: src/emu/inpttype.ipp:193
-msgctxt "input-name"
-msgid "P2 Mahjong Chi"
-msgstr ""
-
-#: src/emu/inpttype.ipp:194
-msgctxt "input-name"
-msgid "P2 Mahjong Reach"
-msgstr ""
-
-#: src/emu/inpttype.ipp:195
-msgctxt "input-name"
-msgid "P2 Mahjong Ron"
-msgstr ""
-
-#: src/emu/inpttype.ipp:196
-msgctxt "input-name"
-msgid "P2 Mahjong Bet"
-msgstr ""
-
-#: src/emu/inpttype.ipp:197
-msgctxt "input-name"
-msgid "P2 Mahjong Last Chance"
-msgstr ""
-
-#: src/emu/inpttype.ipp:198
-msgctxt "input-name"
-msgid "P2 Mahjong Take Score"
-msgstr ""
-
-#: src/emu/inpttype.ipp:199
-msgctxt "input-name"
-msgid "P2 Mahjong Double Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:200
-msgctxt "input-name"
-msgid "P2 Mahjong Flip Flop"
-msgstr ""
-
-#: src/emu/inpttype.ipp:201
-msgctxt "input-name"
-msgid "P2 Mahjong Big"
-msgstr ""
-
-#: src/emu/inpttype.ipp:202
-msgctxt "input-name"
-msgid "P2 Mahjong Small"
-msgstr ""
-
-#: src/emu/inpttype.ipp:207
-msgctxt "input-name"
-msgid "P2 Hanafuda A/1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:208
-msgctxt "input-name"
-msgid "P2 Hanafuda B/2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:209
-msgctxt "input-name"
-msgid "P2 Hanafuda C/3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:210
-msgctxt "input-name"
-msgid "P2 Hanafuda D/4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:211
-msgctxt "input-name"
-msgid "P2 Hanafuda E/5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:212
-msgctxt "input-name"
-msgid "P2 Hanafuda F/6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:213
-msgctxt "input-name"
-msgid "P2 Hanafuda G/7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:214
-msgctxt "input-name"
-msgid "P2 Hanafuda H/8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:215
-msgctxt "input-name"
-msgid "P2 Hanafuda Yes"
-msgstr ""
-
-#: src/emu/inpttype.ipp:216
-msgctxt "input-name"
-msgid "P2 Hanafuda No"
-msgstr ""
-
-#: src/emu/inpttype.ipp:221
-msgctxt "input-name"
-msgid "P3 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:222
-msgctxt "input-name"
-msgid "P3 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:223
-msgctxt "input-name"
-msgid "P3 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:224
-msgctxt "input-name"
-msgid "P3 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:225
-msgctxt "input-name"
-msgid "P3 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:226
-msgctxt "input-name"
-msgid "P3 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:227
-msgctxt "input-name"
-msgid "P3 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:228
-msgctxt "input-name"
-msgid "P3 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:229
-msgctxt "input-name"
-msgid "P3 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:230
-msgctxt "input-name"
-msgid "P3 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:231
-msgctxt "input-name"
-msgid "P3 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:232
-msgctxt "input-name"
-msgid "P3 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:233
-msgctxt "input-name"
-msgid "P3 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:234
-msgctxt "input-name"
-msgid "P3 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:235
-msgctxt "input-name"
-msgid "P3 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:236
-msgctxt "input-name"
-msgid "P3 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:237
-msgctxt "input-name"
-msgid "P3 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:238
-msgctxt "input-name"
-msgid "P3 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:239
-msgctxt "input-name"
-msgid "P3 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:240
-msgctxt "input-name"
-msgid "P3 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:241
-msgctxt "input-name"
-msgid "P3 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:242
-msgctxt "input-name"
-msgid "P3 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:243
-msgctxt "input-name"
-msgid "P3 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:244
-msgctxt "input-name"
-msgid "P3 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:245
-msgctxt "input-name"
-msgid "P3 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:246
-msgctxt "input-name"
-msgid "P3 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:247
-msgctxt "input-name"
-msgid "P3 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:248
-msgctxt "input-name"
-msgid "P3 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:249
-msgctxt "input-name"
-msgid "P3 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:250
-msgctxt "input-name"
-msgid "P3 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:255
-msgctxt "input-name"
-msgid "P4 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:256
-msgctxt "input-name"
-msgid "P4 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:257
-msgctxt "input-name"
-msgid "P4 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:258
-msgctxt "input-name"
-msgid "P4 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:259
-msgctxt "input-name"
-msgid "P4 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:260
-msgctxt "input-name"
-msgid "P4 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:261
-msgctxt "input-name"
-msgid "P4 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:262
-msgctxt "input-name"
-msgid "P4 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:263
-msgctxt "input-name"
-msgid "P4 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:264
-msgctxt "input-name"
-msgid "P4 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:265
-msgctxt "input-name"
-msgid "P4 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:266
-msgctxt "input-name"
-msgid "P4 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:267
-msgctxt "input-name"
-msgid "P4 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:268
-msgctxt "input-name"
-msgid "P4 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:269
-msgctxt "input-name"
-msgid "P4 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:270
-msgctxt "input-name"
-msgid "P4 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:271
-msgctxt "input-name"
-msgid "P4 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:272
-msgctxt "input-name"
-msgid "P4 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:273
-msgctxt "input-name"
-msgid "P4 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:274
-msgctxt "input-name"
-msgid "P4 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:275
-msgctxt "input-name"
-msgid "P4 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:276
-msgctxt "input-name"
-msgid "P4 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:277
-msgctxt "input-name"
-msgid "P4 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:278
-msgctxt "input-name"
-msgid "P4 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:279
-msgctxt "input-name"
-msgid "P4 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:280
-msgctxt "input-name"
-msgid "P4 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:281
-msgctxt "input-name"
-msgid "P4 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:282
-msgctxt "input-name"
-msgid "P4 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:283
-msgctxt "input-name"
-msgid "P4 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:284
-msgctxt "input-name"
-msgid "P4 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:289
-msgctxt "input-name"
-msgid "P5 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:290
-msgctxt "input-name"
-msgid "P5 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:291
-msgctxt "input-name"
-msgid "P5 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:292
-msgctxt "input-name"
-msgid "P5 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:293
-msgctxt "input-name"
-msgid "P5 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:294
-msgctxt "input-name"
-msgid "P5 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:295
-msgctxt "input-name"
-msgid "P5 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:296
-msgctxt "input-name"
-msgid "P5 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:297
-msgctxt "input-name"
-msgid "P5 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:298
-msgctxt "input-name"
-msgid "P5 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:299
-msgctxt "input-name"
-msgid "P5 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:300
-msgctxt "input-name"
-msgid "P5 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:301
-msgctxt "input-name"
-msgid "P5 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:302
-msgctxt "input-name"
-msgid "P5 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:303
-msgctxt "input-name"
-msgid "P5 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:304
-msgctxt "input-name"
-msgid "P5 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:305
-msgctxt "input-name"
-msgid "P5 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:306
-msgctxt "input-name"
-msgid "P5 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:307
-msgctxt "input-name"
-msgid "P5 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:308
-msgctxt "input-name"
-msgid "P5 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:309
-msgctxt "input-name"
-msgid "P5 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:310
-msgctxt "input-name"
-msgid "P5 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:311
-msgctxt "input-name"
-msgid "P5 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:312
-msgctxt "input-name"
-msgid "P5 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:313
-msgctxt "input-name"
-msgid "P5 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:314
-msgctxt "input-name"
-msgid "P5 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:315
-msgctxt "input-name"
-msgid "P5 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:316
-msgctxt "input-name"
-msgid "P5 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:317
-msgctxt "input-name"
-msgid "P5 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:318
-msgctxt "input-name"
-msgid "P5 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:323
-msgctxt "input-name"
-msgid "P6 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:324
-msgctxt "input-name"
-msgid "P6 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:325
-msgctxt "input-name"
-msgid "P6 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:326
-msgctxt "input-name"
-msgid "P6 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:327
-msgctxt "input-name"
-msgid "P6 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:328
-msgctxt "input-name"
-msgid "P6 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:329
-msgctxt "input-name"
-msgid "P6 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:330
-msgctxt "input-name"
-msgid "P6 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:331
-msgctxt "input-name"
-msgid "P6 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:332
-msgctxt "input-name"
-msgid "P6 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:333
-msgctxt "input-name"
-msgid "P6 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:334
-msgctxt "input-name"
-msgid "P6 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:335
-msgctxt "input-name"
-msgid "P6 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:336
-msgctxt "input-name"
-msgid "P6 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:337
-msgctxt "input-name"
-msgid "P6 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:338
-msgctxt "input-name"
-msgid "P6 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:339
-msgctxt "input-name"
-msgid "P6 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:340
-msgctxt "input-name"
-msgid "P6 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:341
-msgctxt "input-name"
-msgid "P6 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:342
-msgctxt "input-name"
-msgid "P6 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:343
-msgctxt "input-name"
-msgid "P6 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:344
-msgctxt "input-name"
-msgid "P6 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:345
-msgctxt "input-name"
-msgid "P6 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:346
-msgctxt "input-name"
-msgid "P6 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:347
-msgctxt "input-name"
-msgid "P6 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:348
-msgctxt "input-name"
-msgid "P6 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:349
-msgctxt "input-name"
-msgid "P6 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:350
-msgctxt "input-name"
-msgid "P6 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:351
-msgctxt "input-name"
-msgid "P6 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:352
-msgctxt "input-name"
-msgid "P6 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:357
-msgctxt "input-name"
-msgid "P7 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:358
-msgctxt "input-name"
-msgid "P7 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:359
-msgctxt "input-name"
-msgid "P7 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:360
-msgctxt "input-name"
-msgid "P7 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:361
-msgctxt "input-name"
-msgid "P7 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:362
-msgctxt "input-name"
-msgid "P7 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:363
-msgctxt "input-name"
-msgid "P7 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:364
-msgctxt "input-name"
-msgid "P7 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:365
-msgctxt "input-name"
-msgid "P7 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:366
-msgctxt "input-name"
-msgid "P7 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:367
-msgctxt "input-name"
-msgid "P7 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:368
-msgctxt "input-name"
-msgid "P7 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:369
-msgctxt "input-name"
-msgid "P7 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:370
-msgctxt "input-name"
-msgid "P7 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:371
-msgctxt "input-name"
-msgid "P7 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:372
-msgctxt "input-name"
-msgid "P7 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:373
-msgctxt "input-name"
-msgid "P7 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:374
-msgctxt "input-name"
-msgid "P7 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:375
-msgctxt "input-name"
-msgid "P7 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:376
-msgctxt "input-name"
-msgid "P7 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:377
-msgctxt "input-name"
-msgid "P7 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:378
-msgctxt "input-name"
-msgid "P7 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:379
-msgctxt "input-name"
-msgid "P7 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:380
-msgctxt "input-name"
-msgid "P7 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:381
-msgctxt "input-name"
-msgid "P7 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:382
-msgctxt "input-name"
-msgid "P7 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:383
-msgctxt "input-name"
-msgid "P7 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:384
-msgctxt "input-name"
-msgid "P7 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:385
-msgctxt "input-name"
-msgid "P7 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:386
-msgctxt "input-name"
-msgid "P7 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:391
-msgctxt "input-name"
-msgid "P8 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:392
-msgctxt "input-name"
-msgid "P8 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:393
-msgctxt "input-name"
-msgid "P8 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:394
-msgctxt "input-name"
-msgid "P8 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:395
-msgctxt "input-name"
-msgid "P8 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:396
-msgctxt "input-name"
-msgid "P8 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:397
-msgctxt "input-name"
-msgid "P8 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:398
-msgctxt "input-name"
-msgid "P8 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:399
-msgctxt "input-name"
-msgid "P8 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:400
-msgctxt "input-name"
-msgid "P8 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:401
-msgctxt "input-name"
-msgid "P8 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:402
-msgctxt "input-name"
-msgid "P8 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:403
-msgctxt "input-name"
-msgid "P8 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:404
-msgctxt "input-name"
-msgid "P8 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:405
-msgctxt "input-name"
-msgid "P8 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:406
-msgctxt "input-name"
-msgid "P8 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:407
-msgctxt "input-name"
-msgid "P8 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:408
-msgctxt "input-name"
-msgid "P8 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:409
-msgctxt "input-name"
-msgid "P8 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:410
-msgctxt "input-name"
-msgid "P8 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:411
-msgctxt "input-name"
-msgid "P8 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:412
-msgctxt "input-name"
-msgid "P8 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:413
-msgctxt "input-name"
-msgid "P8 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:414
-msgctxt "input-name"
-msgid "P8 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:415
-msgctxt "input-name"
-msgid "P8 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:416
-msgctxt "input-name"
-msgid "P8 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:417
-msgctxt "input-name"
-msgid "P8 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:418
-msgctxt "input-name"
-msgid "P8 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:419
-msgctxt "input-name"
-msgid "P8 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:420
-msgctxt "input-name"
-msgid "P8 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:425
-msgctxt "input-name"
-msgid "P9 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:426
-msgctxt "input-name"
-msgid "P9 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:427
-msgctxt "input-name"
-msgid "P9 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:428
-msgctxt "input-name"
-msgid "P9 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:429
-msgctxt "input-name"
-msgid "P9 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:430
-msgctxt "input-name"
-msgid "P9 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:431
-msgctxt "input-name"
-msgid "P9 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:432
-msgctxt "input-name"
-msgid "P9 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:433
-msgctxt "input-name"
-msgid "P9 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:434
-msgctxt "input-name"
-msgid "P9 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:435
-msgctxt "input-name"
-msgid "P9 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:436
-msgctxt "input-name"
-msgid "P9 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:437
-msgctxt "input-name"
-msgid "P9 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:438
-msgctxt "input-name"
-msgid "P9 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:439
-msgctxt "input-name"
-msgid "P9 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:440
-msgctxt "input-name"
-msgid "P9 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:441
-msgctxt "input-name"
-msgid "P9 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:442
-msgctxt "input-name"
-msgid "P9 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:443
-msgctxt "input-name"
-msgid "P9 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:444
-msgctxt "input-name"
-msgid "P9 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:445
-msgctxt "input-name"
-msgid "P9 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:446
-msgctxt "input-name"
-msgid "P9 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:447
-msgctxt "input-name"
-msgid "P9 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:448
-msgctxt "input-name"
-msgid "P9 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:449
-msgctxt "input-name"
-msgid "P9 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:450
-msgctxt "input-name"
-msgid "P9 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:451
-msgctxt "input-name"
-msgid "P9 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:452
-msgctxt "input-name"
-msgid "P9 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:453
-msgctxt "input-name"
-msgid "P9 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:454
-msgctxt "input-name"
-msgid "P9 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:459
-msgctxt "input-name"
-msgid "P10 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:460
-msgctxt "input-name"
-msgid "P10 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:461
-msgctxt "input-name"
-msgid "P10 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:462
-msgctxt "input-name"
-msgid "P10 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:463
-msgctxt "input-name"
-msgid "P10 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:464
-msgctxt "input-name"
-msgid "P10 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:465
-msgctxt "input-name"
-msgid "P10 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:466
-msgctxt "input-name"
-msgid "P10 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:467
-msgctxt "input-name"
-msgid "P10 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:468
-msgctxt "input-name"
-msgid "P10 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:469
-msgctxt "input-name"
-msgid "P10 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:470
-msgctxt "input-name"
-msgid "P10 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:471
-msgctxt "input-name"
-msgid "P10 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:472
-msgctxt "input-name"
-msgid "P10 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:473
-msgctxt "input-name"
-msgid "P10 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:474
-msgctxt "input-name"
-msgid "P10 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:475
-msgctxt "input-name"
-msgid "P10 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:476
-msgctxt "input-name"
-msgid "P10 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:477
-msgctxt "input-name"
-msgid "P10 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:478
-msgctxt "input-name"
-msgid "P10 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:479
-msgctxt "input-name"
-msgid "P10 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:480
-msgctxt "input-name"
-msgid "P10 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:481
-msgctxt "input-name"
-msgid "P10 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:482
-msgctxt "input-name"
-msgid "P10 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:483
-msgctxt "input-name"
-msgid "P10 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:484
-msgctxt "input-name"
-msgid "P10 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:485
-msgctxt "input-name"
-msgid "P10 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:486
-msgctxt "input-name"
-msgid "P10 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:487
-msgctxt "input-name"
-msgid "P10 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:488
-msgctxt "input-name"
-msgid "P10 Select"
-msgstr ""
-
 #: src/emu/inpttype.ipp:493
 msgctxt "input-name"
 msgid "1 Player Start"
@@ -5477,154 +4106,31 @@ msgctxt "input-name"
 msgid "Volume Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:550
-msgctxt "input-name"
-msgid "P1 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:551
-msgctxt "input-name"
-msgid "P2 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:552
-msgctxt "input-name"
-msgid "P3 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:553
-msgctxt "input-name"
-msgid "P4 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:554
-msgctxt "input-name"
-msgid "P5 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:555
-msgctxt "input-name"
-msgid "P6 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:556
-msgctxt "input-name"
-msgid "P7 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:557
-msgctxt "input-name"
-msgid "P8 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:558
-msgctxt "input-name"
-msgid "P9 Pedal 1"
-msgstr ""
-
+#: src/emu/inpttype.ipp:550 src/emu/inpttype.ipp:551 src/emu/inpttype.ipp:552
+#: src/emu/inpttype.ipp:553 src/emu/inpttype.ipp:554 src/emu/inpttype.ipp:555
+#: src/emu/inpttype.ipp:556 src/emu/inpttype.ipp:557 src/emu/inpttype.ipp:558
 #: src/emu/inpttype.ipp:559
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:564
-msgctxt "input-name"
-msgid "P1 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:565
-msgctxt "input-name"
-msgid "P2 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:566
-msgctxt "input-name"
-msgid "P3 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:567
-msgctxt "input-name"
-msgid "P4 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:568
-msgctxt "input-name"
-msgid "P5 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:569
-msgctxt "input-name"
-msgid "P6 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:570
-msgctxt "input-name"
-msgid "P7 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:571
-msgctxt "input-name"
-msgid "P8 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:572
-msgctxt "input-name"
-msgid "P9 Pedal 2"
+msgid "%p Pedal 1"
 msgstr ""
 
+#: src/emu/inpttype.ipp:564 src/emu/inpttype.ipp:565 src/emu/inpttype.ipp:566
+#: src/emu/inpttype.ipp:567 src/emu/inpttype.ipp:568 src/emu/inpttype.ipp:569
+#: src/emu/inpttype.ipp:570 src/emu/inpttype.ipp:571 src/emu/inpttype.ipp:572
 #: src/emu/inpttype.ipp:573
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:578
-msgctxt "input-name"
-msgid "P1 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:579
-msgctxt "input-name"
-msgid "P2 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:580
-msgctxt "input-name"
-msgid "P3 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:581
-msgctxt "input-name"
-msgid "P4 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:582
-msgctxt "input-name"
-msgid "P5 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:583
-msgctxt "input-name"
-msgid "P6 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:584
-msgctxt "input-name"
-msgid "P7 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:585
-msgctxt "input-name"
-msgid "P8 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:586
-msgctxt "input-name"
-msgid "P9 Pedal 3"
+msgid "%p Pedal 2"
 msgstr ""
 
+#: src/emu/inpttype.ipp:578 src/emu/inpttype.ipp:579 src/emu/inpttype.ipp:580
+#: src/emu/inpttype.ipp:581 src/emu/inpttype.ipp:582 src/emu/inpttype.ipp:583
+#: src/emu/inpttype.ipp:584 src/emu/inpttype.ipp:585 src/emu/inpttype.ipp:586
 #: src/emu/inpttype.ipp:587
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 3"
+msgid "%p Pedal 3"
 msgstr ""
 
 #: src/emu/inpttype.ipp:592
diff --git a/language/Belarusian/strings.po b/language/Belarusian/strings.po
index 0b99a1bce5a..ef6b19e0c72 100644
--- a/language/Belarusian/strings.po
+++ b/language/Belarusian/strings.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-19 02:50+1100\n"
+"POT-Creation-Date: 2021-12-09 04:44+1100\n"
 "PO-Revision-Date: 2016-02-20 18:03+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: MAME Language Team\n"
@@ -262,12 +262,12 @@ msgstr ""
 msgid "Driver: \"%1$s\" software list "
 msgstr ""
 
-#: src/frontend/mame/ui/selsoft.cpp:711 src/frontend/mame/ui/selgame.cpp:1066
+#: src/frontend/mame/ui/selsoft.cpp:711 src/frontend/mame/ui/selgame.cpp:1076
 #, c-format
 msgid "%1$s: %2$s - Search: %3$s_"
 msgstr ""
 
-#: src/frontend/mame/ui/selsoft.cpp:713 src/frontend/mame/ui/selgame.cpp:1068
+#: src/frontend/mame/ui/selsoft.cpp:713 src/frontend/mame/ui/selgame.cpp:1078
 #, c-format
 msgid "Search: %1$s_"
 msgstr ""
@@ -277,7 +277,7 @@ msgstr ""
 msgid "Software list/item: %1$s:%2$s"
 msgstr ""
 
-#: src/frontend/mame/ui/optsmenu.cpp:73 src/frontend/mame/ui/sndmenu.cpp:165
+#: src/frontend/mame/ui/optsmenu.cpp:73 src/frontend/mame/ui/sndmenu.cpp:161
 msgid "Sound Options"
 msgstr ""
 
@@ -372,11 +372,11 @@ msgid "Show mouse pointer"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:39
-msgid "Confirm quit from machines"
+msgid "Confirm quit from emulation"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:40
-msgid "Skip information screen at startup"
+msgid "Skip system information screen"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:41
@@ -392,7 +392,7 @@ msgid "Skip BIOS selection menu"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:44
-msgid "Skip software parts selection menu"
+msgid "Skip software part selection menu"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:45
@@ -544,7 +544,7 @@ msgid "UI active"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:91
-msgid "Offscreen reload"
+msgid "Off-screen reload"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:92
@@ -560,7 +560,7 @@ msgid "Natural keyboard"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:95
-msgid "Simultaneous contradictory"
+msgid "Allow contradictory joystick inputs"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:96
@@ -584,7 +584,7 @@ msgid "Pedal Device Assignment"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:106
-msgid "Adstick Device Assignment"
+msgid "AD Stick Device Assignment"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:107
@@ -671,14 +671,14 @@ msgstr ""
 msgid "Wait Vertical Sync"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:687
+#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:689
 #: src/frontend/mame/ui/videoopt.cpp:191 src/frontend/mame/ui/custui.cpp:490
 #: src/frontend/mame/ui/analogipt.cpp:471 plugins/cheatfind/init.lua:766
 #: plugins/cheatfind/init.lua:777 plugins/cheat/init.lua:668
 msgid "On"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:690
+#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:692
 #: src/frontend/mame/ui/videoopt.cpp:207 src/frontend/mame/ui/custui.cpp:490
 #: src/frontend/mame/ui/analogipt.cpp:471 plugins/cheatfind/init.lua:763
 #: plugins/cheatfind/init.lua:774 plugins/cheat/init.lua:671
@@ -686,11 +686,11 @@ msgstr ""
 msgid "Off"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:693
+#: src/frontend/mame/ui/menu.cpp:695
 msgid "Auto"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:1195
+#: src/frontend/mame/ui/menu.cpp:1197
 #: src/frontend/mame/ui/simpleselgame.cpp:278
 #: src/frontend/mame/ui/selmenu.cpp:1280
 msgid "Return to Previous Menu"
@@ -698,7 +698,7 @@ msgstr ""
 
 #: src/frontend/mame/ui/filemngr.cpp:139
 #: src/frontend/mame/ui/confswitch.cpp:119
-#: src/frontend/mame/ui/inputmap.cpp:559 src/frontend/mame/ui/analogipt.cpp:360
+#: src/frontend/mame/ui/inputmap.cpp:563 src/frontend/mame/ui/analogipt.cpp:360
 #, c-format
 msgid "[root%1$s]"
 msgstr ""
@@ -941,22 +941,22 @@ msgid ""
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "GHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "MHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "kHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "Hz"
 msgstr ""
 
@@ -980,38 +980,38 @@ msgstr ""
 msgid "Vector"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:480
+#: src/frontend/mame/ui/info.cpp:483
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:480
+#: src/frontend/mame/ui/info.cpp:483
 msgid "%2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:497
+#: src/frontend/mame/ui/info.cpp:500
 #, c-format
 msgid "Screen '%1$s'"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:499
+#: src/frontend/mame/ui/info.cpp:502
 msgid "Screen"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:570 src/frontend/mame/ui/info.cpp:581
+#: src/frontend/mame/ui/info.cpp:573 src/frontend/mame/ui/info.cpp:584
 #, c-format
 msgid "%1$s:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:662
+#: src/frontend/mame/ui/info.cpp:665
 msgid "Not supported"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:665
+#: src/frontend/mame/ui/info.cpp:668
 msgid "Partially supported"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:674
+#: src/frontend/mame/ui/info.cpp:677
 msgid "[empty]"
 msgstr ""
 
@@ -1084,7 +1084,7 @@ msgid "Emulated"
 msgstr ""
 
 #: src/frontend/mame/ui/keyboard.cpp:59 src/frontend/mame/ui/confswitch.cpp:117
-#: src/frontend/mame/ui/inputmap.cpp:557 src/frontend/mame/ui/analogipt.cpp:358
+#: src/frontend/mame/ui/inputmap.cpp:561 src/frontend/mame/ui/analogipt.cpp:358
 #, c-format
 msgid "%1$s [root%2$s]"
 msgstr ""
@@ -1444,7 +1444,7 @@ msgctxt "swlist-info"
 msgid "Software list/item"
 msgstr ""
 
-#: src/frontend/mame/ui/datmenu.cpp:88 src/frontend/mame/ui/selmenu.cpp:2698
+#: src/frontend/mame/ui/datmenu.cpp:88 src/frontend/mame/ui/selmenu.cpp:2707
 msgid "Software List Info"
 msgstr ""
 
@@ -1559,7 +1559,7 @@ msgstr ""
 msgid "Configure Machine:"
 msgstr ""
 
-#: src/frontend/mame/ui/miscmenu.cpp:858 src/frontend/mame/ui/selmenu.cpp:2638
+#: src/frontend/mame/ui/miscmenu.cpp:858 src/frontend/mame/ui/selmenu.cpp:2647
 msgid " (default)"
 msgstr ""
 
@@ -1576,7 +1576,7 @@ msgid ""
 "Press %2$s to return to emulation"
 msgstr ""
 
-#: src/frontend/mame/ui/info_pty.cpp:30 src/frontend/mame/ui/mainmenu.cpp:155
+#: src/frontend/mame/ui/info_pty.cpp:30
 msgid "Pseudo terminals"
 msgstr ""
 
@@ -1644,52 +1644,52 @@ msgstr ""
 msgid "Other Controls"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:227
+#: src/frontend/mame/ui/inputmap.cpp:231
 msgid "This machine has no configurable inputs."
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:327
+#: src/frontend/mame/ui/inputmap.cpp:331
 msgid "Pressed"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:397
+#: src/frontend/mame/ui/inputmap.cpp:401
 msgid "Invalid sequence entered"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:542
+#: src/frontend/mame/ui/inputmap.cpp:546
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:543
+#: src/frontend/mame/ui/inputmap.cpp:547
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog Inc"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:544
+#: src/frontend/mame/ui/inputmap.cpp:548
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog Dec"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:586
+#: src/frontend/mame/ui/inputmap.cpp:590
 #, c-format
 msgid "Press %1$s to set\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:587
+#: src/frontend/mame/ui/inputmap.cpp:591
 #, c-format
 msgid "Press %1$s to append\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:588
+#: src/frontend/mame/ui/inputmap.cpp:592
 #, c-format
 msgid "Press %1$s to clear\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:589
+#: src/frontend/mame/ui/inputmap.cpp:593
 #, c-format
 msgid "Press %1$s to restore default\n"
 msgstr ""
@@ -1753,7 +1753,7 @@ msgid ""
 msgstr ""
 
 #: src/frontend/mame/ui/simpleselgame.cpp:273
-#: src/frontend/mame/ui/selgame.cpp:436
+#: src/frontend/mame/ui/selgame.cpp:443
 msgid "Configure Options"
 msgstr ""
 
@@ -2081,16 +2081,16 @@ msgstr ""
 msgid "Expand to fit"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:437
+#: src/frontend/mame/ui/selgame.cpp:444
 msgid "Configure Machine"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:1050
+#: src/frontend/mame/ui/selgame.cpp:1060
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d machines (%5$d BIOS) )"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:1078
+#: src/frontend/mame/ui/selgame.cpp:1088
 #, c-format
 msgid "System: %1$-.100s"
 msgstr ""
@@ -2112,7 +2112,7 @@ msgstr ""
 #: src/frontend/mame/ui/auditmenu.cpp:98
 #, c-format
 msgid ""
-"Auditing ROMs for machine %2$u of %3$u...\n"
+"Auditing media for machine %2$u of %3$u...\n"
 "%1$s"
 msgstr ""
 
@@ -2127,12 +2127,12 @@ msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:136
 #, c-format
-msgid "Audit ROMs for %1$u machines marked unavailable"
+msgid "Audit media for %1$u machines marked unavailable"
 msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:137
 #, c-format
-msgid "Audit ROMs for all %1$u machines"
+msgid "Audit media for all %1$u machines"
 msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:154
@@ -2338,84 +2338,84 @@ msgctxt "color-sample"
 msgid "Clone"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:914
+#: src/frontend/mame/ui/custui.cpp:906
 msgid "ARGB Settings"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:919 src/frontend/mame/ui/custui.cpp:922
+#: src/frontend/mame/ui/custui.cpp:911 src/frontend/mame/ui/custui.cpp:914
 msgctxt "color-channel"
 msgid "Alpha"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:927 src/frontend/mame/ui/custui.cpp:930
+#: src/frontend/mame/ui/custui.cpp:919 src/frontend/mame/ui/custui.cpp:922
 msgctxt "color-channel"
 msgid "Red"
 msgstr ""
 
+#: src/frontend/mame/ui/custui.cpp:927 src/frontend/mame/ui/custui.cpp:930
+msgctxt "color-channel"
+msgid "Green"
+msgstr ""
+
 #: src/frontend/mame/ui/custui.cpp:935 src/frontend/mame/ui/custui.cpp:938
 msgctxt "color-channel"
-msgid "Green"
-msgstr ""
-
-#: src/frontend/mame/ui/custui.cpp:943 src/frontend/mame/ui/custui.cpp:946
-msgctxt "color-channel"
 msgid "Blue"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:949
+#: src/frontend/mame/ui/custui.cpp:941
 msgid "Choose from palette"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:996
+#: src/frontend/mame/ui/custui.cpp:988
 msgid "Color preview:"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1093
+#: src/frontend/mame/ui/custui.cpp:1085
 msgctxt "color-preset"
 msgid "White"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1094
+#: src/frontend/mame/ui/custui.cpp:1086
 msgctxt "color-preset"
 msgid "Silver"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1095
+#: src/frontend/mame/ui/custui.cpp:1087
 msgctxt "color-preset"
 msgid "Gray"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1096
+#: src/frontend/mame/ui/custui.cpp:1088
 msgctxt "color-preset"
 msgid "Black"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1097
+#: src/frontend/mame/ui/custui.cpp:1089
 msgctxt "color-preset"
 msgid "Red"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1098
+#: src/frontend/mame/ui/custui.cpp:1090
 msgctxt "color-preset"
 msgid "Orange"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1099
+#: src/frontend/mame/ui/custui.cpp:1091
 msgctxt "color-preset"
 msgid "Yellow"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1100
+#: src/frontend/mame/ui/custui.cpp:1092
 msgctxt "color-preset"
 msgid "Green"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1101
+#: src/frontend/mame/ui/custui.cpp:1093
 msgctxt "color-preset"
 msgid "Blue"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1102
+#: src/frontend/mame/ui/custui.cpp:1094
 msgctxt "color-preset"
 msgid "Violet"
 msgstr ""
@@ -2480,7 +2480,7 @@ msgid "Input (general)"
 msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:123
-msgid "Input (this Machine)"
+msgid "Input (this machine)"
 msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:126
@@ -2519,6 +2519,10 @@ msgstr ""
 msgid "Tape Control"
 msgstr ""
 
+#: src/frontend/mame/ui/mainmenu.cpp:155
+msgid "Pseudo Terminals"
+msgstr ""
+
 #: src/frontend/mame/ui/mainmenu.cpp:158
 msgid "BIOS Selection"
 msgstr ""
@@ -2557,7 +2561,7 @@ msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:200
 #, c-format
-msgid "About %s"
+msgid "About %1$s"
 msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:212
@@ -2717,373 +2721,373 @@ msgstr ""
 msgid "%1$s %2$s"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2235
+#: src/frontend/mame/ui/selmenu.cpp:2244
 msgid "Images"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2236
+#: src/frontend/mame/ui/selmenu.cpp:2245
 msgid "Infos"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2551
+#: src/frontend/mame/ui/selmenu.cpp:2560
 msgid ""
 "Required ROM/disk images for the selected system are missing or incorrect. "
 "Please acquire the correct files or select a different system.\n"
 "\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2567
+#: src/frontend/mame/ui/selmenu.cpp:2576
 msgid ""
 "Required ROM/disk images for the selected software are missing or incorrect. "
 "Please acquire the correct files or select a different software item.\n"
 "\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2583
+#: src/frontend/mame/ui/selmenu.cpp:2592
 msgid "incorrect checksum"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2586
+#: src/frontend/mame/ui/selmenu.cpp:2595
 msgid "incorrect length"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2589
+#: src/frontend/mame/ui/selmenu.cpp:2598
 msgid "not found"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2600
+#: src/frontend/mame/ui/selmenu.cpp:2609
 #, c-format
 msgid "%1$s (%2$s) - %3$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2602
+#: src/frontend/mame/ui/selmenu.cpp:2611
 #, c-format
 msgid "%1$s - %2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2606
+#: src/frontend/mame/ui/selmenu.cpp:2615
 msgid "Press any key to continue."
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2735
+#: src/frontend/mame/ui/selmenu.cpp:2744
 msgid "General Info"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2887
-#, c-format
-msgid "Romset\t%1$s\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2888
-#, c-format
-msgid "Year\t%1$s\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2889
-#, c-format
-msgid "Manufacturer\t%1$s\n"
-msgstr ""
-
 #: src/frontend/mame/ui/selmenu.cpp:2896
 #, c-format
-msgid "Driver is Clone of\t%1$s\n"
+msgid "Romset\t%1$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2901
-msgid "Driver is Parent\t\n"
+#: src/frontend/mame/ui/selmenu.cpp:2897
+#, c-format
+msgid "Year\t%1$s\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2898
+#, c-format
+msgid "Manufacturer\t%1$s\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2905
-msgid "Analog Controls\tYes\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2907
-msgid "Keyboard Inputs\tYes\n"
+#, c-format
+msgid "Driver is Clone of\t%1$s\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2910
-msgid "Overall\tNOT WORKING\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2912
-msgid "Overall\tUnemulated Protection\n"
+msgid "Driver is Parent\t\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2914
-msgid "Overall\tWorking\n"
+msgid "Analog Controls\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2917
-msgid "Graphics\tUnimplemented\n"
+#: src/frontend/mame/ui/selmenu.cpp:2916
+msgid "Keyboard Inputs\tYes\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2919
-msgid "Graphics\tWrong Colors\n"
+msgid "Overall\tNOT WORKING\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2921
-msgid "Graphics\tImperfect Colors\n"
+msgid "Overall\tUnemulated Protection\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2923
-msgid "Graphics\tImperfect\n"
+msgid "Overall\tWorking\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2925
-msgid "Graphics\tOK\n"
+#: src/frontend/mame/ui/selmenu.cpp:2926
+msgid "Graphics\tUnimplemented\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2928
-msgid "Sound\tNone\n"
+msgid "Graphics\tWrong Colors\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2930
-msgid "Sound\tUnimplemented\n"
+msgid "Graphics\tImperfect Colors\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2932
-msgid "Sound\tImperfect\n"
+msgid "Graphics\tImperfect\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2934
-msgid "Sound\tOK\n"
+msgid "Graphics\tOK\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2937
-msgid "Capture\tUnimplemented\n"
+msgid "Sound\tNone\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2939
+msgid "Sound\tUnimplemented\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2941
+msgid "Sound\tImperfect\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2943
+msgid "Sound\tOK\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2946
+msgid "Capture\tUnimplemented\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2948
 msgid "Capture\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2942
+#: src/frontend/mame/ui/selmenu.cpp:2951
 msgid "Camera\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2944
+#: src/frontend/mame/ui/selmenu.cpp:2953
 msgid "Camera\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2947
+#: src/frontend/mame/ui/selmenu.cpp:2956
 msgid "Microphone\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2949
+#: src/frontend/mame/ui/selmenu.cpp:2958
 msgid "Microphone\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2952
+#: src/frontend/mame/ui/selmenu.cpp:2961
 msgid "Controls\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2954
+#: src/frontend/mame/ui/selmenu.cpp:2963
 msgid "Controls\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2957
+#: src/frontend/mame/ui/selmenu.cpp:2966
 msgid "Keyboard\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2959
+#: src/frontend/mame/ui/selmenu.cpp:2968
 msgid "Keyboard\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2962
+#: src/frontend/mame/ui/selmenu.cpp:2971
 msgid "Mouse\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2964
+#: src/frontend/mame/ui/selmenu.cpp:2973
 msgid "Mouse\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2967
+#: src/frontend/mame/ui/selmenu.cpp:2976
 msgid "Media\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2969
+#: src/frontend/mame/ui/selmenu.cpp:2978
 msgid "Media\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2972
+#: src/frontend/mame/ui/selmenu.cpp:2981
 msgid "Disk\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2974
+#: src/frontend/mame/ui/selmenu.cpp:2983
 msgid "Disk\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2977
+#: src/frontend/mame/ui/selmenu.cpp:2986
 msgid "Printer\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2979
+#: src/frontend/mame/ui/selmenu.cpp:2988
 msgid "Printer\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2982
+#: src/frontend/mame/ui/selmenu.cpp:2991
 msgid "Mag. Tape\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2984
+#: src/frontend/mame/ui/selmenu.cpp:2993
 msgid "Mag. Tape\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2987
+#: src/frontend/mame/ui/selmenu.cpp:2996
 msgid "Punch Tape\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2989
+#: src/frontend/mame/ui/selmenu.cpp:2998
 msgid "Punch Tape\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2992
+#: src/frontend/mame/ui/selmenu.cpp:3001
 msgid "Mag. Drum\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2994
+#: src/frontend/mame/ui/selmenu.cpp:3003
 msgid "Mag. Drum\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2997
+#: src/frontend/mame/ui/selmenu.cpp:3006
 msgid "(EP)ROM\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2999
+#: src/frontend/mame/ui/selmenu.cpp:3008
 msgid "(EP)ROM\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3002
+#: src/frontend/mame/ui/selmenu.cpp:3011
 msgid "Communications\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3004
+#: src/frontend/mame/ui/selmenu.cpp:3013
 msgid "Communications\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3007
+#: src/frontend/mame/ui/selmenu.cpp:3016
 msgid "LAN\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3009
+#: src/frontend/mame/ui/selmenu.cpp:3018
 msgid "LAN\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3012
+#: src/frontend/mame/ui/selmenu.cpp:3021
 msgid "WAN\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3014
+#: src/frontend/mame/ui/selmenu.cpp:3023
 msgid "WAN\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3017
+#: src/frontend/mame/ui/selmenu.cpp:3026
 msgid "Timing\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3019
+#: src/frontend/mame/ui/selmenu.cpp:3028
 msgid "Timing\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3021
+#: src/frontend/mame/ui/selmenu.cpp:3030
 msgid "Mechanical Machine\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3021
+#: src/frontend/mame/ui/selmenu.cpp:3030
 msgid "Mechanical Machine\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3022
+#: src/frontend/mame/ui/selmenu.cpp:3031
 msgid "Requires Artwork\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3022
+#: src/frontend/mame/ui/selmenu.cpp:3031
 msgid "Requires Artwork\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3023
+#: src/frontend/mame/ui/selmenu.cpp:3032
 msgid "Requires Clickable Artwork\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3023
+#: src/frontend/mame/ui/selmenu.cpp:3032
 msgid "Requires Clickable Artwork\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3025
+#: src/frontend/mame/ui/selmenu.cpp:3034
 msgid "Support Cocktail\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3026
+#: src/frontend/mame/ui/selmenu.cpp:3035
 msgid "Driver is BIOS\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3026
+#: src/frontend/mame/ui/selmenu.cpp:3035
 msgid "Driver is BIOS\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3027
+#: src/frontend/mame/ui/selmenu.cpp:3036
 msgid "Support Save\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3027
+#: src/frontend/mame/ui/selmenu.cpp:3036
 msgid "Support Save\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3028
+#: src/frontend/mame/ui/selmenu.cpp:3037
 msgid "Screen Orientation\tVertical\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3028
+#: src/frontend/mame/ui/selmenu.cpp:3037
 msgid "Screen Orientation\tHorizontal\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3038
+#: src/frontend/mame/ui/selmenu.cpp:3047
 msgid "Requires CHD\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3038
+#: src/frontend/mame/ui/selmenu.cpp:3047
 msgid "Requires CHD\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3051
-msgid "ROM Audit Result\tOK\n"
+#: src/frontend/mame/ui/selmenu.cpp:3060
+msgid "Media Audit Result\tOK\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3053
-msgid "ROM Audit Result\tBAD\n"
+#: src/frontend/mame/ui/selmenu.cpp:3062
+msgid "Media Audit Result\tBAD\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3056
+#: src/frontend/mame/ui/selmenu.cpp:3065
 msgid "Samples Audit Result\tNone Needed\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3058
+#: src/frontend/mame/ui/selmenu.cpp:3067
 msgid "Samples Audit Result\tOK\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3060
+#: src/frontend/mame/ui/selmenu.cpp:3069
 msgid "Samples Audit Result\tBAD\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3064
+#: src/frontend/mame/ui/selmenu.cpp:3073
 msgid ""
-"ROM Audit \tDisabled\n"
-"Samples Audit \tDisabled\n"
+"Media Audit\tDisabled\n"
+"Samples Audit\tDisabled\n"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:150
+#: src/frontend/mame/ui/sndmenu.cpp:146
 msgid "Sound"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:151
+#: src/frontend/mame/ui/sndmenu.cpp:147
 msgid "Compressor"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:152
+#: src/frontend/mame/ui/sndmenu.cpp:148
 msgid "Sample Rate"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:153
+#: src/frontend/mame/ui/sndmenu.cpp:149
 msgid "Use External Samples"
 msgstr ""
 
@@ -3122,511 +3126,681 @@ msgstr ""
 msgid "  Screen '%1$s': Vector\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:132
+#: src/frontend/mame/ui/devopt.cpp:135
 #, c-format
 msgid "  Screen '%1$s': %2$d × %3$d (V) %4$s Hz\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:133
+#: src/frontend/mame/ui/devopt.cpp:136
 #, c-format
 msgid "  Screen '%1$s': %2$d × %3$d (H) %4$s Hz\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:147
+#: src/frontend/mame/ui/devopt.cpp:150
 msgid "* Sound:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:211
+#: src/frontend/mame/ui/devopt.cpp:214
 #, c-format
 msgid ""
 "* BIOS settings:\n"
 "  %1$d options    [default: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:255 src/frontend/mame/ui/devopt.cpp:271
-#: src/frontend/mame/ui/devopt.cpp:332
+#: src/frontend/mame/ui/devopt.cpp:258 src/frontend/mame/ui/devopt.cpp:274
+#: src/frontend/mame/ui/devopt.cpp:335
 #, c-format
 msgid "  %1$s    [default: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:260 src/frontend/mame/ui/devopt.cpp:276
+#: src/frontend/mame/ui/devopt.cpp:263 src/frontend/mame/ui/devopt.cpp:279
 #, c-format
 msgid "  %1$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:282
+#: src/frontend/mame/ui/devopt.cpp:285
 msgid "* DIP switch settings:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:287
+#: src/frontend/mame/ui/devopt.cpp:290
 msgid "* Configuration settings:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:291
+#: src/frontend/mame/ui/devopt.cpp:294
 msgid "* Input device(s):\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:293
+#: src/frontend/mame/ui/devopt.cpp:296
 #, c-format
 msgid "  User inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:295
+#: src/frontend/mame/ui/devopt.cpp:298
 #, c-format
 msgid "  Mahjong inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:297
+#: src/frontend/mame/ui/devopt.cpp:300
 #, c-format
 msgid "  Hanafuda inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:299
+#: src/frontend/mame/ui/devopt.cpp:302
 #, c-format
 msgid "  Gambling inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:301
+#: src/frontend/mame/ui/devopt.cpp:304
 #, c-format
 msgid "  Analog inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:303
+#: src/frontend/mame/ui/devopt.cpp:306
 #, c-format
 msgid "  Adjuster inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:305
+#: src/frontend/mame/ui/devopt.cpp:308
 #, c-format
 msgid "  Keypad inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:307
+#: src/frontend/mame/ui/devopt.cpp:310
 #, c-format
 msgid "  Keyboard inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:312
+#: src/frontend/mame/ui/devopt.cpp:315
 msgid "* Media Options:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:317
+#: src/frontend/mame/ui/devopt.cpp:320
 #, c-format
 msgid "  %1$s    [tag: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:327
+#: src/frontend/mame/ui/devopt.cpp:330
 msgid "* Slot Options:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:341
+#: src/frontend/mame/ui/devopt.cpp:344
 msgid "[None]\n"
 msgstr ""
 
-#: src/emu/render.cpp:1847
+#: src/emu/render.cpp:1796
 #, c-format
 msgctxt "view-name"
 msgid "Screen %1$u Standard (%2$u:%3$u)"
 msgstr ""
 
-#: src/emu/render.cpp:1873
+#: src/emu/render.cpp:1822
 #, c-format
 msgctxt "view-name"
 msgid "Screen %1$u Pixel Aspect (%2$u:%3$u)"
 msgstr ""
 
-#: src/emu/render.cpp:1895 src/emu/render.cpp:2030
+#: src/emu/render.cpp:1844 src/emu/render.cpp:1979
 msgctxt "view-name"
 msgid "Cocktail"
 msgstr ""
 
-#: src/emu/render.cpp:2015
+#: src/emu/render.cpp:1964
 msgctxt "view-name"
 msgid "Left-to-Right"
 msgstr ""
 
-#: src/emu/render.cpp:2016
+#: src/emu/render.cpp:1965
 msgctxt "view-name"
 msgid "Left-to-Right (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2017
+#: src/emu/render.cpp:1966
 msgctxt "view-name"
 msgid "Top-to-Bottom"
 msgstr ""
 
-#: src/emu/render.cpp:2018
+#: src/emu/render.cpp:1967
 msgctxt "view-name"
 msgid "Top-to-Bottom (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2069
+#: src/emu/render.cpp:2018
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Left-to-Right, Top-to-Bottom"
 msgstr ""
 
-#: src/emu/render.cpp:2078
+#: src/emu/render.cpp:2027
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Left-to-Right, Top-to-Bottom (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2087
+#: src/emu/render.cpp:2036
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Top-to-Bottom, Left-to-Right"
 msgstr ""
 
-#: src/emu/render.cpp:2096
+#: src/emu/render.cpp:2045
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Top-to-Bottom, Left-to-Right (Gapless)"
 msgstr ""
 
-#: src/emu/inpttype.ipp:22
+#: src/emu/ioport.cpp:332
+#, c-format
 msgctxt "input-name"
-msgid "P1 Up"
+msgid "P%1$u"
 msgstr ""
 
-#: src/emu/inpttype.ipp:23
+#: src/emu/ioport.cpp:1924
 msgctxt "input-name"
-msgid "P1 Down"
+msgid "???"
 msgstr ""
 
-#: src/emu/inpttype.ipp:24
+#: src/emu/inpttype.ipp:22 src/emu/inpttype.ipp:140 src/emu/inpttype.ipp:221
+#: src/emu/inpttype.ipp:255 src/emu/inpttype.ipp:289 src/emu/inpttype.ipp:323
+#: src/emu/inpttype.ipp:357 src/emu/inpttype.ipp:391 src/emu/inpttype.ipp:425
+#: src/emu/inpttype.ipp:459
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left"
+msgid "%p Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:25
+#: src/emu/inpttype.ipp:23 src/emu/inpttype.ipp:141 src/emu/inpttype.ipp:222
+#: src/emu/inpttype.ipp:256 src/emu/inpttype.ipp:290 src/emu/inpttype.ipp:324
+#: src/emu/inpttype.ipp:358 src/emu/inpttype.ipp:392 src/emu/inpttype.ipp:426
+#: src/emu/inpttype.ipp:460
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right"
+msgid "%p Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:26
+#: src/emu/inpttype.ipp:24 src/emu/inpttype.ipp:142 src/emu/inpttype.ipp:223
+#: src/emu/inpttype.ipp:257 src/emu/inpttype.ipp:291 src/emu/inpttype.ipp:325
+#: src/emu/inpttype.ipp:359 src/emu/inpttype.ipp:393 src/emu/inpttype.ipp:427
+#: src/emu/inpttype.ipp:461
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Up"
+msgid "%p Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:27
+#: src/emu/inpttype.ipp:25 src/emu/inpttype.ipp:143 src/emu/inpttype.ipp:224
+#: src/emu/inpttype.ipp:258 src/emu/inpttype.ipp:292 src/emu/inpttype.ipp:326
+#: src/emu/inpttype.ipp:360 src/emu/inpttype.ipp:394 src/emu/inpttype.ipp:428
+#: src/emu/inpttype.ipp:462
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Down"
+msgid "%p Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:28
+#: src/emu/inpttype.ipp:26 src/emu/inpttype.ipp:144 src/emu/inpttype.ipp:225
+#: src/emu/inpttype.ipp:259 src/emu/inpttype.ipp:293 src/emu/inpttype.ipp:327
+#: src/emu/inpttype.ipp:361 src/emu/inpttype.ipp:395 src/emu/inpttype.ipp:429
+#: src/emu/inpttype.ipp:463
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Left"
+msgid "%p Right Stick/Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:29
+#: src/emu/inpttype.ipp:27 src/emu/inpttype.ipp:145 src/emu/inpttype.ipp:226
+#: src/emu/inpttype.ipp:260 src/emu/inpttype.ipp:294 src/emu/inpttype.ipp:328
+#: src/emu/inpttype.ipp:362 src/emu/inpttype.ipp:396 src/emu/inpttype.ipp:430
+#: src/emu/inpttype.ipp:464
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Right"
+msgid "%p Right Stick/Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:30
+#: src/emu/inpttype.ipp:28 src/emu/inpttype.ipp:146 src/emu/inpttype.ipp:227
+#: src/emu/inpttype.ipp:261 src/emu/inpttype.ipp:295 src/emu/inpttype.ipp:329
+#: src/emu/inpttype.ipp:363 src/emu/inpttype.ipp:397 src/emu/inpttype.ipp:431
+#: src/emu/inpttype.ipp:465
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Up"
+msgid "%p Right Stick/Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:31
+#: src/emu/inpttype.ipp:29 src/emu/inpttype.ipp:147 src/emu/inpttype.ipp:228
+#: src/emu/inpttype.ipp:262 src/emu/inpttype.ipp:296 src/emu/inpttype.ipp:330
+#: src/emu/inpttype.ipp:364 src/emu/inpttype.ipp:398 src/emu/inpttype.ipp:432
+#: src/emu/inpttype.ipp:466
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Down"
+msgid "%p Right Stick/Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:32
+#: src/emu/inpttype.ipp:30 src/emu/inpttype.ipp:148 src/emu/inpttype.ipp:229
+#: src/emu/inpttype.ipp:263 src/emu/inpttype.ipp:297 src/emu/inpttype.ipp:331
+#: src/emu/inpttype.ipp:365 src/emu/inpttype.ipp:399 src/emu/inpttype.ipp:433
+#: src/emu/inpttype.ipp:467
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Left"
+msgid "%p Left Stick/Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:33
+#: src/emu/inpttype.ipp:31 src/emu/inpttype.ipp:149 src/emu/inpttype.ipp:230
+#: src/emu/inpttype.ipp:264 src/emu/inpttype.ipp:298 src/emu/inpttype.ipp:332
+#: src/emu/inpttype.ipp:366 src/emu/inpttype.ipp:400 src/emu/inpttype.ipp:434
+#: src/emu/inpttype.ipp:468
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Right"
+msgid "%p Left Stick/Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:34
+#: src/emu/inpttype.ipp:32 src/emu/inpttype.ipp:150 src/emu/inpttype.ipp:231
+#: src/emu/inpttype.ipp:265 src/emu/inpttype.ipp:299 src/emu/inpttype.ipp:333
+#: src/emu/inpttype.ipp:367 src/emu/inpttype.ipp:401 src/emu/inpttype.ipp:435
+#: src/emu/inpttype.ipp:469
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 1"
+msgid "%p Left Stick/Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:35
+#: src/emu/inpttype.ipp:33 src/emu/inpttype.ipp:151 src/emu/inpttype.ipp:232
+#: src/emu/inpttype.ipp:266 src/emu/inpttype.ipp:300 src/emu/inpttype.ipp:334
+#: src/emu/inpttype.ipp:368 src/emu/inpttype.ipp:402 src/emu/inpttype.ipp:436
+#: src/emu/inpttype.ipp:470
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 2"
+msgid "%p Left Stick/Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:36
+#: src/emu/inpttype.ipp:34 src/emu/inpttype.ipp:152 src/emu/inpttype.ipp:233
+#: src/emu/inpttype.ipp:267 src/emu/inpttype.ipp:301 src/emu/inpttype.ipp:335
+#: src/emu/inpttype.ipp:369 src/emu/inpttype.ipp:403 src/emu/inpttype.ipp:437
+#: src/emu/inpttype.ipp:471
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 3"
+msgid "%p Button 1"
 msgstr ""
 
-#: src/emu/inpttype.ipp:37
+#: src/emu/inpttype.ipp:35 src/emu/inpttype.ipp:153 src/emu/inpttype.ipp:234
+#: src/emu/inpttype.ipp:268 src/emu/inpttype.ipp:302 src/emu/inpttype.ipp:336
+#: src/emu/inpttype.ipp:370 src/emu/inpttype.ipp:404 src/emu/inpttype.ipp:438
+#: src/emu/inpttype.ipp:472
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 4"
+msgid "%p Button 2"
 msgstr ""
 
-#: src/emu/inpttype.ipp:38
+#: src/emu/inpttype.ipp:36 src/emu/inpttype.ipp:154 src/emu/inpttype.ipp:235
+#: src/emu/inpttype.ipp:269 src/emu/inpttype.ipp:303 src/emu/inpttype.ipp:337
+#: src/emu/inpttype.ipp:371 src/emu/inpttype.ipp:405 src/emu/inpttype.ipp:439
+#: src/emu/inpttype.ipp:473
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 5"
+msgid "%p Button 3"
 msgstr ""
 
-#: src/emu/inpttype.ipp:39
+#: src/emu/inpttype.ipp:37 src/emu/inpttype.ipp:155 src/emu/inpttype.ipp:236
+#: src/emu/inpttype.ipp:270 src/emu/inpttype.ipp:304 src/emu/inpttype.ipp:338
+#: src/emu/inpttype.ipp:372 src/emu/inpttype.ipp:406 src/emu/inpttype.ipp:440
+#: src/emu/inpttype.ipp:474
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 6"
+msgid "%p Button 4"
 msgstr ""
 
-#: src/emu/inpttype.ipp:40
+#: src/emu/inpttype.ipp:38 src/emu/inpttype.ipp:156 src/emu/inpttype.ipp:237
+#: src/emu/inpttype.ipp:271 src/emu/inpttype.ipp:305 src/emu/inpttype.ipp:339
+#: src/emu/inpttype.ipp:373 src/emu/inpttype.ipp:407 src/emu/inpttype.ipp:441
+#: src/emu/inpttype.ipp:475
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 7"
+msgid "%p Button 5"
 msgstr ""
 
-#: src/emu/inpttype.ipp:41
+#: src/emu/inpttype.ipp:39 src/emu/inpttype.ipp:157 src/emu/inpttype.ipp:238
+#: src/emu/inpttype.ipp:272 src/emu/inpttype.ipp:306 src/emu/inpttype.ipp:340
+#: src/emu/inpttype.ipp:374 src/emu/inpttype.ipp:408 src/emu/inpttype.ipp:442
+#: src/emu/inpttype.ipp:476
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 8"
+msgid "%p Button 6"
 msgstr ""
 
-#: src/emu/inpttype.ipp:42
+#: src/emu/inpttype.ipp:40 src/emu/inpttype.ipp:158 src/emu/inpttype.ipp:239
+#: src/emu/inpttype.ipp:273 src/emu/inpttype.ipp:307 src/emu/inpttype.ipp:341
+#: src/emu/inpttype.ipp:375 src/emu/inpttype.ipp:409 src/emu/inpttype.ipp:443
+#: src/emu/inpttype.ipp:477
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 9"
+msgid "%p Button 7"
 msgstr ""
 
-#: src/emu/inpttype.ipp:43
+#: src/emu/inpttype.ipp:41 src/emu/inpttype.ipp:159 src/emu/inpttype.ipp:240
+#: src/emu/inpttype.ipp:274 src/emu/inpttype.ipp:308 src/emu/inpttype.ipp:342
+#: src/emu/inpttype.ipp:376 src/emu/inpttype.ipp:410 src/emu/inpttype.ipp:444
+#: src/emu/inpttype.ipp:478
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 10"
+msgid "%p Button 8"
 msgstr ""
 
-#: src/emu/inpttype.ipp:44
+#: src/emu/inpttype.ipp:42 src/emu/inpttype.ipp:160 src/emu/inpttype.ipp:241
+#: src/emu/inpttype.ipp:275 src/emu/inpttype.ipp:309 src/emu/inpttype.ipp:343
+#: src/emu/inpttype.ipp:377 src/emu/inpttype.ipp:411 src/emu/inpttype.ipp:445
+#: src/emu/inpttype.ipp:479
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 11"
+msgid "%p Button 9"
 msgstr ""
 
-#: src/emu/inpttype.ipp:45
+#: src/emu/inpttype.ipp:43 src/emu/inpttype.ipp:161 src/emu/inpttype.ipp:242
+#: src/emu/inpttype.ipp:276 src/emu/inpttype.ipp:310 src/emu/inpttype.ipp:344
+#: src/emu/inpttype.ipp:378 src/emu/inpttype.ipp:412 src/emu/inpttype.ipp:446
+#: src/emu/inpttype.ipp:480
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 12"
+msgid "%p Button 10"
 msgstr ""
 
-#: src/emu/inpttype.ipp:46
+#: src/emu/inpttype.ipp:44 src/emu/inpttype.ipp:162 src/emu/inpttype.ipp:243
+#: src/emu/inpttype.ipp:277 src/emu/inpttype.ipp:311 src/emu/inpttype.ipp:345
+#: src/emu/inpttype.ipp:379 src/emu/inpttype.ipp:413 src/emu/inpttype.ipp:447
+#: src/emu/inpttype.ipp:481
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 13"
+msgid "%p Button 11"
 msgstr ""
 
-#: src/emu/inpttype.ipp:47
+#: src/emu/inpttype.ipp:45 src/emu/inpttype.ipp:163 src/emu/inpttype.ipp:244
+#: src/emu/inpttype.ipp:278 src/emu/inpttype.ipp:312 src/emu/inpttype.ipp:346
+#: src/emu/inpttype.ipp:380 src/emu/inpttype.ipp:414 src/emu/inpttype.ipp:448
+#: src/emu/inpttype.ipp:482
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 14"
+msgid "%p Button 12"
 msgstr ""
 
-#: src/emu/inpttype.ipp:48
+#: src/emu/inpttype.ipp:46 src/emu/inpttype.ipp:164 src/emu/inpttype.ipp:245
+#: src/emu/inpttype.ipp:279 src/emu/inpttype.ipp:313 src/emu/inpttype.ipp:347
+#: src/emu/inpttype.ipp:381 src/emu/inpttype.ipp:415 src/emu/inpttype.ipp:449
+#: src/emu/inpttype.ipp:483
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 15"
+msgid "%p Button 13"
 msgstr ""
 
-#: src/emu/inpttype.ipp:49
+#: src/emu/inpttype.ipp:47 src/emu/inpttype.ipp:165 src/emu/inpttype.ipp:246
+#: src/emu/inpttype.ipp:280 src/emu/inpttype.ipp:314 src/emu/inpttype.ipp:348
+#: src/emu/inpttype.ipp:382 src/emu/inpttype.ipp:416 src/emu/inpttype.ipp:450
+#: src/emu/inpttype.ipp:484
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 16"
+msgid "%p Button 14"
 msgstr ""
 
-#: src/emu/inpttype.ipp:50
+#: src/emu/inpttype.ipp:48 src/emu/inpttype.ipp:166 src/emu/inpttype.ipp:247
+#: src/emu/inpttype.ipp:281 src/emu/inpttype.ipp:315 src/emu/inpttype.ipp:349
+#: src/emu/inpttype.ipp:383 src/emu/inpttype.ipp:417 src/emu/inpttype.ipp:451
+#: src/emu/inpttype.ipp:485
+#, c-format
 msgctxt "input-name"
-msgid "P1 Start"
+msgid "%p Button 15"
 msgstr ""
 
-#: src/emu/inpttype.ipp:51
+#: src/emu/inpttype.ipp:49 src/emu/inpttype.ipp:167 src/emu/inpttype.ipp:248
+#: src/emu/inpttype.ipp:282 src/emu/inpttype.ipp:316 src/emu/inpttype.ipp:350
+#: src/emu/inpttype.ipp:384 src/emu/inpttype.ipp:418 src/emu/inpttype.ipp:452
+#: src/emu/inpttype.ipp:486
+#, c-format
 msgctxt "input-name"
-msgid "P1 Select"
+msgid "%p Button 16"
 msgstr ""
 
-#: src/emu/inpttype.ipp:56
+#: src/emu/inpttype.ipp:50 src/emu/inpttype.ipp:168 src/emu/inpttype.ipp:249
+#: src/emu/inpttype.ipp:283 src/emu/inpttype.ipp:317 src/emu/inpttype.ipp:351
+#: src/emu/inpttype.ipp:385 src/emu/inpttype.ipp:419 src/emu/inpttype.ipp:453
+#: src/emu/inpttype.ipp:487
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong A"
+msgid "%p Start"
 msgstr ""
 
-#: src/emu/inpttype.ipp:57
+#: src/emu/inpttype.ipp:51 src/emu/inpttype.ipp:169 src/emu/inpttype.ipp:250
+#: src/emu/inpttype.ipp:284 src/emu/inpttype.ipp:318 src/emu/inpttype.ipp:352
+#: src/emu/inpttype.ipp:386 src/emu/inpttype.ipp:420 src/emu/inpttype.ipp:454
+#: src/emu/inpttype.ipp:488
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong B"
+msgid "%p Select"
 msgstr ""
 
-#: src/emu/inpttype.ipp:58
+#: src/emu/inpttype.ipp:56 src/emu/inpttype.ipp:174
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong C"
+msgid "%p Mahjong A"
 msgstr ""
 
-#: src/emu/inpttype.ipp:59
+#: src/emu/inpttype.ipp:57 src/emu/inpttype.ipp:175
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong D"
+msgid "%p Mahjong B"
 msgstr ""
 
-#: src/emu/inpttype.ipp:60
+#: src/emu/inpttype.ipp:58 src/emu/inpttype.ipp:176
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong E"
+msgid "%p Mahjong C"
 msgstr ""
 
-#: src/emu/inpttype.ipp:61
+#: src/emu/inpttype.ipp:59 src/emu/inpttype.ipp:177
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong F"
+msgid "%p Mahjong D"
 msgstr ""
 
-#: src/emu/inpttype.ipp:62
+#: src/emu/inpttype.ipp:60 src/emu/inpttype.ipp:178
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong G"
+msgid "%p Mahjong E"
 msgstr ""
 
-#: src/emu/inpttype.ipp:63
+#: src/emu/inpttype.ipp:61 src/emu/inpttype.ipp:179
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong H"
+msgid "%p Mahjong F"
 msgstr ""
 
-#: src/emu/inpttype.ipp:64
+#: src/emu/inpttype.ipp:62 src/emu/inpttype.ipp:180
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong I"
+msgid "%p Mahjong G"
 msgstr ""
 
-#: src/emu/inpttype.ipp:65
+#: src/emu/inpttype.ipp:63 src/emu/inpttype.ipp:181
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong J"
+msgid "%p Mahjong H"
 msgstr ""
 
-#: src/emu/inpttype.ipp:66
+#: src/emu/inpttype.ipp:64 src/emu/inpttype.ipp:182
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong K"
+msgid "%p Mahjong I"
 msgstr ""
 
-#: src/emu/inpttype.ipp:67
+#: src/emu/inpttype.ipp:65 src/emu/inpttype.ipp:183
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong L"
+msgid "%p Mahjong J"
 msgstr ""
 
-#: src/emu/inpttype.ipp:68
+#: src/emu/inpttype.ipp:66 src/emu/inpttype.ipp:184
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong M"
+msgid "%p Mahjong K"
 msgstr ""
 
-#: src/emu/inpttype.ipp:69
+#: src/emu/inpttype.ipp:67 src/emu/inpttype.ipp:185
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong N"
+msgid "%p Mahjong L"
 msgstr ""
 
-#: src/emu/inpttype.ipp:70
+#: src/emu/inpttype.ipp:68 src/emu/inpttype.ipp:186
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong O"
+msgid "%p Mahjong M"
 msgstr ""
 
-#: src/emu/inpttype.ipp:71
+#: src/emu/inpttype.ipp:69 src/emu/inpttype.ipp:187
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong P"
+msgid "%p Mahjong N"
 msgstr ""
 
-#: src/emu/inpttype.ipp:72
+#: src/emu/inpttype.ipp:70 src/emu/inpttype.ipp:188
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Q"
+msgid "%p Mahjong O"
 msgstr ""
 
-#: src/emu/inpttype.ipp:73
+#: src/emu/inpttype.ipp:71 src/emu/inpttype.ipp:189
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Kan"
+msgid "%p Mahjong P"
 msgstr ""
 
-#: src/emu/inpttype.ipp:74
+#: src/emu/inpttype.ipp:72 src/emu/inpttype.ipp:190
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Pon"
+msgid "%p Mahjong Q"
 msgstr ""
 
-#: src/emu/inpttype.ipp:75
+#: src/emu/inpttype.ipp:73 src/emu/inpttype.ipp:191
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Chi"
+msgid "%p Mahjong Kan"
 msgstr ""
 
-#: src/emu/inpttype.ipp:76
+#: src/emu/inpttype.ipp:74 src/emu/inpttype.ipp:192
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Reach"
+msgid "%p Mahjong Pon"
 msgstr ""
 
-#: src/emu/inpttype.ipp:77
+#: src/emu/inpttype.ipp:75 src/emu/inpttype.ipp:193
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Ron"
+msgid "%p Mahjong Chi"
 msgstr ""
 
-#: src/emu/inpttype.ipp:78
+#: src/emu/inpttype.ipp:76 src/emu/inpttype.ipp:194
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Flip Flop"
+msgid "%p Mahjong Reach"
 msgstr ""
 
-#: src/emu/inpttype.ipp:79
+#: src/emu/inpttype.ipp:77 src/emu/inpttype.ipp:195
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Bet"
+msgid "%p Mahjong Ron"
 msgstr ""
 
-#: src/emu/inpttype.ipp:80
+#: src/emu/inpttype.ipp:78 src/emu/inpttype.ipp:200
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Take Score"
+msgid "%p Mahjong Flip Flop"
 msgstr ""
 
-#: src/emu/inpttype.ipp:81
+#: src/emu/inpttype.ipp:79 src/emu/inpttype.ipp:196
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Double Up"
+msgid "%p Mahjong Bet"
 msgstr ""
 
-#: src/emu/inpttype.ipp:82
+#: src/emu/inpttype.ipp:80 src/emu/inpttype.ipp:198
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Big"
+msgid "%p Mahjong Take Score"
 msgstr ""
 
-#: src/emu/inpttype.ipp:83
+#: src/emu/inpttype.ipp:81 src/emu/inpttype.ipp:199
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Small"
+msgid "%p Mahjong Double Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:84
+#: src/emu/inpttype.ipp:82 src/emu/inpttype.ipp:201
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Last Chance"
+msgid "%p Mahjong Big"
 msgstr ""
 
-#: src/emu/inpttype.ipp:89
+#: src/emu/inpttype.ipp:83 src/emu/inpttype.ipp:202
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda A/1"
+msgid "%p Mahjong Small"
 msgstr ""
 
-#: src/emu/inpttype.ipp:90
+#: src/emu/inpttype.ipp:84 src/emu/inpttype.ipp:197
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda B/2"
+msgid "%p Mahjong Last Chance"
 msgstr ""
 
-#: src/emu/inpttype.ipp:91
+#: src/emu/inpttype.ipp:89 src/emu/inpttype.ipp:207
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda C/3"
+msgid "%p Hanafuda A/1"
 msgstr ""
 
-#: src/emu/inpttype.ipp:92
+#: src/emu/inpttype.ipp:90 src/emu/inpttype.ipp:208
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda D/4"
+msgid "%p Hanafuda B/2"
 msgstr ""
 
-#: src/emu/inpttype.ipp:93
+#: src/emu/inpttype.ipp:91 src/emu/inpttype.ipp:209
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda E/5"
+msgid "%p Hanafuda C/3"
 msgstr ""
 
-#: src/emu/inpttype.ipp:94
+#: src/emu/inpttype.ipp:92 src/emu/inpttype.ipp:210
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda F/6"
+msgid "%p Hanafuda D/4"
 msgstr ""
 
-#: src/emu/inpttype.ipp:95
+#: src/emu/inpttype.ipp:93 src/emu/inpttype.ipp:211
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda G/7"
+msgid "%p Hanafuda E/5"
 msgstr ""
 
-#: src/emu/inpttype.ipp:96
+#: src/emu/inpttype.ipp:94 src/emu/inpttype.ipp:212
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda H/8"
+msgid "%p Hanafuda F/6"
 msgstr ""
 
-#: src/emu/inpttype.ipp:97
+#: src/emu/inpttype.ipp:95 src/emu/inpttype.ipp:213
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda Yes"
+msgid "%p Hanafuda G/7"
 msgstr ""
 
-#: src/emu/inpttype.ipp:98
+#: src/emu/inpttype.ipp:96 src/emu/inpttype.ipp:214
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda No"
+msgid "%p Hanafuda H/8"
+msgstr ""
+
+#: src/emu/inpttype.ipp:97 src/emu/inpttype.ipp:215
+#, c-format
+msgctxt "input-name"
+msgid "%p Hanafuda Yes"
+msgstr ""
+
+#: src/emu/inpttype.ipp:98 src/emu/inpttype.ipp:216
+#, c-format
+msgctxt "input-name"
+msgid "%p Hanafuda No"
 msgstr ""
 
 #: src/emu/inpttype.ipp:103
@@ -3754,1551 +3928,6 @@ msgctxt "input-name"
 msgid "Stop All Reels"
 msgstr ""
 
-#: src/emu/inpttype.ipp:140
-msgctxt "input-name"
-msgid "P2 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:141
-msgctxt "input-name"
-msgid "P2 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:142
-msgctxt "input-name"
-msgid "P2 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:143
-msgctxt "input-name"
-msgid "P2 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:144
-msgctxt "input-name"
-msgid "P2 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:145
-msgctxt "input-name"
-msgid "P2 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:146
-msgctxt "input-name"
-msgid "P2 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:147
-msgctxt "input-name"
-msgid "P2 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:148
-msgctxt "input-name"
-msgid "P2 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:149
-msgctxt "input-name"
-msgid "P2 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:150
-msgctxt "input-name"
-msgid "P2 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:151
-msgctxt "input-name"
-msgid "P2 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:152
-msgctxt "input-name"
-msgid "P2 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:153
-msgctxt "input-name"
-msgid "P2 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:154
-msgctxt "input-name"
-msgid "P2 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:155
-msgctxt "input-name"
-msgid "P2 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:156
-msgctxt "input-name"
-msgid "P2 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:157
-msgctxt "input-name"
-msgid "P2 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:158
-msgctxt "input-name"
-msgid "P2 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:159
-msgctxt "input-name"
-msgid "P2 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:160
-msgctxt "input-name"
-msgid "P2 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:161
-msgctxt "input-name"
-msgid "P2 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:162
-msgctxt "input-name"
-msgid "P2 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:163
-msgctxt "input-name"
-msgid "P2 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:164
-msgctxt "input-name"
-msgid "P2 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:165
-msgctxt "input-name"
-msgid "P2 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:166
-msgctxt "input-name"
-msgid "P2 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:167
-msgctxt "input-name"
-msgid "P2 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:168
-msgctxt "input-name"
-msgid "P2 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:169
-msgctxt "input-name"
-msgid "P2 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:174
-msgctxt "input-name"
-msgid "P2 Mahjong A"
-msgstr ""
-
-#: src/emu/inpttype.ipp:175
-msgctxt "input-name"
-msgid "P2 Mahjong B"
-msgstr ""
-
-#: src/emu/inpttype.ipp:176
-msgctxt "input-name"
-msgid "P2 Mahjong C"
-msgstr ""
-
-#: src/emu/inpttype.ipp:177
-msgctxt "input-name"
-msgid "P2 Mahjong D"
-msgstr ""
-
-#: src/emu/inpttype.ipp:178
-msgctxt "input-name"
-msgid "P2 Mahjong E"
-msgstr ""
-
-#: src/emu/inpttype.ipp:179
-msgctxt "input-name"
-msgid "P2 Mahjong F"
-msgstr ""
-
-#: src/emu/inpttype.ipp:180
-msgctxt "input-name"
-msgid "P2 Mahjong G"
-msgstr ""
-
-#: src/emu/inpttype.ipp:181
-msgctxt "input-name"
-msgid "P2 Mahjong H"
-msgstr ""
-
-#: src/emu/inpttype.ipp:182
-msgctxt "input-name"
-msgid "P2 Mahjong I"
-msgstr ""
-
-#: src/emu/inpttype.ipp:183
-msgctxt "input-name"
-msgid "P2 Mahjong J"
-msgstr ""
-
-#: src/emu/inpttype.ipp:184
-msgctxt "input-name"
-msgid "P2 Mahjong K"
-msgstr ""
-
-#: src/emu/inpttype.ipp:185
-msgctxt "input-name"
-msgid "P2 Mahjong L"
-msgstr ""
-
-#: src/emu/inpttype.ipp:186
-msgctxt "input-name"
-msgid "P2 Mahjong M"
-msgstr ""
-
-#: src/emu/inpttype.ipp:187
-msgctxt "input-name"
-msgid "P2 Mahjong N"
-msgstr ""
-
-#: src/emu/inpttype.ipp:188
-msgctxt "input-name"
-msgid "P2 Mahjong O"
-msgstr ""
-
-#: src/emu/inpttype.ipp:189
-msgctxt "input-name"
-msgid "P2 Mahjong P"
-msgstr ""
-
-#: src/emu/inpttype.ipp:190
-msgctxt "input-name"
-msgid "P2 Mahjong Q"
-msgstr ""
-
-#: src/emu/inpttype.ipp:191
-msgctxt "input-name"
-msgid "P2 Mahjong Kan"
-msgstr ""
-
-#: src/emu/inpttype.ipp:192
-msgctxt "input-name"
-msgid "P2 Mahjong Pon"
-msgstr ""
-
-#: src/emu/inpttype.ipp:193
-msgctxt "input-name"
-msgid "P2 Mahjong Chi"
-msgstr ""
-
-#: src/emu/inpttype.ipp:194
-msgctxt "input-name"
-msgid "P2 Mahjong Reach"
-msgstr ""
-
-#: src/emu/inpttype.ipp:195
-msgctxt "input-name"
-msgid "P2 Mahjong Ron"
-msgstr ""
-
-#: src/emu/inpttype.ipp:196
-msgctxt "input-name"
-msgid "P2 Mahjong Bet"
-msgstr ""
-
-#: src/emu/inpttype.ipp:197
-msgctxt "input-name"
-msgid "P2 Mahjong Last Chance"
-msgstr ""
-
-#: src/emu/inpttype.ipp:198
-msgctxt "input-name"
-msgid "P2 Mahjong Take Score"
-msgstr ""
-
-#: src/emu/inpttype.ipp:199
-msgctxt "input-name"
-msgid "P2 Mahjong Double Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:200
-msgctxt "input-name"
-msgid "P2 Mahjong Flip Flop"
-msgstr ""
-
-#: src/emu/inpttype.ipp:201
-msgctxt "input-name"
-msgid "P2 Mahjong Big"
-msgstr ""
-
-#: src/emu/inpttype.ipp:202
-msgctxt "input-name"
-msgid "P2 Mahjong Small"
-msgstr ""
-
-#: src/emu/inpttype.ipp:207
-msgctxt "input-name"
-msgid "P2 Hanafuda A/1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:208
-msgctxt "input-name"
-msgid "P2 Hanafuda B/2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:209
-msgctxt "input-name"
-msgid "P2 Hanafuda C/3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:210
-msgctxt "input-name"
-msgid "P2 Hanafuda D/4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:211
-msgctxt "input-name"
-msgid "P2 Hanafuda E/5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:212
-msgctxt "input-name"
-msgid "P2 Hanafuda F/6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:213
-msgctxt "input-name"
-msgid "P2 Hanafuda G/7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:214
-msgctxt "input-name"
-msgid "P2 Hanafuda H/8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:215
-msgctxt "input-name"
-msgid "P2 Hanafuda Yes"
-msgstr ""
-
-#: src/emu/inpttype.ipp:216
-msgctxt "input-name"
-msgid "P2 Hanafuda No"
-msgstr ""
-
-#: src/emu/inpttype.ipp:221
-msgctxt "input-name"
-msgid "P3 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:222
-msgctxt "input-name"
-msgid "P3 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:223
-msgctxt "input-name"
-msgid "P3 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:224
-msgctxt "input-name"
-msgid "P3 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:225
-msgctxt "input-name"
-msgid "P3 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:226
-msgctxt "input-name"
-msgid "P3 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:227
-msgctxt "input-name"
-msgid "P3 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:228
-msgctxt "input-name"
-msgid "P3 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:229
-msgctxt "input-name"
-msgid "P3 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:230
-msgctxt "input-name"
-msgid "P3 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:231
-msgctxt "input-name"
-msgid "P3 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:232
-msgctxt "input-name"
-msgid "P3 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:233
-msgctxt "input-name"
-msgid "P3 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:234
-msgctxt "input-name"
-msgid "P3 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:235
-msgctxt "input-name"
-msgid "P3 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:236
-msgctxt "input-name"
-msgid "P3 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:237
-msgctxt "input-name"
-msgid "P3 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:238
-msgctxt "input-name"
-msgid "P3 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:239
-msgctxt "input-name"
-msgid "P3 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:240
-msgctxt "input-name"
-msgid "P3 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:241
-msgctxt "input-name"
-msgid "P3 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:242
-msgctxt "input-name"
-msgid "P3 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:243
-msgctxt "input-name"
-msgid "P3 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:244
-msgctxt "input-name"
-msgid "P3 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:245
-msgctxt "input-name"
-msgid "P3 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:246
-msgctxt "input-name"
-msgid "P3 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:247
-msgctxt "input-name"
-msgid "P3 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:248
-msgctxt "input-name"
-msgid "P3 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:249
-msgctxt "input-name"
-msgid "P3 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:250
-msgctxt "input-name"
-msgid "P3 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:255
-msgctxt "input-name"
-msgid "P4 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:256
-msgctxt "input-name"
-msgid "P4 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:257
-msgctxt "input-name"
-msgid "P4 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:258
-msgctxt "input-name"
-msgid "P4 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:259
-msgctxt "input-name"
-msgid "P4 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:260
-msgctxt "input-name"
-msgid "P4 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:261
-msgctxt "input-name"
-msgid "P4 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:262
-msgctxt "input-name"
-msgid "P4 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:263
-msgctxt "input-name"
-msgid "P4 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:264
-msgctxt "input-name"
-msgid "P4 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:265
-msgctxt "input-name"
-msgid "P4 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:266
-msgctxt "input-name"
-msgid "P4 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:267
-msgctxt "input-name"
-msgid "P4 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:268
-msgctxt "input-name"
-msgid "P4 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:269
-msgctxt "input-name"
-msgid "P4 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:270
-msgctxt "input-name"
-msgid "P4 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:271
-msgctxt "input-name"
-msgid "P4 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:272
-msgctxt "input-name"
-msgid "P4 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:273
-msgctxt "input-name"
-msgid "P4 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:274
-msgctxt "input-name"
-msgid "P4 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:275
-msgctxt "input-name"
-msgid "P4 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:276
-msgctxt "input-name"
-msgid "P4 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:277
-msgctxt "input-name"
-msgid "P4 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:278
-msgctxt "input-name"
-msgid "P4 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:279
-msgctxt "input-name"
-msgid "P4 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:280
-msgctxt "input-name"
-msgid "P4 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:281
-msgctxt "input-name"
-msgid "P4 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:282
-msgctxt "input-name"
-msgid "P4 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:283
-msgctxt "input-name"
-msgid "P4 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:284
-msgctxt "input-name"
-msgid "P4 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:289
-msgctxt "input-name"
-msgid "P5 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:290
-msgctxt "input-name"
-msgid "P5 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:291
-msgctxt "input-name"
-msgid "P5 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:292
-msgctxt "input-name"
-msgid "P5 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:293
-msgctxt "input-name"
-msgid "P5 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:294
-msgctxt "input-name"
-msgid "P5 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:295
-msgctxt "input-name"
-msgid "P5 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:296
-msgctxt "input-name"
-msgid "P5 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:297
-msgctxt "input-name"
-msgid "P5 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:298
-msgctxt "input-name"
-msgid "P5 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:299
-msgctxt "input-name"
-msgid "P5 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:300
-msgctxt "input-name"
-msgid "P5 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:301
-msgctxt "input-name"
-msgid "P5 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:302
-msgctxt "input-name"
-msgid "P5 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:303
-msgctxt "input-name"
-msgid "P5 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:304
-msgctxt "input-name"
-msgid "P5 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:305
-msgctxt "input-name"
-msgid "P5 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:306
-msgctxt "input-name"
-msgid "P5 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:307
-msgctxt "input-name"
-msgid "P5 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:308
-msgctxt "input-name"
-msgid "P5 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:309
-msgctxt "input-name"
-msgid "P5 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:310
-msgctxt "input-name"
-msgid "P5 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:311
-msgctxt "input-name"
-msgid "P5 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:312
-msgctxt "input-name"
-msgid "P5 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:313
-msgctxt "input-name"
-msgid "P5 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:314
-msgctxt "input-name"
-msgid "P5 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:315
-msgctxt "input-name"
-msgid "P5 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:316
-msgctxt "input-name"
-msgid "P5 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:317
-msgctxt "input-name"
-msgid "P5 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:318
-msgctxt "input-name"
-msgid "P5 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:323
-msgctxt "input-name"
-msgid "P6 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:324
-msgctxt "input-name"
-msgid "P6 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:325
-msgctxt "input-name"
-msgid "P6 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:326
-msgctxt "input-name"
-msgid "P6 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:327
-msgctxt "input-name"
-msgid "P6 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:328
-msgctxt "input-name"
-msgid "P6 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:329
-msgctxt "input-name"
-msgid "P6 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:330
-msgctxt "input-name"
-msgid "P6 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:331
-msgctxt "input-name"
-msgid "P6 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:332
-msgctxt "input-name"
-msgid "P6 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:333
-msgctxt "input-name"
-msgid "P6 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:334
-msgctxt "input-name"
-msgid "P6 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:335
-msgctxt "input-name"
-msgid "P6 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:336
-msgctxt "input-name"
-msgid "P6 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:337
-msgctxt "input-name"
-msgid "P6 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:338
-msgctxt "input-name"
-msgid "P6 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:339
-msgctxt "input-name"
-msgid "P6 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:340
-msgctxt "input-name"
-msgid "P6 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:341
-msgctxt "input-name"
-msgid "P6 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:342
-msgctxt "input-name"
-msgid "P6 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:343
-msgctxt "input-name"
-msgid "P6 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:344
-msgctxt "input-name"
-msgid "P6 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:345
-msgctxt "input-name"
-msgid "P6 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:346
-msgctxt "input-name"
-msgid "P6 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:347
-msgctxt "input-name"
-msgid "P6 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:348
-msgctxt "input-name"
-msgid "P6 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:349
-msgctxt "input-name"
-msgid "P6 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:350
-msgctxt "input-name"
-msgid "P6 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:351
-msgctxt "input-name"
-msgid "P6 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:352
-msgctxt "input-name"
-msgid "P6 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:357
-msgctxt "input-name"
-msgid "P7 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:358
-msgctxt "input-name"
-msgid "P7 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:359
-msgctxt "input-name"
-msgid "P7 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:360
-msgctxt "input-name"
-msgid "P7 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:361
-msgctxt "input-name"
-msgid "P7 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:362
-msgctxt "input-name"
-msgid "P7 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:363
-msgctxt "input-name"
-msgid "P7 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:364
-msgctxt "input-name"
-msgid "P7 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:365
-msgctxt "input-name"
-msgid "P7 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:366
-msgctxt "input-name"
-msgid "P7 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:367
-msgctxt "input-name"
-msgid "P7 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:368
-msgctxt "input-name"
-msgid "P7 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:369
-msgctxt "input-name"
-msgid "P7 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:370
-msgctxt "input-name"
-msgid "P7 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:371
-msgctxt "input-name"
-msgid "P7 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:372
-msgctxt "input-name"
-msgid "P7 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:373
-msgctxt "input-name"
-msgid "P7 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:374
-msgctxt "input-name"
-msgid "P7 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:375
-msgctxt "input-name"
-msgid "P7 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:376
-msgctxt "input-name"
-msgid "P7 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:377
-msgctxt "input-name"
-msgid "P7 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:378
-msgctxt "input-name"
-msgid "P7 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:379
-msgctxt "input-name"
-msgid "P7 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:380
-msgctxt "input-name"
-msgid "P7 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:381
-msgctxt "input-name"
-msgid "P7 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:382
-msgctxt "input-name"
-msgid "P7 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:383
-msgctxt "input-name"
-msgid "P7 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:384
-msgctxt "input-name"
-msgid "P7 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:385
-msgctxt "input-name"
-msgid "P7 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:386
-msgctxt "input-name"
-msgid "P7 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:391
-msgctxt "input-name"
-msgid "P8 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:392
-msgctxt "input-name"
-msgid "P8 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:393
-msgctxt "input-name"
-msgid "P8 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:394
-msgctxt "input-name"
-msgid "P8 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:395
-msgctxt "input-name"
-msgid "P8 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:396
-msgctxt "input-name"
-msgid "P8 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:397
-msgctxt "input-name"
-msgid "P8 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:398
-msgctxt "input-name"
-msgid "P8 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:399
-msgctxt "input-name"
-msgid "P8 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:400
-msgctxt "input-name"
-msgid "P8 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:401
-msgctxt "input-name"
-msgid "P8 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:402
-msgctxt "input-name"
-msgid "P8 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:403
-msgctxt "input-name"
-msgid "P8 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:404
-msgctxt "input-name"
-msgid "P8 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:405
-msgctxt "input-name"
-msgid "P8 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:406
-msgctxt "input-name"
-msgid "P8 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:407
-msgctxt "input-name"
-msgid "P8 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:408
-msgctxt "input-name"
-msgid "P8 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:409
-msgctxt "input-name"
-msgid "P8 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:410
-msgctxt "input-name"
-msgid "P8 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:411
-msgctxt "input-name"
-msgid "P8 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:412
-msgctxt "input-name"
-msgid "P8 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:413
-msgctxt "input-name"
-msgid "P8 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:414
-msgctxt "input-name"
-msgid "P8 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:415
-msgctxt "input-name"
-msgid "P8 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:416
-msgctxt "input-name"
-msgid "P8 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:417
-msgctxt "input-name"
-msgid "P8 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:418
-msgctxt "input-name"
-msgid "P8 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:419
-msgctxt "input-name"
-msgid "P8 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:420
-msgctxt "input-name"
-msgid "P8 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:425
-msgctxt "input-name"
-msgid "P9 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:426
-msgctxt "input-name"
-msgid "P9 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:427
-msgctxt "input-name"
-msgid "P9 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:428
-msgctxt "input-name"
-msgid "P9 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:429
-msgctxt "input-name"
-msgid "P9 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:430
-msgctxt "input-name"
-msgid "P9 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:431
-msgctxt "input-name"
-msgid "P9 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:432
-msgctxt "input-name"
-msgid "P9 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:433
-msgctxt "input-name"
-msgid "P9 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:434
-msgctxt "input-name"
-msgid "P9 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:435
-msgctxt "input-name"
-msgid "P9 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:436
-msgctxt "input-name"
-msgid "P9 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:437
-msgctxt "input-name"
-msgid "P9 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:438
-msgctxt "input-name"
-msgid "P9 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:439
-msgctxt "input-name"
-msgid "P9 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:440
-msgctxt "input-name"
-msgid "P9 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:441
-msgctxt "input-name"
-msgid "P9 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:442
-msgctxt "input-name"
-msgid "P9 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:443
-msgctxt "input-name"
-msgid "P9 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:444
-msgctxt "input-name"
-msgid "P9 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:445
-msgctxt "input-name"
-msgid "P9 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:446
-msgctxt "input-name"
-msgid "P9 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:447
-msgctxt "input-name"
-msgid "P9 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:448
-msgctxt "input-name"
-msgid "P9 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:449
-msgctxt "input-name"
-msgid "P9 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:450
-msgctxt "input-name"
-msgid "P9 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:451
-msgctxt "input-name"
-msgid "P9 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:452
-msgctxt "input-name"
-msgid "P9 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:453
-msgctxt "input-name"
-msgid "P9 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:454
-msgctxt "input-name"
-msgid "P9 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:459
-msgctxt "input-name"
-msgid "P10 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:460
-msgctxt "input-name"
-msgid "P10 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:461
-msgctxt "input-name"
-msgid "P10 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:462
-msgctxt "input-name"
-msgid "P10 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:463
-msgctxt "input-name"
-msgid "P10 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:464
-msgctxt "input-name"
-msgid "P10 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:465
-msgctxt "input-name"
-msgid "P10 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:466
-msgctxt "input-name"
-msgid "P10 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:467
-msgctxt "input-name"
-msgid "P10 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:468
-msgctxt "input-name"
-msgid "P10 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:469
-msgctxt "input-name"
-msgid "P10 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:470
-msgctxt "input-name"
-msgid "P10 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:471
-msgctxt "input-name"
-msgid "P10 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:472
-msgctxt "input-name"
-msgid "P10 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:473
-msgctxt "input-name"
-msgid "P10 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:474
-msgctxt "input-name"
-msgid "P10 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:475
-msgctxt "input-name"
-msgid "P10 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:476
-msgctxt "input-name"
-msgid "P10 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:477
-msgctxt "input-name"
-msgid "P10 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:478
-msgctxt "input-name"
-msgid "P10 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:479
-msgctxt "input-name"
-msgid "P10 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:480
-msgctxt "input-name"
-msgid "P10 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:481
-msgctxt "input-name"
-msgid "P10 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:482
-msgctxt "input-name"
-msgid "P10 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:483
-msgctxt "input-name"
-msgid "P10 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:484
-msgctxt "input-name"
-msgid "P10 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:485
-msgctxt "input-name"
-msgid "P10 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:486
-msgctxt "input-name"
-msgid "P10 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:487
-msgctxt "input-name"
-msgid "P10 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:488
-msgctxt "input-name"
-msgid "P10 Select"
-msgstr ""
-
 #: src/emu/inpttype.ipp:493
 msgctxt "input-name"
 msgid "1 Player Start"
@@ -5479,154 +4108,31 @@ msgctxt "input-name"
 msgid "Volume Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:550
-msgctxt "input-name"
-msgid "P1 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:551
-msgctxt "input-name"
-msgid "P2 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:552
-msgctxt "input-name"
-msgid "P3 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:553
-msgctxt "input-name"
-msgid "P4 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:554
-msgctxt "input-name"
-msgid "P5 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:555
-msgctxt "input-name"
-msgid "P6 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:556
-msgctxt "input-name"
-msgid "P7 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:557
-msgctxt "input-name"
-msgid "P8 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:558
-msgctxt "input-name"
-msgid "P9 Pedal 1"
-msgstr ""
-
+#: src/emu/inpttype.ipp:550 src/emu/inpttype.ipp:551 src/emu/inpttype.ipp:552
+#: src/emu/inpttype.ipp:553 src/emu/inpttype.ipp:554 src/emu/inpttype.ipp:555
+#: src/emu/inpttype.ipp:556 src/emu/inpttype.ipp:557 src/emu/inpttype.ipp:558
 #: src/emu/inpttype.ipp:559
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:564
-msgctxt "input-name"
-msgid "P1 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:565
-msgctxt "input-name"
-msgid "P2 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:566
-msgctxt "input-name"
-msgid "P3 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:567
-msgctxt "input-name"
-msgid "P4 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:568
-msgctxt "input-name"
-msgid "P5 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:569
-msgctxt "input-name"
-msgid "P6 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:570
-msgctxt "input-name"
-msgid "P7 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:571
-msgctxt "input-name"
-msgid "P8 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:572
-msgctxt "input-name"
-msgid "P9 Pedal 2"
+msgid "%p Pedal 1"
 msgstr ""
 
+#: src/emu/inpttype.ipp:564 src/emu/inpttype.ipp:565 src/emu/inpttype.ipp:566
+#: src/emu/inpttype.ipp:567 src/emu/inpttype.ipp:568 src/emu/inpttype.ipp:569
+#: src/emu/inpttype.ipp:570 src/emu/inpttype.ipp:571 src/emu/inpttype.ipp:572
 #: src/emu/inpttype.ipp:573
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:578
-msgctxt "input-name"
-msgid "P1 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:579
-msgctxt "input-name"
-msgid "P2 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:580
-msgctxt "input-name"
-msgid "P3 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:581
-msgctxt "input-name"
-msgid "P4 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:582
-msgctxt "input-name"
-msgid "P5 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:583
-msgctxt "input-name"
-msgid "P6 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:584
-msgctxt "input-name"
-msgid "P7 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:585
-msgctxt "input-name"
-msgid "P8 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:586
-msgctxt "input-name"
-msgid "P9 Pedal 3"
+msgid "%p Pedal 2"
 msgstr ""
 
+#: src/emu/inpttype.ipp:578 src/emu/inpttype.ipp:579 src/emu/inpttype.ipp:580
+#: src/emu/inpttype.ipp:581 src/emu/inpttype.ipp:582 src/emu/inpttype.ipp:583
+#: src/emu/inpttype.ipp:584 src/emu/inpttype.ipp:585 src/emu/inpttype.ipp:586
 #: src/emu/inpttype.ipp:587
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 3"
+msgid "%p Pedal 3"
 msgstr ""
 
 #: src/emu/inpttype.ipp:592
diff --git a/language/Bosnian/strings.po b/language/Bosnian/strings.po
index 3053e99be2c..2b0011f7fdc 100644
--- a/language/Bosnian/strings.po
+++ b/language/Bosnian/strings.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-19 02:50+1100\n"
+"POT-Creation-Date: 2021-12-09 04:44+1100\n"
 "PO-Revision-Date: 2016-02-20 18:03+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: MAME Language Team\n"
@@ -259,12 +259,12 @@ msgstr ""
 msgid "Driver: \"%1$s\" software list "
 msgstr ""
 
-#: src/frontend/mame/ui/selsoft.cpp:711 src/frontend/mame/ui/selgame.cpp:1066
+#: src/frontend/mame/ui/selsoft.cpp:711 src/frontend/mame/ui/selgame.cpp:1076
 #, c-format
 msgid "%1$s: %2$s - Search: %3$s_"
 msgstr ""
 
-#: src/frontend/mame/ui/selsoft.cpp:713 src/frontend/mame/ui/selgame.cpp:1068
+#: src/frontend/mame/ui/selsoft.cpp:713 src/frontend/mame/ui/selgame.cpp:1078
 #, c-format
 msgid "Search: %1$s_"
 msgstr ""
@@ -274,7 +274,7 @@ msgstr ""
 msgid "Software list/item: %1$s:%2$s"
 msgstr ""
 
-#: src/frontend/mame/ui/optsmenu.cpp:73 src/frontend/mame/ui/sndmenu.cpp:165
+#: src/frontend/mame/ui/optsmenu.cpp:73 src/frontend/mame/ui/sndmenu.cpp:161
 msgid "Sound Options"
 msgstr ""
 
@@ -369,11 +369,11 @@ msgid "Show mouse pointer"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:39
-msgid "Confirm quit from machines"
+msgid "Confirm quit from emulation"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:40
-msgid "Skip information screen at startup"
+msgid "Skip system information screen"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:41
@@ -389,7 +389,7 @@ msgid "Skip BIOS selection menu"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:44
-msgid "Skip software parts selection menu"
+msgid "Skip software part selection menu"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:45
@@ -541,7 +541,7 @@ msgid "UI active"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:91
-msgid "Offscreen reload"
+msgid "Off-screen reload"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:92
@@ -557,7 +557,7 @@ msgid "Natural keyboard"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:95
-msgid "Simultaneous contradictory"
+msgid "Allow contradictory joystick inputs"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:96
@@ -581,7 +581,7 @@ msgid "Pedal Device Assignment"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:106
-msgid "Adstick Device Assignment"
+msgid "AD Stick Device Assignment"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:107
@@ -668,14 +668,14 @@ msgstr ""
 msgid "Wait Vertical Sync"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:687
+#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:689
 #: src/frontend/mame/ui/videoopt.cpp:191 src/frontend/mame/ui/custui.cpp:490
 #: src/frontend/mame/ui/analogipt.cpp:471 plugins/cheatfind/init.lua:766
 #: plugins/cheatfind/init.lua:777 plugins/cheat/init.lua:668
 msgid "On"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:690
+#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:692
 #: src/frontend/mame/ui/videoopt.cpp:207 src/frontend/mame/ui/custui.cpp:490
 #: src/frontend/mame/ui/analogipt.cpp:471 plugins/cheatfind/init.lua:763
 #: plugins/cheatfind/init.lua:774 plugins/cheat/init.lua:671
@@ -683,11 +683,11 @@ msgstr ""
 msgid "Off"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:693
+#: src/frontend/mame/ui/menu.cpp:695
 msgid "Auto"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:1195
+#: src/frontend/mame/ui/menu.cpp:1197
 #: src/frontend/mame/ui/simpleselgame.cpp:278
 #: src/frontend/mame/ui/selmenu.cpp:1280
 msgid "Return to Previous Menu"
@@ -695,7 +695,7 @@ msgstr ""
 
 #: src/frontend/mame/ui/filemngr.cpp:139
 #: src/frontend/mame/ui/confswitch.cpp:119
-#: src/frontend/mame/ui/inputmap.cpp:559 src/frontend/mame/ui/analogipt.cpp:360
+#: src/frontend/mame/ui/inputmap.cpp:563 src/frontend/mame/ui/analogipt.cpp:360
 #, c-format
 msgid "[root%1$s]"
 msgstr ""
@@ -938,22 +938,22 @@ msgid ""
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "GHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "MHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "kHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "Hz"
 msgstr ""
 
@@ -977,38 +977,38 @@ msgstr ""
 msgid "Vector"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:480
+#: src/frontend/mame/ui/info.cpp:483
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:480
+#: src/frontend/mame/ui/info.cpp:483
 msgid "%2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:497
+#: src/frontend/mame/ui/info.cpp:500
 #, c-format
 msgid "Screen '%1$s'"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:499
+#: src/frontend/mame/ui/info.cpp:502
 msgid "Screen"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:570 src/frontend/mame/ui/info.cpp:581
+#: src/frontend/mame/ui/info.cpp:573 src/frontend/mame/ui/info.cpp:584
 #, c-format
 msgid "%1$s:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:662
+#: src/frontend/mame/ui/info.cpp:665
 msgid "Not supported"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:665
+#: src/frontend/mame/ui/info.cpp:668
 msgid "Partially supported"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:674
+#: src/frontend/mame/ui/info.cpp:677
 msgid "[empty]"
 msgstr ""
 
@@ -1081,7 +1081,7 @@ msgid "Emulated"
 msgstr ""
 
 #: src/frontend/mame/ui/keyboard.cpp:59 src/frontend/mame/ui/confswitch.cpp:117
-#: src/frontend/mame/ui/inputmap.cpp:557 src/frontend/mame/ui/analogipt.cpp:358
+#: src/frontend/mame/ui/inputmap.cpp:561 src/frontend/mame/ui/analogipt.cpp:358
 #, c-format
 msgid "%1$s [root%2$s]"
 msgstr ""
@@ -1441,7 +1441,7 @@ msgctxt "swlist-info"
 msgid "Software list/item"
 msgstr ""
 
-#: src/frontend/mame/ui/datmenu.cpp:88 src/frontend/mame/ui/selmenu.cpp:2698
+#: src/frontend/mame/ui/datmenu.cpp:88 src/frontend/mame/ui/selmenu.cpp:2707
 msgid "Software List Info"
 msgstr ""
 
@@ -1556,7 +1556,7 @@ msgstr ""
 msgid "Configure Machine:"
 msgstr ""
 
-#: src/frontend/mame/ui/miscmenu.cpp:858 src/frontend/mame/ui/selmenu.cpp:2638
+#: src/frontend/mame/ui/miscmenu.cpp:858 src/frontend/mame/ui/selmenu.cpp:2647
 msgid " (default)"
 msgstr ""
 
@@ -1573,7 +1573,7 @@ msgid ""
 "Press %2$s to return to emulation"
 msgstr ""
 
-#: src/frontend/mame/ui/info_pty.cpp:30 src/frontend/mame/ui/mainmenu.cpp:155
+#: src/frontend/mame/ui/info_pty.cpp:30
 msgid "Pseudo terminals"
 msgstr ""
 
@@ -1641,52 +1641,52 @@ msgstr ""
 msgid "Other Controls"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:227
+#: src/frontend/mame/ui/inputmap.cpp:231
 msgid "This machine has no configurable inputs."
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:327
+#: src/frontend/mame/ui/inputmap.cpp:331
 msgid "Pressed"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:397
+#: src/frontend/mame/ui/inputmap.cpp:401
 msgid "Invalid sequence entered"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:542
+#: src/frontend/mame/ui/inputmap.cpp:546
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:543
+#: src/frontend/mame/ui/inputmap.cpp:547
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog Inc"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:544
+#: src/frontend/mame/ui/inputmap.cpp:548
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog Dec"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:586
+#: src/frontend/mame/ui/inputmap.cpp:590
 #, c-format
 msgid "Press %1$s to set\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:587
+#: src/frontend/mame/ui/inputmap.cpp:591
 #, c-format
 msgid "Press %1$s to append\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:588
+#: src/frontend/mame/ui/inputmap.cpp:592
 #, c-format
 msgid "Press %1$s to clear\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:589
+#: src/frontend/mame/ui/inputmap.cpp:593
 #, c-format
 msgid "Press %1$s to restore default\n"
 msgstr ""
@@ -1750,7 +1750,7 @@ msgid ""
 msgstr ""
 
 #: src/frontend/mame/ui/simpleselgame.cpp:273
-#: src/frontend/mame/ui/selgame.cpp:436
+#: src/frontend/mame/ui/selgame.cpp:443
 msgid "Configure Options"
 msgstr ""
 
@@ -2078,16 +2078,16 @@ msgstr ""
 msgid "Expand to fit"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:437
+#: src/frontend/mame/ui/selgame.cpp:444
 msgid "Configure Machine"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:1050
+#: src/frontend/mame/ui/selgame.cpp:1060
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d machines (%5$d BIOS) )"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:1078
+#: src/frontend/mame/ui/selgame.cpp:1088
 #, c-format
 msgid "System: %1$-.100s"
 msgstr ""
@@ -2109,7 +2109,7 @@ msgstr ""
 #: src/frontend/mame/ui/auditmenu.cpp:98
 #, c-format
 msgid ""
-"Auditing ROMs for machine %2$u of %3$u...\n"
+"Auditing media for machine %2$u of %3$u...\n"
 "%1$s"
 msgstr ""
 
@@ -2124,12 +2124,12 @@ msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:136
 #, c-format
-msgid "Audit ROMs for %1$u machines marked unavailable"
+msgid "Audit media for %1$u machines marked unavailable"
 msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:137
 #, c-format
-msgid "Audit ROMs for all %1$u machines"
+msgid "Audit media for all %1$u machines"
 msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:154
@@ -2335,84 +2335,84 @@ msgctxt "color-sample"
 msgid "Clone"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:914
+#: src/frontend/mame/ui/custui.cpp:906
 msgid "ARGB Settings"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:919 src/frontend/mame/ui/custui.cpp:922
+#: src/frontend/mame/ui/custui.cpp:911 src/frontend/mame/ui/custui.cpp:914
 msgctxt "color-channel"
 msgid "Alpha"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:927 src/frontend/mame/ui/custui.cpp:930
+#: src/frontend/mame/ui/custui.cpp:919 src/frontend/mame/ui/custui.cpp:922
 msgctxt "color-channel"
 msgid "Red"
 msgstr ""
 
+#: src/frontend/mame/ui/custui.cpp:927 src/frontend/mame/ui/custui.cpp:930
+msgctxt "color-channel"
+msgid "Green"
+msgstr ""
+
 #: src/frontend/mame/ui/custui.cpp:935 src/frontend/mame/ui/custui.cpp:938
 msgctxt "color-channel"
-msgid "Green"
-msgstr ""
-
-#: src/frontend/mame/ui/custui.cpp:943 src/frontend/mame/ui/custui.cpp:946
-msgctxt "color-channel"
 msgid "Blue"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:949
+#: src/frontend/mame/ui/custui.cpp:941
 msgid "Choose from palette"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:996
+#: src/frontend/mame/ui/custui.cpp:988
 msgid "Color preview:"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1093
+#: src/frontend/mame/ui/custui.cpp:1085
 msgctxt "color-preset"
 msgid "White"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1094
+#: src/frontend/mame/ui/custui.cpp:1086
 msgctxt "color-preset"
 msgid "Silver"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1095
+#: src/frontend/mame/ui/custui.cpp:1087
 msgctxt "color-preset"
 msgid "Gray"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1096
+#: src/frontend/mame/ui/custui.cpp:1088
 msgctxt "color-preset"
 msgid "Black"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1097
+#: src/frontend/mame/ui/custui.cpp:1089
 msgctxt "color-preset"
 msgid "Red"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1098
+#: src/frontend/mame/ui/custui.cpp:1090
 msgctxt "color-preset"
 msgid "Orange"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1099
+#: src/frontend/mame/ui/custui.cpp:1091
 msgctxt "color-preset"
 msgid "Yellow"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1100
+#: src/frontend/mame/ui/custui.cpp:1092
 msgctxt "color-preset"
 msgid "Green"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1101
+#: src/frontend/mame/ui/custui.cpp:1093
 msgctxt "color-preset"
 msgid "Blue"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1102
+#: src/frontend/mame/ui/custui.cpp:1094
 msgctxt "color-preset"
 msgid "Violet"
 msgstr ""
@@ -2477,7 +2477,7 @@ msgid "Input (general)"
 msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:123
-msgid "Input (this Machine)"
+msgid "Input (this machine)"
 msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:126
@@ -2516,6 +2516,10 @@ msgstr ""
 msgid "Tape Control"
 msgstr ""
 
+#: src/frontend/mame/ui/mainmenu.cpp:155
+msgid "Pseudo Terminals"
+msgstr ""
+
 #: src/frontend/mame/ui/mainmenu.cpp:158
 msgid "BIOS Selection"
 msgstr ""
@@ -2554,7 +2558,7 @@ msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:200
 #, c-format
-msgid "About %s"
+msgid "About %1$s"
 msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:212
@@ -2714,373 +2718,373 @@ msgstr ""
 msgid "%1$s %2$s"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2235
+#: src/frontend/mame/ui/selmenu.cpp:2244
 msgid "Images"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2236
+#: src/frontend/mame/ui/selmenu.cpp:2245
 msgid "Infos"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2551
+#: src/frontend/mame/ui/selmenu.cpp:2560
 msgid ""
 "Required ROM/disk images for the selected system are missing or incorrect. "
 "Please acquire the correct files or select a different system.\n"
 "\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2567
+#: src/frontend/mame/ui/selmenu.cpp:2576
 msgid ""
 "Required ROM/disk images for the selected software are missing or incorrect. "
 "Please acquire the correct files or select a different software item.\n"
 "\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2583
+#: src/frontend/mame/ui/selmenu.cpp:2592
 msgid "incorrect checksum"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2586
+#: src/frontend/mame/ui/selmenu.cpp:2595
 msgid "incorrect length"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2589
+#: src/frontend/mame/ui/selmenu.cpp:2598
 msgid "not found"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2600
+#: src/frontend/mame/ui/selmenu.cpp:2609
 #, c-format
 msgid "%1$s (%2$s) - %3$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2602
+#: src/frontend/mame/ui/selmenu.cpp:2611
 #, c-format
 msgid "%1$s - %2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2606
+#: src/frontend/mame/ui/selmenu.cpp:2615
 msgid "Press any key to continue."
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2735
+#: src/frontend/mame/ui/selmenu.cpp:2744
 msgid "General Info"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2887
-#, c-format
-msgid "Romset\t%1$s\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2888
-#, c-format
-msgid "Year\t%1$s\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2889
-#, c-format
-msgid "Manufacturer\t%1$s\n"
-msgstr ""
-
 #: src/frontend/mame/ui/selmenu.cpp:2896
 #, c-format
-msgid "Driver is Clone of\t%1$s\n"
+msgid "Romset\t%1$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2901
-msgid "Driver is Parent\t\n"
+#: src/frontend/mame/ui/selmenu.cpp:2897
+#, c-format
+msgid "Year\t%1$s\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2898
+#, c-format
+msgid "Manufacturer\t%1$s\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2905
-msgid "Analog Controls\tYes\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2907
-msgid "Keyboard Inputs\tYes\n"
+#, c-format
+msgid "Driver is Clone of\t%1$s\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2910
-msgid "Overall\tNOT WORKING\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2912
-msgid "Overall\tUnemulated Protection\n"
+msgid "Driver is Parent\t\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2914
-msgid "Overall\tWorking\n"
+msgid "Analog Controls\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2917
-msgid "Graphics\tUnimplemented\n"
+#: src/frontend/mame/ui/selmenu.cpp:2916
+msgid "Keyboard Inputs\tYes\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2919
-msgid "Graphics\tWrong Colors\n"
+msgid "Overall\tNOT WORKING\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2921
-msgid "Graphics\tImperfect Colors\n"
+msgid "Overall\tUnemulated Protection\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2923
-msgid "Graphics\tImperfect\n"
+msgid "Overall\tWorking\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2925
-msgid "Graphics\tOK\n"
+#: src/frontend/mame/ui/selmenu.cpp:2926
+msgid "Graphics\tUnimplemented\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2928
-msgid "Sound\tNone\n"
+msgid "Graphics\tWrong Colors\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2930
-msgid "Sound\tUnimplemented\n"
+msgid "Graphics\tImperfect Colors\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2932
-msgid "Sound\tImperfect\n"
+msgid "Graphics\tImperfect\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2934
-msgid "Sound\tOK\n"
+msgid "Graphics\tOK\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2937
-msgid "Capture\tUnimplemented\n"
+msgid "Sound\tNone\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2939
+msgid "Sound\tUnimplemented\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2941
+msgid "Sound\tImperfect\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2943
+msgid "Sound\tOK\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2946
+msgid "Capture\tUnimplemented\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2948
 msgid "Capture\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2942
+#: src/frontend/mame/ui/selmenu.cpp:2951
 msgid "Camera\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2944
+#: src/frontend/mame/ui/selmenu.cpp:2953
 msgid "Camera\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2947
+#: src/frontend/mame/ui/selmenu.cpp:2956
 msgid "Microphone\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2949
+#: src/frontend/mame/ui/selmenu.cpp:2958
 msgid "Microphone\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2952
+#: src/frontend/mame/ui/selmenu.cpp:2961
 msgid "Controls\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2954
+#: src/frontend/mame/ui/selmenu.cpp:2963
 msgid "Controls\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2957
+#: src/frontend/mame/ui/selmenu.cpp:2966
 msgid "Keyboard\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2959
+#: src/frontend/mame/ui/selmenu.cpp:2968
 msgid "Keyboard\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2962
+#: src/frontend/mame/ui/selmenu.cpp:2971
 msgid "Mouse\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2964
+#: src/frontend/mame/ui/selmenu.cpp:2973
 msgid "Mouse\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2967
+#: src/frontend/mame/ui/selmenu.cpp:2976
 msgid "Media\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2969
+#: src/frontend/mame/ui/selmenu.cpp:2978
 msgid "Media\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2972
+#: src/frontend/mame/ui/selmenu.cpp:2981
 msgid "Disk\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2974
+#: src/frontend/mame/ui/selmenu.cpp:2983
 msgid "Disk\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2977
+#: src/frontend/mame/ui/selmenu.cpp:2986
 msgid "Printer\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2979
+#: src/frontend/mame/ui/selmenu.cpp:2988
 msgid "Printer\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2982
+#: src/frontend/mame/ui/selmenu.cpp:2991
 msgid "Mag. Tape\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2984
+#: src/frontend/mame/ui/selmenu.cpp:2993
 msgid "Mag. Tape\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2987
+#: src/frontend/mame/ui/selmenu.cpp:2996
 msgid "Punch Tape\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2989
+#: src/frontend/mame/ui/selmenu.cpp:2998
 msgid "Punch Tape\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2992
+#: src/frontend/mame/ui/selmenu.cpp:3001
 msgid "Mag. Drum\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2994
+#: src/frontend/mame/ui/selmenu.cpp:3003
 msgid "Mag. Drum\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2997
+#: src/frontend/mame/ui/selmenu.cpp:3006
 msgid "(EP)ROM\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2999
+#: src/frontend/mame/ui/selmenu.cpp:3008
 msgid "(EP)ROM\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3002
+#: src/frontend/mame/ui/selmenu.cpp:3011
 msgid "Communications\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3004
+#: src/frontend/mame/ui/selmenu.cpp:3013
 msgid "Communications\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3007
+#: src/frontend/mame/ui/selmenu.cpp:3016
 msgid "LAN\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3009
+#: src/frontend/mame/ui/selmenu.cpp:3018
 msgid "LAN\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3012
+#: src/frontend/mame/ui/selmenu.cpp:3021
 msgid "WAN\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3014
+#: src/frontend/mame/ui/selmenu.cpp:3023
 msgid "WAN\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3017
+#: src/frontend/mame/ui/selmenu.cpp:3026
 msgid "Timing\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3019
+#: src/frontend/mame/ui/selmenu.cpp:3028
 msgid "Timing\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3021
+#: src/frontend/mame/ui/selmenu.cpp:3030
 msgid "Mechanical Machine\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3021
+#: src/frontend/mame/ui/selmenu.cpp:3030
 msgid "Mechanical Machine\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3022
+#: src/frontend/mame/ui/selmenu.cpp:3031
 msgid "Requires Artwork\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3022
+#: src/frontend/mame/ui/selmenu.cpp:3031
 msgid "Requires Artwork\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3023
+#: src/frontend/mame/ui/selmenu.cpp:3032
 msgid "Requires Clickable Artwork\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3023
+#: src/frontend/mame/ui/selmenu.cpp:3032
 msgid "Requires Clickable Artwork\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3025
+#: src/frontend/mame/ui/selmenu.cpp:3034
 msgid "Support Cocktail\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3026
+#: src/frontend/mame/ui/selmenu.cpp:3035
 msgid "Driver is BIOS\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3026
+#: src/frontend/mame/ui/selmenu.cpp:3035
 msgid "Driver is BIOS\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3027
+#: src/frontend/mame/ui/selmenu.cpp:3036
 msgid "Support Save\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3027
+#: src/frontend/mame/ui/selmenu.cpp:3036
 msgid "Support Save\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3028
+#: src/frontend/mame/ui/selmenu.cpp:3037
 msgid "Screen Orientation\tVertical\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3028
+#: src/frontend/mame/ui/selmenu.cpp:3037
 msgid "Screen Orientation\tHorizontal\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3038
+#: src/frontend/mame/ui/selmenu.cpp:3047
 msgid "Requires CHD\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3038
+#: src/frontend/mame/ui/selmenu.cpp:3047
 msgid "Requires CHD\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3051
-msgid "ROM Audit Result\tOK\n"
+#: src/frontend/mame/ui/selmenu.cpp:3060
+msgid "Media Audit Result\tOK\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3053
-msgid "ROM Audit Result\tBAD\n"
+#: src/frontend/mame/ui/selmenu.cpp:3062
+msgid "Media Audit Result\tBAD\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3056
+#: src/frontend/mame/ui/selmenu.cpp:3065
 msgid "Samples Audit Result\tNone Needed\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3058
+#: src/frontend/mame/ui/selmenu.cpp:3067
 msgid "Samples Audit Result\tOK\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3060
+#: src/frontend/mame/ui/selmenu.cpp:3069
 msgid "Samples Audit Result\tBAD\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3064
+#: src/frontend/mame/ui/selmenu.cpp:3073
 msgid ""
-"ROM Audit \tDisabled\n"
-"Samples Audit \tDisabled\n"
+"Media Audit\tDisabled\n"
+"Samples Audit\tDisabled\n"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:150
+#: src/frontend/mame/ui/sndmenu.cpp:146
 msgid "Sound"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:151
+#: src/frontend/mame/ui/sndmenu.cpp:147
 msgid "Compressor"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:152
+#: src/frontend/mame/ui/sndmenu.cpp:148
 msgid "Sample Rate"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:153
+#: src/frontend/mame/ui/sndmenu.cpp:149
 msgid "Use External Samples"
 msgstr ""
 
@@ -3119,511 +3123,681 @@ msgstr ""
 msgid "  Screen '%1$s': Vector\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:132
+#: src/frontend/mame/ui/devopt.cpp:135
 #, c-format
 msgid "  Screen '%1$s': %2$d × %3$d (V) %4$s Hz\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:133
+#: src/frontend/mame/ui/devopt.cpp:136
 #, c-format
 msgid "  Screen '%1$s': %2$d × %3$d (H) %4$s Hz\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:147
+#: src/frontend/mame/ui/devopt.cpp:150
 msgid "* Sound:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:211
+#: src/frontend/mame/ui/devopt.cpp:214
 #, c-format
 msgid ""
 "* BIOS settings:\n"
 "  %1$d options    [default: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:255 src/frontend/mame/ui/devopt.cpp:271
-#: src/frontend/mame/ui/devopt.cpp:332
+#: src/frontend/mame/ui/devopt.cpp:258 src/frontend/mame/ui/devopt.cpp:274
+#: src/frontend/mame/ui/devopt.cpp:335
 #, c-format
 msgid "  %1$s    [default: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:260 src/frontend/mame/ui/devopt.cpp:276
+#: src/frontend/mame/ui/devopt.cpp:263 src/frontend/mame/ui/devopt.cpp:279
 #, c-format
 msgid "  %1$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:282
+#: src/frontend/mame/ui/devopt.cpp:285
 msgid "* DIP switch settings:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:287
+#: src/frontend/mame/ui/devopt.cpp:290
 msgid "* Configuration settings:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:291
+#: src/frontend/mame/ui/devopt.cpp:294
 msgid "* Input device(s):\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:293
+#: src/frontend/mame/ui/devopt.cpp:296
 #, c-format
 msgid "  User inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:295
+#: src/frontend/mame/ui/devopt.cpp:298
 #, c-format
 msgid "  Mahjong inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:297
+#: src/frontend/mame/ui/devopt.cpp:300
 #, c-format
 msgid "  Hanafuda inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:299
+#: src/frontend/mame/ui/devopt.cpp:302
 #, c-format
 msgid "  Gambling inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:301
+#: src/frontend/mame/ui/devopt.cpp:304
 #, c-format
 msgid "  Analog inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:303
+#: src/frontend/mame/ui/devopt.cpp:306
 #, c-format
 msgid "  Adjuster inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:305
+#: src/frontend/mame/ui/devopt.cpp:308
 #, c-format
 msgid "  Keypad inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:307
+#: src/frontend/mame/ui/devopt.cpp:310
 #, c-format
 msgid "  Keyboard inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:312
+#: src/frontend/mame/ui/devopt.cpp:315
 msgid "* Media Options:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:317
+#: src/frontend/mame/ui/devopt.cpp:320
 #, c-format
 msgid "  %1$s    [tag: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:327
+#: src/frontend/mame/ui/devopt.cpp:330
 msgid "* Slot Options:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:341
+#: src/frontend/mame/ui/devopt.cpp:344
 msgid "[None]\n"
 msgstr ""
 
-#: src/emu/render.cpp:1847
+#: src/emu/render.cpp:1796
 #, c-format
 msgctxt "view-name"
 msgid "Screen %1$u Standard (%2$u:%3$u)"
 msgstr ""
 
-#: src/emu/render.cpp:1873
+#: src/emu/render.cpp:1822
 #, c-format
 msgctxt "view-name"
 msgid "Screen %1$u Pixel Aspect (%2$u:%3$u)"
 msgstr ""
 
-#: src/emu/render.cpp:1895 src/emu/render.cpp:2030
+#: src/emu/render.cpp:1844 src/emu/render.cpp:1979
 msgctxt "view-name"
 msgid "Cocktail"
 msgstr ""
 
-#: src/emu/render.cpp:2015
+#: src/emu/render.cpp:1964
 msgctxt "view-name"
 msgid "Left-to-Right"
 msgstr ""
 
-#: src/emu/render.cpp:2016
+#: src/emu/render.cpp:1965
 msgctxt "view-name"
 msgid "Left-to-Right (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2017
+#: src/emu/render.cpp:1966
 msgctxt "view-name"
 msgid "Top-to-Bottom"
 msgstr ""
 
-#: src/emu/render.cpp:2018
+#: src/emu/render.cpp:1967
 msgctxt "view-name"
 msgid "Top-to-Bottom (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2069
+#: src/emu/render.cpp:2018
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Left-to-Right, Top-to-Bottom"
 msgstr ""
 
-#: src/emu/render.cpp:2078
+#: src/emu/render.cpp:2027
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Left-to-Right, Top-to-Bottom (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2087
+#: src/emu/render.cpp:2036
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Top-to-Bottom, Left-to-Right"
 msgstr ""
 
-#: src/emu/render.cpp:2096
+#: src/emu/render.cpp:2045
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Top-to-Bottom, Left-to-Right (Gapless)"
 msgstr ""
 
-#: src/emu/inpttype.ipp:22
+#: src/emu/ioport.cpp:332
+#, c-format
 msgctxt "input-name"
-msgid "P1 Up"
+msgid "P%1$u"
 msgstr ""
 
-#: src/emu/inpttype.ipp:23
+#: src/emu/ioport.cpp:1924
 msgctxt "input-name"
-msgid "P1 Down"
+msgid "???"
 msgstr ""
 
-#: src/emu/inpttype.ipp:24
+#: src/emu/inpttype.ipp:22 src/emu/inpttype.ipp:140 src/emu/inpttype.ipp:221
+#: src/emu/inpttype.ipp:255 src/emu/inpttype.ipp:289 src/emu/inpttype.ipp:323
+#: src/emu/inpttype.ipp:357 src/emu/inpttype.ipp:391 src/emu/inpttype.ipp:425
+#: src/emu/inpttype.ipp:459
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left"
+msgid "%p Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:25
+#: src/emu/inpttype.ipp:23 src/emu/inpttype.ipp:141 src/emu/inpttype.ipp:222
+#: src/emu/inpttype.ipp:256 src/emu/inpttype.ipp:290 src/emu/inpttype.ipp:324
+#: src/emu/inpttype.ipp:358 src/emu/inpttype.ipp:392 src/emu/inpttype.ipp:426
+#: src/emu/inpttype.ipp:460
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right"
+msgid "%p Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:26
+#: src/emu/inpttype.ipp:24 src/emu/inpttype.ipp:142 src/emu/inpttype.ipp:223
+#: src/emu/inpttype.ipp:257 src/emu/inpttype.ipp:291 src/emu/inpttype.ipp:325
+#: src/emu/inpttype.ipp:359 src/emu/inpttype.ipp:393 src/emu/inpttype.ipp:427
+#: src/emu/inpttype.ipp:461
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Up"
+msgid "%p Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:27
+#: src/emu/inpttype.ipp:25 src/emu/inpttype.ipp:143 src/emu/inpttype.ipp:224
+#: src/emu/inpttype.ipp:258 src/emu/inpttype.ipp:292 src/emu/inpttype.ipp:326
+#: src/emu/inpttype.ipp:360 src/emu/inpttype.ipp:394 src/emu/inpttype.ipp:428
+#: src/emu/inpttype.ipp:462
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Down"
+msgid "%p Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:28
+#: src/emu/inpttype.ipp:26 src/emu/inpttype.ipp:144 src/emu/inpttype.ipp:225
+#: src/emu/inpttype.ipp:259 src/emu/inpttype.ipp:293 src/emu/inpttype.ipp:327
+#: src/emu/inpttype.ipp:361 src/emu/inpttype.ipp:395 src/emu/inpttype.ipp:429
+#: src/emu/inpttype.ipp:463
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Left"
+msgid "%p Right Stick/Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:29
+#: src/emu/inpttype.ipp:27 src/emu/inpttype.ipp:145 src/emu/inpttype.ipp:226
+#: src/emu/inpttype.ipp:260 src/emu/inpttype.ipp:294 src/emu/inpttype.ipp:328
+#: src/emu/inpttype.ipp:362 src/emu/inpttype.ipp:396 src/emu/inpttype.ipp:430
+#: src/emu/inpttype.ipp:464
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Right"
+msgid "%p Right Stick/Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:30
+#: src/emu/inpttype.ipp:28 src/emu/inpttype.ipp:146 src/emu/inpttype.ipp:227
+#: src/emu/inpttype.ipp:261 src/emu/inpttype.ipp:295 src/emu/inpttype.ipp:329
+#: src/emu/inpttype.ipp:363 src/emu/inpttype.ipp:397 src/emu/inpttype.ipp:431
+#: src/emu/inpttype.ipp:465
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Up"
+msgid "%p Right Stick/Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:31
+#: src/emu/inpttype.ipp:29 src/emu/inpttype.ipp:147 src/emu/inpttype.ipp:228
+#: src/emu/inpttype.ipp:262 src/emu/inpttype.ipp:296 src/emu/inpttype.ipp:330
+#: src/emu/inpttype.ipp:364 src/emu/inpttype.ipp:398 src/emu/inpttype.ipp:432
+#: src/emu/inpttype.ipp:466
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Down"
+msgid "%p Right Stick/Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:32
+#: src/emu/inpttype.ipp:30 src/emu/inpttype.ipp:148 src/emu/inpttype.ipp:229
+#: src/emu/inpttype.ipp:263 src/emu/inpttype.ipp:297 src/emu/inpttype.ipp:331
+#: src/emu/inpttype.ipp:365 src/emu/inpttype.ipp:399 src/emu/inpttype.ipp:433
+#: src/emu/inpttype.ipp:467
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Left"
+msgid "%p Left Stick/Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:33
+#: src/emu/inpttype.ipp:31 src/emu/inpttype.ipp:149 src/emu/inpttype.ipp:230
+#: src/emu/inpttype.ipp:264 src/emu/inpttype.ipp:298 src/emu/inpttype.ipp:332
+#: src/emu/inpttype.ipp:366 src/emu/inpttype.ipp:400 src/emu/inpttype.ipp:434
+#: src/emu/inpttype.ipp:468
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Right"
+msgid "%p Left Stick/Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:34
+#: src/emu/inpttype.ipp:32 src/emu/inpttype.ipp:150 src/emu/inpttype.ipp:231
+#: src/emu/inpttype.ipp:265 src/emu/inpttype.ipp:299 src/emu/inpttype.ipp:333
+#: src/emu/inpttype.ipp:367 src/emu/inpttype.ipp:401 src/emu/inpttype.ipp:435
+#: src/emu/inpttype.ipp:469
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 1"
+msgid "%p Left Stick/Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:35
+#: src/emu/inpttype.ipp:33 src/emu/inpttype.ipp:151 src/emu/inpttype.ipp:232
+#: src/emu/inpttype.ipp:266 src/emu/inpttype.ipp:300 src/emu/inpttype.ipp:334
+#: src/emu/inpttype.ipp:368 src/emu/inpttype.ipp:402 src/emu/inpttype.ipp:436
+#: src/emu/inpttype.ipp:470
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 2"
+msgid "%p Left Stick/Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:36
+#: src/emu/inpttype.ipp:34 src/emu/inpttype.ipp:152 src/emu/inpttype.ipp:233
+#: src/emu/inpttype.ipp:267 src/emu/inpttype.ipp:301 src/emu/inpttype.ipp:335
+#: src/emu/inpttype.ipp:369 src/emu/inpttype.ipp:403 src/emu/inpttype.ipp:437
+#: src/emu/inpttype.ipp:471
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 3"
+msgid "%p Button 1"
 msgstr ""
 
-#: src/emu/inpttype.ipp:37
+#: src/emu/inpttype.ipp:35 src/emu/inpttype.ipp:153 src/emu/inpttype.ipp:234
+#: src/emu/inpttype.ipp:268 src/emu/inpttype.ipp:302 src/emu/inpttype.ipp:336
+#: src/emu/inpttype.ipp:370 src/emu/inpttype.ipp:404 src/emu/inpttype.ipp:438
+#: src/emu/inpttype.ipp:472
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 4"
+msgid "%p Button 2"
 msgstr ""
 
-#: src/emu/inpttype.ipp:38
+#: src/emu/inpttype.ipp:36 src/emu/inpttype.ipp:154 src/emu/inpttype.ipp:235
+#: src/emu/inpttype.ipp:269 src/emu/inpttype.ipp:303 src/emu/inpttype.ipp:337
+#: src/emu/inpttype.ipp:371 src/emu/inpttype.ipp:405 src/emu/inpttype.ipp:439
+#: src/emu/inpttype.ipp:473
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 5"
+msgid "%p Button 3"
 msgstr ""
 
-#: src/emu/inpttype.ipp:39
+#: src/emu/inpttype.ipp:37 src/emu/inpttype.ipp:155 src/emu/inpttype.ipp:236
+#: src/emu/inpttype.ipp:270 src/emu/inpttype.ipp:304 src/emu/inpttype.ipp:338
+#: src/emu/inpttype.ipp:372 src/emu/inpttype.ipp:406 src/emu/inpttype.ipp:440
+#: src/emu/inpttype.ipp:474
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 6"
+msgid "%p Button 4"
 msgstr ""
 
-#: src/emu/inpttype.ipp:40
+#: src/emu/inpttype.ipp:38 src/emu/inpttype.ipp:156 src/emu/inpttype.ipp:237
+#: src/emu/inpttype.ipp:271 src/emu/inpttype.ipp:305 src/emu/inpttype.ipp:339
+#: src/emu/inpttype.ipp:373 src/emu/inpttype.ipp:407 src/emu/inpttype.ipp:441
+#: src/emu/inpttype.ipp:475
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 7"
+msgid "%p Button 5"
 msgstr ""
 
-#: src/emu/inpttype.ipp:41
+#: src/emu/inpttype.ipp:39 src/emu/inpttype.ipp:157 src/emu/inpttype.ipp:238
+#: src/emu/inpttype.ipp:272 src/emu/inpttype.ipp:306 src/emu/inpttype.ipp:340
+#: src/emu/inpttype.ipp:374 src/emu/inpttype.ipp:408 src/emu/inpttype.ipp:442
+#: src/emu/inpttype.ipp:476
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 8"
+msgid "%p Button 6"
 msgstr ""
 
-#: src/emu/inpttype.ipp:42
+#: src/emu/inpttype.ipp:40 src/emu/inpttype.ipp:158 src/emu/inpttype.ipp:239
+#: src/emu/inpttype.ipp:273 src/emu/inpttype.ipp:307 src/emu/inpttype.ipp:341
+#: src/emu/inpttype.ipp:375 src/emu/inpttype.ipp:409 src/emu/inpttype.ipp:443
+#: src/emu/inpttype.ipp:477
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 9"
+msgid "%p Button 7"
 msgstr ""
 
-#: src/emu/inpttype.ipp:43
+#: src/emu/inpttype.ipp:41 src/emu/inpttype.ipp:159 src/emu/inpttype.ipp:240
+#: src/emu/inpttype.ipp:274 src/emu/inpttype.ipp:308 src/emu/inpttype.ipp:342
+#: src/emu/inpttype.ipp:376 src/emu/inpttype.ipp:410 src/emu/inpttype.ipp:444
+#: src/emu/inpttype.ipp:478
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 10"
+msgid "%p Button 8"
 msgstr ""
 
-#: src/emu/inpttype.ipp:44
+#: src/emu/inpttype.ipp:42 src/emu/inpttype.ipp:160 src/emu/inpttype.ipp:241
+#: src/emu/inpttype.ipp:275 src/emu/inpttype.ipp:309 src/emu/inpttype.ipp:343
+#: src/emu/inpttype.ipp:377 src/emu/inpttype.ipp:411 src/emu/inpttype.ipp:445
+#: src/emu/inpttype.ipp:479
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 11"
+msgid "%p Button 9"
 msgstr ""
 
-#: src/emu/inpttype.ipp:45
+#: src/emu/inpttype.ipp:43 src/emu/inpttype.ipp:161 src/emu/inpttype.ipp:242
+#: src/emu/inpttype.ipp:276 src/emu/inpttype.ipp:310 src/emu/inpttype.ipp:344
+#: src/emu/inpttype.ipp:378 src/emu/inpttype.ipp:412 src/emu/inpttype.ipp:446
+#: src/emu/inpttype.ipp:480
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 12"
+msgid "%p Button 10"
 msgstr ""
 
-#: src/emu/inpttype.ipp:46
+#: src/emu/inpttype.ipp:44 src/emu/inpttype.ipp:162 src/emu/inpttype.ipp:243
+#: src/emu/inpttype.ipp:277 src/emu/inpttype.ipp:311 src/emu/inpttype.ipp:345
+#: src/emu/inpttype.ipp:379 src/emu/inpttype.ipp:413 src/emu/inpttype.ipp:447
+#: src/emu/inpttype.ipp:481
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 13"
+msgid "%p Button 11"
 msgstr ""
 
-#: src/emu/inpttype.ipp:47
+#: src/emu/inpttype.ipp:45 src/emu/inpttype.ipp:163 src/emu/inpttype.ipp:244
+#: src/emu/inpttype.ipp:278 src/emu/inpttype.ipp:312 src/emu/inpttype.ipp:346
+#: src/emu/inpttype.ipp:380 src/emu/inpttype.ipp:414 src/emu/inpttype.ipp:448
+#: src/emu/inpttype.ipp:482
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 14"
+msgid "%p Button 12"
 msgstr ""
 
-#: src/emu/inpttype.ipp:48
+#: src/emu/inpttype.ipp:46 src/emu/inpttype.ipp:164 src/emu/inpttype.ipp:245
+#: src/emu/inpttype.ipp:279 src/emu/inpttype.ipp:313 src/emu/inpttype.ipp:347
+#: src/emu/inpttype.ipp:381 src/emu/inpttype.ipp:415 src/emu/inpttype.ipp:449
+#: src/emu/inpttype.ipp:483
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 15"
+msgid "%p Button 13"
 msgstr ""
 
-#: src/emu/inpttype.ipp:49
+#: src/emu/inpttype.ipp:47 src/emu/inpttype.ipp:165 src/emu/inpttype.ipp:246
+#: src/emu/inpttype.ipp:280 src/emu/inpttype.ipp:314 src/emu/inpttype.ipp:348
+#: src/emu/inpttype.ipp:382 src/emu/inpttype.ipp:416 src/emu/inpttype.ipp:450
+#: src/emu/inpttype.ipp:484
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 16"
+msgid "%p Button 14"
 msgstr ""
 
-#: src/emu/inpttype.ipp:50
+#: src/emu/inpttype.ipp:48 src/emu/inpttype.ipp:166 src/emu/inpttype.ipp:247
+#: src/emu/inpttype.ipp:281 src/emu/inpttype.ipp:315 src/emu/inpttype.ipp:349
+#: src/emu/inpttype.ipp:383 src/emu/inpttype.ipp:417 src/emu/inpttype.ipp:451
+#: src/emu/inpttype.ipp:485
+#, c-format
 msgctxt "input-name"
-msgid "P1 Start"
+msgid "%p Button 15"
 msgstr ""
 
-#: src/emu/inpttype.ipp:51
+#: src/emu/inpttype.ipp:49 src/emu/inpttype.ipp:167 src/emu/inpttype.ipp:248
+#: src/emu/inpttype.ipp:282 src/emu/inpttype.ipp:316 src/emu/inpttype.ipp:350
+#: src/emu/inpttype.ipp:384 src/emu/inpttype.ipp:418 src/emu/inpttype.ipp:452
+#: src/emu/inpttype.ipp:486
+#, c-format
 msgctxt "input-name"
-msgid "P1 Select"
+msgid "%p Button 16"
 msgstr ""
 
-#: src/emu/inpttype.ipp:56
+#: src/emu/inpttype.ipp:50 src/emu/inpttype.ipp:168 src/emu/inpttype.ipp:249
+#: src/emu/inpttype.ipp:283 src/emu/inpttype.ipp:317 src/emu/inpttype.ipp:351
+#: src/emu/inpttype.ipp:385 src/emu/inpttype.ipp:419 src/emu/inpttype.ipp:453
+#: src/emu/inpttype.ipp:487
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong A"
+msgid "%p Start"
 msgstr ""
 
-#: src/emu/inpttype.ipp:57
+#: src/emu/inpttype.ipp:51 src/emu/inpttype.ipp:169 src/emu/inpttype.ipp:250
+#: src/emu/inpttype.ipp:284 src/emu/inpttype.ipp:318 src/emu/inpttype.ipp:352
+#: src/emu/inpttype.ipp:386 src/emu/inpttype.ipp:420 src/emu/inpttype.ipp:454
+#: src/emu/inpttype.ipp:488
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong B"
+msgid "%p Select"
 msgstr ""
 
-#: src/emu/inpttype.ipp:58
+#: src/emu/inpttype.ipp:56 src/emu/inpttype.ipp:174
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong C"
+msgid "%p Mahjong A"
 msgstr ""
 
-#: src/emu/inpttype.ipp:59
+#: src/emu/inpttype.ipp:57 src/emu/inpttype.ipp:175
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong D"
+msgid "%p Mahjong B"
 msgstr ""
 
-#: src/emu/inpttype.ipp:60
+#: src/emu/inpttype.ipp:58 src/emu/inpttype.ipp:176
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong E"
+msgid "%p Mahjong C"
 msgstr ""
 
-#: src/emu/inpttype.ipp:61
+#: src/emu/inpttype.ipp:59 src/emu/inpttype.ipp:177
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong F"
+msgid "%p Mahjong D"
 msgstr ""
 
-#: src/emu/inpttype.ipp:62
+#: src/emu/inpttype.ipp:60 src/emu/inpttype.ipp:178
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong G"
+msgid "%p Mahjong E"
 msgstr ""
 
-#: src/emu/inpttype.ipp:63
+#: src/emu/inpttype.ipp:61 src/emu/inpttype.ipp:179
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong H"
+msgid "%p Mahjong F"
 msgstr ""
 
-#: src/emu/inpttype.ipp:64
+#: src/emu/inpttype.ipp:62 src/emu/inpttype.ipp:180
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong I"
+msgid "%p Mahjong G"
 msgstr ""
 
-#: src/emu/inpttype.ipp:65
+#: src/emu/inpttype.ipp:63 src/emu/inpttype.ipp:181
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong J"
+msgid "%p Mahjong H"
 msgstr ""
 
-#: src/emu/inpttype.ipp:66
+#: src/emu/inpttype.ipp:64 src/emu/inpttype.ipp:182
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong K"
+msgid "%p Mahjong I"
 msgstr ""
 
-#: src/emu/inpttype.ipp:67
+#: src/emu/inpttype.ipp:65 src/emu/inpttype.ipp:183
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong L"
+msgid "%p Mahjong J"
 msgstr ""
 
-#: src/emu/inpttype.ipp:68
+#: src/emu/inpttype.ipp:66 src/emu/inpttype.ipp:184
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong M"
+msgid "%p Mahjong K"
 msgstr ""
 
-#: src/emu/inpttype.ipp:69
+#: src/emu/inpttype.ipp:67 src/emu/inpttype.ipp:185
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong N"
+msgid "%p Mahjong L"
 msgstr ""
 
-#: src/emu/inpttype.ipp:70
+#: src/emu/inpttype.ipp:68 src/emu/inpttype.ipp:186
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong O"
+msgid "%p Mahjong M"
 msgstr ""
 
-#: src/emu/inpttype.ipp:71
+#: src/emu/inpttype.ipp:69 src/emu/inpttype.ipp:187
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong P"
+msgid "%p Mahjong N"
 msgstr ""
 
-#: src/emu/inpttype.ipp:72
+#: src/emu/inpttype.ipp:70 src/emu/inpttype.ipp:188
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Q"
+msgid "%p Mahjong O"
 msgstr ""
 
-#: src/emu/inpttype.ipp:73
+#: src/emu/inpttype.ipp:71 src/emu/inpttype.ipp:189
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Kan"
+msgid "%p Mahjong P"
 msgstr ""
 
-#: src/emu/inpttype.ipp:74
+#: src/emu/inpttype.ipp:72 src/emu/inpttype.ipp:190
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Pon"
+msgid "%p Mahjong Q"
 msgstr ""
 
-#: src/emu/inpttype.ipp:75
+#: src/emu/inpttype.ipp:73 src/emu/inpttype.ipp:191
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Chi"
+msgid "%p Mahjong Kan"
 msgstr ""
 
-#: src/emu/inpttype.ipp:76
+#: src/emu/inpttype.ipp:74 src/emu/inpttype.ipp:192
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Reach"
+msgid "%p Mahjong Pon"
 msgstr ""
 
-#: src/emu/inpttype.ipp:77
+#: src/emu/inpttype.ipp:75 src/emu/inpttype.ipp:193
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Ron"
+msgid "%p Mahjong Chi"
 msgstr ""
 
-#: src/emu/inpttype.ipp:78
+#: src/emu/inpttype.ipp:76 src/emu/inpttype.ipp:194
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Flip Flop"
+msgid "%p Mahjong Reach"
 msgstr ""
 
-#: src/emu/inpttype.ipp:79
+#: src/emu/inpttype.ipp:77 src/emu/inpttype.ipp:195
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Bet"
+msgid "%p Mahjong Ron"
 msgstr ""
 
-#: src/emu/inpttype.ipp:80
+#: src/emu/inpttype.ipp:78 src/emu/inpttype.ipp:200
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Take Score"
+msgid "%p Mahjong Flip Flop"
 msgstr ""
 
-#: src/emu/inpttype.ipp:81
+#: src/emu/inpttype.ipp:79 src/emu/inpttype.ipp:196
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Double Up"
+msgid "%p Mahjong Bet"
 msgstr ""
 
-#: src/emu/inpttype.ipp:82
+#: src/emu/inpttype.ipp:80 src/emu/inpttype.ipp:198
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Big"
+msgid "%p Mahjong Take Score"
 msgstr ""
 
-#: src/emu/inpttype.ipp:83
+#: src/emu/inpttype.ipp:81 src/emu/inpttype.ipp:199
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Small"
+msgid "%p Mahjong Double Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:84
+#: src/emu/inpttype.ipp:82 src/emu/inpttype.ipp:201
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Last Chance"
+msgid "%p Mahjong Big"
 msgstr ""
 
-#: src/emu/inpttype.ipp:89
+#: src/emu/inpttype.ipp:83 src/emu/inpttype.ipp:202
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda A/1"
+msgid "%p Mahjong Small"
 msgstr ""
 
-#: src/emu/inpttype.ipp:90
+#: src/emu/inpttype.ipp:84 src/emu/inpttype.ipp:197
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda B/2"
+msgid "%p Mahjong Last Chance"
 msgstr ""
 
-#: src/emu/inpttype.ipp:91
+#: src/emu/inpttype.ipp:89 src/emu/inpttype.ipp:207
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda C/3"
+msgid "%p Hanafuda A/1"
 msgstr ""
 
-#: src/emu/inpttype.ipp:92
+#: src/emu/inpttype.ipp:90 src/emu/inpttype.ipp:208
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda D/4"
+msgid "%p Hanafuda B/2"
 msgstr ""
 
-#: src/emu/inpttype.ipp:93
+#: src/emu/inpttype.ipp:91 src/emu/inpttype.ipp:209
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda E/5"
+msgid "%p Hanafuda C/3"
 msgstr ""
 
-#: src/emu/inpttype.ipp:94
+#: src/emu/inpttype.ipp:92 src/emu/inpttype.ipp:210
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda F/6"
+msgid "%p Hanafuda D/4"
 msgstr ""
 
-#: src/emu/inpttype.ipp:95
+#: src/emu/inpttype.ipp:93 src/emu/inpttype.ipp:211
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda G/7"
+msgid "%p Hanafuda E/5"
 msgstr ""
 
-#: src/emu/inpttype.ipp:96
+#: src/emu/inpttype.ipp:94 src/emu/inpttype.ipp:212
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda H/8"
+msgid "%p Hanafuda F/6"
 msgstr ""
 
-#: src/emu/inpttype.ipp:97
+#: src/emu/inpttype.ipp:95 src/emu/inpttype.ipp:213
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda Yes"
+msgid "%p Hanafuda G/7"
 msgstr ""
 
-#: src/emu/inpttype.ipp:98
+#: src/emu/inpttype.ipp:96 src/emu/inpttype.ipp:214
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda No"
+msgid "%p Hanafuda H/8"
+msgstr ""
+
+#: src/emu/inpttype.ipp:97 src/emu/inpttype.ipp:215
+#, c-format
+msgctxt "input-name"
+msgid "%p Hanafuda Yes"
+msgstr ""
+
+#: src/emu/inpttype.ipp:98 src/emu/inpttype.ipp:216
+#, c-format
+msgctxt "input-name"
+msgid "%p Hanafuda No"
 msgstr ""
 
 #: src/emu/inpttype.ipp:103
@@ -3751,1551 +3925,6 @@ msgctxt "input-name"
 msgid "Stop All Reels"
 msgstr ""
 
-#: src/emu/inpttype.ipp:140
-msgctxt "input-name"
-msgid "P2 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:141
-msgctxt "input-name"
-msgid "P2 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:142
-msgctxt "input-name"
-msgid "P2 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:143
-msgctxt "input-name"
-msgid "P2 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:144
-msgctxt "input-name"
-msgid "P2 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:145
-msgctxt "input-name"
-msgid "P2 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:146
-msgctxt "input-name"
-msgid "P2 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:147
-msgctxt "input-name"
-msgid "P2 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:148
-msgctxt "input-name"
-msgid "P2 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:149
-msgctxt "input-name"
-msgid "P2 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:150
-msgctxt "input-name"
-msgid "P2 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:151
-msgctxt "input-name"
-msgid "P2 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:152
-msgctxt "input-name"
-msgid "P2 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:153
-msgctxt "input-name"
-msgid "P2 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:154
-msgctxt "input-name"
-msgid "P2 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:155
-msgctxt "input-name"
-msgid "P2 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:156
-msgctxt "input-name"
-msgid "P2 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:157
-msgctxt "input-name"
-msgid "P2 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:158
-msgctxt "input-name"
-msgid "P2 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:159
-msgctxt "input-name"
-msgid "P2 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:160
-msgctxt "input-name"
-msgid "P2 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:161
-msgctxt "input-name"
-msgid "P2 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:162
-msgctxt "input-name"
-msgid "P2 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:163
-msgctxt "input-name"
-msgid "P2 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:164
-msgctxt "input-name"
-msgid "P2 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:165
-msgctxt "input-name"
-msgid "P2 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:166
-msgctxt "input-name"
-msgid "P2 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:167
-msgctxt "input-name"
-msgid "P2 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:168
-msgctxt "input-name"
-msgid "P2 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:169
-msgctxt "input-name"
-msgid "P2 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:174
-msgctxt "input-name"
-msgid "P2 Mahjong A"
-msgstr ""
-
-#: src/emu/inpttype.ipp:175
-msgctxt "input-name"
-msgid "P2 Mahjong B"
-msgstr ""
-
-#: src/emu/inpttype.ipp:176
-msgctxt "input-name"
-msgid "P2 Mahjong C"
-msgstr ""
-
-#: src/emu/inpttype.ipp:177
-msgctxt "input-name"
-msgid "P2 Mahjong D"
-msgstr ""
-
-#: src/emu/inpttype.ipp:178
-msgctxt "input-name"
-msgid "P2 Mahjong E"
-msgstr ""
-
-#: src/emu/inpttype.ipp:179
-msgctxt "input-name"
-msgid "P2 Mahjong F"
-msgstr ""
-
-#: src/emu/inpttype.ipp:180
-msgctxt "input-name"
-msgid "P2 Mahjong G"
-msgstr ""
-
-#: src/emu/inpttype.ipp:181
-msgctxt "input-name"
-msgid "P2 Mahjong H"
-msgstr ""
-
-#: src/emu/inpttype.ipp:182
-msgctxt "input-name"
-msgid "P2 Mahjong I"
-msgstr ""
-
-#: src/emu/inpttype.ipp:183
-msgctxt "input-name"
-msgid "P2 Mahjong J"
-msgstr ""
-
-#: src/emu/inpttype.ipp:184
-msgctxt "input-name"
-msgid "P2 Mahjong K"
-msgstr ""
-
-#: src/emu/inpttype.ipp:185
-msgctxt "input-name"
-msgid "P2 Mahjong L"
-msgstr ""
-
-#: src/emu/inpttype.ipp:186
-msgctxt "input-name"
-msgid "P2 Mahjong M"
-msgstr ""
-
-#: src/emu/inpttype.ipp:187
-msgctxt "input-name"
-msgid "P2 Mahjong N"
-msgstr ""
-
-#: src/emu/inpttype.ipp:188
-msgctxt "input-name"
-msgid "P2 Mahjong O"
-msgstr ""
-
-#: src/emu/inpttype.ipp:189
-msgctxt "input-name"
-msgid "P2 Mahjong P"
-msgstr ""
-
-#: src/emu/inpttype.ipp:190
-msgctxt "input-name"
-msgid "P2 Mahjong Q"
-msgstr ""
-
-#: src/emu/inpttype.ipp:191
-msgctxt "input-name"
-msgid "P2 Mahjong Kan"
-msgstr ""
-
-#: src/emu/inpttype.ipp:192
-msgctxt "input-name"
-msgid "P2 Mahjong Pon"
-msgstr ""
-
-#: src/emu/inpttype.ipp:193
-msgctxt "input-name"
-msgid "P2 Mahjong Chi"
-msgstr ""
-
-#: src/emu/inpttype.ipp:194
-msgctxt "input-name"
-msgid "P2 Mahjong Reach"
-msgstr ""
-
-#: src/emu/inpttype.ipp:195
-msgctxt "input-name"
-msgid "P2 Mahjong Ron"
-msgstr ""
-
-#: src/emu/inpttype.ipp:196
-msgctxt "input-name"
-msgid "P2 Mahjong Bet"
-msgstr ""
-
-#: src/emu/inpttype.ipp:197
-msgctxt "input-name"
-msgid "P2 Mahjong Last Chance"
-msgstr ""
-
-#: src/emu/inpttype.ipp:198
-msgctxt "input-name"
-msgid "P2 Mahjong Take Score"
-msgstr ""
-
-#: src/emu/inpttype.ipp:199
-msgctxt "input-name"
-msgid "P2 Mahjong Double Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:200
-msgctxt "input-name"
-msgid "P2 Mahjong Flip Flop"
-msgstr ""
-
-#: src/emu/inpttype.ipp:201
-msgctxt "input-name"
-msgid "P2 Mahjong Big"
-msgstr ""
-
-#: src/emu/inpttype.ipp:202
-msgctxt "input-name"
-msgid "P2 Mahjong Small"
-msgstr ""
-
-#: src/emu/inpttype.ipp:207
-msgctxt "input-name"
-msgid "P2 Hanafuda A/1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:208
-msgctxt "input-name"
-msgid "P2 Hanafuda B/2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:209
-msgctxt "input-name"
-msgid "P2 Hanafuda C/3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:210
-msgctxt "input-name"
-msgid "P2 Hanafuda D/4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:211
-msgctxt "input-name"
-msgid "P2 Hanafuda E/5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:212
-msgctxt "input-name"
-msgid "P2 Hanafuda F/6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:213
-msgctxt "input-name"
-msgid "P2 Hanafuda G/7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:214
-msgctxt "input-name"
-msgid "P2 Hanafuda H/8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:215
-msgctxt "input-name"
-msgid "P2 Hanafuda Yes"
-msgstr ""
-
-#: src/emu/inpttype.ipp:216
-msgctxt "input-name"
-msgid "P2 Hanafuda No"
-msgstr ""
-
-#: src/emu/inpttype.ipp:221
-msgctxt "input-name"
-msgid "P3 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:222
-msgctxt "input-name"
-msgid "P3 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:223
-msgctxt "input-name"
-msgid "P3 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:224
-msgctxt "input-name"
-msgid "P3 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:225
-msgctxt "input-name"
-msgid "P3 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:226
-msgctxt "input-name"
-msgid "P3 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:227
-msgctxt "input-name"
-msgid "P3 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:228
-msgctxt "input-name"
-msgid "P3 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:229
-msgctxt "input-name"
-msgid "P3 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:230
-msgctxt "input-name"
-msgid "P3 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:231
-msgctxt "input-name"
-msgid "P3 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:232
-msgctxt "input-name"
-msgid "P3 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:233
-msgctxt "input-name"
-msgid "P3 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:234
-msgctxt "input-name"
-msgid "P3 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:235
-msgctxt "input-name"
-msgid "P3 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:236
-msgctxt "input-name"
-msgid "P3 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:237
-msgctxt "input-name"
-msgid "P3 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:238
-msgctxt "input-name"
-msgid "P3 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:239
-msgctxt "input-name"
-msgid "P3 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:240
-msgctxt "input-name"
-msgid "P3 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:241
-msgctxt "input-name"
-msgid "P3 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:242
-msgctxt "input-name"
-msgid "P3 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:243
-msgctxt "input-name"
-msgid "P3 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:244
-msgctxt "input-name"
-msgid "P3 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:245
-msgctxt "input-name"
-msgid "P3 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:246
-msgctxt "input-name"
-msgid "P3 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:247
-msgctxt "input-name"
-msgid "P3 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:248
-msgctxt "input-name"
-msgid "P3 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:249
-msgctxt "input-name"
-msgid "P3 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:250
-msgctxt "input-name"
-msgid "P3 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:255
-msgctxt "input-name"
-msgid "P4 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:256
-msgctxt "input-name"
-msgid "P4 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:257
-msgctxt "input-name"
-msgid "P4 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:258
-msgctxt "input-name"
-msgid "P4 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:259
-msgctxt "input-name"
-msgid "P4 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:260
-msgctxt "input-name"
-msgid "P4 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:261
-msgctxt "input-name"
-msgid "P4 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:262
-msgctxt "input-name"
-msgid "P4 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:263
-msgctxt "input-name"
-msgid "P4 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:264
-msgctxt "input-name"
-msgid "P4 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:265
-msgctxt "input-name"
-msgid "P4 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:266
-msgctxt "input-name"
-msgid "P4 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:267
-msgctxt "input-name"
-msgid "P4 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:268
-msgctxt "input-name"
-msgid "P4 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:269
-msgctxt "input-name"
-msgid "P4 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:270
-msgctxt "input-name"
-msgid "P4 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:271
-msgctxt "input-name"
-msgid "P4 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:272
-msgctxt "input-name"
-msgid "P4 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:273
-msgctxt "input-name"
-msgid "P4 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:274
-msgctxt "input-name"
-msgid "P4 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:275
-msgctxt "input-name"
-msgid "P4 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:276
-msgctxt "input-name"
-msgid "P4 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:277
-msgctxt "input-name"
-msgid "P4 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:278
-msgctxt "input-name"
-msgid "P4 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:279
-msgctxt "input-name"
-msgid "P4 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:280
-msgctxt "input-name"
-msgid "P4 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:281
-msgctxt "input-name"
-msgid "P4 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:282
-msgctxt "input-name"
-msgid "P4 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:283
-msgctxt "input-name"
-msgid "P4 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:284
-msgctxt "input-name"
-msgid "P4 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:289
-msgctxt "input-name"
-msgid "P5 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:290
-msgctxt "input-name"
-msgid "P5 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:291
-msgctxt "input-name"
-msgid "P5 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:292
-msgctxt "input-name"
-msgid "P5 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:293
-msgctxt "input-name"
-msgid "P5 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:294
-msgctxt "input-name"
-msgid "P5 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:295
-msgctxt "input-name"
-msgid "P5 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:296
-msgctxt "input-name"
-msgid "P5 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:297
-msgctxt "input-name"
-msgid "P5 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:298
-msgctxt "input-name"
-msgid "P5 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:299
-msgctxt "input-name"
-msgid "P5 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:300
-msgctxt "input-name"
-msgid "P5 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:301
-msgctxt "input-name"
-msgid "P5 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:302
-msgctxt "input-name"
-msgid "P5 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:303
-msgctxt "input-name"
-msgid "P5 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:304
-msgctxt "input-name"
-msgid "P5 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:305
-msgctxt "input-name"
-msgid "P5 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:306
-msgctxt "input-name"
-msgid "P5 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:307
-msgctxt "input-name"
-msgid "P5 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:308
-msgctxt "input-name"
-msgid "P5 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:309
-msgctxt "input-name"
-msgid "P5 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:310
-msgctxt "input-name"
-msgid "P5 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:311
-msgctxt "input-name"
-msgid "P5 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:312
-msgctxt "input-name"
-msgid "P5 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:313
-msgctxt "input-name"
-msgid "P5 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:314
-msgctxt "input-name"
-msgid "P5 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:315
-msgctxt "input-name"
-msgid "P5 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:316
-msgctxt "input-name"
-msgid "P5 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:317
-msgctxt "input-name"
-msgid "P5 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:318
-msgctxt "input-name"
-msgid "P5 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:323
-msgctxt "input-name"
-msgid "P6 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:324
-msgctxt "input-name"
-msgid "P6 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:325
-msgctxt "input-name"
-msgid "P6 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:326
-msgctxt "input-name"
-msgid "P6 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:327
-msgctxt "input-name"
-msgid "P6 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:328
-msgctxt "input-name"
-msgid "P6 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:329
-msgctxt "input-name"
-msgid "P6 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:330
-msgctxt "input-name"
-msgid "P6 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:331
-msgctxt "input-name"
-msgid "P6 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:332
-msgctxt "input-name"
-msgid "P6 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:333
-msgctxt "input-name"
-msgid "P6 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:334
-msgctxt "input-name"
-msgid "P6 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:335
-msgctxt "input-name"
-msgid "P6 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:336
-msgctxt "input-name"
-msgid "P6 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:337
-msgctxt "input-name"
-msgid "P6 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:338
-msgctxt "input-name"
-msgid "P6 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:339
-msgctxt "input-name"
-msgid "P6 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:340
-msgctxt "input-name"
-msgid "P6 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:341
-msgctxt "input-name"
-msgid "P6 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:342
-msgctxt "input-name"
-msgid "P6 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:343
-msgctxt "input-name"
-msgid "P6 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:344
-msgctxt "input-name"
-msgid "P6 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:345
-msgctxt "input-name"
-msgid "P6 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:346
-msgctxt "input-name"
-msgid "P6 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:347
-msgctxt "input-name"
-msgid "P6 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:348
-msgctxt "input-name"
-msgid "P6 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:349
-msgctxt "input-name"
-msgid "P6 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:350
-msgctxt "input-name"
-msgid "P6 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:351
-msgctxt "input-name"
-msgid "P6 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:352
-msgctxt "input-name"
-msgid "P6 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:357
-msgctxt "input-name"
-msgid "P7 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:358
-msgctxt "input-name"
-msgid "P7 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:359
-msgctxt "input-name"
-msgid "P7 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:360
-msgctxt "input-name"
-msgid "P7 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:361
-msgctxt "input-name"
-msgid "P7 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:362
-msgctxt "input-name"
-msgid "P7 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:363
-msgctxt "input-name"
-msgid "P7 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:364
-msgctxt "input-name"
-msgid "P7 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:365
-msgctxt "input-name"
-msgid "P7 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:366
-msgctxt "input-name"
-msgid "P7 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:367
-msgctxt "input-name"
-msgid "P7 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:368
-msgctxt "input-name"
-msgid "P7 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:369
-msgctxt "input-name"
-msgid "P7 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:370
-msgctxt "input-name"
-msgid "P7 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:371
-msgctxt "input-name"
-msgid "P7 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:372
-msgctxt "input-name"
-msgid "P7 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:373
-msgctxt "input-name"
-msgid "P7 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:374
-msgctxt "input-name"
-msgid "P7 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:375
-msgctxt "input-name"
-msgid "P7 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:376
-msgctxt "input-name"
-msgid "P7 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:377
-msgctxt "input-name"
-msgid "P7 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:378
-msgctxt "input-name"
-msgid "P7 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:379
-msgctxt "input-name"
-msgid "P7 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:380
-msgctxt "input-name"
-msgid "P7 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:381
-msgctxt "input-name"
-msgid "P7 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:382
-msgctxt "input-name"
-msgid "P7 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:383
-msgctxt "input-name"
-msgid "P7 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:384
-msgctxt "input-name"
-msgid "P7 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:385
-msgctxt "input-name"
-msgid "P7 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:386
-msgctxt "input-name"
-msgid "P7 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:391
-msgctxt "input-name"
-msgid "P8 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:392
-msgctxt "input-name"
-msgid "P8 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:393
-msgctxt "input-name"
-msgid "P8 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:394
-msgctxt "input-name"
-msgid "P8 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:395
-msgctxt "input-name"
-msgid "P8 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:396
-msgctxt "input-name"
-msgid "P8 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:397
-msgctxt "input-name"
-msgid "P8 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:398
-msgctxt "input-name"
-msgid "P8 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:399
-msgctxt "input-name"
-msgid "P8 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:400
-msgctxt "input-name"
-msgid "P8 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:401
-msgctxt "input-name"
-msgid "P8 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:402
-msgctxt "input-name"
-msgid "P8 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:403
-msgctxt "input-name"
-msgid "P8 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:404
-msgctxt "input-name"
-msgid "P8 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:405
-msgctxt "input-name"
-msgid "P8 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:406
-msgctxt "input-name"
-msgid "P8 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:407
-msgctxt "input-name"
-msgid "P8 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:408
-msgctxt "input-name"
-msgid "P8 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:409
-msgctxt "input-name"
-msgid "P8 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:410
-msgctxt "input-name"
-msgid "P8 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:411
-msgctxt "input-name"
-msgid "P8 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:412
-msgctxt "input-name"
-msgid "P8 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:413
-msgctxt "input-name"
-msgid "P8 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:414
-msgctxt "input-name"
-msgid "P8 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:415
-msgctxt "input-name"
-msgid "P8 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:416
-msgctxt "input-name"
-msgid "P8 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:417
-msgctxt "input-name"
-msgid "P8 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:418
-msgctxt "input-name"
-msgid "P8 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:419
-msgctxt "input-name"
-msgid "P8 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:420
-msgctxt "input-name"
-msgid "P8 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:425
-msgctxt "input-name"
-msgid "P9 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:426
-msgctxt "input-name"
-msgid "P9 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:427
-msgctxt "input-name"
-msgid "P9 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:428
-msgctxt "input-name"
-msgid "P9 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:429
-msgctxt "input-name"
-msgid "P9 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:430
-msgctxt "input-name"
-msgid "P9 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:431
-msgctxt "input-name"
-msgid "P9 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:432
-msgctxt "input-name"
-msgid "P9 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:433
-msgctxt "input-name"
-msgid "P9 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:434
-msgctxt "input-name"
-msgid "P9 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:435
-msgctxt "input-name"
-msgid "P9 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:436
-msgctxt "input-name"
-msgid "P9 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:437
-msgctxt "input-name"
-msgid "P9 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:438
-msgctxt "input-name"
-msgid "P9 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:439
-msgctxt "input-name"
-msgid "P9 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:440
-msgctxt "input-name"
-msgid "P9 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:441
-msgctxt "input-name"
-msgid "P9 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:442
-msgctxt "input-name"
-msgid "P9 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:443
-msgctxt "input-name"
-msgid "P9 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:444
-msgctxt "input-name"
-msgid "P9 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:445
-msgctxt "input-name"
-msgid "P9 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:446
-msgctxt "input-name"
-msgid "P9 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:447
-msgctxt "input-name"
-msgid "P9 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:448
-msgctxt "input-name"
-msgid "P9 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:449
-msgctxt "input-name"
-msgid "P9 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:450
-msgctxt "input-name"
-msgid "P9 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:451
-msgctxt "input-name"
-msgid "P9 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:452
-msgctxt "input-name"
-msgid "P9 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:453
-msgctxt "input-name"
-msgid "P9 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:454
-msgctxt "input-name"
-msgid "P9 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:459
-msgctxt "input-name"
-msgid "P10 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:460
-msgctxt "input-name"
-msgid "P10 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:461
-msgctxt "input-name"
-msgid "P10 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:462
-msgctxt "input-name"
-msgid "P10 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:463
-msgctxt "input-name"
-msgid "P10 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:464
-msgctxt "input-name"
-msgid "P10 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:465
-msgctxt "input-name"
-msgid "P10 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:466
-msgctxt "input-name"
-msgid "P10 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:467
-msgctxt "input-name"
-msgid "P10 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:468
-msgctxt "input-name"
-msgid "P10 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:469
-msgctxt "input-name"
-msgid "P10 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:470
-msgctxt "input-name"
-msgid "P10 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:471
-msgctxt "input-name"
-msgid "P10 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:472
-msgctxt "input-name"
-msgid "P10 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:473
-msgctxt "input-name"
-msgid "P10 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:474
-msgctxt "input-name"
-msgid "P10 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:475
-msgctxt "input-name"
-msgid "P10 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:476
-msgctxt "input-name"
-msgid "P10 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:477
-msgctxt "input-name"
-msgid "P10 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:478
-msgctxt "input-name"
-msgid "P10 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:479
-msgctxt "input-name"
-msgid "P10 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:480
-msgctxt "input-name"
-msgid "P10 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:481
-msgctxt "input-name"
-msgid "P10 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:482
-msgctxt "input-name"
-msgid "P10 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:483
-msgctxt "input-name"
-msgid "P10 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:484
-msgctxt "input-name"
-msgid "P10 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:485
-msgctxt "input-name"
-msgid "P10 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:486
-msgctxt "input-name"
-msgid "P10 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:487
-msgctxt "input-name"
-msgid "P10 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:488
-msgctxt "input-name"
-msgid "P10 Select"
-msgstr ""
-
 #: src/emu/inpttype.ipp:493
 msgctxt "input-name"
 msgid "1 Player Start"
@@ -5476,154 +4105,31 @@ msgctxt "input-name"
 msgid "Volume Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:550
-msgctxt "input-name"
-msgid "P1 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:551
-msgctxt "input-name"
-msgid "P2 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:552
-msgctxt "input-name"
-msgid "P3 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:553
-msgctxt "input-name"
-msgid "P4 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:554
-msgctxt "input-name"
-msgid "P5 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:555
-msgctxt "input-name"
-msgid "P6 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:556
-msgctxt "input-name"
-msgid "P7 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:557
-msgctxt "input-name"
-msgid "P8 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:558
-msgctxt "input-name"
-msgid "P9 Pedal 1"
-msgstr ""
-
+#: src/emu/inpttype.ipp:550 src/emu/inpttype.ipp:551 src/emu/inpttype.ipp:552
+#: src/emu/inpttype.ipp:553 src/emu/inpttype.ipp:554 src/emu/inpttype.ipp:555
+#: src/emu/inpttype.ipp:556 src/emu/inpttype.ipp:557 src/emu/inpttype.ipp:558
 #: src/emu/inpttype.ipp:559
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:564
-msgctxt "input-name"
-msgid "P1 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:565
-msgctxt "input-name"
-msgid "P2 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:566
-msgctxt "input-name"
-msgid "P3 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:567
-msgctxt "input-name"
-msgid "P4 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:568
-msgctxt "input-name"
-msgid "P5 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:569
-msgctxt "input-name"
-msgid "P6 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:570
-msgctxt "input-name"
-msgid "P7 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:571
-msgctxt "input-name"
-msgid "P8 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:572
-msgctxt "input-name"
-msgid "P9 Pedal 2"
+msgid "%p Pedal 1"
 msgstr ""
 
+#: src/emu/inpttype.ipp:564 src/emu/inpttype.ipp:565 src/emu/inpttype.ipp:566
+#: src/emu/inpttype.ipp:567 src/emu/inpttype.ipp:568 src/emu/inpttype.ipp:569
+#: src/emu/inpttype.ipp:570 src/emu/inpttype.ipp:571 src/emu/inpttype.ipp:572
 #: src/emu/inpttype.ipp:573
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:578
-msgctxt "input-name"
-msgid "P1 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:579
-msgctxt "input-name"
-msgid "P2 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:580
-msgctxt "input-name"
-msgid "P3 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:581
-msgctxt "input-name"
-msgid "P4 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:582
-msgctxt "input-name"
-msgid "P5 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:583
-msgctxt "input-name"
-msgid "P6 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:584
-msgctxt "input-name"
-msgid "P7 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:585
-msgctxt "input-name"
-msgid "P8 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:586
-msgctxt "input-name"
-msgid "P9 Pedal 3"
+msgid "%p Pedal 2"
 msgstr ""
 
+#: src/emu/inpttype.ipp:578 src/emu/inpttype.ipp:579 src/emu/inpttype.ipp:580
+#: src/emu/inpttype.ipp:581 src/emu/inpttype.ipp:582 src/emu/inpttype.ipp:583
+#: src/emu/inpttype.ipp:584 src/emu/inpttype.ipp:585 src/emu/inpttype.ipp:586
 #: src/emu/inpttype.ipp:587
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 3"
+msgid "%p Pedal 3"
 msgstr ""
 
 #: src/emu/inpttype.ipp:592
diff --git a/language/Bulgarian/strings.po b/language/Bulgarian/strings.po
index 61ef4fbfc48..2a19892803b 100644
--- a/language/Bulgarian/strings.po
+++ b/language/Bulgarian/strings.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-19 02:50+1100\n"
+"POT-Creation-Date: 2021-12-09 04:44+1100\n"
 "PO-Revision-Date: 2016-02-20 18:03+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: MAME Language Team\n"
@@ -261,12 +261,12 @@ msgstr ""
 msgid "Driver: \"%1$s\" software list "
 msgstr ""
 
-#: src/frontend/mame/ui/selsoft.cpp:711 src/frontend/mame/ui/selgame.cpp:1066
+#: src/frontend/mame/ui/selsoft.cpp:711 src/frontend/mame/ui/selgame.cpp:1076
 #, c-format
 msgid "%1$s: %2$s - Search: %3$s_"
 msgstr ""
 
-#: src/frontend/mame/ui/selsoft.cpp:713 src/frontend/mame/ui/selgame.cpp:1068
+#: src/frontend/mame/ui/selsoft.cpp:713 src/frontend/mame/ui/selgame.cpp:1078
 #, c-format
 msgid "Search: %1$s_"
 msgstr ""
@@ -276,7 +276,7 @@ msgstr ""
 msgid "Software list/item: %1$s:%2$s"
 msgstr ""
 
-#: src/frontend/mame/ui/optsmenu.cpp:73 src/frontend/mame/ui/sndmenu.cpp:165
+#: src/frontend/mame/ui/optsmenu.cpp:73 src/frontend/mame/ui/sndmenu.cpp:161
 msgid "Sound Options"
 msgstr ""
 
@@ -371,11 +371,11 @@ msgid "Show mouse pointer"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:39
-msgid "Confirm quit from machines"
+msgid "Confirm quit from emulation"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:40
-msgid "Skip information screen at startup"
+msgid "Skip system information screen"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:41
@@ -391,7 +391,7 @@ msgid "Skip BIOS selection menu"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:44
-msgid "Skip software parts selection menu"
+msgid "Skip software part selection menu"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:45
@@ -543,7 +543,7 @@ msgid "UI active"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:91
-msgid "Offscreen reload"
+msgid "Off-screen reload"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:92
@@ -559,7 +559,7 @@ msgid "Natural keyboard"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:95
-msgid "Simultaneous contradictory"
+msgid "Allow contradictory joystick inputs"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:96
@@ -583,7 +583,7 @@ msgid "Pedal Device Assignment"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:106
-msgid "Adstick Device Assignment"
+msgid "AD Stick Device Assignment"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:107
@@ -670,14 +670,14 @@ msgstr ""
 msgid "Wait Vertical Sync"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:687
+#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:689
 #: src/frontend/mame/ui/videoopt.cpp:191 src/frontend/mame/ui/custui.cpp:490
 #: src/frontend/mame/ui/analogipt.cpp:471 plugins/cheatfind/init.lua:766
 #: plugins/cheatfind/init.lua:777 plugins/cheat/init.lua:668
 msgid "On"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:690
+#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:692
 #: src/frontend/mame/ui/videoopt.cpp:207 src/frontend/mame/ui/custui.cpp:490
 #: src/frontend/mame/ui/analogipt.cpp:471 plugins/cheatfind/init.lua:763
 #: plugins/cheatfind/init.lua:774 plugins/cheat/init.lua:671
@@ -685,11 +685,11 @@ msgstr ""
 msgid "Off"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:693
+#: src/frontend/mame/ui/menu.cpp:695
 msgid "Auto"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:1195
+#: src/frontend/mame/ui/menu.cpp:1197
 #: src/frontend/mame/ui/simpleselgame.cpp:278
 #: src/frontend/mame/ui/selmenu.cpp:1280
 msgid "Return to Previous Menu"
@@ -697,7 +697,7 @@ msgstr ""
 
 #: src/frontend/mame/ui/filemngr.cpp:139
 #: src/frontend/mame/ui/confswitch.cpp:119
-#: src/frontend/mame/ui/inputmap.cpp:559 src/frontend/mame/ui/analogipt.cpp:360
+#: src/frontend/mame/ui/inputmap.cpp:563 src/frontend/mame/ui/analogipt.cpp:360
 #, c-format
 msgid "[root%1$s]"
 msgstr ""
@@ -940,22 +940,22 @@ msgid ""
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "GHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "MHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "kHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "Hz"
 msgstr ""
 
@@ -979,38 +979,38 @@ msgstr ""
 msgid "Vector"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:480
+#: src/frontend/mame/ui/info.cpp:483
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:480
+#: src/frontend/mame/ui/info.cpp:483
 msgid "%2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:497
+#: src/frontend/mame/ui/info.cpp:500
 #, c-format
 msgid "Screen '%1$s'"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:499
+#: src/frontend/mame/ui/info.cpp:502
 msgid "Screen"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:570 src/frontend/mame/ui/info.cpp:581
+#: src/frontend/mame/ui/info.cpp:573 src/frontend/mame/ui/info.cpp:584
 #, c-format
 msgid "%1$s:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:662
+#: src/frontend/mame/ui/info.cpp:665
 msgid "Not supported"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:665
+#: src/frontend/mame/ui/info.cpp:668
 msgid "Partially supported"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:674
+#: src/frontend/mame/ui/info.cpp:677
 msgid "[empty]"
 msgstr ""
 
@@ -1083,7 +1083,7 @@ msgid "Emulated"
 msgstr ""
 
 #: src/frontend/mame/ui/keyboard.cpp:59 src/frontend/mame/ui/confswitch.cpp:117
-#: src/frontend/mame/ui/inputmap.cpp:557 src/frontend/mame/ui/analogipt.cpp:358
+#: src/frontend/mame/ui/inputmap.cpp:561 src/frontend/mame/ui/analogipt.cpp:358
 #, c-format
 msgid "%1$s [root%2$s]"
 msgstr ""
@@ -1443,7 +1443,7 @@ msgctxt "swlist-info"
 msgid "Software list/item"
 msgstr ""
 
-#: src/frontend/mame/ui/datmenu.cpp:88 src/frontend/mame/ui/selmenu.cpp:2698
+#: src/frontend/mame/ui/datmenu.cpp:88 src/frontend/mame/ui/selmenu.cpp:2707
 msgid "Software List Info"
 msgstr ""
 
@@ -1558,7 +1558,7 @@ msgstr ""
 msgid "Configure Machine:"
 msgstr ""
 
-#: src/frontend/mame/ui/miscmenu.cpp:858 src/frontend/mame/ui/selmenu.cpp:2638
+#: src/frontend/mame/ui/miscmenu.cpp:858 src/frontend/mame/ui/selmenu.cpp:2647
 msgid " (default)"
 msgstr ""
 
@@ -1575,7 +1575,7 @@ msgid ""
 "Press %2$s to return to emulation"
 msgstr ""
 
-#: src/frontend/mame/ui/info_pty.cpp:30 src/frontend/mame/ui/mainmenu.cpp:155
+#: src/frontend/mame/ui/info_pty.cpp:30
 msgid "Pseudo terminals"
 msgstr ""
 
@@ -1643,52 +1643,52 @@ msgstr ""
 msgid "Other Controls"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:227
+#: src/frontend/mame/ui/inputmap.cpp:231
 msgid "This machine has no configurable inputs."
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:327
+#: src/frontend/mame/ui/inputmap.cpp:331
 msgid "Pressed"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:397
+#: src/frontend/mame/ui/inputmap.cpp:401
 msgid "Invalid sequence entered"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:542
+#: src/frontend/mame/ui/inputmap.cpp:546
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:543
+#: src/frontend/mame/ui/inputmap.cpp:547
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog Inc"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:544
+#: src/frontend/mame/ui/inputmap.cpp:548
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog Dec"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:586
+#: src/frontend/mame/ui/inputmap.cpp:590
 #, c-format
 msgid "Press %1$s to set\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:587
+#: src/frontend/mame/ui/inputmap.cpp:591
 #, c-format
 msgid "Press %1$s to append\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:588
+#: src/frontend/mame/ui/inputmap.cpp:592
 #, c-format
 msgid "Press %1$s to clear\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:589
+#: src/frontend/mame/ui/inputmap.cpp:593
 #, c-format
 msgid "Press %1$s to restore default\n"
 msgstr ""
@@ -1752,7 +1752,7 @@ msgid ""
 msgstr ""
 
 #: src/frontend/mame/ui/simpleselgame.cpp:273
-#: src/frontend/mame/ui/selgame.cpp:436
+#: src/frontend/mame/ui/selgame.cpp:443
 msgid "Configure Options"
 msgstr ""
 
@@ -2080,16 +2080,16 @@ msgstr ""
 msgid "Expand to fit"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:437
+#: src/frontend/mame/ui/selgame.cpp:444
 msgid "Configure Machine"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:1050
+#: src/frontend/mame/ui/selgame.cpp:1060
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d machines (%5$d BIOS) )"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:1078
+#: src/frontend/mame/ui/selgame.cpp:1088
 #, c-format
 msgid "System: %1$-.100s"
 msgstr ""
@@ -2111,7 +2111,7 @@ msgstr ""
 #: src/frontend/mame/ui/auditmenu.cpp:98
 #, c-format
 msgid ""
-"Auditing ROMs for machine %2$u of %3$u...\n"
+"Auditing media for machine %2$u of %3$u...\n"
 "%1$s"
 msgstr ""
 
@@ -2126,12 +2126,12 @@ msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:136
 #, c-format
-msgid "Audit ROMs for %1$u machines marked unavailable"
+msgid "Audit media for %1$u machines marked unavailable"
 msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:137
 #, c-format
-msgid "Audit ROMs for all %1$u machines"
+msgid "Audit media for all %1$u machines"
 msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:154
@@ -2337,84 +2337,84 @@ msgctxt "color-sample"
 msgid "Clone"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:914
+#: src/frontend/mame/ui/custui.cpp:906
 msgid "ARGB Settings"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:919 src/frontend/mame/ui/custui.cpp:922
+#: src/frontend/mame/ui/custui.cpp:911 src/frontend/mame/ui/custui.cpp:914
 msgctxt "color-channel"
 msgid "Alpha"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:927 src/frontend/mame/ui/custui.cpp:930
+#: src/frontend/mame/ui/custui.cpp:919 src/frontend/mame/ui/custui.cpp:922
 msgctxt "color-channel"
 msgid "Red"
 msgstr ""
 
+#: src/frontend/mame/ui/custui.cpp:927 src/frontend/mame/ui/custui.cpp:930
+msgctxt "color-channel"
+msgid "Green"
+msgstr ""
+
 #: src/frontend/mame/ui/custui.cpp:935 src/frontend/mame/ui/custui.cpp:938
 msgctxt "color-channel"
-msgid "Green"
-msgstr ""
-
-#: src/frontend/mame/ui/custui.cpp:943 src/frontend/mame/ui/custui.cpp:946
-msgctxt "color-channel"
 msgid "Blue"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:949
+#: src/frontend/mame/ui/custui.cpp:941
 msgid "Choose from palette"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:996
+#: src/frontend/mame/ui/custui.cpp:988
 msgid "Color preview:"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1093
+#: src/frontend/mame/ui/custui.cpp:1085
 msgctxt "color-preset"
 msgid "White"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1094
+#: src/frontend/mame/ui/custui.cpp:1086
 msgctxt "color-preset"
 msgid "Silver"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1095
+#: src/frontend/mame/ui/custui.cpp:1087
 msgctxt "color-preset"
 msgid "Gray"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1096
+#: src/frontend/mame/ui/custui.cpp:1088
 msgctxt "color-preset"
 msgid "Black"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1097
+#: src/frontend/mame/ui/custui.cpp:1089
 msgctxt "color-preset"
 msgid "Red"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1098
+#: src/frontend/mame/ui/custui.cpp:1090
 msgctxt "color-preset"
 msgid "Orange"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1099
+#: src/frontend/mame/ui/custui.cpp:1091
 msgctxt "color-preset"
 msgid "Yellow"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1100
+#: src/frontend/mame/ui/custui.cpp:1092
 msgctxt "color-preset"
 msgid "Green"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1101
+#: src/frontend/mame/ui/custui.cpp:1093
 msgctxt "color-preset"
 msgid "Blue"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1102
+#: src/frontend/mame/ui/custui.cpp:1094
 msgctxt "color-preset"
 msgid "Violet"
 msgstr ""
@@ -2479,7 +2479,7 @@ msgid "Input (general)"
 msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:123
-msgid "Input (this Machine)"
+msgid "Input (this machine)"
 msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:126
@@ -2518,6 +2518,10 @@ msgstr ""
 msgid "Tape Control"
 msgstr ""
 
+#: src/frontend/mame/ui/mainmenu.cpp:155
+msgid "Pseudo Terminals"
+msgstr ""
+
 #: src/frontend/mame/ui/mainmenu.cpp:158
 msgid "BIOS Selection"
 msgstr ""
@@ -2556,7 +2560,7 @@ msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:200
 #, c-format
-msgid "About %s"
+msgid "About %1$s"
 msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:212
@@ -2716,373 +2720,373 @@ msgstr ""
 msgid "%1$s %2$s"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2235
+#: src/frontend/mame/ui/selmenu.cpp:2244
 msgid "Images"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2236
+#: src/frontend/mame/ui/selmenu.cpp:2245
 msgid "Infos"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2551
+#: src/frontend/mame/ui/selmenu.cpp:2560
 msgid ""
 "Required ROM/disk images for the selected system are missing or incorrect. "
 "Please acquire the correct files or select a different system.\n"
 "\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2567
+#: src/frontend/mame/ui/selmenu.cpp:2576
 msgid ""
 "Required ROM/disk images for the selected software are missing or incorrect. "
 "Please acquire the correct files or select a different software item.\n"
 "\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2583
+#: src/frontend/mame/ui/selmenu.cpp:2592
 msgid "incorrect checksum"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2586
+#: src/frontend/mame/ui/selmenu.cpp:2595
 msgid "incorrect length"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2589
+#: src/frontend/mame/ui/selmenu.cpp:2598
 msgid "not found"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2600
+#: src/frontend/mame/ui/selmenu.cpp:2609
 #, c-format
 msgid "%1$s (%2$s) - %3$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2602
+#: src/frontend/mame/ui/selmenu.cpp:2611
 #, c-format
 msgid "%1$s - %2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2606
+#: src/frontend/mame/ui/selmenu.cpp:2615
 msgid "Press any key to continue."
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2735
+#: src/frontend/mame/ui/selmenu.cpp:2744
 msgid "General Info"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2887
-#, c-format
-msgid "Romset\t%1$s\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2888
-#, c-format
-msgid "Year\t%1$s\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2889
-#, c-format
-msgid "Manufacturer\t%1$s\n"
-msgstr ""
-
 #: src/frontend/mame/ui/selmenu.cpp:2896
 #, c-format
-msgid "Driver is Clone of\t%1$s\n"
+msgid "Romset\t%1$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2901
-msgid "Driver is Parent\t\n"
+#: src/frontend/mame/ui/selmenu.cpp:2897
+#, c-format
+msgid "Year\t%1$s\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2898
+#, c-format
+msgid "Manufacturer\t%1$s\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2905
-msgid "Analog Controls\tYes\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2907
-msgid "Keyboard Inputs\tYes\n"
+#, c-format
+msgid "Driver is Clone of\t%1$s\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2910
-msgid "Overall\tNOT WORKING\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2912
-msgid "Overall\tUnemulated Protection\n"
+msgid "Driver is Parent\t\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2914
-msgid "Overall\tWorking\n"
+msgid "Analog Controls\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2917
-msgid "Graphics\tUnimplemented\n"
+#: src/frontend/mame/ui/selmenu.cpp:2916
+msgid "Keyboard Inputs\tYes\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2919
-msgid "Graphics\tWrong Colors\n"
+msgid "Overall\tNOT WORKING\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2921
-msgid "Graphics\tImperfect Colors\n"
+msgid "Overall\tUnemulated Protection\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2923
-msgid "Graphics\tImperfect\n"
+msgid "Overall\tWorking\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2925
-msgid "Graphics\tOK\n"
+#: src/frontend/mame/ui/selmenu.cpp:2926
+msgid "Graphics\tUnimplemented\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2928
-msgid "Sound\tNone\n"
+msgid "Graphics\tWrong Colors\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2930
-msgid "Sound\tUnimplemented\n"
+msgid "Graphics\tImperfect Colors\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2932
-msgid "Sound\tImperfect\n"
+msgid "Graphics\tImperfect\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2934
-msgid "Sound\tOK\n"
+msgid "Graphics\tOK\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2937
-msgid "Capture\tUnimplemented\n"
+msgid "Sound\tNone\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2939
+msgid "Sound\tUnimplemented\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2941
+msgid "Sound\tImperfect\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2943
+msgid "Sound\tOK\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2946
+msgid "Capture\tUnimplemented\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2948
 msgid "Capture\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2942
+#: src/frontend/mame/ui/selmenu.cpp:2951
 msgid "Camera\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2944
+#: src/frontend/mame/ui/selmenu.cpp:2953
 msgid "Camera\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2947
+#: src/frontend/mame/ui/selmenu.cpp:2956
 msgid "Microphone\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2949
+#: src/frontend/mame/ui/selmenu.cpp:2958
 msgid "Microphone\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2952
+#: src/frontend/mame/ui/selmenu.cpp:2961
 msgid "Controls\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2954
+#: src/frontend/mame/ui/selmenu.cpp:2963
 msgid "Controls\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2957
+#: src/frontend/mame/ui/selmenu.cpp:2966
 msgid "Keyboard\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2959
+#: src/frontend/mame/ui/selmenu.cpp:2968
 msgid "Keyboard\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2962
+#: src/frontend/mame/ui/selmenu.cpp:2971
 msgid "Mouse\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2964
+#: src/frontend/mame/ui/selmenu.cpp:2973
 msgid "Mouse\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2967
+#: src/frontend/mame/ui/selmenu.cpp:2976
 msgid "Media\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2969
+#: src/frontend/mame/ui/selmenu.cpp:2978
 msgid "Media\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2972
+#: src/frontend/mame/ui/selmenu.cpp:2981
 msgid "Disk\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2974
+#: src/frontend/mame/ui/selmenu.cpp:2983
 msgid "Disk\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2977
+#: src/frontend/mame/ui/selmenu.cpp:2986
 msgid "Printer\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2979
+#: src/frontend/mame/ui/selmenu.cpp:2988
 msgid "Printer\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2982
+#: src/frontend/mame/ui/selmenu.cpp:2991
 msgid "Mag. Tape\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2984
+#: src/frontend/mame/ui/selmenu.cpp:2993
 msgid "Mag. Tape\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2987
+#: src/frontend/mame/ui/selmenu.cpp:2996
 msgid "Punch Tape\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2989
+#: src/frontend/mame/ui/selmenu.cpp:2998
 msgid "Punch Tape\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2992
+#: src/frontend/mame/ui/selmenu.cpp:3001
 msgid "Mag. Drum\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2994
+#: src/frontend/mame/ui/selmenu.cpp:3003
 msgid "Mag. Drum\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2997
+#: src/frontend/mame/ui/selmenu.cpp:3006
 msgid "(EP)ROM\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2999
+#: src/frontend/mame/ui/selmenu.cpp:3008
 msgid "(EP)ROM\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3002
+#: src/frontend/mame/ui/selmenu.cpp:3011
 msgid "Communications\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3004
+#: src/frontend/mame/ui/selmenu.cpp:3013
 msgid "Communications\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3007
+#: src/frontend/mame/ui/selmenu.cpp:3016
 msgid "LAN\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3009
+#: src/frontend/mame/ui/selmenu.cpp:3018
 msgid "LAN\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3012
+#: src/frontend/mame/ui/selmenu.cpp:3021
 msgid "WAN\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3014
+#: src/frontend/mame/ui/selmenu.cpp:3023
 msgid "WAN\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3017
+#: src/frontend/mame/ui/selmenu.cpp:3026
 msgid "Timing\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3019
+#: src/frontend/mame/ui/selmenu.cpp:3028
 msgid "Timing\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3021
+#: src/frontend/mame/ui/selmenu.cpp:3030
 msgid "Mechanical Machine\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3021
+#: src/frontend/mame/ui/selmenu.cpp:3030
 msgid "Mechanical Machine\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3022
+#: src/frontend/mame/ui/selmenu.cpp:3031
 msgid "Requires Artwork\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3022
+#: src/frontend/mame/ui/selmenu.cpp:3031
 msgid "Requires Artwork\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3023
+#: src/frontend/mame/ui/selmenu.cpp:3032
 msgid "Requires Clickable Artwork\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3023
+#: src/frontend/mame/ui/selmenu.cpp:3032
 msgid "Requires Clickable Artwork\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3025
+#: src/frontend/mame/ui/selmenu.cpp:3034
 msgid "Support Cocktail\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3026
+#: src/frontend/mame/ui/selmenu.cpp:3035
 msgid "Driver is BIOS\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3026
+#: src/frontend/mame/ui/selmenu.cpp:3035
 msgid "Driver is BIOS\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3027
+#: src/frontend/mame/ui/selmenu.cpp:3036
 msgid "Support Save\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3027
+#: src/frontend/mame/ui/selmenu.cpp:3036
 msgid "Support Save\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3028
+#: src/frontend/mame/ui/selmenu.cpp:3037
 msgid "Screen Orientation\tVertical\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3028
+#: src/frontend/mame/ui/selmenu.cpp:3037
 msgid "Screen Orientation\tHorizontal\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3038
+#: src/frontend/mame/ui/selmenu.cpp:3047
 msgid "Requires CHD\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3038
+#: src/frontend/mame/ui/selmenu.cpp:3047
 msgid "Requires CHD\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3051
-msgid "ROM Audit Result\tOK\n"
+#: src/frontend/mame/ui/selmenu.cpp:3060
+msgid "Media Audit Result\tOK\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3053
-msgid "ROM Audit Result\tBAD\n"
+#: src/frontend/mame/ui/selmenu.cpp:3062
+msgid "Media Audit Result\tBAD\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3056
+#: src/frontend/mame/ui/selmenu.cpp:3065
 msgid "Samples Audit Result\tNone Needed\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3058
+#: src/frontend/mame/ui/selmenu.cpp:3067
 msgid "Samples Audit Result\tOK\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3060
+#: src/frontend/mame/ui/selmenu.cpp:3069
 msgid "Samples Audit Result\tBAD\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3064
+#: src/frontend/mame/ui/selmenu.cpp:3073
 msgid ""
-"ROM Audit \tDisabled\n"
-"Samples Audit \tDisabled\n"
+"Media Audit\tDisabled\n"
+"Samples Audit\tDisabled\n"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:150
+#: src/frontend/mame/ui/sndmenu.cpp:146
 msgid "Sound"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:151
+#: src/frontend/mame/ui/sndmenu.cpp:147
 msgid "Compressor"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:152
+#: src/frontend/mame/ui/sndmenu.cpp:148
 msgid "Sample Rate"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:153
+#: src/frontend/mame/ui/sndmenu.cpp:149
 msgid "Use External Samples"
 msgstr ""
 
@@ -3121,511 +3125,681 @@ msgstr ""
 msgid "  Screen '%1$s': Vector\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:132
+#: src/frontend/mame/ui/devopt.cpp:135
 #, c-format
 msgid "  Screen '%1$s': %2$d × %3$d (V) %4$s Hz\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:133
+#: src/frontend/mame/ui/devopt.cpp:136
 #, c-format
 msgid "  Screen '%1$s': %2$d × %3$d (H) %4$s Hz\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:147
+#: src/frontend/mame/ui/devopt.cpp:150
 msgid "* Sound:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:211
+#: src/frontend/mame/ui/devopt.cpp:214
 #, c-format
 msgid ""
 "* BIOS settings:\n"
 "  %1$d options    [default: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:255 src/frontend/mame/ui/devopt.cpp:271
-#: src/frontend/mame/ui/devopt.cpp:332
+#: src/frontend/mame/ui/devopt.cpp:258 src/frontend/mame/ui/devopt.cpp:274
+#: src/frontend/mame/ui/devopt.cpp:335
 #, c-format
 msgid "  %1$s    [default: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:260 src/frontend/mame/ui/devopt.cpp:276
+#: src/frontend/mame/ui/devopt.cpp:263 src/frontend/mame/ui/devopt.cpp:279
 #, c-format
 msgid "  %1$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:282
+#: src/frontend/mame/ui/devopt.cpp:285
 msgid "* DIP switch settings:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:287
+#: src/frontend/mame/ui/devopt.cpp:290
 msgid "* Configuration settings:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:291
+#: src/frontend/mame/ui/devopt.cpp:294
 msgid "* Input device(s):\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:293
+#: src/frontend/mame/ui/devopt.cpp:296
 #, c-format
 msgid "  User inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:295
+#: src/frontend/mame/ui/devopt.cpp:298
 #, c-format
 msgid "  Mahjong inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:297
+#: src/frontend/mame/ui/devopt.cpp:300
 #, c-format
 msgid "  Hanafuda inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:299
+#: src/frontend/mame/ui/devopt.cpp:302
 #, c-format
 msgid "  Gambling inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:301
+#: src/frontend/mame/ui/devopt.cpp:304
 #, c-format
 msgid "  Analog inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:303
+#: src/frontend/mame/ui/devopt.cpp:306
 #, c-format
 msgid "  Adjuster inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:305
+#: src/frontend/mame/ui/devopt.cpp:308
 #, c-format
 msgid "  Keypad inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:307
+#: src/frontend/mame/ui/devopt.cpp:310
 #, c-format
 msgid "  Keyboard inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:312
+#: src/frontend/mame/ui/devopt.cpp:315
 msgid "* Media Options:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:317
+#: src/frontend/mame/ui/devopt.cpp:320
 #, c-format
 msgid "  %1$s    [tag: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:327
+#: src/frontend/mame/ui/devopt.cpp:330
 msgid "* Slot Options:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:341
+#: src/frontend/mame/ui/devopt.cpp:344
 msgid "[None]\n"
 msgstr ""
 
-#: src/emu/render.cpp:1847
+#: src/emu/render.cpp:1796
 #, c-format
 msgctxt "view-name"
 msgid "Screen %1$u Standard (%2$u:%3$u)"
 msgstr ""
 
-#: src/emu/render.cpp:1873
+#: src/emu/render.cpp:1822
 #, c-format
 msgctxt "view-name"
 msgid "Screen %1$u Pixel Aspect (%2$u:%3$u)"
 msgstr ""
 
-#: src/emu/render.cpp:1895 src/emu/render.cpp:2030
+#: src/emu/render.cpp:1844 src/emu/render.cpp:1979
 msgctxt "view-name"
 msgid "Cocktail"
 msgstr ""
 
-#: src/emu/render.cpp:2015
+#: src/emu/render.cpp:1964
 msgctxt "view-name"
 msgid "Left-to-Right"
 msgstr ""
 
-#: src/emu/render.cpp:2016
+#: src/emu/render.cpp:1965
 msgctxt "view-name"
 msgid "Left-to-Right (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2017
+#: src/emu/render.cpp:1966
 msgctxt "view-name"
 msgid "Top-to-Bottom"
 msgstr ""
 
-#: src/emu/render.cpp:2018
+#: src/emu/render.cpp:1967
 msgctxt "view-name"
 msgid "Top-to-Bottom (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2069
+#: src/emu/render.cpp:2018
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Left-to-Right, Top-to-Bottom"
 msgstr ""
 
-#: src/emu/render.cpp:2078
+#: src/emu/render.cpp:2027
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Left-to-Right, Top-to-Bottom (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2087
+#: src/emu/render.cpp:2036
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Top-to-Bottom, Left-to-Right"
 msgstr ""
 
-#: src/emu/render.cpp:2096
+#: src/emu/render.cpp:2045
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Top-to-Bottom, Left-to-Right (Gapless)"
 msgstr ""
 
-#: src/emu/inpttype.ipp:22
+#: src/emu/ioport.cpp:332
+#, c-format
 msgctxt "input-name"
-msgid "P1 Up"
+msgid "P%1$u"
 msgstr ""
 
-#: src/emu/inpttype.ipp:23
+#: src/emu/ioport.cpp:1924
 msgctxt "input-name"
-msgid "P1 Down"
+msgid "???"
 msgstr ""
 
-#: src/emu/inpttype.ipp:24
+#: src/emu/inpttype.ipp:22 src/emu/inpttype.ipp:140 src/emu/inpttype.ipp:221
+#: src/emu/inpttype.ipp:255 src/emu/inpttype.ipp:289 src/emu/inpttype.ipp:323
+#: src/emu/inpttype.ipp:357 src/emu/inpttype.ipp:391 src/emu/inpttype.ipp:425
+#: src/emu/inpttype.ipp:459
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left"
+msgid "%p Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:25
+#: src/emu/inpttype.ipp:23 src/emu/inpttype.ipp:141 src/emu/inpttype.ipp:222
+#: src/emu/inpttype.ipp:256 src/emu/inpttype.ipp:290 src/emu/inpttype.ipp:324
+#: src/emu/inpttype.ipp:358 src/emu/inpttype.ipp:392 src/emu/inpttype.ipp:426
+#: src/emu/inpttype.ipp:460
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right"
+msgid "%p Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:26
+#: src/emu/inpttype.ipp:24 src/emu/inpttype.ipp:142 src/emu/inpttype.ipp:223
+#: src/emu/inpttype.ipp:257 src/emu/inpttype.ipp:291 src/emu/inpttype.ipp:325
+#: src/emu/inpttype.ipp:359 src/emu/inpttype.ipp:393 src/emu/inpttype.ipp:427
+#: src/emu/inpttype.ipp:461
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Up"
+msgid "%p Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:27
+#: src/emu/inpttype.ipp:25 src/emu/inpttype.ipp:143 src/emu/inpttype.ipp:224
+#: src/emu/inpttype.ipp:258 src/emu/inpttype.ipp:292 src/emu/inpttype.ipp:326
+#: src/emu/inpttype.ipp:360 src/emu/inpttype.ipp:394 src/emu/inpttype.ipp:428
+#: src/emu/inpttype.ipp:462
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Down"
+msgid "%p Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:28
+#: src/emu/inpttype.ipp:26 src/emu/inpttype.ipp:144 src/emu/inpttype.ipp:225
+#: src/emu/inpttype.ipp:259 src/emu/inpttype.ipp:293 src/emu/inpttype.ipp:327
+#: src/emu/inpttype.ipp:361 src/emu/inpttype.ipp:395 src/emu/inpttype.ipp:429
+#: src/emu/inpttype.ipp:463
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Left"
+msgid "%p Right Stick/Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:29
+#: src/emu/inpttype.ipp:27 src/emu/inpttype.ipp:145 src/emu/inpttype.ipp:226
+#: src/emu/inpttype.ipp:260 src/emu/inpttype.ipp:294 src/emu/inpttype.ipp:328
+#: src/emu/inpttype.ipp:362 src/emu/inpttype.ipp:396 src/emu/inpttype.ipp:430
+#: src/emu/inpttype.ipp:464
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Right"
+msgid "%p Right Stick/Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:30
+#: src/emu/inpttype.ipp:28 src/emu/inpttype.ipp:146 src/emu/inpttype.ipp:227
+#: src/emu/inpttype.ipp:261 src/emu/inpttype.ipp:295 src/emu/inpttype.ipp:329
+#: src/emu/inpttype.ipp:363 src/emu/inpttype.ipp:397 src/emu/inpttype.ipp:431
+#: src/emu/inpttype.ipp:465
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Up"
+msgid "%p Right Stick/Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:31
+#: src/emu/inpttype.ipp:29 src/emu/inpttype.ipp:147 src/emu/inpttype.ipp:228
+#: src/emu/inpttype.ipp:262 src/emu/inpttype.ipp:296 src/emu/inpttype.ipp:330
+#: src/emu/inpttype.ipp:364 src/emu/inpttype.ipp:398 src/emu/inpttype.ipp:432
+#: src/emu/inpttype.ipp:466
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Down"
+msgid "%p Right Stick/Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:32
+#: src/emu/inpttype.ipp:30 src/emu/inpttype.ipp:148 src/emu/inpttype.ipp:229
+#: src/emu/inpttype.ipp:263 src/emu/inpttype.ipp:297 src/emu/inpttype.ipp:331
+#: src/emu/inpttype.ipp:365 src/emu/inpttype.ipp:399 src/emu/inpttype.ipp:433
+#: src/emu/inpttype.ipp:467
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Left"
+msgid "%p Left Stick/Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:33
+#: src/emu/inpttype.ipp:31 src/emu/inpttype.ipp:149 src/emu/inpttype.ipp:230
+#: src/emu/inpttype.ipp:264 src/emu/inpttype.ipp:298 src/emu/inpttype.ipp:332
+#: src/emu/inpttype.ipp:366 src/emu/inpttype.ipp:400 src/emu/inpttype.ipp:434
+#: src/emu/inpttype.ipp:468
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Right"
+msgid "%p Left Stick/Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:34
+#: src/emu/inpttype.ipp:32 src/emu/inpttype.ipp:150 src/emu/inpttype.ipp:231
+#: src/emu/inpttype.ipp:265 src/emu/inpttype.ipp:299 src/emu/inpttype.ipp:333
+#: src/emu/inpttype.ipp:367 src/emu/inpttype.ipp:401 src/emu/inpttype.ipp:435
+#: src/emu/inpttype.ipp:469
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 1"
+msgid "%p Left Stick/Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:35
+#: src/emu/inpttype.ipp:33 src/emu/inpttype.ipp:151 src/emu/inpttype.ipp:232
+#: src/emu/inpttype.ipp:266 src/emu/inpttype.ipp:300 src/emu/inpttype.ipp:334
+#: src/emu/inpttype.ipp:368 src/emu/inpttype.ipp:402 src/emu/inpttype.ipp:436
+#: src/emu/inpttype.ipp:470
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 2"
+msgid "%p Left Stick/Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:36
+#: src/emu/inpttype.ipp:34 src/emu/inpttype.ipp:152 src/emu/inpttype.ipp:233
+#: src/emu/inpttype.ipp:267 src/emu/inpttype.ipp:301 src/emu/inpttype.ipp:335
+#: src/emu/inpttype.ipp:369 src/emu/inpttype.ipp:403 src/emu/inpttype.ipp:437
+#: src/emu/inpttype.ipp:471
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 3"
+msgid "%p Button 1"
 msgstr ""
 
-#: src/emu/inpttype.ipp:37
+#: src/emu/inpttype.ipp:35 src/emu/inpttype.ipp:153 src/emu/inpttype.ipp:234
+#: src/emu/inpttype.ipp:268 src/emu/inpttype.ipp:302 src/emu/inpttype.ipp:336
+#: src/emu/inpttype.ipp:370 src/emu/inpttype.ipp:404 src/emu/inpttype.ipp:438
+#: src/emu/inpttype.ipp:472
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 4"
+msgid "%p Button 2"
 msgstr ""
 
-#: src/emu/inpttype.ipp:38
+#: src/emu/inpttype.ipp:36 src/emu/inpttype.ipp:154 src/emu/inpttype.ipp:235
+#: src/emu/inpttype.ipp:269 src/emu/inpttype.ipp:303 src/emu/inpttype.ipp:337
+#: src/emu/inpttype.ipp:371 src/emu/inpttype.ipp:405 src/emu/inpttype.ipp:439
+#: src/emu/inpttype.ipp:473
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 5"
+msgid "%p Button 3"
 msgstr ""
 
-#: src/emu/inpttype.ipp:39
+#: src/emu/inpttype.ipp:37 src/emu/inpttype.ipp:155 src/emu/inpttype.ipp:236
+#: src/emu/inpttype.ipp:270 src/emu/inpttype.ipp:304 src/emu/inpttype.ipp:338
+#: src/emu/inpttype.ipp:372 src/emu/inpttype.ipp:406 src/emu/inpttype.ipp:440
+#: src/emu/inpttype.ipp:474
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 6"
+msgid "%p Button 4"
 msgstr ""
 
-#: src/emu/inpttype.ipp:40
+#: src/emu/inpttype.ipp:38 src/emu/inpttype.ipp:156 src/emu/inpttype.ipp:237
+#: src/emu/inpttype.ipp:271 src/emu/inpttype.ipp:305 src/emu/inpttype.ipp:339
+#: src/emu/inpttype.ipp:373 src/emu/inpttype.ipp:407 src/emu/inpttype.ipp:441
+#: src/emu/inpttype.ipp:475
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 7"
+msgid "%p Button 5"
 msgstr ""
 
-#: src/emu/inpttype.ipp:41
+#: src/emu/inpttype.ipp:39 src/emu/inpttype.ipp:157 src/emu/inpttype.ipp:238
+#: src/emu/inpttype.ipp:272 src/emu/inpttype.ipp:306 src/emu/inpttype.ipp:340
+#: src/emu/inpttype.ipp:374 src/emu/inpttype.ipp:408 src/emu/inpttype.ipp:442
+#: src/emu/inpttype.ipp:476
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 8"
+msgid "%p Button 6"
 msgstr ""
 
-#: src/emu/inpttype.ipp:42
+#: src/emu/inpttype.ipp:40 src/emu/inpttype.ipp:158 src/emu/inpttype.ipp:239
+#: src/emu/inpttype.ipp:273 src/emu/inpttype.ipp:307 src/emu/inpttype.ipp:341
+#: src/emu/inpttype.ipp:375 src/emu/inpttype.ipp:409 src/emu/inpttype.ipp:443
+#: src/emu/inpttype.ipp:477
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 9"
+msgid "%p Button 7"
 msgstr ""
 
-#: src/emu/inpttype.ipp:43
+#: src/emu/inpttype.ipp:41 src/emu/inpttype.ipp:159 src/emu/inpttype.ipp:240
+#: src/emu/inpttype.ipp:274 src/emu/inpttype.ipp:308 src/emu/inpttype.ipp:342
+#: src/emu/inpttype.ipp:376 src/emu/inpttype.ipp:410 src/emu/inpttype.ipp:444
+#: src/emu/inpttype.ipp:478
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 10"
+msgid "%p Button 8"
 msgstr ""
 
-#: src/emu/inpttype.ipp:44
+#: src/emu/inpttype.ipp:42 src/emu/inpttype.ipp:160 src/emu/inpttype.ipp:241
+#: src/emu/inpttype.ipp:275 src/emu/inpttype.ipp:309 src/emu/inpttype.ipp:343
+#: src/emu/inpttype.ipp:377 src/emu/inpttype.ipp:411 src/emu/inpttype.ipp:445
+#: src/emu/inpttype.ipp:479
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 11"
+msgid "%p Button 9"
 msgstr ""
 
-#: src/emu/inpttype.ipp:45
+#: src/emu/inpttype.ipp:43 src/emu/inpttype.ipp:161 src/emu/inpttype.ipp:242
+#: src/emu/inpttype.ipp:276 src/emu/inpttype.ipp:310 src/emu/inpttype.ipp:344
+#: src/emu/inpttype.ipp:378 src/emu/inpttype.ipp:412 src/emu/inpttype.ipp:446
+#: src/emu/inpttype.ipp:480
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 12"
+msgid "%p Button 10"
 msgstr ""
 
-#: src/emu/inpttype.ipp:46
+#: src/emu/inpttype.ipp:44 src/emu/inpttype.ipp:162 src/emu/inpttype.ipp:243
+#: src/emu/inpttype.ipp:277 src/emu/inpttype.ipp:311 src/emu/inpttype.ipp:345
+#: src/emu/inpttype.ipp:379 src/emu/inpttype.ipp:413 src/emu/inpttype.ipp:447
+#: src/emu/inpttype.ipp:481
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 13"
+msgid "%p Button 11"
 msgstr ""
 
-#: src/emu/inpttype.ipp:47
+#: src/emu/inpttype.ipp:45 src/emu/inpttype.ipp:163 src/emu/inpttype.ipp:244
+#: src/emu/inpttype.ipp:278 src/emu/inpttype.ipp:312 src/emu/inpttype.ipp:346
+#: src/emu/inpttype.ipp:380 src/emu/inpttype.ipp:414 src/emu/inpttype.ipp:448
+#: src/emu/inpttype.ipp:482
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 14"
+msgid "%p Button 12"
 msgstr ""
 
-#: src/emu/inpttype.ipp:48
+#: src/emu/inpttype.ipp:46 src/emu/inpttype.ipp:164 src/emu/inpttype.ipp:245
+#: src/emu/inpttype.ipp:279 src/emu/inpttype.ipp:313 src/emu/inpttype.ipp:347
+#: src/emu/inpttype.ipp:381 src/emu/inpttype.ipp:415 src/emu/inpttype.ipp:449
+#: src/emu/inpttype.ipp:483
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 15"
+msgid "%p Button 13"
 msgstr ""
 
-#: src/emu/inpttype.ipp:49
+#: src/emu/inpttype.ipp:47 src/emu/inpttype.ipp:165 src/emu/inpttype.ipp:246
+#: src/emu/inpttype.ipp:280 src/emu/inpttype.ipp:314 src/emu/inpttype.ipp:348
+#: src/emu/inpttype.ipp:382 src/emu/inpttype.ipp:416 src/emu/inpttype.ipp:450
+#: src/emu/inpttype.ipp:484
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 16"
+msgid "%p Button 14"
 msgstr ""
 
-#: src/emu/inpttype.ipp:50
+#: src/emu/inpttype.ipp:48 src/emu/inpttype.ipp:166 src/emu/inpttype.ipp:247
+#: src/emu/inpttype.ipp:281 src/emu/inpttype.ipp:315 src/emu/inpttype.ipp:349
+#: src/emu/inpttype.ipp:383 src/emu/inpttype.ipp:417 src/emu/inpttype.ipp:451
+#: src/emu/inpttype.ipp:485
+#, c-format
 msgctxt "input-name"
-msgid "P1 Start"
+msgid "%p Button 15"
 msgstr ""
 
-#: src/emu/inpttype.ipp:51
+#: src/emu/inpttype.ipp:49 src/emu/inpttype.ipp:167 src/emu/inpttype.ipp:248
+#: src/emu/inpttype.ipp:282 src/emu/inpttype.ipp:316 src/emu/inpttype.ipp:350
+#: src/emu/inpttype.ipp:384 src/emu/inpttype.ipp:418 src/emu/inpttype.ipp:452
+#: src/emu/inpttype.ipp:486
+#, c-format
 msgctxt "input-name"
-msgid "P1 Select"
+msgid "%p Button 16"
 msgstr ""
 
-#: src/emu/inpttype.ipp:56
+#: src/emu/inpttype.ipp:50 src/emu/inpttype.ipp:168 src/emu/inpttype.ipp:249
+#: src/emu/inpttype.ipp:283 src/emu/inpttype.ipp:317 src/emu/inpttype.ipp:351
+#: src/emu/inpttype.ipp:385 src/emu/inpttype.ipp:419 src/emu/inpttype.ipp:453
+#: src/emu/inpttype.ipp:487
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong A"
+msgid "%p Start"
 msgstr ""
 
-#: src/emu/inpttype.ipp:57
+#: src/emu/inpttype.ipp:51 src/emu/inpttype.ipp:169 src/emu/inpttype.ipp:250
+#: src/emu/inpttype.ipp:284 src/emu/inpttype.ipp:318 src/emu/inpttype.ipp:352
+#: src/emu/inpttype.ipp:386 src/emu/inpttype.ipp:420 src/emu/inpttype.ipp:454
+#: src/emu/inpttype.ipp:488
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong B"
+msgid "%p Select"
 msgstr ""
 
-#: src/emu/inpttype.ipp:58
+#: src/emu/inpttype.ipp:56 src/emu/inpttype.ipp:174
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong C"
+msgid "%p Mahjong A"
 msgstr ""
 
-#: src/emu/inpttype.ipp:59
+#: src/emu/inpttype.ipp:57 src/emu/inpttype.ipp:175
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong D"
+msgid "%p Mahjong B"
 msgstr ""
 
-#: src/emu/inpttype.ipp:60
+#: src/emu/inpttype.ipp:58 src/emu/inpttype.ipp:176
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong E"
+msgid "%p Mahjong C"
 msgstr ""
 
-#: src/emu/inpttype.ipp:61
+#: src/emu/inpttype.ipp:59 src/emu/inpttype.ipp:177
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong F"
+msgid "%p Mahjong D"
 msgstr ""
 
-#: src/emu/inpttype.ipp:62
+#: src/emu/inpttype.ipp:60 src/emu/inpttype.ipp:178
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong G"
+msgid "%p Mahjong E"
 msgstr ""
 
-#: src/emu/inpttype.ipp:63
+#: src/emu/inpttype.ipp:61 src/emu/inpttype.ipp:179
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong H"
+msgid "%p Mahjong F"
 msgstr ""
 
-#: src/emu/inpttype.ipp:64
+#: src/emu/inpttype.ipp:62 src/emu/inpttype.ipp:180
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong I"
+msgid "%p Mahjong G"
 msgstr ""
 
-#: src/emu/inpttype.ipp:65
+#: src/emu/inpttype.ipp:63 src/emu/inpttype.ipp:181
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong J"
+msgid "%p Mahjong H"
 msgstr ""
 
-#: src/emu/inpttype.ipp:66
+#: src/emu/inpttype.ipp:64 src/emu/inpttype.ipp:182
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong K"
+msgid "%p Mahjong I"
 msgstr ""
 
-#: src/emu/inpttype.ipp:67
+#: src/emu/inpttype.ipp:65 src/emu/inpttype.ipp:183
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong L"
+msgid "%p Mahjong J"
 msgstr ""
 
-#: src/emu/inpttype.ipp:68
+#: src/emu/inpttype.ipp:66 src/emu/inpttype.ipp:184
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong M"
+msgid "%p Mahjong K"
 msgstr ""
 
-#: src/emu/inpttype.ipp:69
+#: src/emu/inpttype.ipp:67 src/emu/inpttype.ipp:185
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong N"
+msgid "%p Mahjong L"
 msgstr ""
 
-#: src/emu/inpttype.ipp:70
+#: src/emu/inpttype.ipp:68 src/emu/inpttype.ipp:186
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong O"
+msgid "%p Mahjong M"
 msgstr ""
 
-#: src/emu/inpttype.ipp:71
+#: src/emu/inpttype.ipp:69 src/emu/inpttype.ipp:187
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong P"
+msgid "%p Mahjong N"
 msgstr ""
 
-#: src/emu/inpttype.ipp:72
+#: src/emu/inpttype.ipp:70 src/emu/inpttype.ipp:188
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Q"
+msgid "%p Mahjong O"
 msgstr ""
 
-#: src/emu/inpttype.ipp:73
+#: src/emu/inpttype.ipp:71 src/emu/inpttype.ipp:189
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Kan"
+msgid "%p Mahjong P"
 msgstr ""
 
-#: src/emu/inpttype.ipp:74
+#: src/emu/inpttype.ipp:72 src/emu/inpttype.ipp:190
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Pon"
+msgid "%p Mahjong Q"
 msgstr ""
 
-#: src/emu/inpttype.ipp:75
+#: src/emu/inpttype.ipp:73 src/emu/inpttype.ipp:191
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Chi"
+msgid "%p Mahjong Kan"
 msgstr ""
 
-#: src/emu/inpttype.ipp:76
+#: src/emu/inpttype.ipp:74 src/emu/inpttype.ipp:192
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Reach"
+msgid "%p Mahjong Pon"
 msgstr ""
 
-#: src/emu/inpttype.ipp:77
+#: src/emu/inpttype.ipp:75 src/emu/inpttype.ipp:193
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Ron"
+msgid "%p Mahjong Chi"
 msgstr ""
 
-#: src/emu/inpttype.ipp:78
+#: src/emu/inpttype.ipp:76 src/emu/inpttype.ipp:194
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Flip Flop"
+msgid "%p Mahjong Reach"
 msgstr ""
 
-#: src/emu/inpttype.ipp:79
+#: src/emu/inpttype.ipp:77 src/emu/inpttype.ipp:195
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Bet"
+msgid "%p Mahjong Ron"
 msgstr ""
 
-#: src/emu/inpttype.ipp:80
+#: src/emu/inpttype.ipp:78 src/emu/inpttype.ipp:200
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Take Score"
+msgid "%p Mahjong Flip Flop"
 msgstr ""
 
-#: src/emu/inpttype.ipp:81
+#: src/emu/inpttype.ipp:79 src/emu/inpttype.ipp:196
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Double Up"
+msgid "%p Mahjong Bet"
 msgstr ""
 
-#: src/emu/inpttype.ipp:82
+#: src/emu/inpttype.ipp:80 src/emu/inpttype.ipp:198
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Big"
+msgid "%p Mahjong Take Score"
 msgstr ""
 
-#: src/emu/inpttype.ipp:83
+#: src/emu/inpttype.ipp:81 src/emu/inpttype.ipp:199
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Small"
+msgid "%p Mahjong Double Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:84
+#: src/emu/inpttype.ipp:82 src/emu/inpttype.ipp:201
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Last Chance"
+msgid "%p Mahjong Big"
 msgstr ""
 
-#: src/emu/inpttype.ipp:89
+#: src/emu/inpttype.ipp:83 src/emu/inpttype.ipp:202
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda A/1"
+msgid "%p Mahjong Small"
 msgstr ""
 
-#: src/emu/inpttype.ipp:90
+#: src/emu/inpttype.ipp:84 src/emu/inpttype.ipp:197
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda B/2"
+msgid "%p Mahjong Last Chance"
 msgstr ""
 
-#: src/emu/inpttype.ipp:91
+#: src/emu/inpttype.ipp:89 src/emu/inpttype.ipp:207
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda C/3"
+msgid "%p Hanafuda A/1"
 msgstr ""
 
-#: src/emu/inpttype.ipp:92
+#: src/emu/inpttype.ipp:90 src/emu/inpttype.ipp:208
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda D/4"
+msgid "%p Hanafuda B/2"
 msgstr ""
 
-#: src/emu/inpttype.ipp:93
+#: src/emu/inpttype.ipp:91 src/emu/inpttype.ipp:209
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda E/5"
+msgid "%p Hanafuda C/3"
 msgstr ""
 
-#: src/emu/inpttype.ipp:94
+#: src/emu/inpttype.ipp:92 src/emu/inpttype.ipp:210
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda F/6"
+msgid "%p Hanafuda D/4"
 msgstr ""
 
-#: src/emu/inpttype.ipp:95
+#: src/emu/inpttype.ipp:93 src/emu/inpttype.ipp:211
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda G/7"
+msgid "%p Hanafuda E/5"
 msgstr ""
 
-#: src/emu/inpttype.ipp:96
+#: src/emu/inpttype.ipp:94 src/emu/inpttype.ipp:212
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda H/8"
+msgid "%p Hanafuda F/6"
 msgstr ""
 
-#: src/emu/inpttype.ipp:97
+#: src/emu/inpttype.ipp:95 src/emu/inpttype.ipp:213
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda Yes"
+msgid "%p Hanafuda G/7"
 msgstr ""
 
-#: src/emu/inpttype.ipp:98
+#: src/emu/inpttype.ipp:96 src/emu/inpttype.ipp:214
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda No"
+msgid "%p Hanafuda H/8"
+msgstr ""
+
+#: src/emu/inpttype.ipp:97 src/emu/inpttype.ipp:215
+#, c-format
+msgctxt "input-name"
+msgid "%p Hanafuda Yes"
+msgstr ""
+
+#: src/emu/inpttype.ipp:98 src/emu/inpttype.ipp:216
+#, c-format
+msgctxt "input-name"
+msgid "%p Hanafuda No"
 msgstr ""
 
 #: src/emu/inpttype.ipp:103
@@ -3753,1551 +3927,6 @@ msgctxt "input-name"
 msgid "Stop All Reels"
 msgstr ""
 
-#: src/emu/inpttype.ipp:140
-msgctxt "input-name"
-msgid "P2 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:141
-msgctxt "input-name"
-msgid "P2 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:142
-msgctxt "input-name"
-msgid "P2 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:143
-msgctxt "input-name"
-msgid "P2 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:144
-msgctxt "input-name"
-msgid "P2 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:145
-msgctxt "input-name"
-msgid "P2 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:146
-msgctxt "input-name"
-msgid "P2 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:147
-msgctxt "input-name"
-msgid "P2 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:148
-msgctxt "input-name"
-msgid "P2 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:149
-msgctxt "input-name"
-msgid "P2 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:150
-msgctxt "input-name"
-msgid "P2 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:151
-msgctxt "input-name"
-msgid "P2 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:152
-msgctxt "input-name"
-msgid "P2 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:153
-msgctxt "input-name"
-msgid "P2 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:154
-msgctxt "input-name"
-msgid "P2 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:155
-msgctxt "input-name"
-msgid "P2 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:156
-msgctxt "input-name"
-msgid "P2 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:157
-msgctxt "input-name"
-msgid "P2 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:158
-msgctxt "input-name"
-msgid "P2 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:159
-msgctxt "input-name"
-msgid "P2 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:160
-msgctxt "input-name"
-msgid "P2 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:161
-msgctxt "input-name"
-msgid "P2 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:162
-msgctxt "input-name"
-msgid "P2 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:163
-msgctxt "input-name"
-msgid "P2 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:164
-msgctxt "input-name"
-msgid "P2 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:165
-msgctxt "input-name"
-msgid "P2 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:166
-msgctxt "input-name"
-msgid "P2 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:167
-msgctxt "input-name"
-msgid "P2 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:168
-msgctxt "input-name"
-msgid "P2 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:169
-msgctxt "input-name"
-msgid "P2 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:174
-msgctxt "input-name"
-msgid "P2 Mahjong A"
-msgstr ""
-
-#: src/emu/inpttype.ipp:175
-msgctxt "input-name"
-msgid "P2 Mahjong B"
-msgstr ""
-
-#: src/emu/inpttype.ipp:176
-msgctxt "input-name"
-msgid "P2 Mahjong C"
-msgstr ""
-
-#: src/emu/inpttype.ipp:177
-msgctxt "input-name"
-msgid "P2 Mahjong D"
-msgstr ""
-
-#: src/emu/inpttype.ipp:178
-msgctxt "input-name"
-msgid "P2 Mahjong E"
-msgstr ""
-
-#: src/emu/inpttype.ipp:179
-msgctxt "input-name"
-msgid "P2 Mahjong F"
-msgstr ""
-
-#: src/emu/inpttype.ipp:180
-msgctxt "input-name"
-msgid "P2 Mahjong G"
-msgstr ""
-
-#: src/emu/inpttype.ipp:181
-msgctxt "input-name"
-msgid "P2 Mahjong H"
-msgstr ""
-
-#: src/emu/inpttype.ipp:182
-msgctxt "input-name"
-msgid "P2 Mahjong I"
-msgstr ""
-
-#: src/emu/inpttype.ipp:183
-msgctxt "input-name"
-msgid "P2 Mahjong J"
-msgstr ""
-
-#: src/emu/inpttype.ipp:184
-msgctxt "input-name"
-msgid "P2 Mahjong K"
-msgstr ""
-
-#: src/emu/inpttype.ipp:185
-msgctxt "input-name"
-msgid "P2 Mahjong L"
-msgstr ""
-
-#: src/emu/inpttype.ipp:186
-msgctxt "input-name"
-msgid "P2 Mahjong M"
-msgstr ""
-
-#: src/emu/inpttype.ipp:187
-msgctxt "input-name"
-msgid "P2 Mahjong N"
-msgstr ""
-
-#: src/emu/inpttype.ipp:188
-msgctxt "input-name"
-msgid "P2 Mahjong O"
-msgstr ""
-
-#: src/emu/inpttype.ipp:189
-msgctxt "input-name"
-msgid "P2 Mahjong P"
-msgstr ""
-
-#: src/emu/inpttype.ipp:190
-msgctxt "input-name"
-msgid "P2 Mahjong Q"
-msgstr ""
-
-#: src/emu/inpttype.ipp:191
-msgctxt "input-name"
-msgid "P2 Mahjong Kan"
-msgstr ""
-
-#: src/emu/inpttype.ipp:192
-msgctxt "input-name"
-msgid "P2 Mahjong Pon"
-msgstr ""
-
-#: src/emu/inpttype.ipp:193
-msgctxt "input-name"
-msgid "P2 Mahjong Chi"
-msgstr ""
-
-#: src/emu/inpttype.ipp:194
-msgctxt "input-name"
-msgid "P2 Mahjong Reach"
-msgstr ""
-
-#: src/emu/inpttype.ipp:195
-msgctxt "input-name"
-msgid "P2 Mahjong Ron"
-msgstr ""
-
-#: src/emu/inpttype.ipp:196
-msgctxt "input-name"
-msgid "P2 Mahjong Bet"
-msgstr ""
-
-#: src/emu/inpttype.ipp:197
-msgctxt "input-name"
-msgid "P2 Mahjong Last Chance"
-msgstr ""
-
-#: src/emu/inpttype.ipp:198
-msgctxt "input-name"
-msgid "P2 Mahjong Take Score"
-msgstr ""
-
-#: src/emu/inpttype.ipp:199
-msgctxt "input-name"
-msgid "P2 Mahjong Double Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:200
-msgctxt "input-name"
-msgid "P2 Mahjong Flip Flop"
-msgstr ""
-
-#: src/emu/inpttype.ipp:201
-msgctxt "input-name"
-msgid "P2 Mahjong Big"
-msgstr ""
-
-#: src/emu/inpttype.ipp:202
-msgctxt "input-name"
-msgid "P2 Mahjong Small"
-msgstr ""
-
-#: src/emu/inpttype.ipp:207
-msgctxt "input-name"
-msgid "P2 Hanafuda A/1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:208
-msgctxt "input-name"
-msgid "P2 Hanafuda B/2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:209
-msgctxt "input-name"
-msgid "P2 Hanafuda C/3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:210
-msgctxt "input-name"
-msgid "P2 Hanafuda D/4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:211
-msgctxt "input-name"
-msgid "P2 Hanafuda E/5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:212
-msgctxt "input-name"
-msgid "P2 Hanafuda F/6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:213
-msgctxt "input-name"
-msgid "P2 Hanafuda G/7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:214
-msgctxt "input-name"
-msgid "P2 Hanafuda H/8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:215
-msgctxt "input-name"
-msgid "P2 Hanafuda Yes"
-msgstr ""
-
-#: src/emu/inpttype.ipp:216
-msgctxt "input-name"
-msgid "P2 Hanafuda No"
-msgstr ""
-
-#: src/emu/inpttype.ipp:221
-msgctxt "input-name"
-msgid "P3 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:222
-msgctxt "input-name"
-msgid "P3 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:223
-msgctxt "input-name"
-msgid "P3 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:224
-msgctxt "input-name"
-msgid "P3 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:225
-msgctxt "input-name"
-msgid "P3 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:226
-msgctxt "input-name"
-msgid "P3 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:227
-msgctxt "input-name"
-msgid "P3 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:228
-msgctxt "input-name"
-msgid "P3 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:229
-msgctxt "input-name"
-msgid "P3 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:230
-msgctxt "input-name"
-msgid "P3 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:231
-msgctxt "input-name"
-msgid "P3 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:232
-msgctxt "input-name"
-msgid "P3 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:233
-msgctxt "input-name"
-msgid "P3 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:234
-msgctxt "input-name"
-msgid "P3 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:235
-msgctxt "input-name"
-msgid "P3 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:236
-msgctxt "input-name"
-msgid "P3 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:237
-msgctxt "input-name"
-msgid "P3 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:238
-msgctxt "input-name"
-msgid "P3 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:239
-msgctxt "input-name"
-msgid "P3 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:240
-msgctxt "input-name"
-msgid "P3 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:241
-msgctxt "input-name"
-msgid "P3 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:242
-msgctxt "input-name"
-msgid "P3 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:243
-msgctxt "input-name"
-msgid "P3 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:244
-msgctxt "input-name"
-msgid "P3 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:245
-msgctxt "input-name"
-msgid "P3 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:246
-msgctxt "input-name"
-msgid "P3 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:247
-msgctxt "input-name"
-msgid "P3 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:248
-msgctxt "input-name"
-msgid "P3 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:249
-msgctxt "input-name"
-msgid "P3 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:250
-msgctxt "input-name"
-msgid "P3 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:255
-msgctxt "input-name"
-msgid "P4 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:256
-msgctxt "input-name"
-msgid "P4 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:257
-msgctxt "input-name"
-msgid "P4 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:258
-msgctxt "input-name"
-msgid "P4 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:259
-msgctxt "input-name"
-msgid "P4 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:260
-msgctxt "input-name"
-msgid "P4 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:261
-msgctxt "input-name"
-msgid "P4 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:262
-msgctxt "input-name"
-msgid "P4 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:263
-msgctxt "input-name"
-msgid "P4 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:264
-msgctxt "input-name"
-msgid "P4 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:265
-msgctxt "input-name"
-msgid "P4 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:266
-msgctxt "input-name"
-msgid "P4 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:267
-msgctxt "input-name"
-msgid "P4 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:268
-msgctxt "input-name"
-msgid "P4 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:269
-msgctxt "input-name"
-msgid "P4 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:270
-msgctxt "input-name"
-msgid "P4 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:271
-msgctxt "input-name"
-msgid "P4 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:272
-msgctxt "input-name"
-msgid "P4 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:273
-msgctxt "input-name"
-msgid "P4 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:274
-msgctxt "input-name"
-msgid "P4 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:275
-msgctxt "input-name"
-msgid "P4 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:276
-msgctxt "input-name"
-msgid "P4 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:277
-msgctxt "input-name"
-msgid "P4 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:278
-msgctxt "input-name"
-msgid "P4 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:279
-msgctxt "input-name"
-msgid "P4 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:280
-msgctxt "input-name"
-msgid "P4 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:281
-msgctxt "input-name"
-msgid "P4 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:282
-msgctxt "input-name"
-msgid "P4 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:283
-msgctxt "input-name"
-msgid "P4 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:284
-msgctxt "input-name"
-msgid "P4 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:289
-msgctxt "input-name"
-msgid "P5 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:290
-msgctxt "input-name"
-msgid "P5 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:291
-msgctxt "input-name"
-msgid "P5 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:292
-msgctxt "input-name"
-msgid "P5 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:293
-msgctxt "input-name"
-msgid "P5 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:294
-msgctxt "input-name"
-msgid "P5 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:295
-msgctxt "input-name"
-msgid "P5 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:296
-msgctxt "input-name"
-msgid "P5 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:297
-msgctxt "input-name"
-msgid "P5 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:298
-msgctxt "input-name"
-msgid "P5 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:299
-msgctxt "input-name"
-msgid "P5 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:300
-msgctxt "input-name"
-msgid "P5 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:301
-msgctxt "input-name"
-msgid "P5 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:302
-msgctxt "input-name"
-msgid "P5 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:303
-msgctxt "input-name"
-msgid "P5 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:304
-msgctxt "input-name"
-msgid "P5 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:305
-msgctxt "input-name"
-msgid "P5 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:306
-msgctxt "input-name"
-msgid "P5 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:307
-msgctxt "input-name"
-msgid "P5 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:308
-msgctxt "input-name"
-msgid "P5 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:309
-msgctxt "input-name"
-msgid "P5 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:310
-msgctxt "input-name"
-msgid "P5 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:311
-msgctxt "input-name"
-msgid "P5 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:312
-msgctxt "input-name"
-msgid "P5 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:313
-msgctxt "input-name"
-msgid "P5 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:314
-msgctxt "input-name"
-msgid "P5 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:315
-msgctxt "input-name"
-msgid "P5 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:316
-msgctxt "input-name"
-msgid "P5 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:317
-msgctxt "input-name"
-msgid "P5 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:318
-msgctxt "input-name"
-msgid "P5 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:323
-msgctxt "input-name"
-msgid "P6 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:324
-msgctxt "input-name"
-msgid "P6 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:325
-msgctxt "input-name"
-msgid "P6 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:326
-msgctxt "input-name"
-msgid "P6 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:327
-msgctxt "input-name"
-msgid "P6 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:328
-msgctxt "input-name"
-msgid "P6 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:329
-msgctxt "input-name"
-msgid "P6 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:330
-msgctxt "input-name"
-msgid "P6 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:331
-msgctxt "input-name"
-msgid "P6 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:332
-msgctxt "input-name"
-msgid "P6 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:333
-msgctxt "input-name"
-msgid "P6 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:334
-msgctxt "input-name"
-msgid "P6 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:335
-msgctxt "input-name"
-msgid "P6 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:336
-msgctxt "input-name"
-msgid "P6 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:337
-msgctxt "input-name"
-msgid "P6 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:338
-msgctxt "input-name"
-msgid "P6 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:339
-msgctxt "input-name"
-msgid "P6 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:340
-msgctxt "input-name"
-msgid "P6 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:341
-msgctxt "input-name"
-msgid "P6 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:342
-msgctxt "input-name"
-msgid "P6 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:343
-msgctxt "input-name"
-msgid "P6 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:344
-msgctxt "input-name"
-msgid "P6 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:345
-msgctxt "input-name"
-msgid "P6 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:346
-msgctxt "input-name"
-msgid "P6 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:347
-msgctxt "input-name"
-msgid "P6 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:348
-msgctxt "input-name"
-msgid "P6 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:349
-msgctxt "input-name"
-msgid "P6 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:350
-msgctxt "input-name"
-msgid "P6 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:351
-msgctxt "input-name"
-msgid "P6 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:352
-msgctxt "input-name"
-msgid "P6 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:357
-msgctxt "input-name"
-msgid "P7 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:358
-msgctxt "input-name"
-msgid "P7 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:359
-msgctxt "input-name"
-msgid "P7 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:360
-msgctxt "input-name"
-msgid "P7 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:361
-msgctxt "input-name"
-msgid "P7 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:362
-msgctxt "input-name"
-msgid "P7 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:363
-msgctxt "input-name"
-msgid "P7 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:364
-msgctxt "input-name"
-msgid "P7 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:365
-msgctxt "input-name"
-msgid "P7 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:366
-msgctxt "input-name"
-msgid "P7 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:367
-msgctxt "input-name"
-msgid "P7 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:368
-msgctxt "input-name"
-msgid "P7 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:369
-msgctxt "input-name"
-msgid "P7 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:370
-msgctxt "input-name"
-msgid "P7 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:371
-msgctxt "input-name"
-msgid "P7 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:372
-msgctxt "input-name"
-msgid "P7 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:373
-msgctxt "input-name"
-msgid "P7 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:374
-msgctxt "input-name"
-msgid "P7 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:375
-msgctxt "input-name"
-msgid "P7 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:376
-msgctxt "input-name"
-msgid "P7 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:377
-msgctxt "input-name"
-msgid "P7 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:378
-msgctxt "input-name"
-msgid "P7 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:379
-msgctxt "input-name"
-msgid "P7 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:380
-msgctxt "input-name"
-msgid "P7 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:381
-msgctxt "input-name"
-msgid "P7 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:382
-msgctxt "input-name"
-msgid "P7 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:383
-msgctxt "input-name"
-msgid "P7 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:384
-msgctxt "input-name"
-msgid "P7 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:385
-msgctxt "input-name"
-msgid "P7 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:386
-msgctxt "input-name"
-msgid "P7 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:391
-msgctxt "input-name"
-msgid "P8 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:392
-msgctxt "input-name"
-msgid "P8 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:393
-msgctxt "input-name"
-msgid "P8 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:394
-msgctxt "input-name"
-msgid "P8 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:395
-msgctxt "input-name"
-msgid "P8 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:396
-msgctxt "input-name"
-msgid "P8 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:397
-msgctxt "input-name"
-msgid "P8 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:398
-msgctxt "input-name"
-msgid "P8 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:399
-msgctxt "input-name"
-msgid "P8 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:400
-msgctxt "input-name"
-msgid "P8 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:401
-msgctxt "input-name"
-msgid "P8 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:402
-msgctxt "input-name"
-msgid "P8 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:403
-msgctxt "input-name"
-msgid "P8 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:404
-msgctxt "input-name"
-msgid "P8 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:405
-msgctxt "input-name"
-msgid "P8 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:406
-msgctxt "input-name"
-msgid "P8 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:407
-msgctxt "input-name"
-msgid "P8 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:408
-msgctxt "input-name"
-msgid "P8 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:409
-msgctxt "input-name"
-msgid "P8 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:410
-msgctxt "input-name"
-msgid "P8 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:411
-msgctxt "input-name"
-msgid "P8 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:412
-msgctxt "input-name"
-msgid "P8 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:413
-msgctxt "input-name"
-msgid "P8 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:414
-msgctxt "input-name"
-msgid "P8 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:415
-msgctxt "input-name"
-msgid "P8 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:416
-msgctxt "input-name"
-msgid "P8 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:417
-msgctxt "input-name"
-msgid "P8 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:418
-msgctxt "input-name"
-msgid "P8 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:419
-msgctxt "input-name"
-msgid "P8 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:420
-msgctxt "input-name"
-msgid "P8 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:425
-msgctxt "input-name"
-msgid "P9 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:426
-msgctxt "input-name"
-msgid "P9 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:427
-msgctxt "input-name"
-msgid "P9 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:428
-msgctxt "input-name"
-msgid "P9 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:429
-msgctxt "input-name"
-msgid "P9 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:430
-msgctxt "input-name"
-msgid "P9 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:431
-msgctxt "input-name"
-msgid "P9 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:432
-msgctxt "input-name"
-msgid "P9 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:433
-msgctxt "input-name"
-msgid "P9 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:434
-msgctxt "input-name"
-msgid "P9 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:435
-msgctxt "input-name"
-msgid "P9 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:436
-msgctxt "input-name"
-msgid "P9 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:437
-msgctxt "input-name"
-msgid "P9 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:438
-msgctxt "input-name"
-msgid "P9 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:439
-msgctxt "input-name"
-msgid "P9 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:440
-msgctxt "input-name"
-msgid "P9 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:441
-msgctxt "input-name"
-msgid "P9 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:442
-msgctxt "input-name"
-msgid "P9 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:443
-msgctxt "input-name"
-msgid "P9 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:444
-msgctxt "input-name"
-msgid "P9 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:445
-msgctxt "input-name"
-msgid "P9 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:446
-msgctxt "input-name"
-msgid "P9 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:447
-msgctxt "input-name"
-msgid "P9 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:448
-msgctxt "input-name"
-msgid "P9 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:449
-msgctxt "input-name"
-msgid "P9 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:450
-msgctxt "input-name"
-msgid "P9 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:451
-msgctxt "input-name"
-msgid "P9 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:452
-msgctxt "input-name"
-msgid "P9 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:453
-msgctxt "input-name"
-msgid "P9 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:454
-msgctxt "input-name"
-msgid "P9 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:459
-msgctxt "input-name"
-msgid "P10 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:460
-msgctxt "input-name"
-msgid "P10 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:461
-msgctxt "input-name"
-msgid "P10 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:462
-msgctxt "input-name"
-msgid "P10 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:463
-msgctxt "input-name"
-msgid "P10 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:464
-msgctxt "input-name"
-msgid "P10 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:465
-msgctxt "input-name"
-msgid "P10 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:466
-msgctxt "input-name"
-msgid "P10 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:467
-msgctxt "input-name"
-msgid "P10 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:468
-msgctxt "input-name"
-msgid "P10 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:469
-msgctxt "input-name"
-msgid "P10 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:470
-msgctxt "input-name"
-msgid "P10 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:471
-msgctxt "input-name"
-msgid "P10 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:472
-msgctxt "input-name"
-msgid "P10 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:473
-msgctxt "input-name"
-msgid "P10 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:474
-msgctxt "input-name"
-msgid "P10 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:475
-msgctxt "input-name"
-msgid "P10 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:476
-msgctxt "input-name"
-msgid "P10 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:477
-msgctxt "input-name"
-msgid "P10 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:478
-msgctxt "input-name"
-msgid "P10 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:479
-msgctxt "input-name"
-msgid "P10 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:480
-msgctxt "input-name"
-msgid "P10 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:481
-msgctxt "input-name"
-msgid "P10 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:482
-msgctxt "input-name"
-msgid "P10 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:483
-msgctxt "input-name"
-msgid "P10 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:484
-msgctxt "input-name"
-msgid "P10 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:485
-msgctxt "input-name"
-msgid "P10 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:486
-msgctxt "input-name"
-msgid "P10 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:487
-msgctxt "input-name"
-msgid "P10 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:488
-msgctxt "input-name"
-msgid "P10 Select"
-msgstr ""
-
 #: src/emu/inpttype.ipp:493
 msgctxt "input-name"
 msgid "1 Player Start"
@@ -5478,154 +4107,31 @@ msgctxt "input-name"
 msgid "Volume Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:550
-msgctxt "input-name"
-msgid "P1 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:551
-msgctxt "input-name"
-msgid "P2 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:552
-msgctxt "input-name"
-msgid "P3 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:553
-msgctxt "input-name"
-msgid "P4 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:554
-msgctxt "input-name"
-msgid "P5 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:555
-msgctxt "input-name"
-msgid "P6 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:556
-msgctxt "input-name"
-msgid "P7 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:557
-msgctxt "input-name"
-msgid "P8 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:558
-msgctxt "input-name"
-msgid "P9 Pedal 1"
-msgstr ""
-
+#: src/emu/inpttype.ipp:550 src/emu/inpttype.ipp:551 src/emu/inpttype.ipp:552
+#: src/emu/inpttype.ipp:553 src/emu/inpttype.ipp:554 src/emu/inpttype.ipp:555
+#: src/emu/inpttype.ipp:556 src/emu/inpttype.ipp:557 src/emu/inpttype.ipp:558
 #: src/emu/inpttype.ipp:559
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:564
-msgctxt "input-name"
-msgid "P1 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:565
-msgctxt "input-name"
-msgid "P2 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:566
-msgctxt "input-name"
-msgid "P3 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:567
-msgctxt "input-name"
-msgid "P4 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:568
-msgctxt "input-name"
-msgid "P5 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:569
-msgctxt "input-name"
-msgid "P6 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:570
-msgctxt "input-name"
-msgid "P7 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:571
-msgctxt "input-name"
-msgid "P8 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:572
-msgctxt "input-name"
-msgid "P9 Pedal 2"
+msgid "%p Pedal 1"
 msgstr ""
 
+#: src/emu/inpttype.ipp:564 src/emu/inpttype.ipp:565 src/emu/inpttype.ipp:566
+#: src/emu/inpttype.ipp:567 src/emu/inpttype.ipp:568 src/emu/inpttype.ipp:569
+#: src/emu/inpttype.ipp:570 src/emu/inpttype.ipp:571 src/emu/inpttype.ipp:572
 #: src/emu/inpttype.ipp:573
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:578
-msgctxt "input-name"
-msgid "P1 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:579
-msgctxt "input-name"
-msgid "P2 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:580
-msgctxt "input-name"
-msgid "P3 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:581
-msgctxt "input-name"
-msgid "P4 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:582
-msgctxt "input-name"
-msgid "P5 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:583
-msgctxt "input-name"
-msgid "P6 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:584
-msgctxt "input-name"
-msgid "P7 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:585
-msgctxt "input-name"
-msgid "P8 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:586
-msgctxt "input-name"
-msgid "P9 Pedal 3"
+msgid "%p Pedal 2"
 msgstr ""
 
+#: src/emu/inpttype.ipp:578 src/emu/inpttype.ipp:579 src/emu/inpttype.ipp:580
+#: src/emu/inpttype.ipp:581 src/emu/inpttype.ipp:582 src/emu/inpttype.ipp:583
+#: src/emu/inpttype.ipp:584 src/emu/inpttype.ipp:585 src/emu/inpttype.ipp:586
 #: src/emu/inpttype.ipp:587
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 3"
+msgid "%p Pedal 3"
 msgstr ""
 
 #: src/emu/inpttype.ipp:592
diff --git a/language/Burmese/strings.po b/language/Burmese/strings.po
index aead122f7f3..4b65086d31a 100644
--- a/language/Burmese/strings.po
+++ b/language/Burmese/strings.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-19 02:50+1100\n"
+"POT-Creation-Date: 2021-12-09 04:44+1100\n"
 "PO-Revision-Date: 2016-02-20 18:03+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: MAME Language Team\n"
@@ -259,12 +259,12 @@ msgstr ""
 msgid "Driver: \"%1$s\" software list "
 msgstr ""
 
-#: src/frontend/mame/ui/selsoft.cpp:711 src/frontend/mame/ui/selgame.cpp:1066
+#: src/frontend/mame/ui/selsoft.cpp:711 src/frontend/mame/ui/selgame.cpp:1076
 #, c-format
 msgid "%1$s: %2$s - Search: %3$s_"
 msgstr ""
 
-#: src/frontend/mame/ui/selsoft.cpp:713 src/frontend/mame/ui/selgame.cpp:1068
+#: src/frontend/mame/ui/selsoft.cpp:713 src/frontend/mame/ui/selgame.cpp:1078
 #, c-format
 msgid "Search: %1$s_"
 msgstr ""
@@ -274,7 +274,7 @@ msgstr ""
 msgid "Software list/item: %1$s:%2$s"
 msgstr ""
 
-#: src/frontend/mame/ui/optsmenu.cpp:73 src/frontend/mame/ui/sndmenu.cpp:165
+#: src/frontend/mame/ui/optsmenu.cpp:73 src/frontend/mame/ui/sndmenu.cpp:161
 msgid "Sound Options"
 msgstr ""
 
@@ -369,11 +369,11 @@ msgid "Show mouse pointer"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:39
-msgid "Confirm quit from machines"
+msgid "Confirm quit from emulation"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:40
-msgid "Skip information screen at startup"
+msgid "Skip system information screen"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:41
@@ -389,7 +389,7 @@ msgid "Skip BIOS selection menu"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:44
-msgid "Skip software parts selection menu"
+msgid "Skip software part selection menu"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:45
@@ -541,7 +541,7 @@ msgid "UI active"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:91
-msgid "Offscreen reload"
+msgid "Off-screen reload"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:92
@@ -557,7 +557,7 @@ msgid "Natural keyboard"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:95
-msgid "Simultaneous contradictory"
+msgid "Allow contradictory joystick inputs"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:96
@@ -581,7 +581,7 @@ msgid "Pedal Device Assignment"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:106
-msgid "Adstick Device Assignment"
+msgid "AD Stick Device Assignment"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:107
@@ -668,14 +668,14 @@ msgstr ""
 msgid "Wait Vertical Sync"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:687
+#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:689
 #: src/frontend/mame/ui/videoopt.cpp:191 src/frontend/mame/ui/custui.cpp:490
 #: src/frontend/mame/ui/analogipt.cpp:471 plugins/cheatfind/init.lua:766
 #: plugins/cheatfind/init.lua:777 plugins/cheat/init.lua:668
 msgid "On"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:690
+#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:692
 #: src/frontend/mame/ui/videoopt.cpp:207 src/frontend/mame/ui/custui.cpp:490
 #: src/frontend/mame/ui/analogipt.cpp:471 plugins/cheatfind/init.lua:763
 #: plugins/cheatfind/init.lua:774 plugins/cheat/init.lua:671
@@ -683,11 +683,11 @@ msgstr ""
 msgid "Off"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:693
+#: src/frontend/mame/ui/menu.cpp:695
 msgid "Auto"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:1195
+#: src/frontend/mame/ui/menu.cpp:1197
 #: src/frontend/mame/ui/simpleselgame.cpp:278
 #: src/frontend/mame/ui/selmenu.cpp:1280
 msgid "Return to Previous Menu"
@@ -695,7 +695,7 @@ msgstr ""
 
 #: src/frontend/mame/ui/filemngr.cpp:139
 #: src/frontend/mame/ui/confswitch.cpp:119
-#: src/frontend/mame/ui/inputmap.cpp:559 src/frontend/mame/ui/analogipt.cpp:360
+#: src/frontend/mame/ui/inputmap.cpp:563 src/frontend/mame/ui/analogipt.cpp:360
 #, c-format
 msgid "[root%1$s]"
 msgstr ""
@@ -938,22 +938,22 @@ msgid ""
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "GHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "MHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "kHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "Hz"
 msgstr ""
 
@@ -977,38 +977,38 @@ msgstr ""
 msgid "Vector"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:480
+#: src/frontend/mame/ui/info.cpp:483
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:480
+#: src/frontend/mame/ui/info.cpp:483
 msgid "%2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:497
+#: src/frontend/mame/ui/info.cpp:500
 #, c-format
 msgid "Screen '%1$s'"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:499
+#: src/frontend/mame/ui/info.cpp:502
 msgid "Screen"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:570 src/frontend/mame/ui/info.cpp:581
+#: src/frontend/mame/ui/info.cpp:573 src/frontend/mame/ui/info.cpp:584
 #, c-format
 msgid "%1$s:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:662
+#: src/frontend/mame/ui/info.cpp:665
 msgid "Not supported"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:665
+#: src/frontend/mame/ui/info.cpp:668
 msgid "Partially supported"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:674
+#: src/frontend/mame/ui/info.cpp:677
 msgid "[empty]"
 msgstr ""
 
@@ -1081,7 +1081,7 @@ msgid "Emulated"
 msgstr ""
 
 #: src/frontend/mame/ui/keyboard.cpp:59 src/frontend/mame/ui/confswitch.cpp:117
-#: src/frontend/mame/ui/inputmap.cpp:557 src/frontend/mame/ui/analogipt.cpp:358
+#: src/frontend/mame/ui/inputmap.cpp:561 src/frontend/mame/ui/analogipt.cpp:358
 #, c-format
 msgid "%1$s [root%2$s]"
 msgstr ""
@@ -1441,7 +1441,7 @@ msgctxt "swlist-info"
 msgid "Software list/item"
 msgstr ""
 
-#: src/frontend/mame/ui/datmenu.cpp:88 src/frontend/mame/ui/selmenu.cpp:2698
+#: src/frontend/mame/ui/datmenu.cpp:88 src/frontend/mame/ui/selmenu.cpp:2707
 msgid "Software List Info"
 msgstr ""
 
@@ -1556,7 +1556,7 @@ msgstr ""
 msgid "Configure Machine:"
 msgstr ""
 
-#: src/frontend/mame/ui/miscmenu.cpp:858 src/frontend/mame/ui/selmenu.cpp:2638
+#: src/frontend/mame/ui/miscmenu.cpp:858 src/frontend/mame/ui/selmenu.cpp:2647
 msgid " (default)"
 msgstr ""
 
@@ -1573,7 +1573,7 @@ msgid ""
 "Press %2$s to return to emulation"
 msgstr ""
 
-#: src/frontend/mame/ui/info_pty.cpp:30 src/frontend/mame/ui/mainmenu.cpp:155
+#: src/frontend/mame/ui/info_pty.cpp:30
 msgid "Pseudo terminals"
 msgstr ""
 
@@ -1641,52 +1641,52 @@ msgstr ""
 msgid "Other Controls"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:227
+#: src/frontend/mame/ui/inputmap.cpp:231
 msgid "This machine has no configurable inputs."
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:327
+#: src/frontend/mame/ui/inputmap.cpp:331
 msgid "Pressed"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:397
+#: src/frontend/mame/ui/inputmap.cpp:401
 msgid "Invalid sequence entered"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:542
+#: src/frontend/mame/ui/inputmap.cpp:546
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:543
+#: src/frontend/mame/ui/inputmap.cpp:547
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog Inc"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:544
+#: src/frontend/mame/ui/inputmap.cpp:548
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog Dec"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:586
+#: src/frontend/mame/ui/inputmap.cpp:590
 #, c-format
 msgid "Press %1$s to set\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:587
+#: src/frontend/mame/ui/inputmap.cpp:591
 #, c-format
 msgid "Press %1$s to append\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:588
+#: src/frontend/mame/ui/inputmap.cpp:592
 #, c-format
 msgid "Press %1$s to clear\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:589
+#: src/frontend/mame/ui/inputmap.cpp:593
 #, c-format
 msgid "Press %1$s to restore default\n"
 msgstr ""
@@ -1750,7 +1750,7 @@ msgid ""
 msgstr ""
 
 #: src/frontend/mame/ui/simpleselgame.cpp:273
-#: src/frontend/mame/ui/selgame.cpp:436
+#: src/frontend/mame/ui/selgame.cpp:443
 msgid "Configure Options"
 msgstr ""
 
@@ -2078,16 +2078,16 @@ msgstr ""
 msgid "Expand to fit"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:437
+#: src/frontend/mame/ui/selgame.cpp:444
 msgid "Configure Machine"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:1050
+#: src/frontend/mame/ui/selgame.cpp:1060
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d machines (%5$d BIOS) )"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:1078
+#: src/frontend/mame/ui/selgame.cpp:1088
 #, c-format
 msgid "System: %1$-.100s"
 msgstr ""
@@ -2109,7 +2109,7 @@ msgstr ""
 #: src/frontend/mame/ui/auditmenu.cpp:98
 #, c-format
 msgid ""
-"Auditing ROMs for machine %2$u of %3$u...\n"
+"Auditing media for machine %2$u of %3$u...\n"
 "%1$s"
 msgstr ""
 
@@ -2124,12 +2124,12 @@ msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:136
 #, c-format
-msgid "Audit ROMs for %1$u machines marked unavailable"
+msgid "Audit media for %1$u machines marked unavailable"
 msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:137
 #, c-format
-msgid "Audit ROMs for all %1$u machines"
+msgid "Audit media for all %1$u machines"
 msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:154
@@ -2335,84 +2335,84 @@ msgctxt "color-sample"
 msgid "Clone"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:914
+#: src/frontend/mame/ui/custui.cpp:906
 msgid "ARGB Settings"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:919 src/frontend/mame/ui/custui.cpp:922
+#: src/frontend/mame/ui/custui.cpp:911 src/frontend/mame/ui/custui.cpp:914
 msgctxt "color-channel"
 msgid "Alpha"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:927 src/frontend/mame/ui/custui.cpp:930
+#: src/frontend/mame/ui/custui.cpp:919 src/frontend/mame/ui/custui.cpp:922
 msgctxt "color-channel"
 msgid "Red"
 msgstr ""
 
+#: src/frontend/mame/ui/custui.cpp:927 src/frontend/mame/ui/custui.cpp:930
+msgctxt "color-channel"
+msgid "Green"
+msgstr ""
+
 #: src/frontend/mame/ui/custui.cpp:935 src/frontend/mame/ui/custui.cpp:938
 msgctxt "color-channel"
-msgid "Green"
-msgstr ""
-
-#: src/frontend/mame/ui/custui.cpp:943 src/frontend/mame/ui/custui.cpp:946
-msgctxt "color-channel"
 msgid "Blue"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:949
+#: src/frontend/mame/ui/custui.cpp:941
 msgid "Choose from palette"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:996
+#: src/frontend/mame/ui/custui.cpp:988
 msgid "Color preview:"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1093
+#: src/frontend/mame/ui/custui.cpp:1085
 msgctxt "color-preset"
 msgid "White"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1094
+#: src/frontend/mame/ui/custui.cpp:1086
 msgctxt "color-preset"
 msgid "Silver"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1095
+#: src/frontend/mame/ui/custui.cpp:1087
 msgctxt "color-preset"
 msgid "Gray"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1096
+#: src/frontend/mame/ui/custui.cpp:1088
 msgctxt "color-preset"
 msgid "Black"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1097
+#: src/frontend/mame/ui/custui.cpp:1089
 msgctxt "color-preset"
 msgid "Red"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1098
+#: src/frontend/mame/ui/custui.cpp:1090
 msgctxt "color-preset"
 msgid "Orange"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1099
+#: src/frontend/mame/ui/custui.cpp:1091
 msgctxt "color-preset"
 msgid "Yellow"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1100
+#: src/frontend/mame/ui/custui.cpp:1092
 msgctxt "color-preset"
 msgid "Green"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1101
+#: src/frontend/mame/ui/custui.cpp:1093
 msgctxt "color-preset"
 msgid "Blue"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1102
+#: src/frontend/mame/ui/custui.cpp:1094
 msgctxt "color-preset"
 msgid "Violet"
 msgstr ""
@@ -2477,7 +2477,7 @@ msgid "Input (general)"
 msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:123
-msgid "Input (this Machine)"
+msgid "Input (this machine)"
 msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:126
@@ -2516,6 +2516,10 @@ msgstr ""
 msgid "Tape Control"
 msgstr ""
 
+#: src/frontend/mame/ui/mainmenu.cpp:155
+msgid "Pseudo Terminals"
+msgstr ""
+
 #: src/frontend/mame/ui/mainmenu.cpp:158
 msgid "BIOS Selection"
 msgstr ""
@@ -2554,7 +2558,7 @@ msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:200
 #, c-format
-msgid "About %s"
+msgid "About %1$s"
 msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:212
@@ -2714,373 +2718,373 @@ msgstr ""
 msgid "%1$s %2$s"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2235
+#: src/frontend/mame/ui/selmenu.cpp:2244
 msgid "Images"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2236
+#: src/frontend/mame/ui/selmenu.cpp:2245
 msgid "Infos"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2551
+#: src/frontend/mame/ui/selmenu.cpp:2560
 msgid ""
 "Required ROM/disk images for the selected system are missing or incorrect. "
 "Please acquire the correct files or select a different system.\n"
 "\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2567
+#: src/frontend/mame/ui/selmenu.cpp:2576
 msgid ""
 "Required ROM/disk images for the selected software are missing or incorrect. "
 "Please acquire the correct files or select a different software item.\n"
 "\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2583
+#: src/frontend/mame/ui/selmenu.cpp:2592
 msgid "incorrect checksum"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2586
+#: src/frontend/mame/ui/selmenu.cpp:2595
 msgid "incorrect length"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2589
+#: src/frontend/mame/ui/selmenu.cpp:2598
 msgid "not found"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2600
+#: src/frontend/mame/ui/selmenu.cpp:2609
 #, c-format
 msgid "%1$s (%2$s) - %3$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2602
+#: src/frontend/mame/ui/selmenu.cpp:2611
 #, c-format
 msgid "%1$s - %2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2606
+#: src/frontend/mame/ui/selmenu.cpp:2615
 msgid "Press any key to continue."
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2735
+#: src/frontend/mame/ui/selmenu.cpp:2744
 msgid "General Info"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2887
-#, c-format
-msgid "Romset\t%1$s\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2888
-#, c-format
-msgid "Year\t%1$s\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2889
-#, c-format
-msgid "Manufacturer\t%1$s\n"
-msgstr ""
-
 #: src/frontend/mame/ui/selmenu.cpp:2896
 #, c-format
-msgid "Driver is Clone of\t%1$s\n"
+msgid "Romset\t%1$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2901
-msgid "Driver is Parent\t\n"
+#: src/frontend/mame/ui/selmenu.cpp:2897
+#, c-format
+msgid "Year\t%1$s\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2898
+#, c-format
+msgid "Manufacturer\t%1$s\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2905
-msgid "Analog Controls\tYes\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2907
-msgid "Keyboard Inputs\tYes\n"
+#, c-format
+msgid "Driver is Clone of\t%1$s\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2910
-msgid "Overall\tNOT WORKING\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2912
-msgid "Overall\tUnemulated Protection\n"
+msgid "Driver is Parent\t\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2914
-msgid "Overall\tWorking\n"
+msgid "Analog Controls\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2917
-msgid "Graphics\tUnimplemented\n"
+#: src/frontend/mame/ui/selmenu.cpp:2916
+msgid "Keyboard Inputs\tYes\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2919
-msgid "Graphics\tWrong Colors\n"
+msgid "Overall\tNOT WORKING\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2921
-msgid "Graphics\tImperfect Colors\n"
+msgid "Overall\tUnemulated Protection\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2923
-msgid "Graphics\tImperfect\n"
+msgid "Overall\tWorking\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2925
-msgid "Graphics\tOK\n"
+#: src/frontend/mame/ui/selmenu.cpp:2926
+msgid "Graphics\tUnimplemented\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2928
-msgid "Sound\tNone\n"
+msgid "Graphics\tWrong Colors\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2930
-msgid "Sound\tUnimplemented\n"
+msgid "Graphics\tImperfect Colors\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2932
-msgid "Sound\tImperfect\n"
+msgid "Graphics\tImperfect\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2934
-msgid "Sound\tOK\n"
+msgid "Graphics\tOK\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2937
-msgid "Capture\tUnimplemented\n"
+msgid "Sound\tNone\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2939
+msgid "Sound\tUnimplemented\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2941
+msgid "Sound\tImperfect\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2943
+msgid "Sound\tOK\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2946
+msgid "Capture\tUnimplemented\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2948
 msgid "Capture\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2942
+#: src/frontend/mame/ui/selmenu.cpp:2951
 msgid "Camera\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2944
+#: src/frontend/mame/ui/selmenu.cpp:2953
 msgid "Camera\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2947
+#: src/frontend/mame/ui/selmenu.cpp:2956
 msgid "Microphone\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2949
+#: src/frontend/mame/ui/selmenu.cpp:2958
 msgid "Microphone\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2952
+#: src/frontend/mame/ui/selmenu.cpp:2961
 msgid "Controls\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2954
+#: src/frontend/mame/ui/selmenu.cpp:2963
 msgid "Controls\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2957
+#: src/frontend/mame/ui/selmenu.cpp:2966
 msgid "Keyboard\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2959
+#: src/frontend/mame/ui/selmenu.cpp:2968
 msgid "Keyboard\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2962
+#: src/frontend/mame/ui/selmenu.cpp:2971
 msgid "Mouse\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2964
+#: src/frontend/mame/ui/selmenu.cpp:2973
 msgid "Mouse\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2967
+#: src/frontend/mame/ui/selmenu.cpp:2976
 msgid "Media\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2969
+#: src/frontend/mame/ui/selmenu.cpp:2978
 msgid "Media\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2972
+#: src/frontend/mame/ui/selmenu.cpp:2981
 msgid "Disk\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2974
+#: src/frontend/mame/ui/selmenu.cpp:2983
 msgid "Disk\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2977
+#: src/frontend/mame/ui/selmenu.cpp:2986
 msgid "Printer\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2979
+#: src/frontend/mame/ui/selmenu.cpp:2988
 msgid "Printer\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2982
+#: src/frontend/mame/ui/selmenu.cpp:2991
 msgid "Mag. Tape\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2984
+#: src/frontend/mame/ui/selmenu.cpp:2993
 msgid "Mag. Tape\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2987
+#: src/frontend/mame/ui/selmenu.cpp:2996
 msgid "Punch Tape\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2989
+#: src/frontend/mame/ui/selmenu.cpp:2998
 msgid "Punch Tape\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2992
+#: src/frontend/mame/ui/selmenu.cpp:3001
 msgid "Mag. Drum\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2994
+#: src/frontend/mame/ui/selmenu.cpp:3003
 msgid "Mag. Drum\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2997
+#: src/frontend/mame/ui/selmenu.cpp:3006
 msgid "(EP)ROM\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2999
+#: src/frontend/mame/ui/selmenu.cpp:3008
 msgid "(EP)ROM\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3002
+#: src/frontend/mame/ui/selmenu.cpp:3011
 msgid "Communications\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3004
+#: src/frontend/mame/ui/selmenu.cpp:3013
 msgid "Communications\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3007
+#: src/frontend/mame/ui/selmenu.cpp:3016
 msgid "LAN\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3009
+#: src/frontend/mame/ui/selmenu.cpp:3018
 msgid "LAN\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3012
+#: src/frontend/mame/ui/selmenu.cpp:3021
 msgid "WAN\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3014
+#: src/frontend/mame/ui/selmenu.cpp:3023
 msgid "WAN\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3017
+#: src/frontend/mame/ui/selmenu.cpp:3026
 msgid "Timing\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3019
+#: src/frontend/mame/ui/selmenu.cpp:3028
 msgid "Timing\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3021
+#: src/frontend/mame/ui/selmenu.cpp:3030
 msgid "Mechanical Machine\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3021
+#: src/frontend/mame/ui/selmenu.cpp:3030
 msgid "Mechanical Machine\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3022
+#: src/frontend/mame/ui/selmenu.cpp:3031
 msgid "Requires Artwork\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3022
+#: src/frontend/mame/ui/selmenu.cpp:3031
 msgid "Requires Artwork\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3023
+#: src/frontend/mame/ui/selmenu.cpp:3032
 msgid "Requires Clickable Artwork\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3023
+#: src/frontend/mame/ui/selmenu.cpp:3032
 msgid "Requires Clickable Artwork\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3025
+#: src/frontend/mame/ui/selmenu.cpp:3034
 msgid "Support Cocktail\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3026
+#: src/frontend/mame/ui/selmenu.cpp:3035
 msgid "Driver is BIOS\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3026
+#: src/frontend/mame/ui/selmenu.cpp:3035
 msgid "Driver is BIOS\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3027
+#: src/frontend/mame/ui/selmenu.cpp:3036
 msgid "Support Save\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3027
+#: src/frontend/mame/ui/selmenu.cpp:3036
 msgid "Support Save\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3028
+#: src/frontend/mame/ui/selmenu.cpp:3037
 msgid "Screen Orientation\tVertical\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3028
+#: src/frontend/mame/ui/selmenu.cpp:3037
 msgid "Screen Orientation\tHorizontal\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3038
+#: src/frontend/mame/ui/selmenu.cpp:3047
 msgid "Requires CHD\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3038
+#: src/frontend/mame/ui/selmenu.cpp:3047
 msgid "Requires CHD\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3051
-msgid "ROM Audit Result\tOK\n"
+#: src/frontend/mame/ui/selmenu.cpp:3060
+msgid "Media Audit Result\tOK\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3053
-msgid "ROM Audit Result\tBAD\n"
+#: src/frontend/mame/ui/selmenu.cpp:3062
+msgid "Media Audit Result\tBAD\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3056
+#: src/frontend/mame/ui/selmenu.cpp:3065
 msgid "Samples Audit Result\tNone Needed\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3058
+#: src/frontend/mame/ui/selmenu.cpp:3067
 msgid "Samples Audit Result\tOK\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3060
+#: src/frontend/mame/ui/selmenu.cpp:3069
 msgid "Samples Audit Result\tBAD\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3064
+#: src/frontend/mame/ui/selmenu.cpp:3073
 msgid ""
-"ROM Audit \tDisabled\n"
-"Samples Audit \tDisabled\n"
+"Media Audit\tDisabled\n"
+"Samples Audit\tDisabled\n"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:150
+#: src/frontend/mame/ui/sndmenu.cpp:146
 msgid "Sound"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:151
+#: src/frontend/mame/ui/sndmenu.cpp:147
 msgid "Compressor"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:152
+#: src/frontend/mame/ui/sndmenu.cpp:148
 msgid "Sample Rate"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:153
+#: src/frontend/mame/ui/sndmenu.cpp:149
 msgid "Use External Samples"
 msgstr ""
 
@@ -3119,511 +3123,681 @@ msgstr ""
 msgid "  Screen '%1$s': Vector\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:132
+#: src/frontend/mame/ui/devopt.cpp:135
 #, c-format
 msgid "  Screen '%1$s': %2$d × %3$d (V) %4$s Hz\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:133
+#: src/frontend/mame/ui/devopt.cpp:136
 #, c-format
 msgid "  Screen '%1$s': %2$d × %3$d (H) %4$s Hz\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:147
+#: src/frontend/mame/ui/devopt.cpp:150
 msgid "* Sound:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:211
+#: src/frontend/mame/ui/devopt.cpp:214
 #, c-format
 msgid ""
 "* BIOS settings:\n"
 "  %1$d options    [default: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:255 src/frontend/mame/ui/devopt.cpp:271
-#: src/frontend/mame/ui/devopt.cpp:332
+#: src/frontend/mame/ui/devopt.cpp:258 src/frontend/mame/ui/devopt.cpp:274
+#: src/frontend/mame/ui/devopt.cpp:335
 #, c-format
 msgid "  %1$s    [default: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:260 src/frontend/mame/ui/devopt.cpp:276
+#: src/frontend/mame/ui/devopt.cpp:263 src/frontend/mame/ui/devopt.cpp:279
 #, c-format
 msgid "  %1$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:282
+#: src/frontend/mame/ui/devopt.cpp:285
 msgid "* DIP switch settings:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:287
+#: src/frontend/mame/ui/devopt.cpp:290
 msgid "* Configuration settings:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:291
+#: src/frontend/mame/ui/devopt.cpp:294
 msgid "* Input device(s):\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:293
+#: src/frontend/mame/ui/devopt.cpp:296
 #, c-format
 msgid "  User inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:295
+#: src/frontend/mame/ui/devopt.cpp:298
 #, c-format
 msgid "  Mahjong inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:297
+#: src/frontend/mame/ui/devopt.cpp:300
 #, c-format
 msgid "  Hanafuda inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:299
+#: src/frontend/mame/ui/devopt.cpp:302
 #, c-format
 msgid "  Gambling inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:301
+#: src/frontend/mame/ui/devopt.cpp:304
 #, c-format
 msgid "  Analog inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:303
+#: src/frontend/mame/ui/devopt.cpp:306
 #, c-format
 msgid "  Adjuster inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:305
+#: src/frontend/mame/ui/devopt.cpp:308
 #, c-format
 msgid "  Keypad inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:307
+#: src/frontend/mame/ui/devopt.cpp:310
 #, c-format
 msgid "  Keyboard inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:312
+#: src/frontend/mame/ui/devopt.cpp:315
 msgid "* Media Options:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:317
+#: src/frontend/mame/ui/devopt.cpp:320
 #, c-format
 msgid "  %1$s    [tag: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:327
+#: src/frontend/mame/ui/devopt.cpp:330
 msgid "* Slot Options:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:341
+#: src/frontend/mame/ui/devopt.cpp:344
 msgid "[None]\n"
 msgstr ""
 
-#: src/emu/render.cpp:1847
+#: src/emu/render.cpp:1796
 #, c-format
 msgctxt "view-name"
 msgid "Screen %1$u Standard (%2$u:%3$u)"
 msgstr ""
 
-#: src/emu/render.cpp:1873
+#: src/emu/render.cpp:1822
 #, c-format
 msgctxt "view-name"
 msgid "Screen %1$u Pixel Aspect (%2$u:%3$u)"
 msgstr ""
 
-#: src/emu/render.cpp:1895 src/emu/render.cpp:2030
+#: src/emu/render.cpp:1844 src/emu/render.cpp:1979
 msgctxt "view-name"
 msgid "Cocktail"
 msgstr ""
 
-#: src/emu/render.cpp:2015
+#: src/emu/render.cpp:1964
 msgctxt "view-name"
 msgid "Left-to-Right"
 msgstr ""
 
-#: src/emu/render.cpp:2016
+#: src/emu/render.cpp:1965
 msgctxt "view-name"
 msgid "Left-to-Right (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2017
+#: src/emu/render.cpp:1966
 msgctxt "view-name"
 msgid "Top-to-Bottom"
 msgstr ""
 
-#: src/emu/render.cpp:2018
+#: src/emu/render.cpp:1967
 msgctxt "view-name"
 msgid "Top-to-Bottom (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2069
+#: src/emu/render.cpp:2018
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Left-to-Right, Top-to-Bottom"
 msgstr ""
 
-#: src/emu/render.cpp:2078
+#: src/emu/render.cpp:2027
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Left-to-Right, Top-to-Bottom (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2087
+#: src/emu/render.cpp:2036
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Top-to-Bottom, Left-to-Right"
 msgstr ""
 
-#: src/emu/render.cpp:2096
+#: src/emu/render.cpp:2045
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Top-to-Bottom, Left-to-Right (Gapless)"
 msgstr ""
 
-#: src/emu/inpttype.ipp:22
+#: src/emu/ioport.cpp:332
+#, c-format
 msgctxt "input-name"
-msgid "P1 Up"
+msgid "P%1$u"
 msgstr ""
 
-#: src/emu/inpttype.ipp:23
+#: src/emu/ioport.cpp:1924
 msgctxt "input-name"
-msgid "P1 Down"
+msgid "???"
 msgstr ""
 
-#: src/emu/inpttype.ipp:24
+#: src/emu/inpttype.ipp:22 src/emu/inpttype.ipp:140 src/emu/inpttype.ipp:221
+#: src/emu/inpttype.ipp:255 src/emu/inpttype.ipp:289 src/emu/inpttype.ipp:323
+#: src/emu/inpttype.ipp:357 src/emu/inpttype.ipp:391 src/emu/inpttype.ipp:425
+#: src/emu/inpttype.ipp:459
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left"
+msgid "%p Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:25
+#: src/emu/inpttype.ipp:23 src/emu/inpttype.ipp:141 src/emu/inpttype.ipp:222
+#: src/emu/inpttype.ipp:256 src/emu/inpttype.ipp:290 src/emu/inpttype.ipp:324
+#: src/emu/inpttype.ipp:358 src/emu/inpttype.ipp:392 src/emu/inpttype.ipp:426
+#: src/emu/inpttype.ipp:460
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right"
+msgid "%p Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:26
+#: src/emu/inpttype.ipp:24 src/emu/inpttype.ipp:142 src/emu/inpttype.ipp:223
+#: src/emu/inpttype.ipp:257 src/emu/inpttype.ipp:291 src/emu/inpttype.ipp:325
+#: src/emu/inpttype.ipp:359 src/emu/inpttype.ipp:393 src/emu/inpttype.ipp:427
+#: src/emu/inpttype.ipp:461
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Up"
+msgid "%p Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:27
+#: src/emu/inpttype.ipp:25 src/emu/inpttype.ipp:143 src/emu/inpttype.ipp:224
+#: src/emu/inpttype.ipp:258 src/emu/inpttype.ipp:292 src/emu/inpttype.ipp:326
+#: src/emu/inpttype.ipp:360 src/emu/inpttype.ipp:394 src/emu/inpttype.ipp:428
+#: src/emu/inpttype.ipp:462
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Down"
+msgid "%p Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:28
+#: src/emu/inpttype.ipp:26 src/emu/inpttype.ipp:144 src/emu/inpttype.ipp:225
+#: src/emu/inpttype.ipp:259 src/emu/inpttype.ipp:293 src/emu/inpttype.ipp:327
+#: src/emu/inpttype.ipp:361 src/emu/inpttype.ipp:395 src/emu/inpttype.ipp:429
+#: src/emu/inpttype.ipp:463
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Left"
+msgid "%p Right Stick/Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:29
+#: src/emu/inpttype.ipp:27 src/emu/inpttype.ipp:145 src/emu/inpttype.ipp:226
+#: src/emu/inpttype.ipp:260 src/emu/inpttype.ipp:294 src/emu/inpttype.ipp:328
+#: src/emu/inpttype.ipp:362 src/emu/inpttype.ipp:396 src/emu/inpttype.ipp:430
+#: src/emu/inpttype.ipp:464
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Right"
+msgid "%p Right Stick/Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:30
+#: src/emu/inpttype.ipp:28 src/emu/inpttype.ipp:146 src/emu/inpttype.ipp:227
+#: src/emu/inpttype.ipp:261 src/emu/inpttype.ipp:295 src/emu/inpttype.ipp:329
+#: src/emu/inpttype.ipp:363 src/emu/inpttype.ipp:397 src/emu/inpttype.ipp:431
+#: src/emu/inpttype.ipp:465
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Up"
+msgid "%p Right Stick/Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:31
+#: src/emu/inpttype.ipp:29 src/emu/inpttype.ipp:147 src/emu/inpttype.ipp:228
+#: src/emu/inpttype.ipp:262 src/emu/inpttype.ipp:296 src/emu/inpttype.ipp:330
+#: src/emu/inpttype.ipp:364 src/emu/inpttype.ipp:398 src/emu/inpttype.ipp:432
+#: src/emu/inpttype.ipp:466
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Down"
+msgid "%p Right Stick/Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:32
+#: src/emu/inpttype.ipp:30 src/emu/inpttype.ipp:148 src/emu/inpttype.ipp:229
+#: src/emu/inpttype.ipp:263 src/emu/inpttype.ipp:297 src/emu/inpttype.ipp:331
+#: src/emu/inpttype.ipp:365 src/emu/inpttype.ipp:399 src/emu/inpttype.ipp:433
+#: src/emu/inpttype.ipp:467
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Left"
+msgid "%p Left Stick/Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:33
+#: src/emu/inpttype.ipp:31 src/emu/inpttype.ipp:149 src/emu/inpttype.ipp:230
+#: src/emu/inpttype.ipp:264 src/emu/inpttype.ipp:298 src/emu/inpttype.ipp:332
+#: src/emu/inpttype.ipp:366 src/emu/inpttype.ipp:400 src/emu/inpttype.ipp:434
+#: src/emu/inpttype.ipp:468
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Right"
+msgid "%p Left Stick/Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:34
+#: src/emu/inpttype.ipp:32 src/emu/inpttype.ipp:150 src/emu/inpttype.ipp:231
+#: src/emu/inpttype.ipp:265 src/emu/inpttype.ipp:299 src/emu/inpttype.ipp:333
+#: src/emu/inpttype.ipp:367 src/emu/inpttype.ipp:401 src/emu/inpttype.ipp:435
+#: src/emu/inpttype.ipp:469
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 1"
+msgid "%p Left Stick/Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:35
+#: src/emu/inpttype.ipp:33 src/emu/inpttype.ipp:151 src/emu/inpttype.ipp:232
+#: src/emu/inpttype.ipp:266 src/emu/inpttype.ipp:300 src/emu/inpttype.ipp:334
+#: src/emu/inpttype.ipp:368 src/emu/inpttype.ipp:402 src/emu/inpttype.ipp:436
+#: src/emu/inpttype.ipp:470
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 2"
+msgid "%p Left Stick/Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:36
+#: src/emu/inpttype.ipp:34 src/emu/inpttype.ipp:152 src/emu/inpttype.ipp:233
+#: src/emu/inpttype.ipp:267 src/emu/inpttype.ipp:301 src/emu/inpttype.ipp:335
+#: src/emu/inpttype.ipp:369 src/emu/inpttype.ipp:403 src/emu/inpttype.ipp:437
+#: src/emu/inpttype.ipp:471
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 3"
+msgid "%p Button 1"
 msgstr ""
 
-#: src/emu/inpttype.ipp:37
+#: src/emu/inpttype.ipp:35 src/emu/inpttype.ipp:153 src/emu/inpttype.ipp:234
+#: src/emu/inpttype.ipp:268 src/emu/inpttype.ipp:302 src/emu/inpttype.ipp:336
+#: src/emu/inpttype.ipp:370 src/emu/inpttype.ipp:404 src/emu/inpttype.ipp:438
+#: src/emu/inpttype.ipp:472
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 4"
+msgid "%p Button 2"
 msgstr ""
 
-#: src/emu/inpttype.ipp:38
+#: src/emu/inpttype.ipp:36 src/emu/inpttype.ipp:154 src/emu/inpttype.ipp:235
+#: src/emu/inpttype.ipp:269 src/emu/inpttype.ipp:303 src/emu/inpttype.ipp:337
+#: src/emu/inpttype.ipp:371 src/emu/inpttype.ipp:405 src/emu/inpttype.ipp:439
+#: src/emu/inpttype.ipp:473
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 5"
+msgid "%p Button 3"
 msgstr ""
 
-#: src/emu/inpttype.ipp:39
+#: src/emu/inpttype.ipp:37 src/emu/inpttype.ipp:155 src/emu/inpttype.ipp:236
+#: src/emu/inpttype.ipp:270 src/emu/inpttype.ipp:304 src/emu/inpttype.ipp:338
+#: src/emu/inpttype.ipp:372 src/emu/inpttype.ipp:406 src/emu/inpttype.ipp:440
+#: src/emu/inpttype.ipp:474
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 6"
+msgid "%p Button 4"
 msgstr ""
 
-#: src/emu/inpttype.ipp:40
+#: src/emu/inpttype.ipp:38 src/emu/inpttype.ipp:156 src/emu/inpttype.ipp:237
+#: src/emu/inpttype.ipp:271 src/emu/inpttype.ipp:305 src/emu/inpttype.ipp:339
+#: src/emu/inpttype.ipp:373 src/emu/inpttype.ipp:407 src/emu/inpttype.ipp:441
+#: src/emu/inpttype.ipp:475
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 7"
+msgid "%p Button 5"
 msgstr ""
 
-#: src/emu/inpttype.ipp:41
+#: src/emu/inpttype.ipp:39 src/emu/inpttype.ipp:157 src/emu/inpttype.ipp:238
+#: src/emu/inpttype.ipp:272 src/emu/inpttype.ipp:306 src/emu/inpttype.ipp:340
+#: src/emu/inpttype.ipp:374 src/emu/inpttype.ipp:408 src/emu/inpttype.ipp:442
+#: src/emu/inpttype.ipp:476
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 8"
+msgid "%p Button 6"
 msgstr ""
 
-#: src/emu/inpttype.ipp:42
+#: src/emu/inpttype.ipp:40 src/emu/inpttype.ipp:158 src/emu/inpttype.ipp:239
+#: src/emu/inpttype.ipp:273 src/emu/inpttype.ipp:307 src/emu/inpttype.ipp:341
+#: src/emu/inpttype.ipp:375 src/emu/inpttype.ipp:409 src/emu/inpttype.ipp:443
+#: src/emu/inpttype.ipp:477
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 9"
+msgid "%p Button 7"
 msgstr ""
 
-#: src/emu/inpttype.ipp:43
+#: src/emu/inpttype.ipp:41 src/emu/inpttype.ipp:159 src/emu/inpttype.ipp:240
+#: src/emu/inpttype.ipp:274 src/emu/inpttype.ipp:308 src/emu/inpttype.ipp:342
+#: src/emu/inpttype.ipp:376 src/emu/inpttype.ipp:410 src/emu/inpttype.ipp:444
+#: src/emu/inpttype.ipp:478
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 10"
+msgid "%p Button 8"
 msgstr ""
 
-#: src/emu/inpttype.ipp:44
+#: src/emu/inpttype.ipp:42 src/emu/inpttype.ipp:160 src/emu/inpttype.ipp:241
+#: src/emu/inpttype.ipp:275 src/emu/inpttype.ipp:309 src/emu/inpttype.ipp:343
+#: src/emu/inpttype.ipp:377 src/emu/inpttype.ipp:411 src/emu/inpttype.ipp:445
+#: src/emu/inpttype.ipp:479
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 11"
+msgid "%p Button 9"
 msgstr ""
 
-#: src/emu/inpttype.ipp:45
+#: src/emu/inpttype.ipp:43 src/emu/inpttype.ipp:161 src/emu/inpttype.ipp:242
+#: src/emu/inpttype.ipp:276 src/emu/inpttype.ipp:310 src/emu/inpttype.ipp:344
+#: src/emu/inpttype.ipp:378 src/emu/inpttype.ipp:412 src/emu/inpttype.ipp:446
+#: src/emu/inpttype.ipp:480
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 12"
+msgid "%p Button 10"
 msgstr ""
 
-#: src/emu/inpttype.ipp:46
+#: src/emu/inpttype.ipp:44 src/emu/inpttype.ipp:162 src/emu/inpttype.ipp:243
+#: src/emu/inpttype.ipp:277 src/emu/inpttype.ipp:311 src/emu/inpttype.ipp:345
+#: src/emu/inpttype.ipp:379 src/emu/inpttype.ipp:413 src/emu/inpttype.ipp:447
+#: src/emu/inpttype.ipp:481
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 13"
+msgid "%p Button 11"
 msgstr ""
 
-#: src/emu/inpttype.ipp:47
+#: src/emu/inpttype.ipp:45 src/emu/inpttype.ipp:163 src/emu/inpttype.ipp:244
+#: src/emu/inpttype.ipp:278 src/emu/inpttype.ipp:312 src/emu/inpttype.ipp:346
+#: src/emu/inpttype.ipp:380 src/emu/inpttype.ipp:414 src/emu/inpttype.ipp:448
+#: src/emu/inpttype.ipp:482
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 14"
+msgid "%p Button 12"
 msgstr ""
 
-#: src/emu/inpttype.ipp:48
+#: src/emu/inpttype.ipp:46 src/emu/inpttype.ipp:164 src/emu/inpttype.ipp:245
+#: src/emu/inpttype.ipp:279 src/emu/inpttype.ipp:313 src/emu/inpttype.ipp:347
+#: src/emu/inpttype.ipp:381 src/emu/inpttype.ipp:415 src/emu/inpttype.ipp:449
+#: src/emu/inpttype.ipp:483
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 15"
+msgid "%p Button 13"
 msgstr ""
 
-#: src/emu/inpttype.ipp:49
+#: src/emu/inpttype.ipp:47 src/emu/inpttype.ipp:165 src/emu/inpttype.ipp:246
+#: src/emu/inpttype.ipp:280 src/emu/inpttype.ipp:314 src/emu/inpttype.ipp:348
+#: src/emu/inpttype.ipp:382 src/emu/inpttype.ipp:416 src/emu/inpttype.ipp:450
+#: src/emu/inpttype.ipp:484
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 16"
+msgid "%p Button 14"
 msgstr ""
 
-#: src/emu/inpttype.ipp:50
+#: src/emu/inpttype.ipp:48 src/emu/inpttype.ipp:166 src/emu/inpttype.ipp:247
+#: src/emu/inpttype.ipp:281 src/emu/inpttype.ipp:315 src/emu/inpttype.ipp:349
+#: src/emu/inpttype.ipp:383 src/emu/inpttype.ipp:417 src/emu/inpttype.ipp:451
+#: src/emu/inpttype.ipp:485
+#, c-format
 msgctxt "input-name"
-msgid "P1 Start"
+msgid "%p Button 15"
 msgstr ""
 
-#: src/emu/inpttype.ipp:51
+#: src/emu/inpttype.ipp:49 src/emu/inpttype.ipp:167 src/emu/inpttype.ipp:248
+#: src/emu/inpttype.ipp:282 src/emu/inpttype.ipp:316 src/emu/inpttype.ipp:350
+#: src/emu/inpttype.ipp:384 src/emu/inpttype.ipp:418 src/emu/inpttype.ipp:452
+#: src/emu/inpttype.ipp:486
+#, c-format
 msgctxt "input-name"
-msgid "P1 Select"
+msgid "%p Button 16"
 msgstr ""
 
-#: src/emu/inpttype.ipp:56
+#: src/emu/inpttype.ipp:50 src/emu/inpttype.ipp:168 src/emu/inpttype.ipp:249
+#: src/emu/inpttype.ipp:283 src/emu/inpttype.ipp:317 src/emu/inpttype.ipp:351
+#: src/emu/inpttype.ipp:385 src/emu/inpttype.ipp:419 src/emu/inpttype.ipp:453
+#: src/emu/inpttype.ipp:487
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong A"
+msgid "%p Start"
 msgstr ""
 
-#: src/emu/inpttype.ipp:57
+#: src/emu/inpttype.ipp:51 src/emu/inpttype.ipp:169 src/emu/inpttype.ipp:250
+#: src/emu/inpttype.ipp:284 src/emu/inpttype.ipp:318 src/emu/inpttype.ipp:352
+#: src/emu/inpttype.ipp:386 src/emu/inpttype.ipp:420 src/emu/inpttype.ipp:454
+#: src/emu/inpttype.ipp:488
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong B"
+msgid "%p Select"
 msgstr ""
 
-#: src/emu/inpttype.ipp:58
+#: src/emu/inpttype.ipp:56 src/emu/inpttype.ipp:174
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong C"
+msgid "%p Mahjong A"
 msgstr ""
 
-#: src/emu/inpttype.ipp:59
+#: src/emu/inpttype.ipp:57 src/emu/inpttype.ipp:175
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong D"
+msgid "%p Mahjong B"
 msgstr ""
 
-#: src/emu/inpttype.ipp:60
+#: src/emu/inpttype.ipp:58 src/emu/inpttype.ipp:176
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong E"
+msgid "%p Mahjong C"
 msgstr ""
 
-#: src/emu/inpttype.ipp:61
+#: src/emu/inpttype.ipp:59 src/emu/inpttype.ipp:177
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong F"
+msgid "%p Mahjong D"
 msgstr ""
 
-#: src/emu/inpttype.ipp:62
+#: src/emu/inpttype.ipp:60 src/emu/inpttype.ipp:178
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong G"
+msgid "%p Mahjong E"
 msgstr ""
 
-#: src/emu/inpttype.ipp:63
+#: src/emu/inpttype.ipp:61 src/emu/inpttype.ipp:179
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong H"
+msgid "%p Mahjong F"
 msgstr ""
 
-#: src/emu/inpttype.ipp:64
+#: src/emu/inpttype.ipp:62 src/emu/inpttype.ipp:180
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong I"
+msgid "%p Mahjong G"
 msgstr ""
 
-#: src/emu/inpttype.ipp:65
+#: src/emu/inpttype.ipp:63 src/emu/inpttype.ipp:181
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong J"
+msgid "%p Mahjong H"
 msgstr ""
 
-#: src/emu/inpttype.ipp:66
+#: src/emu/inpttype.ipp:64 src/emu/inpttype.ipp:182
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong K"
+msgid "%p Mahjong I"
 msgstr ""
 
-#: src/emu/inpttype.ipp:67
+#: src/emu/inpttype.ipp:65 src/emu/inpttype.ipp:183
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong L"
+msgid "%p Mahjong J"
 msgstr ""
 
-#: src/emu/inpttype.ipp:68
+#: src/emu/inpttype.ipp:66 src/emu/inpttype.ipp:184
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong M"
+msgid "%p Mahjong K"
 msgstr ""
 
-#: src/emu/inpttype.ipp:69
+#: src/emu/inpttype.ipp:67 src/emu/inpttype.ipp:185
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong N"
+msgid "%p Mahjong L"
 msgstr ""
 
-#: src/emu/inpttype.ipp:70
+#: src/emu/inpttype.ipp:68 src/emu/inpttype.ipp:186
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong O"
+msgid "%p Mahjong M"
 msgstr ""
 
-#: src/emu/inpttype.ipp:71
+#: src/emu/inpttype.ipp:69 src/emu/inpttype.ipp:187
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong P"
+msgid "%p Mahjong N"
 msgstr ""
 
-#: src/emu/inpttype.ipp:72
+#: src/emu/inpttype.ipp:70 src/emu/inpttype.ipp:188
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Q"
+msgid "%p Mahjong O"
 msgstr ""
 
-#: src/emu/inpttype.ipp:73
+#: src/emu/inpttype.ipp:71 src/emu/inpttype.ipp:189
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Kan"
+msgid "%p Mahjong P"
 msgstr ""
 
-#: src/emu/inpttype.ipp:74
+#: src/emu/inpttype.ipp:72 src/emu/inpttype.ipp:190
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Pon"
+msgid "%p Mahjong Q"
 msgstr ""
 
-#: src/emu/inpttype.ipp:75
+#: src/emu/inpttype.ipp:73 src/emu/inpttype.ipp:191
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Chi"
+msgid "%p Mahjong Kan"
 msgstr ""
 
-#: src/emu/inpttype.ipp:76
+#: src/emu/inpttype.ipp:74 src/emu/inpttype.ipp:192
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Reach"
+msgid "%p Mahjong Pon"
 msgstr ""
 
-#: src/emu/inpttype.ipp:77
+#: src/emu/inpttype.ipp:75 src/emu/inpttype.ipp:193
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Ron"
+msgid "%p Mahjong Chi"
 msgstr ""
 
-#: src/emu/inpttype.ipp:78
+#: src/emu/inpttype.ipp:76 src/emu/inpttype.ipp:194
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Flip Flop"
+msgid "%p Mahjong Reach"
 msgstr ""
 
-#: src/emu/inpttype.ipp:79
+#: src/emu/inpttype.ipp:77 src/emu/inpttype.ipp:195
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Bet"
+msgid "%p Mahjong Ron"
 msgstr ""
 
-#: src/emu/inpttype.ipp:80
+#: src/emu/inpttype.ipp:78 src/emu/inpttype.ipp:200
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Take Score"
+msgid "%p Mahjong Flip Flop"
 msgstr ""
 
-#: src/emu/inpttype.ipp:81
+#: src/emu/inpttype.ipp:79 src/emu/inpttype.ipp:196
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Double Up"
+msgid "%p Mahjong Bet"
 msgstr ""
 
-#: src/emu/inpttype.ipp:82
+#: src/emu/inpttype.ipp:80 src/emu/inpttype.ipp:198
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Big"
+msgid "%p Mahjong Take Score"
 msgstr ""
 
-#: src/emu/inpttype.ipp:83
+#: src/emu/inpttype.ipp:81 src/emu/inpttype.ipp:199
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Small"
+msgid "%p Mahjong Double Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:84
+#: src/emu/inpttype.ipp:82 src/emu/inpttype.ipp:201
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Last Chance"
+msgid "%p Mahjong Big"
 msgstr ""
 
-#: src/emu/inpttype.ipp:89
+#: src/emu/inpttype.ipp:83 src/emu/inpttype.ipp:202
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda A/1"
+msgid "%p Mahjong Small"
 msgstr ""
 
-#: src/emu/inpttype.ipp:90
+#: src/emu/inpttype.ipp:84 src/emu/inpttype.ipp:197
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda B/2"
+msgid "%p Mahjong Last Chance"
 msgstr ""
 
-#: src/emu/inpttype.ipp:91
+#: src/emu/inpttype.ipp:89 src/emu/inpttype.ipp:207
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda C/3"
+msgid "%p Hanafuda A/1"
 msgstr ""
 
-#: src/emu/inpttype.ipp:92
+#: src/emu/inpttype.ipp:90 src/emu/inpttype.ipp:208
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda D/4"
+msgid "%p Hanafuda B/2"
 msgstr ""
 
-#: src/emu/inpttype.ipp:93
+#: src/emu/inpttype.ipp:91 src/emu/inpttype.ipp:209
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda E/5"
+msgid "%p Hanafuda C/3"
 msgstr ""
 
-#: src/emu/inpttype.ipp:94
+#: src/emu/inpttype.ipp:92 src/emu/inpttype.ipp:210
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda F/6"
+msgid "%p Hanafuda D/4"
 msgstr ""
 
-#: src/emu/inpttype.ipp:95
+#: src/emu/inpttype.ipp:93 src/emu/inpttype.ipp:211
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda G/7"
+msgid "%p Hanafuda E/5"
 msgstr ""
 
-#: src/emu/inpttype.ipp:96
+#: src/emu/inpttype.ipp:94 src/emu/inpttype.ipp:212
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda H/8"
+msgid "%p Hanafuda F/6"
 msgstr ""
 
-#: src/emu/inpttype.ipp:97
+#: src/emu/inpttype.ipp:95 src/emu/inpttype.ipp:213
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda Yes"
+msgid "%p Hanafuda G/7"
 msgstr ""
 
-#: src/emu/inpttype.ipp:98
+#: src/emu/inpttype.ipp:96 src/emu/inpttype.ipp:214
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda No"
+msgid "%p Hanafuda H/8"
+msgstr ""
+
+#: src/emu/inpttype.ipp:97 src/emu/inpttype.ipp:215
+#, c-format
+msgctxt "input-name"
+msgid "%p Hanafuda Yes"
+msgstr ""
+
+#: src/emu/inpttype.ipp:98 src/emu/inpttype.ipp:216
+#, c-format
+msgctxt "input-name"
+msgid "%p Hanafuda No"
 msgstr ""
 
 #: src/emu/inpttype.ipp:103
@@ -3751,1551 +3925,6 @@ msgctxt "input-name"
 msgid "Stop All Reels"
 msgstr ""
 
-#: src/emu/inpttype.ipp:140
-msgctxt "input-name"
-msgid "P2 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:141
-msgctxt "input-name"
-msgid "P2 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:142
-msgctxt "input-name"
-msgid "P2 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:143
-msgctxt "input-name"
-msgid "P2 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:144
-msgctxt "input-name"
-msgid "P2 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:145
-msgctxt "input-name"
-msgid "P2 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:146
-msgctxt "input-name"
-msgid "P2 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:147
-msgctxt "input-name"
-msgid "P2 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:148
-msgctxt "input-name"
-msgid "P2 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:149
-msgctxt "input-name"
-msgid "P2 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:150
-msgctxt "input-name"
-msgid "P2 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:151
-msgctxt "input-name"
-msgid "P2 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:152
-msgctxt "input-name"
-msgid "P2 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:153
-msgctxt "input-name"
-msgid "P2 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:154
-msgctxt "input-name"
-msgid "P2 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:155
-msgctxt "input-name"
-msgid "P2 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:156
-msgctxt "input-name"
-msgid "P2 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:157
-msgctxt "input-name"
-msgid "P2 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:158
-msgctxt "input-name"
-msgid "P2 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:159
-msgctxt "input-name"
-msgid "P2 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:160
-msgctxt "input-name"
-msgid "P2 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:161
-msgctxt "input-name"
-msgid "P2 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:162
-msgctxt "input-name"
-msgid "P2 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:163
-msgctxt "input-name"
-msgid "P2 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:164
-msgctxt "input-name"
-msgid "P2 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:165
-msgctxt "input-name"
-msgid "P2 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:166
-msgctxt "input-name"
-msgid "P2 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:167
-msgctxt "input-name"
-msgid "P2 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:168
-msgctxt "input-name"
-msgid "P2 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:169
-msgctxt "input-name"
-msgid "P2 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:174
-msgctxt "input-name"
-msgid "P2 Mahjong A"
-msgstr ""
-
-#: src/emu/inpttype.ipp:175
-msgctxt "input-name"
-msgid "P2 Mahjong B"
-msgstr ""
-
-#: src/emu/inpttype.ipp:176
-msgctxt "input-name"
-msgid "P2 Mahjong C"
-msgstr ""
-
-#: src/emu/inpttype.ipp:177
-msgctxt "input-name"
-msgid "P2 Mahjong D"
-msgstr ""
-
-#: src/emu/inpttype.ipp:178
-msgctxt "input-name"
-msgid "P2 Mahjong E"
-msgstr ""
-
-#: src/emu/inpttype.ipp:179
-msgctxt "input-name"
-msgid "P2 Mahjong F"
-msgstr ""
-
-#: src/emu/inpttype.ipp:180
-msgctxt "input-name"
-msgid "P2 Mahjong G"
-msgstr ""
-
-#: src/emu/inpttype.ipp:181
-msgctxt "input-name"
-msgid "P2 Mahjong H"
-msgstr ""
-
-#: src/emu/inpttype.ipp:182
-msgctxt "input-name"
-msgid "P2 Mahjong I"
-msgstr ""
-
-#: src/emu/inpttype.ipp:183
-msgctxt "input-name"
-msgid "P2 Mahjong J"
-msgstr ""
-
-#: src/emu/inpttype.ipp:184
-msgctxt "input-name"
-msgid "P2 Mahjong K"
-msgstr ""
-
-#: src/emu/inpttype.ipp:185
-msgctxt "input-name"
-msgid "P2 Mahjong L"
-msgstr ""
-
-#: src/emu/inpttype.ipp:186
-msgctxt "input-name"
-msgid "P2 Mahjong M"
-msgstr ""
-
-#: src/emu/inpttype.ipp:187
-msgctxt "input-name"
-msgid "P2 Mahjong N"
-msgstr ""
-
-#: src/emu/inpttype.ipp:188
-msgctxt "input-name"
-msgid "P2 Mahjong O"
-msgstr ""
-
-#: src/emu/inpttype.ipp:189
-msgctxt "input-name"
-msgid "P2 Mahjong P"
-msgstr ""
-
-#: src/emu/inpttype.ipp:190
-msgctxt "input-name"
-msgid "P2 Mahjong Q"
-msgstr ""
-
-#: src/emu/inpttype.ipp:191
-msgctxt "input-name"
-msgid "P2 Mahjong Kan"
-msgstr ""
-
-#: src/emu/inpttype.ipp:192
-msgctxt "input-name"
-msgid "P2 Mahjong Pon"
-msgstr ""
-
-#: src/emu/inpttype.ipp:193
-msgctxt "input-name"
-msgid "P2 Mahjong Chi"
-msgstr ""
-
-#: src/emu/inpttype.ipp:194
-msgctxt "input-name"
-msgid "P2 Mahjong Reach"
-msgstr ""
-
-#: src/emu/inpttype.ipp:195
-msgctxt "input-name"
-msgid "P2 Mahjong Ron"
-msgstr ""
-
-#: src/emu/inpttype.ipp:196
-msgctxt "input-name"
-msgid "P2 Mahjong Bet"
-msgstr ""
-
-#: src/emu/inpttype.ipp:197
-msgctxt "input-name"
-msgid "P2 Mahjong Last Chance"
-msgstr ""
-
-#: src/emu/inpttype.ipp:198
-msgctxt "input-name"
-msgid "P2 Mahjong Take Score"
-msgstr ""
-
-#: src/emu/inpttype.ipp:199
-msgctxt "input-name"
-msgid "P2 Mahjong Double Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:200
-msgctxt "input-name"
-msgid "P2 Mahjong Flip Flop"
-msgstr ""
-
-#: src/emu/inpttype.ipp:201
-msgctxt "input-name"
-msgid "P2 Mahjong Big"
-msgstr ""
-
-#: src/emu/inpttype.ipp:202
-msgctxt "input-name"
-msgid "P2 Mahjong Small"
-msgstr ""
-
-#: src/emu/inpttype.ipp:207
-msgctxt "input-name"
-msgid "P2 Hanafuda A/1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:208
-msgctxt "input-name"
-msgid "P2 Hanafuda B/2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:209
-msgctxt "input-name"
-msgid "P2 Hanafuda C/3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:210
-msgctxt "input-name"
-msgid "P2 Hanafuda D/4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:211
-msgctxt "input-name"
-msgid "P2 Hanafuda E/5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:212
-msgctxt "input-name"
-msgid "P2 Hanafuda F/6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:213
-msgctxt "input-name"
-msgid "P2 Hanafuda G/7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:214
-msgctxt "input-name"
-msgid "P2 Hanafuda H/8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:215
-msgctxt "input-name"
-msgid "P2 Hanafuda Yes"
-msgstr ""
-
-#: src/emu/inpttype.ipp:216
-msgctxt "input-name"
-msgid "P2 Hanafuda No"
-msgstr ""
-
-#: src/emu/inpttype.ipp:221
-msgctxt "input-name"
-msgid "P3 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:222
-msgctxt "input-name"
-msgid "P3 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:223
-msgctxt "input-name"
-msgid "P3 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:224
-msgctxt "input-name"
-msgid "P3 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:225
-msgctxt "input-name"
-msgid "P3 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:226
-msgctxt "input-name"
-msgid "P3 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:227
-msgctxt "input-name"
-msgid "P3 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:228
-msgctxt "input-name"
-msgid "P3 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:229
-msgctxt "input-name"
-msgid "P3 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:230
-msgctxt "input-name"
-msgid "P3 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:231
-msgctxt "input-name"
-msgid "P3 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:232
-msgctxt "input-name"
-msgid "P3 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:233
-msgctxt "input-name"
-msgid "P3 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:234
-msgctxt "input-name"
-msgid "P3 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:235
-msgctxt "input-name"
-msgid "P3 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:236
-msgctxt "input-name"
-msgid "P3 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:237
-msgctxt "input-name"
-msgid "P3 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:238
-msgctxt "input-name"
-msgid "P3 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:239
-msgctxt "input-name"
-msgid "P3 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:240
-msgctxt "input-name"
-msgid "P3 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:241
-msgctxt "input-name"
-msgid "P3 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:242
-msgctxt "input-name"
-msgid "P3 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:243
-msgctxt "input-name"
-msgid "P3 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:244
-msgctxt "input-name"
-msgid "P3 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:245
-msgctxt "input-name"
-msgid "P3 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:246
-msgctxt "input-name"
-msgid "P3 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:247
-msgctxt "input-name"
-msgid "P3 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:248
-msgctxt "input-name"
-msgid "P3 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:249
-msgctxt "input-name"
-msgid "P3 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:250
-msgctxt "input-name"
-msgid "P3 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:255
-msgctxt "input-name"
-msgid "P4 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:256
-msgctxt "input-name"
-msgid "P4 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:257
-msgctxt "input-name"
-msgid "P4 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:258
-msgctxt "input-name"
-msgid "P4 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:259
-msgctxt "input-name"
-msgid "P4 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:260
-msgctxt "input-name"
-msgid "P4 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:261
-msgctxt "input-name"
-msgid "P4 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:262
-msgctxt "input-name"
-msgid "P4 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:263
-msgctxt "input-name"
-msgid "P4 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:264
-msgctxt "input-name"
-msgid "P4 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:265
-msgctxt "input-name"
-msgid "P4 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:266
-msgctxt "input-name"
-msgid "P4 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:267
-msgctxt "input-name"
-msgid "P4 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:268
-msgctxt "input-name"
-msgid "P4 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:269
-msgctxt "input-name"
-msgid "P4 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:270
-msgctxt "input-name"
-msgid "P4 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:271
-msgctxt "input-name"
-msgid "P4 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:272
-msgctxt "input-name"
-msgid "P4 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:273
-msgctxt "input-name"
-msgid "P4 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:274
-msgctxt "input-name"
-msgid "P4 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:275
-msgctxt "input-name"
-msgid "P4 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:276
-msgctxt "input-name"
-msgid "P4 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:277
-msgctxt "input-name"
-msgid "P4 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:278
-msgctxt "input-name"
-msgid "P4 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:279
-msgctxt "input-name"
-msgid "P4 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:280
-msgctxt "input-name"
-msgid "P4 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:281
-msgctxt "input-name"
-msgid "P4 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:282
-msgctxt "input-name"
-msgid "P4 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:283
-msgctxt "input-name"
-msgid "P4 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:284
-msgctxt "input-name"
-msgid "P4 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:289
-msgctxt "input-name"
-msgid "P5 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:290
-msgctxt "input-name"
-msgid "P5 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:291
-msgctxt "input-name"
-msgid "P5 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:292
-msgctxt "input-name"
-msgid "P5 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:293
-msgctxt "input-name"
-msgid "P5 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:294
-msgctxt "input-name"
-msgid "P5 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:295
-msgctxt "input-name"
-msgid "P5 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:296
-msgctxt "input-name"
-msgid "P5 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:297
-msgctxt "input-name"
-msgid "P5 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:298
-msgctxt "input-name"
-msgid "P5 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:299
-msgctxt "input-name"
-msgid "P5 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:300
-msgctxt "input-name"
-msgid "P5 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:301
-msgctxt "input-name"
-msgid "P5 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:302
-msgctxt "input-name"
-msgid "P5 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:303
-msgctxt "input-name"
-msgid "P5 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:304
-msgctxt "input-name"
-msgid "P5 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:305
-msgctxt "input-name"
-msgid "P5 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:306
-msgctxt "input-name"
-msgid "P5 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:307
-msgctxt "input-name"
-msgid "P5 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:308
-msgctxt "input-name"
-msgid "P5 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:309
-msgctxt "input-name"
-msgid "P5 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:310
-msgctxt "input-name"
-msgid "P5 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:311
-msgctxt "input-name"
-msgid "P5 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:312
-msgctxt "input-name"
-msgid "P5 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:313
-msgctxt "input-name"
-msgid "P5 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:314
-msgctxt "input-name"
-msgid "P5 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:315
-msgctxt "input-name"
-msgid "P5 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:316
-msgctxt "input-name"
-msgid "P5 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:317
-msgctxt "input-name"
-msgid "P5 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:318
-msgctxt "input-name"
-msgid "P5 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:323
-msgctxt "input-name"
-msgid "P6 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:324
-msgctxt "input-name"
-msgid "P6 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:325
-msgctxt "input-name"
-msgid "P6 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:326
-msgctxt "input-name"
-msgid "P6 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:327
-msgctxt "input-name"
-msgid "P6 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:328
-msgctxt "input-name"
-msgid "P6 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:329
-msgctxt "input-name"
-msgid "P6 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:330
-msgctxt "input-name"
-msgid "P6 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:331
-msgctxt "input-name"
-msgid "P6 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:332
-msgctxt "input-name"
-msgid "P6 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:333
-msgctxt "input-name"
-msgid "P6 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:334
-msgctxt "input-name"
-msgid "P6 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:335
-msgctxt "input-name"
-msgid "P6 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:336
-msgctxt "input-name"
-msgid "P6 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:337
-msgctxt "input-name"
-msgid "P6 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:338
-msgctxt "input-name"
-msgid "P6 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:339
-msgctxt "input-name"
-msgid "P6 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:340
-msgctxt "input-name"
-msgid "P6 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:341
-msgctxt "input-name"
-msgid "P6 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:342
-msgctxt "input-name"
-msgid "P6 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:343
-msgctxt "input-name"
-msgid "P6 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:344
-msgctxt "input-name"
-msgid "P6 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:345
-msgctxt "input-name"
-msgid "P6 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:346
-msgctxt "input-name"
-msgid "P6 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:347
-msgctxt "input-name"
-msgid "P6 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:348
-msgctxt "input-name"
-msgid "P6 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:349
-msgctxt "input-name"
-msgid "P6 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:350
-msgctxt "input-name"
-msgid "P6 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:351
-msgctxt "input-name"
-msgid "P6 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:352
-msgctxt "input-name"
-msgid "P6 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:357
-msgctxt "input-name"
-msgid "P7 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:358
-msgctxt "input-name"
-msgid "P7 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:359
-msgctxt "input-name"
-msgid "P7 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:360
-msgctxt "input-name"
-msgid "P7 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:361
-msgctxt "input-name"
-msgid "P7 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:362
-msgctxt "input-name"
-msgid "P7 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:363
-msgctxt "input-name"
-msgid "P7 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:364
-msgctxt "input-name"
-msgid "P7 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:365
-msgctxt "input-name"
-msgid "P7 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:366
-msgctxt "input-name"
-msgid "P7 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:367
-msgctxt "input-name"
-msgid "P7 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:368
-msgctxt "input-name"
-msgid "P7 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:369
-msgctxt "input-name"
-msgid "P7 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:370
-msgctxt "input-name"
-msgid "P7 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:371
-msgctxt "input-name"
-msgid "P7 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:372
-msgctxt "input-name"
-msgid "P7 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:373
-msgctxt "input-name"
-msgid "P7 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:374
-msgctxt "input-name"
-msgid "P7 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:375
-msgctxt "input-name"
-msgid "P7 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:376
-msgctxt "input-name"
-msgid "P7 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:377
-msgctxt "input-name"
-msgid "P7 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:378
-msgctxt "input-name"
-msgid "P7 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:379
-msgctxt "input-name"
-msgid "P7 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:380
-msgctxt "input-name"
-msgid "P7 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:381
-msgctxt "input-name"
-msgid "P7 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:382
-msgctxt "input-name"
-msgid "P7 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:383
-msgctxt "input-name"
-msgid "P7 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:384
-msgctxt "input-name"
-msgid "P7 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:385
-msgctxt "input-name"
-msgid "P7 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:386
-msgctxt "input-name"
-msgid "P7 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:391
-msgctxt "input-name"
-msgid "P8 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:392
-msgctxt "input-name"
-msgid "P8 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:393
-msgctxt "input-name"
-msgid "P8 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:394
-msgctxt "input-name"
-msgid "P8 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:395
-msgctxt "input-name"
-msgid "P8 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:396
-msgctxt "input-name"
-msgid "P8 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:397
-msgctxt "input-name"
-msgid "P8 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:398
-msgctxt "input-name"
-msgid "P8 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:399
-msgctxt "input-name"
-msgid "P8 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:400
-msgctxt "input-name"
-msgid "P8 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:401
-msgctxt "input-name"
-msgid "P8 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:402
-msgctxt "input-name"
-msgid "P8 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:403
-msgctxt "input-name"
-msgid "P8 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:404
-msgctxt "input-name"
-msgid "P8 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:405
-msgctxt "input-name"
-msgid "P8 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:406
-msgctxt "input-name"
-msgid "P8 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:407
-msgctxt "input-name"
-msgid "P8 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:408
-msgctxt "input-name"
-msgid "P8 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:409
-msgctxt "input-name"
-msgid "P8 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:410
-msgctxt "input-name"
-msgid "P8 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:411
-msgctxt "input-name"
-msgid "P8 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:412
-msgctxt "input-name"
-msgid "P8 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:413
-msgctxt "input-name"
-msgid "P8 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:414
-msgctxt "input-name"
-msgid "P8 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:415
-msgctxt "input-name"
-msgid "P8 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:416
-msgctxt "input-name"
-msgid "P8 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:417
-msgctxt "input-name"
-msgid "P8 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:418
-msgctxt "input-name"
-msgid "P8 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:419
-msgctxt "input-name"
-msgid "P8 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:420
-msgctxt "input-name"
-msgid "P8 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:425
-msgctxt "input-name"
-msgid "P9 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:426
-msgctxt "input-name"
-msgid "P9 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:427
-msgctxt "input-name"
-msgid "P9 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:428
-msgctxt "input-name"
-msgid "P9 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:429
-msgctxt "input-name"
-msgid "P9 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:430
-msgctxt "input-name"
-msgid "P9 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:431
-msgctxt "input-name"
-msgid "P9 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:432
-msgctxt "input-name"
-msgid "P9 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:433
-msgctxt "input-name"
-msgid "P9 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:434
-msgctxt "input-name"
-msgid "P9 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:435
-msgctxt "input-name"
-msgid "P9 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:436
-msgctxt "input-name"
-msgid "P9 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:437
-msgctxt "input-name"
-msgid "P9 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:438
-msgctxt "input-name"
-msgid "P9 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:439
-msgctxt "input-name"
-msgid "P9 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:440
-msgctxt "input-name"
-msgid "P9 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:441
-msgctxt "input-name"
-msgid "P9 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:442
-msgctxt "input-name"
-msgid "P9 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:443
-msgctxt "input-name"
-msgid "P9 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:444
-msgctxt "input-name"
-msgid "P9 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:445
-msgctxt "input-name"
-msgid "P9 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:446
-msgctxt "input-name"
-msgid "P9 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:447
-msgctxt "input-name"
-msgid "P9 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:448
-msgctxt "input-name"
-msgid "P9 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:449
-msgctxt "input-name"
-msgid "P9 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:450
-msgctxt "input-name"
-msgid "P9 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:451
-msgctxt "input-name"
-msgid "P9 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:452
-msgctxt "input-name"
-msgid "P9 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:453
-msgctxt "input-name"
-msgid "P9 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:454
-msgctxt "input-name"
-msgid "P9 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:459
-msgctxt "input-name"
-msgid "P10 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:460
-msgctxt "input-name"
-msgid "P10 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:461
-msgctxt "input-name"
-msgid "P10 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:462
-msgctxt "input-name"
-msgid "P10 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:463
-msgctxt "input-name"
-msgid "P10 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:464
-msgctxt "input-name"
-msgid "P10 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:465
-msgctxt "input-name"
-msgid "P10 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:466
-msgctxt "input-name"
-msgid "P10 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:467
-msgctxt "input-name"
-msgid "P10 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:468
-msgctxt "input-name"
-msgid "P10 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:469
-msgctxt "input-name"
-msgid "P10 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:470
-msgctxt "input-name"
-msgid "P10 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:471
-msgctxt "input-name"
-msgid "P10 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:472
-msgctxt "input-name"
-msgid "P10 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:473
-msgctxt "input-name"
-msgid "P10 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:474
-msgctxt "input-name"
-msgid "P10 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:475
-msgctxt "input-name"
-msgid "P10 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:476
-msgctxt "input-name"
-msgid "P10 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:477
-msgctxt "input-name"
-msgid "P10 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:478
-msgctxt "input-name"
-msgid "P10 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:479
-msgctxt "input-name"
-msgid "P10 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:480
-msgctxt "input-name"
-msgid "P10 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:481
-msgctxt "input-name"
-msgid "P10 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:482
-msgctxt "input-name"
-msgid "P10 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:483
-msgctxt "input-name"
-msgid "P10 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:484
-msgctxt "input-name"
-msgid "P10 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:485
-msgctxt "input-name"
-msgid "P10 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:486
-msgctxt "input-name"
-msgid "P10 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:487
-msgctxt "input-name"
-msgid "P10 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:488
-msgctxt "input-name"
-msgid "P10 Select"
-msgstr ""
-
 #: src/emu/inpttype.ipp:493
 msgctxt "input-name"
 msgid "1 Player Start"
@@ -5476,154 +4105,31 @@ msgctxt "input-name"
 msgid "Volume Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:550
-msgctxt "input-name"
-msgid "P1 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:551
-msgctxt "input-name"
-msgid "P2 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:552
-msgctxt "input-name"
-msgid "P3 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:553
-msgctxt "input-name"
-msgid "P4 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:554
-msgctxt "input-name"
-msgid "P5 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:555
-msgctxt "input-name"
-msgid "P6 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:556
-msgctxt "input-name"
-msgid "P7 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:557
-msgctxt "input-name"
-msgid "P8 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:558
-msgctxt "input-name"
-msgid "P9 Pedal 1"
-msgstr ""
-
+#: src/emu/inpttype.ipp:550 src/emu/inpttype.ipp:551 src/emu/inpttype.ipp:552
+#: src/emu/inpttype.ipp:553 src/emu/inpttype.ipp:554 src/emu/inpttype.ipp:555
+#: src/emu/inpttype.ipp:556 src/emu/inpttype.ipp:557 src/emu/inpttype.ipp:558
 #: src/emu/inpttype.ipp:559
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:564
-msgctxt "input-name"
-msgid "P1 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:565
-msgctxt "input-name"
-msgid "P2 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:566
-msgctxt "input-name"
-msgid "P3 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:567
-msgctxt "input-name"
-msgid "P4 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:568
-msgctxt "input-name"
-msgid "P5 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:569
-msgctxt "input-name"
-msgid "P6 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:570
-msgctxt "input-name"
-msgid "P7 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:571
-msgctxt "input-name"
-msgid "P8 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:572
-msgctxt "input-name"
-msgid "P9 Pedal 2"
+msgid "%p Pedal 1"
 msgstr ""
 
+#: src/emu/inpttype.ipp:564 src/emu/inpttype.ipp:565 src/emu/inpttype.ipp:566
+#: src/emu/inpttype.ipp:567 src/emu/inpttype.ipp:568 src/emu/inpttype.ipp:569
+#: src/emu/inpttype.ipp:570 src/emu/inpttype.ipp:571 src/emu/inpttype.ipp:572
 #: src/emu/inpttype.ipp:573
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:578
-msgctxt "input-name"
-msgid "P1 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:579
-msgctxt "input-name"
-msgid "P2 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:580
-msgctxt "input-name"
-msgid "P3 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:581
-msgctxt "input-name"
-msgid "P4 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:582
-msgctxt "input-name"
-msgid "P5 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:583
-msgctxt "input-name"
-msgid "P6 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:584
-msgctxt "input-name"
-msgid "P7 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:585
-msgctxt "input-name"
-msgid "P8 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:586
-msgctxt "input-name"
-msgid "P9 Pedal 3"
+msgid "%p Pedal 2"
 msgstr ""
 
+#: src/emu/inpttype.ipp:578 src/emu/inpttype.ipp:579 src/emu/inpttype.ipp:580
+#: src/emu/inpttype.ipp:581 src/emu/inpttype.ipp:582 src/emu/inpttype.ipp:583
+#: src/emu/inpttype.ipp:584 src/emu/inpttype.ipp:585 src/emu/inpttype.ipp:586
 #: src/emu/inpttype.ipp:587
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 3"
+msgid "%p Pedal 3"
 msgstr ""
 
 #: src/emu/inpttype.ipp:592
diff --git a/language/Catalan/strings.po b/language/Catalan/strings.po
index 53eaf95fe66..2efe48a94da 100644
--- a/language/Catalan/strings.po
+++ b/language/Catalan/strings.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME 0.180\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-19 02:50+1100\n"
+"POT-Creation-Date: 2021-12-09 04:44+1100\n"
 "PO-Revision-Date: 2016-12-14 14:01+0100\n"
 "Last-Translator: Jordi Mallach <jordi@debian.org>\n"
 "Language-Team: Catalan <ca@dodds.net>\n"
@@ -268,12 +268,12 @@ msgstr "%1$s %2$s (%3$d / %4$d paquets de programari)"
 msgid "Driver: \"%1$s\" software list "
 msgstr ""
 
-#: src/frontend/mame/ui/selsoft.cpp:711 src/frontend/mame/ui/selgame.cpp:1066
+#: src/frontend/mame/ui/selsoft.cpp:711 src/frontend/mame/ui/selgame.cpp:1076
 #, c-format
 msgid "%1$s: %2$s - Search: %3$s_"
 msgstr ""
 
-#: src/frontend/mame/ui/selsoft.cpp:713 src/frontend/mame/ui/selgame.cpp:1068
+#: src/frontend/mame/ui/selsoft.cpp:713 src/frontend/mame/ui/selgame.cpp:1078
 #, c-format
 msgid "Search: %1$s_"
 msgstr ""
@@ -283,7 +283,7 @@ msgstr ""
 msgid "Software list/item: %1$s:%2$s"
 msgstr ""
 
-#: src/frontend/mame/ui/optsmenu.cpp:73 src/frontend/mame/ui/sndmenu.cpp:165
+#: src/frontend/mame/ui/optsmenu.cpp:73 src/frontend/mame/ui/sndmenu.cpp:161
 msgid "Sound Options"
 msgstr "Opcions de so"
 
@@ -378,11 +378,11 @@ msgid "Show mouse pointer"
 msgstr "Mostra el punter del ratolí"
 
 #: src/frontend/mame/ui/submenu.cpp:39
-msgid "Confirm quit from machines"
-msgstr "Confirma la sortida de les màquines"
+msgid "Confirm quit from emulation"
+msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:40
-msgid "Skip information screen at startup"
+msgid "Skip system information screen"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:41
@@ -398,7 +398,7 @@ msgid "Skip BIOS selection menu"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:44
-msgid "Skip software parts selection menu"
+msgid "Skip software part selection menu"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:45
@@ -550,7 +550,7 @@ msgid "UI active"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:91
-msgid "Offscreen reload"
+msgid "Off-screen reload"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:92
@@ -566,7 +566,7 @@ msgid "Natural keyboard"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:95
-msgid "Simultaneous contradictory"
+msgid "Allow contradictory joystick inputs"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:96
@@ -590,7 +590,7 @@ msgid "Pedal Device Assignment"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:106
-msgid "Adstick Device Assignment"
+msgid "AD Stick Device Assignment"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:107
@@ -677,14 +677,14 @@ msgstr ""
 msgid "Wait Vertical Sync"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:687
+#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:689
 #: src/frontend/mame/ui/videoopt.cpp:191 src/frontend/mame/ui/custui.cpp:490
 #: src/frontend/mame/ui/analogipt.cpp:471 plugins/cheatfind/init.lua:766
 #: plugins/cheatfind/init.lua:777 plugins/cheat/init.lua:668
 msgid "On"
 msgstr "Encès"
 
-#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:690
+#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:692
 #: src/frontend/mame/ui/videoopt.cpp:207 src/frontend/mame/ui/custui.cpp:490
 #: src/frontend/mame/ui/analogipt.cpp:471 plugins/cheatfind/init.lua:763
 #: plugins/cheatfind/init.lua:774 plugins/cheat/init.lua:671
@@ -692,11 +692,11 @@ msgstr "Encès"
 msgid "Off"
 msgstr "Apagat"
 
-#: src/frontend/mame/ui/menu.cpp:693
+#: src/frontend/mame/ui/menu.cpp:695
 msgid "Auto"
 msgstr "Auto"
 
-#: src/frontend/mame/ui/menu.cpp:1195
+#: src/frontend/mame/ui/menu.cpp:1197
 #: src/frontend/mame/ui/simpleselgame.cpp:278
 #: src/frontend/mame/ui/selmenu.cpp:1280
 msgid "Return to Previous Menu"
@@ -704,7 +704,7 @@ msgstr "Torna al menú anterior"
 
 #: src/frontend/mame/ui/filemngr.cpp:139
 #: src/frontend/mame/ui/confswitch.cpp:119
-#: src/frontend/mame/ui/inputmap.cpp:559 src/frontend/mame/ui/analogipt.cpp:360
+#: src/frontend/mame/ui/inputmap.cpp:563 src/frontend/mame/ui/analogipt.cpp:360
 #, c-format
 msgid "[root%1$s]"
 msgstr ""
@@ -964,22 +964,22 @@ msgstr ""
 "CPU:\n"
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "GHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "MHz"
 msgstr "MHz"
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "kHz"
 msgstr "kHz"
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "Hz"
 msgstr ""
 
@@ -1007,38 +1007,38 @@ msgstr "Cap\n"
 msgid "Vector"
 msgstr "Vector"
 
-#: src/frontend/mame/ui/info.cpp:480
+#: src/frontend/mame/ui/info.cpp:483
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr "%1$s: %2$s\n"
 
-#: src/frontend/mame/ui/info.cpp:480
+#: src/frontend/mame/ui/info.cpp:483
 msgid "%2$s\n"
 msgstr "%2$s\n"
 
-#: src/frontend/mame/ui/info.cpp:497
+#: src/frontend/mame/ui/info.cpp:500
 #, c-format
 msgid "Screen '%1$s'"
 msgstr "Pantalla «%1$s»"
 
-#: src/frontend/mame/ui/info.cpp:499
+#: src/frontend/mame/ui/info.cpp:502
 msgid "Screen"
 msgstr "Pantalla"
 
-#: src/frontend/mame/ui/info.cpp:570 src/frontend/mame/ui/info.cpp:581
+#: src/frontend/mame/ui/info.cpp:573 src/frontend/mame/ui/info.cpp:584
 #, c-format
 msgid "%1$s:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:662
+#: src/frontend/mame/ui/info.cpp:665
 msgid "Not supported"
 msgstr "No suportat"
 
-#: src/frontend/mame/ui/info.cpp:665
+#: src/frontend/mame/ui/info.cpp:668
 msgid "Partially supported"
 msgstr "Parcialment suportat"
 
-#: src/frontend/mame/ui/info.cpp:674
+#: src/frontend/mame/ui/info.cpp:677
 msgid "[empty]"
 msgstr "[buit]"
 
@@ -1111,7 +1111,7 @@ msgid "Emulated"
 msgstr "Emulat"
 
 #: src/frontend/mame/ui/keyboard.cpp:59 src/frontend/mame/ui/confswitch.cpp:117
-#: src/frontend/mame/ui/inputmap.cpp:557 src/frontend/mame/ui/analogipt.cpp:358
+#: src/frontend/mame/ui/inputmap.cpp:561 src/frontend/mame/ui/analogipt.cpp:358
 #, c-format
 msgid "%1$s [root%2$s]"
 msgstr ""
@@ -1471,7 +1471,7 @@ msgctxt "swlist-info"
 msgid "Software list/item"
 msgstr ""
 
-#: src/frontend/mame/ui/datmenu.cpp:88 src/frontend/mame/ui/selmenu.cpp:2698
+#: src/frontend/mame/ui/datmenu.cpp:88 src/frontend/mame/ui/selmenu.cpp:2707
 msgid "Software List Info"
 msgstr ""
 
@@ -1591,7 +1591,7 @@ msgstr ""
 msgid "Configure Machine:"
 msgstr ""
 
-#: src/frontend/mame/ui/miscmenu.cpp:858 src/frontend/mame/ui/selmenu.cpp:2638
+#: src/frontend/mame/ui/miscmenu.cpp:858 src/frontend/mame/ui/selmenu.cpp:2647
 msgid " (default)"
 msgstr " (per defecte)"
 
@@ -1608,7 +1608,7 @@ msgid ""
 "Press %2$s to return to emulation"
 msgstr ""
 
-#: src/frontend/mame/ui/info_pty.cpp:30 src/frontend/mame/ui/mainmenu.cpp:155
+#: src/frontend/mame/ui/info_pty.cpp:30
 msgid "Pseudo terminals"
 msgstr "Pseudo terminals"
 
@@ -1676,52 +1676,52 @@ msgstr ""
 msgid "Other Controls"
 msgstr "Altres controls"
 
-#: src/frontend/mame/ui/inputmap.cpp:227
+#: src/frontend/mame/ui/inputmap.cpp:231
 msgid "This machine has no configurable inputs."
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:327
+#: src/frontend/mame/ui/inputmap.cpp:331
 msgid "Pressed"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:397
+#: src/frontend/mame/ui/inputmap.cpp:401
 msgid "Invalid sequence entered"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:542
+#: src/frontend/mame/ui/inputmap.cpp:546
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:543
+#: src/frontend/mame/ui/inputmap.cpp:547
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog Inc"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:544
+#: src/frontend/mame/ui/inputmap.cpp:548
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog Dec"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:586
+#: src/frontend/mame/ui/inputmap.cpp:590
 #, c-format
 msgid "Press %1$s to set\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:587
+#: src/frontend/mame/ui/inputmap.cpp:591
 #, c-format
 msgid "Press %1$s to append\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:588
+#: src/frontend/mame/ui/inputmap.cpp:592
 #, c-format
 msgid "Press %1$s to clear\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:589
+#: src/frontend/mame/ui/inputmap.cpp:593
 #, c-format
 msgid "Press %1$s to restore default\n"
 msgstr ""
@@ -1785,7 +1785,7 @@ msgid ""
 msgstr ""
 
 #: src/frontend/mame/ui/simpleselgame.cpp:273
-#: src/frontend/mame/ui/selgame.cpp:436
+#: src/frontend/mame/ui/selgame.cpp:443
 msgid "Configure Options"
 msgstr "Configura les opcions"
 
@@ -2115,16 +2115,16 @@ msgstr ""
 msgid "Expand to fit"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:437
+#: src/frontend/mame/ui/selgame.cpp:444
 msgid "Configure Machine"
 msgstr "Configura la màquina"
 
-#: src/frontend/mame/ui/selgame.cpp:1050
+#: src/frontend/mame/ui/selgame.cpp:1060
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d machines (%5$d BIOS) )"
 msgstr "%1$s %2$s (%3$d / %4$d màquines (%5$d BIOS))"
 
-#: src/frontend/mame/ui/selgame.cpp:1078
+#: src/frontend/mame/ui/selgame.cpp:1088
 #, c-format
 msgid "System: %1$-.100s"
 msgstr "Sistema: %1$-.100s"
@@ -2146,7 +2146,7 @@ msgstr ""
 #: src/frontend/mame/ui/auditmenu.cpp:98
 #, c-format
 msgid ""
-"Auditing ROMs for machine %2$u of %3$u...\n"
+"Auditing media for machine %2$u of %3$u...\n"
 "%1$s"
 msgstr ""
 
@@ -2161,12 +2161,12 @@ msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:136
 #, c-format
-msgid "Audit ROMs for %1$u machines marked unavailable"
+msgid "Audit media for %1$u machines marked unavailable"
 msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:137
 #, c-format
-msgid "Audit ROMs for all %1$u machines"
+msgid "Audit media for all %1$u machines"
 msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:154
@@ -2373,84 +2373,84 @@ msgctxt "color-sample"
 msgid "Clone"
 msgstr "Clona"
 
-#: src/frontend/mame/ui/custui.cpp:914
+#: src/frontend/mame/ui/custui.cpp:906
 msgid "ARGB Settings"
 msgstr "Paràmetres d'ARGB"
 
-#: src/frontend/mame/ui/custui.cpp:919 src/frontend/mame/ui/custui.cpp:922
+#: src/frontend/mame/ui/custui.cpp:911 src/frontend/mame/ui/custui.cpp:914
 msgctxt "color-channel"
 msgid "Alpha"
 msgstr "Alfa"
 
-#: src/frontend/mame/ui/custui.cpp:927 src/frontend/mame/ui/custui.cpp:930
+#: src/frontend/mame/ui/custui.cpp:919 src/frontend/mame/ui/custui.cpp:922
 msgctxt "color-channel"
 msgid "Red"
 msgstr "Vermell"
 
-#: src/frontend/mame/ui/custui.cpp:935 src/frontend/mame/ui/custui.cpp:938
+#: src/frontend/mame/ui/custui.cpp:927 src/frontend/mame/ui/custui.cpp:930
 msgctxt "color-channel"
 msgid "Green"
 msgstr "Verd"
 
-#: src/frontend/mame/ui/custui.cpp:943 src/frontend/mame/ui/custui.cpp:946
+#: src/frontend/mame/ui/custui.cpp:935 src/frontend/mame/ui/custui.cpp:938
 msgctxt "color-channel"
 msgid "Blue"
 msgstr "Blau"
 
-#: src/frontend/mame/ui/custui.cpp:949
+#: src/frontend/mame/ui/custui.cpp:941
 msgid "Choose from palette"
 msgstr "Selecciona des de la paleta"
 
-#: src/frontend/mame/ui/custui.cpp:996
+#: src/frontend/mame/ui/custui.cpp:988
 msgid "Color preview:"
 msgstr "Previsualització de color:"
 
-#: src/frontend/mame/ui/custui.cpp:1093
+#: src/frontend/mame/ui/custui.cpp:1085
 msgctxt "color-preset"
 msgid "White"
 msgstr "Blanc"
 
-#: src/frontend/mame/ui/custui.cpp:1094
+#: src/frontend/mame/ui/custui.cpp:1086
 msgctxt "color-preset"
 msgid "Silver"
 msgstr "Plata"
 
-#: src/frontend/mame/ui/custui.cpp:1095
+#: src/frontend/mame/ui/custui.cpp:1087
 msgctxt "color-preset"
 msgid "Gray"
 msgstr "Gris"
 
-#: src/frontend/mame/ui/custui.cpp:1096
+#: src/frontend/mame/ui/custui.cpp:1088
 msgctxt "color-preset"
 msgid "Black"
 msgstr "Negre"
 
-#: src/frontend/mame/ui/custui.cpp:1097
+#: src/frontend/mame/ui/custui.cpp:1089
 msgctxt "color-preset"
 msgid "Red"
 msgstr "Vermell"
 
-#: src/frontend/mame/ui/custui.cpp:1098
+#: src/frontend/mame/ui/custui.cpp:1090
 msgctxt "color-preset"
 msgid "Orange"
 msgstr "Taronja"
 
-#: src/frontend/mame/ui/custui.cpp:1099
+#: src/frontend/mame/ui/custui.cpp:1091
 msgctxt "color-preset"
 msgid "Yellow"
 msgstr "Groc"
 
-#: src/frontend/mame/ui/custui.cpp:1100
+#: src/frontend/mame/ui/custui.cpp:1092
 msgctxt "color-preset"
 msgid "Green"
 msgstr "Verd"
 
-#: src/frontend/mame/ui/custui.cpp:1101
+#: src/frontend/mame/ui/custui.cpp:1093
 msgctxt "color-preset"
 msgid "Blue"
 msgstr "Blau"
 
-#: src/frontend/mame/ui/custui.cpp:1102
+#: src/frontend/mame/ui/custui.cpp:1094
 msgctxt "color-preset"
 msgid "Violet"
 msgstr "Violeta"
@@ -2515,7 +2515,7 @@ msgid "Input (general)"
 msgstr "Entrada (general)"
 
 #: src/frontend/mame/ui/mainmenu.cpp:123
-msgid "Input (this Machine)"
+msgid "Input (this machine)"
 msgstr "Entrada (aquesta màquina)"
 
 #: src/frontend/mame/ui/mainmenu.cpp:126
@@ -2554,6 +2554,10 @@ msgstr "Gestor de fitxers"
 msgid "Tape Control"
 msgstr "Control de cinta"
 
+#: src/frontend/mame/ui/mainmenu.cpp:155
+msgid "Pseudo Terminals"
+msgstr ""
+
 #: src/frontend/mame/ui/mainmenu.cpp:158
 msgid "BIOS Selection"
 msgstr "Selecció de BIOS"
@@ -2592,7 +2596,7 @@ msgstr "Visualització de DAT externa"
 
 #: src/frontend/mame/ui/mainmenu.cpp:200
 #, c-format
-msgid "About %s"
+msgid "About %1$s"
 msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:212
@@ -2752,373 +2756,373 @@ msgstr "El control·lador és un clon de: %1$s"
 msgid "%1$s %2$s"
 msgstr "%1$s %2$s"
 
-#: src/frontend/mame/ui/selmenu.cpp:2235
+#: src/frontend/mame/ui/selmenu.cpp:2244
 msgid "Images"
 msgstr "Imatges"
 
-#: src/frontend/mame/ui/selmenu.cpp:2236
+#: src/frontend/mame/ui/selmenu.cpp:2245
 msgid "Infos"
 msgstr "Infos"
 
-#: src/frontend/mame/ui/selmenu.cpp:2551
+#: src/frontend/mame/ui/selmenu.cpp:2560
 msgid ""
 "Required ROM/disk images for the selected system are missing or incorrect. "
 "Please acquire the correct files or select a different system.\n"
 "\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2567
+#: src/frontend/mame/ui/selmenu.cpp:2576
 msgid ""
 "Required ROM/disk images for the selected software are missing or incorrect. "
 "Please acquire the correct files or select a different software item.\n"
 "\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2583
+#: src/frontend/mame/ui/selmenu.cpp:2592
 msgid "incorrect checksum"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2586
+#: src/frontend/mame/ui/selmenu.cpp:2595
 msgid "incorrect length"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2589
+#: src/frontend/mame/ui/selmenu.cpp:2598
 msgid "not found"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2600
+#: src/frontend/mame/ui/selmenu.cpp:2609
 #, c-format
 msgid "%1$s (%2$s) - %3$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2602
+#: src/frontend/mame/ui/selmenu.cpp:2611
 #, c-format
 msgid "%1$s - %2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2606
+#: src/frontend/mame/ui/selmenu.cpp:2615
 msgid "Press any key to continue."
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2735
+#: src/frontend/mame/ui/selmenu.cpp:2744
 msgid "General Info"
 msgstr "Informació general"
 
-#: src/frontend/mame/ui/selmenu.cpp:2887
+#: src/frontend/mame/ui/selmenu.cpp:2896
 #, c-format
 msgid "Romset\t%1$s\n"
 msgstr "Conjunt de ROM\t%1$s\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2888
+#: src/frontend/mame/ui/selmenu.cpp:2897
 #, c-format
 msgid "Year\t%1$s\n"
 msgstr "Any\t%1$s\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2889
+#: src/frontend/mame/ui/selmenu.cpp:2898
 #, c-format
 msgid "Manufacturer\t%1$s\n"
 msgstr "Fabricant\t%1$s\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2896
+#: src/frontend/mame/ui/selmenu.cpp:2905
 #, c-format
 msgid "Driver is Clone of\t%1$s\n"
 msgstr "El control·lador és un clon de\t%1$s\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2901
+#: src/frontend/mame/ui/selmenu.cpp:2910
 msgid "Driver is Parent\t\n"
 msgstr "El controlador és el pare\t\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2905
+#: src/frontend/mame/ui/selmenu.cpp:2914
 msgid "Analog Controls\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2907
+#: src/frontend/mame/ui/selmenu.cpp:2916
 msgid "Keyboard Inputs\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2910
+#: src/frontend/mame/ui/selmenu.cpp:2919
 msgid "Overall\tNOT WORKING\n"
 msgstr "En resum\tNO FUNCIONA\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2912
+#: src/frontend/mame/ui/selmenu.cpp:2921
 msgid "Overall\tUnemulated Protection\n"
 msgstr "En resum\tProtecció no emulada\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2914
+#: src/frontend/mame/ui/selmenu.cpp:2923
 msgid "Overall\tWorking\n"
 msgstr "En resum\tFunciona\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2917
+#: src/frontend/mame/ui/selmenu.cpp:2926
 msgid "Graphics\tUnimplemented\n"
 msgstr "Gràfics\tNo implementat\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2919
+#: src/frontend/mame/ui/selmenu.cpp:2928
 msgid "Graphics\tWrong Colors\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2921
+#: src/frontend/mame/ui/selmenu.cpp:2930
 msgid "Graphics\tImperfect Colors\n"
 msgstr "Gràfics\tColors imperfectes\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2923
+#: src/frontend/mame/ui/selmenu.cpp:2932
 msgid "Graphics\tImperfect\n"
 msgstr "Gràfics\tImperfecte\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2925
+#: src/frontend/mame/ui/selmenu.cpp:2934
 msgid "Graphics\tOK\n"
 msgstr "Gràfics\tOK\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2928
+#: src/frontend/mame/ui/selmenu.cpp:2937
 msgid "Sound\tNone\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2930
+#: src/frontend/mame/ui/selmenu.cpp:2939
 msgid "Sound\tUnimplemented\n"
 msgstr "So\tNo implementat\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2932
+#: src/frontend/mame/ui/selmenu.cpp:2941
 msgid "Sound\tImperfect\n"
 msgstr "So\tImperfecte\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2934
+#: src/frontend/mame/ui/selmenu.cpp:2943
 msgid "Sound\tOK\n"
 msgstr "So\tOK\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2937
+#: src/frontend/mame/ui/selmenu.cpp:2946
 msgid "Capture\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2939
+#: src/frontend/mame/ui/selmenu.cpp:2948
 msgid "Capture\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2942
+#: src/frontend/mame/ui/selmenu.cpp:2951
 msgid "Camera\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2944
+#: src/frontend/mame/ui/selmenu.cpp:2953
 msgid "Camera\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2947
+#: src/frontend/mame/ui/selmenu.cpp:2956
 msgid "Microphone\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2949
+#: src/frontend/mame/ui/selmenu.cpp:2958
 msgid "Microphone\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2952
+#: src/frontend/mame/ui/selmenu.cpp:2961
 msgid "Controls\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2954
+#: src/frontend/mame/ui/selmenu.cpp:2963
 msgid "Controls\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2957
+#: src/frontend/mame/ui/selmenu.cpp:2966
 msgid "Keyboard\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2959
+#: src/frontend/mame/ui/selmenu.cpp:2968
 msgid "Keyboard\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2962
+#: src/frontend/mame/ui/selmenu.cpp:2971
 msgid "Mouse\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2964
+#: src/frontend/mame/ui/selmenu.cpp:2973
 msgid "Mouse\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2967
+#: src/frontend/mame/ui/selmenu.cpp:2976
 msgid "Media\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2969
+#: src/frontend/mame/ui/selmenu.cpp:2978
 msgid "Media\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2972
+#: src/frontend/mame/ui/selmenu.cpp:2981
 msgid "Disk\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2974
+#: src/frontend/mame/ui/selmenu.cpp:2983
 msgid "Disk\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2977
+#: src/frontend/mame/ui/selmenu.cpp:2986
 msgid "Printer\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2979
+#: src/frontend/mame/ui/selmenu.cpp:2988
 msgid "Printer\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2982
+#: src/frontend/mame/ui/selmenu.cpp:2991
 msgid "Mag. Tape\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2984
+#: src/frontend/mame/ui/selmenu.cpp:2993
 msgid "Mag. Tape\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2987
+#: src/frontend/mame/ui/selmenu.cpp:2996
 msgid "Punch Tape\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2989
+#: src/frontend/mame/ui/selmenu.cpp:2998
 msgid "Punch Tape\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2992
+#: src/frontend/mame/ui/selmenu.cpp:3001
 msgid "Mag. Drum\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2994
+#: src/frontend/mame/ui/selmenu.cpp:3003
 msgid "Mag. Drum\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2997
+#: src/frontend/mame/ui/selmenu.cpp:3006
 msgid "(EP)ROM\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2999
+#: src/frontend/mame/ui/selmenu.cpp:3008
 msgid "(EP)ROM\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3002
+#: src/frontend/mame/ui/selmenu.cpp:3011
 msgid "Communications\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3004
+#: src/frontend/mame/ui/selmenu.cpp:3013
 msgid "Communications\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3007
+#: src/frontend/mame/ui/selmenu.cpp:3016
 msgid "LAN\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3009
+#: src/frontend/mame/ui/selmenu.cpp:3018
 msgid "LAN\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3012
+#: src/frontend/mame/ui/selmenu.cpp:3021
 msgid "WAN\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3014
+#: src/frontend/mame/ui/selmenu.cpp:3023
 msgid "WAN\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3017
+#: src/frontend/mame/ui/selmenu.cpp:3026
 msgid "Timing\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3019
+#: src/frontend/mame/ui/selmenu.cpp:3028
 msgid "Timing\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3021
+#: src/frontend/mame/ui/selmenu.cpp:3030
 msgid "Mechanical Machine\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3021
+#: src/frontend/mame/ui/selmenu.cpp:3030
 msgid "Mechanical Machine\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3022
+#: src/frontend/mame/ui/selmenu.cpp:3031
 msgid "Requires Artwork\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3022
+#: src/frontend/mame/ui/selmenu.cpp:3031
 msgid "Requires Artwork\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3023
+#: src/frontend/mame/ui/selmenu.cpp:3032
 msgid "Requires Clickable Artwork\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3023
+#: src/frontend/mame/ui/selmenu.cpp:3032
 msgid "Requires Clickable Artwork\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3025
+#: src/frontend/mame/ui/selmenu.cpp:3034
 msgid "Support Cocktail\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3026
+#: src/frontend/mame/ui/selmenu.cpp:3035
 msgid "Driver is BIOS\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3026
+#: src/frontend/mame/ui/selmenu.cpp:3035
 msgid "Driver is BIOS\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3027
+#: src/frontend/mame/ui/selmenu.cpp:3036
 msgid "Support Save\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3027
+#: src/frontend/mame/ui/selmenu.cpp:3036
 msgid "Support Save\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3028
+#: src/frontend/mame/ui/selmenu.cpp:3037
 msgid "Screen Orientation\tVertical\n"
 msgstr "Orientació de la pantalla\tVertical\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3028
+#: src/frontend/mame/ui/selmenu.cpp:3037
 msgid "Screen Orientation\tHorizontal\n"
 msgstr "Orientació de la pantalla\tHoritzontal\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3038
+#: src/frontend/mame/ui/selmenu.cpp:3047
 msgid "Requires CHD\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3038
+#: src/frontend/mame/ui/selmenu.cpp:3047
 msgid "Requires CHD\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3051
-msgid "ROM Audit Result\tOK\n"
+#: src/frontend/mame/ui/selmenu.cpp:3060
+msgid "Media Audit Result\tOK\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3053
-msgid "ROM Audit Result\tBAD\n"
+#: src/frontend/mame/ui/selmenu.cpp:3062
+msgid "Media Audit Result\tBAD\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3056
+#: src/frontend/mame/ui/selmenu.cpp:3065
 msgid "Samples Audit Result\tNone Needed\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3058
+#: src/frontend/mame/ui/selmenu.cpp:3067
 msgid "Samples Audit Result\tOK\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3060
+#: src/frontend/mame/ui/selmenu.cpp:3069
 msgid "Samples Audit Result\tBAD\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3064
+#: src/frontend/mame/ui/selmenu.cpp:3073
 msgid ""
-"ROM Audit \tDisabled\n"
-"Samples Audit \tDisabled\n"
+"Media Audit\tDisabled\n"
+"Samples Audit\tDisabled\n"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:150
+#: src/frontend/mame/ui/sndmenu.cpp:146
 msgid "Sound"
 msgstr "So"
 
-#: src/frontend/mame/ui/sndmenu.cpp:151
+#: src/frontend/mame/ui/sndmenu.cpp:147
 msgid "Compressor"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:152
+#: src/frontend/mame/ui/sndmenu.cpp:148
 msgid "Sample Rate"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:153
+#: src/frontend/mame/ui/sndmenu.cpp:149
 msgid "Use External Samples"
 msgstr ""
 
@@ -3157,511 +3161,681 @@ msgstr ""
 msgid "  Screen '%1$s': Vector\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:132
+#: src/frontend/mame/ui/devopt.cpp:135
 #, c-format
 msgid "  Screen '%1$s': %2$d × %3$d (V) %4$s Hz\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:133
+#: src/frontend/mame/ui/devopt.cpp:136
 #, c-format
 msgid "  Screen '%1$s': %2$d × %3$d (H) %4$s Hz\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:147
+#: src/frontend/mame/ui/devopt.cpp:150
 msgid "* Sound:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:211
+#: src/frontend/mame/ui/devopt.cpp:214
 #, c-format
 msgid ""
 "* BIOS settings:\n"
 "  %1$d options    [default: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:255 src/frontend/mame/ui/devopt.cpp:271
-#: src/frontend/mame/ui/devopt.cpp:332
+#: src/frontend/mame/ui/devopt.cpp:258 src/frontend/mame/ui/devopt.cpp:274
+#: src/frontend/mame/ui/devopt.cpp:335
 #, c-format
 msgid "  %1$s    [default: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:260 src/frontend/mame/ui/devopt.cpp:276
+#: src/frontend/mame/ui/devopt.cpp:263 src/frontend/mame/ui/devopt.cpp:279
 #, c-format
 msgid "  %1$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:282
+#: src/frontend/mame/ui/devopt.cpp:285
 msgid "* DIP switch settings:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:287
+#: src/frontend/mame/ui/devopt.cpp:290
 msgid "* Configuration settings:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:291
+#: src/frontend/mame/ui/devopt.cpp:294
 msgid "* Input device(s):\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:293
+#: src/frontend/mame/ui/devopt.cpp:296
 #, c-format
 msgid "  User inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:295
+#: src/frontend/mame/ui/devopt.cpp:298
 #, c-format
 msgid "  Mahjong inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:297
+#: src/frontend/mame/ui/devopt.cpp:300
 #, c-format
 msgid "  Hanafuda inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:299
+#: src/frontend/mame/ui/devopt.cpp:302
 #, c-format
 msgid "  Gambling inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:301
+#: src/frontend/mame/ui/devopt.cpp:304
 #, c-format
 msgid "  Analog inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:303
+#: src/frontend/mame/ui/devopt.cpp:306
 #, c-format
 msgid "  Adjuster inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:305
+#: src/frontend/mame/ui/devopt.cpp:308
 #, c-format
 msgid "  Keypad inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:307
+#: src/frontend/mame/ui/devopt.cpp:310
 #, c-format
 msgid "  Keyboard inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:312
+#: src/frontend/mame/ui/devopt.cpp:315
 msgid "* Media Options:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:317
+#: src/frontend/mame/ui/devopt.cpp:320
 #, c-format
 msgid "  %1$s    [tag: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:327
+#: src/frontend/mame/ui/devopt.cpp:330
 msgid "* Slot Options:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:341
+#: src/frontend/mame/ui/devopt.cpp:344
 msgid "[None]\n"
 msgstr ""
 
-#: src/emu/render.cpp:1847
+#: src/emu/render.cpp:1796
 #, c-format
 msgctxt "view-name"
 msgid "Screen %1$u Standard (%2$u:%3$u)"
 msgstr ""
 
-#: src/emu/render.cpp:1873
+#: src/emu/render.cpp:1822
 #, c-format
 msgctxt "view-name"
 msgid "Screen %1$u Pixel Aspect (%2$u:%3$u)"
 msgstr ""
 
-#: src/emu/render.cpp:1895 src/emu/render.cpp:2030
+#: src/emu/render.cpp:1844 src/emu/render.cpp:1979
 msgctxt "view-name"
 msgid "Cocktail"
 msgstr ""
 
-#: src/emu/render.cpp:2015
+#: src/emu/render.cpp:1964
 msgctxt "view-name"
 msgid "Left-to-Right"
 msgstr ""
 
-#: src/emu/render.cpp:2016
+#: src/emu/render.cpp:1965
 msgctxt "view-name"
 msgid "Left-to-Right (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2017
+#: src/emu/render.cpp:1966
 msgctxt "view-name"
 msgid "Top-to-Bottom"
 msgstr ""
 
-#: src/emu/render.cpp:2018
+#: src/emu/render.cpp:1967
 msgctxt "view-name"
 msgid "Top-to-Bottom (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2069
+#: src/emu/render.cpp:2018
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Left-to-Right, Top-to-Bottom"
 msgstr ""
 
-#: src/emu/render.cpp:2078
+#: src/emu/render.cpp:2027
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Left-to-Right, Top-to-Bottom (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2087
+#: src/emu/render.cpp:2036
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Top-to-Bottom, Left-to-Right"
 msgstr ""
 
-#: src/emu/render.cpp:2096
+#: src/emu/render.cpp:2045
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Top-to-Bottom, Left-to-Right (Gapless)"
 msgstr ""
 
-#: src/emu/inpttype.ipp:22
+#: src/emu/ioport.cpp:332
+#, c-format
 msgctxt "input-name"
-msgid "P1 Up"
+msgid "P%1$u"
 msgstr ""
 
-#: src/emu/inpttype.ipp:23
+#: src/emu/ioport.cpp:1924
 msgctxt "input-name"
-msgid "P1 Down"
+msgid "???"
 msgstr ""
 
-#: src/emu/inpttype.ipp:24
+#: src/emu/inpttype.ipp:22 src/emu/inpttype.ipp:140 src/emu/inpttype.ipp:221
+#: src/emu/inpttype.ipp:255 src/emu/inpttype.ipp:289 src/emu/inpttype.ipp:323
+#: src/emu/inpttype.ipp:357 src/emu/inpttype.ipp:391 src/emu/inpttype.ipp:425
+#: src/emu/inpttype.ipp:459
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left"
+msgid "%p Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:25
+#: src/emu/inpttype.ipp:23 src/emu/inpttype.ipp:141 src/emu/inpttype.ipp:222
+#: src/emu/inpttype.ipp:256 src/emu/inpttype.ipp:290 src/emu/inpttype.ipp:324
+#: src/emu/inpttype.ipp:358 src/emu/inpttype.ipp:392 src/emu/inpttype.ipp:426
+#: src/emu/inpttype.ipp:460
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right"
+msgid "%p Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:26
+#: src/emu/inpttype.ipp:24 src/emu/inpttype.ipp:142 src/emu/inpttype.ipp:223
+#: src/emu/inpttype.ipp:257 src/emu/inpttype.ipp:291 src/emu/inpttype.ipp:325
+#: src/emu/inpttype.ipp:359 src/emu/inpttype.ipp:393 src/emu/inpttype.ipp:427
+#: src/emu/inpttype.ipp:461
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Up"
+msgid "%p Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:27
+#: src/emu/inpttype.ipp:25 src/emu/inpttype.ipp:143 src/emu/inpttype.ipp:224
+#: src/emu/inpttype.ipp:258 src/emu/inpttype.ipp:292 src/emu/inpttype.ipp:326
+#: src/emu/inpttype.ipp:360 src/emu/inpttype.ipp:394 src/emu/inpttype.ipp:428
+#: src/emu/inpttype.ipp:462
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Down"
+msgid "%p Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:28
+#: src/emu/inpttype.ipp:26 src/emu/inpttype.ipp:144 src/emu/inpttype.ipp:225
+#: src/emu/inpttype.ipp:259 src/emu/inpttype.ipp:293 src/emu/inpttype.ipp:327
+#: src/emu/inpttype.ipp:361 src/emu/inpttype.ipp:395 src/emu/inpttype.ipp:429
+#: src/emu/inpttype.ipp:463
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Left"
+msgid "%p Right Stick/Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:29
+#: src/emu/inpttype.ipp:27 src/emu/inpttype.ipp:145 src/emu/inpttype.ipp:226
+#: src/emu/inpttype.ipp:260 src/emu/inpttype.ipp:294 src/emu/inpttype.ipp:328
+#: src/emu/inpttype.ipp:362 src/emu/inpttype.ipp:396 src/emu/inpttype.ipp:430
+#: src/emu/inpttype.ipp:464
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Right"
+msgid "%p Right Stick/Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:30
+#: src/emu/inpttype.ipp:28 src/emu/inpttype.ipp:146 src/emu/inpttype.ipp:227
+#: src/emu/inpttype.ipp:261 src/emu/inpttype.ipp:295 src/emu/inpttype.ipp:329
+#: src/emu/inpttype.ipp:363 src/emu/inpttype.ipp:397 src/emu/inpttype.ipp:431
+#: src/emu/inpttype.ipp:465
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Up"
+msgid "%p Right Stick/Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:31
+#: src/emu/inpttype.ipp:29 src/emu/inpttype.ipp:147 src/emu/inpttype.ipp:228
+#: src/emu/inpttype.ipp:262 src/emu/inpttype.ipp:296 src/emu/inpttype.ipp:330
+#: src/emu/inpttype.ipp:364 src/emu/inpttype.ipp:398 src/emu/inpttype.ipp:432
+#: src/emu/inpttype.ipp:466
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Down"
+msgid "%p Right Stick/Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:32
+#: src/emu/inpttype.ipp:30 src/emu/inpttype.ipp:148 src/emu/inpttype.ipp:229
+#: src/emu/inpttype.ipp:263 src/emu/inpttype.ipp:297 src/emu/inpttype.ipp:331
+#: src/emu/inpttype.ipp:365 src/emu/inpttype.ipp:399 src/emu/inpttype.ipp:433
+#: src/emu/inpttype.ipp:467
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Left"
+msgid "%p Left Stick/Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:33
+#: src/emu/inpttype.ipp:31 src/emu/inpttype.ipp:149 src/emu/inpttype.ipp:230
+#: src/emu/inpttype.ipp:264 src/emu/inpttype.ipp:298 src/emu/inpttype.ipp:332
+#: src/emu/inpttype.ipp:366 src/emu/inpttype.ipp:400 src/emu/inpttype.ipp:434
+#: src/emu/inpttype.ipp:468
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Right"
+msgid "%p Left Stick/Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:34
+#: src/emu/inpttype.ipp:32 src/emu/inpttype.ipp:150 src/emu/inpttype.ipp:231
+#: src/emu/inpttype.ipp:265 src/emu/inpttype.ipp:299 src/emu/inpttype.ipp:333
+#: src/emu/inpttype.ipp:367 src/emu/inpttype.ipp:401 src/emu/inpttype.ipp:435
+#: src/emu/inpttype.ipp:469
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 1"
+msgid "%p Left Stick/Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:35
+#: src/emu/inpttype.ipp:33 src/emu/inpttype.ipp:151 src/emu/inpttype.ipp:232
+#: src/emu/inpttype.ipp:266 src/emu/inpttype.ipp:300 src/emu/inpttype.ipp:334
+#: src/emu/inpttype.ipp:368 src/emu/inpttype.ipp:402 src/emu/inpttype.ipp:436
+#: src/emu/inpttype.ipp:470
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 2"
+msgid "%p Left Stick/Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:36
+#: src/emu/inpttype.ipp:34 src/emu/inpttype.ipp:152 src/emu/inpttype.ipp:233
+#: src/emu/inpttype.ipp:267 src/emu/inpttype.ipp:301 src/emu/inpttype.ipp:335
+#: src/emu/inpttype.ipp:369 src/emu/inpttype.ipp:403 src/emu/inpttype.ipp:437
+#: src/emu/inpttype.ipp:471
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 3"
+msgid "%p Button 1"
 msgstr ""
 
-#: src/emu/inpttype.ipp:37
+#: src/emu/inpttype.ipp:35 src/emu/inpttype.ipp:153 src/emu/inpttype.ipp:234
+#: src/emu/inpttype.ipp:268 src/emu/inpttype.ipp:302 src/emu/inpttype.ipp:336
+#: src/emu/inpttype.ipp:370 src/emu/inpttype.ipp:404 src/emu/inpttype.ipp:438
+#: src/emu/inpttype.ipp:472
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 4"
+msgid "%p Button 2"
 msgstr ""
 
-#: src/emu/inpttype.ipp:38
+#: src/emu/inpttype.ipp:36 src/emu/inpttype.ipp:154 src/emu/inpttype.ipp:235
+#: src/emu/inpttype.ipp:269 src/emu/inpttype.ipp:303 src/emu/inpttype.ipp:337
+#: src/emu/inpttype.ipp:371 src/emu/inpttype.ipp:405 src/emu/inpttype.ipp:439
+#: src/emu/inpttype.ipp:473
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 5"
+msgid "%p Button 3"
 msgstr ""
 
-#: src/emu/inpttype.ipp:39
+#: src/emu/inpttype.ipp:37 src/emu/inpttype.ipp:155 src/emu/inpttype.ipp:236
+#: src/emu/inpttype.ipp:270 src/emu/inpttype.ipp:304 src/emu/inpttype.ipp:338
+#: src/emu/inpttype.ipp:372 src/emu/inpttype.ipp:406 src/emu/inpttype.ipp:440
+#: src/emu/inpttype.ipp:474
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 6"
+msgid "%p Button 4"
 msgstr ""
 
-#: src/emu/inpttype.ipp:40
+#: src/emu/inpttype.ipp:38 src/emu/inpttype.ipp:156 src/emu/inpttype.ipp:237
+#: src/emu/inpttype.ipp:271 src/emu/inpttype.ipp:305 src/emu/inpttype.ipp:339
+#: src/emu/inpttype.ipp:373 src/emu/inpttype.ipp:407 src/emu/inpttype.ipp:441
+#: src/emu/inpttype.ipp:475
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 7"
+msgid "%p Button 5"
 msgstr ""
 
-#: src/emu/inpttype.ipp:41
+#: src/emu/inpttype.ipp:39 src/emu/inpttype.ipp:157 src/emu/inpttype.ipp:238
+#: src/emu/inpttype.ipp:272 src/emu/inpttype.ipp:306 src/emu/inpttype.ipp:340
+#: src/emu/inpttype.ipp:374 src/emu/inpttype.ipp:408 src/emu/inpttype.ipp:442
+#: src/emu/inpttype.ipp:476
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 8"
+msgid "%p Button 6"
 msgstr ""
 
-#: src/emu/inpttype.ipp:42
+#: src/emu/inpttype.ipp:40 src/emu/inpttype.ipp:158 src/emu/inpttype.ipp:239
+#: src/emu/inpttype.ipp:273 src/emu/inpttype.ipp:307 src/emu/inpttype.ipp:341
+#: src/emu/inpttype.ipp:375 src/emu/inpttype.ipp:409 src/emu/inpttype.ipp:443
+#: src/emu/inpttype.ipp:477
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 9"
+msgid "%p Button 7"
 msgstr ""
 
-#: src/emu/inpttype.ipp:43
+#: src/emu/inpttype.ipp:41 src/emu/inpttype.ipp:159 src/emu/inpttype.ipp:240
+#: src/emu/inpttype.ipp:274 src/emu/inpttype.ipp:308 src/emu/inpttype.ipp:342
+#: src/emu/inpttype.ipp:376 src/emu/inpttype.ipp:410 src/emu/inpttype.ipp:444
+#: src/emu/inpttype.ipp:478
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 10"
+msgid "%p Button 8"
 msgstr ""
 
-#: src/emu/inpttype.ipp:44
+#: src/emu/inpttype.ipp:42 src/emu/inpttype.ipp:160 src/emu/inpttype.ipp:241
+#: src/emu/inpttype.ipp:275 src/emu/inpttype.ipp:309 src/emu/inpttype.ipp:343
+#: src/emu/inpttype.ipp:377 src/emu/inpttype.ipp:411 src/emu/inpttype.ipp:445
+#: src/emu/inpttype.ipp:479
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 11"
+msgid "%p Button 9"
 msgstr ""
 
-#: src/emu/inpttype.ipp:45
+#: src/emu/inpttype.ipp:43 src/emu/inpttype.ipp:161 src/emu/inpttype.ipp:242
+#: src/emu/inpttype.ipp:276 src/emu/inpttype.ipp:310 src/emu/inpttype.ipp:344
+#: src/emu/inpttype.ipp:378 src/emu/inpttype.ipp:412 src/emu/inpttype.ipp:446
+#: src/emu/inpttype.ipp:480
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 12"
+msgid "%p Button 10"
 msgstr ""
 
-#: src/emu/inpttype.ipp:46
+#: src/emu/inpttype.ipp:44 src/emu/inpttype.ipp:162 src/emu/inpttype.ipp:243
+#: src/emu/inpttype.ipp:277 src/emu/inpttype.ipp:311 src/emu/inpttype.ipp:345
+#: src/emu/inpttype.ipp:379 src/emu/inpttype.ipp:413 src/emu/inpttype.ipp:447
+#: src/emu/inpttype.ipp:481
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 13"
+msgid "%p Button 11"
 msgstr ""
 
-#: src/emu/inpttype.ipp:47
+#: src/emu/inpttype.ipp:45 src/emu/inpttype.ipp:163 src/emu/inpttype.ipp:244
+#: src/emu/inpttype.ipp:278 src/emu/inpttype.ipp:312 src/emu/inpttype.ipp:346
+#: src/emu/inpttype.ipp:380 src/emu/inpttype.ipp:414 src/emu/inpttype.ipp:448
+#: src/emu/inpttype.ipp:482
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 14"
+msgid "%p Button 12"
 msgstr ""
 
-#: src/emu/inpttype.ipp:48
+#: src/emu/inpttype.ipp:46 src/emu/inpttype.ipp:164 src/emu/inpttype.ipp:245
+#: src/emu/inpttype.ipp:279 src/emu/inpttype.ipp:313 src/emu/inpttype.ipp:347
+#: src/emu/inpttype.ipp:381 src/emu/inpttype.ipp:415 src/emu/inpttype.ipp:449
+#: src/emu/inpttype.ipp:483
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 15"
+msgid "%p Button 13"
 msgstr ""
 
-#: src/emu/inpttype.ipp:49
+#: src/emu/inpttype.ipp:47 src/emu/inpttype.ipp:165 src/emu/inpttype.ipp:246
+#: src/emu/inpttype.ipp:280 src/emu/inpttype.ipp:314 src/emu/inpttype.ipp:348
+#: src/emu/inpttype.ipp:382 src/emu/inpttype.ipp:416 src/emu/inpttype.ipp:450
+#: src/emu/inpttype.ipp:484
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 16"
+msgid "%p Button 14"
 msgstr ""
 
-#: src/emu/inpttype.ipp:50
+#: src/emu/inpttype.ipp:48 src/emu/inpttype.ipp:166 src/emu/inpttype.ipp:247
+#: src/emu/inpttype.ipp:281 src/emu/inpttype.ipp:315 src/emu/inpttype.ipp:349
+#: src/emu/inpttype.ipp:383 src/emu/inpttype.ipp:417 src/emu/inpttype.ipp:451
+#: src/emu/inpttype.ipp:485
+#, c-format
 msgctxt "input-name"
-msgid "P1 Start"
+msgid "%p Button 15"
 msgstr ""
 
-#: src/emu/inpttype.ipp:51
+#: src/emu/inpttype.ipp:49 src/emu/inpttype.ipp:167 src/emu/inpttype.ipp:248
+#: src/emu/inpttype.ipp:282 src/emu/inpttype.ipp:316 src/emu/inpttype.ipp:350
+#: src/emu/inpttype.ipp:384 src/emu/inpttype.ipp:418 src/emu/inpttype.ipp:452
+#: src/emu/inpttype.ipp:486
+#, c-format
 msgctxt "input-name"
-msgid "P1 Select"
+msgid "%p Button 16"
 msgstr ""
 
-#: src/emu/inpttype.ipp:56
+#: src/emu/inpttype.ipp:50 src/emu/inpttype.ipp:168 src/emu/inpttype.ipp:249
+#: src/emu/inpttype.ipp:283 src/emu/inpttype.ipp:317 src/emu/inpttype.ipp:351
+#: src/emu/inpttype.ipp:385 src/emu/inpttype.ipp:419 src/emu/inpttype.ipp:453
+#: src/emu/inpttype.ipp:487
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong A"
+msgid "%p Start"
 msgstr ""
 
-#: src/emu/inpttype.ipp:57
+#: src/emu/inpttype.ipp:51 src/emu/inpttype.ipp:169 src/emu/inpttype.ipp:250
+#: src/emu/inpttype.ipp:284 src/emu/inpttype.ipp:318 src/emu/inpttype.ipp:352
+#: src/emu/inpttype.ipp:386 src/emu/inpttype.ipp:420 src/emu/inpttype.ipp:454
+#: src/emu/inpttype.ipp:488
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong B"
+msgid "%p Select"
 msgstr ""
 
-#: src/emu/inpttype.ipp:58
+#: src/emu/inpttype.ipp:56 src/emu/inpttype.ipp:174
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong C"
+msgid "%p Mahjong A"
 msgstr ""
 
-#: src/emu/inpttype.ipp:59
+#: src/emu/inpttype.ipp:57 src/emu/inpttype.ipp:175
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong D"
+msgid "%p Mahjong B"
 msgstr ""
 
-#: src/emu/inpttype.ipp:60
+#: src/emu/inpttype.ipp:58 src/emu/inpttype.ipp:176
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong E"
+msgid "%p Mahjong C"
 msgstr ""
 
-#: src/emu/inpttype.ipp:61
+#: src/emu/inpttype.ipp:59 src/emu/inpttype.ipp:177
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong F"
+msgid "%p Mahjong D"
 msgstr ""
 
-#: src/emu/inpttype.ipp:62
+#: src/emu/inpttype.ipp:60 src/emu/inpttype.ipp:178
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong G"
+msgid "%p Mahjong E"
 msgstr ""
 
-#: src/emu/inpttype.ipp:63
+#: src/emu/inpttype.ipp:61 src/emu/inpttype.ipp:179
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong H"
+msgid "%p Mahjong F"
 msgstr ""
 
-#: src/emu/inpttype.ipp:64
+#: src/emu/inpttype.ipp:62 src/emu/inpttype.ipp:180
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong I"
+msgid "%p Mahjong G"
 msgstr ""
 
-#: src/emu/inpttype.ipp:65
+#: src/emu/inpttype.ipp:63 src/emu/inpttype.ipp:181
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong J"
+msgid "%p Mahjong H"
 msgstr ""
 
-#: src/emu/inpttype.ipp:66
+#: src/emu/inpttype.ipp:64 src/emu/inpttype.ipp:182
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong K"
+msgid "%p Mahjong I"
 msgstr ""
 
-#: src/emu/inpttype.ipp:67
+#: src/emu/inpttype.ipp:65 src/emu/inpttype.ipp:183
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong L"
+msgid "%p Mahjong J"
 msgstr ""
 
-#: src/emu/inpttype.ipp:68
+#: src/emu/inpttype.ipp:66 src/emu/inpttype.ipp:184
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong M"
+msgid "%p Mahjong K"
 msgstr ""
 
-#: src/emu/inpttype.ipp:69
+#: src/emu/inpttype.ipp:67 src/emu/inpttype.ipp:185
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong N"
+msgid "%p Mahjong L"
 msgstr ""
 
-#: src/emu/inpttype.ipp:70
+#: src/emu/inpttype.ipp:68 src/emu/inpttype.ipp:186
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong O"
+msgid "%p Mahjong M"
 msgstr ""
 
-#: src/emu/inpttype.ipp:71
+#: src/emu/inpttype.ipp:69 src/emu/inpttype.ipp:187
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong P"
+msgid "%p Mahjong N"
 msgstr ""
 
-#: src/emu/inpttype.ipp:72
+#: src/emu/inpttype.ipp:70 src/emu/inpttype.ipp:188
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Q"
+msgid "%p Mahjong O"
 msgstr ""
 
-#: src/emu/inpttype.ipp:73
+#: src/emu/inpttype.ipp:71 src/emu/inpttype.ipp:189
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Kan"
+msgid "%p Mahjong P"
 msgstr ""
 
-#: src/emu/inpttype.ipp:74
+#: src/emu/inpttype.ipp:72 src/emu/inpttype.ipp:190
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Pon"
+msgid "%p Mahjong Q"
 msgstr ""
 
-#: src/emu/inpttype.ipp:75
+#: src/emu/inpttype.ipp:73 src/emu/inpttype.ipp:191
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Chi"
+msgid "%p Mahjong Kan"
 msgstr ""
 
-#: src/emu/inpttype.ipp:76
+#: src/emu/inpttype.ipp:74 src/emu/inpttype.ipp:192
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Reach"
+msgid "%p Mahjong Pon"
 msgstr ""
 
-#: src/emu/inpttype.ipp:77
+#: src/emu/inpttype.ipp:75 src/emu/inpttype.ipp:193
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Ron"
+msgid "%p Mahjong Chi"
 msgstr ""
 
-#: src/emu/inpttype.ipp:78
+#: src/emu/inpttype.ipp:76 src/emu/inpttype.ipp:194
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Flip Flop"
+msgid "%p Mahjong Reach"
 msgstr ""
 
-#: src/emu/inpttype.ipp:79
+#: src/emu/inpttype.ipp:77 src/emu/inpttype.ipp:195
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Bet"
+msgid "%p Mahjong Ron"
 msgstr ""
 
-#: src/emu/inpttype.ipp:80
+#: src/emu/inpttype.ipp:78 src/emu/inpttype.ipp:200
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Take Score"
+msgid "%p Mahjong Flip Flop"
 msgstr ""
 
-#: src/emu/inpttype.ipp:81
+#: src/emu/inpttype.ipp:79 src/emu/inpttype.ipp:196
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Double Up"
+msgid "%p Mahjong Bet"
 msgstr ""
 
-#: src/emu/inpttype.ipp:82
+#: src/emu/inpttype.ipp:80 src/emu/inpttype.ipp:198
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Big"
+msgid "%p Mahjong Take Score"
 msgstr ""
 
-#: src/emu/inpttype.ipp:83
+#: src/emu/inpttype.ipp:81 src/emu/inpttype.ipp:199
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Small"
+msgid "%p Mahjong Double Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:84
+#: src/emu/inpttype.ipp:82 src/emu/inpttype.ipp:201
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Last Chance"
+msgid "%p Mahjong Big"
 msgstr ""
 
-#: src/emu/inpttype.ipp:89
+#: src/emu/inpttype.ipp:83 src/emu/inpttype.ipp:202
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda A/1"
+msgid "%p Mahjong Small"
 msgstr ""
 
-#: src/emu/inpttype.ipp:90
+#: src/emu/inpttype.ipp:84 src/emu/inpttype.ipp:197
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda B/2"
+msgid "%p Mahjong Last Chance"
 msgstr ""
 
-#: src/emu/inpttype.ipp:91
+#: src/emu/inpttype.ipp:89 src/emu/inpttype.ipp:207
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda C/3"
+msgid "%p Hanafuda A/1"
 msgstr ""
 
-#: src/emu/inpttype.ipp:92
+#: src/emu/inpttype.ipp:90 src/emu/inpttype.ipp:208
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda D/4"
+msgid "%p Hanafuda B/2"
 msgstr ""
 
-#: src/emu/inpttype.ipp:93
+#: src/emu/inpttype.ipp:91 src/emu/inpttype.ipp:209
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda E/5"
+msgid "%p Hanafuda C/3"
 msgstr ""
 
-#: src/emu/inpttype.ipp:94
+#: src/emu/inpttype.ipp:92 src/emu/inpttype.ipp:210
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda F/6"
+msgid "%p Hanafuda D/4"
 msgstr ""
 
-#: src/emu/inpttype.ipp:95
+#: src/emu/inpttype.ipp:93 src/emu/inpttype.ipp:211
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda G/7"
+msgid "%p Hanafuda E/5"
 msgstr ""
 
-#: src/emu/inpttype.ipp:96
+#: src/emu/inpttype.ipp:94 src/emu/inpttype.ipp:212
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda H/8"
+msgid "%p Hanafuda F/6"
 msgstr ""
 
-#: src/emu/inpttype.ipp:97
+#: src/emu/inpttype.ipp:95 src/emu/inpttype.ipp:213
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda Yes"
+msgid "%p Hanafuda G/7"
 msgstr ""
 
-#: src/emu/inpttype.ipp:98
+#: src/emu/inpttype.ipp:96 src/emu/inpttype.ipp:214
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda No"
+msgid "%p Hanafuda H/8"
+msgstr ""
+
+#: src/emu/inpttype.ipp:97 src/emu/inpttype.ipp:215
+#, c-format
+msgctxt "input-name"
+msgid "%p Hanafuda Yes"
+msgstr ""
+
+#: src/emu/inpttype.ipp:98 src/emu/inpttype.ipp:216
+#, c-format
+msgctxt "input-name"
+msgid "%p Hanafuda No"
 msgstr ""
 
 #: src/emu/inpttype.ipp:103
@@ -3789,1551 +3963,6 @@ msgctxt "input-name"
 msgid "Stop All Reels"
 msgstr ""
 
-#: src/emu/inpttype.ipp:140
-msgctxt "input-name"
-msgid "P2 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:141
-msgctxt "input-name"
-msgid "P2 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:142
-msgctxt "input-name"
-msgid "P2 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:143
-msgctxt "input-name"
-msgid "P2 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:144
-msgctxt "input-name"
-msgid "P2 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:145
-msgctxt "input-name"
-msgid "P2 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:146
-msgctxt "input-name"
-msgid "P2 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:147
-msgctxt "input-name"
-msgid "P2 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:148
-msgctxt "input-name"
-msgid "P2 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:149
-msgctxt "input-name"
-msgid "P2 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:150
-msgctxt "input-name"
-msgid "P2 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:151
-msgctxt "input-name"
-msgid "P2 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:152
-msgctxt "input-name"
-msgid "P2 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:153
-msgctxt "input-name"
-msgid "P2 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:154
-msgctxt "input-name"
-msgid "P2 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:155
-msgctxt "input-name"
-msgid "P2 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:156
-msgctxt "input-name"
-msgid "P2 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:157
-msgctxt "input-name"
-msgid "P2 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:158
-msgctxt "input-name"
-msgid "P2 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:159
-msgctxt "input-name"
-msgid "P2 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:160
-msgctxt "input-name"
-msgid "P2 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:161
-msgctxt "input-name"
-msgid "P2 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:162
-msgctxt "input-name"
-msgid "P2 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:163
-msgctxt "input-name"
-msgid "P2 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:164
-msgctxt "input-name"
-msgid "P2 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:165
-msgctxt "input-name"
-msgid "P2 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:166
-msgctxt "input-name"
-msgid "P2 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:167
-msgctxt "input-name"
-msgid "P2 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:168
-msgctxt "input-name"
-msgid "P2 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:169
-msgctxt "input-name"
-msgid "P2 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:174
-msgctxt "input-name"
-msgid "P2 Mahjong A"
-msgstr ""
-
-#: src/emu/inpttype.ipp:175
-msgctxt "input-name"
-msgid "P2 Mahjong B"
-msgstr ""
-
-#: src/emu/inpttype.ipp:176
-msgctxt "input-name"
-msgid "P2 Mahjong C"
-msgstr ""
-
-#: src/emu/inpttype.ipp:177
-msgctxt "input-name"
-msgid "P2 Mahjong D"
-msgstr ""
-
-#: src/emu/inpttype.ipp:178
-msgctxt "input-name"
-msgid "P2 Mahjong E"
-msgstr ""
-
-#: src/emu/inpttype.ipp:179
-msgctxt "input-name"
-msgid "P2 Mahjong F"
-msgstr ""
-
-#: src/emu/inpttype.ipp:180
-msgctxt "input-name"
-msgid "P2 Mahjong G"
-msgstr ""
-
-#: src/emu/inpttype.ipp:181
-msgctxt "input-name"
-msgid "P2 Mahjong H"
-msgstr ""
-
-#: src/emu/inpttype.ipp:182
-msgctxt "input-name"
-msgid "P2 Mahjong I"
-msgstr ""
-
-#: src/emu/inpttype.ipp:183
-msgctxt "input-name"
-msgid "P2 Mahjong J"
-msgstr ""
-
-#: src/emu/inpttype.ipp:184
-msgctxt "input-name"
-msgid "P2 Mahjong K"
-msgstr ""
-
-#: src/emu/inpttype.ipp:185
-msgctxt "input-name"
-msgid "P2 Mahjong L"
-msgstr ""
-
-#: src/emu/inpttype.ipp:186
-msgctxt "input-name"
-msgid "P2 Mahjong M"
-msgstr ""
-
-#: src/emu/inpttype.ipp:187
-msgctxt "input-name"
-msgid "P2 Mahjong N"
-msgstr ""
-
-#: src/emu/inpttype.ipp:188
-msgctxt "input-name"
-msgid "P2 Mahjong O"
-msgstr ""
-
-#: src/emu/inpttype.ipp:189
-msgctxt "input-name"
-msgid "P2 Mahjong P"
-msgstr ""
-
-#: src/emu/inpttype.ipp:190
-msgctxt "input-name"
-msgid "P2 Mahjong Q"
-msgstr ""
-
-#: src/emu/inpttype.ipp:191
-msgctxt "input-name"
-msgid "P2 Mahjong Kan"
-msgstr ""
-
-#: src/emu/inpttype.ipp:192
-msgctxt "input-name"
-msgid "P2 Mahjong Pon"
-msgstr ""
-
-#: src/emu/inpttype.ipp:193
-msgctxt "input-name"
-msgid "P2 Mahjong Chi"
-msgstr ""
-
-#: src/emu/inpttype.ipp:194
-msgctxt "input-name"
-msgid "P2 Mahjong Reach"
-msgstr ""
-
-#: src/emu/inpttype.ipp:195
-msgctxt "input-name"
-msgid "P2 Mahjong Ron"
-msgstr ""
-
-#: src/emu/inpttype.ipp:196
-msgctxt "input-name"
-msgid "P2 Mahjong Bet"
-msgstr ""
-
-#: src/emu/inpttype.ipp:197
-msgctxt "input-name"
-msgid "P2 Mahjong Last Chance"
-msgstr ""
-
-#: src/emu/inpttype.ipp:198
-msgctxt "input-name"
-msgid "P2 Mahjong Take Score"
-msgstr ""
-
-#: src/emu/inpttype.ipp:199
-msgctxt "input-name"
-msgid "P2 Mahjong Double Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:200
-msgctxt "input-name"
-msgid "P2 Mahjong Flip Flop"
-msgstr ""
-
-#: src/emu/inpttype.ipp:201
-msgctxt "input-name"
-msgid "P2 Mahjong Big"
-msgstr ""
-
-#: src/emu/inpttype.ipp:202
-msgctxt "input-name"
-msgid "P2 Mahjong Small"
-msgstr ""
-
-#: src/emu/inpttype.ipp:207
-msgctxt "input-name"
-msgid "P2 Hanafuda A/1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:208
-msgctxt "input-name"
-msgid "P2 Hanafuda B/2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:209
-msgctxt "input-name"
-msgid "P2 Hanafuda C/3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:210
-msgctxt "input-name"
-msgid "P2 Hanafuda D/4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:211
-msgctxt "input-name"
-msgid "P2 Hanafuda E/5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:212
-msgctxt "input-name"
-msgid "P2 Hanafuda F/6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:213
-msgctxt "input-name"
-msgid "P2 Hanafuda G/7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:214
-msgctxt "input-name"
-msgid "P2 Hanafuda H/8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:215
-msgctxt "input-name"
-msgid "P2 Hanafuda Yes"
-msgstr ""
-
-#: src/emu/inpttype.ipp:216
-msgctxt "input-name"
-msgid "P2 Hanafuda No"
-msgstr ""
-
-#: src/emu/inpttype.ipp:221
-msgctxt "input-name"
-msgid "P3 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:222
-msgctxt "input-name"
-msgid "P3 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:223
-msgctxt "input-name"
-msgid "P3 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:224
-msgctxt "input-name"
-msgid "P3 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:225
-msgctxt "input-name"
-msgid "P3 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:226
-msgctxt "input-name"
-msgid "P3 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:227
-msgctxt "input-name"
-msgid "P3 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:228
-msgctxt "input-name"
-msgid "P3 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:229
-msgctxt "input-name"
-msgid "P3 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:230
-msgctxt "input-name"
-msgid "P3 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:231
-msgctxt "input-name"
-msgid "P3 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:232
-msgctxt "input-name"
-msgid "P3 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:233
-msgctxt "input-name"
-msgid "P3 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:234
-msgctxt "input-name"
-msgid "P3 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:235
-msgctxt "input-name"
-msgid "P3 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:236
-msgctxt "input-name"
-msgid "P3 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:237
-msgctxt "input-name"
-msgid "P3 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:238
-msgctxt "input-name"
-msgid "P3 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:239
-msgctxt "input-name"
-msgid "P3 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:240
-msgctxt "input-name"
-msgid "P3 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:241
-msgctxt "input-name"
-msgid "P3 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:242
-msgctxt "input-name"
-msgid "P3 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:243
-msgctxt "input-name"
-msgid "P3 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:244
-msgctxt "input-name"
-msgid "P3 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:245
-msgctxt "input-name"
-msgid "P3 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:246
-msgctxt "input-name"
-msgid "P3 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:247
-msgctxt "input-name"
-msgid "P3 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:248
-msgctxt "input-name"
-msgid "P3 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:249
-msgctxt "input-name"
-msgid "P3 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:250
-msgctxt "input-name"
-msgid "P3 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:255
-msgctxt "input-name"
-msgid "P4 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:256
-msgctxt "input-name"
-msgid "P4 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:257
-msgctxt "input-name"
-msgid "P4 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:258
-msgctxt "input-name"
-msgid "P4 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:259
-msgctxt "input-name"
-msgid "P4 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:260
-msgctxt "input-name"
-msgid "P4 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:261
-msgctxt "input-name"
-msgid "P4 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:262
-msgctxt "input-name"
-msgid "P4 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:263
-msgctxt "input-name"
-msgid "P4 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:264
-msgctxt "input-name"
-msgid "P4 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:265
-msgctxt "input-name"
-msgid "P4 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:266
-msgctxt "input-name"
-msgid "P4 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:267
-msgctxt "input-name"
-msgid "P4 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:268
-msgctxt "input-name"
-msgid "P4 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:269
-msgctxt "input-name"
-msgid "P4 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:270
-msgctxt "input-name"
-msgid "P4 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:271
-msgctxt "input-name"
-msgid "P4 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:272
-msgctxt "input-name"
-msgid "P4 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:273
-msgctxt "input-name"
-msgid "P4 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:274
-msgctxt "input-name"
-msgid "P4 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:275
-msgctxt "input-name"
-msgid "P4 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:276
-msgctxt "input-name"
-msgid "P4 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:277
-msgctxt "input-name"
-msgid "P4 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:278
-msgctxt "input-name"
-msgid "P4 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:279
-msgctxt "input-name"
-msgid "P4 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:280
-msgctxt "input-name"
-msgid "P4 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:281
-msgctxt "input-name"
-msgid "P4 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:282
-msgctxt "input-name"
-msgid "P4 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:283
-msgctxt "input-name"
-msgid "P4 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:284
-msgctxt "input-name"
-msgid "P4 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:289
-msgctxt "input-name"
-msgid "P5 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:290
-msgctxt "input-name"
-msgid "P5 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:291
-msgctxt "input-name"
-msgid "P5 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:292
-msgctxt "input-name"
-msgid "P5 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:293
-msgctxt "input-name"
-msgid "P5 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:294
-msgctxt "input-name"
-msgid "P5 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:295
-msgctxt "input-name"
-msgid "P5 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:296
-msgctxt "input-name"
-msgid "P5 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:297
-msgctxt "input-name"
-msgid "P5 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:298
-msgctxt "input-name"
-msgid "P5 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:299
-msgctxt "input-name"
-msgid "P5 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:300
-msgctxt "input-name"
-msgid "P5 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:301
-msgctxt "input-name"
-msgid "P5 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:302
-msgctxt "input-name"
-msgid "P5 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:303
-msgctxt "input-name"
-msgid "P5 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:304
-msgctxt "input-name"
-msgid "P5 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:305
-msgctxt "input-name"
-msgid "P5 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:306
-msgctxt "input-name"
-msgid "P5 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:307
-msgctxt "input-name"
-msgid "P5 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:308
-msgctxt "input-name"
-msgid "P5 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:309
-msgctxt "input-name"
-msgid "P5 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:310
-msgctxt "input-name"
-msgid "P5 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:311
-msgctxt "input-name"
-msgid "P5 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:312
-msgctxt "input-name"
-msgid "P5 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:313
-msgctxt "input-name"
-msgid "P5 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:314
-msgctxt "input-name"
-msgid "P5 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:315
-msgctxt "input-name"
-msgid "P5 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:316
-msgctxt "input-name"
-msgid "P5 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:317
-msgctxt "input-name"
-msgid "P5 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:318
-msgctxt "input-name"
-msgid "P5 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:323
-msgctxt "input-name"
-msgid "P6 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:324
-msgctxt "input-name"
-msgid "P6 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:325
-msgctxt "input-name"
-msgid "P6 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:326
-msgctxt "input-name"
-msgid "P6 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:327
-msgctxt "input-name"
-msgid "P6 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:328
-msgctxt "input-name"
-msgid "P6 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:329
-msgctxt "input-name"
-msgid "P6 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:330
-msgctxt "input-name"
-msgid "P6 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:331
-msgctxt "input-name"
-msgid "P6 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:332
-msgctxt "input-name"
-msgid "P6 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:333
-msgctxt "input-name"
-msgid "P6 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:334
-msgctxt "input-name"
-msgid "P6 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:335
-msgctxt "input-name"
-msgid "P6 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:336
-msgctxt "input-name"
-msgid "P6 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:337
-msgctxt "input-name"
-msgid "P6 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:338
-msgctxt "input-name"
-msgid "P6 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:339
-msgctxt "input-name"
-msgid "P6 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:340
-msgctxt "input-name"
-msgid "P6 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:341
-msgctxt "input-name"
-msgid "P6 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:342
-msgctxt "input-name"
-msgid "P6 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:343
-msgctxt "input-name"
-msgid "P6 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:344
-msgctxt "input-name"
-msgid "P6 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:345
-msgctxt "input-name"
-msgid "P6 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:346
-msgctxt "input-name"
-msgid "P6 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:347
-msgctxt "input-name"
-msgid "P6 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:348
-msgctxt "input-name"
-msgid "P6 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:349
-msgctxt "input-name"
-msgid "P6 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:350
-msgctxt "input-name"
-msgid "P6 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:351
-msgctxt "input-name"
-msgid "P6 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:352
-msgctxt "input-name"
-msgid "P6 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:357
-msgctxt "input-name"
-msgid "P7 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:358
-msgctxt "input-name"
-msgid "P7 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:359
-msgctxt "input-name"
-msgid "P7 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:360
-msgctxt "input-name"
-msgid "P7 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:361
-msgctxt "input-name"
-msgid "P7 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:362
-msgctxt "input-name"
-msgid "P7 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:363
-msgctxt "input-name"
-msgid "P7 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:364
-msgctxt "input-name"
-msgid "P7 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:365
-msgctxt "input-name"
-msgid "P7 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:366
-msgctxt "input-name"
-msgid "P7 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:367
-msgctxt "input-name"
-msgid "P7 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:368
-msgctxt "input-name"
-msgid "P7 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:369
-msgctxt "input-name"
-msgid "P7 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:370
-msgctxt "input-name"
-msgid "P7 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:371
-msgctxt "input-name"
-msgid "P7 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:372
-msgctxt "input-name"
-msgid "P7 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:373
-msgctxt "input-name"
-msgid "P7 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:374
-msgctxt "input-name"
-msgid "P7 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:375
-msgctxt "input-name"
-msgid "P7 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:376
-msgctxt "input-name"
-msgid "P7 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:377
-msgctxt "input-name"
-msgid "P7 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:378
-msgctxt "input-name"
-msgid "P7 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:379
-msgctxt "input-name"
-msgid "P7 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:380
-msgctxt "input-name"
-msgid "P7 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:381
-msgctxt "input-name"
-msgid "P7 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:382
-msgctxt "input-name"
-msgid "P7 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:383
-msgctxt "input-name"
-msgid "P7 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:384
-msgctxt "input-name"
-msgid "P7 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:385
-msgctxt "input-name"
-msgid "P7 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:386
-msgctxt "input-name"
-msgid "P7 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:391
-msgctxt "input-name"
-msgid "P8 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:392
-msgctxt "input-name"
-msgid "P8 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:393
-msgctxt "input-name"
-msgid "P8 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:394
-msgctxt "input-name"
-msgid "P8 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:395
-msgctxt "input-name"
-msgid "P8 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:396
-msgctxt "input-name"
-msgid "P8 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:397
-msgctxt "input-name"
-msgid "P8 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:398
-msgctxt "input-name"
-msgid "P8 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:399
-msgctxt "input-name"
-msgid "P8 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:400
-msgctxt "input-name"
-msgid "P8 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:401
-msgctxt "input-name"
-msgid "P8 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:402
-msgctxt "input-name"
-msgid "P8 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:403
-msgctxt "input-name"
-msgid "P8 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:404
-msgctxt "input-name"
-msgid "P8 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:405
-msgctxt "input-name"
-msgid "P8 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:406
-msgctxt "input-name"
-msgid "P8 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:407
-msgctxt "input-name"
-msgid "P8 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:408
-msgctxt "input-name"
-msgid "P8 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:409
-msgctxt "input-name"
-msgid "P8 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:410
-msgctxt "input-name"
-msgid "P8 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:411
-msgctxt "input-name"
-msgid "P8 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:412
-msgctxt "input-name"
-msgid "P8 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:413
-msgctxt "input-name"
-msgid "P8 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:414
-msgctxt "input-name"
-msgid "P8 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:415
-msgctxt "input-name"
-msgid "P8 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:416
-msgctxt "input-name"
-msgid "P8 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:417
-msgctxt "input-name"
-msgid "P8 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:418
-msgctxt "input-name"
-msgid "P8 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:419
-msgctxt "input-name"
-msgid "P8 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:420
-msgctxt "input-name"
-msgid "P8 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:425
-msgctxt "input-name"
-msgid "P9 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:426
-msgctxt "input-name"
-msgid "P9 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:427
-msgctxt "input-name"
-msgid "P9 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:428
-msgctxt "input-name"
-msgid "P9 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:429
-msgctxt "input-name"
-msgid "P9 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:430
-msgctxt "input-name"
-msgid "P9 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:431
-msgctxt "input-name"
-msgid "P9 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:432
-msgctxt "input-name"
-msgid "P9 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:433
-msgctxt "input-name"
-msgid "P9 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:434
-msgctxt "input-name"
-msgid "P9 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:435
-msgctxt "input-name"
-msgid "P9 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:436
-msgctxt "input-name"
-msgid "P9 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:437
-msgctxt "input-name"
-msgid "P9 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:438
-msgctxt "input-name"
-msgid "P9 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:439
-msgctxt "input-name"
-msgid "P9 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:440
-msgctxt "input-name"
-msgid "P9 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:441
-msgctxt "input-name"
-msgid "P9 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:442
-msgctxt "input-name"
-msgid "P9 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:443
-msgctxt "input-name"
-msgid "P9 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:444
-msgctxt "input-name"
-msgid "P9 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:445
-msgctxt "input-name"
-msgid "P9 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:446
-msgctxt "input-name"
-msgid "P9 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:447
-msgctxt "input-name"
-msgid "P9 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:448
-msgctxt "input-name"
-msgid "P9 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:449
-msgctxt "input-name"
-msgid "P9 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:450
-msgctxt "input-name"
-msgid "P9 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:451
-msgctxt "input-name"
-msgid "P9 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:452
-msgctxt "input-name"
-msgid "P9 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:453
-msgctxt "input-name"
-msgid "P9 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:454
-msgctxt "input-name"
-msgid "P9 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:459
-msgctxt "input-name"
-msgid "P10 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:460
-msgctxt "input-name"
-msgid "P10 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:461
-msgctxt "input-name"
-msgid "P10 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:462
-msgctxt "input-name"
-msgid "P10 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:463
-msgctxt "input-name"
-msgid "P10 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:464
-msgctxt "input-name"
-msgid "P10 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:465
-msgctxt "input-name"
-msgid "P10 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:466
-msgctxt "input-name"
-msgid "P10 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:467
-msgctxt "input-name"
-msgid "P10 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:468
-msgctxt "input-name"
-msgid "P10 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:469
-msgctxt "input-name"
-msgid "P10 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:470
-msgctxt "input-name"
-msgid "P10 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:471
-msgctxt "input-name"
-msgid "P10 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:472
-msgctxt "input-name"
-msgid "P10 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:473
-msgctxt "input-name"
-msgid "P10 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:474
-msgctxt "input-name"
-msgid "P10 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:475
-msgctxt "input-name"
-msgid "P10 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:476
-msgctxt "input-name"
-msgid "P10 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:477
-msgctxt "input-name"
-msgid "P10 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:478
-msgctxt "input-name"
-msgid "P10 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:479
-msgctxt "input-name"
-msgid "P10 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:480
-msgctxt "input-name"
-msgid "P10 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:481
-msgctxt "input-name"
-msgid "P10 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:482
-msgctxt "input-name"
-msgid "P10 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:483
-msgctxt "input-name"
-msgid "P10 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:484
-msgctxt "input-name"
-msgid "P10 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:485
-msgctxt "input-name"
-msgid "P10 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:486
-msgctxt "input-name"
-msgid "P10 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:487
-msgctxt "input-name"
-msgid "P10 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:488
-msgctxt "input-name"
-msgid "P10 Select"
-msgstr ""
-
 #: src/emu/inpttype.ipp:493
 msgctxt "input-name"
 msgid "1 Player Start"
@@ -5514,154 +4143,31 @@ msgctxt "input-name"
 msgid "Volume Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:550
-msgctxt "input-name"
-msgid "P1 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:551
-msgctxt "input-name"
-msgid "P2 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:552
-msgctxt "input-name"
-msgid "P3 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:553
-msgctxt "input-name"
-msgid "P4 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:554
-msgctxt "input-name"
-msgid "P5 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:555
-msgctxt "input-name"
-msgid "P6 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:556
-msgctxt "input-name"
-msgid "P7 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:557
-msgctxt "input-name"
-msgid "P8 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:558
-msgctxt "input-name"
-msgid "P9 Pedal 1"
-msgstr ""
-
+#: src/emu/inpttype.ipp:550 src/emu/inpttype.ipp:551 src/emu/inpttype.ipp:552
+#: src/emu/inpttype.ipp:553 src/emu/inpttype.ipp:554 src/emu/inpttype.ipp:555
+#: src/emu/inpttype.ipp:556 src/emu/inpttype.ipp:557 src/emu/inpttype.ipp:558
 #: src/emu/inpttype.ipp:559
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:564
-msgctxt "input-name"
-msgid "P1 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:565
-msgctxt "input-name"
-msgid "P2 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:566
-msgctxt "input-name"
-msgid "P3 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:567
-msgctxt "input-name"
-msgid "P4 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:568
-msgctxt "input-name"
-msgid "P5 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:569
-msgctxt "input-name"
-msgid "P6 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:570
-msgctxt "input-name"
-msgid "P7 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:571
-msgctxt "input-name"
-msgid "P8 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:572
-msgctxt "input-name"
-msgid "P9 Pedal 2"
+msgid "%p Pedal 1"
 msgstr ""
 
+#: src/emu/inpttype.ipp:564 src/emu/inpttype.ipp:565 src/emu/inpttype.ipp:566
+#: src/emu/inpttype.ipp:567 src/emu/inpttype.ipp:568 src/emu/inpttype.ipp:569
+#: src/emu/inpttype.ipp:570 src/emu/inpttype.ipp:571 src/emu/inpttype.ipp:572
 #: src/emu/inpttype.ipp:573
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:578
-msgctxt "input-name"
-msgid "P1 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:579
-msgctxt "input-name"
-msgid "P2 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:580
-msgctxt "input-name"
-msgid "P3 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:581
-msgctxt "input-name"
-msgid "P4 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:582
-msgctxt "input-name"
-msgid "P5 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:583
-msgctxt "input-name"
-msgid "P6 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:584
-msgctxt "input-name"
-msgid "P7 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:585
-msgctxt "input-name"
-msgid "P8 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:586
-msgctxt "input-name"
-msgid "P9 Pedal 3"
+msgid "%p Pedal 2"
 msgstr ""
 
+#: src/emu/inpttype.ipp:578 src/emu/inpttype.ipp:579 src/emu/inpttype.ipp:580
+#: src/emu/inpttype.ipp:581 src/emu/inpttype.ipp:582 src/emu/inpttype.ipp:583
+#: src/emu/inpttype.ipp:584 src/emu/inpttype.ipp:585 src/emu/inpttype.ipp:586
 #: src/emu/inpttype.ipp:587
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 3"
+msgid "%p Pedal 3"
 msgstr ""
 
 #: src/emu/inpttype.ipp:592
@@ -7549,6 +6055,9 @@ msgid ""
 "%s"
 msgstr ""
 
+#~ msgid "Confirm quit from machines"
+#~ msgstr "Confirma la sortida de les màquines"
+
 #~ msgid "Device Mapping"
 #~ msgstr "Mapeig de dispositius"
 
diff --git a/language/Chinese_Simplified/strings.po b/language/Chinese_Simplified/strings.po
index b836c466185..fc6d052a5f3 100644
--- a/language/Chinese_Simplified/strings.po
+++ b/language/Chinese_Simplified/strings.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-19 02:50+1100\n"
+"POT-Creation-Date: 2021-12-09 04:44+1100\n"
 "PO-Revision-Date: 2021-11-19 09:46+0800\n"
 "Last-Translator: YuiFAN\n"
 "Language-Team: MAME Language Team\n"
@@ -274,12 +274,12 @@ msgstr "%1$s %2$s ( %3$d / %4$d 软件包 )"
 msgid "Driver: \"%1$s\" software list "
 msgstr "驱动： \"%1$s\" 软件清单 "
 
-#: src/frontend/mame/ui/selsoft.cpp:711 src/frontend/mame/ui/selgame.cpp:1066
+#: src/frontend/mame/ui/selsoft.cpp:711 src/frontend/mame/ui/selgame.cpp:1076
 #, c-format
 msgid "%1$s: %2$s - Search: %3$s_"
 msgstr "%1$s： %2$s - 搜寻： %3$s_"
 
-#: src/frontend/mame/ui/selsoft.cpp:713 src/frontend/mame/ui/selgame.cpp:1068
+#: src/frontend/mame/ui/selsoft.cpp:713 src/frontend/mame/ui/selgame.cpp:1078
 #, c-format
 msgid "Search: %1$s_"
 msgstr "搜寻： %1$s_"
@@ -289,7 +289,7 @@ msgstr "搜寻： %1$s_"
 msgid "Software list/item: %1$s:%2$s"
 msgstr "软体列表/项目： %1$s:%2$s"
 
-#: src/frontend/mame/ui/optsmenu.cpp:73 src/frontend/mame/ui/sndmenu.cpp:165
+#: src/frontend/mame/ui/optsmenu.cpp:73 src/frontend/mame/ui/sndmenu.cpp:161
 msgid "Sound Options"
 msgstr "声音选项"
 
@@ -384,12 +384,12 @@ msgid "Show mouse pointer"
 msgstr "显示鼠标指标"
 
 #: src/frontend/mame/ui/submenu.cpp:39
-msgid "Confirm quit from machines"
-msgstr "确认离开机台"
+msgid "Confirm quit from emulation"
+msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:40
-msgid "Skip information screen at startup"
-msgstr "略过起始的信息画面"
+msgid "Skip system information screen"
+msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:41
 msgid "Force 4:3 aspect for snapshot display"
@@ -404,8 +404,8 @@ msgid "Skip BIOS selection menu"
 msgstr "略过 BIOS 选择菜单"
 
 #: src/frontend/mame/ui/submenu.cpp:44
-msgid "Skip software parts selection menu"
-msgstr "略过软件部分选择菜单"
+msgid "Skip software part selection menu"
+msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:45
 msgid "Info auto audit"
@@ -556,7 +556,7 @@ msgid "UI active"
 msgstr "UI 启动"
 
 #: src/frontend/mame/ui/submenu.cpp:91
-msgid "Offscreen reload"
+msgid "Off-screen reload"
 msgstr "画面外重新装填"
 
 #: src/frontend/mame/ui/submenu.cpp:92
@@ -572,8 +572,8 @@ msgid "Natural keyboard"
 msgstr "自然键盘"
 
 #: src/frontend/mame/ui/submenu.cpp:95
-msgid "Simultaneous contradictory"
-msgstr "同时发生的对立状况"
+msgid "Allow contradictory joystick inputs"
+msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:96
 msgid "Coin impulse"
@@ -596,8 +596,8 @@ msgid "Pedal Device Assignment"
 msgstr "分配踏板装置"
 
 #: src/frontend/mame/ui/submenu.cpp:106
-msgid "Adstick Device Assignment"
-msgstr "分配 Adstick 装置"
+msgid "AD Stick Device Assignment"
+msgstr "分配 AD 游戏杆装置"
 
 #: src/frontend/mame/ui/submenu.cpp:107
 msgid "Paddle Device Assignment"
@@ -683,14 +683,14 @@ msgstr "同步更新"
 msgid "Wait Vertical Sync"
 msgstr "等待垂直同步"
 
-#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:687
+#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:689
 #: src/frontend/mame/ui/videoopt.cpp:191 src/frontend/mame/ui/custui.cpp:490
 #: src/frontend/mame/ui/analogipt.cpp:471 plugins/cheatfind/init.lua:766
 #: plugins/cheatfind/init.lua:777 plugins/cheat/init.lua:668
 msgid "On"
 msgstr "开"
 
-#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:690
+#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:692
 #: src/frontend/mame/ui/videoopt.cpp:207 src/frontend/mame/ui/custui.cpp:490
 #: src/frontend/mame/ui/analogipt.cpp:471 plugins/cheatfind/init.lua:763
 #: plugins/cheatfind/init.lua:774 plugins/cheat/init.lua:671
@@ -698,11 +698,11 @@ msgstr "开"
 msgid "Off"
 msgstr "关"
 
-#: src/frontend/mame/ui/menu.cpp:693
+#: src/frontend/mame/ui/menu.cpp:695
 msgid "Auto"
 msgstr "自动"
 
-#: src/frontend/mame/ui/menu.cpp:1195
+#: src/frontend/mame/ui/menu.cpp:1197
 #: src/frontend/mame/ui/simpleselgame.cpp:278
 #: src/frontend/mame/ui/selmenu.cpp:1280
 msgid "Return to Previous Menu"
@@ -710,7 +710,7 @@ msgstr "回上一层菜单"
 
 #: src/frontend/mame/ui/filemngr.cpp:139
 #: src/frontend/mame/ui/confswitch.cpp:119
-#: src/frontend/mame/ui/inputmap.cpp:559 src/frontend/mame/ui/analogipt.cpp:360
+#: src/frontend/mame/ui/inputmap.cpp:563 src/frontend/mame/ui/analogipt.cpp:360
 #, c-format
 msgid "[root%1$s]"
 msgstr "[root%1$s]"
@@ -969,22 +969,22 @@ msgstr ""
 "CPU:\n"
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "GHz"
 msgstr "GHz"
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "MHz"
 msgstr "MHz"
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "kHz"
 msgstr "kHz"
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "Hz"
 msgstr "Hz"
 
@@ -1012,38 +1012,38 @@ msgstr "无\n"
 msgid "Vector"
 msgstr "向量"
 
-#: src/frontend/mame/ui/info.cpp:480
+#: src/frontend/mame/ui/info.cpp:483
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr "%1$s: %2$s\n"
 
-#: src/frontend/mame/ui/info.cpp:480
+#: src/frontend/mame/ui/info.cpp:483
 msgid "%2$s\n"
 msgstr "%2$s\n"
 
-#: src/frontend/mame/ui/info.cpp:497
+#: src/frontend/mame/ui/info.cpp:500
 #, c-format
 msgid "Screen '%1$s'"
 msgstr "画面 '%1$s'"
 
-#: src/frontend/mame/ui/info.cpp:499
+#: src/frontend/mame/ui/info.cpp:502
 msgid "Screen"
 msgstr "画面"
 
-#: src/frontend/mame/ui/info.cpp:570 src/frontend/mame/ui/info.cpp:581
+#: src/frontend/mame/ui/info.cpp:573 src/frontend/mame/ui/info.cpp:584
 #, c-format
 msgid "%1$s:\n"
 msgstr "%1$s:\n"
 
-#: src/frontend/mame/ui/info.cpp:662
+#: src/frontend/mame/ui/info.cpp:665
 msgid "Not supported"
 msgstr "不支援"
 
-#: src/frontend/mame/ui/info.cpp:665
+#: src/frontend/mame/ui/info.cpp:668
 msgid "Partially supported"
 msgstr "部分支援"
 
-#: src/frontend/mame/ui/info.cpp:674
+#: src/frontend/mame/ui/info.cpp:677
 msgid "[empty]"
 msgstr "[ 空 ]"
 
@@ -1116,7 +1116,7 @@ msgid "Emulated"
 msgstr "模拟"
 
 #: src/frontend/mame/ui/keyboard.cpp:59 src/frontend/mame/ui/confswitch.cpp:117
-#: src/frontend/mame/ui/inputmap.cpp:557 src/frontend/mame/ui/analogipt.cpp:358
+#: src/frontend/mame/ui/inputmap.cpp:561 src/frontend/mame/ui/analogipt.cpp:358
 #, c-format
 msgid "%1$s [root%2$s]"
 msgstr "%1$s [root%2$s]"
@@ -1476,7 +1476,7 @@ msgctxt "swlist-info"
 msgid "Software list/item"
 msgstr "软体列表/项目"
 
-#: src/frontend/mame/ui/datmenu.cpp:88 src/frontend/mame/ui/selmenu.cpp:2698
+#: src/frontend/mame/ui/datmenu.cpp:88 src/frontend/mame/ui/selmenu.cpp:2707
 msgid "Software List Info"
 msgstr "软件列表信息"
 
@@ -1597,7 +1597,7 @@ msgstr "保存机台设定"
 msgid "Configure Machine:"
 msgstr "设定机台:"
 
-#: src/frontend/mame/ui/miscmenu.cpp:858 src/frontend/mame/ui/selmenu.cpp:2638
+#: src/frontend/mame/ui/miscmenu.cpp:858 src/frontend/mame/ui/selmenu.cpp:2647
 msgid " (default)"
 msgstr " (缺省)"
 
@@ -1618,7 +1618,7 @@ msgstr ""
 "按 %1$s 退出\n"
 "按 %2$s 继续模拟"
 
-#: src/frontend/mame/ui/info_pty.cpp:30 src/frontend/mame/ui/mainmenu.cpp:155
+#: src/frontend/mame/ui/info_pty.cpp:30
 msgid "Pseudo terminals"
 msgstr "伪终端"
 
@@ -1689,52 +1689,52 @@ msgstr "玩者 %1$d 控制"
 msgid "Other Controls"
 msgstr "其他控制"
 
-#: src/frontend/mame/ui/inputmap.cpp:227
+#: src/frontend/mame/ui/inputmap.cpp:231
 msgid "This machine has no configurable inputs."
 msgstr "此机台没有可设定的输入"
 
-#: src/frontend/mame/ui/inputmap.cpp:327
+#: src/frontend/mame/ui/inputmap.cpp:331
 msgid "Pressed"
 msgstr "按住"
 
-#: src/frontend/mame/ui/inputmap.cpp:397
+#: src/frontend/mame/ui/inputmap.cpp:401
 msgid "Invalid sequence entered"
 msgstr "输入了无效序列"
 
-#: src/frontend/mame/ui/inputmap.cpp:542
+#: src/frontend/mame/ui/inputmap.cpp:546
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog"
 msgstr "%1$s 类比"
 
-#: src/frontend/mame/ui/inputmap.cpp:543
+#: src/frontend/mame/ui/inputmap.cpp:547
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog Inc"
 msgstr "%1$s 类比增加"
 
-#: src/frontend/mame/ui/inputmap.cpp:544
+#: src/frontend/mame/ui/inputmap.cpp:548
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog Dec"
 msgstr "%1$s 类比减少"
 
-#: src/frontend/mame/ui/inputmap.cpp:586
+#: src/frontend/mame/ui/inputmap.cpp:590
 #, c-format
 msgid "Press %1$s to set\n"
 msgstr "按下 %1$s 设定\n"
 
-#: src/frontend/mame/ui/inputmap.cpp:587
+#: src/frontend/mame/ui/inputmap.cpp:591
 #, c-format
 msgid "Press %1$s to append\n"
 msgstr "按下 %1$s 加入\n"
 
-#: src/frontend/mame/ui/inputmap.cpp:588
+#: src/frontend/mame/ui/inputmap.cpp:592
 #, c-format
 msgid "Press %1$s to clear\n"
 msgstr "按下 %1$s 清除\n"
 
-#: src/frontend/mame/ui/inputmap.cpp:589
+#: src/frontend/mame/ui/inputmap.cpp:593
 #, c-format
 msgid "Press %1$s to restore default\n"
 msgstr "按下 %1$s 还原缺省值\n"
@@ -1802,7 +1802,7 @@ msgstr ""
 "按任意键继续。"
 
 #: src/frontend/mame/ui/simpleselgame.cpp:273
-#: src/frontend/mame/ui/selgame.cpp:436
+#: src/frontend/mame/ui/selgame.cpp:443
 msgid "Configure Options"
 msgstr "设定选项"
 
@@ -2136,16 +2136,16 @@ msgstr "缩放 = %1$d"
 msgid "Expand to fit"
 msgstr "展开以符合"
 
-#: src/frontend/mame/ui/selgame.cpp:437
+#: src/frontend/mame/ui/selgame.cpp:444
 msgid "Configure Machine"
 msgstr "设定机台"
 
-#: src/frontend/mame/ui/selgame.cpp:1050
+#: src/frontend/mame/ui/selgame.cpp:1060
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d machines (%5$d BIOS) )"
 msgstr "%1$s %2$s ( %3$d / %4$d 机械 (%5$d BIOS) )"
 
-#: src/frontend/mame/ui/selgame.cpp:1078
+#: src/frontend/mame/ui/selgame.cpp:1088
 #, c-format
 msgid "System: %1$-.100s"
 msgstr "系统： %1$-.100s"
@@ -2167,11 +2167,9 @@ msgstr "结果将保存在 %1$s"
 #: src/frontend/mame/ui/auditmenu.cpp:98
 #, c-format
 msgid ""
-"Auditing ROMs for machine %2$u of %3$u...\n"
+"Auditing media for machine %2$u of %3$u...\n"
 "%1$s"
 msgstr ""
-"正在校验供机台 %2$u 的 %3$u ROM 档案...\n"
-"%1$s"
 
 #: src/frontend/mame/ui/auditmenu.cpp:116
 #, c-format
@@ -2188,13 +2186,13 @@ msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:136
 #, c-format
-msgid "Audit ROMs for %1$u machines marked unavailable"
-msgstr "校验标记为不可用的 %1$u 机台的 ROM 档案"
+msgid "Audit media for %1$u machines marked unavailable"
+msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:137
 #, c-format
-msgid "Audit ROMs for all %1$u machines"
-msgstr "校验所有 %1$u 机台的 ROM 档案"
+msgid "Audit media for all %1$u machines"
+msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:154
 #, c-format
@@ -2399,84 +2397,84 @@ msgctxt "color-sample"
 msgid "Clone"
 msgstr "克隆"
 
-#: src/frontend/mame/ui/custui.cpp:914
+#: src/frontend/mame/ui/custui.cpp:906
 msgid "ARGB Settings"
 msgstr "ARGB 设定"
 
-#: src/frontend/mame/ui/custui.cpp:919 src/frontend/mame/ui/custui.cpp:922
+#: src/frontend/mame/ui/custui.cpp:911 src/frontend/mame/ui/custui.cpp:914
 msgctxt "color-channel"
 msgid "Alpha"
 msgstr "透明度"
 
-#: src/frontend/mame/ui/custui.cpp:927 src/frontend/mame/ui/custui.cpp:930
+#: src/frontend/mame/ui/custui.cpp:919 src/frontend/mame/ui/custui.cpp:922
 msgctxt "color-channel"
 msgid "Red"
 msgstr "红"
 
-#: src/frontend/mame/ui/custui.cpp:935 src/frontend/mame/ui/custui.cpp:938
+#: src/frontend/mame/ui/custui.cpp:927 src/frontend/mame/ui/custui.cpp:930
 msgctxt "color-channel"
 msgid "Green"
 msgstr "绿"
 
-#: src/frontend/mame/ui/custui.cpp:943 src/frontend/mame/ui/custui.cpp:946
+#: src/frontend/mame/ui/custui.cpp:935 src/frontend/mame/ui/custui.cpp:938
 msgctxt "color-channel"
 msgid "Blue"
 msgstr "蓝"
 
-#: src/frontend/mame/ui/custui.cpp:949
+#: src/frontend/mame/ui/custui.cpp:941
 msgid "Choose from palette"
 msgstr "从色盘选择"
 
-#: src/frontend/mame/ui/custui.cpp:996
+#: src/frontend/mame/ui/custui.cpp:988
 msgid "Color preview:"
 msgstr "颜色预览："
 
-#: src/frontend/mame/ui/custui.cpp:1093
+#: src/frontend/mame/ui/custui.cpp:1085
 msgctxt "color-preset"
 msgid "White"
 msgstr "白"
 
-#: src/frontend/mame/ui/custui.cpp:1094
+#: src/frontend/mame/ui/custui.cpp:1086
 msgctxt "color-preset"
 msgid "Silver"
 msgstr "银"
 
-#: src/frontend/mame/ui/custui.cpp:1095
+#: src/frontend/mame/ui/custui.cpp:1087
 msgctxt "color-preset"
 msgid "Gray"
 msgstr "灰"
 
-#: src/frontend/mame/ui/custui.cpp:1096
+#: src/frontend/mame/ui/custui.cpp:1088
 msgctxt "color-preset"
 msgid "Black"
 msgstr "黑"
 
-#: src/frontend/mame/ui/custui.cpp:1097
+#: src/frontend/mame/ui/custui.cpp:1089
 msgctxt "color-preset"
 msgid "Red"
 msgstr "红"
 
-#: src/frontend/mame/ui/custui.cpp:1098
+#: src/frontend/mame/ui/custui.cpp:1090
 msgctxt "color-preset"
 msgid "Orange"
 msgstr "橘"
 
-#: src/frontend/mame/ui/custui.cpp:1099
+#: src/frontend/mame/ui/custui.cpp:1091
 msgctxt "color-preset"
 msgid "Yellow"
 msgstr "黄"
 
-#: src/frontend/mame/ui/custui.cpp:1100
+#: src/frontend/mame/ui/custui.cpp:1092
 msgctxt "color-preset"
 msgid "Green"
 msgstr "绿"
 
-#: src/frontend/mame/ui/custui.cpp:1101
+#: src/frontend/mame/ui/custui.cpp:1093
 msgctxt "color-preset"
 msgid "Blue"
 msgstr "蓝"
 
-#: src/frontend/mame/ui/custui.cpp:1102
+#: src/frontend/mame/ui/custui.cpp:1094
 msgctxt "color-preset"
 msgid "Violet"
 msgstr "紫"
@@ -2541,7 +2539,7 @@ msgid "Input (general)"
 msgstr "输入设定 （一般）"
 
 #: src/frontend/mame/ui/mainmenu.cpp:123
-msgid "Input (this Machine)"
+msgid "Input (this machine)"
 msgstr "输入设定 （本机器）"
 
 #: src/frontend/mame/ui/mainmenu.cpp:126
@@ -2580,6 +2578,10 @@ msgstr "文件管理器"
 msgid "Tape Control"
 msgstr "磁带控制"
 
+#: src/frontend/mame/ui/mainmenu.cpp:155
+msgid "Pseudo Terminals"
+msgstr ""
+
 #: src/frontend/mame/ui/mainmenu.cpp:158
 msgid "BIOS Selection"
 msgstr "选择 BIOS"
@@ -2618,8 +2620,8 @@ msgstr "檢視外部文件"
 
 #: src/frontend/mame/ui/mainmenu.cpp:200
 #, c-format
-msgid "About %s"
-msgstr "关于 %s"
+msgid "About %1$s"
+msgstr "关于 %1$s"
 
 #: src/frontend/mame/ui/mainmenu.cpp:212
 msgid "Select New Machine"
@@ -2778,15 +2780,15 @@ msgstr "驱动相容于： %1$s"
 msgid "%1$s %2$s"
 msgstr "%1$s %2$s"
 
-#: src/frontend/mame/ui/selmenu.cpp:2235
+#: src/frontend/mame/ui/selmenu.cpp:2244
 msgid "Images"
 msgstr "图像"
 
-#: src/frontend/mame/ui/selmenu.cpp:2236
+#: src/frontend/mame/ui/selmenu.cpp:2245
 msgid "Infos"
 msgstr "信息"
 
-#: src/frontend/mame/ui/selmenu.cpp:2551
+#: src/frontend/mame/ui/selmenu.cpp:2560
 msgid ""
 "Required ROM/disk images for the selected system are missing or incorrect. "
 "Please acquire the correct files or select a different system.\n"
@@ -2796,7 +2798,7 @@ msgstr ""
 "请取得正确的档案或选择不同的系统。\n"
 "\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2567
+#: src/frontend/mame/ui/selmenu.cpp:2576
 msgid ""
 "Required ROM/disk images for the selected software are missing or incorrect. "
 "Please acquire the correct files or select a different software item.\n"
@@ -2806,353 +2808,351 @@ msgstr ""
 "请取得正确的档案或选择不同的软体项目。\n"
 "\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2583
+#: src/frontend/mame/ui/selmenu.cpp:2592
 msgid "incorrect checksum"
 msgstr "不正确的检查码"
 
-#: src/frontend/mame/ui/selmenu.cpp:2586
+#: src/frontend/mame/ui/selmenu.cpp:2595
 msgid "incorrect length"
 msgstr "不正确的长度"
 
-#: src/frontend/mame/ui/selmenu.cpp:2589
+#: src/frontend/mame/ui/selmenu.cpp:2598
 msgid "not found"
 msgstr "未找到"
 
-#: src/frontend/mame/ui/selmenu.cpp:2600
+#: src/frontend/mame/ui/selmenu.cpp:2609
 #, c-format
 msgid "%1$s (%2$s) - %3$s\n"
 msgstr "%1$s (%2$s) - %3$s\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2602
+#: src/frontend/mame/ui/selmenu.cpp:2611
 #, c-format
 msgid "%1$s - %2$s\n"
 msgstr "%1$s - %2$s\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2606
+#: src/frontend/mame/ui/selmenu.cpp:2615
 msgid "Press any key to continue."
 msgstr "按任意键继续。"
 
-#: src/frontend/mame/ui/selmenu.cpp:2735
+#: src/frontend/mame/ui/selmenu.cpp:2744
 msgid "General Info"
 msgstr "一般信息"
 
-#: src/frontend/mame/ui/selmenu.cpp:2887
+#: src/frontend/mame/ui/selmenu.cpp:2896
 #, c-format
 msgid "Romset\t%1$s\n"
 msgstr "ROM组\t%1$s\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2888
+#: src/frontend/mame/ui/selmenu.cpp:2897
 #, c-format
 msgid "Year\t%1$s\n"
 msgstr "年代\t%1$s\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2889
+#: src/frontend/mame/ui/selmenu.cpp:2898
 #, c-format
 msgid "Manufacturer\t%1$s\n"
 msgstr "制造商\t%1$s\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2896
+#: src/frontend/mame/ui/selmenu.cpp:2905
 #, c-format
 msgid "Driver is Clone of\t%1$s\n"
 msgstr "驱动相容于\t%1$s\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2901
+#: src/frontend/mame/ui/selmenu.cpp:2910
 msgid "Driver is Parent\t\n"
 msgstr "驱动为主档\t\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2905
+#: src/frontend/mame/ui/selmenu.cpp:2914
 msgid "Analog Controls\tYes\n"
 msgstr "类比控制\t是\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2907
+#: src/frontend/mame/ui/selmenu.cpp:2916
 msgid "Keyboard Inputs\tYes\n"
 msgstr "键盘输入\t是\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2910
+#: src/frontend/mame/ui/selmenu.cpp:2919
 msgid "Overall\tNOT WORKING\n"
 msgstr "整体\t不可执行\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2912
+#: src/frontend/mame/ui/selmenu.cpp:2921
 msgid "Overall\tUnemulated Protection\n"
 msgstr "整体\t未模拟保护\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2914
+#: src/frontend/mame/ui/selmenu.cpp:2923
 msgid "Overall\tWorking\n"
 msgstr "整体\t可以执行\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2917
+#: src/frontend/mame/ui/selmenu.cpp:2926
 msgid "Graphics\tUnimplemented\n"
 msgstr "图形\t无法执行\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2919
+#: src/frontend/mame/ui/selmenu.cpp:2928
 msgid "Graphics\tWrong Colors\n"
 msgstr "图形\t色彩错误\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2921
+#: src/frontend/mame/ui/selmenu.cpp:2930
 msgid "Graphics\tImperfect Colors\n"
 msgstr "图形\t色彩不完美\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2923
+#: src/frontend/mame/ui/selmenu.cpp:2932
 msgid "Graphics\tImperfect\n"
 msgstr "图形\t不完美\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2925
+#: src/frontend/mame/ui/selmenu.cpp:2934
 msgid "Graphics\tOK\n"
 msgstr "图形\tOK\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2928
+#: src/frontend/mame/ui/selmenu.cpp:2937
 msgid "Sound\tNone\n"
 msgstr "声音\t无\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2930
+#: src/frontend/mame/ui/selmenu.cpp:2939
 msgid "Sound\tUnimplemented\n"
 msgstr "声音\t无法执行\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2932
+#: src/frontend/mame/ui/selmenu.cpp:2941
 msgid "Sound\tImperfect\n"
 msgstr "声音\t不完美\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2934
+#: src/frontend/mame/ui/selmenu.cpp:2943
 msgid "Sound\tOK\n"
 msgstr "声音\tOK\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2937
+#: src/frontend/mame/ui/selmenu.cpp:2946
 msgid "Capture\tUnimplemented\n"
 msgstr "撷取\t无法执行\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2939
+#: src/frontend/mame/ui/selmenu.cpp:2948
 msgid "Capture\tImperfect\n"
 msgstr "撷取\t不完美\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2942
+#: src/frontend/mame/ui/selmenu.cpp:2951
 msgid "Camera\tUnimplemented\n"
 msgstr "相机\t无法执行\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2944
+#: src/frontend/mame/ui/selmenu.cpp:2953
 msgid "Camera\tImperfect\n"
 msgstr "相机\t不完美\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2947
+#: src/frontend/mame/ui/selmenu.cpp:2956
 msgid "Microphone\tUnimplemented\n"
 msgstr "麦克风\t无法执行\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2949
+#: src/frontend/mame/ui/selmenu.cpp:2958
 msgid "Microphone\tImperfect\n"
 msgstr "麦克风\t不完美\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2952
+#: src/frontend/mame/ui/selmenu.cpp:2961
 msgid "Controls\tUnimplemented\n"
 msgstr "控制\t无法执行\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2954
+#: src/frontend/mame/ui/selmenu.cpp:2963
 msgid "Controls\tImperfect\n"
 msgstr "控制\t不完美\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2957
+#: src/frontend/mame/ui/selmenu.cpp:2966
 msgid "Keyboard\tUnimplemented\n"
 msgstr "键盘\t无法执行\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2959
+#: src/frontend/mame/ui/selmenu.cpp:2968
 msgid "Keyboard\tImperfect\n"
 msgstr "键盘\t不完美\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2962
+#: src/frontend/mame/ui/selmenu.cpp:2971
 msgid "Mouse\tUnimplemented\n"
 msgstr "鼠标\t无法执行\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2964
+#: src/frontend/mame/ui/selmenu.cpp:2973
 msgid "Mouse\tImperfect\n"
 msgstr "鼠标\t不完美\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2967
+#: src/frontend/mame/ui/selmenu.cpp:2976
 msgid "Media\tUnimplemented\n"
 msgstr "媒体\t无法执行\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2969
+#: src/frontend/mame/ui/selmenu.cpp:2978
 msgid "Media\tImperfect\n"
 msgstr "媒体\t不完美\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2972
+#: src/frontend/mame/ui/selmenu.cpp:2981
 msgid "Disk\tUnimplemented\n"
 msgstr "磁盘\t无法执行\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2974
+#: src/frontend/mame/ui/selmenu.cpp:2983
 msgid "Disk\tImperfect\n"
 msgstr "磁盘\t不完美\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2977
+#: src/frontend/mame/ui/selmenu.cpp:2986
 msgid "Printer\tUnimplemented\n"
 msgstr "打印机\t无法执行\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2979
+#: src/frontend/mame/ui/selmenu.cpp:2988
 msgid "Printer\tImperfect\n"
 msgstr "打印机\t不完美\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2982
+#: src/frontend/mame/ui/selmenu.cpp:2991
 msgid "Mag. Tape\tUnimplemented\n"
 msgstr "磁带\t无法执行\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2984
+#: src/frontend/mame/ui/selmenu.cpp:2993
 msgid "Mag. Tape\tImperfect\n"
 msgstr "磁带\t不完美\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2987
+#: src/frontend/mame/ui/selmenu.cpp:2996
 msgid "Punch Tape\tUnimplemented\n"
 msgstr "打孔带\t无法执行\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2989
+#: src/frontend/mame/ui/selmenu.cpp:2998
 msgid "Punch Tape\tImperfect\n"
 msgstr "打孔带\t不完美\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2992
+#: src/frontend/mame/ui/selmenu.cpp:3001
 msgid "Mag. Drum\tUnimplemented\n"
 msgstr "磁鼓\t无法执行\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2994
+#: src/frontend/mame/ui/selmenu.cpp:3003
 msgid "Mag. Drum\tImperfect\n"
 msgstr "磁鼓\t不完美\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2997
+#: src/frontend/mame/ui/selmenu.cpp:3006
 msgid "(EP)ROM\tUnimplemented\n"
 msgstr "(EP)ROM\t无法执行\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2999
+#: src/frontend/mame/ui/selmenu.cpp:3008
 msgid "(EP)ROM\tImperfect\n"
 msgstr "(EP)ROM\t不完美\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3002
+#: src/frontend/mame/ui/selmenu.cpp:3011
 msgid "Communications\tUnimplemented\n"
 msgstr "通讯\t无法执行\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3004
+#: src/frontend/mame/ui/selmenu.cpp:3013
 msgid "Communications\tImperfect\n"
 msgstr "通讯\t不完美\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3007
+#: src/frontend/mame/ui/selmenu.cpp:3016
 msgid "LAN\tUnimplemented\n"
 msgstr "区域网路\t无法执行\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3009
+#: src/frontend/mame/ui/selmenu.cpp:3018
 msgid "LAN\tImperfect\n"
 msgstr "区域网路\t不完美\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3012
+#: src/frontend/mame/ui/selmenu.cpp:3021
 msgid "WAN\tUnimplemented\n"
 msgstr "外部网路\t无法执行\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3014
+#: src/frontend/mame/ui/selmenu.cpp:3023
 msgid "WAN\tImperfect\n"
 msgstr "外部网路\t不完美\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3017
+#: src/frontend/mame/ui/selmenu.cpp:3026
 msgid "Timing\tUnimplemented\n"
 msgstr "计时\t无法执行\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3019
+#: src/frontend/mame/ui/selmenu.cpp:3028
 msgid "Timing\tImperfect\n"
 msgstr "计时\t不完美\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3021
+#: src/frontend/mame/ui/selmenu.cpp:3030
 msgid "Mechanical Machine\tYes\n"
 msgstr "机械式机台\t是\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3021
+#: src/frontend/mame/ui/selmenu.cpp:3030
 msgid "Mechanical Machine\tNo\n"
 msgstr "机械式机台\t否\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3022
+#: src/frontend/mame/ui/selmenu.cpp:3031
 msgid "Requires Artwork\tYes\n"
 msgstr "需要装饰图\t是\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3022
+#: src/frontend/mame/ui/selmenu.cpp:3031
 msgid "Requires Artwork\tNo\n"
 msgstr "需要装饰图\t否\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3023
+#: src/frontend/mame/ui/selmenu.cpp:3032
 msgid "Requires Clickable Artwork\tYes\n"
 msgstr "需要可点击的装饰图\t是\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3023
+#: src/frontend/mame/ui/selmenu.cpp:3032
 msgid "Requires Clickable Artwork\tNo\n"
 msgstr "需要可点击的装饰图\t否\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3025
+#: src/frontend/mame/ui/selmenu.cpp:3034
 msgid "Support Cocktail\tNo\n"
 msgstr "支援檯面型筐体\t否\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3026
+#: src/frontend/mame/ui/selmenu.cpp:3035
 msgid "Driver is BIOS\tYes\n"
 msgstr "驱动程序为 BIOS\t是\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3026
+#: src/frontend/mame/ui/selmenu.cpp:3035
 msgid "Driver is BIOS\tNo\n"
 msgstr "驱动程序为 BIOS\t否\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3027
+#: src/frontend/mame/ui/selmenu.cpp:3036
 msgid "Support Save\tYes\n"
 msgstr "支援即时存档\t是\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3027
+#: src/frontend/mame/ui/selmenu.cpp:3036
 msgid "Support Save\tNo\n"
 msgstr "支援即时存档\t否\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3028
+#: src/frontend/mame/ui/selmenu.cpp:3037
 msgid "Screen Orientation\tVertical\n"
 msgstr "画面方向\t垂直\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3028
+#: src/frontend/mame/ui/selmenu.cpp:3037
 msgid "Screen Orientation\tHorizontal\n"
 msgstr "画面方向\t水平\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3038
+#: src/frontend/mame/ui/selmenu.cpp:3047
 msgid "Requires CHD\tYes\n"
 msgstr "需要 CHD\t是\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3038
+#: src/frontend/mame/ui/selmenu.cpp:3047
 msgid "Requires CHD\tNo\n"
 msgstr "需要 CHD\t否\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3051
-msgid "ROM Audit Result\tOK\n"
-msgstr "ROM 校验结果\tOK\n"
+#: src/frontend/mame/ui/selmenu.cpp:3060
+msgid "Media Audit Result\tOK\n"
+msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3053
-msgid "ROM Audit Result\tBAD\n"
-msgstr "ROM 校验结果\t错误\n"
+#: src/frontend/mame/ui/selmenu.cpp:3062
+msgid "Media Audit Result\tBAD\n"
+msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3056
+#: src/frontend/mame/ui/selmenu.cpp:3065
 msgid "Samples Audit Result\tNone Needed\n"
 msgstr "采样文件校验结果\t不需要\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3058
+#: src/frontend/mame/ui/selmenu.cpp:3067
 msgid "Samples Audit Result\tOK\n"
 msgstr "样本档校验结果\tOK\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3060
+#: src/frontend/mame/ui/selmenu.cpp:3069
 msgid "Samples Audit Result\tBAD\n"
 msgstr "样本档校验结果\t错误\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3064
+#: src/frontend/mame/ui/selmenu.cpp:3073
 msgid ""
-"ROM Audit \tDisabled\n"
-"Samples Audit \tDisabled\n"
+"Media Audit\tDisabled\n"
+"Samples Audit\tDisabled\n"
 msgstr ""
-"ROM 验证 \t停用\n"
-"采样文件验证 \t停用\n"
 
-#: src/frontend/mame/ui/sndmenu.cpp:150
+#: src/frontend/mame/ui/sndmenu.cpp:146
 msgid "Sound"
 msgstr "声音"
 
-#: src/frontend/mame/ui/sndmenu.cpp:151
+#: src/frontend/mame/ui/sndmenu.cpp:147
 msgid "Compressor"
 msgstr "压缩"
 
-#: src/frontend/mame/ui/sndmenu.cpp:152
+#: src/frontend/mame/ui/sndmenu.cpp:148
 msgid "Sample Rate"
 msgstr "采样率"
 
-#: src/frontend/mame/ui/sndmenu.cpp:153
+#: src/frontend/mame/ui/sndmenu.cpp:149
 msgid "Use External Samples"
 msgstr "使用外部采样文件"
 
@@ -3203,21 +3203,21 @@ msgstr "* 视频：\n"
 msgid "  Screen '%1$s': Vector\n"
 msgstr "  画面 '%1$s'： 向量\n"
 
-#: src/frontend/mame/ui/devopt.cpp:132
+#: src/frontend/mame/ui/devopt.cpp:135
 #, c-format
 msgid "  Screen '%1$s': %2$d × %3$d (V) %4$s Hz\n"
 msgstr "  画面 '%1$s'： %2$d × %3$d (V) %4$s Hz\n"
 
-#: src/frontend/mame/ui/devopt.cpp:133
+#: src/frontend/mame/ui/devopt.cpp:136
 #, c-format
 msgid "  Screen '%1$s': %2$d × %3$d (H) %4$s Hz\n"
 msgstr "  画面 '%1$s': %2$d × %3$d (H) %4$s Hz\n"
 
-#: src/frontend/mame/ui/devopt.cpp:147
+#: src/frontend/mame/ui/devopt.cpp:150
 msgid "* Sound:\n"
 msgstr "* 声音:\n"
 
-#: src/frontend/mame/ui/devopt.cpp:211
+#: src/frontend/mame/ui/devopt.cpp:214
 #, c-format
 msgid ""
 "* BIOS settings:\n"
@@ -3226,491 +3226,661 @@ msgstr ""
 "* BIOS 设定：\n"
 "  %1$d 选项    [缺省： %2$s]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:255 src/frontend/mame/ui/devopt.cpp:271
-#: src/frontend/mame/ui/devopt.cpp:332
+#: src/frontend/mame/ui/devopt.cpp:258 src/frontend/mame/ui/devopt.cpp:274
+#: src/frontend/mame/ui/devopt.cpp:335
 #, c-format
 msgid "  %1$s    [default: %2$s]\n"
 msgstr "  %1$s    [缺省： %2$s]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:260 src/frontend/mame/ui/devopt.cpp:276
+#: src/frontend/mame/ui/devopt.cpp:263 src/frontend/mame/ui/devopt.cpp:279
 #, c-format
 msgid "  %1$s\n"
 msgstr "  %1$s\n"
 
-#: src/frontend/mame/ui/devopt.cpp:282
+#: src/frontend/mame/ui/devopt.cpp:285
 msgid "* DIP switch settings:\n"
 msgstr "* 指拨开关设定：\n"
 
-#: src/frontend/mame/ui/devopt.cpp:287
+#: src/frontend/mame/ui/devopt.cpp:290
 msgid "* Configuration settings:\n"
 msgstr "* 配置设定：\n"
 
-#: src/frontend/mame/ui/devopt.cpp:291
+#: src/frontend/mame/ui/devopt.cpp:294
 msgid "* Input device(s):\n"
 msgstr "* 输入装置：\n"
 
-#: src/frontend/mame/ui/devopt.cpp:293
+#: src/frontend/mame/ui/devopt.cpp:296
 #, c-format
 msgid "  User inputs    [%1$d inputs]\n"
 msgstr "  使用者输入    [%1$d 输入]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:295
+#: src/frontend/mame/ui/devopt.cpp:298
 #, c-format
 msgid "  Mahjong inputs    [%1$d inputs]\n"
 msgstr "  麻将输入    [%1$d 输入]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:297
+#: src/frontend/mame/ui/devopt.cpp:300
 #, c-format
 msgid "  Hanafuda inputs    [%1$d inputs]\n"
 msgstr "  花牌输入    [%1$d 输入]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:299
+#: src/frontend/mame/ui/devopt.cpp:302
 #, c-format
 msgid "  Gambling inputs    [%1$d inputs]\n"
 msgstr "  博奕输入    [%1$d 输入]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:301
+#: src/frontend/mame/ui/devopt.cpp:304
 #, c-format
 msgid "  Analog inputs    [%1$d inputs]\n"
 msgstr "  类比输入    [%1$d 输入]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:303
+#: src/frontend/mame/ui/devopt.cpp:306
 #, c-format
 msgid "  Adjuster inputs    [%1$d inputs]\n"
 msgstr "  调节器输入    [%1$d 输入]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:305
+#: src/frontend/mame/ui/devopt.cpp:308
 #, c-format
 msgid "  Keypad inputs    [%1$d inputs]\n"
 msgstr "  数字键盘输入    [%1$d 输入]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:307
+#: src/frontend/mame/ui/devopt.cpp:310
 #, c-format
 msgid "  Keyboard inputs    [%1$d inputs]\n"
 msgstr "  键盘输入    [%1$d 输入]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:312
+#: src/frontend/mame/ui/devopt.cpp:315
 msgid "* Media Options:\n"
 msgstr "* 媒体选项：\n"
 
-#: src/frontend/mame/ui/devopt.cpp:317
+#: src/frontend/mame/ui/devopt.cpp:320
 #, c-format
 msgid "  %1$s    [tag: %2$s]\n"
 msgstr "  %1$s    [标签： %2$s]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:327
+#: src/frontend/mame/ui/devopt.cpp:330
 msgid "* Slot Options:\n"
 msgstr "* 插槽选项：\n"
 
-#: src/frontend/mame/ui/devopt.cpp:341
+#: src/frontend/mame/ui/devopt.cpp:344
 msgid "[None]\n"
 msgstr "[ 无 ]\n"
 
-#: src/emu/render.cpp:1847
+#: src/emu/render.cpp:1796
 #, c-format
 msgctxt "view-name"
 msgid "Screen %1$u Standard (%2$u:%3$u)"
 msgstr "画面  %1$u 标准  (%2$u:%3$u)"
 
-#: src/emu/render.cpp:1873
+#: src/emu/render.cpp:1822
 #, c-format
 msgctxt "view-name"
 msgid "Screen %1$u Pixel Aspect (%2$u:%3$u)"
 msgstr "画面 %1$u 像素比例 (%2$u:%3$u)"
 
-#: src/emu/render.cpp:1895 src/emu/render.cpp:2030
+#: src/emu/render.cpp:1844 src/emu/render.cpp:1979
 msgctxt "view-name"
 msgid "Cocktail"
 msgstr "台面型"
 
-#: src/emu/render.cpp:2015
+#: src/emu/render.cpp:1964
 msgctxt "view-name"
 msgid "Left-to-Right"
 msgstr "左至右"
 
-#: src/emu/render.cpp:2016
+#: src/emu/render.cpp:1965
 msgctxt "view-name"
 msgid "Left-to-Right (Gapless)"
 msgstr "左至右 (无边)"
 
-#: src/emu/render.cpp:2017
+#: src/emu/render.cpp:1966
 msgctxt "view-name"
 msgid "Top-to-Bottom"
 msgstr "上到下"
 
-#: src/emu/render.cpp:2018
+#: src/emu/render.cpp:1967
 msgctxt "view-name"
 msgid "Top-to-Bottom (Gapless)"
 msgstr "上到下 (无边)"
 
-#: src/emu/render.cpp:2069
+#: src/emu/render.cpp:2018
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Left-to-Right, Top-to-Bottom"
 msgstr "%1$u×%2$u 左至右, 上到下"
 
-#: src/emu/render.cpp:2078
+#: src/emu/render.cpp:2027
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Left-to-Right, Top-to-Bottom (Gapless)"
 msgstr "%1$u×%2$u 左至右, 上到下 (无边)"
 
-#: src/emu/render.cpp:2087
+#: src/emu/render.cpp:2036
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Top-to-Bottom, Left-to-Right"
 msgstr "%1$u×%2$u 上到下, 左至右"
 
-#: src/emu/render.cpp:2096
+#: src/emu/render.cpp:2045
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Top-to-Bottom, Left-to-Right (Gapless)"
 msgstr "%1$u×%2$u 上到下, 左至右 (无边)"
 
-#: src/emu/inpttype.ipp:22
+#: src/emu/ioport.cpp:332
+#, c-format
+msgctxt "input-name"
+msgid "P%1$u"
+msgstr "P%1$u"
+
+#: src/emu/ioport.cpp:1924
+msgctxt "input-name"
+msgid "???"
+msgstr ""
+
+#: src/emu/inpttype.ipp:22 src/emu/inpttype.ipp:140 src/emu/inpttype.ipp:221
+#: src/emu/inpttype.ipp:255 src/emu/inpttype.ipp:289 src/emu/inpttype.ipp:323
+#: src/emu/inpttype.ipp:357 src/emu/inpttype.ipp:391 src/emu/inpttype.ipp:425
+#: src/emu/inpttype.ipp:459
+#, c-format
+msgctxt "input-name"
+msgid "%p Up"
+msgstr "%p 上"
+
+#: src/emu/inpttype.ipp:23 src/emu/inpttype.ipp:141 src/emu/inpttype.ipp:222
+#: src/emu/inpttype.ipp:256 src/emu/inpttype.ipp:290 src/emu/inpttype.ipp:324
+#: src/emu/inpttype.ipp:358 src/emu/inpttype.ipp:392 src/emu/inpttype.ipp:426
+#: src/emu/inpttype.ipp:460
+#, c-format
+msgctxt "input-name"
+msgid "%p Down"
+msgstr "%p 下"
+
+#: src/emu/inpttype.ipp:24 src/emu/inpttype.ipp:142 src/emu/inpttype.ipp:223
+#: src/emu/inpttype.ipp:257 src/emu/inpttype.ipp:291 src/emu/inpttype.ipp:325
+#: src/emu/inpttype.ipp:359 src/emu/inpttype.ipp:393 src/emu/inpttype.ipp:427
+#: src/emu/inpttype.ipp:461
+#, c-format
+msgctxt "input-name"
+msgid "%p Left"
+msgstr "%p 左"
+
+#: src/emu/inpttype.ipp:25 src/emu/inpttype.ipp:143 src/emu/inpttype.ipp:224
+#: src/emu/inpttype.ipp:258 src/emu/inpttype.ipp:292 src/emu/inpttype.ipp:326
+#: src/emu/inpttype.ipp:360 src/emu/inpttype.ipp:394 src/emu/inpttype.ipp:428
+#: src/emu/inpttype.ipp:462
+#, c-format
+msgctxt "input-name"
+msgid "%p Right"
+msgstr "%p 右"
+
+#: src/emu/inpttype.ipp:26 src/emu/inpttype.ipp:144 src/emu/inpttype.ipp:225
+#: src/emu/inpttype.ipp:259 src/emu/inpttype.ipp:293 src/emu/inpttype.ipp:327
+#: src/emu/inpttype.ipp:361 src/emu/inpttype.ipp:395 src/emu/inpttype.ipp:429
+#: src/emu/inpttype.ipp:463
+#, c-format
+msgctxt "input-name"
+msgid "%p Right Stick/Up"
+msgstr "%p 右摇杆/上"
+
+#: src/emu/inpttype.ipp:27 src/emu/inpttype.ipp:145 src/emu/inpttype.ipp:226
+#: src/emu/inpttype.ipp:260 src/emu/inpttype.ipp:294 src/emu/inpttype.ipp:328
+#: src/emu/inpttype.ipp:362 src/emu/inpttype.ipp:396 src/emu/inpttype.ipp:430
+#: src/emu/inpttype.ipp:464
+#, c-format
+msgctxt "input-name"
+msgid "%p Right Stick/Down"
+msgstr "%p 右摇杆/下"
+
+#: src/emu/inpttype.ipp:28 src/emu/inpttype.ipp:146 src/emu/inpttype.ipp:227
+#: src/emu/inpttype.ipp:261 src/emu/inpttype.ipp:295 src/emu/inpttype.ipp:329
+#: src/emu/inpttype.ipp:363 src/emu/inpttype.ipp:397 src/emu/inpttype.ipp:431
+#: src/emu/inpttype.ipp:465
+#, c-format
+msgctxt "input-name"
+msgid "%p Right Stick/Left"
+msgstr "%p 右摇杆/左"
+
+#: src/emu/inpttype.ipp:29 src/emu/inpttype.ipp:147 src/emu/inpttype.ipp:228
+#: src/emu/inpttype.ipp:262 src/emu/inpttype.ipp:296 src/emu/inpttype.ipp:330
+#: src/emu/inpttype.ipp:364 src/emu/inpttype.ipp:398 src/emu/inpttype.ipp:432
+#: src/emu/inpttype.ipp:466
+#, c-format
+msgctxt "input-name"
+msgid "%p Right Stick/Right"
+msgstr "%p 右摇杆/右"
+
+#: src/emu/inpttype.ipp:30 src/emu/inpttype.ipp:148 src/emu/inpttype.ipp:229
+#: src/emu/inpttype.ipp:263 src/emu/inpttype.ipp:297 src/emu/inpttype.ipp:331
+#: src/emu/inpttype.ipp:365 src/emu/inpttype.ipp:399 src/emu/inpttype.ipp:433
+#: src/emu/inpttype.ipp:467
+#, c-format
+msgctxt "input-name"
+msgid "%p Left Stick/Up"
+msgstr "%p 左摇杆/上"
+
+#: src/emu/inpttype.ipp:31 src/emu/inpttype.ipp:149 src/emu/inpttype.ipp:230
+#: src/emu/inpttype.ipp:264 src/emu/inpttype.ipp:298 src/emu/inpttype.ipp:332
+#: src/emu/inpttype.ipp:366 src/emu/inpttype.ipp:400 src/emu/inpttype.ipp:434
+#: src/emu/inpttype.ipp:468
+#, c-format
+msgctxt "input-name"
+msgid "%p Left Stick/Down"
+msgstr "%p 左摇杆/下"
+
+#: src/emu/inpttype.ipp:32 src/emu/inpttype.ipp:150 src/emu/inpttype.ipp:231
+#: src/emu/inpttype.ipp:265 src/emu/inpttype.ipp:299 src/emu/inpttype.ipp:333
+#: src/emu/inpttype.ipp:367 src/emu/inpttype.ipp:401 src/emu/inpttype.ipp:435
+#: src/emu/inpttype.ipp:469
+#, c-format
+msgctxt "input-name"
+msgid "%p Left Stick/Left"
+msgstr "%p 左摇杆/左"
+
+#: src/emu/inpttype.ipp:33 src/emu/inpttype.ipp:151 src/emu/inpttype.ipp:232
+#: src/emu/inpttype.ipp:266 src/emu/inpttype.ipp:300 src/emu/inpttype.ipp:334
+#: src/emu/inpttype.ipp:368 src/emu/inpttype.ipp:402 src/emu/inpttype.ipp:436
+#: src/emu/inpttype.ipp:470
+#, c-format
+msgctxt "input-name"
+msgid "%p Left Stick/Right"
+msgstr "%p 左摇杆/右"
+
+#: src/emu/inpttype.ipp:34 src/emu/inpttype.ipp:152 src/emu/inpttype.ipp:233
+#: src/emu/inpttype.ipp:267 src/emu/inpttype.ipp:301 src/emu/inpttype.ipp:335
+#: src/emu/inpttype.ipp:369 src/emu/inpttype.ipp:403 src/emu/inpttype.ipp:437
+#: src/emu/inpttype.ipp:471
+#, c-format
+msgctxt "input-name"
+msgid "%p Button 1"
+msgstr "%p 按钮 1"
+
+#: src/emu/inpttype.ipp:35 src/emu/inpttype.ipp:153 src/emu/inpttype.ipp:234
+#: src/emu/inpttype.ipp:268 src/emu/inpttype.ipp:302 src/emu/inpttype.ipp:336
+#: src/emu/inpttype.ipp:370 src/emu/inpttype.ipp:404 src/emu/inpttype.ipp:438
+#: src/emu/inpttype.ipp:472
+#, c-format
+msgctxt "input-name"
+msgid "%p Button 2"
+msgstr "%p 按钮 2"
+
+#: src/emu/inpttype.ipp:36 src/emu/inpttype.ipp:154 src/emu/inpttype.ipp:235
+#: src/emu/inpttype.ipp:269 src/emu/inpttype.ipp:303 src/emu/inpttype.ipp:337
+#: src/emu/inpttype.ipp:371 src/emu/inpttype.ipp:405 src/emu/inpttype.ipp:439
+#: src/emu/inpttype.ipp:473
+#, c-format
+msgctxt "input-name"
+msgid "%p Button 3"
+msgstr "%p 按钮 3"
+
+#: src/emu/inpttype.ipp:37 src/emu/inpttype.ipp:155 src/emu/inpttype.ipp:236
+#: src/emu/inpttype.ipp:270 src/emu/inpttype.ipp:304 src/emu/inpttype.ipp:338
+#: src/emu/inpttype.ipp:372 src/emu/inpttype.ipp:406 src/emu/inpttype.ipp:440
+#: src/emu/inpttype.ipp:474
+#, c-format
+msgctxt "input-name"
+msgid "%p Button 4"
+msgstr "%p 按钮 4"
+
+#: src/emu/inpttype.ipp:38 src/emu/inpttype.ipp:156 src/emu/inpttype.ipp:237
+#: src/emu/inpttype.ipp:271 src/emu/inpttype.ipp:305 src/emu/inpttype.ipp:339
+#: src/emu/inpttype.ipp:373 src/emu/inpttype.ipp:407 src/emu/inpttype.ipp:441
+#: src/emu/inpttype.ipp:475
+#, c-format
+msgctxt "input-name"
+msgid "%p Button 5"
+msgstr "%p 按钮 5"
+
+#: src/emu/inpttype.ipp:39 src/emu/inpttype.ipp:157 src/emu/inpttype.ipp:238
+#: src/emu/inpttype.ipp:272 src/emu/inpttype.ipp:306 src/emu/inpttype.ipp:340
+#: src/emu/inpttype.ipp:374 src/emu/inpttype.ipp:408 src/emu/inpttype.ipp:442
+#: src/emu/inpttype.ipp:476
+#, c-format
+msgctxt "input-name"
+msgid "%p Button 6"
+msgstr "%p 按钮 6"
+
+#: src/emu/inpttype.ipp:40 src/emu/inpttype.ipp:158 src/emu/inpttype.ipp:239
+#: src/emu/inpttype.ipp:273 src/emu/inpttype.ipp:307 src/emu/inpttype.ipp:341
+#: src/emu/inpttype.ipp:375 src/emu/inpttype.ipp:409 src/emu/inpttype.ipp:443
+#: src/emu/inpttype.ipp:477
+#, c-format
+msgctxt "input-name"
+msgid "%p Button 7"
+msgstr "%p 按钮 7"
+
+#: src/emu/inpttype.ipp:41 src/emu/inpttype.ipp:159 src/emu/inpttype.ipp:240
+#: src/emu/inpttype.ipp:274 src/emu/inpttype.ipp:308 src/emu/inpttype.ipp:342
+#: src/emu/inpttype.ipp:376 src/emu/inpttype.ipp:410 src/emu/inpttype.ipp:444
+#: src/emu/inpttype.ipp:478
+#, c-format
+msgctxt "input-name"
+msgid "%p Button 8"
+msgstr "%p 按钮 8"
+
+#: src/emu/inpttype.ipp:42 src/emu/inpttype.ipp:160 src/emu/inpttype.ipp:241
+#: src/emu/inpttype.ipp:275 src/emu/inpttype.ipp:309 src/emu/inpttype.ipp:343
+#: src/emu/inpttype.ipp:377 src/emu/inpttype.ipp:411 src/emu/inpttype.ipp:445
+#: src/emu/inpttype.ipp:479
+#, c-format
+msgctxt "input-name"
+msgid "%p Button 9"
+msgstr "%p 按钮 9"
+
+#: src/emu/inpttype.ipp:43 src/emu/inpttype.ipp:161 src/emu/inpttype.ipp:242
+#: src/emu/inpttype.ipp:276 src/emu/inpttype.ipp:310 src/emu/inpttype.ipp:344
+#: src/emu/inpttype.ipp:378 src/emu/inpttype.ipp:412 src/emu/inpttype.ipp:446
+#: src/emu/inpttype.ipp:480
+#, c-format
+msgctxt "input-name"
+msgid "%p Button 10"
+msgstr "%p 按钮 10"
+
+#: src/emu/inpttype.ipp:44 src/emu/inpttype.ipp:162 src/emu/inpttype.ipp:243
+#: src/emu/inpttype.ipp:277 src/emu/inpttype.ipp:311 src/emu/inpttype.ipp:345
+#: src/emu/inpttype.ipp:379 src/emu/inpttype.ipp:413 src/emu/inpttype.ipp:447
+#: src/emu/inpttype.ipp:481
+#, c-format
+msgctxt "input-name"
+msgid "%p Button 11"
+msgstr "%p 按钮 11"
+
+#: src/emu/inpttype.ipp:45 src/emu/inpttype.ipp:163 src/emu/inpttype.ipp:244
+#: src/emu/inpttype.ipp:278 src/emu/inpttype.ipp:312 src/emu/inpttype.ipp:346
+#: src/emu/inpttype.ipp:380 src/emu/inpttype.ipp:414 src/emu/inpttype.ipp:448
+#: src/emu/inpttype.ipp:482
+#, c-format
 msgctxt "input-name"
-msgid "P1 Up"
-msgstr "P1 上"
+msgid "%p Button 12"
+msgstr "%p 按钮 12"
 
-#: src/emu/inpttype.ipp:23
+#: src/emu/inpttype.ipp:46 src/emu/inpttype.ipp:164 src/emu/inpttype.ipp:245
+#: src/emu/inpttype.ipp:279 src/emu/inpttype.ipp:313 src/emu/inpttype.ipp:347
+#: src/emu/inpttype.ipp:381 src/emu/inpttype.ipp:415 src/emu/inpttype.ipp:449
+#: src/emu/inpttype.ipp:483
+#, c-format
 msgctxt "input-name"
-msgid "P1 Down"
-msgstr "P1 下"
+msgid "%p Button 13"
+msgstr "%p 按钮 13"
 
-#: src/emu/inpttype.ipp:24
+#: src/emu/inpttype.ipp:47 src/emu/inpttype.ipp:165 src/emu/inpttype.ipp:246
+#: src/emu/inpttype.ipp:280 src/emu/inpttype.ipp:314 src/emu/inpttype.ipp:348
+#: src/emu/inpttype.ipp:382 src/emu/inpttype.ipp:416 src/emu/inpttype.ipp:450
+#: src/emu/inpttype.ipp:484
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left"
-msgstr "P1 左"
+msgid "%p Button 14"
+msgstr "%p 按钮 14"
 
-#: src/emu/inpttype.ipp:25
+#: src/emu/inpttype.ipp:48 src/emu/inpttype.ipp:166 src/emu/inpttype.ipp:247
+#: src/emu/inpttype.ipp:281 src/emu/inpttype.ipp:315 src/emu/inpttype.ipp:349
+#: src/emu/inpttype.ipp:383 src/emu/inpttype.ipp:417 src/emu/inpttype.ipp:451
+#: src/emu/inpttype.ipp:485
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right"
-msgstr "P1 右"
+msgid "%p Button 15"
+msgstr "%p 按钮 15"
 
-#: src/emu/inpttype.ipp:26
+#: src/emu/inpttype.ipp:49 src/emu/inpttype.ipp:167 src/emu/inpttype.ipp:248
+#: src/emu/inpttype.ipp:282 src/emu/inpttype.ipp:316 src/emu/inpttype.ipp:350
+#: src/emu/inpttype.ipp:384 src/emu/inpttype.ipp:418 src/emu/inpttype.ipp:452
+#: src/emu/inpttype.ipp:486
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Up"
-msgstr "P1 右摇杆/上"
+msgid "%p Button 16"
+msgstr "%p 按钮 16"
 
-#: src/emu/inpttype.ipp:27
+#: src/emu/inpttype.ipp:50 src/emu/inpttype.ipp:168 src/emu/inpttype.ipp:249
+#: src/emu/inpttype.ipp:283 src/emu/inpttype.ipp:317 src/emu/inpttype.ipp:351
+#: src/emu/inpttype.ipp:385 src/emu/inpttype.ipp:419 src/emu/inpttype.ipp:453
+#: src/emu/inpttype.ipp:487
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Down"
-msgstr "P1 右摇杆/下"
+msgid "%p Start"
+msgstr "%p 开始"
 
-#: src/emu/inpttype.ipp:28
+#: src/emu/inpttype.ipp:51 src/emu/inpttype.ipp:169 src/emu/inpttype.ipp:250
+#: src/emu/inpttype.ipp:284 src/emu/inpttype.ipp:318 src/emu/inpttype.ipp:352
+#: src/emu/inpttype.ipp:386 src/emu/inpttype.ipp:420 src/emu/inpttype.ipp:454
+#: src/emu/inpttype.ipp:488
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Left"
-msgstr "P1 右摇杆/左"
+msgid "%p Select"
+msgstr "%p 选择"
 
-#: src/emu/inpttype.ipp:29
+#: src/emu/inpttype.ipp:56 src/emu/inpttype.ipp:174
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Right"
-msgstr "P1 右摇杆/右"
+msgid "%p Mahjong A"
+msgstr "%p 麻将 A"
 
-#: src/emu/inpttype.ipp:30
+#: src/emu/inpttype.ipp:57 src/emu/inpttype.ipp:175
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Up"
-msgstr "P1 左摇杆/上"
+msgid "%p Mahjong B"
+msgstr "%p 麻将 B"
 
-#: src/emu/inpttype.ipp:31
+#: src/emu/inpttype.ipp:58 src/emu/inpttype.ipp:176
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Down"
-msgstr "P1 左摇杆/下"
+msgid "%p Mahjong C"
+msgstr "%p 麻将 C"
 
-#: src/emu/inpttype.ipp:32
+#: src/emu/inpttype.ipp:59 src/emu/inpttype.ipp:177
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Left"
-msgstr "P1 左摇杆/左"
+msgid "%p Mahjong D"
+msgstr "%p 麻将 D"
 
-#: src/emu/inpttype.ipp:33
+#: src/emu/inpttype.ipp:60 src/emu/inpttype.ipp:178
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Right"
-msgstr "P1 左摇杆/右"
+msgid "%p Mahjong E"
+msgstr "%p 麻将 E"
 
-#: src/emu/inpttype.ipp:34
+#: src/emu/inpttype.ipp:61 src/emu/inpttype.ipp:179
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 1"
-msgstr "P1 按钮 1"
+msgid "%p Mahjong F"
+msgstr "%p 麻将 F"
 
-#: src/emu/inpttype.ipp:35
+#: src/emu/inpttype.ipp:62 src/emu/inpttype.ipp:180
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 2"
-msgstr "P1 按钮 2"
+msgid "%p Mahjong G"
+msgstr "%p 麻将 G"
 
-#: src/emu/inpttype.ipp:36
+#: src/emu/inpttype.ipp:63 src/emu/inpttype.ipp:181
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 3"
-msgstr "P1 按钮 3"
+msgid "%p Mahjong H"
+msgstr "%p 麻将 H"
 
-#: src/emu/inpttype.ipp:37
+#: src/emu/inpttype.ipp:64 src/emu/inpttype.ipp:182
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 4"
-msgstr "P1 按钮 4"
+msgid "%p Mahjong I"
+msgstr "%p 麻将 I"
 
-#: src/emu/inpttype.ipp:38
+#: src/emu/inpttype.ipp:65 src/emu/inpttype.ipp:183
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 5"
-msgstr "P1 按钮 5"
+msgid "%p Mahjong J"
+msgstr "%p 麻将 J"
 
-#: src/emu/inpttype.ipp:39
+#: src/emu/inpttype.ipp:66 src/emu/inpttype.ipp:184
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 6"
-msgstr "P1 按钮 6"
+msgid "%p Mahjong K"
+msgstr "%p 麻将 K"
 
-#: src/emu/inpttype.ipp:40
+#: src/emu/inpttype.ipp:67 src/emu/inpttype.ipp:185
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 7"
-msgstr "P1 按钮 7"
+msgid "%p Mahjong L"
+msgstr "%p 麻将 L"
 
-#: src/emu/inpttype.ipp:41
+#: src/emu/inpttype.ipp:68 src/emu/inpttype.ipp:186
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 8"
-msgstr "P1 按钮 8"
+msgid "%p Mahjong M"
+msgstr "%p 麻将 M"
 
-#: src/emu/inpttype.ipp:42
+#: src/emu/inpttype.ipp:69 src/emu/inpttype.ipp:187
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 9"
-msgstr "P1 按钮 9"
+msgid "%p Mahjong N"
+msgstr "%p 麻将 N"
 
-#: src/emu/inpttype.ipp:43
+#: src/emu/inpttype.ipp:70 src/emu/inpttype.ipp:188
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 10"
-msgstr "P1 按钮 10"
+msgid "%p Mahjong O"
+msgstr "%p 麻将 O"
 
-#: src/emu/inpttype.ipp:44
+#: src/emu/inpttype.ipp:71 src/emu/inpttype.ipp:189
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 11"
-msgstr "P1 按钮 11"
+msgid "%p Mahjong P"
+msgstr "%p 麻将 P"
 
-#: src/emu/inpttype.ipp:45
+#: src/emu/inpttype.ipp:72 src/emu/inpttype.ipp:190
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 12"
-msgstr "P1 按钮 12"
+msgid "%p Mahjong Q"
+msgstr "%p 麻将 Q"
 
-#: src/emu/inpttype.ipp:46
+#: src/emu/inpttype.ipp:73 src/emu/inpttype.ipp:191
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 13"
-msgstr "P1 按钮 13"
+msgid "%p Mahjong Kan"
+msgstr "%p 麻将 杠"
 
-#: src/emu/inpttype.ipp:47
+#: src/emu/inpttype.ipp:74 src/emu/inpttype.ipp:192
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 14"
-msgstr "P1 按钮 14"
+msgid "%p Mahjong Pon"
+msgstr "%p 麻将 碰"
 
-#: src/emu/inpttype.ipp:48
+#: src/emu/inpttype.ipp:75 src/emu/inpttype.ipp:193
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 15"
-msgstr "P1 按钮 15"
+msgid "%p Mahjong Chi"
+msgstr "%p 麻将 吃"
 
-#: src/emu/inpttype.ipp:49
+#: src/emu/inpttype.ipp:76 src/emu/inpttype.ipp:194
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 16"
-msgstr "P1 按钮 16"
+msgid "%p Mahjong Reach"
+msgstr "%p 麻将 听"
 
-#: src/emu/inpttype.ipp:50
+#: src/emu/inpttype.ipp:77 src/emu/inpttype.ipp:195
+#, c-format
 msgctxt "input-name"
-msgid "P1 Start"
-msgstr "P1 开始"
+msgid "%p Mahjong Ron"
+msgstr "%p 麻将 胡"
 
-#: src/emu/inpttype.ipp:51
+#: src/emu/inpttype.ipp:78 src/emu/inpttype.ipp:200
+#, c-format
 msgctxt "input-name"
-msgid "P1 Select"
-msgstr "P1 选择"
+msgid "%p Mahjong Flip Flop"
+msgstr "%p 麻将 交换牌"
 
-#: src/emu/inpttype.ipp:56
+#: src/emu/inpttype.ipp:79 src/emu/inpttype.ipp:196
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong A"
-msgstr "P1 麻将 A"
+msgid "%p Mahjong Bet"
+msgstr "%p 麻将 押分"
 
-#: src/emu/inpttype.ipp:57
+#: src/emu/inpttype.ipp:80 src/emu/inpttype.ipp:198
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong B"
-msgstr "P1 麻将 B"
+msgid "%p Mahjong Take Score"
+msgstr "%p 麻将 得分"
 
-#: src/emu/inpttype.ipp:58
+#: src/emu/inpttype.ipp:81 src/emu/inpttype.ipp:199
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong C"
-msgstr "P1 麻将 C"
+msgid "%p Mahjong Double Up"
+msgstr "%p 麻将 加倍"
 
-#: src/emu/inpttype.ipp:59
+#: src/emu/inpttype.ipp:82 src/emu/inpttype.ipp:201
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong D"
-msgstr "P1 麻将 D"
+msgid "%p Mahjong Big"
+msgstr "%p 麻将 大"
 
-#: src/emu/inpttype.ipp:60
+#: src/emu/inpttype.ipp:83 src/emu/inpttype.ipp:202
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong E"
-msgstr "P1 麻将 E"
+msgid "%p Mahjong Small"
+msgstr "%p 麻将 小"
 
-#: src/emu/inpttype.ipp:61
+#: src/emu/inpttype.ipp:84 src/emu/inpttype.ipp:197
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong F"
-msgstr "P1 麻将 F"
+msgid "%p Mahjong Last Chance"
+msgstr "%p 麻将 海底机会"
 
-#: src/emu/inpttype.ipp:62
+#: src/emu/inpttype.ipp:89 src/emu/inpttype.ipp:207
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong G"
-msgstr "P1 麻将 G"
+msgid "%p Hanafuda A/1"
+msgstr "%p 花牌 A/1"
 
-#: src/emu/inpttype.ipp:63
+#: src/emu/inpttype.ipp:90 src/emu/inpttype.ipp:208
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong H"
-msgstr "P1 麻将 H"
+msgid "%p Hanafuda B/2"
+msgstr "%p 花牌 B/2"
 
-#: src/emu/inpttype.ipp:64
+#: src/emu/inpttype.ipp:91 src/emu/inpttype.ipp:209
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong I"
-msgstr "P1 麻将 I"
+msgid "%p Hanafuda C/3"
+msgstr "%p 花牌 C/3"
 
-#: src/emu/inpttype.ipp:65
+#: src/emu/inpttype.ipp:92 src/emu/inpttype.ipp:210
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong J"
-msgstr "P1 麻将 J"
+msgid "%p Hanafuda D/4"
+msgstr "%p 花牌 D/4"
 
-#: src/emu/inpttype.ipp:66
+#: src/emu/inpttype.ipp:93 src/emu/inpttype.ipp:211
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong K"
-msgstr "P1 麻将 K"
+msgid "%p Hanafuda E/5"
+msgstr "%p 花牌 E/5"
 
-#: src/emu/inpttype.ipp:67
+#: src/emu/inpttype.ipp:94 src/emu/inpttype.ipp:212
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong L"
-msgstr "P1 麻将 L"
+msgid "%p Hanafuda F/6"
+msgstr "%p 花牌 F/6"
 
-#: src/emu/inpttype.ipp:68
+#: src/emu/inpttype.ipp:95 src/emu/inpttype.ipp:213
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong M"
-msgstr "P1 麻将 M"
+msgid "%p Hanafuda G/7"
+msgstr "%p 花牌 G/7"
 
-#: src/emu/inpttype.ipp:69
+#: src/emu/inpttype.ipp:96 src/emu/inpttype.ipp:214
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong N"
-msgstr "P1 麻将 N"
+msgid "%p Hanafuda H/8"
+msgstr "%p 花牌 H/8"
 
-#: src/emu/inpttype.ipp:70
+#: src/emu/inpttype.ipp:97 src/emu/inpttype.ipp:215
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong O"
-msgstr "P1 麻将 O"
+msgid "%p Hanafuda Yes"
+msgstr "%p 花牌 是"
 
-#: src/emu/inpttype.ipp:71
+#: src/emu/inpttype.ipp:98 src/emu/inpttype.ipp:216
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong P"
-msgstr "P1 麻将 P"
-
-#: src/emu/inpttype.ipp:72
-msgctxt "input-name"
-msgid "P1 Mahjong Q"
-msgstr "P1 麻将 Q"
-
-#: src/emu/inpttype.ipp:73
-msgctxt "input-name"
-msgid "P1 Mahjong Kan"
-msgstr "P1 麻将 杠"
-
-#: src/emu/inpttype.ipp:74
-msgctxt "input-name"
-msgid "P1 Mahjong Pon"
-msgstr "P1 麻将 碰"
-
-#: src/emu/inpttype.ipp:75
-msgctxt "input-name"
-msgid "P1 Mahjong Chi"
-msgstr "P1 麻将 吃"
-
-#: src/emu/inpttype.ipp:76
-msgctxt "input-name"
-msgid "P1 Mahjong Reach"
-msgstr "P1 麻将 听"
-
-#: src/emu/inpttype.ipp:77
-msgctxt "input-name"
-msgid "P1 Mahjong Ron"
-msgstr "P1 麻将 胡"
-
-#: src/emu/inpttype.ipp:78
-msgctxt "input-name"
-msgid "P1 Mahjong Flip Flop"
-msgstr "P1 麻将 交换牌"
-
-#: src/emu/inpttype.ipp:79
-msgctxt "input-name"
-msgid "P1 Mahjong Bet"
-msgstr "P1 麻将 押分"
-
-#: src/emu/inpttype.ipp:80
-msgctxt "input-name"
-msgid "P1 Mahjong Take Score"
-msgstr "P1 麻将 得分"
-
-#: src/emu/inpttype.ipp:81
-msgctxt "input-name"
-msgid "P1 Mahjong Double Up"
-msgstr "P1 麻将 加倍"
-
-#: src/emu/inpttype.ipp:82
-msgctxt "input-name"
-msgid "P1 Mahjong Big"
-msgstr "P1 麻将 大"
-
-#: src/emu/inpttype.ipp:83
-msgctxt "input-name"
-msgid "P1 Mahjong Small"
-msgstr "P1 麻将 小"
-
-#: src/emu/inpttype.ipp:84
-msgctxt "input-name"
-msgid "P1 Mahjong Last Chance"
-msgstr "P1 麻将 海底机会"
-
-#: src/emu/inpttype.ipp:89
-msgctxt "input-name"
-msgid "P1 Hanafuda A/1"
-msgstr "P1 花牌 A/1"
-
-#: src/emu/inpttype.ipp:90
-msgctxt "input-name"
-msgid "P1 Hanafuda B/2"
-msgstr "P1 花牌 B/2"
-
-#: src/emu/inpttype.ipp:91
-msgctxt "input-name"
-msgid "P1 Hanafuda C/3"
-msgstr "P1 花牌 C/3"
-
-#: src/emu/inpttype.ipp:92
-msgctxt "input-name"
-msgid "P1 Hanafuda D/4"
-msgstr "P1 花牌 D/4"
-
-#: src/emu/inpttype.ipp:93
-msgctxt "input-name"
-msgid "P1 Hanafuda E/5"
-msgstr "P1 花牌 E/5"
-
-#: src/emu/inpttype.ipp:94
-msgctxt "input-name"
-msgid "P1 Hanafuda F/6"
-msgstr "P1 花牌 F/6"
-
-#: src/emu/inpttype.ipp:95
-msgctxt "input-name"
-msgid "P1 Hanafuda G/7"
-msgstr "P1 花牌 G/7"
-
-#: src/emu/inpttype.ipp:96
-msgctxt "input-name"
-msgid "P1 Hanafuda H/8"
-msgstr "P1 花牌 H/8"
-
-#: src/emu/inpttype.ipp:97
-msgctxt "input-name"
-msgid "P1 Hanafuda Yes"
-msgstr "P1 花牌 是"
-
-#: src/emu/inpttype.ipp:98
-msgctxt "input-name"
-msgid "P1 Hanafuda No"
-msgstr "P1 花牌 否"
+msgid "%p Hanafuda No"
+msgstr "%p 花牌 否"
 
 #: src/emu/inpttype.ipp:103
 msgctxt "input-name"
@@ -3837,1551 +4007,6 @@ msgctxt "input-name"
 msgid "Stop All Reels"
 msgstr "停止所有卷轴"
 
-#: src/emu/inpttype.ipp:140
-msgctxt "input-name"
-msgid "P2 Up"
-msgstr "P2 上"
-
-#: src/emu/inpttype.ipp:141
-msgctxt "input-name"
-msgid "P2 Down"
-msgstr "P2 下"
-
-#: src/emu/inpttype.ipp:142
-msgctxt "input-name"
-msgid "P2 Left"
-msgstr "P2 左"
-
-#: src/emu/inpttype.ipp:143
-msgctxt "input-name"
-msgid "P2 Right"
-msgstr "P2 右"
-
-#: src/emu/inpttype.ipp:144
-msgctxt "input-name"
-msgid "P2 Right Stick/Up"
-msgstr "P2 右摇杆/上"
-
-#: src/emu/inpttype.ipp:145
-msgctxt "input-name"
-msgid "P2 Right Stick/Down"
-msgstr "P2 右摇杆/下"
-
-#: src/emu/inpttype.ipp:146
-msgctxt "input-name"
-msgid "P2 Right Stick/Left"
-msgstr "P2 右摇杆/左"
-
-#: src/emu/inpttype.ipp:147
-msgctxt "input-name"
-msgid "P2 Right Stick/Right"
-msgstr "P2 右摇杆/右"
-
-#: src/emu/inpttype.ipp:148
-msgctxt "input-name"
-msgid "P2 Left Stick/Up"
-msgstr "P2 左摇杆/上"
-
-#: src/emu/inpttype.ipp:149
-msgctxt "input-name"
-msgid "P2 Left Stick/Down"
-msgstr "P2 左摇杆/下"
-
-#: src/emu/inpttype.ipp:150
-msgctxt "input-name"
-msgid "P2 Left Stick/Left"
-msgstr "P2 左摇杆/左"
-
-#: src/emu/inpttype.ipp:151
-msgctxt "input-name"
-msgid "P2 Left Stick/Right"
-msgstr "P2 左摇杆/右"
-
-#: src/emu/inpttype.ipp:152
-msgctxt "input-name"
-msgid "P2 Button 1"
-msgstr "P2 按钮 1"
-
-#: src/emu/inpttype.ipp:153
-msgctxt "input-name"
-msgid "P2 Button 2"
-msgstr "P2 按钮 2"
-
-#: src/emu/inpttype.ipp:154
-msgctxt "input-name"
-msgid "P2 Button 3"
-msgstr "P2 按钮 3"
-
-#: src/emu/inpttype.ipp:155
-msgctxt "input-name"
-msgid "P2 Button 4"
-msgstr "P2 按钮 4"
-
-#: src/emu/inpttype.ipp:156
-msgctxt "input-name"
-msgid "P2 Button 5"
-msgstr "P2 按钮 5"
-
-#: src/emu/inpttype.ipp:157
-msgctxt "input-name"
-msgid "P2 Button 6"
-msgstr "P2 按钮 6"
-
-#: src/emu/inpttype.ipp:158
-msgctxt "input-name"
-msgid "P2 Button 7"
-msgstr "P2 按钮 7"
-
-#: src/emu/inpttype.ipp:159
-msgctxt "input-name"
-msgid "P2 Button 8"
-msgstr "P2 按钮 8"
-
-#: src/emu/inpttype.ipp:160
-msgctxt "input-name"
-msgid "P2 Button 9"
-msgstr "P2 按钮 9"
-
-#: src/emu/inpttype.ipp:161
-msgctxt "input-name"
-msgid "P2 Button 10"
-msgstr "P2 按钮 10"
-
-#: src/emu/inpttype.ipp:162
-msgctxt "input-name"
-msgid "P2 Button 11"
-msgstr "P2 按钮 11"
-
-#: src/emu/inpttype.ipp:163
-msgctxt "input-name"
-msgid "P2 Button 12"
-msgstr "P2 按钮 12"
-
-#: src/emu/inpttype.ipp:164
-msgctxt "input-name"
-msgid "P2 Button 13"
-msgstr "P2 按钮 13"
-
-#: src/emu/inpttype.ipp:165
-msgctxt "input-name"
-msgid "P2 Button 14"
-msgstr "P2 按钮 14"
-
-#: src/emu/inpttype.ipp:166
-msgctxt "input-name"
-msgid "P2 Button 15"
-msgstr "P2 按钮 15"
-
-#: src/emu/inpttype.ipp:167
-msgctxt "input-name"
-msgid "P2 Button 16"
-msgstr "P2 按钮 16"
-
-#: src/emu/inpttype.ipp:168
-msgctxt "input-name"
-msgid "P2 Start"
-msgstr "P2 开始"
-
-#: src/emu/inpttype.ipp:169
-msgctxt "input-name"
-msgid "P2 Select"
-msgstr "P2 选择"
-
-#: src/emu/inpttype.ipp:174
-msgctxt "input-name"
-msgid "P2 Mahjong A"
-msgstr "P2 麻将 A"
-
-#: src/emu/inpttype.ipp:175
-msgctxt "input-name"
-msgid "P2 Mahjong B"
-msgstr "P2 麻将 B"
-
-#: src/emu/inpttype.ipp:176
-msgctxt "input-name"
-msgid "P2 Mahjong C"
-msgstr "P2 麻将 C"
-
-#: src/emu/inpttype.ipp:177
-msgctxt "input-name"
-msgid "P2 Mahjong D"
-msgstr "P2 麻将 D"
-
-#: src/emu/inpttype.ipp:178
-msgctxt "input-name"
-msgid "P2 Mahjong E"
-msgstr "P2 麻将 E"
-
-#: src/emu/inpttype.ipp:179
-msgctxt "input-name"
-msgid "P2 Mahjong F"
-msgstr "P2 麻将 F"
-
-#: src/emu/inpttype.ipp:180
-msgctxt "input-name"
-msgid "P2 Mahjong G"
-msgstr "P2 麻将 G"
-
-#: src/emu/inpttype.ipp:181
-msgctxt "input-name"
-msgid "P2 Mahjong H"
-msgstr "P2 麻将 H"
-
-#: src/emu/inpttype.ipp:182
-msgctxt "input-name"
-msgid "P2 Mahjong I"
-msgstr "P2 麻将 I"
-
-#: src/emu/inpttype.ipp:183
-msgctxt "input-name"
-msgid "P2 Mahjong J"
-msgstr "P2 麻将 J"
-
-#: src/emu/inpttype.ipp:184
-msgctxt "input-name"
-msgid "P2 Mahjong K"
-msgstr "P2 麻将 K"
-
-#: src/emu/inpttype.ipp:185
-msgctxt "input-name"
-msgid "P2 Mahjong L"
-msgstr "P2 麻将 L"
-
-#: src/emu/inpttype.ipp:186
-msgctxt "input-name"
-msgid "P2 Mahjong M"
-msgstr "P2 麻将 M"
-
-#: src/emu/inpttype.ipp:187
-msgctxt "input-name"
-msgid "P2 Mahjong N"
-msgstr "P2 麻将 N"
-
-#: src/emu/inpttype.ipp:188
-msgctxt "input-name"
-msgid "P2 Mahjong O"
-msgstr "P2 麻将 O"
-
-#: src/emu/inpttype.ipp:189
-msgctxt "input-name"
-msgid "P2 Mahjong P"
-msgstr "P2 麻将 P"
-
-#: src/emu/inpttype.ipp:190
-msgctxt "input-name"
-msgid "P2 Mahjong Q"
-msgstr "P2 麻将 Q"
-
-#: src/emu/inpttype.ipp:191
-msgctxt "input-name"
-msgid "P2 Mahjong Kan"
-msgstr "P2 麻将 杠"
-
-#: src/emu/inpttype.ipp:192
-msgctxt "input-name"
-msgid "P2 Mahjong Pon"
-msgstr "P2 麻将 碰"
-
-#: src/emu/inpttype.ipp:193
-msgctxt "input-name"
-msgid "P2 Mahjong Chi"
-msgstr "P2 麻将 吃"
-
-#: src/emu/inpttype.ipp:194
-msgctxt "input-name"
-msgid "P2 Mahjong Reach"
-msgstr "P2 麻将 听"
-
-#: src/emu/inpttype.ipp:195
-msgctxt "input-name"
-msgid "P2 Mahjong Ron"
-msgstr "P2 麻将 胡"
-
-#: src/emu/inpttype.ipp:196
-msgctxt "input-name"
-msgid "P2 Mahjong Bet"
-msgstr "P2 麻将 押分"
-
-#: src/emu/inpttype.ipp:197
-msgctxt "input-name"
-msgid "P2 Mahjong Last Chance"
-msgstr "P2 麻将 海底机会"
-
-#: src/emu/inpttype.ipp:198
-msgctxt "input-name"
-msgid "P2 Mahjong Take Score"
-msgstr "P2 麻将 得分"
-
-#: src/emu/inpttype.ipp:199
-msgctxt "input-name"
-msgid "P2 Mahjong Double Up"
-msgstr "P2 麻将 加倍"
-
-#: src/emu/inpttype.ipp:200
-msgctxt "input-name"
-msgid "P2 Mahjong Flip Flop"
-msgstr "P2 麻将 交换牌"
-
-#: src/emu/inpttype.ipp:201
-msgctxt "input-name"
-msgid "P2 Mahjong Big"
-msgstr "P2 麻将 大"
-
-#: src/emu/inpttype.ipp:202
-msgctxt "input-name"
-msgid "P2 Mahjong Small"
-msgstr "P2 麻将 小"
-
-#: src/emu/inpttype.ipp:207
-msgctxt "input-name"
-msgid "P2 Hanafuda A/1"
-msgstr "P2 花牌 A/1"
-
-#: src/emu/inpttype.ipp:208
-msgctxt "input-name"
-msgid "P2 Hanafuda B/2"
-msgstr "P2 花牌 B/2"
-
-#: src/emu/inpttype.ipp:209
-msgctxt "input-name"
-msgid "P2 Hanafuda C/3"
-msgstr "P2 花牌 C/3"
-
-#: src/emu/inpttype.ipp:210
-msgctxt "input-name"
-msgid "P2 Hanafuda D/4"
-msgstr "P2 花牌 D/4"
-
-#: src/emu/inpttype.ipp:211
-msgctxt "input-name"
-msgid "P2 Hanafuda E/5"
-msgstr "P2 花牌 E/5"
-
-#: src/emu/inpttype.ipp:212
-msgctxt "input-name"
-msgid "P2 Hanafuda F/6"
-msgstr "P2 花牌 F/6"
-
-#: src/emu/inpttype.ipp:213
-msgctxt "input-name"
-msgid "P2 Hanafuda G/7"
-msgstr "P2 花牌 G/7"
-
-#: src/emu/inpttype.ipp:214
-msgctxt "input-name"
-msgid "P2 Hanafuda H/8"
-msgstr "P2 花牌 H/8"
-
-#: src/emu/inpttype.ipp:215
-msgctxt "input-name"
-msgid "P2 Hanafuda Yes"
-msgstr "P2 花牌 是"
-
-#: src/emu/inpttype.ipp:216
-msgctxt "input-name"
-msgid "P2 Hanafuda No"
-msgstr "P2 花牌 否"
-
-#: src/emu/inpttype.ipp:221
-msgctxt "input-name"
-msgid "P3 Up"
-msgstr "P3 上"
-
-#: src/emu/inpttype.ipp:222
-msgctxt "input-name"
-msgid "P3 Down"
-msgstr "P3 下"
-
-#: src/emu/inpttype.ipp:223
-msgctxt "input-name"
-msgid "P3 Left"
-msgstr "P3 左"
-
-#: src/emu/inpttype.ipp:224
-msgctxt "input-name"
-msgid "P3 Right"
-msgstr "P3 右"
-
-#: src/emu/inpttype.ipp:225
-msgctxt "input-name"
-msgid "P3 Right Stick/Up"
-msgstr "P3 右摇杆/上"
-
-#: src/emu/inpttype.ipp:226
-msgctxt "input-name"
-msgid "P3 Right Stick/Down"
-msgstr "P3 右摇杆/下"
-
-#: src/emu/inpttype.ipp:227
-msgctxt "input-name"
-msgid "P3 Right Stick/Left"
-msgstr "P3 右摇杆/左"
-
-#: src/emu/inpttype.ipp:228
-msgctxt "input-name"
-msgid "P3 Right Stick/Right"
-msgstr "P3 右摇杆/右"
-
-#: src/emu/inpttype.ipp:229
-msgctxt "input-name"
-msgid "P3 Left Stick/Up"
-msgstr "P3 左摇杆/上"
-
-#: src/emu/inpttype.ipp:230
-msgctxt "input-name"
-msgid "P3 Left Stick/Down"
-msgstr "P3 左摇杆/下"
-
-#: src/emu/inpttype.ipp:231
-msgctxt "input-name"
-msgid "P3 Left Stick/Left"
-msgstr "P3 左摇杆/左"
-
-#: src/emu/inpttype.ipp:232
-msgctxt "input-name"
-msgid "P3 Left Stick/Right"
-msgstr "P3 左摇杆/右"
-
-#: src/emu/inpttype.ipp:233
-msgctxt "input-name"
-msgid "P3 Button 1"
-msgstr "P3 按钮 1"
-
-#: src/emu/inpttype.ipp:234
-msgctxt "input-name"
-msgid "P3 Button 2"
-msgstr "P3 按钮 2"
-
-#: src/emu/inpttype.ipp:235
-msgctxt "input-name"
-msgid "P3 Button 3"
-msgstr "P3 按钮 3"
-
-#: src/emu/inpttype.ipp:236
-msgctxt "input-name"
-msgid "P3 Button 4"
-msgstr "P3 按钮 4"
-
-#: src/emu/inpttype.ipp:237
-msgctxt "input-name"
-msgid "P3 Button 5"
-msgstr "P3 按钮 5"
-
-#: src/emu/inpttype.ipp:238
-msgctxt "input-name"
-msgid "P3 Button 6"
-msgstr "P3 按钮 6"
-
-#: src/emu/inpttype.ipp:239
-msgctxt "input-name"
-msgid "P3 Button 7"
-msgstr "P3 按钮 7"
-
-#: src/emu/inpttype.ipp:240
-msgctxt "input-name"
-msgid "P3 Button 8"
-msgstr "P3 按钮 8"
-
-#: src/emu/inpttype.ipp:241
-msgctxt "input-name"
-msgid "P3 Button 9"
-msgstr "P3 按钮 9"
-
-#: src/emu/inpttype.ipp:242
-msgctxt "input-name"
-msgid "P3 Button 10"
-msgstr "P3 按钮 10"
-
-#: src/emu/inpttype.ipp:243
-msgctxt "input-name"
-msgid "P3 Button 11"
-msgstr "P3 按钮 11"
-
-#: src/emu/inpttype.ipp:244
-msgctxt "input-name"
-msgid "P3 Button 12"
-msgstr "P3 按钮 12"
-
-#: src/emu/inpttype.ipp:245
-msgctxt "input-name"
-msgid "P3 Button 13"
-msgstr "P3 按钮 13"
-
-#: src/emu/inpttype.ipp:246
-msgctxt "input-name"
-msgid "P3 Button 14"
-msgstr "P3 按钮 14"
-
-#: src/emu/inpttype.ipp:247
-msgctxt "input-name"
-msgid "P3 Button 15"
-msgstr "P3 按钮 15"
-
-#: src/emu/inpttype.ipp:248
-msgctxt "input-name"
-msgid "P3 Button 16"
-msgstr "P3 按钮 16"
-
-#: src/emu/inpttype.ipp:249
-msgctxt "input-name"
-msgid "P3 Start"
-msgstr "P3 开始"
-
-#: src/emu/inpttype.ipp:250
-msgctxt "input-name"
-msgid "P3 Select"
-msgstr "P3 选择"
-
-#: src/emu/inpttype.ipp:255
-msgctxt "input-name"
-msgid "P4 Up"
-msgstr "P4 上"
-
-#: src/emu/inpttype.ipp:256
-msgctxt "input-name"
-msgid "P4 Down"
-msgstr "P4 下"
-
-#: src/emu/inpttype.ipp:257
-msgctxt "input-name"
-msgid "P4 Left"
-msgstr "P4 左"
-
-#: src/emu/inpttype.ipp:258
-msgctxt "input-name"
-msgid "P4 Right"
-msgstr "P4 右"
-
-#: src/emu/inpttype.ipp:259
-msgctxt "input-name"
-msgid "P4 Right Stick/Up"
-msgstr "P4 右摇杆/上"
-
-#: src/emu/inpttype.ipp:260
-msgctxt "input-name"
-msgid "P4 Right Stick/Down"
-msgstr "P4 右摇杆/下"
-
-#: src/emu/inpttype.ipp:261
-msgctxt "input-name"
-msgid "P4 Right Stick/Left"
-msgstr "P4 右摇杆/左"
-
-#: src/emu/inpttype.ipp:262
-msgctxt "input-name"
-msgid "P4 Right Stick/Right"
-msgstr "P4 右摇杆/右"
-
-#: src/emu/inpttype.ipp:263
-msgctxt "input-name"
-msgid "P4 Left Stick/Up"
-msgstr "P4 左摇杆/上"
-
-#: src/emu/inpttype.ipp:264
-msgctxt "input-name"
-msgid "P4 Left Stick/Down"
-msgstr "P4 左摇杆/下"
-
-#: src/emu/inpttype.ipp:265
-msgctxt "input-name"
-msgid "P4 Left Stick/Left"
-msgstr "P4 左摇杆/左"
-
-#: src/emu/inpttype.ipp:266
-msgctxt "input-name"
-msgid "P4 Left Stick/Right"
-msgstr "P4 左摇杆/右"
-
-#: src/emu/inpttype.ipp:267
-msgctxt "input-name"
-msgid "P4 Button 1"
-msgstr "P4 按钮 1"
-
-#: src/emu/inpttype.ipp:268
-msgctxt "input-name"
-msgid "P4 Button 2"
-msgstr "P4 按钮 2"
-
-#: src/emu/inpttype.ipp:269
-msgctxt "input-name"
-msgid "P4 Button 3"
-msgstr "P4 按钮 3"
-
-#: src/emu/inpttype.ipp:270
-msgctxt "input-name"
-msgid "P4 Button 4"
-msgstr "P4 按钮 4"
-
-#: src/emu/inpttype.ipp:271
-msgctxt "input-name"
-msgid "P4 Button 5"
-msgstr "P4 按钮 5"
-
-#: src/emu/inpttype.ipp:272
-msgctxt "input-name"
-msgid "P4 Button 6"
-msgstr "P4 按钮 6"
-
-#: src/emu/inpttype.ipp:273
-msgctxt "input-name"
-msgid "P4 Button 7"
-msgstr "P4 按钮 7"
-
-#: src/emu/inpttype.ipp:274
-msgctxt "input-name"
-msgid "P4 Button 8"
-msgstr "P4 按钮 8"
-
-#: src/emu/inpttype.ipp:275
-msgctxt "input-name"
-msgid "P4 Button 9"
-msgstr "P4 按钮 9"
-
-#: src/emu/inpttype.ipp:276
-msgctxt "input-name"
-msgid "P4 Button 10"
-msgstr "P4 按钮 10"
-
-#: src/emu/inpttype.ipp:277
-msgctxt "input-name"
-msgid "P4 Button 11"
-msgstr "P4 按钮 11"
-
-#: src/emu/inpttype.ipp:278
-msgctxt "input-name"
-msgid "P4 Button 12"
-msgstr "P4 按钮 12"
-
-#: src/emu/inpttype.ipp:279
-msgctxt "input-name"
-msgid "P4 Button 13"
-msgstr "P4 按钮 13"
-
-#: src/emu/inpttype.ipp:280
-msgctxt "input-name"
-msgid "P4 Button 14"
-msgstr "P4 按钮 14"
-
-#: src/emu/inpttype.ipp:281
-msgctxt "input-name"
-msgid "P4 Button 15"
-msgstr "P4 按钮 15"
-
-#: src/emu/inpttype.ipp:282
-msgctxt "input-name"
-msgid "P4 Button 16"
-msgstr "P4 按钮 16"
-
-#: src/emu/inpttype.ipp:283
-msgctxt "input-name"
-msgid "P4 Start"
-msgstr "P4 开始"
-
-#: src/emu/inpttype.ipp:284
-msgctxt "input-name"
-msgid "P4 Select"
-msgstr "P4 选择"
-
-#: src/emu/inpttype.ipp:289
-msgctxt "input-name"
-msgid "P5 Up"
-msgstr "P5 上"
-
-#: src/emu/inpttype.ipp:290
-msgctxt "input-name"
-msgid "P5 Down"
-msgstr "P5 下"
-
-#: src/emu/inpttype.ipp:291
-msgctxt "input-name"
-msgid "P5 Left"
-msgstr "P5 左"
-
-#: src/emu/inpttype.ipp:292
-msgctxt "input-name"
-msgid "P5 Right"
-msgstr "P5 右"
-
-#: src/emu/inpttype.ipp:293
-msgctxt "input-name"
-msgid "P5 Right Stick/Up"
-msgstr "P5 右摇杆/上"
-
-#: src/emu/inpttype.ipp:294
-msgctxt "input-name"
-msgid "P5 Right Stick/Down"
-msgstr "P5 右摇杆/下"
-
-#: src/emu/inpttype.ipp:295
-msgctxt "input-name"
-msgid "P5 Right Stick/Left"
-msgstr "P5 右摇杆/左"
-
-#: src/emu/inpttype.ipp:296
-msgctxt "input-name"
-msgid "P5 Right Stick/Right"
-msgstr "P5 右摇杆/右"
-
-#: src/emu/inpttype.ipp:297
-msgctxt "input-name"
-msgid "P5 Left Stick/Up"
-msgstr "P5 左摇杆/上"
-
-#: src/emu/inpttype.ipp:298
-msgctxt "input-name"
-msgid "P5 Left Stick/Down"
-msgstr "P5 左摇杆/下"
-
-#: src/emu/inpttype.ipp:299
-msgctxt "input-name"
-msgid "P5 Left Stick/Left"
-msgstr "P5 左摇杆/左"
-
-#: src/emu/inpttype.ipp:300
-msgctxt "input-name"
-msgid "P5 Left Stick/Right"
-msgstr "P5 左摇杆/右"
-
-#: src/emu/inpttype.ipp:301
-msgctxt "input-name"
-msgid "P5 Button 1"
-msgstr "P5 按钮 1"
-
-#: src/emu/inpttype.ipp:302
-msgctxt "input-name"
-msgid "P5 Button 2"
-msgstr "P5 按钮 2"
-
-#: src/emu/inpttype.ipp:303
-msgctxt "input-name"
-msgid "P5 Button 3"
-msgstr "P5 按钮 3"
-
-#: src/emu/inpttype.ipp:304
-msgctxt "input-name"
-msgid "P5 Button 4"
-msgstr "P5 按钮 4"
-
-#: src/emu/inpttype.ipp:305
-msgctxt "input-name"
-msgid "P5 Button 5"
-msgstr "P5 按钮 5"
-
-#: src/emu/inpttype.ipp:306
-msgctxt "input-name"
-msgid "P5 Button 6"
-msgstr "P5 按钮 6"
-
-#: src/emu/inpttype.ipp:307
-msgctxt "input-name"
-msgid "P5 Button 7"
-msgstr "P5 按钮 7"
-
-#: src/emu/inpttype.ipp:308
-msgctxt "input-name"
-msgid "P5 Button 8"
-msgstr "P5 按钮 8"
-
-#: src/emu/inpttype.ipp:309
-msgctxt "input-name"
-msgid "P5 Button 9"
-msgstr "P5 按钮 9"
-
-#: src/emu/inpttype.ipp:310
-msgctxt "input-name"
-msgid "P5 Button 10"
-msgstr "P5 按钮 10"
-
-#: src/emu/inpttype.ipp:311
-msgctxt "input-name"
-msgid "P5 Button 11"
-msgstr "P5 按钮 11"
-
-#: src/emu/inpttype.ipp:312
-msgctxt "input-name"
-msgid "P5 Button 12"
-msgstr "P5 按钮 12"
-
-#: src/emu/inpttype.ipp:313
-msgctxt "input-name"
-msgid "P5 Button 13"
-msgstr "P5 按钮 13"
-
-#: src/emu/inpttype.ipp:314
-msgctxt "input-name"
-msgid "P5 Button 14"
-msgstr "P5 按钮 14"
-
-#: src/emu/inpttype.ipp:315
-msgctxt "input-name"
-msgid "P5 Button 15"
-msgstr "P5 按钮 15"
-
-#: src/emu/inpttype.ipp:316
-msgctxt "input-name"
-msgid "P5 Button 16"
-msgstr "P5 按钮 16"
-
-#: src/emu/inpttype.ipp:317
-msgctxt "input-name"
-msgid "P5 Start"
-msgstr "P5 开始"
-
-#: src/emu/inpttype.ipp:318
-msgctxt "input-name"
-msgid "P5 Select"
-msgstr "P5 选择"
-
-#: src/emu/inpttype.ipp:323
-msgctxt "input-name"
-msgid "P6 Up"
-msgstr "P6 上"
-
-#: src/emu/inpttype.ipp:324
-msgctxt "input-name"
-msgid "P6 Down"
-msgstr "P6 下"
-
-#: src/emu/inpttype.ipp:325
-msgctxt "input-name"
-msgid "P6 Left"
-msgstr "P6 左"
-
-#: src/emu/inpttype.ipp:326
-msgctxt "input-name"
-msgid "P6 Right"
-msgstr "P6 右"
-
-#: src/emu/inpttype.ipp:327
-msgctxt "input-name"
-msgid "P6 Right Stick/Up"
-msgstr "P6 右摇杆/上"
-
-#: src/emu/inpttype.ipp:328
-msgctxt "input-name"
-msgid "P6 Right Stick/Down"
-msgstr "P6 右摇杆/下"
-
-#: src/emu/inpttype.ipp:329
-msgctxt "input-name"
-msgid "P6 Right Stick/Left"
-msgstr "P6 右摇杆/左"
-
-#: src/emu/inpttype.ipp:330
-msgctxt "input-name"
-msgid "P6 Right Stick/Right"
-msgstr "P6 右摇杆/右"
-
-#: src/emu/inpttype.ipp:331
-msgctxt "input-name"
-msgid "P6 Left Stick/Up"
-msgstr "P6 左摇杆/上"
-
-#: src/emu/inpttype.ipp:332
-msgctxt "input-name"
-msgid "P6 Left Stick/Down"
-msgstr "P6 左摇杆/下"
-
-#: src/emu/inpttype.ipp:333
-msgctxt "input-name"
-msgid "P6 Left Stick/Left"
-msgstr "P6 左摇杆/左"
-
-#: src/emu/inpttype.ipp:334
-msgctxt "input-name"
-msgid "P6 Left Stick/Right"
-msgstr "P6 左摇杆/右"
-
-#: src/emu/inpttype.ipp:335
-msgctxt "input-name"
-msgid "P6 Button 1"
-msgstr "P6 按钮 1"
-
-#: src/emu/inpttype.ipp:336
-msgctxt "input-name"
-msgid "P6 Button 2"
-msgstr "P6 按钮 2"
-
-#: src/emu/inpttype.ipp:337
-msgctxt "input-name"
-msgid "P6 Button 3"
-msgstr "P6 按钮 3"
-
-#: src/emu/inpttype.ipp:338
-msgctxt "input-name"
-msgid "P6 Button 4"
-msgstr "P6 按钮 4"
-
-#: src/emu/inpttype.ipp:339
-msgctxt "input-name"
-msgid "P6 Button 5"
-msgstr "P6 按钮 5"
-
-#: src/emu/inpttype.ipp:340
-msgctxt "input-name"
-msgid "P6 Button 6"
-msgstr "P6 按钮 6"
-
-#: src/emu/inpttype.ipp:341
-msgctxt "input-name"
-msgid "P6 Button 7"
-msgstr "P6 按钮 7"
-
-#: src/emu/inpttype.ipp:342
-msgctxt "input-name"
-msgid "P6 Button 8"
-msgstr "P6 按钮 8"
-
-#: src/emu/inpttype.ipp:343
-msgctxt "input-name"
-msgid "P6 Button 9"
-msgstr "P6 按钮 9"
-
-#: src/emu/inpttype.ipp:344
-msgctxt "input-name"
-msgid "P6 Button 10"
-msgstr "P6 按钮 10"
-
-#: src/emu/inpttype.ipp:345
-msgctxt "input-name"
-msgid "P6 Button 11"
-msgstr "P6 按钮 11"
-
-#: src/emu/inpttype.ipp:346
-msgctxt "input-name"
-msgid "P6 Button 12"
-msgstr "P6 按钮 12"
-
-#: src/emu/inpttype.ipp:347
-msgctxt "input-name"
-msgid "P6 Button 13"
-msgstr "P6 按钮 13"
-
-#: src/emu/inpttype.ipp:348
-msgctxt "input-name"
-msgid "P6 Button 14"
-msgstr "P6 按钮 14"
-
-#: src/emu/inpttype.ipp:349
-msgctxt "input-name"
-msgid "P6 Button 15"
-msgstr "P6 按钮 15"
-
-#: src/emu/inpttype.ipp:350
-msgctxt "input-name"
-msgid "P6 Button 16"
-msgstr "P6 按钮 16"
-
-#: src/emu/inpttype.ipp:351
-msgctxt "input-name"
-msgid "P6 Start"
-msgstr "P6 开始"
-
-#: src/emu/inpttype.ipp:352
-msgctxt "input-name"
-msgid "P6 Select"
-msgstr "P6 选择"
-
-#: src/emu/inpttype.ipp:357
-msgctxt "input-name"
-msgid "P7 Up"
-msgstr "P7 上"
-
-#: src/emu/inpttype.ipp:358
-msgctxt "input-name"
-msgid "P7 Down"
-msgstr "P7 下"
-
-#: src/emu/inpttype.ipp:359
-msgctxt "input-name"
-msgid "P7 Left"
-msgstr "P7 左"
-
-#: src/emu/inpttype.ipp:360
-msgctxt "input-name"
-msgid "P7 Right"
-msgstr "P7 右"
-
-#: src/emu/inpttype.ipp:361
-msgctxt "input-name"
-msgid "P7 Right Stick/Up"
-msgstr "P7 右摇杆/上"
-
-#: src/emu/inpttype.ipp:362
-msgctxt "input-name"
-msgid "P7 Right Stick/Down"
-msgstr "P7 右摇杆/下"
-
-#: src/emu/inpttype.ipp:363
-msgctxt "input-name"
-msgid "P7 Right Stick/Left"
-msgstr "P7 右摇杆/左"
-
-#: src/emu/inpttype.ipp:364
-msgctxt "input-name"
-msgid "P7 Right Stick/Right"
-msgstr "P7 右摇杆/右"
-
-#: src/emu/inpttype.ipp:365
-msgctxt "input-name"
-msgid "P7 Left Stick/Up"
-msgstr "P7 左摇杆/上"
-
-#: src/emu/inpttype.ipp:366
-msgctxt "input-name"
-msgid "P7 Left Stick/Down"
-msgstr "P7 左摇杆/下"
-
-#: src/emu/inpttype.ipp:367
-msgctxt "input-name"
-msgid "P7 Left Stick/Left"
-msgstr "P7 左摇杆/左"
-
-#: src/emu/inpttype.ipp:368
-msgctxt "input-name"
-msgid "P7 Left Stick/Right"
-msgstr "P7 左摇杆/右"
-
-#: src/emu/inpttype.ipp:369
-msgctxt "input-name"
-msgid "P7 Button 1"
-msgstr "P7 按钮 1"
-
-#: src/emu/inpttype.ipp:370
-msgctxt "input-name"
-msgid "P7 Button 2"
-msgstr "P7 按钮 2"
-
-#: src/emu/inpttype.ipp:371
-msgctxt "input-name"
-msgid "P7 Button 3"
-msgstr "P7 按钮 3"
-
-#: src/emu/inpttype.ipp:372
-msgctxt "input-name"
-msgid "P7 Button 4"
-msgstr "P7 按钮 4"
-
-#: src/emu/inpttype.ipp:373
-msgctxt "input-name"
-msgid "P7 Button 5"
-msgstr "P7 按钮 5"
-
-#: src/emu/inpttype.ipp:374
-msgctxt "input-name"
-msgid "P7 Button 6"
-msgstr "P7 按钮 6"
-
-#: src/emu/inpttype.ipp:375
-msgctxt "input-name"
-msgid "P7 Button 7"
-msgstr "P7 按钮 7"
-
-#: src/emu/inpttype.ipp:376
-msgctxt "input-name"
-msgid "P7 Button 8"
-msgstr "P7 按钮 8"
-
-#: src/emu/inpttype.ipp:377
-msgctxt "input-name"
-msgid "P7 Button 9"
-msgstr "P7 按钮 9"
-
-#: src/emu/inpttype.ipp:378
-msgctxt "input-name"
-msgid "P7 Button 10"
-msgstr "P7 按钮 10"
-
-#: src/emu/inpttype.ipp:379
-msgctxt "input-name"
-msgid "P7 Button 11"
-msgstr "P7 按钮 11"
-
-#: src/emu/inpttype.ipp:380
-msgctxt "input-name"
-msgid "P7 Button 12"
-msgstr "P7 按钮 12"
-
-#: src/emu/inpttype.ipp:381
-msgctxt "input-name"
-msgid "P7 Button 13"
-msgstr "P7 按钮 13"
-
-#: src/emu/inpttype.ipp:382
-msgctxt "input-name"
-msgid "P7 Button 14"
-msgstr "P7 按钮 14"
-
-#: src/emu/inpttype.ipp:383
-msgctxt "input-name"
-msgid "P7 Button 15"
-msgstr "P7 按钮 15"
-
-#: src/emu/inpttype.ipp:384
-msgctxt "input-name"
-msgid "P7 Button 16"
-msgstr "P7 按钮 16"
-
-#: src/emu/inpttype.ipp:385
-msgctxt "input-name"
-msgid "P7 Start"
-msgstr "P7 开始"
-
-#: src/emu/inpttype.ipp:386
-msgctxt "input-name"
-msgid "P7 Select"
-msgstr "P7 选择"
-
-#: src/emu/inpttype.ipp:391
-msgctxt "input-name"
-msgid "P8 Up"
-msgstr "P8 上"
-
-#: src/emu/inpttype.ipp:392
-msgctxt "input-name"
-msgid "P8 Down"
-msgstr "P8 下"
-
-#: src/emu/inpttype.ipp:393
-msgctxt "input-name"
-msgid "P8 Left"
-msgstr "P8 左"
-
-#: src/emu/inpttype.ipp:394
-msgctxt "input-name"
-msgid "P8 Right"
-msgstr "P8 右"
-
-#: src/emu/inpttype.ipp:395
-msgctxt "input-name"
-msgid "P8 Right Stick/Up"
-msgstr "P8 右摇杆/上"
-
-#: src/emu/inpttype.ipp:396
-msgctxt "input-name"
-msgid "P8 Right Stick/Down"
-msgstr "P8 右摇杆/下"
-
-#: src/emu/inpttype.ipp:397
-msgctxt "input-name"
-msgid "P8 Right Stick/Left"
-msgstr "P8 右摇杆/左"
-
-#: src/emu/inpttype.ipp:398
-msgctxt "input-name"
-msgid "P8 Right Stick/Right"
-msgstr "P8 右摇杆/右"
-
-#: src/emu/inpttype.ipp:399
-msgctxt "input-name"
-msgid "P8 Left Stick/Up"
-msgstr "P8 左摇杆/上"
-
-#: src/emu/inpttype.ipp:400
-msgctxt "input-name"
-msgid "P8 Left Stick/Down"
-msgstr "P8 左摇杆/下"
-
-#: src/emu/inpttype.ipp:401
-msgctxt "input-name"
-msgid "P8 Left Stick/Left"
-msgstr "P8 左摇杆/左"
-
-#: src/emu/inpttype.ipp:402
-msgctxt "input-name"
-msgid "P8 Left Stick/Right"
-msgstr "P8 左摇杆/右"
-
-#: src/emu/inpttype.ipp:403
-msgctxt "input-name"
-msgid "P8 Button 1"
-msgstr "P8 按钮 1"
-
-#: src/emu/inpttype.ipp:404
-msgctxt "input-name"
-msgid "P8 Button 2"
-msgstr "P8 按钮 2"
-
-#: src/emu/inpttype.ipp:405
-msgctxt "input-name"
-msgid "P8 Button 3"
-msgstr "P8 按钮 3"
-
-#: src/emu/inpttype.ipp:406
-msgctxt "input-name"
-msgid "P8 Button 4"
-msgstr "P8 按钮 4"
-
-#: src/emu/inpttype.ipp:407
-msgctxt "input-name"
-msgid "P8 Button 5"
-msgstr "P8 按钮 5"
-
-#: src/emu/inpttype.ipp:408
-msgctxt "input-name"
-msgid "P8 Button 6"
-msgstr "P8 按钮 6"
-
-#: src/emu/inpttype.ipp:409
-msgctxt "input-name"
-msgid "P8 Button 7"
-msgstr "P8 按钮 7"
-
-#: src/emu/inpttype.ipp:410
-msgctxt "input-name"
-msgid "P8 Button 8"
-msgstr "P8 按钮 8"
-
-#: src/emu/inpttype.ipp:411
-msgctxt "input-name"
-msgid "P8 Button 9"
-msgstr "P8 按钮 9"
-
-#: src/emu/inpttype.ipp:412
-msgctxt "input-name"
-msgid "P8 Button 10"
-msgstr "P8 按钮 10"
-
-#: src/emu/inpttype.ipp:413
-msgctxt "input-name"
-msgid "P8 Button 11"
-msgstr "P8 按钮 11"
-
-#: src/emu/inpttype.ipp:414
-msgctxt "input-name"
-msgid "P8 Button 12"
-msgstr "P8 按钮 12"
-
-#: src/emu/inpttype.ipp:415
-msgctxt "input-name"
-msgid "P8 Button 13"
-msgstr "P8 按钮 13"
-
-#: src/emu/inpttype.ipp:416
-msgctxt "input-name"
-msgid "P8 Button 14"
-msgstr "P8 按钮 14"
-
-#: src/emu/inpttype.ipp:417
-msgctxt "input-name"
-msgid "P8 Button 15"
-msgstr "P8 按钮 15"
-
-#: src/emu/inpttype.ipp:418
-msgctxt "input-name"
-msgid "P8 Button 16"
-msgstr "P8 按钮 16"
-
-#: src/emu/inpttype.ipp:419
-msgctxt "input-name"
-msgid "P8 Start"
-msgstr "P8 开始"
-
-#: src/emu/inpttype.ipp:420
-msgctxt "input-name"
-msgid "P8 Select"
-msgstr "P8 选择"
-
-#: src/emu/inpttype.ipp:425
-msgctxt "input-name"
-msgid "P9 Up"
-msgstr "P9 上"
-
-#: src/emu/inpttype.ipp:426
-msgctxt "input-name"
-msgid "P9 Down"
-msgstr "P9 下"
-
-#: src/emu/inpttype.ipp:427
-msgctxt "input-name"
-msgid "P9 Left"
-msgstr "P9 左"
-
-#: src/emu/inpttype.ipp:428
-msgctxt "input-name"
-msgid "P9 Right"
-msgstr "P9 右"
-
-#: src/emu/inpttype.ipp:429
-msgctxt "input-name"
-msgid "P9 Right Stick/Up"
-msgstr "P9 右摇杆/上"
-
-#: src/emu/inpttype.ipp:430
-msgctxt "input-name"
-msgid "P9 Right Stick/Down"
-msgstr "P9 右摇杆/下"
-
-#: src/emu/inpttype.ipp:431
-msgctxt "input-name"
-msgid "P9 Right Stick/Left"
-msgstr "P9 右摇杆/左"
-
-#: src/emu/inpttype.ipp:432
-msgctxt "input-name"
-msgid "P9 Right Stick/Right"
-msgstr "P9 右摇杆/右"
-
-#: src/emu/inpttype.ipp:433
-msgctxt "input-name"
-msgid "P9 Left Stick/Up"
-msgstr "P9 左摇杆/上"
-
-#: src/emu/inpttype.ipp:434
-msgctxt "input-name"
-msgid "P9 Left Stick/Down"
-msgstr "P9 左摇杆/下"
-
-#: src/emu/inpttype.ipp:435
-msgctxt "input-name"
-msgid "P9 Left Stick/Left"
-msgstr "P9 左摇杆/左"
-
-#: src/emu/inpttype.ipp:436
-msgctxt "input-name"
-msgid "P9 Left Stick/Right"
-msgstr "P9 左摇杆/右"
-
-#: src/emu/inpttype.ipp:437
-msgctxt "input-name"
-msgid "P9 Button 1"
-msgstr "P9 按钮 1"
-
-#: src/emu/inpttype.ipp:438
-msgctxt "input-name"
-msgid "P9 Button 2"
-msgstr "P9 按钮 2"
-
-#: src/emu/inpttype.ipp:439
-msgctxt "input-name"
-msgid "P9 Button 3"
-msgstr "P9 按钮 3"
-
-#: src/emu/inpttype.ipp:440
-msgctxt "input-name"
-msgid "P9 Button 4"
-msgstr "P9 按钮 4"
-
-#: src/emu/inpttype.ipp:441
-msgctxt "input-name"
-msgid "P9 Button 5"
-msgstr "P9 按钮 5"
-
-#: src/emu/inpttype.ipp:442
-msgctxt "input-name"
-msgid "P9 Button 6"
-msgstr "P9 按钮 6"
-
-#: src/emu/inpttype.ipp:443
-msgctxt "input-name"
-msgid "P9 Button 7"
-msgstr "P9 按钮 7"
-
-#: src/emu/inpttype.ipp:444
-msgctxt "input-name"
-msgid "P9 Button 8"
-msgstr "P9 按钮 8"
-
-#: src/emu/inpttype.ipp:445
-msgctxt "input-name"
-msgid "P9 Button 9"
-msgstr "P9 按钮 9"
-
-#: src/emu/inpttype.ipp:446
-msgctxt "input-name"
-msgid "P9 Button 10"
-msgstr "P9 按钮 10"
-
-#: src/emu/inpttype.ipp:447
-msgctxt "input-name"
-msgid "P9 Button 11"
-msgstr "P9 按钮 11"
-
-#: src/emu/inpttype.ipp:448
-msgctxt "input-name"
-msgid "P9 Button 12"
-msgstr "P9 按钮 12"
-
-#: src/emu/inpttype.ipp:449
-msgctxt "input-name"
-msgid "P9 Button 13"
-msgstr "P9 按钮 13"
-
-#: src/emu/inpttype.ipp:450
-msgctxt "input-name"
-msgid "P9 Button 14"
-msgstr "P9 按钮 14"
-
-#: src/emu/inpttype.ipp:451
-msgctxt "input-name"
-msgid "P9 Button 15"
-msgstr "P9 按钮 15"
-
-#: src/emu/inpttype.ipp:452
-msgctxt "input-name"
-msgid "P9 Button 16"
-msgstr "P9 按钮 16"
-
-#: src/emu/inpttype.ipp:453
-msgctxt "input-name"
-msgid "P9 Start"
-msgstr "P9 开始"
-
-#: src/emu/inpttype.ipp:454
-msgctxt "input-name"
-msgid "P9 Select"
-msgstr "P9 选择"
-
-#: src/emu/inpttype.ipp:459
-msgctxt "input-name"
-msgid "P10 Up"
-msgstr "P10 上"
-
-#: src/emu/inpttype.ipp:460
-msgctxt "input-name"
-msgid "P10 Down"
-msgstr "P10 下"
-
-#: src/emu/inpttype.ipp:461
-msgctxt "input-name"
-msgid "P10 Left"
-msgstr "P10 左"
-
-#: src/emu/inpttype.ipp:462
-msgctxt "input-name"
-msgid "P10 Right"
-msgstr "P10 右"
-
-#: src/emu/inpttype.ipp:463
-msgctxt "input-name"
-msgid "P10 Right Stick/Up"
-msgstr "P10 右摇杆/上"
-
-#: src/emu/inpttype.ipp:464
-msgctxt "input-name"
-msgid "P10 Right Stick/Down"
-msgstr "P10 右摇杆/下"
-
-#: src/emu/inpttype.ipp:465
-msgctxt "input-name"
-msgid "P10 Right Stick/Left"
-msgstr "P10 右摇杆/左"
-
-#: src/emu/inpttype.ipp:466
-msgctxt "input-name"
-msgid "P10 Right Stick/Right"
-msgstr "P10 右摇杆/右"
-
-#: src/emu/inpttype.ipp:467
-msgctxt "input-name"
-msgid "P10 Left Stick/Up"
-msgstr "P10 左摇杆/上"
-
-#: src/emu/inpttype.ipp:468
-msgctxt "input-name"
-msgid "P10 Left Stick/Down"
-msgstr "P10 左摇杆/下"
-
-#: src/emu/inpttype.ipp:469
-msgctxt "input-name"
-msgid "P10 Left Stick/Left"
-msgstr "P10 左摇杆/左"
-
-#: src/emu/inpttype.ipp:470
-msgctxt "input-name"
-msgid "P10 Left Stick/Right"
-msgstr "P10 左摇杆/右"
-
-#: src/emu/inpttype.ipp:471
-msgctxt "input-name"
-msgid "P10 Button 1"
-msgstr "P10 按钮 1"
-
-#: src/emu/inpttype.ipp:472
-msgctxt "input-name"
-msgid "P10 Button 2"
-msgstr "P10 按钮 2"
-
-#: src/emu/inpttype.ipp:473
-msgctxt "input-name"
-msgid "P10 Button 3"
-msgstr "P10 按钮 3"
-
-#: src/emu/inpttype.ipp:474
-msgctxt "input-name"
-msgid "P10 Button 4"
-msgstr "P10 按钮 4"
-
-#: src/emu/inpttype.ipp:475
-msgctxt "input-name"
-msgid "P10 Button 5"
-msgstr "P10 按钮 5"
-
-#: src/emu/inpttype.ipp:476
-msgctxt "input-name"
-msgid "P10 Button 6"
-msgstr "P10 按钮 6"
-
-#: src/emu/inpttype.ipp:477
-msgctxt "input-name"
-msgid "P10 Button 7"
-msgstr "P10 按钮 7"
-
-#: src/emu/inpttype.ipp:478
-msgctxt "input-name"
-msgid "P10 Button 8"
-msgstr "P10 按钮 8"
-
-#: src/emu/inpttype.ipp:479
-msgctxt "input-name"
-msgid "P10 Button 9"
-msgstr "P10 按钮 9"
-
-#: src/emu/inpttype.ipp:480
-msgctxt "input-name"
-msgid "P10 Button 10"
-msgstr "P10 按钮 10"
-
-#: src/emu/inpttype.ipp:481
-msgctxt "input-name"
-msgid "P10 Button 11"
-msgstr "P10 按钮 11"
-
-#: src/emu/inpttype.ipp:482
-msgctxt "input-name"
-msgid "P10 Button 12"
-msgstr "P10 按钮 12"
-
-#: src/emu/inpttype.ipp:483
-msgctxt "input-name"
-msgid "P10 Button 13"
-msgstr "P10 按钮 13"
-
-#: src/emu/inpttype.ipp:484
-msgctxt "input-name"
-msgid "P10 Button 14"
-msgstr "P10 按钮 14"
-
-#: src/emu/inpttype.ipp:485
-msgctxt "input-name"
-msgid "P10 Button 15"
-msgstr "P10 按钮 15"
-
-#: src/emu/inpttype.ipp:486
-msgctxt "input-name"
-msgid "P10 Button 16"
-msgstr "P10 按钮 16"
-
-#: src/emu/inpttype.ipp:487
-msgctxt "input-name"
-msgid "P10 Start"
-msgstr "P10 开始"
-
-#: src/emu/inpttype.ipp:488
-msgctxt "input-name"
-msgid "P10 Select"
-msgstr "P10 选择"
-
 #: src/emu/inpttype.ipp:493
 msgctxt "input-name"
 msgid "1 Player Start"
@@ -5562,155 +4187,32 @@ msgctxt "input-name"
 msgid "Volume Up"
 msgstr "音量提升"
 
-#: src/emu/inpttype.ipp:550
-msgctxt "input-name"
-msgid "P1 Pedal 1"
-msgstr "P1 踏板 1"
-
-#: src/emu/inpttype.ipp:551
-msgctxt "input-name"
-msgid "P2 Pedal 1"
-msgstr "P2 踏板 1"
-
-#: src/emu/inpttype.ipp:552
-msgctxt "input-name"
-msgid "P3 Pedal 1"
-msgstr "P3 踏板 1"
-
-#: src/emu/inpttype.ipp:553
-msgctxt "input-name"
-msgid "P4 Pedal 1"
-msgstr "P4 踏板 1"
-
-#: src/emu/inpttype.ipp:554
-msgctxt "input-name"
-msgid "P5 Pedal 1"
-msgstr "P5 踏板 1"
-
-#: src/emu/inpttype.ipp:555
-msgctxt "input-name"
-msgid "P6 Pedal 1"
-msgstr "P6 踏板 1"
-
-#: src/emu/inpttype.ipp:556
-msgctxt "input-name"
-msgid "P7 Pedal 1"
-msgstr "P7 踏板 1"
-
-#: src/emu/inpttype.ipp:557
-msgctxt "input-name"
-msgid "P8 Pedal 1"
-msgstr "P8 踏板 1"
-
-#: src/emu/inpttype.ipp:558
-msgctxt "input-name"
-msgid "P9 Pedal 1"
-msgstr "P9 踏板 1"
-
+#: src/emu/inpttype.ipp:550 src/emu/inpttype.ipp:551 src/emu/inpttype.ipp:552
+#: src/emu/inpttype.ipp:553 src/emu/inpttype.ipp:554 src/emu/inpttype.ipp:555
+#: src/emu/inpttype.ipp:556 src/emu/inpttype.ipp:557 src/emu/inpttype.ipp:558
 #: src/emu/inpttype.ipp:559
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 1"
-msgstr "P10 踏板 1"
-
-#: src/emu/inpttype.ipp:564
-msgctxt "input-name"
-msgid "P1 Pedal 2"
-msgstr "P1 踏板 2"
-
-#: src/emu/inpttype.ipp:565
-msgctxt "input-name"
-msgid "P2 Pedal 2"
-msgstr "P2 踏板 2"
-
-#: src/emu/inpttype.ipp:566
-msgctxt "input-name"
-msgid "P3 Pedal 2"
-msgstr "P3 踏板 2"
-
-#: src/emu/inpttype.ipp:567
-msgctxt "input-name"
-msgid "P4 Pedal 2"
-msgstr "P4 踏板 2"
-
-#: src/emu/inpttype.ipp:568
-msgctxt "input-name"
-msgid "P5 Pedal 2"
-msgstr "P5 踏板 2"
-
-#: src/emu/inpttype.ipp:569
-msgctxt "input-name"
-msgid "P6 Pedal 2"
-msgstr "P6 踏板 2"
-
-#: src/emu/inpttype.ipp:570
-msgctxt "input-name"
-msgid "P7 Pedal 2"
-msgstr "P7 踏板 2"
-
-#: src/emu/inpttype.ipp:571
-msgctxt "input-name"
-msgid "P8 Pedal 2"
-msgstr "P8 踏板 2"
-
-#: src/emu/inpttype.ipp:572
-msgctxt "input-name"
-msgid "P9 Pedal 2"
-msgstr "P9 踏板 2"
+msgid "%p Pedal 1"
+msgstr "%p 踏板 1"
 
+#: src/emu/inpttype.ipp:564 src/emu/inpttype.ipp:565 src/emu/inpttype.ipp:566
+#: src/emu/inpttype.ipp:567 src/emu/inpttype.ipp:568 src/emu/inpttype.ipp:569
+#: src/emu/inpttype.ipp:570 src/emu/inpttype.ipp:571 src/emu/inpttype.ipp:572
 #: src/emu/inpttype.ipp:573
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 2"
-msgstr "P10 踏板 2"
-
-#: src/emu/inpttype.ipp:578
-msgctxt "input-name"
-msgid "P1 Pedal 3"
-msgstr "P1 踏板 3"
-
-#: src/emu/inpttype.ipp:579
-msgctxt "input-name"
-msgid "P2 Pedal 3"
-msgstr "P2 踏板 3"
-
-#: src/emu/inpttype.ipp:580
-msgctxt "input-name"
-msgid "P3 Pedal 3"
-msgstr "P3 踏板 3"
-
-#: src/emu/inpttype.ipp:581
-msgctxt "input-name"
-msgid "P4 Pedal 3"
-msgstr "P4 踏板 3"
-
-#: src/emu/inpttype.ipp:582
-msgctxt "input-name"
-msgid "P5 Pedal 3"
-msgstr "P5 踏板 3"
-
-#: src/emu/inpttype.ipp:583
-msgctxt "input-name"
-msgid "P6 Pedal 3"
-msgstr "P6 踏板 3"
-
-#: src/emu/inpttype.ipp:584
-msgctxt "input-name"
-msgid "P7 Pedal 3"
-msgstr "P7 踏板 3"
-
-#: src/emu/inpttype.ipp:585
-msgctxt "input-name"
-msgid "P8 Pedal 3"
-msgstr "P8 踏板 3"
-
-#: src/emu/inpttype.ipp:586
-msgctxt "input-name"
-msgid "P9 Pedal 3"
-msgstr "P9 踏板 3"
+msgid "%p Pedal 2"
+msgstr "%p 踏板 2"
 
+#: src/emu/inpttype.ipp:578 src/emu/inpttype.ipp:579 src/emu/inpttype.ipp:580
+#: src/emu/inpttype.ipp:581 src/emu/inpttype.ipp:582 src/emu/inpttype.ipp:583
+#: src/emu/inpttype.ipp:584 src/emu/inpttype.ipp:585 src/emu/inpttype.ipp:586
 #: src/emu/inpttype.ipp:587
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 3"
-msgstr "P10 踏板 3"
+msgid "%p Pedal 3"
+msgstr "%p 踏板 3"
 
 #: src/emu/inpttype.ipp:592
 msgctxt "input-name"
@@ -7604,3 +6106,44 @@ msgid ""
 msgstr ""
 "输入序列或按下 %s 取消\n"
 "%s"
+
+#~ msgid "Confirm quit from machines"
+#~ msgstr "确认离开机台"
+
+#~ msgid "Skip information screen at startup"
+#~ msgstr "略过起始的信息画面"
+
+#~ msgid "Skip software parts selection menu"
+#~ msgstr "略过软件部分选择菜单"
+
+#~ msgid "Simultaneous contradictory"
+#~ msgstr "同时发生的对立状况"
+
+#, c-format
+#~ msgid ""
+#~ "Auditing ROMs for machine %2$u of %3$u...\n"
+#~ "%1$s"
+#~ msgstr ""
+#~ "正在校验供机台 %2$u 的 %3$u ROM 档案...\n"
+#~ "%1$s"
+
+#, c-format
+#~ msgid "Audit ROMs for %1$u machines marked unavailable"
+#~ msgstr "校验标记为不可用的 %1$u 机台的 ROM 档案"
+
+#, c-format
+#~ msgid "Audit ROMs for all %1$u machines"
+#~ msgstr "校验所有 %1$u 机台的 ROM 档案"
+
+#~ msgid "ROM Audit Result\tOK\n"
+#~ msgstr "ROM 校验结果\tOK\n"
+
+#~ msgid "ROM Audit Result\tBAD\n"
+#~ msgstr "ROM 校验结果\t错误\n"
+
+#~ msgid ""
+#~ "ROM Audit \tDisabled\n"
+#~ "Samples Audit \tDisabled\n"
+#~ msgstr ""
+#~ "ROM 验证 \t停用\n"
+#~ "采样文件验证 \t停用\n"
diff --git a/language/Chinese_Traditional/strings.po b/language/Chinese_Traditional/strings.po
index 42b55467309..adb662bdba8 100644
--- a/language/Chinese_Traditional/strings.po
+++ b/language/Chinese_Traditional/strings.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-19 02:50+1100\n"
+"POT-Creation-Date: 2021-12-09 04:44+1100\n"
 "PO-Revision-Date: 2021-11-19 09:33+0800\n"
 "Last-Translator: YuiFAN\n"
 "Language-Team: MAME Language Team\n"
@@ -274,12 +274,12 @@ msgstr "%1$s %2$s ( %3$d / %4$d 軟體套件 )"
 msgid "Driver: \"%1$s\" software list "
 msgstr "驅動程式： \"%1$s\" 軟體清單 "
 
-#: src/frontend/mame/ui/selsoft.cpp:711 src/frontend/mame/ui/selgame.cpp:1066
+#: src/frontend/mame/ui/selsoft.cpp:711 src/frontend/mame/ui/selgame.cpp:1076
 #, c-format
 msgid "%1$s: %2$s - Search: %3$s_"
 msgstr "%1$s： %2$s - 搜尋： %3$s_"
 
-#: src/frontend/mame/ui/selsoft.cpp:713 src/frontend/mame/ui/selgame.cpp:1068
+#: src/frontend/mame/ui/selsoft.cpp:713 src/frontend/mame/ui/selgame.cpp:1078
 #, c-format
 msgid "Search: %1$s_"
 msgstr "搜尋： %1$s_"
@@ -289,7 +289,7 @@ msgstr "搜尋： %1$s_"
 msgid "Software list/item: %1$s:%2$s"
 msgstr "軟體列表/項目: %1$s:%2$s"
 
-#: src/frontend/mame/ui/optsmenu.cpp:73 src/frontend/mame/ui/sndmenu.cpp:165
+#: src/frontend/mame/ui/optsmenu.cpp:73 src/frontend/mame/ui/sndmenu.cpp:161
 msgid "Sound Options"
 msgstr "聲音選項"
 
@@ -384,12 +384,12 @@ msgid "Show mouse pointer"
 msgstr "顯示滑鼠指標"
 
 #: src/frontend/mame/ui/submenu.cpp:39
-msgid "Confirm quit from machines"
-msgstr "確認離開機台"
+msgid "Confirm quit from emulation"
+msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:40
-msgid "Skip information screen at startup"
-msgstr "略過起始的資訊畫面"
+msgid "Skip system information screen"
+msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:41
 msgid "Force 4:3 aspect for snapshot display"
@@ -404,8 +404,8 @@ msgid "Skip BIOS selection menu"
 msgstr "略過 BIOS 選擇選單"
 
 #: src/frontend/mame/ui/submenu.cpp:44
-msgid "Skip software parts selection menu"
-msgstr "略過軟體部分選擇選單"
+msgid "Skip software part selection menu"
+msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:45
 msgid "Info auto audit"
@@ -556,7 +556,7 @@ msgid "UI active"
 msgstr "UI 啟動"
 
 #: src/frontend/mame/ui/submenu.cpp:91
-msgid "Offscreen reload"
+msgid "Off-screen reload"
 msgstr "畫面外重新裝填"
 
 #: src/frontend/mame/ui/submenu.cpp:92
@@ -572,8 +572,8 @@ msgid "Natural keyboard"
 msgstr "自然鍵盤"
 
 #: src/frontend/mame/ui/submenu.cpp:95
-msgid "Simultaneous contradictory"
-msgstr "同時發生的對立狀況"
+msgid "Allow contradictory joystick inputs"
+msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:96
 msgid "Coin impulse"
@@ -596,8 +596,8 @@ msgid "Pedal Device Assignment"
 msgstr "分配踏板裝置"
 
 #: src/frontend/mame/ui/submenu.cpp:106
-msgid "Adstick Device Assignment"
-msgstr "分配 Adstick 裝置"
+msgid "AD Stick Device Assignment"
+msgstr "分配 AD 搖桿裝置"
 
 #: src/frontend/mame/ui/submenu.cpp:107
 msgid "Paddle Device Assignment"
@@ -683,14 +683,14 @@ msgstr "同步更新"
 msgid "Wait Vertical Sync"
 msgstr "等待垂直同步"
 
-#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:687
+#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:689
 #: src/frontend/mame/ui/videoopt.cpp:191 src/frontend/mame/ui/custui.cpp:490
 #: src/frontend/mame/ui/analogipt.cpp:471 plugins/cheatfind/init.lua:766
 #: plugins/cheatfind/init.lua:777 plugins/cheat/init.lua:668
 msgid "On"
 msgstr "開"
 
-#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:690
+#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:692
 #: src/frontend/mame/ui/videoopt.cpp:207 src/frontend/mame/ui/custui.cpp:490
 #: src/frontend/mame/ui/analogipt.cpp:471 plugins/cheatfind/init.lua:763
 #: plugins/cheatfind/init.lua:774 plugins/cheat/init.lua:671
@@ -698,11 +698,11 @@ msgstr "開"
 msgid "Off"
 msgstr "關"
 
-#: src/frontend/mame/ui/menu.cpp:693
+#: src/frontend/mame/ui/menu.cpp:695
 msgid "Auto"
 msgstr "自動"
 
-#: src/frontend/mame/ui/menu.cpp:1195
+#: src/frontend/mame/ui/menu.cpp:1197
 #: src/frontend/mame/ui/simpleselgame.cpp:278
 #: src/frontend/mame/ui/selmenu.cpp:1280
 msgid "Return to Previous Menu"
@@ -710,7 +710,7 @@ msgstr "回上一層選單"
 
 #: src/frontend/mame/ui/filemngr.cpp:139
 #: src/frontend/mame/ui/confswitch.cpp:119
-#: src/frontend/mame/ui/inputmap.cpp:559 src/frontend/mame/ui/analogipt.cpp:360
+#: src/frontend/mame/ui/inputmap.cpp:563 src/frontend/mame/ui/analogipt.cpp:360
 #, c-format
 msgid "[root%1$s]"
 msgstr "[root%1$s]"
@@ -969,22 +969,22 @@ msgstr ""
 "CPU：\n"
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "GHz"
 msgstr "GHz"
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "MHz"
 msgstr "MHz"
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "kHz"
 msgstr "kHz"
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "Hz"
 msgstr "Hz"
 
@@ -1012,38 +1012,38 @@ msgstr "無\n"
 msgid "Vector"
 msgstr "向量"
 
-#: src/frontend/mame/ui/info.cpp:480
+#: src/frontend/mame/ui/info.cpp:483
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr "%1$s: %2$s\n"
 
-#: src/frontend/mame/ui/info.cpp:480
+#: src/frontend/mame/ui/info.cpp:483
 msgid "%2$s\n"
 msgstr "%2$s\n"
 
-#: src/frontend/mame/ui/info.cpp:497
+#: src/frontend/mame/ui/info.cpp:500
 #, c-format
 msgid "Screen '%1$s'"
 msgstr "畫面 '%1$s'"
 
-#: src/frontend/mame/ui/info.cpp:499
+#: src/frontend/mame/ui/info.cpp:502
 msgid "Screen"
 msgstr "畫面"
 
-#: src/frontend/mame/ui/info.cpp:570 src/frontend/mame/ui/info.cpp:581
+#: src/frontend/mame/ui/info.cpp:573 src/frontend/mame/ui/info.cpp:584
 #, c-format
 msgid "%1$s:\n"
 msgstr "%1$s:\n"
 
-#: src/frontend/mame/ui/info.cpp:662
+#: src/frontend/mame/ui/info.cpp:665
 msgid "Not supported"
 msgstr "不支援"
 
-#: src/frontend/mame/ui/info.cpp:665
+#: src/frontend/mame/ui/info.cpp:668
 msgid "Partially supported"
 msgstr "部分支援"
 
-#: src/frontend/mame/ui/info.cpp:674
+#: src/frontend/mame/ui/info.cpp:677
 msgid "[empty]"
 msgstr "[ 空 ]"
 
@@ -1116,7 +1116,7 @@ msgid "Emulated"
 msgstr "模擬"
 
 #: src/frontend/mame/ui/keyboard.cpp:59 src/frontend/mame/ui/confswitch.cpp:117
-#: src/frontend/mame/ui/inputmap.cpp:557 src/frontend/mame/ui/analogipt.cpp:358
+#: src/frontend/mame/ui/inputmap.cpp:561 src/frontend/mame/ui/analogipt.cpp:358
 #, c-format
 msgid "%1$s [root%2$s]"
 msgstr "%1$s [root%2$s]"
@@ -1476,7 +1476,7 @@ msgctxt "swlist-info"
 msgid "Software list/item"
 msgstr "軟體列表/項目"
 
-#: src/frontend/mame/ui/datmenu.cpp:88 src/frontend/mame/ui/selmenu.cpp:2698
+#: src/frontend/mame/ui/datmenu.cpp:88 src/frontend/mame/ui/selmenu.cpp:2707
 msgid "Software List Info"
 msgstr "軟體列表資訊"
 
@@ -1597,7 +1597,7 @@ msgstr "儲存機台設定"
 msgid "Configure Machine:"
 msgstr "設定機台："
 
-#: src/frontend/mame/ui/miscmenu.cpp:858 src/frontend/mame/ui/selmenu.cpp:2638
+#: src/frontend/mame/ui/miscmenu.cpp:858 src/frontend/mame/ui/selmenu.cpp:2647
 msgid " (default)"
 msgstr " （預設）"
 
@@ -1618,7 +1618,7 @@ msgstr ""
 "按 %1$s 退出 \n"
 "按 %2$s 繼續模擬"
 
-#: src/frontend/mame/ui/info_pty.cpp:30 src/frontend/mame/ui/mainmenu.cpp:155
+#: src/frontend/mame/ui/info_pty.cpp:30
 msgid "Pseudo terminals"
 msgstr "偽終端"
 
@@ -1689,52 +1689,52 @@ msgstr "玩家 %1$d 控制"
 msgid "Other Controls"
 msgstr "其他控制"
 
-#: src/frontend/mame/ui/inputmap.cpp:227
+#: src/frontend/mame/ui/inputmap.cpp:231
 msgid "This machine has no configurable inputs."
 msgstr "此機台沒有可設定的輸入"
 
-#: src/frontend/mame/ui/inputmap.cpp:327
+#: src/frontend/mame/ui/inputmap.cpp:331
 msgid "Pressed"
 msgstr "按住"
 
-#: src/frontend/mame/ui/inputmap.cpp:397
+#: src/frontend/mame/ui/inputmap.cpp:401
 msgid "Invalid sequence entered"
 msgstr "輸入了無效序列"
 
-#: src/frontend/mame/ui/inputmap.cpp:542
+#: src/frontend/mame/ui/inputmap.cpp:546
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog"
 msgstr "%1$s 類比"
 
-#: src/frontend/mame/ui/inputmap.cpp:543
+#: src/frontend/mame/ui/inputmap.cpp:547
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog Inc"
 msgstr "%1$s 類比增加"
 
-#: src/frontend/mame/ui/inputmap.cpp:544
+#: src/frontend/mame/ui/inputmap.cpp:548
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog Dec"
 msgstr "%1$s 類比減少"
 
-#: src/frontend/mame/ui/inputmap.cpp:586
+#: src/frontend/mame/ui/inputmap.cpp:590
 #, c-format
 msgid "Press %1$s to set\n"
 msgstr "按下 %1$s 設定\n"
 
-#: src/frontend/mame/ui/inputmap.cpp:587
+#: src/frontend/mame/ui/inputmap.cpp:591
 #, c-format
 msgid "Press %1$s to append\n"
 msgstr "按下 %1$s 加入\n"
 
-#: src/frontend/mame/ui/inputmap.cpp:588
+#: src/frontend/mame/ui/inputmap.cpp:592
 #, c-format
 msgid "Press %1$s to clear\n"
 msgstr "按下 %1$s 清除\n"
 
-#: src/frontend/mame/ui/inputmap.cpp:589
+#: src/frontend/mame/ui/inputmap.cpp:593
 #, c-format
 msgid "Press %1$s to restore default\n"
 msgstr "按下 %1$s 還原預設值\n"
@@ -1802,7 +1802,7 @@ msgstr ""
 "按任意鍵繼續。"
 
 #: src/frontend/mame/ui/simpleselgame.cpp:273
-#: src/frontend/mame/ui/selgame.cpp:436
+#: src/frontend/mame/ui/selgame.cpp:443
 msgid "Configure Options"
 msgstr "設定選項"
 
@@ -2136,16 +2136,16 @@ msgstr "縮放 = %1$d"
 msgid "Expand to fit"
 msgstr "展開以符合"
 
-#: src/frontend/mame/ui/selgame.cpp:437
+#: src/frontend/mame/ui/selgame.cpp:444
 msgid "Configure Machine"
 msgstr "設定機台"
 
-#: src/frontend/mame/ui/selgame.cpp:1050
+#: src/frontend/mame/ui/selgame.cpp:1060
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d machines (%5$d BIOS) )"
 msgstr "%1$s %2$s （ %3$d / %4$d 機台 (%5$d BIOS) ）"
 
-#: src/frontend/mame/ui/selgame.cpp:1078
+#: src/frontend/mame/ui/selgame.cpp:1088
 #, c-format
 msgid "System: %1$-.100s"
 msgstr "系統: %1$-.100s"
@@ -2167,11 +2167,9 @@ msgstr "結果將儲存至 %1$s"
 #: src/frontend/mame/ui/auditmenu.cpp:98
 #, c-format
 msgid ""
-"Auditing ROMs for machine %2$u of %3$u...\n"
+"Auditing media for machine %2$u of %3$u...\n"
 "%1$s"
 msgstr ""
-"正在驗證供機台 %2$u 的 %3$u ROM 檔...\n"
-"%1$s"
 
 #: src/frontend/mame/ui/auditmenu.cpp:116
 #, c-format
@@ -2188,13 +2186,13 @@ msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:136
 #, c-format
-msgid "Audit ROMs for %1$u machines marked unavailable"
-msgstr "驗證標記為不可用的 %1$u 機台 ROM 檔"
+msgid "Audit media for %1$u machines marked unavailable"
+msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:137
 #, c-format
-msgid "Audit ROMs for all %1$u machines"
-msgstr "驗證所有 %1$u 機台的 ROM 檔"
+msgid "Audit media for all %1$u machines"
+msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:154
 #, c-format
@@ -2399,84 +2397,84 @@ msgctxt "color-sample"
 msgid "Clone"
 msgstr "相容版本"
 
-#: src/frontend/mame/ui/custui.cpp:914
+#: src/frontend/mame/ui/custui.cpp:906
 msgid "ARGB Settings"
 msgstr "ARGB 設定"
 
-#: src/frontend/mame/ui/custui.cpp:919 src/frontend/mame/ui/custui.cpp:922
+#: src/frontend/mame/ui/custui.cpp:911 src/frontend/mame/ui/custui.cpp:914
 msgctxt "color-channel"
 msgid "Alpha"
 msgstr "透明度"
 
-#: src/frontend/mame/ui/custui.cpp:927 src/frontend/mame/ui/custui.cpp:930
+#: src/frontend/mame/ui/custui.cpp:919 src/frontend/mame/ui/custui.cpp:922
 msgctxt "color-channel"
 msgid "Red"
 msgstr "紅"
 
-#: src/frontend/mame/ui/custui.cpp:935 src/frontend/mame/ui/custui.cpp:938
+#: src/frontend/mame/ui/custui.cpp:927 src/frontend/mame/ui/custui.cpp:930
 msgctxt "color-channel"
 msgid "Green"
 msgstr "綠"
 
-#: src/frontend/mame/ui/custui.cpp:943 src/frontend/mame/ui/custui.cpp:946
+#: src/frontend/mame/ui/custui.cpp:935 src/frontend/mame/ui/custui.cpp:938
 msgctxt "color-channel"
 msgid "Blue"
 msgstr "藍"
 
-#: src/frontend/mame/ui/custui.cpp:949
+#: src/frontend/mame/ui/custui.cpp:941
 msgid "Choose from palette"
 msgstr "從色盤挑選"
 
-#: src/frontend/mame/ui/custui.cpp:996
+#: src/frontend/mame/ui/custui.cpp:988
 msgid "Color preview:"
 msgstr "顏色預覽："
 
-#: src/frontend/mame/ui/custui.cpp:1093
+#: src/frontend/mame/ui/custui.cpp:1085
 msgctxt "color-preset"
 msgid "White"
 msgstr "白"
 
-#: src/frontend/mame/ui/custui.cpp:1094
+#: src/frontend/mame/ui/custui.cpp:1086
 msgctxt "color-preset"
 msgid "Silver"
 msgstr "銀"
 
-#: src/frontend/mame/ui/custui.cpp:1095
+#: src/frontend/mame/ui/custui.cpp:1087
 msgctxt "color-preset"
 msgid "Gray"
 msgstr "灰"
 
-#: src/frontend/mame/ui/custui.cpp:1096
+#: src/frontend/mame/ui/custui.cpp:1088
 msgctxt "color-preset"
 msgid "Black"
 msgstr "黑"
 
-#: src/frontend/mame/ui/custui.cpp:1097
+#: src/frontend/mame/ui/custui.cpp:1089
 msgctxt "color-preset"
 msgid "Red"
 msgstr "紅"
 
-#: src/frontend/mame/ui/custui.cpp:1098
+#: src/frontend/mame/ui/custui.cpp:1090
 msgctxt "color-preset"
 msgid "Orange"
 msgstr "橘"
 
-#: src/frontend/mame/ui/custui.cpp:1099
+#: src/frontend/mame/ui/custui.cpp:1091
 msgctxt "color-preset"
 msgid "Yellow"
 msgstr "黃"
 
-#: src/frontend/mame/ui/custui.cpp:1100
+#: src/frontend/mame/ui/custui.cpp:1092
 msgctxt "color-preset"
 msgid "Green"
 msgstr "綠"
 
-#: src/frontend/mame/ui/custui.cpp:1101
+#: src/frontend/mame/ui/custui.cpp:1093
 msgctxt "color-preset"
 msgid "Blue"
 msgstr "藍"
 
-#: src/frontend/mame/ui/custui.cpp:1102
+#: src/frontend/mame/ui/custui.cpp:1094
 msgctxt "color-preset"
 msgid "Violet"
 msgstr "紫"
@@ -2541,7 +2539,7 @@ msgid "Input (general)"
 msgstr "輸入設定 （一般）"
 
 #: src/frontend/mame/ui/mainmenu.cpp:123
-msgid "Input (this Machine)"
+msgid "Input (this machine)"
 msgstr "輸入設定 （本機台）"
 
 #: src/frontend/mame/ui/mainmenu.cpp:126
@@ -2580,6 +2578,10 @@ msgstr "檔案管理員"
 msgid "Tape Control"
 msgstr "磁帶控制"
 
+#: src/frontend/mame/ui/mainmenu.cpp:155
+msgid "Pseudo Terminals"
+msgstr ""
+
 #: src/frontend/mame/ui/mainmenu.cpp:158
 msgid "BIOS Selection"
 msgstr "選擇 BIOS"
@@ -2618,8 +2620,8 @@ msgstr "查閱外部文件"
 
 #: src/frontend/mame/ui/mainmenu.cpp:200
 #, c-format
-msgid "About %s"
-msgstr "關於 %s"
+msgid "About %1$s"
+msgstr "關於 %1$s"
 
 #: src/frontend/mame/ui/mainmenu.cpp:212
 msgid "Select New Machine"
@@ -2778,15 +2780,15 @@ msgstr "驅動程式相容於： %1$s"
 msgid "%1$s %2$s"
 msgstr "%1$s %2$s"
 
-#: src/frontend/mame/ui/selmenu.cpp:2235
+#: src/frontend/mame/ui/selmenu.cpp:2244
 msgid "Images"
 msgstr "圖片"
 
-#: src/frontend/mame/ui/selmenu.cpp:2236
+#: src/frontend/mame/ui/selmenu.cpp:2245
 msgid "Infos"
 msgstr "資訊"
 
-#: src/frontend/mame/ui/selmenu.cpp:2551
+#: src/frontend/mame/ui/selmenu.cpp:2560
 msgid ""
 "Required ROM/disk images for the selected system are missing or incorrect. "
 "Please acquire the correct files or select a different system.\n"
@@ -2796,7 +2798,7 @@ msgstr ""
 "請取得正確的檔案或選擇不同的系統。\n"
 "\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2567
+#: src/frontend/mame/ui/selmenu.cpp:2576
 msgid ""
 "Required ROM/disk images for the selected software are missing or incorrect. "
 "Please acquire the correct files or select a different software item.\n"
@@ -2806,353 +2808,351 @@ msgstr ""
 "請取得正確的檔案或選擇不同的軟體項目。\n"
 "\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2583
+#: src/frontend/mame/ui/selmenu.cpp:2592
 msgid "incorrect checksum"
 msgstr "不正確的檢查碼"
 
-#: src/frontend/mame/ui/selmenu.cpp:2586
+#: src/frontend/mame/ui/selmenu.cpp:2595
 msgid "incorrect length"
 msgstr "不正確的長度"
 
-#: src/frontend/mame/ui/selmenu.cpp:2589
+#: src/frontend/mame/ui/selmenu.cpp:2598
 msgid "not found"
 msgstr "未找到"
 
-#: src/frontend/mame/ui/selmenu.cpp:2600
+#: src/frontend/mame/ui/selmenu.cpp:2609
 #, c-format
 msgid "%1$s (%2$s) - %3$s\n"
 msgstr "%1$s (%2$s) - %3$s\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2602
+#: src/frontend/mame/ui/selmenu.cpp:2611
 #, c-format
 msgid "%1$s - %2$s\n"
 msgstr "%1$s - %2$s\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2606
+#: src/frontend/mame/ui/selmenu.cpp:2615
 msgid "Press any key to continue."
 msgstr "按任意鍵繼續。"
 
-#: src/frontend/mame/ui/selmenu.cpp:2735
+#: src/frontend/mame/ui/selmenu.cpp:2744
 msgid "General Info"
 msgstr "一般資訊"
 
-#: src/frontend/mame/ui/selmenu.cpp:2887
+#: src/frontend/mame/ui/selmenu.cpp:2896
 #, c-format
 msgid "Romset\t%1$s\n"
 msgstr "ROM組\t%1$s\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2888
+#: src/frontend/mame/ui/selmenu.cpp:2897
 #, c-format
 msgid "Year\t%1$s\n"
 msgstr "年代\t%1$s\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2889
+#: src/frontend/mame/ui/selmenu.cpp:2898
 #, c-format
 msgid "Manufacturer\t%1$s\n"
 msgstr "製造商\t%1$s\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2896
+#: src/frontend/mame/ui/selmenu.cpp:2905
 #, c-format
 msgid "Driver is Clone of\t%1$s\n"
 msgstr "驅動程式相容於\t%1$s\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2901
+#: src/frontend/mame/ui/selmenu.cpp:2910
 msgid "Driver is Parent\t\n"
 msgstr "驅動程式為主檔\t\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2905
+#: src/frontend/mame/ui/selmenu.cpp:2914
 msgid "Analog Controls\tYes\n"
 msgstr "類比控制\t是\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2907
+#: src/frontend/mame/ui/selmenu.cpp:2916
 msgid "Keyboard Inputs\tYes\n"
 msgstr "鍵盤輸入\t是\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2910
+#: src/frontend/mame/ui/selmenu.cpp:2919
 msgid "Overall\tNOT WORKING\n"
 msgstr "整體\t不可執行\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2912
+#: src/frontend/mame/ui/selmenu.cpp:2921
 msgid "Overall\tUnemulated Protection\n"
 msgstr "整體\t未模擬保護\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2914
+#: src/frontend/mame/ui/selmenu.cpp:2923
 msgid "Overall\tWorking\n"
 msgstr "整體\t可以執行\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2917
+#: src/frontend/mame/ui/selmenu.cpp:2926
 msgid "Graphics\tUnimplemented\n"
 msgstr "圖形\t無法執行\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2919
+#: src/frontend/mame/ui/selmenu.cpp:2928
 msgid "Graphics\tWrong Colors\n"
 msgstr "圖形\t色彩錯誤\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2921
+#: src/frontend/mame/ui/selmenu.cpp:2930
 msgid "Graphics\tImperfect Colors\n"
 msgstr "圖形\t色彩不完美\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2923
+#: src/frontend/mame/ui/selmenu.cpp:2932
 msgid "Graphics\tImperfect\n"
 msgstr "圖形\t不完美\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2925
+#: src/frontend/mame/ui/selmenu.cpp:2934
 msgid "Graphics\tOK\n"
 msgstr "圖形\tOK\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2928
+#: src/frontend/mame/ui/selmenu.cpp:2937
 msgid "Sound\tNone\n"
 msgstr "聲音\t無\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2930
+#: src/frontend/mame/ui/selmenu.cpp:2939
 msgid "Sound\tUnimplemented\n"
 msgstr "聲音\t無法執行\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2932
+#: src/frontend/mame/ui/selmenu.cpp:2941
 msgid "Sound\tImperfect\n"
 msgstr "聲音\t不完美\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2934
+#: src/frontend/mame/ui/selmenu.cpp:2943
 msgid "Sound\tOK\n"
 msgstr "聲音\tOK\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2937
+#: src/frontend/mame/ui/selmenu.cpp:2946
 msgid "Capture\tUnimplemented\n"
 msgstr "擷取\t無法執行\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2939
+#: src/frontend/mame/ui/selmenu.cpp:2948
 msgid "Capture\tImperfect\n"
 msgstr "擷取\t不完美\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2942
+#: src/frontend/mame/ui/selmenu.cpp:2951
 msgid "Camera\tUnimplemented\n"
 msgstr "相機\t無法執行\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2944
+#: src/frontend/mame/ui/selmenu.cpp:2953
 msgid "Camera\tImperfect\n"
 msgstr "相機\t不完美\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2947
+#: src/frontend/mame/ui/selmenu.cpp:2956
 msgid "Microphone\tUnimplemented\n"
 msgstr "麥克風\t無法執行\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2949
+#: src/frontend/mame/ui/selmenu.cpp:2958
 msgid "Microphone\tImperfect\n"
 msgstr "麥克風\t不完美\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2952
+#: src/frontend/mame/ui/selmenu.cpp:2961
 msgid "Controls\tUnimplemented\n"
 msgstr "控制\t無法執行\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2954
+#: src/frontend/mame/ui/selmenu.cpp:2963
 msgid "Controls\tImperfect\n"
 msgstr "控制\t不完美\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2957
+#: src/frontend/mame/ui/selmenu.cpp:2966
 msgid "Keyboard\tUnimplemented\n"
 msgstr "鍵盤\t無法執行\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2959
+#: src/frontend/mame/ui/selmenu.cpp:2968
 msgid "Keyboard\tImperfect\n"
 msgstr "鍵盤\t不完美\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2962
+#: src/frontend/mame/ui/selmenu.cpp:2971
 msgid "Mouse\tUnimplemented\n"
 msgstr "滑鼠\t無法執行\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2964
+#: src/frontend/mame/ui/selmenu.cpp:2973
 msgid "Mouse\tImperfect\n"
 msgstr "滑鼠\t不完美\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2967
+#: src/frontend/mame/ui/selmenu.cpp:2976
 msgid "Media\tUnimplemented\n"
 msgstr "媒體\t無法執行\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2969
+#: src/frontend/mame/ui/selmenu.cpp:2978
 msgid "Media\tImperfect\n"
 msgstr "媒體\t不完美\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2972
+#: src/frontend/mame/ui/selmenu.cpp:2981
 msgid "Disk\tUnimplemented\n"
 msgstr "磁碟\t無法執行\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2974
+#: src/frontend/mame/ui/selmenu.cpp:2983
 msgid "Disk\tImperfect\n"
 msgstr "磁碟\t不完美\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2977
+#: src/frontend/mame/ui/selmenu.cpp:2986
 msgid "Printer\tUnimplemented\n"
 msgstr "印表機\t無法執行\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2979
+#: src/frontend/mame/ui/selmenu.cpp:2988
 msgid "Printer\tImperfect\n"
 msgstr "印表機\t不完美\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2982
+#: src/frontend/mame/ui/selmenu.cpp:2991
 msgid "Mag. Tape\tUnimplemented\n"
 msgstr "磁帶\t無法執行\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2984
+#: src/frontend/mame/ui/selmenu.cpp:2993
 msgid "Mag. Tape\tImperfect\n"
 msgstr "磁帶\t不完美\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2987
+#: src/frontend/mame/ui/selmenu.cpp:2996
 msgid "Punch Tape\tUnimplemented\n"
 msgstr "打孔帶\t無法執行\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2989
+#: src/frontend/mame/ui/selmenu.cpp:2998
 msgid "Punch Tape\tImperfect\n"
 msgstr "打孔帶\t不完美\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2992
+#: src/frontend/mame/ui/selmenu.cpp:3001
 msgid "Mag. Drum\tUnimplemented\n"
 msgstr "磁鼓\t無法執行\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2994
+#: src/frontend/mame/ui/selmenu.cpp:3003
 msgid "Mag. Drum\tImperfect\n"
 msgstr "磁鼓\t不完美\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2997
+#: src/frontend/mame/ui/selmenu.cpp:3006
 msgid "(EP)ROM\tUnimplemented\n"
 msgstr "(EP)ROM\t無法執行\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2999
+#: src/frontend/mame/ui/selmenu.cpp:3008
 msgid "(EP)ROM\tImperfect\n"
 msgstr "(EP)ROM\t不完美\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3002
+#: src/frontend/mame/ui/selmenu.cpp:3011
 msgid "Communications\tUnimplemented\n"
 msgstr "通訊\t無法執行\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3004
+#: src/frontend/mame/ui/selmenu.cpp:3013
 msgid "Communications\tImperfect\n"
 msgstr "通訊\t不完美\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3007
+#: src/frontend/mame/ui/selmenu.cpp:3016
 msgid "LAN\tUnimplemented\n"
 msgstr "區域網路\t無法執行\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3009
+#: src/frontend/mame/ui/selmenu.cpp:3018
 msgid "LAN\tImperfect\n"
 msgstr "區域網路\t不完美\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3012
+#: src/frontend/mame/ui/selmenu.cpp:3021
 msgid "WAN\tUnimplemented\n"
 msgstr "外部網路\t無法執行\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3014
+#: src/frontend/mame/ui/selmenu.cpp:3023
 msgid "WAN\tImperfect\n"
 msgstr "外部網路\t不完美\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3017
+#: src/frontend/mame/ui/selmenu.cpp:3026
 msgid "Timing\tUnimplemented\n"
 msgstr "計時\t無法執行\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3019
+#: src/frontend/mame/ui/selmenu.cpp:3028
 msgid "Timing\tImperfect\n"
 msgstr "計時\t不完美\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3021
+#: src/frontend/mame/ui/selmenu.cpp:3030
 msgid "Mechanical Machine\tYes\n"
 msgstr "機械式機台\t是\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3021
+#: src/frontend/mame/ui/selmenu.cpp:3030
 msgid "Mechanical Machine\tNo\n"
 msgstr "機械式機台\t否\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3022
+#: src/frontend/mame/ui/selmenu.cpp:3031
 msgid "Requires Artwork\tYes\n"
 msgstr "需要裝飾圖\t是\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3022
+#: src/frontend/mame/ui/selmenu.cpp:3031
 msgid "Requires Artwork\tNo\n"
 msgstr "需要裝飾圖\t否\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3023
+#: src/frontend/mame/ui/selmenu.cpp:3032
 msgid "Requires Clickable Artwork\tYes\n"
 msgstr "需要可點擊的裝飾圖\t是\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3023
+#: src/frontend/mame/ui/selmenu.cpp:3032
 msgid "Requires Clickable Artwork\tNo\n"
 msgstr "需要可點擊的裝飾圖\t否\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3025
+#: src/frontend/mame/ui/selmenu.cpp:3034
 msgid "Support Cocktail\tNo\n"
 msgstr "支援檯面型筐體\t否\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3026
+#: src/frontend/mame/ui/selmenu.cpp:3035
 msgid "Driver is BIOS\tYes\n"
 msgstr "驅動程式為 BIOS\t是\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3026
+#: src/frontend/mame/ui/selmenu.cpp:3035
 msgid "Driver is BIOS\tNo\n"
 msgstr "驅動程式為 BIOS\t否\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3027
+#: src/frontend/mame/ui/selmenu.cpp:3036
 msgid "Support Save\tYes\n"
 msgstr "支援即時存檔\t是\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3027
+#: src/frontend/mame/ui/selmenu.cpp:3036
 msgid "Support Save\tNo\n"
 msgstr "支援即時存檔\t否\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3028
+#: src/frontend/mame/ui/selmenu.cpp:3037
 msgid "Screen Orientation\tVertical\n"
 msgstr "畫面方向\t垂直\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3028
+#: src/frontend/mame/ui/selmenu.cpp:3037
 msgid "Screen Orientation\tHorizontal\n"
 msgstr "畫面方向\t水平\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3038
+#: src/frontend/mame/ui/selmenu.cpp:3047
 msgid "Requires CHD\tYes\n"
 msgstr "需要 CHD\t是\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3038
+#: src/frontend/mame/ui/selmenu.cpp:3047
 msgid "Requires CHD\tNo\n"
 msgstr "需要 CHD\t否\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3051
-msgid "ROM Audit Result\tOK\n"
-msgstr "ROM 驗證結果\tOK\n"
+#: src/frontend/mame/ui/selmenu.cpp:3060
+msgid "Media Audit Result\tOK\n"
+msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3053
-msgid "ROM Audit Result\tBAD\n"
-msgstr "ROM 驗證結果\t錯誤\n"
+#: src/frontend/mame/ui/selmenu.cpp:3062
+msgid "Media Audit Result\tBAD\n"
+msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3056
+#: src/frontend/mame/ui/selmenu.cpp:3065
 msgid "Samples Audit Result\tNone Needed\n"
 msgstr "樣本檔驗證結果\t不需要\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3058
+#: src/frontend/mame/ui/selmenu.cpp:3067
 msgid "Samples Audit Result\tOK\n"
 msgstr "樣本檔驗證結果\tOK\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3060
+#: src/frontend/mame/ui/selmenu.cpp:3069
 msgid "Samples Audit Result\tBAD\n"
 msgstr "樣本檔驗證結果\t錯誤\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3064
+#: src/frontend/mame/ui/selmenu.cpp:3073
 msgid ""
-"ROM Audit \tDisabled\n"
-"Samples Audit \tDisabled\n"
+"Media Audit\tDisabled\n"
+"Samples Audit\tDisabled\n"
 msgstr ""
-"ROM 驗證 \t停用\n"
-"樣本檔驗證 \t停用\n"
 
-#: src/frontend/mame/ui/sndmenu.cpp:150
+#: src/frontend/mame/ui/sndmenu.cpp:146
 msgid "Sound"
 msgstr "聲音"
 
-#: src/frontend/mame/ui/sndmenu.cpp:151
+#: src/frontend/mame/ui/sndmenu.cpp:147
 msgid "Compressor"
 msgstr "壓縮"
 
-#: src/frontend/mame/ui/sndmenu.cpp:152
+#: src/frontend/mame/ui/sndmenu.cpp:148
 msgid "Sample Rate"
 msgstr "取樣頻率"
 
-#: src/frontend/mame/ui/sndmenu.cpp:153
+#: src/frontend/mame/ui/sndmenu.cpp:149
 msgid "Use External Samples"
 msgstr "使用外部樣本檔"
 
@@ -3203,21 +3203,21 @@ msgstr "* 視訊：\n"
 msgid "  Screen '%1$s': Vector\n"
 msgstr "  畫面 '%1$s'： 向量\n"
 
-#: src/frontend/mame/ui/devopt.cpp:132
+#: src/frontend/mame/ui/devopt.cpp:135
 #, c-format
 msgid "  Screen '%1$s': %2$d × %3$d (V) %4$s Hz\n"
 msgstr "  畫面 '%1$s': %2$d × %3$d (V) %4$s Hz\n"
 
-#: src/frontend/mame/ui/devopt.cpp:133
+#: src/frontend/mame/ui/devopt.cpp:136
 #, c-format
 msgid "  Screen '%1$s': %2$d × %3$d (H) %4$s Hz\n"
 msgstr "  畫面 '%1$s': %2$d × %3$d (H) %4$s Hz\n"
 
-#: src/frontend/mame/ui/devopt.cpp:147
+#: src/frontend/mame/ui/devopt.cpp:150
 msgid "* Sound:\n"
 msgstr "* 聲音:\n"
 
-#: src/frontend/mame/ui/devopt.cpp:211
+#: src/frontend/mame/ui/devopt.cpp:214
 #, c-format
 msgid ""
 "* BIOS settings:\n"
@@ -3226,491 +3226,661 @@ msgstr ""
 "* BIOS 設定：\n"
 "  %1$d 選項    [預設值： %2$s]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:255 src/frontend/mame/ui/devopt.cpp:271
-#: src/frontend/mame/ui/devopt.cpp:332
+#: src/frontend/mame/ui/devopt.cpp:258 src/frontend/mame/ui/devopt.cpp:274
+#: src/frontend/mame/ui/devopt.cpp:335
 #, c-format
 msgid "  %1$s    [default: %2$s]\n"
 msgstr "  %1$s    [預設值： %2$s]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:260 src/frontend/mame/ui/devopt.cpp:276
+#: src/frontend/mame/ui/devopt.cpp:263 src/frontend/mame/ui/devopt.cpp:279
 #, c-format
 msgid "  %1$s\n"
 msgstr "  %1$s\n"
 
-#: src/frontend/mame/ui/devopt.cpp:282
+#: src/frontend/mame/ui/devopt.cpp:285
 msgid "* DIP switch settings:\n"
 msgstr "* 指撥開關設定：\n"
 
-#: src/frontend/mame/ui/devopt.cpp:287
+#: src/frontend/mame/ui/devopt.cpp:290
 msgid "* Configuration settings:\n"
 msgstr "* 配置設定：\n"
 
-#: src/frontend/mame/ui/devopt.cpp:291
+#: src/frontend/mame/ui/devopt.cpp:294
 msgid "* Input device(s):\n"
 msgstr "* 輸入裝置:\n"
 
-#: src/frontend/mame/ui/devopt.cpp:293
+#: src/frontend/mame/ui/devopt.cpp:296
 #, c-format
 msgid "  User inputs    [%1$d inputs]\n"
 msgstr "  使用者輸入    [%1$d 輸入]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:295
+#: src/frontend/mame/ui/devopt.cpp:298
 #, c-format
 msgid "  Mahjong inputs    [%1$d inputs]\n"
 msgstr "  麻將輸入    [%1$d 輸入]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:297
+#: src/frontend/mame/ui/devopt.cpp:300
 #, c-format
 msgid "  Hanafuda inputs    [%1$d inputs]\n"
 msgstr "  花牌輸入    [%1$d 輸入]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:299
+#: src/frontend/mame/ui/devopt.cpp:302
 #, c-format
 msgid "  Gambling inputs    [%1$d inputs]\n"
 msgstr "  博奕輸入    [%1$d 輸入]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:301
+#: src/frontend/mame/ui/devopt.cpp:304
 #, c-format
 msgid "  Analog inputs    [%1$d inputs]\n"
 msgstr "  類比輸入    [%1$d 輸入]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:303
+#: src/frontend/mame/ui/devopt.cpp:306
 #, c-format
 msgid "  Adjuster inputs    [%1$d inputs]\n"
 msgstr "  調節器輸入    [%1$d 輸入]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:305
+#: src/frontend/mame/ui/devopt.cpp:308
 #, c-format
 msgid "  Keypad inputs    [%1$d inputs]\n"
 msgstr "  數字鍵盤輸入    [%1$d 輸入]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:307
+#: src/frontend/mame/ui/devopt.cpp:310
 #, c-format
 msgid "  Keyboard inputs    [%1$d inputs]\n"
 msgstr "  鍵盤輸入    [%1$d 輸入]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:312
+#: src/frontend/mame/ui/devopt.cpp:315
 msgid "* Media Options:\n"
 msgstr "* 媒體選項:\n"
 
-#: src/frontend/mame/ui/devopt.cpp:317
+#: src/frontend/mame/ui/devopt.cpp:320
 #, c-format
 msgid "  %1$s    [tag: %2$s]\n"
 msgstr "  %1$s    [標籤: %2$s]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:327
+#: src/frontend/mame/ui/devopt.cpp:330
 msgid "* Slot Options:\n"
 msgstr "* 插槽選項：\n"
 
-#: src/frontend/mame/ui/devopt.cpp:341
+#: src/frontend/mame/ui/devopt.cpp:344
 msgid "[None]\n"
 msgstr "[ 無 ]\n"
 
-#: src/emu/render.cpp:1847
+#: src/emu/render.cpp:1796
 #, c-format
 msgctxt "view-name"
 msgid "Screen %1$u Standard (%2$u:%3$u)"
 msgstr "畫面  %1$u 標準  (%2$u:%3$u)"
 
-#: src/emu/render.cpp:1873
+#: src/emu/render.cpp:1822
 #, c-format
 msgctxt "view-name"
 msgid "Screen %1$u Pixel Aspect (%2$u:%3$u)"
 msgstr "畫面 %1$u 像素比例 (%2$u:%3$u)"
 
-#: src/emu/render.cpp:1895 src/emu/render.cpp:2030
+#: src/emu/render.cpp:1844 src/emu/render.cpp:1979
 msgctxt "view-name"
 msgid "Cocktail"
 msgstr "檯面型"
 
-#: src/emu/render.cpp:2015
+#: src/emu/render.cpp:1964
 msgctxt "view-name"
 msgid "Left-to-Right"
 msgstr "左至右"
 
-#: src/emu/render.cpp:2016
+#: src/emu/render.cpp:1965
 msgctxt "view-name"
 msgid "Left-to-Right (Gapless)"
 msgstr "左至右 (無邊)"
 
-#: src/emu/render.cpp:2017
+#: src/emu/render.cpp:1966
 msgctxt "view-name"
 msgid "Top-to-Bottom"
 msgstr "上到下"
 
-#: src/emu/render.cpp:2018
+#: src/emu/render.cpp:1967
 msgctxt "view-name"
 msgid "Top-to-Bottom (Gapless)"
 msgstr "上到下 (無邊)"
 
-#: src/emu/render.cpp:2069
+#: src/emu/render.cpp:2018
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Left-to-Right, Top-to-Bottom"
 msgstr "%1$u×%2$u 左至右, 上到下"
 
-#: src/emu/render.cpp:2078
+#: src/emu/render.cpp:2027
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Left-to-Right, Top-to-Bottom (Gapless)"
 msgstr "%1$u×%2$u 左至右, 上到下 (無邊)"
 
-#: src/emu/render.cpp:2087
+#: src/emu/render.cpp:2036
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Top-to-Bottom, Left-to-Right"
 msgstr "%1$u×%2$u 上到下, 左至右"
 
-#: src/emu/render.cpp:2096
+#: src/emu/render.cpp:2045
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Top-to-Bottom, Left-to-Right (Gapless)"
 msgstr "%1$u×%2$u 上到下, 左至右 (無邊)"
 
-#: src/emu/inpttype.ipp:22
+#: src/emu/ioport.cpp:332
+#, c-format
+msgctxt "input-name"
+msgid "P%1$u"
+msgstr "P%1$u"
+
+#: src/emu/ioport.cpp:1924
+msgctxt "input-name"
+msgid "???"
+msgstr ""
+
+#: src/emu/inpttype.ipp:22 src/emu/inpttype.ipp:140 src/emu/inpttype.ipp:221
+#: src/emu/inpttype.ipp:255 src/emu/inpttype.ipp:289 src/emu/inpttype.ipp:323
+#: src/emu/inpttype.ipp:357 src/emu/inpttype.ipp:391 src/emu/inpttype.ipp:425
+#: src/emu/inpttype.ipp:459
+#, c-format
+msgctxt "input-name"
+msgid "%p Up"
+msgstr "%p 上"
+
+#: src/emu/inpttype.ipp:23 src/emu/inpttype.ipp:141 src/emu/inpttype.ipp:222
+#: src/emu/inpttype.ipp:256 src/emu/inpttype.ipp:290 src/emu/inpttype.ipp:324
+#: src/emu/inpttype.ipp:358 src/emu/inpttype.ipp:392 src/emu/inpttype.ipp:426
+#: src/emu/inpttype.ipp:460
+#, c-format
+msgctxt "input-name"
+msgid "%p Down"
+msgstr "%p 下"
+
+#: src/emu/inpttype.ipp:24 src/emu/inpttype.ipp:142 src/emu/inpttype.ipp:223
+#: src/emu/inpttype.ipp:257 src/emu/inpttype.ipp:291 src/emu/inpttype.ipp:325
+#: src/emu/inpttype.ipp:359 src/emu/inpttype.ipp:393 src/emu/inpttype.ipp:427
+#: src/emu/inpttype.ipp:461
+#, c-format
+msgctxt "input-name"
+msgid "%p Left"
+msgstr "%p 左"
+
+#: src/emu/inpttype.ipp:25 src/emu/inpttype.ipp:143 src/emu/inpttype.ipp:224
+#: src/emu/inpttype.ipp:258 src/emu/inpttype.ipp:292 src/emu/inpttype.ipp:326
+#: src/emu/inpttype.ipp:360 src/emu/inpttype.ipp:394 src/emu/inpttype.ipp:428
+#: src/emu/inpttype.ipp:462
+#, c-format
+msgctxt "input-name"
+msgid "%p Right"
+msgstr "%p 右"
+
+#: src/emu/inpttype.ipp:26 src/emu/inpttype.ipp:144 src/emu/inpttype.ipp:225
+#: src/emu/inpttype.ipp:259 src/emu/inpttype.ipp:293 src/emu/inpttype.ipp:327
+#: src/emu/inpttype.ipp:361 src/emu/inpttype.ipp:395 src/emu/inpttype.ipp:429
+#: src/emu/inpttype.ipp:463
+#, c-format
+msgctxt "input-name"
+msgid "%p Right Stick/Up"
+msgstr "%p 右搖桿/上"
+
+#: src/emu/inpttype.ipp:27 src/emu/inpttype.ipp:145 src/emu/inpttype.ipp:226
+#: src/emu/inpttype.ipp:260 src/emu/inpttype.ipp:294 src/emu/inpttype.ipp:328
+#: src/emu/inpttype.ipp:362 src/emu/inpttype.ipp:396 src/emu/inpttype.ipp:430
+#: src/emu/inpttype.ipp:464
+#, c-format
+msgctxt "input-name"
+msgid "%p Right Stick/Down"
+msgstr "%p 右搖桿/下"
+
+#: src/emu/inpttype.ipp:28 src/emu/inpttype.ipp:146 src/emu/inpttype.ipp:227
+#: src/emu/inpttype.ipp:261 src/emu/inpttype.ipp:295 src/emu/inpttype.ipp:329
+#: src/emu/inpttype.ipp:363 src/emu/inpttype.ipp:397 src/emu/inpttype.ipp:431
+#: src/emu/inpttype.ipp:465
+#, c-format
+msgctxt "input-name"
+msgid "%p Right Stick/Left"
+msgstr "%p 右搖桿/左"
+
+#: src/emu/inpttype.ipp:29 src/emu/inpttype.ipp:147 src/emu/inpttype.ipp:228
+#: src/emu/inpttype.ipp:262 src/emu/inpttype.ipp:296 src/emu/inpttype.ipp:330
+#: src/emu/inpttype.ipp:364 src/emu/inpttype.ipp:398 src/emu/inpttype.ipp:432
+#: src/emu/inpttype.ipp:466
+#, c-format
+msgctxt "input-name"
+msgid "%p Right Stick/Right"
+msgstr "%p 右搖桿/右"
+
+#: src/emu/inpttype.ipp:30 src/emu/inpttype.ipp:148 src/emu/inpttype.ipp:229
+#: src/emu/inpttype.ipp:263 src/emu/inpttype.ipp:297 src/emu/inpttype.ipp:331
+#: src/emu/inpttype.ipp:365 src/emu/inpttype.ipp:399 src/emu/inpttype.ipp:433
+#: src/emu/inpttype.ipp:467
+#, c-format
+msgctxt "input-name"
+msgid "%p Left Stick/Up"
+msgstr "%p 左搖桿/上"
+
+#: src/emu/inpttype.ipp:31 src/emu/inpttype.ipp:149 src/emu/inpttype.ipp:230
+#: src/emu/inpttype.ipp:264 src/emu/inpttype.ipp:298 src/emu/inpttype.ipp:332
+#: src/emu/inpttype.ipp:366 src/emu/inpttype.ipp:400 src/emu/inpttype.ipp:434
+#: src/emu/inpttype.ipp:468
+#, c-format
+msgctxt "input-name"
+msgid "%p Left Stick/Down"
+msgstr "%p 左搖桿/下"
+
+#: src/emu/inpttype.ipp:32 src/emu/inpttype.ipp:150 src/emu/inpttype.ipp:231
+#: src/emu/inpttype.ipp:265 src/emu/inpttype.ipp:299 src/emu/inpttype.ipp:333
+#: src/emu/inpttype.ipp:367 src/emu/inpttype.ipp:401 src/emu/inpttype.ipp:435
+#: src/emu/inpttype.ipp:469
+#, c-format
+msgctxt "input-name"
+msgid "%p Left Stick/Left"
+msgstr "%p 左搖桿/左"
+
+#: src/emu/inpttype.ipp:33 src/emu/inpttype.ipp:151 src/emu/inpttype.ipp:232
+#: src/emu/inpttype.ipp:266 src/emu/inpttype.ipp:300 src/emu/inpttype.ipp:334
+#: src/emu/inpttype.ipp:368 src/emu/inpttype.ipp:402 src/emu/inpttype.ipp:436
+#: src/emu/inpttype.ipp:470
+#, c-format
+msgctxt "input-name"
+msgid "%p Left Stick/Right"
+msgstr "%p 左搖桿/右"
+
+#: src/emu/inpttype.ipp:34 src/emu/inpttype.ipp:152 src/emu/inpttype.ipp:233
+#: src/emu/inpttype.ipp:267 src/emu/inpttype.ipp:301 src/emu/inpttype.ipp:335
+#: src/emu/inpttype.ipp:369 src/emu/inpttype.ipp:403 src/emu/inpttype.ipp:437
+#: src/emu/inpttype.ipp:471
+#, c-format
+msgctxt "input-name"
+msgid "%p Button 1"
+msgstr "%p 按鈕 1"
+
+#: src/emu/inpttype.ipp:35 src/emu/inpttype.ipp:153 src/emu/inpttype.ipp:234
+#: src/emu/inpttype.ipp:268 src/emu/inpttype.ipp:302 src/emu/inpttype.ipp:336
+#: src/emu/inpttype.ipp:370 src/emu/inpttype.ipp:404 src/emu/inpttype.ipp:438
+#: src/emu/inpttype.ipp:472
+#, c-format
+msgctxt "input-name"
+msgid "%p Button 2"
+msgstr "%p 按鈕 2"
+
+#: src/emu/inpttype.ipp:36 src/emu/inpttype.ipp:154 src/emu/inpttype.ipp:235
+#: src/emu/inpttype.ipp:269 src/emu/inpttype.ipp:303 src/emu/inpttype.ipp:337
+#: src/emu/inpttype.ipp:371 src/emu/inpttype.ipp:405 src/emu/inpttype.ipp:439
+#: src/emu/inpttype.ipp:473
+#, c-format
+msgctxt "input-name"
+msgid "%p Button 3"
+msgstr "%p 按鈕 3"
+
+#: src/emu/inpttype.ipp:37 src/emu/inpttype.ipp:155 src/emu/inpttype.ipp:236
+#: src/emu/inpttype.ipp:270 src/emu/inpttype.ipp:304 src/emu/inpttype.ipp:338
+#: src/emu/inpttype.ipp:372 src/emu/inpttype.ipp:406 src/emu/inpttype.ipp:440
+#: src/emu/inpttype.ipp:474
+#, c-format
+msgctxt "input-name"
+msgid "%p Button 4"
+msgstr "%p 按鈕 4"
+
+#: src/emu/inpttype.ipp:38 src/emu/inpttype.ipp:156 src/emu/inpttype.ipp:237
+#: src/emu/inpttype.ipp:271 src/emu/inpttype.ipp:305 src/emu/inpttype.ipp:339
+#: src/emu/inpttype.ipp:373 src/emu/inpttype.ipp:407 src/emu/inpttype.ipp:441
+#: src/emu/inpttype.ipp:475
+#, c-format
+msgctxt "input-name"
+msgid "%p Button 5"
+msgstr "%p 按鈕 5"
+
+#: src/emu/inpttype.ipp:39 src/emu/inpttype.ipp:157 src/emu/inpttype.ipp:238
+#: src/emu/inpttype.ipp:272 src/emu/inpttype.ipp:306 src/emu/inpttype.ipp:340
+#: src/emu/inpttype.ipp:374 src/emu/inpttype.ipp:408 src/emu/inpttype.ipp:442
+#: src/emu/inpttype.ipp:476
+#, c-format
+msgctxt "input-name"
+msgid "%p Button 6"
+msgstr "%p 按鈕 6"
+
+#: src/emu/inpttype.ipp:40 src/emu/inpttype.ipp:158 src/emu/inpttype.ipp:239
+#: src/emu/inpttype.ipp:273 src/emu/inpttype.ipp:307 src/emu/inpttype.ipp:341
+#: src/emu/inpttype.ipp:375 src/emu/inpttype.ipp:409 src/emu/inpttype.ipp:443
+#: src/emu/inpttype.ipp:477
+#, c-format
+msgctxt "input-name"
+msgid "%p Button 7"
+msgstr "%p 按鈕 7"
+
+#: src/emu/inpttype.ipp:41 src/emu/inpttype.ipp:159 src/emu/inpttype.ipp:240
+#: src/emu/inpttype.ipp:274 src/emu/inpttype.ipp:308 src/emu/inpttype.ipp:342
+#: src/emu/inpttype.ipp:376 src/emu/inpttype.ipp:410 src/emu/inpttype.ipp:444
+#: src/emu/inpttype.ipp:478
+#, c-format
+msgctxt "input-name"
+msgid "%p Button 8"
+msgstr "%p 按鈕 8"
+
+#: src/emu/inpttype.ipp:42 src/emu/inpttype.ipp:160 src/emu/inpttype.ipp:241
+#: src/emu/inpttype.ipp:275 src/emu/inpttype.ipp:309 src/emu/inpttype.ipp:343
+#: src/emu/inpttype.ipp:377 src/emu/inpttype.ipp:411 src/emu/inpttype.ipp:445
+#: src/emu/inpttype.ipp:479
+#, c-format
+msgctxt "input-name"
+msgid "%p Button 9"
+msgstr "%p 按鈕 9"
+
+#: src/emu/inpttype.ipp:43 src/emu/inpttype.ipp:161 src/emu/inpttype.ipp:242
+#: src/emu/inpttype.ipp:276 src/emu/inpttype.ipp:310 src/emu/inpttype.ipp:344
+#: src/emu/inpttype.ipp:378 src/emu/inpttype.ipp:412 src/emu/inpttype.ipp:446
+#: src/emu/inpttype.ipp:480
+#, c-format
+msgctxt "input-name"
+msgid "%p Button 10"
+msgstr "%p 按鈕 10"
+
+#: src/emu/inpttype.ipp:44 src/emu/inpttype.ipp:162 src/emu/inpttype.ipp:243
+#: src/emu/inpttype.ipp:277 src/emu/inpttype.ipp:311 src/emu/inpttype.ipp:345
+#: src/emu/inpttype.ipp:379 src/emu/inpttype.ipp:413 src/emu/inpttype.ipp:447
+#: src/emu/inpttype.ipp:481
+#, c-format
+msgctxt "input-name"
+msgid "%p Button 11"
+msgstr "%p 按鈕 11"
+
+#: src/emu/inpttype.ipp:45 src/emu/inpttype.ipp:163 src/emu/inpttype.ipp:244
+#: src/emu/inpttype.ipp:278 src/emu/inpttype.ipp:312 src/emu/inpttype.ipp:346
+#: src/emu/inpttype.ipp:380 src/emu/inpttype.ipp:414 src/emu/inpttype.ipp:448
+#: src/emu/inpttype.ipp:482
+#, c-format
 msgctxt "input-name"
-msgid "P1 Up"
-msgstr "P1 上"
+msgid "%p Button 12"
+msgstr "%p 按鈕 12"
 
-#: src/emu/inpttype.ipp:23
+#: src/emu/inpttype.ipp:46 src/emu/inpttype.ipp:164 src/emu/inpttype.ipp:245
+#: src/emu/inpttype.ipp:279 src/emu/inpttype.ipp:313 src/emu/inpttype.ipp:347
+#: src/emu/inpttype.ipp:381 src/emu/inpttype.ipp:415 src/emu/inpttype.ipp:449
+#: src/emu/inpttype.ipp:483
+#, c-format
 msgctxt "input-name"
-msgid "P1 Down"
-msgstr "P1 下"
+msgid "%p Button 13"
+msgstr "%p 按鈕 13"
 
-#: src/emu/inpttype.ipp:24
+#: src/emu/inpttype.ipp:47 src/emu/inpttype.ipp:165 src/emu/inpttype.ipp:246
+#: src/emu/inpttype.ipp:280 src/emu/inpttype.ipp:314 src/emu/inpttype.ipp:348
+#: src/emu/inpttype.ipp:382 src/emu/inpttype.ipp:416 src/emu/inpttype.ipp:450
+#: src/emu/inpttype.ipp:484
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left"
-msgstr "P1 左"
+msgid "%p Button 14"
+msgstr "%p 按鈕 14"
 
-#: src/emu/inpttype.ipp:25
+#: src/emu/inpttype.ipp:48 src/emu/inpttype.ipp:166 src/emu/inpttype.ipp:247
+#: src/emu/inpttype.ipp:281 src/emu/inpttype.ipp:315 src/emu/inpttype.ipp:349
+#: src/emu/inpttype.ipp:383 src/emu/inpttype.ipp:417 src/emu/inpttype.ipp:451
+#: src/emu/inpttype.ipp:485
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right"
-msgstr "P1 右"
+msgid "%p Button 15"
+msgstr "%p 按鈕 15"
 
-#: src/emu/inpttype.ipp:26
+#: src/emu/inpttype.ipp:49 src/emu/inpttype.ipp:167 src/emu/inpttype.ipp:248
+#: src/emu/inpttype.ipp:282 src/emu/inpttype.ipp:316 src/emu/inpttype.ipp:350
+#: src/emu/inpttype.ipp:384 src/emu/inpttype.ipp:418 src/emu/inpttype.ipp:452
+#: src/emu/inpttype.ipp:486
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Up"
-msgstr "P1 右搖桿/上"
+msgid "%p Button 16"
+msgstr "%p 按鈕 16"
 
-#: src/emu/inpttype.ipp:27
+#: src/emu/inpttype.ipp:50 src/emu/inpttype.ipp:168 src/emu/inpttype.ipp:249
+#: src/emu/inpttype.ipp:283 src/emu/inpttype.ipp:317 src/emu/inpttype.ipp:351
+#: src/emu/inpttype.ipp:385 src/emu/inpttype.ipp:419 src/emu/inpttype.ipp:453
+#: src/emu/inpttype.ipp:487
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Down"
-msgstr "P1 右搖桿/下"
+msgid "%p Start"
+msgstr "%p 開始"
 
-#: src/emu/inpttype.ipp:28
+#: src/emu/inpttype.ipp:51 src/emu/inpttype.ipp:169 src/emu/inpttype.ipp:250
+#: src/emu/inpttype.ipp:284 src/emu/inpttype.ipp:318 src/emu/inpttype.ipp:352
+#: src/emu/inpttype.ipp:386 src/emu/inpttype.ipp:420 src/emu/inpttype.ipp:454
+#: src/emu/inpttype.ipp:488
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Left"
-msgstr "P1 右搖桿/左"
+msgid "%p Select"
+msgstr "%p 選擇"
 
-#: src/emu/inpttype.ipp:29
+#: src/emu/inpttype.ipp:56 src/emu/inpttype.ipp:174
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Right"
-msgstr "P1 右搖桿/右"
+msgid "%p Mahjong A"
+msgstr "%p 麻將 A"
 
-#: src/emu/inpttype.ipp:30
+#: src/emu/inpttype.ipp:57 src/emu/inpttype.ipp:175
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Up"
-msgstr "P1 左搖桿/上"
+msgid "%p Mahjong B"
+msgstr "%p 麻將 B"
 
-#: src/emu/inpttype.ipp:31
+#: src/emu/inpttype.ipp:58 src/emu/inpttype.ipp:176
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Down"
-msgstr "P1 左搖桿/下"
+msgid "%p Mahjong C"
+msgstr "%p 麻將 C"
 
-#: src/emu/inpttype.ipp:32
+#: src/emu/inpttype.ipp:59 src/emu/inpttype.ipp:177
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Left"
-msgstr "P1 左搖桿/左"
+msgid "%p Mahjong D"
+msgstr "%p 麻將 D"
 
-#: src/emu/inpttype.ipp:33
+#: src/emu/inpttype.ipp:60 src/emu/inpttype.ipp:178
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Right"
-msgstr "P1 左搖桿/右"
+msgid "%p Mahjong E"
+msgstr "%p 麻將 E"
 
-#: src/emu/inpttype.ipp:34
+#: src/emu/inpttype.ipp:61 src/emu/inpttype.ipp:179
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 1"
-msgstr "P1 按鈕 1"
+msgid "%p Mahjong F"
+msgstr "%p 麻將 F"
 
-#: src/emu/inpttype.ipp:35
+#: src/emu/inpttype.ipp:62 src/emu/inpttype.ipp:180
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 2"
-msgstr "P1 按鈕 2"
+msgid "%p Mahjong G"
+msgstr "%p 麻將 G"
 
-#: src/emu/inpttype.ipp:36
+#: src/emu/inpttype.ipp:63 src/emu/inpttype.ipp:181
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 3"
-msgstr "P1 按鈕 3"
+msgid "%p Mahjong H"
+msgstr "%p 麻將 H"
 
-#: src/emu/inpttype.ipp:37
+#: src/emu/inpttype.ipp:64 src/emu/inpttype.ipp:182
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 4"
-msgstr "P1 按鈕 4"
+msgid "%p Mahjong I"
+msgstr "%p 麻將 I"
 
-#: src/emu/inpttype.ipp:38
+#: src/emu/inpttype.ipp:65 src/emu/inpttype.ipp:183
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 5"
-msgstr "P1 按鈕 5"
+msgid "%p Mahjong J"
+msgstr "%p 麻將 J"
 
-#: src/emu/inpttype.ipp:39
+#: src/emu/inpttype.ipp:66 src/emu/inpttype.ipp:184
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 6"
-msgstr "P1 按鈕 6"
+msgid "%p Mahjong K"
+msgstr "%p 麻將 K"
 
-#: src/emu/inpttype.ipp:40
+#: src/emu/inpttype.ipp:67 src/emu/inpttype.ipp:185
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 7"
-msgstr "P1 按鈕 7"
+msgid "%p Mahjong L"
+msgstr "%p 麻將 L"
 
-#: src/emu/inpttype.ipp:41
+#: src/emu/inpttype.ipp:68 src/emu/inpttype.ipp:186
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 8"
-msgstr "P1 按鈕 8"
+msgid "%p Mahjong M"
+msgstr "%p 麻將 M"
 
-#: src/emu/inpttype.ipp:42
+#: src/emu/inpttype.ipp:69 src/emu/inpttype.ipp:187
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 9"
-msgstr "P1 按鈕 9"
+msgid "%p Mahjong N"
+msgstr "%p 麻將 N"
 
-#: src/emu/inpttype.ipp:43
+#: src/emu/inpttype.ipp:70 src/emu/inpttype.ipp:188
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 10"
-msgstr "P1 按鈕 10"
+msgid "%p Mahjong O"
+msgstr "%p 麻將 O"
 
-#: src/emu/inpttype.ipp:44
+#: src/emu/inpttype.ipp:71 src/emu/inpttype.ipp:189
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 11"
-msgstr "P1 按鈕 11"
+msgid "%p Mahjong P"
+msgstr "%p 麻將 P"
 
-#: src/emu/inpttype.ipp:45
+#: src/emu/inpttype.ipp:72 src/emu/inpttype.ipp:190
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 12"
-msgstr "P1 按鈕 12"
+msgid "%p Mahjong Q"
+msgstr "%p 麻將 Q"
 
-#: src/emu/inpttype.ipp:46
+#: src/emu/inpttype.ipp:73 src/emu/inpttype.ipp:191
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 13"
-msgstr "P1 按鈕 13"
+msgid "%p Mahjong Kan"
+msgstr "%p 麻將 槓"
 
-#: src/emu/inpttype.ipp:47
+#: src/emu/inpttype.ipp:74 src/emu/inpttype.ipp:192
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 14"
-msgstr "P1 按鈕 14"
+msgid "%p Mahjong Pon"
+msgstr "%p 麻將 碰"
 
-#: src/emu/inpttype.ipp:48
+#: src/emu/inpttype.ipp:75 src/emu/inpttype.ipp:193
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 15"
-msgstr "P1 按鈕 15"
+msgid "%p Mahjong Chi"
+msgstr "%p 麻將 吃"
 
-#: src/emu/inpttype.ipp:49
+#: src/emu/inpttype.ipp:76 src/emu/inpttype.ipp:194
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 16"
-msgstr "P1 按鈕 16"
+msgid "%p Mahjong Reach"
+msgstr "%p 麻將 聽"
 
-#: src/emu/inpttype.ipp:50
+#: src/emu/inpttype.ipp:77 src/emu/inpttype.ipp:195
+#, c-format
 msgctxt "input-name"
-msgid "P1 Start"
-msgstr "P1 開始"
+msgid "%p Mahjong Ron"
+msgstr "%p 麻將 胡"
 
-#: src/emu/inpttype.ipp:51
+#: src/emu/inpttype.ipp:78 src/emu/inpttype.ipp:200
+#, c-format
 msgctxt "input-name"
-msgid "P1 Select"
-msgstr "P1 選擇"
+msgid "%p Mahjong Flip Flop"
+msgstr "%p 麻將 交換牌"
 
-#: src/emu/inpttype.ipp:56
+#: src/emu/inpttype.ipp:79 src/emu/inpttype.ipp:196
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong A"
-msgstr "P1 麻將 A"
+msgid "%p Mahjong Bet"
+msgstr "%p 麻將 押分"
 
-#: src/emu/inpttype.ipp:57
+#: src/emu/inpttype.ipp:80 src/emu/inpttype.ipp:198
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong B"
-msgstr "P1 麻將 B"
+msgid "%p Mahjong Take Score"
+msgstr "%p 麻將 得分"
 
-#: src/emu/inpttype.ipp:58
+#: src/emu/inpttype.ipp:81 src/emu/inpttype.ipp:199
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong C"
-msgstr "P1 麻將 C"
+msgid "%p Mahjong Double Up"
+msgstr "%p 麻將 加倍"
 
-#: src/emu/inpttype.ipp:59
+#: src/emu/inpttype.ipp:82 src/emu/inpttype.ipp:201
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong D"
-msgstr "P1 麻將 D"
+msgid "%p Mahjong Big"
+msgstr "%p 麻將 大"
 
-#: src/emu/inpttype.ipp:60
+#: src/emu/inpttype.ipp:83 src/emu/inpttype.ipp:202
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong E"
-msgstr "P1 麻將 E"
+msgid "%p Mahjong Small"
+msgstr "%p 麻將 小"
 
-#: src/emu/inpttype.ipp:61
+#: src/emu/inpttype.ipp:84 src/emu/inpttype.ipp:197
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong F"
-msgstr "P1 麻將 F"
+msgid "%p Mahjong Last Chance"
+msgstr "%p 麻將 海底機會"
 
-#: src/emu/inpttype.ipp:62
+#: src/emu/inpttype.ipp:89 src/emu/inpttype.ipp:207
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong G"
-msgstr "P1 麻將 G"
+msgid "%p Hanafuda A/1"
+msgstr "%p 花牌 A/1"
 
-#: src/emu/inpttype.ipp:63
+#: src/emu/inpttype.ipp:90 src/emu/inpttype.ipp:208
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong H"
-msgstr "P1 麻將 H"
+msgid "%p Hanafuda B/2"
+msgstr "%p 花牌 B/2"
 
-#: src/emu/inpttype.ipp:64
+#: src/emu/inpttype.ipp:91 src/emu/inpttype.ipp:209
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong I"
-msgstr "P1 麻將 I"
+msgid "%p Hanafuda C/3"
+msgstr "%p 花牌 C/3"
 
-#: src/emu/inpttype.ipp:65
+#: src/emu/inpttype.ipp:92 src/emu/inpttype.ipp:210
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong J"
-msgstr "P1 麻將 J"
+msgid "%p Hanafuda D/4"
+msgstr "%p 花牌 D/4"
 
-#: src/emu/inpttype.ipp:66
+#: src/emu/inpttype.ipp:93 src/emu/inpttype.ipp:211
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong K"
-msgstr "P1 麻將 K"
+msgid "%p Hanafuda E/5"
+msgstr "%p 花牌 E/5"
 
-#: src/emu/inpttype.ipp:67
+#: src/emu/inpttype.ipp:94 src/emu/inpttype.ipp:212
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong L"
-msgstr "P1 麻將 L"
+msgid "%p Hanafuda F/6"
+msgstr "%p 花牌 F/6"
 
-#: src/emu/inpttype.ipp:68
+#: src/emu/inpttype.ipp:95 src/emu/inpttype.ipp:213
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong M"
-msgstr "P1 麻將 M"
+msgid "%p Hanafuda G/7"
+msgstr "%p 花牌 G/7"
 
-#: src/emu/inpttype.ipp:69
+#: src/emu/inpttype.ipp:96 src/emu/inpttype.ipp:214
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong N"
-msgstr "P1 麻將 N"
+msgid "%p Hanafuda H/8"
+msgstr "%p 花牌 H/8"
 
-#: src/emu/inpttype.ipp:70
+#: src/emu/inpttype.ipp:97 src/emu/inpttype.ipp:215
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong O"
-msgstr "P1 麻將 O"
+msgid "%p Hanafuda Yes"
+msgstr "%p 花牌 是"
 
-#: src/emu/inpttype.ipp:71
+#: src/emu/inpttype.ipp:98 src/emu/inpttype.ipp:216
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong P"
-msgstr "P1 麻將 P"
-
-#: src/emu/inpttype.ipp:72
-msgctxt "input-name"
-msgid "P1 Mahjong Q"
-msgstr "P1 麻將 Q"
-
-#: src/emu/inpttype.ipp:73
-msgctxt "input-name"
-msgid "P1 Mahjong Kan"
-msgstr "P1 麻將 槓"
-
-#: src/emu/inpttype.ipp:74
-msgctxt "input-name"
-msgid "P1 Mahjong Pon"
-msgstr "P1 麻將 碰"
-
-#: src/emu/inpttype.ipp:75
-msgctxt "input-name"
-msgid "P1 Mahjong Chi"
-msgstr "P1 麻將 吃"
-
-#: src/emu/inpttype.ipp:76
-msgctxt "input-name"
-msgid "P1 Mahjong Reach"
-msgstr "P1 麻將 聽"
-
-#: src/emu/inpttype.ipp:77
-msgctxt "input-name"
-msgid "P1 Mahjong Ron"
-msgstr "P1 麻將 胡"
-
-#: src/emu/inpttype.ipp:78
-msgctxt "input-name"
-msgid "P1 Mahjong Flip Flop"
-msgstr "P1 麻將 交換牌"
-
-#: src/emu/inpttype.ipp:79
-msgctxt "input-name"
-msgid "P1 Mahjong Bet"
-msgstr "P1 麻將 押分"
-
-#: src/emu/inpttype.ipp:80
-msgctxt "input-name"
-msgid "P1 Mahjong Take Score"
-msgstr "P1 麻將 得分"
-
-#: src/emu/inpttype.ipp:81
-msgctxt "input-name"
-msgid "P1 Mahjong Double Up"
-msgstr "P1 麻將 加倍"
-
-#: src/emu/inpttype.ipp:82
-msgctxt "input-name"
-msgid "P1 Mahjong Big"
-msgstr "P1 麻將 大"
-
-#: src/emu/inpttype.ipp:83
-msgctxt "input-name"
-msgid "P1 Mahjong Small"
-msgstr "P1 麻將 小"
-
-#: src/emu/inpttype.ipp:84
-msgctxt "input-name"
-msgid "P1 Mahjong Last Chance"
-msgstr "P1 麻將 海底機會"
-
-#: src/emu/inpttype.ipp:89
-msgctxt "input-name"
-msgid "P1 Hanafuda A/1"
-msgstr "P1 花牌 A/1"
-
-#: src/emu/inpttype.ipp:90
-msgctxt "input-name"
-msgid "P1 Hanafuda B/2"
-msgstr "P1 花牌 B/2"
-
-#: src/emu/inpttype.ipp:91
-msgctxt "input-name"
-msgid "P1 Hanafuda C/3"
-msgstr "P1 花牌 C/3"
-
-#: src/emu/inpttype.ipp:92
-msgctxt "input-name"
-msgid "P1 Hanafuda D/4"
-msgstr "P1 花牌 D/4"
-
-#: src/emu/inpttype.ipp:93
-msgctxt "input-name"
-msgid "P1 Hanafuda E/5"
-msgstr "P1 花牌 E/5"
-
-#: src/emu/inpttype.ipp:94
-msgctxt "input-name"
-msgid "P1 Hanafuda F/6"
-msgstr "P1 花牌 F/6"
-
-#: src/emu/inpttype.ipp:95
-msgctxt "input-name"
-msgid "P1 Hanafuda G/7"
-msgstr "P1 花牌 G/7"
-
-#: src/emu/inpttype.ipp:96
-msgctxt "input-name"
-msgid "P1 Hanafuda H/8"
-msgstr "P1 花牌 H/8"
-
-#: src/emu/inpttype.ipp:97
-msgctxt "input-name"
-msgid "P1 Hanafuda Yes"
-msgstr "P1 花牌 是"
-
-#: src/emu/inpttype.ipp:98
-msgctxt "input-name"
-msgid "P1 Hanafuda No"
-msgstr "P1 花牌 否"
+msgid "%p Hanafuda No"
+msgstr "%p 花牌 否"
 
 #: src/emu/inpttype.ipp:103
 msgctxt "input-name"
@@ -3837,1551 +4007,6 @@ msgctxt "input-name"
 msgid "Stop All Reels"
 msgstr "停止所有捲軸"
 
-#: src/emu/inpttype.ipp:140
-msgctxt "input-name"
-msgid "P2 Up"
-msgstr "P2 上"
-
-#: src/emu/inpttype.ipp:141
-msgctxt "input-name"
-msgid "P2 Down"
-msgstr "P2 下"
-
-#: src/emu/inpttype.ipp:142
-msgctxt "input-name"
-msgid "P2 Left"
-msgstr "P2 左"
-
-#: src/emu/inpttype.ipp:143
-msgctxt "input-name"
-msgid "P2 Right"
-msgstr "P2 右"
-
-#: src/emu/inpttype.ipp:144
-msgctxt "input-name"
-msgid "P2 Right Stick/Up"
-msgstr "P2 右搖桿/上"
-
-#: src/emu/inpttype.ipp:145
-msgctxt "input-name"
-msgid "P2 Right Stick/Down"
-msgstr "P2 右搖桿/下"
-
-#: src/emu/inpttype.ipp:146
-msgctxt "input-name"
-msgid "P2 Right Stick/Left"
-msgstr "P2 右搖桿/左"
-
-#: src/emu/inpttype.ipp:147
-msgctxt "input-name"
-msgid "P2 Right Stick/Right"
-msgstr "P2 右搖桿/右"
-
-#: src/emu/inpttype.ipp:148
-msgctxt "input-name"
-msgid "P2 Left Stick/Up"
-msgstr "P2 左搖桿/上"
-
-#: src/emu/inpttype.ipp:149
-msgctxt "input-name"
-msgid "P2 Left Stick/Down"
-msgstr "P2 左搖桿/下"
-
-#: src/emu/inpttype.ipp:150
-msgctxt "input-name"
-msgid "P2 Left Stick/Left"
-msgstr "P2 左搖桿/左"
-
-#: src/emu/inpttype.ipp:151
-msgctxt "input-name"
-msgid "P2 Left Stick/Right"
-msgstr "P2 左搖桿/右"
-
-#: src/emu/inpttype.ipp:152
-msgctxt "input-name"
-msgid "P2 Button 1"
-msgstr "P2 按鈕 1"
-
-#: src/emu/inpttype.ipp:153
-msgctxt "input-name"
-msgid "P2 Button 2"
-msgstr "P2 按鈕 2"
-
-#: src/emu/inpttype.ipp:154
-msgctxt "input-name"
-msgid "P2 Button 3"
-msgstr "P2 按鈕 3"
-
-#: src/emu/inpttype.ipp:155
-msgctxt "input-name"
-msgid "P2 Button 4"
-msgstr "P2 按鈕 4"
-
-#: src/emu/inpttype.ipp:156
-msgctxt "input-name"
-msgid "P2 Button 5"
-msgstr "P2 按鈕 5"
-
-#: src/emu/inpttype.ipp:157
-msgctxt "input-name"
-msgid "P2 Button 6"
-msgstr "P2 按鈕 6"
-
-#: src/emu/inpttype.ipp:158
-msgctxt "input-name"
-msgid "P2 Button 7"
-msgstr "P2 按鈕 7"
-
-#: src/emu/inpttype.ipp:159
-msgctxt "input-name"
-msgid "P2 Button 8"
-msgstr "P2 按鈕 8"
-
-#: src/emu/inpttype.ipp:160
-msgctxt "input-name"
-msgid "P2 Button 9"
-msgstr "P2 按鈕 9"
-
-#: src/emu/inpttype.ipp:161
-msgctxt "input-name"
-msgid "P2 Button 10"
-msgstr "P2 按鈕 10"
-
-#: src/emu/inpttype.ipp:162
-msgctxt "input-name"
-msgid "P2 Button 11"
-msgstr "P2 按鈕 11"
-
-#: src/emu/inpttype.ipp:163
-msgctxt "input-name"
-msgid "P2 Button 12"
-msgstr "P2 按鈕 12"
-
-#: src/emu/inpttype.ipp:164
-msgctxt "input-name"
-msgid "P2 Button 13"
-msgstr "P2 按鈕 13"
-
-#: src/emu/inpttype.ipp:165
-msgctxt "input-name"
-msgid "P2 Button 14"
-msgstr "P2 按鈕 14"
-
-#: src/emu/inpttype.ipp:166
-msgctxt "input-name"
-msgid "P2 Button 15"
-msgstr "P2 按鈕 15"
-
-#: src/emu/inpttype.ipp:167
-msgctxt "input-name"
-msgid "P2 Button 16"
-msgstr "P2 按鈕 16"
-
-#: src/emu/inpttype.ipp:168
-msgctxt "input-name"
-msgid "P2 Start"
-msgstr "P2 開始"
-
-#: src/emu/inpttype.ipp:169
-msgctxt "input-name"
-msgid "P2 Select"
-msgstr "P2 選擇"
-
-#: src/emu/inpttype.ipp:174
-msgctxt "input-name"
-msgid "P2 Mahjong A"
-msgstr "P2 麻將 A"
-
-#: src/emu/inpttype.ipp:175
-msgctxt "input-name"
-msgid "P2 Mahjong B"
-msgstr "P2 麻將 B"
-
-#: src/emu/inpttype.ipp:176
-msgctxt "input-name"
-msgid "P2 Mahjong C"
-msgstr "P2 麻將 C"
-
-#: src/emu/inpttype.ipp:177
-msgctxt "input-name"
-msgid "P2 Mahjong D"
-msgstr "P2 麻將 D"
-
-#: src/emu/inpttype.ipp:178
-msgctxt "input-name"
-msgid "P2 Mahjong E"
-msgstr "P2 麻將 E"
-
-#: src/emu/inpttype.ipp:179
-msgctxt "input-name"
-msgid "P2 Mahjong F"
-msgstr "P2 麻將 F"
-
-#: src/emu/inpttype.ipp:180
-msgctxt "input-name"
-msgid "P2 Mahjong G"
-msgstr "P2 麻將 G"
-
-#: src/emu/inpttype.ipp:181
-msgctxt "input-name"
-msgid "P2 Mahjong H"
-msgstr "P2 麻將 H"
-
-#: src/emu/inpttype.ipp:182
-msgctxt "input-name"
-msgid "P2 Mahjong I"
-msgstr "P2 麻將 I"
-
-#: src/emu/inpttype.ipp:183
-msgctxt "input-name"
-msgid "P2 Mahjong J"
-msgstr "P2 麻將 J"
-
-#: src/emu/inpttype.ipp:184
-msgctxt "input-name"
-msgid "P2 Mahjong K"
-msgstr "P2 麻將 K"
-
-#: src/emu/inpttype.ipp:185
-msgctxt "input-name"
-msgid "P2 Mahjong L"
-msgstr "P2 麻將 L"
-
-#: src/emu/inpttype.ipp:186
-msgctxt "input-name"
-msgid "P2 Mahjong M"
-msgstr "P2 麻將 M"
-
-#: src/emu/inpttype.ipp:187
-msgctxt "input-name"
-msgid "P2 Mahjong N"
-msgstr "P2 麻將 N"
-
-#: src/emu/inpttype.ipp:188
-msgctxt "input-name"
-msgid "P2 Mahjong O"
-msgstr "P2 麻將 O"
-
-#: src/emu/inpttype.ipp:189
-msgctxt "input-name"
-msgid "P2 Mahjong P"
-msgstr "P2 麻將 P"
-
-#: src/emu/inpttype.ipp:190
-msgctxt "input-name"
-msgid "P2 Mahjong Q"
-msgstr "P2 麻將 Q"
-
-#: src/emu/inpttype.ipp:191
-msgctxt "input-name"
-msgid "P2 Mahjong Kan"
-msgstr "P2 麻將 槓"
-
-#: src/emu/inpttype.ipp:192
-msgctxt "input-name"
-msgid "P2 Mahjong Pon"
-msgstr "P2 麻將 碰"
-
-#: src/emu/inpttype.ipp:193
-msgctxt "input-name"
-msgid "P2 Mahjong Chi"
-msgstr "P2 麻將 吃"
-
-#: src/emu/inpttype.ipp:194
-msgctxt "input-name"
-msgid "P2 Mahjong Reach"
-msgstr "P2 麻將 聽"
-
-#: src/emu/inpttype.ipp:195
-msgctxt "input-name"
-msgid "P2 Mahjong Ron"
-msgstr "P2 麻將 胡"
-
-#: src/emu/inpttype.ipp:196
-msgctxt "input-name"
-msgid "P2 Mahjong Bet"
-msgstr "P2 麻將 押分"
-
-#: src/emu/inpttype.ipp:197
-msgctxt "input-name"
-msgid "P2 Mahjong Last Chance"
-msgstr "P2 麻將 海底機會"
-
-#: src/emu/inpttype.ipp:198
-msgctxt "input-name"
-msgid "P2 Mahjong Take Score"
-msgstr "P2 麻將 得分"
-
-#: src/emu/inpttype.ipp:199
-msgctxt "input-name"
-msgid "P2 Mahjong Double Up"
-msgstr "P2 麻將 加倍"
-
-#: src/emu/inpttype.ipp:200
-msgctxt "input-name"
-msgid "P2 Mahjong Flip Flop"
-msgstr "P2 麻將 交換牌"
-
-#: src/emu/inpttype.ipp:201
-msgctxt "input-name"
-msgid "P2 Mahjong Big"
-msgstr "P2 麻將 大"
-
-#: src/emu/inpttype.ipp:202
-msgctxt "input-name"
-msgid "P2 Mahjong Small"
-msgstr "P2 麻將 小"
-
-#: src/emu/inpttype.ipp:207
-msgctxt "input-name"
-msgid "P2 Hanafuda A/1"
-msgstr "P2 花牌 A/1"
-
-#: src/emu/inpttype.ipp:208
-msgctxt "input-name"
-msgid "P2 Hanafuda B/2"
-msgstr "P2 花牌 B/2"
-
-#: src/emu/inpttype.ipp:209
-msgctxt "input-name"
-msgid "P2 Hanafuda C/3"
-msgstr "P2 花牌 C/3"
-
-#: src/emu/inpttype.ipp:210
-msgctxt "input-name"
-msgid "P2 Hanafuda D/4"
-msgstr "P2 花牌 D/4"
-
-#: src/emu/inpttype.ipp:211
-msgctxt "input-name"
-msgid "P2 Hanafuda E/5"
-msgstr "P2 花牌 E/5"
-
-#: src/emu/inpttype.ipp:212
-msgctxt "input-name"
-msgid "P2 Hanafuda F/6"
-msgstr "P2 花牌 F/6"
-
-#: src/emu/inpttype.ipp:213
-msgctxt "input-name"
-msgid "P2 Hanafuda G/7"
-msgstr "P2 花牌 G/7"
-
-#: src/emu/inpttype.ipp:214
-msgctxt "input-name"
-msgid "P2 Hanafuda H/8"
-msgstr "P2 花牌 H/8"
-
-#: src/emu/inpttype.ipp:215
-msgctxt "input-name"
-msgid "P2 Hanafuda Yes"
-msgstr "P2 花牌 是"
-
-#: src/emu/inpttype.ipp:216
-msgctxt "input-name"
-msgid "P2 Hanafuda No"
-msgstr "P2 花牌 否"
-
-#: src/emu/inpttype.ipp:221
-msgctxt "input-name"
-msgid "P3 Up"
-msgstr "P3 上"
-
-#: src/emu/inpttype.ipp:222
-msgctxt "input-name"
-msgid "P3 Down"
-msgstr "P3 下"
-
-#: src/emu/inpttype.ipp:223
-msgctxt "input-name"
-msgid "P3 Left"
-msgstr "P3 左"
-
-#: src/emu/inpttype.ipp:224
-msgctxt "input-name"
-msgid "P3 Right"
-msgstr "P3 右"
-
-#: src/emu/inpttype.ipp:225
-msgctxt "input-name"
-msgid "P3 Right Stick/Up"
-msgstr "P3 右搖桿/上"
-
-#: src/emu/inpttype.ipp:226
-msgctxt "input-name"
-msgid "P3 Right Stick/Down"
-msgstr "P3 右搖桿/下"
-
-#: src/emu/inpttype.ipp:227
-msgctxt "input-name"
-msgid "P3 Right Stick/Left"
-msgstr "P3 右搖桿/左"
-
-#: src/emu/inpttype.ipp:228
-msgctxt "input-name"
-msgid "P3 Right Stick/Right"
-msgstr "P3 右搖桿/右"
-
-#: src/emu/inpttype.ipp:229
-msgctxt "input-name"
-msgid "P3 Left Stick/Up"
-msgstr "P3 左搖桿/上"
-
-#: src/emu/inpttype.ipp:230
-msgctxt "input-name"
-msgid "P3 Left Stick/Down"
-msgstr "P3 左搖桿/下"
-
-#: src/emu/inpttype.ipp:231
-msgctxt "input-name"
-msgid "P3 Left Stick/Left"
-msgstr "P3 左搖桿/左"
-
-#: src/emu/inpttype.ipp:232
-msgctxt "input-name"
-msgid "P3 Left Stick/Right"
-msgstr "P3 左搖桿/右"
-
-#: src/emu/inpttype.ipp:233
-msgctxt "input-name"
-msgid "P3 Button 1"
-msgstr "P3 按鈕 1"
-
-#: src/emu/inpttype.ipp:234
-msgctxt "input-name"
-msgid "P3 Button 2"
-msgstr "P3 按鈕 2"
-
-#: src/emu/inpttype.ipp:235
-msgctxt "input-name"
-msgid "P3 Button 3"
-msgstr "P3 按鈕 3"
-
-#: src/emu/inpttype.ipp:236
-msgctxt "input-name"
-msgid "P3 Button 4"
-msgstr "P3 按鈕 4"
-
-#: src/emu/inpttype.ipp:237
-msgctxt "input-name"
-msgid "P3 Button 5"
-msgstr "P3 按鈕 5"
-
-#: src/emu/inpttype.ipp:238
-msgctxt "input-name"
-msgid "P3 Button 6"
-msgstr "P3 按鈕 6"
-
-#: src/emu/inpttype.ipp:239
-msgctxt "input-name"
-msgid "P3 Button 7"
-msgstr "P3 按鈕 7"
-
-#: src/emu/inpttype.ipp:240
-msgctxt "input-name"
-msgid "P3 Button 8"
-msgstr "P3 按鈕 8"
-
-#: src/emu/inpttype.ipp:241
-msgctxt "input-name"
-msgid "P3 Button 9"
-msgstr "P3 按鈕 9"
-
-#: src/emu/inpttype.ipp:242
-msgctxt "input-name"
-msgid "P3 Button 10"
-msgstr "P3 按鈕 10"
-
-#: src/emu/inpttype.ipp:243
-msgctxt "input-name"
-msgid "P3 Button 11"
-msgstr "P3 按鈕 11"
-
-#: src/emu/inpttype.ipp:244
-msgctxt "input-name"
-msgid "P3 Button 12"
-msgstr "P3 按鈕 12"
-
-#: src/emu/inpttype.ipp:245
-msgctxt "input-name"
-msgid "P3 Button 13"
-msgstr "P3 按鈕 13"
-
-#: src/emu/inpttype.ipp:246
-msgctxt "input-name"
-msgid "P3 Button 14"
-msgstr "P3 按鈕 14"
-
-#: src/emu/inpttype.ipp:247
-msgctxt "input-name"
-msgid "P3 Button 15"
-msgstr "P3 按鈕 15"
-
-#: src/emu/inpttype.ipp:248
-msgctxt "input-name"
-msgid "P3 Button 16"
-msgstr "P3 按鈕 16"
-
-#: src/emu/inpttype.ipp:249
-msgctxt "input-name"
-msgid "P3 Start"
-msgstr "P3 開始"
-
-#: src/emu/inpttype.ipp:250
-msgctxt "input-name"
-msgid "P3 Select"
-msgstr "P3 選擇"
-
-#: src/emu/inpttype.ipp:255
-msgctxt "input-name"
-msgid "P4 Up"
-msgstr "P4 上"
-
-#: src/emu/inpttype.ipp:256
-msgctxt "input-name"
-msgid "P4 Down"
-msgstr "P4 下"
-
-#: src/emu/inpttype.ipp:257
-msgctxt "input-name"
-msgid "P4 Left"
-msgstr "P4 左"
-
-#: src/emu/inpttype.ipp:258
-msgctxt "input-name"
-msgid "P4 Right"
-msgstr "P4 右"
-
-#: src/emu/inpttype.ipp:259
-msgctxt "input-name"
-msgid "P4 Right Stick/Up"
-msgstr "P4 右搖桿/上"
-
-#: src/emu/inpttype.ipp:260
-msgctxt "input-name"
-msgid "P4 Right Stick/Down"
-msgstr "P4 右搖桿/下"
-
-#: src/emu/inpttype.ipp:261
-msgctxt "input-name"
-msgid "P4 Right Stick/Left"
-msgstr "P4 右搖桿/左"
-
-#: src/emu/inpttype.ipp:262
-msgctxt "input-name"
-msgid "P4 Right Stick/Right"
-msgstr "P4 右搖桿/右"
-
-#: src/emu/inpttype.ipp:263
-msgctxt "input-name"
-msgid "P4 Left Stick/Up"
-msgstr "P4 左搖桿/上"
-
-#: src/emu/inpttype.ipp:264
-msgctxt "input-name"
-msgid "P4 Left Stick/Down"
-msgstr "P4 左搖桿/下"
-
-#: src/emu/inpttype.ipp:265
-msgctxt "input-name"
-msgid "P4 Left Stick/Left"
-msgstr "P4 左搖桿/左"
-
-#: src/emu/inpttype.ipp:266
-msgctxt "input-name"
-msgid "P4 Left Stick/Right"
-msgstr "P4 左搖桿/右"
-
-#: src/emu/inpttype.ipp:267
-msgctxt "input-name"
-msgid "P4 Button 1"
-msgstr "P4 按鈕 1"
-
-#: src/emu/inpttype.ipp:268
-msgctxt "input-name"
-msgid "P4 Button 2"
-msgstr "P4 按鈕 2"
-
-#: src/emu/inpttype.ipp:269
-msgctxt "input-name"
-msgid "P4 Button 3"
-msgstr "P4 按鈕 3"
-
-#: src/emu/inpttype.ipp:270
-msgctxt "input-name"
-msgid "P4 Button 4"
-msgstr "P4 按鈕 4"
-
-#: src/emu/inpttype.ipp:271
-msgctxt "input-name"
-msgid "P4 Button 5"
-msgstr "P4 按鈕 5"
-
-#: src/emu/inpttype.ipp:272
-msgctxt "input-name"
-msgid "P4 Button 6"
-msgstr "P4 按鈕 6"
-
-#: src/emu/inpttype.ipp:273
-msgctxt "input-name"
-msgid "P4 Button 7"
-msgstr "P4 按鈕 7"
-
-#: src/emu/inpttype.ipp:274
-msgctxt "input-name"
-msgid "P4 Button 8"
-msgstr "P4 按鈕 8"
-
-#: src/emu/inpttype.ipp:275
-msgctxt "input-name"
-msgid "P4 Button 9"
-msgstr "P4 按鈕 9"
-
-#: src/emu/inpttype.ipp:276
-msgctxt "input-name"
-msgid "P4 Button 10"
-msgstr "P4 按鈕 10"
-
-#: src/emu/inpttype.ipp:277
-msgctxt "input-name"
-msgid "P4 Button 11"
-msgstr "P4 按鈕 11"
-
-#: src/emu/inpttype.ipp:278
-msgctxt "input-name"
-msgid "P4 Button 12"
-msgstr "P4 按鈕 12"
-
-#: src/emu/inpttype.ipp:279
-msgctxt "input-name"
-msgid "P4 Button 13"
-msgstr "P4 按鈕 13"
-
-#: src/emu/inpttype.ipp:280
-msgctxt "input-name"
-msgid "P4 Button 14"
-msgstr "P4 按鈕 14"
-
-#: src/emu/inpttype.ipp:281
-msgctxt "input-name"
-msgid "P4 Button 15"
-msgstr "P4 按鈕 15"
-
-#: src/emu/inpttype.ipp:282
-msgctxt "input-name"
-msgid "P4 Button 16"
-msgstr "P4 按鈕 16"
-
-#: src/emu/inpttype.ipp:283
-msgctxt "input-name"
-msgid "P4 Start"
-msgstr "P4 開始"
-
-#: src/emu/inpttype.ipp:284
-msgctxt "input-name"
-msgid "P4 Select"
-msgstr "P4 選擇"
-
-#: src/emu/inpttype.ipp:289
-msgctxt "input-name"
-msgid "P5 Up"
-msgstr "P5 上"
-
-#: src/emu/inpttype.ipp:290
-msgctxt "input-name"
-msgid "P5 Down"
-msgstr "P5 下"
-
-#: src/emu/inpttype.ipp:291
-msgctxt "input-name"
-msgid "P5 Left"
-msgstr "P5 左"
-
-#: src/emu/inpttype.ipp:292
-msgctxt "input-name"
-msgid "P5 Right"
-msgstr "P5 右"
-
-#: src/emu/inpttype.ipp:293
-msgctxt "input-name"
-msgid "P5 Right Stick/Up"
-msgstr "P5 右搖桿/上"
-
-#: src/emu/inpttype.ipp:294
-msgctxt "input-name"
-msgid "P5 Right Stick/Down"
-msgstr "P5 右搖桿/下"
-
-#: src/emu/inpttype.ipp:295
-msgctxt "input-name"
-msgid "P5 Right Stick/Left"
-msgstr "P5 右搖桿/左"
-
-#: src/emu/inpttype.ipp:296
-msgctxt "input-name"
-msgid "P5 Right Stick/Right"
-msgstr "P5 右搖桿/右"
-
-#: src/emu/inpttype.ipp:297
-msgctxt "input-name"
-msgid "P5 Left Stick/Up"
-msgstr "P5 左搖桿/上"
-
-#: src/emu/inpttype.ipp:298
-msgctxt "input-name"
-msgid "P5 Left Stick/Down"
-msgstr "P5 左搖桿/下"
-
-#: src/emu/inpttype.ipp:299
-msgctxt "input-name"
-msgid "P5 Left Stick/Left"
-msgstr "P5 左搖桿/左"
-
-#: src/emu/inpttype.ipp:300
-msgctxt "input-name"
-msgid "P5 Left Stick/Right"
-msgstr "P5 左搖桿/右"
-
-#: src/emu/inpttype.ipp:301
-msgctxt "input-name"
-msgid "P5 Button 1"
-msgstr "P5 按鈕 1"
-
-#: src/emu/inpttype.ipp:302
-msgctxt "input-name"
-msgid "P5 Button 2"
-msgstr "P5 按鈕 2"
-
-#: src/emu/inpttype.ipp:303
-msgctxt "input-name"
-msgid "P5 Button 3"
-msgstr "P5 按鈕 3"
-
-#: src/emu/inpttype.ipp:304
-msgctxt "input-name"
-msgid "P5 Button 4"
-msgstr "P5 按鈕 4"
-
-#: src/emu/inpttype.ipp:305
-msgctxt "input-name"
-msgid "P5 Button 5"
-msgstr "P5 按鈕 5"
-
-#: src/emu/inpttype.ipp:306
-msgctxt "input-name"
-msgid "P5 Button 6"
-msgstr "P5 按鈕 6"
-
-#: src/emu/inpttype.ipp:307
-msgctxt "input-name"
-msgid "P5 Button 7"
-msgstr "P5 按鈕 7"
-
-#: src/emu/inpttype.ipp:308
-msgctxt "input-name"
-msgid "P5 Button 8"
-msgstr "P5 按鈕 8"
-
-#: src/emu/inpttype.ipp:309
-msgctxt "input-name"
-msgid "P5 Button 9"
-msgstr "P5 按鈕 9"
-
-#: src/emu/inpttype.ipp:310
-msgctxt "input-name"
-msgid "P5 Button 10"
-msgstr "P5 按鈕 10"
-
-#: src/emu/inpttype.ipp:311
-msgctxt "input-name"
-msgid "P5 Button 11"
-msgstr "P5 按鈕 11"
-
-#: src/emu/inpttype.ipp:312
-msgctxt "input-name"
-msgid "P5 Button 12"
-msgstr "P5 按鈕 12"
-
-#: src/emu/inpttype.ipp:313
-msgctxt "input-name"
-msgid "P5 Button 13"
-msgstr "P5 按鈕 13"
-
-#: src/emu/inpttype.ipp:314
-msgctxt "input-name"
-msgid "P5 Button 14"
-msgstr "P5 按鈕 14"
-
-#: src/emu/inpttype.ipp:315
-msgctxt "input-name"
-msgid "P5 Button 15"
-msgstr "P5 按鈕 15"
-
-#: src/emu/inpttype.ipp:316
-msgctxt "input-name"
-msgid "P5 Button 16"
-msgstr "P5 按鈕 16"
-
-#: src/emu/inpttype.ipp:317
-msgctxt "input-name"
-msgid "P5 Start"
-msgstr "P5 開始"
-
-#: src/emu/inpttype.ipp:318
-msgctxt "input-name"
-msgid "P5 Select"
-msgstr "P5 選擇"
-
-#: src/emu/inpttype.ipp:323
-msgctxt "input-name"
-msgid "P6 Up"
-msgstr "P6 上"
-
-#: src/emu/inpttype.ipp:324
-msgctxt "input-name"
-msgid "P6 Down"
-msgstr "P6 下"
-
-#: src/emu/inpttype.ipp:325
-msgctxt "input-name"
-msgid "P6 Left"
-msgstr "P6 左"
-
-#: src/emu/inpttype.ipp:326
-msgctxt "input-name"
-msgid "P6 Right"
-msgstr "P6 右"
-
-#: src/emu/inpttype.ipp:327
-msgctxt "input-name"
-msgid "P6 Right Stick/Up"
-msgstr "P6 右搖桿/上"
-
-#: src/emu/inpttype.ipp:328
-msgctxt "input-name"
-msgid "P6 Right Stick/Down"
-msgstr "P6 右搖桿/下"
-
-#: src/emu/inpttype.ipp:329
-msgctxt "input-name"
-msgid "P6 Right Stick/Left"
-msgstr "P6 右搖桿/左"
-
-#: src/emu/inpttype.ipp:330
-msgctxt "input-name"
-msgid "P6 Right Stick/Right"
-msgstr "P6 右搖桿/右"
-
-#: src/emu/inpttype.ipp:331
-msgctxt "input-name"
-msgid "P6 Left Stick/Up"
-msgstr "P6 左搖桿/上"
-
-#: src/emu/inpttype.ipp:332
-msgctxt "input-name"
-msgid "P6 Left Stick/Down"
-msgstr "P6 左搖桿/下"
-
-#: src/emu/inpttype.ipp:333
-msgctxt "input-name"
-msgid "P6 Left Stick/Left"
-msgstr "P6 左搖桿/左"
-
-#: src/emu/inpttype.ipp:334
-msgctxt "input-name"
-msgid "P6 Left Stick/Right"
-msgstr "P6 左搖桿/右"
-
-#: src/emu/inpttype.ipp:335
-msgctxt "input-name"
-msgid "P6 Button 1"
-msgstr "P6 按鈕 1"
-
-#: src/emu/inpttype.ipp:336
-msgctxt "input-name"
-msgid "P6 Button 2"
-msgstr "P6 按鈕 2"
-
-#: src/emu/inpttype.ipp:337
-msgctxt "input-name"
-msgid "P6 Button 3"
-msgstr "P6 按鈕 3"
-
-#: src/emu/inpttype.ipp:338
-msgctxt "input-name"
-msgid "P6 Button 4"
-msgstr "P6 按鈕 4"
-
-#: src/emu/inpttype.ipp:339
-msgctxt "input-name"
-msgid "P6 Button 5"
-msgstr "P6 按鈕 5"
-
-#: src/emu/inpttype.ipp:340
-msgctxt "input-name"
-msgid "P6 Button 6"
-msgstr "P6 按鈕 6"
-
-#: src/emu/inpttype.ipp:341
-msgctxt "input-name"
-msgid "P6 Button 7"
-msgstr "P6 按鈕 7"
-
-#: src/emu/inpttype.ipp:342
-msgctxt "input-name"
-msgid "P6 Button 8"
-msgstr "P6 按鈕 8"
-
-#: src/emu/inpttype.ipp:343
-msgctxt "input-name"
-msgid "P6 Button 9"
-msgstr "P6 按鈕 9"
-
-#: src/emu/inpttype.ipp:344
-msgctxt "input-name"
-msgid "P6 Button 10"
-msgstr "P6 按鈕 10"
-
-#: src/emu/inpttype.ipp:345
-msgctxt "input-name"
-msgid "P6 Button 11"
-msgstr "P6 按鈕 11"
-
-#: src/emu/inpttype.ipp:346
-msgctxt "input-name"
-msgid "P6 Button 12"
-msgstr "P6 按鈕 12"
-
-#: src/emu/inpttype.ipp:347
-msgctxt "input-name"
-msgid "P6 Button 13"
-msgstr "P6 按鈕 13"
-
-#: src/emu/inpttype.ipp:348
-msgctxt "input-name"
-msgid "P6 Button 14"
-msgstr "P6 按鈕 14"
-
-#: src/emu/inpttype.ipp:349
-msgctxt "input-name"
-msgid "P6 Button 15"
-msgstr "P6 按鈕 15"
-
-#: src/emu/inpttype.ipp:350
-msgctxt "input-name"
-msgid "P6 Button 16"
-msgstr "P6 按鈕 16"
-
-#: src/emu/inpttype.ipp:351
-msgctxt "input-name"
-msgid "P6 Start"
-msgstr "P6 開始"
-
-#: src/emu/inpttype.ipp:352
-msgctxt "input-name"
-msgid "P6 Select"
-msgstr "P6 選擇"
-
-#: src/emu/inpttype.ipp:357
-msgctxt "input-name"
-msgid "P7 Up"
-msgstr "P7 上"
-
-#: src/emu/inpttype.ipp:358
-msgctxt "input-name"
-msgid "P7 Down"
-msgstr "P7 下"
-
-#: src/emu/inpttype.ipp:359
-msgctxt "input-name"
-msgid "P7 Left"
-msgstr "P7 左"
-
-#: src/emu/inpttype.ipp:360
-msgctxt "input-name"
-msgid "P7 Right"
-msgstr "P7 右"
-
-#: src/emu/inpttype.ipp:361
-msgctxt "input-name"
-msgid "P7 Right Stick/Up"
-msgstr "P7 右搖桿/上"
-
-#: src/emu/inpttype.ipp:362
-msgctxt "input-name"
-msgid "P7 Right Stick/Down"
-msgstr "P7 右搖桿/下"
-
-#: src/emu/inpttype.ipp:363
-msgctxt "input-name"
-msgid "P7 Right Stick/Left"
-msgstr "P7 右搖桿/左"
-
-#: src/emu/inpttype.ipp:364
-msgctxt "input-name"
-msgid "P7 Right Stick/Right"
-msgstr "P7 右搖桿/右"
-
-#: src/emu/inpttype.ipp:365
-msgctxt "input-name"
-msgid "P7 Left Stick/Up"
-msgstr "P7 左搖桿/上"
-
-#: src/emu/inpttype.ipp:366
-msgctxt "input-name"
-msgid "P7 Left Stick/Down"
-msgstr "P7 左搖桿/下"
-
-#: src/emu/inpttype.ipp:367
-msgctxt "input-name"
-msgid "P7 Left Stick/Left"
-msgstr "P7 左搖桿/左"
-
-#: src/emu/inpttype.ipp:368
-msgctxt "input-name"
-msgid "P7 Left Stick/Right"
-msgstr "P7 左搖桿/右"
-
-#: src/emu/inpttype.ipp:369
-msgctxt "input-name"
-msgid "P7 Button 1"
-msgstr "P7 按鈕 1"
-
-#: src/emu/inpttype.ipp:370
-msgctxt "input-name"
-msgid "P7 Button 2"
-msgstr "P7 按鈕 2"
-
-#: src/emu/inpttype.ipp:371
-msgctxt "input-name"
-msgid "P7 Button 3"
-msgstr "P7 按鈕 3"
-
-#: src/emu/inpttype.ipp:372
-msgctxt "input-name"
-msgid "P7 Button 4"
-msgstr "P7 按鈕 4"
-
-#: src/emu/inpttype.ipp:373
-msgctxt "input-name"
-msgid "P7 Button 5"
-msgstr "P7 按鈕 5"
-
-#: src/emu/inpttype.ipp:374
-msgctxt "input-name"
-msgid "P7 Button 6"
-msgstr "P7 按鈕 6"
-
-#: src/emu/inpttype.ipp:375
-msgctxt "input-name"
-msgid "P7 Button 7"
-msgstr "P7 按鈕 7"
-
-#: src/emu/inpttype.ipp:376
-msgctxt "input-name"
-msgid "P7 Button 8"
-msgstr "P7 按鈕 8"
-
-#: src/emu/inpttype.ipp:377
-msgctxt "input-name"
-msgid "P7 Button 9"
-msgstr "P7 按鈕 9"
-
-#: src/emu/inpttype.ipp:378
-msgctxt "input-name"
-msgid "P7 Button 10"
-msgstr "P7 按鈕 10"
-
-#: src/emu/inpttype.ipp:379
-msgctxt "input-name"
-msgid "P7 Button 11"
-msgstr "P7 按鈕 11"
-
-#: src/emu/inpttype.ipp:380
-msgctxt "input-name"
-msgid "P7 Button 12"
-msgstr "P7 按鈕 12"
-
-#: src/emu/inpttype.ipp:381
-msgctxt "input-name"
-msgid "P7 Button 13"
-msgstr "P7 按鈕 13"
-
-#: src/emu/inpttype.ipp:382
-msgctxt "input-name"
-msgid "P7 Button 14"
-msgstr "P7 按鈕 14"
-
-#: src/emu/inpttype.ipp:383
-msgctxt "input-name"
-msgid "P7 Button 15"
-msgstr "P7 按鈕 15"
-
-#: src/emu/inpttype.ipp:384
-msgctxt "input-name"
-msgid "P7 Button 16"
-msgstr "P7 按鈕 16"
-
-#: src/emu/inpttype.ipp:385
-msgctxt "input-name"
-msgid "P7 Start"
-msgstr "P7 開始"
-
-#: src/emu/inpttype.ipp:386
-msgctxt "input-name"
-msgid "P7 Select"
-msgstr "P7 選擇"
-
-#: src/emu/inpttype.ipp:391
-msgctxt "input-name"
-msgid "P8 Up"
-msgstr "P8 上"
-
-#: src/emu/inpttype.ipp:392
-msgctxt "input-name"
-msgid "P8 Down"
-msgstr "P8 下"
-
-#: src/emu/inpttype.ipp:393
-msgctxt "input-name"
-msgid "P8 Left"
-msgstr "P8 左"
-
-#: src/emu/inpttype.ipp:394
-msgctxt "input-name"
-msgid "P8 Right"
-msgstr "P8 右"
-
-#: src/emu/inpttype.ipp:395
-msgctxt "input-name"
-msgid "P8 Right Stick/Up"
-msgstr "P8 右搖桿/上"
-
-#: src/emu/inpttype.ipp:396
-msgctxt "input-name"
-msgid "P8 Right Stick/Down"
-msgstr "P8 右搖桿/下"
-
-#: src/emu/inpttype.ipp:397
-msgctxt "input-name"
-msgid "P8 Right Stick/Left"
-msgstr "P8 右搖桿/左"
-
-#: src/emu/inpttype.ipp:398
-msgctxt "input-name"
-msgid "P8 Right Stick/Right"
-msgstr "P8 右搖桿/右"
-
-#: src/emu/inpttype.ipp:399
-msgctxt "input-name"
-msgid "P8 Left Stick/Up"
-msgstr "P8 左搖桿/上"
-
-#: src/emu/inpttype.ipp:400
-msgctxt "input-name"
-msgid "P8 Left Stick/Down"
-msgstr "P8 左搖桿/下"
-
-#: src/emu/inpttype.ipp:401
-msgctxt "input-name"
-msgid "P8 Left Stick/Left"
-msgstr "P8 左搖桿/左"
-
-#: src/emu/inpttype.ipp:402
-msgctxt "input-name"
-msgid "P8 Left Stick/Right"
-msgstr "P8 左搖桿/右"
-
-#: src/emu/inpttype.ipp:403
-msgctxt "input-name"
-msgid "P8 Button 1"
-msgstr "P8 按鈕 1"
-
-#: src/emu/inpttype.ipp:404
-msgctxt "input-name"
-msgid "P8 Button 2"
-msgstr "P8 按鈕 2"
-
-#: src/emu/inpttype.ipp:405
-msgctxt "input-name"
-msgid "P8 Button 3"
-msgstr "P8 按鈕 3"
-
-#: src/emu/inpttype.ipp:406
-msgctxt "input-name"
-msgid "P8 Button 4"
-msgstr "P8 按鈕 4"
-
-#: src/emu/inpttype.ipp:407
-msgctxt "input-name"
-msgid "P8 Button 5"
-msgstr "P8 按鈕 5"
-
-#: src/emu/inpttype.ipp:408
-msgctxt "input-name"
-msgid "P8 Button 6"
-msgstr "P8 按鈕 6"
-
-#: src/emu/inpttype.ipp:409
-msgctxt "input-name"
-msgid "P8 Button 7"
-msgstr "P8 按鈕 7"
-
-#: src/emu/inpttype.ipp:410
-msgctxt "input-name"
-msgid "P8 Button 8"
-msgstr "P8 按鈕 8"
-
-#: src/emu/inpttype.ipp:411
-msgctxt "input-name"
-msgid "P8 Button 9"
-msgstr "P8 按鈕 9"
-
-#: src/emu/inpttype.ipp:412
-msgctxt "input-name"
-msgid "P8 Button 10"
-msgstr "P8 按鈕 10"
-
-#: src/emu/inpttype.ipp:413
-msgctxt "input-name"
-msgid "P8 Button 11"
-msgstr "P8 按鈕 11"
-
-#: src/emu/inpttype.ipp:414
-msgctxt "input-name"
-msgid "P8 Button 12"
-msgstr "P8 按鈕 12"
-
-#: src/emu/inpttype.ipp:415
-msgctxt "input-name"
-msgid "P8 Button 13"
-msgstr "P8 按鈕 13"
-
-#: src/emu/inpttype.ipp:416
-msgctxt "input-name"
-msgid "P8 Button 14"
-msgstr "P8 按鈕 14"
-
-#: src/emu/inpttype.ipp:417
-msgctxt "input-name"
-msgid "P8 Button 15"
-msgstr "P8 按鈕 15"
-
-#: src/emu/inpttype.ipp:418
-msgctxt "input-name"
-msgid "P8 Button 16"
-msgstr "P8 按鈕 16"
-
-#: src/emu/inpttype.ipp:419
-msgctxt "input-name"
-msgid "P8 Start"
-msgstr "P8 開始"
-
-#: src/emu/inpttype.ipp:420
-msgctxt "input-name"
-msgid "P8 Select"
-msgstr "P8 選擇"
-
-#: src/emu/inpttype.ipp:425
-msgctxt "input-name"
-msgid "P9 Up"
-msgstr "P9 上"
-
-#: src/emu/inpttype.ipp:426
-msgctxt "input-name"
-msgid "P9 Down"
-msgstr "P9 下"
-
-#: src/emu/inpttype.ipp:427
-msgctxt "input-name"
-msgid "P9 Left"
-msgstr "P9 左"
-
-#: src/emu/inpttype.ipp:428
-msgctxt "input-name"
-msgid "P9 Right"
-msgstr "P9 右"
-
-#: src/emu/inpttype.ipp:429
-msgctxt "input-name"
-msgid "P9 Right Stick/Up"
-msgstr "P9 右搖桿/上"
-
-#: src/emu/inpttype.ipp:430
-msgctxt "input-name"
-msgid "P9 Right Stick/Down"
-msgstr "P9 右搖桿/下"
-
-#: src/emu/inpttype.ipp:431
-msgctxt "input-name"
-msgid "P9 Right Stick/Left"
-msgstr "P9 右搖桿/左"
-
-#: src/emu/inpttype.ipp:432
-msgctxt "input-name"
-msgid "P9 Right Stick/Right"
-msgstr "P9 右搖桿/右"
-
-#: src/emu/inpttype.ipp:433
-msgctxt "input-name"
-msgid "P9 Left Stick/Up"
-msgstr "P9 左搖桿/上"
-
-#: src/emu/inpttype.ipp:434
-msgctxt "input-name"
-msgid "P9 Left Stick/Down"
-msgstr "P9 左搖桿/下"
-
-#: src/emu/inpttype.ipp:435
-msgctxt "input-name"
-msgid "P9 Left Stick/Left"
-msgstr "P9 左搖桿/左"
-
-#: src/emu/inpttype.ipp:436
-msgctxt "input-name"
-msgid "P9 Left Stick/Right"
-msgstr "P9 左搖桿/右"
-
-#: src/emu/inpttype.ipp:437
-msgctxt "input-name"
-msgid "P9 Button 1"
-msgstr "P9 按鈕 1"
-
-#: src/emu/inpttype.ipp:438
-msgctxt "input-name"
-msgid "P9 Button 2"
-msgstr "P9 按鈕 2"
-
-#: src/emu/inpttype.ipp:439
-msgctxt "input-name"
-msgid "P9 Button 3"
-msgstr "P9 按鈕 3"
-
-#: src/emu/inpttype.ipp:440
-msgctxt "input-name"
-msgid "P9 Button 4"
-msgstr "P9 按鈕 4"
-
-#: src/emu/inpttype.ipp:441
-msgctxt "input-name"
-msgid "P9 Button 5"
-msgstr "P9 按鈕 5"
-
-#: src/emu/inpttype.ipp:442
-msgctxt "input-name"
-msgid "P9 Button 6"
-msgstr "P9 按鈕 6"
-
-#: src/emu/inpttype.ipp:443
-msgctxt "input-name"
-msgid "P9 Button 7"
-msgstr "P9 按鈕 7"
-
-#: src/emu/inpttype.ipp:444
-msgctxt "input-name"
-msgid "P9 Button 8"
-msgstr "P9 按鈕 8"
-
-#: src/emu/inpttype.ipp:445
-msgctxt "input-name"
-msgid "P9 Button 9"
-msgstr "P9 按鈕 9"
-
-#: src/emu/inpttype.ipp:446
-msgctxt "input-name"
-msgid "P9 Button 10"
-msgstr "P9 按鈕 10"
-
-#: src/emu/inpttype.ipp:447
-msgctxt "input-name"
-msgid "P9 Button 11"
-msgstr "P9 按鈕 11"
-
-#: src/emu/inpttype.ipp:448
-msgctxt "input-name"
-msgid "P9 Button 12"
-msgstr "P9 按鈕 12"
-
-#: src/emu/inpttype.ipp:449
-msgctxt "input-name"
-msgid "P9 Button 13"
-msgstr "P9 按鈕 13"
-
-#: src/emu/inpttype.ipp:450
-msgctxt "input-name"
-msgid "P9 Button 14"
-msgstr "P9 按鈕 14"
-
-#: src/emu/inpttype.ipp:451
-msgctxt "input-name"
-msgid "P9 Button 15"
-msgstr "P9 按鈕 15"
-
-#: src/emu/inpttype.ipp:452
-msgctxt "input-name"
-msgid "P9 Button 16"
-msgstr "P9 按鈕 16"
-
-#: src/emu/inpttype.ipp:453
-msgctxt "input-name"
-msgid "P9 Start"
-msgstr "P9 開始"
-
-#: src/emu/inpttype.ipp:454
-msgctxt "input-name"
-msgid "P9 Select"
-msgstr "P9 選擇"
-
-#: src/emu/inpttype.ipp:459
-msgctxt "input-name"
-msgid "P10 Up"
-msgstr "P10 上"
-
-#: src/emu/inpttype.ipp:460
-msgctxt "input-name"
-msgid "P10 Down"
-msgstr "P10 下"
-
-#: src/emu/inpttype.ipp:461
-msgctxt "input-name"
-msgid "P10 Left"
-msgstr "P10 左"
-
-#: src/emu/inpttype.ipp:462
-msgctxt "input-name"
-msgid "P10 Right"
-msgstr "P10 右"
-
-#: src/emu/inpttype.ipp:463
-msgctxt "input-name"
-msgid "P10 Right Stick/Up"
-msgstr "P10 右搖桿/上"
-
-#: src/emu/inpttype.ipp:464
-msgctxt "input-name"
-msgid "P10 Right Stick/Down"
-msgstr "P10 右搖桿/下"
-
-#: src/emu/inpttype.ipp:465
-msgctxt "input-name"
-msgid "P10 Right Stick/Left"
-msgstr "P10 右搖桿/左"
-
-#: src/emu/inpttype.ipp:466
-msgctxt "input-name"
-msgid "P10 Right Stick/Right"
-msgstr "P10 右搖桿/右"
-
-#: src/emu/inpttype.ipp:467
-msgctxt "input-name"
-msgid "P10 Left Stick/Up"
-msgstr "P10 左搖桿/上"
-
-#: src/emu/inpttype.ipp:468
-msgctxt "input-name"
-msgid "P10 Left Stick/Down"
-msgstr "P10 左搖桿/下"
-
-#: src/emu/inpttype.ipp:469
-msgctxt "input-name"
-msgid "P10 Left Stick/Left"
-msgstr "P10 左搖桿/左"
-
-#: src/emu/inpttype.ipp:470
-msgctxt "input-name"
-msgid "P10 Left Stick/Right"
-msgstr "P10 左搖桿/右"
-
-#: src/emu/inpttype.ipp:471
-msgctxt "input-name"
-msgid "P10 Button 1"
-msgstr "P10 按鈕 1"
-
-#: src/emu/inpttype.ipp:472
-msgctxt "input-name"
-msgid "P10 Button 2"
-msgstr "P10 按鈕 2"
-
-#: src/emu/inpttype.ipp:473
-msgctxt "input-name"
-msgid "P10 Button 3"
-msgstr "P10 按鈕 3"
-
-#: src/emu/inpttype.ipp:474
-msgctxt "input-name"
-msgid "P10 Button 4"
-msgstr "P10 按鈕 4"
-
-#: src/emu/inpttype.ipp:475
-msgctxt "input-name"
-msgid "P10 Button 5"
-msgstr "P10 按鈕 5"
-
-#: src/emu/inpttype.ipp:476
-msgctxt "input-name"
-msgid "P10 Button 6"
-msgstr "P10 按鈕 6"
-
-#: src/emu/inpttype.ipp:477
-msgctxt "input-name"
-msgid "P10 Button 7"
-msgstr "P10 按鈕 7"
-
-#: src/emu/inpttype.ipp:478
-msgctxt "input-name"
-msgid "P10 Button 8"
-msgstr "P10 按鈕 8"
-
-#: src/emu/inpttype.ipp:479
-msgctxt "input-name"
-msgid "P10 Button 9"
-msgstr "P10 按鈕 9"
-
-#: src/emu/inpttype.ipp:480
-msgctxt "input-name"
-msgid "P10 Button 10"
-msgstr "P10 按鈕 10"
-
-#: src/emu/inpttype.ipp:481
-msgctxt "input-name"
-msgid "P10 Button 11"
-msgstr "P10 按鈕 11"
-
-#: src/emu/inpttype.ipp:482
-msgctxt "input-name"
-msgid "P10 Button 12"
-msgstr "P10 按鈕 12"
-
-#: src/emu/inpttype.ipp:483
-msgctxt "input-name"
-msgid "P10 Button 13"
-msgstr "P10 按鈕 13"
-
-#: src/emu/inpttype.ipp:484
-msgctxt "input-name"
-msgid "P10 Button 14"
-msgstr "P10 按鈕 14"
-
-#: src/emu/inpttype.ipp:485
-msgctxt "input-name"
-msgid "P10 Button 15"
-msgstr "P10 按鈕 15"
-
-#: src/emu/inpttype.ipp:486
-msgctxt "input-name"
-msgid "P10 Button 16"
-msgstr "P10 按鈕 16"
-
-#: src/emu/inpttype.ipp:487
-msgctxt "input-name"
-msgid "P10 Start"
-msgstr "P10 開始"
-
-#: src/emu/inpttype.ipp:488
-msgctxt "input-name"
-msgid "P10 Select"
-msgstr "P10 選擇"
-
 #: src/emu/inpttype.ipp:493
 msgctxt "input-name"
 msgid "1 Player Start"
@@ -5562,155 +4187,32 @@ msgctxt "input-name"
 msgid "Volume Up"
 msgstr "音量提升"
 
-#: src/emu/inpttype.ipp:550
-msgctxt "input-name"
-msgid "P1 Pedal 1"
-msgstr "P1 踏板 1"
-
-#: src/emu/inpttype.ipp:551
-msgctxt "input-name"
-msgid "P2 Pedal 1"
-msgstr "P2 踏板 1"
-
-#: src/emu/inpttype.ipp:552
-msgctxt "input-name"
-msgid "P3 Pedal 1"
-msgstr "P3 踏板 1"
-
-#: src/emu/inpttype.ipp:553
-msgctxt "input-name"
-msgid "P4 Pedal 1"
-msgstr "P4 踏板 1"
-
-#: src/emu/inpttype.ipp:554
-msgctxt "input-name"
-msgid "P5 Pedal 1"
-msgstr "P5 踏板 1"
-
-#: src/emu/inpttype.ipp:555
-msgctxt "input-name"
-msgid "P6 Pedal 1"
-msgstr "P6 踏板 1"
-
-#: src/emu/inpttype.ipp:556
-msgctxt "input-name"
-msgid "P7 Pedal 1"
-msgstr "P7 踏板 1"
-
-#: src/emu/inpttype.ipp:557
-msgctxt "input-name"
-msgid "P8 Pedal 1"
-msgstr "P8 踏板 1"
-
-#: src/emu/inpttype.ipp:558
-msgctxt "input-name"
-msgid "P9 Pedal 1"
-msgstr "P9 踏板 1"
-
+#: src/emu/inpttype.ipp:550 src/emu/inpttype.ipp:551 src/emu/inpttype.ipp:552
+#: src/emu/inpttype.ipp:553 src/emu/inpttype.ipp:554 src/emu/inpttype.ipp:555
+#: src/emu/inpttype.ipp:556 src/emu/inpttype.ipp:557 src/emu/inpttype.ipp:558
 #: src/emu/inpttype.ipp:559
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 1"
-msgstr "P10 踏板 1"
-
-#: src/emu/inpttype.ipp:564
-msgctxt "input-name"
-msgid "P1 Pedal 2"
-msgstr "P1 踏板 2"
-
-#: src/emu/inpttype.ipp:565
-msgctxt "input-name"
-msgid "P2 Pedal 2"
-msgstr "P2 踏板 2"
-
-#: src/emu/inpttype.ipp:566
-msgctxt "input-name"
-msgid "P3 Pedal 2"
-msgstr "P3 踏板 2"
-
-#: src/emu/inpttype.ipp:567
-msgctxt "input-name"
-msgid "P4 Pedal 2"
-msgstr "P4 踏板 2"
-
-#: src/emu/inpttype.ipp:568
-msgctxt "input-name"
-msgid "P5 Pedal 2"
-msgstr "P5 踏板 2"
-
-#: src/emu/inpttype.ipp:569
-msgctxt "input-name"
-msgid "P6 Pedal 2"
-msgstr "P6 踏板 2"
-
-#: src/emu/inpttype.ipp:570
-msgctxt "input-name"
-msgid "P7 Pedal 2"
-msgstr "P7 踏板 2"
-
-#: src/emu/inpttype.ipp:571
-msgctxt "input-name"
-msgid "P8 Pedal 2"
-msgstr "P8 踏板 2"
-
-#: src/emu/inpttype.ipp:572
-msgctxt "input-name"
-msgid "P9 Pedal 2"
-msgstr "P9 踏板 2"
+msgid "%p Pedal 1"
+msgstr "%p 踏板 1"
 
+#: src/emu/inpttype.ipp:564 src/emu/inpttype.ipp:565 src/emu/inpttype.ipp:566
+#: src/emu/inpttype.ipp:567 src/emu/inpttype.ipp:568 src/emu/inpttype.ipp:569
+#: src/emu/inpttype.ipp:570 src/emu/inpttype.ipp:571 src/emu/inpttype.ipp:572
 #: src/emu/inpttype.ipp:573
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 2"
-msgstr "P10 踏板 2"
-
-#: src/emu/inpttype.ipp:578
-msgctxt "input-name"
-msgid "P1 Pedal 3"
-msgstr "P1 踏板 3"
-
-#: src/emu/inpttype.ipp:579
-msgctxt "input-name"
-msgid "P2 Pedal 3"
-msgstr "P2 踏板 3"
-
-#: src/emu/inpttype.ipp:580
-msgctxt "input-name"
-msgid "P3 Pedal 3"
-msgstr "P3 踏板 3"
-
-#: src/emu/inpttype.ipp:581
-msgctxt "input-name"
-msgid "P4 Pedal 3"
-msgstr "P4 踏板 3"
-
-#: src/emu/inpttype.ipp:582
-msgctxt "input-name"
-msgid "P5 Pedal 3"
-msgstr "P5 踏板 3"
-
-#: src/emu/inpttype.ipp:583
-msgctxt "input-name"
-msgid "P6 Pedal 3"
-msgstr "P6 踏板 3"
-
-#: src/emu/inpttype.ipp:584
-msgctxt "input-name"
-msgid "P7 Pedal 3"
-msgstr "P7 踏板 3"
-
-#: src/emu/inpttype.ipp:585
-msgctxt "input-name"
-msgid "P8 Pedal 3"
-msgstr "P8 踏板 3"
-
-#: src/emu/inpttype.ipp:586
-msgctxt "input-name"
-msgid "P9 Pedal 3"
-msgstr "P9 踏板 3"
+msgid "%p Pedal 2"
+msgstr "%p 踏板 2"
 
+#: src/emu/inpttype.ipp:578 src/emu/inpttype.ipp:579 src/emu/inpttype.ipp:580
+#: src/emu/inpttype.ipp:581 src/emu/inpttype.ipp:582 src/emu/inpttype.ipp:583
+#: src/emu/inpttype.ipp:584 src/emu/inpttype.ipp:585 src/emu/inpttype.ipp:586
 #: src/emu/inpttype.ipp:587
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 3"
-msgstr "P10 踏板 3"
+msgid "%p Pedal 3"
+msgstr "%p 踏板 3"
 
 #: src/emu/inpttype.ipp:592
 msgctxt "input-name"
@@ -7604,3 +6106,44 @@ msgid ""
 msgstr ""
 "輸入序列或按下 %s 取消\n"
 "%s"
+
+#~ msgid "Confirm quit from machines"
+#~ msgstr "確認離開機台"
+
+#~ msgid "Skip information screen at startup"
+#~ msgstr "略過起始的資訊畫面"
+
+#~ msgid "Skip software parts selection menu"
+#~ msgstr "略過軟體部分選擇選單"
+
+#~ msgid "Simultaneous contradictory"
+#~ msgstr "同時發生的對立狀況"
+
+#, c-format
+#~ msgid ""
+#~ "Auditing ROMs for machine %2$u of %3$u...\n"
+#~ "%1$s"
+#~ msgstr ""
+#~ "正在驗證供機台 %2$u 的 %3$u ROM 檔...\n"
+#~ "%1$s"
+
+#, c-format
+#~ msgid "Audit ROMs for %1$u machines marked unavailable"
+#~ msgstr "驗證標記為不可用的 %1$u 機台 ROM 檔"
+
+#, c-format
+#~ msgid "Audit ROMs for all %1$u machines"
+#~ msgstr "驗證所有 %1$u 機台的 ROM 檔"
+
+#~ msgid "ROM Audit Result\tOK\n"
+#~ msgstr "ROM 驗證結果\tOK\n"
+
+#~ msgid "ROM Audit Result\tBAD\n"
+#~ msgstr "ROM 驗證結果\t錯誤\n"
+
+#~ msgid ""
+#~ "ROM Audit \tDisabled\n"
+#~ "Samples Audit \tDisabled\n"
+#~ msgstr ""
+#~ "ROM 驗證 \t停用\n"
+#~ "樣本檔驗證 \t停用\n"
diff --git a/language/Croatian/strings.po b/language/Croatian/strings.po
index fa49e436cfd..e87ba97ffe0 100644
--- a/language/Croatian/strings.po
+++ b/language/Croatian/strings.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-19 02:50+1100\n"
+"POT-Creation-Date: 2021-12-09 04:44+1100\n"
 "PO-Revision-Date: 2016-02-20 18:03+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: MAME Language Team\n"
@@ -261,12 +261,12 @@ msgstr ""
 msgid "Driver: \"%1$s\" software list "
 msgstr ""
 
-#: src/frontend/mame/ui/selsoft.cpp:711 src/frontend/mame/ui/selgame.cpp:1066
+#: src/frontend/mame/ui/selsoft.cpp:711 src/frontend/mame/ui/selgame.cpp:1076
 #, c-format
 msgid "%1$s: %2$s - Search: %3$s_"
 msgstr ""
 
-#: src/frontend/mame/ui/selsoft.cpp:713 src/frontend/mame/ui/selgame.cpp:1068
+#: src/frontend/mame/ui/selsoft.cpp:713 src/frontend/mame/ui/selgame.cpp:1078
 #, c-format
 msgid "Search: %1$s_"
 msgstr ""
@@ -276,7 +276,7 @@ msgstr ""
 msgid "Software list/item: %1$s:%2$s"
 msgstr ""
 
-#: src/frontend/mame/ui/optsmenu.cpp:73 src/frontend/mame/ui/sndmenu.cpp:165
+#: src/frontend/mame/ui/optsmenu.cpp:73 src/frontend/mame/ui/sndmenu.cpp:161
 msgid "Sound Options"
 msgstr ""
 
@@ -371,11 +371,11 @@ msgid "Show mouse pointer"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:39
-msgid "Confirm quit from machines"
+msgid "Confirm quit from emulation"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:40
-msgid "Skip information screen at startup"
+msgid "Skip system information screen"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:41
@@ -391,7 +391,7 @@ msgid "Skip BIOS selection menu"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:44
-msgid "Skip software parts selection menu"
+msgid "Skip software part selection menu"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:45
@@ -543,7 +543,7 @@ msgid "UI active"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:91
-msgid "Offscreen reload"
+msgid "Off-screen reload"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:92
@@ -559,7 +559,7 @@ msgid "Natural keyboard"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:95
-msgid "Simultaneous contradictory"
+msgid "Allow contradictory joystick inputs"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:96
@@ -583,7 +583,7 @@ msgid "Pedal Device Assignment"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:106
-msgid "Adstick Device Assignment"
+msgid "AD Stick Device Assignment"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:107
@@ -670,14 +670,14 @@ msgstr ""
 msgid "Wait Vertical Sync"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:687
+#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:689
 #: src/frontend/mame/ui/videoopt.cpp:191 src/frontend/mame/ui/custui.cpp:490
 #: src/frontend/mame/ui/analogipt.cpp:471 plugins/cheatfind/init.lua:766
 #: plugins/cheatfind/init.lua:777 plugins/cheat/init.lua:668
 msgid "On"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:690
+#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:692
 #: src/frontend/mame/ui/videoopt.cpp:207 src/frontend/mame/ui/custui.cpp:490
 #: src/frontend/mame/ui/analogipt.cpp:471 plugins/cheatfind/init.lua:763
 #: plugins/cheatfind/init.lua:774 plugins/cheat/init.lua:671
@@ -685,11 +685,11 @@ msgstr ""
 msgid "Off"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:693
+#: src/frontend/mame/ui/menu.cpp:695
 msgid "Auto"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:1195
+#: src/frontend/mame/ui/menu.cpp:1197
 #: src/frontend/mame/ui/simpleselgame.cpp:278
 #: src/frontend/mame/ui/selmenu.cpp:1280
 msgid "Return to Previous Menu"
@@ -697,7 +697,7 @@ msgstr ""
 
 #: src/frontend/mame/ui/filemngr.cpp:139
 #: src/frontend/mame/ui/confswitch.cpp:119
-#: src/frontend/mame/ui/inputmap.cpp:559 src/frontend/mame/ui/analogipt.cpp:360
+#: src/frontend/mame/ui/inputmap.cpp:563 src/frontend/mame/ui/analogipt.cpp:360
 #, c-format
 msgid "[root%1$s]"
 msgstr ""
@@ -940,22 +940,22 @@ msgid ""
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "GHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "MHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "kHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "Hz"
 msgstr ""
 
@@ -979,38 +979,38 @@ msgstr ""
 msgid "Vector"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:480
+#: src/frontend/mame/ui/info.cpp:483
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:480
+#: src/frontend/mame/ui/info.cpp:483
 msgid "%2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:497
+#: src/frontend/mame/ui/info.cpp:500
 #, c-format
 msgid "Screen '%1$s'"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:499
+#: src/frontend/mame/ui/info.cpp:502
 msgid "Screen"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:570 src/frontend/mame/ui/info.cpp:581
+#: src/frontend/mame/ui/info.cpp:573 src/frontend/mame/ui/info.cpp:584
 #, c-format
 msgid "%1$s:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:662
+#: src/frontend/mame/ui/info.cpp:665
 msgid "Not supported"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:665
+#: src/frontend/mame/ui/info.cpp:668
 msgid "Partially supported"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:674
+#: src/frontend/mame/ui/info.cpp:677
 msgid "[empty]"
 msgstr ""
 
@@ -1083,7 +1083,7 @@ msgid "Emulated"
 msgstr ""
 
 #: src/frontend/mame/ui/keyboard.cpp:59 src/frontend/mame/ui/confswitch.cpp:117
-#: src/frontend/mame/ui/inputmap.cpp:557 src/frontend/mame/ui/analogipt.cpp:358
+#: src/frontend/mame/ui/inputmap.cpp:561 src/frontend/mame/ui/analogipt.cpp:358
 #, c-format
 msgid "%1$s [root%2$s]"
 msgstr ""
@@ -1443,7 +1443,7 @@ msgctxt "swlist-info"
 msgid "Software list/item"
 msgstr ""
 
-#: src/frontend/mame/ui/datmenu.cpp:88 src/frontend/mame/ui/selmenu.cpp:2698
+#: src/frontend/mame/ui/datmenu.cpp:88 src/frontend/mame/ui/selmenu.cpp:2707
 msgid "Software List Info"
 msgstr ""
 
@@ -1558,7 +1558,7 @@ msgstr ""
 msgid "Configure Machine:"
 msgstr ""
 
-#: src/frontend/mame/ui/miscmenu.cpp:858 src/frontend/mame/ui/selmenu.cpp:2638
+#: src/frontend/mame/ui/miscmenu.cpp:858 src/frontend/mame/ui/selmenu.cpp:2647
 msgid " (default)"
 msgstr ""
 
@@ -1575,7 +1575,7 @@ msgid ""
 "Press %2$s to return to emulation"
 msgstr ""
 
-#: src/frontend/mame/ui/info_pty.cpp:30 src/frontend/mame/ui/mainmenu.cpp:155
+#: src/frontend/mame/ui/info_pty.cpp:30
 msgid "Pseudo terminals"
 msgstr ""
 
@@ -1643,52 +1643,52 @@ msgstr ""
 msgid "Other Controls"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:227
+#: src/frontend/mame/ui/inputmap.cpp:231
 msgid "This machine has no configurable inputs."
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:327
+#: src/frontend/mame/ui/inputmap.cpp:331
 msgid "Pressed"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:397
+#: src/frontend/mame/ui/inputmap.cpp:401
 msgid "Invalid sequence entered"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:542
+#: src/frontend/mame/ui/inputmap.cpp:546
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:543
+#: src/frontend/mame/ui/inputmap.cpp:547
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog Inc"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:544
+#: src/frontend/mame/ui/inputmap.cpp:548
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog Dec"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:586
+#: src/frontend/mame/ui/inputmap.cpp:590
 #, c-format
 msgid "Press %1$s to set\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:587
+#: src/frontend/mame/ui/inputmap.cpp:591
 #, c-format
 msgid "Press %1$s to append\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:588
+#: src/frontend/mame/ui/inputmap.cpp:592
 #, c-format
 msgid "Press %1$s to clear\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:589
+#: src/frontend/mame/ui/inputmap.cpp:593
 #, c-format
 msgid "Press %1$s to restore default\n"
 msgstr ""
@@ -1752,7 +1752,7 @@ msgid ""
 msgstr ""
 
 #: src/frontend/mame/ui/simpleselgame.cpp:273
-#: src/frontend/mame/ui/selgame.cpp:436
+#: src/frontend/mame/ui/selgame.cpp:443
 msgid "Configure Options"
 msgstr ""
 
@@ -2080,16 +2080,16 @@ msgstr ""
 msgid "Expand to fit"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:437
+#: src/frontend/mame/ui/selgame.cpp:444
 msgid "Configure Machine"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:1050
+#: src/frontend/mame/ui/selgame.cpp:1060
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d machines (%5$d BIOS) )"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:1078
+#: src/frontend/mame/ui/selgame.cpp:1088
 #, c-format
 msgid "System: %1$-.100s"
 msgstr ""
@@ -2111,7 +2111,7 @@ msgstr ""
 #: src/frontend/mame/ui/auditmenu.cpp:98
 #, c-format
 msgid ""
-"Auditing ROMs for machine %2$u of %3$u...\n"
+"Auditing media for machine %2$u of %3$u...\n"
 "%1$s"
 msgstr ""
 
@@ -2126,12 +2126,12 @@ msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:136
 #, c-format
-msgid "Audit ROMs for %1$u machines marked unavailable"
+msgid "Audit media for %1$u machines marked unavailable"
 msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:137
 #, c-format
-msgid "Audit ROMs for all %1$u machines"
+msgid "Audit media for all %1$u machines"
 msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:154
@@ -2337,84 +2337,84 @@ msgctxt "color-sample"
 msgid "Clone"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:914
+#: src/frontend/mame/ui/custui.cpp:906
 msgid "ARGB Settings"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:919 src/frontend/mame/ui/custui.cpp:922
+#: src/frontend/mame/ui/custui.cpp:911 src/frontend/mame/ui/custui.cpp:914
 msgctxt "color-channel"
 msgid "Alpha"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:927 src/frontend/mame/ui/custui.cpp:930
+#: src/frontend/mame/ui/custui.cpp:919 src/frontend/mame/ui/custui.cpp:922
 msgctxt "color-channel"
 msgid "Red"
 msgstr ""
 
+#: src/frontend/mame/ui/custui.cpp:927 src/frontend/mame/ui/custui.cpp:930
+msgctxt "color-channel"
+msgid "Green"
+msgstr ""
+
 #: src/frontend/mame/ui/custui.cpp:935 src/frontend/mame/ui/custui.cpp:938
 msgctxt "color-channel"
-msgid "Green"
-msgstr ""
-
-#: src/frontend/mame/ui/custui.cpp:943 src/frontend/mame/ui/custui.cpp:946
-msgctxt "color-channel"
 msgid "Blue"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:949
+#: src/frontend/mame/ui/custui.cpp:941
 msgid "Choose from palette"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:996
+#: src/frontend/mame/ui/custui.cpp:988
 msgid "Color preview:"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1093
+#: src/frontend/mame/ui/custui.cpp:1085
 msgctxt "color-preset"
 msgid "White"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1094
+#: src/frontend/mame/ui/custui.cpp:1086
 msgctxt "color-preset"
 msgid "Silver"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1095
+#: src/frontend/mame/ui/custui.cpp:1087
 msgctxt "color-preset"
 msgid "Gray"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1096
+#: src/frontend/mame/ui/custui.cpp:1088
 msgctxt "color-preset"
 msgid "Black"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1097
+#: src/frontend/mame/ui/custui.cpp:1089
 msgctxt "color-preset"
 msgid "Red"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1098
+#: src/frontend/mame/ui/custui.cpp:1090
 msgctxt "color-preset"
 msgid "Orange"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1099
+#: src/frontend/mame/ui/custui.cpp:1091
 msgctxt "color-preset"
 msgid "Yellow"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1100
+#: src/frontend/mame/ui/custui.cpp:1092
 msgctxt "color-preset"
 msgid "Green"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1101
+#: src/frontend/mame/ui/custui.cpp:1093
 msgctxt "color-preset"
 msgid "Blue"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1102
+#: src/frontend/mame/ui/custui.cpp:1094
 msgctxt "color-preset"
 msgid "Violet"
 msgstr ""
@@ -2479,7 +2479,7 @@ msgid "Input (general)"
 msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:123
-msgid "Input (this Machine)"
+msgid "Input (this machine)"
 msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:126
@@ -2518,6 +2518,10 @@ msgstr ""
 msgid "Tape Control"
 msgstr ""
 
+#: src/frontend/mame/ui/mainmenu.cpp:155
+msgid "Pseudo Terminals"
+msgstr ""
+
 #: src/frontend/mame/ui/mainmenu.cpp:158
 msgid "BIOS Selection"
 msgstr ""
@@ -2556,7 +2560,7 @@ msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:200
 #, c-format
-msgid "About %s"
+msgid "About %1$s"
 msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:212
@@ -2716,373 +2720,373 @@ msgstr ""
 msgid "%1$s %2$s"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2235
+#: src/frontend/mame/ui/selmenu.cpp:2244
 msgid "Images"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2236
+#: src/frontend/mame/ui/selmenu.cpp:2245
 msgid "Infos"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2551
+#: src/frontend/mame/ui/selmenu.cpp:2560
 msgid ""
 "Required ROM/disk images for the selected system are missing or incorrect. "
 "Please acquire the correct files or select a different system.\n"
 "\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2567
+#: src/frontend/mame/ui/selmenu.cpp:2576
 msgid ""
 "Required ROM/disk images for the selected software are missing or incorrect. "
 "Please acquire the correct files or select a different software item.\n"
 "\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2583
+#: src/frontend/mame/ui/selmenu.cpp:2592
 msgid "incorrect checksum"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2586
+#: src/frontend/mame/ui/selmenu.cpp:2595
 msgid "incorrect length"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2589
+#: src/frontend/mame/ui/selmenu.cpp:2598
 msgid "not found"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2600
+#: src/frontend/mame/ui/selmenu.cpp:2609
 #, c-format
 msgid "%1$s (%2$s) - %3$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2602
+#: src/frontend/mame/ui/selmenu.cpp:2611
 #, c-format
 msgid "%1$s - %2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2606
+#: src/frontend/mame/ui/selmenu.cpp:2615
 msgid "Press any key to continue."
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2735
+#: src/frontend/mame/ui/selmenu.cpp:2744
 msgid "General Info"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2887
-#, c-format
-msgid "Romset\t%1$s\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2888
-#, c-format
-msgid "Year\t%1$s\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2889
-#, c-format
-msgid "Manufacturer\t%1$s\n"
-msgstr ""
-
 #: src/frontend/mame/ui/selmenu.cpp:2896
 #, c-format
-msgid "Driver is Clone of\t%1$s\n"
+msgid "Romset\t%1$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2901
-msgid "Driver is Parent\t\n"
+#: src/frontend/mame/ui/selmenu.cpp:2897
+#, c-format
+msgid "Year\t%1$s\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2898
+#, c-format
+msgid "Manufacturer\t%1$s\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2905
-msgid "Analog Controls\tYes\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2907
-msgid "Keyboard Inputs\tYes\n"
+#, c-format
+msgid "Driver is Clone of\t%1$s\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2910
-msgid "Overall\tNOT WORKING\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2912
-msgid "Overall\tUnemulated Protection\n"
+msgid "Driver is Parent\t\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2914
-msgid "Overall\tWorking\n"
+msgid "Analog Controls\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2917
-msgid "Graphics\tUnimplemented\n"
+#: src/frontend/mame/ui/selmenu.cpp:2916
+msgid "Keyboard Inputs\tYes\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2919
-msgid "Graphics\tWrong Colors\n"
+msgid "Overall\tNOT WORKING\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2921
-msgid "Graphics\tImperfect Colors\n"
+msgid "Overall\tUnemulated Protection\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2923
-msgid "Graphics\tImperfect\n"
+msgid "Overall\tWorking\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2925
-msgid "Graphics\tOK\n"
+#: src/frontend/mame/ui/selmenu.cpp:2926
+msgid "Graphics\tUnimplemented\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2928
-msgid "Sound\tNone\n"
+msgid "Graphics\tWrong Colors\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2930
-msgid "Sound\tUnimplemented\n"
+msgid "Graphics\tImperfect Colors\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2932
-msgid "Sound\tImperfect\n"
+msgid "Graphics\tImperfect\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2934
-msgid "Sound\tOK\n"
+msgid "Graphics\tOK\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2937
-msgid "Capture\tUnimplemented\n"
+msgid "Sound\tNone\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2939
+msgid "Sound\tUnimplemented\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2941
+msgid "Sound\tImperfect\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2943
+msgid "Sound\tOK\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2946
+msgid "Capture\tUnimplemented\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2948
 msgid "Capture\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2942
+#: src/frontend/mame/ui/selmenu.cpp:2951
 msgid "Camera\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2944
+#: src/frontend/mame/ui/selmenu.cpp:2953
 msgid "Camera\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2947
+#: src/frontend/mame/ui/selmenu.cpp:2956
 msgid "Microphone\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2949
+#: src/frontend/mame/ui/selmenu.cpp:2958
 msgid "Microphone\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2952
+#: src/frontend/mame/ui/selmenu.cpp:2961
 msgid "Controls\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2954
+#: src/frontend/mame/ui/selmenu.cpp:2963
 msgid "Controls\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2957
+#: src/frontend/mame/ui/selmenu.cpp:2966
 msgid "Keyboard\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2959
+#: src/frontend/mame/ui/selmenu.cpp:2968
 msgid "Keyboard\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2962
+#: src/frontend/mame/ui/selmenu.cpp:2971
 msgid "Mouse\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2964
+#: src/frontend/mame/ui/selmenu.cpp:2973
 msgid "Mouse\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2967
+#: src/frontend/mame/ui/selmenu.cpp:2976
 msgid "Media\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2969
+#: src/frontend/mame/ui/selmenu.cpp:2978
 msgid "Media\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2972
+#: src/frontend/mame/ui/selmenu.cpp:2981
 msgid "Disk\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2974
+#: src/frontend/mame/ui/selmenu.cpp:2983
 msgid "Disk\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2977
+#: src/frontend/mame/ui/selmenu.cpp:2986
 msgid "Printer\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2979
+#: src/frontend/mame/ui/selmenu.cpp:2988
 msgid "Printer\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2982
+#: src/frontend/mame/ui/selmenu.cpp:2991
 msgid "Mag. Tape\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2984
+#: src/frontend/mame/ui/selmenu.cpp:2993
 msgid "Mag. Tape\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2987
+#: src/frontend/mame/ui/selmenu.cpp:2996
 msgid "Punch Tape\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2989
+#: src/frontend/mame/ui/selmenu.cpp:2998
 msgid "Punch Tape\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2992
+#: src/frontend/mame/ui/selmenu.cpp:3001
 msgid "Mag. Drum\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2994
+#: src/frontend/mame/ui/selmenu.cpp:3003
 msgid "Mag. Drum\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2997
+#: src/frontend/mame/ui/selmenu.cpp:3006
 msgid "(EP)ROM\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2999
+#: src/frontend/mame/ui/selmenu.cpp:3008
 msgid "(EP)ROM\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3002
+#: src/frontend/mame/ui/selmenu.cpp:3011
 msgid "Communications\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3004
+#: src/frontend/mame/ui/selmenu.cpp:3013
 msgid "Communications\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3007
+#: src/frontend/mame/ui/selmenu.cpp:3016
 msgid "LAN\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3009
+#: src/frontend/mame/ui/selmenu.cpp:3018
 msgid "LAN\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3012
+#: src/frontend/mame/ui/selmenu.cpp:3021
 msgid "WAN\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3014
+#: src/frontend/mame/ui/selmenu.cpp:3023
 msgid "WAN\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3017
+#: src/frontend/mame/ui/selmenu.cpp:3026
 msgid "Timing\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3019
+#: src/frontend/mame/ui/selmenu.cpp:3028
 msgid "Timing\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3021
+#: src/frontend/mame/ui/selmenu.cpp:3030
 msgid "Mechanical Machine\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3021
+#: src/frontend/mame/ui/selmenu.cpp:3030
 msgid "Mechanical Machine\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3022
+#: src/frontend/mame/ui/selmenu.cpp:3031
 msgid "Requires Artwork\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3022
+#: src/frontend/mame/ui/selmenu.cpp:3031
 msgid "Requires Artwork\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3023
+#: src/frontend/mame/ui/selmenu.cpp:3032
 msgid "Requires Clickable Artwork\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3023
+#: src/frontend/mame/ui/selmenu.cpp:3032
 msgid "Requires Clickable Artwork\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3025
+#: src/frontend/mame/ui/selmenu.cpp:3034
 msgid "Support Cocktail\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3026
+#: src/frontend/mame/ui/selmenu.cpp:3035
 msgid "Driver is BIOS\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3026
+#: src/frontend/mame/ui/selmenu.cpp:3035
 msgid "Driver is BIOS\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3027
+#: src/frontend/mame/ui/selmenu.cpp:3036
 msgid "Support Save\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3027
+#: src/frontend/mame/ui/selmenu.cpp:3036
 msgid "Support Save\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3028
+#: src/frontend/mame/ui/selmenu.cpp:3037
 msgid "Screen Orientation\tVertical\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3028
+#: src/frontend/mame/ui/selmenu.cpp:3037
 msgid "Screen Orientation\tHorizontal\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3038
+#: src/frontend/mame/ui/selmenu.cpp:3047
 msgid "Requires CHD\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3038
+#: src/frontend/mame/ui/selmenu.cpp:3047
 msgid "Requires CHD\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3051
-msgid "ROM Audit Result\tOK\n"
+#: src/frontend/mame/ui/selmenu.cpp:3060
+msgid "Media Audit Result\tOK\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3053
-msgid "ROM Audit Result\tBAD\n"
+#: src/frontend/mame/ui/selmenu.cpp:3062
+msgid "Media Audit Result\tBAD\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3056
+#: src/frontend/mame/ui/selmenu.cpp:3065
 msgid "Samples Audit Result\tNone Needed\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3058
+#: src/frontend/mame/ui/selmenu.cpp:3067
 msgid "Samples Audit Result\tOK\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3060
+#: src/frontend/mame/ui/selmenu.cpp:3069
 msgid "Samples Audit Result\tBAD\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3064
+#: src/frontend/mame/ui/selmenu.cpp:3073
 msgid ""
-"ROM Audit \tDisabled\n"
-"Samples Audit \tDisabled\n"
+"Media Audit\tDisabled\n"
+"Samples Audit\tDisabled\n"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:150
+#: src/frontend/mame/ui/sndmenu.cpp:146
 msgid "Sound"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:151
+#: src/frontend/mame/ui/sndmenu.cpp:147
 msgid "Compressor"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:152
+#: src/frontend/mame/ui/sndmenu.cpp:148
 msgid "Sample Rate"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:153
+#: src/frontend/mame/ui/sndmenu.cpp:149
 msgid "Use External Samples"
 msgstr ""
 
@@ -3121,511 +3125,681 @@ msgstr ""
 msgid "  Screen '%1$s': Vector\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:132
+#: src/frontend/mame/ui/devopt.cpp:135
 #, c-format
 msgid "  Screen '%1$s': %2$d × %3$d (V) %4$s Hz\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:133
+#: src/frontend/mame/ui/devopt.cpp:136
 #, c-format
 msgid "  Screen '%1$s': %2$d × %3$d (H) %4$s Hz\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:147
+#: src/frontend/mame/ui/devopt.cpp:150
 msgid "* Sound:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:211
+#: src/frontend/mame/ui/devopt.cpp:214
 #, c-format
 msgid ""
 "* BIOS settings:\n"
 "  %1$d options    [default: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:255 src/frontend/mame/ui/devopt.cpp:271
-#: src/frontend/mame/ui/devopt.cpp:332
+#: src/frontend/mame/ui/devopt.cpp:258 src/frontend/mame/ui/devopt.cpp:274
+#: src/frontend/mame/ui/devopt.cpp:335
 #, c-format
 msgid "  %1$s    [default: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:260 src/frontend/mame/ui/devopt.cpp:276
+#: src/frontend/mame/ui/devopt.cpp:263 src/frontend/mame/ui/devopt.cpp:279
 #, c-format
 msgid "  %1$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:282
+#: src/frontend/mame/ui/devopt.cpp:285
 msgid "* DIP switch settings:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:287
+#: src/frontend/mame/ui/devopt.cpp:290
 msgid "* Configuration settings:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:291
+#: src/frontend/mame/ui/devopt.cpp:294
 msgid "* Input device(s):\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:293
+#: src/frontend/mame/ui/devopt.cpp:296
 #, c-format
 msgid "  User inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:295
+#: src/frontend/mame/ui/devopt.cpp:298
 #, c-format
 msgid "  Mahjong inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:297
+#: src/frontend/mame/ui/devopt.cpp:300
 #, c-format
 msgid "  Hanafuda inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:299
+#: src/frontend/mame/ui/devopt.cpp:302
 #, c-format
 msgid "  Gambling inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:301
+#: src/frontend/mame/ui/devopt.cpp:304
 #, c-format
 msgid "  Analog inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:303
+#: src/frontend/mame/ui/devopt.cpp:306
 #, c-format
 msgid "  Adjuster inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:305
+#: src/frontend/mame/ui/devopt.cpp:308
 #, c-format
 msgid "  Keypad inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:307
+#: src/frontend/mame/ui/devopt.cpp:310
 #, c-format
 msgid "  Keyboard inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:312
+#: src/frontend/mame/ui/devopt.cpp:315
 msgid "* Media Options:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:317
+#: src/frontend/mame/ui/devopt.cpp:320
 #, c-format
 msgid "  %1$s    [tag: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:327
+#: src/frontend/mame/ui/devopt.cpp:330
 msgid "* Slot Options:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:341
+#: src/frontend/mame/ui/devopt.cpp:344
 msgid "[None]\n"
 msgstr ""
 
-#: src/emu/render.cpp:1847
+#: src/emu/render.cpp:1796
 #, c-format
 msgctxt "view-name"
 msgid "Screen %1$u Standard (%2$u:%3$u)"
 msgstr ""
 
-#: src/emu/render.cpp:1873
+#: src/emu/render.cpp:1822
 #, c-format
 msgctxt "view-name"
 msgid "Screen %1$u Pixel Aspect (%2$u:%3$u)"
 msgstr ""
 
-#: src/emu/render.cpp:1895 src/emu/render.cpp:2030
+#: src/emu/render.cpp:1844 src/emu/render.cpp:1979
 msgctxt "view-name"
 msgid "Cocktail"
 msgstr ""
 
-#: src/emu/render.cpp:2015
+#: src/emu/render.cpp:1964
 msgctxt "view-name"
 msgid "Left-to-Right"
 msgstr ""
 
-#: src/emu/render.cpp:2016
+#: src/emu/render.cpp:1965
 msgctxt "view-name"
 msgid "Left-to-Right (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2017
+#: src/emu/render.cpp:1966
 msgctxt "view-name"
 msgid "Top-to-Bottom"
 msgstr ""
 
-#: src/emu/render.cpp:2018
+#: src/emu/render.cpp:1967
 msgctxt "view-name"
 msgid "Top-to-Bottom (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2069
+#: src/emu/render.cpp:2018
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Left-to-Right, Top-to-Bottom"
 msgstr ""
 
-#: src/emu/render.cpp:2078
+#: src/emu/render.cpp:2027
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Left-to-Right, Top-to-Bottom (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2087
+#: src/emu/render.cpp:2036
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Top-to-Bottom, Left-to-Right"
 msgstr ""
 
-#: src/emu/render.cpp:2096
+#: src/emu/render.cpp:2045
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Top-to-Bottom, Left-to-Right (Gapless)"
 msgstr ""
 
-#: src/emu/inpttype.ipp:22
+#: src/emu/ioport.cpp:332
+#, c-format
 msgctxt "input-name"
-msgid "P1 Up"
+msgid "P%1$u"
 msgstr ""
 
-#: src/emu/inpttype.ipp:23
+#: src/emu/ioport.cpp:1924
 msgctxt "input-name"
-msgid "P1 Down"
+msgid "???"
 msgstr ""
 
-#: src/emu/inpttype.ipp:24
+#: src/emu/inpttype.ipp:22 src/emu/inpttype.ipp:140 src/emu/inpttype.ipp:221
+#: src/emu/inpttype.ipp:255 src/emu/inpttype.ipp:289 src/emu/inpttype.ipp:323
+#: src/emu/inpttype.ipp:357 src/emu/inpttype.ipp:391 src/emu/inpttype.ipp:425
+#: src/emu/inpttype.ipp:459
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left"
+msgid "%p Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:25
+#: src/emu/inpttype.ipp:23 src/emu/inpttype.ipp:141 src/emu/inpttype.ipp:222
+#: src/emu/inpttype.ipp:256 src/emu/inpttype.ipp:290 src/emu/inpttype.ipp:324
+#: src/emu/inpttype.ipp:358 src/emu/inpttype.ipp:392 src/emu/inpttype.ipp:426
+#: src/emu/inpttype.ipp:460
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right"
+msgid "%p Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:26
+#: src/emu/inpttype.ipp:24 src/emu/inpttype.ipp:142 src/emu/inpttype.ipp:223
+#: src/emu/inpttype.ipp:257 src/emu/inpttype.ipp:291 src/emu/inpttype.ipp:325
+#: src/emu/inpttype.ipp:359 src/emu/inpttype.ipp:393 src/emu/inpttype.ipp:427
+#: src/emu/inpttype.ipp:461
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Up"
+msgid "%p Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:27
+#: src/emu/inpttype.ipp:25 src/emu/inpttype.ipp:143 src/emu/inpttype.ipp:224
+#: src/emu/inpttype.ipp:258 src/emu/inpttype.ipp:292 src/emu/inpttype.ipp:326
+#: src/emu/inpttype.ipp:360 src/emu/inpttype.ipp:394 src/emu/inpttype.ipp:428
+#: src/emu/inpttype.ipp:462
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Down"
+msgid "%p Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:28
+#: src/emu/inpttype.ipp:26 src/emu/inpttype.ipp:144 src/emu/inpttype.ipp:225
+#: src/emu/inpttype.ipp:259 src/emu/inpttype.ipp:293 src/emu/inpttype.ipp:327
+#: src/emu/inpttype.ipp:361 src/emu/inpttype.ipp:395 src/emu/inpttype.ipp:429
+#: src/emu/inpttype.ipp:463
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Left"
+msgid "%p Right Stick/Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:29
+#: src/emu/inpttype.ipp:27 src/emu/inpttype.ipp:145 src/emu/inpttype.ipp:226
+#: src/emu/inpttype.ipp:260 src/emu/inpttype.ipp:294 src/emu/inpttype.ipp:328
+#: src/emu/inpttype.ipp:362 src/emu/inpttype.ipp:396 src/emu/inpttype.ipp:430
+#: src/emu/inpttype.ipp:464
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Right"
+msgid "%p Right Stick/Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:30
+#: src/emu/inpttype.ipp:28 src/emu/inpttype.ipp:146 src/emu/inpttype.ipp:227
+#: src/emu/inpttype.ipp:261 src/emu/inpttype.ipp:295 src/emu/inpttype.ipp:329
+#: src/emu/inpttype.ipp:363 src/emu/inpttype.ipp:397 src/emu/inpttype.ipp:431
+#: src/emu/inpttype.ipp:465
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Up"
+msgid "%p Right Stick/Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:31
+#: src/emu/inpttype.ipp:29 src/emu/inpttype.ipp:147 src/emu/inpttype.ipp:228
+#: src/emu/inpttype.ipp:262 src/emu/inpttype.ipp:296 src/emu/inpttype.ipp:330
+#: src/emu/inpttype.ipp:364 src/emu/inpttype.ipp:398 src/emu/inpttype.ipp:432
+#: src/emu/inpttype.ipp:466
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Down"
+msgid "%p Right Stick/Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:32
+#: src/emu/inpttype.ipp:30 src/emu/inpttype.ipp:148 src/emu/inpttype.ipp:229
+#: src/emu/inpttype.ipp:263 src/emu/inpttype.ipp:297 src/emu/inpttype.ipp:331
+#: src/emu/inpttype.ipp:365 src/emu/inpttype.ipp:399 src/emu/inpttype.ipp:433
+#: src/emu/inpttype.ipp:467
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Left"
+msgid "%p Left Stick/Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:33
+#: src/emu/inpttype.ipp:31 src/emu/inpttype.ipp:149 src/emu/inpttype.ipp:230
+#: src/emu/inpttype.ipp:264 src/emu/inpttype.ipp:298 src/emu/inpttype.ipp:332
+#: src/emu/inpttype.ipp:366 src/emu/inpttype.ipp:400 src/emu/inpttype.ipp:434
+#: src/emu/inpttype.ipp:468
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Right"
+msgid "%p Left Stick/Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:34
+#: src/emu/inpttype.ipp:32 src/emu/inpttype.ipp:150 src/emu/inpttype.ipp:231
+#: src/emu/inpttype.ipp:265 src/emu/inpttype.ipp:299 src/emu/inpttype.ipp:333
+#: src/emu/inpttype.ipp:367 src/emu/inpttype.ipp:401 src/emu/inpttype.ipp:435
+#: src/emu/inpttype.ipp:469
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 1"
+msgid "%p Left Stick/Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:35
+#: src/emu/inpttype.ipp:33 src/emu/inpttype.ipp:151 src/emu/inpttype.ipp:232
+#: src/emu/inpttype.ipp:266 src/emu/inpttype.ipp:300 src/emu/inpttype.ipp:334
+#: src/emu/inpttype.ipp:368 src/emu/inpttype.ipp:402 src/emu/inpttype.ipp:436
+#: src/emu/inpttype.ipp:470
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 2"
+msgid "%p Left Stick/Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:36
+#: src/emu/inpttype.ipp:34 src/emu/inpttype.ipp:152 src/emu/inpttype.ipp:233
+#: src/emu/inpttype.ipp:267 src/emu/inpttype.ipp:301 src/emu/inpttype.ipp:335
+#: src/emu/inpttype.ipp:369 src/emu/inpttype.ipp:403 src/emu/inpttype.ipp:437
+#: src/emu/inpttype.ipp:471
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 3"
+msgid "%p Button 1"
 msgstr ""
 
-#: src/emu/inpttype.ipp:37
+#: src/emu/inpttype.ipp:35 src/emu/inpttype.ipp:153 src/emu/inpttype.ipp:234
+#: src/emu/inpttype.ipp:268 src/emu/inpttype.ipp:302 src/emu/inpttype.ipp:336
+#: src/emu/inpttype.ipp:370 src/emu/inpttype.ipp:404 src/emu/inpttype.ipp:438
+#: src/emu/inpttype.ipp:472
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 4"
+msgid "%p Button 2"
 msgstr ""
 
-#: src/emu/inpttype.ipp:38
+#: src/emu/inpttype.ipp:36 src/emu/inpttype.ipp:154 src/emu/inpttype.ipp:235
+#: src/emu/inpttype.ipp:269 src/emu/inpttype.ipp:303 src/emu/inpttype.ipp:337
+#: src/emu/inpttype.ipp:371 src/emu/inpttype.ipp:405 src/emu/inpttype.ipp:439
+#: src/emu/inpttype.ipp:473
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 5"
+msgid "%p Button 3"
 msgstr ""
 
-#: src/emu/inpttype.ipp:39
+#: src/emu/inpttype.ipp:37 src/emu/inpttype.ipp:155 src/emu/inpttype.ipp:236
+#: src/emu/inpttype.ipp:270 src/emu/inpttype.ipp:304 src/emu/inpttype.ipp:338
+#: src/emu/inpttype.ipp:372 src/emu/inpttype.ipp:406 src/emu/inpttype.ipp:440
+#: src/emu/inpttype.ipp:474
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 6"
+msgid "%p Button 4"
 msgstr ""
 
-#: src/emu/inpttype.ipp:40
+#: src/emu/inpttype.ipp:38 src/emu/inpttype.ipp:156 src/emu/inpttype.ipp:237
+#: src/emu/inpttype.ipp:271 src/emu/inpttype.ipp:305 src/emu/inpttype.ipp:339
+#: src/emu/inpttype.ipp:373 src/emu/inpttype.ipp:407 src/emu/inpttype.ipp:441
+#: src/emu/inpttype.ipp:475
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 7"
+msgid "%p Button 5"
 msgstr ""
 
-#: src/emu/inpttype.ipp:41
+#: src/emu/inpttype.ipp:39 src/emu/inpttype.ipp:157 src/emu/inpttype.ipp:238
+#: src/emu/inpttype.ipp:272 src/emu/inpttype.ipp:306 src/emu/inpttype.ipp:340
+#: src/emu/inpttype.ipp:374 src/emu/inpttype.ipp:408 src/emu/inpttype.ipp:442
+#: src/emu/inpttype.ipp:476
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 8"
+msgid "%p Button 6"
 msgstr ""
 
-#: src/emu/inpttype.ipp:42
+#: src/emu/inpttype.ipp:40 src/emu/inpttype.ipp:158 src/emu/inpttype.ipp:239
+#: src/emu/inpttype.ipp:273 src/emu/inpttype.ipp:307 src/emu/inpttype.ipp:341
+#: src/emu/inpttype.ipp:375 src/emu/inpttype.ipp:409 src/emu/inpttype.ipp:443
+#: src/emu/inpttype.ipp:477
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 9"
+msgid "%p Button 7"
 msgstr ""
 
-#: src/emu/inpttype.ipp:43
+#: src/emu/inpttype.ipp:41 src/emu/inpttype.ipp:159 src/emu/inpttype.ipp:240
+#: src/emu/inpttype.ipp:274 src/emu/inpttype.ipp:308 src/emu/inpttype.ipp:342
+#: src/emu/inpttype.ipp:376 src/emu/inpttype.ipp:410 src/emu/inpttype.ipp:444
+#: src/emu/inpttype.ipp:478
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 10"
+msgid "%p Button 8"
 msgstr ""
 
-#: src/emu/inpttype.ipp:44
+#: src/emu/inpttype.ipp:42 src/emu/inpttype.ipp:160 src/emu/inpttype.ipp:241
+#: src/emu/inpttype.ipp:275 src/emu/inpttype.ipp:309 src/emu/inpttype.ipp:343
+#: src/emu/inpttype.ipp:377 src/emu/inpttype.ipp:411 src/emu/inpttype.ipp:445
+#: src/emu/inpttype.ipp:479
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 11"
+msgid "%p Button 9"
 msgstr ""
 
-#: src/emu/inpttype.ipp:45
+#: src/emu/inpttype.ipp:43 src/emu/inpttype.ipp:161 src/emu/inpttype.ipp:242
+#: src/emu/inpttype.ipp:276 src/emu/inpttype.ipp:310 src/emu/inpttype.ipp:344
+#: src/emu/inpttype.ipp:378 src/emu/inpttype.ipp:412 src/emu/inpttype.ipp:446
+#: src/emu/inpttype.ipp:480
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 12"
+msgid "%p Button 10"
 msgstr ""
 
-#: src/emu/inpttype.ipp:46
+#: src/emu/inpttype.ipp:44 src/emu/inpttype.ipp:162 src/emu/inpttype.ipp:243
+#: src/emu/inpttype.ipp:277 src/emu/inpttype.ipp:311 src/emu/inpttype.ipp:345
+#: src/emu/inpttype.ipp:379 src/emu/inpttype.ipp:413 src/emu/inpttype.ipp:447
+#: src/emu/inpttype.ipp:481
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 13"
+msgid "%p Button 11"
 msgstr ""
 
-#: src/emu/inpttype.ipp:47
+#: src/emu/inpttype.ipp:45 src/emu/inpttype.ipp:163 src/emu/inpttype.ipp:244
+#: src/emu/inpttype.ipp:278 src/emu/inpttype.ipp:312 src/emu/inpttype.ipp:346
+#: src/emu/inpttype.ipp:380 src/emu/inpttype.ipp:414 src/emu/inpttype.ipp:448
+#: src/emu/inpttype.ipp:482
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 14"
+msgid "%p Button 12"
 msgstr ""
 
-#: src/emu/inpttype.ipp:48
+#: src/emu/inpttype.ipp:46 src/emu/inpttype.ipp:164 src/emu/inpttype.ipp:245
+#: src/emu/inpttype.ipp:279 src/emu/inpttype.ipp:313 src/emu/inpttype.ipp:347
+#: src/emu/inpttype.ipp:381 src/emu/inpttype.ipp:415 src/emu/inpttype.ipp:449
+#: src/emu/inpttype.ipp:483
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 15"
+msgid "%p Button 13"
 msgstr ""
 
-#: src/emu/inpttype.ipp:49
+#: src/emu/inpttype.ipp:47 src/emu/inpttype.ipp:165 src/emu/inpttype.ipp:246
+#: src/emu/inpttype.ipp:280 src/emu/inpttype.ipp:314 src/emu/inpttype.ipp:348
+#: src/emu/inpttype.ipp:382 src/emu/inpttype.ipp:416 src/emu/inpttype.ipp:450
+#: src/emu/inpttype.ipp:484
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 16"
+msgid "%p Button 14"
 msgstr ""
 
-#: src/emu/inpttype.ipp:50
+#: src/emu/inpttype.ipp:48 src/emu/inpttype.ipp:166 src/emu/inpttype.ipp:247
+#: src/emu/inpttype.ipp:281 src/emu/inpttype.ipp:315 src/emu/inpttype.ipp:349
+#: src/emu/inpttype.ipp:383 src/emu/inpttype.ipp:417 src/emu/inpttype.ipp:451
+#: src/emu/inpttype.ipp:485
+#, c-format
 msgctxt "input-name"
-msgid "P1 Start"
+msgid "%p Button 15"
 msgstr ""
 
-#: src/emu/inpttype.ipp:51
+#: src/emu/inpttype.ipp:49 src/emu/inpttype.ipp:167 src/emu/inpttype.ipp:248
+#: src/emu/inpttype.ipp:282 src/emu/inpttype.ipp:316 src/emu/inpttype.ipp:350
+#: src/emu/inpttype.ipp:384 src/emu/inpttype.ipp:418 src/emu/inpttype.ipp:452
+#: src/emu/inpttype.ipp:486
+#, c-format
 msgctxt "input-name"
-msgid "P1 Select"
+msgid "%p Button 16"
 msgstr ""
 
-#: src/emu/inpttype.ipp:56
+#: src/emu/inpttype.ipp:50 src/emu/inpttype.ipp:168 src/emu/inpttype.ipp:249
+#: src/emu/inpttype.ipp:283 src/emu/inpttype.ipp:317 src/emu/inpttype.ipp:351
+#: src/emu/inpttype.ipp:385 src/emu/inpttype.ipp:419 src/emu/inpttype.ipp:453
+#: src/emu/inpttype.ipp:487
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong A"
+msgid "%p Start"
 msgstr ""
 
-#: src/emu/inpttype.ipp:57
+#: src/emu/inpttype.ipp:51 src/emu/inpttype.ipp:169 src/emu/inpttype.ipp:250
+#: src/emu/inpttype.ipp:284 src/emu/inpttype.ipp:318 src/emu/inpttype.ipp:352
+#: src/emu/inpttype.ipp:386 src/emu/inpttype.ipp:420 src/emu/inpttype.ipp:454
+#: src/emu/inpttype.ipp:488
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong B"
+msgid "%p Select"
 msgstr ""
 
-#: src/emu/inpttype.ipp:58
+#: src/emu/inpttype.ipp:56 src/emu/inpttype.ipp:174
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong C"
+msgid "%p Mahjong A"
 msgstr ""
 
-#: src/emu/inpttype.ipp:59
+#: src/emu/inpttype.ipp:57 src/emu/inpttype.ipp:175
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong D"
+msgid "%p Mahjong B"
 msgstr ""
 
-#: src/emu/inpttype.ipp:60
+#: src/emu/inpttype.ipp:58 src/emu/inpttype.ipp:176
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong E"
+msgid "%p Mahjong C"
 msgstr ""
 
-#: src/emu/inpttype.ipp:61
+#: src/emu/inpttype.ipp:59 src/emu/inpttype.ipp:177
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong F"
+msgid "%p Mahjong D"
 msgstr ""
 
-#: src/emu/inpttype.ipp:62
+#: src/emu/inpttype.ipp:60 src/emu/inpttype.ipp:178
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong G"
+msgid "%p Mahjong E"
 msgstr ""
 
-#: src/emu/inpttype.ipp:63
+#: src/emu/inpttype.ipp:61 src/emu/inpttype.ipp:179
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong H"
+msgid "%p Mahjong F"
 msgstr ""
 
-#: src/emu/inpttype.ipp:64
+#: src/emu/inpttype.ipp:62 src/emu/inpttype.ipp:180
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong I"
+msgid "%p Mahjong G"
 msgstr ""
 
-#: src/emu/inpttype.ipp:65
+#: src/emu/inpttype.ipp:63 src/emu/inpttype.ipp:181
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong J"
+msgid "%p Mahjong H"
 msgstr ""
 
-#: src/emu/inpttype.ipp:66
+#: src/emu/inpttype.ipp:64 src/emu/inpttype.ipp:182
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong K"
+msgid "%p Mahjong I"
 msgstr ""
 
-#: src/emu/inpttype.ipp:67
+#: src/emu/inpttype.ipp:65 src/emu/inpttype.ipp:183
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong L"
+msgid "%p Mahjong J"
 msgstr ""
 
-#: src/emu/inpttype.ipp:68
+#: src/emu/inpttype.ipp:66 src/emu/inpttype.ipp:184
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong M"
+msgid "%p Mahjong K"
 msgstr ""
 
-#: src/emu/inpttype.ipp:69
+#: src/emu/inpttype.ipp:67 src/emu/inpttype.ipp:185
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong N"
+msgid "%p Mahjong L"
 msgstr ""
 
-#: src/emu/inpttype.ipp:70
+#: src/emu/inpttype.ipp:68 src/emu/inpttype.ipp:186
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong O"
+msgid "%p Mahjong M"
 msgstr ""
 
-#: src/emu/inpttype.ipp:71
+#: src/emu/inpttype.ipp:69 src/emu/inpttype.ipp:187
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong P"
+msgid "%p Mahjong N"
 msgstr ""
 
-#: src/emu/inpttype.ipp:72
+#: src/emu/inpttype.ipp:70 src/emu/inpttype.ipp:188
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Q"
+msgid "%p Mahjong O"
 msgstr ""
 
-#: src/emu/inpttype.ipp:73
+#: src/emu/inpttype.ipp:71 src/emu/inpttype.ipp:189
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Kan"
+msgid "%p Mahjong P"
 msgstr ""
 
-#: src/emu/inpttype.ipp:74
+#: src/emu/inpttype.ipp:72 src/emu/inpttype.ipp:190
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Pon"
+msgid "%p Mahjong Q"
 msgstr ""
 
-#: src/emu/inpttype.ipp:75
+#: src/emu/inpttype.ipp:73 src/emu/inpttype.ipp:191
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Chi"
+msgid "%p Mahjong Kan"
 msgstr ""
 
-#: src/emu/inpttype.ipp:76
+#: src/emu/inpttype.ipp:74 src/emu/inpttype.ipp:192
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Reach"
+msgid "%p Mahjong Pon"
 msgstr ""
 
-#: src/emu/inpttype.ipp:77
+#: src/emu/inpttype.ipp:75 src/emu/inpttype.ipp:193
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Ron"
+msgid "%p Mahjong Chi"
 msgstr ""
 
-#: src/emu/inpttype.ipp:78
+#: src/emu/inpttype.ipp:76 src/emu/inpttype.ipp:194
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Flip Flop"
+msgid "%p Mahjong Reach"
 msgstr ""
 
-#: src/emu/inpttype.ipp:79
+#: src/emu/inpttype.ipp:77 src/emu/inpttype.ipp:195
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Bet"
+msgid "%p Mahjong Ron"
 msgstr ""
 
-#: src/emu/inpttype.ipp:80
+#: src/emu/inpttype.ipp:78 src/emu/inpttype.ipp:200
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Take Score"
+msgid "%p Mahjong Flip Flop"
 msgstr ""
 
-#: src/emu/inpttype.ipp:81
+#: src/emu/inpttype.ipp:79 src/emu/inpttype.ipp:196
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Double Up"
+msgid "%p Mahjong Bet"
 msgstr ""
 
-#: src/emu/inpttype.ipp:82
+#: src/emu/inpttype.ipp:80 src/emu/inpttype.ipp:198
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Big"
+msgid "%p Mahjong Take Score"
 msgstr ""
 
-#: src/emu/inpttype.ipp:83
+#: src/emu/inpttype.ipp:81 src/emu/inpttype.ipp:199
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Small"
+msgid "%p Mahjong Double Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:84
+#: src/emu/inpttype.ipp:82 src/emu/inpttype.ipp:201
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Last Chance"
+msgid "%p Mahjong Big"
 msgstr ""
 
-#: src/emu/inpttype.ipp:89
+#: src/emu/inpttype.ipp:83 src/emu/inpttype.ipp:202
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda A/1"
+msgid "%p Mahjong Small"
 msgstr ""
 
-#: src/emu/inpttype.ipp:90
+#: src/emu/inpttype.ipp:84 src/emu/inpttype.ipp:197
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda B/2"
+msgid "%p Mahjong Last Chance"
 msgstr ""
 
-#: src/emu/inpttype.ipp:91
+#: src/emu/inpttype.ipp:89 src/emu/inpttype.ipp:207
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda C/3"
+msgid "%p Hanafuda A/1"
 msgstr ""
 
-#: src/emu/inpttype.ipp:92
+#: src/emu/inpttype.ipp:90 src/emu/inpttype.ipp:208
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda D/4"
+msgid "%p Hanafuda B/2"
 msgstr ""
 
-#: src/emu/inpttype.ipp:93
+#: src/emu/inpttype.ipp:91 src/emu/inpttype.ipp:209
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda E/5"
+msgid "%p Hanafuda C/3"
 msgstr ""
 
-#: src/emu/inpttype.ipp:94
+#: src/emu/inpttype.ipp:92 src/emu/inpttype.ipp:210
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda F/6"
+msgid "%p Hanafuda D/4"
 msgstr ""
 
-#: src/emu/inpttype.ipp:95
+#: src/emu/inpttype.ipp:93 src/emu/inpttype.ipp:211
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda G/7"
+msgid "%p Hanafuda E/5"
 msgstr ""
 
-#: src/emu/inpttype.ipp:96
+#: src/emu/inpttype.ipp:94 src/emu/inpttype.ipp:212
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda H/8"
+msgid "%p Hanafuda F/6"
 msgstr ""
 
-#: src/emu/inpttype.ipp:97
+#: src/emu/inpttype.ipp:95 src/emu/inpttype.ipp:213
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda Yes"
+msgid "%p Hanafuda G/7"
 msgstr ""
 
-#: src/emu/inpttype.ipp:98
+#: src/emu/inpttype.ipp:96 src/emu/inpttype.ipp:214
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda No"
+msgid "%p Hanafuda H/8"
+msgstr ""
+
+#: src/emu/inpttype.ipp:97 src/emu/inpttype.ipp:215
+#, c-format
+msgctxt "input-name"
+msgid "%p Hanafuda Yes"
+msgstr ""
+
+#: src/emu/inpttype.ipp:98 src/emu/inpttype.ipp:216
+#, c-format
+msgctxt "input-name"
+msgid "%p Hanafuda No"
 msgstr ""
 
 #: src/emu/inpttype.ipp:103
@@ -3753,1551 +3927,6 @@ msgctxt "input-name"
 msgid "Stop All Reels"
 msgstr ""
 
-#: src/emu/inpttype.ipp:140
-msgctxt "input-name"
-msgid "P2 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:141
-msgctxt "input-name"
-msgid "P2 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:142
-msgctxt "input-name"
-msgid "P2 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:143
-msgctxt "input-name"
-msgid "P2 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:144
-msgctxt "input-name"
-msgid "P2 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:145
-msgctxt "input-name"
-msgid "P2 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:146
-msgctxt "input-name"
-msgid "P2 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:147
-msgctxt "input-name"
-msgid "P2 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:148
-msgctxt "input-name"
-msgid "P2 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:149
-msgctxt "input-name"
-msgid "P2 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:150
-msgctxt "input-name"
-msgid "P2 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:151
-msgctxt "input-name"
-msgid "P2 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:152
-msgctxt "input-name"
-msgid "P2 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:153
-msgctxt "input-name"
-msgid "P2 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:154
-msgctxt "input-name"
-msgid "P2 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:155
-msgctxt "input-name"
-msgid "P2 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:156
-msgctxt "input-name"
-msgid "P2 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:157
-msgctxt "input-name"
-msgid "P2 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:158
-msgctxt "input-name"
-msgid "P2 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:159
-msgctxt "input-name"
-msgid "P2 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:160
-msgctxt "input-name"
-msgid "P2 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:161
-msgctxt "input-name"
-msgid "P2 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:162
-msgctxt "input-name"
-msgid "P2 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:163
-msgctxt "input-name"
-msgid "P2 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:164
-msgctxt "input-name"
-msgid "P2 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:165
-msgctxt "input-name"
-msgid "P2 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:166
-msgctxt "input-name"
-msgid "P2 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:167
-msgctxt "input-name"
-msgid "P2 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:168
-msgctxt "input-name"
-msgid "P2 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:169
-msgctxt "input-name"
-msgid "P2 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:174
-msgctxt "input-name"
-msgid "P2 Mahjong A"
-msgstr ""
-
-#: src/emu/inpttype.ipp:175
-msgctxt "input-name"
-msgid "P2 Mahjong B"
-msgstr ""
-
-#: src/emu/inpttype.ipp:176
-msgctxt "input-name"
-msgid "P2 Mahjong C"
-msgstr ""
-
-#: src/emu/inpttype.ipp:177
-msgctxt "input-name"
-msgid "P2 Mahjong D"
-msgstr ""
-
-#: src/emu/inpttype.ipp:178
-msgctxt "input-name"
-msgid "P2 Mahjong E"
-msgstr ""
-
-#: src/emu/inpttype.ipp:179
-msgctxt "input-name"
-msgid "P2 Mahjong F"
-msgstr ""
-
-#: src/emu/inpttype.ipp:180
-msgctxt "input-name"
-msgid "P2 Mahjong G"
-msgstr ""
-
-#: src/emu/inpttype.ipp:181
-msgctxt "input-name"
-msgid "P2 Mahjong H"
-msgstr ""
-
-#: src/emu/inpttype.ipp:182
-msgctxt "input-name"
-msgid "P2 Mahjong I"
-msgstr ""
-
-#: src/emu/inpttype.ipp:183
-msgctxt "input-name"
-msgid "P2 Mahjong J"
-msgstr ""
-
-#: src/emu/inpttype.ipp:184
-msgctxt "input-name"
-msgid "P2 Mahjong K"
-msgstr ""
-
-#: src/emu/inpttype.ipp:185
-msgctxt "input-name"
-msgid "P2 Mahjong L"
-msgstr ""
-
-#: src/emu/inpttype.ipp:186
-msgctxt "input-name"
-msgid "P2 Mahjong M"
-msgstr ""
-
-#: src/emu/inpttype.ipp:187
-msgctxt "input-name"
-msgid "P2 Mahjong N"
-msgstr ""
-
-#: src/emu/inpttype.ipp:188
-msgctxt "input-name"
-msgid "P2 Mahjong O"
-msgstr ""
-
-#: src/emu/inpttype.ipp:189
-msgctxt "input-name"
-msgid "P2 Mahjong P"
-msgstr ""
-
-#: src/emu/inpttype.ipp:190
-msgctxt "input-name"
-msgid "P2 Mahjong Q"
-msgstr ""
-
-#: src/emu/inpttype.ipp:191
-msgctxt "input-name"
-msgid "P2 Mahjong Kan"
-msgstr ""
-
-#: src/emu/inpttype.ipp:192
-msgctxt "input-name"
-msgid "P2 Mahjong Pon"
-msgstr ""
-
-#: src/emu/inpttype.ipp:193
-msgctxt "input-name"
-msgid "P2 Mahjong Chi"
-msgstr ""
-
-#: src/emu/inpttype.ipp:194
-msgctxt "input-name"
-msgid "P2 Mahjong Reach"
-msgstr ""
-
-#: src/emu/inpttype.ipp:195
-msgctxt "input-name"
-msgid "P2 Mahjong Ron"
-msgstr ""
-
-#: src/emu/inpttype.ipp:196
-msgctxt "input-name"
-msgid "P2 Mahjong Bet"
-msgstr ""
-
-#: src/emu/inpttype.ipp:197
-msgctxt "input-name"
-msgid "P2 Mahjong Last Chance"
-msgstr ""
-
-#: src/emu/inpttype.ipp:198
-msgctxt "input-name"
-msgid "P2 Mahjong Take Score"
-msgstr ""
-
-#: src/emu/inpttype.ipp:199
-msgctxt "input-name"
-msgid "P2 Mahjong Double Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:200
-msgctxt "input-name"
-msgid "P2 Mahjong Flip Flop"
-msgstr ""
-
-#: src/emu/inpttype.ipp:201
-msgctxt "input-name"
-msgid "P2 Mahjong Big"
-msgstr ""
-
-#: src/emu/inpttype.ipp:202
-msgctxt "input-name"
-msgid "P2 Mahjong Small"
-msgstr ""
-
-#: src/emu/inpttype.ipp:207
-msgctxt "input-name"
-msgid "P2 Hanafuda A/1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:208
-msgctxt "input-name"
-msgid "P2 Hanafuda B/2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:209
-msgctxt "input-name"
-msgid "P2 Hanafuda C/3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:210
-msgctxt "input-name"
-msgid "P2 Hanafuda D/4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:211
-msgctxt "input-name"
-msgid "P2 Hanafuda E/5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:212
-msgctxt "input-name"
-msgid "P2 Hanafuda F/6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:213
-msgctxt "input-name"
-msgid "P2 Hanafuda G/7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:214
-msgctxt "input-name"
-msgid "P2 Hanafuda H/8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:215
-msgctxt "input-name"
-msgid "P2 Hanafuda Yes"
-msgstr ""
-
-#: src/emu/inpttype.ipp:216
-msgctxt "input-name"
-msgid "P2 Hanafuda No"
-msgstr ""
-
-#: src/emu/inpttype.ipp:221
-msgctxt "input-name"
-msgid "P3 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:222
-msgctxt "input-name"
-msgid "P3 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:223
-msgctxt "input-name"
-msgid "P3 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:224
-msgctxt "input-name"
-msgid "P3 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:225
-msgctxt "input-name"
-msgid "P3 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:226
-msgctxt "input-name"
-msgid "P3 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:227
-msgctxt "input-name"
-msgid "P3 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:228
-msgctxt "input-name"
-msgid "P3 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:229
-msgctxt "input-name"
-msgid "P3 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:230
-msgctxt "input-name"
-msgid "P3 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:231
-msgctxt "input-name"
-msgid "P3 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:232
-msgctxt "input-name"
-msgid "P3 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:233
-msgctxt "input-name"
-msgid "P3 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:234
-msgctxt "input-name"
-msgid "P3 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:235
-msgctxt "input-name"
-msgid "P3 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:236
-msgctxt "input-name"
-msgid "P3 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:237
-msgctxt "input-name"
-msgid "P3 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:238
-msgctxt "input-name"
-msgid "P3 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:239
-msgctxt "input-name"
-msgid "P3 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:240
-msgctxt "input-name"
-msgid "P3 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:241
-msgctxt "input-name"
-msgid "P3 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:242
-msgctxt "input-name"
-msgid "P3 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:243
-msgctxt "input-name"
-msgid "P3 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:244
-msgctxt "input-name"
-msgid "P3 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:245
-msgctxt "input-name"
-msgid "P3 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:246
-msgctxt "input-name"
-msgid "P3 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:247
-msgctxt "input-name"
-msgid "P3 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:248
-msgctxt "input-name"
-msgid "P3 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:249
-msgctxt "input-name"
-msgid "P3 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:250
-msgctxt "input-name"
-msgid "P3 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:255
-msgctxt "input-name"
-msgid "P4 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:256
-msgctxt "input-name"
-msgid "P4 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:257
-msgctxt "input-name"
-msgid "P4 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:258
-msgctxt "input-name"
-msgid "P4 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:259
-msgctxt "input-name"
-msgid "P4 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:260
-msgctxt "input-name"
-msgid "P4 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:261
-msgctxt "input-name"
-msgid "P4 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:262
-msgctxt "input-name"
-msgid "P4 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:263
-msgctxt "input-name"
-msgid "P4 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:264
-msgctxt "input-name"
-msgid "P4 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:265
-msgctxt "input-name"
-msgid "P4 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:266
-msgctxt "input-name"
-msgid "P4 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:267
-msgctxt "input-name"
-msgid "P4 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:268
-msgctxt "input-name"
-msgid "P4 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:269
-msgctxt "input-name"
-msgid "P4 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:270
-msgctxt "input-name"
-msgid "P4 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:271
-msgctxt "input-name"
-msgid "P4 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:272
-msgctxt "input-name"
-msgid "P4 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:273
-msgctxt "input-name"
-msgid "P4 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:274
-msgctxt "input-name"
-msgid "P4 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:275
-msgctxt "input-name"
-msgid "P4 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:276
-msgctxt "input-name"
-msgid "P4 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:277
-msgctxt "input-name"
-msgid "P4 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:278
-msgctxt "input-name"
-msgid "P4 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:279
-msgctxt "input-name"
-msgid "P4 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:280
-msgctxt "input-name"
-msgid "P4 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:281
-msgctxt "input-name"
-msgid "P4 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:282
-msgctxt "input-name"
-msgid "P4 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:283
-msgctxt "input-name"
-msgid "P4 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:284
-msgctxt "input-name"
-msgid "P4 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:289
-msgctxt "input-name"
-msgid "P5 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:290
-msgctxt "input-name"
-msgid "P5 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:291
-msgctxt "input-name"
-msgid "P5 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:292
-msgctxt "input-name"
-msgid "P5 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:293
-msgctxt "input-name"
-msgid "P5 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:294
-msgctxt "input-name"
-msgid "P5 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:295
-msgctxt "input-name"
-msgid "P5 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:296
-msgctxt "input-name"
-msgid "P5 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:297
-msgctxt "input-name"
-msgid "P5 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:298
-msgctxt "input-name"
-msgid "P5 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:299
-msgctxt "input-name"
-msgid "P5 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:300
-msgctxt "input-name"
-msgid "P5 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:301
-msgctxt "input-name"
-msgid "P5 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:302
-msgctxt "input-name"
-msgid "P5 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:303
-msgctxt "input-name"
-msgid "P5 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:304
-msgctxt "input-name"
-msgid "P5 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:305
-msgctxt "input-name"
-msgid "P5 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:306
-msgctxt "input-name"
-msgid "P5 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:307
-msgctxt "input-name"
-msgid "P5 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:308
-msgctxt "input-name"
-msgid "P5 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:309
-msgctxt "input-name"
-msgid "P5 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:310
-msgctxt "input-name"
-msgid "P5 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:311
-msgctxt "input-name"
-msgid "P5 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:312
-msgctxt "input-name"
-msgid "P5 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:313
-msgctxt "input-name"
-msgid "P5 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:314
-msgctxt "input-name"
-msgid "P5 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:315
-msgctxt "input-name"
-msgid "P5 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:316
-msgctxt "input-name"
-msgid "P5 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:317
-msgctxt "input-name"
-msgid "P5 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:318
-msgctxt "input-name"
-msgid "P5 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:323
-msgctxt "input-name"
-msgid "P6 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:324
-msgctxt "input-name"
-msgid "P6 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:325
-msgctxt "input-name"
-msgid "P6 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:326
-msgctxt "input-name"
-msgid "P6 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:327
-msgctxt "input-name"
-msgid "P6 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:328
-msgctxt "input-name"
-msgid "P6 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:329
-msgctxt "input-name"
-msgid "P6 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:330
-msgctxt "input-name"
-msgid "P6 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:331
-msgctxt "input-name"
-msgid "P6 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:332
-msgctxt "input-name"
-msgid "P6 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:333
-msgctxt "input-name"
-msgid "P6 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:334
-msgctxt "input-name"
-msgid "P6 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:335
-msgctxt "input-name"
-msgid "P6 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:336
-msgctxt "input-name"
-msgid "P6 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:337
-msgctxt "input-name"
-msgid "P6 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:338
-msgctxt "input-name"
-msgid "P6 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:339
-msgctxt "input-name"
-msgid "P6 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:340
-msgctxt "input-name"
-msgid "P6 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:341
-msgctxt "input-name"
-msgid "P6 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:342
-msgctxt "input-name"
-msgid "P6 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:343
-msgctxt "input-name"
-msgid "P6 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:344
-msgctxt "input-name"
-msgid "P6 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:345
-msgctxt "input-name"
-msgid "P6 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:346
-msgctxt "input-name"
-msgid "P6 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:347
-msgctxt "input-name"
-msgid "P6 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:348
-msgctxt "input-name"
-msgid "P6 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:349
-msgctxt "input-name"
-msgid "P6 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:350
-msgctxt "input-name"
-msgid "P6 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:351
-msgctxt "input-name"
-msgid "P6 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:352
-msgctxt "input-name"
-msgid "P6 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:357
-msgctxt "input-name"
-msgid "P7 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:358
-msgctxt "input-name"
-msgid "P7 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:359
-msgctxt "input-name"
-msgid "P7 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:360
-msgctxt "input-name"
-msgid "P7 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:361
-msgctxt "input-name"
-msgid "P7 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:362
-msgctxt "input-name"
-msgid "P7 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:363
-msgctxt "input-name"
-msgid "P7 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:364
-msgctxt "input-name"
-msgid "P7 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:365
-msgctxt "input-name"
-msgid "P7 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:366
-msgctxt "input-name"
-msgid "P7 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:367
-msgctxt "input-name"
-msgid "P7 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:368
-msgctxt "input-name"
-msgid "P7 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:369
-msgctxt "input-name"
-msgid "P7 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:370
-msgctxt "input-name"
-msgid "P7 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:371
-msgctxt "input-name"
-msgid "P7 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:372
-msgctxt "input-name"
-msgid "P7 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:373
-msgctxt "input-name"
-msgid "P7 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:374
-msgctxt "input-name"
-msgid "P7 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:375
-msgctxt "input-name"
-msgid "P7 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:376
-msgctxt "input-name"
-msgid "P7 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:377
-msgctxt "input-name"
-msgid "P7 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:378
-msgctxt "input-name"
-msgid "P7 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:379
-msgctxt "input-name"
-msgid "P7 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:380
-msgctxt "input-name"
-msgid "P7 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:381
-msgctxt "input-name"
-msgid "P7 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:382
-msgctxt "input-name"
-msgid "P7 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:383
-msgctxt "input-name"
-msgid "P7 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:384
-msgctxt "input-name"
-msgid "P7 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:385
-msgctxt "input-name"
-msgid "P7 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:386
-msgctxt "input-name"
-msgid "P7 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:391
-msgctxt "input-name"
-msgid "P8 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:392
-msgctxt "input-name"
-msgid "P8 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:393
-msgctxt "input-name"
-msgid "P8 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:394
-msgctxt "input-name"
-msgid "P8 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:395
-msgctxt "input-name"
-msgid "P8 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:396
-msgctxt "input-name"
-msgid "P8 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:397
-msgctxt "input-name"
-msgid "P8 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:398
-msgctxt "input-name"
-msgid "P8 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:399
-msgctxt "input-name"
-msgid "P8 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:400
-msgctxt "input-name"
-msgid "P8 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:401
-msgctxt "input-name"
-msgid "P8 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:402
-msgctxt "input-name"
-msgid "P8 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:403
-msgctxt "input-name"
-msgid "P8 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:404
-msgctxt "input-name"
-msgid "P8 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:405
-msgctxt "input-name"
-msgid "P8 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:406
-msgctxt "input-name"
-msgid "P8 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:407
-msgctxt "input-name"
-msgid "P8 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:408
-msgctxt "input-name"
-msgid "P8 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:409
-msgctxt "input-name"
-msgid "P8 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:410
-msgctxt "input-name"
-msgid "P8 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:411
-msgctxt "input-name"
-msgid "P8 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:412
-msgctxt "input-name"
-msgid "P8 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:413
-msgctxt "input-name"
-msgid "P8 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:414
-msgctxt "input-name"
-msgid "P8 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:415
-msgctxt "input-name"
-msgid "P8 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:416
-msgctxt "input-name"
-msgid "P8 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:417
-msgctxt "input-name"
-msgid "P8 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:418
-msgctxt "input-name"
-msgid "P8 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:419
-msgctxt "input-name"
-msgid "P8 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:420
-msgctxt "input-name"
-msgid "P8 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:425
-msgctxt "input-name"
-msgid "P9 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:426
-msgctxt "input-name"
-msgid "P9 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:427
-msgctxt "input-name"
-msgid "P9 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:428
-msgctxt "input-name"
-msgid "P9 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:429
-msgctxt "input-name"
-msgid "P9 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:430
-msgctxt "input-name"
-msgid "P9 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:431
-msgctxt "input-name"
-msgid "P9 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:432
-msgctxt "input-name"
-msgid "P9 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:433
-msgctxt "input-name"
-msgid "P9 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:434
-msgctxt "input-name"
-msgid "P9 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:435
-msgctxt "input-name"
-msgid "P9 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:436
-msgctxt "input-name"
-msgid "P9 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:437
-msgctxt "input-name"
-msgid "P9 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:438
-msgctxt "input-name"
-msgid "P9 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:439
-msgctxt "input-name"
-msgid "P9 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:440
-msgctxt "input-name"
-msgid "P9 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:441
-msgctxt "input-name"
-msgid "P9 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:442
-msgctxt "input-name"
-msgid "P9 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:443
-msgctxt "input-name"
-msgid "P9 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:444
-msgctxt "input-name"
-msgid "P9 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:445
-msgctxt "input-name"
-msgid "P9 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:446
-msgctxt "input-name"
-msgid "P9 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:447
-msgctxt "input-name"
-msgid "P9 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:448
-msgctxt "input-name"
-msgid "P9 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:449
-msgctxt "input-name"
-msgid "P9 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:450
-msgctxt "input-name"
-msgid "P9 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:451
-msgctxt "input-name"
-msgid "P9 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:452
-msgctxt "input-name"
-msgid "P9 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:453
-msgctxt "input-name"
-msgid "P9 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:454
-msgctxt "input-name"
-msgid "P9 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:459
-msgctxt "input-name"
-msgid "P10 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:460
-msgctxt "input-name"
-msgid "P10 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:461
-msgctxt "input-name"
-msgid "P10 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:462
-msgctxt "input-name"
-msgid "P10 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:463
-msgctxt "input-name"
-msgid "P10 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:464
-msgctxt "input-name"
-msgid "P10 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:465
-msgctxt "input-name"
-msgid "P10 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:466
-msgctxt "input-name"
-msgid "P10 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:467
-msgctxt "input-name"
-msgid "P10 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:468
-msgctxt "input-name"
-msgid "P10 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:469
-msgctxt "input-name"
-msgid "P10 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:470
-msgctxt "input-name"
-msgid "P10 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:471
-msgctxt "input-name"
-msgid "P10 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:472
-msgctxt "input-name"
-msgid "P10 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:473
-msgctxt "input-name"
-msgid "P10 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:474
-msgctxt "input-name"
-msgid "P10 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:475
-msgctxt "input-name"
-msgid "P10 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:476
-msgctxt "input-name"
-msgid "P10 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:477
-msgctxt "input-name"
-msgid "P10 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:478
-msgctxt "input-name"
-msgid "P10 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:479
-msgctxt "input-name"
-msgid "P10 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:480
-msgctxt "input-name"
-msgid "P10 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:481
-msgctxt "input-name"
-msgid "P10 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:482
-msgctxt "input-name"
-msgid "P10 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:483
-msgctxt "input-name"
-msgid "P10 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:484
-msgctxt "input-name"
-msgid "P10 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:485
-msgctxt "input-name"
-msgid "P10 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:486
-msgctxt "input-name"
-msgid "P10 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:487
-msgctxt "input-name"
-msgid "P10 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:488
-msgctxt "input-name"
-msgid "P10 Select"
-msgstr ""
-
 #: src/emu/inpttype.ipp:493
 msgctxt "input-name"
 msgid "1 Player Start"
@@ -5478,154 +4107,31 @@ msgctxt "input-name"
 msgid "Volume Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:550
-msgctxt "input-name"
-msgid "P1 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:551
-msgctxt "input-name"
-msgid "P2 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:552
-msgctxt "input-name"
-msgid "P3 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:553
-msgctxt "input-name"
-msgid "P4 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:554
-msgctxt "input-name"
-msgid "P5 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:555
-msgctxt "input-name"
-msgid "P6 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:556
-msgctxt "input-name"
-msgid "P7 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:557
-msgctxt "input-name"
-msgid "P8 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:558
-msgctxt "input-name"
-msgid "P9 Pedal 1"
-msgstr ""
-
+#: src/emu/inpttype.ipp:550 src/emu/inpttype.ipp:551 src/emu/inpttype.ipp:552
+#: src/emu/inpttype.ipp:553 src/emu/inpttype.ipp:554 src/emu/inpttype.ipp:555
+#: src/emu/inpttype.ipp:556 src/emu/inpttype.ipp:557 src/emu/inpttype.ipp:558
 #: src/emu/inpttype.ipp:559
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:564
-msgctxt "input-name"
-msgid "P1 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:565
-msgctxt "input-name"
-msgid "P2 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:566
-msgctxt "input-name"
-msgid "P3 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:567
-msgctxt "input-name"
-msgid "P4 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:568
-msgctxt "input-name"
-msgid "P5 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:569
-msgctxt "input-name"
-msgid "P6 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:570
-msgctxt "input-name"
-msgid "P7 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:571
-msgctxt "input-name"
-msgid "P8 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:572
-msgctxt "input-name"
-msgid "P9 Pedal 2"
+msgid "%p Pedal 1"
 msgstr ""
 
+#: src/emu/inpttype.ipp:564 src/emu/inpttype.ipp:565 src/emu/inpttype.ipp:566
+#: src/emu/inpttype.ipp:567 src/emu/inpttype.ipp:568 src/emu/inpttype.ipp:569
+#: src/emu/inpttype.ipp:570 src/emu/inpttype.ipp:571 src/emu/inpttype.ipp:572
 #: src/emu/inpttype.ipp:573
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:578
-msgctxt "input-name"
-msgid "P1 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:579
-msgctxt "input-name"
-msgid "P2 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:580
-msgctxt "input-name"
-msgid "P3 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:581
-msgctxt "input-name"
-msgid "P4 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:582
-msgctxt "input-name"
-msgid "P5 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:583
-msgctxt "input-name"
-msgid "P6 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:584
-msgctxt "input-name"
-msgid "P7 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:585
-msgctxt "input-name"
-msgid "P8 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:586
-msgctxt "input-name"
-msgid "P9 Pedal 3"
+msgid "%p Pedal 2"
 msgstr ""
 
+#: src/emu/inpttype.ipp:578 src/emu/inpttype.ipp:579 src/emu/inpttype.ipp:580
+#: src/emu/inpttype.ipp:581 src/emu/inpttype.ipp:582 src/emu/inpttype.ipp:583
+#: src/emu/inpttype.ipp:584 src/emu/inpttype.ipp:585 src/emu/inpttype.ipp:586
 #: src/emu/inpttype.ipp:587
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 3"
+msgid "%p Pedal 3"
 msgstr ""
 
 #: src/emu/inpttype.ipp:592
diff --git a/language/Czech/strings.po b/language/Czech/strings.po
index 31e3251184b..6e07da99df2 100644
--- a/language/Czech/strings.po
+++ b/language/Czech/strings.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-19 02:50+1100\n"
+"POT-Creation-Date: 2021-12-09 04:44+1100\n"
 "PO-Revision-Date: 2016-04-01 16:38+0200\n"
 "Last-Translator: Karel Brejcha <pankabre@gmail.com>\n"
 "Language-Team: MAME Language Team\n"
@@ -272,12 +272,12 @@ msgstr ""
 msgid "Driver: \"%1$s\" software list "
 msgstr "Driver: \"%1$s\" software list "
 
-#: src/frontend/mame/ui/selsoft.cpp:711 src/frontend/mame/ui/selgame.cpp:1066
+#: src/frontend/mame/ui/selsoft.cpp:711 src/frontend/mame/ui/selgame.cpp:1076
 #, c-format
 msgid "%1$s: %2$s - Search: %3$s_"
 msgstr ""
 
-#: src/frontend/mame/ui/selsoft.cpp:713 src/frontend/mame/ui/selgame.cpp:1068
+#: src/frontend/mame/ui/selsoft.cpp:713 src/frontend/mame/ui/selgame.cpp:1078
 #, c-format
 msgid "Search: %1$s_"
 msgstr ""
@@ -287,7 +287,7 @@ msgstr ""
 msgid "Software list/item: %1$s:%2$s"
 msgstr ""
 
-#: src/frontend/mame/ui/optsmenu.cpp:73 src/frontend/mame/ui/sndmenu.cpp:165
+#: src/frontend/mame/ui/optsmenu.cpp:73 src/frontend/mame/ui/sndmenu.cpp:161
 msgid "Sound Options"
 msgstr "Možnosti zvuku"
 
@@ -382,11 +382,11 @@ msgid "Show mouse pointer"
 msgstr "Zobraz ukazatel myši"
 
 #: src/frontend/mame/ui/submenu.cpp:39
-msgid "Confirm quit from machines"
-msgstr "Potvrď odchod ze zařízení"
+msgid "Confirm quit from emulation"
+msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:40
-msgid "Skip information screen at startup"
+msgid "Skip system information screen"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:41
@@ -402,8 +402,8 @@ msgid "Skip BIOS selection menu"
 msgstr "Přeskoč menu s výběrem BIOSu"
 
 #: src/frontend/mame/ui/submenu.cpp:44
-msgid "Skip software parts selection menu"
-msgstr "Přeskoč menu s výběrem částí software"
+msgid "Skip software part selection menu"
+msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:45
 msgid "Info auto audit"
@@ -554,7 +554,7 @@ msgid "UI active"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:91
-msgid "Offscreen reload"
+msgid "Off-screen reload"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:92
@@ -570,7 +570,7 @@ msgid "Natural keyboard"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:95
-msgid "Simultaneous contradictory"
+msgid "Allow contradictory joystick inputs"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:96
@@ -594,8 +594,8 @@ msgid "Pedal Device Assignment"
 msgstr "Pedál zařízení přiřazení"
 
 #: src/frontend/mame/ui/submenu.cpp:106
-msgid "Adstick Device Assignment"
-msgstr "ADStick zařízení přiřazení"
+msgid "AD Stick Device Assignment"
+msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:107
 msgid "Paddle Device Assignment"
@@ -681,14 +681,14 @@ msgstr "Synchronizované obnovení"
 msgid "Wait Vertical Sync"
 msgstr "Čekat na V-Sync"
 
-#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:687
+#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:689
 #: src/frontend/mame/ui/videoopt.cpp:191 src/frontend/mame/ui/custui.cpp:490
 #: src/frontend/mame/ui/analogipt.cpp:471 plugins/cheatfind/init.lua:766
 #: plugins/cheatfind/init.lua:777 plugins/cheat/init.lua:668
 msgid "On"
 msgstr "Zapnuto"
 
-#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:690
+#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:692
 #: src/frontend/mame/ui/videoopt.cpp:207 src/frontend/mame/ui/custui.cpp:490
 #: src/frontend/mame/ui/analogipt.cpp:471 plugins/cheatfind/init.lua:763
 #: plugins/cheatfind/init.lua:774 plugins/cheat/init.lua:671
@@ -696,11 +696,11 @@ msgstr "Zapnuto"
 msgid "Off"
 msgstr "Vypnuto"
 
-#: src/frontend/mame/ui/menu.cpp:693
+#: src/frontend/mame/ui/menu.cpp:695
 msgid "Auto"
 msgstr "Automaticky"
 
-#: src/frontend/mame/ui/menu.cpp:1195
+#: src/frontend/mame/ui/menu.cpp:1197
 #: src/frontend/mame/ui/simpleselgame.cpp:278
 #: src/frontend/mame/ui/selmenu.cpp:1280
 msgid "Return to Previous Menu"
@@ -708,7 +708,7 @@ msgstr "Zpět na předchozí menu"
 
 #: src/frontend/mame/ui/filemngr.cpp:139
 #: src/frontend/mame/ui/confswitch.cpp:119
-#: src/frontend/mame/ui/inputmap.cpp:559 src/frontend/mame/ui/analogipt.cpp:360
+#: src/frontend/mame/ui/inputmap.cpp:563 src/frontend/mame/ui/analogipt.cpp:360
 #, c-format
 msgid "[root%1$s]"
 msgstr ""
@@ -971,22 +971,22 @@ msgstr ""
 "CPU:\n"
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "GHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "MHz"
 msgstr "MHz"
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "kHz"
 msgstr "kHz"
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "Hz"
 msgstr ""
 
@@ -1014,38 +1014,38 @@ msgstr "Žádný\n"
 msgid "Vector"
 msgstr "Vektor"
 
-#: src/frontend/mame/ui/info.cpp:480
+#: src/frontend/mame/ui/info.cpp:483
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr "%1$s: %2$s\n"
 
-#: src/frontend/mame/ui/info.cpp:480
+#: src/frontend/mame/ui/info.cpp:483
 msgid "%2$s\n"
 msgstr "%2$s\n"
 
-#: src/frontend/mame/ui/info.cpp:497
+#: src/frontend/mame/ui/info.cpp:500
 #, c-format
 msgid "Screen '%1$s'"
 msgstr "Obraz '%1$s'"
 
-#: src/frontend/mame/ui/info.cpp:499
+#: src/frontend/mame/ui/info.cpp:502
 msgid "Screen"
 msgstr "Obraz"
 
-#: src/frontend/mame/ui/info.cpp:570 src/frontend/mame/ui/info.cpp:581
+#: src/frontend/mame/ui/info.cpp:573 src/frontend/mame/ui/info.cpp:584
 #, c-format
 msgid "%1$s:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:662
+#: src/frontend/mame/ui/info.cpp:665
 msgid "Not supported"
 msgstr "Nepodporováno"
 
-#: src/frontend/mame/ui/info.cpp:665
+#: src/frontend/mame/ui/info.cpp:668
 msgid "Partially supported"
 msgstr "Částečná podpora"
 
-#: src/frontend/mame/ui/info.cpp:674
+#: src/frontend/mame/ui/info.cpp:677
 msgid "[empty]"
 msgstr "[prázdný]"
 
@@ -1118,7 +1118,7 @@ msgid "Emulated"
 msgstr "Emulovaná"
 
 #: src/frontend/mame/ui/keyboard.cpp:59 src/frontend/mame/ui/confswitch.cpp:117
-#: src/frontend/mame/ui/inputmap.cpp:557 src/frontend/mame/ui/analogipt.cpp:358
+#: src/frontend/mame/ui/inputmap.cpp:561 src/frontend/mame/ui/analogipt.cpp:358
 #, c-format
 msgid "%1$s [root%2$s]"
 msgstr ""
@@ -1478,7 +1478,7 @@ msgctxt "swlist-info"
 msgid "Software list/item"
 msgstr ""
 
-#: src/frontend/mame/ui/datmenu.cpp:88 src/frontend/mame/ui/selmenu.cpp:2698
+#: src/frontend/mame/ui/datmenu.cpp:88 src/frontend/mame/ui/selmenu.cpp:2707
 msgid "Software List Info"
 msgstr ""
 
@@ -1599,7 +1599,7 @@ msgstr ""
 msgid "Configure Machine:"
 msgstr ""
 
-#: src/frontend/mame/ui/miscmenu.cpp:858 src/frontend/mame/ui/selmenu.cpp:2638
+#: src/frontend/mame/ui/miscmenu.cpp:858 src/frontend/mame/ui/selmenu.cpp:2647
 msgid " (default)"
 msgstr " (standardní)"
 
@@ -1620,7 +1620,7 @@ msgstr ""
 "Stiskni %1$s pro ukončení\n"
 "Stiskni %2$s pro návrat do emulace"
 
-#: src/frontend/mame/ui/info_pty.cpp:30 src/frontend/mame/ui/mainmenu.cpp:155
+#: src/frontend/mame/ui/info_pty.cpp:30
 msgid "Pseudo terminals"
 msgstr "Pseudo terminály"
 
@@ -1688,52 +1688,52 @@ msgstr ""
 msgid "Other Controls"
 msgstr "Ostatní ovládání"
 
-#: src/frontend/mame/ui/inputmap.cpp:227
+#: src/frontend/mame/ui/inputmap.cpp:231
 msgid "This machine has no configurable inputs."
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:327
+#: src/frontend/mame/ui/inputmap.cpp:331
 msgid "Pressed"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:397
+#: src/frontend/mame/ui/inputmap.cpp:401
 msgid "Invalid sequence entered"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:542
+#: src/frontend/mame/ui/inputmap.cpp:546
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:543
+#: src/frontend/mame/ui/inputmap.cpp:547
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog Inc"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:544
+#: src/frontend/mame/ui/inputmap.cpp:548
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog Dec"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:586
+#: src/frontend/mame/ui/inputmap.cpp:590
 #, c-format
 msgid "Press %1$s to set\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:587
+#: src/frontend/mame/ui/inputmap.cpp:591
 #, c-format
 msgid "Press %1$s to append\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:588
+#: src/frontend/mame/ui/inputmap.cpp:592
 #, c-format
 msgid "Press %1$s to clear\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:589
+#: src/frontend/mame/ui/inputmap.cpp:593
 #, c-format
 msgid "Press %1$s to restore default\n"
 msgstr ""
@@ -1797,7 +1797,7 @@ msgid ""
 msgstr ""
 
 #: src/frontend/mame/ui/simpleselgame.cpp:273
-#: src/frontend/mame/ui/selgame.cpp:436
+#: src/frontend/mame/ui/selgame.cpp:443
 msgid "Configure Options"
 msgstr "Možnosti konfigurace"
 
@@ -2131,16 +2131,16 @@ msgstr ""
 msgid "Expand to fit"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:437
+#: src/frontend/mame/ui/selgame.cpp:444
 msgid "Configure Machine"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:1050
+#: src/frontend/mame/ui/selgame.cpp:1060
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d machines (%5$d BIOS) )"
 msgstr "%1$s %2$s ( %3$d / %4$d zařízení (%5$d BIOS) )"
 
-#: src/frontend/mame/ui/selgame.cpp:1078
+#: src/frontend/mame/ui/selgame.cpp:1088
 #, c-format
 msgid "System: %1$-.100s"
 msgstr "Systém: %1$-.100s"
@@ -2162,7 +2162,7 @@ msgstr ""
 #: src/frontend/mame/ui/auditmenu.cpp:98
 #, c-format
 msgid ""
-"Auditing ROMs for machine %2$u of %3$u...\n"
+"Auditing media for machine %2$u of %3$u...\n"
 "%1$s"
 msgstr ""
 
@@ -2177,12 +2177,12 @@ msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:136
 #, c-format
-msgid "Audit ROMs for %1$u machines marked unavailable"
+msgid "Audit media for %1$u machines marked unavailable"
 msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:137
 #, c-format
-msgid "Audit ROMs for all %1$u machines"
+msgid "Audit media for all %1$u machines"
 msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:154
@@ -2389,84 +2389,84 @@ msgctxt "color-sample"
 msgid "Clone"
 msgstr "Klon"
 
-#: src/frontend/mame/ui/custui.cpp:914
+#: src/frontend/mame/ui/custui.cpp:906
 msgid "ARGB Settings"
 msgstr "ARGB nastavení"
 
-#: src/frontend/mame/ui/custui.cpp:919 src/frontend/mame/ui/custui.cpp:922
+#: src/frontend/mame/ui/custui.cpp:911 src/frontend/mame/ui/custui.cpp:914
 msgctxt "color-channel"
 msgid "Alpha"
 msgstr "Průhlednost"
 
-#: src/frontend/mame/ui/custui.cpp:927 src/frontend/mame/ui/custui.cpp:930
+#: src/frontend/mame/ui/custui.cpp:919 src/frontend/mame/ui/custui.cpp:922
 msgctxt "color-channel"
 msgid "Red"
 msgstr "Červená"
 
-#: src/frontend/mame/ui/custui.cpp:935 src/frontend/mame/ui/custui.cpp:938
+#: src/frontend/mame/ui/custui.cpp:927 src/frontend/mame/ui/custui.cpp:930
 msgctxt "color-channel"
 msgid "Green"
 msgstr "Zelená"
 
-#: src/frontend/mame/ui/custui.cpp:943 src/frontend/mame/ui/custui.cpp:946
+#: src/frontend/mame/ui/custui.cpp:935 src/frontend/mame/ui/custui.cpp:938
 msgctxt "color-channel"
 msgid "Blue"
 msgstr "Modrá"
 
-#: src/frontend/mame/ui/custui.cpp:949
+#: src/frontend/mame/ui/custui.cpp:941
 msgid "Choose from palette"
 msgstr "Výběr z palety"
 
-#: src/frontend/mame/ui/custui.cpp:996
+#: src/frontend/mame/ui/custui.cpp:988
 msgid "Color preview:"
 msgstr "Barevný náhled:"
 
-#: src/frontend/mame/ui/custui.cpp:1093
+#: src/frontend/mame/ui/custui.cpp:1085
 msgctxt "color-preset"
 msgid "White"
 msgstr "Bílá"
 
-#: src/frontend/mame/ui/custui.cpp:1094
+#: src/frontend/mame/ui/custui.cpp:1086
 msgctxt "color-preset"
 msgid "Silver"
 msgstr "Stříbrná"
 
-#: src/frontend/mame/ui/custui.cpp:1095
+#: src/frontend/mame/ui/custui.cpp:1087
 msgctxt "color-preset"
 msgid "Gray"
 msgstr "Šedá"
 
-#: src/frontend/mame/ui/custui.cpp:1096
+#: src/frontend/mame/ui/custui.cpp:1088
 msgctxt "color-preset"
 msgid "Black"
 msgstr "Černá"
 
-#: src/frontend/mame/ui/custui.cpp:1097
+#: src/frontend/mame/ui/custui.cpp:1089
 msgctxt "color-preset"
 msgid "Red"
 msgstr "Červená"
 
-#: src/frontend/mame/ui/custui.cpp:1098
+#: src/frontend/mame/ui/custui.cpp:1090
 msgctxt "color-preset"
 msgid "Orange"
 msgstr "Oranžová"
 
-#: src/frontend/mame/ui/custui.cpp:1099
+#: src/frontend/mame/ui/custui.cpp:1091
 msgctxt "color-preset"
 msgid "Yellow"
 msgstr "Žlutá"
 
-#: src/frontend/mame/ui/custui.cpp:1100
+#: src/frontend/mame/ui/custui.cpp:1092
 msgctxt "color-preset"
 msgid "Green"
 msgstr "Zelená"
 
-#: src/frontend/mame/ui/custui.cpp:1101
+#: src/frontend/mame/ui/custui.cpp:1093
 msgctxt "color-preset"
 msgid "Blue"
 msgstr "Modrá"
 
-#: src/frontend/mame/ui/custui.cpp:1102
+#: src/frontend/mame/ui/custui.cpp:1094
 msgctxt "color-preset"
 msgid "Violet"
 msgstr "Fialová"
@@ -2531,7 +2531,7 @@ msgid "Input (general)"
 msgstr "Vstup (vše)"
 
 #: src/frontend/mame/ui/mainmenu.cpp:123
-msgid "Input (this Machine)"
+msgid "Input (this machine)"
 msgstr "Vstup (toto zařízení)"
 
 #: src/frontend/mame/ui/mainmenu.cpp:126
@@ -2570,6 +2570,10 @@ msgstr "Souborový manažer"
 msgid "Tape Control"
 msgstr "Ovládání kazetového přehrávače"
 
+#: src/frontend/mame/ui/mainmenu.cpp:155
+msgid "Pseudo Terminals"
+msgstr ""
+
 #: src/frontend/mame/ui/mainmenu.cpp:158
 msgid "BIOS Selection"
 msgstr "Výběr BIOSu"
@@ -2608,7 +2612,7 @@ msgstr "Externí DAT zobrazení"
 
 #: src/frontend/mame/ui/mainmenu.cpp:200
 #, c-format
-msgid "About %s"
+msgid "About %1$s"
 msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:212
@@ -2768,373 +2772,373 @@ msgstr "Driver je klon: %1$s"
 msgid "%1$s %2$s"
 msgstr "%1$s %2$s"
 
-#: src/frontend/mame/ui/selmenu.cpp:2235
+#: src/frontend/mame/ui/selmenu.cpp:2244
 msgid "Images"
 msgstr "Obrázky"
 
-#: src/frontend/mame/ui/selmenu.cpp:2236
+#: src/frontend/mame/ui/selmenu.cpp:2245
 msgid "Infos"
 msgstr "Informace"
 
-#: src/frontend/mame/ui/selmenu.cpp:2551
+#: src/frontend/mame/ui/selmenu.cpp:2560
 msgid ""
 "Required ROM/disk images for the selected system are missing or incorrect. "
 "Please acquire the correct files or select a different system.\n"
 "\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2567
+#: src/frontend/mame/ui/selmenu.cpp:2576
 msgid ""
 "Required ROM/disk images for the selected software are missing or incorrect. "
 "Please acquire the correct files or select a different software item.\n"
 "\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2583
+#: src/frontend/mame/ui/selmenu.cpp:2592
 msgid "incorrect checksum"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2586
+#: src/frontend/mame/ui/selmenu.cpp:2595
 msgid "incorrect length"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2589
+#: src/frontend/mame/ui/selmenu.cpp:2598
 msgid "not found"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2600
+#: src/frontend/mame/ui/selmenu.cpp:2609
 #, c-format
 msgid "%1$s (%2$s) - %3$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2602
+#: src/frontend/mame/ui/selmenu.cpp:2611
 #, c-format
 msgid "%1$s - %2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2606
+#: src/frontend/mame/ui/selmenu.cpp:2615
 msgid "Press any key to continue."
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2735
+#: src/frontend/mame/ui/selmenu.cpp:2744
 msgid "General Info"
 msgstr "Základní informace"
 
-#: src/frontend/mame/ui/selmenu.cpp:2887
+#: src/frontend/mame/ui/selmenu.cpp:2896
 #, c-format
 msgid "Romset\t%1$s\n"
 msgstr "Romset\t%1$s\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2888
+#: src/frontend/mame/ui/selmenu.cpp:2897
 #, c-format
 msgid "Year\t%1$s\n"
 msgstr "Rok\t%1$s\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2889
+#: src/frontend/mame/ui/selmenu.cpp:2898
 #, c-format
 msgid "Manufacturer\t%1$s\n"
 msgstr "Výrobce\t%1$s\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2896
+#: src/frontend/mame/ui/selmenu.cpp:2905
 #, c-format
 msgid "Driver is Clone of\t%1$s\n"
 msgstr "Driver je Klon\t%1$s\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2901
+#: src/frontend/mame/ui/selmenu.cpp:2910
 msgid "Driver is Parent\t\n"
 msgstr "Driver je Parent\t\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2905
+#: src/frontend/mame/ui/selmenu.cpp:2914
 msgid "Analog Controls\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2907
+#: src/frontend/mame/ui/selmenu.cpp:2916
 msgid "Keyboard Inputs\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2910
+#: src/frontend/mame/ui/selmenu.cpp:2919
 msgid "Overall\tNOT WORKING\n"
 msgstr "Celkově\tNEFUNGUJE\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2912
+#: src/frontend/mame/ui/selmenu.cpp:2921
 msgid "Overall\tUnemulated Protection\n"
 msgstr "Celkově\tNeemulovaná ochrana\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2914
+#: src/frontend/mame/ui/selmenu.cpp:2923
 msgid "Overall\tWorking\n"
 msgstr "Celkově\tFunguje\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2917
+#: src/frontend/mame/ui/selmenu.cpp:2926
 msgid "Graphics\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2919
+#: src/frontend/mame/ui/selmenu.cpp:2928
 msgid "Graphics\tWrong Colors\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2921
+#: src/frontend/mame/ui/selmenu.cpp:2930
 msgid "Graphics\tImperfect Colors\n"
 msgstr "Grafika\tNedokonalé barvy\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2923
+#: src/frontend/mame/ui/selmenu.cpp:2932
 msgid "Graphics\tImperfect\n"
 msgstr "Grafika\tNedokonalá\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2925
+#: src/frontend/mame/ui/selmenu.cpp:2934
 msgid "Graphics\tOK\n"
 msgstr "Grafika\tOK\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2928
+#: src/frontend/mame/ui/selmenu.cpp:2937
 msgid "Sound\tNone\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2930
+#: src/frontend/mame/ui/selmenu.cpp:2939
 msgid "Sound\tUnimplemented\n"
 msgstr "Zvuk\tNeimplementován\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2932
+#: src/frontend/mame/ui/selmenu.cpp:2941
 msgid "Sound\tImperfect\n"
 msgstr "Zvuk\tNedokonalý\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2934
+#: src/frontend/mame/ui/selmenu.cpp:2943
 msgid "Sound\tOK\n"
 msgstr "Zvuk\tOK\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2937
+#: src/frontend/mame/ui/selmenu.cpp:2946
 msgid "Capture\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2939
+#: src/frontend/mame/ui/selmenu.cpp:2948
 msgid "Capture\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2942
+#: src/frontend/mame/ui/selmenu.cpp:2951
 msgid "Camera\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2944
+#: src/frontend/mame/ui/selmenu.cpp:2953
 msgid "Camera\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2947
+#: src/frontend/mame/ui/selmenu.cpp:2956
 msgid "Microphone\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2949
+#: src/frontend/mame/ui/selmenu.cpp:2958
 msgid "Microphone\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2952
+#: src/frontend/mame/ui/selmenu.cpp:2961
 msgid "Controls\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2954
+#: src/frontend/mame/ui/selmenu.cpp:2963
 msgid "Controls\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2957
+#: src/frontend/mame/ui/selmenu.cpp:2966
 msgid "Keyboard\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2959
+#: src/frontend/mame/ui/selmenu.cpp:2968
 msgid "Keyboard\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2962
+#: src/frontend/mame/ui/selmenu.cpp:2971
 msgid "Mouse\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2964
+#: src/frontend/mame/ui/selmenu.cpp:2973
 msgid "Mouse\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2967
+#: src/frontend/mame/ui/selmenu.cpp:2976
 msgid "Media\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2969
+#: src/frontend/mame/ui/selmenu.cpp:2978
 msgid "Media\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2972
+#: src/frontend/mame/ui/selmenu.cpp:2981
 msgid "Disk\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2974
+#: src/frontend/mame/ui/selmenu.cpp:2983
 msgid "Disk\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2977
+#: src/frontend/mame/ui/selmenu.cpp:2986
 msgid "Printer\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2979
+#: src/frontend/mame/ui/selmenu.cpp:2988
 msgid "Printer\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2982
+#: src/frontend/mame/ui/selmenu.cpp:2991
 msgid "Mag. Tape\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2984
+#: src/frontend/mame/ui/selmenu.cpp:2993
 msgid "Mag. Tape\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2987
+#: src/frontend/mame/ui/selmenu.cpp:2996
 msgid "Punch Tape\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2989
+#: src/frontend/mame/ui/selmenu.cpp:2998
 msgid "Punch Tape\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2992
+#: src/frontend/mame/ui/selmenu.cpp:3001
 msgid "Mag. Drum\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2994
+#: src/frontend/mame/ui/selmenu.cpp:3003
 msgid "Mag. Drum\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2997
+#: src/frontend/mame/ui/selmenu.cpp:3006
 msgid "(EP)ROM\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2999
+#: src/frontend/mame/ui/selmenu.cpp:3008
 msgid "(EP)ROM\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3002
+#: src/frontend/mame/ui/selmenu.cpp:3011
 msgid "Communications\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3004
+#: src/frontend/mame/ui/selmenu.cpp:3013
 msgid "Communications\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3007
+#: src/frontend/mame/ui/selmenu.cpp:3016
 msgid "LAN\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3009
+#: src/frontend/mame/ui/selmenu.cpp:3018
 msgid "LAN\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3012
+#: src/frontend/mame/ui/selmenu.cpp:3021
 msgid "WAN\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3014
+#: src/frontend/mame/ui/selmenu.cpp:3023
 msgid "WAN\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3017
+#: src/frontend/mame/ui/selmenu.cpp:3026
 msgid "Timing\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3019
+#: src/frontend/mame/ui/selmenu.cpp:3028
 msgid "Timing\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3021
+#: src/frontend/mame/ui/selmenu.cpp:3030
 msgid "Mechanical Machine\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3021
+#: src/frontend/mame/ui/selmenu.cpp:3030
 msgid "Mechanical Machine\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3022
+#: src/frontend/mame/ui/selmenu.cpp:3031
 msgid "Requires Artwork\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3022
+#: src/frontend/mame/ui/selmenu.cpp:3031
 msgid "Requires Artwork\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3023
+#: src/frontend/mame/ui/selmenu.cpp:3032
 msgid "Requires Clickable Artwork\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3023
+#: src/frontend/mame/ui/selmenu.cpp:3032
 msgid "Requires Clickable Artwork\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3025
+#: src/frontend/mame/ui/selmenu.cpp:3034
 msgid "Support Cocktail\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3026
+#: src/frontend/mame/ui/selmenu.cpp:3035
 msgid "Driver is BIOS\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3026
+#: src/frontend/mame/ui/selmenu.cpp:3035
 msgid "Driver is BIOS\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3027
+#: src/frontend/mame/ui/selmenu.cpp:3036
 msgid "Support Save\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3027
+#: src/frontend/mame/ui/selmenu.cpp:3036
 msgid "Support Save\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3028
+#: src/frontend/mame/ui/selmenu.cpp:3037
 msgid "Screen Orientation\tVertical\n"
 msgstr "Orientace obrazovky\tVertikální\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3028
+#: src/frontend/mame/ui/selmenu.cpp:3037
 msgid "Screen Orientation\tHorizontal\n"
 msgstr "Orientace obrazovky\tHorizontální\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3038
+#: src/frontend/mame/ui/selmenu.cpp:3047
 msgid "Requires CHD\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3038
+#: src/frontend/mame/ui/selmenu.cpp:3047
 msgid "Requires CHD\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3051
-msgid "ROM Audit Result\tOK\n"
+#: src/frontend/mame/ui/selmenu.cpp:3060
+msgid "Media Audit Result\tOK\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3053
-msgid "ROM Audit Result\tBAD\n"
+#: src/frontend/mame/ui/selmenu.cpp:3062
+msgid "Media Audit Result\tBAD\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3056
+#: src/frontend/mame/ui/selmenu.cpp:3065
 msgid "Samples Audit Result\tNone Needed\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3058
+#: src/frontend/mame/ui/selmenu.cpp:3067
 msgid "Samples Audit Result\tOK\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3060
+#: src/frontend/mame/ui/selmenu.cpp:3069
 msgid "Samples Audit Result\tBAD\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3064
+#: src/frontend/mame/ui/selmenu.cpp:3073
 msgid ""
-"ROM Audit \tDisabled\n"
-"Samples Audit \tDisabled\n"
+"Media Audit\tDisabled\n"
+"Samples Audit\tDisabled\n"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:150
+#: src/frontend/mame/ui/sndmenu.cpp:146
 msgid "Sound"
 msgstr "Zvuk"
 
-#: src/frontend/mame/ui/sndmenu.cpp:151
+#: src/frontend/mame/ui/sndmenu.cpp:147
 msgid "Compressor"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:152
+#: src/frontend/mame/ui/sndmenu.cpp:148
 msgid "Sample Rate"
 msgstr "Vzorkovací frekvence"
 
-#: src/frontend/mame/ui/sndmenu.cpp:153
+#: src/frontend/mame/ui/sndmenu.cpp:149
 msgid "Use External Samples"
 msgstr "Použít externí samply"
 
@@ -3173,511 +3177,681 @@ msgstr ""
 msgid "  Screen '%1$s': Vector\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:132
+#: src/frontend/mame/ui/devopt.cpp:135
 #, c-format
 msgid "  Screen '%1$s': %2$d × %3$d (V) %4$s Hz\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:133
+#: src/frontend/mame/ui/devopt.cpp:136
 #, c-format
 msgid "  Screen '%1$s': %2$d × %3$d (H) %4$s Hz\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:147
+#: src/frontend/mame/ui/devopt.cpp:150
 msgid "* Sound:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:211
+#: src/frontend/mame/ui/devopt.cpp:214
 #, c-format
 msgid ""
 "* BIOS settings:\n"
 "  %1$d options    [default: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:255 src/frontend/mame/ui/devopt.cpp:271
-#: src/frontend/mame/ui/devopt.cpp:332
+#: src/frontend/mame/ui/devopt.cpp:258 src/frontend/mame/ui/devopt.cpp:274
+#: src/frontend/mame/ui/devopt.cpp:335
 #, c-format
 msgid "  %1$s    [default: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:260 src/frontend/mame/ui/devopt.cpp:276
+#: src/frontend/mame/ui/devopt.cpp:263 src/frontend/mame/ui/devopt.cpp:279
 #, c-format
 msgid "  %1$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:282
+#: src/frontend/mame/ui/devopt.cpp:285
 msgid "* DIP switch settings:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:287
+#: src/frontend/mame/ui/devopt.cpp:290
 msgid "* Configuration settings:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:291
+#: src/frontend/mame/ui/devopt.cpp:294
 msgid "* Input device(s):\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:293
+#: src/frontend/mame/ui/devopt.cpp:296
 #, c-format
 msgid "  User inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:295
+#: src/frontend/mame/ui/devopt.cpp:298
 #, c-format
 msgid "  Mahjong inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:297
+#: src/frontend/mame/ui/devopt.cpp:300
 #, c-format
 msgid "  Hanafuda inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:299
+#: src/frontend/mame/ui/devopt.cpp:302
 #, c-format
 msgid "  Gambling inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:301
+#: src/frontend/mame/ui/devopt.cpp:304
 #, c-format
 msgid "  Analog inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:303
+#: src/frontend/mame/ui/devopt.cpp:306
 #, c-format
 msgid "  Adjuster inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:305
+#: src/frontend/mame/ui/devopt.cpp:308
 #, c-format
 msgid "  Keypad inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:307
+#: src/frontend/mame/ui/devopt.cpp:310
 #, c-format
 msgid "  Keyboard inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:312
+#: src/frontend/mame/ui/devopt.cpp:315
 msgid "* Media Options:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:317
+#: src/frontend/mame/ui/devopt.cpp:320
 #, c-format
 msgid "  %1$s    [tag: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:327
+#: src/frontend/mame/ui/devopt.cpp:330
 msgid "* Slot Options:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:341
+#: src/frontend/mame/ui/devopt.cpp:344
 msgid "[None]\n"
 msgstr ""
 
-#: src/emu/render.cpp:1847
+#: src/emu/render.cpp:1796
 #, c-format
 msgctxt "view-name"
 msgid "Screen %1$u Standard (%2$u:%3$u)"
 msgstr ""
 
-#: src/emu/render.cpp:1873
+#: src/emu/render.cpp:1822
 #, c-format
 msgctxt "view-name"
 msgid "Screen %1$u Pixel Aspect (%2$u:%3$u)"
 msgstr ""
 
-#: src/emu/render.cpp:1895 src/emu/render.cpp:2030
+#: src/emu/render.cpp:1844 src/emu/render.cpp:1979
 msgctxt "view-name"
 msgid "Cocktail"
 msgstr ""
 
-#: src/emu/render.cpp:2015
+#: src/emu/render.cpp:1964
 msgctxt "view-name"
 msgid "Left-to-Right"
 msgstr ""
 
-#: src/emu/render.cpp:2016
+#: src/emu/render.cpp:1965
 msgctxt "view-name"
 msgid "Left-to-Right (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2017
+#: src/emu/render.cpp:1966
 msgctxt "view-name"
 msgid "Top-to-Bottom"
 msgstr ""
 
-#: src/emu/render.cpp:2018
+#: src/emu/render.cpp:1967
 msgctxt "view-name"
 msgid "Top-to-Bottom (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2069
+#: src/emu/render.cpp:2018
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Left-to-Right, Top-to-Bottom"
 msgstr ""
 
-#: src/emu/render.cpp:2078
+#: src/emu/render.cpp:2027
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Left-to-Right, Top-to-Bottom (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2087
+#: src/emu/render.cpp:2036
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Top-to-Bottom, Left-to-Right"
 msgstr ""
 
-#: src/emu/render.cpp:2096
+#: src/emu/render.cpp:2045
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Top-to-Bottom, Left-to-Right (Gapless)"
 msgstr ""
 
-#: src/emu/inpttype.ipp:22
+#: src/emu/ioport.cpp:332
+#, c-format
 msgctxt "input-name"
-msgid "P1 Up"
+msgid "P%1$u"
 msgstr ""
 
-#: src/emu/inpttype.ipp:23
+#: src/emu/ioport.cpp:1924
 msgctxt "input-name"
-msgid "P1 Down"
+msgid "???"
 msgstr ""
 
-#: src/emu/inpttype.ipp:24
+#: src/emu/inpttype.ipp:22 src/emu/inpttype.ipp:140 src/emu/inpttype.ipp:221
+#: src/emu/inpttype.ipp:255 src/emu/inpttype.ipp:289 src/emu/inpttype.ipp:323
+#: src/emu/inpttype.ipp:357 src/emu/inpttype.ipp:391 src/emu/inpttype.ipp:425
+#: src/emu/inpttype.ipp:459
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left"
+msgid "%p Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:25
+#: src/emu/inpttype.ipp:23 src/emu/inpttype.ipp:141 src/emu/inpttype.ipp:222
+#: src/emu/inpttype.ipp:256 src/emu/inpttype.ipp:290 src/emu/inpttype.ipp:324
+#: src/emu/inpttype.ipp:358 src/emu/inpttype.ipp:392 src/emu/inpttype.ipp:426
+#: src/emu/inpttype.ipp:460
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right"
+msgid "%p Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:26
+#: src/emu/inpttype.ipp:24 src/emu/inpttype.ipp:142 src/emu/inpttype.ipp:223
+#: src/emu/inpttype.ipp:257 src/emu/inpttype.ipp:291 src/emu/inpttype.ipp:325
+#: src/emu/inpttype.ipp:359 src/emu/inpttype.ipp:393 src/emu/inpttype.ipp:427
+#: src/emu/inpttype.ipp:461
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Up"
+msgid "%p Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:27
+#: src/emu/inpttype.ipp:25 src/emu/inpttype.ipp:143 src/emu/inpttype.ipp:224
+#: src/emu/inpttype.ipp:258 src/emu/inpttype.ipp:292 src/emu/inpttype.ipp:326
+#: src/emu/inpttype.ipp:360 src/emu/inpttype.ipp:394 src/emu/inpttype.ipp:428
+#: src/emu/inpttype.ipp:462
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Down"
+msgid "%p Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:28
+#: src/emu/inpttype.ipp:26 src/emu/inpttype.ipp:144 src/emu/inpttype.ipp:225
+#: src/emu/inpttype.ipp:259 src/emu/inpttype.ipp:293 src/emu/inpttype.ipp:327
+#: src/emu/inpttype.ipp:361 src/emu/inpttype.ipp:395 src/emu/inpttype.ipp:429
+#: src/emu/inpttype.ipp:463
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Left"
+msgid "%p Right Stick/Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:29
+#: src/emu/inpttype.ipp:27 src/emu/inpttype.ipp:145 src/emu/inpttype.ipp:226
+#: src/emu/inpttype.ipp:260 src/emu/inpttype.ipp:294 src/emu/inpttype.ipp:328
+#: src/emu/inpttype.ipp:362 src/emu/inpttype.ipp:396 src/emu/inpttype.ipp:430
+#: src/emu/inpttype.ipp:464
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Right"
+msgid "%p Right Stick/Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:30
+#: src/emu/inpttype.ipp:28 src/emu/inpttype.ipp:146 src/emu/inpttype.ipp:227
+#: src/emu/inpttype.ipp:261 src/emu/inpttype.ipp:295 src/emu/inpttype.ipp:329
+#: src/emu/inpttype.ipp:363 src/emu/inpttype.ipp:397 src/emu/inpttype.ipp:431
+#: src/emu/inpttype.ipp:465
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Up"
+msgid "%p Right Stick/Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:31
+#: src/emu/inpttype.ipp:29 src/emu/inpttype.ipp:147 src/emu/inpttype.ipp:228
+#: src/emu/inpttype.ipp:262 src/emu/inpttype.ipp:296 src/emu/inpttype.ipp:330
+#: src/emu/inpttype.ipp:364 src/emu/inpttype.ipp:398 src/emu/inpttype.ipp:432
+#: src/emu/inpttype.ipp:466
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Down"
+msgid "%p Right Stick/Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:32
+#: src/emu/inpttype.ipp:30 src/emu/inpttype.ipp:148 src/emu/inpttype.ipp:229
+#: src/emu/inpttype.ipp:263 src/emu/inpttype.ipp:297 src/emu/inpttype.ipp:331
+#: src/emu/inpttype.ipp:365 src/emu/inpttype.ipp:399 src/emu/inpttype.ipp:433
+#: src/emu/inpttype.ipp:467
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Left"
+msgid "%p Left Stick/Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:33
+#: src/emu/inpttype.ipp:31 src/emu/inpttype.ipp:149 src/emu/inpttype.ipp:230
+#: src/emu/inpttype.ipp:264 src/emu/inpttype.ipp:298 src/emu/inpttype.ipp:332
+#: src/emu/inpttype.ipp:366 src/emu/inpttype.ipp:400 src/emu/inpttype.ipp:434
+#: src/emu/inpttype.ipp:468
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Right"
+msgid "%p Left Stick/Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:34
+#: src/emu/inpttype.ipp:32 src/emu/inpttype.ipp:150 src/emu/inpttype.ipp:231
+#: src/emu/inpttype.ipp:265 src/emu/inpttype.ipp:299 src/emu/inpttype.ipp:333
+#: src/emu/inpttype.ipp:367 src/emu/inpttype.ipp:401 src/emu/inpttype.ipp:435
+#: src/emu/inpttype.ipp:469
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 1"
+msgid "%p Left Stick/Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:35
+#: src/emu/inpttype.ipp:33 src/emu/inpttype.ipp:151 src/emu/inpttype.ipp:232
+#: src/emu/inpttype.ipp:266 src/emu/inpttype.ipp:300 src/emu/inpttype.ipp:334
+#: src/emu/inpttype.ipp:368 src/emu/inpttype.ipp:402 src/emu/inpttype.ipp:436
+#: src/emu/inpttype.ipp:470
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 2"
+msgid "%p Left Stick/Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:36
+#: src/emu/inpttype.ipp:34 src/emu/inpttype.ipp:152 src/emu/inpttype.ipp:233
+#: src/emu/inpttype.ipp:267 src/emu/inpttype.ipp:301 src/emu/inpttype.ipp:335
+#: src/emu/inpttype.ipp:369 src/emu/inpttype.ipp:403 src/emu/inpttype.ipp:437
+#: src/emu/inpttype.ipp:471
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 3"
+msgid "%p Button 1"
 msgstr ""
 
-#: src/emu/inpttype.ipp:37
+#: src/emu/inpttype.ipp:35 src/emu/inpttype.ipp:153 src/emu/inpttype.ipp:234
+#: src/emu/inpttype.ipp:268 src/emu/inpttype.ipp:302 src/emu/inpttype.ipp:336
+#: src/emu/inpttype.ipp:370 src/emu/inpttype.ipp:404 src/emu/inpttype.ipp:438
+#: src/emu/inpttype.ipp:472
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 4"
+msgid "%p Button 2"
 msgstr ""
 
-#: src/emu/inpttype.ipp:38
+#: src/emu/inpttype.ipp:36 src/emu/inpttype.ipp:154 src/emu/inpttype.ipp:235
+#: src/emu/inpttype.ipp:269 src/emu/inpttype.ipp:303 src/emu/inpttype.ipp:337
+#: src/emu/inpttype.ipp:371 src/emu/inpttype.ipp:405 src/emu/inpttype.ipp:439
+#: src/emu/inpttype.ipp:473
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 5"
+msgid "%p Button 3"
 msgstr ""
 
-#: src/emu/inpttype.ipp:39
+#: src/emu/inpttype.ipp:37 src/emu/inpttype.ipp:155 src/emu/inpttype.ipp:236
+#: src/emu/inpttype.ipp:270 src/emu/inpttype.ipp:304 src/emu/inpttype.ipp:338
+#: src/emu/inpttype.ipp:372 src/emu/inpttype.ipp:406 src/emu/inpttype.ipp:440
+#: src/emu/inpttype.ipp:474
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 6"
+msgid "%p Button 4"
 msgstr ""
 
-#: src/emu/inpttype.ipp:40
+#: src/emu/inpttype.ipp:38 src/emu/inpttype.ipp:156 src/emu/inpttype.ipp:237
+#: src/emu/inpttype.ipp:271 src/emu/inpttype.ipp:305 src/emu/inpttype.ipp:339
+#: src/emu/inpttype.ipp:373 src/emu/inpttype.ipp:407 src/emu/inpttype.ipp:441
+#: src/emu/inpttype.ipp:475
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 7"
+msgid "%p Button 5"
 msgstr ""
 
-#: src/emu/inpttype.ipp:41
+#: src/emu/inpttype.ipp:39 src/emu/inpttype.ipp:157 src/emu/inpttype.ipp:238
+#: src/emu/inpttype.ipp:272 src/emu/inpttype.ipp:306 src/emu/inpttype.ipp:340
+#: src/emu/inpttype.ipp:374 src/emu/inpttype.ipp:408 src/emu/inpttype.ipp:442
+#: src/emu/inpttype.ipp:476
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 8"
+msgid "%p Button 6"
 msgstr ""
 
-#: src/emu/inpttype.ipp:42
+#: src/emu/inpttype.ipp:40 src/emu/inpttype.ipp:158 src/emu/inpttype.ipp:239
+#: src/emu/inpttype.ipp:273 src/emu/inpttype.ipp:307 src/emu/inpttype.ipp:341
+#: src/emu/inpttype.ipp:375 src/emu/inpttype.ipp:409 src/emu/inpttype.ipp:443
+#: src/emu/inpttype.ipp:477
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 9"
+msgid "%p Button 7"
 msgstr ""
 
-#: src/emu/inpttype.ipp:43
+#: src/emu/inpttype.ipp:41 src/emu/inpttype.ipp:159 src/emu/inpttype.ipp:240
+#: src/emu/inpttype.ipp:274 src/emu/inpttype.ipp:308 src/emu/inpttype.ipp:342
+#: src/emu/inpttype.ipp:376 src/emu/inpttype.ipp:410 src/emu/inpttype.ipp:444
+#: src/emu/inpttype.ipp:478
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 10"
+msgid "%p Button 8"
 msgstr ""
 
-#: src/emu/inpttype.ipp:44
+#: src/emu/inpttype.ipp:42 src/emu/inpttype.ipp:160 src/emu/inpttype.ipp:241
+#: src/emu/inpttype.ipp:275 src/emu/inpttype.ipp:309 src/emu/inpttype.ipp:343
+#: src/emu/inpttype.ipp:377 src/emu/inpttype.ipp:411 src/emu/inpttype.ipp:445
+#: src/emu/inpttype.ipp:479
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 11"
+msgid "%p Button 9"
 msgstr ""
 
-#: src/emu/inpttype.ipp:45
+#: src/emu/inpttype.ipp:43 src/emu/inpttype.ipp:161 src/emu/inpttype.ipp:242
+#: src/emu/inpttype.ipp:276 src/emu/inpttype.ipp:310 src/emu/inpttype.ipp:344
+#: src/emu/inpttype.ipp:378 src/emu/inpttype.ipp:412 src/emu/inpttype.ipp:446
+#: src/emu/inpttype.ipp:480
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 12"
+msgid "%p Button 10"
 msgstr ""
 
-#: src/emu/inpttype.ipp:46
+#: src/emu/inpttype.ipp:44 src/emu/inpttype.ipp:162 src/emu/inpttype.ipp:243
+#: src/emu/inpttype.ipp:277 src/emu/inpttype.ipp:311 src/emu/inpttype.ipp:345
+#: src/emu/inpttype.ipp:379 src/emu/inpttype.ipp:413 src/emu/inpttype.ipp:447
+#: src/emu/inpttype.ipp:481
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 13"
+msgid "%p Button 11"
 msgstr ""
 
-#: src/emu/inpttype.ipp:47
+#: src/emu/inpttype.ipp:45 src/emu/inpttype.ipp:163 src/emu/inpttype.ipp:244
+#: src/emu/inpttype.ipp:278 src/emu/inpttype.ipp:312 src/emu/inpttype.ipp:346
+#: src/emu/inpttype.ipp:380 src/emu/inpttype.ipp:414 src/emu/inpttype.ipp:448
+#: src/emu/inpttype.ipp:482
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 14"
+msgid "%p Button 12"
 msgstr ""
 
-#: src/emu/inpttype.ipp:48
+#: src/emu/inpttype.ipp:46 src/emu/inpttype.ipp:164 src/emu/inpttype.ipp:245
+#: src/emu/inpttype.ipp:279 src/emu/inpttype.ipp:313 src/emu/inpttype.ipp:347
+#: src/emu/inpttype.ipp:381 src/emu/inpttype.ipp:415 src/emu/inpttype.ipp:449
+#: src/emu/inpttype.ipp:483
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 15"
+msgid "%p Button 13"
 msgstr ""
 
-#: src/emu/inpttype.ipp:49
+#: src/emu/inpttype.ipp:47 src/emu/inpttype.ipp:165 src/emu/inpttype.ipp:246
+#: src/emu/inpttype.ipp:280 src/emu/inpttype.ipp:314 src/emu/inpttype.ipp:348
+#: src/emu/inpttype.ipp:382 src/emu/inpttype.ipp:416 src/emu/inpttype.ipp:450
+#: src/emu/inpttype.ipp:484
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 16"
+msgid "%p Button 14"
 msgstr ""
 
-#: src/emu/inpttype.ipp:50
+#: src/emu/inpttype.ipp:48 src/emu/inpttype.ipp:166 src/emu/inpttype.ipp:247
+#: src/emu/inpttype.ipp:281 src/emu/inpttype.ipp:315 src/emu/inpttype.ipp:349
+#: src/emu/inpttype.ipp:383 src/emu/inpttype.ipp:417 src/emu/inpttype.ipp:451
+#: src/emu/inpttype.ipp:485
+#, c-format
 msgctxt "input-name"
-msgid "P1 Start"
+msgid "%p Button 15"
 msgstr ""
 
-#: src/emu/inpttype.ipp:51
+#: src/emu/inpttype.ipp:49 src/emu/inpttype.ipp:167 src/emu/inpttype.ipp:248
+#: src/emu/inpttype.ipp:282 src/emu/inpttype.ipp:316 src/emu/inpttype.ipp:350
+#: src/emu/inpttype.ipp:384 src/emu/inpttype.ipp:418 src/emu/inpttype.ipp:452
+#: src/emu/inpttype.ipp:486
+#, c-format
 msgctxt "input-name"
-msgid "P1 Select"
+msgid "%p Button 16"
 msgstr ""
 
-#: src/emu/inpttype.ipp:56
+#: src/emu/inpttype.ipp:50 src/emu/inpttype.ipp:168 src/emu/inpttype.ipp:249
+#: src/emu/inpttype.ipp:283 src/emu/inpttype.ipp:317 src/emu/inpttype.ipp:351
+#: src/emu/inpttype.ipp:385 src/emu/inpttype.ipp:419 src/emu/inpttype.ipp:453
+#: src/emu/inpttype.ipp:487
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong A"
+msgid "%p Start"
 msgstr ""
 
-#: src/emu/inpttype.ipp:57
+#: src/emu/inpttype.ipp:51 src/emu/inpttype.ipp:169 src/emu/inpttype.ipp:250
+#: src/emu/inpttype.ipp:284 src/emu/inpttype.ipp:318 src/emu/inpttype.ipp:352
+#: src/emu/inpttype.ipp:386 src/emu/inpttype.ipp:420 src/emu/inpttype.ipp:454
+#: src/emu/inpttype.ipp:488
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong B"
+msgid "%p Select"
 msgstr ""
 
-#: src/emu/inpttype.ipp:58
+#: src/emu/inpttype.ipp:56 src/emu/inpttype.ipp:174
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong C"
+msgid "%p Mahjong A"
 msgstr ""
 
-#: src/emu/inpttype.ipp:59
+#: src/emu/inpttype.ipp:57 src/emu/inpttype.ipp:175
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong D"
+msgid "%p Mahjong B"
 msgstr ""
 
-#: src/emu/inpttype.ipp:60
+#: src/emu/inpttype.ipp:58 src/emu/inpttype.ipp:176
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong E"
+msgid "%p Mahjong C"
 msgstr ""
 
-#: src/emu/inpttype.ipp:61
+#: src/emu/inpttype.ipp:59 src/emu/inpttype.ipp:177
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong F"
+msgid "%p Mahjong D"
 msgstr ""
 
-#: src/emu/inpttype.ipp:62
+#: src/emu/inpttype.ipp:60 src/emu/inpttype.ipp:178
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong G"
+msgid "%p Mahjong E"
 msgstr ""
 
-#: src/emu/inpttype.ipp:63
+#: src/emu/inpttype.ipp:61 src/emu/inpttype.ipp:179
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong H"
+msgid "%p Mahjong F"
 msgstr ""
 
-#: src/emu/inpttype.ipp:64
+#: src/emu/inpttype.ipp:62 src/emu/inpttype.ipp:180
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong I"
+msgid "%p Mahjong G"
 msgstr ""
 
-#: src/emu/inpttype.ipp:65
+#: src/emu/inpttype.ipp:63 src/emu/inpttype.ipp:181
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong J"
+msgid "%p Mahjong H"
 msgstr ""
 
-#: src/emu/inpttype.ipp:66
+#: src/emu/inpttype.ipp:64 src/emu/inpttype.ipp:182
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong K"
+msgid "%p Mahjong I"
 msgstr ""
 
-#: src/emu/inpttype.ipp:67
+#: src/emu/inpttype.ipp:65 src/emu/inpttype.ipp:183
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong L"
+msgid "%p Mahjong J"
 msgstr ""
 
-#: src/emu/inpttype.ipp:68
+#: src/emu/inpttype.ipp:66 src/emu/inpttype.ipp:184
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong M"
+msgid "%p Mahjong K"
 msgstr ""
 
-#: src/emu/inpttype.ipp:69
+#: src/emu/inpttype.ipp:67 src/emu/inpttype.ipp:185
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong N"
+msgid "%p Mahjong L"
 msgstr ""
 
-#: src/emu/inpttype.ipp:70
+#: src/emu/inpttype.ipp:68 src/emu/inpttype.ipp:186
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong O"
+msgid "%p Mahjong M"
 msgstr ""
 
-#: src/emu/inpttype.ipp:71
+#: src/emu/inpttype.ipp:69 src/emu/inpttype.ipp:187
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong P"
+msgid "%p Mahjong N"
 msgstr ""
 
-#: src/emu/inpttype.ipp:72
+#: src/emu/inpttype.ipp:70 src/emu/inpttype.ipp:188
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Q"
+msgid "%p Mahjong O"
 msgstr ""
 
-#: src/emu/inpttype.ipp:73
+#: src/emu/inpttype.ipp:71 src/emu/inpttype.ipp:189
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Kan"
+msgid "%p Mahjong P"
 msgstr ""
 
-#: src/emu/inpttype.ipp:74
+#: src/emu/inpttype.ipp:72 src/emu/inpttype.ipp:190
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Pon"
+msgid "%p Mahjong Q"
 msgstr ""
 
-#: src/emu/inpttype.ipp:75
+#: src/emu/inpttype.ipp:73 src/emu/inpttype.ipp:191
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Chi"
+msgid "%p Mahjong Kan"
 msgstr ""
 
-#: src/emu/inpttype.ipp:76
+#: src/emu/inpttype.ipp:74 src/emu/inpttype.ipp:192
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Reach"
+msgid "%p Mahjong Pon"
 msgstr ""
 
-#: src/emu/inpttype.ipp:77
+#: src/emu/inpttype.ipp:75 src/emu/inpttype.ipp:193
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Ron"
+msgid "%p Mahjong Chi"
 msgstr ""
 
-#: src/emu/inpttype.ipp:78
+#: src/emu/inpttype.ipp:76 src/emu/inpttype.ipp:194
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Flip Flop"
+msgid "%p Mahjong Reach"
 msgstr ""
 
-#: src/emu/inpttype.ipp:79
+#: src/emu/inpttype.ipp:77 src/emu/inpttype.ipp:195
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Bet"
+msgid "%p Mahjong Ron"
 msgstr ""
 
-#: src/emu/inpttype.ipp:80
+#: src/emu/inpttype.ipp:78 src/emu/inpttype.ipp:200
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Take Score"
+msgid "%p Mahjong Flip Flop"
 msgstr ""
 
-#: src/emu/inpttype.ipp:81
+#: src/emu/inpttype.ipp:79 src/emu/inpttype.ipp:196
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Double Up"
+msgid "%p Mahjong Bet"
 msgstr ""
 
-#: src/emu/inpttype.ipp:82
+#: src/emu/inpttype.ipp:80 src/emu/inpttype.ipp:198
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Big"
+msgid "%p Mahjong Take Score"
 msgstr ""
 
-#: src/emu/inpttype.ipp:83
+#: src/emu/inpttype.ipp:81 src/emu/inpttype.ipp:199
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Small"
+msgid "%p Mahjong Double Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:84
+#: src/emu/inpttype.ipp:82 src/emu/inpttype.ipp:201
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Last Chance"
+msgid "%p Mahjong Big"
 msgstr ""
 
-#: src/emu/inpttype.ipp:89
+#: src/emu/inpttype.ipp:83 src/emu/inpttype.ipp:202
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda A/1"
+msgid "%p Mahjong Small"
 msgstr ""
 
-#: src/emu/inpttype.ipp:90
+#: src/emu/inpttype.ipp:84 src/emu/inpttype.ipp:197
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda B/2"
+msgid "%p Mahjong Last Chance"
 msgstr ""
 
-#: src/emu/inpttype.ipp:91
+#: src/emu/inpttype.ipp:89 src/emu/inpttype.ipp:207
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda C/3"
+msgid "%p Hanafuda A/1"
 msgstr ""
 
-#: src/emu/inpttype.ipp:92
+#: src/emu/inpttype.ipp:90 src/emu/inpttype.ipp:208
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda D/4"
+msgid "%p Hanafuda B/2"
 msgstr ""
 
-#: src/emu/inpttype.ipp:93
+#: src/emu/inpttype.ipp:91 src/emu/inpttype.ipp:209
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda E/5"
+msgid "%p Hanafuda C/3"
 msgstr ""
 
-#: src/emu/inpttype.ipp:94
+#: src/emu/inpttype.ipp:92 src/emu/inpttype.ipp:210
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda F/6"
+msgid "%p Hanafuda D/4"
 msgstr ""
 
-#: src/emu/inpttype.ipp:95
+#: src/emu/inpttype.ipp:93 src/emu/inpttype.ipp:211
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda G/7"
+msgid "%p Hanafuda E/5"
 msgstr ""
 
-#: src/emu/inpttype.ipp:96
+#: src/emu/inpttype.ipp:94 src/emu/inpttype.ipp:212
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda H/8"
+msgid "%p Hanafuda F/6"
 msgstr ""
 
-#: src/emu/inpttype.ipp:97
+#: src/emu/inpttype.ipp:95 src/emu/inpttype.ipp:213
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda Yes"
+msgid "%p Hanafuda G/7"
 msgstr ""
 
-#: src/emu/inpttype.ipp:98
+#: src/emu/inpttype.ipp:96 src/emu/inpttype.ipp:214
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda No"
+msgid "%p Hanafuda H/8"
+msgstr ""
+
+#: src/emu/inpttype.ipp:97 src/emu/inpttype.ipp:215
+#, c-format
+msgctxt "input-name"
+msgid "%p Hanafuda Yes"
+msgstr ""
+
+#: src/emu/inpttype.ipp:98 src/emu/inpttype.ipp:216
+#, c-format
+msgctxt "input-name"
+msgid "%p Hanafuda No"
 msgstr ""
 
 #: src/emu/inpttype.ipp:103
@@ -3805,1551 +3979,6 @@ msgctxt "input-name"
 msgid "Stop All Reels"
 msgstr ""
 
-#: src/emu/inpttype.ipp:140
-msgctxt "input-name"
-msgid "P2 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:141
-msgctxt "input-name"
-msgid "P2 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:142
-msgctxt "input-name"
-msgid "P2 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:143
-msgctxt "input-name"
-msgid "P2 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:144
-msgctxt "input-name"
-msgid "P2 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:145
-msgctxt "input-name"
-msgid "P2 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:146
-msgctxt "input-name"
-msgid "P2 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:147
-msgctxt "input-name"
-msgid "P2 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:148
-msgctxt "input-name"
-msgid "P2 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:149
-msgctxt "input-name"
-msgid "P2 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:150
-msgctxt "input-name"
-msgid "P2 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:151
-msgctxt "input-name"
-msgid "P2 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:152
-msgctxt "input-name"
-msgid "P2 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:153
-msgctxt "input-name"
-msgid "P2 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:154
-msgctxt "input-name"
-msgid "P2 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:155
-msgctxt "input-name"
-msgid "P2 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:156
-msgctxt "input-name"
-msgid "P2 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:157
-msgctxt "input-name"
-msgid "P2 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:158
-msgctxt "input-name"
-msgid "P2 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:159
-msgctxt "input-name"
-msgid "P2 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:160
-msgctxt "input-name"
-msgid "P2 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:161
-msgctxt "input-name"
-msgid "P2 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:162
-msgctxt "input-name"
-msgid "P2 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:163
-msgctxt "input-name"
-msgid "P2 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:164
-msgctxt "input-name"
-msgid "P2 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:165
-msgctxt "input-name"
-msgid "P2 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:166
-msgctxt "input-name"
-msgid "P2 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:167
-msgctxt "input-name"
-msgid "P2 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:168
-msgctxt "input-name"
-msgid "P2 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:169
-msgctxt "input-name"
-msgid "P2 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:174
-msgctxt "input-name"
-msgid "P2 Mahjong A"
-msgstr ""
-
-#: src/emu/inpttype.ipp:175
-msgctxt "input-name"
-msgid "P2 Mahjong B"
-msgstr ""
-
-#: src/emu/inpttype.ipp:176
-msgctxt "input-name"
-msgid "P2 Mahjong C"
-msgstr ""
-
-#: src/emu/inpttype.ipp:177
-msgctxt "input-name"
-msgid "P2 Mahjong D"
-msgstr ""
-
-#: src/emu/inpttype.ipp:178
-msgctxt "input-name"
-msgid "P2 Mahjong E"
-msgstr ""
-
-#: src/emu/inpttype.ipp:179
-msgctxt "input-name"
-msgid "P2 Mahjong F"
-msgstr ""
-
-#: src/emu/inpttype.ipp:180
-msgctxt "input-name"
-msgid "P2 Mahjong G"
-msgstr ""
-
-#: src/emu/inpttype.ipp:181
-msgctxt "input-name"
-msgid "P2 Mahjong H"
-msgstr ""
-
-#: src/emu/inpttype.ipp:182
-msgctxt "input-name"
-msgid "P2 Mahjong I"
-msgstr ""
-
-#: src/emu/inpttype.ipp:183
-msgctxt "input-name"
-msgid "P2 Mahjong J"
-msgstr ""
-
-#: src/emu/inpttype.ipp:184
-msgctxt "input-name"
-msgid "P2 Mahjong K"
-msgstr ""
-
-#: src/emu/inpttype.ipp:185
-msgctxt "input-name"
-msgid "P2 Mahjong L"
-msgstr ""
-
-#: src/emu/inpttype.ipp:186
-msgctxt "input-name"
-msgid "P2 Mahjong M"
-msgstr ""
-
-#: src/emu/inpttype.ipp:187
-msgctxt "input-name"
-msgid "P2 Mahjong N"
-msgstr ""
-
-#: src/emu/inpttype.ipp:188
-msgctxt "input-name"
-msgid "P2 Mahjong O"
-msgstr ""
-
-#: src/emu/inpttype.ipp:189
-msgctxt "input-name"
-msgid "P2 Mahjong P"
-msgstr ""
-
-#: src/emu/inpttype.ipp:190
-msgctxt "input-name"
-msgid "P2 Mahjong Q"
-msgstr ""
-
-#: src/emu/inpttype.ipp:191
-msgctxt "input-name"
-msgid "P2 Mahjong Kan"
-msgstr ""
-
-#: src/emu/inpttype.ipp:192
-msgctxt "input-name"
-msgid "P2 Mahjong Pon"
-msgstr ""
-
-#: src/emu/inpttype.ipp:193
-msgctxt "input-name"
-msgid "P2 Mahjong Chi"
-msgstr ""
-
-#: src/emu/inpttype.ipp:194
-msgctxt "input-name"
-msgid "P2 Mahjong Reach"
-msgstr ""
-
-#: src/emu/inpttype.ipp:195
-msgctxt "input-name"
-msgid "P2 Mahjong Ron"
-msgstr ""
-
-#: src/emu/inpttype.ipp:196
-msgctxt "input-name"
-msgid "P2 Mahjong Bet"
-msgstr ""
-
-#: src/emu/inpttype.ipp:197
-msgctxt "input-name"
-msgid "P2 Mahjong Last Chance"
-msgstr ""
-
-#: src/emu/inpttype.ipp:198
-msgctxt "input-name"
-msgid "P2 Mahjong Take Score"
-msgstr ""
-
-#: src/emu/inpttype.ipp:199
-msgctxt "input-name"
-msgid "P2 Mahjong Double Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:200
-msgctxt "input-name"
-msgid "P2 Mahjong Flip Flop"
-msgstr ""
-
-#: src/emu/inpttype.ipp:201
-msgctxt "input-name"
-msgid "P2 Mahjong Big"
-msgstr ""
-
-#: src/emu/inpttype.ipp:202
-msgctxt "input-name"
-msgid "P2 Mahjong Small"
-msgstr ""
-
-#: src/emu/inpttype.ipp:207
-msgctxt "input-name"
-msgid "P2 Hanafuda A/1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:208
-msgctxt "input-name"
-msgid "P2 Hanafuda B/2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:209
-msgctxt "input-name"
-msgid "P2 Hanafuda C/3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:210
-msgctxt "input-name"
-msgid "P2 Hanafuda D/4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:211
-msgctxt "input-name"
-msgid "P2 Hanafuda E/5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:212
-msgctxt "input-name"
-msgid "P2 Hanafuda F/6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:213
-msgctxt "input-name"
-msgid "P2 Hanafuda G/7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:214
-msgctxt "input-name"
-msgid "P2 Hanafuda H/8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:215
-msgctxt "input-name"
-msgid "P2 Hanafuda Yes"
-msgstr ""
-
-#: src/emu/inpttype.ipp:216
-msgctxt "input-name"
-msgid "P2 Hanafuda No"
-msgstr ""
-
-#: src/emu/inpttype.ipp:221
-msgctxt "input-name"
-msgid "P3 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:222
-msgctxt "input-name"
-msgid "P3 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:223
-msgctxt "input-name"
-msgid "P3 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:224
-msgctxt "input-name"
-msgid "P3 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:225
-msgctxt "input-name"
-msgid "P3 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:226
-msgctxt "input-name"
-msgid "P3 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:227
-msgctxt "input-name"
-msgid "P3 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:228
-msgctxt "input-name"
-msgid "P3 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:229
-msgctxt "input-name"
-msgid "P3 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:230
-msgctxt "input-name"
-msgid "P3 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:231
-msgctxt "input-name"
-msgid "P3 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:232
-msgctxt "input-name"
-msgid "P3 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:233
-msgctxt "input-name"
-msgid "P3 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:234
-msgctxt "input-name"
-msgid "P3 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:235
-msgctxt "input-name"
-msgid "P3 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:236
-msgctxt "input-name"
-msgid "P3 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:237
-msgctxt "input-name"
-msgid "P3 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:238
-msgctxt "input-name"
-msgid "P3 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:239
-msgctxt "input-name"
-msgid "P3 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:240
-msgctxt "input-name"
-msgid "P3 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:241
-msgctxt "input-name"
-msgid "P3 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:242
-msgctxt "input-name"
-msgid "P3 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:243
-msgctxt "input-name"
-msgid "P3 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:244
-msgctxt "input-name"
-msgid "P3 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:245
-msgctxt "input-name"
-msgid "P3 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:246
-msgctxt "input-name"
-msgid "P3 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:247
-msgctxt "input-name"
-msgid "P3 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:248
-msgctxt "input-name"
-msgid "P3 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:249
-msgctxt "input-name"
-msgid "P3 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:250
-msgctxt "input-name"
-msgid "P3 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:255
-msgctxt "input-name"
-msgid "P4 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:256
-msgctxt "input-name"
-msgid "P4 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:257
-msgctxt "input-name"
-msgid "P4 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:258
-msgctxt "input-name"
-msgid "P4 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:259
-msgctxt "input-name"
-msgid "P4 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:260
-msgctxt "input-name"
-msgid "P4 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:261
-msgctxt "input-name"
-msgid "P4 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:262
-msgctxt "input-name"
-msgid "P4 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:263
-msgctxt "input-name"
-msgid "P4 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:264
-msgctxt "input-name"
-msgid "P4 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:265
-msgctxt "input-name"
-msgid "P4 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:266
-msgctxt "input-name"
-msgid "P4 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:267
-msgctxt "input-name"
-msgid "P4 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:268
-msgctxt "input-name"
-msgid "P4 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:269
-msgctxt "input-name"
-msgid "P4 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:270
-msgctxt "input-name"
-msgid "P4 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:271
-msgctxt "input-name"
-msgid "P4 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:272
-msgctxt "input-name"
-msgid "P4 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:273
-msgctxt "input-name"
-msgid "P4 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:274
-msgctxt "input-name"
-msgid "P4 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:275
-msgctxt "input-name"
-msgid "P4 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:276
-msgctxt "input-name"
-msgid "P4 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:277
-msgctxt "input-name"
-msgid "P4 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:278
-msgctxt "input-name"
-msgid "P4 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:279
-msgctxt "input-name"
-msgid "P4 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:280
-msgctxt "input-name"
-msgid "P4 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:281
-msgctxt "input-name"
-msgid "P4 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:282
-msgctxt "input-name"
-msgid "P4 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:283
-msgctxt "input-name"
-msgid "P4 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:284
-msgctxt "input-name"
-msgid "P4 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:289
-msgctxt "input-name"
-msgid "P5 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:290
-msgctxt "input-name"
-msgid "P5 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:291
-msgctxt "input-name"
-msgid "P5 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:292
-msgctxt "input-name"
-msgid "P5 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:293
-msgctxt "input-name"
-msgid "P5 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:294
-msgctxt "input-name"
-msgid "P5 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:295
-msgctxt "input-name"
-msgid "P5 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:296
-msgctxt "input-name"
-msgid "P5 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:297
-msgctxt "input-name"
-msgid "P5 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:298
-msgctxt "input-name"
-msgid "P5 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:299
-msgctxt "input-name"
-msgid "P5 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:300
-msgctxt "input-name"
-msgid "P5 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:301
-msgctxt "input-name"
-msgid "P5 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:302
-msgctxt "input-name"
-msgid "P5 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:303
-msgctxt "input-name"
-msgid "P5 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:304
-msgctxt "input-name"
-msgid "P5 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:305
-msgctxt "input-name"
-msgid "P5 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:306
-msgctxt "input-name"
-msgid "P5 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:307
-msgctxt "input-name"
-msgid "P5 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:308
-msgctxt "input-name"
-msgid "P5 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:309
-msgctxt "input-name"
-msgid "P5 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:310
-msgctxt "input-name"
-msgid "P5 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:311
-msgctxt "input-name"
-msgid "P5 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:312
-msgctxt "input-name"
-msgid "P5 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:313
-msgctxt "input-name"
-msgid "P5 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:314
-msgctxt "input-name"
-msgid "P5 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:315
-msgctxt "input-name"
-msgid "P5 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:316
-msgctxt "input-name"
-msgid "P5 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:317
-msgctxt "input-name"
-msgid "P5 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:318
-msgctxt "input-name"
-msgid "P5 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:323
-msgctxt "input-name"
-msgid "P6 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:324
-msgctxt "input-name"
-msgid "P6 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:325
-msgctxt "input-name"
-msgid "P6 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:326
-msgctxt "input-name"
-msgid "P6 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:327
-msgctxt "input-name"
-msgid "P6 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:328
-msgctxt "input-name"
-msgid "P6 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:329
-msgctxt "input-name"
-msgid "P6 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:330
-msgctxt "input-name"
-msgid "P6 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:331
-msgctxt "input-name"
-msgid "P6 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:332
-msgctxt "input-name"
-msgid "P6 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:333
-msgctxt "input-name"
-msgid "P6 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:334
-msgctxt "input-name"
-msgid "P6 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:335
-msgctxt "input-name"
-msgid "P6 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:336
-msgctxt "input-name"
-msgid "P6 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:337
-msgctxt "input-name"
-msgid "P6 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:338
-msgctxt "input-name"
-msgid "P6 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:339
-msgctxt "input-name"
-msgid "P6 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:340
-msgctxt "input-name"
-msgid "P6 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:341
-msgctxt "input-name"
-msgid "P6 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:342
-msgctxt "input-name"
-msgid "P6 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:343
-msgctxt "input-name"
-msgid "P6 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:344
-msgctxt "input-name"
-msgid "P6 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:345
-msgctxt "input-name"
-msgid "P6 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:346
-msgctxt "input-name"
-msgid "P6 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:347
-msgctxt "input-name"
-msgid "P6 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:348
-msgctxt "input-name"
-msgid "P6 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:349
-msgctxt "input-name"
-msgid "P6 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:350
-msgctxt "input-name"
-msgid "P6 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:351
-msgctxt "input-name"
-msgid "P6 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:352
-msgctxt "input-name"
-msgid "P6 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:357
-msgctxt "input-name"
-msgid "P7 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:358
-msgctxt "input-name"
-msgid "P7 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:359
-msgctxt "input-name"
-msgid "P7 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:360
-msgctxt "input-name"
-msgid "P7 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:361
-msgctxt "input-name"
-msgid "P7 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:362
-msgctxt "input-name"
-msgid "P7 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:363
-msgctxt "input-name"
-msgid "P7 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:364
-msgctxt "input-name"
-msgid "P7 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:365
-msgctxt "input-name"
-msgid "P7 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:366
-msgctxt "input-name"
-msgid "P7 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:367
-msgctxt "input-name"
-msgid "P7 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:368
-msgctxt "input-name"
-msgid "P7 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:369
-msgctxt "input-name"
-msgid "P7 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:370
-msgctxt "input-name"
-msgid "P7 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:371
-msgctxt "input-name"
-msgid "P7 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:372
-msgctxt "input-name"
-msgid "P7 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:373
-msgctxt "input-name"
-msgid "P7 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:374
-msgctxt "input-name"
-msgid "P7 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:375
-msgctxt "input-name"
-msgid "P7 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:376
-msgctxt "input-name"
-msgid "P7 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:377
-msgctxt "input-name"
-msgid "P7 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:378
-msgctxt "input-name"
-msgid "P7 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:379
-msgctxt "input-name"
-msgid "P7 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:380
-msgctxt "input-name"
-msgid "P7 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:381
-msgctxt "input-name"
-msgid "P7 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:382
-msgctxt "input-name"
-msgid "P7 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:383
-msgctxt "input-name"
-msgid "P7 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:384
-msgctxt "input-name"
-msgid "P7 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:385
-msgctxt "input-name"
-msgid "P7 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:386
-msgctxt "input-name"
-msgid "P7 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:391
-msgctxt "input-name"
-msgid "P8 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:392
-msgctxt "input-name"
-msgid "P8 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:393
-msgctxt "input-name"
-msgid "P8 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:394
-msgctxt "input-name"
-msgid "P8 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:395
-msgctxt "input-name"
-msgid "P8 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:396
-msgctxt "input-name"
-msgid "P8 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:397
-msgctxt "input-name"
-msgid "P8 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:398
-msgctxt "input-name"
-msgid "P8 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:399
-msgctxt "input-name"
-msgid "P8 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:400
-msgctxt "input-name"
-msgid "P8 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:401
-msgctxt "input-name"
-msgid "P8 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:402
-msgctxt "input-name"
-msgid "P8 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:403
-msgctxt "input-name"
-msgid "P8 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:404
-msgctxt "input-name"
-msgid "P8 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:405
-msgctxt "input-name"
-msgid "P8 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:406
-msgctxt "input-name"
-msgid "P8 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:407
-msgctxt "input-name"
-msgid "P8 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:408
-msgctxt "input-name"
-msgid "P8 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:409
-msgctxt "input-name"
-msgid "P8 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:410
-msgctxt "input-name"
-msgid "P8 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:411
-msgctxt "input-name"
-msgid "P8 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:412
-msgctxt "input-name"
-msgid "P8 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:413
-msgctxt "input-name"
-msgid "P8 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:414
-msgctxt "input-name"
-msgid "P8 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:415
-msgctxt "input-name"
-msgid "P8 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:416
-msgctxt "input-name"
-msgid "P8 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:417
-msgctxt "input-name"
-msgid "P8 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:418
-msgctxt "input-name"
-msgid "P8 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:419
-msgctxt "input-name"
-msgid "P8 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:420
-msgctxt "input-name"
-msgid "P8 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:425
-msgctxt "input-name"
-msgid "P9 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:426
-msgctxt "input-name"
-msgid "P9 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:427
-msgctxt "input-name"
-msgid "P9 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:428
-msgctxt "input-name"
-msgid "P9 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:429
-msgctxt "input-name"
-msgid "P9 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:430
-msgctxt "input-name"
-msgid "P9 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:431
-msgctxt "input-name"
-msgid "P9 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:432
-msgctxt "input-name"
-msgid "P9 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:433
-msgctxt "input-name"
-msgid "P9 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:434
-msgctxt "input-name"
-msgid "P9 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:435
-msgctxt "input-name"
-msgid "P9 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:436
-msgctxt "input-name"
-msgid "P9 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:437
-msgctxt "input-name"
-msgid "P9 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:438
-msgctxt "input-name"
-msgid "P9 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:439
-msgctxt "input-name"
-msgid "P9 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:440
-msgctxt "input-name"
-msgid "P9 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:441
-msgctxt "input-name"
-msgid "P9 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:442
-msgctxt "input-name"
-msgid "P9 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:443
-msgctxt "input-name"
-msgid "P9 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:444
-msgctxt "input-name"
-msgid "P9 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:445
-msgctxt "input-name"
-msgid "P9 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:446
-msgctxt "input-name"
-msgid "P9 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:447
-msgctxt "input-name"
-msgid "P9 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:448
-msgctxt "input-name"
-msgid "P9 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:449
-msgctxt "input-name"
-msgid "P9 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:450
-msgctxt "input-name"
-msgid "P9 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:451
-msgctxt "input-name"
-msgid "P9 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:452
-msgctxt "input-name"
-msgid "P9 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:453
-msgctxt "input-name"
-msgid "P9 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:454
-msgctxt "input-name"
-msgid "P9 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:459
-msgctxt "input-name"
-msgid "P10 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:460
-msgctxt "input-name"
-msgid "P10 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:461
-msgctxt "input-name"
-msgid "P10 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:462
-msgctxt "input-name"
-msgid "P10 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:463
-msgctxt "input-name"
-msgid "P10 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:464
-msgctxt "input-name"
-msgid "P10 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:465
-msgctxt "input-name"
-msgid "P10 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:466
-msgctxt "input-name"
-msgid "P10 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:467
-msgctxt "input-name"
-msgid "P10 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:468
-msgctxt "input-name"
-msgid "P10 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:469
-msgctxt "input-name"
-msgid "P10 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:470
-msgctxt "input-name"
-msgid "P10 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:471
-msgctxt "input-name"
-msgid "P10 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:472
-msgctxt "input-name"
-msgid "P10 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:473
-msgctxt "input-name"
-msgid "P10 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:474
-msgctxt "input-name"
-msgid "P10 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:475
-msgctxt "input-name"
-msgid "P10 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:476
-msgctxt "input-name"
-msgid "P10 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:477
-msgctxt "input-name"
-msgid "P10 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:478
-msgctxt "input-name"
-msgid "P10 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:479
-msgctxt "input-name"
-msgid "P10 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:480
-msgctxt "input-name"
-msgid "P10 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:481
-msgctxt "input-name"
-msgid "P10 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:482
-msgctxt "input-name"
-msgid "P10 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:483
-msgctxt "input-name"
-msgid "P10 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:484
-msgctxt "input-name"
-msgid "P10 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:485
-msgctxt "input-name"
-msgid "P10 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:486
-msgctxt "input-name"
-msgid "P10 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:487
-msgctxt "input-name"
-msgid "P10 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:488
-msgctxt "input-name"
-msgid "P10 Select"
-msgstr ""
-
 #: src/emu/inpttype.ipp:493
 msgctxt "input-name"
 msgid "1 Player Start"
@@ -5530,154 +4159,31 @@ msgctxt "input-name"
 msgid "Volume Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:550
-msgctxt "input-name"
-msgid "P1 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:551
-msgctxt "input-name"
-msgid "P2 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:552
-msgctxt "input-name"
-msgid "P3 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:553
-msgctxt "input-name"
-msgid "P4 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:554
-msgctxt "input-name"
-msgid "P5 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:555
-msgctxt "input-name"
-msgid "P6 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:556
-msgctxt "input-name"
-msgid "P7 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:557
-msgctxt "input-name"
-msgid "P8 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:558
-msgctxt "input-name"
-msgid "P9 Pedal 1"
-msgstr ""
-
+#: src/emu/inpttype.ipp:550 src/emu/inpttype.ipp:551 src/emu/inpttype.ipp:552
+#: src/emu/inpttype.ipp:553 src/emu/inpttype.ipp:554 src/emu/inpttype.ipp:555
+#: src/emu/inpttype.ipp:556 src/emu/inpttype.ipp:557 src/emu/inpttype.ipp:558
 #: src/emu/inpttype.ipp:559
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:564
-msgctxt "input-name"
-msgid "P1 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:565
-msgctxt "input-name"
-msgid "P2 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:566
-msgctxt "input-name"
-msgid "P3 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:567
-msgctxt "input-name"
-msgid "P4 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:568
-msgctxt "input-name"
-msgid "P5 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:569
-msgctxt "input-name"
-msgid "P6 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:570
-msgctxt "input-name"
-msgid "P7 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:571
-msgctxt "input-name"
-msgid "P8 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:572
-msgctxt "input-name"
-msgid "P9 Pedal 2"
+msgid "%p Pedal 1"
 msgstr ""
 
+#: src/emu/inpttype.ipp:564 src/emu/inpttype.ipp:565 src/emu/inpttype.ipp:566
+#: src/emu/inpttype.ipp:567 src/emu/inpttype.ipp:568 src/emu/inpttype.ipp:569
+#: src/emu/inpttype.ipp:570 src/emu/inpttype.ipp:571 src/emu/inpttype.ipp:572
 #: src/emu/inpttype.ipp:573
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:578
-msgctxt "input-name"
-msgid "P1 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:579
-msgctxt "input-name"
-msgid "P2 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:580
-msgctxt "input-name"
-msgid "P3 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:581
-msgctxt "input-name"
-msgid "P4 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:582
-msgctxt "input-name"
-msgid "P5 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:583
-msgctxt "input-name"
-msgid "P6 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:584
-msgctxt "input-name"
-msgid "P7 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:585
-msgctxt "input-name"
-msgid "P8 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:586
-msgctxt "input-name"
-msgid "P9 Pedal 3"
+msgid "%p Pedal 2"
 msgstr ""
 
+#: src/emu/inpttype.ipp:578 src/emu/inpttype.ipp:579 src/emu/inpttype.ipp:580
+#: src/emu/inpttype.ipp:581 src/emu/inpttype.ipp:582 src/emu/inpttype.ipp:583
+#: src/emu/inpttype.ipp:584 src/emu/inpttype.ipp:585 src/emu/inpttype.ipp:586
 #: src/emu/inpttype.ipp:587
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 3"
+msgid "%p Pedal 3"
 msgstr ""
 
 #: src/emu/inpttype.ipp:592
@@ -7565,6 +6071,15 @@ msgid ""
 "%s"
 msgstr ""
 
+#~ msgid "Confirm quit from machines"
+#~ msgstr "Potvrď odchod ze zařízení"
+
+#~ msgid "Skip software parts selection menu"
+#~ msgstr "Přeskoč menu s výběrem částí software"
+
+#~ msgid "Adstick Device Assignment"
+#~ msgstr "ADStick zařízení přiřazení"
+
 #~ msgid "Device Mapping"
 #~ msgstr "Mapování zařízení"
 
diff --git a/language/Danish/strings.po b/language/Danish/strings.po
index 8b34a363f2e..e99a7a99126 100644
--- a/language/Danish/strings.po
+++ b/language/Danish/strings.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-19 02:50+1100\n"
+"POT-Creation-Date: 2021-12-09 04:44+1100\n"
 "PO-Revision-Date: 2016-02-20 18:03+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: MAME Language Team\n"
@@ -261,12 +261,12 @@ msgstr ""
 msgid "Driver: \"%1$s\" software list "
 msgstr ""
 
-#: src/frontend/mame/ui/selsoft.cpp:711 src/frontend/mame/ui/selgame.cpp:1066
+#: src/frontend/mame/ui/selsoft.cpp:711 src/frontend/mame/ui/selgame.cpp:1076
 #, c-format
 msgid "%1$s: %2$s - Search: %3$s_"
 msgstr ""
 
-#: src/frontend/mame/ui/selsoft.cpp:713 src/frontend/mame/ui/selgame.cpp:1068
+#: src/frontend/mame/ui/selsoft.cpp:713 src/frontend/mame/ui/selgame.cpp:1078
 #, c-format
 msgid "Search: %1$s_"
 msgstr ""
@@ -276,7 +276,7 @@ msgstr ""
 msgid "Software list/item: %1$s:%2$s"
 msgstr ""
 
-#: src/frontend/mame/ui/optsmenu.cpp:73 src/frontend/mame/ui/sndmenu.cpp:165
+#: src/frontend/mame/ui/optsmenu.cpp:73 src/frontend/mame/ui/sndmenu.cpp:161
 msgid "Sound Options"
 msgstr ""
 
@@ -371,11 +371,11 @@ msgid "Show mouse pointer"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:39
-msgid "Confirm quit from machines"
+msgid "Confirm quit from emulation"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:40
-msgid "Skip information screen at startup"
+msgid "Skip system information screen"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:41
@@ -391,7 +391,7 @@ msgid "Skip BIOS selection menu"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:44
-msgid "Skip software parts selection menu"
+msgid "Skip software part selection menu"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:45
@@ -543,7 +543,7 @@ msgid "UI active"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:91
-msgid "Offscreen reload"
+msgid "Off-screen reload"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:92
@@ -559,7 +559,7 @@ msgid "Natural keyboard"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:95
-msgid "Simultaneous contradictory"
+msgid "Allow contradictory joystick inputs"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:96
@@ -583,7 +583,7 @@ msgid "Pedal Device Assignment"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:106
-msgid "Adstick Device Assignment"
+msgid "AD Stick Device Assignment"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:107
@@ -670,14 +670,14 @@ msgstr ""
 msgid "Wait Vertical Sync"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:687
+#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:689
 #: src/frontend/mame/ui/videoopt.cpp:191 src/frontend/mame/ui/custui.cpp:490
 #: src/frontend/mame/ui/analogipt.cpp:471 plugins/cheatfind/init.lua:766
 #: plugins/cheatfind/init.lua:777 plugins/cheat/init.lua:668
 msgid "On"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:690
+#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:692
 #: src/frontend/mame/ui/videoopt.cpp:207 src/frontend/mame/ui/custui.cpp:490
 #: src/frontend/mame/ui/analogipt.cpp:471 plugins/cheatfind/init.lua:763
 #: plugins/cheatfind/init.lua:774 plugins/cheat/init.lua:671
@@ -685,11 +685,11 @@ msgstr ""
 msgid "Off"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:693
+#: src/frontend/mame/ui/menu.cpp:695
 msgid "Auto"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:1195
+#: src/frontend/mame/ui/menu.cpp:1197
 #: src/frontend/mame/ui/simpleselgame.cpp:278
 #: src/frontend/mame/ui/selmenu.cpp:1280
 msgid "Return to Previous Menu"
@@ -697,7 +697,7 @@ msgstr ""
 
 #: src/frontend/mame/ui/filemngr.cpp:139
 #: src/frontend/mame/ui/confswitch.cpp:119
-#: src/frontend/mame/ui/inputmap.cpp:559 src/frontend/mame/ui/analogipt.cpp:360
+#: src/frontend/mame/ui/inputmap.cpp:563 src/frontend/mame/ui/analogipt.cpp:360
 #, c-format
 msgid "[root%1$s]"
 msgstr ""
@@ -940,22 +940,22 @@ msgid ""
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "GHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "MHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "kHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "Hz"
 msgstr ""
 
@@ -979,38 +979,38 @@ msgstr ""
 msgid "Vector"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:480
+#: src/frontend/mame/ui/info.cpp:483
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:480
+#: src/frontend/mame/ui/info.cpp:483
 msgid "%2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:497
+#: src/frontend/mame/ui/info.cpp:500
 #, c-format
 msgid "Screen '%1$s'"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:499
+#: src/frontend/mame/ui/info.cpp:502
 msgid "Screen"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:570 src/frontend/mame/ui/info.cpp:581
+#: src/frontend/mame/ui/info.cpp:573 src/frontend/mame/ui/info.cpp:584
 #, c-format
 msgid "%1$s:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:662
+#: src/frontend/mame/ui/info.cpp:665
 msgid "Not supported"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:665
+#: src/frontend/mame/ui/info.cpp:668
 msgid "Partially supported"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:674
+#: src/frontend/mame/ui/info.cpp:677
 msgid "[empty]"
 msgstr ""
 
@@ -1083,7 +1083,7 @@ msgid "Emulated"
 msgstr ""
 
 #: src/frontend/mame/ui/keyboard.cpp:59 src/frontend/mame/ui/confswitch.cpp:117
-#: src/frontend/mame/ui/inputmap.cpp:557 src/frontend/mame/ui/analogipt.cpp:358
+#: src/frontend/mame/ui/inputmap.cpp:561 src/frontend/mame/ui/analogipt.cpp:358
 #, c-format
 msgid "%1$s [root%2$s]"
 msgstr ""
@@ -1443,7 +1443,7 @@ msgctxt "swlist-info"
 msgid "Software list/item"
 msgstr ""
 
-#: src/frontend/mame/ui/datmenu.cpp:88 src/frontend/mame/ui/selmenu.cpp:2698
+#: src/frontend/mame/ui/datmenu.cpp:88 src/frontend/mame/ui/selmenu.cpp:2707
 msgid "Software List Info"
 msgstr ""
 
@@ -1558,7 +1558,7 @@ msgstr ""
 msgid "Configure Machine:"
 msgstr ""
 
-#: src/frontend/mame/ui/miscmenu.cpp:858 src/frontend/mame/ui/selmenu.cpp:2638
+#: src/frontend/mame/ui/miscmenu.cpp:858 src/frontend/mame/ui/selmenu.cpp:2647
 msgid " (default)"
 msgstr ""
 
@@ -1575,7 +1575,7 @@ msgid ""
 "Press %2$s to return to emulation"
 msgstr ""
 
-#: src/frontend/mame/ui/info_pty.cpp:30 src/frontend/mame/ui/mainmenu.cpp:155
+#: src/frontend/mame/ui/info_pty.cpp:30
 msgid "Pseudo terminals"
 msgstr ""
 
@@ -1643,52 +1643,52 @@ msgstr ""
 msgid "Other Controls"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:227
+#: src/frontend/mame/ui/inputmap.cpp:231
 msgid "This machine has no configurable inputs."
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:327
+#: src/frontend/mame/ui/inputmap.cpp:331
 msgid "Pressed"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:397
+#: src/frontend/mame/ui/inputmap.cpp:401
 msgid "Invalid sequence entered"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:542
+#: src/frontend/mame/ui/inputmap.cpp:546
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:543
+#: src/frontend/mame/ui/inputmap.cpp:547
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog Inc"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:544
+#: src/frontend/mame/ui/inputmap.cpp:548
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog Dec"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:586
+#: src/frontend/mame/ui/inputmap.cpp:590
 #, c-format
 msgid "Press %1$s to set\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:587
+#: src/frontend/mame/ui/inputmap.cpp:591
 #, c-format
 msgid "Press %1$s to append\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:588
+#: src/frontend/mame/ui/inputmap.cpp:592
 #, c-format
 msgid "Press %1$s to clear\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:589
+#: src/frontend/mame/ui/inputmap.cpp:593
 #, c-format
 msgid "Press %1$s to restore default\n"
 msgstr ""
@@ -1752,7 +1752,7 @@ msgid ""
 msgstr ""
 
 #: src/frontend/mame/ui/simpleselgame.cpp:273
-#: src/frontend/mame/ui/selgame.cpp:436
+#: src/frontend/mame/ui/selgame.cpp:443
 msgid "Configure Options"
 msgstr ""
 
@@ -2080,16 +2080,16 @@ msgstr ""
 msgid "Expand to fit"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:437
+#: src/frontend/mame/ui/selgame.cpp:444
 msgid "Configure Machine"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:1050
+#: src/frontend/mame/ui/selgame.cpp:1060
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d machines (%5$d BIOS) )"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:1078
+#: src/frontend/mame/ui/selgame.cpp:1088
 #, c-format
 msgid "System: %1$-.100s"
 msgstr ""
@@ -2111,7 +2111,7 @@ msgstr ""
 #: src/frontend/mame/ui/auditmenu.cpp:98
 #, c-format
 msgid ""
-"Auditing ROMs for machine %2$u of %3$u...\n"
+"Auditing media for machine %2$u of %3$u...\n"
 "%1$s"
 msgstr ""
 
@@ -2126,12 +2126,12 @@ msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:136
 #, c-format
-msgid "Audit ROMs for %1$u machines marked unavailable"
+msgid "Audit media for %1$u machines marked unavailable"
 msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:137
 #, c-format
-msgid "Audit ROMs for all %1$u machines"
+msgid "Audit media for all %1$u machines"
 msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:154
@@ -2337,84 +2337,84 @@ msgctxt "color-sample"
 msgid "Clone"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:914
+#: src/frontend/mame/ui/custui.cpp:906
 msgid "ARGB Settings"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:919 src/frontend/mame/ui/custui.cpp:922
+#: src/frontend/mame/ui/custui.cpp:911 src/frontend/mame/ui/custui.cpp:914
 msgctxt "color-channel"
 msgid "Alpha"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:927 src/frontend/mame/ui/custui.cpp:930
+#: src/frontend/mame/ui/custui.cpp:919 src/frontend/mame/ui/custui.cpp:922
 msgctxt "color-channel"
 msgid "Red"
 msgstr ""
 
+#: src/frontend/mame/ui/custui.cpp:927 src/frontend/mame/ui/custui.cpp:930
+msgctxt "color-channel"
+msgid "Green"
+msgstr ""
+
 #: src/frontend/mame/ui/custui.cpp:935 src/frontend/mame/ui/custui.cpp:938
 msgctxt "color-channel"
-msgid "Green"
-msgstr ""
-
-#: src/frontend/mame/ui/custui.cpp:943 src/frontend/mame/ui/custui.cpp:946
-msgctxt "color-channel"
 msgid "Blue"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:949
+#: src/frontend/mame/ui/custui.cpp:941
 msgid "Choose from palette"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:996
+#: src/frontend/mame/ui/custui.cpp:988
 msgid "Color preview:"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1093
+#: src/frontend/mame/ui/custui.cpp:1085
 msgctxt "color-preset"
 msgid "White"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1094
+#: src/frontend/mame/ui/custui.cpp:1086
 msgctxt "color-preset"
 msgid "Silver"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1095
+#: src/frontend/mame/ui/custui.cpp:1087
 msgctxt "color-preset"
 msgid "Gray"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1096
+#: src/frontend/mame/ui/custui.cpp:1088
 msgctxt "color-preset"
 msgid "Black"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1097
+#: src/frontend/mame/ui/custui.cpp:1089
 msgctxt "color-preset"
 msgid "Red"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1098
+#: src/frontend/mame/ui/custui.cpp:1090
 msgctxt "color-preset"
 msgid "Orange"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1099
+#: src/frontend/mame/ui/custui.cpp:1091
 msgctxt "color-preset"
 msgid "Yellow"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1100
+#: src/frontend/mame/ui/custui.cpp:1092
 msgctxt "color-preset"
 msgid "Green"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1101
+#: src/frontend/mame/ui/custui.cpp:1093
 msgctxt "color-preset"
 msgid "Blue"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1102
+#: src/frontend/mame/ui/custui.cpp:1094
 msgctxt "color-preset"
 msgid "Violet"
 msgstr ""
@@ -2479,7 +2479,7 @@ msgid "Input (general)"
 msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:123
-msgid "Input (this Machine)"
+msgid "Input (this machine)"
 msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:126
@@ -2518,6 +2518,10 @@ msgstr ""
 msgid "Tape Control"
 msgstr ""
 
+#: src/frontend/mame/ui/mainmenu.cpp:155
+msgid "Pseudo Terminals"
+msgstr ""
+
 #: src/frontend/mame/ui/mainmenu.cpp:158
 msgid "BIOS Selection"
 msgstr ""
@@ -2556,7 +2560,7 @@ msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:200
 #, c-format
-msgid "About %s"
+msgid "About %1$s"
 msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:212
@@ -2716,373 +2720,373 @@ msgstr ""
 msgid "%1$s %2$s"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2235
+#: src/frontend/mame/ui/selmenu.cpp:2244
 msgid "Images"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2236
+#: src/frontend/mame/ui/selmenu.cpp:2245
 msgid "Infos"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2551
+#: src/frontend/mame/ui/selmenu.cpp:2560
 msgid ""
 "Required ROM/disk images for the selected system are missing or incorrect. "
 "Please acquire the correct files or select a different system.\n"
 "\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2567
+#: src/frontend/mame/ui/selmenu.cpp:2576
 msgid ""
 "Required ROM/disk images for the selected software are missing or incorrect. "
 "Please acquire the correct files or select a different software item.\n"
 "\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2583
+#: src/frontend/mame/ui/selmenu.cpp:2592
 msgid "incorrect checksum"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2586
+#: src/frontend/mame/ui/selmenu.cpp:2595
 msgid "incorrect length"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2589
+#: src/frontend/mame/ui/selmenu.cpp:2598
 msgid "not found"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2600
+#: src/frontend/mame/ui/selmenu.cpp:2609
 #, c-format
 msgid "%1$s (%2$s) - %3$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2602
+#: src/frontend/mame/ui/selmenu.cpp:2611
 #, c-format
 msgid "%1$s - %2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2606
+#: src/frontend/mame/ui/selmenu.cpp:2615
 msgid "Press any key to continue."
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2735
+#: src/frontend/mame/ui/selmenu.cpp:2744
 msgid "General Info"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2887
-#, c-format
-msgid "Romset\t%1$s\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2888
-#, c-format
-msgid "Year\t%1$s\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2889
-#, c-format
-msgid "Manufacturer\t%1$s\n"
-msgstr ""
-
 #: src/frontend/mame/ui/selmenu.cpp:2896
 #, c-format
-msgid "Driver is Clone of\t%1$s\n"
+msgid "Romset\t%1$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2901
-msgid "Driver is Parent\t\n"
+#: src/frontend/mame/ui/selmenu.cpp:2897
+#, c-format
+msgid "Year\t%1$s\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2898
+#, c-format
+msgid "Manufacturer\t%1$s\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2905
-msgid "Analog Controls\tYes\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2907
-msgid "Keyboard Inputs\tYes\n"
+#, c-format
+msgid "Driver is Clone of\t%1$s\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2910
-msgid "Overall\tNOT WORKING\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2912
-msgid "Overall\tUnemulated Protection\n"
+msgid "Driver is Parent\t\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2914
-msgid "Overall\tWorking\n"
+msgid "Analog Controls\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2917
-msgid "Graphics\tUnimplemented\n"
+#: src/frontend/mame/ui/selmenu.cpp:2916
+msgid "Keyboard Inputs\tYes\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2919
-msgid "Graphics\tWrong Colors\n"
+msgid "Overall\tNOT WORKING\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2921
-msgid "Graphics\tImperfect Colors\n"
+msgid "Overall\tUnemulated Protection\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2923
-msgid "Graphics\tImperfect\n"
+msgid "Overall\tWorking\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2925
-msgid "Graphics\tOK\n"
+#: src/frontend/mame/ui/selmenu.cpp:2926
+msgid "Graphics\tUnimplemented\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2928
-msgid "Sound\tNone\n"
+msgid "Graphics\tWrong Colors\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2930
-msgid "Sound\tUnimplemented\n"
+msgid "Graphics\tImperfect Colors\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2932
-msgid "Sound\tImperfect\n"
+msgid "Graphics\tImperfect\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2934
-msgid "Sound\tOK\n"
+msgid "Graphics\tOK\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2937
-msgid "Capture\tUnimplemented\n"
+msgid "Sound\tNone\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2939
+msgid "Sound\tUnimplemented\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2941
+msgid "Sound\tImperfect\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2943
+msgid "Sound\tOK\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2946
+msgid "Capture\tUnimplemented\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2948
 msgid "Capture\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2942
+#: src/frontend/mame/ui/selmenu.cpp:2951
 msgid "Camera\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2944
+#: src/frontend/mame/ui/selmenu.cpp:2953
 msgid "Camera\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2947
+#: src/frontend/mame/ui/selmenu.cpp:2956
 msgid "Microphone\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2949
+#: src/frontend/mame/ui/selmenu.cpp:2958
 msgid "Microphone\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2952
+#: src/frontend/mame/ui/selmenu.cpp:2961
 msgid "Controls\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2954
+#: src/frontend/mame/ui/selmenu.cpp:2963
 msgid "Controls\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2957
+#: src/frontend/mame/ui/selmenu.cpp:2966
 msgid "Keyboard\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2959
+#: src/frontend/mame/ui/selmenu.cpp:2968
 msgid "Keyboard\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2962
+#: src/frontend/mame/ui/selmenu.cpp:2971
 msgid "Mouse\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2964
+#: src/frontend/mame/ui/selmenu.cpp:2973
 msgid "Mouse\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2967
+#: src/frontend/mame/ui/selmenu.cpp:2976
 msgid "Media\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2969
+#: src/frontend/mame/ui/selmenu.cpp:2978
 msgid "Media\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2972
+#: src/frontend/mame/ui/selmenu.cpp:2981
 msgid "Disk\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2974
+#: src/frontend/mame/ui/selmenu.cpp:2983
 msgid "Disk\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2977
+#: src/frontend/mame/ui/selmenu.cpp:2986
 msgid "Printer\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2979
+#: src/frontend/mame/ui/selmenu.cpp:2988
 msgid "Printer\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2982
+#: src/frontend/mame/ui/selmenu.cpp:2991
 msgid "Mag. Tape\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2984
+#: src/frontend/mame/ui/selmenu.cpp:2993
 msgid "Mag. Tape\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2987
+#: src/frontend/mame/ui/selmenu.cpp:2996
 msgid "Punch Tape\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2989
+#: src/frontend/mame/ui/selmenu.cpp:2998
 msgid "Punch Tape\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2992
+#: src/frontend/mame/ui/selmenu.cpp:3001
 msgid "Mag. Drum\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2994
+#: src/frontend/mame/ui/selmenu.cpp:3003
 msgid "Mag. Drum\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2997
+#: src/frontend/mame/ui/selmenu.cpp:3006
 msgid "(EP)ROM\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2999
+#: src/frontend/mame/ui/selmenu.cpp:3008
 msgid "(EP)ROM\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3002
+#: src/frontend/mame/ui/selmenu.cpp:3011
 msgid "Communications\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3004
+#: src/frontend/mame/ui/selmenu.cpp:3013
 msgid "Communications\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3007
+#: src/frontend/mame/ui/selmenu.cpp:3016
 msgid "LAN\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3009
+#: src/frontend/mame/ui/selmenu.cpp:3018
 msgid "LAN\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3012
+#: src/frontend/mame/ui/selmenu.cpp:3021
 msgid "WAN\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3014
+#: src/frontend/mame/ui/selmenu.cpp:3023
 msgid "WAN\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3017
+#: src/frontend/mame/ui/selmenu.cpp:3026
 msgid "Timing\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3019
+#: src/frontend/mame/ui/selmenu.cpp:3028
 msgid "Timing\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3021
+#: src/frontend/mame/ui/selmenu.cpp:3030
 msgid "Mechanical Machine\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3021
+#: src/frontend/mame/ui/selmenu.cpp:3030
 msgid "Mechanical Machine\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3022
+#: src/frontend/mame/ui/selmenu.cpp:3031
 msgid "Requires Artwork\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3022
+#: src/frontend/mame/ui/selmenu.cpp:3031
 msgid "Requires Artwork\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3023
+#: src/frontend/mame/ui/selmenu.cpp:3032
 msgid "Requires Clickable Artwork\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3023
+#: src/frontend/mame/ui/selmenu.cpp:3032
 msgid "Requires Clickable Artwork\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3025
+#: src/frontend/mame/ui/selmenu.cpp:3034
 msgid "Support Cocktail\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3026
+#: src/frontend/mame/ui/selmenu.cpp:3035
 msgid "Driver is BIOS\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3026
+#: src/frontend/mame/ui/selmenu.cpp:3035
 msgid "Driver is BIOS\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3027
+#: src/frontend/mame/ui/selmenu.cpp:3036
 msgid "Support Save\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3027
+#: src/frontend/mame/ui/selmenu.cpp:3036
 msgid "Support Save\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3028
+#: src/frontend/mame/ui/selmenu.cpp:3037
 msgid "Screen Orientation\tVertical\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3028
+#: src/frontend/mame/ui/selmenu.cpp:3037
 msgid "Screen Orientation\tHorizontal\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3038
+#: src/frontend/mame/ui/selmenu.cpp:3047
 msgid "Requires CHD\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3038
+#: src/frontend/mame/ui/selmenu.cpp:3047
 msgid "Requires CHD\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3051
-msgid "ROM Audit Result\tOK\n"
+#: src/frontend/mame/ui/selmenu.cpp:3060
+msgid "Media Audit Result\tOK\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3053
-msgid "ROM Audit Result\tBAD\n"
+#: src/frontend/mame/ui/selmenu.cpp:3062
+msgid "Media Audit Result\tBAD\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3056
+#: src/frontend/mame/ui/selmenu.cpp:3065
 msgid "Samples Audit Result\tNone Needed\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3058
+#: src/frontend/mame/ui/selmenu.cpp:3067
 msgid "Samples Audit Result\tOK\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3060
+#: src/frontend/mame/ui/selmenu.cpp:3069
 msgid "Samples Audit Result\tBAD\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3064
+#: src/frontend/mame/ui/selmenu.cpp:3073
 msgid ""
-"ROM Audit \tDisabled\n"
-"Samples Audit \tDisabled\n"
+"Media Audit\tDisabled\n"
+"Samples Audit\tDisabled\n"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:150
+#: src/frontend/mame/ui/sndmenu.cpp:146
 msgid "Sound"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:151
+#: src/frontend/mame/ui/sndmenu.cpp:147
 msgid "Compressor"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:152
+#: src/frontend/mame/ui/sndmenu.cpp:148
 msgid "Sample Rate"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:153
+#: src/frontend/mame/ui/sndmenu.cpp:149
 msgid "Use External Samples"
 msgstr ""
 
@@ -3121,511 +3125,681 @@ msgstr ""
 msgid "  Screen '%1$s': Vector\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:132
+#: src/frontend/mame/ui/devopt.cpp:135
 #, c-format
 msgid "  Screen '%1$s': %2$d × %3$d (V) %4$s Hz\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:133
+#: src/frontend/mame/ui/devopt.cpp:136
 #, c-format
 msgid "  Screen '%1$s': %2$d × %3$d (H) %4$s Hz\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:147
+#: src/frontend/mame/ui/devopt.cpp:150
 msgid "* Sound:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:211
+#: src/frontend/mame/ui/devopt.cpp:214
 #, c-format
 msgid ""
 "* BIOS settings:\n"
 "  %1$d options    [default: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:255 src/frontend/mame/ui/devopt.cpp:271
-#: src/frontend/mame/ui/devopt.cpp:332
+#: src/frontend/mame/ui/devopt.cpp:258 src/frontend/mame/ui/devopt.cpp:274
+#: src/frontend/mame/ui/devopt.cpp:335
 #, c-format
 msgid "  %1$s    [default: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:260 src/frontend/mame/ui/devopt.cpp:276
+#: src/frontend/mame/ui/devopt.cpp:263 src/frontend/mame/ui/devopt.cpp:279
 #, c-format
 msgid "  %1$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:282
+#: src/frontend/mame/ui/devopt.cpp:285
 msgid "* DIP switch settings:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:287
+#: src/frontend/mame/ui/devopt.cpp:290
 msgid "* Configuration settings:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:291
+#: src/frontend/mame/ui/devopt.cpp:294
 msgid "* Input device(s):\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:293
+#: src/frontend/mame/ui/devopt.cpp:296
 #, c-format
 msgid "  User inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:295
+#: src/frontend/mame/ui/devopt.cpp:298
 #, c-format
 msgid "  Mahjong inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:297
+#: src/frontend/mame/ui/devopt.cpp:300
 #, c-format
 msgid "  Hanafuda inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:299
+#: src/frontend/mame/ui/devopt.cpp:302
 #, c-format
 msgid "  Gambling inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:301
+#: src/frontend/mame/ui/devopt.cpp:304
 #, c-format
 msgid "  Analog inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:303
+#: src/frontend/mame/ui/devopt.cpp:306
 #, c-format
 msgid "  Adjuster inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:305
+#: src/frontend/mame/ui/devopt.cpp:308
 #, c-format
 msgid "  Keypad inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:307
+#: src/frontend/mame/ui/devopt.cpp:310
 #, c-format
 msgid "  Keyboard inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:312
+#: src/frontend/mame/ui/devopt.cpp:315
 msgid "* Media Options:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:317
+#: src/frontend/mame/ui/devopt.cpp:320
 #, c-format
 msgid "  %1$s    [tag: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:327
+#: src/frontend/mame/ui/devopt.cpp:330
 msgid "* Slot Options:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:341
+#: src/frontend/mame/ui/devopt.cpp:344
 msgid "[None]\n"
 msgstr ""
 
-#: src/emu/render.cpp:1847
+#: src/emu/render.cpp:1796
 #, c-format
 msgctxt "view-name"
 msgid "Screen %1$u Standard (%2$u:%3$u)"
 msgstr ""
 
-#: src/emu/render.cpp:1873
+#: src/emu/render.cpp:1822
 #, c-format
 msgctxt "view-name"
 msgid "Screen %1$u Pixel Aspect (%2$u:%3$u)"
 msgstr ""
 
-#: src/emu/render.cpp:1895 src/emu/render.cpp:2030
+#: src/emu/render.cpp:1844 src/emu/render.cpp:1979
 msgctxt "view-name"
 msgid "Cocktail"
 msgstr ""
 
-#: src/emu/render.cpp:2015
+#: src/emu/render.cpp:1964
 msgctxt "view-name"
 msgid "Left-to-Right"
 msgstr ""
 
-#: src/emu/render.cpp:2016
+#: src/emu/render.cpp:1965
 msgctxt "view-name"
 msgid "Left-to-Right (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2017
+#: src/emu/render.cpp:1966
 msgctxt "view-name"
 msgid "Top-to-Bottom"
 msgstr ""
 
-#: src/emu/render.cpp:2018
+#: src/emu/render.cpp:1967
 msgctxt "view-name"
 msgid "Top-to-Bottom (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2069
+#: src/emu/render.cpp:2018
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Left-to-Right, Top-to-Bottom"
 msgstr ""
 
-#: src/emu/render.cpp:2078
+#: src/emu/render.cpp:2027
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Left-to-Right, Top-to-Bottom (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2087
+#: src/emu/render.cpp:2036
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Top-to-Bottom, Left-to-Right"
 msgstr ""
 
-#: src/emu/render.cpp:2096
+#: src/emu/render.cpp:2045
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Top-to-Bottom, Left-to-Right (Gapless)"
 msgstr ""
 
-#: src/emu/inpttype.ipp:22
+#: src/emu/ioport.cpp:332
+#, c-format
 msgctxt "input-name"
-msgid "P1 Up"
+msgid "P%1$u"
 msgstr ""
 
-#: src/emu/inpttype.ipp:23
+#: src/emu/ioport.cpp:1924
 msgctxt "input-name"
-msgid "P1 Down"
+msgid "???"
 msgstr ""
 
-#: src/emu/inpttype.ipp:24
+#: src/emu/inpttype.ipp:22 src/emu/inpttype.ipp:140 src/emu/inpttype.ipp:221
+#: src/emu/inpttype.ipp:255 src/emu/inpttype.ipp:289 src/emu/inpttype.ipp:323
+#: src/emu/inpttype.ipp:357 src/emu/inpttype.ipp:391 src/emu/inpttype.ipp:425
+#: src/emu/inpttype.ipp:459
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left"
+msgid "%p Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:25
+#: src/emu/inpttype.ipp:23 src/emu/inpttype.ipp:141 src/emu/inpttype.ipp:222
+#: src/emu/inpttype.ipp:256 src/emu/inpttype.ipp:290 src/emu/inpttype.ipp:324
+#: src/emu/inpttype.ipp:358 src/emu/inpttype.ipp:392 src/emu/inpttype.ipp:426
+#: src/emu/inpttype.ipp:460
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right"
+msgid "%p Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:26
+#: src/emu/inpttype.ipp:24 src/emu/inpttype.ipp:142 src/emu/inpttype.ipp:223
+#: src/emu/inpttype.ipp:257 src/emu/inpttype.ipp:291 src/emu/inpttype.ipp:325
+#: src/emu/inpttype.ipp:359 src/emu/inpttype.ipp:393 src/emu/inpttype.ipp:427
+#: src/emu/inpttype.ipp:461
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Up"
+msgid "%p Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:27
+#: src/emu/inpttype.ipp:25 src/emu/inpttype.ipp:143 src/emu/inpttype.ipp:224
+#: src/emu/inpttype.ipp:258 src/emu/inpttype.ipp:292 src/emu/inpttype.ipp:326
+#: src/emu/inpttype.ipp:360 src/emu/inpttype.ipp:394 src/emu/inpttype.ipp:428
+#: src/emu/inpttype.ipp:462
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Down"
+msgid "%p Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:28
+#: src/emu/inpttype.ipp:26 src/emu/inpttype.ipp:144 src/emu/inpttype.ipp:225
+#: src/emu/inpttype.ipp:259 src/emu/inpttype.ipp:293 src/emu/inpttype.ipp:327
+#: src/emu/inpttype.ipp:361 src/emu/inpttype.ipp:395 src/emu/inpttype.ipp:429
+#: src/emu/inpttype.ipp:463
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Left"
+msgid "%p Right Stick/Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:29
+#: src/emu/inpttype.ipp:27 src/emu/inpttype.ipp:145 src/emu/inpttype.ipp:226
+#: src/emu/inpttype.ipp:260 src/emu/inpttype.ipp:294 src/emu/inpttype.ipp:328
+#: src/emu/inpttype.ipp:362 src/emu/inpttype.ipp:396 src/emu/inpttype.ipp:430
+#: src/emu/inpttype.ipp:464
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Right"
+msgid "%p Right Stick/Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:30
+#: src/emu/inpttype.ipp:28 src/emu/inpttype.ipp:146 src/emu/inpttype.ipp:227
+#: src/emu/inpttype.ipp:261 src/emu/inpttype.ipp:295 src/emu/inpttype.ipp:329
+#: src/emu/inpttype.ipp:363 src/emu/inpttype.ipp:397 src/emu/inpttype.ipp:431
+#: src/emu/inpttype.ipp:465
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Up"
+msgid "%p Right Stick/Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:31
+#: src/emu/inpttype.ipp:29 src/emu/inpttype.ipp:147 src/emu/inpttype.ipp:228
+#: src/emu/inpttype.ipp:262 src/emu/inpttype.ipp:296 src/emu/inpttype.ipp:330
+#: src/emu/inpttype.ipp:364 src/emu/inpttype.ipp:398 src/emu/inpttype.ipp:432
+#: src/emu/inpttype.ipp:466
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Down"
+msgid "%p Right Stick/Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:32
+#: src/emu/inpttype.ipp:30 src/emu/inpttype.ipp:148 src/emu/inpttype.ipp:229
+#: src/emu/inpttype.ipp:263 src/emu/inpttype.ipp:297 src/emu/inpttype.ipp:331
+#: src/emu/inpttype.ipp:365 src/emu/inpttype.ipp:399 src/emu/inpttype.ipp:433
+#: src/emu/inpttype.ipp:467
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Left"
+msgid "%p Left Stick/Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:33
+#: src/emu/inpttype.ipp:31 src/emu/inpttype.ipp:149 src/emu/inpttype.ipp:230
+#: src/emu/inpttype.ipp:264 src/emu/inpttype.ipp:298 src/emu/inpttype.ipp:332
+#: src/emu/inpttype.ipp:366 src/emu/inpttype.ipp:400 src/emu/inpttype.ipp:434
+#: src/emu/inpttype.ipp:468
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Right"
+msgid "%p Left Stick/Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:34
+#: src/emu/inpttype.ipp:32 src/emu/inpttype.ipp:150 src/emu/inpttype.ipp:231
+#: src/emu/inpttype.ipp:265 src/emu/inpttype.ipp:299 src/emu/inpttype.ipp:333
+#: src/emu/inpttype.ipp:367 src/emu/inpttype.ipp:401 src/emu/inpttype.ipp:435
+#: src/emu/inpttype.ipp:469
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 1"
+msgid "%p Left Stick/Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:35
+#: src/emu/inpttype.ipp:33 src/emu/inpttype.ipp:151 src/emu/inpttype.ipp:232
+#: src/emu/inpttype.ipp:266 src/emu/inpttype.ipp:300 src/emu/inpttype.ipp:334
+#: src/emu/inpttype.ipp:368 src/emu/inpttype.ipp:402 src/emu/inpttype.ipp:436
+#: src/emu/inpttype.ipp:470
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 2"
+msgid "%p Left Stick/Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:36
+#: src/emu/inpttype.ipp:34 src/emu/inpttype.ipp:152 src/emu/inpttype.ipp:233
+#: src/emu/inpttype.ipp:267 src/emu/inpttype.ipp:301 src/emu/inpttype.ipp:335
+#: src/emu/inpttype.ipp:369 src/emu/inpttype.ipp:403 src/emu/inpttype.ipp:437
+#: src/emu/inpttype.ipp:471
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 3"
+msgid "%p Button 1"
 msgstr ""
 
-#: src/emu/inpttype.ipp:37
+#: src/emu/inpttype.ipp:35 src/emu/inpttype.ipp:153 src/emu/inpttype.ipp:234
+#: src/emu/inpttype.ipp:268 src/emu/inpttype.ipp:302 src/emu/inpttype.ipp:336
+#: src/emu/inpttype.ipp:370 src/emu/inpttype.ipp:404 src/emu/inpttype.ipp:438
+#: src/emu/inpttype.ipp:472
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 4"
+msgid "%p Button 2"
 msgstr ""
 
-#: src/emu/inpttype.ipp:38
+#: src/emu/inpttype.ipp:36 src/emu/inpttype.ipp:154 src/emu/inpttype.ipp:235
+#: src/emu/inpttype.ipp:269 src/emu/inpttype.ipp:303 src/emu/inpttype.ipp:337
+#: src/emu/inpttype.ipp:371 src/emu/inpttype.ipp:405 src/emu/inpttype.ipp:439
+#: src/emu/inpttype.ipp:473
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 5"
+msgid "%p Button 3"
 msgstr ""
 
-#: src/emu/inpttype.ipp:39
+#: src/emu/inpttype.ipp:37 src/emu/inpttype.ipp:155 src/emu/inpttype.ipp:236
+#: src/emu/inpttype.ipp:270 src/emu/inpttype.ipp:304 src/emu/inpttype.ipp:338
+#: src/emu/inpttype.ipp:372 src/emu/inpttype.ipp:406 src/emu/inpttype.ipp:440
+#: src/emu/inpttype.ipp:474
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 6"
+msgid "%p Button 4"
 msgstr ""
 
-#: src/emu/inpttype.ipp:40
+#: src/emu/inpttype.ipp:38 src/emu/inpttype.ipp:156 src/emu/inpttype.ipp:237
+#: src/emu/inpttype.ipp:271 src/emu/inpttype.ipp:305 src/emu/inpttype.ipp:339
+#: src/emu/inpttype.ipp:373 src/emu/inpttype.ipp:407 src/emu/inpttype.ipp:441
+#: src/emu/inpttype.ipp:475
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 7"
+msgid "%p Button 5"
 msgstr ""
 
-#: src/emu/inpttype.ipp:41
+#: src/emu/inpttype.ipp:39 src/emu/inpttype.ipp:157 src/emu/inpttype.ipp:238
+#: src/emu/inpttype.ipp:272 src/emu/inpttype.ipp:306 src/emu/inpttype.ipp:340
+#: src/emu/inpttype.ipp:374 src/emu/inpttype.ipp:408 src/emu/inpttype.ipp:442
+#: src/emu/inpttype.ipp:476
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 8"
+msgid "%p Button 6"
 msgstr ""
 
-#: src/emu/inpttype.ipp:42
+#: src/emu/inpttype.ipp:40 src/emu/inpttype.ipp:158 src/emu/inpttype.ipp:239
+#: src/emu/inpttype.ipp:273 src/emu/inpttype.ipp:307 src/emu/inpttype.ipp:341
+#: src/emu/inpttype.ipp:375 src/emu/inpttype.ipp:409 src/emu/inpttype.ipp:443
+#: src/emu/inpttype.ipp:477
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 9"
+msgid "%p Button 7"
 msgstr ""
 
-#: src/emu/inpttype.ipp:43
+#: src/emu/inpttype.ipp:41 src/emu/inpttype.ipp:159 src/emu/inpttype.ipp:240
+#: src/emu/inpttype.ipp:274 src/emu/inpttype.ipp:308 src/emu/inpttype.ipp:342
+#: src/emu/inpttype.ipp:376 src/emu/inpttype.ipp:410 src/emu/inpttype.ipp:444
+#: src/emu/inpttype.ipp:478
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 10"
+msgid "%p Button 8"
 msgstr ""
 
-#: src/emu/inpttype.ipp:44
+#: src/emu/inpttype.ipp:42 src/emu/inpttype.ipp:160 src/emu/inpttype.ipp:241
+#: src/emu/inpttype.ipp:275 src/emu/inpttype.ipp:309 src/emu/inpttype.ipp:343
+#: src/emu/inpttype.ipp:377 src/emu/inpttype.ipp:411 src/emu/inpttype.ipp:445
+#: src/emu/inpttype.ipp:479
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 11"
+msgid "%p Button 9"
 msgstr ""
 
-#: src/emu/inpttype.ipp:45
+#: src/emu/inpttype.ipp:43 src/emu/inpttype.ipp:161 src/emu/inpttype.ipp:242
+#: src/emu/inpttype.ipp:276 src/emu/inpttype.ipp:310 src/emu/inpttype.ipp:344
+#: src/emu/inpttype.ipp:378 src/emu/inpttype.ipp:412 src/emu/inpttype.ipp:446
+#: src/emu/inpttype.ipp:480
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 12"
+msgid "%p Button 10"
 msgstr ""
 
-#: src/emu/inpttype.ipp:46
+#: src/emu/inpttype.ipp:44 src/emu/inpttype.ipp:162 src/emu/inpttype.ipp:243
+#: src/emu/inpttype.ipp:277 src/emu/inpttype.ipp:311 src/emu/inpttype.ipp:345
+#: src/emu/inpttype.ipp:379 src/emu/inpttype.ipp:413 src/emu/inpttype.ipp:447
+#: src/emu/inpttype.ipp:481
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 13"
+msgid "%p Button 11"
 msgstr ""
 
-#: src/emu/inpttype.ipp:47
+#: src/emu/inpttype.ipp:45 src/emu/inpttype.ipp:163 src/emu/inpttype.ipp:244
+#: src/emu/inpttype.ipp:278 src/emu/inpttype.ipp:312 src/emu/inpttype.ipp:346
+#: src/emu/inpttype.ipp:380 src/emu/inpttype.ipp:414 src/emu/inpttype.ipp:448
+#: src/emu/inpttype.ipp:482
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 14"
+msgid "%p Button 12"
 msgstr ""
 
-#: src/emu/inpttype.ipp:48
+#: src/emu/inpttype.ipp:46 src/emu/inpttype.ipp:164 src/emu/inpttype.ipp:245
+#: src/emu/inpttype.ipp:279 src/emu/inpttype.ipp:313 src/emu/inpttype.ipp:347
+#: src/emu/inpttype.ipp:381 src/emu/inpttype.ipp:415 src/emu/inpttype.ipp:449
+#: src/emu/inpttype.ipp:483
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 15"
+msgid "%p Button 13"
 msgstr ""
 
-#: src/emu/inpttype.ipp:49
+#: src/emu/inpttype.ipp:47 src/emu/inpttype.ipp:165 src/emu/inpttype.ipp:246
+#: src/emu/inpttype.ipp:280 src/emu/inpttype.ipp:314 src/emu/inpttype.ipp:348
+#: src/emu/inpttype.ipp:382 src/emu/inpttype.ipp:416 src/emu/inpttype.ipp:450
+#: src/emu/inpttype.ipp:484
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 16"
+msgid "%p Button 14"
 msgstr ""
 
-#: src/emu/inpttype.ipp:50
+#: src/emu/inpttype.ipp:48 src/emu/inpttype.ipp:166 src/emu/inpttype.ipp:247
+#: src/emu/inpttype.ipp:281 src/emu/inpttype.ipp:315 src/emu/inpttype.ipp:349
+#: src/emu/inpttype.ipp:383 src/emu/inpttype.ipp:417 src/emu/inpttype.ipp:451
+#: src/emu/inpttype.ipp:485
+#, c-format
 msgctxt "input-name"
-msgid "P1 Start"
+msgid "%p Button 15"
 msgstr ""
 
-#: src/emu/inpttype.ipp:51
+#: src/emu/inpttype.ipp:49 src/emu/inpttype.ipp:167 src/emu/inpttype.ipp:248
+#: src/emu/inpttype.ipp:282 src/emu/inpttype.ipp:316 src/emu/inpttype.ipp:350
+#: src/emu/inpttype.ipp:384 src/emu/inpttype.ipp:418 src/emu/inpttype.ipp:452
+#: src/emu/inpttype.ipp:486
+#, c-format
 msgctxt "input-name"
-msgid "P1 Select"
+msgid "%p Button 16"
 msgstr ""
 
-#: src/emu/inpttype.ipp:56
+#: src/emu/inpttype.ipp:50 src/emu/inpttype.ipp:168 src/emu/inpttype.ipp:249
+#: src/emu/inpttype.ipp:283 src/emu/inpttype.ipp:317 src/emu/inpttype.ipp:351
+#: src/emu/inpttype.ipp:385 src/emu/inpttype.ipp:419 src/emu/inpttype.ipp:453
+#: src/emu/inpttype.ipp:487
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong A"
+msgid "%p Start"
 msgstr ""
 
-#: src/emu/inpttype.ipp:57
+#: src/emu/inpttype.ipp:51 src/emu/inpttype.ipp:169 src/emu/inpttype.ipp:250
+#: src/emu/inpttype.ipp:284 src/emu/inpttype.ipp:318 src/emu/inpttype.ipp:352
+#: src/emu/inpttype.ipp:386 src/emu/inpttype.ipp:420 src/emu/inpttype.ipp:454
+#: src/emu/inpttype.ipp:488
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong B"
+msgid "%p Select"
 msgstr ""
 
-#: src/emu/inpttype.ipp:58
+#: src/emu/inpttype.ipp:56 src/emu/inpttype.ipp:174
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong C"
+msgid "%p Mahjong A"
 msgstr ""
 
-#: src/emu/inpttype.ipp:59
+#: src/emu/inpttype.ipp:57 src/emu/inpttype.ipp:175
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong D"
+msgid "%p Mahjong B"
 msgstr ""
 
-#: src/emu/inpttype.ipp:60
+#: src/emu/inpttype.ipp:58 src/emu/inpttype.ipp:176
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong E"
+msgid "%p Mahjong C"
 msgstr ""
 
-#: src/emu/inpttype.ipp:61
+#: src/emu/inpttype.ipp:59 src/emu/inpttype.ipp:177
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong F"
+msgid "%p Mahjong D"
 msgstr ""
 
-#: src/emu/inpttype.ipp:62
+#: src/emu/inpttype.ipp:60 src/emu/inpttype.ipp:178
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong G"
+msgid "%p Mahjong E"
 msgstr ""
 
-#: src/emu/inpttype.ipp:63
+#: src/emu/inpttype.ipp:61 src/emu/inpttype.ipp:179
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong H"
+msgid "%p Mahjong F"
 msgstr ""
 
-#: src/emu/inpttype.ipp:64
+#: src/emu/inpttype.ipp:62 src/emu/inpttype.ipp:180
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong I"
+msgid "%p Mahjong G"
 msgstr ""
 
-#: src/emu/inpttype.ipp:65
+#: src/emu/inpttype.ipp:63 src/emu/inpttype.ipp:181
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong J"
+msgid "%p Mahjong H"
 msgstr ""
 
-#: src/emu/inpttype.ipp:66
+#: src/emu/inpttype.ipp:64 src/emu/inpttype.ipp:182
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong K"
+msgid "%p Mahjong I"
 msgstr ""
 
-#: src/emu/inpttype.ipp:67
+#: src/emu/inpttype.ipp:65 src/emu/inpttype.ipp:183
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong L"
+msgid "%p Mahjong J"
 msgstr ""
 
-#: src/emu/inpttype.ipp:68
+#: src/emu/inpttype.ipp:66 src/emu/inpttype.ipp:184
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong M"
+msgid "%p Mahjong K"
 msgstr ""
 
-#: src/emu/inpttype.ipp:69
+#: src/emu/inpttype.ipp:67 src/emu/inpttype.ipp:185
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong N"
+msgid "%p Mahjong L"
 msgstr ""
 
-#: src/emu/inpttype.ipp:70
+#: src/emu/inpttype.ipp:68 src/emu/inpttype.ipp:186
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong O"
+msgid "%p Mahjong M"
 msgstr ""
 
-#: src/emu/inpttype.ipp:71
+#: src/emu/inpttype.ipp:69 src/emu/inpttype.ipp:187
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong P"
+msgid "%p Mahjong N"
 msgstr ""
 
-#: src/emu/inpttype.ipp:72
+#: src/emu/inpttype.ipp:70 src/emu/inpttype.ipp:188
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Q"
+msgid "%p Mahjong O"
 msgstr ""
 
-#: src/emu/inpttype.ipp:73
+#: src/emu/inpttype.ipp:71 src/emu/inpttype.ipp:189
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Kan"
+msgid "%p Mahjong P"
 msgstr ""
 
-#: src/emu/inpttype.ipp:74
+#: src/emu/inpttype.ipp:72 src/emu/inpttype.ipp:190
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Pon"
+msgid "%p Mahjong Q"
 msgstr ""
 
-#: src/emu/inpttype.ipp:75
+#: src/emu/inpttype.ipp:73 src/emu/inpttype.ipp:191
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Chi"
+msgid "%p Mahjong Kan"
 msgstr ""
 
-#: src/emu/inpttype.ipp:76
+#: src/emu/inpttype.ipp:74 src/emu/inpttype.ipp:192
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Reach"
+msgid "%p Mahjong Pon"
 msgstr ""
 
-#: src/emu/inpttype.ipp:77
+#: src/emu/inpttype.ipp:75 src/emu/inpttype.ipp:193
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Ron"
+msgid "%p Mahjong Chi"
 msgstr ""
 
-#: src/emu/inpttype.ipp:78
+#: src/emu/inpttype.ipp:76 src/emu/inpttype.ipp:194
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Flip Flop"
+msgid "%p Mahjong Reach"
 msgstr ""
 
-#: src/emu/inpttype.ipp:79
+#: src/emu/inpttype.ipp:77 src/emu/inpttype.ipp:195
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Bet"
+msgid "%p Mahjong Ron"
 msgstr ""
 
-#: src/emu/inpttype.ipp:80
+#: src/emu/inpttype.ipp:78 src/emu/inpttype.ipp:200
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Take Score"
+msgid "%p Mahjong Flip Flop"
 msgstr ""
 
-#: src/emu/inpttype.ipp:81
+#: src/emu/inpttype.ipp:79 src/emu/inpttype.ipp:196
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Double Up"
+msgid "%p Mahjong Bet"
 msgstr ""
 
-#: src/emu/inpttype.ipp:82
+#: src/emu/inpttype.ipp:80 src/emu/inpttype.ipp:198
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Big"
+msgid "%p Mahjong Take Score"
 msgstr ""
 
-#: src/emu/inpttype.ipp:83
+#: src/emu/inpttype.ipp:81 src/emu/inpttype.ipp:199
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Small"
+msgid "%p Mahjong Double Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:84
+#: src/emu/inpttype.ipp:82 src/emu/inpttype.ipp:201
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Last Chance"
+msgid "%p Mahjong Big"
 msgstr ""
 
-#: src/emu/inpttype.ipp:89
+#: src/emu/inpttype.ipp:83 src/emu/inpttype.ipp:202
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda A/1"
+msgid "%p Mahjong Small"
 msgstr ""
 
-#: src/emu/inpttype.ipp:90
+#: src/emu/inpttype.ipp:84 src/emu/inpttype.ipp:197
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda B/2"
+msgid "%p Mahjong Last Chance"
 msgstr ""
 
-#: src/emu/inpttype.ipp:91
+#: src/emu/inpttype.ipp:89 src/emu/inpttype.ipp:207
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda C/3"
+msgid "%p Hanafuda A/1"
 msgstr ""
 
-#: src/emu/inpttype.ipp:92
+#: src/emu/inpttype.ipp:90 src/emu/inpttype.ipp:208
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda D/4"
+msgid "%p Hanafuda B/2"
 msgstr ""
 
-#: src/emu/inpttype.ipp:93
+#: src/emu/inpttype.ipp:91 src/emu/inpttype.ipp:209
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda E/5"
+msgid "%p Hanafuda C/3"
 msgstr ""
 
-#: src/emu/inpttype.ipp:94
+#: src/emu/inpttype.ipp:92 src/emu/inpttype.ipp:210
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda F/6"
+msgid "%p Hanafuda D/4"
 msgstr ""
 
-#: src/emu/inpttype.ipp:95
+#: src/emu/inpttype.ipp:93 src/emu/inpttype.ipp:211
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda G/7"
+msgid "%p Hanafuda E/5"
 msgstr ""
 
-#: src/emu/inpttype.ipp:96
+#: src/emu/inpttype.ipp:94 src/emu/inpttype.ipp:212
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda H/8"
+msgid "%p Hanafuda F/6"
 msgstr ""
 
-#: src/emu/inpttype.ipp:97
+#: src/emu/inpttype.ipp:95 src/emu/inpttype.ipp:213
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda Yes"
+msgid "%p Hanafuda G/7"
 msgstr ""
 
-#: src/emu/inpttype.ipp:98
+#: src/emu/inpttype.ipp:96 src/emu/inpttype.ipp:214
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda No"
+msgid "%p Hanafuda H/8"
+msgstr ""
+
+#: src/emu/inpttype.ipp:97 src/emu/inpttype.ipp:215
+#, c-format
+msgctxt "input-name"
+msgid "%p Hanafuda Yes"
+msgstr ""
+
+#: src/emu/inpttype.ipp:98 src/emu/inpttype.ipp:216
+#, c-format
+msgctxt "input-name"
+msgid "%p Hanafuda No"
 msgstr ""
 
 #: src/emu/inpttype.ipp:103
@@ -3753,1551 +3927,6 @@ msgctxt "input-name"
 msgid "Stop All Reels"
 msgstr ""
 
-#: src/emu/inpttype.ipp:140
-msgctxt "input-name"
-msgid "P2 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:141
-msgctxt "input-name"
-msgid "P2 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:142
-msgctxt "input-name"
-msgid "P2 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:143
-msgctxt "input-name"
-msgid "P2 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:144
-msgctxt "input-name"
-msgid "P2 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:145
-msgctxt "input-name"
-msgid "P2 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:146
-msgctxt "input-name"
-msgid "P2 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:147
-msgctxt "input-name"
-msgid "P2 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:148
-msgctxt "input-name"
-msgid "P2 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:149
-msgctxt "input-name"
-msgid "P2 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:150
-msgctxt "input-name"
-msgid "P2 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:151
-msgctxt "input-name"
-msgid "P2 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:152
-msgctxt "input-name"
-msgid "P2 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:153
-msgctxt "input-name"
-msgid "P2 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:154
-msgctxt "input-name"
-msgid "P2 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:155
-msgctxt "input-name"
-msgid "P2 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:156
-msgctxt "input-name"
-msgid "P2 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:157
-msgctxt "input-name"
-msgid "P2 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:158
-msgctxt "input-name"
-msgid "P2 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:159
-msgctxt "input-name"
-msgid "P2 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:160
-msgctxt "input-name"
-msgid "P2 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:161
-msgctxt "input-name"
-msgid "P2 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:162
-msgctxt "input-name"
-msgid "P2 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:163
-msgctxt "input-name"
-msgid "P2 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:164
-msgctxt "input-name"
-msgid "P2 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:165
-msgctxt "input-name"
-msgid "P2 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:166
-msgctxt "input-name"
-msgid "P2 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:167
-msgctxt "input-name"
-msgid "P2 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:168
-msgctxt "input-name"
-msgid "P2 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:169
-msgctxt "input-name"
-msgid "P2 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:174
-msgctxt "input-name"
-msgid "P2 Mahjong A"
-msgstr ""
-
-#: src/emu/inpttype.ipp:175
-msgctxt "input-name"
-msgid "P2 Mahjong B"
-msgstr ""
-
-#: src/emu/inpttype.ipp:176
-msgctxt "input-name"
-msgid "P2 Mahjong C"
-msgstr ""
-
-#: src/emu/inpttype.ipp:177
-msgctxt "input-name"
-msgid "P2 Mahjong D"
-msgstr ""
-
-#: src/emu/inpttype.ipp:178
-msgctxt "input-name"
-msgid "P2 Mahjong E"
-msgstr ""
-
-#: src/emu/inpttype.ipp:179
-msgctxt "input-name"
-msgid "P2 Mahjong F"
-msgstr ""
-
-#: src/emu/inpttype.ipp:180
-msgctxt "input-name"
-msgid "P2 Mahjong G"
-msgstr ""
-
-#: src/emu/inpttype.ipp:181
-msgctxt "input-name"
-msgid "P2 Mahjong H"
-msgstr ""
-
-#: src/emu/inpttype.ipp:182
-msgctxt "input-name"
-msgid "P2 Mahjong I"
-msgstr ""
-
-#: src/emu/inpttype.ipp:183
-msgctxt "input-name"
-msgid "P2 Mahjong J"
-msgstr ""
-
-#: src/emu/inpttype.ipp:184
-msgctxt "input-name"
-msgid "P2 Mahjong K"
-msgstr ""
-
-#: src/emu/inpttype.ipp:185
-msgctxt "input-name"
-msgid "P2 Mahjong L"
-msgstr ""
-
-#: src/emu/inpttype.ipp:186
-msgctxt "input-name"
-msgid "P2 Mahjong M"
-msgstr ""
-
-#: src/emu/inpttype.ipp:187
-msgctxt "input-name"
-msgid "P2 Mahjong N"
-msgstr ""
-
-#: src/emu/inpttype.ipp:188
-msgctxt "input-name"
-msgid "P2 Mahjong O"
-msgstr ""
-
-#: src/emu/inpttype.ipp:189
-msgctxt "input-name"
-msgid "P2 Mahjong P"
-msgstr ""
-
-#: src/emu/inpttype.ipp:190
-msgctxt "input-name"
-msgid "P2 Mahjong Q"
-msgstr ""
-
-#: src/emu/inpttype.ipp:191
-msgctxt "input-name"
-msgid "P2 Mahjong Kan"
-msgstr ""
-
-#: src/emu/inpttype.ipp:192
-msgctxt "input-name"
-msgid "P2 Mahjong Pon"
-msgstr ""
-
-#: src/emu/inpttype.ipp:193
-msgctxt "input-name"
-msgid "P2 Mahjong Chi"
-msgstr ""
-
-#: src/emu/inpttype.ipp:194
-msgctxt "input-name"
-msgid "P2 Mahjong Reach"
-msgstr ""
-
-#: src/emu/inpttype.ipp:195
-msgctxt "input-name"
-msgid "P2 Mahjong Ron"
-msgstr ""
-
-#: src/emu/inpttype.ipp:196
-msgctxt "input-name"
-msgid "P2 Mahjong Bet"
-msgstr ""
-
-#: src/emu/inpttype.ipp:197
-msgctxt "input-name"
-msgid "P2 Mahjong Last Chance"
-msgstr ""
-
-#: src/emu/inpttype.ipp:198
-msgctxt "input-name"
-msgid "P2 Mahjong Take Score"
-msgstr ""
-
-#: src/emu/inpttype.ipp:199
-msgctxt "input-name"
-msgid "P2 Mahjong Double Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:200
-msgctxt "input-name"
-msgid "P2 Mahjong Flip Flop"
-msgstr ""
-
-#: src/emu/inpttype.ipp:201
-msgctxt "input-name"
-msgid "P2 Mahjong Big"
-msgstr ""
-
-#: src/emu/inpttype.ipp:202
-msgctxt "input-name"
-msgid "P2 Mahjong Small"
-msgstr ""
-
-#: src/emu/inpttype.ipp:207
-msgctxt "input-name"
-msgid "P2 Hanafuda A/1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:208
-msgctxt "input-name"
-msgid "P2 Hanafuda B/2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:209
-msgctxt "input-name"
-msgid "P2 Hanafuda C/3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:210
-msgctxt "input-name"
-msgid "P2 Hanafuda D/4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:211
-msgctxt "input-name"
-msgid "P2 Hanafuda E/5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:212
-msgctxt "input-name"
-msgid "P2 Hanafuda F/6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:213
-msgctxt "input-name"
-msgid "P2 Hanafuda G/7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:214
-msgctxt "input-name"
-msgid "P2 Hanafuda H/8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:215
-msgctxt "input-name"
-msgid "P2 Hanafuda Yes"
-msgstr ""
-
-#: src/emu/inpttype.ipp:216
-msgctxt "input-name"
-msgid "P2 Hanafuda No"
-msgstr ""
-
-#: src/emu/inpttype.ipp:221
-msgctxt "input-name"
-msgid "P3 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:222
-msgctxt "input-name"
-msgid "P3 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:223
-msgctxt "input-name"
-msgid "P3 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:224
-msgctxt "input-name"
-msgid "P3 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:225
-msgctxt "input-name"
-msgid "P3 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:226
-msgctxt "input-name"
-msgid "P3 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:227
-msgctxt "input-name"
-msgid "P3 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:228
-msgctxt "input-name"
-msgid "P3 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:229
-msgctxt "input-name"
-msgid "P3 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:230
-msgctxt "input-name"
-msgid "P3 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:231
-msgctxt "input-name"
-msgid "P3 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:232
-msgctxt "input-name"
-msgid "P3 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:233
-msgctxt "input-name"
-msgid "P3 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:234
-msgctxt "input-name"
-msgid "P3 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:235
-msgctxt "input-name"
-msgid "P3 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:236
-msgctxt "input-name"
-msgid "P3 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:237
-msgctxt "input-name"
-msgid "P3 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:238
-msgctxt "input-name"
-msgid "P3 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:239
-msgctxt "input-name"
-msgid "P3 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:240
-msgctxt "input-name"
-msgid "P3 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:241
-msgctxt "input-name"
-msgid "P3 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:242
-msgctxt "input-name"
-msgid "P3 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:243
-msgctxt "input-name"
-msgid "P3 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:244
-msgctxt "input-name"
-msgid "P3 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:245
-msgctxt "input-name"
-msgid "P3 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:246
-msgctxt "input-name"
-msgid "P3 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:247
-msgctxt "input-name"
-msgid "P3 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:248
-msgctxt "input-name"
-msgid "P3 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:249
-msgctxt "input-name"
-msgid "P3 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:250
-msgctxt "input-name"
-msgid "P3 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:255
-msgctxt "input-name"
-msgid "P4 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:256
-msgctxt "input-name"
-msgid "P4 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:257
-msgctxt "input-name"
-msgid "P4 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:258
-msgctxt "input-name"
-msgid "P4 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:259
-msgctxt "input-name"
-msgid "P4 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:260
-msgctxt "input-name"
-msgid "P4 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:261
-msgctxt "input-name"
-msgid "P4 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:262
-msgctxt "input-name"
-msgid "P4 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:263
-msgctxt "input-name"
-msgid "P4 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:264
-msgctxt "input-name"
-msgid "P4 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:265
-msgctxt "input-name"
-msgid "P4 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:266
-msgctxt "input-name"
-msgid "P4 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:267
-msgctxt "input-name"
-msgid "P4 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:268
-msgctxt "input-name"
-msgid "P4 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:269
-msgctxt "input-name"
-msgid "P4 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:270
-msgctxt "input-name"
-msgid "P4 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:271
-msgctxt "input-name"
-msgid "P4 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:272
-msgctxt "input-name"
-msgid "P4 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:273
-msgctxt "input-name"
-msgid "P4 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:274
-msgctxt "input-name"
-msgid "P4 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:275
-msgctxt "input-name"
-msgid "P4 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:276
-msgctxt "input-name"
-msgid "P4 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:277
-msgctxt "input-name"
-msgid "P4 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:278
-msgctxt "input-name"
-msgid "P4 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:279
-msgctxt "input-name"
-msgid "P4 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:280
-msgctxt "input-name"
-msgid "P4 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:281
-msgctxt "input-name"
-msgid "P4 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:282
-msgctxt "input-name"
-msgid "P4 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:283
-msgctxt "input-name"
-msgid "P4 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:284
-msgctxt "input-name"
-msgid "P4 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:289
-msgctxt "input-name"
-msgid "P5 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:290
-msgctxt "input-name"
-msgid "P5 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:291
-msgctxt "input-name"
-msgid "P5 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:292
-msgctxt "input-name"
-msgid "P5 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:293
-msgctxt "input-name"
-msgid "P5 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:294
-msgctxt "input-name"
-msgid "P5 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:295
-msgctxt "input-name"
-msgid "P5 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:296
-msgctxt "input-name"
-msgid "P5 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:297
-msgctxt "input-name"
-msgid "P5 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:298
-msgctxt "input-name"
-msgid "P5 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:299
-msgctxt "input-name"
-msgid "P5 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:300
-msgctxt "input-name"
-msgid "P5 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:301
-msgctxt "input-name"
-msgid "P5 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:302
-msgctxt "input-name"
-msgid "P5 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:303
-msgctxt "input-name"
-msgid "P5 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:304
-msgctxt "input-name"
-msgid "P5 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:305
-msgctxt "input-name"
-msgid "P5 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:306
-msgctxt "input-name"
-msgid "P5 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:307
-msgctxt "input-name"
-msgid "P5 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:308
-msgctxt "input-name"
-msgid "P5 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:309
-msgctxt "input-name"
-msgid "P5 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:310
-msgctxt "input-name"
-msgid "P5 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:311
-msgctxt "input-name"
-msgid "P5 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:312
-msgctxt "input-name"
-msgid "P5 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:313
-msgctxt "input-name"
-msgid "P5 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:314
-msgctxt "input-name"
-msgid "P5 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:315
-msgctxt "input-name"
-msgid "P5 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:316
-msgctxt "input-name"
-msgid "P5 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:317
-msgctxt "input-name"
-msgid "P5 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:318
-msgctxt "input-name"
-msgid "P5 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:323
-msgctxt "input-name"
-msgid "P6 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:324
-msgctxt "input-name"
-msgid "P6 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:325
-msgctxt "input-name"
-msgid "P6 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:326
-msgctxt "input-name"
-msgid "P6 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:327
-msgctxt "input-name"
-msgid "P6 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:328
-msgctxt "input-name"
-msgid "P6 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:329
-msgctxt "input-name"
-msgid "P6 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:330
-msgctxt "input-name"
-msgid "P6 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:331
-msgctxt "input-name"
-msgid "P6 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:332
-msgctxt "input-name"
-msgid "P6 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:333
-msgctxt "input-name"
-msgid "P6 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:334
-msgctxt "input-name"
-msgid "P6 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:335
-msgctxt "input-name"
-msgid "P6 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:336
-msgctxt "input-name"
-msgid "P6 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:337
-msgctxt "input-name"
-msgid "P6 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:338
-msgctxt "input-name"
-msgid "P6 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:339
-msgctxt "input-name"
-msgid "P6 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:340
-msgctxt "input-name"
-msgid "P6 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:341
-msgctxt "input-name"
-msgid "P6 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:342
-msgctxt "input-name"
-msgid "P6 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:343
-msgctxt "input-name"
-msgid "P6 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:344
-msgctxt "input-name"
-msgid "P6 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:345
-msgctxt "input-name"
-msgid "P6 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:346
-msgctxt "input-name"
-msgid "P6 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:347
-msgctxt "input-name"
-msgid "P6 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:348
-msgctxt "input-name"
-msgid "P6 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:349
-msgctxt "input-name"
-msgid "P6 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:350
-msgctxt "input-name"
-msgid "P6 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:351
-msgctxt "input-name"
-msgid "P6 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:352
-msgctxt "input-name"
-msgid "P6 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:357
-msgctxt "input-name"
-msgid "P7 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:358
-msgctxt "input-name"
-msgid "P7 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:359
-msgctxt "input-name"
-msgid "P7 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:360
-msgctxt "input-name"
-msgid "P7 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:361
-msgctxt "input-name"
-msgid "P7 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:362
-msgctxt "input-name"
-msgid "P7 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:363
-msgctxt "input-name"
-msgid "P7 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:364
-msgctxt "input-name"
-msgid "P7 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:365
-msgctxt "input-name"
-msgid "P7 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:366
-msgctxt "input-name"
-msgid "P7 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:367
-msgctxt "input-name"
-msgid "P7 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:368
-msgctxt "input-name"
-msgid "P7 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:369
-msgctxt "input-name"
-msgid "P7 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:370
-msgctxt "input-name"
-msgid "P7 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:371
-msgctxt "input-name"
-msgid "P7 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:372
-msgctxt "input-name"
-msgid "P7 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:373
-msgctxt "input-name"
-msgid "P7 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:374
-msgctxt "input-name"
-msgid "P7 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:375
-msgctxt "input-name"
-msgid "P7 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:376
-msgctxt "input-name"
-msgid "P7 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:377
-msgctxt "input-name"
-msgid "P7 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:378
-msgctxt "input-name"
-msgid "P7 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:379
-msgctxt "input-name"
-msgid "P7 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:380
-msgctxt "input-name"
-msgid "P7 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:381
-msgctxt "input-name"
-msgid "P7 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:382
-msgctxt "input-name"
-msgid "P7 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:383
-msgctxt "input-name"
-msgid "P7 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:384
-msgctxt "input-name"
-msgid "P7 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:385
-msgctxt "input-name"
-msgid "P7 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:386
-msgctxt "input-name"
-msgid "P7 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:391
-msgctxt "input-name"
-msgid "P8 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:392
-msgctxt "input-name"
-msgid "P8 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:393
-msgctxt "input-name"
-msgid "P8 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:394
-msgctxt "input-name"
-msgid "P8 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:395
-msgctxt "input-name"
-msgid "P8 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:396
-msgctxt "input-name"
-msgid "P8 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:397
-msgctxt "input-name"
-msgid "P8 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:398
-msgctxt "input-name"
-msgid "P8 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:399
-msgctxt "input-name"
-msgid "P8 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:400
-msgctxt "input-name"
-msgid "P8 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:401
-msgctxt "input-name"
-msgid "P8 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:402
-msgctxt "input-name"
-msgid "P8 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:403
-msgctxt "input-name"
-msgid "P8 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:404
-msgctxt "input-name"
-msgid "P8 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:405
-msgctxt "input-name"
-msgid "P8 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:406
-msgctxt "input-name"
-msgid "P8 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:407
-msgctxt "input-name"
-msgid "P8 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:408
-msgctxt "input-name"
-msgid "P8 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:409
-msgctxt "input-name"
-msgid "P8 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:410
-msgctxt "input-name"
-msgid "P8 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:411
-msgctxt "input-name"
-msgid "P8 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:412
-msgctxt "input-name"
-msgid "P8 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:413
-msgctxt "input-name"
-msgid "P8 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:414
-msgctxt "input-name"
-msgid "P8 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:415
-msgctxt "input-name"
-msgid "P8 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:416
-msgctxt "input-name"
-msgid "P8 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:417
-msgctxt "input-name"
-msgid "P8 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:418
-msgctxt "input-name"
-msgid "P8 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:419
-msgctxt "input-name"
-msgid "P8 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:420
-msgctxt "input-name"
-msgid "P8 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:425
-msgctxt "input-name"
-msgid "P9 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:426
-msgctxt "input-name"
-msgid "P9 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:427
-msgctxt "input-name"
-msgid "P9 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:428
-msgctxt "input-name"
-msgid "P9 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:429
-msgctxt "input-name"
-msgid "P9 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:430
-msgctxt "input-name"
-msgid "P9 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:431
-msgctxt "input-name"
-msgid "P9 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:432
-msgctxt "input-name"
-msgid "P9 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:433
-msgctxt "input-name"
-msgid "P9 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:434
-msgctxt "input-name"
-msgid "P9 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:435
-msgctxt "input-name"
-msgid "P9 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:436
-msgctxt "input-name"
-msgid "P9 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:437
-msgctxt "input-name"
-msgid "P9 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:438
-msgctxt "input-name"
-msgid "P9 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:439
-msgctxt "input-name"
-msgid "P9 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:440
-msgctxt "input-name"
-msgid "P9 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:441
-msgctxt "input-name"
-msgid "P9 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:442
-msgctxt "input-name"
-msgid "P9 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:443
-msgctxt "input-name"
-msgid "P9 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:444
-msgctxt "input-name"
-msgid "P9 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:445
-msgctxt "input-name"
-msgid "P9 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:446
-msgctxt "input-name"
-msgid "P9 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:447
-msgctxt "input-name"
-msgid "P9 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:448
-msgctxt "input-name"
-msgid "P9 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:449
-msgctxt "input-name"
-msgid "P9 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:450
-msgctxt "input-name"
-msgid "P9 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:451
-msgctxt "input-name"
-msgid "P9 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:452
-msgctxt "input-name"
-msgid "P9 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:453
-msgctxt "input-name"
-msgid "P9 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:454
-msgctxt "input-name"
-msgid "P9 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:459
-msgctxt "input-name"
-msgid "P10 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:460
-msgctxt "input-name"
-msgid "P10 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:461
-msgctxt "input-name"
-msgid "P10 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:462
-msgctxt "input-name"
-msgid "P10 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:463
-msgctxt "input-name"
-msgid "P10 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:464
-msgctxt "input-name"
-msgid "P10 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:465
-msgctxt "input-name"
-msgid "P10 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:466
-msgctxt "input-name"
-msgid "P10 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:467
-msgctxt "input-name"
-msgid "P10 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:468
-msgctxt "input-name"
-msgid "P10 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:469
-msgctxt "input-name"
-msgid "P10 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:470
-msgctxt "input-name"
-msgid "P10 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:471
-msgctxt "input-name"
-msgid "P10 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:472
-msgctxt "input-name"
-msgid "P10 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:473
-msgctxt "input-name"
-msgid "P10 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:474
-msgctxt "input-name"
-msgid "P10 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:475
-msgctxt "input-name"
-msgid "P10 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:476
-msgctxt "input-name"
-msgid "P10 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:477
-msgctxt "input-name"
-msgid "P10 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:478
-msgctxt "input-name"
-msgid "P10 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:479
-msgctxt "input-name"
-msgid "P10 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:480
-msgctxt "input-name"
-msgid "P10 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:481
-msgctxt "input-name"
-msgid "P10 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:482
-msgctxt "input-name"
-msgid "P10 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:483
-msgctxt "input-name"
-msgid "P10 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:484
-msgctxt "input-name"
-msgid "P10 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:485
-msgctxt "input-name"
-msgid "P10 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:486
-msgctxt "input-name"
-msgid "P10 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:487
-msgctxt "input-name"
-msgid "P10 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:488
-msgctxt "input-name"
-msgid "P10 Select"
-msgstr ""
-
 #: src/emu/inpttype.ipp:493
 msgctxt "input-name"
 msgid "1 Player Start"
@@ -5478,154 +4107,31 @@ msgctxt "input-name"
 msgid "Volume Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:550
-msgctxt "input-name"
-msgid "P1 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:551
-msgctxt "input-name"
-msgid "P2 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:552
-msgctxt "input-name"
-msgid "P3 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:553
-msgctxt "input-name"
-msgid "P4 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:554
-msgctxt "input-name"
-msgid "P5 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:555
-msgctxt "input-name"
-msgid "P6 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:556
-msgctxt "input-name"
-msgid "P7 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:557
-msgctxt "input-name"
-msgid "P8 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:558
-msgctxt "input-name"
-msgid "P9 Pedal 1"
-msgstr ""
-
+#: src/emu/inpttype.ipp:550 src/emu/inpttype.ipp:551 src/emu/inpttype.ipp:552
+#: src/emu/inpttype.ipp:553 src/emu/inpttype.ipp:554 src/emu/inpttype.ipp:555
+#: src/emu/inpttype.ipp:556 src/emu/inpttype.ipp:557 src/emu/inpttype.ipp:558
 #: src/emu/inpttype.ipp:559
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:564
-msgctxt "input-name"
-msgid "P1 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:565
-msgctxt "input-name"
-msgid "P2 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:566
-msgctxt "input-name"
-msgid "P3 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:567
-msgctxt "input-name"
-msgid "P4 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:568
-msgctxt "input-name"
-msgid "P5 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:569
-msgctxt "input-name"
-msgid "P6 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:570
-msgctxt "input-name"
-msgid "P7 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:571
-msgctxt "input-name"
-msgid "P8 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:572
-msgctxt "input-name"
-msgid "P9 Pedal 2"
+msgid "%p Pedal 1"
 msgstr ""
 
+#: src/emu/inpttype.ipp:564 src/emu/inpttype.ipp:565 src/emu/inpttype.ipp:566
+#: src/emu/inpttype.ipp:567 src/emu/inpttype.ipp:568 src/emu/inpttype.ipp:569
+#: src/emu/inpttype.ipp:570 src/emu/inpttype.ipp:571 src/emu/inpttype.ipp:572
 #: src/emu/inpttype.ipp:573
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:578
-msgctxt "input-name"
-msgid "P1 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:579
-msgctxt "input-name"
-msgid "P2 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:580
-msgctxt "input-name"
-msgid "P3 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:581
-msgctxt "input-name"
-msgid "P4 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:582
-msgctxt "input-name"
-msgid "P5 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:583
-msgctxt "input-name"
-msgid "P6 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:584
-msgctxt "input-name"
-msgid "P7 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:585
-msgctxt "input-name"
-msgid "P8 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:586
-msgctxt "input-name"
-msgid "P9 Pedal 3"
+msgid "%p Pedal 2"
 msgstr ""
 
+#: src/emu/inpttype.ipp:578 src/emu/inpttype.ipp:579 src/emu/inpttype.ipp:580
+#: src/emu/inpttype.ipp:581 src/emu/inpttype.ipp:582 src/emu/inpttype.ipp:583
+#: src/emu/inpttype.ipp:584 src/emu/inpttype.ipp:585 src/emu/inpttype.ipp:586
 #: src/emu/inpttype.ipp:587
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 3"
+msgid "%p Pedal 3"
 msgstr ""
 
 #: src/emu/inpttype.ipp:592
diff --git a/language/Dutch/strings.po b/language/Dutch/strings.po
index ed8752f0d23..ee7bc90ae0a 100644
--- a/language/Dutch/strings.po
+++ b/language/Dutch/strings.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-19 02:50+1100\n"
+"POT-Creation-Date: 2021-12-09 04:44+1100\n"
 "PO-Revision-Date: 2021-04-04 13:08+0200\n"
 "Last-Translator: Jos van Mourik\n"
 "Language-Team: MAME Language Team\n"
@@ -272,12 +272,12 @@ msgstr "%1$s %2$s ( %3$d / %4$d softwarepakketten )"
 msgid "Driver: \"%1$s\" software list "
 msgstr "Driver: \"%1$s\" softwarelijst "
 
-#: src/frontend/mame/ui/selsoft.cpp:711 src/frontend/mame/ui/selgame.cpp:1066
+#: src/frontend/mame/ui/selsoft.cpp:711 src/frontend/mame/ui/selgame.cpp:1076
 #, c-format
 msgid "%1$s: %2$s - Search: %3$s_"
 msgstr "%1$s: %2$s - Zoek: %3$s_"
 
-#: src/frontend/mame/ui/selsoft.cpp:713 src/frontend/mame/ui/selgame.cpp:1068
+#: src/frontend/mame/ui/selsoft.cpp:713 src/frontend/mame/ui/selgame.cpp:1078
 #, c-format
 msgid "Search: %1$s_"
 msgstr "Zoek: %1$s_"
@@ -287,7 +287,7 @@ msgstr "Zoek: %1$s_"
 msgid "Software list/item: %1$s:%2$s"
 msgstr ""
 
-#: src/frontend/mame/ui/optsmenu.cpp:73 src/frontend/mame/ui/sndmenu.cpp:165
+#: src/frontend/mame/ui/optsmenu.cpp:73 src/frontend/mame/ui/sndmenu.cpp:161
 msgid "Sound Options"
 msgstr "Geluid opties"
 
@@ -382,12 +382,12 @@ msgid "Show mouse pointer"
 msgstr "Toon muispointer"
 
 #: src/frontend/mame/ui/submenu.cpp:39
-msgid "Confirm quit from machines"
-msgstr "Bevestig afsluiten machines"
+msgid "Confirm quit from emulation"
+msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:40
-msgid "Skip information screen at startup"
-msgstr "Sla informatie bij opstarten over"
+msgid "Skip system information screen"
+msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:41
 msgid "Force 4:3 aspect for snapshot display"
@@ -402,8 +402,8 @@ msgid "Skip BIOS selection menu"
 msgstr "BIOS-selectiemenu overslaan"
 
 #: src/frontend/mame/ui/submenu.cpp:44
-msgid "Skip software parts selection menu"
-msgstr "Softwareonderdelen selectiemenu overslaan"
+msgid "Skip software part selection menu"
+msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:45
 msgid "Info auto audit"
@@ -554,7 +554,7 @@ msgid "UI active"
 msgstr "Gebruikersinterface actief"
 
 #: src/frontend/mame/ui/submenu.cpp:91
-msgid "Offscreen reload"
+msgid "Off-screen reload"
 msgstr "Buiten scherm herladen"
 
 #: src/frontend/mame/ui/submenu.cpp:92
@@ -570,8 +570,8 @@ msgid "Natural keyboard"
 msgstr "Natuurlijk toetsenbord"
 
 #: src/frontend/mame/ui/submenu.cpp:95
-msgid "Simultaneous contradictory"
-msgstr "Gelijktijdig tegenstrijdig"
+msgid "Allow contradictory joystick inputs"
+msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:96
 msgid "Coin impulse"
@@ -594,8 +594,8 @@ msgid "Pedal Device Assignment"
 msgstr "Pedaaltoewijzing"
 
 #: src/frontend/mame/ui/submenu.cpp:106
-msgid "Adstick Device Assignment"
-msgstr "Adsticktoewijzing"
+msgid "AD Stick Device Assignment"
+msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:107
 msgid "Paddle Device Assignment"
@@ -681,14 +681,14 @@ msgstr "Gesynchroniseerde verversing"
 msgid "Wait Vertical Sync"
 msgstr "Wacht verticale sync"
 
-#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:687
+#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:689
 #: src/frontend/mame/ui/videoopt.cpp:191 src/frontend/mame/ui/custui.cpp:490
 #: src/frontend/mame/ui/analogipt.cpp:471 plugins/cheatfind/init.lua:766
 #: plugins/cheatfind/init.lua:777 plugins/cheat/init.lua:668
 msgid "On"
 msgstr "Aan"
 
-#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:690
+#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:692
 #: src/frontend/mame/ui/videoopt.cpp:207 src/frontend/mame/ui/custui.cpp:490
 #: src/frontend/mame/ui/analogipt.cpp:471 plugins/cheatfind/init.lua:763
 #: plugins/cheatfind/init.lua:774 plugins/cheat/init.lua:671
@@ -696,11 +696,11 @@ msgstr "Aan"
 msgid "Off"
 msgstr "Uit"
 
-#: src/frontend/mame/ui/menu.cpp:693
+#: src/frontend/mame/ui/menu.cpp:695
 msgid "Auto"
 msgstr "Automatisch"
 
-#: src/frontend/mame/ui/menu.cpp:1195
+#: src/frontend/mame/ui/menu.cpp:1197
 #: src/frontend/mame/ui/simpleselgame.cpp:278
 #: src/frontend/mame/ui/selmenu.cpp:1280
 msgid "Return to Previous Menu"
@@ -708,7 +708,7 @@ msgstr "Terug naar vorig menu"
 
 #: src/frontend/mame/ui/filemngr.cpp:139
 #: src/frontend/mame/ui/confswitch.cpp:119
-#: src/frontend/mame/ui/inputmap.cpp:559 src/frontend/mame/ui/analogipt.cpp:360
+#: src/frontend/mame/ui/inputmap.cpp:563 src/frontend/mame/ui/analogipt.cpp:360
 #, c-format
 msgid "[root%1$s]"
 msgstr ""
@@ -971,22 +971,22 @@ msgstr ""
 "Processor:\n"
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "GHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "MHz"
 msgstr "MHz"
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "kHz"
 msgstr "kHz"
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "Hz"
 msgstr ""
 
@@ -1014,38 +1014,38 @@ msgstr "Geen\n"
 msgid "Vector"
 msgstr "Vector"
 
-#: src/frontend/mame/ui/info.cpp:480
+#: src/frontend/mame/ui/info.cpp:483
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr "%1$s: %2$s\n"
 
-#: src/frontend/mame/ui/info.cpp:480
+#: src/frontend/mame/ui/info.cpp:483
 msgid "%2$s\n"
 msgstr "%2$s\n"
 
-#: src/frontend/mame/ui/info.cpp:497
+#: src/frontend/mame/ui/info.cpp:500
 #, c-format
 msgid "Screen '%1$s'"
 msgstr "Scherm '%1$s'"
 
-#: src/frontend/mame/ui/info.cpp:499
+#: src/frontend/mame/ui/info.cpp:502
 msgid "Screen"
 msgstr "Scherm"
 
-#: src/frontend/mame/ui/info.cpp:570 src/frontend/mame/ui/info.cpp:581
+#: src/frontend/mame/ui/info.cpp:573 src/frontend/mame/ui/info.cpp:584
 #, c-format
 msgid "%1$s:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:662
+#: src/frontend/mame/ui/info.cpp:665
 msgid "Not supported"
 msgstr "Niet ondersteund"
 
-#: src/frontend/mame/ui/info.cpp:665
+#: src/frontend/mame/ui/info.cpp:668
 msgid "Partially supported"
 msgstr "Gedeeltelijk ondersteund"
 
-#: src/frontend/mame/ui/info.cpp:674
+#: src/frontend/mame/ui/info.cpp:677
 msgid "[empty]"
 msgstr "[leeg]"
 
@@ -1118,7 +1118,7 @@ msgid "Emulated"
 msgstr "Geëmuleerd"
 
 #: src/frontend/mame/ui/keyboard.cpp:59 src/frontend/mame/ui/confswitch.cpp:117
-#: src/frontend/mame/ui/inputmap.cpp:557 src/frontend/mame/ui/analogipt.cpp:358
+#: src/frontend/mame/ui/inputmap.cpp:561 src/frontend/mame/ui/analogipt.cpp:358
 #, c-format
 msgid "%1$s [root%2$s]"
 msgstr ""
@@ -1478,7 +1478,7 @@ msgctxt "swlist-info"
 msgid "Software list/item"
 msgstr ""
 
-#: src/frontend/mame/ui/datmenu.cpp:88 src/frontend/mame/ui/selmenu.cpp:2698
+#: src/frontend/mame/ui/datmenu.cpp:88 src/frontend/mame/ui/selmenu.cpp:2707
 msgid "Software List Info"
 msgstr ""
 
@@ -1599,7 +1599,7 @@ msgstr ""
 msgid "Configure Machine:"
 msgstr ""
 
-#: src/frontend/mame/ui/miscmenu.cpp:858 src/frontend/mame/ui/selmenu.cpp:2638
+#: src/frontend/mame/ui/miscmenu.cpp:858 src/frontend/mame/ui/selmenu.cpp:2647
 msgid " (default)"
 msgstr " (standaard)"
 
@@ -1620,7 +1620,7 @@ msgstr ""
 "Druk op %1$s om te stoppen\n"
 "druk op %2$s om terug te keren naar de emulatie"
 
-#: src/frontend/mame/ui/info_pty.cpp:30 src/frontend/mame/ui/mainmenu.cpp:155
+#: src/frontend/mame/ui/info_pty.cpp:30
 msgid "Pseudo terminals"
 msgstr "Pseudoterminals"
 
@@ -1688,52 +1688,52 @@ msgstr ""
 msgid "Other Controls"
 msgstr "Andere besturing"
 
-#: src/frontend/mame/ui/inputmap.cpp:227
+#: src/frontend/mame/ui/inputmap.cpp:231
 msgid "This machine has no configurable inputs."
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:327
+#: src/frontend/mame/ui/inputmap.cpp:331
 msgid "Pressed"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:397
+#: src/frontend/mame/ui/inputmap.cpp:401
 msgid "Invalid sequence entered"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:542
+#: src/frontend/mame/ui/inputmap.cpp:546
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:543
+#: src/frontend/mame/ui/inputmap.cpp:547
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog Inc"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:544
+#: src/frontend/mame/ui/inputmap.cpp:548
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog Dec"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:586
+#: src/frontend/mame/ui/inputmap.cpp:590
 #, c-format
 msgid "Press %1$s to set\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:587
+#: src/frontend/mame/ui/inputmap.cpp:591
 #, c-format
 msgid "Press %1$s to append\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:588
+#: src/frontend/mame/ui/inputmap.cpp:592
 #, c-format
 msgid "Press %1$s to clear\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:589
+#: src/frontend/mame/ui/inputmap.cpp:593
 #, c-format
 msgid "Press %1$s to restore default\n"
 msgstr ""
@@ -1801,7 +1801,7 @@ msgstr ""
 "Druk op een toets om door te gaan."
 
 #: src/frontend/mame/ui/simpleselgame.cpp:273
-#: src/frontend/mame/ui/selgame.cpp:436
+#: src/frontend/mame/ui/selgame.cpp:443
 msgid "Configure Options"
 msgstr "Configureer opties"
 
@@ -2136,16 +2136,16 @@ msgstr ""
 msgid "Expand to fit"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:437
+#: src/frontend/mame/ui/selgame.cpp:444
 msgid "Configure Machine"
 msgstr "Configureer machine"
 
-#: src/frontend/mame/ui/selgame.cpp:1050
+#: src/frontend/mame/ui/selgame.cpp:1060
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d machines (%5$d BIOS) )"
 msgstr "%1$s %2$s ( %3$d / %4$d machines (waarvan %5$d BIOS) )"
 
-#: src/frontend/mame/ui/selgame.cpp:1078
+#: src/frontend/mame/ui/selgame.cpp:1088
 #, c-format
 msgid "System: %1$-.100s"
 msgstr "Systeem: %1$-.100s"
@@ -2167,11 +2167,9 @@ msgstr "Resultaten worden opgeslagen naar %1$s"
 #: src/frontend/mame/ui/auditmenu.cpp:98
 #, c-format
 msgid ""
-"Auditing ROMs for machine %2$u of %3$u...\n"
+"Auditing media for machine %2$u of %3$u...\n"
 "%1$s"
 msgstr ""
-"ROMs controleren voor machine %2$u van %3$u...\n"
-"%1$s"
 
 #: src/frontend/mame/ui/auditmenu.cpp:116
 #, c-format
@@ -2184,13 +2182,13 @@ msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:136
 #, c-format
-msgid "Audit ROMs for %1$u machines marked unavailable"
-msgstr "Controleer ROMs voor %1$u onbeschikbaar gemarkeerde machines"
+msgid "Audit media for %1$u machines marked unavailable"
+msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:137
 #, c-format
-msgid "Audit ROMs for all %1$u machines"
-msgstr "Controleer ROMs voor alle %1$u machines"
+msgid "Audit media for all %1$u machines"
+msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:154
 #, c-format
@@ -2396,84 +2394,84 @@ msgctxt "color-sample"
 msgid "Clone"
 msgstr "Variant"
 
-#: src/frontend/mame/ui/custui.cpp:914
+#: src/frontend/mame/ui/custui.cpp:906
 msgid "ARGB Settings"
 msgstr "ARGB-instellingen"
 
-#: src/frontend/mame/ui/custui.cpp:919 src/frontend/mame/ui/custui.cpp:922
+#: src/frontend/mame/ui/custui.cpp:911 src/frontend/mame/ui/custui.cpp:914
 msgctxt "color-channel"
 msgid "Alpha"
 msgstr "Alpha"
 
-#: src/frontend/mame/ui/custui.cpp:927 src/frontend/mame/ui/custui.cpp:930
+#: src/frontend/mame/ui/custui.cpp:919 src/frontend/mame/ui/custui.cpp:922
 msgctxt "color-channel"
 msgid "Red"
 msgstr "Rood"
 
-#: src/frontend/mame/ui/custui.cpp:935 src/frontend/mame/ui/custui.cpp:938
+#: src/frontend/mame/ui/custui.cpp:927 src/frontend/mame/ui/custui.cpp:930
 msgctxt "color-channel"
 msgid "Green"
 msgstr "Groen"
 
-#: src/frontend/mame/ui/custui.cpp:943 src/frontend/mame/ui/custui.cpp:946
+#: src/frontend/mame/ui/custui.cpp:935 src/frontend/mame/ui/custui.cpp:938
 msgctxt "color-channel"
 msgid "Blue"
 msgstr "Blauw"
 
-#: src/frontend/mame/ui/custui.cpp:949
+#: src/frontend/mame/ui/custui.cpp:941
 msgid "Choose from palette"
 msgstr "Kies uit palet"
 
-#: src/frontend/mame/ui/custui.cpp:996
+#: src/frontend/mame/ui/custui.cpp:988
 msgid "Color preview:"
 msgstr "Kleur voorbeeld:"
 
-#: src/frontend/mame/ui/custui.cpp:1093
+#: src/frontend/mame/ui/custui.cpp:1085
 msgctxt "color-preset"
 msgid "White"
 msgstr "Wit"
 
-#: src/frontend/mame/ui/custui.cpp:1094
+#: src/frontend/mame/ui/custui.cpp:1086
 msgctxt "color-preset"
 msgid "Silver"
 msgstr "Zilver"
 
-#: src/frontend/mame/ui/custui.cpp:1095
+#: src/frontend/mame/ui/custui.cpp:1087
 msgctxt "color-preset"
 msgid "Gray"
 msgstr "Grijs"
 
-#: src/frontend/mame/ui/custui.cpp:1096
+#: src/frontend/mame/ui/custui.cpp:1088
 msgctxt "color-preset"
 msgid "Black"
 msgstr "Zwart"
 
-#: src/frontend/mame/ui/custui.cpp:1097
+#: src/frontend/mame/ui/custui.cpp:1089
 msgctxt "color-preset"
 msgid "Red"
 msgstr "Rood"
 
-#: src/frontend/mame/ui/custui.cpp:1098
+#: src/frontend/mame/ui/custui.cpp:1090
 msgctxt "color-preset"
 msgid "Orange"
 msgstr "Oranje"
 
-#: src/frontend/mame/ui/custui.cpp:1099
+#: src/frontend/mame/ui/custui.cpp:1091
 msgctxt "color-preset"
 msgid "Yellow"
 msgstr "Geel"
 
-#: src/frontend/mame/ui/custui.cpp:1100
+#: src/frontend/mame/ui/custui.cpp:1092
 msgctxt "color-preset"
 msgid "Green"
 msgstr "Groen"
 
-#: src/frontend/mame/ui/custui.cpp:1101
+#: src/frontend/mame/ui/custui.cpp:1093
 msgctxt "color-preset"
 msgid "Blue"
 msgstr "Blauw"
 
-#: src/frontend/mame/ui/custui.cpp:1102
+#: src/frontend/mame/ui/custui.cpp:1094
 msgctxt "color-preset"
 msgid "Violet"
 msgstr "Violet"
@@ -2538,8 +2536,8 @@ msgid "Input (general)"
 msgstr "Invoer (algemeen)"
 
 #: src/frontend/mame/ui/mainmenu.cpp:123
-msgid "Input (this Machine)"
-msgstr "Invoer (deze machine)"
+msgid "Input (this machine)"
+msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:126
 msgid "Analog Controls"
@@ -2577,6 +2575,10 @@ msgstr "Bestandsbeheer"
 msgid "Tape Control"
 msgstr "Cassettebediening"
 
+#: src/frontend/mame/ui/mainmenu.cpp:155
+msgid "Pseudo Terminals"
+msgstr ""
+
 #: src/frontend/mame/ui/mainmenu.cpp:158
 msgid "BIOS Selection"
 msgstr "BIOS-selectie"
@@ -2615,7 +2617,7 @@ msgstr "Externe DAT-overzicht"
 
 #: src/frontend/mame/ui/mainmenu.cpp:200
 #, c-format
-msgid "About %s"
+msgid "About %1$s"
 msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:212
@@ -2775,375 +2777,373 @@ msgstr "Driver is een variant van: %1$s"
 msgid "%1$s %2$s"
 msgstr "%1$s %2$s"
 
-#: src/frontend/mame/ui/selmenu.cpp:2235
+#: src/frontend/mame/ui/selmenu.cpp:2244
 msgid "Images"
 msgstr "Afbeeldingen"
 
-#: src/frontend/mame/ui/selmenu.cpp:2236
+#: src/frontend/mame/ui/selmenu.cpp:2245
 msgid "Infos"
 msgstr "Informatie"
 
-#: src/frontend/mame/ui/selmenu.cpp:2551
+#: src/frontend/mame/ui/selmenu.cpp:2560
 msgid ""
 "Required ROM/disk images for the selected system are missing or incorrect. "
 "Please acquire the correct files or select a different system.\n"
 "\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2567
+#: src/frontend/mame/ui/selmenu.cpp:2576
 msgid ""
 "Required ROM/disk images for the selected software are missing or incorrect. "
 "Please acquire the correct files or select a different software item.\n"
 "\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2583
+#: src/frontend/mame/ui/selmenu.cpp:2592
 msgid "incorrect checksum"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2586
+#: src/frontend/mame/ui/selmenu.cpp:2595
 msgid "incorrect length"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2589
+#: src/frontend/mame/ui/selmenu.cpp:2598
 msgid "not found"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2600
+#: src/frontend/mame/ui/selmenu.cpp:2609
 #, c-format
 msgid "%1$s (%2$s) - %3$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2602
+#: src/frontend/mame/ui/selmenu.cpp:2611
 #, c-format
 msgid "%1$s - %2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2606
+#: src/frontend/mame/ui/selmenu.cpp:2615
 msgid "Press any key to continue."
 msgstr "Druk op een toets om door te gaan."
 
-#: src/frontend/mame/ui/selmenu.cpp:2735
+#: src/frontend/mame/ui/selmenu.cpp:2744
 msgid "General Info"
 msgstr "Algemene informatie"
 
-#: src/frontend/mame/ui/selmenu.cpp:2887
+#: src/frontend/mame/ui/selmenu.cpp:2896
 #, c-format
 msgid "Romset\t%1$s\n"
 msgstr "Romset\t%1$s\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2888
+#: src/frontend/mame/ui/selmenu.cpp:2897
 #, c-format
 msgid "Year\t%1$s\n"
 msgstr "Jaar\t%1$s\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2889
+#: src/frontend/mame/ui/selmenu.cpp:2898
 #, c-format
 msgid "Manufacturer\t%1$s\n"
 msgstr "Fabrikant\t%1$s\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2896
+#: src/frontend/mame/ui/selmenu.cpp:2905
 #, c-format
 msgid "Driver is Clone of\t%1$s\n"
 msgstr "Driver is variant van\t%1$s\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2901
+#: src/frontend/mame/ui/selmenu.cpp:2910
 msgid "Driver is Parent\t\n"
 msgstr "Driver is hoofdsoftware\t\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2905
+#: src/frontend/mame/ui/selmenu.cpp:2914
 msgid "Analog Controls\tYes\n"
 msgstr "Analoge besturing\tJa\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2907
+#: src/frontend/mame/ui/selmenu.cpp:2916
 msgid "Keyboard Inputs\tYes\n"
 msgstr "Toetensenbordinvoer\tJa\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2910
+#: src/frontend/mame/ui/selmenu.cpp:2919
 msgid "Overall\tNOT WORKING\n"
 msgstr "Status\tNIET WERKEND\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2912
+#: src/frontend/mame/ui/selmenu.cpp:2921
 msgid "Overall\tUnemulated Protection\n"
 msgstr "Status\tOngeëmuleerde beveiliging\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2914
+#: src/frontend/mame/ui/selmenu.cpp:2923
 msgid "Overall\tWorking\n"
 msgstr "Status\tWerkend\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2917
+#: src/frontend/mame/ui/selmenu.cpp:2926
 msgid "Graphics\tUnimplemented\n"
 msgstr "Beeld\tNiet geïmplementeerd\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2919
+#: src/frontend/mame/ui/selmenu.cpp:2928
 msgid "Graphics\tWrong Colors\n"
 msgstr "Beeld\tVerkeerde kleuren\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2921
+#: src/frontend/mame/ui/selmenu.cpp:2930
 msgid "Graphics\tImperfect Colors\n"
 msgstr "Beeld\tOnvolledige kleuren\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2923
+#: src/frontend/mame/ui/selmenu.cpp:2932
 msgid "Graphics\tImperfect\n"
 msgstr "Beeld\tOnvolledig\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2925
+#: src/frontend/mame/ui/selmenu.cpp:2934
 msgid "Graphics\tOK\n"
 msgstr "Beeld\tOK\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2928
+#: src/frontend/mame/ui/selmenu.cpp:2937
 msgid "Sound\tNone\n"
 msgstr "Geluid\tGeen\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2930
+#: src/frontend/mame/ui/selmenu.cpp:2939
 msgid "Sound\tUnimplemented\n"
 msgstr "Geluid\tNiet geïmplementeerd\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2932
+#: src/frontend/mame/ui/selmenu.cpp:2941
 msgid "Sound\tImperfect\n"
 msgstr "Geluid\tOnvolledig\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2934
+#: src/frontend/mame/ui/selmenu.cpp:2943
 msgid "Sound\tOK\n"
 msgstr "Geluid\tOK\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2937
+#: src/frontend/mame/ui/selmenu.cpp:2946
 msgid "Capture\tUnimplemented\n"
 msgstr "Opname\tNiet geïmplementeerd\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2939
+#: src/frontend/mame/ui/selmenu.cpp:2948
 msgid "Capture\tImperfect\n"
 msgstr "Opname\tOnvolledig\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2942
+#: src/frontend/mame/ui/selmenu.cpp:2951
 msgid "Camera\tUnimplemented\n"
 msgstr "Camera\tNiet geïmplementeerd\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2944
+#: src/frontend/mame/ui/selmenu.cpp:2953
 msgid "Camera\tImperfect\n"
 msgstr "Camera\tOnvolledig\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2947
+#: src/frontend/mame/ui/selmenu.cpp:2956
 msgid "Microphone\tUnimplemented\n"
 msgstr "Microfoon\tNiet geïmplementeerd\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2949
+#: src/frontend/mame/ui/selmenu.cpp:2958
 msgid "Microphone\tImperfect\n"
 msgstr "Microfoon\tOnvolledig\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2952
+#: src/frontend/mame/ui/selmenu.cpp:2961
 msgid "Controls\tUnimplemented\n"
 msgstr "Besturing\tNiet geïmplementeerd\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2954
+#: src/frontend/mame/ui/selmenu.cpp:2963
 msgid "Controls\tImperfect\n"
 msgstr "Besturing\tOnvolledig\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2957
+#: src/frontend/mame/ui/selmenu.cpp:2966
 msgid "Keyboard\tUnimplemented\n"
 msgstr "Toetsenbord\tNiet geïmplementeerd\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2959
+#: src/frontend/mame/ui/selmenu.cpp:2968
 msgid "Keyboard\tImperfect\n"
 msgstr "Toetsenbord\tOnvolledig\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2962
+#: src/frontend/mame/ui/selmenu.cpp:2971
 msgid "Mouse\tUnimplemented\n"
 msgstr "Muis\tNiet geïmplementeerd\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2964
+#: src/frontend/mame/ui/selmenu.cpp:2973
 msgid "Mouse\tImperfect\n"
 msgstr "Muis\tOnvolledig\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2967
+#: src/frontend/mame/ui/selmenu.cpp:2976
 msgid "Media\tUnimplemented\n"
 msgstr "Media\tNiet geïmplementeerd\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2969
+#: src/frontend/mame/ui/selmenu.cpp:2978
 msgid "Media\tImperfect\n"
 msgstr "Media\tOnvolledig\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2972
+#: src/frontend/mame/ui/selmenu.cpp:2981
 msgid "Disk\tUnimplemented\n"
 msgstr "Schijf\tNiet geïmplementeerd\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2974
+#: src/frontend/mame/ui/selmenu.cpp:2983
 msgid "Disk\tImperfect\n"
 msgstr "Schijf\tOnvolledig\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2977
+#: src/frontend/mame/ui/selmenu.cpp:2986
 msgid "Printer\tUnimplemented\n"
 msgstr "Printer\tNiet geïmplementeerd\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2979
+#: src/frontend/mame/ui/selmenu.cpp:2988
 msgid "Printer\tImperfect\n"
 msgstr "Printer\tOnvolledig\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2982
+#: src/frontend/mame/ui/selmenu.cpp:2991
 msgid "Mag. Tape\tUnimplemented\n"
 msgstr "Mag. Band\tNiet geïmplementeerd\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2984
+#: src/frontend/mame/ui/selmenu.cpp:2993
 msgid "Mag. Tape\tImperfect\n"
 msgstr "Mag. Band\tOnvolledig\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2987
+#: src/frontend/mame/ui/selmenu.cpp:2996
 msgid "Punch Tape\tUnimplemented\n"
 msgstr "Ponsband\tNiet geïmplementeerd\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2989
+#: src/frontend/mame/ui/selmenu.cpp:2998
 msgid "Punch Tape\tImperfect\n"
 msgstr "Ponsband\tOnvolledig\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2992
+#: src/frontend/mame/ui/selmenu.cpp:3001
 msgid "Mag. Drum\tUnimplemented\n"
 msgstr "Mag. trommel\tNiet geïmplementeerd\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2994
+#: src/frontend/mame/ui/selmenu.cpp:3003
 msgid "Mag. Drum\tImperfect\n"
 msgstr "Mag. trommel\tOnvolledig\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2997
+#: src/frontend/mame/ui/selmenu.cpp:3006
 msgid "(EP)ROM\tUnimplemented\n"
 msgstr "(EP)ROM\tNiet geïmplementeerd\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2999
+#: src/frontend/mame/ui/selmenu.cpp:3008
 msgid "(EP)ROM\tImperfect\n"
 msgstr "(EP)ROM\tOnvolledig\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3002
+#: src/frontend/mame/ui/selmenu.cpp:3011
 msgid "Communications\tUnimplemented\n"
 msgstr "Communicatie\tNiet geïmplementeerd\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3004
+#: src/frontend/mame/ui/selmenu.cpp:3013
 msgid "Communications\tImperfect\n"
 msgstr "Communicatie\tOnvolledig\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3007
+#: src/frontend/mame/ui/selmenu.cpp:3016
 msgid "LAN\tUnimplemented\n"
 msgstr "LAN\tNiet geïmplementeerd\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3009
+#: src/frontend/mame/ui/selmenu.cpp:3018
 msgid "LAN\tImperfect\n"
 msgstr "LAN\tOnvolledig\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3012
+#: src/frontend/mame/ui/selmenu.cpp:3021
 msgid "WAN\tUnimplemented\n"
 msgstr "WAN\tNiet geïmplementeerd\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3014
+#: src/frontend/mame/ui/selmenu.cpp:3023
 msgid "WAN\tImperfect\n"
 msgstr "WAN\tOnvolledig\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3017
+#: src/frontend/mame/ui/selmenu.cpp:3026
 msgid "Timing\tUnimplemented\n"
 msgstr "Timing\tNiet geïmplementeerd\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3019
+#: src/frontend/mame/ui/selmenu.cpp:3028
 msgid "Timing\tImperfect\n"
 msgstr "Timing\tOnvolledig\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3021
+#: src/frontend/mame/ui/selmenu.cpp:3030
 msgid "Mechanical Machine\tYes\n"
 msgstr "Mechanische machine\tJa\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3021
+#: src/frontend/mame/ui/selmenu.cpp:3030
 msgid "Mechanical Machine\tNo\n"
 msgstr "Mechanische machine\tNee\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3022
+#: src/frontend/mame/ui/selmenu.cpp:3031
 msgid "Requires Artwork\tYes\n"
 msgstr "Vereist artwork\tJa\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3022
+#: src/frontend/mame/ui/selmenu.cpp:3031
 msgid "Requires Artwork\tNo\n"
 msgstr "Vereist artwork\tNee\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3023
+#: src/frontend/mame/ui/selmenu.cpp:3032
 msgid "Requires Clickable Artwork\tYes\n"
 msgstr "Vereist klikbare artwork\tJa\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3023
+#: src/frontend/mame/ui/selmenu.cpp:3032
 msgid "Requires Clickable Artwork\tNo\n"
 msgstr "Vereist klikbare artwork\tNee\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3025
+#: src/frontend/mame/ui/selmenu.cpp:3034
 msgid "Support Cocktail\tNo\n"
 msgstr "Ondersteunt cocktail\tNee\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3026
+#: src/frontend/mame/ui/selmenu.cpp:3035
 msgid "Driver is BIOS\tYes\n"
 msgstr "Driver is BIOS\tJa\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3026
+#: src/frontend/mame/ui/selmenu.cpp:3035
 msgid "Driver is BIOS\tNo\n"
 msgstr "Driver is BIOS\tNee\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3027
+#: src/frontend/mame/ui/selmenu.cpp:3036
 msgid "Support Save\tYes\n"
 msgstr "Ondersteunt opslaan\tJa\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3027
+#: src/frontend/mame/ui/selmenu.cpp:3036
 msgid "Support Save\tNo\n"
 msgstr "Ondersteunt opslaan\tNee\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3028
+#: src/frontend/mame/ui/selmenu.cpp:3037
 msgid "Screen Orientation\tVertical\n"
 msgstr "Schermoriëntatie\tVerticaal\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3028
+#: src/frontend/mame/ui/selmenu.cpp:3037
 msgid "Screen Orientation\tHorizontal\n"
 msgstr "Schermoriëntatie\tHorizontaal\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3038
+#: src/frontend/mame/ui/selmenu.cpp:3047
 msgid "Requires CHD\tYes\n"
 msgstr "Vereist CHD\tJa\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3038
+#: src/frontend/mame/ui/selmenu.cpp:3047
 msgid "Requires CHD\tNo\n"
 msgstr "Vereist CHD\tNee\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3051
-msgid "ROM Audit Result\tOK\n"
-msgstr "ROM-controle Resultaat\tOK\n"
+#: src/frontend/mame/ui/selmenu.cpp:3060
+msgid "Media Audit Result\tOK\n"
+msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3053
-msgid "ROM Audit Result\tBAD\n"
-msgstr "ROM-controle Resultaat\tSLECHT\n"
+#: src/frontend/mame/ui/selmenu.cpp:3062
+msgid "Media Audit Result\tBAD\n"
+msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3056
+#: src/frontend/mame/ui/selmenu.cpp:3065
 msgid "Samples Audit Result\tNone Needed\n"
 msgstr "Samplecontrole Resultaat\tNiet Nodig\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3058
+#: src/frontend/mame/ui/selmenu.cpp:3067
 msgid "Samples Audit Result\tOK\n"
 msgstr "Samplecontrole Resultaat\tOK\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3060
+#: src/frontend/mame/ui/selmenu.cpp:3069
 msgid "Samples Audit Result\tBAD\n"
 msgstr "Samplecontrole Resultaat\tSLECHT\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3064
+#: src/frontend/mame/ui/selmenu.cpp:3073
 msgid ""
-"ROM Audit \tDisabled\n"
-"Samples Audit \tDisabled\n"
+"Media Audit\tDisabled\n"
+"Samples Audit\tDisabled\n"
 msgstr ""
-"ROM-controle \tUitgeschakeld\n"
-"Samplecontrole \tUitgeschakeld\n"
 
-#: src/frontend/mame/ui/sndmenu.cpp:150
+#: src/frontend/mame/ui/sndmenu.cpp:146
 msgid "Sound"
 msgstr "Geluid"
 
-#: src/frontend/mame/ui/sndmenu.cpp:151
+#: src/frontend/mame/ui/sndmenu.cpp:147
 msgid "Compressor"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:152
+#: src/frontend/mame/ui/sndmenu.cpp:148
 msgid "Sample Rate"
 msgstr "Samplesnelheid"
 
-#: src/frontend/mame/ui/sndmenu.cpp:153
+#: src/frontend/mame/ui/sndmenu.cpp:149
 msgid "Use External Samples"
 msgstr "Gebruik externe samples"
 
@@ -3194,21 +3194,21 @@ msgstr "* Video:\n"
 msgid "  Screen '%1$s': Vector\n"
 msgstr "  Scherm '%1$s': Vector\n"
 
-#: src/frontend/mame/ui/devopt.cpp:132
+#: src/frontend/mame/ui/devopt.cpp:135
 #, c-format
 msgid "  Screen '%1$s': %2$d × %3$d (V) %4$s Hz\n"
 msgstr "  Scherm '%1$s': %2$d × %3$d (V) %4$s Hz\n"
 
-#: src/frontend/mame/ui/devopt.cpp:133
+#: src/frontend/mame/ui/devopt.cpp:136
 #, c-format
 msgid "  Screen '%1$s': %2$d × %3$d (H) %4$s Hz\n"
 msgstr "  Scherm '%1$s': %2$d × %3$d (H) %4$s Hz\n"
 
-#: src/frontend/mame/ui/devopt.cpp:147
+#: src/frontend/mame/ui/devopt.cpp:150
 msgid "* Sound:\n"
 msgstr "* Geluid:\n"
 
-#: src/frontend/mame/ui/devopt.cpp:211
+#: src/frontend/mame/ui/devopt.cpp:214
 #, c-format
 msgid ""
 "* BIOS settings:\n"
@@ -3217,490 +3217,660 @@ msgstr ""
 "* BIOS-instellingen:\n"
 "  %1$d opties    [standaard: %2$s]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:255 src/frontend/mame/ui/devopt.cpp:271
-#: src/frontend/mame/ui/devopt.cpp:332
+#: src/frontend/mame/ui/devopt.cpp:258 src/frontend/mame/ui/devopt.cpp:274
+#: src/frontend/mame/ui/devopt.cpp:335
 #, c-format
 msgid "  %1$s    [default: %2$s]\n"
 msgstr "  %1$s    [standaard: %2$s]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:260 src/frontend/mame/ui/devopt.cpp:276
+#: src/frontend/mame/ui/devopt.cpp:263 src/frontend/mame/ui/devopt.cpp:279
 #, c-format
 msgid "  %1$s\n"
 msgstr "  %1$s\n"
 
-#: src/frontend/mame/ui/devopt.cpp:282
+#: src/frontend/mame/ui/devopt.cpp:285
 msgid "* DIP switch settings:\n"
 msgstr "DIP-schakelaarinstellingen:\n"
 
-#: src/frontend/mame/ui/devopt.cpp:287
+#: src/frontend/mame/ui/devopt.cpp:290
 msgid "* Configuration settings:\n"
 msgstr "* Configuratieinstellingen:\n"
 
-#: src/frontend/mame/ui/devopt.cpp:291
+#: src/frontend/mame/ui/devopt.cpp:294
 msgid "* Input device(s):\n"
 msgstr "* Invoerapparatuur:\n"
 
-#: src/frontend/mame/ui/devopt.cpp:293
+#: src/frontend/mame/ui/devopt.cpp:296
 #, c-format
 msgid "  User inputs    [%1$d inputs]\n"
 msgstr "  Gebruikersinvoer    [%1$d invoeren]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:295
+#: src/frontend/mame/ui/devopt.cpp:298
 #, c-format
 msgid "  Mahjong inputs    [%1$d inputs]\n"
 msgstr "  Mahjonginvoer    [%1$d invoeren]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:297
+#: src/frontend/mame/ui/devopt.cpp:300
 #, c-format
 msgid "  Hanafuda inputs    [%1$d inputs]\n"
 msgstr "  Hanafudainvoer    [%1$d invoeren]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:299
+#: src/frontend/mame/ui/devopt.cpp:302
 #, c-format
 msgid "  Gambling inputs    [%1$d inputs]\n"
 msgstr "  Gokinvoer    [%1$d invoeren]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:301
+#: src/frontend/mame/ui/devopt.cpp:304
 #, c-format
 msgid "  Analog inputs    [%1$d inputs]\n"
 msgstr "  Analoge invoer    [%1$d invoeren]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:303
+#: src/frontend/mame/ui/devopt.cpp:306
 #, c-format
 msgid "  Adjuster inputs    [%1$d inputs]\n"
 msgstr "  Aanpassingsinvoer    [%1$d invoeren]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:305
+#: src/frontend/mame/ui/devopt.cpp:308
 #, c-format
 msgid "  Keypad inputs    [%1$d inputs]\n"
 msgstr "  Toetsenblokinvoer    [%1$d invoeren]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:307
+#: src/frontend/mame/ui/devopt.cpp:310
 #, c-format
 msgid "  Keyboard inputs    [%1$d inputs]\n"
 msgstr "  Toetsenbordinvoer    [%1$d invoeren]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:312
+#: src/frontend/mame/ui/devopt.cpp:315
 msgid "* Media Options:\n"
 msgstr "* Media opties:\n"
 
-#: src/frontend/mame/ui/devopt.cpp:317
+#: src/frontend/mame/ui/devopt.cpp:320
 #, c-format
 msgid "  %1$s    [tag: %2$s]\n"
 msgstr "  %1$s    [label: %2$s]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:327
+#: src/frontend/mame/ui/devopt.cpp:330
 msgid "* Slot Options:\n"
 msgstr "* Plek opties:\n"
 
-#: src/frontend/mame/ui/devopt.cpp:341
+#: src/frontend/mame/ui/devopt.cpp:344
 msgid "[None]\n"
 msgstr "[Geen]\n"
 
-#: src/emu/render.cpp:1847
+#: src/emu/render.cpp:1796
 #, c-format
 msgctxt "view-name"
 msgid "Screen %1$u Standard (%2$u:%3$u)"
 msgstr ""
 
-#: src/emu/render.cpp:1873
+#: src/emu/render.cpp:1822
 #, c-format
 msgctxt "view-name"
 msgid "Screen %1$u Pixel Aspect (%2$u:%3$u)"
 msgstr ""
 
-#: src/emu/render.cpp:1895 src/emu/render.cpp:2030
+#: src/emu/render.cpp:1844 src/emu/render.cpp:1979
 msgctxt "view-name"
 msgid "Cocktail"
 msgstr ""
 
-#: src/emu/render.cpp:2015
+#: src/emu/render.cpp:1964
 msgctxt "view-name"
 msgid "Left-to-Right"
 msgstr ""
 
-#: src/emu/render.cpp:2016
+#: src/emu/render.cpp:1965
 msgctxt "view-name"
 msgid "Left-to-Right (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2017
+#: src/emu/render.cpp:1966
 msgctxt "view-name"
 msgid "Top-to-Bottom"
 msgstr ""
 
-#: src/emu/render.cpp:2018
+#: src/emu/render.cpp:1967
 msgctxt "view-name"
 msgid "Top-to-Bottom (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2069
+#: src/emu/render.cpp:2018
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Left-to-Right, Top-to-Bottom"
 msgstr ""
 
-#: src/emu/render.cpp:2078
+#: src/emu/render.cpp:2027
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Left-to-Right, Top-to-Bottom (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2087
+#: src/emu/render.cpp:2036
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Top-to-Bottom, Left-to-Right"
 msgstr ""
 
-#: src/emu/render.cpp:2096
+#: src/emu/render.cpp:2045
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Top-to-Bottom, Left-to-Right (Gapless)"
 msgstr ""
 
-#: src/emu/inpttype.ipp:22
+#: src/emu/ioport.cpp:332
+#, c-format
 msgctxt "input-name"
-msgid "P1 Up"
+msgid "P%1$u"
 msgstr ""
 
-#: src/emu/inpttype.ipp:23
+#: src/emu/ioport.cpp:1924
 msgctxt "input-name"
-msgid "P1 Down"
+msgid "???"
 msgstr ""
 
-#: src/emu/inpttype.ipp:24
+#: src/emu/inpttype.ipp:22 src/emu/inpttype.ipp:140 src/emu/inpttype.ipp:221
+#: src/emu/inpttype.ipp:255 src/emu/inpttype.ipp:289 src/emu/inpttype.ipp:323
+#: src/emu/inpttype.ipp:357 src/emu/inpttype.ipp:391 src/emu/inpttype.ipp:425
+#: src/emu/inpttype.ipp:459
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left"
+msgid "%p Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:25
+#: src/emu/inpttype.ipp:23 src/emu/inpttype.ipp:141 src/emu/inpttype.ipp:222
+#: src/emu/inpttype.ipp:256 src/emu/inpttype.ipp:290 src/emu/inpttype.ipp:324
+#: src/emu/inpttype.ipp:358 src/emu/inpttype.ipp:392 src/emu/inpttype.ipp:426
+#: src/emu/inpttype.ipp:460
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right"
+msgid "%p Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:26
+#: src/emu/inpttype.ipp:24 src/emu/inpttype.ipp:142 src/emu/inpttype.ipp:223
+#: src/emu/inpttype.ipp:257 src/emu/inpttype.ipp:291 src/emu/inpttype.ipp:325
+#: src/emu/inpttype.ipp:359 src/emu/inpttype.ipp:393 src/emu/inpttype.ipp:427
+#: src/emu/inpttype.ipp:461
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Up"
+msgid "%p Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:27
+#: src/emu/inpttype.ipp:25 src/emu/inpttype.ipp:143 src/emu/inpttype.ipp:224
+#: src/emu/inpttype.ipp:258 src/emu/inpttype.ipp:292 src/emu/inpttype.ipp:326
+#: src/emu/inpttype.ipp:360 src/emu/inpttype.ipp:394 src/emu/inpttype.ipp:428
+#: src/emu/inpttype.ipp:462
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Down"
+msgid "%p Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:28
+#: src/emu/inpttype.ipp:26 src/emu/inpttype.ipp:144 src/emu/inpttype.ipp:225
+#: src/emu/inpttype.ipp:259 src/emu/inpttype.ipp:293 src/emu/inpttype.ipp:327
+#: src/emu/inpttype.ipp:361 src/emu/inpttype.ipp:395 src/emu/inpttype.ipp:429
+#: src/emu/inpttype.ipp:463
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Left"
+msgid "%p Right Stick/Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:29
+#: src/emu/inpttype.ipp:27 src/emu/inpttype.ipp:145 src/emu/inpttype.ipp:226
+#: src/emu/inpttype.ipp:260 src/emu/inpttype.ipp:294 src/emu/inpttype.ipp:328
+#: src/emu/inpttype.ipp:362 src/emu/inpttype.ipp:396 src/emu/inpttype.ipp:430
+#: src/emu/inpttype.ipp:464
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Right"
+msgid "%p Right Stick/Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:30
+#: src/emu/inpttype.ipp:28 src/emu/inpttype.ipp:146 src/emu/inpttype.ipp:227
+#: src/emu/inpttype.ipp:261 src/emu/inpttype.ipp:295 src/emu/inpttype.ipp:329
+#: src/emu/inpttype.ipp:363 src/emu/inpttype.ipp:397 src/emu/inpttype.ipp:431
+#: src/emu/inpttype.ipp:465
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Up"
+msgid "%p Right Stick/Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:31
+#: src/emu/inpttype.ipp:29 src/emu/inpttype.ipp:147 src/emu/inpttype.ipp:228
+#: src/emu/inpttype.ipp:262 src/emu/inpttype.ipp:296 src/emu/inpttype.ipp:330
+#: src/emu/inpttype.ipp:364 src/emu/inpttype.ipp:398 src/emu/inpttype.ipp:432
+#: src/emu/inpttype.ipp:466
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Down"
+msgid "%p Right Stick/Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:32
+#: src/emu/inpttype.ipp:30 src/emu/inpttype.ipp:148 src/emu/inpttype.ipp:229
+#: src/emu/inpttype.ipp:263 src/emu/inpttype.ipp:297 src/emu/inpttype.ipp:331
+#: src/emu/inpttype.ipp:365 src/emu/inpttype.ipp:399 src/emu/inpttype.ipp:433
+#: src/emu/inpttype.ipp:467
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Left"
+msgid "%p Left Stick/Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:33
+#: src/emu/inpttype.ipp:31 src/emu/inpttype.ipp:149 src/emu/inpttype.ipp:230
+#: src/emu/inpttype.ipp:264 src/emu/inpttype.ipp:298 src/emu/inpttype.ipp:332
+#: src/emu/inpttype.ipp:366 src/emu/inpttype.ipp:400 src/emu/inpttype.ipp:434
+#: src/emu/inpttype.ipp:468
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Right"
+msgid "%p Left Stick/Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:34
+#: src/emu/inpttype.ipp:32 src/emu/inpttype.ipp:150 src/emu/inpttype.ipp:231
+#: src/emu/inpttype.ipp:265 src/emu/inpttype.ipp:299 src/emu/inpttype.ipp:333
+#: src/emu/inpttype.ipp:367 src/emu/inpttype.ipp:401 src/emu/inpttype.ipp:435
+#: src/emu/inpttype.ipp:469
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 1"
+msgid "%p Left Stick/Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:35
+#: src/emu/inpttype.ipp:33 src/emu/inpttype.ipp:151 src/emu/inpttype.ipp:232
+#: src/emu/inpttype.ipp:266 src/emu/inpttype.ipp:300 src/emu/inpttype.ipp:334
+#: src/emu/inpttype.ipp:368 src/emu/inpttype.ipp:402 src/emu/inpttype.ipp:436
+#: src/emu/inpttype.ipp:470
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 2"
+msgid "%p Left Stick/Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:36
+#: src/emu/inpttype.ipp:34 src/emu/inpttype.ipp:152 src/emu/inpttype.ipp:233
+#: src/emu/inpttype.ipp:267 src/emu/inpttype.ipp:301 src/emu/inpttype.ipp:335
+#: src/emu/inpttype.ipp:369 src/emu/inpttype.ipp:403 src/emu/inpttype.ipp:437
+#: src/emu/inpttype.ipp:471
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 3"
+msgid "%p Button 1"
 msgstr ""
 
-#: src/emu/inpttype.ipp:37
+#: src/emu/inpttype.ipp:35 src/emu/inpttype.ipp:153 src/emu/inpttype.ipp:234
+#: src/emu/inpttype.ipp:268 src/emu/inpttype.ipp:302 src/emu/inpttype.ipp:336
+#: src/emu/inpttype.ipp:370 src/emu/inpttype.ipp:404 src/emu/inpttype.ipp:438
+#: src/emu/inpttype.ipp:472
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 4"
+msgid "%p Button 2"
 msgstr ""
 
-#: src/emu/inpttype.ipp:38
+#: src/emu/inpttype.ipp:36 src/emu/inpttype.ipp:154 src/emu/inpttype.ipp:235
+#: src/emu/inpttype.ipp:269 src/emu/inpttype.ipp:303 src/emu/inpttype.ipp:337
+#: src/emu/inpttype.ipp:371 src/emu/inpttype.ipp:405 src/emu/inpttype.ipp:439
+#: src/emu/inpttype.ipp:473
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 5"
+msgid "%p Button 3"
 msgstr ""
 
-#: src/emu/inpttype.ipp:39
+#: src/emu/inpttype.ipp:37 src/emu/inpttype.ipp:155 src/emu/inpttype.ipp:236
+#: src/emu/inpttype.ipp:270 src/emu/inpttype.ipp:304 src/emu/inpttype.ipp:338
+#: src/emu/inpttype.ipp:372 src/emu/inpttype.ipp:406 src/emu/inpttype.ipp:440
+#: src/emu/inpttype.ipp:474
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 6"
+msgid "%p Button 4"
 msgstr ""
 
-#: src/emu/inpttype.ipp:40
+#: src/emu/inpttype.ipp:38 src/emu/inpttype.ipp:156 src/emu/inpttype.ipp:237
+#: src/emu/inpttype.ipp:271 src/emu/inpttype.ipp:305 src/emu/inpttype.ipp:339
+#: src/emu/inpttype.ipp:373 src/emu/inpttype.ipp:407 src/emu/inpttype.ipp:441
+#: src/emu/inpttype.ipp:475
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 7"
+msgid "%p Button 5"
 msgstr ""
 
-#: src/emu/inpttype.ipp:41
+#: src/emu/inpttype.ipp:39 src/emu/inpttype.ipp:157 src/emu/inpttype.ipp:238
+#: src/emu/inpttype.ipp:272 src/emu/inpttype.ipp:306 src/emu/inpttype.ipp:340
+#: src/emu/inpttype.ipp:374 src/emu/inpttype.ipp:408 src/emu/inpttype.ipp:442
+#: src/emu/inpttype.ipp:476
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 8"
+msgid "%p Button 6"
 msgstr ""
 
-#: src/emu/inpttype.ipp:42
+#: src/emu/inpttype.ipp:40 src/emu/inpttype.ipp:158 src/emu/inpttype.ipp:239
+#: src/emu/inpttype.ipp:273 src/emu/inpttype.ipp:307 src/emu/inpttype.ipp:341
+#: src/emu/inpttype.ipp:375 src/emu/inpttype.ipp:409 src/emu/inpttype.ipp:443
+#: src/emu/inpttype.ipp:477
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 9"
+msgid "%p Button 7"
 msgstr ""
 
-#: src/emu/inpttype.ipp:43
+#: src/emu/inpttype.ipp:41 src/emu/inpttype.ipp:159 src/emu/inpttype.ipp:240
+#: src/emu/inpttype.ipp:274 src/emu/inpttype.ipp:308 src/emu/inpttype.ipp:342
+#: src/emu/inpttype.ipp:376 src/emu/inpttype.ipp:410 src/emu/inpttype.ipp:444
+#: src/emu/inpttype.ipp:478
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 10"
+msgid "%p Button 8"
 msgstr ""
 
-#: src/emu/inpttype.ipp:44
+#: src/emu/inpttype.ipp:42 src/emu/inpttype.ipp:160 src/emu/inpttype.ipp:241
+#: src/emu/inpttype.ipp:275 src/emu/inpttype.ipp:309 src/emu/inpttype.ipp:343
+#: src/emu/inpttype.ipp:377 src/emu/inpttype.ipp:411 src/emu/inpttype.ipp:445
+#: src/emu/inpttype.ipp:479
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 11"
+msgid "%p Button 9"
 msgstr ""
 
-#: src/emu/inpttype.ipp:45
+#: src/emu/inpttype.ipp:43 src/emu/inpttype.ipp:161 src/emu/inpttype.ipp:242
+#: src/emu/inpttype.ipp:276 src/emu/inpttype.ipp:310 src/emu/inpttype.ipp:344
+#: src/emu/inpttype.ipp:378 src/emu/inpttype.ipp:412 src/emu/inpttype.ipp:446
+#: src/emu/inpttype.ipp:480
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 12"
+msgid "%p Button 10"
 msgstr ""
 
-#: src/emu/inpttype.ipp:46
+#: src/emu/inpttype.ipp:44 src/emu/inpttype.ipp:162 src/emu/inpttype.ipp:243
+#: src/emu/inpttype.ipp:277 src/emu/inpttype.ipp:311 src/emu/inpttype.ipp:345
+#: src/emu/inpttype.ipp:379 src/emu/inpttype.ipp:413 src/emu/inpttype.ipp:447
+#: src/emu/inpttype.ipp:481
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 13"
+msgid "%p Button 11"
 msgstr ""
 
-#: src/emu/inpttype.ipp:47
+#: src/emu/inpttype.ipp:45 src/emu/inpttype.ipp:163 src/emu/inpttype.ipp:244
+#: src/emu/inpttype.ipp:278 src/emu/inpttype.ipp:312 src/emu/inpttype.ipp:346
+#: src/emu/inpttype.ipp:380 src/emu/inpttype.ipp:414 src/emu/inpttype.ipp:448
+#: src/emu/inpttype.ipp:482
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 14"
+msgid "%p Button 12"
 msgstr ""
 
-#: src/emu/inpttype.ipp:48
+#: src/emu/inpttype.ipp:46 src/emu/inpttype.ipp:164 src/emu/inpttype.ipp:245
+#: src/emu/inpttype.ipp:279 src/emu/inpttype.ipp:313 src/emu/inpttype.ipp:347
+#: src/emu/inpttype.ipp:381 src/emu/inpttype.ipp:415 src/emu/inpttype.ipp:449
+#: src/emu/inpttype.ipp:483
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 15"
+msgid "%p Button 13"
 msgstr ""
 
-#: src/emu/inpttype.ipp:49
+#: src/emu/inpttype.ipp:47 src/emu/inpttype.ipp:165 src/emu/inpttype.ipp:246
+#: src/emu/inpttype.ipp:280 src/emu/inpttype.ipp:314 src/emu/inpttype.ipp:348
+#: src/emu/inpttype.ipp:382 src/emu/inpttype.ipp:416 src/emu/inpttype.ipp:450
+#: src/emu/inpttype.ipp:484
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 16"
+msgid "%p Button 14"
 msgstr ""
 
-#: src/emu/inpttype.ipp:50
+#: src/emu/inpttype.ipp:48 src/emu/inpttype.ipp:166 src/emu/inpttype.ipp:247
+#: src/emu/inpttype.ipp:281 src/emu/inpttype.ipp:315 src/emu/inpttype.ipp:349
+#: src/emu/inpttype.ipp:383 src/emu/inpttype.ipp:417 src/emu/inpttype.ipp:451
+#: src/emu/inpttype.ipp:485
+#, c-format
 msgctxt "input-name"
-msgid "P1 Start"
+msgid "%p Button 15"
 msgstr ""
 
-#: src/emu/inpttype.ipp:51
+#: src/emu/inpttype.ipp:49 src/emu/inpttype.ipp:167 src/emu/inpttype.ipp:248
+#: src/emu/inpttype.ipp:282 src/emu/inpttype.ipp:316 src/emu/inpttype.ipp:350
+#: src/emu/inpttype.ipp:384 src/emu/inpttype.ipp:418 src/emu/inpttype.ipp:452
+#: src/emu/inpttype.ipp:486
+#, c-format
 msgctxt "input-name"
-msgid "P1 Select"
+msgid "%p Button 16"
 msgstr ""
 
-#: src/emu/inpttype.ipp:56
+#: src/emu/inpttype.ipp:50 src/emu/inpttype.ipp:168 src/emu/inpttype.ipp:249
+#: src/emu/inpttype.ipp:283 src/emu/inpttype.ipp:317 src/emu/inpttype.ipp:351
+#: src/emu/inpttype.ipp:385 src/emu/inpttype.ipp:419 src/emu/inpttype.ipp:453
+#: src/emu/inpttype.ipp:487
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong A"
+msgid "%p Start"
 msgstr ""
 
-#: src/emu/inpttype.ipp:57
+#: src/emu/inpttype.ipp:51 src/emu/inpttype.ipp:169 src/emu/inpttype.ipp:250
+#: src/emu/inpttype.ipp:284 src/emu/inpttype.ipp:318 src/emu/inpttype.ipp:352
+#: src/emu/inpttype.ipp:386 src/emu/inpttype.ipp:420 src/emu/inpttype.ipp:454
+#: src/emu/inpttype.ipp:488
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong B"
+msgid "%p Select"
 msgstr ""
 
-#: src/emu/inpttype.ipp:58
+#: src/emu/inpttype.ipp:56 src/emu/inpttype.ipp:174
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong C"
+msgid "%p Mahjong A"
 msgstr ""
 
-#: src/emu/inpttype.ipp:59
+#: src/emu/inpttype.ipp:57 src/emu/inpttype.ipp:175
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong D"
+msgid "%p Mahjong B"
 msgstr ""
 
-#: src/emu/inpttype.ipp:60
+#: src/emu/inpttype.ipp:58 src/emu/inpttype.ipp:176
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong E"
+msgid "%p Mahjong C"
 msgstr ""
 
-#: src/emu/inpttype.ipp:61
+#: src/emu/inpttype.ipp:59 src/emu/inpttype.ipp:177
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong F"
+msgid "%p Mahjong D"
 msgstr ""
 
-#: src/emu/inpttype.ipp:62
+#: src/emu/inpttype.ipp:60 src/emu/inpttype.ipp:178
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong G"
+msgid "%p Mahjong E"
 msgstr ""
 
-#: src/emu/inpttype.ipp:63
+#: src/emu/inpttype.ipp:61 src/emu/inpttype.ipp:179
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong H"
+msgid "%p Mahjong F"
 msgstr ""
 
-#: src/emu/inpttype.ipp:64
+#: src/emu/inpttype.ipp:62 src/emu/inpttype.ipp:180
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong I"
+msgid "%p Mahjong G"
 msgstr ""
 
-#: src/emu/inpttype.ipp:65
+#: src/emu/inpttype.ipp:63 src/emu/inpttype.ipp:181
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong J"
+msgid "%p Mahjong H"
 msgstr ""
 
-#: src/emu/inpttype.ipp:66
+#: src/emu/inpttype.ipp:64 src/emu/inpttype.ipp:182
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong K"
+msgid "%p Mahjong I"
 msgstr ""
 
-#: src/emu/inpttype.ipp:67
+#: src/emu/inpttype.ipp:65 src/emu/inpttype.ipp:183
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong L"
+msgid "%p Mahjong J"
 msgstr ""
 
-#: src/emu/inpttype.ipp:68
+#: src/emu/inpttype.ipp:66 src/emu/inpttype.ipp:184
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong M"
+msgid "%p Mahjong K"
 msgstr ""
 
-#: src/emu/inpttype.ipp:69
+#: src/emu/inpttype.ipp:67 src/emu/inpttype.ipp:185
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong N"
+msgid "%p Mahjong L"
 msgstr ""
 
-#: src/emu/inpttype.ipp:70
+#: src/emu/inpttype.ipp:68 src/emu/inpttype.ipp:186
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong O"
+msgid "%p Mahjong M"
 msgstr ""
 
-#: src/emu/inpttype.ipp:71
+#: src/emu/inpttype.ipp:69 src/emu/inpttype.ipp:187
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong P"
+msgid "%p Mahjong N"
 msgstr ""
 
-#: src/emu/inpttype.ipp:72
+#: src/emu/inpttype.ipp:70 src/emu/inpttype.ipp:188
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Q"
+msgid "%p Mahjong O"
 msgstr ""
 
-#: src/emu/inpttype.ipp:73
+#: src/emu/inpttype.ipp:71 src/emu/inpttype.ipp:189
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Kan"
+msgid "%p Mahjong P"
 msgstr ""
 
-#: src/emu/inpttype.ipp:74
+#: src/emu/inpttype.ipp:72 src/emu/inpttype.ipp:190
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Pon"
+msgid "%p Mahjong Q"
 msgstr ""
 
-#: src/emu/inpttype.ipp:75
+#: src/emu/inpttype.ipp:73 src/emu/inpttype.ipp:191
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Chi"
+msgid "%p Mahjong Kan"
 msgstr ""
 
-#: src/emu/inpttype.ipp:76
+#: src/emu/inpttype.ipp:74 src/emu/inpttype.ipp:192
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Reach"
+msgid "%p Mahjong Pon"
 msgstr ""
 
-#: src/emu/inpttype.ipp:77
+#: src/emu/inpttype.ipp:75 src/emu/inpttype.ipp:193
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Ron"
+msgid "%p Mahjong Chi"
 msgstr ""
 
-#: src/emu/inpttype.ipp:78
+#: src/emu/inpttype.ipp:76 src/emu/inpttype.ipp:194
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Flip Flop"
+msgid "%p Mahjong Reach"
 msgstr ""
 
-#: src/emu/inpttype.ipp:79
+#: src/emu/inpttype.ipp:77 src/emu/inpttype.ipp:195
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Bet"
+msgid "%p Mahjong Ron"
 msgstr ""
 
-#: src/emu/inpttype.ipp:80
+#: src/emu/inpttype.ipp:78 src/emu/inpttype.ipp:200
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Take Score"
+msgid "%p Mahjong Flip Flop"
 msgstr ""
 
-#: src/emu/inpttype.ipp:81
+#: src/emu/inpttype.ipp:79 src/emu/inpttype.ipp:196
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Double Up"
+msgid "%p Mahjong Bet"
 msgstr ""
 
-#: src/emu/inpttype.ipp:82
+#: src/emu/inpttype.ipp:80 src/emu/inpttype.ipp:198
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Big"
+msgid "%p Mahjong Take Score"
 msgstr ""
 
-#: src/emu/inpttype.ipp:83
+#: src/emu/inpttype.ipp:81 src/emu/inpttype.ipp:199
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Small"
+msgid "%p Mahjong Double Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:84
+#: src/emu/inpttype.ipp:82 src/emu/inpttype.ipp:201
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Last Chance"
+msgid "%p Mahjong Big"
 msgstr ""
 
-#: src/emu/inpttype.ipp:89
+#: src/emu/inpttype.ipp:83 src/emu/inpttype.ipp:202
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda A/1"
+msgid "%p Mahjong Small"
 msgstr ""
 
-#: src/emu/inpttype.ipp:90
+#: src/emu/inpttype.ipp:84 src/emu/inpttype.ipp:197
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda B/2"
+msgid "%p Mahjong Last Chance"
 msgstr ""
 
-#: src/emu/inpttype.ipp:91
+#: src/emu/inpttype.ipp:89 src/emu/inpttype.ipp:207
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda C/3"
+msgid "%p Hanafuda A/1"
 msgstr ""
 
-#: src/emu/inpttype.ipp:92
+#: src/emu/inpttype.ipp:90 src/emu/inpttype.ipp:208
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda D/4"
+msgid "%p Hanafuda B/2"
 msgstr ""
 
-#: src/emu/inpttype.ipp:93
+#: src/emu/inpttype.ipp:91 src/emu/inpttype.ipp:209
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda E/5"
+msgid "%p Hanafuda C/3"
 msgstr ""
 
-#: src/emu/inpttype.ipp:94
+#: src/emu/inpttype.ipp:92 src/emu/inpttype.ipp:210
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda F/6"
+msgid "%p Hanafuda D/4"
 msgstr ""
 
-#: src/emu/inpttype.ipp:95
+#: src/emu/inpttype.ipp:93 src/emu/inpttype.ipp:211
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda G/7"
+msgid "%p Hanafuda E/5"
 msgstr ""
 
-#: src/emu/inpttype.ipp:96
+#: src/emu/inpttype.ipp:94 src/emu/inpttype.ipp:212
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda H/8"
+msgid "%p Hanafuda F/6"
 msgstr ""
 
-#: src/emu/inpttype.ipp:97
+#: src/emu/inpttype.ipp:95 src/emu/inpttype.ipp:213
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda Yes"
+msgid "%p Hanafuda G/7"
 msgstr ""
 
-#: src/emu/inpttype.ipp:98
+#: src/emu/inpttype.ipp:96 src/emu/inpttype.ipp:214
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda No"
+msgid "%p Hanafuda H/8"
+msgstr ""
+
+#: src/emu/inpttype.ipp:97 src/emu/inpttype.ipp:215
+#, c-format
+msgctxt "input-name"
+msgid "%p Hanafuda Yes"
+msgstr ""
+
+#: src/emu/inpttype.ipp:98 src/emu/inpttype.ipp:216
+#, c-format
+msgctxt "input-name"
+msgid "%p Hanafuda No"
 msgstr ""
 
 #: src/emu/inpttype.ipp:103
@@ -3828,1551 +3998,6 @@ msgctxt "input-name"
 msgid "Stop All Reels"
 msgstr ""
 
-#: src/emu/inpttype.ipp:140
-msgctxt "input-name"
-msgid "P2 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:141
-msgctxt "input-name"
-msgid "P2 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:142
-msgctxt "input-name"
-msgid "P2 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:143
-msgctxt "input-name"
-msgid "P2 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:144
-msgctxt "input-name"
-msgid "P2 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:145
-msgctxt "input-name"
-msgid "P2 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:146
-msgctxt "input-name"
-msgid "P2 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:147
-msgctxt "input-name"
-msgid "P2 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:148
-msgctxt "input-name"
-msgid "P2 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:149
-msgctxt "input-name"
-msgid "P2 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:150
-msgctxt "input-name"
-msgid "P2 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:151
-msgctxt "input-name"
-msgid "P2 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:152
-msgctxt "input-name"
-msgid "P2 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:153
-msgctxt "input-name"
-msgid "P2 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:154
-msgctxt "input-name"
-msgid "P2 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:155
-msgctxt "input-name"
-msgid "P2 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:156
-msgctxt "input-name"
-msgid "P2 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:157
-msgctxt "input-name"
-msgid "P2 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:158
-msgctxt "input-name"
-msgid "P2 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:159
-msgctxt "input-name"
-msgid "P2 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:160
-msgctxt "input-name"
-msgid "P2 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:161
-msgctxt "input-name"
-msgid "P2 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:162
-msgctxt "input-name"
-msgid "P2 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:163
-msgctxt "input-name"
-msgid "P2 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:164
-msgctxt "input-name"
-msgid "P2 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:165
-msgctxt "input-name"
-msgid "P2 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:166
-msgctxt "input-name"
-msgid "P2 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:167
-msgctxt "input-name"
-msgid "P2 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:168
-msgctxt "input-name"
-msgid "P2 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:169
-msgctxt "input-name"
-msgid "P2 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:174
-msgctxt "input-name"
-msgid "P2 Mahjong A"
-msgstr ""
-
-#: src/emu/inpttype.ipp:175
-msgctxt "input-name"
-msgid "P2 Mahjong B"
-msgstr ""
-
-#: src/emu/inpttype.ipp:176
-msgctxt "input-name"
-msgid "P2 Mahjong C"
-msgstr ""
-
-#: src/emu/inpttype.ipp:177
-msgctxt "input-name"
-msgid "P2 Mahjong D"
-msgstr ""
-
-#: src/emu/inpttype.ipp:178
-msgctxt "input-name"
-msgid "P2 Mahjong E"
-msgstr ""
-
-#: src/emu/inpttype.ipp:179
-msgctxt "input-name"
-msgid "P2 Mahjong F"
-msgstr ""
-
-#: src/emu/inpttype.ipp:180
-msgctxt "input-name"
-msgid "P2 Mahjong G"
-msgstr ""
-
-#: src/emu/inpttype.ipp:181
-msgctxt "input-name"
-msgid "P2 Mahjong H"
-msgstr ""
-
-#: src/emu/inpttype.ipp:182
-msgctxt "input-name"
-msgid "P2 Mahjong I"
-msgstr ""
-
-#: src/emu/inpttype.ipp:183
-msgctxt "input-name"
-msgid "P2 Mahjong J"
-msgstr ""
-
-#: src/emu/inpttype.ipp:184
-msgctxt "input-name"
-msgid "P2 Mahjong K"
-msgstr ""
-
-#: src/emu/inpttype.ipp:185
-msgctxt "input-name"
-msgid "P2 Mahjong L"
-msgstr ""
-
-#: src/emu/inpttype.ipp:186
-msgctxt "input-name"
-msgid "P2 Mahjong M"
-msgstr ""
-
-#: src/emu/inpttype.ipp:187
-msgctxt "input-name"
-msgid "P2 Mahjong N"
-msgstr ""
-
-#: src/emu/inpttype.ipp:188
-msgctxt "input-name"
-msgid "P2 Mahjong O"
-msgstr ""
-
-#: src/emu/inpttype.ipp:189
-msgctxt "input-name"
-msgid "P2 Mahjong P"
-msgstr ""
-
-#: src/emu/inpttype.ipp:190
-msgctxt "input-name"
-msgid "P2 Mahjong Q"
-msgstr ""
-
-#: src/emu/inpttype.ipp:191
-msgctxt "input-name"
-msgid "P2 Mahjong Kan"
-msgstr ""
-
-#: src/emu/inpttype.ipp:192
-msgctxt "input-name"
-msgid "P2 Mahjong Pon"
-msgstr ""
-
-#: src/emu/inpttype.ipp:193
-msgctxt "input-name"
-msgid "P2 Mahjong Chi"
-msgstr ""
-
-#: src/emu/inpttype.ipp:194
-msgctxt "input-name"
-msgid "P2 Mahjong Reach"
-msgstr ""
-
-#: src/emu/inpttype.ipp:195
-msgctxt "input-name"
-msgid "P2 Mahjong Ron"
-msgstr ""
-
-#: src/emu/inpttype.ipp:196
-msgctxt "input-name"
-msgid "P2 Mahjong Bet"
-msgstr ""
-
-#: src/emu/inpttype.ipp:197
-msgctxt "input-name"
-msgid "P2 Mahjong Last Chance"
-msgstr ""
-
-#: src/emu/inpttype.ipp:198
-msgctxt "input-name"
-msgid "P2 Mahjong Take Score"
-msgstr ""
-
-#: src/emu/inpttype.ipp:199
-msgctxt "input-name"
-msgid "P2 Mahjong Double Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:200
-msgctxt "input-name"
-msgid "P2 Mahjong Flip Flop"
-msgstr ""
-
-#: src/emu/inpttype.ipp:201
-msgctxt "input-name"
-msgid "P2 Mahjong Big"
-msgstr ""
-
-#: src/emu/inpttype.ipp:202
-msgctxt "input-name"
-msgid "P2 Mahjong Small"
-msgstr ""
-
-#: src/emu/inpttype.ipp:207
-msgctxt "input-name"
-msgid "P2 Hanafuda A/1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:208
-msgctxt "input-name"
-msgid "P2 Hanafuda B/2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:209
-msgctxt "input-name"
-msgid "P2 Hanafuda C/3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:210
-msgctxt "input-name"
-msgid "P2 Hanafuda D/4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:211
-msgctxt "input-name"
-msgid "P2 Hanafuda E/5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:212
-msgctxt "input-name"
-msgid "P2 Hanafuda F/6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:213
-msgctxt "input-name"
-msgid "P2 Hanafuda G/7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:214
-msgctxt "input-name"
-msgid "P2 Hanafuda H/8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:215
-msgctxt "input-name"
-msgid "P2 Hanafuda Yes"
-msgstr ""
-
-#: src/emu/inpttype.ipp:216
-msgctxt "input-name"
-msgid "P2 Hanafuda No"
-msgstr ""
-
-#: src/emu/inpttype.ipp:221
-msgctxt "input-name"
-msgid "P3 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:222
-msgctxt "input-name"
-msgid "P3 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:223
-msgctxt "input-name"
-msgid "P3 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:224
-msgctxt "input-name"
-msgid "P3 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:225
-msgctxt "input-name"
-msgid "P3 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:226
-msgctxt "input-name"
-msgid "P3 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:227
-msgctxt "input-name"
-msgid "P3 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:228
-msgctxt "input-name"
-msgid "P3 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:229
-msgctxt "input-name"
-msgid "P3 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:230
-msgctxt "input-name"
-msgid "P3 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:231
-msgctxt "input-name"
-msgid "P3 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:232
-msgctxt "input-name"
-msgid "P3 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:233
-msgctxt "input-name"
-msgid "P3 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:234
-msgctxt "input-name"
-msgid "P3 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:235
-msgctxt "input-name"
-msgid "P3 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:236
-msgctxt "input-name"
-msgid "P3 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:237
-msgctxt "input-name"
-msgid "P3 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:238
-msgctxt "input-name"
-msgid "P3 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:239
-msgctxt "input-name"
-msgid "P3 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:240
-msgctxt "input-name"
-msgid "P3 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:241
-msgctxt "input-name"
-msgid "P3 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:242
-msgctxt "input-name"
-msgid "P3 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:243
-msgctxt "input-name"
-msgid "P3 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:244
-msgctxt "input-name"
-msgid "P3 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:245
-msgctxt "input-name"
-msgid "P3 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:246
-msgctxt "input-name"
-msgid "P3 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:247
-msgctxt "input-name"
-msgid "P3 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:248
-msgctxt "input-name"
-msgid "P3 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:249
-msgctxt "input-name"
-msgid "P3 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:250
-msgctxt "input-name"
-msgid "P3 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:255
-msgctxt "input-name"
-msgid "P4 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:256
-msgctxt "input-name"
-msgid "P4 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:257
-msgctxt "input-name"
-msgid "P4 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:258
-msgctxt "input-name"
-msgid "P4 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:259
-msgctxt "input-name"
-msgid "P4 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:260
-msgctxt "input-name"
-msgid "P4 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:261
-msgctxt "input-name"
-msgid "P4 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:262
-msgctxt "input-name"
-msgid "P4 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:263
-msgctxt "input-name"
-msgid "P4 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:264
-msgctxt "input-name"
-msgid "P4 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:265
-msgctxt "input-name"
-msgid "P4 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:266
-msgctxt "input-name"
-msgid "P4 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:267
-msgctxt "input-name"
-msgid "P4 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:268
-msgctxt "input-name"
-msgid "P4 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:269
-msgctxt "input-name"
-msgid "P4 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:270
-msgctxt "input-name"
-msgid "P4 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:271
-msgctxt "input-name"
-msgid "P4 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:272
-msgctxt "input-name"
-msgid "P4 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:273
-msgctxt "input-name"
-msgid "P4 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:274
-msgctxt "input-name"
-msgid "P4 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:275
-msgctxt "input-name"
-msgid "P4 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:276
-msgctxt "input-name"
-msgid "P4 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:277
-msgctxt "input-name"
-msgid "P4 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:278
-msgctxt "input-name"
-msgid "P4 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:279
-msgctxt "input-name"
-msgid "P4 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:280
-msgctxt "input-name"
-msgid "P4 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:281
-msgctxt "input-name"
-msgid "P4 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:282
-msgctxt "input-name"
-msgid "P4 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:283
-msgctxt "input-name"
-msgid "P4 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:284
-msgctxt "input-name"
-msgid "P4 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:289
-msgctxt "input-name"
-msgid "P5 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:290
-msgctxt "input-name"
-msgid "P5 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:291
-msgctxt "input-name"
-msgid "P5 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:292
-msgctxt "input-name"
-msgid "P5 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:293
-msgctxt "input-name"
-msgid "P5 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:294
-msgctxt "input-name"
-msgid "P5 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:295
-msgctxt "input-name"
-msgid "P5 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:296
-msgctxt "input-name"
-msgid "P5 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:297
-msgctxt "input-name"
-msgid "P5 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:298
-msgctxt "input-name"
-msgid "P5 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:299
-msgctxt "input-name"
-msgid "P5 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:300
-msgctxt "input-name"
-msgid "P5 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:301
-msgctxt "input-name"
-msgid "P5 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:302
-msgctxt "input-name"
-msgid "P5 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:303
-msgctxt "input-name"
-msgid "P5 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:304
-msgctxt "input-name"
-msgid "P5 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:305
-msgctxt "input-name"
-msgid "P5 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:306
-msgctxt "input-name"
-msgid "P5 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:307
-msgctxt "input-name"
-msgid "P5 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:308
-msgctxt "input-name"
-msgid "P5 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:309
-msgctxt "input-name"
-msgid "P5 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:310
-msgctxt "input-name"
-msgid "P5 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:311
-msgctxt "input-name"
-msgid "P5 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:312
-msgctxt "input-name"
-msgid "P5 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:313
-msgctxt "input-name"
-msgid "P5 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:314
-msgctxt "input-name"
-msgid "P5 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:315
-msgctxt "input-name"
-msgid "P5 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:316
-msgctxt "input-name"
-msgid "P5 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:317
-msgctxt "input-name"
-msgid "P5 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:318
-msgctxt "input-name"
-msgid "P5 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:323
-msgctxt "input-name"
-msgid "P6 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:324
-msgctxt "input-name"
-msgid "P6 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:325
-msgctxt "input-name"
-msgid "P6 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:326
-msgctxt "input-name"
-msgid "P6 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:327
-msgctxt "input-name"
-msgid "P6 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:328
-msgctxt "input-name"
-msgid "P6 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:329
-msgctxt "input-name"
-msgid "P6 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:330
-msgctxt "input-name"
-msgid "P6 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:331
-msgctxt "input-name"
-msgid "P6 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:332
-msgctxt "input-name"
-msgid "P6 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:333
-msgctxt "input-name"
-msgid "P6 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:334
-msgctxt "input-name"
-msgid "P6 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:335
-msgctxt "input-name"
-msgid "P6 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:336
-msgctxt "input-name"
-msgid "P6 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:337
-msgctxt "input-name"
-msgid "P6 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:338
-msgctxt "input-name"
-msgid "P6 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:339
-msgctxt "input-name"
-msgid "P6 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:340
-msgctxt "input-name"
-msgid "P6 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:341
-msgctxt "input-name"
-msgid "P6 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:342
-msgctxt "input-name"
-msgid "P6 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:343
-msgctxt "input-name"
-msgid "P6 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:344
-msgctxt "input-name"
-msgid "P6 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:345
-msgctxt "input-name"
-msgid "P6 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:346
-msgctxt "input-name"
-msgid "P6 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:347
-msgctxt "input-name"
-msgid "P6 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:348
-msgctxt "input-name"
-msgid "P6 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:349
-msgctxt "input-name"
-msgid "P6 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:350
-msgctxt "input-name"
-msgid "P6 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:351
-msgctxt "input-name"
-msgid "P6 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:352
-msgctxt "input-name"
-msgid "P6 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:357
-msgctxt "input-name"
-msgid "P7 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:358
-msgctxt "input-name"
-msgid "P7 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:359
-msgctxt "input-name"
-msgid "P7 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:360
-msgctxt "input-name"
-msgid "P7 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:361
-msgctxt "input-name"
-msgid "P7 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:362
-msgctxt "input-name"
-msgid "P7 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:363
-msgctxt "input-name"
-msgid "P7 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:364
-msgctxt "input-name"
-msgid "P7 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:365
-msgctxt "input-name"
-msgid "P7 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:366
-msgctxt "input-name"
-msgid "P7 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:367
-msgctxt "input-name"
-msgid "P7 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:368
-msgctxt "input-name"
-msgid "P7 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:369
-msgctxt "input-name"
-msgid "P7 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:370
-msgctxt "input-name"
-msgid "P7 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:371
-msgctxt "input-name"
-msgid "P7 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:372
-msgctxt "input-name"
-msgid "P7 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:373
-msgctxt "input-name"
-msgid "P7 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:374
-msgctxt "input-name"
-msgid "P7 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:375
-msgctxt "input-name"
-msgid "P7 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:376
-msgctxt "input-name"
-msgid "P7 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:377
-msgctxt "input-name"
-msgid "P7 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:378
-msgctxt "input-name"
-msgid "P7 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:379
-msgctxt "input-name"
-msgid "P7 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:380
-msgctxt "input-name"
-msgid "P7 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:381
-msgctxt "input-name"
-msgid "P7 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:382
-msgctxt "input-name"
-msgid "P7 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:383
-msgctxt "input-name"
-msgid "P7 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:384
-msgctxt "input-name"
-msgid "P7 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:385
-msgctxt "input-name"
-msgid "P7 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:386
-msgctxt "input-name"
-msgid "P7 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:391
-msgctxt "input-name"
-msgid "P8 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:392
-msgctxt "input-name"
-msgid "P8 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:393
-msgctxt "input-name"
-msgid "P8 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:394
-msgctxt "input-name"
-msgid "P8 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:395
-msgctxt "input-name"
-msgid "P8 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:396
-msgctxt "input-name"
-msgid "P8 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:397
-msgctxt "input-name"
-msgid "P8 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:398
-msgctxt "input-name"
-msgid "P8 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:399
-msgctxt "input-name"
-msgid "P8 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:400
-msgctxt "input-name"
-msgid "P8 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:401
-msgctxt "input-name"
-msgid "P8 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:402
-msgctxt "input-name"
-msgid "P8 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:403
-msgctxt "input-name"
-msgid "P8 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:404
-msgctxt "input-name"
-msgid "P8 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:405
-msgctxt "input-name"
-msgid "P8 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:406
-msgctxt "input-name"
-msgid "P8 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:407
-msgctxt "input-name"
-msgid "P8 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:408
-msgctxt "input-name"
-msgid "P8 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:409
-msgctxt "input-name"
-msgid "P8 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:410
-msgctxt "input-name"
-msgid "P8 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:411
-msgctxt "input-name"
-msgid "P8 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:412
-msgctxt "input-name"
-msgid "P8 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:413
-msgctxt "input-name"
-msgid "P8 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:414
-msgctxt "input-name"
-msgid "P8 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:415
-msgctxt "input-name"
-msgid "P8 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:416
-msgctxt "input-name"
-msgid "P8 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:417
-msgctxt "input-name"
-msgid "P8 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:418
-msgctxt "input-name"
-msgid "P8 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:419
-msgctxt "input-name"
-msgid "P8 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:420
-msgctxt "input-name"
-msgid "P8 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:425
-msgctxt "input-name"
-msgid "P9 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:426
-msgctxt "input-name"
-msgid "P9 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:427
-msgctxt "input-name"
-msgid "P9 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:428
-msgctxt "input-name"
-msgid "P9 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:429
-msgctxt "input-name"
-msgid "P9 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:430
-msgctxt "input-name"
-msgid "P9 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:431
-msgctxt "input-name"
-msgid "P9 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:432
-msgctxt "input-name"
-msgid "P9 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:433
-msgctxt "input-name"
-msgid "P9 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:434
-msgctxt "input-name"
-msgid "P9 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:435
-msgctxt "input-name"
-msgid "P9 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:436
-msgctxt "input-name"
-msgid "P9 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:437
-msgctxt "input-name"
-msgid "P9 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:438
-msgctxt "input-name"
-msgid "P9 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:439
-msgctxt "input-name"
-msgid "P9 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:440
-msgctxt "input-name"
-msgid "P9 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:441
-msgctxt "input-name"
-msgid "P9 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:442
-msgctxt "input-name"
-msgid "P9 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:443
-msgctxt "input-name"
-msgid "P9 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:444
-msgctxt "input-name"
-msgid "P9 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:445
-msgctxt "input-name"
-msgid "P9 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:446
-msgctxt "input-name"
-msgid "P9 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:447
-msgctxt "input-name"
-msgid "P9 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:448
-msgctxt "input-name"
-msgid "P9 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:449
-msgctxt "input-name"
-msgid "P9 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:450
-msgctxt "input-name"
-msgid "P9 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:451
-msgctxt "input-name"
-msgid "P9 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:452
-msgctxt "input-name"
-msgid "P9 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:453
-msgctxt "input-name"
-msgid "P9 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:454
-msgctxt "input-name"
-msgid "P9 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:459
-msgctxt "input-name"
-msgid "P10 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:460
-msgctxt "input-name"
-msgid "P10 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:461
-msgctxt "input-name"
-msgid "P10 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:462
-msgctxt "input-name"
-msgid "P10 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:463
-msgctxt "input-name"
-msgid "P10 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:464
-msgctxt "input-name"
-msgid "P10 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:465
-msgctxt "input-name"
-msgid "P10 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:466
-msgctxt "input-name"
-msgid "P10 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:467
-msgctxt "input-name"
-msgid "P10 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:468
-msgctxt "input-name"
-msgid "P10 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:469
-msgctxt "input-name"
-msgid "P10 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:470
-msgctxt "input-name"
-msgid "P10 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:471
-msgctxt "input-name"
-msgid "P10 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:472
-msgctxt "input-name"
-msgid "P10 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:473
-msgctxt "input-name"
-msgid "P10 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:474
-msgctxt "input-name"
-msgid "P10 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:475
-msgctxt "input-name"
-msgid "P10 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:476
-msgctxt "input-name"
-msgid "P10 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:477
-msgctxt "input-name"
-msgid "P10 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:478
-msgctxt "input-name"
-msgid "P10 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:479
-msgctxt "input-name"
-msgid "P10 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:480
-msgctxt "input-name"
-msgid "P10 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:481
-msgctxt "input-name"
-msgid "P10 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:482
-msgctxt "input-name"
-msgid "P10 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:483
-msgctxt "input-name"
-msgid "P10 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:484
-msgctxt "input-name"
-msgid "P10 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:485
-msgctxt "input-name"
-msgid "P10 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:486
-msgctxt "input-name"
-msgid "P10 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:487
-msgctxt "input-name"
-msgid "P10 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:488
-msgctxt "input-name"
-msgid "P10 Select"
-msgstr ""
-
 #: src/emu/inpttype.ipp:493
 msgctxt "input-name"
 msgid "1 Player Start"
@@ -5553,154 +4178,31 @@ msgctxt "input-name"
 msgid "Volume Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:550
-msgctxt "input-name"
-msgid "P1 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:551
-msgctxt "input-name"
-msgid "P2 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:552
-msgctxt "input-name"
-msgid "P3 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:553
-msgctxt "input-name"
-msgid "P4 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:554
-msgctxt "input-name"
-msgid "P5 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:555
-msgctxt "input-name"
-msgid "P6 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:556
-msgctxt "input-name"
-msgid "P7 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:557
-msgctxt "input-name"
-msgid "P8 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:558
-msgctxt "input-name"
-msgid "P9 Pedal 1"
-msgstr ""
-
+#: src/emu/inpttype.ipp:550 src/emu/inpttype.ipp:551 src/emu/inpttype.ipp:552
+#: src/emu/inpttype.ipp:553 src/emu/inpttype.ipp:554 src/emu/inpttype.ipp:555
+#: src/emu/inpttype.ipp:556 src/emu/inpttype.ipp:557 src/emu/inpttype.ipp:558
 #: src/emu/inpttype.ipp:559
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:564
-msgctxt "input-name"
-msgid "P1 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:565
-msgctxt "input-name"
-msgid "P2 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:566
-msgctxt "input-name"
-msgid "P3 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:567
-msgctxt "input-name"
-msgid "P4 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:568
-msgctxt "input-name"
-msgid "P5 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:569
-msgctxt "input-name"
-msgid "P6 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:570
-msgctxt "input-name"
-msgid "P7 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:571
-msgctxt "input-name"
-msgid "P8 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:572
-msgctxt "input-name"
-msgid "P9 Pedal 2"
+msgid "%p Pedal 1"
 msgstr ""
 
+#: src/emu/inpttype.ipp:564 src/emu/inpttype.ipp:565 src/emu/inpttype.ipp:566
+#: src/emu/inpttype.ipp:567 src/emu/inpttype.ipp:568 src/emu/inpttype.ipp:569
+#: src/emu/inpttype.ipp:570 src/emu/inpttype.ipp:571 src/emu/inpttype.ipp:572
 #: src/emu/inpttype.ipp:573
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:578
-msgctxt "input-name"
-msgid "P1 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:579
-msgctxt "input-name"
-msgid "P2 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:580
-msgctxt "input-name"
-msgid "P3 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:581
-msgctxt "input-name"
-msgid "P4 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:582
-msgctxt "input-name"
-msgid "P5 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:583
-msgctxt "input-name"
-msgid "P6 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:584
-msgctxt "input-name"
-msgid "P7 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:585
-msgctxt "input-name"
-msgid "P8 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:586
-msgctxt "input-name"
-msgid "P9 Pedal 3"
+msgid "%p Pedal 2"
 msgstr ""
 
+#: src/emu/inpttype.ipp:578 src/emu/inpttype.ipp:579 src/emu/inpttype.ipp:580
+#: src/emu/inpttype.ipp:581 src/emu/inpttype.ipp:582 src/emu/inpttype.ipp:583
+#: src/emu/inpttype.ipp:584 src/emu/inpttype.ipp:585 src/emu/inpttype.ipp:586
 #: src/emu/inpttype.ipp:587
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 3"
+msgid "%p Pedal 3"
 msgstr ""
 
 #: src/emu/inpttype.ipp:592
@@ -7600,6 +6102,53 @@ msgid ""
 "%s"
 msgstr ""
 
+#~ msgid "Confirm quit from machines"
+#~ msgstr "Bevestig afsluiten machines"
+
+#~ msgid "Skip information screen at startup"
+#~ msgstr "Sla informatie bij opstarten over"
+
+#~ msgid "Skip software parts selection menu"
+#~ msgstr "Softwareonderdelen selectiemenu overslaan"
+
+#~ msgid "Simultaneous contradictory"
+#~ msgstr "Gelijktijdig tegenstrijdig"
+
+#~ msgid "Adstick Device Assignment"
+#~ msgstr "Adsticktoewijzing"
+
+#, c-format
+#~ msgid ""
+#~ "Auditing ROMs for machine %2$u of %3$u...\n"
+#~ "%1$s"
+#~ msgstr ""
+#~ "ROMs controleren voor machine %2$u van %3$u...\n"
+#~ "%1$s"
+
+#, c-format
+#~ msgid "Audit ROMs for %1$u machines marked unavailable"
+#~ msgstr "Controleer ROMs voor %1$u onbeschikbaar gemarkeerde machines"
+
+#, c-format
+#~ msgid "Audit ROMs for all %1$u machines"
+#~ msgstr "Controleer ROMs voor alle %1$u machines"
+
+#~ msgid "Input (this Machine)"
+#~ msgstr "Invoer (deze machine)"
+
+#~ msgid "ROM Audit Result\tOK\n"
+#~ msgstr "ROM-controle Resultaat\tOK\n"
+
+#~ msgid "ROM Audit Result\tBAD\n"
+#~ msgstr "ROM-controle Resultaat\tSLECHT\n"
+
+#~ msgid ""
+#~ "ROM Audit \tDisabled\n"
+#~ "Samples Audit \tDisabled\n"
+#~ msgstr ""
+#~ "ROM-controle \tUitgeschakeld\n"
+#~ "Samplecontrole \tUitgeschakeld\n"
+
 #~ msgid "Device Mapping"
 #~ msgstr "Invoerapparaat in kaart brengen"
 
diff --git a/language/English/strings.po b/language/English/strings.po
index 6f3ad7c6e7f..c4e0c42f5ef 100644
--- a/language/English/strings.po
+++ b/language/English/strings.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-19 02:50+1100\n"
+"POT-Creation-Date: 2021-12-09 04:44+1100\n"
 "PO-Revision-Date: 2016-02-20 18:03+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: MAME Language Team\n"
@@ -260,12 +260,12 @@ msgstr ""
 msgid "Driver: \"%1$s\" software list "
 msgstr ""
 
-#: src/frontend/mame/ui/selsoft.cpp:711 src/frontend/mame/ui/selgame.cpp:1066
+#: src/frontend/mame/ui/selsoft.cpp:711 src/frontend/mame/ui/selgame.cpp:1076
 #, c-format
 msgid "%1$s: %2$s - Search: %3$s_"
 msgstr ""
 
-#: src/frontend/mame/ui/selsoft.cpp:713 src/frontend/mame/ui/selgame.cpp:1068
+#: src/frontend/mame/ui/selsoft.cpp:713 src/frontend/mame/ui/selgame.cpp:1078
 #, c-format
 msgid "Search: %1$s_"
 msgstr ""
@@ -275,7 +275,7 @@ msgstr ""
 msgid "Software list/item: %1$s:%2$s"
 msgstr ""
 
-#: src/frontend/mame/ui/optsmenu.cpp:73 src/frontend/mame/ui/sndmenu.cpp:165
+#: src/frontend/mame/ui/optsmenu.cpp:73 src/frontend/mame/ui/sndmenu.cpp:161
 msgid "Sound Options"
 msgstr ""
 
@@ -370,11 +370,11 @@ msgid "Show mouse pointer"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:39
-msgid "Confirm quit from machines"
+msgid "Confirm quit from emulation"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:40
-msgid "Skip information screen at startup"
+msgid "Skip system information screen"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:41
@@ -390,7 +390,7 @@ msgid "Skip BIOS selection menu"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:44
-msgid "Skip software parts selection menu"
+msgid "Skip software part selection menu"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:45
@@ -542,7 +542,7 @@ msgid "UI active"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:91
-msgid "Offscreen reload"
+msgid "Off-screen reload"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:92
@@ -558,7 +558,7 @@ msgid "Natural keyboard"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:95
-msgid "Simultaneous contradictory"
+msgid "Allow contradictory joystick inputs"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:96
@@ -582,7 +582,7 @@ msgid "Pedal Device Assignment"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:106
-msgid "Adstick Device Assignment"
+msgid "AD Stick Device Assignment"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:107
@@ -669,14 +669,14 @@ msgstr ""
 msgid "Wait Vertical Sync"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:687
+#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:689
 #: src/frontend/mame/ui/videoopt.cpp:191 src/frontend/mame/ui/custui.cpp:490
 #: src/frontend/mame/ui/analogipt.cpp:471 plugins/cheatfind/init.lua:766
 #: plugins/cheatfind/init.lua:777 plugins/cheat/init.lua:668
 msgid "On"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:690
+#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:692
 #: src/frontend/mame/ui/videoopt.cpp:207 src/frontend/mame/ui/custui.cpp:490
 #: src/frontend/mame/ui/analogipt.cpp:471 plugins/cheatfind/init.lua:763
 #: plugins/cheatfind/init.lua:774 plugins/cheat/init.lua:671
@@ -684,11 +684,11 @@ msgstr ""
 msgid "Off"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:693
+#: src/frontend/mame/ui/menu.cpp:695
 msgid "Auto"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:1195
+#: src/frontend/mame/ui/menu.cpp:1197
 #: src/frontend/mame/ui/simpleselgame.cpp:278
 #: src/frontend/mame/ui/selmenu.cpp:1280
 msgid "Return to Previous Menu"
@@ -696,7 +696,7 @@ msgstr ""
 
 #: src/frontend/mame/ui/filemngr.cpp:139
 #: src/frontend/mame/ui/confswitch.cpp:119
-#: src/frontend/mame/ui/inputmap.cpp:559 src/frontend/mame/ui/analogipt.cpp:360
+#: src/frontend/mame/ui/inputmap.cpp:563 src/frontend/mame/ui/analogipt.cpp:360
 #, c-format
 msgid "[root%1$s]"
 msgstr ""
@@ -939,22 +939,22 @@ msgid ""
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "GHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "MHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "kHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "Hz"
 msgstr ""
 
@@ -978,38 +978,38 @@ msgstr ""
 msgid "Vector"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:480
+#: src/frontend/mame/ui/info.cpp:483
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:480
+#: src/frontend/mame/ui/info.cpp:483
 msgid "%2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:497
+#: src/frontend/mame/ui/info.cpp:500
 #, c-format
 msgid "Screen '%1$s'"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:499
+#: src/frontend/mame/ui/info.cpp:502
 msgid "Screen"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:570 src/frontend/mame/ui/info.cpp:581
+#: src/frontend/mame/ui/info.cpp:573 src/frontend/mame/ui/info.cpp:584
 #, c-format
 msgid "%1$s:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:662
+#: src/frontend/mame/ui/info.cpp:665
 msgid "Not supported"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:665
+#: src/frontend/mame/ui/info.cpp:668
 msgid "Partially supported"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:674
+#: src/frontend/mame/ui/info.cpp:677
 msgid "[empty]"
 msgstr ""
 
@@ -1082,7 +1082,7 @@ msgid "Emulated"
 msgstr ""
 
 #: src/frontend/mame/ui/keyboard.cpp:59 src/frontend/mame/ui/confswitch.cpp:117
-#: src/frontend/mame/ui/inputmap.cpp:557 src/frontend/mame/ui/analogipt.cpp:358
+#: src/frontend/mame/ui/inputmap.cpp:561 src/frontend/mame/ui/analogipt.cpp:358
 #, c-format
 msgid "%1$s [root%2$s]"
 msgstr ""
@@ -1442,7 +1442,7 @@ msgctxt "swlist-info"
 msgid "Software list/item"
 msgstr ""
 
-#: src/frontend/mame/ui/datmenu.cpp:88 src/frontend/mame/ui/selmenu.cpp:2698
+#: src/frontend/mame/ui/datmenu.cpp:88 src/frontend/mame/ui/selmenu.cpp:2707
 msgid "Software List Info"
 msgstr ""
 
@@ -1557,7 +1557,7 @@ msgstr ""
 msgid "Configure Machine:"
 msgstr ""
 
-#: src/frontend/mame/ui/miscmenu.cpp:858 src/frontend/mame/ui/selmenu.cpp:2638
+#: src/frontend/mame/ui/miscmenu.cpp:858 src/frontend/mame/ui/selmenu.cpp:2647
 msgid " (default)"
 msgstr ""
 
@@ -1574,7 +1574,7 @@ msgid ""
 "Press %2$s to return to emulation"
 msgstr ""
 
-#: src/frontend/mame/ui/info_pty.cpp:30 src/frontend/mame/ui/mainmenu.cpp:155
+#: src/frontend/mame/ui/info_pty.cpp:30
 msgid "Pseudo terminals"
 msgstr ""
 
@@ -1642,52 +1642,52 @@ msgstr ""
 msgid "Other Controls"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:227
+#: src/frontend/mame/ui/inputmap.cpp:231
 msgid "This machine has no configurable inputs."
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:327
+#: src/frontend/mame/ui/inputmap.cpp:331
 msgid "Pressed"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:397
+#: src/frontend/mame/ui/inputmap.cpp:401
 msgid "Invalid sequence entered"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:542
+#: src/frontend/mame/ui/inputmap.cpp:546
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:543
+#: src/frontend/mame/ui/inputmap.cpp:547
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog Inc"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:544
+#: src/frontend/mame/ui/inputmap.cpp:548
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog Dec"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:586
+#: src/frontend/mame/ui/inputmap.cpp:590
 #, c-format
 msgid "Press %1$s to set\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:587
+#: src/frontend/mame/ui/inputmap.cpp:591
 #, c-format
 msgid "Press %1$s to append\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:588
+#: src/frontend/mame/ui/inputmap.cpp:592
 #, c-format
 msgid "Press %1$s to clear\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:589
+#: src/frontend/mame/ui/inputmap.cpp:593
 #, c-format
 msgid "Press %1$s to restore default\n"
 msgstr ""
@@ -1751,7 +1751,7 @@ msgid ""
 msgstr ""
 
 #: src/frontend/mame/ui/simpleselgame.cpp:273
-#: src/frontend/mame/ui/selgame.cpp:436
+#: src/frontend/mame/ui/selgame.cpp:443
 msgid "Configure Options"
 msgstr ""
 
@@ -2079,16 +2079,16 @@ msgstr ""
 msgid "Expand to fit"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:437
+#: src/frontend/mame/ui/selgame.cpp:444
 msgid "Configure Machine"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:1050
+#: src/frontend/mame/ui/selgame.cpp:1060
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d machines (%5$d BIOS) )"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:1078
+#: src/frontend/mame/ui/selgame.cpp:1088
 #, c-format
 msgid "System: %1$-.100s"
 msgstr ""
@@ -2110,7 +2110,7 @@ msgstr ""
 #: src/frontend/mame/ui/auditmenu.cpp:98
 #, c-format
 msgid ""
-"Auditing ROMs for machine %2$u of %3$u...\n"
+"Auditing media for machine %2$u of %3$u...\n"
 "%1$s"
 msgstr ""
 
@@ -2125,12 +2125,12 @@ msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:136
 #, c-format
-msgid "Audit ROMs for %1$u machines marked unavailable"
+msgid "Audit media for %1$u machines marked unavailable"
 msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:137
 #, c-format
-msgid "Audit ROMs for all %1$u machines"
+msgid "Audit media for all %1$u machines"
 msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:154
@@ -2336,84 +2336,84 @@ msgctxt "color-sample"
 msgid "Clone"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:914
+#: src/frontend/mame/ui/custui.cpp:906
 msgid "ARGB Settings"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:919 src/frontend/mame/ui/custui.cpp:922
+#: src/frontend/mame/ui/custui.cpp:911 src/frontend/mame/ui/custui.cpp:914
 msgctxt "color-channel"
 msgid "Alpha"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:927 src/frontend/mame/ui/custui.cpp:930
+#: src/frontend/mame/ui/custui.cpp:919 src/frontend/mame/ui/custui.cpp:922
 msgctxt "color-channel"
 msgid "Red"
 msgstr ""
 
+#: src/frontend/mame/ui/custui.cpp:927 src/frontend/mame/ui/custui.cpp:930
+msgctxt "color-channel"
+msgid "Green"
+msgstr ""
+
 #: src/frontend/mame/ui/custui.cpp:935 src/frontend/mame/ui/custui.cpp:938
 msgctxt "color-channel"
-msgid "Green"
-msgstr ""
-
-#: src/frontend/mame/ui/custui.cpp:943 src/frontend/mame/ui/custui.cpp:946
-msgctxt "color-channel"
 msgid "Blue"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:949
+#: src/frontend/mame/ui/custui.cpp:941
 msgid "Choose from palette"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:996
+#: src/frontend/mame/ui/custui.cpp:988
 msgid "Color preview:"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1093
+#: src/frontend/mame/ui/custui.cpp:1085
 msgctxt "color-preset"
 msgid "White"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1094
+#: src/frontend/mame/ui/custui.cpp:1086
 msgctxt "color-preset"
 msgid "Silver"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1095
+#: src/frontend/mame/ui/custui.cpp:1087
 msgctxt "color-preset"
 msgid "Gray"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1096
+#: src/frontend/mame/ui/custui.cpp:1088
 msgctxt "color-preset"
 msgid "Black"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1097
+#: src/frontend/mame/ui/custui.cpp:1089
 msgctxt "color-preset"
 msgid "Red"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1098
+#: src/frontend/mame/ui/custui.cpp:1090
 msgctxt "color-preset"
 msgid "Orange"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1099
+#: src/frontend/mame/ui/custui.cpp:1091
 msgctxt "color-preset"
 msgid "Yellow"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1100
+#: src/frontend/mame/ui/custui.cpp:1092
 msgctxt "color-preset"
 msgid "Green"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1101
+#: src/frontend/mame/ui/custui.cpp:1093
 msgctxt "color-preset"
 msgid "Blue"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1102
+#: src/frontend/mame/ui/custui.cpp:1094
 msgctxt "color-preset"
 msgid "Violet"
 msgstr ""
@@ -2478,7 +2478,7 @@ msgid "Input (general)"
 msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:123
-msgid "Input (this Machine)"
+msgid "Input (this machine)"
 msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:126
@@ -2517,6 +2517,10 @@ msgstr ""
 msgid "Tape Control"
 msgstr ""
 
+#: src/frontend/mame/ui/mainmenu.cpp:155
+msgid "Pseudo Terminals"
+msgstr ""
+
 #: src/frontend/mame/ui/mainmenu.cpp:158
 msgid "BIOS Selection"
 msgstr ""
@@ -2555,7 +2559,7 @@ msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:200
 #, c-format
-msgid "About %s"
+msgid "About %1$s"
 msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:212
@@ -2715,373 +2719,373 @@ msgstr ""
 msgid "%1$s %2$s"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2235
+#: src/frontend/mame/ui/selmenu.cpp:2244
 msgid "Images"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2236
+#: src/frontend/mame/ui/selmenu.cpp:2245
 msgid "Infos"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2551
+#: src/frontend/mame/ui/selmenu.cpp:2560
 msgid ""
 "Required ROM/disk images for the selected system are missing or incorrect. "
 "Please acquire the correct files or select a different system.\n"
 "\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2567
+#: src/frontend/mame/ui/selmenu.cpp:2576
 msgid ""
 "Required ROM/disk images for the selected software are missing or incorrect. "
 "Please acquire the correct files or select a different software item.\n"
 "\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2583
+#: src/frontend/mame/ui/selmenu.cpp:2592
 msgid "incorrect checksum"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2586
+#: src/frontend/mame/ui/selmenu.cpp:2595
 msgid "incorrect length"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2589
+#: src/frontend/mame/ui/selmenu.cpp:2598
 msgid "not found"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2600
+#: src/frontend/mame/ui/selmenu.cpp:2609
 #, c-format
 msgid "%1$s (%2$s) - %3$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2602
+#: src/frontend/mame/ui/selmenu.cpp:2611
 #, c-format
 msgid "%1$s - %2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2606
+#: src/frontend/mame/ui/selmenu.cpp:2615
 msgid "Press any key to continue."
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2735
+#: src/frontend/mame/ui/selmenu.cpp:2744
 msgid "General Info"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2887
-#, c-format
-msgid "Romset\t%1$s\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2888
-#, c-format
-msgid "Year\t%1$s\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2889
-#, c-format
-msgid "Manufacturer\t%1$s\n"
-msgstr ""
-
 #: src/frontend/mame/ui/selmenu.cpp:2896
 #, c-format
-msgid "Driver is Clone of\t%1$s\n"
+msgid "Romset\t%1$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2901
-msgid "Driver is Parent\t\n"
+#: src/frontend/mame/ui/selmenu.cpp:2897
+#, c-format
+msgid "Year\t%1$s\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2898
+#, c-format
+msgid "Manufacturer\t%1$s\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2905
-msgid "Analog Controls\tYes\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2907
-msgid "Keyboard Inputs\tYes\n"
+#, c-format
+msgid "Driver is Clone of\t%1$s\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2910
-msgid "Overall\tNOT WORKING\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2912
-msgid "Overall\tUnemulated Protection\n"
+msgid "Driver is Parent\t\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2914
-msgid "Overall\tWorking\n"
+msgid "Analog Controls\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2917
-msgid "Graphics\tUnimplemented\n"
+#: src/frontend/mame/ui/selmenu.cpp:2916
+msgid "Keyboard Inputs\tYes\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2919
-msgid "Graphics\tWrong Colors\n"
+msgid "Overall\tNOT WORKING\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2921
-msgid "Graphics\tImperfect Colors\n"
+msgid "Overall\tUnemulated Protection\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2923
-msgid "Graphics\tImperfect\n"
+msgid "Overall\tWorking\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2925
-msgid "Graphics\tOK\n"
+#: src/frontend/mame/ui/selmenu.cpp:2926
+msgid "Graphics\tUnimplemented\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2928
-msgid "Sound\tNone\n"
+msgid "Graphics\tWrong Colors\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2930
-msgid "Sound\tUnimplemented\n"
+msgid "Graphics\tImperfect Colors\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2932
-msgid "Sound\tImperfect\n"
+msgid "Graphics\tImperfect\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2934
-msgid "Sound\tOK\n"
+msgid "Graphics\tOK\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2937
-msgid "Capture\tUnimplemented\n"
+msgid "Sound\tNone\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2939
+msgid "Sound\tUnimplemented\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2941
+msgid "Sound\tImperfect\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2943
+msgid "Sound\tOK\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2946
+msgid "Capture\tUnimplemented\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2948
 msgid "Capture\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2942
+#: src/frontend/mame/ui/selmenu.cpp:2951
 msgid "Camera\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2944
+#: src/frontend/mame/ui/selmenu.cpp:2953
 msgid "Camera\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2947
+#: src/frontend/mame/ui/selmenu.cpp:2956
 msgid "Microphone\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2949
+#: src/frontend/mame/ui/selmenu.cpp:2958
 msgid "Microphone\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2952
+#: src/frontend/mame/ui/selmenu.cpp:2961
 msgid "Controls\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2954
+#: src/frontend/mame/ui/selmenu.cpp:2963
 msgid "Controls\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2957
+#: src/frontend/mame/ui/selmenu.cpp:2966
 msgid "Keyboard\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2959
+#: src/frontend/mame/ui/selmenu.cpp:2968
 msgid "Keyboard\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2962
+#: src/frontend/mame/ui/selmenu.cpp:2971
 msgid "Mouse\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2964
+#: src/frontend/mame/ui/selmenu.cpp:2973
 msgid "Mouse\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2967
+#: src/frontend/mame/ui/selmenu.cpp:2976
 msgid "Media\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2969
+#: src/frontend/mame/ui/selmenu.cpp:2978
 msgid "Media\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2972
+#: src/frontend/mame/ui/selmenu.cpp:2981
 msgid "Disk\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2974
+#: src/frontend/mame/ui/selmenu.cpp:2983
 msgid "Disk\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2977
+#: src/frontend/mame/ui/selmenu.cpp:2986
 msgid "Printer\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2979
+#: src/frontend/mame/ui/selmenu.cpp:2988
 msgid "Printer\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2982
+#: src/frontend/mame/ui/selmenu.cpp:2991
 msgid "Mag. Tape\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2984
+#: src/frontend/mame/ui/selmenu.cpp:2993
 msgid "Mag. Tape\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2987
+#: src/frontend/mame/ui/selmenu.cpp:2996
 msgid "Punch Tape\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2989
+#: src/frontend/mame/ui/selmenu.cpp:2998
 msgid "Punch Tape\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2992
+#: src/frontend/mame/ui/selmenu.cpp:3001
 msgid "Mag. Drum\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2994
+#: src/frontend/mame/ui/selmenu.cpp:3003
 msgid "Mag. Drum\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2997
+#: src/frontend/mame/ui/selmenu.cpp:3006
 msgid "(EP)ROM\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2999
+#: src/frontend/mame/ui/selmenu.cpp:3008
 msgid "(EP)ROM\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3002
+#: src/frontend/mame/ui/selmenu.cpp:3011
 msgid "Communications\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3004
+#: src/frontend/mame/ui/selmenu.cpp:3013
 msgid "Communications\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3007
+#: src/frontend/mame/ui/selmenu.cpp:3016
 msgid "LAN\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3009
+#: src/frontend/mame/ui/selmenu.cpp:3018
 msgid "LAN\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3012
+#: src/frontend/mame/ui/selmenu.cpp:3021
 msgid "WAN\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3014
+#: src/frontend/mame/ui/selmenu.cpp:3023
 msgid "WAN\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3017
+#: src/frontend/mame/ui/selmenu.cpp:3026
 msgid "Timing\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3019
+#: src/frontend/mame/ui/selmenu.cpp:3028
 msgid "Timing\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3021
+#: src/frontend/mame/ui/selmenu.cpp:3030
 msgid "Mechanical Machine\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3021
+#: src/frontend/mame/ui/selmenu.cpp:3030
 msgid "Mechanical Machine\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3022
+#: src/frontend/mame/ui/selmenu.cpp:3031
 msgid "Requires Artwork\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3022
+#: src/frontend/mame/ui/selmenu.cpp:3031
 msgid "Requires Artwork\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3023
+#: src/frontend/mame/ui/selmenu.cpp:3032
 msgid "Requires Clickable Artwork\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3023
+#: src/frontend/mame/ui/selmenu.cpp:3032
 msgid "Requires Clickable Artwork\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3025
+#: src/frontend/mame/ui/selmenu.cpp:3034
 msgid "Support Cocktail\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3026
+#: src/frontend/mame/ui/selmenu.cpp:3035
 msgid "Driver is BIOS\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3026
+#: src/frontend/mame/ui/selmenu.cpp:3035
 msgid "Driver is BIOS\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3027
+#: src/frontend/mame/ui/selmenu.cpp:3036
 msgid "Support Save\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3027
+#: src/frontend/mame/ui/selmenu.cpp:3036
 msgid "Support Save\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3028
+#: src/frontend/mame/ui/selmenu.cpp:3037
 msgid "Screen Orientation\tVertical\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3028
+#: src/frontend/mame/ui/selmenu.cpp:3037
 msgid "Screen Orientation\tHorizontal\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3038
+#: src/frontend/mame/ui/selmenu.cpp:3047
 msgid "Requires CHD\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3038
+#: src/frontend/mame/ui/selmenu.cpp:3047
 msgid "Requires CHD\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3051
-msgid "ROM Audit Result\tOK\n"
+#: src/frontend/mame/ui/selmenu.cpp:3060
+msgid "Media Audit Result\tOK\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3053
-msgid "ROM Audit Result\tBAD\n"
+#: src/frontend/mame/ui/selmenu.cpp:3062
+msgid "Media Audit Result\tBAD\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3056
+#: src/frontend/mame/ui/selmenu.cpp:3065
 msgid "Samples Audit Result\tNone Needed\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3058
+#: src/frontend/mame/ui/selmenu.cpp:3067
 msgid "Samples Audit Result\tOK\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3060
+#: src/frontend/mame/ui/selmenu.cpp:3069
 msgid "Samples Audit Result\tBAD\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3064
+#: src/frontend/mame/ui/selmenu.cpp:3073
 msgid ""
-"ROM Audit \tDisabled\n"
-"Samples Audit \tDisabled\n"
+"Media Audit\tDisabled\n"
+"Samples Audit\tDisabled\n"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:150
+#: src/frontend/mame/ui/sndmenu.cpp:146
 msgid "Sound"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:151
+#: src/frontend/mame/ui/sndmenu.cpp:147
 msgid "Compressor"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:152
+#: src/frontend/mame/ui/sndmenu.cpp:148
 msgid "Sample Rate"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:153
+#: src/frontend/mame/ui/sndmenu.cpp:149
 msgid "Use External Samples"
 msgstr ""
 
@@ -3120,511 +3124,681 @@ msgstr ""
 msgid "  Screen '%1$s': Vector\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:132
+#: src/frontend/mame/ui/devopt.cpp:135
 #, c-format
 msgid "  Screen '%1$s': %2$d × %3$d (V) %4$s Hz\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:133
+#: src/frontend/mame/ui/devopt.cpp:136
 #, c-format
 msgid "  Screen '%1$s': %2$d × %3$d (H) %4$s Hz\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:147
+#: src/frontend/mame/ui/devopt.cpp:150
 msgid "* Sound:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:211
+#: src/frontend/mame/ui/devopt.cpp:214
 #, c-format
 msgid ""
 "* BIOS settings:\n"
 "  %1$d options    [default: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:255 src/frontend/mame/ui/devopt.cpp:271
-#: src/frontend/mame/ui/devopt.cpp:332
+#: src/frontend/mame/ui/devopt.cpp:258 src/frontend/mame/ui/devopt.cpp:274
+#: src/frontend/mame/ui/devopt.cpp:335
 #, c-format
 msgid "  %1$s    [default: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:260 src/frontend/mame/ui/devopt.cpp:276
+#: src/frontend/mame/ui/devopt.cpp:263 src/frontend/mame/ui/devopt.cpp:279
 #, c-format
 msgid "  %1$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:282
+#: src/frontend/mame/ui/devopt.cpp:285
 msgid "* DIP switch settings:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:287
+#: src/frontend/mame/ui/devopt.cpp:290
 msgid "* Configuration settings:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:291
+#: src/frontend/mame/ui/devopt.cpp:294
 msgid "* Input device(s):\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:293
+#: src/frontend/mame/ui/devopt.cpp:296
 #, c-format
 msgid "  User inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:295
+#: src/frontend/mame/ui/devopt.cpp:298
 #, c-format
 msgid "  Mahjong inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:297
+#: src/frontend/mame/ui/devopt.cpp:300
 #, c-format
 msgid "  Hanafuda inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:299
+#: src/frontend/mame/ui/devopt.cpp:302
 #, c-format
 msgid "  Gambling inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:301
+#: src/frontend/mame/ui/devopt.cpp:304
 #, c-format
 msgid "  Analog inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:303
+#: src/frontend/mame/ui/devopt.cpp:306
 #, c-format
 msgid "  Adjuster inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:305
+#: src/frontend/mame/ui/devopt.cpp:308
 #, c-format
 msgid "  Keypad inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:307
+#: src/frontend/mame/ui/devopt.cpp:310
 #, c-format
 msgid "  Keyboard inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:312
+#: src/frontend/mame/ui/devopt.cpp:315
 msgid "* Media Options:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:317
+#: src/frontend/mame/ui/devopt.cpp:320
 #, c-format
 msgid "  %1$s    [tag: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:327
+#: src/frontend/mame/ui/devopt.cpp:330
 msgid "* Slot Options:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:341
+#: src/frontend/mame/ui/devopt.cpp:344
 msgid "[None]\n"
 msgstr ""
 
-#: src/emu/render.cpp:1847
+#: src/emu/render.cpp:1796
 #, c-format
 msgctxt "view-name"
 msgid "Screen %1$u Standard (%2$u:%3$u)"
 msgstr ""
 
-#: src/emu/render.cpp:1873
+#: src/emu/render.cpp:1822
 #, c-format
 msgctxt "view-name"
 msgid "Screen %1$u Pixel Aspect (%2$u:%3$u)"
 msgstr ""
 
-#: src/emu/render.cpp:1895 src/emu/render.cpp:2030
+#: src/emu/render.cpp:1844 src/emu/render.cpp:1979
 msgctxt "view-name"
 msgid "Cocktail"
 msgstr ""
 
-#: src/emu/render.cpp:2015
+#: src/emu/render.cpp:1964
 msgctxt "view-name"
 msgid "Left-to-Right"
 msgstr ""
 
-#: src/emu/render.cpp:2016
+#: src/emu/render.cpp:1965
 msgctxt "view-name"
 msgid "Left-to-Right (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2017
+#: src/emu/render.cpp:1966
 msgctxt "view-name"
 msgid "Top-to-Bottom"
 msgstr ""
 
-#: src/emu/render.cpp:2018
+#: src/emu/render.cpp:1967
 msgctxt "view-name"
 msgid "Top-to-Bottom (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2069
+#: src/emu/render.cpp:2018
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Left-to-Right, Top-to-Bottom"
 msgstr ""
 
-#: src/emu/render.cpp:2078
+#: src/emu/render.cpp:2027
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Left-to-Right, Top-to-Bottom (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2087
+#: src/emu/render.cpp:2036
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Top-to-Bottom, Left-to-Right"
 msgstr ""
 
-#: src/emu/render.cpp:2096
+#: src/emu/render.cpp:2045
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Top-to-Bottom, Left-to-Right (Gapless)"
 msgstr ""
 
-#: src/emu/inpttype.ipp:22
+#: src/emu/ioport.cpp:332
+#, c-format
 msgctxt "input-name"
-msgid "P1 Up"
+msgid "P%1$u"
 msgstr ""
 
-#: src/emu/inpttype.ipp:23
+#: src/emu/ioport.cpp:1924
 msgctxt "input-name"
-msgid "P1 Down"
+msgid "???"
 msgstr ""
 
-#: src/emu/inpttype.ipp:24
+#: src/emu/inpttype.ipp:22 src/emu/inpttype.ipp:140 src/emu/inpttype.ipp:221
+#: src/emu/inpttype.ipp:255 src/emu/inpttype.ipp:289 src/emu/inpttype.ipp:323
+#: src/emu/inpttype.ipp:357 src/emu/inpttype.ipp:391 src/emu/inpttype.ipp:425
+#: src/emu/inpttype.ipp:459
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left"
+msgid "%p Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:25
+#: src/emu/inpttype.ipp:23 src/emu/inpttype.ipp:141 src/emu/inpttype.ipp:222
+#: src/emu/inpttype.ipp:256 src/emu/inpttype.ipp:290 src/emu/inpttype.ipp:324
+#: src/emu/inpttype.ipp:358 src/emu/inpttype.ipp:392 src/emu/inpttype.ipp:426
+#: src/emu/inpttype.ipp:460
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right"
+msgid "%p Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:26
+#: src/emu/inpttype.ipp:24 src/emu/inpttype.ipp:142 src/emu/inpttype.ipp:223
+#: src/emu/inpttype.ipp:257 src/emu/inpttype.ipp:291 src/emu/inpttype.ipp:325
+#: src/emu/inpttype.ipp:359 src/emu/inpttype.ipp:393 src/emu/inpttype.ipp:427
+#: src/emu/inpttype.ipp:461
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Up"
+msgid "%p Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:27
+#: src/emu/inpttype.ipp:25 src/emu/inpttype.ipp:143 src/emu/inpttype.ipp:224
+#: src/emu/inpttype.ipp:258 src/emu/inpttype.ipp:292 src/emu/inpttype.ipp:326
+#: src/emu/inpttype.ipp:360 src/emu/inpttype.ipp:394 src/emu/inpttype.ipp:428
+#: src/emu/inpttype.ipp:462
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Down"
+msgid "%p Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:28
+#: src/emu/inpttype.ipp:26 src/emu/inpttype.ipp:144 src/emu/inpttype.ipp:225
+#: src/emu/inpttype.ipp:259 src/emu/inpttype.ipp:293 src/emu/inpttype.ipp:327
+#: src/emu/inpttype.ipp:361 src/emu/inpttype.ipp:395 src/emu/inpttype.ipp:429
+#: src/emu/inpttype.ipp:463
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Left"
+msgid "%p Right Stick/Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:29
+#: src/emu/inpttype.ipp:27 src/emu/inpttype.ipp:145 src/emu/inpttype.ipp:226
+#: src/emu/inpttype.ipp:260 src/emu/inpttype.ipp:294 src/emu/inpttype.ipp:328
+#: src/emu/inpttype.ipp:362 src/emu/inpttype.ipp:396 src/emu/inpttype.ipp:430
+#: src/emu/inpttype.ipp:464
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Right"
+msgid "%p Right Stick/Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:30
+#: src/emu/inpttype.ipp:28 src/emu/inpttype.ipp:146 src/emu/inpttype.ipp:227
+#: src/emu/inpttype.ipp:261 src/emu/inpttype.ipp:295 src/emu/inpttype.ipp:329
+#: src/emu/inpttype.ipp:363 src/emu/inpttype.ipp:397 src/emu/inpttype.ipp:431
+#: src/emu/inpttype.ipp:465
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Up"
+msgid "%p Right Stick/Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:31
+#: src/emu/inpttype.ipp:29 src/emu/inpttype.ipp:147 src/emu/inpttype.ipp:228
+#: src/emu/inpttype.ipp:262 src/emu/inpttype.ipp:296 src/emu/inpttype.ipp:330
+#: src/emu/inpttype.ipp:364 src/emu/inpttype.ipp:398 src/emu/inpttype.ipp:432
+#: src/emu/inpttype.ipp:466
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Down"
+msgid "%p Right Stick/Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:32
+#: src/emu/inpttype.ipp:30 src/emu/inpttype.ipp:148 src/emu/inpttype.ipp:229
+#: src/emu/inpttype.ipp:263 src/emu/inpttype.ipp:297 src/emu/inpttype.ipp:331
+#: src/emu/inpttype.ipp:365 src/emu/inpttype.ipp:399 src/emu/inpttype.ipp:433
+#: src/emu/inpttype.ipp:467
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Left"
+msgid "%p Left Stick/Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:33
+#: src/emu/inpttype.ipp:31 src/emu/inpttype.ipp:149 src/emu/inpttype.ipp:230
+#: src/emu/inpttype.ipp:264 src/emu/inpttype.ipp:298 src/emu/inpttype.ipp:332
+#: src/emu/inpttype.ipp:366 src/emu/inpttype.ipp:400 src/emu/inpttype.ipp:434
+#: src/emu/inpttype.ipp:468
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Right"
+msgid "%p Left Stick/Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:34
+#: src/emu/inpttype.ipp:32 src/emu/inpttype.ipp:150 src/emu/inpttype.ipp:231
+#: src/emu/inpttype.ipp:265 src/emu/inpttype.ipp:299 src/emu/inpttype.ipp:333
+#: src/emu/inpttype.ipp:367 src/emu/inpttype.ipp:401 src/emu/inpttype.ipp:435
+#: src/emu/inpttype.ipp:469
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 1"
+msgid "%p Left Stick/Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:35
+#: src/emu/inpttype.ipp:33 src/emu/inpttype.ipp:151 src/emu/inpttype.ipp:232
+#: src/emu/inpttype.ipp:266 src/emu/inpttype.ipp:300 src/emu/inpttype.ipp:334
+#: src/emu/inpttype.ipp:368 src/emu/inpttype.ipp:402 src/emu/inpttype.ipp:436
+#: src/emu/inpttype.ipp:470
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 2"
+msgid "%p Left Stick/Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:36
+#: src/emu/inpttype.ipp:34 src/emu/inpttype.ipp:152 src/emu/inpttype.ipp:233
+#: src/emu/inpttype.ipp:267 src/emu/inpttype.ipp:301 src/emu/inpttype.ipp:335
+#: src/emu/inpttype.ipp:369 src/emu/inpttype.ipp:403 src/emu/inpttype.ipp:437
+#: src/emu/inpttype.ipp:471
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 3"
+msgid "%p Button 1"
 msgstr ""
 
-#: src/emu/inpttype.ipp:37
+#: src/emu/inpttype.ipp:35 src/emu/inpttype.ipp:153 src/emu/inpttype.ipp:234
+#: src/emu/inpttype.ipp:268 src/emu/inpttype.ipp:302 src/emu/inpttype.ipp:336
+#: src/emu/inpttype.ipp:370 src/emu/inpttype.ipp:404 src/emu/inpttype.ipp:438
+#: src/emu/inpttype.ipp:472
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 4"
+msgid "%p Button 2"
 msgstr ""
 
-#: src/emu/inpttype.ipp:38
+#: src/emu/inpttype.ipp:36 src/emu/inpttype.ipp:154 src/emu/inpttype.ipp:235
+#: src/emu/inpttype.ipp:269 src/emu/inpttype.ipp:303 src/emu/inpttype.ipp:337
+#: src/emu/inpttype.ipp:371 src/emu/inpttype.ipp:405 src/emu/inpttype.ipp:439
+#: src/emu/inpttype.ipp:473
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 5"
+msgid "%p Button 3"
 msgstr ""
 
-#: src/emu/inpttype.ipp:39
+#: src/emu/inpttype.ipp:37 src/emu/inpttype.ipp:155 src/emu/inpttype.ipp:236
+#: src/emu/inpttype.ipp:270 src/emu/inpttype.ipp:304 src/emu/inpttype.ipp:338
+#: src/emu/inpttype.ipp:372 src/emu/inpttype.ipp:406 src/emu/inpttype.ipp:440
+#: src/emu/inpttype.ipp:474
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 6"
+msgid "%p Button 4"
 msgstr ""
 
-#: src/emu/inpttype.ipp:40
+#: src/emu/inpttype.ipp:38 src/emu/inpttype.ipp:156 src/emu/inpttype.ipp:237
+#: src/emu/inpttype.ipp:271 src/emu/inpttype.ipp:305 src/emu/inpttype.ipp:339
+#: src/emu/inpttype.ipp:373 src/emu/inpttype.ipp:407 src/emu/inpttype.ipp:441
+#: src/emu/inpttype.ipp:475
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 7"
+msgid "%p Button 5"
 msgstr ""
 
-#: src/emu/inpttype.ipp:41
+#: src/emu/inpttype.ipp:39 src/emu/inpttype.ipp:157 src/emu/inpttype.ipp:238
+#: src/emu/inpttype.ipp:272 src/emu/inpttype.ipp:306 src/emu/inpttype.ipp:340
+#: src/emu/inpttype.ipp:374 src/emu/inpttype.ipp:408 src/emu/inpttype.ipp:442
+#: src/emu/inpttype.ipp:476
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 8"
+msgid "%p Button 6"
 msgstr ""
 
-#: src/emu/inpttype.ipp:42
+#: src/emu/inpttype.ipp:40 src/emu/inpttype.ipp:158 src/emu/inpttype.ipp:239
+#: src/emu/inpttype.ipp:273 src/emu/inpttype.ipp:307 src/emu/inpttype.ipp:341
+#: src/emu/inpttype.ipp:375 src/emu/inpttype.ipp:409 src/emu/inpttype.ipp:443
+#: src/emu/inpttype.ipp:477
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 9"
+msgid "%p Button 7"
 msgstr ""
 
-#: src/emu/inpttype.ipp:43
+#: src/emu/inpttype.ipp:41 src/emu/inpttype.ipp:159 src/emu/inpttype.ipp:240
+#: src/emu/inpttype.ipp:274 src/emu/inpttype.ipp:308 src/emu/inpttype.ipp:342
+#: src/emu/inpttype.ipp:376 src/emu/inpttype.ipp:410 src/emu/inpttype.ipp:444
+#: src/emu/inpttype.ipp:478
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 10"
+msgid "%p Button 8"
 msgstr ""
 
-#: src/emu/inpttype.ipp:44
+#: src/emu/inpttype.ipp:42 src/emu/inpttype.ipp:160 src/emu/inpttype.ipp:241
+#: src/emu/inpttype.ipp:275 src/emu/inpttype.ipp:309 src/emu/inpttype.ipp:343
+#: src/emu/inpttype.ipp:377 src/emu/inpttype.ipp:411 src/emu/inpttype.ipp:445
+#: src/emu/inpttype.ipp:479
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 11"
+msgid "%p Button 9"
 msgstr ""
 
-#: src/emu/inpttype.ipp:45
+#: src/emu/inpttype.ipp:43 src/emu/inpttype.ipp:161 src/emu/inpttype.ipp:242
+#: src/emu/inpttype.ipp:276 src/emu/inpttype.ipp:310 src/emu/inpttype.ipp:344
+#: src/emu/inpttype.ipp:378 src/emu/inpttype.ipp:412 src/emu/inpttype.ipp:446
+#: src/emu/inpttype.ipp:480
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 12"
+msgid "%p Button 10"
 msgstr ""
 
-#: src/emu/inpttype.ipp:46
+#: src/emu/inpttype.ipp:44 src/emu/inpttype.ipp:162 src/emu/inpttype.ipp:243
+#: src/emu/inpttype.ipp:277 src/emu/inpttype.ipp:311 src/emu/inpttype.ipp:345
+#: src/emu/inpttype.ipp:379 src/emu/inpttype.ipp:413 src/emu/inpttype.ipp:447
+#: src/emu/inpttype.ipp:481
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 13"
+msgid "%p Button 11"
 msgstr ""
 
-#: src/emu/inpttype.ipp:47
+#: src/emu/inpttype.ipp:45 src/emu/inpttype.ipp:163 src/emu/inpttype.ipp:244
+#: src/emu/inpttype.ipp:278 src/emu/inpttype.ipp:312 src/emu/inpttype.ipp:346
+#: src/emu/inpttype.ipp:380 src/emu/inpttype.ipp:414 src/emu/inpttype.ipp:448
+#: src/emu/inpttype.ipp:482
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 14"
+msgid "%p Button 12"
 msgstr ""
 
-#: src/emu/inpttype.ipp:48
+#: src/emu/inpttype.ipp:46 src/emu/inpttype.ipp:164 src/emu/inpttype.ipp:245
+#: src/emu/inpttype.ipp:279 src/emu/inpttype.ipp:313 src/emu/inpttype.ipp:347
+#: src/emu/inpttype.ipp:381 src/emu/inpttype.ipp:415 src/emu/inpttype.ipp:449
+#: src/emu/inpttype.ipp:483
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 15"
+msgid "%p Button 13"
 msgstr ""
 
-#: src/emu/inpttype.ipp:49
+#: src/emu/inpttype.ipp:47 src/emu/inpttype.ipp:165 src/emu/inpttype.ipp:246
+#: src/emu/inpttype.ipp:280 src/emu/inpttype.ipp:314 src/emu/inpttype.ipp:348
+#: src/emu/inpttype.ipp:382 src/emu/inpttype.ipp:416 src/emu/inpttype.ipp:450
+#: src/emu/inpttype.ipp:484
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 16"
+msgid "%p Button 14"
 msgstr ""
 
-#: src/emu/inpttype.ipp:50
+#: src/emu/inpttype.ipp:48 src/emu/inpttype.ipp:166 src/emu/inpttype.ipp:247
+#: src/emu/inpttype.ipp:281 src/emu/inpttype.ipp:315 src/emu/inpttype.ipp:349
+#: src/emu/inpttype.ipp:383 src/emu/inpttype.ipp:417 src/emu/inpttype.ipp:451
+#: src/emu/inpttype.ipp:485
+#, c-format
 msgctxt "input-name"
-msgid "P1 Start"
+msgid "%p Button 15"
 msgstr ""
 
-#: src/emu/inpttype.ipp:51
+#: src/emu/inpttype.ipp:49 src/emu/inpttype.ipp:167 src/emu/inpttype.ipp:248
+#: src/emu/inpttype.ipp:282 src/emu/inpttype.ipp:316 src/emu/inpttype.ipp:350
+#: src/emu/inpttype.ipp:384 src/emu/inpttype.ipp:418 src/emu/inpttype.ipp:452
+#: src/emu/inpttype.ipp:486
+#, c-format
 msgctxt "input-name"
-msgid "P1 Select"
+msgid "%p Button 16"
 msgstr ""
 
-#: src/emu/inpttype.ipp:56
+#: src/emu/inpttype.ipp:50 src/emu/inpttype.ipp:168 src/emu/inpttype.ipp:249
+#: src/emu/inpttype.ipp:283 src/emu/inpttype.ipp:317 src/emu/inpttype.ipp:351
+#: src/emu/inpttype.ipp:385 src/emu/inpttype.ipp:419 src/emu/inpttype.ipp:453
+#: src/emu/inpttype.ipp:487
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong A"
+msgid "%p Start"
 msgstr ""
 
-#: src/emu/inpttype.ipp:57
+#: src/emu/inpttype.ipp:51 src/emu/inpttype.ipp:169 src/emu/inpttype.ipp:250
+#: src/emu/inpttype.ipp:284 src/emu/inpttype.ipp:318 src/emu/inpttype.ipp:352
+#: src/emu/inpttype.ipp:386 src/emu/inpttype.ipp:420 src/emu/inpttype.ipp:454
+#: src/emu/inpttype.ipp:488
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong B"
+msgid "%p Select"
 msgstr ""
 
-#: src/emu/inpttype.ipp:58
+#: src/emu/inpttype.ipp:56 src/emu/inpttype.ipp:174
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong C"
+msgid "%p Mahjong A"
 msgstr ""
 
-#: src/emu/inpttype.ipp:59
+#: src/emu/inpttype.ipp:57 src/emu/inpttype.ipp:175
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong D"
+msgid "%p Mahjong B"
 msgstr ""
 
-#: src/emu/inpttype.ipp:60
+#: src/emu/inpttype.ipp:58 src/emu/inpttype.ipp:176
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong E"
+msgid "%p Mahjong C"
 msgstr ""
 
-#: src/emu/inpttype.ipp:61
+#: src/emu/inpttype.ipp:59 src/emu/inpttype.ipp:177
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong F"
+msgid "%p Mahjong D"
 msgstr ""
 
-#: src/emu/inpttype.ipp:62
+#: src/emu/inpttype.ipp:60 src/emu/inpttype.ipp:178
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong G"
+msgid "%p Mahjong E"
 msgstr ""
 
-#: src/emu/inpttype.ipp:63
+#: src/emu/inpttype.ipp:61 src/emu/inpttype.ipp:179
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong H"
+msgid "%p Mahjong F"
 msgstr ""
 
-#: src/emu/inpttype.ipp:64
+#: src/emu/inpttype.ipp:62 src/emu/inpttype.ipp:180
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong I"
+msgid "%p Mahjong G"
 msgstr ""
 
-#: src/emu/inpttype.ipp:65
+#: src/emu/inpttype.ipp:63 src/emu/inpttype.ipp:181
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong J"
+msgid "%p Mahjong H"
 msgstr ""
 
-#: src/emu/inpttype.ipp:66
+#: src/emu/inpttype.ipp:64 src/emu/inpttype.ipp:182
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong K"
+msgid "%p Mahjong I"
 msgstr ""
 
-#: src/emu/inpttype.ipp:67
+#: src/emu/inpttype.ipp:65 src/emu/inpttype.ipp:183
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong L"
+msgid "%p Mahjong J"
 msgstr ""
 
-#: src/emu/inpttype.ipp:68
+#: src/emu/inpttype.ipp:66 src/emu/inpttype.ipp:184
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong M"
+msgid "%p Mahjong K"
 msgstr ""
 
-#: src/emu/inpttype.ipp:69
+#: src/emu/inpttype.ipp:67 src/emu/inpttype.ipp:185
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong N"
+msgid "%p Mahjong L"
 msgstr ""
 
-#: src/emu/inpttype.ipp:70
+#: src/emu/inpttype.ipp:68 src/emu/inpttype.ipp:186
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong O"
+msgid "%p Mahjong M"
 msgstr ""
 
-#: src/emu/inpttype.ipp:71
+#: src/emu/inpttype.ipp:69 src/emu/inpttype.ipp:187
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong P"
+msgid "%p Mahjong N"
 msgstr ""
 
-#: src/emu/inpttype.ipp:72
+#: src/emu/inpttype.ipp:70 src/emu/inpttype.ipp:188
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Q"
+msgid "%p Mahjong O"
 msgstr ""
 
-#: src/emu/inpttype.ipp:73
+#: src/emu/inpttype.ipp:71 src/emu/inpttype.ipp:189
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Kan"
+msgid "%p Mahjong P"
 msgstr ""
 
-#: src/emu/inpttype.ipp:74
+#: src/emu/inpttype.ipp:72 src/emu/inpttype.ipp:190
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Pon"
+msgid "%p Mahjong Q"
 msgstr ""
 
-#: src/emu/inpttype.ipp:75
+#: src/emu/inpttype.ipp:73 src/emu/inpttype.ipp:191
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Chi"
+msgid "%p Mahjong Kan"
 msgstr ""
 
-#: src/emu/inpttype.ipp:76
+#: src/emu/inpttype.ipp:74 src/emu/inpttype.ipp:192
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Reach"
+msgid "%p Mahjong Pon"
 msgstr ""
 
-#: src/emu/inpttype.ipp:77
+#: src/emu/inpttype.ipp:75 src/emu/inpttype.ipp:193
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Ron"
+msgid "%p Mahjong Chi"
 msgstr ""
 
-#: src/emu/inpttype.ipp:78
+#: src/emu/inpttype.ipp:76 src/emu/inpttype.ipp:194
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Flip Flop"
+msgid "%p Mahjong Reach"
 msgstr ""
 
-#: src/emu/inpttype.ipp:79
+#: src/emu/inpttype.ipp:77 src/emu/inpttype.ipp:195
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Bet"
+msgid "%p Mahjong Ron"
 msgstr ""
 
-#: src/emu/inpttype.ipp:80
+#: src/emu/inpttype.ipp:78 src/emu/inpttype.ipp:200
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Take Score"
+msgid "%p Mahjong Flip Flop"
 msgstr ""
 
-#: src/emu/inpttype.ipp:81
+#: src/emu/inpttype.ipp:79 src/emu/inpttype.ipp:196
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Double Up"
+msgid "%p Mahjong Bet"
 msgstr ""
 
-#: src/emu/inpttype.ipp:82
+#: src/emu/inpttype.ipp:80 src/emu/inpttype.ipp:198
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Big"
+msgid "%p Mahjong Take Score"
 msgstr ""
 
-#: src/emu/inpttype.ipp:83
+#: src/emu/inpttype.ipp:81 src/emu/inpttype.ipp:199
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Small"
+msgid "%p Mahjong Double Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:84
+#: src/emu/inpttype.ipp:82 src/emu/inpttype.ipp:201
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Last Chance"
+msgid "%p Mahjong Big"
 msgstr ""
 
-#: src/emu/inpttype.ipp:89
+#: src/emu/inpttype.ipp:83 src/emu/inpttype.ipp:202
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda A/1"
+msgid "%p Mahjong Small"
 msgstr ""
 
-#: src/emu/inpttype.ipp:90
+#: src/emu/inpttype.ipp:84 src/emu/inpttype.ipp:197
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda B/2"
+msgid "%p Mahjong Last Chance"
 msgstr ""
 
-#: src/emu/inpttype.ipp:91
+#: src/emu/inpttype.ipp:89 src/emu/inpttype.ipp:207
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda C/3"
+msgid "%p Hanafuda A/1"
 msgstr ""
 
-#: src/emu/inpttype.ipp:92
+#: src/emu/inpttype.ipp:90 src/emu/inpttype.ipp:208
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda D/4"
+msgid "%p Hanafuda B/2"
 msgstr ""
 
-#: src/emu/inpttype.ipp:93
+#: src/emu/inpttype.ipp:91 src/emu/inpttype.ipp:209
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda E/5"
+msgid "%p Hanafuda C/3"
 msgstr ""
 
-#: src/emu/inpttype.ipp:94
+#: src/emu/inpttype.ipp:92 src/emu/inpttype.ipp:210
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda F/6"
+msgid "%p Hanafuda D/4"
 msgstr ""
 
-#: src/emu/inpttype.ipp:95
+#: src/emu/inpttype.ipp:93 src/emu/inpttype.ipp:211
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda G/7"
+msgid "%p Hanafuda E/5"
 msgstr ""
 
-#: src/emu/inpttype.ipp:96
+#: src/emu/inpttype.ipp:94 src/emu/inpttype.ipp:212
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda H/8"
+msgid "%p Hanafuda F/6"
 msgstr ""
 
-#: src/emu/inpttype.ipp:97
+#: src/emu/inpttype.ipp:95 src/emu/inpttype.ipp:213
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda Yes"
+msgid "%p Hanafuda G/7"
 msgstr ""
 
-#: src/emu/inpttype.ipp:98
+#: src/emu/inpttype.ipp:96 src/emu/inpttype.ipp:214
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda No"
+msgid "%p Hanafuda H/8"
+msgstr ""
+
+#: src/emu/inpttype.ipp:97 src/emu/inpttype.ipp:215
+#, c-format
+msgctxt "input-name"
+msgid "%p Hanafuda Yes"
+msgstr ""
+
+#: src/emu/inpttype.ipp:98 src/emu/inpttype.ipp:216
+#, c-format
+msgctxt "input-name"
+msgid "%p Hanafuda No"
 msgstr ""
 
 #: src/emu/inpttype.ipp:103
@@ -3752,1551 +3926,6 @@ msgctxt "input-name"
 msgid "Stop All Reels"
 msgstr ""
 
-#: src/emu/inpttype.ipp:140
-msgctxt "input-name"
-msgid "P2 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:141
-msgctxt "input-name"
-msgid "P2 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:142
-msgctxt "input-name"
-msgid "P2 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:143
-msgctxt "input-name"
-msgid "P2 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:144
-msgctxt "input-name"
-msgid "P2 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:145
-msgctxt "input-name"
-msgid "P2 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:146
-msgctxt "input-name"
-msgid "P2 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:147
-msgctxt "input-name"
-msgid "P2 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:148
-msgctxt "input-name"
-msgid "P2 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:149
-msgctxt "input-name"
-msgid "P2 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:150
-msgctxt "input-name"
-msgid "P2 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:151
-msgctxt "input-name"
-msgid "P2 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:152
-msgctxt "input-name"
-msgid "P2 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:153
-msgctxt "input-name"
-msgid "P2 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:154
-msgctxt "input-name"
-msgid "P2 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:155
-msgctxt "input-name"
-msgid "P2 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:156
-msgctxt "input-name"
-msgid "P2 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:157
-msgctxt "input-name"
-msgid "P2 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:158
-msgctxt "input-name"
-msgid "P2 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:159
-msgctxt "input-name"
-msgid "P2 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:160
-msgctxt "input-name"
-msgid "P2 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:161
-msgctxt "input-name"
-msgid "P2 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:162
-msgctxt "input-name"
-msgid "P2 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:163
-msgctxt "input-name"
-msgid "P2 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:164
-msgctxt "input-name"
-msgid "P2 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:165
-msgctxt "input-name"
-msgid "P2 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:166
-msgctxt "input-name"
-msgid "P2 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:167
-msgctxt "input-name"
-msgid "P2 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:168
-msgctxt "input-name"
-msgid "P2 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:169
-msgctxt "input-name"
-msgid "P2 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:174
-msgctxt "input-name"
-msgid "P2 Mahjong A"
-msgstr ""
-
-#: src/emu/inpttype.ipp:175
-msgctxt "input-name"
-msgid "P2 Mahjong B"
-msgstr ""
-
-#: src/emu/inpttype.ipp:176
-msgctxt "input-name"
-msgid "P2 Mahjong C"
-msgstr ""
-
-#: src/emu/inpttype.ipp:177
-msgctxt "input-name"
-msgid "P2 Mahjong D"
-msgstr ""
-
-#: src/emu/inpttype.ipp:178
-msgctxt "input-name"
-msgid "P2 Mahjong E"
-msgstr ""
-
-#: src/emu/inpttype.ipp:179
-msgctxt "input-name"
-msgid "P2 Mahjong F"
-msgstr ""
-
-#: src/emu/inpttype.ipp:180
-msgctxt "input-name"
-msgid "P2 Mahjong G"
-msgstr ""
-
-#: src/emu/inpttype.ipp:181
-msgctxt "input-name"
-msgid "P2 Mahjong H"
-msgstr ""
-
-#: src/emu/inpttype.ipp:182
-msgctxt "input-name"
-msgid "P2 Mahjong I"
-msgstr ""
-
-#: src/emu/inpttype.ipp:183
-msgctxt "input-name"
-msgid "P2 Mahjong J"
-msgstr ""
-
-#: src/emu/inpttype.ipp:184
-msgctxt "input-name"
-msgid "P2 Mahjong K"
-msgstr ""
-
-#: src/emu/inpttype.ipp:185
-msgctxt "input-name"
-msgid "P2 Mahjong L"
-msgstr ""
-
-#: src/emu/inpttype.ipp:186
-msgctxt "input-name"
-msgid "P2 Mahjong M"
-msgstr ""
-
-#: src/emu/inpttype.ipp:187
-msgctxt "input-name"
-msgid "P2 Mahjong N"
-msgstr ""
-
-#: src/emu/inpttype.ipp:188
-msgctxt "input-name"
-msgid "P2 Mahjong O"
-msgstr ""
-
-#: src/emu/inpttype.ipp:189
-msgctxt "input-name"
-msgid "P2 Mahjong P"
-msgstr ""
-
-#: src/emu/inpttype.ipp:190
-msgctxt "input-name"
-msgid "P2 Mahjong Q"
-msgstr ""
-
-#: src/emu/inpttype.ipp:191
-msgctxt "input-name"
-msgid "P2 Mahjong Kan"
-msgstr ""
-
-#: src/emu/inpttype.ipp:192
-msgctxt "input-name"
-msgid "P2 Mahjong Pon"
-msgstr ""
-
-#: src/emu/inpttype.ipp:193
-msgctxt "input-name"
-msgid "P2 Mahjong Chi"
-msgstr ""
-
-#: src/emu/inpttype.ipp:194
-msgctxt "input-name"
-msgid "P2 Mahjong Reach"
-msgstr ""
-
-#: src/emu/inpttype.ipp:195
-msgctxt "input-name"
-msgid "P2 Mahjong Ron"
-msgstr ""
-
-#: src/emu/inpttype.ipp:196
-msgctxt "input-name"
-msgid "P2 Mahjong Bet"
-msgstr ""
-
-#: src/emu/inpttype.ipp:197
-msgctxt "input-name"
-msgid "P2 Mahjong Last Chance"
-msgstr ""
-
-#: src/emu/inpttype.ipp:198
-msgctxt "input-name"
-msgid "P2 Mahjong Take Score"
-msgstr ""
-
-#: src/emu/inpttype.ipp:199
-msgctxt "input-name"
-msgid "P2 Mahjong Double Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:200
-msgctxt "input-name"
-msgid "P2 Mahjong Flip Flop"
-msgstr ""
-
-#: src/emu/inpttype.ipp:201
-msgctxt "input-name"
-msgid "P2 Mahjong Big"
-msgstr ""
-
-#: src/emu/inpttype.ipp:202
-msgctxt "input-name"
-msgid "P2 Mahjong Small"
-msgstr ""
-
-#: src/emu/inpttype.ipp:207
-msgctxt "input-name"
-msgid "P2 Hanafuda A/1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:208
-msgctxt "input-name"
-msgid "P2 Hanafuda B/2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:209
-msgctxt "input-name"
-msgid "P2 Hanafuda C/3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:210
-msgctxt "input-name"
-msgid "P2 Hanafuda D/4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:211
-msgctxt "input-name"
-msgid "P2 Hanafuda E/5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:212
-msgctxt "input-name"
-msgid "P2 Hanafuda F/6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:213
-msgctxt "input-name"
-msgid "P2 Hanafuda G/7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:214
-msgctxt "input-name"
-msgid "P2 Hanafuda H/8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:215
-msgctxt "input-name"
-msgid "P2 Hanafuda Yes"
-msgstr ""
-
-#: src/emu/inpttype.ipp:216
-msgctxt "input-name"
-msgid "P2 Hanafuda No"
-msgstr ""
-
-#: src/emu/inpttype.ipp:221
-msgctxt "input-name"
-msgid "P3 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:222
-msgctxt "input-name"
-msgid "P3 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:223
-msgctxt "input-name"
-msgid "P3 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:224
-msgctxt "input-name"
-msgid "P3 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:225
-msgctxt "input-name"
-msgid "P3 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:226
-msgctxt "input-name"
-msgid "P3 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:227
-msgctxt "input-name"
-msgid "P3 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:228
-msgctxt "input-name"
-msgid "P3 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:229
-msgctxt "input-name"
-msgid "P3 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:230
-msgctxt "input-name"
-msgid "P3 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:231
-msgctxt "input-name"
-msgid "P3 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:232
-msgctxt "input-name"
-msgid "P3 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:233
-msgctxt "input-name"
-msgid "P3 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:234
-msgctxt "input-name"
-msgid "P3 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:235
-msgctxt "input-name"
-msgid "P3 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:236
-msgctxt "input-name"
-msgid "P3 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:237
-msgctxt "input-name"
-msgid "P3 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:238
-msgctxt "input-name"
-msgid "P3 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:239
-msgctxt "input-name"
-msgid "P3 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:240
-msgctxt "input-name"
-msgid "P3 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:241
-msgctxt "input-name"
-msgid "P3 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:242
-msgctxt "input-name"
-msgid "P3 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:243
-msgctxt "input-name"
-msgid "P3 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:244
-msgctxt "input-name"
-msgid "P3 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:245
-msgctxt "input-name"
-msgid "P3 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:246
-msgctxt "input-name"
-msgid "P3 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:247
-msgctxt "input-name"
-msgid "P3 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:248
-msgctxt "input-name"
-msgid "P3 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:249
-msgctxt "input-name"
-msgid "P3 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:250
-msgctxt "input-name"
-msgid "P3 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:255
-msgctxt "input-name"
-msgid "P4 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:256
-msgctxt "input-name"
-msgid "P4 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:257
-msgctxt "input-name"
-msgid "P4 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:258
-msgctxt "input-name"
-msgid "P4 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:259
-msgctxt "input-name"
-msgid "P4 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:260
-msgctxt "input-name"
-msgid "P4 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:261
-msgctxt "input-name"
-msgid "P4 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:262
-msgctxt "input-name"
-msgid "P4 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:263
-msgctxt "input-name"
-msgid "P4 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:264
-msgctxt "input-name"
-msgid "P4 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:265
-msgctxt "input-name"
-msgid "P4 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:266
-msgctxt "input-name"
-msgid "P4 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:267
-msgctxt "input-name"
-msgid "P4 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:268
-msgctxt "input-name"
-msgid "P4 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:269
-msgctxt "input-name"
-msgid "P4 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:270
-msgctxt "input-name"
-msgid "P4 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:271
-msgctxt "input-name"
-msgid "P4 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:272
-msgctxt "input-name"
-msgid "P4 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:273
-msgctxt "input-name"
-msgid "P4 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:274
-msgctxt "input-name"
-msgid "P4 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:275
-msgctxt "input-name"
-msgid "P4 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:276
-msgctxt "input-name"
-msgid "P4 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:277
-msgctxt "input-name"
-msgid "P4 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:278
-msgctxt "input-name"
-msgid "P4 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:279
-msgctxt "input-name"
-msgid "P4 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:280
-msgctxt "input-name"
-msgid "P4 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:281
-msgctxt "input-name"
-msgid "P4 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:282
-msgctxt "input-name"
-msgid "P4 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:283
-msgctxt "input-name"
-msgid "P4 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:284
-msgctxt "input-name"
-msgid "P4 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:289
-msgctxt "input-name"
-msgid "P5 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:290
-msgctxt "input-name"
-msgid "P5 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:291
-msgctxt "input-name"
-msgid "P5 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:292
-msgctxt "input-name"
-msgid "P5 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:293
-msgctxt "input-name"
-msgid "P5 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:294
-msgctxt "input-name"
-msgid "P5 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:295
-msgctxt "input-name"
-msgid "P5 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:296
-msgctxt "input-name"
-msgid "P5 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:297
-msgctxt "input-name"
-msgid "P5 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:298
-msgctxt "input-name"
-msgid "P5 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:299
-msgctxt "input-name"
-msgid "P5 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:300
-msgctxt "input-name"
-msgid "P5 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:301
-msgctxt "input-name"
-msgid "P5 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:302
-msgctxt "input-name"
-msgid "P5 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:303
-msgctxt "input-name"
-msgid "P5 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:304
-msgctxt "input-name"
-msgid "P5 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:305
-msgctxt "input-name"
-msgid "P5 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:306
-msgctxt "input-name"
-msgid "P5 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:307
-msgctxt "input-name"
-msgid "P5 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:308
-msgctxt "input-name"
-msgid "P5 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:309
-msgctxt "input-name"
-msgid "P5 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:310
-msgctxt "input-name"
-msgid "P5 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:311
-msgctxt "input-name"
-msgid "P5 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:312
-msgctxt "input-name"
-msgid "P5 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:313
-msgctxt "input-name"
-msgid "P5 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:314
-msgctxt "input-name"
-msgid "P5 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:315
-msgctxt "input-name"
-msgid "P5 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:316
-msgctxt "input-name"
-msgid "P5 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:317
-msgctxt "input-name"
-msgid "P5 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:318
-msgctxt "input-name"
-msgid "P5 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:323
-msgctxt "input-name"
-msgid "P6 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:324
-msgctxt "input-name"
-msgid "P6 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:325
-msgctxt "input-name"
-msgid "P6 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:326
-msgctxt "input-name"
-msgid "P6 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:327
-msgctxt "input-name"
-msgid "P6 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:328
-msgctxt "input-name"
-msgid "P6 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:329
-msgctxt "input-name"
-msgid "P6 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:330
-msgctxt "input-name"
-msgid "P6 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:331
-msgctxt "input-name"
-msgid "P6 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:332
-msgctxt "input-name"
-msgid "P6 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:333
-msgctxt "input-name"
-msgid "P6 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:334
-msgctxt "input-name"
-msgid "P6 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:335
-msgctxt "input-name"
-msgid "P6 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:336
-msgctxt "input-name"
-msgid "P6 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:337
-msgctxt "input-name"
-msgid "P6 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:338
-msgctxt "input-name"
-msgid "P6 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:339
-msgctxt "input-name"
-msgid "P6 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:340
-msgctxt "input-name"
-msgid "P6 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:341
-msgctxt "input-name"
-msgid "P6 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:342
-msgctxt "input-name"
-msgid "P6 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:343
-msgctxt "input-name"
-msgid "P6 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:344
-msgctxt "input-name"
-msgid "P6 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:345
-msgctxt "input-name"
-msgid "P6 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:346
-msgctxt "input-name"
-msgid "P6 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:347
-msgctxt "input-name"
-msgid "P6 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:348
-msgctxt "input-name"
-msgid "P6 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:349
-msgctxt "input-name"
-msgid "P6 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:350
-msgctxt "input-name"
-msgid "P6 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:351
-msgctxt "input-name"
-msgid "P6 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:352
-msgctxt "input-name"
-msgid "P6 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:357
-msgctxt "input-name"
-msgid "P7 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:358
-msgctxt "input-name"
-msgid "P7 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:359
-msgctxt "input-name"
-msgid "P7 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:360
-msgctxt "input-name"
-msgid "P7 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:361
-msgctxt "input-name"
-msgid "P7 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:362
-msgctxt "input-name"
-msgid "P7 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:363
-msgctxt "input-name"
-msgid "P7 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:364
-msgctxt "input-name"
-msgid "P7 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:365
-msgctxt "input-name"
-msgid "P7 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:366
-msgctxt "input-name"
-msgid "P7 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:367
-msgctxt "input-name"
-msgid "P7 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:368
-msgctxt "input-name"
-msgid "P7 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:369
-msgctxt "input-name"
-msgid "P7 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:370
-msgctxt "input-name"
-msgid "P7 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:371
-msgctxt "input-name"
-msgid "P7 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:372
-msgctxt "input-name"
-msgid "P7 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:373
-msgctxt "input-name"
-msgid "P7 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:374
-msgctxt "input-name"
-msgid "P7 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:375
-msgctxt "input-name"
-msgid "P7 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:376
-msgctxt "input-name"
-msgid "P7 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:377
-msgctxt "input-name"
-msgid "P7 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:378
-msgctxt "input-name"
-msgid "P7 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:379
-msgctxt "input-name"
-msgid "P7 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:380
-msgctxt "input-name"
-msgid "P7 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:381
-msgctxt "input-name"
-msgid "P7 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:382
-msgctxt "input-name"
-msgid "P7 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:383
-msgctxt "input-name"
-msgid "P7 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:384
-msgctxt "input-name"
-msgid "P7 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:385
-msgctxt "input-name"
-msgid "P7 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:386
-msgctxt "input-name"
-msgid "P7 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:391
-msgctxt "input-name"
-msgid "P8 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:392
-msgctxt "input-name"
-msgid "P8 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:393
-msgctxt "input-name"
-msgid "P8 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:394
-msgctxt "input-name"
-msgid "P8 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:395
-msgctxt "input-name"
-msgid "P8 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:396
-msgctxt "input-name"
-msgid "P8 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:397
-msgctxt "input-name"
-msgid "P8 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:398
-msgctxt "input-name"
-msgid "P8 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:399
-msgctxt "input-name"
-msgid "P8 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:400
-msgctxt "input-name"
-msgid "P8 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:401
-msgctxt "input-name"
-msgid "P8 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:402
-msgctxt "input-name"
-msgid "P8 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:403
-msgctxt "input-name"
-msgid "P8 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:404
-msgctxt "input-name"
-msgid "P8 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:405
-msgctxt "input-name"
-msgid "P8 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:406
-msgctxt "input-name"
-msgid "P8 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:407
-msgctxt "input-name"
-msgid "P8 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:408
-msgctxt "input-name"
-msgid "P8 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:409
-msgctxt "input-name"
-msgid "P8 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:410
-msgctxt "input-name"
-msgid "P8 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:411
-msgctxt "input-name"
-msgid "P8 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:412
-msgctxt "input-name"
-msgid "P8 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:413
-msgctxt "input-name"
-msgid "P8 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:414
-msgctxt "input-name"
-msgid "P8 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:415
-msgctxt "input-name"
-msgid "P8 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:416
-msgctxt "input-name"
-msgid "P8 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:417
-msgctxt "input-name"
-msgid "P8 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:418
-msgctxt "input-name"
-msgid "P8 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:419
-msgctxt "input-name"
-msgid "P8 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:420
-msgctxt "input-name"
-msgid "P8 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:425
-msgctxt "input-name"
-msgid "P9 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:426
-msgctxt "input-name"
-msgid "P9 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:427
-msgctxt "input-name"
-msgid "P9 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:428
-msgctxt "input-name"
-msgid "P9 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:429
-msgctxt "input-name"
-msgid "P9 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:430
-msgctxt "input-name"
-msgid "P9 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:431
-msgctxt "input-name"
-msgid "P9 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:432
-msgctxt "input-name"
-msgid "P9 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:433
-msgctxt "input-name"
-msgid "P9 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:434
-msgctxt "input-name"
-msgid "P9 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:435
-msgctxt "input-name"
-msgid "P9 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:436
-msgctxt "input-name"
-msgid "P9 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:437
-msgctxt "input-name"
-msgid "P9 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:438
-msgctxt "input-name"
-msgid "P9 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:439
-msgctxt "input-name"
-msgid "P9 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:440
-msgctxt "input-name"
-msgid "P9 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:441
-msgctxt "input-name"
-msgid "P9 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:442
-msgctxt "input-name"
-msgid "P9 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:443
-msgctxt "input-name"
-msgid "P9 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:444
-msgctxt "input-name"
-msgid "P9 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:445
-msgctxt "input-name"
-msgid "P9 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:446
-msgctxt "input-name"
-msgid "P9 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:447
-msgctxt "input-name"
-msgid "P9 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:448
-msgctxt "input-name"
-msgid "P9 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:449
-msgctxt "input-name"
-msgid "P9 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:450
-msgctxt "input-name"
-msgid "P9 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:451
-msgctxt "input-name"
-msgid "P9 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:452
-msgctxt "input-name"
-msgid "P9 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:453
-msgctxt "input-name"
-msgid "P9 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:454
-msgctxt "input-name"
-msgid "P9 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:459
-msgctxt "input-name"
-msgid "P10 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:460
-msgctxt "input-name"
-msgid "P10 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:461
-msgctxt "input-name"
-msgid "P10 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:462
-msgctxt "input-name"
-msgid "P10 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:463
-msgctxt "input-name"
-msgid "P10 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:464
-msgctxt "input-name"
-msgid "P10 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:465
-msgctxt "input-name"
-msgid "P10 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:466
-msgctxt "input-name"
-msgid "P10 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:467
-msgctxt "input-name"
-msgid "P10 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:468
-msgctxt "input-name"
-msgid "P10 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:469
-msgctxt "input-name"
-msgid "P10 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:470
-msgctxt "input-name"
-msgid "P10 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:471
-msgctxt "input-name"
-msgid "P10 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:472
-msgctxt "input-name"
-msgid "P10 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:473
-msgctxt "input-name"
-msgid "P10 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:474
-msgctxt "input-name"
-msgid "P10 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:475
-msgctxt "input-name"
-msgid "P10 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:476
-msgctxt "input-name"
-msgid "P10 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:477
-msgctxt "input-name"
-msgid "P10 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:478
-msgctxt "input-name"
-msgid "P10 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:479
-msgctxt "input-name"
-msgid "P10 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:480
-msgctxt "input-name"
-msgid "P10 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:481
-msgctxt "input-name"
-msgid "P10 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:482
-msgctxt "input-name"
-msgid "P10 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:483
-msgctxt "input-name"
-msgid "P10 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:484
-msgctxt "input-name"
-msgid "P10 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:485
-msgctxt "input-name"
-msgid "P10 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:486
-msgctxt "input-name"
-msgid "P10 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:487
-msgctxt "input-name"
-msgid "P10 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:488
-msgctxt "input-name"
-msgid "P10 Select"
-msgstr ""
-
 #: src/emu/inpttype.ipp:493
 msgctxt "input-name"
 msgid "1 Player Start"
@@ -5477,154 +4106,31 @@ msgctxt "input-name"
 msgid "Volume Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:550
-msgctxt "input-name"
-msgid "P1 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:551
-msgctxt "input-name"
-msgid "P2 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:552
-msgctxt "input-name"
-msgid "P3 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:553
-msgctxt "input-name"
-msgid "P4 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:554
-msgctxt "input-name"
-msgid "P5 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:555
-msgctxt "input-name"
-msgid "P6 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:556
-msgctxt "input-name"
-msgid "P7 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:557
-msgctxt "input-name"
-msgid "P8 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:558
-msgctxt "input-name"
-msgid "P9 Pedal 1"
-msgstr ""
-
+#: src/emu/inpttype.ipp:550 src/emu/inpttype.ipp:551 src/emu/inpttype.ipp:552
+#: src/emu/inpttype.ipp:553 src/emu/inpttype.ipp:554 src/emu/inpttype.ipp:555
+#: src/emu/inpttype.ipp:556 src/emu/inpttype.ipp:557 src/emu/inpttype.ipp:558
 #: src/emu/inpttype.ipp:559
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:564
-msgctxt "input-name"
-msgid "P1 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:565
-msgctxt "input-name"
-msgid "P2 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:566
-msgctxt "input-name"
-msgid "P3 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:567
-msgctxt "input-name"
-msgid "P4 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:568
-msgctxt "input-name"
-msgid "P5 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:569
-msgctxt "input-name"
-msgid "P6 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:570
-msgctxt "input-name"
-msgid "P7 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:571
-msgctxt "input-name"
-msgid "P8 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:572
-msgctxt "input-name"
-msgid "P9 Pedal 2"
+msgid "%p Pedal 1"
 msgstr ""
 
+#: src/emu/inpttype.ipp:564 src/emu/inpttype.ipp:565 src/emu/inpttype.ipp:566
+#: src/emu/inpttype.ipp:567 src/emu/inpttype.ipp:568 src/emu/inpttype.ipp:569
+#: src/emu/inpttype.ipp:570 src/emu/inpttype.ipp:571 src/emu/inpttype.ipp:572
 #: src/emu/inpttype.ipp:573
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:578
-msgctxt "input-name"
-msgid "P1 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:579
-msgctxt "input-name"
-msgid "P2 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:580
-msgctxt "input-name"
-msgid "P3 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:581
-msgctxt "input-name"
-msgid "P4 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:582
-msgctxt "input-name"
-msgid "P5 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:583
-msgctxt "input-name"
-msgid "P6 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:584
-msgctxt "input-name"
-msgid "P7 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:585
-msgctxt "input-name"
-msgid "P8 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:586
-msgctxt "input-name"
-msgid "P9 Pedal 3"
+msgid "%p Pedal 2"
 msgstr ""
 
+#: src/emu/inpttype.ipp:578 src/emu/inpttype.ipp:579 src/emu/inpttype.ipp:580
+#: src/emu/inpttype.ipp:581 src/emu/inpttype.ipp:582 src/emu/inpttype.ipp:583
+#: src/emu/inpttype.ipp:584 src/emu/inpttype.ipp:585 src/emu/inpttype.ipp:586
 #: src/emu/inpttype.ipp:587
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 3"
+msgid "%p Pedal 3"
 msgstr ""
 
 #: src/emu/inpttype.ipp:592
diff --git a/language/Estonian/strings.po b/language/Estonian/strings.po
index 71fcc3988b6..f5bdb5d2a43 100644
--- a/language/Estonian/strings.po
+++ b/language/Estonian/strings.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-19 02:50+1100\n"
+"POT-Creation-Date: 2021-12-09 04:44+1100\n"
 "PO-Revision-Date: 2016-02-20 18:03+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: MAME Language Team\n"
@@ -260,12 +260,12 @@ msgstr ""
 msgid "Driver: \"%1$s\" software list "
 msgstr ""
 
-#: src/frontend/mame/ui/selsoft.cpp:711 src/frontend/mame/ui/selgame.cpp:1066
+#: src/frontend/mame/ui/selsoft.cpp:711 src/frontend/mame/ui/selgame.cpp:1076
 #, c-format
 msgid "%1$s: %2$s - Search: %3$s_"
 msgstr ""
 
-#: src/frontend/mame/ui/selsoft.cpp:713 src/frontend/mame/ui/selgame.cpp:1068
+#: src/frontend/mame/ui/selsoft.cpp:713 src/frontend/mame/ui/selgame.cpp:1078
 #, c-format
 msgid "Search: %1$s_"
 msgstr ""
@@ -275,7 +275,7 @@ msgstr ""
 msgid "Software list/item: %1$s:%2$s"
 msgstr ""
 
-#: src/frontend/mame/ui/optsmenu.cpp:73 src/frontend/mame/ui/sndmenu.cpp:165
+#: src/frontend/mame/ui/optsmenu.cpp:73 src/frontend/mame/ui/sndmenu.cpp:161
 msgid "Sound Options"
 msgstr ""
 
@@ -370,11 +370,11 @@ msgid "Show mouse pointer"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:39
-msgid "Confirm quit from machines"
+msgid "Confirm quit from emulation"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:40
-msgid "Skip information screen at startup"
+msgid "Skip system information screen"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:41
@@ -390,7 +390,7 @@ msgid "Skip BIOS selection menu"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:44
-msgid "Skip software parts selection menu"
+msgid "Skip software part selection menu"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:45
@@ -542,7 +542,7 @@ msgid "UI active"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:91
-msgid "Offscreen reload"
+msgid "Off-screen reload"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:92
@@ -558,7 +558,7 @@ msgid "Natural keyboard"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:95
-msgid "Simultaneous contradictory"
+msgid "Allow contradictory joystick inputs"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:96
@@ -582,7 +582,7 @@ msgid "Pedal Device Assignment"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:106
-msgid "Adstick Device Assignment"
+msgid "AD Stick Device Assignment"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:107
@@ -669,14 +669,14 @@ msgstr ""
 msgid "Wait Vertical Sync"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:687
+#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:689
 #: src/frontend/mame/ui/videoopt.cpp:191 src/frontend/mame/ui/custui.cpp:490
 #: src/frontend/mame/ui/analogipt.cpp:471 plugins/cheatfind/init.lua:766
 #: plugins/cheatfind/init.lua:777 plugins/cheat/init.lua:668
 msgid "On"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:690
+#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:692
 #: src/frontend/mame/ui/videoopt.cpp:207 src/frontend/mame/ui/custui.cpp:490
 #: src/frontend/mame/ui/analogipt.cpp:471 plugins/cheatfind/init.lua:763
 #: plugins/cheatfind/init.lua:774 plugins/cheat/init.lua:671
@@ -684,11 +684,11 @@ msgstr ""
 msgid "Off"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:693
+#: src/frontend/mame/ui/menu.cpp:695
 msgid "Auto"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:1195
+#: src/frontend/mame/ui/menu.cpp:1197
 #: src/frontend/mame/ui/simpleselgame.cpp:278
 #: src/frontend/mame/ui/selmenu.cpp:1280
 msgid "Return to Previous Menu"
@@ -696,7 +696,7 @@ msgstr ""
 
 #: src/frontend/mame/ui/filemngr.cpp:139
 #: src/frontend/mame/ui/confswitch.cpp:119
-#: src/frontend/mame/ui/inputmap.cpp:559 src/frontend/mame/ui/analogipt.cpp:360
+#: src/frontend/mame/ui/inputmap.cpp:563 src/frontend/mame/ui/analogipt.cpp:360
 #, c-format
 msgid "[root%1$s]"
 msgstr ""
@@ -939,22 +939,22 @@ msgid ""
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "GHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "MHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "kHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "Hz"
 msgstr ""
 
@@ -978,38 +978,38 @@ msgstr ""
 msgid "Vector"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:480
+#: src/frontend/mame/ui/info.cpp:483
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:480
+#: src/frontend/mame/ui/info.cpp:483
 msgid "%2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:497
+#: src/frontend/mame/ui/info.cpp:500
 #, c-format
 msgid "Screen '%1$s'"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:499
+#: src/frontend/mame/ui/info.cpp:502
 msgid "Screen"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:570 src/frontend/mame/ui/info.cpp:581
+#: src/frontend/mame/ui/info.cpp:573 src/frontend/mame/ui/info.cpp:584
 #, c-format
 msgid "%1$s:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:662
+#: src/frontend/mame/ui/info.cpp:665
 msgid "Not supported"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:665
+#: src/frontend/mame/ui/info.cpp:668
 msgid "Partially supported"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:674
+#: src/frontend/mame/ui/info.cpp:677
 msgid "[empty]"
 msgstr ""
 
@@ -1082,7 +1082,7 @@ msgid "Emulated"
 msgstr ""
 
 #: src/frontend/mame/ui/keyboard.cpp:59 src/frontend/mame/ui/confswitch.cpp:117
-#: src/frontend/mame/ui/inputmap.cpp:557 src/frontend/mame/ui/analogipt.cpp:358
+#: src/frontend/mame/ui/inputmap.cpp:561 src/frontend/mame/ui/analogipt.cpp:358
 #, c-format
 msgid "%1$s [root%2$s]"
 msgstr ""
@@ -1442,7 +1442,7 @@ msgctxt "swlist-info"
 msgid "Software list/item"
 msgstr ""
 
-#: src/frontend/mame/ui/datmenu.cpp:88 src/frontend/mame/ui/selmenu.cpp:2698
+#: src/frontend/mame/ui/datmenu.cpp:88 src/frontend/mame/ui/selmenu.cpp:2707
 msgid "Software List Info"
 msgstr ""
 
@@ -1557,7 +1557,7 @@ msgstr ""
 msgid "Configure Machine:"
 msgstr ""
 
-#: src/frontend/mame/ui/miscmenu.cpp:858 src/frontend/mame/ui/selmenu.cpp:2638
+#: src/frontend/mame/ui/miscmenu.cpp:858 src/frontend/mame/ui/selmenu.cpp:2647
 msgid " (default)"
 msgstr ""
 
@@ -1574,7 +1574,7 @@ msgid ""
 "Press %2$s to return to emulation"
 msgstr ""
 
-#: src/frontend/mame/ui/info_pty.cpp:30 src/frontend/mame/ui/mainmenu.cpp:155
+#: src/frontend/mame/ui/info_pty.cpp:30
 msgid "Pseudo terminals"
 msgstr ""
 
@@ -1642,52 +1642,52 @@ msgstr ""
 msgid "Other Controls"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:227
+#: src/frontend/mame/ui/inputmap.cpp:231
 msgid "This machine has no configurable inputs."
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:327
+#: src/frontend/mame/ui/inputmap.cpp:331
 msgid "Pressed"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:397
+#: src/frontend/mame/ui/inputmap.cpp:401
 msgid "Invalid sequence entered"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:542
+#: src/frontend/mame/ui/inputmap.cpp:546
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:543
+#: src/frontend/mame/ui/inputmap.cpp:547
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog Inc"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:544
+#: src/frontend/mame/ui/inputmap.cpp:548
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog Dec"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:586
+#: src/frontend/mame/ui/inputmap.cpp:590
 #, c-format
 msgid "Press %1$s to set\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:587
+#: src/frontend/mame/ui/inputmap.cpp:591
 #, c-format
 msgid "Press %1$s to append\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:588
+#: src/frontend/mame/ui/inputmap.cpp:592
 #, c-format
 msgid "Press %1$s to clear\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:589
+#: src/frontend/mame/ui/inputmap.cpp:593
 #, c-format
 msgid "Press %1$s to restore default\n"
 msgstr ""
@@ -1751,7 +1751,7 @@ msgid ""
 msgstr ""
 
 #: src/frontend/mame/ui/simpleselgame.cpp:273
-#: src/frontend/mame/ui/selgame.cpp:436
+#: src/frontend/mame/ui/selgame.cpp:443
 msgid "Configure Options"
 msgstr ""
 
@@ -2079,16 +2079,16 @@ msgstr ""
 msgid "Expand to fit"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:437
+#: src/frontend/mame/ui/selgame.cpp:444
 msgid "Configure Machine"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:1050
+#: src/frontend/mame/ui/selgame.cpp:1060
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d machines (%5$d BIOS) )"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:1078
+#: src/frontend/mame/ui/selgame.cpp:1088
 #, c-format
 msgid "System: %1$-.100s"
 msgstr ""
@@ -2110,7 +2110,7 @@ msgstr ""
 #: src/frontend/mame/ui/auditmenu.cpp:98
 #, c-format
 msgid ""
-"Auditing ROMs for machine %2$u of %3$u...\n"
+"Auditing media for machine %2$u of %3$u...\n"
 "%1$s"
 msgstr ""
 
@@ -2125,12 +2125,12 @@ msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:136
 #, c-format
-msgid "Audit ROMs for %1$u machines marked unavailable"
+msgid "Audit media for %1$u machines marked unavailable"
 msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:137
 #, c-format
-msgid "Audit ROMs for all %1$u machines"
+msgid "Audit media for all %1$u machines"
 msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:154
@@ -2336,84 +2336,84 @@ msgctxt "color-sample"
 msgid "Clone"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:914
+#: src/frontend/mame/ui/custui.cpp:906
 msgid "ARGB Settings"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:919 src/frontend/mame/ui/custui.cpp:922
+#: src/frontend/mame/ui/custui.cpp:911 src/frontend/mame/ui/custui.cpp:914
 msgctxt "color-channel"
 msgid "Alpha"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:927 src/frontend/mame/ui/custui.cpp:930
+#: src/frontend/mame/ui/custui.cpp:919 src/frontend/mame/ui/custui.cpp:922
 msgctxt "color-channel"
 msgid "Red"
 msgstr ""
 
+#: src/frontend/mame/ui/custui.cpp:927 src/frontend/mame/ui/custui.cpp:930
+msgctxt "color-channel"
+msgid "Green"
+msgstr ""
+
 #: src/frontend/mame/ui/custui.cpp:935 src/frontend/mame/ui/custui.cpp:938
 msgctxt "color-channel"
-msgid "Green"
-msgstr ""
-
-#: src/frontend/mame/ui/custui.cpp:943 src/frontend/mame/ui/custui.cpp:946
-msgctxt "color-channel"
 msgid "Blue"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:949
+#: src/frontend/mame/ui/custui.cpp:941
 msgid "Choose from palette"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:996
+#: src/frontend/mame/ui/custui.cpp:988
 msgid "Color preview:"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1093
+#: src/frontend/mame/ui/custui.cpp:1085
 msgctxt "color-preset"
 msgid "White"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1094
+#: src/frontend/mame/ui/custui.cpp:1086
 msgctxt "color-preset"
 msgid "Silver"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1095
+#: src/frontend/mame/ui/custui.cpp:1087
 msgctxt "color-preset"
 msgid "Gray"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1096
+#: src/frontend/mame/ui/custui.cpp:1088
 msgctxt "color-preset"
 msgid "Black"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1097
+#: src/frontend/mame/ui/custui.cpp:1089
 msgctxt "color-preset"
 msgid "Red"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1098
+#: src/frontend/mame/ui/custui.cpp:1090
 msgctxt "color-preset"
 msgid "Orange"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1099
+#: src/frontend/mame/ui/custui.cpp:1091
 msgctxt "color-preset"
 msgid "Yellow"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1100
+#: src/frontend/mame/ui/custui.cpp:1092
 msgctxt "color-preset"
 msgid "Green"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1101
+#: src/frontend/mame/ui/custui.cpp:1093
 msgctxt "color-preset"
 msgid "Blue"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1102
+#: src/frontend/mame/ui/custui.cpp:1094
 msgctxt "color-preset"
 msgid "Violet"
 msgstr ""
@@ -2478,7 +2478,7 @@ msgid "Input (general)"
 msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:123
-msgid "Input (this Machine)"
+msgid "Input (this machine)"
 msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:126
@@ -2517,6 +2517,10 @@ msgstr ""
 msgid "Tape Control"
 msgstr ""
 
+#: src/frontend/mame/ui/mainmenu.cpp:155
+msgid "Pseudo Terminals"
+msgstr ""
+
 #: src/frontend/mame/ui/mainmenu.cpp:158
 msgid "BIOS Selection"
 msgstr ""
@@ -2555,7 +2559,7 @@ msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:200
 #, c-format
-msgid "About %s"
+msgid "About %1$s"
 msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:212
@@ -2715,373 +2719,373 @@ msgstr ""
 msgid "%1$s %2$s"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2235
+#: src/frontend/mame/ui/selmenu.cpp:2244
 msgid "Images"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2236
+#: src/frontend/mame/ui/selmenu.cpp:2245
 msgid "Infos"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2551
+#: src/frontend/mame/ui/selmenu.cpp:2560
 msgid ""
 "Required ROM/disk images for the selected system are missing or incorrect. "
 "Please acquire the correct files or select a different system.\n"
 "\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2567
+#: src/frontend/mame/ui/selmenu.cpp:2576
 msgid ""
 "Required ROM/disk images for the selected software are missing or incorrect. "
 "Please acquire the correct files or select a different software item.\n"
 "\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2583
+#: src/frontend/mame/ui/selmenu.cpp:2592
 msgid "incorrect checksum"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2586
+#: src/frontend/mame/ui/selmenu.cpp:2595
 msgid "incorrect length"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2589
+#: src/frontend/mame/ui/selmenu.cpp:2598
 msgid "not found"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2600
+#: src/frontend/mame/ui/selmenu.cpp:2609
 #, c-format
 msgid "%1$s (%2$s) - %3$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2602
+#: src/frontend/mame/ui/selmenu.cpp:2611
 #, c-format
 msgid "%1$s - %2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2606
+#: src/frontend/mame/ui/selmenu.cpp:2615
 msgid "Press any key to continue."
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2735
+#: src/frontend/mame/ui/selmenu.cpp:2744
 msgid "General Info"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2887
-#, c-format
-msgid "Romset\t%1$s\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2888
-#, c-format
-msgid "Year\t%1$s\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2889
-#, c-format
-msgid "Manufacturer\t%1$s\n"
-msgstr ""
-
 #: src/frontend/mame/ui/selmenu.cpp:2896
 #, c-format
-msgid "Driver is Clone of\t%1$s\n"
+msgid "Romset\t%1$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2901
-msgid "Driver is Parent\t\n"
+#: src/frontend/mame/ui/selmenu.cpp:2897
+#, c-format
+msgid "Year\t%1$s\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2898
+#, c-format
+msgid "Manufacturer\t%1$s\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2905
-msgid "Analog Controls\tYes\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2907
-msgid "Keyboard Inputs\tYes\n"
+#, c-format
+msgid "Driver is Clone of\t%1$s\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2910
-msgid "Overall\tNOT WORKING\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2912
-msgid "Overall\tUnemulated Protection\n"
+msgid "Driver is Parent\t\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2914
-msgid "Overall\tWorking\n"
+msgid "Analog Controls\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2917
-msgid "Graphics\tUnimplemented\n"
+#: src/frontend/mame/ui/selmenu.cpp:2916
+msgid "Keyboard Inputs\tYes\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2919
-msgid "Graphics\tWrong Colors\n"
+msgid "Overall\tNOT WORKING\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2921
-msgid "Graphics\tImperfect Colors\n"
+msgid "Overall\tUnemulated Protection\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2923
-msgid "Graphics\tImperfect\n"
+msgid "Overall\tWorking\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2925
-msgid "Graphics\tOK\n"
+#: src/frontend/mame/ui/selmenu.cpp:2926
+msgid "Graphics\tUnimplemented\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2928
-msgid "Sound\tNone\n"
+msgid "Graphics\tWrong Colors\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2930
-msgid "Sound\tUnimplemented\n"
+msgid "Graphics\tImperfect Colors\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2932
-msgid "Sound\tImperfect\n"
+msgid "Graphics\tImperfect\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2934
-msgid "Sound\tOK\n"
+msgid "Graphics\tOK\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2937
-msgid "Capture\tUnimplemented\n"
+msgid "Sound\tNone\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2939
+msgid "Sound\tUnimplemented\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2941
+msgid "Sound\tImperfect\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2943
+msgid "Sound\tOK\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2946
+msgid "Capture\tUnimplemented\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2948
 msgid "Capture\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2942
+#: src/frontend/mame/ui/selmenu.cpp:2951
 msgid "Camera\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2944
+#: src/frontend/mame/ui/selmenu.cpp:2953
 msgid "Camera\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2947
+#: src/frontend/mame/ui/selmenu.cpp:2956
 msgid "Microphone\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2949
+#: src/frontend/mame/ui/selmenu.cpp:2958
 msgid "Microphone\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2952
+#: src/frontend/mame/ui/selmenu.cpp:2961
 msgid "Controls\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2954
+#: src/frontend/mame/ui/selmenu.cpp:2963
 msgid "Controls\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2957
+#: src/frontend/mame/ui/selmenu.cpp:2966
 msgid "Keyboard\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2959
+#: src/frontend/mame/ui/selmenu.cpp:2968
 msgid "Keyboard\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2962
+#: src/frontend/mame/ui/selmenu.cpp:2971
 msgid "Mouse\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2964
+#: src/frontend/mame/ui/selmenu.cpp:2973
 msgid "Mouse\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2967
+#: src/frontend/mame/ui/selmenu.cpp:2976
 msgid "Media\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2969
+#: src/frontend/mame/ui/selmenu.cpp:2978
 msgid "Media\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2972
+#: src/frontend/mame/ui/selmenu.cpp:2981
 msgid "Disk\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2974
+#: src/frontend/mame/ui/selmenu.cpp:2983
 msgid "Disk\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2977
+#: src/frontend/mame/ui/selmenu.cpp:2986
 msgid "Printer\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2979
+#: src/frontend/mame/ui/selmenu.cpp:2988
 msgid "Printer\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2982
+#: src/frontend/mame/ui/selmenu.cpp:2991
 msgid "Mag. Tape\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2984
+#: src/frontend/mame/ui/selmenu.cpp:2993
 msgid "Mag. Tape\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2987
+#: src/frontend/mame/ui/selmenu.cpp:2996
 msgid "Punch Tape\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2989
+#: src/frontend/mame/ui/selmenu.cpp:2998
 msgid "Punch Tape\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2992
+#: src/frontend/mame/ui/selmenu.cpp:3001
 msgid "Mag. Drum\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2994
+#: src/frontend/mame/ui/selmenu.cpp:3003
 msgid "Mag. Drum\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2997
+#: src/frontend/mame/ui/selmenu.cpp:3006
 msgid "(EP)ROM\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2999
+#: src/frontend/mame/ui/selmenu.cpp:3008
 msgid "(EP)ROM\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3002
+#: src/frontend/mame/ui/selmenu.cpp:3011
 msgid "Communications\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3004
+#: src/frontend/mame/ui/selmenu.cpp:3013
 msgid "Communications\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3007
+#: src/frontend/mame/ui/selmenu.cpp:3016
 msgid "LAN\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3009
+#: src/frontend/mame/ui/selmenu.cpp:3018
 msgid "LAN\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3012
+#: src/frontend/mame/ui/selmenu.cpp:3021
 msgid "WAN\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3014
+#: src/frontend/mame/ui/selmenu.cpp:3023
 msgid "WAN\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3017
+#: src/frontend/mame/ui/selmenu.cpp:3026
 msgid "Timing\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3019
+#: src/frontend/mame/ui/selmenu.cpp:3028
 msgid "Timing\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3021
+#: src/frontend/mame/ui/selmenu.cpp:3030
 msgid "Mechanical Machine\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3021
+#: src/frontend/mame/ui/selmenu.cpp:3030
 msgid "Mechanical Machine\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3022
+#: src/frontend/mame/ui/selmenu.cpp:3031
 msgid "Requires Artwork\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3022
+#: src/frontend/mame/ui/selmenu.cpp:3031
 msgid "Requires Artwork\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3023
+#: src/frontend/mame/ui/selmenu.cpp:3032
 msgid "Requires Clickable Artwork\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3023
+#: src/frontend/mame/ui/selmenu.cpp:3032
 msgid "Requires Clickable Artwork\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3025
+#: src/frontend/mame/ui/selmenu.cpp:3034
 msgid "Support Cocktail\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3026
+#: src/frontend/mame/ui/selmenu.cpp:3035
 msgid "Driver is BIOS\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3026
+#: src/frontend/mame/ui/selmenu.cpp:3035
 msgid "Driver is BIOS\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3027
+#: src/frontend/mame/ui/selmenu.cpp:3036
 msgid "Support Save\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3027
+#: src/frontend/mame/ui/selmenu.cpp:3036
 msgid "Support Save\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3028
+#: src/frontend/mame/ui/selmenu.cpp:3037
 msgid "Screen Orientation\tVertical\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3028
+#: src/frontend/mame/ui/selmenu.cpp:3037
 msgid "Screen Orientation\tHorizontal\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3038
+#: src/frontend/mame/ui/selmenu.cpp:3047
 msgid "Requires CHD\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3038
+#: src/frontend/mame/ui/selmenu.cpp:3047
 msgid "Requires CHD\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3051
-msgid "ROM Audit Result\tOK\n"
+#: src/frontend/mame/ui/selmenu.cpp:3060
+msgid "Media Audit Result\tOK\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3053
-msgid "ROM Audit Result\tBAD\n"
+#: src/frontend/mame/ui/selmenu.cpp:3062
+msgid "Media Audit Result\tBAD\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3056
+#: src/frontend/mame/ui/selmenu.cpp:3065
 msgid "Samples Audit Result\tNone Needed\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3058
+#: src/frontend/mame/ui/selmenu.cpp:3067
 msgid "Samples Audit Result\tOK\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3060
+#: src/frontend/mame/ui/selmenu.cpp:3069
 msgid "Samples Audit Result\tBAD\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3064
+#: src/frontend/mame/ui/selmenu.cpp:3073
 msgid ""
-"ROM Audit \tDisabled\n"
-"Samples Audit \tDisabled\n"
+"Media Audit\tDisabled\n"
+"Samples Audit\tDisabled\n"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:150
+#: src/frontend/mame/ui/sndmenu.cpp:146
 msgid "Sound"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:151
+#: src/frontend/mame/ui/sndmenu.cpp:147
 msgid "Compressor"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:152
+#: src/frontend/mame/ui/sndmenu.cpp:148
 msgid "Sample Rate"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:153
+#: src/frontend/mame/ui/sndmenu.cpp:149
 msgid "Use External Samples"
 msgstr ""
 
@@ -3120,511 +3124,681 @@ msgstr ""
 msgid "  Screen '%1$s': Vector\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:132
+#: src/frontend/mame/ui/devopt.cpp:135
 #, c-format
 msgid "  Screen '%1$s': %2$d × %3$d (V) %4$s Hz\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:133
+#: src/frontend/mame/ui/devopt.cpp:136
 #, c-format
 msgid "  Screen '%1$s': %2$d × %3$d (H) %4$s Hz\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:147
+#: src/frontend/mame/ui/devopt.cpp:150
 msgid "* Sound:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:211
+#: src/frontend/mame/ui/devopt.cpp:214
 #, c-format
 msgid ""
 "* BIOS settings:\n"
 "  %1$d options    [default: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:255 src/frontend/mame/ui/devopt.cpp:271
-#: src/frontend/mame/ui/devopt.cpp:332
+#: src/frontend/mame/ui/devopt.cpp:258 src/frontend/mame/ui/devopt.cpp:274
+#: src/frontend/mame/ui/devopt.cpp:335
 #, c-format
 msgid "  %1$s    [default: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:260 src/frontend/mame/ui/devopt.cpp:276
+#: src/frontend/mame/ui/devopt.cpp:263 src/frontend/mame/ui/devopt.cpp:279
 #, c-format
 msgid "  %1$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:282
+#: src/frontend/mame/ui/devopt.cpp:285
 msgid "* DIP switch settings:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:287
+#: src/frontend/mame/ui/devopt.cpp:290
 msgid "* Configuration settings:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:291
+#: src/frontend/mame/ui/devopt.cpp:294
 msgid "* Input device(s):\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:293
+#: src/frontend/mame/ui/devopt.cpp:296
 #, c-format
 msgid "  User inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:295
+#: src/frontend/mame/ui/devopt.cpp:298
 #, c-format
 msgid "  Mahjong inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:297
+#: src/frontend/mame/ui/devopt.cpp:300
 #, c-format
 msgid "  Hanafuda inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:299
+#: src/frontend/mame/ui/devopt.cpp:302
 #, c-format
 msgid "  Gambling inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:301
+#: src/frontend/mame/ui/devopt.cpp:304
 #, c-format
 msgid "  Analog inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:303
+#: src/frontend/mame/ui/devopt.cpp:306
 #, c-format
 msgid "  Adjuster inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:305
+#: src/frontend/mame/ui/devopt.cpp:308
 #, c-format
 msgid "  Keypad inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:307
+#: src/frontend/mame/ui/devopt.cpp:310
 #, c-format
 msgid "  Keyboard inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:312
+#: src/frontend/mame/ui/devopt.cpp:315
 msgid "* Media Options:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:317
+#: src/frontend/mame/ui/devopt.cpp:320
 #, c-format
 msgid "  %1$s    [tag: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:327
+#: src/frontend/mame/ui/devopt.cpp:330
 msgid "* Slot Options:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:341
+#: src/frontend/mame/ui/devopt.cpp:344
 msgid "[None]\n"
 msgstr ""
 
-#: src/emu/render.cpp:1847
+#: src/emu/render.cpp:1796
 #, c-format
 msgctxt "view-name"
 msgid "Screen %1$u Standard (%2$u:%3$u)"
 msgstr ""
 
-#: src/emu/render.cpp:1873
+#: src/emu/render.cpp:1822
 #, c-format
 msgctxt "view-name"
 msgid "Screen %1$u Pixel Aspect (%2$u:%3$u)"
 msgstr ""
 
-#: src/emu/render.cpp:1895 src/emu/render.cpp:2030
+#: src/emu/render.cpp:1844 src/emu/render.cpp:1979
 msgctxt "view-name"
 msgid "Cocktail"
 msgstr ""
 
-#: src/emu/render.cpp:2015
+#: src/emu/render.cpp:1964
 msgctxt "view-name"
 msgid "Left-to-Right"
 msgstr ""
 
-#: src/emu/render.cpp:2016
+#: src/emu/render.cpp:1965
 msgctxt "view-name"
 msgid "Left-to-Right (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2017
+#: src/emu/render.cpp:1966
 msgctxt "view-name"
 msgid "Top-to-Bottom"
 msgstr ""
 
-#: src/emu/render.cpp:2018
+#: src/emu/render.cpp:1967
 msgctxt "view-name"
 msgid "Top-to-Bottom (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2069
+#: src/emu/render.cpp:2018
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Left-to-Right, Top-to-Bottom"
 msgstr ""
 
-#: src/emu/render.cpp:2078
+#: src/emu/render.cpp:2027
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Left-to-Right, Top-to-Bottom (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2087
+#: src/emu/render.cpp:2036
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Top-to-Bottom, Left-to-Right"
 msgstr ""
 
-#: src/emu/render.cpp:2096
+#: src/emu/render.cpp:2045
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Top-to-Bottom, Left-to-Right (Gapless)"
 msgstr ""
 
-#: src/emu/inpttype.ipp:22
+#: src/emu/ioport.cpp:332
+#, c-format
 msgctxt "input-name"
-msgid "P1 Up"
+msgid "P%1$u"
 msgstr ""
 
-#: src/emu/inpttype.ipp:23
+#: src/emu/ioport.cpp:1924
 msgctxt "input-name"
-msgid "P1 Down"
+msgid "???"
 msgstr ""
 
-#: src/emu/inpttype.ipp:24
+#: src/emu/inpttype.ipp:22 src/emu/inpttype.ipp:140 src/emu/inpttype.ipp:221
+#: src/emu/inpttype.ipp:255 src/emu/inpttype.ipp:289 src/emu/inpttype.ipp:323
+#: src/emu/inpttype.ipp:357 src/emu/inpttype.ipp:391 src/emu/inpttype.ipp:425
+#: src/emu/inpttype.ipp:459
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left"
+msgid "%p Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:25
+#: src/emu/inpttype.ipp:23 src/emu/inpttype.ipp:141 src/emu/inpttype.ipp:222
+#: src/emu/inpttype.ipp:256 src/emu/inpttype.ipp:290 src/emu/inpttype.ipp:324
+#: src/emu/inpttype.ipp:358 src/emu/inpttype.ipp:392 src/emu/inpttype.ipp:426
+#: src/emu/inpttype.ipp:460
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right"
+msgid "%p Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:26
+#: src/emu/inpttype.ipp:24 src/emu/inpttype.ipp:142 src/emu/inpttype.ipp:223
+#: src/emu/inpttype.ipp:257 src/emu/inpttype.ipp:291 src/emu/inpttype.ipp:325
+#: src/emu/inpttype.ipp:359 src/emu/inpttype.ipp:393 src/emu/inpttype.ipp:427
+#: src/emu/inpttype.ipp:461
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Up"
+msgid "%p Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:27
+#: src/emu/inpttype.ipp:25 src/emu/inpttype.ipp:143 src/emu/inpttype.ipp:224
+#: src/emu/inpttype.ipp:258 src/emu/inpttype.ipp:292 src/emu/inpttype.ipp:326
+#: src/emu/inpttype.ipp:360 src/emu/inpttype.ipp:394 src/emu/inpttype.ipp:428
+#: src/emu/inpttype.ipp:462
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Down"
+msgid "%p Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:28
+#: src/emu/inpttype.ipp:26 src/emu/inpttype.ipp:144 src/emu/inpttype.ipp:225
+#: src/emu/inpttype.ipp:259 src/emu/inpttype.ipp:293 src/emu/inpttype.ipp:327
+#: src/emu/inpttype.ipp:361 src/emu/inpttype.ipp:395 src/emu/inpttype.ipp:429
+#: src/emu/inpttype.ipp:463
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Left"
+msgid "%p Right Stick/Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:29
+#: src/emu/inpttype.ipp:27 src/emu/inpttype.ipp:145 src/emu/inpttype.ipp:226
+#: src/emu/inpttype.ipp:260 src/emu/inpttype.ipp:294 src/emu/inpttype.ipp:328
+#: src/emu/inpttype.ipp:362 src/emu/inpttype.ipp:396 src/emu/inpttype.ipp:430
+#: src/emu/inpttype.ipp:464
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Right"
+msgid "%p Right Stick/Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:30
+#: src/emu/inpttype.ipp:28 src/emu/inpttype.ipp:146 src/emu/inpttype.ipp:227
+#: src/emu/inpttype.ipp:261 src/emu/inpttype.ipp:295 src/emu/inpttype.ipp:329
+#: src/emu/inpttype.ipp:363 src/emu/inpttype.ipp:397 src/emu/inpttype.ipp:431
+#: src/emu/inpttype.ipp:465
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Up"
+msgid "%p Right Stick/Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:31
+#: src/emu/inpttype.ipp:29 src/emu/inpttype.ipp:147 src/emu/inpttype.ipp:228
+#: src/emu/inpttype.ipp:262 src/emu/inpttype.ipp:296 src/emu/inpttype.ipp:330
+#: src/emu/inpttype.ipp:364 src/emu/inpttype.ipp:398 src/emu/inpttype.ipp:432
+#: src/emu/inpttype.ipp:466
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Down"
+msgid "%p Right Stick/Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:32
+#: src/emu/inpttype.ipp:30 src/emu/inpttype.ipp:148 src/emu/inpttype.ipp:229
+#: src/emu/inpttype.ipp:263 src/emu/inpttype.ipp:297 src/emu/inpttype.ipp:331
+#: src/emu/inpttype.ipp:365 src/emu/inpttype.ipp:399 src/emu/inpttype.ipp:433
+#: src/emu/inpttype.ipp:467
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Left"
+msgid "%p Left Stick/Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:33
+#: src/emu/inpttype.ipp:31 src/emu/inpttype.ipp:149 src/emu/inpttype.ipp:230
+#: src/emu/inpttype.ipp:264 src/emu/inpttype.ipp:298 src/emu/inpttype.ipp:332
+#: src/emu/inpttype.ipp:366 src/emu/inpttype.ipp:400 src/emu/inpttype.ipp:434
+#: src/emu/inpttype.ipp:468
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Right"
+msgid "%p Left Stick/Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:34
+#: src/emu/inpttype.ipp:32 src/emu/inpttype.ipp:150 src/emu/inpttype.ipp:231
+#: src/emu/inpttype.ipp:265 src/emu/inpttype.ipp:299 src/emu/inpttype.ipp:333
+#: src/emu/inpttype.ipp:367 src/emu/inpttype.ipp:401 src/emu/inpttype.ipp:435
+#: src/emu/inpttype.ipp:469
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 1"
+msgid "%p Left Stick/Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:35
+#: src/emu/inpttype.ipp:33 src/emu/inpttype.ipp:151 src/emu/inpttype.ipp:232
+#: src/emu/inpttype.ipp:266 src/emu/inpttype.ipp:300 src/emu/inpttype.ipp:334
+#: src/emu/inpttype.ipp:368 src/emu/inpttype.ipp:402 src/emu/inpttype.ipp:436
+#: src/emu/inpttype.ipp:470
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 2"
+msgid "%p Left Stick/Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:36
+#: src/emu/inpttype.ipp:34 src/emu/inpttype.ipp:152 src/emu/inpttype.ipp:233
+#: src/emu/inpttype.ipp:267 src/emu/inpttype.ipp:301 src/emu/inpttype.ipp:335
+#: src/emu/inpttype.ipp:369 src/emu/inpttype.ipp:403 src/emu/inpttype.ipp:437
+#: src/emu/inpttype.ipp:471
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 3"
+msgid "%p Button 1"
 msgstr ""
 
-#: src/emu/inpttype.ipp:37
+#: src/emu/inpttype.ipp:35 src/emu/inpttype.ipp:153 src/emu/inpttype.ipp:234
+#: src/emu/inpttype.ipp:268 src/emu/inpttype.ipp:302 src/emu/inpttype.ipp:336
+#: src/emu/inpttype.ipp:370 src/emu/inpttype.ipp:404 src/emu/inpttype.ipp:438
+#: src/emu/inpttype.ipp:472
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 4"
+msgid "%p Button 2"
 msgstr ""
 
-#: src/emu/inpttype.ipp:38
+#: src/emu/inpttype.ipp:36 src/emu/inpttype.ipp:154 src/emu/inpttype.ipp:235
+#: src/emu/inpttype.ipp:269 src/emu/inpttype.ipp:303 src/emu/inpttype.ipp:337
+#: src/emu/inpttype.ipp:371 src/emu/inpttype.ipp:405 src/emu/inpttype.ipp:439
+#: src/emu/inpttype.ipp:473
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 5"
+msgid "%p Button 3"
 msgstr ""
 
-#: src/emu/inpttype.ipp:39
+#: src/emu/inpttype.ipp:37 src/emu/inpttype.ipp:155 src/emu/inpttype.ipp:236
+#: src/emu/inpttype.ipp:270 src/emu/inpttype.ipp:304 src/emu/inpttype.ipp:338
+#: src/emu/inpttype.ipp:372 src/emu/inpttype.ipp:406 src/emu/inpttype.ipp:440
+#: src/emu/inpttype.ipp:474
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 6"
+msgid "%p Button 4"
 msgstr ""
 
-#: src/emu/inpttype.ipp:40
+#: src/emu/inpttype.ipp:38 src/emu/inpttype.ipp:156 src/emu/inpttype.ipp:237
+#: src/emu/inpttype.ipp:271 src/emu/inpttype.ipp:305 src/emu/inpttype.ipp:339
+#: src/emu/inpttype.ipp:373 src/emu/inpttype.ipp:407 src/emu/inpttype.ipp:441
+#: src/emu/inpttype.ipp:475
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 7"
+msgid "%p Button 5"
 msgstr ""
 
-#: src/emu/inpttype.ipp:41
+#: src/emu/inpttype.ipp:39 src/emu/inpttype.ipp:157 src/emu/inpttype.ipp:238
+#: src/emu/inpttype.ipp:272 src/emu/inpttype.ipp:306 src/emu/inpttype.ipp:340
+#: src/emu/inpttype.ipp:374 src/emu/inpttype.ipp:408 src/emu/inpttype.ipp:442
+#: src/emu/inpttype.ipp:476
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 8"
+msgid "%p Button 6"
 msgstr ""
 
-#: src/emu/inpttype.ipp:42
+#: src/emu/inpttype.ipp:40 src/emu/inpttype.ipp:158 src/emu/inpttype.ipp:239
+#: src/emu/inpttype.ipp:273 src/emu/inpttype.ipp:307 src/emu/inpttype.ipp:341
+#: src/emu/inpttype.ipp:375 src/emu/inpttype.ipp:409 src/emu/inpttype.ipp:443
+#: src/emu/inpttype.ipp:477
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 9"
+msgid "%p Button 7"
 msgstr ""
 
-#: src/emu/inpttype.ipp:43
+#: src/emu/inpttype.ipp:41 src/emu/inpttype.ipp:159 src/emu/inpttype.ipp:240
+#: src/emu/inpttype.ipp:274 src/emu/inpttype.ipp:308 src/emu/inpttype.ipp:342
+#: src/emu/inpttype.ipp:376 src/emu/inpttype.ipp:410 src/emu/inpttype.ipp:444
+#: src/emu/inpttype.ipp:478
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 10"
+msgid "%p Button 8"
 msgstr ""
 
-#: src/emu/inpttype.ipp:44
+#: src/emu/inpttype.ipp:42 src/emu/inpttype.ipp:160 src/emu/inpttype.ipp:241
+#: src/emu/inpttype.ipp:275 src/emu/inpttype.ipp:309 src/emu/inpttype.ipp:343
+#: src/emu/inpttype.ipp:377 src/emu/inpttype.ipp:411 src/emu/inpttype.ipp:445
+#: src/emu/inpttype.ipp:479
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 11"
+msgid "%p Button 9"
 msgstr ""
 
-#: src/emu/inpttype.ipp:45
+#: src/emu/inpttype.ipp:43 src/emu/inpttype.ipp:161 src/emu/inpttype.ipp:242
+#: src/emu/inpttype.ipp:276 src/emu/inpttype.ipp:310 src/emu/inpttype.ipp:344
+#: src/emu/inpttype.ipp:378 src/emu/inpttype.ipp:412 src/emu/inpttype.ipp:446
+#: src/emu/inpttype.ipp:480
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 12"
+msgid "%p Button 10"
 msgstr ""
 
-#: src/emu/inpttype.ipp:46
+#: src/emu/inpttype.ipp:44 src/emu/inpttype.ipp:162 src/emu/inpttype.ipp:243
+#: src/emu/inpttype.ipp:277 src/emu/inpttype.ipp:311 src/emu/inpttype.ipp:345
+#: src/emu/inpttype.ipp:379 src/emu/inpttype.ipp:413 src/emu/inpttype.ipp:447
+#: src/emu/inpttype.ipp:481
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 13"
+msgid "%p Button 11"
 msgstr ""
 
-#: src/emu/inpttype.ipp:47
+#: src/emu/inpttype.ipp:45 src/emu/inpttype.ipp:163 src/emu/inpttype.ipp:244
+#: src/emu/inpttype.ipp:278 src/emu/inpttype.ipp:312 src/emu/inpttype.ipp:346
+#: src/emu/inpttype.ipp:380 src/emu/inpttype.ipp:414 src/emu/inpttype.ipp:448
+#: src/emu/inpttype.ipp:482
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 14"
+msgid "%p Button 12"
 msgstr ""
 
-#: src/emu/inpttype.ipp:48
+#: src/emu/inpttype.ipp:46 src/emu/inpttype.ipp:164 src/emu/inpttype.ipp:245
+#: src/emu/inpttype.ipp:279 src/emu/inpttype.ipp:313 src/emu/inpttype.ipp:347
+#: src/emu/inpttype.ipp:381 src/emu/inpttype.ipp:415 src/emu/inpttype.ipp:449
+#: src/emu/inpttype.ipp:483
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 15"
+msgid "%p Button 13"
 msgstr ""
 
-#: src/emu/inpttype.ipp:49
+#: src/emu/inpttype.ipp:47 src/emu/inpttype.ipp:165 src/emu/inpttype.ipp:246
+#: src/emu/inpttype.ipp:280 src/emu/inpttype.ipp:314 src/emu/inpttype.ipp:348
+#: src/emu/inpttype.ipp:382 src/emu/inpttype.ipp:416 src/emu/inpttype.ipp:450
+#: src/emu/inpttype.ipp:484
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 16"
+msgid "%p Button 14"
 msgstr ""
 
-#: src/emu/inpttype.ipp:50
+#: src/emu/inpttype.ipp:48 src/emu/inpttype.ipp:166 src/emu/inpttype.ipp:247
+#: src/emu/inpttype.ipp:281 src/emu/inpttype.ipp:315 src/emu/inpttype.ipp:349
+#: src/emu/inpttype.ipp:383 src/emu/inpttype.ipp:417 src/emu/inpttype.ipp:451
+#: src/emu/inpttype.ipp:485
+#, c-format
 msgctxt "input-name"
-msgid "P1 Start"
+msgid "%p Button 15"
 msgstr ""
 
-#: src/emu/inpttype.ipp:51
+#: src/emu/inpttype.ipp:49 src/emu/inpttype.ipp:167 src/emu/inpttype.ipp:248
+#: src/emu/inpttype.ipp:282 src/emu/inpttype.ipp:316 src/emu/inpttype.ipp:350
+#: src/emu/inpttype.ipp:384 src/emu/inpttype.ipp:418 src/emu/inpttype.ipp:452
+#: src/emu/inpttype.ipp:486
+#, c-format
 msgctxt "input-name"
-msgid "P1 Select"
+msgid "%p Button 16"
 msgstr ""
 
-#: src/emu/inpttype.ipp:56
+#: src/emu/inpttype.ipp:50 src/emu/inpttype.ipp:168 src/emu/inpttype.ipp:249
+#: src/emu/inpttype.ipp:283 src/emu/inpttype.ipp:317 src/emu/inpttype.ipp:351
+#: src/emu/inpttype.ipp:385 src/emu/inpttype.ipp:419 src/emu/inpttype.ipp:453
+#: src/emu/inpttype.ipp:487
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong A"
+msgid "%p Start"
 msgstr ""
 
-#: src/emu/inpttype.ipp:57
+#: src/emu/inpttype.ipp:51 src/emu/inpttype.ipp:169 src/emu/inpttype.ipp:250
+#: src/emu/inpttype.ipp:284 src/emu/inpttype.ipp:318 src/emu/inpttype.ipp:352
+#: src/emu/inpttype.ipp:386 src/emu/inpttype.ipp:420 src/emu/inpttype.ipp:454
+#: src/emu/inpttype.ipp:488
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong B"
+msgid "%p Select"
 msgstr ""
 
-#: src/emu/inpttype.ipp:58
+#: src/emu/inpttype.ipp:56 src/emu/inpttype.ipp:174
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong C"
+msgid "%p Mahjong A"
 msgstr ""
 
-#: src/emu/inpttype.ipp:59
+#: src/emu/inpttype.ipp:57 src/emu/inpttype.ipp:175
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong D"
+msgid "%p Mahjong B"
 msgstr ""
 
-#: src/emu/inpttype.ipp:60
+#: src/emu/inpttype.ipp:58 src/emu/inpttype.ipp:176
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong E"
+msgid "%p Mahjong C"
 msgstr ""
 
-#: src/emu/inpttype.ipp:61
+#: src/emu/inpttype.ipp:59 src/emu/inpttype.ipp:177
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong F"
+msgid "%p Mahjong D"
 msgstr ""
 
-#: src/emu/inpttype.ipp:62
+#: src/emu/inpttype.ipp:60 src/emu/inpttype.ipp:178
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong G"
+msgid "%p Mahjong E"
 msgstr ""
 
-#: src/emu/inpttype.ipp:63
+#: src/emu/inpttype.ipp:61 src/emu/inpttype.ipp:179
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong H"
+msgid "%p Mahjong F"
 msgstr ""
 
-#: src/emu/inpttype.ipp:64
+#: src/emu/inpttype.ipp:62 src/emu/inpttype.ipp:180
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong I"
+msgid "%p Mahjong G"
 msgstr ""
 
-#: src/emu/inpttype.ipp:65
+#: src/emu/inpttype.ipp:63 src/emu/inpttype.ipp:181
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong J"
+msgid "%p Mahjong H"
 msgstr ""
 
-#: src/emu/inpttype.ipp:66
+#: src/emu/inpttype.ipp:64 src/emu/inpttype.ipp:182
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong K"
+msgid "%p Mahjong I"
 msgstr ""
 
-#: src/emu/inpttype.ipp:67
+#: src/emu/inpttype.ipp:65 src/emu/inpttype.ipp:183
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong L"
+msgid "%p Mahjong J"
 msgstr ""
 
-#: src/emu/inpttype.ipp:68
+#: src/emu/inpttype.ipp:66 src/emu/inpttype.ipp:184
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong M"
+msgid "%p Mahjong K"
 msgstr ""
 
-#: src/emu/inpttype.ipp:69
+#: src/emu/inpttype.ipp:67 src/emu/inpttype.ipp:185
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong N"
+msgid "%p Mahjong L"
 msgstr ""
 
-#: src/emu/inpttype.ipp:70
+#: src/emu/inpttype.ipp:68 src/emu/inpttype.ipp:186
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong O"
+msgid "%p Mahjong M"
 msgstr ""
 
-#: src/emu/inpttype.ipp:71
+#: src/emu/inpttype.ipp:69 src/emu/inpttype.ipp:187
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong P"
+msgid "%p Mahjong N"
 msgstr ""
 
-#: src/emu/inpttype.ipp:72
+#: src/emu/inpttype.ipp:70 src/emu/inpttype.ipp:188
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Q"
+msgid "%p Mahjong O"
 msgstr ""
 
-#: src/emu/inpttype.ipp:73
+#: src/emu/inpttype.ipp:71 src/emu/inpttype.ipp:189
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Kan"
+msgid "%p Mahjong P"
 msgstr ""
 
-#: src/emu/inpttype.ipp:74
+#: src/emu/inpttype.ipp:72 src/emu/inpttype.ipp:190
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Pon"
+msgid "%p Mahjong Q"
 msgstr ""
 
-#: src/emu/inpttype.ipp:75
+#: src/emu/inpttype.ipp:73 src/emu/inpttype.ipp:191
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Chi"
+msgid "%p Mahjong Kan"
 msgstr ""
 
-#: src/emu/inpttype.ipp:76
+#: src/emu/inpttype.ipp:74 src/emu/inpttype.ipp:192
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Reach"
+msgid "%p Mahjong Pon"
 msgstr ""
 
-#: src/emu/inpttype.ipp:77
+#: src/emu/inpttype.ipp:75 src/emu/inpttype.ipp:193
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Ron"
+msgid "%p Mahjong Chi"
 msgstr ""
 
-#: src/emu/inpttype.ipp:78
+#: src/emu/inpttype.ipp:76 src/emu/inpttype.ipp:194
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Flip Flop"
+msgid "%p Mahjong Reach"
 msgstr ""
 
-#: src/emu/inpttype.ipp:79
+#: src/emu/inpttype.ipp:77 src/emu/inpttype.ipp:195
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Bet"
+msgid "%p Mahjong Ron"
 msgstr ""
 
-#: src/emu/inpttype.ipp:80
+#: src/emu/inpttype.ipp:78 src/emu/inpttype.ipp:200
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Take Score"
+msgid "%p Mahjong Flip Flop"
 msgstr ""
 
-#: src/emu/inpttype.ipp:81
+#: src/emu/inpttype.ipp:79 src/emu/inpttype.ipp:196
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Double Up"
+msgid "%p Mahjong Bet"
 msgstr ""
 
-#: src/emu/inpttype.ipp:82
+#: src/emu/inpttype.ipp:80 src/emu/inpttype.ipp:198
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Big"
+msgid "%p Mahjong Take Score"
 msgstr ""
 
-#: src/emu/inpttype.ipp:83
+#: src/emu/inpttype.ipp:81 src/emu/inpttype.ipp:199
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Small"
+msgid "%p Mahjong Double Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:84
+#: src/emu/inpttype.ipp:82 src/emu/inpttype.ipp:201
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Last Chance"
+msgid "%p Mahjong Big"
 msgstr ""
 
-#: src/emu/inpttype.ipp:89
+#: src/emu/inpttype.ipp:83 src/emu/inpttype.ipp:202
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda A/1"
+msgid "%p Mahjong Small"
 msgstr ""
 
-#: src/emu/inpttype.ipp:90
+#: src/emu/inpttype.ipp:84 src/emu/inpttype.ipp:197
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda B/2"
+msgid "%p Mahjong Last Chance"
 msgstr ""
 
-#: src/emu/inpttype.ipp:91
+#: src/emu/inpttype.ipp:89 src/emu/inpttype.ipp:207
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda C/3"
+msgid "%p Hanafuda A/1"
 msgstr ""
 
-#: src/emu/inpttype.ipp:92
+#: src/emu/inpttype.ipp:90 src/emu/inpttype.ipp:208
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda D/4"
+msgid "%p Hanafuda B/2"
 msgstr ""
 
-#: src/emu/inpttype.ipp:93
+#: src/emu/inpttype.ipp:91 src/emu/inpttype.ipp:209
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda E/5"
+msgid "%p Hanafuda C/3"
 msgstr ""
 
-#: src/emu/inpttype.ipp:94
+#: src/emu/inpttype.ipp:92 src/emu/inpttype.ipp:210
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda F/6"
+msgid "%p Hanafuda D/4"
 msgstr ""
 
-#: src/emu/inpttype.ipp:95
+#: src/emu/inpttype.ipp:93 src/emu/inpttype.ipp:211
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda G/7"
+msgid "%p Hanafuda E/5"
 msgstr ""
 
-#: src/emu/inpttype.ipp:96
+#: src/emu/inpttype.ipp:94 src/emu/inpttype.ipp:212
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda H/8"
+msgid "%p Hanafuda F/6"
 msgstr ""
 
-#: src/emu/inpttype.ipp:97
+#: src/emu/inpttype.ipp:95 src/emu/inpttype.ipp:213
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda Yes"
+msgid "%p Hanafuda G/7"
 msgstr ""
 
-#: src/emu/inpttype.ipp:98
+#: src/emu/inpttype.ipp:96 src/emu/inpttype.ipp:214
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda No"
+msgid "%p Hanafuda H/8"
+msgstr ""
+
+#: src/emu/inpttype.ipp:97 src/emu/inpttype.ipp:215
+#, c-format
+msgctxt "input-name"
+msgid "%p Hanafuda Yes"
+msgstr ""
+
+#: src/emu/inpttype.ipp:98 src/emu/inpttype.ipp:216
+#, c-format
+msgctxt "input-name"
+msgid "%p Hanafuda No"
 msgstr ""
 
 #: src/emu/inpttype.ipp:103
@@ -3752,1551 +3926,6 @@ msgctxt "input-name"
 msgid "Stop All Reels"
 msgstr ""
 
-#: src/emu/inpttype.ipp:140
-msgctxt "input-name"
-msgid "P2 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:141
-msgctxt "input-name"
-msgid "P2 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:142
-msgctxt "input-name"
-msgid "P2 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:143
-msgctxt "input-name"
-msgid "P2 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:144
-msgctxt "input-name"
-msgid "P2 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:145
-msgctxt "input-name"
-msgid "P2 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:146
-msgctxt "input-name"
-msgid "P2 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:147
-msgctxt "input-name"
-msgid "P2 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:148
-msgctxt "input-name"
-msgid "P2 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:149
-msgctxt "input-name"
-msgid "P2 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:150
-msgctxt "input-name"
-msgid "P2 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:151
-msgctxt "input-name"
-msgid "P2 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:152
-msgctxt "input-name"
-msgid "P2 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:153
-msgctxt "input-name"
-msgid "P2 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:154
-msgctxt "input-name"
-msgid "P2 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:155
-msgctxt "input-name"
-msgid "P2 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:156
-msgctxt "input-name"
-msgid "P2 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:157
-msgctxt "input-name"
-msgid "P2 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:158
-msgctxt "input-name"
-msgid "P2 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:159
-msgctxt "input-name"
-msgid "P2 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:160
-msgctxt "input-name"
-msgid "P2 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:161
-msgctxt "input-name"
-msgid "P2 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:162
-msgctxt "input-name"
-msgid "P2 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:163
-msgctxt "input-name"
-msgid "P2 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:164
-msgctxt "input-name"
-msgid "P2 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:165
-msgctxt "input-name"
-msgid "P2 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:166
-msgctxt "input-name"
-msgid "P2 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:167
-msgctxt "input-name"
-msgid "P2 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:168
-msgctxt "input-name"
-msgid "P2 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:169
-msgctxt "input-name"
-msgid "P2 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:174
-msgctxt "input-name"
-msgid "P2 Mahjong A"
-msgstr ""
-
-#: src/emu/inpttype.ipp:175
-msgctxt "input-name"
-msgid "P2 Mahjong B"
-msgstr ""
-
-#: src/emu/inpttype.ipp:176
-msgctxt "input-name"
-msgid "P2 Mahjong C"
-msgstr ""
-
-#: src/emu/inpttype.ipp:177
-msgctxt "input-name"
-msgid "P2 Mahjong D"
-msgstr ""
-
-#: src/emu/inpttype.ipp:178
-msgctxt "input-name"
-msgid "P2 Mahjong E"
-msgstr ""
-
-#: src/emu/inpttype.ipp:179
-msgctxt "input-name"
-msgid "P2 Mahjong F"
-msgstr ""
-
-#: src/emu/inpttype.ipp:180
-msgctxt "input-name"
-msgid "P2 Mahjong G"
-msgstr ""
-
-#: src/emu/inpttype.ipp:181
-msgctxt "input-name"
-msgid "P2 Mahjong H"
-msgstr ""
-
-#: src/emu/inpttype.ipp:182
-msgctxt "input-name"
-msgid "P2 Mahjong I"
-msgstr ""
-
-#: src/emu/inpttype.ipp:183
-msgctxt "input-name"
-msgid "P2 Mahjong J"
-msgstr ""
-
-#: src/emu/inpttype.ipp:184
-msgctxt "input-name"
-msgid "P2 Mahjong K"
-msgstr ""
-
-#: src/emu/inpttype.ipp:185
-msgctxt "input-name"
-msgid "P2 Mahjong L"
-msgstr ""
-
-#: src/emu/inpttype.ipp:186
-msgctxt "input-name"
-msgid "P2 Mahjong M"
-msgstr ""
-
-#: src/emu/inpttype.ipp:187
-msgctxt "input-name"
-msgid "P2 Mahjong N"
-msgstr ""
-
-#: src/emu/inpttype.ipp:188
-msgctxt "input-name"
-msgid "P2 Mahjong O"
-msgstr ""
-
-#: src/emu/inpttype.ipp:189
-msgctxt "input-name"
-msgid "P2 Mahjong P"
-msgstr ""
-
-#: src/emu/inpttype.ipp:190
-msgctxt "input-name"
-msgid "P2 Mahjong Q"
-msgstr ""
-
-#: src/emu/inpttype.ipp:191
-msgctxt "input-name"
-msgid "P2 Mahjong Kan"
-msgstr ""
-
-#: src/emu/inpttype.ipp:192
-msgctxt "input-name"
-msgid "P2 Mahjong Pon"
-msgstr ""
-
-#: src/emu/inpttype.ipp:193
-msgctxt "input-name"
-msgid "P2 Mahjong Chi"
-msgstr ""
-
-#: src/emu/inpttype.ipp:194
-msgctxt "input-name"
-msgid "P2 Mahjong Reach"
-msgstr ""
-
-#: src/emu/inpttype.ipp:195
-msgctxt "input-name"
-msgid "P2 Mahjong Ron"
-msgstr ""
-
-#: src/emu/inpttype.ipp:196
-msgctxt "input-name"
-msgid "P2 Mahjong Bet"
-msgstr ""
-
-#: src/emu/inpttype.ipp:197
-msgctxt "input-name"
-msgid "P2 Mahjong Last Chance"
-msgstr ""
-
-#: src/emu/inpttype.ipp:198
-msgctxt "input-name"
-msgid "P2 Mahjong Take Score"
-msgstr ""
-
-#: src/emu/inpttype.ipp:199
-msgctxt "input-name"
-msgid "P2 Mahjong Double Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:200
-msgctxt "input-name"
-msgid "P2 Mahjong Flip Flop"
-msgstr ""
-
-#: src/emu/inpttype.ipp:201
-msgctxt "input-name"
-msgid "P2 Mahjong Big"
-msgstr ""
-
-#: src/emu/inpttype.ipp:202
-msgctxt "input-name"
-msgid "P2 Mahjong Small"
-msgstr ""
-
-#: src/emu/inpttype.ipp:207
-msgctxt "input-name"
-msgid "P2 Hanafuda A/1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:208
-msgctxt "input-name"
-msgid "P2 Hanafuda B/2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:209
-msgctxt "input-name"
-msgid "P2 Hanafuda C/3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:210
-msgctxt "input-name"
-msgid "P2 Hanafuda D/4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:211
-msgctxt "input-name"
-msgid "P2 Hanafuda E/5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:212
-msgctxt "input-name"
-msgid "P2 Hanafuda F/6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:213
-msgctxt "input-name"
-msgid "P2 Hanafuda G/7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:214
-msgctxt "input-name"
-msgid "P2 Hanafuda H/8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:215
-msgctxt "input-name"
-msgid "P2 Hanafuda Yes"
-msgstr ""
-
-#: src/emu/inpttype.ipp:216
-msgctxt "input-name"
-msgid "P2 Hanafuda No"
-msgstr ""
-
-#: src/emu/inpttype.ipp:221
-msgctxt "input-name"
-msgid "P3 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:222
-msgctxt "input-name"
-msgid "P3 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:223
-msgctxt "input-name"
-msgid "P3 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:224
-msgctxt "input-name"
-msgid "P3 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:225
-msgctxt "input-name"
-msgid "P3 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:226
-msgctxt "input-name"
-msgid "P3 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:227
-msgctxt "input-name"
-msgid "P3 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:228
-msgctxt "input-name"
-msgid "P3 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:229
-msgctxt "input-name"
-msgid "P3 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:230
-msgctxt "input-name"
-msgid "P3 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:231
-msgctxt "input-name"
-msgid "P3 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:232
-msgctxt "input-name"
-msgid "P3 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:233
-msgctxt "input-name"
-msgid "P3 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:234
-msgctxt "input-name"
-msgid "P3 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:235
-msgctxt "input-name"
-msgid "P3 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:236
-msgctxt "input-name"
-msgid "P3 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:237
-msgctxt "input-name"
-msgid "P3 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:238
-msgctxt "input-name"
-msgid "P3 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:239
-msgctxt "input-name"
-msgid "P3 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:240
-msgctxt "input-name"
-msgid "P3 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:241
-msgctxt "input-name"
-msgid "P3 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:242
-msgctxt "input-name"
-msgid "P3 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:243
-msgctxt "input-name"
-msgid "P3 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:244
-msgctxt "input-name"
-msgid "P3 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:245
-msgctxt "input-name"
-msgid "P3 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:246
-msgctxt "input-name"
-msgid "P3 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:247
-msgctxt "input-name"
-msgid "P3 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:248
-msgctxt "input-name"
-msgid "P3 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:249
-msgctxt "input-name"
-msgid "P3 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:250
-msgctxt "input-name"
-msgid "P3 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:255
-msgctxt "input-name"
-msgid "P4 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:256
-msgctxt "input-name"
-msgid "P4 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:257
-msgctxt "input-name"
-msgid "P4 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:258
-msgctxt "input-name"
-msgid "P4 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:259
-msgctxt "input-name"
-msgid "P4 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:260
-msgctxt "input-name"
-msgid "P4 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:261
-msgctxt "input-name"
-msgid "P4 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:262
-msgctxt "input-name"
-msgid "P4 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:263
-msgctxt "input-name"
-msgid "P4 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:264
-msgctxt "input-name"
-msgid "P4 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:265
-msgctxt "input-name"
-msgid "P4 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:266
-msgctxt "input-name"
-msgid "P4 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:267
-msgctxt "input-name"
-msgid "P4 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:268
-msgctxt "input-name"
-msgid "P4 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:269
-msgctxt "input-name"
-msgid "P4 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:270
-msgctxt "input-name"
-msgid "P4 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:271
-msgctxt "input-name"
-msgid "P4 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:272
-msgctxt "input-name"
-msgid "P4 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:273
-msgctxt "input-name"
-msgid "P4 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:274
-msgctxt "input-name"
-msgid "P4 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:275
-msgctxt "input-name"
-msgid "P4 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:276
-msgctxt "input-name"
-msgid "P4 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:277
-msgctxt "input-name"
-msgid "P4 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:278
-msgctxt "input-name"
-msgid "P4 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:279
-msgctxt "input-name"
-msgid "P4 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:280
-msgctxt "input-name"
-msgid "P4 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:281
-msgctxt "input-name"
-msgid "P4 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:282
-msgctxt "input-name"
-msgid "P4 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:283
-msgctxt "input-name"
-msgid "P4 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:284
-msgctxt "input-name"
-msgid "P4 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:289
-msgctxt "input-name"
-msgid "P5 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:290
-msgctxt "input-name"
-msgid "P5 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:291
-msgctxt "input-name"
-msgid "P5 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:292
-msgctxt "input-name"
-msgid "P5 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:293
-msgctxt "input-name"
-msgid "P5 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:294
-msgctxt "input-name"
-msgid "P5 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:295
-msgctxt "input-name"
-msgid "P5 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:296
-msgctxt "input-name"
-msgid "P5 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:297
-msgctxt "input-name"
-msgid "P5 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:298
-msgctxt "input-name"
-msgid "P5 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:299
-msgctxt "input-name"
-msgid "P5 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:300
-msgctxt "input-name"
-msgid "P5 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:301
-msgctxt "input-name"
-msgid "P5 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:302
-msgctxt "input-name"
-msgid "P5 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:303
-msgctxt "input-name"
-msgid "P5 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:304
-msgctxt "input-name"
-msgid "P5 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:305
-msgctxt "input-name"
-msgid "P5 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:306
-msgctxt "input-name"
-msgid "P5 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:307
-msgctxt "input-name"
-msgid "P5 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:308
-msgctxt "input-name"
-msgid "P5 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:309
-msgctxt "input-name"
-msgid "P5 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:310
-msgctxt "input-name"
-msgid "P5 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:311
-msgctxt "input-name"
-msgid "P5 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:312
-msgctxt "input-name"
-msgid "P5 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:313
-msgctxt "input-name"
-msgid "P5 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:314
-msgctxt "input-name"
-msgid "P5 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:315
-msgctxt "input-name"
-msgid "P5 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:316
-msgctxt "input-name"
-msgid "P5 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:317
-msgctxt "input-name"
-msgid "P5 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:318
-msgctxt "input-name"
-msgid "P5 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:323
-msgctxt "input-name"
-msgid "P6 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:324
-msgctxt "input-name"
-msgid "P6 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:325
-msgctxt "input-name"
-msgid "P6 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:326
-msgctxt "input-name"
-msgid "P6 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:327
-msgctxt "input-name"
-msgid "P6 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:328
-msgctxt "input-name"
-msgid "P6 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:329
-msgctxt "input-name"
-msgid "P6 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:330
-msgctxt "input-name"
-msgid "P6 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:331
-msgctxt "input-name"
-msgid "P6 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:332
-msgctxt "input-name"
-msgid "P6 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:333
-msgctxt "input-name"
-msgid "P6 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:334
-msgctxt "input-name"
-msgid "P6 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:335
-msgctxt "input-name"
-msgid "P6 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:336
-msgctxt "input-name"
-msgid "P6 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:337
-msgctxt "input-name"
-msgid "P6 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:338
-msgctxt "input-name"
-msgid "P6 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:339
-msgctxt "input-name"
-msgid "P6 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:340
-msgctxt "input-name"
-msgid "P6 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:341
-msgctxt "input-name"
-msgid "P6 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:342
-msgctxt "input-name"
-msgid "P6 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:343
-msgctxt "input-name"
-msgid "P6 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:344
-msgctxt "input-name"
-msgid "P6 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:345
-msgctxt "input-name"
-msgid "P6 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:346
-msgctxt "input-name"
-msgid "P6 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:347
-msgctxt "input-name"
-msgid "P6 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:348
-msgctxt "input-name"
-msgid "P6 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:349
-msgctxt "input-name"
-msgid "P6 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:350
-msgctxt "input-name"
-msgid "P6 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:351
-msgctxt "input-name"
-msgid "P6 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:352
-msgctxt "input-name"
-msgid "P6 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:357
-msgctxt "input-name"
-msgid "P7 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:358
-msgctxt "input-name"
-msgid "P7 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:359
-msgctxt "input-name"
-msgid "P7 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:360
-msgctxt "input-name"
-msgid "P7 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:361
-msgctxt "input-name"
-msgid "P7 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:362
-msgctxt "input-name"
-msgid "P7 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:363
-msgctxt "input-name"
-msgid "P7 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:364
-msgctxt "input-name"
-msgid "P7 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:365
-msgctxt "input-name"
-msgid "P7 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:366
-msgctxt "input-name"
-msgid "P7 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:367
-msgctxt "input-name"
-msgid "P7 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:368
-msgctxt "input-name"
-msgid "P7 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:369
-msgctxt "input-name"
-msgid "P7 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:370
-msgctxt "input-name"
-msgid "P7 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:371
-msgctxt "input-name"
-msgid "P7 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:372
-msgctxt "input-name"
-msgid "P7 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:373
-msgctxt "input-name"
-msgid "P7 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:374
-msgctxt "input-name"
-msgid "P7 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:375
-msgctxt "input-name"
-msgid "P7 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:376
-msgctxt "input-name"
-msgid "P7 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:377
-msgctxt "input-name"
-msgid "P7 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:378
-msgctxt "input-name"
-msgid "P7 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:379
-msgctxt "input-name"
-msgid "P7 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:380
-msgctxt "input-name"
-msgid "P7 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:381
-msgctxt "input-name"
-msgid "P7 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:382
-msgctxt "input-name"
-msgid "P7 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:383
-msgctxt "input-name"
-msgid "P7 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:384
-msgctxt "input-name"
-msgid "P7 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:385
-msgctxt "input-name"
-msgid "P7 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:386
-msgctxt "input-name"
-msgid "P7 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:391
-msgctxt "input-name"
-msgid "P8 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:392
-msgctxt "input-name"
-msgid "P8 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:393
-msgctxt "input-name"
-msgid "P8 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:394
-msgctxt "input-name"
-msgid "P8 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:395
-msgctxt "input-name"
-msgid "P8 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:396
-msgctxt "input-name"
-msgid "P8 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:397
-msgctxt "input-name"
-msgid "P8 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:398
-msgctxt "input-name"
-msgid "P8 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:399
-msgctxt "input-name"
-msgid "P8 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:400
-msgctxt "input-name"
-msgid "P8 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:401
-msgctxt "input-name"
-msgid "P8 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:402
-msgctxt "input-name"
-msgid "P8 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:403
-msgctxt "input-name"
-msgid "P8 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:404
-msgctxt "input-name"
-msgid "P8 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:405
-msgctxt "input-name"
-msgid "P8 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:406
-msgctxt "input-name"
-msgid "P8 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:407
-msgctxt "input-name"
-msgid "P8 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:408
-msgctxt "input-name"
-msgid "P8 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:409
-msgctxt "input-name"
-msgid "P8 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:410
-msgctxt "input-name"
-msgid "P8 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:411
-msgctxt "input-name"
-msgid "P8 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:412
-msgctxt "input-name"
-msgid "P8 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:413
-msgctxt "input-name"
-msgid "P8 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:414
-msgctxt "input-name"
-msgid "P8 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:415
-msgctxt "input-name"
-msgid "P8 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:416
-msgctxt "input-name"
-msgid "P8 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:417
-msgctxt "input-name"
-msgid "P8 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:418
-msgctxt "input-name"
-msgid "P8 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:419
-msgctxt "input-name"
-msgid "P8 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:420
-msgctxt "input-name"
-msgid "P8 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:425
-msgctxt "input-name"
-msgid "P9 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:426
-msgctxt "input-name"
-msgid "P9 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:427
-msgctxt "input-name"
-msgid "P9 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:428
-msgctxt "input-name"
-msgid "P9 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:429
-msgctxt "input-name"
-msgid "P9 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:430
-msgctxt "input-name"
-msgid "P9 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:431
-msgctxt "input-name"
-msgid "P9 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:432
-msgctxt "input-name"
-msgid "P9 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:433
-msgctxt "input-name"
-msgid "P9 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:434
-msgctxt "input-name"
-msgid "P9 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:435
-msgctxt "input-name"
-msgid "P9 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:436
-msgctxt "input-name"
-msgid "P9 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:437
-msgctxt "input-name"
-msgid "P9 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:438
-msgctxt "input-name"
-msgid "P9 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:439
-msgctxt "input-name"
-msgid "P9 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:440
-msgctxt "input-name"
-msgid "P9 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:441
-msgctxt "input-name"
-msgid "P9 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:442
-msgctxt "input-name"
-msgid "P9 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:443
-msgctxt "input-name"
-msgid "P9 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:444
-msgctxt "input-name"
-msgid "P9 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:445
-msgctxt "input-name"
-msgid "P9 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:446
-msgctxt "input-name"
-msgid "P9 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:447
-msgctxt "input-name"
-msgid "P9 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:448
-msgctxt "input-name"
-msgid "P9 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:449
-msgctxt "input-name"
-msgid "P9 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:450
-msgctxt "input-name"
-msgid "P9 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:451
-msgctxt "input-name"
-msgid "P9 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:452
-msgctxt "input-name"
-msgid "P9 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:453
-msgctxt "input-name"
-msgid "P9 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:454
-msgctxt "input-name"
-msgid "P9 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:459
-msgctxt "input-name"
-msgid "P10 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:460
-msgctxt "input-name"
-msgid "P10 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:461
-msgctxt "input-name"
-msgid "P10 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:462
-msgctxt "input-name"
-msgid "P10 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:463
-msgctxt "input-name"
-msgid "P10 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:464
-msgctxt "input-name"
-msgid "P10 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:465
-msgctxt "input-name"
-msgid "P10 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:466
-msgctxt "input-name"
-msgid "P10 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:467
-msgctxt "input-name"
-msgid "P10 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:468
-msgctxt "input-name"
-msgid "P10 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:469
-msgctxt "input-name"
-msgid "P10 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:470
-msgctxt "input-name"
-msgid "P10 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:471
-msgctxt "input-name"
-msgid "P10 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:472
-msgctxt "input-name"
-msgid "P10 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:473
-msgctxt "input-name"
-msgid "P10 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:474
-msgctxt "input-name"
-msgid "P10 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:475
-msgctxt "input-name"
-msgid "P10 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:476
-msgctxt "input-name"
-msgid "P10 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:477
-msgctxt "input-name"
-msgid "P10 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:478
-msgctxt "input-name"
-msgid "P10 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:479
-msgctxt "input-name"
-msgid "P10 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:480
-msgctxt "input-name"
-msgid "P10 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:481
-msgctxt "input-name"
-msgid "P10 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:482
-msgctxt "input-name"
-msgid "P10 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:483
-msgctxt "input-name"
-msgid "P10 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:484
-msgctxt "input-name"
-msgid "P10 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:485
-msgctxt "input-name"
-msgid "P10 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:486
-msgctxt "input-name"
-msgid "P10 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:487
-msgctxt "input-name"
-msgid "P10 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:488
-msgctxt "input-name"
-msgid "P10 Select"
-msgstr ""
-
 #: src/emu/inpttype.ipp:493
 msgctxt "input-name"
 msgid "1 Player Start"
@@ -5477,154 +4106,31 @@ msgctxt "input-name"
 msgid "Volume Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:550
-msgctxt "input-name"
-msgid "P1 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:551
-msgctxt "input-name"
-msgid "P2 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:552
-msgctxt "input-name"
-msgid "P3 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:553
-msgctxt "input-name"
-msgid "P4 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:554
-msgctxt "input-name"
-msgid "P5 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:555
-msgctxt "input-name"
-msgid "P6 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:556
-msgctxt "input-name"
-msgid "P7 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:557
-msgctxt "input-name"
-msgid "P8 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:558
-msgctxt "input-name"
-msgid "P9 Pedal 1"
-msgstr ""
-
+#: src/emu/inpttype.ipp:550 src/emu/inpttype.ipp:551 src/emu/inpttype.ipp:552
+#: src/emu/inpttype.ipp:553 src/emu/inpttype.ipp:554 src/emu/inpttype.ipp:555
+#: src/emu/inpttype.ipp:556 src/emu/inpttype.ipp:557 src/emu/inpttype.ipp:558
 #: src/emu/inpttype.ipp:559
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:564
-msgctxt "input-name"
-msgid "P1 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:565
-msgctxt "input-name"
-msgid "P2 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:566
-msgctxt "input-name"
-msgid "P3 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:567
-msgctxt "input-name"
-msgid "P4 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:568
-msgctxt "input-name"
-msgid "P5 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:569
-msgctxt "input-name"
-msgid "P6 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:570
-msgctxt "input-name"
-msgid "P7 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:571
-msgctxt "input-name"
-msgid "P8 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:572
-msgctxt "input-name"
-msgid "P9 Pedal 2"
+msgid "%p Pedal 1"
 msgstr ""
 
+#: src/emu/inpttype.ipp:564 src/emu/inpttype.ipp:565 src/emu/inpttype.ipp:566
+#: src/emu/inpttype.ipp:567 src/emu/inpttype.ipp:568 src/emu/inpttype.ipp:569
+#: src/emu/inpttype.ipp:570 src/emu/inpttype.ipp:571 src/emu/inpttype.ipp:572
 #: src/emu/inpttype.ipp:573
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:578
-msgctxt "input-name"
-msgid "P1 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:579
-msgctxt "input-name"
-msgid "P2 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:580
-msgctxt "input-name"
-msgid "P3 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:581
-msgctxt "input-name"
-msgid "P4 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:582
-msgctxt "input-name"
-msgid "P5 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:583
-msgctxt "input-name"
-msgid "P6 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:584
-msgctxt "input-name"
-msgid "P7 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:585
-msgctxt "input-name"
-msgid "P8 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:586
-msgctxt "input-name"
-msgid "P9 Pedal 3"
+msgid "%p Pedal 2"
 msgstr ""
 
+#: src/emu/inpttype.ipp:578 src/emu/inpttype.ipp:579 src/emu/inpttype.ipp:580
+#: src/emu/inpttype.ipp:581 src/emu/inpttype.ipp:582 src/emu/inpttype.ipp:583
+#: src/emu/inpttype.ipp:584 src/emu/inpttype.ipp:585 src/emu/inpttype.ipp:586
 #: src/emu/inpttype.ipp:587
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 3"
+msgid "%p Pedal 3"
 msgstr ""
 
 #: src/emu/inpttype.ipp:592
diff --git a/language/Finnish/strings.po b/language/Finnish/strings.po
index 443e0511d60..eab0e9f864a 100644
--- a/language/Finnish/strings.po
+++ b/language/Finnish/strings.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-19 02:50+1100\n"
+"POT-Creation-Date: 2021-12-09 04:44+1100\n"
 "PO-Revision-Date: 2016-02-20 18:03+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: MAME Language Team\n"
@@ -261,12 +261,12 @@ msgstr ""
 msgid "Driver: \"%1$s\" software list "
 msgstr ""
 
-#: src/frontend/mame/ui/selsoft.cpp:711 src/frontend/mame/ui/selgame.cpp:1066
+#: src/frontend/mame/ui/selsoft.cpp:711 src/frontend/mame/ui/selgame.cpp:1076
 #, c-format
 msgid "%1$s: %2$s - Search: %3$s_"
 msgstr ""
 
-#: src/frontend/mame/ui/selsoft.cpp:713 src/frontend/mame/ui/selgame.cpp:1068
+#: src/frontend/mame/ui/selsoft.cpp:713 src/frontend/mame/ui/selgame.cpp:1078
 #, c-format
 msgid "Search: %1$s_"
 msgstr ""
@@ -276,7 +276,7 @@ msgstr ""
 msgid "Software list/item: %1$s:%2$s"
 msgstr ""
 
-#: src/frontend/mame/ui/optsmenu.cpp:73 src/frontend/mame/ui/sndmenu.cpp:165
+#: src/frontend/mame/ui/optsmenu.cpp:73 src/frontend/mame/ui/sndmenu.cpp:161
 msgid "Sound Options"
 msgstr ""
 
@@ -371,11 +371,11 @@ msgid "Show mouse pointer"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:39
-msgid "Confirm quit from machines"
+msgid "Confirm quit from emulation"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:40
-msgid "Skip information screen at startup"
+msgid "Skip system information screen"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:41
@@ -391,7 +391,7 @@ msgid "Skip BIOS selection menu"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:44
-msgid "Skip software parts selection menu"
+msgid "Skip software part selection menu"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:45
@@ -543,7 +543,7 @@ msgid "UI active"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:91
-msgid "Offscreen reload"
+msgid "Off-screen reload"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:92
@@ -559,7 +559,7 @@ msgid "Natural keyboard"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:95
-msgid "Simultaneous contradictory"
+msgid "Allow contradictory joystick inputs"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:96
@@ -583,7 +583,7 @@ msgid "Pedal Device Assignment"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:106
-msgid "Adstick Device Assignment"
+msgid "AD Stick Device Assignment"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:107
@@ -670,14 +670,14 @@ msgstr ""
 msgid "Wait Vertical Sync"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:687
+#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:689
 #: src/frontend/mame/ui/videoopt.cpp:191 src/frontend/mame/ui/custui.cpp:490
 #: src/frontend/mame/ui/analogipt.cpp:471 plugins/cheatfind/init.lua:766
 #: plugins/cheatfind/init.lua:777 plugins/cheat/init.lua:668
 msgid "On"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:690
+#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:692
 #: src/frontend/mame/ui/videoopt.cpp:207 src/frontend/mame/ui/custui.cpp:490
 #: src/frontend/mame/ui/analogipt.cpp:471 plugins/cheatfind/init.lua:763
 #: plugins/cheatfind/init.lua:774 plugins/cheat/init.lua:671
@@ -685,11 +685,11 @@ msgstr ""
 msgid "Off"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:693
+#: src/frontend/mame/ui/menu.cpp:695
 msgid "Auto"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:1195
+#: src/frontend/mame/ui/menu.cpp:1197
 #: src/frontend/mame/ui/simpleselgame.cpp:278
 #: src/frontend/mame/ui/selmenu.cpp:1280
 msgid "Return to Previous Menu"
@@ -697,7 +697,7 @@ msgstr ""
 
 #: src/frontend/mame/ui/filemngr.cpp:139
 #: src/frontend/mame/ui/confswitch.cpp:119
-#: src/frontend/mame/ui/inputmap.cpp:559 src/frontend/mame/ui/analogipt.cpp:360
+#: src/frontend/mame/ui/inputmap.cpp:563 src/frontend/mame/ui/analogipt.cpp:360
 #, c-format
 msgid "[root%1$s]"
 msgstr ""
@@ -940,22 +940,22 @@ msgid ""
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "GHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "MHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "kHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "Hz"
 msgstr ""
 
@@ -979,38 +979,38 @@ msgstr ""
 msgid "Vector"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:480
+#: src/frontend/mame/ui/info.cpp:483
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:480
+#: src/frontend/mame/ui/info.cpp:483
 msgid "%2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:497
+#: src/frontend/mame/ui/info.cpp:500
 #, c-format
 msgid "Screen '%1$s'"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:499
+#: src/frontend/mame/ui/info.cpp:502
 msgid "Screen"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:570 src/frontend/mame/ui/info.cpp:581
+#: src/frontend/mame/ui/info.cpp:573 src/frontend/mame/ui/info.cpp:584
 #, c-format
 msgid "%1$s:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:662
+#: src/frontend/mame/ui/info.cpp:665
 msgid "Not supported"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:665
+#: src/frontend/mame/ui/info.cpp:668
 msgid "Partially supported"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:674
+#: src/frontend/mame/ui/info.cpp:677
 msgid "[empty]"
 msgstr ""
 
@@ -1083,7 +1083,7 @@ msgid "Emulated"
 msgstr ""
 
 #: src/frontend/mame/ui/keyboard.cpp:59 src/frontend/mame/ui/confswitch.cpp:117
-#: src/frontend/mame/ui/inputmap.cpp:557 src/frontend/mame/ui/analogipt.cpp:358
+#: src/frontend/mame/ui/inputmap.cpp:561 src/frontend/mame/ui/analogipt.cpp:358
 #, c-format
 msgid "%1$s [root%2$s]"
 msgstr ""
@@ -1443,7 +1443,7 @@ msgctxt "swlist-info"
 msgid "Software list/item"
 msgstr ""
 
-#: src/frontend/mame/ui/datmenu.cpp:88 src/frontend/mame/ui/selmenu.cpp:2698
+#: src/frontend/mame/ui/datmenu.cpp:88 src/frontend/mame/ui/selmenu.cpp:2707
 msgid "Software List Info"
 msgstr ""
 
@@ -1558,7 +1558,7 @@ msgstr ""
 msgid "Configure Machine:"
 msgstr ""
 
-#: src/frontend/mame/ui/miscmenu.cpp:858 src/frontend/mame/ui/selmenu.cpp:2638
+#: src/frontend/mame/ui/miscmenu.cpp:858 src/frontend/mame/ui/selmenu.cpp:2647
 msgid " (default)"
 msgstr ""
 
@@ -1575,7 +1575,7 @@ msgid ""
 "Press %2$s to return to emulation"
 msgstr ""
 
-#: src/frontend/mame/ui/info_pty.cpp:30 src/frontend/mame/ui/mainmenu.cpp:155
+#: src/frontend/mame/ui/info_pty.cpp:30
 msgid "Pseudo terminals"
 msgstr ""
 
@@ -1643,52 +1643,52 @@ msgstr ""
 msgid "Other Controls"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:227
+#: src/frontend/mame/ui/inputmap.cpp:231
 msgid "This machine has no configurable inputs."
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:327
+#: src/frontend/mame/ui/inputmap.cpp:331
 msgid "Pressed"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:397
+#: src/frontend/mame/ui/inputmap.cpp:401
 msgid "Invalid sequence entered"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:542
+#: src/frontend/mame/ui/inputmap.cpp:546
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:543
+#: src/frontend/mame/ui/inputmap.cpp:547
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog Inc"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:544
+#: src/frontend/mame/ui/inputmap.cpp:548
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog Dec"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:586
+#: src/frontend/mame/ui/inputmap.cpp:590
 #, c-format
 msgid "Press %1$s to set\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:587
+#: src/frontend/mame/ui/inputmap.cpp:591
 #, c-format
 msgid "Press %1$s to append\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:588
+#: src/frontend/mame/ui/inputmap.cpp:592
 #, c-format
 msgid "Press %1$s to clear\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:589
+#: src/frontend/mame/ui/inputmap.cpp:593
 #, c-format
 msgid "Press %1$s to restore default\n"
 msgstr ""
@@ -1752,7 +1752,7 @@ msgid ""
 msgstr ""
 
 #: src/frontend/mame/ui/simpleselgame.cpp:273
-#: src/frontend/mame/ui/selgame.cpp:436
+#: src/frontend/mame/ui/selgame.cpp:443
 msgid "Configure Options"
 msgstr ""
 
@@ -2080,16 +2080,16 @@ msgstr ""
 msgid "Expand to fit"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:437
+#: src/frontend/mame/ui/selgame.cpp:444
 msgid "Configure Machine"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:1050
+#: src/frontend/mame/ui/selgame.cpp:1060
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d machines (%5$d BIOS) )"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:1078
+#: src/frontend/mame/ui/selgame.cpp:1088
 #, c-format
 msgid "System: %1$-.100s"
 msgstr ""
@@ -2111,7 +2111,7 @@ msgstr ""
 #: src/frontend/mame/ui/auditmenu.cpp:98
 #, c-format
 msgid ""
-"Auditing ROMs for machine %2$u of %3$u...\n"
+"Auditing media for machine %2$u of %3$u...\n"
 "%1$s"
 msgstr ""
 
@@ -2126,12 +2126,12 @@ msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:136
 #, c-format
-msgid "Audit ROMs for %1$u machines marked unavailable"
+msgid "Audit media for %1$u machines marked unavailable"
 msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:137
 #, c-format
-msgid "Audit ROMs for all %1$u machines"
+msgid "Audit media for all %1$u machines"
 msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:154
@@ -2337,84 +2337,84 @@ msgctxt "color-sample"
 msgid "Clone"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:914
+#: src/frontend/mame/ui/custui.cpp:906
 msgid "ARGB Settings"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:919 src/frontend/mame/ui/custui.cpp:922
+#: src/frontend/mame/ui/custui.cpp:911 src/frontend/mame/ui/custui.cpp:914
 msgctxt "color-channel"
 msgid "Alpha"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:927 src/frontend/mame/ui/custui.cpp:930
+#: src/frontend/mame/ui/custui.cpp:919 src/frontend/mame/ui/custui.cpp:922
 msgctxt "color-channel"
 msgid "Red"
 msgstr ""
 
+#: src/frontend/mame/ui/custui.cpp:927 src/frontend/mame/ui/custui.cpp:930
+msgctxt "color-channel"
+msgid "Green"
+msgstr ""
+
 #: src/frontend/mame/ui/custui.cpp:935 src/frontend/mame/ui/custui.cpp:938
 msgctxt "color-channel"
-msgid "Green"
-msgstr ""
-
-#: src/frontend/mame/ui/custui.cpp:943 src/frontend/mame/ui/custui.cpp:946
-msgctxt "color-channel"
 msgid "Blue"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:949
+#: src/frontend/mame/ui/custui.cpp:941
 msgid "Choose from palette"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:996
+#: src/frontend/mame/ui/custui.cpp:988
 msgid "Color preview:"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1093
+#: src/frontend/mame/ui/custui.cpp:1085
 msgctxt "color-preset"
 msgid "White"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1094
+#: src/frontend/mame/ui/custui.cpp:1086
 msgctxt "color-preset"
 msgid "Silver"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1095
+#: src/frontend/mame/ui/custui.cpp:1087
 msgctxt "color-preset"
 msgid "Gray"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1096
+#: src/frontend/mame/ui/custui.cpp:1088
 msgctxt "color-preset"
 msgid "Black"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1097
+#: src/frontend/mame/ui/custui.cpp:1089
 msgctxt "color-preset"
 msgid "Red"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1098
+#: src/frontend/mame/ui/custui.cpp:1090
 msgctxt "color-preset"
 msgid "Orange"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1099
+#: src/frontend/mame/ui/custui.cpp:1091
 msgctxt "color-preset"
 msgid "Yellow"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1100
+#: src/frontend/mame/ui/custui.cpp:1092
 msgctxt "color-preset"
 msgid "Green"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1101
+#: src/frontend/mame/ui/custui.cpp:1093
 msgctxt "color-preset"
 msgid "Blue"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1102
+#: src/frontend/mame/ui/custui.cpp:1094
 msgctxt "color-preset"
 msgid "Violet"
 msgstr ""
@@ -2479,7 +2479,7 @@ msgid "Input (general)"
 msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:123
-msgid "Input (this Machine)"
+msgid "Input (this machine)"
 msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:126
@@ -2518,6 +2518,10 @@ msgstr ""
 msgid "Tape Control"
 msgstr ""
 
+#: src/frontend/mame/ui/mainmenu.cpp:155
+msgid "Pseudo Terminals"
+msgstr ""
+
 #: src/frontend/mame/ui/mainmenu.cpp:158
 msgid "BIOS Selection"
 msgstr ""
@@ -2556,7 +2560,7 @@ msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:200
 #, c-format
-msgid "About %s"
+msgid "About %1$s"
 msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:212
@@ -2716,373 +2720,373 @@ msgstr ""
 msgid "%1$s %2$s"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2235
+#: src/frontend/mame/ui/selmenu.cpp:2244
 msgid "Images"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2236
+#: src/frontend/mame/ui/selmenu.cpp:2245
 msgid "Infos"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2551
+#: src/frontend/mame/ui/selmenu.cpp:2560
 msgid ""
 "Required ROM/disk images for the selected system are missing or incorrect. "
 "Please acquire the correct files or select a different system.\n"
 "\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2567
+#: src/frontend/mame/ui/selmenu.cpp:2576
 msgid ""
 "Required ROM/disk images for the selected software are missing or incorrect. "
 "Please acquire the correct files or select a different software item.\n"
 "\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2583
+#: src/frontend/mame/ui/selmenu.cpp:2592
 msgid "incorrect checksum"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2586
+#: src/frontend/mame/ui/selmenu.cpp:2595
 msgid "incorrect length"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2589
+#: src/frontend/mame/ui/selmenu.cpp:2598
 msgid "not found"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2600
+#: src/frontend/mame/ui/selmenu.cpp:2609
 #, c-format
 msgid "%1$s (%2$s) - %3$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2602
+#: src/frontend/mame/ui/selmenu.cpp:2611
 #, c-format
 msgid "%1$s - %2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2606
+#: src/frontend/mame/ui/selmenu.cpp:2615
 msgid "Press any key to continue."
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2735
+#: src/frontend/mame/ui/selmenu.cpp:2744
 msgid "General Info"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2887
-#, c-format
-msgid "Romset\t%1$s\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2888
-#, c-format
-msgid "Year\t%1$s\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2889
-#, c-format
-msgid "Manufacturer\t%1$s\n"
-msgstr ""
-
 #: src/frontend/mame/ui/selmenu.cpp:2896
 #, c-format
-msgid "Driver is Clone of\t%1$s\n"
+msgid "Romset\t%1$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2901
-msgid "Driver is Parent\t\n"
+#: src/frontend/mame/ui/selmenu.cpp:2897
+#, c-format
+msgid "Year\t%1$s\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2898
+#, c-format
+msgid "Manufacturer\t%1$s\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2905
-msgid "Analog Controls\tYes\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2907
-msgid "Keyboard Inputs\tYes\n"
+#, c-format
+msgid "Driver is Clone of\t%1$s\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2910
-msgid "Overall\tNOT WORKING\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2912
-msgid "Overall\tUnemulated Protection\n"
+msgid "Driver is Parent\t\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2914
-msgid "Overall\tWorking\n"
+msgid "Analog Controls\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2917
-msgid "Graphics\tUnimplemented\n"
+#: src/frontend/mame/ui/selmenu.cpp:2916
+msgid "Keyboard Inputs\tYes\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2919
-msgid "Graphics\tWrong Colors\n"
+msgid "Overall\tNOT WORKING\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2921
-msgid "Graphics\tImperfect Colors\n"
+msgid "Overall\tUnemulated Protection\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2923
-msgid "Graphics\tImperfect\n"
+msgid "Overall\tWorking\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2925
-msgid "Graphics\tOK\n"
+#: src/frontend/mame/ui/selmenu.cpp:2926
+msgid "Graphics\tUnimplemented\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2928
-msgid "Sound\tNone\n"
+msgid "Graphics\tWrong Colors\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2930
-msgid "Sound\tUnimplemented\n"
+msgid "Graphics\tImperfect Colors\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2932
-msgid "Sound\tImperfect\n"
+msgid "Graphics\tImperfect\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2934
-msgid "Sound\tOK\n"
+msgid "Graphics\tOK\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2937
-msgid "Capture\tUnimplemented\n"
+msgid "Sound\tNone\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2939
+msgid "Sound\tUnimplemented\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2941
+msgid "Sound\tImperfect\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2943
+msgid "Sound\tOK\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2946
+msgid "Capture\tUnimplemented\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2948
 msgid "Capture\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2942
+#: src/frontend/mame/ui/selmenu.cpp:2951
 msgid "Camera\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2944
+#: src/frontend/mame/ui/selmenu.cpp:2953
 msgid "Camera\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2947
+#: src/frontend/mame/ui/selmenu.cpp:2956
 msgid "Microphone\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2949
+#: src/frontend/mame/ui/selmenu.cpp:2958
 msgid "Microphone\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2952
+#: src/frontend/mame/ui/selmenu.cpp:2961
 msgid "Controls\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2954
+#: src/frontend/mame/ui/selmenu.cpp:2963
 msgid "Controls\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2957
+#: src/frontend/mame/ui/selmenu.cpp:2966
 msgid "Keyboard\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2959
+#: src/frontend/mame/ui/selmenu.cpp:2968
 msgid "Keyboard\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2962
+#: src/frontend/mame/ui/selmenu.cpp:2971
 msgid "Mouse\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2964
+#: src/frontend/mame/ui/selmenu.cpp:2973
 msgid "Mouse\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2967
+#: src/frontend/mame/ui/selmenu.cpp:2976
 msgid "Media\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2969
+#: src/frontend/mame/ui/selmenu.cpp:2978
 msgid "Media\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2972
+#: src/frontend/mame/ui/selmenu.cpp:2981
 msgid "Disk\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2974
+#: src/frontend/mame/ui/selmenu.cpp:2983
 msgid "Disk\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2977
+#: src/frontend/mame/ui/selmenu.cpp:2986
 msgid "Printer\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2979
+#: src/frontend/mame/ui/selmenu.cpp:2988
 msgid "Printer\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2982
+#: src/frontend/mame/ui/selmenu.cpp:2991
 msgid "Mag. Tape\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2984
+#: src/frontend/mame/ui/selmenu.cpp:2993
 msgid "Mag. Tape\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2987
+#: src/frontend/mame/ui/selmenu.cpp:2996
 msgid "Punch Tape\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2989
+#: src/frontend/mame/ui/selmenu.cpp:2998
 msgid "Punch Tape\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2992
+#: src/frontend/mame/ui/selmenu.cpp:3001
 msgid "Mag. Drum\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2994
+#: src/frontend/mame/ui/selmenu.cpp:3003
 msgid "Mag. Drum\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2997
+#: src/frontend/mame/ui/selmenu.cpp:3006
 msgid "(EP)ROM\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2999
+#: src/frontend/mame/ui/selmenu.cpp:3008
 msgid "(EP)ROM\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3002
+#: src/frontend/mame/ui/selmenu.cpp:3011
 msgid "Communications\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3004
+#: src/frontend/mame/ui/selmenu.cpp:3013
 msgid "Communications\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3007
+#: src/frontend/mame/ui/selmenu.cpp:3016
 msgid "LAN\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3009
+#: src/frontend/mame/ui/selmenu.cpp:3018
 msgid "LAN\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3012
+#: src/frontend/mame/ui/selmenu.cpp:3021
 msgid "WAN\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3014
+#: src/frontend/mame/ui/selmenu.cpp:3023
 msgid "WAN\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3017
+#: src/frontend/mame/ui/selmenu.cpp:3026
 msgid "Timing\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3019
+#: src/frontend/mame/ui/selmenu.cpp:3028
 msgid "Timing\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3021
+#: src/frontend/mame/ui/selmenu.cpp:3030
 msgid "Mechanical Machine\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3021
+#: src/frontend/mame/ui/selmenu.cpp:3030
 msgid "Mechanical Machine\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3022
+#: src/frontend/mame/ui/selmenu.cpp:3031
 msgid "Requires Artwork\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3022
+#: src/frontend/mame/ui/selmenu.cpp:3031
 msgid "Requires Artwork\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3023
+#: src/frontend/mame/ui/selmenu.cpp:3032
 msgid "Requires Clickable Artwork\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3023
+#: src/frontend/mame/ui/selmenu.cpp:3032
 msgid "Requires Clickable Artwork\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3025
+#: src/frontend/mame/ui/selmenu.cpp:3034
 msgid "Support Cocktail\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3026
+#: src/frontend/mame/ui/selmenu.cpp:3035
 msgid "Driver is BIOS\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3026
+#: src/frontend/mame/ui/selmenu.cpp:3035
 msgid "Driver is BIOS\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3027
+#: src/frontend/mame/ui/selmenu.cpp:3036
 msgid "Support Save\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3027
+#: src/frontend/mame/ui/selmenu.cpp:3036
 msgid "Support Save\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3028
+#: src/frontend/mame/ui/selmenu.cpp:3037
 msgid "Screen Orientation\tVertical\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3028
+#: src/frontend/mame/ui/selmenu.cpp:3037
 msgid "Screen Orientation\tHorizontal\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3038
+#: src/frontend/mame/ui/selmenu.cpp:3047
 msgid "Requires CHD\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3038
+#: src/frontend/mame/ui/selmenu.cpp:3047
 msgid "Requires CHD\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3051
-msgid "ROM Audit Result\tOK\n"
+#: src/frontend/mame/ui/selmenu.cpp:3060
+msgid "Media Audit Result\tOK\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3053
-msgid "ROM Audit Result\tBAD\n"
+#: src/frontend/mame/ui/selmenu.cpp:3062
+msgid "Media Audit Result\tBAD\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3056
+#: src/frontend/mame/ui/selmenu.cpp:3065
 msgid "Samples Audit Result\tNone Needed\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3058
+#: src/frontend/mame/ui/selmenu.cpp:3067
 msgid "Samples Audit Result\tOK\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3060
+#: src/frontend/mame/ui/selmenu.cpp:3069
 msgid "Samples Audit Result\tBAD\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3064
+#: src/frontend/mame/ui/selmenu.cpp:3073
 msgid ""
-"ROM Audit \tDisabled\n"
-"Samples Audit \tDisabled\n"
+"Media Audit\tDisabled\n"
+"Samples Audit\tDisabled\n"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:150
+#: src/frontend/mame/ui/sndmenu.cpp:146
 msgid "Sound"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:151
+#: src/frontend/mame/ui/sndmenu.cpp:147
 msgid "Compressor"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:152
+#: src/frontend/mame/ui/sndmenu.cpp:148
 msgid "Sample Rate"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:153
+#: src/frontend/mame/ui/sndmenu.cpp:149
 msgid "Use External Samples"
 msgstr ""
 
@@ -3121,511 +3125,681 @@ msgstr ""
 msgid "  Screen '%1$s': Vector\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:132
+#: src/frontend/mame/ui/devopt.cpp:135
 #, c-format
 msgid "  Screen '%1$s': %2$d × %3$d (V) %4$s Hz\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:133
+#: src/frontend/mame/ui/devopt.cpp:136
 #, c-format
 msgid "  Screen '%1$s': %2$d × %3$d (H) %4$s Hz\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:147
+#: src/frontend/mame/ui/devopt.cpp:150
 msgid "* Sound:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:211
+#: src/frontend/mame/ui/devopt.cpp:214
 #, c-format
 msgid ""
 "* BIOS settings:\n"
 "  %1$d options    [default: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:255 src/frontend/mame/ui/devopt.cpp:271
-#: src/frontend/mame/ui/devopt.cpp:332
+#: src/frontend/mame/ui/devopt.cpp:258 src/frontend/mame/ui/devopt.cpp:274
+#: src/frontend/mame/ui/devopt.cpp:335
 #, c-format
 msgid "  %1$s    [default: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:260 src/frontend/mame/ui/devopt.cpp:276
+#: src/frontend/mame/ui/devopt.cpp:263 src/frontend/mame/ui/devopt.cpp:279
 #, c-format
 msgid "  %1$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:282
+#: src/frontend/mame/ui/devopt.cpp:285
 msgid "* DIP switch settings:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:287
+#: src/frontend/mame/ui/devopt.cpp:290
 msgid "* Configuration settings:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:291
+#: src/frontend/mame/ui/devopt.cpp:294
 msgid "* Input device(s):\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:293
+#: src/frontend/mame/ui/devopt.cpp:296
 #, c-format
 msgid "  User inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:295
+#: src/frontend/mame/ui/devopt.cpp:298
 #, c-format
 msgid "  Mahjong inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:297
+#: src/frontend/mame/ui/devopt.cpp:300
 #, c-format
 msgid "  Hanafuda inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:299
+#: src/frontend/mame/ui/devopt.cpp:302
 #, c-format
 msgid "  Gambling inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:301
+#: src/frontend/mame/ui/devopt.cpp:304
 #, c-format
 msgid "  Analog inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:303
+#: src/frontend/mame/ui/devopt.cpp:306
 #, c-format
 msgid "  Adjuster inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:305
+#: src/frontend/mame/ui/devopt.cpp:308
 #, c-format
 msgid "  Keypad inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:307
+#: src/frontend/mame/ui/devopt.cpp:310
 #, c-format
 msgid "  Keyboard inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:312
+#: src/frontend/mame/ui/devopt.cpp:315
 msgid "* Media Options:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:317
+#: src/frontend/mame/ui/devopt.cpp:320
 #, c-format
 msgid "  %1$s    [tag: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:327
+#: src/frontend/mame/ui/devopt.cpp:330
 msgid "* Slot Options:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:341
+#: src/frontend/mame/ui/devopt.cpp:344
 msgid "[None]\n"
 msgstr ""
 
-#: src/emu/render.cpp:1847
+#: src/emu/render.cpp:1796
 #, c-format
 msgctxt "view-name"
 msgid "Screen %1$u Standard (%2$u:%3$u)"
 msgstr ""
 
-#: src/emu/render.cpp:1873
+#: src/emu/render.cpp:1822
 #, c-format
 msgctxt "view-name"
 msgid "Screen %1$u Pixel Aspect (%2$u:%3$u)"
 msgstr ""
 
-#: src/emu/render.cpp:1895 src/emu/render.cpp:2030
+#: src/emu/render.cpp:1844 src/emu/render.cpp:1979
 msgctxt "view-name"
 msgid "Cocktail"
 msgstr ""
 
-#: src/emu/render.cpp:2015
+#: src/emu/render.cpp:1964
 msgctxt "view-name"
 msgid "Left-to-Right"
 msgstr ""
 
-#: src/emu/render.cpp:2016
+#: src/emu/render.cpp:1965
 msgctxt "view-name"
 msgid "Left-to-Right (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2017
+#: src/emu/render.cpp:1966
 msgctxt "view-name"
 msgid "Top-to-Bottom"
 msgstr ""
 
-#: src/emu/render.cpp:2018
+#: src/emu/render.cpp:1967
 msgctxt "view-name"
 msgid "Top-to-Bottom (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2069
+#: src/emu/render.cpp:2018
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Left-to-Right, Top-to-Bottom"
 msgstr ""
 
-#: src/emu/render.cpp:2078
+#: src/emu/render.cpp:2027
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Left-to-Right, Top-to-Bottom (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2087
+#: src/emu/render.cpp:2036
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Top-to-Bottom, Left-to-Right"
 msgstr ""
 
-#: src/emu/render.cpp:2096
+#: src/emu/render.cpp:2045
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Top-to-Bottom, Left-to-Right (Gapless)"
 msgstr ""
 
-#: src/emu/inpttype.ipp:22
+#: src/emu/ioport.cpp:332
+#, c-format
 msgctxt "input-name"
-msgid "P1 Up"
+msgid "P%1$u"
 msgstr ""
 
-#: src/emu/inpttype.ipp:23
+#: src/emu/ioport.cpp:1924
 msgctxt "input-name"
-msgid "P1 Down"
+msgid "???"
 msgstr ""
 
-#: src/emu/inpttype.ipp:24
+#: src/emu/inpttype.ipp:22 src/emu/inpttype.ipp:140 src/emu/inpttype.ipp:221
+#: src/emu/inpttype.ipp:255 src/emu/inpttype.ipp:289 src/emu/inpttype.ipp:323
+#: src/emu/inpttype.ipp:357 src/emu/inpttype.ipp:391 src/emu/inpttype.ipp:425
+#: src/emu/inpttype.ipp:459
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left"
+msgid "%p Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:25
+#: src/emu/inpttype.ipp:23 src/emu/inpttype.ipp:141 src/emu/inpttype.ipp:222
+#: src/emu/inpttype.ipp:256 src/emu/inpttype.ipp:290 src/emu/inpttype.ipp:324
+#: src/emu/inpttype.ipp:358 src/emu/inpttype.ipp:392 src/emu/inpttype.ipp:426
+#: src/emu/inpttype.ipp:460
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right"
+msgid "%p Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:26
+#: src/emu/inpttype.ipp:24 src/emu/inpttype.ipp:142 src/emu/inpttype.ipp:223
+#: src/emu/inpttype.ipp:257 src/emu/inpttype.ipp:291 src/emu/inpttype.ipp:325
+#: src/emu/inpttype.ipp:359 src/emu/inpttype.ipp:393 src/emu/inpttype.ipp:427
+#: src/emu/inpttype.ipp:461
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Up"
+msgid "%p Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:27
+#: src/emu/inpttype.ipp:25 src/emu/inpttype.ipp:143 src/emu/inpttype.ipp:224
+#: src/emu/inpttype.ipp:258 src/emu/inpttype.ipp:292 src/emu/inpttype.ipp:326
+#: src/emu/inpttype.ipp:360 src/emu/inpttype.ipp:394 src/emu/inpttype.ipp:428
+#: src/emu/inpttype.ipp:462
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Down"
+msgid "%p Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:28
+#: src/emu/inpttype.ipp:26 src/emu/inpttype.ipp:144 src/emu/inpttype.ipp:225
+#: src/emu/inpttype.ipp:259 src/emu/inpttype.ipp:293 src/emu/inpttype.ipp:327
+#: src/emu/inpttype.ipp:361 src/emu/inpttype.ipp:395 src/emu/inpttype.ipp:429
+#: src/emu/inpttype.ipp:463
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Left"
+msgid "%p Right Stick/Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:29
+#: src/emu/inpttype.ipp:27 src/emu/inpttype.ipp:145 src/emu/inpttype.ipp:226
+#: src/emu/inpttype.ipp:260 src/emu/inpttype.ipp:294 src/emu/inpttype.ipp:328
+#: src/emu/inpttype.ipp:362 src/emu/inpttype.ipp:396 src/emu/inpttype.ipp:430
+#: src/emu/inpttype.ipp:464
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Right"
+msgid "%p Right Stick/Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:30
+#: src/emu/inpttype.ipp:28 src/emu/inpttype.ipp:146 src/emu/inpttype.ipp:227
+#: src/emu/inpttype.ipp:261 src/emu/inpttype.ipp:295 src/emu/inpttype.ipp:329
+#: src/emu/inpttype.ipp:363 src/emu/inpttype.ipp:397 src/emu/inpttype.ipp:431
+#: src/emu/inpttype.ipp:465
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Up"
+msgid "%p Right Stick/Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:31
+#: src/emu/inpttype.ipp:29 src/emu/inpttype.ipp:147 src/emu/inpttype.ipp:228
+#: src/emu/inpttype.ipp:262 src/emu/inpttype.ipp:296 src/emu/inpttype.ipp:330
+#: src/emu/inpttype.ipp:364 src/emu/inpttype.ipp:398 src/emu/inpttype.ipp:432
+#: src/emu/inpttype.ipp:466
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Down"
+msgid "%p Right Stick/Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:32
+#: src/emu/inpttype.ipp:30 src/emu/inpttype.ipp:148 src/emu/inpttype.ipp:229
+#: src/emu/inpttype.ipp:263 src/emu/inpttype.ipp:297 src/emu/inpttype.ipp:331
+#: src/emu/inpttype.ipp:365 src/emu/inpttype.ipp:399 src/emu/inpttype.ipp:433
+#: src/emu/inpttype.ipp:467
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Left"
+msgid "%p Left Stick/Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:33
+#: src/emu/inpttype.ipp:31 src/emu/inpttype.ipp:149 src/emu/inpttype.ipp:230
+#: src/emu/inpttype.ipp:264 src/emu/inpttype.ipp:298 src/emu/inpttype.ipp:332
+#: src/emu/inpttype.ipp:366 src/emu/inpttype.ipp:400 src/emu/inpttype.ipp:434
+#: src/emu/inpttype.ipp:468
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Right"
+msgid "%p Left Stick/Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:34
+#: src/emu/inpttype.ipp:32 src/emu/inpttype.ipp:150 src/emu/inpttype.ipp:231
+#: src/emu/inpttype.ipp:265 src/emu/inpttype.ipp:299 src/emu/inpttype.ipp:333
+#: src/emu/inpttype.ipp:367 src/emu/inpttype.ipp:401 src/emu/inpttype.ipp:435
+#: src/emu/inpttype.ipp:469
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 1"
+msgid "%p Left Stick/Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:35
+#: src/emu/inpttype.ipp:33 src/emu/inpttype.ipp:151 src/emu/inpttype.ipp:232
+#: src/emu/inpttype.ipp:266 src/emu/inpttype.ipp:300 src/emu/inpttype.ipp:334
+#: src/emu/inpttype.ipp:368 src/emu/inpttype.ipp:402 src/emu/inpttype.ipp:436
+#: src/emu/inpttype.ipp:470
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 2"
+msgid "%p Left Stick/Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:36
+#: src/emu/inpttype.ipp:34 src/emu/inpttype.ipp:152 src/emu/inpttype.ipp:233
+#: src/emu/inpttype.ipp:267 src/emu/inpttype.ipp:301 src/emu/inpttype.ipp:335
+#: src/emu/inpttype.ipp:369 src/emu/inpttype.ipp:403 src/emu/inpttype.ipp:437
+#: src/emu/inpttype.ipp:471
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 3"
+msgid "%p Button 1"
 msgstr ""
 
-#: src/emu/inpttype.ipp:37
+#: src/emu/inpttype.ipp:35 src/emu/inpttype.ipp:153 src/emu/inpttype.ipp:234
+#: src/emu/inpttype.ipp:268 src/emu/inpttype.ipp:302 src/emu/inpttype.ipp:336
+#: src/emu/inpttype.ipp:370 src/emu/inpttype.ipp:404 src/emu/inpttype.ipp:438
+#: src/emu/inpttype.ipp:472
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 4"
+msgid "%p Button 2"
 msgstr ""
 
-#: src/emu/inpttype.ipp:38
+#: src/emu/inpttype.ipp:36 src/emu/inpttype.ipp:154 src/emu/inpttype.ipp:235
+#: src/emu/inpttype.ipp:269 src/emu/inpttype.ipp:303 src/emu/inpttype.ipp:337
+#: src/emu/inpttype.ipp:371 src/emu/inpttype.ipp:405 src/emu/inpttype.ipp:439
+#: src/emu/inpttype.ipp:473
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 5"
+msgid "%p Button 3"
 msgstr ""
 
-#: src/emu/inpttype.ipp:39
+#: src/emu/inpttype.ipp:37 src/emu/inpttype.ipp:155 src/emu/inpttype.ipp:236
+#: src/emu/inpttype.ipp:270 src/emu/inpttype.ipp:304 src/emu/inpttype.ipp:338
+#: src/emu/inpttype.ipp:372 src/emu/inpttype.ipp:406 src/emu/inpttype.ipp:440
+#: src/emu/inpttype.ipp:474
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 6"
+msgid "%p Button 4"
 msgstr ""
 
-#: src/emu/inpttype.ipp:40
+#: src/emu/inpttype.ipp:38 src/emu/inpttype.ipp:156 src/emu/inpttype.ipp:237
+#: src/emu/inpttype.ipp:271 src/emu/inpttype.ipp:305 src/emu/inpttype.ipp:339
+#: src/emu/inpttype.ipp:373 src/emu/inpttype.ipp:407 src/emu/inpttype.ipp:441
+#: src/emu/inpttype.ipp:475
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 7"
+msgid "%p Button 5"
 msgstr ""
 
-#: src/emu/inpttype.ipp:41
+#: src/emu/inpttype.ipp:39 src/emu/inpttype.ipp:157 src/emu/inpttype.ipp:238
+#: src/emu/inpttype.ipp:272 src/emu/inpttype.ipp:306 src/emu/inpttype.ipp:340
+#: src/emu/inpttype.ipp:374 src/emu/inpttype.ipp:408 src/emu/inpttype.ipp:442
+#: src/emu/inpttype.ipp:476
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 8"
+msgid "%p Button 6"
 msgstr ""
 
-#: src/emu/inpttype.ipp:42
+#: src/emu/inpttype.ipp:40 src/emu/inpttype.ipp:158 src/emu/inpttype.ipp:239
+#: src/emu/inpttype.ipp:273 src/emu/inpttype.ipp:307 src/emu/inpttype.ipp:341
+#: src/emu/inpttype.ipp:375 src/emu/inpttype.ipp:409 src/emu/inpttype.ipp:443
+#: src/emu/inpttype.ipp:477
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 9"
+msgid "%p Button 7"
 msgstr ""
 
-#: src/emu/inpttype.ipp:43
+#: src/emu/inpttype.ipp:41 src/emu/inpttype.ipp:159 src/emu/inpttype.ipp:240
+#: src/emu/inpttype.ipp:274 src/emu/inpttype.ipp:308 src/emu/inpttype.ipp:342
+#: src/emu/inpttype.ipp:376 src/emu/inpttype.ipp:410 src/emu/inpttype.ipp:444
+#: src/emu/inpttype.ipp:478
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 10"
+msgid "%p Button 8"
 msgstr ""
 
-#: src/emu/inpttype.ipp:44
+#: src/emu/inpttype.ipp:42 src/emu/inpttype.ipp:160 src/emu/inpttype.ipp:241
+#: src/emu/inpttype.ipp:275 src/emu/inpttype.ipp:309 src/emu/inpttype.ipp:343
+#: src/emu/inpttype.ipp:377 src/emu/inpttype.ipp:411 src/emu/inpttype.ipp:445
+#: src/emu/inpttype.ipp:479
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 11"
+msgid "%p Button 9"
 msgstr ""
 
-#: src/emu/inpttype.ipp:45
+#: src/emu/inpttype.ipp:43 src/emu/inpttype.ipp:161 src/emu/inpttype.ipp:242
+#: src/emu/inpttype.ipp:276 src/emu/inpttype.ipp:310 src/emu/inpttype.ipp:344
+#: src/emu/inpttype.ipp:378 src/emu/inpttype.ipp:412 src/emu/inpttype.ipp:446
+#: src/emu/inpttype.ipp:480
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 12"
+msgid "%p Button 10"
 msgstr ""
 
-#: src/emu/inpttype.ipp:46
+#: src/emu/inpttype.ipp:44 src/emu/inpttype.ipp:162 src/emu/inpttype.ipp:243
+#: src/emu/inpttype.ipp:277 src/emu/inpttype.ipp:311 src/emu/inpttype.ipp:345
+#: src/emu/inpttype.ipp:379 src/emu/inpttype.ipp:413 src/emu/inpttype.ipp:447
+#: src/emu/inpttype.ipp:481
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 13"
+msgid "%p Button 11"
 msgstr ""
 
-#: src/emu/inpttype.ipp:47
+#: src/emu/inpttype.ipp:45 src/emu/inpttype.ipp:163 src/emu/inpttype.ipp:244
+#: src/emu/inpttype.ipp:278 src/emu/inpttype.ipp:312 src/emu/inpttype.ipp:346
+#: src/emu/inpttype.ipp:380 src/emu/inpttype.ipp:414 src/emu/inpttype.ipp:448
+#: src/emu/inpttype.ipp:482
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 14"
+msgid "%p Button 12"
 msgstr ""
 
-#: src/emu/inpttype.ipp:48
+#: src/emu/inpttype.ipp:46 src/emu/inpttype.ipp:164 src/emu/inpttype.ipp:245
+#: src/emu/inpttype.ipp:279 src/emu/inpttype.ipp:313 src/emu/inpttype.ipp:347
+#: src/emu/inpttype.ipp:381 src/emu/inpttype.ipp:415 src/emu/inpttype.ipp:449
+#: src/emu/inpttype.ipp:483
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 15"
+msgid "%p Button 13"
 msgstr ""
 
-#: src/emu/inpttype.ipp:49
+#: src/emu/inpttype.ipp:47 src/emu/inpttype.ipp:165 src/emu/inpttype.ipp:246
+#: src/emu/inpttype.ipp:280 src/emu/inpttype.ipp:314 src/emu/inpttype.ipp:348
+#: src/emu/inpttype.ipp:382 src/emu/inpttype.ipp:416 src/emu/inpttype.ipp:450
+#: src/emu/inpttype.ipp:484
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 16"
+msgid "%p Button 14"
 msgstr ""
 
-#: src/emu/inpttype.ipp:50
+#: src/emu/inpttype.ipp:48 src/emu/inpttype.ipp:166 src/emu/inpttype.ipp:247
+#: src/emu/inpttype.ipp:281 src/emu/inpttype.ipp:315 src/emu/inpttype.ipp:349
+#: src/emu/inpttype.ipp:383 src/emu/inpttype.ipp:417 src/emu/inpttype.ipp:451
+#: src/emu/inpttype.ipp:485
+#, c-format
 msgctxt "input-name"
-msgid "P1 Start"
+msgid "%p Button 15"
 msgstr ""
 
-#: src/emu/inpttype.ipp:51
+#: src/emu/inpttype.ipp:49 src/emu/inpttype.ipp:167 src/emu/inpttype.ipp:248
+#: src/emu/inpttype.ipp:282 src/emu/inpttype.ipp:316 src/emu/inpttype.ipp:350
+#: src/emu/inpttype.ipp:384 src/emu/inpttype.ipp:418 src/emu/inpttype.ipp:452
+#: src/emu/inpttype.ipp:486
+#, c-format
 msgctxt "input-name"
-msgid "P1 Select"
+msgid "%p Button 16"
 msgstr ""
 
-#: src/emu/inpttype.ipp:56
+#: src/emu/inpttype.ipp:50 src/emu/inpttype.ipp:168 src/emu/inpttype.ipp:249
+#: src/emu/inpttype.ipp:283 src/emu/inpttype.ipp:317 src/emu/inpttype.ipp:351
+#: src/emu/inpttype.ipp:385 src/emu/inpttype.ipp:419 src/emu/inpttype.ipp:453
+#: src/emu/inpttype.ipp:487
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong A"
+msgid "%p Start"
 msgstr ""
 
-#: src/emu/inpttype.ipp:57
+#: src/emu/inpttype.ipp:51 src/emu/inpttype.ipp:169 src/emu/inpttype.ipp:250
+#: src/emu/inpttype.ipp:284 src/emu/inpttype.ipp:318 src/emu/inpttype.ipp:352
+#: src/emu/inpttype.ipp:386 src/emu/inpttype.ipp:420 src/emu/inpttype.ipp:454
+#: src/emu/inpttype.ipp:488
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong B"
+msgid "%p Select"
 msgstr ""
 
-#: src/emu/inpttype.ipp:58
+#: src/emu/inpttype.ipp:56 src/emu/inpttype.ipp:174
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong C"
+msgid "%p Mahjong A"
 msgstr ""
 
-#: src/emu/inpttype.ipp:59
+#: src/emu/inpttype.ipp:57 src/emu/inpttype.ipp:175
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong D"
+msgid "%p Mahjong B"
 msgstr ""
 
-#: src/emu/inpttype.ipp:60
+#: src/emu/inpttype.ipp:58 src/emu/inpttype.ipp:176
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong E"
+msgid "%p Mahjong C"
 msgstr ""
 
-#: src/emu/inpttype.ipp:61
+#: src/emu/inpttype.ipp:59 src/emu/inpttype.ipp:177
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong F"
+msgid "%p Mahjong D"
 msgstr ""
 
-#: src/emu/inpttype.ipp:62
+#: src/emu/inpttype.ipp:60 src/emu/inpttype.ipp:178
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong G"
+msgid "%p Mahjong E"
 msgstr ""
 
-#: src/emu/inpttype.ipp:63
+#: src/emu/inpttype.ipp:61 src/emu/inpttype.ipp:179
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong H"
+msgid "%p Mahjong F"
 msgstr ""
 
-#: src/emu/inpttype.ipp:64
+#: src/emu/inpttype.ipp:62 src/emu/inpttype.ipp:180
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong I"
+msgid "%p Mahjong G"
 msgstr ""
 
-#: src/emu/inpttype.ipp:65
+#: src/emu/inpttype.ipp:63 src/emu/inpttype.ipp:181
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong J"
+msgid "%p Mahjong H"
 msgstr ""
 
-#: src/emu/inpttype.ipp:66
+#: src/emu/inpttype.ipp:64 src/emu/inpttype.ipp:182
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong K"
+msgid "%p Mahjong I"
 msgstr ""
 
-#: src/emu/inpttype.ipp:67
+#: src/emu/inpttype.ipp:65 src/emu/inpttype.ipp:183
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong L"
+msgid "%p Mahjong J"
 msgstr ""
 
-#: src/emu/inpttype.ipp:68
+#: src/emu/inpttype.ipp:66 src/emu/inpttype.ipp:184
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong M"
+msgid "%p Mahjong K"
 msgstr ""
 
-#: src/emu/inpttype.ipp:69
+#: src/emu/inpttype.ipp:67 src/emu/inpttype.ipp:185
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong N"
+msgid "%p Mahjong L"
 msgstr ""
 
-#: src/emu/inpttype.ipp:70
+#: src/emu/inpttype.ipp:68 src/emu/inpttype.ipp:186
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong O"
+msgid "%p Mahjong M"
 msgstr ""
 
-#: src/emu/inpttype.ipp:71
+#: src/emu/inpttype.ipp:69 src/emu/inpttype.ipp:187
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong P"
+msgid "%p Mahjong N"
 msgstr ""
 
-#: src/emu/inpttype.ipp:72
+#: src/emu/inpttype.ipp:70 src/emu/inpttype.ipp:188
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Q"
+msgid "%p Mahjong O"
 msgstr ""
 
-#: src/emu/inpttype.ipp:73
+#: src/emu/inpttype.ipp:71 src/emu/inpttype.ipp:189
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Kan"
+msgid "%p Mahjong P"
 msgstr ""
 
-#: src/emu/inpttype.ipp:74
+#: src/emu/inpttype.ipp:72 src/emu/inpttype.ipp:190
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Pon"
+msgid "%p Mahjong Q"
 msgstr ""
 
-#: src/emu/inpttype.ipp:75
+#: src/emu/inpttype.ipp:73 src/emu/inpttype.ipp:191
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Chi"
+msgid "%p Mahjong Kan"
 msgstr ""
 
-#: src/emu/inpttype.ipp:76
+#: src/emu/inpttype.ipp:74 src/emu/inpttype.ipp:192
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Reach"
+msgid "%p Mahjong Pon"
 msgstr ""
 
-#: src/emu/inpttype.ipp:77
+#: src/emu/inpttype.ipp:75 src/emu/inpttype.ipp:193
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Ron"
+msgid "%p Mahjong Chi"
 msgstr ""
 
-#: src/emu/inpttype.ipp:78
+#: src/emu/inpttype.ipp:76 src/emu/inpttype.ipp:194
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Flip Flop"
+msgid "%p Mahjong Reach"
 msgstr ""
 
-#: src/emu/inpttype.ipp:79
+#: src/emu/inpttype.ipp:77 src/emu/inpttype.ipp:195
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Bet"
+msgid "%p Mahjong Ron"
 msgstr ""
 
-#: src/emu/inpttype.ipp:80
+#: src/emu/inpttype.ipp:78 src/emu/inpttype.ipp:200
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Take Score"
+msgid "%p Mahjong Flip Flop"
 msgstr ""
 
-#: src/emu/inpttype.ipp:81
+#: src/emu/inpttype.ipp:79 src/emu/inpttype.ipp:196
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Double Up"
+msgid "%p Mahjong Bet"
 msgstr ""
 
-#: src/emu/inpttype.ipp:82
+#: src/emu/inpttype.ipp:80 src/emu/inpttype.ipp:198
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Big"
+msgid "%p Mahjong Take Score"
 msgstr ""
 
-#: src/emu/inpttype.ipp:83
+#: src/emu/inpttype.ipp:81 src/emu/inpttype.ipp:199
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Small"
+msgid "%p Mahjong Double Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:84
+#: src/emu/inpttype.ipp:82 src/emu/inpttype.ipp:201
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Last Chance"
+msgid "%p Mahjong Big"
 msgstr ""
 
-#: src/emu/inpttype.ipp:89
+#: src/emu/inpttype.ipp:83 src/emu/inpttype.ipp:202
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda A/1"
+msgid "%p Mahjong Small"
 msgstr ""
 
-#: src/emu/inpttype.ipp:90
+#: src/emu/inpttype.ipp:84 src/emu/inpttype.ipp:197
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda B/2"
+msgid "%p Mahjong Last Chance"
 msgstr ""
 
-#: src/emu/inpttype.ipp:91
+#: src/emu/inpttype.ipp:89 src/emu/inpttype.ipp:207
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda C/3"
+msgid "%p Hanafuda A/1"
 msgstr ""
 
-#: src/emu/inpttype.ipp:92
+#: src/emu/inpttype.ipp:90 src/emu/inpttype.ipp:208
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda D/4"
+msgid "%p Hanafuda B/2"
 msgstr ""
 
-#: src/emu/inpttype.ipp:93
+#: src/emu/inpttype.ipp:91 src/emu/inpttype.ipp:209
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda E/5"
+msgid "%p Hanafuda C/3"
 msgstr ""
 
-#: src/emu/inpttype.ipp:94
+#: src/emu/inpttype.ipp:92 src/emu/inpttype.ipp:210
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda F/6"
+msgid "%p Hanafuda D/4"
 msgstr ""
 
-#: src/emu/inpttype.ipp:95
+#: src/emu/inpttype.ipp:93 src/emu/inpttype.ipp:211
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda G/7"
+msgid "%p Hanafuda E/5"
 msgstr ""
 
-#: src/emu/inpttype.ipp:96
+#: src/emu/inpttype.ipp:94 src/emu/inpttype.ipp:212
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda H/8"
+msgid "%p Hanafuda F/6"
 msgstr ""
 
-#: src/emu/inpttype.ipp:97
+#: src/emu/inpttype.ipp:95 src/emu/inpttype.ipp:213
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda Yes"
+msgid "%p Hanafuda G/7"
 msgstr ""
 
-#: src/emu/inpttype.ipp:98
+#: src/emu/inpttype.ipp:96 src/emu/inpttype.ipp:214
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda No"
+msgid "%p Hanafuda H/8"
+msgstr ""
+
+#: src/emu/inpttype.ipp:97 src/emu/inpttype.ipp:215
+#, c-format
+msgctxt "input-name"
+msgid "%p Hanafuda Yes"
+msgstr ""
+
+#: src/emu/inpttype.ipp:98 src/emu/inpttype.ipp:216
+#, c-format
+msgctxt "input-name"
+msgid "%p Hanafuda No"
 msgstr ""
 
 #: src/emu/inpttype.ipp:103
@@ -3753,1551 +3927,6 @@ msgctxt "input-name"
 msgid "Stop All Reels"
 msgstr ""
 
-#: src/emu/inpttype.ipp:140
-msgctxt "input-name"
-msgid "P2 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:141
-msgctxt "input-name"
-msgid "P2 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:142
-msgctxt "input-name"
-msgid "P2 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:143
-msgctxt "input-name"
-msgid "P2 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:144
-msgctxt "input-name"
-msgid "P2 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:145
-msgctxt "input-name"
-msgid "P2 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:146
-msgctxt "input-name"
-msgid "P2 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:147
-msgctxt "input-name"
-msgid "P2 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:148
-msgctxt "input-name"
-msgid "P2 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:149
-msgctxt "input-name"
-msgid "P2 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:150
-msgctxt "input-name"
-msgid "P2 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:151
-msgctxt "input-name"
-msgid "P2 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:152
-msgctxt "input-name"
-msgid "P2 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:153
-msgctxt "input-name"
-msgid "P2 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:154
-msgctxt "input-name"
-msgid "P2 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:155
-msgctxt "input-name"
-msgid "P2 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:156
-msgctxt "input-name"
-msgid "P2 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:157
-msgctxt "input-name"
-msgid "P2 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:158
-msgctxt "input-name"
-msgid "P2 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:159
-msgctxt "input-name"
-msgid "P2 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:160
-msgctxt "input-name"
-msgid "P2 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:161
-msgctxt "input-name"
-msgid "P2 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:162
-msgctxt "input-name"
-msgid "P2 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:163
-msgctxt "input-name"
-msgid "P2 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:164
-msgctxt "input-name"
-msgid "P2 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:165
-msgctxt "input-name"
-msgid "P2 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:166
-msgctxt "input-name"
-msgid "P2 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:167
-msgctxt "input-name"
-msgid "P2 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:168
-msgctxt "input-name"
-msgid "P2 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:169
-msgctxt "input-name"
-msgid "P2 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:174
-msgctxt "input-name"
-msgid "P2 Mahjong A"
-msgstr ""
-
-#: src/emu/inpttype.ipp:175
-msgctxt "input-name"
-msgid "P2 Mahjong B"
-msgstr ""
-
-#: src/emu/inpttype.ipp:176
-msgctxt "input-name"
-msgid "P2 Mahjong C"
-msgstr ""
-
-#: src/emu/inpttype.ipp:177
-msgctxt "input-name"
-msgid "P2 Mahjong D"
-msgstr ""
-
-#: src/emu/inpttype.ipp:178
-msgctxt "input-name"
-msgid "P2 Mahjong E"
-msgstr ""
-
-#: src/emu/inpttype.ipp:179
-msgctxt "input-name"
-msgid "P2 Mahjong F"
-msgstr ""
-
-#: src/emu/inpttype.ipp:180
-msgctxt "input-name"
-msgid "P2 Mahjong G"
-msgstr ""
-
-#: src/emu/inpttype.ipp:181
-msgctxt "input-name"
-msgid "P2 Mahjong H"
-msgstr ""
-
-#: src/emu/inpttype.ipp:182
-msgctxt "input-name"
-msgid "P2 Mahjong I"
-msgstr ""
-
-#: src/emu/inpttype.ipp:183
-msgctxt "input-name"
-msgid "P2 Mahjong J"
-msgstr ""
-
-#: src/emu/inpttype.ipp:184
-msgctxt "input-name"
-msgid "P2 Mahjong K"
-msgstr ""
-
-#: src/emu/inpttype.ipp:185
-msgctxt "input-name"
-msgid "P2 Mahjong L"
-msgstr ""
-
-#: src/emu/inpttype.ipp:186
-msgctxt "input-name"
-msgid "P2 Mahjong M"
-msgstr ""
-
-#: src/emu/inpttype.ipp:187
-msgctxt "input-name"
-msgid "P2 Mahjong N"
-msgstr ""
-
-#: src/emu/inpttype.ipp:188
-msgctxt "input-name"
-msgid "P2 Mahjong O"
-msgstr ""
-
-#: src/emu/inpttype.ipp:189
-msgctxt "input-name"
-msgid "P2 Mahjong P"
-msgstr ""
-
-#: src/emu/inpttype.ipp:190
-msgctxt "input-name"
-msgid "P2 Mahjong Q"
-msgstr ""
-
-#: src/emu/inpttype.ipp:191
-msgctxt "input-name"
-msgid "P2 Mahjong Kan"
-msgstr ""
-
-#: src/emu/inpttype.ipp:192
-msgctxt "input-name"
-msgid "P2 Mahjong Pon"
-msgstr ""
-
-#: src/emu/inpttype.ipp:193
-msgctxt "input-name"
-msgid "P2 Mahjong Chi"
-msgstr ""
-
-#: src/emu/inpttype.ipp:194
-msgctxt "input-name"
-msgid "P2 Mahjong Reach"
-msgstr ""
-
-#: src/emu/inpttype.ipp:195
-msgctxt "input-name"
-msgid "P2 Mahjong Ron"
-msgstr ""
-
-#: src/emu/inpttype.ipp:196
-msgctxt "input-name"
-msgid "P2 Mahjong Bet"
-msgstr ""
-
-#: src/emu/inpttype.ipp:197
-msgctxt "input-name"
-msgid "P2 Mahjong Last Chance"
-msgstr ""
-
-#: src/emu/inpttype.ipp:198
-msgctxt "input-name"
-msgid "P2 Mahjong Take Score"
-msgstr ""
-
-#: src/emu/inpttype.ipp:199
-msgctxt "input-name"
-msgid "P2 Mahjong Double Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:200
-msgctxt "input-name"
-msgid "P2 Mahjong Flip Flop"
-msgstr ""
-
-#: src/emu/inpttype.ipp:201
-msgctxt "input-name"
-msgid "P2 Mahjong Big"
-msgstr ""
-
-#: src/emu/inpttype.ipp:202
-msgctxt "input-name"
-msgid "P2 Mahjong Small"
-msgstr ""
-
-#: src/emu/inpttype.ipp:207
-msgctxt "input-name"
-msgid "P2 Hanafuda A/1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:208
-msgctxt "input-name"
-msgid "P2 Hanafuda B/2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:209
-msgctxt "input-name"
-msgid "P2 Hanafuda C/3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:210
-msgctxt "input-name"
-msgid "P2 Hanafuda D/4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:211
-msgctxt "input-name"
-msgid "P2 Hanafuda E/5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:212
-msgctxt "input-name"
-msgid "P2 Hanafuda F/6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:213
-msgctxt "input-name"
-msgid "P2 Hanafuda G/7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:214
-msgctxt "input-name"
-msgid "P2 Hanafuda H/8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:215
-msgctxt "input-name"
-msgid "P2 Hanafuda Yes"
-msgstr ""
-
-#: src/emu/inpttype.ipp:216
-msgctxt "input-name"
-msgid "P2 Hanafuda No"
-msgstr ""
-
-#: src/emu/inpttype.ipp:221
-msgctxt "input-name"
-msgid "P3 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:222
-msgctxt "input-name"
-msgid "P3 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:223
-msgctxt "input-name"
-msgid "P3 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:224
-msgctxt "input-name"
-msgid "P3 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:225
-msgctxt "input-name"
-msgid "P3 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:226
-msgctxt "input-name"
-msgid "P3 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:227
-msgctxt "input-name"
-msgid "P3 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:228
-msgctxt "input-name"
-msgid "P3 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:229
-msgctxt "input-name"
-msgid "P3 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:230
-msgctxt "input-name"
-msgid "P3 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:231
-msgctxt "input-name"
-msgid "P3 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:232
-msgctxt "input-name"
-msgid "P3 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:233
-msgctxt "input-name"
-msgid "P3 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:234
-msgctxt "input-name"
-msgid "P3 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:235
-msgctxt "input-name"
-msgid "P3 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:236
-msgctxt "input-name"
-msgid "P3 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:237
-msgctxt "input-name"
-msgid "P3 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:238
-msgctxt "input-name"
-msgid "P3 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:239
-msgctxt "input-name"
-msgid "P3 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:240
-msgctxt "input-name"
-msgid "P3 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:241
-msgctxt "input-name"
-msgid "P3 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:242
-msgctxt "input-name"
-msgid "P3 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:243
-msgctxt "input-name"
-msgid "P3 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:244
-msgctxt "input-name"
-msgid "P3 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:245
-msgctxt "input-name"
-msgid "P3 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:246
-msgctxt "input-name"
-msgid "P3 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:247
-msgctxt "input-name"
-msgid "P3 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:248
-msgctxt "input-name"
-msgid "P3 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:249
-msgctxt "input-name"
-msgid "P3 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:250
-msgctxt "input-name"
-msgid "P3 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:255
-msgctxt "input-name"
-msgid "P4 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:256
-msgctxt "input-name"
-msgid "P4 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:257
-msgctxt "input-name"
-msgid "P4 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:258
-msgctxt "input-name"
-msgid "P4 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:259
-msgctxt "input-name"
-msgid "P4 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:260
-msgctxt "input-name"
-msgid "P4 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:261
-msgctxt "input-name"
-msgid "P4 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:262
-msgctxt "input-name"
-msgid "P4 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:263
-msgctxt "input-name"
-msgid "P4 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:264
-msgctxt "input-name"
-msgid "P4 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:265
-msgctxt "input-name"
-msgid "P4 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:266
-msgctxt "input-name"
-msgid "P4 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:267
-msgctxt "input-name"
-msgid "P4 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:268
-msgctxt "input-name"
-msgid "P4 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:269
-msgctxt "input-name"
-msgid "P4 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:270
-msgctxt "input-name"
-msgid "P4 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:271
-msgctxt "input-name"
-msgid "P4 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:272
-msgctxt "input-name"
-msgid "P4 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:273
-msgctxt "input-name"
-msgid "P4 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:274
-msgctxt "input-name"
-msgid "P4 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:275
-msgctxt "input-name"
-msgid "P4 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:276
-msgctxt "input-name"
-msgid "P4 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:277
-msgctxt "input-name"
-msgid "P4 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:278
-msgctxt "input-name"
-msgid "P4 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:279
-msgctxt "input-name"
-msgid "P4 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:280
-msgctxt "input-name"
-msgid "P4 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:281
-msgctxt "input-name"
-msgid "P4 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:282
-msgctxt "input-name"
-msgid "P4 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:283
-msgctxt "input-name"
-msgid "P4 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:284
-msgctxt "input-name"
-msgid "P4 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:289
-msgctxt "input-name"
-msgid "P5 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:290
-msgctxt "input-name"
-msgid "P5 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:291
-msgctxt "input-name"
-msgid "P5 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:292
-msgctxt "input-name"
-msgid "P5 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:293
-msgctxt "input-name"
-msgid "P5 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:294
-msgctxt "input-name"
-msgid "P5 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:295
-msgctxt "input-name"
-msgid "P5 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:296
-msgctxt "input-name"
-msgid "P5 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:297
-msgctxt "input-name"
-msgid "P5 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:298
-msgctxt "input-name"
-msgid "P5 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:299
-msgctxt "input-name"
-msgid "P5 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:300
-msgctxt "input-name"
-msgid "P5 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:301
-msgctxt "input-name"
-msgid "P5 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:302
-msgctxt "input-name"
-msgid "P5 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:303
-msgctxt "input-name"
-msgid "P5 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:304
-msgctxt "input-name"
-msgid "P5 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:305
-msgctxt "input-name"
-msgid "P5 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:306
-msgctxt "input-name"
-msgid "P5 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:307
-msgctxt "input-name"
-msgid "P5 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:308
-msgctxt "input-name"
-msgid "P5 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:309
-msgctxt "input-name"
-msgid "P5 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:310
-msgctxt "input-name"
-msgid "P5 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:311
-msgctxt "input-name"
-msgid "P5 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:312
-msgctxt "input-name"
-msgid "P5 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:313
-msgctxt "input-name"
-msgid "P5 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:314
-msgctxt "input-name"
-msgid "P5 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:315
-msgctxt "input-name"
-msgid "P5 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:316
-msgctxt "input-name"
-msgid "P5 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:317
-msgctxt "input-name"
-msgid "P5 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:318
-msgctxt "input-name"
-msgid "P5 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:323
-msgctxt "input-name"
-msgid "P6 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:324
-msgctxt "input-name"
-msgid "P6 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:325
-msgctxt "input-name"
-msgid "P6 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:326
-msgctxt "input-name"
-msgid "P6 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:327
-msgctxt "input-name"
-msgid "P6 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:328
-msgctxt "input-name"
-msgid "P6 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:329
-msgctxt "input-name"
-msgid "P6 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:330
-msgctxt "input-name"
-msgid "P6 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:331
-msgctxt "input-name"
-msgid "P6 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:332
-msgctxt "input-name"
-msgid "P6 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:333
-msgctxt "input-name"
-msgid "P6 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:334
-msgctxt "input-name"
-msgid "P6 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:335
-msgctxt "input-name"
-msgid "P6 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:336
-msgctxt "input-name"
-msgid "P6 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:337
-msgctxt "input-name"
-msgid "P6 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:338
-msgctxt "input-name"
-msgid "P6 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:339
-msgctxt "input-name"
-msgid "P6 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:340
-msgctxt "input-name"
-msgid "P6 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:341
-msgctxt "input-name"
-msgid "P6 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:342
-msgctxt "input-name"
-msgid "P6 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:343
-msgctxt "input-name"
-msgid "P6 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:344
-msgctxt "input-name"
-msgid "P6 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:345
-msgctxt "input-name"
-msgid "P6 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:346
-msgctxt "input-name"
-msgid "P6 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:347
-msgctxt "input-name"
-msgid "P6 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:348
-msgctxt "input-name"
-msgid "P6 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:349
-msgctxt "input-name"
-msgid "P6 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:350
-msgctxt "input-name"
-msgid "P6 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:351
-msgctxt "input-name"
-msgid "P6 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:352
-msgctxt "input-name"
-msgid "P6 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:357
-msgctxt "input-name"
-msgid "P7 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:358
-msgctxt "input-name"
-msgid "P7 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:359
-msgctxt "input-name"
-msgid "P7 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:360
-msgctxt "input-name"
-msgid "P7 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:361
-msgctxt "input-name"
-msgid "P7 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:362
-msgctxt "input-name"
-msgid "P7 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:363
-msgctxt "input-name"
-msgid "P7 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:364
-msgctxt "input-name"
-msgid "P7 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:365
-msgctxt "input-name"
-msgid "P7 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:366
-msgctxt "input-name"
-msgid "P7 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:367
-msgctxt "input-name"
-msgid "P7 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:368
-msgctxt "input-name"
-msgid "P7 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:369
-msgctxt "input-name"
-msgid "P7 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:370
-msgctxt "input-name"
-msgid "P7 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:371
-msgctxt "input-name"
-msgid "P7 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:372
-msgctxt "input-name"
-msgid "P7 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:373
-msgctxt "input-name"
-msgid "P7 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:374
-msgctxt "input-name"
-msgid "P7 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:375
-msgctxt "input-name"
-msgid "P7 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:376
-msgctxt "input-name"
-msgid "P7 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:377
-msgctxt "input-name"
-msgid "P7 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:378
-msgctxt "input-name"
-msgid "P7 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:379
-msgctxt "input-name"
-msgid "P7 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:380
-msgctxt "input-name"
-msgid "P7 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:381
-msgctxt "input-name"
-msgid "P7 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:382
-msgctxt "input-name"
-msgid "P7 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:383
-msgctxt "input-name"
-msgid "P7 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:384
-msgctxt "input-name"
-msgid "P7 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:385
-msgctxt "input-name"
-msgid "P7 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:386
-msgctxt "input-name"
-msgid "P7 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:391
-msgctxt "input-name"
-msgid "P8 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:392
-msgctxt "input-name"
-msgid "P8 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:393
-msgctxt "input-name"
-msgid "P8 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:394
-msgctxt "input-name"
-msgid "P8 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:395
-msgctxt "input-name"
-msgid "P8 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:396
-msgctxt "input-name"
-msgid "P8 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:397
-msgctxt "input-name"
-msgid "P8 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:398
-msgctxt "input-name"
-msgid "P8 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:399
-msgctxt "input-name"
-msgid "P8 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:400
-msgctxt "input-name"
-msgid "P8 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:401
-msgctxt "input-name"
-msgid "P8 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:402
-msgctxt "input-name"
-msgid "P8 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:403
-msgctxt "input-name"
-msgid "P8 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:404
-msgctxt "input-name"
-msgid "P8 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:405
-msgctxt "input-name"
-msgid "P8 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:406
-msgctxt "input-name"
-msgid "P8 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:407
-msgctxt "input-name"
-msgid "P8 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:408
-msgctxt "input-name"
-msgid "P8 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:409
-msgctxt "input-name"
-msgid "P8 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:410
-msgctxt "input-name"
-msgid "P8 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:411
-msgctxt "input-name"
-msgid "P8 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:412
-msgctxt "input-name"
-msgid "P8 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:413
-msgctxt "input-name"
-msgid "P8 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:414
-msgctxt "input-name"
-msgid "P8 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:415
-msgctxt "input-name"
-msgid "P8 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:416
-msgctxt "input-name"
-msgid "P8 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:417
-msgctxt "input-name"
-msgid "P8 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:418
-msgctxt "input-name"
-msgid "P8 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:419
-msgctxt "input-name"
-msgid "P8 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:420
-msgctxt "input-name"
-msgid "P8 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:425
-msgctxt "input-name"
-msgid "P9 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:426
-msgctxt "input-name"
-msgid "P9 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:427
-msgctxt "input-name"
-msgid "P9 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:428
-msgctxt "input-name"
-msgid "P9 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:429
-msgctxt "input-name"
-msgid "P9 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:430
-msgctxt "input-name"
-msgid "P9 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:431
-msgctxt "input-name"
-msgid "P9 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:432
-msgctxt "input-name"
-msgid "P9 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:433
-msgctxt "input-name"
-msgid "P9 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:434
-msgctxt "input-name"
-msgid "P9 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:435
-msgctxt "input-name"
-msgid "P9 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:436
-msgctxt "input-name"
-msgid "P9 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:437
-msgctxt "input-name"
-msgid "P9 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:438
-msgctxt "input-name"
-msgid "P9 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:439
-msgctxt "input-name"
-msgid "P9 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:440
-msgctxt "input-name"
-msgid "P9 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:441
-msgctxt "input-name"
-msgid "P9 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:442
-msgctxt "input-name"
-msgid "P9 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:443
-msgctxt "input-name"
-msgid "P9 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:444
-msgctxt "input-name"
-msgid "P9 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:445
-msgctxt "input-name"
-msgid "P9 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:446
-msgctxt "input-name"
-msgid "P9 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:447
-msgctxt "input-name"
-msgid "P9 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:448
-msgctxt "input-name"
-msgid "P9 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:449
-msgctxt "input-name"
-msgid "P9 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:450
-msgctxt "input-name"
-msgid "P9 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:451
-msgctxt "input-name"
-msgid "P9 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:452
-msgctxt "input-name"
-msgid "P9 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:453
-msgctxt "input-name"
-msgid "P9 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:454
-msgctxt "input-name"
-msgid "P9 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:459
-msgctxt "input-name"
-msgid "P10 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:460
-msgctxt "input-name"
-msgid "P10 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:461
-msgctxt "input-name"
-msgid "P10 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:462
-msgctxt "input-name"
-msgid "P10 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:463
-msgctxt "input-name"
-msgid "P10 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:464
-msgctxt "input-name"
-msgid "P10 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:465
-msgctxt "input-name"
-msgid "P10 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:466
-msgctxt "input-name"
-msgid "P10 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:467
-msgctxt "input-name"
-msgid "P10 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:468
-msgctxt "input-name"
-msgid "P10 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:469
-msgctxt "input-name"
-msgid "P10 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:470
-msgctxt "input-name"
-msgid "P10 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:471
-msgctxt "input-name"
-msgid "P10 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:472
-msgctxt "input-name"
-msgid "P10 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:473
-msgctxt "input-name"
-msgid "P10 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:474
-msgctxt "input-name"
-msgid "P10 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:475
-msgctxt "input-name"
-msgid "P10 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:476
-msgctxt "input-name"
-msgid "P10 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:477
-msgctxt "input-name"
-msgid "P10 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:478
-msgctxt "input-name"
-msgid "P10 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:479
-msgctxt "input-name"
-msgid "P10 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:480
-msgctxt "input-name"
-msgid "P10 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:481
-msgctxt "input-name"
-msgid "P10 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:482
-msgctxt "input-name"
-msgid "P10 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:483
-msgctxt "input-name"
-msgid "P10 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:484
-msgctxt "input-name"
-msgid "P10 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:485
-msgctxt "input-name"
-msgid "P10 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:486
-msgctxt "input-name"
-msgid "P10 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:487
-msgctxt "input-name"
-msgid "P10 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:488
-msgctxt "input-name"
-msgid "P10 Select"
-msgstr ""
-
 #: src/emu/inpttype.ipp:493
 msgctxt "input-name"
 msgid "1 Player Start"
@@ -5478,154 +4107,31 @@ msgctxt "input-name"
 msgid "Volume Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:550
-msgctxt "input-name"
-msgid "P1 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:551
-msgctxt "input-name"
-msgid "P2 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:552
-msgctxt "input-name"
-msgid "P3 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:553
-msgctxt "input-name"
-msgid "P4 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:554
-msgctxt "input-name"
-msgid "P5 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:555
-msgctxt "input-name"
-msgid "P6 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:556
-msgctxt "input-name"
-msgid "P7 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:557
-msgctxt "input-name"
-msgid "P8 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:558
-msgctxt "input-name"
-msgid "P9 Pedal 1"
-msgstr ""
-
+#: src/emu/inpttype.ipp:550 src/emu/inpttype.ipp:551 src/emu/inpttype.ipp:552
+#: src/emu/inpttype.ipp:553 src/emu/inpttype.ipp:554 src/emu/inpttype.ipp:555
+#: src/emu/inpttype.ipp:556 src/emu/inpttype.ipp:557 src/emu/inpttype.ipp:558
 #: src/emu/inpttype.ipp:559
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:564
-msgctxt "input-name"
-msgid "P1 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:565
-msgctxt "input-name"
-msgid "P2 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:566
-msgctxt "input-name"
-msgid "P3 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:567
-msgctxt "input-name"
-msgid "P4 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:568
-msgctxt "input-name"
-msgid "P5 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:569
-msgctxt "input-name"
-msgid "P6 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:570
-msgctxt "input-name"
-msgid "P7 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:571
-msgctxt "input-name"
-msgid "P8 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:572
-msgctxt "input-name"
-msgid "P9 Pedal 2"
+msgid "%p Pedal 1"
 msgstr ""
 
+#: src/emu/inpttype.ipp:564 src/emu/inpttype.ipp:565 src/emu/inpttype.ipp:566
+#: src/emu/inpttype.ipp:567 src/emu/inpttype.ipp:568 src/emu/inpttype.ipp:569
+#: src/emu/inpttype.ipp:570 src/emu/inpttype.ipp:571 src/emu/inpttype.ipp:572
 #: src/emu/inpttype.ipp:573
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:578
-msgctxt "input-name"
-msgid "P1 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:579
-msgctxt "input-name"
-msgid "P2 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:580
-msgctxt "input-name"
-msgid "P3 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:581
-msgctxt "input-name"
-msgid "P4 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:582
-msgctxt "input-name"
-msgid "P5 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:583
-msgctxt "input-name"
-msgid "P6 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:584
-msgctxt "input-name"
-msgid "P7 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:585
-msgctxt "input-name"
-msgid "P8 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:586
-msgctxt "input-name"
-msgid "P9 Pedal 3"
+msgid "%p Pedal 2"
 msgstr ""
 
+#: src/emu/inpttype.ipp:578 src/emu/inpttype.ipp:579 src/emu/inpttype.ipp:580
+#: src/emu/inpttype.ipp:581 src/emu/inpttype.ipp:582 src/emu/inpttype.ipp:583
+#: src/emu/inpttype.ipp:584 src/emu/inpttype.ipp:585 src/emu/inpttype.ipp:586
 #: src/emu/inpttype.ipp:587
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 3"
+msgid "%p Pedal 3"
 msgstr ""
 
 #: src/emu/inpttype.ipp:592
diff --git a/language/French/strings.po b/language/French/strings.po
index 4c5e2161fff..3b9e65a98bc 100644
--- a/language/French/strings.po
+++ b/language/French/strings.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-19 02:50+1100\n"
+"POT-Creation-Date: 2021-12-09 04:44+1100\n"
 "PO-Revision-Date: 2016-05-24 23:38+0200\n"
 "Last-Translator: Mevi <mevi.mame@gmail.com>\n"
 "Language-Team: MAME Language Team\n"
@@ -272,12 +272,12 @@ msgstr "%1$s %2$s ( %3$d / %4$d packages logiciels )"
 msgid "Driver: \"%1$s\" software list "
 msgstr "Liste de logiciels pour le driver : \"%1$s\" "
 
-#: src/frontend/mame/ui/selsoft.cpp:711 src/frontend/mame/ui/selgame.cpp:1066
+#: src/frontend/mame/ui/selsoft.cpp:711 src/frontend/mame/ui/selgame.cpp:1076
 #, c-format
 msgid "%1$s: %2$s - Search: %3$s_"
 msgstr "%1$s : %2$s - Recherche : %3$s_"
 
-#: src/frontend/mame/ui/selsoft.cpp:713 src/frontend/mame/ui/selgame.cpp:1068
+#: src/frontend/mame/ui/selsoft.cpp:713 src/frontend/mame/ui/selgame.cpp:1078
 #, c-format
 msgid "Search: %1$s_"
 msgstr "Recherche : %1$s_"
@@ -287,7 +287,7 @@ msgstr "Recherche : %1$s_"
 msgid "Software list/item: %1$s:%2$s"
 msgstr ""
 
-#: src/frontend/mame/ui/optsmenu.cpp:73 src/frontend/mame/ui/sndmenu.cpp:165
+#: src/frontend/mame/ui/optsmenu.cpp:73 src/frontend/mame/ui/sndmenu.cpp:161
 msgid "Sound Options"
 msgstr "Options du son"
 
@@ -382,12 +382,12 @@ msgid "Show mouse pointer"
 msgstr "Affiche pointeur souris"
 
 #: src/frontend/mame/ui/submenu.cpp:39
-msgid "Confirm quit from machines"
-msgstr "Confirmation quitter depuis les machines"
+msgid "Confirm quit from emulation"
+msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:40
-msgid "Skip information screen at startup"
-msgstr "Passe écran information au démarrage"
+msgid "Skip system information screen"
+msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:41
 msgid "Force 4:3 aspect for snapshot display"
@@ -402,7 +402,7 @@ msgid "Skip BIOS selection menu"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:44
-msgid "Skip software parts selection menu"
+msgid "Skip software part selection menu"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:45
@@ -554,7 +554,7 @@ msgid "UI active"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:91
-msgid "Offscreen reload"
+msgid "Off-screen reload"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:92
@@ -570,7 +570,7 @@ msgid "Natural keyboard"
 msgstr "Clavier naturel"
 
 #: src/frontend/mame/ui/submenu.cpp:95
-msgid "Simultaneous contradictory"
+msgid "Allow contradictory joystick inputs"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:96
@@ -594,7 +594,7 @@ msgid "Pedal Device Assignment"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:106
-msgid "Adstick Device Assignment"
+msgid "AD Stick Device Assignment"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:107
@@ -681,14 +681,14 @@ msgstr ""
 msgid "Wait Vertical Sync"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:687
+#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:689
 #: src/frontend/mame/ui/videoopt.cpp:191 src/frontend/mame/ui/custui.cpp:490
 #: src/frontend/mame/ui/analogipt.cpp:471 plugins/cheatfind/init.lua:766
 #: plugins/cheatfind/init.lua:777 plugins/cheat/init.lua:668
 msgid "On"
 msgstr "Actif"
 
-#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:690
+#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:692
 #: src/frontend/mame/ui/videoopt.cpp:207 src/frontend/mame/ui/custui.cpp:490
 #: src/frontend/mame/ui/analogipt.cpp:471 plugins/cheatfind/init.lua:763
 #: plugins/cheatfind/init.lua:774 plugins/cheat/init.lua:671
@@ -696,11 +696,11 @@ msgstr "Actif"
 msgid "Off"
 msgstr "Inactif"
 
-#: src/frontend/mame/ui/menu.cpp:693
+#: src/frontend/mame/ui/menu.cpp:695
 msgid "Auto"
 msgstr "Auto"
 
-#: src/frontend/mame/ui/menu.cpp:1195
+#: src/frontend/mame/ui/menu.cpp:1197
 #: src/frontend/mame/ui/simpleselgame.cpp:278
 #: src/frontend/mame/ui/selmenu.cpp:1280
 msgid "Return to Previous Menu"
@@ -708,7 +708,7 @@ msgstr "Retour au menu précédent"
 
 #: src/frontend/mame/ui/filemngr.cpp:139
 #: src/frontend/mame/ui/confswitch.cpp:119
-#: src/frontend/mame/ui/inputmap.cpp:559 src/frontend/mame/ui/analogipt.cpp:360
+#: src/frontend/mame/ui/inputmap.cpp:563 src/frontend/mame/ui/analogipt.cpp:360
 #, c-format
 msgid "[root%1$s]"
 msgstr ""
@@ -975,22 +975,22 @@ msgstr ""
 "Processeur(s) :\n"
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "GHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "MHz"
 msgstr "MHz"
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "kHz"
 msgstr "kHz"
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "Hz"
 msgstr ""
 
@@ -1018,38 +1018,38 @@ msgstr "Aucun\n"
 msgid "Vector"
 msgstr "Graphismes vectoriels"
 
-#: src/frontend/mame/ui/info.cpp:480
+#: src/frontend/mame/ui/info.cpp:483
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr "%1$s : %2$s\n"
 
-#: src/frontend/mame/ui/info.cpp:480
+#: src/frontend/mame/ui/info.cpp:483
 msgid "%2$s\n"
 msgstr "%2$s\n"
 
-#: src/frontend/mame/ui/info.cpp:497
+#: src/frontend/mame/ui/info.cpp:500
 #, c-format
 msgid "Screen '%1$s'"
 msgstr "Écran '%1$s'"
 
-#: src/frontend/mame/ui/info.cpp:499
+#: src/frontend/mame/ui/info.cpp:502
 msgid "Screen"
 msgstr "Écran"
 
-#: src/frontend/mame/ui/info.cpp:570 src/frontend/mame/ui/info.cpp:581
+#: src/frontend/mame/ui/info.cpp:573 src/frontend/mame/ui/info.cpp:584
 #, c-format
 msgid "%1$s:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:662
+#: src/frontend/mame/ui/info.cpp:665
 msgid "Not supported"
 msgstr "Non supporté"
 
-#: src/frontend/mame/ui/info.cpp:665
+#: src/frontend/mame/ui/info.cpp:668
 msgid "Partially supported"
 msgstr "Partiellement supporté"
 
-#: src/frontend/mame/ui/info.cpp:674
+#: src/frontend/mame/ui/info.cpp:677
 msgid "[empty]"
 msgstr "[vide]"
 
@@ -1126,7 +1126,7 @@ msgid "Emulated"
 msgstr "Émulé"
 
 #: src/frontend/mame/ui/keyboard.cpp:59 src/frontend/mame/ui/confswitch.cpp:117
-#: src/frontend/mame/ui/inputmap.cpp:557 src/frontend/mame/ui/analogipt.cpp:358
+#: src/frontend/mame/ui/inputmap.cpp:561 src/frontend/mame/ui/analogipt.cpp:358
 #, c-format
 msgid "%1$s [root%2$s]"
 msgstr ""
@@ -1486,7 +1486,7 @@ msgctxt "swlist-info"
 msgid "Software list/item"
 msgstr ""
 
-#: src/frontend/mame/ui/datmenu.cpp:88 src/frontend/mame/ui/selmenu.cpp:2698
+#: src/frontend/mame/ui/datmenu.cpp:88 src/frontend/mame/ui/selmenu.cpp:2707
 msgid "Software List Info"
 msgstr ""
 
@@ -1609,7 +1609,7 @@ msgstr ""
 msgid "Configure Machine:"
 msgstr ""
 
-#: src/frontend/mame/ui/miscmenu.cpp:858 src/frontend/mame/ui/selmenu.cpp:2638
+#: src/frontend/mame/ui/miscmenu.cpp:858 src/frontend/mame/ui/selmenu.cpp:2647
 msgid " (default)"
 msgstr " (par défaut)"
 
@@ -1630,7 +1630,7 @@ msgstr ""
 "Appuyez sur %1$s pour quitter\n"
 "Appuyez sur %2$s pour retourner à l'émulation"
 
-#: src/frontend/mame/ui/info_pty.cpp:30 src/frontend/mame/ui/mainmenu.cpp:155
+#: src/frontend/mame/ui/info_pty.cpp:30
 msgid "Pseudo terminals"
 msgstr "Pseudo terminals"
 
@@ -1698,52 +1698,52 @@ msgstr ""
 msgid "Other Controls"
 msgstr "Autres contrôles"
 
-#: src/frontend/mame/ui/inputmap.cpp:227
+#: src/frontend/mame/ui/inputmap.cpp:231
 msgid "This machine has no configurable inputs."
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:327
+#: src/frontend/mame/ui/inputmap.cpp:331
 msgid "Pressed"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:397
+#: src/frontend/mame/ui/inputmap.cpp:401
 msgid "Invalid sequence entered"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:542
+#: src/frontend/mame/ui/inputmap.cpp:546
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:543
+#: src/frontend/mame/ui/inputmap.cpp:547
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog Inc"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:544
+#: src/frontend/mame/ui/inputmap.cpp:548
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog Dec"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:586
+#: src/frontend/mame/ui/inputmap.cpp:590
 #, c-format
 msgid "Press %1$s to set\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:587
+#: src/frontend/mame/ui/inputmap.cpp:591
 #, c-format
 msgid "Press %1$s to append\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:588
+#: src/frontend/mame/ui/inputmap.cpp:592
 #, c-format
 msgid "Press %1$s to clear\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:589
+#: src/frontend/mame/ui/inputmap.cpp:593
 #, c-format
 msgid "Press %1$s to restore default\n"
 msgstr ""
@@ -1811,7 +1811,7 @@ msgstr ""
 "Appuyer sur une touche pour continuer."
 
 #: src/frontend/mame/ui/simpleselgame.cpp:273
-#: src/frontend/mame/ui/selgame.cpp:436
+#: src/frontend/mame/ui/selgame.cpp:443
 msgid "Configure Options"
 msgstr "Configurer les options"
 
@@ -2147,16 +2147,16 @@ msgstr ""
 msgid "Expand to fit"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:437
+#: src/frontend/mame/ui/selgame.cpp:444
 msgid "Configure Machine"
 msgstr "Configurer la machine"
 
-#: src/frontend/mame/ui/selgame.cpp:1050
+#: src/frontend/mame/ui/selgame.cpp:1060
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d machines (%5$d BIOS) )"
 msgstr "%1$s %2$s ( %3$d / %4$d machines (%5$d BIOS) )"
 
-#: src/frontend/mame/ui/selgame.cpp:1078
+#: src/frontend/mame/ui/selgame.cpp:1088
 #, c-format
 msgid "System: %1$-.100s"
 msgstr "Système : %1$-.100s"
@@ -2178,11 +2178,9 @@ msgstr "Les résultats va être sauvegarder à %1$s"
 #: src/frontend/mame/ui/auditmenu.cpp:98
 #, c-format
 msgid ""
-"Auditing ROMs for machine %2$u of %3$u...\n"
+"Auditing media for machine %2$u of %3$u...\n"
 "%1$s"
 msgstr ""
-"Auditing ROMs pour machine %2$u de %3$u...\n"
-"%1$s"
 
 #: src/frontend/mame/ui/auditmenu.cpp:116
 #, c-format
@@ -2195,13 +2193,13 @@ msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:136
 #, c-format
-msgid "Audit ROMs for %1$u machines marked unavailable"
-msgstr "Audit ROMs pour %1$u machines marqué non disponible"
+msgid "Audit media for %1$u machines marked unavailable"
+msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:137
 #, c-format
-msgid "Audit ROMs for all %1$u machines"
-msgstr "Audit ROMs pour toutes les machines %1$u"
+msgid "Audit media for all %1$u machines"
+msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:154
 #, c-format
@@ -2407,84 +2405,84 @@ msgctxt "color-sample"
 msgid "Clone"
 msgstr "Clone"
 
-#: src/frontend/mame/ui/custui.cpp:914
+#: src/frontend/mame/ui/custui.cpp:906
 msgid "ARGB Settings"
 msgstr "Paramètres ARVB"
 
-#: src/frontend/mame/ui/custui.cpp:919 src/frontend/mame/ui/custui.cpp:922
+#: src/frontend/mame/ui/custui.cpp:911 src/frontend/mame/ui/custui.cpp:914
 msgctxt "color-channel"
 msgid "Alpha"
 msgstr "Alpha"
 
-#: src/frontend/mame/ui/custui.cpp:927 src/frontend/mame/ui/custui.cpp:930
+#: src/frontend/mame/ui/custui.cpp:919 src/frontend/mame/ui/custui.cpp:922
 msgctxt "color-channel"
 msgid "Red"
 msgstr "Rouge"
 
-#: src/frontend/mame/ui/custui.cpp:935 src/frontend/mame/ui/custui.cpp:938
+#: src/frontend/mame/ui/custui.cpp:927 src/frontend/mame/ui/custui.cpp:930
 msgctxt "color-channel"
 msgid "Green"
 msgstr "Vert"
 
-#: src/frontend/mame/ui/custui.cpp:943 src/frontend/mame/ui/custui.cpp:946
+#: src/frontend/mame/ui/custui.cpp:935 src/frontend/mame/ui/custui.cpp:938
 msgctxt "color-channel"
 msgid "Blue"
 msgstr "Bleu"
 
-#: src/frontend/mame/ui/custui.cpp:949
+#: src/frontend/mame/ui/custui.cpp:941
 msgid "Choose from palette"
 msgstr "Choisir parmi la palette"
 
-#: src/frontend/mame/ui/custui.cpp:996
+#: src/frontend/mame/ui/custui.cpp:988
 msgid "Color preview:"
 msgstr "Aperçu de la couleur :"
 
-#: src/frontend/mame/ui/custui.cpp:1093
+#: src/frontend/mame/ui/custui.cpp:1085
 msgctxt "color-preset"
 msgid "White"
 msgstr "Blanc"
 
-#: src/frontend/mame/ui/custui.cpp:1094
+#: src/frontend/mame/ui/custui.cpp:1086
 msgctxt "color-preset"
 msgid "Silver"
 msgstr "Argent"
 
-#: src/frontend/mame/ui/custui.cpp:1095
+#: src/frontend/mame/ui/custui.cpp:1087
 msgctxt "color-preset"
 msgid "Gray"
 msgstr "Gris"
 
-#: src/frontend/mame/ui/custui.cpp:1096
+#: src/frontend/mame/ui/custui.cpp:1088
 msgctxt "color-preset"
 msgid "Black"
 msgstr "Noir"
 
-#: src/frontend/mame/ui/custui.cpp:1097
+#: src/frontend/mame/ui/custui.cpp:1089
 msgctxt "color-preset"
 msgid "Red"
 msgstr "Rouge"
 
-#: src/frontend/mame/ui/custui.cpp:1098
+#: src/frontend/mame/ui/custui.cpp:1090
 msgctxt "color-preset"
 msgid "Orange"
 msgstr "Orange"
 
-#: src/frontend/mame/ui/custui.cpp:1099
+#: src/frontend/mame/ui/custui.cpp:1091
 msgctxt "color-preset"
 msgid "Yellow"
 msgstr "Jaune"
 
-#: src/frontend/mame/ui/custui.cpp:1100
+#: src/frontend/mame/ui/custui.cpp:1092
 msgctxt "color-preset"
 msgid "Green"
 msgstr "Vert"
 
-#: src/frontend/mame/ui/custui.cpp:1101
+#: src/frontend/mame/ui/custui.cpp:1093
 msgctxt "color-preset"
 msgid "Blue"
 msgstr "Bleu"
 
-#: src/frontend/mame/ui/custui.cpp:1102
+#: src/frontend/mame/ui/custui.cpp:1094
 msgctxt "color-preset"
 msgid "Violet"
 msgstr "Violet"
@@ -2549,7 +2547,7 @@ msgid "Input (general)"
 msgstr "Périphériques d'entrée (généraux)"
 
 #: src/frontend/mame/ui/mainmenu.cpp:123
-msgid "Input (this Machine)"
+msgid "Input (this machine)"
 msgstr "Périphériques d'entrée (cette machine)"
 
 #: src/frontend/mame/ui/mainmenu.cpp:126
@@ -2588,6 +2586,10 @@ msgstr "Gestionnaire de fichiers"
 msgid "Tape Control"
 msgstr "Contrôle de la cassette"
 
+#: src/frontend/mame/ui/mainmenu.cpp:155
+msgid "Pseudo Terminals"
+msgstr ""
+
 #: src/frontend/mame/ui/mainmenu.cpp:158
 msgid "BIOS Selection"
 msgstr "Sélection BIOS"
@@ -2626,7 +2628,7 @@ msgstr "Visualiser un DAT externe"
 
 #: src/frontend/mame/ui/mainmenu.cpp:200
 #, c-format
-msgid "About %s"
+msgid "About %1$s"
 msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:212
@@ -2786,373 +2788,373 @@ msgstr "Ce driver est un clone de : %1$s"
 msgid "%1$s %2$s"
 msgstr "%1$s %2$s"
 
-#: src/frontend/mame/ui/selmenu.cpp:2235
+#: src/frontend/mame/ui/selmenu.cpp:2244
 msgid "Images"
 msgstr "Images"
 
-#: src/frontend/mame/ui/selmenu.cpp:2236
+#: src/frontend/mame/ui/selmenu.cpp:2245
 msgid "Infos"
 msgstr "Infos"
 
-#: src/frontend/mame/ui/selmenu.cpp:2551
+#: src/frontend/mame/ui/selmenu.cpp:2560
 msgid ""
 "Required ROM/disk images for the selected system are missing or incorrect. "
 "Please acquire the correct files or select a different system.\n"
 "\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2567
+#: src/frontend/mame/ui/selmenu.cpp:2576
 msgid ""
 "Required ROM/disk images for the selected software are missing or incorrect. "
 "Please acquire the correct files or select a different software item.\n"
 "\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2583
+#: src/frontend/mame/ui/selmenu.cpp:2592
 msgid "incorrect checksum"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2586
+#: src/frontend/mame/ui/selmenu.cpp:2595
 msgid "incorrect length"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2589
+#: src/frontend/mame/ui/selmenu.cpp:2598
 msgid "not found"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2600
+#: src/frontend/mame/ui/selmenu.cpp:2609
 #, c-format
 msgid "%1$s (%2$s) - %3$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2602
+#: src/frontend/mame/ui/selmenu.cpp:2611
 #, c-format
 msgid "%1$s - %2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2606
+#: src/frontend/mame/ui/selmenu.cpp:2615
 msgid "Press any key to continue."
 msgstr "Appuyez sur une touche pour continuer"
 
-#: src/frontend/mame/ui/selmenu.cpp:2735
+#: src/frontend/mame/ui/selmenu.cpp:2744
 msgid "General Info"
 msgstr "Informations générales"
 
-#: src/frontend/mame/ui/selmenu.cpp:2887
+#: src/frontend/mame/ui/selmenu.cpp:2896
 #, c-format
 msgid "Romset\t%1$s\n"
 msgstr "Romset\t%1$s\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2888
+#: src/frontend/mame/ui/selmenu.cpp:2897
 #, c-format
 msgid "Year\t%1$s\n"
 msgstr "Année\t%1$s\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2889
+#: src/frontend/mame/ui/selmenu.cpp:2898
 #, c-format
 msgid "Manufacturer\t%1$s\n"
 msgstr "Fabricant\t%1$s\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2896
+#: src/frontend/mame/ui/selmenu.cpp:2905
 #, c-format
 msgid "Driver is Clone of\t%1$s\n"
 msgstr "Driver est le Clone de\t%1$s\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2901
+#: src/frontend/mame/ui/selmenu.cpp:2910
 msgid "Driver is Parent\t\n"
 msgstr "Driver est le parent\t\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2905
+#: src/frontend/mame/ui/selmenu.cpp:2914
 msgid "Analog Controls\tYes\n"
 msgstr "Contrôles analogique\tOui\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2907
+#: src/frontend/mame/ui/selmenu.cpp:2916
 msgid "Keyboard Inputs\tYes\n"
 msgstr "Entrées clavier\tOui\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2910
+#: src/frontend/mame/ui/selmenu.cpp:2919
 msgid "Overall\tNOT WORKING\n"
 msgstr "Globalement\tNON FONCTIONNEL\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2912
+#: src/frontend/mame/ui/selmenu.cpp:2921
 msgid "Overall\tUnemulated Protection\n"
 msgstr "Globalement\tProtection non émulée\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2914
+#: src/frontend/mame/ui/selmenu.cpp:2923
 msgid "Overall\tWorking\n"
 msgstr "Globalement\tFonctionnel\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2917
+#: src/frontend/mame/ui/selmenu.cpp:2926
 msgid "Graphics\tUnimplemented\n"
 msgstr "Graphismes\tNon implanté\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2919
+#: src/frontend/mame/ui/selmenu.cpp:2928
 msgid "Graphics\tWrong Colors\n"
 msgstr "Graphismes\tCouleurs Incorrectes\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2921
+#: src/frontend/mame/ui/selmenu.cpp:2930
 msgid "Graphics\tImperfect Colors\n"
 msgstr "Graphismes\tCouleurs Imparfaites\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2923
+#: src/frontend/mame/ui/selmenu.cpp:2932
 msgid "Graphics\tImperfect\n"
 msgstr "Graphismes\tImparfaites\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2925
+#: src/frontend/mame/ui/selmenu.cpp:2934
 msgid "Graphics\tOK\n"
 msgstr "Graphismes\tOK\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2928
+#: src/frontend/mame/ui/selmenu.cpp:2937
 msgid "Sound\tNone\n"
 msgstr "Son\tAucun\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2930
+#: src/frontend/mame/ui/selmenu.cpp:2939
 msgid "Sound\tUnimplemented\n"
 msgstr "Son\tNon implanté\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2932
+#: src/frontend/mame/ui/selmenu.cpp:2941
 msgid "Sound\tImperfect\n"
 msgstr "Son\tImparfait\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2934
+#: src/frontend/mame/ui/selmenu.cpp:2943
 msgid "Sound\tOK\n"
 msgstr "Son\tOK\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2937
+#: src/frontend/mame/ui/selmenu.cpp:2946
 msgid "Capture\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2939
+#: src/frontend/mame/ui/selmenu.cpp:2948
 msgid "Capture\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2942
+#: src/frontend/mame/ui/selmenu.cpp:2951
 msgid "Camera\tUnimplemented\n"
 msgstr "Caméra\tNon implanté\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2944
+#: src/frontend/mame/ui/selmenu.cpp:2953
 msgid "Camera\tImperfect\n"
 msgstr "Caméra\tImparfait\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2947
+#: src/frontend/mame/ui/selmenu.cpp:2956
 msgid "Microphone\tUnimplemented\n"
 msgstr "Microphone\tNon implanté\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2949
+#: src/frontend/mame/ui/selmenu.cpp:2958
 msgid "Microphone\tImperfect\n"
 msgstr "Microphone\tImparfait\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2952
+#: src/frontend/mame/ui/selmenu.cpp:2961
 msgid "Controls\tUnimplemented\n"
 msgstr "Contrôles\tNon implanté\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2954
+#: src/frontend/mame/ui/selmenu.cpp:2963
 msgid "Controls\tImperfect\n"
 msgstr "Contrôles\tImparfait\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2957
+#: src/frontend/mame/ui/selmenu.cpp:2966
 msgid "Keyboard\tUnimplemented\n"
 msgstr "Clavier\tNon implanté\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2959
+#: src/frontend/mame/ui/selmenu.cpp:2968
 msgid "Keyboard\tImperfect\n"
 msgstr "Clavier\tImparfait\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2962
+#: src/frontend/mame/ui/selmenu.cpp:2971
 msgid "Mouse\tUnimplemented\n"
 msgstr "Souris\tNon implanté\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2964
+#: src/frontend/mame/ui/selmenu.cpp:2973
 msgid "Mouse\tImperfect\n"
 msgstr "Souris\tImparfait\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2967
+#: src/frontend/mame/ui/selmenu.cpp:2976
 msgid "Media\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2969
+#: src/frontend/mame/ui/selmenu.cpp:2978
 msgid "Media\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2972
+#: src/frontend/mame/ui/selmenu.cpp:2981
 msgid "Disk\tUnimplemented\n"
 msgstr "Disque\tNon implanté\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2974
+#: src/frontend/mame/ui/selmenu.cpp:2983
 msgid "Disk\tImperfect\n"
 msgstr "Disque\tImparfait\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2977
+#: src/frontend/mame/ui/selmenu.cpp:2986
 msgid "Printer\tUnimplemented\n"
 msgstr "Imprimante\tNon implanté\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2979
+#: src/frontend/mame/ui/selmenu.cpp:2988
 msgid "Printer\tImperfect\n"
 msgstr "Imprimante\tImparfait\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2982
+#: src/frontend/mame/ui/selmenu.cpp:2991
 msgid "Mag. Tape\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2984
+#: src/frontend/mame/ui/selmenu.cpp:2993
 msgid "Mag. Tape\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2987
+#: src/frontend/mame/ui/selmenu.cpp:2996
 msgid "Punch Tape\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2989
+#: src/frontend/mame/ui/selmenu.cpp:2998
 msgid "Punch Tape\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2992
+#: src/frontend/mame/ui/selmenu.cpp:3001
 msgid "Mag. Drum\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2994
+#: src/frontend/mame/ui/selmenu.cpp:3003
 msgid "Mag. Drum\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2997
+#: src/frontend/mame/ui/selmenu.cpp:3006
 msgid "(EP)ROM\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2999
+#: src/frontend/mame/ui/selmenu.cpp:3008
 msgid "(EP)ROM\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3002
+#: src/frontend/mame/ui/selmenu.cpp:3011
 msgid "Communications\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3004
+#: src/frontend/mame/ui/selmenu.cpp:3013
 msgid "Communications\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3007
+#: src/frontend/mame/ui/selmenu.cpp:3016
 msgid "LAN\tUnimplemented\n"
 msgstr "LAN\tNon implanté\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3009
+#: src/frontend/mame/ui/selmenu.cpp:3018
 msgid "LAN\tImperfect\n"
 msgstr "LAN\tImparfait\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3012
+#: src/frontend/mame/ui/selmenu.cpp:3021
 msgid "WAN\tUnimplemented\n"
 msgstr "WAN\tNon implanté\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3014
+#: src/frontend/mame/ui/selmenu.cpp:3023
 msgid "WAN\tImperfect\n"
 msgstr "WAN\tImparfait\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3017
+#: src/frontend/mame/ui/selmenu.cpp:3026
 msgid "Timing\tUnimplemented\n"
 msgstr "Minutage\tNon implanté\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3019
+#: src/frontend/mame/ui/selmenu.cpp:3028
 msgid "Timing\tImperfect\n"
 msgstr "Minutage\tImparfait\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3021
+#: src/frontend/mame/ui/selmenu.cpp:3030
 msgid "Mechanical Machine\tYes\n"
 msgstr "Machine mécanique\tOui\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3021
+#: src/frontend/mame/ui/selmenu.cpp:3030
 msgid "Mechanical Machine\tNo\n"
 msgstr "Machine mécanique\tNon\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3022
+#: src/frontend/mame/ui/selmenu.cpp:3031
 msgid "Requires Artwork\tYes\n"
 msgstr "Illustrations requis\tOui\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3022
+#: src/frontend/mame/ui/selmenu.cpp:3031
 msgid "Requires Artwork\tNo\n"
 msgstr "Illustrations requis\tNon\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3023
+#: src/frontend/mame/ui/selmenu.cpp:3032
 msgid "Requires Clickable Artwork\tYes\n"
 msgstr "Illustrations cliquable requis\tOui\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3023
+#: src/frontend/mame/ui/selmenu.cpp:3032
 msgid "Requires Clickable Artwork\tNo\n"
 msgstr "Illustrations cliquable requis\tNon\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3025
+#: src/frontend/mame/ui/selmenu.cpp:3034
 msgid "Support Cocktail\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3026
+#: src/frontend/mame/ui/selmenu.cpp:3035
 msgid "Driver is BIOS\tYes\n"
 msgstr "Driver est BIOS\tOui\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3026
+#: src/frontend/mame/ui/selmenu.cpp:3035
 msgid "Driver is BIOS\tNo\n"
 msgstr "Driver est BIOS\tNon\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3027
+#: src/frontend/mame/ui/selmenu.cpp:3036
 msgid "Support Save\tYes\n"
 msgstr "Supporte sauvegarde\tOui\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3027
+#: src/frontend/mame/ui/selmenu.cpp:3036
 msgid "Support Save\tNo\n"
 msgstr "Supporte sauvegarde\tNon\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3028
+#: src/frontend/mame/ui/selmenu.cpp:3037
 msgid "Screen Orientation\tVertical\n"
 msgstr "Orientation de l'écran\tVerticale\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3028
+#: src/frontend/mame/ui/selmenu.cpp:3037
 msgid "Screen Orientation\tHorizontal\n"
 msgstr "Orientation de l'écran\tHorizontale\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3038
+#: src/frontend/mame/ui/selmenu.cpp:3047
 msgid "Requires CHD\tYes\n"
 msgstr "CHD requis\tOui\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3038
+#: src/frontend/mame/ui/selmenu.cpp:3047
 msgid "Requires CHD\tNo\n"
 msgstr "CHD requis\tNon\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3051
-msgid "ROM Audit Result\tOK\n"
+#: src/frontend/mame/ui/selmenu.cpp:3060
+msgid "Media Audit Result\tOK\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3053
-msgid "ROM Audit Result\tBAD\n"
+#: src/frontend/mame/ui/selmenu.cpp:3062
+msgid "Media Audit Result\tBAD\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3056
+#: src/frontend/mame/ui/selmenu.cpp:3065
 msgid "Samples Audit Result\tNone Needed\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3058
+#: src/frontend/mame/ui/selmenu.cpp:3067
 msgid "Samples Audit Result\tOK\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3060
+#: src/frontend/mame/ui/selmenu.cpp:3069
 msgid "Samples Audit Result\tBAD\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3064
+#: src/frontend/mame/ui/selmenu.cpp:3073
 msgid ""
-"ROM Audit \tDisabled\n"
-"Samples Audit \tDisabled\n"
+"Media Audit\tDisabled\n"
+"Samples Audit\tDisabled\n"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:150
+#: src/frontend/mame/ui/sndmenu.cpp:146
 msgid "Sound"
 msgstr "Son"
 
-#: src/frontend/mame/ui/sndmenu.cpp:151
+#: src/frontend/mame/ui/sndmenu.cpp:147
 msgid "Compressor"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:152
+#: src/frontend/mame/ui/sndmenu.cpp:148
 msgid "Sample Rate"
 msgstr "Fréquence d'échantillonnage"
 
-#: src/frontend/mame/ui/sndmenu.cpp:153
+#: src/frontend/mame/ui/sndmenu.cpp:149
 msgid "Use External Samples"
 msgstr "Utiliser des samples externes"
 
@@ -3191,511 +3193,681 @@ msgstr ""
 msgid "  Screen '%1$s': Vector\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:132
+#: src/frontend/mame/ui/devopt.cpp:135
 #, c-format
 msgid "  Screen '%1$s': %2$d × %3$d (V) %4$s Hz\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:133
+#: src/frontend/mame/ui/devopt.cpp:136
 #, c-format
 msgid "  Screen '%1$s': %2$d × %3$d (H) %4$s Hz\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:147
+#: src/frontend/mame/ui/devopt.cpp:150
 msgid "* Sound:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:211
+#: src/frontend/mame/ui/devopt.cpp:214
 #, c-format
 msgid ""
 "* BIOS settings:\n"
 "  %1$d options    [default: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:255 src/frontend/mame/ui/devopt.cpp:271
-#: src/frontend/mame/ui/devopt.cpp:332
+#: src/frontend/mame/ui/devopt.cpp:258 src/frontend/mame/ui/devopt.cpp:274
+#: src/frontend/mame/ui/devopt.cpp:335
 #, c-format
 msgid "  %1$s    [default: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:260 src/frontend/mame/ui/devopt.cpp:276
+#: src/frontend/mame/ui/devopt.cpp:263 src/frontend/mame/ui/devopt.cpp:279
 #, c-format
 msgid "  %1$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:282
+#: src/frontend/mame/ui/devopt.cpp:285
 msgid "* DIP switch settings:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:287
+#: src/frontend/mame/ui/devopt.cpp:290
 msgid "* Configuration settings:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:291
+#: src/frontend/mame/ui/devopt.cpp:294
 msgid "* Input device(s):\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:293
+#: src/frontend/mame/ui/devopt.cpp:296
 #, c-format
 msgid "  User inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:295
+#: src/frontend/mame/ui/devopt.cpp:298
 #, c-format
 msgid "  Mahjong inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:297
+#: src/frontend/mame/ui/devopt.cpp:300
 #, c-format
 msgid "  Hanafuda inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:299
+#: src/frontend/mame/ui/devopt.cpp:302
 #, c-format
 msgid "  Gambling inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:301
+#: src/frontend/mame/ui/devopt.cpp:304
 #, c-format
 msgid "  Analog inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:303
+#: src/frontend/mame/ui/devopt.cpp:306
 #, c-format
 msgid "  Adjuster inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:305
+#: src/frontend/mame/ui/devopt.cpp:308
 #, c-format
 msgid "  Keypad inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:307
+#: src/frontend/mame/ui/devopt.cpp:310
 #, c-format
 msgid "  Keyboard inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:312
+#: src/frontend/mame/ui/devopt.cpp:315
 msgid "* Media Options:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:317
+#: src/frontend/mame/ui/devopt.cpp:320
 #, c-format
 msgid "  %1$s    [tag: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:327
+#: src/frontend/mame/ui/devopt.cpp:330
 msgid "* Slot Options:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:341
+#: src/frontend/mame/ui/devopt.cpp:344
 msgid "[None]\n"
 msgstr ""
 
-#: src/emu/render.cpp:1847
+#: src/emu/render.cpp:1796
 #, c-format
 msgctxt "view-name"
 msgid "Screen %1$u Standard (%2$u:%3$u)"
 msgstr ""
 
-#: src/emu/render.cpp:1873
+#: src/emu/render.cpp:1822
 #, c-format
 msgctxt "view-name"
 msgid "Screen %1$u Pixel Aspect (%2$u:%3$u)"
 msgstr ""
 
-#: src/emu/render.cpp:1895 src/emu/render.cpp:2030
+#: src/emu/render.cpp:1844 src/emu/render.cpp:1979
 msgctxt "view-name"
 msgid "Cocktail"
 msgstr ""
 
-#: src/emu/render.cpp:2015
+#: src/emu/render.cpp:1964
 msgctxt "view-name"
 msgid "Left-to-Right"
 msgstr ""
 
-#: src/emu/render.cpp:2016
+#: src/emu/render.cpp:1965
 msgctxt "view-name"
 msgid "Left-to-Right (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2017
+#: src/emu/render.cpp:1966
 msgctxt "view-name"
 msgid "Top-to-Bottom"
 msgstr ""
 
-#: src/emu/render.cpp:2018
+#: src/emu/render.cpp:1967
 msgctxt "view-name"
 msgid "Top-to-Bottom (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2069
+#: src/emu/render.cpp:2018
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Left-to-Right, Top-to-Bottom"
 msgstr ""
 
-#: src/emu/render.cpp:2078
+#: src/emu/render.cpp:2027
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Left-to-Right, Top-to-Bottom (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2087
+#: src/emu/render.cpp:2036
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Top-to-Bottom, Left-to-Right"
 msgstr ""
 
-#: src/emu/render.cpp:2096
+#: src/emu/render.cpp:2045
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Top-to-Bottom, Left-to-Right (Gapless)"
 msgstr ""
 
-#: src/emu/inpttype.ipp:22
+#: src/emu/ioport.cpp:332
+#, c-format
 msgctxt "input-name"
-msgid "P1 Up"
+msgid "P%1$u"
 msgstr ""
 
-#: src/emu/inpttype.ipp:23
+#: src/emu/ioport.cpp:1924
 msgctxt "input-name"
-msgid "P1 Down"
+msgid "???"
 msgstr ""
 
-#: src/emu/inpttype.ipp:24
+#: src/emu/inpttype.ipp:22 src/emu/inpttype.ipp:140 src/emu/inpttype.ipp:221
+#: src/emu/inpttype.ipp:255 src/emu/inpttype.ipp:289 src/emu/inpttype.ipp:323
+#: src/emu/inpttype.ipp:357 src/emu/inpttype.ipp:391 src/emu/inpttype.ipp:425
+#: src/emu/inpttype.ipp:459
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left"
+msgid "%p Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:25
+#: src/emu/inpttype.ipp:23 src/emu/inpttype.ipp:141 src/emu/inpttype.ipp:222
+#: src/emu/inpttype.ipp:256 src/emu/inpttype.ipp:290 src/emu/inpttype.ipp:324
+#: src/emu/inpttype.ipp:358 src/emu/inpttype.ipp:392 src/emu/inpttype.ipp:426
+#: src/emu/inpttype.ipp:460
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right"
+msgid "%p Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:26
+#: src/emu/inpttype.ipp:24 src/emu/inpttype.ipp:142 src/emu/inpttype.ipp:223
+#: src/emu/inpttype.ipp:257 src/emu/inpttype.ipp:291 src/emu/inpttype.ipp:325
+#: src/emu/inpttype.ipp:359 src/emu/inpttype.ipp:393 src/emu/inpttype.ipp:427
+#: src/emu/inpttype.ipp:461
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Up"
+msgid "%p Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:27
+#: src/emu/inpttype.ipp:25 src/emu/inpttype.ipp:143 src/emu/inpttype.ipp:224
+#: src/emu/inpttype.ipp:258 src/emu/inpttype.ipp:292 src/emu/inpttype.ipp:326
+#: src/emu/inpttype.ipp:360 src/emu/inpttype.ipp:394 src/emu/inpttype.ipp:428
+#: src/emu/inpttype.ipp:462
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Down"
+msgid "%p Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:28
+#: src/emu/inpttype.ipp:26 src/emu/inpttype.ipp:144 src/emu/inpttype.ipp:225
+#: src/emu/inpttype.ipp:259 src/emu/inpttype.ipp:293 src/emu/inpttype.ipp:327
+#: src/emu/inpttype.ipp:361 src/emu/inpttype.ipp:395 src/emu/inpttype.ipp:429
+#: src/emu/inpttype.ipp:463
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Left"
+msgid "%p Right Stick/Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:29
+#: src/emu/inpttype.ipp:27 src/emu/inpttype.ipp:145 src/emu/inpttype.ipp:226
+#: src/emu/inpttype.ipp:260 src/emu/inpttype.ipp:294 src/emu/inpttype.ipp:328
+#: src/emu/inpttype.ipp:362 src/emu/inpttype.ipp:396 src/emu/inpttype.ipp:430
+#: src/emu/inpttype.ipp:464
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Right"
+msgid "%p Right Stick/Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:30
+#: src/emu/inpttype.ipp:28 src/emu/inpttype.ipp:146 src/emu/inpttype.ipp:227
+#: src/emu/inpttype.ipp:261 src/emu/inpttype.ipp:295 src/emu/inpttype.ipp:329
+#: src/emu/inpttype.ipp:363 src/emu/inpttype.ipp:397 src/emu/inpttype.ipp:431
+#: src/emu/inpttype.ipp:465
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Up"
+msgid "%p Right Stick/Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:31
+#: src/emu/inpttype.ipp:29 src/emu/inpttype.ipp:147 src/emu/inpttype.ipp:228
+#: src/emu/inpttype.ipp:262 src/emu/inpttype.ipp:296 src/emu/inpttype.ipp:330
+#: src/emu/inpttype.ipp:364 src/emu/inpttype.ipp:398 src/emu/inpttype.ipp:432
+#: src/emu/inpttype.ipp:466
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Down"
+msgid "%p Right Stick/Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:32
+#: src/emu/inpttype.ipp:30 src/emu/inpttype.ipp:148 src/emu/inpttype.ipp:229
+#: src/emu/inpttype.ipp:263 src/emu/inpttype.ipp:297 src/emu/inpttype.ipp:331
+#: src/emu/inpttype.ipp:365 src/emu/inpttype.ipp:399 src/emu/inpttype.ipp:433
+#: src/emu/inpttype.ipp:467
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Left"
+msgid "%p Left Stick/Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:33
+#: src/emu/inpttype.ipp:31 src/emu/inpttype.ipp:149 src/emu/inpttype.ipp:230
+#: src/emu/inpttype.ipp:264 src/emu/inpttype.ipp:298 src/emu/inpttype.ipp:332
+#: src/emu/inpttype.ipp:366 src/emu/inpttype.ipp:400 src/emu/inpttype.ipp:434
+#: src/emu/inpttype.ipp:468
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Right"
+msgid "%p Left Stick/Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:34
+#: src/emu/inpttype.ipp:32 src/emu/inpttype.ipp:150 src/emu/inpttype.ipp:231
+#: src/emu/inpttype.ipp:265 src/emu/inpttype.ipp:299 src/emu/inpttype.ipp:333
+#: src/emu/inpttype.ipp:367 src/emu/inpttype.ipp:401 src/emu/inpttype.ipp:435
+#: src/emu/inpttype.ipp:469
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 1"
+msgid "%p Left Stick/Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:35
+#: src/emu/inpttype.ipp:33 src/emu/inpttype.ipp:151 src/emu/inpttype.ipp:232
+#: src/emu/inpttype.ipp:266 src/emu/inpttype.ipp:300 src/emu/inpttype.ipp:334
+#: src/emu/inpttype.ipp:368 src/emu/inpttype.ipp:402 src/emu/inpttype.ipp:436
+#: src/emu/inpttype.ipp:470
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 2"
+msgid "%p Left Stick/Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:36
+#: src/emu/inpttype.ipp:34 src/emu/inpttype.ipp:152 src/emu/inpttype.ipp:233
+#: src/emu/inpttype.ipp:267 src/emu/inpttype.ipp:301 src/emu/inpttype.ipp:335
+#: src/emu/inpttype.ipp:369 src/emu/inpttype.ipp:403 src/emu/inpttype.ipp:437
+#: src/emu/inpttype.ipp:471
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 3"
+msgid "%p Button 1"
 msgstr ""
 
-#: src/emu/inpttype.ipp:37
+#: src/emu/inpttype.ipp:35 src/emu/inpttype.ipp:153 src/emu/inpttype.ipp:234
+#: src/emu/inpttype.ipp:268 src/emu/inpttype.ipp:302 src/emu/inpttype.ipp:336
+#: src/emu/inpttype.ipp:370 src/emu/inpttype.ipp:404 src/emu/inpttype.ipp:438
+#: src/emu/inpttype.ipp:472
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 4"
+msgid "%p Button 2"
 msgstr ""
 
-#: src/emu/inpttype.ipp:38
+#: src/emu/inpttype.ipp:36 src/emu/inpttype.ipp:154 src/emu/inpttype.ipp:235
+#: src/emu/inpttype.ipp:269 src/emu/inpttype.ipp:303 src/emu/inpttype.ipp:337
+#: src/emu/inpttype.ipp:371 src/emu/inpttype.ipp:405 src/emu/inpttype.ipp:439
+#: src/emu/inpttype.ipp:473
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 5"
+msgid "%p Button 3"
 msgstr ""
 
-#: src/emu/inpttype.ipp:39
+#: src/emu/inpttype.ipp:37 src/emu/inpttype.ipp:155 src/emu/inpttype.ipp:236
+#: src/emu/inpttype.ipp:270 src/emu/inpttype.ipp:304 src/emu/inpttype.ipp:338
+#: src/emu/inpttype.ipp:372 src/emu/inpttype.ipp:406 src/emu/inpttype.ipp:440
+#: src/emu/inpttype.ipp:474
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 6"
+msgid "%p Button 4"
 msgstr ""
 
-#: src/emu/inpttype.ipp:40
+#: src/emu/inpttype.ipp:38 src/emu/inpttype.ipp:156 src/emu/inpttype.ipp:237
+#: src/emu/inpttype.ipp:271 src/emu/inpttype.ipp:305 src/emu/inpttype.ipp:339
+#: src/emu/inpttype.ipp:373 src/emu/inpttype.ipp:407 src/emu/inpttype.ipp:441
+#: src/emu/inpttype.ipp:475
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 7"
+msgid "%p Button 5"
 msgstr ""
 
-#: src/emu/inpttype.ipp:41
+#: src/emu/inpttype.ipp:39 src/emu/inpttype.ipp:157 src/emu/inpttype.ipp:238
+#: src/emu/inpttype.ipp:272 src/emu/inpttype.ipp:306 src/emu/inpttype.ipp:340
+#: src/emu/inpttype.ipp:374 src/emu/inpttype.ipp:408 src/emu/inpttype.ipp:442
+#: src/emu/inpttype.ipp:476
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 8"
+msgid "%p Button 6"
 msgstr ""
 
-#: src/emu/inpttype.ipp:42
+#: src/emu/inpttype.ipp:40 src/emu/inpttype.ipp:158 src/emu/inpttype.ipp:239
+#: src/emu/inpttype.ipp:273 src/emu/inpttype.ipp:307 src/emu/inpttype.ipp:341
+#: src/emu/inpttype.ipp:375 src/emu/inpttype.ipp:409 src/emu/inpttype.ipp:443
+#: src/emu/inpttype.ipp:477
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 9"
+msgid "%p Button 7"
 msgstr ""
 
-#: src/emu/inpttype.ipp:43
+#: src/emu/inpttype.ipp:41 src/emu/inpttype.ipp:159 src/emu/inpttype.ipp:240
+#: src/emu/inpttype.ipp:274 src/emu/inpttype.ipp:308 src/emu/inpttype.ipp:342
+#: src/emu/inpttype.ipp:376 src/emu/inpttype.ipp:410 src/emu/inpttype.ipp:444
+#: src/emu/inpttype.ipp:478
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 10"
+msgid "%p Button 8"
 msgstr ""
 
-#: src/emu/inpttype.ipp:44
+#: src/emu/inpttype.ipp:42 src/emu/inpttype.ipp:160 src/emu/inpttype.ipp:241
+#: src/emu/inpttype.ipp:275 src/emu/inpttype.ipp:309 src/emu/inpttype.ipp:343
+#: src/emu/inpttype.ipp:377 src/emu/inpttype.ipp:411 src/emu/inpttype.ipp:445
+#: src/emu/inpttype.ipp:479
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 11"
+msgid "%p Button 9"
 msgstr ""
 
-#: src/emu/inpttype.ipp:45
+#: src/emu/inpttype.ipp:43 src/emu/inpttype.ipp:161 src/emu/inpttype.ipp:242
+#: src/emu/inpttype.ipp:276 src/emu/inpttype.ipp:310 src/emu/inpttype.ipp:344
+#: src/emu/inpttype.ipp:378 src/emu/inpttype.ipp:412 src/emu/inpttype.ipp:446
+#: src/emu/inpttype.ipp:480
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 12"
+msgid "%p Button 10"
 msgstr ""
 
-#: src/emu/inpttype.ipp:46
+#: src/emu/inpttype.ipp:44 src/emu/inpttype.ipp:162 src/emu/inpttype.ipp:243
+#: src/emu/inpttype.ipp:277 src/emu/inpttype.ipp:311 src/emu/inpttype.ipp:345
+#: src/emu/inpttype.ipp:379 src/emu/inpttype.ipp:413 src/emu/inpttype.ipp:447
+#: src/emu/inpttype.ipp:481
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 13"
+msgid "%p Button 11"
 msgstr ""
 
-#: src/emu/inpttype.ipp:47
+#: src/emu/inpttype.ipp:45 src/emu/inpttype.ipp:163 src/emu/inpttype.ipp:244
+#: src/emu/inpttype.ipp:278 src/emu/inpttype.ipp:312 src/emu/inpttype.ipp:346
+#: src/emu/inpttype.ipp:380 src/emu/inpttype.ipp:414 src/emu/inpttype.ipp:448
+#: src/emu/inpttype.ipp:482
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 14"
+msgid "%p Button 12"
 msgstr ""
 
-#: src/emu/inpttype.ipp:48
+#: src/emu/inpttype.ipp:46 src/emu/inpttype.ipp:164 src/emu/inpttype.ipp:245
+#: src/emu/inpttype.ipp:279 src/emu/inpttype.ipp:313 src/emu/inpttype.ipp:347
+#: src/emu/inpttype.ipp:381 src/emu/inpttype.ipp:415 src/emu/inpttype.ipp:449
+#: src/emu/inpttype.ipp:483
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 15"
+msgid "%p Button 13"
 msgstr ""
 
-#: src/emu/inpttype.ipp:49
+#: src/emu/inpttype.ipp:47 src/emu/inpttype.ipp:165 src/emu/inpttype.ipp:246
+#: src/emu/inpttype.ipp:280 src/emu/inpttype.ipp:314 src/emu/inpttype.ipp:348
+#: src/emu/inpttype.ipp:382 src/emu/inpttype.ipp:416 src/emu/inpttype.ipp:450
+#: src/emu/inpttype.ipp:484
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 16"
+msgid "%p Button 14"
 msgstr ""
 
-#: src/emu/inpttype.ipp:50
+#: src/emu/inpttype.ipp:48 src/emu/inpttype.ipp:166 src/emu/inpttype.ipp:247
+#: src/emu/inpttype.ipp:281 src/emu/inpttype.ipp:315 src/emu/inpttype.ipp:349
+#: src/emu/inpttype.ipp:383 src/emu/inpttype.ipp:417 src/emu/inpttype.ipp:451
+#: src/emu/inpttype.ipp:485
+#, c-format
 msgctxt "input-name"
-msgid "P1 Start"
+msgid "%p Button 15"
 msgstr ""
 
-#: src/emu/inpttype.ipp:51
+#: src/emu/inpttype.ipp:49 src/emu/inpttype.ipp:167 src/emu/inpttype.ipp:248
+#: src/emu/inpttype.ipp:282 src/emu/inpttype.ipp:316 src/emu/inpttype.ipp:350
+#: src/emu/inpttype.ipp:384 src/emu/inpttype.ipp:418 src/emu/inpttype.ipp:452
+#: src/emu/inpttype.ipp:486
+#, c-format
 msgctxt "input-name"
-msgid "P1 Select"
+msgid "%p Button 16"
 msgstr ""
 
-#: src/emu/inpttype.ipp:56
+#: src/emu/inpttype.ipp:50 src/emu/inpttype.ipp:168 src/emu/inpttype.ipp:249
+#: src/emu/inpttype.ipp:283 src/emu/inpttype.ipp:317 src/emu/inpttype.ipp:351
+#: src/emu/inpttype.ipp:385 src/emu/inpttype.ipp:419 src/emu/inpttype.ipp:453
+#: src/emu/inpttype.ipp:487
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong A"
+msgid "%p Start"
 msgstr ""
 
-#: src/emu/inpttype.ipp:57
+#: src/emu/inpttype.ipp:51 src/emu/inpttype.ipp:169 src/emu/inpttype.ipp:250
+#: src/emu/inpttype.ipp:284 src/emu/inpttype.ipp:318 src/emu/inpttype.ipp:352
+#: src/emu/inpttype.ipp:386 src/emu/inpttype.ipp:420 src/emu/inpttype.ipp:454
+#: src/emu/inpttype.ipp:488
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong B"
+msgid "%p Select"
 msgstr ""
 
-#: src/emu/inpttype.ipp:58
+#: src/emu/inpttype.ipp:56 src/emu/inpttype.ipp:174
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong C"
+msgid "%p Mahjong A"
 msgstr ""
 
-#: src/emu/inpttype.ipp:59
+#: src/emu/inpttype.ipp:57 src/emu/inpttype.ipp:175
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong D"
+msgid "%p Mahjong B"
 msgstr ""
 
-#: src/emu/inpttype.ipp:60
+#: src/emu/inpttype.ipp:58 src/emu/inpttype.ipp:176
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong E"
+msgid "%p Mahjong C"
 msgstr ""
 
-#: src/emu/inpttype.ipp:61
+#: src/emu/inpttype.ipp:59 src/emu/inpttype.ipp:177
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong F"
+msgid "%p Mahjong D"
 msgstr ""
 
-#: src/emu/inpttype.ipp:62
+#: src/emu/inpttype.ipp:60 src/emu/inpttype.ipp:178
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong G"
+msgid "%p Mahjong E"
 msgstr ""
 
-#: src/emu/inpttype.ipp:63
+#: src/emu/inpttype.ipp:61 src/emu/inpttype.ipp:179
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong H"
+msgid "%p Mahjong F"
 msgstr ""
 
-#: src/emu/inpttype.ipp:64
+#: src/emu/inpttype.ipp:62 src/emu/inpttype.ipp:180
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong I"
+msgid "%p Mahjong G"
 msgstr ""
 
-#: src/emu/inpttype.ipp:65
+#: src/emu/inpttype.ipp:63 src/emu/inpttype.ipp:181
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong J"
+msgid "%p Mahjong H"
 msgstr ""
 
-#: src/emu/inpttype.ipp:66
+#: src/emu/inpttype.ipp:64 src/emu/inpttype.ipp:182
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong K"
+msgid "%p Mahjong I"
 msgstr ""
 
-#: src/emu/inpttype.ipp:67
+#: src/emu/inpttype.ipp:65 src/emu/inpttype.ipp:183
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong L"
+msgid "%p Mahjong J"
 msgstr ""
 
-#: src/emu/inpttype.ipp:68
+#: src/emu/inpttype.ipp:66 src/emu/inpttype.ipp:184
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong M"
+msgid "%p Mahjong K"
 msgstr ""
 
-#: src/emu/inpttype.ipp:69
+#: src/emu/inpttype.ipp:67 src/emu/inpttype.ipp:185
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong N"
+msgid "%p Mahjong L"
 msgstr ""
 
-#: src/emu/inpttype.ipp:70
+#: src/emu/inpttype.ipp:68 src/emu/inpttype.ipp:186
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong O"
+msgid "%p Mahjong M"
 msgstr ""
 
-#: src/emu/inpttype.ipp:71
+#: src/emu/inpttype.ipp:69 src/emu/inpttype.ipp:187
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong P"
+msgid "%p Mahjong N"
 msgstr ""
 
-#: src/emu/inpttype.ipp:72
+#: src/emu/inpttype.ipp:70 src/emu/inpttype.ipp:188
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Q"
+msgid "%p Mahjong O"
 msgstr ""
 
-#: src/emu/inpttype.ipp:73
+#: src/emu/inpttype.ipp:71 src/emu/inpttype.ipp:189
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Kan"
+msgid "%p Mahjong P"
 msgstr ""
 
-#: src/emu/inpttype.ipp:74
+#: src/emu/inpttype.ipp:72 src/emu/inpttype.ipp:190
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Pon"
+msgid "%p Mahjong Q"
 msgstr ""
 
-#: src/emu/inpttype.ipp:75
+#: src/emu/inpttype.ipp:73 src/emu/inpttype.ipp:191
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Chi"
+msgid "%p Mahjong Kan"
 msgstr ""
 
-#: src/emu/inpttype.ipp:76
+#: src/emu/inpttype.ipp:74 src/emu/inpttype.ipp:192
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Reach"
+msgid "%p Mahjong Pon"
 msgstr ""
 
-#: src/emu/inpttype.ipp:77
+#: src/emu/inpttype.ipp:75 src/emu/inpttype.ipp:193
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Ron"
+msgid "%p Mahjong Chi"
 msgstr ""
 
-#: src/emu/inpttype.ipp:78
+#: src/emu/inpttype.ipp:76 src/emu/inpttype.ipp:194
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Flip Flop"
+msgid "%p Mahjong Reach"
 msgstr ""
 
-#: src/emu/inpttype.ipp:79
+#: src/emu/inpttype.ipp:77 src/emu/inpttype.ipp:195
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Bet"
+msgid "%p Mahjong Ron"
 msgstr ""
 
-#: src/emu/inpttype.ipp:80
+#: src/emu/inpttype.ipp:78 src/emu/inpttype.ipp:200
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Take Score"
+msgid "%p Mahjong Flip Flop"
 msgstr ""
 
-#: src/emu/inpttype.ipp:81
+#: src/emu/inpttype.ipp:79 src/emu/inpttype.ipp:196
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Double Up"
+msgid "%p Mahjong Bet"
 msgstr ""
 
-#: src/emu/inpttype.ipp:82
+#: src/emu/inpttype.ipp:80 src/emu/inpttype.ipp:198
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Big"
+msgid "%p Mahjong Take Score"
 msgstr ""
 
-#: src/emu/inpttype.ipp:83
+#: src/emu/inpttype.ipp:81 src/emu/inpttype.ipp:199
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Small"
+msgid "%p Mahjong Double Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:84
+#: src/emu/inpttype.ipp:82 src/emu/inpttype.ipp:201
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Last Chance"
+msgid "%p Mahjong Big"
 msgstr ""
 
-#: src/emu/inpttype.ipp:89
+#: src/emu/inpttype.ipp:83 src/emu/inpttype.ipp:202
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda A/1"
+msgid "%p Mahjong Small"
 msgstr ""
 
-#: src/emu/inpttype.ipp:90
+#: src/emu/inpttype.ipp:84 src/emu/inpttype.ipp:197
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda B/2"
+msgid "%p Mahjong Last Chance"
 msgstr ""
 
-#: src/emu/inpttype.ipp:91
+#: src/emu/inpttype.ipp:89 src/emu/inpttype.ipp:207
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda C/3"
+msgid "%p Hanafuda A/1"
 msgstr ""
 
-#: src/emu/inpttype.ipp:92
+#: src/emu/inpttype.ipp:90 src/emu/inpttype.ipp:208
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda D/4"
+msgid "%p Hanafuda B/2"
 msgstr ""
 
-#: src/emu/inpttype.ipp:93
+#: src/emu/inpttype.ipp:91 src/emu/inpttype.ipp:209
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda E/5"
+msgid "%p Hanafuda C/3"
 msgstr ""
 
-#: src/emu/inpttype.ipp:94
+#: src/emu/inpttype.ipp:92 src/emu/inpttype.ipp:210
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda F/6"
+msgid "%p Hanafuda D/4"
 msgstr ""
 
-#: src/emu/inpttype.ipp:95
+#: src/emu/inpttype.ipp:93 src/emu/inpttype.ipp:211
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda G/7"
+msgid "%p Hanafuda E/5"
 msgstr ""
 
-#: src/emu/inpttype.ipp:96
+#: src/emu/inpttype.ipp:94 src/emu/inpttype.ipp:212
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda H/8"
+msgid "%p Hanafuda F/6"
 msgstr ""
 
-#: src/emu/inpttype.ipp:97
+#: src/emu/inpttype.ipp:95 src/emu/inpttype.ipp:213
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda Yes"
+msgid "%p Hanafuda G/7"
 msgstr ""
 
-#: src/emu/inpttype.ipp:98
+#: src/emu/inpttype.ipp:96 src/emu/inpttype.ipp:214
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda No"
+msgid "%p Hanafuda H/8"
+msgstr ""
+
+#: src/emu/inpttype.ipp:97 src/emu/inpttype.ipp:215
+#, c-format
+msgctxt "input-name"
+msgid "%p Hanafuda Yes"
+msgstr ""
+
+#: src/emu/inpttype.ipp:98 src/emu/inpttype.ipp:216
+#, c-format
+msgctxt "input-name"
+msgid "%p Hanafuda No"
 msgstr ""
 
 #: src/emu/inpttype.ipp:103
@@ -3823,1551 +3995,6 @@ msgctxt "input-name"
 msgid "Stop All Reels"
 msgstr ""
 
-#: src/emu/inpttype.ipp:140
-msgctxt "input-name"
-msgid "P2 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:141
-msgctxt "input-name"
-msgid "P2 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:142
-msgctxt "input-name"
-msgid "P2 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:143
-msgctxt "input-name"
-msgid "P2 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:144
-msgctxt "input-name"
-msgid "P2 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:145
-msgctxt "input-name"
-msgid "P2 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:146
-msgctxt "input-name"
-msgid "P2 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:147
-msgctxt "input-name"
-msgid "P2 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:148
-msgctxt "input-name"
-msgid "P2 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:149
-msgctxt "input-name"
-msgid "P2 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:150
-msgctxt "input-name"
-msgid "P2 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:151
-msgctxt "input-name"
-msgid "P2 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:152
-msgctxt "input-name"
-msgid "P2 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:153
-msgctxt "input-name"
-msgid "P2 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:154
-msgctxt "input-name"
-msgid "P2 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:155
-msgctxt "input-name"
-msgid "P2 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:156
-msgctxt "input-name"
-msgid "P2 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:157
-msgctxt "input-name"
-msgid "P2 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:158
-msgctxt "input-name"
-msgid "P2 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:159
-msgctxt "input-name"
-msgid "P2 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:160
-msgctxt "input-name"
-msgid "P2 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:161
-msgctxt "input-name"
-msgid "P2 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:162
-msgctxt "input-name"
-msgid "P2 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:163
-msgctxt "input-name"
-msgid "P2 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:164
-msgctxt "input-name"
-msgid "P2 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:165
-msgctxt "input-name"
-msgid "P2 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:166
-msgctxt "input-name"
-msgid "P2 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:167
-msgctxt "input-name"
-msgid "P2 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:168
-msgctxt "input-name"
-msgid "P2 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:169
-msgctxt "input-name"
-msgid "P2 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:174
-msgctxt "input-name"
-msgid "P2 Mahjong A"
-msgstr ""
-
-#: src/emu/inpttype.ipp:175
-msgctxt "input-name"
-msgid "P2 Mahjong B"
-msgstr ""
-
-#: src/emu/inpttype.ipp:176
-msgctxt "input-name"
-msgid "P2 Mahjong C"
-msgstr ""
-
-#: src/emu/inpttype.ipp:177
-msgctxt "input-name"
-msgid "P2 Mahjong D"
-msgstr ""
-
-#: src/emu/inpttype.ipp:178
-msgctxt "input-name"
-msgid "P2 Mahjong E"
-msgstr ""
-
-#: src/emu/inpttype.ipp:179
-msgctxt "input-name"
-msgid "P2 Mahjong F"
-msgstr ""
-
-#: src/emu/inpttype.ipp:180
-msgctxt "input-name"
-msgid "P2 Mahjong G"
-msgstr ""
-
-#: src/emu/inpttype.ipp:181
-msgctxt "input-name"
-msgid "P2 Mahjong H"
-msgstr ""
-
-#: src/emu/inpttype.ipp:182
-msgctxt "input-name"
-msgid "P2 Mahjong I"
-msgstr ""
-
-#: src/emu/inpttype.ipp:183
-msgctxt "input-name"
-msgid "P2 Mahjong J"
-msgstr ""
-
-#: src/emu/inpttype.ipp:184
-msgctxt "input-name"
-msgid "P2 Mahjong K"
-msgstr ""
-
-#: src/emu/inpttype.ipp:185
-msgctxt "input-name"
-msgid "P2 Mahjong L"
-msgstr ""
-
-#: src/emu/inpttype.ipp:186
-msgctxt "input-name"
-msgid "P2 Mahjong M"
-msgstr ""
-
-#: src/emu/inpttype.ipp:187
-msgctxt "input-name"
-msgid "P2 Mahjong N"
-msgstr ""
-
-#: src/emu/inpttype.ipp:188
-msgctxt "input-name"
-msgid "P2 Mahjong O"
-msgstr ""
-
-#: src/emu/inpttype.ipp:189
-msgctxt "input-name"
-msgid "P2 Mahjong P"
-msgstr ""
-
-#: src/emu/inpttype.ipp:190
-msgctxt "input-name"
-msgid "P2 Mahjong Q"
-msgstr ""
-
-#: src/emu/inpttype.ipp:191
-msgctxt "input-name"
-msgid "P2 Mahjong Kan"
-msgstr ""
-
-#: src/emu/inpttype.ipp:192
-msgctxt "input-name"
-msgid "P2 Mahjong Pon"
-msgstr ""
-
-#: src/emu/inpttype.ipp:193
-msgctxt "input-name"
-msgid "P2 Mahjong Chi"
-msgstr ""
-
-#: src/emu/inpttype.ipp:194
-msgctxt "input-name"
-msgid "P2 Mahjong Reach"
-msgstr ""
-
-#: src/emu/inpttype.ipp:195
-msgctxt "input-name"
-msgid "P2 Mahjong Ron"
-msgstr ""
-
-#: src/emu/inpttype.ipp:196
-msgctxt "input-name"
-msgid "P2 Mahjong Bet"
-msgstr ""
-
-#: src/emu/inpttype.ipp:197
-msgctxt "input-name"
-msgid "P2 Mahjong Last Chance"
-msgstr ""
-
-#: src/emu/inpttype.ipp:198
-msgctxt "input-name"
-msgid "P2 Mahjong Take Score"
-msgstr ""
-
-#: src/emu/inpttype.ipp:199
-msgctxt "input-name"
-msgid "P2 Mahjong Double Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:200
-msgctxt "input-name"
-msgid "P2 Mahjong Flip Flop"
-msgstr ""
-
-#: src/emu/inpttype.ipp:201
-msgctxt "input-name"
-msgid "P2 Mahjong Big"
-msgstr ""
-
-#: src/emu/inpttype.ipp:202
-msgctxt "input-name"
-msgid "P2 Mahjong Small"
-msgstr ""
-
-#: src/emu/inpttype.ipp:207
-msgctxt "input-name"
-msgid "P2 Hanafuda A/1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:208
-msgctxt "input-name"
-msgid "P2 Hanafuda B/2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:209
-msgctxt "input-name"
-msgid "P2 Hanafuda C/3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:210
-msgctxt "input-name"
-msgid "P2 Hanafuda D/4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:211
-msgctxt "input-name"
-msgid "P2 Hanafuda E/5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:212
-msgctxt "input-name"
-msgid "P2 Hanafuda F/6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:213
-msgctxt "input-name"
-msgid "P2 Hanafuda G/7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:214
-msgctxt "input-name"
-msgid "P2 Hanafuda H/8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:215
-msgctxt "input-name"
-msgid "P2 Hanafuda Yes"
-msgstr ""
-
-#: src/emu/inpttype.ipp:216
-msgctxt "input-name"
-msgid "P2 Hanafuda No"
-msgstr ""
-
-#: src/emu/inpttype.ipp:221
-msgctxt "input-name"
-msgid "P3 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:222
-msgctxt "input-name"
-msgid "P3 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:223
-msgctxt "input-name"
-msgid "P3 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:224
-msgctxt "input-name"
-msgid "P3 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:225
-msgctxt "input-name"
-msgid "P3 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:226
-msgctxt "input-name"
-msgid "P3 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:227
-msgctxt "input-name"
-msgid "P3 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:228
-msgctxt "input-name"
-msgid "P3 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:229
-msgctxt "input-name"
-msgid "P3 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:230
-msgctxt "input-name"
-msgid "P3 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:231
-msgctxt "input-name"
-msgid "P3 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:232
-msgctxt "input-name"
-msgid "P3 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:233
-msgctxt "input-name"
-msgid "P3 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:234
-msgctxt "input-name"
-msgid "P3 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:235
-msgctxt "input-name"
-msgid "P3 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:236
-msgctxt "input-name"
-msgid "P3 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:237
-msgctxt "input-name"
-msgid "P3 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:238
-msgctxt "input-name"
-msgid "P3 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:239
-msgctxt "input-name"
-msgid "P3 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:240
-msgctxt "input-name"
-msgid "P3 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:241
-msgctxt "input-name"
-msgid "P3 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:242
-msgctxt "input-name"
-msgid "P3 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:243
-msgctxt "input-name"
-msgid "P3 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:244
-msgctxt "input-name"
-msgid "P3 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:245
-msgctxt "input-name"
-msgid "P3 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:246
-msgctxt "input-name"
-msgid "P3 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:247
-msgctxt "input-name"
-msgid "P3 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:248
-msgctxt "input-name"
-msgid "P3 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:249
-msgctxt "input-name"
-msgid "P3 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:250
-msgctxt "input-name"
-msgid "P3 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:255
-msgctxt "input-name"
-msgid "P4 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:256
-msgctxt "input-name"
-msgid "P4 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:257
-msgctxt "input-name"
-msgid "P4 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:258
-msgctxt "input-name"
-msgid "P4 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:259
-msgctxt "input-name"
-msgid "P4 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:260
-msgctxt "input-name"
-msgid "P4 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:261
-msgctxt "input-name"
-msgid "P4 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:262
-msgctxt "input-name"
-msgid "P4 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:263
-msgctxt "input-name"
-msgid "P4 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:264
-msgctxt "input-name"
-msgid "P4 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:265
-msgctxt "input-name"
-msgid "P4 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:266
-msgctxt "input-name"
-msgid "P4 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:267
-msgctxt "input-name"
-msgid "P4 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:268
-msgctxt "input-name"
-msgid "P4 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:269
-msgctxt "input-name"
-msgid "P4 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:270
-msgctxt "input-name"
-msgid "P4 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:271
-msgctxt "input-name"
-msgid "P4 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:272
-msgctxt "input-name"
-msgid "P4 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:273
-msgctxt "input-name"
-msgid "P4 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:274
-msgctxt "input-name"
-msgid "P4 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:275
-msgctxt "input-name"
-msgid "P4 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:276
-msgctxt "input-name"
-msgid "P4 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:277
-msgctxt "input-name"
-msgid "P4 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:278
-msgctxt "input-name"
-msgid "P4 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:279
-msgctxt "input-name"
-msgid "P4 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:280
-msgctxt "input-name"
-msgid "P4 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:281
-msgctxt "input-name"
-msgid "P4 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:282
-msgctxt "input-name"
-msgid "P4 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:283
-msgctxt "input-name"
-msgid "P4 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:284
-msgctxt "input-name"
-msgid "P4 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:289
-msgctxt "input-name"
-msgid "P5 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:290
-msgctxt "input-name"
-msgid "P5 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:291
-msgctxt "input-name"
-msgid "P5 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:292
-msgctxt "input-name"
-msgid "P5 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:293
-msgctxt "input-name"
-msgid "P5 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:294
-msgctxt "input-name"
-msgid "P5 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:295
-msgctxt "input-name"
-msgid "P5 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:296
-msgctxt "input-name"
-msgid "P5 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:297
-msgctxt "input-name"
-msgid "P5 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:298
-msgctxt "input-name"
-msgid "P5 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:299
-msgctxt "input-name"
-msgid "P5 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:300
-msgctxt "input-name"
-msgid "P5 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:301
-msgctxt "input-name"
-msgid "P5 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:302
-msgctxt "input-name"
-msgid "P5 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:303
-msgctxt "input-name"
-msgid "P5 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:304
-msgctxt "input-name"
-msgid "P5 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:305
-msgctxt "input-name"
-msgid "P5 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:306
-msgctxt "input-name"
-msgid "P5 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:307
-msgctxt "input-name"
-msgid "P5 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:308
-msgctxt "input-name"
-msgid "P5 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:309
-msgctxt "input-name"
-msgid "P5 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:310
-msgctxt "input-name"
-msgid "P5 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:311
-msgctxt "input-name"
-msgid "P5 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:312
-msgctxt "input-name"
-msgid "P5 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:313
-msgctxt "input-name"
-msgid "P5 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:314
-msgctxt "input-name"
-msgid "P5 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:315
-msgctxt "input-name"
-msgid "P5 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:316
-msgctxt "input-name"
-msgid "P5 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:317
-msgctxt "input-name"
-msgid "P5 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:318
-msgctxt "input-name"
-msgid "P5 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:323
-msgctxt "input-name"
-msgid "P6 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:324
-msgctxt "input-name"
-msgid "P6 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:325
-msgctxt "input-name"
-msgid "P6 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:326
-msgctxt "input-name"
-msgid "P6 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:327
-msgctxt "input-name"
-msgid "P6 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:328
-msgctxt "input-name"
-msgid "P6 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:329
-msgctxt "input-name"
-msgid "P6 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:330
-msgctxt "input-name"
-msgid "P6 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:331
-msgctxt "input-name"
-msgid "P6 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:332
-msgctxt "input-name"
-msgid "P6 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:333
-msgctxt "input-name"
-msgid "P6 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:334
-msgctxt "input-name"
-msgid "P6 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:335
-msgctxt "input-name"
-msgid "P6 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:336
-msgctxt "input-name"
-msgid "P6 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:337
-msgctxt "input-name"
-msgid "P6 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:338
-msgctxt "input-name"
-msgid "P6 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:339
-msgctxt "input-name"
-msgid "P6 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:340
-msgctxt "input-name"
-msgid "P6 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:341
-msgctxt "input-name"
-msgid "P6 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:342
-msgctxt "input-name"
-msgid "P6 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:343
-msgctxt "input-name"
-msgid "P6 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:344
-msgctxt "input-name"
-msgid "P6 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:345
-msgctxt "input-name"
-msgid "P6 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:346
-msgctxt "input-name"
-msgid "P6 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:347
-msgctxt "input-name"
-msgid "P6 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:348
-msgctxt "input-name"
-msgid "P6 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:349
-msgctxt "input-name"
-msgid "P6 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:350
-msgctxt "input-name"
-msgid "P6 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:351
-msgctxt "input-name"
-msgid "P6 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:352
-msgctxt "input-name"
-msgid "P6 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:357
-msgctxt "input-name"
-msgid "P7 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:358
-msgctxt "input-name"
-msgid "P7 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:359
-msgctxt "input-name"
-msgid "P7 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:360
-msgctxt "input-name"
-msgid "P7 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:361
-msgctxt "input-name"
-msgid "P7 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:362
-msgctxt "input-name"
-msgid "P7 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:363
-msgctxt "input-name"
-msgid "P7 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:364
-msgctxt "input-name"
-msgid "P7 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:365
-msgctxt "input-name"
-msgid "P7 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:366
-msgctxt "input-name"
-msgid "P7 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:367
-msgctxt "input-name"
-msgid "P7 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:368
-msgctxt "input-name"
-msgid "P7 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:369
-msgctxt "input-name"
-msgid "P7 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:370
-msgctxt "input-name"
-msgid "P7 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:371
-msgctxt "input-name"
-msgid "P7 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:372
-msgctxt "input-name"
-msgid "P7 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:373
-msgctxt "input-name"
-msgid "P7 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:374
-msgctxt "input-name"
-msgid "P7 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:375
-msgctxt "input-name"
-msgid "P7 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:376
-msgctxt "input-name"
-msgid "P7 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:377
-msgctxt "input-name"
-msgid "P7 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:378
-msgctxt "input-name"
-msgid "P7 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:379
-msgctxt "input-name"
-msgid "P7 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:380
-msgctxt "input-name"
-msgid "P7 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:381
-msgctxt "input-name"
-msgid "P7 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:382
-msgctxt "input-name"
-msgid "P7 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:383
-msgctxt "input-name"
-msgid "P7 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:384
-msgctxt "input-name"
-msgid "P7 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:385
-msgctxt "input-name"
-msgid "P7 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:386
-msgctxt "input-name"
-msgid "P7 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:391
-msgctxt "input-name"
-msgid "P8 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:392
-msgctxt "input-name"
-msgid "P8 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:393
-msgctxt "input-name"
-msgid "P8 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:394
-msgctxt "input-name"
-msgid "P8 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:395
-msgctxt "input-name"
-msgid "P8 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:396
-msgctxt "input-name"
-msgid "P8 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:397
-msgctxt "input-name"
-msgid "P8 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:398
-msgctxt "input-name"
-msgid "P8 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:399
-msgctxt "input-name"
-msgid "P8 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:400
-msgctxt "input-name"
-msgid "P8 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:401
-msgctxt "input-name"
-msgid "P8 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:402
-msgctxt "input-name"
-msgid "P8 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:403
-msgctxt "input-name"
-msgid "P8 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:404
-msgctxt "input-name"
-msgid "P8 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:405
-msgctxt "input-name"
-msgid "P8 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:406
-msgctxt "input-name"
-msgid "P8 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:407
-msgctxt "input-name"
-msgid "P8 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:408
-msgctxt "input-name"
-msgid "P8 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:409
-msgctxt "input-name"
-msgid "P8 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:410
-msgctxt "input-name"
-msgid "P8 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:411
-msgctxt "input-name"
-msgid "P8 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:412
-msgctxt "input-name"
-msgid "P8 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:413
-msgctxt "input-name"
-msgid "P8 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:414
-msgctxt "input-name"
-msgid "P8 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:415
-msgctxt "input-name"
-msgid "P8 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:416
-msgctxt "input-name"
-msgid "P8 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:417
-msgctxt "input-name"
-msgid "P8 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:418
-msgctxt "input-name"
-msgid "P8 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:419
-msgctxt "input-name"
-msgid "P8 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:420
-msgctxt "input-name"
-msgid "P8 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:425
-msgctxt "input-name"
-msgid "P9 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:426
-msgctxt "input-name"
-msgid "P9 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:427
-msgctxt "input-name"
-msgid "P9 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:428
-msgctxt "input-name"
-msgid "P9 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:429
-msgctxt "input-name"
-msgid "P9 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:430
-msgctxt "input-name"
-msgid "P9 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:431
-msgctxt "input-name"
-msgid "P9 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:432
-msgctxt "input-name"
-msgid "P9 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:433
-msgctxt "input-name"
-msgid "P9 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:434
-msgctxt "input-name"
-msgid "P9 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:435
-msgctxt "input-name"
-msgid "P9 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:436
-msgctxt "input-name"
-msgid "P9 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:437
-msgctxt "input-name"
-msgid "P9 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:438
-msgctxt "input-name"
-msgid "P9 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:439
-msgctxt "input-name"
-msgid "P9 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:440
-msgctxt "input-name"
-msgid "P9 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:441
-msgctxt "input-name"
-msgid "P9 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:442
-msgctxt "input-name"
-msgid "P9 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:443
-msgctxt "input-name"
-msgid "P9 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:444
-msgctxt "input-name"
-msgid "P9 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:445
-msgctxt "input-name"
-msgid "P9 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:446
-msgctxt "input-name"
-msgid "P9 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:447
-msgctxt "input-name"
-msgid "P9 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:448
-msgctxt "input-name"
-msgid "P9 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:449
-msgctxt "input-name"
-msgid "P9 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:450
-msgctxt "input-name"
-msgid "P9 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:451
-msgctxt "input-name"
-msgid "P9 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:452
-msgctxt "input-name"
-msgid "P9 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:453
-msgctxt "input-name"
-msgid "P9 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:454
-msgctxt "input-name"
-msgid "P9 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:459
-msgctxt "input-name"
-msgid "P10 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:460
-msgctxt "input-name"
-msgid "P10 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:461
-msgctxt "input-name"
-msgid "P10 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:462
-msgctxt "input-name"
-msgid "P10 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:463
-msgctxt "input-name"
-msgid "P10 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:464
-msgctxt "input-name"
-msgid "P10 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:465
-msgctxt "input-name"
-msgid "P10 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:466
-msgctxt "input-name"
-msgid "P10 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:467
-msgctxt "input-name"
-msgid "P10 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:468
-msgctxt "input-name"
-msgid "P10 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:469
-msgctxt "input-name"
-msgid "P10 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:470
-msgctxt "input-name"
-msgid "P10 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:471
-msgctxt "input-name"
-msgid "P10 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:472
-msgctxt "input-name"
-msgid "P10 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:473
-msgctxt "input-name"
-msgid "P10 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:474
-msgctxt "input-name"
-msgid "P10 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:475
-msgctxt "input-name"
-msgid "P10 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:476
-msgctxt "input-name"
-msgid "P10 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:477
-msgctxt "input-name"
-msgid "P10 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:478
-msgctxt "input-name"
-msgid "P10 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:479
-msgctxt "input-name"
-msgid "P10 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:480
-msgctxt "input-name"
-msgid "P10 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:481
-msgctxt "input-name"
-msgid "P10 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:482
-msgctxt "input-name"
-msgid "P10 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:483
-msgctxt "input-name"
-msgid "P10 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:484
-msgctxt "input-name"
-msgid "P10 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:485
-msgctxt "input-name"
-msgid "P10 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:486
-msgctxt "input-name"
-msgid "P10 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:487
-msgctxt "input-name"
-msgid "P10 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:488
-msgctxt "input-name"
-msgid "P10 Select"
-msgstr ""
-
 #: src/emu/inpttype.ipp:493
 msgctxt "input-name"
 msgid "1 Player Start"
@@ -5548,154 +4175,31 @@ msgctxt "input-name"
 msgid "Volume Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:550
-msgctxt "input-name"
-msgid "P1 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:551
-msgctxt "input-name"
-msgid "P2 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:552
-msgctxt "input-name"
-msgid "P3 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:553
-msgctxt "input-name"
-msgid "P4 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:554
-msgctxt "input-name"
-msgid "P5 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:555
-msgctxt "input-name"
-msgid "P6 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:556
-msgctxt "input-name"
-msgid "P7 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:557
-msgctxt "input-name"
-msgid "P8 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:558
-msgctxt "input-name"
-msgid "P9 Pedal 1"
-msgstr ""
-
+#: src/emu/inpttype.ipp:550 src/emu/inpttype.ipp:551 src/emu/inpttype.ipp:552
+#: src/emu/inpttype.ipp:553 src/emu/inpttype.ipp:554 src/emu/inpttype.ipp:555
+#: src/emu/inpttype.ipp:556 src/emu/inpttype.ipp:557 src/emu/inpttype.ipp:558
 #: src/emu/inpttype.ipp:559
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:564
-msgctxt "input-name"
-msgid "P1 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:565
-msgctxt "input-name"
-msgid "P2 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:566
-msgctxt "input-name"
-msgid "P3 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:567
-msgctxt "input-name"
-msgid "P4 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:568
-msgctxt "input-name"
-msgid "P5 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:569
-msgctxt "input-name"
-msgid "P6 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:570
-msgctxt "input-name"
-msgid "P7 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:571
-msgctxt "input-name"
-msgid "P8 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:572
-msgctxt "input-name"
-msgid "P9 Pedal 2"
+msgid "%p Pedal 1"
 msgstr ""
 
+#: src/emu/inpttype.ipp:564 src/emu/inpttype.ipp:565 src/emu/inpttype.ipp:566
+#: src/emu/inpttype.ipp:567 src/emu/inpttype.ipp:568 src/emu/inpttype.ipp:569
+#: src/emu/inpttype.ipp:570 src/emu/inpttype.ipp:571 src/emu/inpttype.ipp:572
 #: src/emu/inpttype.ipp:573
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:578
-msgctxt "input-name"
-msgid "P1 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:579
-msgctxt "input-name"
-msgid "P2 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:580
-msgctxt "input-name"
-msgid "P3 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:581
-msgctxt "input-name"
-msgid "P4 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:582
-msgctxt "input-name"
-msgid "P5 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:583
-msgctxt "input-name"
-msgid "P6 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:584
-msgctxt "input-name"
-msgid "P7 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:585
-msgctxt "input-name"
-msgid "P8 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:586
-msgctxt "input-name"
-msgid "P9 Pedal 3"
+msgid "%p Pedal 2"
 msgstr ""
 
+#: src/emu/inpttype.ipp:578 src/emu/inpttype.ipp:579 src/emu/inpttype.ipp:580
+#: src/emu/inpttype.ipp:581 src/emu/inpttype.ipp:582 src/emu/inpttype.ipp:583
+#: src/emu/inpttype.ipp:584 src/emu/inpttype.ipp:585 src/emu/inpttype.ipp:586
 #: src/emu/inpttype.ipp:587
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 3"
+msgid "%p Pedal 3"
 msgstr ""
 
 #: src/emu/inpttype.ipp:592
@@ -7587,6 +6091,28 @@ msgid ""
 "%s"
 msgstr ""
 
+#~ msgid "Confirm quit from machines"
+#~ msgstr "Confirmation quitter depuis les machines"
+
+#~ msgid "Skip information screen at startup"
+#~ msgstr "Passe écran information au démarrage"
+
+#, c-format
+#~ msgid ""
+#~ "Auditing ROMs for machine %2$u of %3$u...\n"
+#~ "%1$s"
+#~ msgstr ""
+#~ "Auditing ROMs pour machine %2$u de %3$u...\n"
+#~ "%1$s"
+
+#, c-format
+#~ msgid "Audit ROMs for %1$u machines marked unavailable"
+#~ msgstr "Audit ROMs pour %1$u machines marqué non disponible"
+
+#, c-format
+#~ msgid "Audit ROMs for all %1$u machines"
+#~ msgstr "Audit ROMs pour toutes les machines %1$u"
+
 #, c-format
 #~ msgid "%s.xml saved under ui folder."
 #~ msgstr "%s.xml sauvegardé dans le dossier ui."
diff --git a/language/French_Belgium/strings.po b/language/French_Belgium/strings.po
index 1456113dea3..18ab6beaccc 100644
--- a/language/French_Belgium/strings.po
+++ b/language/French_Belgium/strings.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-19 02:50+1100\n"
+"POT-Creation-Date: 2021-12-09 04:44+1100\n"
 "PO-Revision-Date: 2016-05-24 23:42+0200\n"
 "Last-Translator: Mevi <mevi.mame@gmail.com>\n"
 "Language-Team: MAME Language Team\n"
@@ -272,12 +272,12 @@ msgstr "%1$s %2$s ( %3$d / %4$d packages logiciels )"
 msgid "Driver: \"%1$s\" software list "
 msgstr "Liste de logiciels pour le driver : \"%1$s\" "
 
-#: src/frontend/mame/ui/selsoft.cpp:711 src/frontend/mame/ui/selgame.cpp:1066
+#: src/frontend/mame/ui/selsoft.cpp:711 src/frontend/mame/ui/selgame.cpp:1076
 #, c-format
 msgid "%1$s: %2$s - Search: %3$s_"
 msgstr "%1$s : %2$s - Recherche : %3$s_"
 
-#: src/frontend/mame/ui/selsoft.cpp:713 src/frontend/mame/ui/selgame.cpp:1068
+#: src/frontend/mame/ui/selsoft.cpp:713 src/frontend/mame/ui/selgame.cpp:1078
 #, c-format
 msgid "Search: %1$s_"
 msgstr "Recherche : %1$s_"
@@ -287,7 +287,7 @@ msgstr "Recherche : %1$s_"
 msgid "Software list/item: %1$s:%2$s"
 msgstr ""
 
-#: src/frontend/mame/ui/optsmenu.cpp:73 src/frontend/mame/ui/sndmenu.cpp:165
+#: src/frontend/mame/ui/optsmenu.cpp:73 src/frontend/mame/ui/sndmenu.cpp:161
 msgid "Sound Options"
 msgstr "Options du son"
 
@@ -382,11 +382,11 @@ msgid "Show mouse pointer"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:39
-msgid "Confirm quit from machines"
+msgid "Confirm quit from emulation"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:40
-msgid "Skip information screen at startup"
+msgid "Skip system information screen"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:41
@@ -402,7 +402,7 @@ msgid "Skip BIOS selection menu"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:44
-msgid "Skip software parts selection menu"
+msgid "Skip software part selection menu"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:45
@@ -554,7 +554,7 @@ msgid "UI active"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:91
-msgid "Offscreen reload"
+msgid "Off-screen reload"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:92
@@ -570,7 +570,7 @@ msgid "Natural keyboard"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:95
-msgid "Simultaneous contradictory"
+msgid "Allow contradictory joystick inputs"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:96
@@ -594,7 +594,7 @@ msgid "Pedal Device Assignment"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:106
-msgid "Adstick Device Assignment"
+msgid "AD Stick Device Assignment"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:107
@@ -681,14 +681,14 @@ msgstr ""
 msgid "Wait Vertical Sync"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:687
+#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:689
 #: src/frontend/mame/ui/videoopt.cpp:191 src/frontend/mame/ui/custui.cpp:490
 #: src/frontend/mame/ui/analogipt.cpp:471 plugins/cheatfind/init.lua:766
 #: plugins/cheatfind/init.lua:777 plugins/cheat/init.lua:668
 msgid "On"
 msgstr "Actif"
 
-#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:690
+#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:692
 #: src/frontend/mame/ui/videoopt.cpp:207 src/frontend/mame/ui/custui.cpp:490
 #: src/frontend/mame/ui/analogipt.cpp:471 plugins/cheatfind/init.lua:763
 #: plugins/cheatfind/init.lua:774 plugins/cheat/init.lua:671
@@ -696,11 +696,11 @@ msgstr "Actif"
 msgid "Off"
 msgstr "Inactif"
 
-#: src/frontend/mame/ui/menu.cpp:693
+#: src/frontend/mame/ui/menu.cpp:695
 msgid "Auto"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:1195
+#: src/frontend/mame/ui/menu.cpp:1197
 #: src/frontend/mame/ui/simpleselgame.cpp:278
 #: src/frontend/mame/ui/selmenu.cpp:1280
 msgid "Return to Previous Menu"
@@ -708,7 +708,7 @@ msgstr "Retour au menu précédent"
 
 #: src/frontend/mame/ui/filemngr.cpp:139
 #: src/frontend/mame/ui/confswitch.cpp:119
-#: src/frontend/mame/ui/inputmap.cpp:559 src/frontend/mame/ui/analogipt.cpp:360
+#: src/frontend/mame/ui/inputmap.cpp:563 src/frontend/mame/ui/analogipt.cpp:360
 #, c-format
 msgid "[root%1$s]"
 msgstr ""
@@ -975,22 +975,22 @@ msgstr ""
 "Processeur(s) :\n"
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "GHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "MHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "kHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "Hz"
 msgstr ""
 
@@ -1018,38 +1018,38 @@ msgstr "Aucun\n"
 msgid "Vector"
 msgstr "Graphismes vectoriels"
 
-#: src/frontend/mame/ui/info.cpp:480
+#: src/frontend/mame/ui/info.cpp:483
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr "%1$s : %2$s\n"
 
-#: src/frontend/mame/ui/info.cpp:480
+#: src/frontend/mame/ui/info.cpp:483
 msgid "%2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:497
+#: src/frontend/mame/ui/info.cpp:500
 #, c-format
 msgid "Screen '%1$s'"
 msgstr "Écran '%1$s'"
 
-#: src/frontend/mame/ui/info.cpp:499
+#: src/frontend/mame/ui/info.cpp:502
 msgid "Screen"
 msgstr "Écran"
 
-#: src/frontend/mame/ui/info.cpp:570 src/frontend/mame/ui/info.cpp:581
+#: src/frontend/mame/ui/info.cpp:573 src/frontend/mame/ui/info.cpp:584
 #, c-format
 msgid "%1$s:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:662
+#: src/frontend/mame/ui/info.cpp:665
 msgid "Not supported"
 msgstr "Non supporté"
 
-#: src/frontend/mame/ui/info.cpp:665
+#: src/frontend/mame/ui/info.cpp:668
 msgid "Partially supported"
 msgstr "Partiellement supporté"
 
-#: src/frontend/mame/ui/info.cpp:674
+#: src/frontend/mame/ui/info.cpp:677
 msgid "[empty]"
 msgstr "[vide]"
 
@@ -1126,7 +1126,7 @@ msgid "Emulated"
 msgstr "Émulé"
 
 #: src/frontend/mame/ui/keyboard.cpp:59 src/frontend/mame/ui/confswitch.cpp:117
-#: src/frontend/mame/ui/inputmap.cpp:557 src/frontend/mame/ui/analogipt.cpp:358
+#: src/frontend/mame/ui/inputmap.cpp:561 src/frontend/mame/ui/analogipt.cpp:358
 #, c-format
 msgid "%1$s [root%2$s]"
 msgstr ""
@@ -1486,7 +1486,7 @@ msgctxt "swlist-info"
 msgid "Software list/item"
 msgstr ""
 
-#: src/frontend/mame/ui/datmenu.cpp:88 src/frontend/mame/ui/selmenu.cpp:2698
+#: src/frontend/mame/ui/datmenu.cpp:88 src/frontend/mame/ui/selmenu.cpp:2707
 msgid "Software List Info"
 msgstr ""
 
@@ -1609,7 +1609,7 @@ msgstr ""
 msgid "Configure Machine:"
 msgstr ""
 
-#: src/frontend/mame/ui/miscmenu.cpp:858 src/frontend/mame/ui/selmenu.cpp:2638
+#: src/frontend/mame/ui/miscmenu.cpp:858 src/frontend/mame/ui/selmenu.cpp:2647
 msgid " (default)"
 msgstr " (par défaut)"
 
@@ -1630,7 +1630,7 @@ msgstr ""
 "Appuyez sur %1$s pour quitter\n"
 "Appuyez sur %2$s pour retourner à l'émulation"
 
-#: src/frontend/mame/ui/info_pty.cpp:30 src/frontend/mame/ui/mainmenu.cpp:155
+#: src/frontend/mame/ui/info_pty.cpp:30
 msgid "Pseudo terminals"
 msgstr ""
 
@@ -1698,52 +1698,52 @@ msgstr ""
 msgid "Other Controls"
 msgstr "Autres contrôles"
 
-#: src/frontend/mame/ui/inputmap.cpp:227
+#: src/frontend/mame/ui/inputmap.cpp:231
 msgid "This machine has no configurable inputs."
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:327
+#: src/frontend/mame/ui/inputmap.cpp:331
 msgid "Pressed"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:397
+#: src/frontend/mame/ui/inputmap.cpp:401
 msgid "Invalid sequence entered"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:542
+#: src/frontend/mame/ui/inputmap.cpp:546
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:543
+#: src/frontend/mame/ui/inputmap.cpp:547
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog Inc"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:544
+#: src/frontend/mame/ui/inputmap.cpp:548
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog Dec"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:586
+#: src/frontend/mame/ui/inputmap.cpp:590
 #, c-format
 msgid "Press %1$s to set\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:587
+#: src/frontend/mame/ui/inputmap.cpp:591
 #, c-format
 msgid "Press %1$s to append\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:588
+#: src/frontend/mame/ui/inputmap.cpp:592
 #, c-format
 msgid "Press %1$s to clear\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:589
+#: src/frontend/mame/ui/inputmap.cpp:593
 #, c-format
 msgid "Press %1$s to restore default\n"
 msgstr ""
@@ -1807,7 +1807,7 @@ msgid ""
 msgstr ""
 
 #: src/frontend/mame/ui/simpleselgame.cpp:273
-#: src/frontend/mame/ui/selgame.cpp:436
+#: src/frontend/mame/ui/selgame.cpp:443
 msgid "Configure Options"
 msgstr "Configurer les options"
 
@@ -2143,16 +2143,16 @@ msgstr ""
 msgid "Expand to fit"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:437
+#: src/frontend/mame/ui/selgame.cpp:444
 msgid "Configure Machine"
 msgstr "Configurer la machine"
 
-#: src/frontend/mame/ui/selgame.cpp:1050
+#: src/frontend/mame/ui/selgame.cpp:1060
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d machines (%5$d BIOS) )"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:1078
+#: src/frontend/mame/ui/selgame.cpp:1088
 #, c-format
 msgid "System: %1$-.100s"
 msgstr "Système : %1$-.100s"
@@ -2174,7 +2174,7 @@ msgstr ""
 #: src/frontend/mame/ui/auditmenu.cpp:98
 #, c-format
 msgid ""
-"Auditing ROMs for machine %2$u of %3$u...\n"
+"Auditing media for machine %2$u of %3$u...\n"
 "%1$s"
 msgstr ""
 
@@ -2189,12 +2189,12 @@ msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:136
 #, c-format
-msgid "Audit ROMs for %1$u machines marked unavailable"
+msgid "Audit media for %1$u machines marked unavailable"
 msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:137
 #, c-format
-msgid "Audit ROMs for all %1$u machines"
+msgid "Audit media for all %1$u machines"
 msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:154
@@ -2401,84 +2401,84 @@ msgctxt "color-sample"
 msgid "Clone"
 msgstr "Clone"
 
-#: src/frontend/mame/ui/custui.cpp:914
+#: src/frontend/mame/ui/custui.cpp:906
 msgid "ARGB Settings"
 msgstr "Paramètres ARVB"
 
-#: src/frontend/mame/ui/custui.cpp:919 src/frontend/mame/ui/custui.cpp:922
+#: src/frontend/mame/ui/custui.cpp:911 src/frontend/mame/ui/custui.cpp:914
 msgctxt "color-channel"
 msgid "Alpha"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:927 src/frontend/mame/ui/custui.cpp:930
+#: src/frontend/mame/ui/custui.cpp:919 src/frontend/mame/ui/custui.cpp:922
 msgctxt "color-channel"
 msgid "Red"
 msgstr "Rouge"
 
-#: src/frontend/mame/ui/custui.cpp:935 src/frontend/mame/ui/custui.cpp:938
+#: src/frontend/mame/ui/custui.cpp:927 src/frontend/mame/ui/custui.cpp:930
 msgctxt "color-channel"
 msgid "Green"
 msgstr "Vert"
 
-#: src/frontend/mame/ui/custui.cpp:943 src/frontend/mame/ui/custui.cpp:946
+#: src/frontend/mame/ui/custui.cpp:935 src/frontend/mame/ui/custui.cpp:938
 msgctxt "color-channel"
 msgid "Blue"
 msgstr "Bleu"
 
-#: src/frontend/mame/ui/custui.cpp:949
+#: src/frontend/mame/ui/custui.cpp:941
 msgid "Choose from palette"
 msgstr "Choisir parmi la palette"
 
-#: src/frontend/mame/ui/custui.cpp:996
+#: src/frontend/mame/ui/custui.cpp:988
 msgid "Color preview:"
 msgstr "Aperçu de la couleur :"
 
-#: src/frontend/mame/ui/custui.cpp:1093
+#: src/frontend/mame/ui/custui.cpp:1085
 msgctxt "color-preset"
 msgid "White"
 msgstr "Blanc"
 
-#: src/frontend/mame/ui/custui.cpp:1094
+#: src/frontend/mame/ui/custui.cpp:1086
 msgctxt "color-preset"
 msgid "Silver"
 msgstr "Argent"
 
-#: src/frontend/mame/ui/custui.cpp:1095
+#: src/frontend/mame/ui/custui.cpp:1087
 msgctxt "color-preset"
 msgid "Gray"
 msgstr "Gris"
 
-#: src/frontend/mame/ui/custui.cpp:1096
+#: src/frontend/mame/ui/custui.cpp:1088
 msgctxt "color-preset"
 msgid "Black"
 msgstr "Noir"
 
-#: src/frontend/mame/ui/custui.cpp:1097
+#: src/frontend/mame/ui/custui.cpp:1089
 msgctxt "color-preset"
 msgid "Red"
 msgstr "Rouge"
 
-#: src/frontend/mame/ui/custui.cpp:1098
+#: src/frontend/mame/ui/custui.cpp:1090
 msgctxt "color-preset"
 msgid "Orange"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1099
+#: src/frontend/mame/ui/custui.cpp:1091
 msgctxt "color-preset"
 msgid "Yellow"
 msgstr "Jaune"
 
-#: src/frontend/mame/ui/custui.cpp:1100
+#: src/frontend/mame/ui/custui.cpp:1092
 msgctxt "color-preset"
 msgid "Green"
 msgstr "Vert"
 
-#: src/frontend/mame/ui/custui.cpp:1101
+#: src/frontend/mame/ui/custui.cpp:1093
 msgctxt "color-preset"
 msgid "Blue"
 msgstr "Bleu"
 
-#: src/frontend/mame/ui/custui.cpp:1102
+#: src/frontend/mame/ui/custui.cpp:1094
 msgctxt "color-preset"
 msgid "Violet"
 msgstr ""
@@ -2543,7 +2543,7 @@ msgid "Input (general)"
 msgstr "Périphériques d'entrée (généraux)"
 
 #: src/frontend/mame/ui/mainmenu.cpp:123
-msgid "Input (this Machine)"
+msgid "Input (this machine)"
 msgstr "Périphériques d'entrée (cette machine)"
 
 #: src/frontend/mame/ui/mainmenu.cpp:126
@@ -2582,6 +2582,10 @@ msgstr "Gestionnaire de fichiers"
 msgid "Tape Control"
 msgstr "Contrôle de la cassette"
 
+#: src/frontend/mame/ui/mainmenu.cpp:155
+msgid "Pseudo Terminals"
+msgstr ""
+
 #: src/frontend/mame/ui/mainmenu.cpp:158
 msgid "BIOS Selection"
 msgstr "Sélection du BIOS"
@@ -2620,7 +2624,7 @@ msgstr "Visualiser un DAT externe"
 
 #: src/frontend/mame/ui/mainmenu.cpp:200
 #, c-format
-msgid "About %s"
+msgid "About %1$s"
 msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:212
@@ -2780,373 +2784,373 @@ msgstr "Ce driver est un clone de : %1$s"
 msgid "%1$s %2$s"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2235
+#: src/frontend/mame/ui/selmenu.cpp:2244
 msgid "Images"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2236
+#: src/frontend/mame/ui/selmenu.cpp:2245
 msgid "Infos"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2551
+#: src/frontend/mame/ui/selmenu.cpp:2560
 msgid ""
 "Required ROM/disk images for the selected system are missing or incorrect. "
 "Please acquire the correct files or select a different system.\n"
 "\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2567
+#: src/frontend/mame/ui/selmenu.cpp:2576
 msgid ""
 "Required ROM/disk images for the selected software are missing or incorrect. "
 "Please acquire the correct files or select a different software item.\n"
 "\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2583
+#: src/frontend/mame/ui/selmenu.cpp:2592
 msgid "incorrect checksum"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2586
+#: src/frontend/mame/ui/selmenu.cpp:2595
 msgid "incorrect length"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2589
+#: src/frontend/mame/ui/selmenu.cpp:2598
 msgid "not found"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2600
+#: src/frontend/mame/ui/selmenu.cpp:2609
 #, c-format
 msgid "%1$s (%2$s) - %3$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2602
+#: src/frontend/mame/ui/selmenu.cpp:2611
 #, c-format
 msgid "%1$s - %2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2606
+#: src/frontend/mame/ui/selmenu.cpp:2615
 msgid "Press any key to continue."
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2735
+#: src/frontend/mame/ui/selmenu.cpp:2744
 msgid "General Info"
 msgstr "Informations générales"
 
-#: src/frontend/mame/ui/selmenu.cpp:2887
+#: src/frontend/mame/ui/selmenu.cpp:2896
 #, c-format
 msgid "Romset\t%1$s\n"
 msgstr "Romset\t%1$s\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2888
+#: src/frontend/mame/ui/selmenu.cpp:2897
 #, c-format
 msgid "Year\t%1$s\n"
 msgstr "Année\t%1$s\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2889
+#: src/frontend/mame/ui/selmenu.cpp:2898
 #, c-format
 msgid "Manufacturer\t%1$s\n"
 msgstr "Constructeur\t%1$s\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2896
+#: src/frontend/mame/ui/selmenu.cpp:2905
 #, c-format
 msgid "Driver is Clone of\t%1$s\n"
 msgstr "Ce driver est un clone de\t%1$s\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2901
+#: src/frontend/mame/ui/selmenu.cpp:2910
 msgid "Driver is Parent\t\n"
 msgstr "Ce driver est le parent\t\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2905
+#: src/frontend/mame/ui/selmenu.cpp:2914
 msgid "Analog Controls\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2907
+#: src/frontend/mame/ui/selmenu.cpp:2916
 msgid "Keyboard Inputs\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2910
+#: src/frontend/mame/ui/selmenu.cpp:2919
 msgid "Overall\tNOT WORKING\n"
 msgstr "En résumé\tNE FONCTIONNE PAS\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2912
+#: src/frontend/mame/ui/selmenu.cpp:2921
 msgid "Overall\tUnemulated Protection\n"
 msgstr "En résumé\tProtection non émulée\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2914
+#: src/frontend/mame/ui/selmenu.cpp:2923
 msgid "Overall\tWorking\n"
 msgstr "En résumé\tFonctionne correctement\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2917
+#: src/frontend/mame/ui/selmenu.cpp:2926
 msgid "Graphics\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2919
+#: src/frontend/mame/ui/selmenu.cpp:2928
 msgid "Graphics\tWrong Colors\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2921
+#: src/frontend/mame/ui/selmenu.cpp:2930
 msgid "Graphics\tImperfect Colors\n"
 msgstr "Graphismes\tCouleurs imparfaites\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2923
+#: src/frontend/mame/ui/selmenu.cpp:2932
 msgid "Graphics\tImperfect\n"
 msgstr "Graphismes\tImparfaits\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2925
+#: src/frontend/mame/ui/selmenu.cpp:2934
 msgid "Graphics\tOK\n"
 msgstr "Graphismes\tOK\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2928
+#: src/frontend/mame/ui/selmenu.cpp:2937
 msgid "Sound\tNone\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2930
+#: src/frontend/mame/ui/selmenu.cpp:2939
 msgid "Sound\tUnimplemented\n"
 msgstr "Son\tNon implémenté\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2932
+#: src/frontend/mame/ui/selmenu.cpp:2941
 msgid "Sound\tImperfect\n"
 msgstr "Son\tImparfait\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2934
+#: src/frontend/mame/ui/selmenu.cpp:2943
 msgid "Sound\tOK\n"
 msgstr "Son\tOK\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2937
+#: src/frontend/mame/ui/selmenu.cpp:2946
 msgid "Capture\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2939
+#: src/frontend/mame/ui/selmenu.cpp:2948
 msgid "Capture\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2942
+#: src/frontend/mame/ui/selmenu.cpp:2951
 msgid "Camera\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2944
+#: src/frontend/mame/ui/selmenu.cpp:2953
 msgid "Camera\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2947
+#: src/frontend/mame/ui/selmenu.cpp:2956
 msgid "Microphone\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2949
+#: src/frontend/mame/ui/selmenu.cpp:2958
 msgid "Microphone\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2952
+#: src/frontend/mame/ui/selmenu.cpp:2961
 msgid "Controls\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2954
+#: src/frontend/mame/ui/selmenu.cpp:2963
 msgid "Controls\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2957
+#: src/frontend/mame/ui/selmenu.cpp:2966
 msgid "Keyboard\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2959
+#: src/frontend/mame/ui/selmenu.cpp:2968
 msgid "Keyboard\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2962
+#: src/frontend/mame/ui/selmenu.cpp:2971
 msgid "Mouse\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2964
+#: src/frontend/mame/ui/selmenu.cpp:2973
 msgid "Mouse\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2967
+#: src/frontend/mame/ui/selmenu.cpp:2976
 msgid "Media\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2969
+#: src/frontend/mame/ui/selmenu.cpp:2978
 msgid "Media\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2972
+#: src/frontend/mame/ui/selmenu.cpp:2981
 msgid "Disk\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2974
+#: src/frontend/mame/ui/selmenu.cpp:2983
 msgid "Disk\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2977
+#: src/frontend/mame/ui/selmenu.cpp:2986
 msgid "Printer\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2979
+#: src/frontend/mame/ui/selmenu.cpp:2988
 msgid "Printer\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2982
+#: src/frontend/mame/ui/selmenu.cpp:2991
 msgid "Mag. Tape\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2984
+#: src/frontend/mame/ui/selmenu.cpp:2993
 msgid "Mag. Tape\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2987
+#: src/frontend/mame/ui/selmenu.cpp:2996
 msgid "Punch Tape\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2989
+#: src/frontend/mame/ui/selmenu.cpp:2998
 msgid "Punch Tape\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2992
+#: src/frontend/mame/ui/selmenu.cpp:3001
 msgid "Mag. Drum\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2994
+#: src/frontend/mame/ui/selmenu.cpp:3003
 msgid "Mag. Drum\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2997
+#: src/frontend/mame/ui/selmenu.cpp:3006
 msgid "(EP)ROM\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2999
+#: src/frontend/mame/ui/selmenu.cpp:3008
 msgid "(EP)ROM\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3002
+#: src/frontend/mame/ui/selmenu.cpp:3011
 msgid "Communications\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3004
+#: src/frontend/mame/ui/selmenu.cpp:3013
 msgid "Communications\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3007
+#: src/frontend/mame/ui/selmenu.cpp:3016
 msgid "LAN\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3009
+#: src/frontend/mame/ui/selmenu.cpp:3018
 msgid "LAN\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3012
+#: src/frontend/mame/ui/selmenu.cpp:3021
 msgid "WAN\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3014
+#: src/frontend/mame/ui/selmenu.cpp:3023
 msgid "WAN\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3017
+#: src/frontend/mame/ui/selmenu.cpp:3026
 msgid "Timing\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3019
+#: src/frontend/mame/ui/selmenu.cpp:3028
 msgid "Timing\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3021
+#: src/frontend/mame/ui/selmenu.cpp:3030
 msgid "Mechanical Machine\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3021
+#: src/frontend/mame/ui/selmenu.cpp:3030
 msgid "Mechanical Machine\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3022
+#: src/frontend/mame/ui/selmenu.cpp:3031
 msgid "Requires Artwork\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3022
+#: src/frontend/mame/ui/selmenu.cpp:3031
 msgid "Requires Artwork\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3023
+#: src/frontend/mame/ui/selmenu.cpp:3032
 msgid "Requires Clickable Artwork\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3023
+#: src/frontend/mame/ui/selmenu.cpp:3032
 msgid "Requires Clickable Artwork\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3025
+#: src/frontend/mame/ui/selmenu.cpp:3034
 msgid "Support Cocktail\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3026
+#: src/frontend/mame/ui/selmenu.cpp:3035
 msgid "Driver is BIOS\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3026
+#: src/frontend/mame/ui/selmenu.cpp:3035
 msgid "Driver is BIOS\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3027
+#: src/frontend/mame/ui/selmenu.cpp:3036
 msgid "Support Save\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3027
+#: src/frontend/mame/ui/selmenu.cpp:3036
 msgid "Support Save\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3028
+#: src/frontend/mame/ui/selmenu.cpp:3037
 msgid "Screen Orientation\tVertical\n"
 msgstr "Orientation de l'écran\tVerticale\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3028
+#: src/frontend/mame/ui/selmenu.cpp:3037
 msgid "Screen Orientation\tHorizontal\n"
 msgstr "Orientation de l'écran\tHorizontale\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3038
+#: src/frontend/mame/ui/selmenu.cpp:3047
 msgid "Requires CHD\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3038
+#: src/frontend/mame/ui/selmenu.cpp:3047
 msgid "Requires CHD\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3051
-msgid "ROM Audit Result\tOK\n"
+#: src/frontend/mame/ui/selmenu.cpp:3060
+msgid "Media Audit Result\tOK\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3053
-msgid "ROM Audit Result\tBAD\n"
+#: src/frontend/mame/ui/selmenu.cpp:3062
+msgid "Media Audit Result\tBAD\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3056
+#: src/frontend/mame/ui/selmenu.cpp:3065
 msgid "Samples Audit Result\tNone Needed\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3058
+#: src/frontend/mame/ui/selmenu.cpp:3067
 msgid "Samples Audit Result\tOK\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3060
+#: src/frontend/mame/ui/selmenu.cpp:3069
 msgid "Samples Audit Result\tBAD\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3064
+#: src/frontend/mame/ui/selmenu.cpp:3073
 msgid ""
-"ROM Audit \tDisabled\n"
-"Samples Audit \tDisabled\n"
+"Media Audit\tDisabled\n"
+"Samples Audit\tDisabled\n"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:150
+#: src/frontend/mame/ui/sndmenu.cpp:146
 msgid "Sound"
 msgstr "Son"
 
-#: src/frontend/mame/ui/sndmenu.cpp:151
+#: src/frontend/mame/ui/sndmenu.cpp:147
 msgid "Compressor"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:152
+#: src/frontend/mame/ui/sndmenu.cpp:148
 msgid "Sample Rate"
 msgstr "Fréquence d'échantillonnage"
 
-#: src/frontend/mame/ui/sndmenu.cpp:153
+#: src/frontend/mame/ui/sndmenu.cpp:149
 msgid "Use External Samples"
 msgstr "Utiliser des samples externes"
 
@@ -3185,511 +3189,681 @@ msgstr ""
 msgid "  Screen '%1$s': Vector\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:132
+#: src/frontend/mame/ui/devopt.cpp:135
 #, c-format
 msgid "  Screen '%1$s': %2$d × %3$d (V) %4$s Hz\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:133
+#: src/frontend/mame/ui/devopt.cpp:136
 #, c-format
 msgid "  Screen '%1$s': %2$d × %3$d (H) %4$s Hz\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:147
+#: src/frontend/mame/ui/devopt.cpp:150
 msgid "* Sound:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:211
+#: src/frontend/mame/ui/devopt.cpp:214
 #, c-format
 msgid ""
 "* BIOS settings:\n"
 "  %1$d options    [default: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:255 src/frontend/mame/ui/devopt.cpp:271
-#: src/frontend/mame/ui/devopt.cpp:332
+#: src/frontend/mame/ui/devopt.cpp:258 src/frontend/mame/ui/devopt.cpp:274
+#: src/frontend/mame/ui/devopt.cpp:335
 #, c-format
 msgid "  %1$s    [default: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:260 src/frontend/mame/ui/devopt.cpp:276
+#: src/frontend/mame/ui/devopt.cpp:263 src/frontend/mame/ui/devopt.cpp:279
 #, c-format
 msgid "  %1$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:282
+#: src/frontend/mame/ui/devopt.cpp:285
 msgid "* DIP switch settings:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:287
+#: src/frontend/mame/ui/devopt.cpp:290
 msgid "* Configuration settings:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:291
+#: src/frontend/mame/ui/devopt.cpp:294
 msgid "* Input device(s):\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:293
+#: src/frontend/mame/ui/devopt.cpp:296
 #, c-format
 msgid "  User inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:295
+#: src/frontend/mame/ui/devopt.cpp:298
 #, c-format
 msgid "  Mahjong inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:297
+#: src/frontend/mame/ui/devopt.cpp:300
 #, c-format
 msgid "  Hanafuda inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:299
+#: src/frontend/mame/ui/devopt.cpp:302
 #, c-format
 msgid "  Gambling inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:301
+#: src/frontend/mame/ui/devopt.cpp:304
 #, c-format
 msgid "  Analog inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:303
+#: src/frontend/mame/ui/devopt.cpp:306
 #, c-format
 msgid "  Adjuster inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:305
+#: src/frontend/mame/ui/devopt.cpp:308
 #, c-format
 msgid "  Keypad inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:307
+#: src/frontend/mame/ui/devopt.cpp:310
 #, c-format
 msgid "  Keyboard inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:312
+#: src/frontend/mame/ui/devopt.cpp:315
 msgid "* Media Options:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:317
+#: src/frontend/mame/ui/devopt.cpp:320
 #, c-format
 msgid "  %1$s    [tag: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:327
+#: src/frontend/mame/ui/devopt.cpp:330
 msgid "* Slot Options:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:341
+#: src/frontend/mame/ui/devopt.cpp:344
 msgid "[None]\n"
 msgstr ""
 
-#: src/emu/render.cpp:1847
+#: src/emu/render.cpp:1796
 #, c-format
 msgctxt "view-name"
 msgid "Screen %1$u Standard (%2$u:%3$u)"
 msgstr ""
 
-#: src/emu/render.cpp:1873
+#: src/emu/render.cpp:1822
 #, c-format
 msgctxt "view-name"
 msgid "Screen %1$u Pixel Aspect (%2$u:%3$u)"
 msgstr ""
 
-#: src/emu/render.cpp:1895 src/emu/render.cpp:2030
+#: src/emu/render.cpp:1844 src/emu/render.cpp:1979
 msgctxt "view-name"
 msgid "Cocktail"
 msgstr ""
 
-#: src/emu/render.cpp:2015
+#: src/emu/render.cpp:1964
 msgctxt "view-name"
 msgid "Left-to-Right"
 msgstr ""
 
-#: src/emu/render.cpp:2016
+#: src/emu/render.cpp:1965
 msgctxt "view-name"
 msgid "Left-to-Right (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2017
+#: src/emu/render.cpp:1966
 msgctxt "view-name"
 msgid "Top-to-Bottom"
 msgstr ""
 
-#: src/emu/render.cpp:2018
+#: src/emu/render.cpp:1967
 msgctxt "view-name"
 msgid "Top-to-Bottom (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2069
+#: src/emu/render.cpp:2018
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Left-to-Right, Top-to-Bottom"
 msgstr ""
 
-#: src/emu/render.cpp:2078
+#: src/emu/render.cpp:2027
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Left-to-Right, Top-to-Bottom (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2087
+#: src/emu/render.cpp:2036
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Top-to-Bottom, Left-to-Right"
 msgstr ""
 
-#: src/emu/render.cpp:2096
+#: src/emu/render.cpp:2045
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Top-to-Bottom, Left-to-Right (Gapless)"
 msgstr ""
 
-#: src/emu/inpttype.ipp:22
+#: src/emu/ioport.cpp:332
+#, c-format
 msgctxt "input-name"
-msgid "P1 Up"
+msgid "P%1$u"
 msgstr ""
 
-#: src/emu/inpttype.ipp:23
+#: src/emu/ioport.cpp:1924
 msgctxt "input-name"
-msgid "P1 Down"
+msgid "???"
 msgstr ""
 
-#: src/emu/inpttype.ipp:24
+#: src/emu/inpttype.ipp:22 src/emu/inpttype.ipp:140 src/emu/inpttype.ipp:221
+#: src/emu/inpttype.ipp:255 src/emu/inpttype.ipp:289 src/emu/inpttype.ipp:323
+#: src/emu/inpttype.ipp:357 src/emu/inpttype.ipp:391 src/emu/inpttype.ipp:425
+#: src/emu/inpttype.ipp:459
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left"
+msgid "%p Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:25
+#: src/emu/inpttype.ipp:23 src/emu/inpttype.ipp:141 src/emu/inpttype.ipp:222
+#: src/emu/inpttype.ipp:256 src/emu/inpttype.ipp:290 src/emu/inpttype.ipp:324
+#: src/emu/inpttype.ipp:358 src/emu/inpttype.ipp:392 src/emu/inpttype.ipp:426
+#: src/emu/inpttype.ipp:460
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right"
+msgid "%p Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:26
+#: src/emu/inpttype.ipp:24 src/emu/inpttype.ipp:142 src/emu/inpttype.ipp:223
+#: src/emu/inpttype.ipp:257 src/emu/inpttype.ipp:291 src/emu/inpttype.ipp:325
+#: src/emu/inpttype.ipp:359 src/emu/inpttype.ipp:393 src/emu/inpttype.ipp:427
+#: src/emu/inpttype.ipp:461
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Up"
+msgid "%p Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:27
+#: src/emu/inpttype.ipp:25 src/emu/inpttype.ipp:143 src/emu/inpttype.ipp:224
+#: src/emu/inpttype.ipp:258 src/emu/inpttype.ipp:292 src/emu/inpttype.ipp:326
+#: src/emu/inpttype.ipp:360 src/emu/inpttype.ipp:394 src/emu/inpttype.ipp:428
+#: src/emu/inpttype.ipp:462
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Down"
+msgid "%p Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:28
+#: src/emu/inpttype.ipp:26 src/emu/inpttype.ipp:144 src/emu/inpttype.ipp:225
+#: src/emu/inpttype.ipp:259 src/emu/inpttype.ipp:293 src/emu/inpttype.ipp:327
+#: src/emu/inpttype.ipp:361 src/emu/inpttype.ipp:395 src/emu/inpttype.ipp:429
+#: src/emu/inpttype.ipp:463
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Left"
+msgid "%p Right Stick/Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:29
+#: src/emu/inpttype.ipp:27 src/emu/inpttype.ipp:145 src/emu/inpttype.ipp:226
+#: src/emu/inpttype.ipp:260 src/emu/inpttype.ipp:294 src/emu/inpttype.ipp:328
+#: src/emu/inpttype.ipp:362 src/emu/inpttype.ipp:396 src/emu/inpttype.ipp:430
+#: src/emu/inpttype.ipp:464
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Right"
+msgid "%p Right Stick/Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:30
+#: src/emu/inpttype.ipp:28 src/emu/inpttype.ipp:146 src/emu/inpttype.ipp:227
+#: src/emu/inpttype.ipp:261 src/emu/inpttype.ipp:295 src/emu/inpttype.ipp:329
+#: src/emu/inpttype.ipp:363 src/emu/inpttype.ipp:397 src/emu/inpttype.ipp:431
+#: src/emu/inpttype.ipp:465
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Up"
+msgid "%p Right Stick/Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:31
+#: src/emu/inpttype.ipp:29 src/emu/inpttype.ipp:147 src/emu/inpttype.ipp:228
+#: src/emu/inpttype.ipp:262 src/emu/inpttype.ipp:296 src/emu/inpttype.ipp:330
+#: src/emu/inpttype.ipp:364 src/emu/inpttype.ipp:398 src/emu/inpttype.ipp:432
+#: src/emu/inpttype.ipp:466
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Down"
+msgid "%p Right Stick/Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:32
+#: src/emu/inpttype.ipp:30 src/emu/inpttype.ipp:148 src/emu/inpttype.ipp:229
+#: src/emu/inpttype.ipp:263 src/emu/inpttype.ipp:297 src/emu/inpttype.ipp:331
+#: src/emu/inpttype.ipp:365 src/emu/inpttype.ipp:399 src/emu/inpttype.ipp:433
+#: src/emu/inpttype.ipp:467
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Left"
+msgid "%p Left Stick/Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:33
+#: src/emu/inpttype.ipp:31 src/emu/inpttype.ipp:149 src/emu/inpttype.ipp:230
+#: src/emu/inpttype.ipp:264 src/emu/inpttype.ipp:298 src/emu/inpttype.ipp:332
+#: src/emu/inpttype.ipp:366 src/emu/inpttype.ipp:400 src/emu/inpttype.ipp:434
+#: src/emu/inpttype.ipp:468
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Right"
+msgid "%p Left Stick/Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:34
+#: src/emu/inpttype.ipp:32 src/emu/inpttype.ipp:150 src/emu/inpttype.ipp:231
+#: src/emu/inpttype.ipp:265 src/emu/inpttype.ipp:299 src/emu/inpttype.ipp:333
+#: src/emu/inpttype.ipp:367 src/emu/inpttype.ipp:401 src/emu/inpttype.ipp:435
+#: src/emu/inpttype.ipp:469
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 1"
+msgid "%p Left Stick/Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:35
+#: src/emu/inpttype.ipp:33 src/emu/inpttype.ipp:151 src/emu/inpttype.ipp:232
+#: src/emu/inpttype.ipp:266 src/emu/inpttype.ipp:300 src/emu/inpttype.ipp:334
+#: src/emu/inpttype.ipp:368 src/emu/inpttype.ipp:402 src/emu/inpttype.ipp:436
+#: src/emu/inpttype.ipp:470
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 2"
+msgid "%p Left Stick/Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:36
+#: src/emu/inpttype.ipp:34 src/emu/inpttype.ipp:152 src/emu/inpttype.ipp:233
+#: src/emu/inpttype.ipp:267 src/emu/inpttype.ipp:301 src/emu/inpttype.ipp:335
+#: src/emu/inpttype.ipp:369 src/emu/inpttype.ipp:403 src/emu/inpttype.ipp:437
+#: src/emu/inpttype.ipp:471
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 3"
+msgid "%p Button 1"
 msgstr ""
 
-#: src/emu/inpttype.ipp:37
+#: src/emu/inpttype.ipp:35 src/emu/inpttype.ipp:153 src/emu/inpttype.ipp:234
+#: src/emu/inpttype.ipp:268 src/emu/inpttype.ipp:302 src/emu/inpttype.ipp:336
+#: src/emu/inpttype.ipp:370 src/emu/inpttype.ipp:404 src/emu/inpttype.ipp:438
+#: src/emu/inpttype.ipp:472
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 4"
+msgid "%p Button 2"
 msgstr ""
 
-#: src/emu/inpttype.ipp:38
+#: src/emu/inpttype.ipp:36 src/emu/inpttype.ipp:154 src/emu/inpttype.ipp:235
+#: src/emu/inpttype.ipp:269 src/emu/inpttype.ipp:303 src/emu/inpttype.ipp:337
+#: src/emu/inpttype.ipp:371 src/emu/inpttype.ipp:405 src/emu/inpttype.ipp:439
+#: src/emu/inpttype.ipp:473
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 5"
+msgid "%p Button 3"
 msgstr ""
 
-#: src/emu/inpttype.ipp:39
+#: src/emu/inpttype.ipp:37 src/emu/inpttype.ipp:155 src/emu/inpttype.ipp:236
+#: src/emu/inpttype.ipp:270 src/emu/inpttype.ipp:304 src/emu/inpttype.ipp:338
+#: src/emu/inpttype.ipp:372 src/emu/inpttype.ipp:406 src/emu/inpttype.ipp:440
+#: src/emu/inpttype.ipp:474
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 6"
+msgid "%p Button 4"
 msgstr ""
 
-#: src/emu/inpttype.ipp:40
+#: src/emu/inpttype.ipp:38 src/emu/inpttype.ipp:156 src/emu/inpttype.ipp:237
+#: src/emu/inpttype.ipp:271 src/emu/inpttype.ipp:305 src/emu/inpttype.ipp:339
+#: src/emu/inpttype.ipp:373 src/emu/inpttype.ipp:407 src/emu/inpttype.ipp:441
+#: src/emu/inpttype.ipp:475
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 7"
+msgid "%p Button 5"
 msgstr ""
 
-#: src/emu/inpttype.ipp:41
+#: src/emu/inpttype.ipp:39 src/emu/inpttype.ipp:157 src/emu/inpttype.ipp:238
+#: src/emu/inpttype.ipp:272 src/emu/inpttype.ipp:306 src/emu/inpttype.ipp:340
+#: src/emu/inpttype.ipp:374 src/emu/inpttype.ipp:408 src/emu/inpttype.ipp:442
+#: src/emu/inpttype.ipp:476
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 8"
+msgid "%p Button 6"
 msgstr ""
 
-#: src/emu/inpttype.ipp:42
+#: src/emu/inpttype.ipp:40 src/emu/inpttype.ipp:158 src/emu/inpttype.ipp:239
+#: src/emu/inpttype.ipp:273 src/emu/inpttype.ipp:307 src/emu/inpttype.ipp:341
+#: src/emu/inpttype.ipp:375 src/emu/inpttype.ipp:409 src/emu/inpttype.ipp:443
+#: src/emu/inpttype.ipp:477
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 9"
+msgid "%p Button 7"
 msgstr ""
 
-#: src/emu/inpttype.ipp:43
+#: src/emu/inpttype.ipp:41 src/emu/inpttype.ipp:159 src/emu/inpttype.ipp:240
+#: src/emu/inpttype.ipp:274 src/emu/inpttype.ipp:308 src/emu/inpttype.ipp:342
+#: src/emu/inpttype.ipp:376 src/emu/inpttype.ipp:410 src/emu/inpttype.ipp:444
+#: src/emu/inpttype.ipp:478
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 10"
+msgid "%p Button 8"
 msgstr ""
 
-#: src/emu/inpttype.ipp:44
+#: src/emu/inpttype.ipp:42 src/emu/inpttype.ipp:160 src/emu/inpttype.ipp:241
+#: src/emu/inpttype.ipp:275 src/emu/inpttype.ipp:309 src/emu/inpttype.ipp:343
+#: src/emu/inpttype.ipp:377 src/emu/inpttype.ipp:411 src/emu/inpttype.ipp:445
+#: src/emu/inpttype.ipp:479
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 11"
+msgid "%p Button 9"
 msgstr ""
 
-#: src/emu/inpttype.ipp:45
+#: src/emu/inpttype.ipp:43 src/emu/inpttype.ipp:161 src/emu/inpttype.ipp:242
+#: src/emu/inpttype.ipp:276 src/emu/inpttype.ipp:310 src/emu/inpttype.ipp:344
+#: src/emu/inpttype.ipp:378 src/emu/inpttype.ipp:412 src/emu/inpttype.ipp:446
+#: src/emu/inpttype.ipp:480
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 12"
+msgid "%p Button 10"
 msgstr ""
 
-#: src/emu/inpttype.ipp:46
+#: src/emu/inpttype.ipp:44 src/emu/inpttype.ipp:162 src/emu/inpttype.ipp:243
+#: src/emu/inpttype.ipp:277 src/emu/inpttype.ipp:311 src/emu/inpttype.ipp:345
+#: src/emu/inpttype.ipp:379 src/emu/inpttype.ipp:413 src/emu/inpttype.ipp:447
+#: src/emu/inpttype.ipp:481
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 13"
+msgid "%p Button 11"
 msgstr ""
 
-#: src/emu/inpttype.ipp:47
+#: src/emu/inpttype.ipp:45 src/emu/inpttype.ipp:163 src/emu/inpttype.ipp:244
+#: src/emu/inpttype.ipp:278 src/emu/inpttype.ipp:312 src/emu/inpttype.ipp:346
+#: src/emu/inpttype.ipp:380 src/emu/inpttype.ipp:414 src/emu/inpttype.ipp:448
+#: src/emu/inpttype.ipp:482
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 14"
+msgid "%p Button 12"
 msgstr ""
 
-#: src/emu/inpttype.ipp:48
+#: src/emu/inpttype.ipp:46 src/emu/inpttype.ipp:164 src/emu/inpttype.ipp:245
+#: src/emu/inpttype.ipp:279 src/emu/inpttype.ipp:313 src/emu/inpttype.ipp:347
+#: src/emu/inpttype.ipp:381 src/emu/inpttype.ipp:415 src/emu/inpttype.ipp:449
+#: src/emu/inpttype.ipp:483
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 15"
+msgid "%p Button 13"
 msgstr ""
 
-#: src/emu/inpttype.ipp:49
+#: src/emu/inpttype.ipp:47 src/emu/inpttype.ipp:165 src/emu/inpttype.ipp:246
+#: src/emu/inpttype.ipp:280 src/emu/inpttype.ipp:314 src/emu/inpttype.ipp:348
+#: src/emu/inpttype.ipp:382 src/emu/inpttype.ipp:416 src/emu/inpttype.ipp:450
+#: src/emu/inpttype.ipp:484
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 16"
+msgid "%p Button 14"
 msgstr ""
 
-#: src/emu/inpttype.ipp:50
+#: src/emu/inpttype.ipp:48 src/emu/inpttype.ipp:166 src/emu/inpttype.ipp:247
+#: src/emu/inpttype.ipp:281 src/emu/inpttype.ipp:315 src/emu/inpttype.ipp:349
+#: src/emu/inpttype.ipp:383 src/emu/inpttype.ipp:417 src/emu/inpttype.ipp:451
+#: src/emu/inpttype.ipp:485
+#, c-format
 msgctxt "input-name"
-msgid "P1 Start"
+msgid "%p Button 15"
 msgstr ""
 
-#: src/emu/inpttype.ipp:51
+#: src/emu/inpttype.ipp:49 src/emu/inpttype.ipp:167 src/emu/inpttype.ipp:248
+#: src/emu/inpttype.ipp:282 src/emu/inpttype.ipp:316 src/emu/inpttype.ipp:350
+#: src/emu/inpttype.ipp:384 src/emu/inpttype.ipp:418 src/emu/inpttype.ipp:452
+#: src/emu/inpttype.ipp:486
+#, c-format
 msgctxt "input-name"
-msgid "P1 Select"
+msgid "%p Button 16"
 msgstr ""
 
-#: src/emu/inpttype.ipp:56
+#: src/emu/inpttype.ipp:50 src/emu/inpttype.ipp:168 src/emu/inpttype.ipp:249
+#: src/emu/inpttype.ipp:283 src/emu/inpttype.ipp:317 src/emu/inpttype.ipp:351
+#: src/emu/inpttype.ipp:385 src/emu/inpttype.ipp:419 src/emu/inpttype.ipp:453
+#: src/emu/inpttype.ipp:487
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong A"
+msgid "%p Start"
 msgstr ""
 
-#: src/emu/inpttype.ipp:57
+#: src/emu/inpttype.ipp:51 src/emu/inpttype.ipp:169 src/emu/inpttype.ipp:250
+#: src/emu/inpttype.ipp:284 src/emu/inpttype.ipp:318 src/emu/inpttype.ipp:352
+#: src/emu/inpttype.ipp:386 src/emu/inpttype.ipp:420 src/emu/inpttype.ipp:454
+#: src/emu/inpttype.ipp:488
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong B"
+msgid "%p Select"
 msgstr ""
 
-#: src/emu/inpttype.ipp:58
+#: src/emu/inpttype.ipp:56 src/emu/inpttype.ipp:174
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong C"
+msgid "%p Mahjong A"
 msgstr ""
 
-#: src/emu/inpttype.ipp:59
+#: src/emu/inpttype.ipp:57 src/emu/inpttype.ipp:175
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong D"
+msgid "%p Mahjong B"
 msgstr ""
 
-#: src/emu/inpttype.ipp:60
+#: src/emu/inpttype.ipp:58 src/emu/inpttype.ipp:176
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong E"
+msgid "%p Mahjong C"
 msgstr ""
 
-#: src/emu/inpttype.ipp:61
+#: src/emu/inpttype.ipp:59 src/emu/inpttype.ipp:177
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong F"
+msgid "%p Mahjong D"
 msgstr ""
 
-#: src/emu/inpttype.ipp:62
+#: src/emu/inpttype.ipp:60 src/emu/inpttype.ipp:178
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong G"
+msgid "%p Mahjong E"
 msgstr ""
 
-#: src/emu/inpttype.ipp:63
+#: src/emu/inpttype.ipp:61 src/emu/inpttype.ipp:179
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong H"
+msgid "%p Mahjong F"
 msgstr ""
 
-#: src/emu/inpttype.ipp:64
+#: src/emu/inpttype.ipp:62 src/emu/inpttype.ipp:180
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong I"
+msgid "%p Mahjong G"
 msgstr ""
 
-#: src/emu/inpttype.ipp:65
+#: src/emu/inpttype.ipp:63 src/emu/inpttype.ipp:181
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong J"
+msgid "%p Mahjong H"
 msgstr ""
 
-#: src/emu/inpttype.ipp:66
+#: src/emu/inpttype.ipp:64 src/emu/inpttype.ipp:182
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong K"
+msgid "%p Mahjong I"
 msgstr ""
 
-#: src/emu/inpttype.ipp:67
+#: src/emu/inpttype.ipp:65 src/emu/inpttype.ipp:183
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong L"
+msgid "%p Mahjong J"
 msgstr ""
 
-#: src/emu/inpttype.ipp:68
+#: src/emu/inpttype.ipp:66 src/emu/inpttype.ipp:184
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong M"
+msgid "%p Mahjong K"
 msgstr ""
 
-#: src/emu/inpttype.ipp:69
+#: src/emu/inpttype.ipp:67 src/emu/inpttype.ipp:185
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong N"
+msgid "%p Mahjong L"
 msgstr ""
 
-#: src/emu/inpttype.ipp:70
+#: src/emu/inpttype.ipp:68 src/emu/inpttype.ipp:186
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong O"
+msgid "%p Mahjong M"
 msgstr ""
 
-#: src/emu/inpttype.ipp:71
+#: src/emu/inpttype.ipp:69 src/emu/inpttype.ipp:187
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong P"
+msgid "%p Mahjong N"
 msgstr ""
 
-#: src/emu/inpttype.ipp:72
+#: src/emu/inpttype.ipp:70 src/emu/inpttype.ipp:188
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Q"
+msgid "%p Mahjong O"
 msgstr ""
 
-#: src/emu/inpttype.ipp:73
+#: src/emu/inpttype.ipp:71 src/emu/inpttype.ipp:189
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Kan"
+msgid "%p Mahjong P"
 msgstr ""
 
-#: src/emu/inpttype.ipp:74
+#: src/emu/inpttype.ipp:72 src/emu/inpttype.ipp:190
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Pon"
+msgid "%p Mahjong Q"
 msgstr ""
 
-#: src/emu/inpttype.ipp:75
+#: src/emu/inpttype.ipp:73 src/emu/inpttype.ipp:191
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Chi"
+msgid "%p Mahjong Kan"
 msgstr ""
 
-#: src/emu/inpttype.ipp:76
+#: src/emu/inpttype.ipp:74 src/emu/inpttype.ipp:192
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Reach"
+msgid "%p Mahjong Pon"
 msgstr ""
 
-#: src/emu/inpttype.ipp:77
+#: src/emu/inpttype.ipp:75 src/emu/inpttype.ipp:193
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Ron"
+msgid "%p Mahjong Chi"
 msgstr ""
 
-#: src/emu/inpttype.ipp:78
+#: src/emu/inpttype.ipp:76 src/emu/inpttype.ipp:194
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Flip Flop"
+msgid "%p Mahjong Reach"
 msgstr ""
 
-#: src/emu/inpttype.ipp:79
+#: src/emu/inpttype.ipp:77 src/emu/inpttype.ipp:195
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Bet"
+msgid "%p Mahjong Ron"
 msgstr ""
 
-#: src/emu/inpttype.ipp:80
+#: src/emu/inpttype.ipp:78 src/emu/inpttype.ipp:200
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Take Score"
+msgid "%p Mahjong Flip Flop"
 msgstr ""
 
-#: src/emu/inpttype.ipp:81
+#: src/emu/inpttype.ipp:79 src/emu/inpttype.ipp:196
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Double Up"
+msgid "%p Mahjong Bet"
 msgstr ""
 
-#: src/emu/inpttype.ipp:82
+#: src/emu/inpttype.ipp:80 src/emu/inpttype.ipp:198
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Big"
+msgid "%p Mahjong Take Score"
 msgstr ""
 
-#: src/emu/inpttype.ipp:83
+#: src/emu/inpttype.ipp:81 src/emu/inpttype.ipp:199
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Small"
+msgid "%p Mahjong Double Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:84
+#: src/emu/inpttype.ipp:82 src/emu/inpttype.ipp:201
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Last Chance"
+msgid "%p Mahjong Big"
 msgstr ""
 
-#: src/emu/inpttype.ipp:89
+#: src/emu/inpttype.ipp:83 src/emu/inpttype.ipp:202
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda A/1"
+msgid "%p Mahjong Small"
 msgstr ""
 
-#: src/emu/inpttype.ipp:90
+#: src/emu/inpttype.ipp:84 src/emu/inpttype.ipp:197
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda B/2"
+msgid "%p Mahjong Last Chance"
 msgstr ""
 
-#: src/emu/inpttype.ipp:91
+#: src/emu/inpttype.ipp:89 src/emu/inpttype.ipp:207
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda C/3"
+msgid "%p Hanafuda A/1"
 msgstr ""
 
-#: src/emu/inpttype.ipp:92
+#: src/emu/inpttype.ipp:90 src/emu/inpttype.ipp:208
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda D/4"
+msgid "%p Hanafuda B/2"
 msgstr ""
 
-#: src/emu/inpttype.ipp:93
+#: src/emu/inpttype.ipp:91 src/emu/inpttype.ipp:209
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda E/5"
+msgid "%p Hanafuda C/3"
 msgstr ""
 
-#: src/emu/inpttype.ipp:94
+#: src/emu/inpttype.ipp:92 src/emu/inpttype.ipp:210
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda F/6"
+msgid "%p Hanafuda D/4"
 msgstr ""
 
-#: src/emu/inpttype.ipp:95
+#: src/emu/inpttype.ipp:93 src/emu/inpttype.ipp:211
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda G/7"
+msgid "%p Hanafuda E/5"
 msgstr ""
 
-#: src/emu/inpttype.ipp:96
+#: src/emu/inpttype.ipp:94 src/emu/inpttype.ipp:212
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda H/8"
+msgid "%p Hanafuda F/6"
 msgstr ""
 
-#: src/emu/inpttype.ipp:97
+#: src/emu/inpttype.ipp:95 src/emu/inpttype.ipp:213
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda Yes"
+msgid "%p Hanafuda G/7"
 msgstr ""
 
-#: src/emu/inpttype.ipp:98
+#: src/emu/inpttype.ipp:96 src/emu/inpttype.ipp:214
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda No"
+msgid "%p Hanafuda H/8"
+msgstr ""
+
+#: src/emu/inpttype.ipp:97 src/emu/inpttype.ipp:215
+#, c-format
+msgctxt "input-name"
+msgid "%p Hanafuda Yes"
+msgstr ""
+
+#: src/emu/inpttype.ipp:98 src/emu/inpttype.ipp:216
+#, c-format
+msgctxt "input-name"
+msgid "%p Hanafuda No"
 msgstr ""
 
 #: src/emu/inpttype.ipp:103
@@ -3817,1551 +3991,6 @@ msgctxt "input-name"
 msgid "Stop All Reels"
 msgstr ""
 
-#: src/emu/inpttype.ipp:140
-msgctxt "input-name"
-msgid "P2 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:141
-msgctxt "input-name"
-msgid "P2 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:142
-msgctxt "input-name"
-msgid "P2 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:143
-msgctxt "input-name"
-msgid "P2 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:144
-msgctxt "input-name"
-msgid "P2 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:145
-msgctxt "input-name"
-msgid "P2 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:146
-msgctxt "input-name"
-msgid "P2 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:147
-msgctxt "input-name"
-msgid "P2 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:148
-msgctxt "input-name"
-msgid "P2 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:149
-msgctxt "input-name"
-msgid "P2 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:150
-msgctxt "input-name"
-msgid "P2 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:151
-msgctxt "input-name"
-msgid "P2 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:152
-msgctxt "input-name"
-msgid "P2 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:153
-msgctxt "input-name"
-msgid "P2 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:154
-msgctxt "input-name"
-msgid "P2 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:155
-msgctxt "input-name"
-msgid "P2 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:156
-msgctxt "input-name"
-msgid "P2 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:157
-msgctxt "input-name"
-msgid "P2 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:158
-msgctxt "input-name"
-msgid "P2 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:159
-msgctxt "input-name"
-msgid "P2 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:160
-msgctxt "input-name"
-msgid "P2 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:161
-msgctxt "input-name"
-msgid "P2 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:162
-msgctxt "input-name"
-msgid "P2 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:163
-msgctxt "input-name"
-msgid "P2 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:164
-msgctxt "input-name"
-msgid "P2 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:165
-msgctxt "input-name"
-msgid "P2 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:166
-msgctxt "input-name"
-msgid "P2 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:167
-msgctxt "input-name"
-msgid "P2 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:168
-msgctxt "input-name"
-msgid "P2 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:169
-msgctxt "input-name"
-msgid "P2 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:174
-msgctxt "input-name"
-msgid "P2 Mahjong A"
-msgstr ""
-
-#: src/emu/inpttype.ipp:175
-msgctxt "input-name"
-msgid "P2 Mahjong B"
-msgstr ""
-
-#: src/emu/inpttype.ipp:176
-msgctxt "input-name"
-msgid "P2 Mahjong C"
-msgstr ""
-
-#: src/emu/inpttype.ipp:177
-msgctxt "input-name"
-msgid "P2 Mahjong D"
-msgstr ""
-
-#: src/emu/inpttype.ipp:178
-msgctxt "input-name"
-msgid "P2 Mahjong E"
-msgstr ""
-
-#: src/emu/inpttype.ipp:179
-msgctxt "input-name"
-msgid "P2 Mahjong F"
-msgstr ""
-
-#: src/emu/inpttype.ipp:180
-msgctxt "input-name"
-msgid "P2 Mahjong G"
-msgstr ""
-
-#: src/emu/inpttype.ipp:181
-msgctxt "input-name"
-msgid "P2 Mahjong H"
-msgstr ""
-
-#: src/emu/inpttype.ipp:182
-msgctxt "input-name"
-msgid "P2 Mahjong I"
-msgstr ""
-
-#: src/emu/inpttype.ipp:183
-msgctxt "input-name"
-msgid "P2 Mahjong J"
-msgstr ""
-
-#: src/emu/inpttype.ipp:184
-msgctxt "input-name"
-msgid "P2 Mahjong K"
-msgstr ""
-
-#: src/emu/inpttype.ipp:185
-msgctxt "input-name"
-msgid "P2 Mahjong L"
-msgstr ""
-
-#: src/emu/inpttype.ipp:186
-msgctxt "input-name"
-msgid "P2 Mahjong M"
-msgstr ""
-
-#: src/emu/inpttype.ipp:187
-msgctxt "input-name"
-msgid "P2 Mahjong N"
-msgstr ""
-
-#: src/emu/inpttype.ipp:188
-msgctxt "input-name"
-msgid "P2 Mahjong O"
-msgstr ""
-
-#: src/emu/inpttype.ipp:189
-msgctxt "input-name"
-msgid "P2 Mahjong P"
-msgstr ""
-
-#: src/emu/inpttype.ipp:190
-msgctxt "input-name"
-msgid "P2 Mahjong Q"
-msgstr ""
-
-#: src/emu/inpttype.ipp:191
-msgctxt "input-name"
-msgid "P2 Mahjong Kan"
-msgstr ""
-
-#: src/emu/inpttype.ipp:192
-msgctxt "input-name"
-msgid "P2 Mahjong Pon"
-msgstr ""
-
-#: src/emu/inpttype.ipp:193
-msgctxt "input-name"
-msgid "P2 Mahjong Chi"
-msgstr ""
-
-#: src/emu/inpttype.ipp:194
-msgctxt "input-name"
-msgid "P2 Mahjong Reach"
-msgstr ""
-
-#: src/emu/inpttype.ipp:195
-msgctxt "input-name"
-msgid "P2 Mahjong Ron"
-msgstr ""
-
-#: src/emu/inpttype.ipp:196
-msgctxt "input-name"
-msgid "P2 Mahjong Bet"
-msgstr ""
-
-#: src/emu/inpttype.ipp:197
-msgctxt "input-name"
-msgid "P2 Mahjong Last Chance"
-msgstr ""
-
-#: src/emu/inpttype.ipp:198
-msgctxt "input-name"
-msgid "P2 Mahjong Take Score"
-msgstr ""
-
-#: src/emu/inpttype.ipp:199
-msgctxt "input-name"
-msgid "P2 Mahjong Double Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:200
-msgctxt "input-name"
-msgid "P2 Mahjong Flip Flop"
-msgstr ""
-
-#: src/emu/inpttype.ipp:201
-msgctxt "input-name"
-msgid "P2 Mahjong Big"
-msgstr ""
-
-#: src/emu/inpttype.ipp:202
-msgctxt "input-name"
-msgid "P2 Mahjong Small"
-msgstr ""
-
-#: src/emu/inpttype.ipp:207
-msgctxt "input-name"
-msgid "P2 Hanafuda A/1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:208
-msgctxt "input-name"
-msgid "P2 Hanafuda B/2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:209
-msgctxt "input-name"
-msgid "P2 Hanafuda C/3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:210
-msgctxt "input-name"
-msgid "P2 Hanafuda D/4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:211
-msgctxt "input-name"
-msgid "P2 Hanafuda E/5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:212
-msgctxt "input-name"
-msgid "P2 Hanafuda F/6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:213
-msgctxt "input-name"
-msgid "P2 Hanafuda G/7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:214
-msgctxt "input-name"
-msgid "P2 Hanafuda H/8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:215
-msgctxt "input-name"
-msgid "P2 Hanafuda Yes"
-msgstr ""
-
-#: src/emu/inpttype.ipp:216
-msgctxt "input-name"
-msgid "P2 Hanafuda No"
-msgstr ""
-
-#: src/emu/inpttype.ipp:221
-msgctxt "input-name"
-msgid "P3 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:222
-msgctxt "input-name"
-msgid "P3 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:223
-msgctxt "input-name"
-msgid "P3 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:224
-msgctxt "input-name"
-msgid "P3 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:225
-msgctxt "input-name"
-msgid "P3 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:226
-msgctxt "input-name"
-msgid "P3 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:227
-msgctxt "input-name"
-msgid "P3 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:228
-msgctxt "input-name"
-msgid "P3 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:229
-msgctxt "input-name"
-msgid "P3 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:230
-msgctxt "input-name"
-msgid "P3 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:231
-msgctxt "input-name"
-msgid "P3 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:232
-msgctxt "input-name"
-msgid "P3 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:233
-msgctxt "input-name"
-msgid "P3 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:234
-msgctxt "input-name"
-msgid "P3 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:235
-msgctxt "input-name"
-msgid "P3 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:236
-msgctxt "input-name"
-msgid "P3 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:237
-msgctxt "input-name"
-msgid "P3 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:238
-msgctxt "input-name"
-msgid "P3 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:239
-msgctxt "input-name"
-msgid "P3 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:240
-msgctxt "input-name"
-msgid "P3 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:241
-msgctxt "input-name"
-msgid "P3 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:242
-msgctxt "input-name"
-msgid "P3 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:243
-msgctxt "input-name"
-msgid "P3 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:244
-msgctxt "input-name"
-msgid "P3 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:245
-msgctxt "input-name"
-msgid "P3 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:246
-msgctxt "input-name"
-msgid "P3 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:247
-msgctxt "input-name"
-msgid "P3 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:248
-msgctxt "input-name"
-msgid "P3 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:249
-msgctxt "input-name"
-msgid "P3 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:250
-msgctxt "input-name"
-msgid "P3 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:255
-msgctxt "input-name"
-msgid "P4 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:256
-msgctxt "input-name"
-msgid "P4 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:257
-msgctxt "input-name"
-msgid "P4 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:258
-msgctxt "input-name"
-msgid "P4 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:259
-msgctxt "input-name"
-msgid "P4 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:260
-msgctxt "input-name"
-msgid "P4 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:261
-msgctxt "input-name"
-msgid "P4 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:262
-msgctxt "input-name"
-msgid "P4 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:263
-msgctxt "input-name"
-msgid "P4 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:264
-msgctxt "input-name"
-msgid "P4 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:265
-msgctxt "input-name"
-msgid "P4 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:266
-msgctxt "input-name"
-msgid "P4 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:267
-msgctxt "input-name"
-msgid "P4 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:268
-msgctxt "input-name"
-msgid "P4 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:269
-msgctxt "input-name"
-msgid "P4 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:270
-msgctxt "input-name"
-msgid "P4 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:271
-msgctxt "input-name"
-msgid "P4 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:272
-msgctxt "input-name"
-msgid "P4 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:273
-msgctxt "input-name"
-msgid "P4 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:274
-msgctxt "input-name"
-msgid "P4 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:275
-msgctxt "input-name"
-msgid "P4 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:276
-msgctxt "input-name"
-msgid "P4 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:277
-msgctxt "input-name"
-msgid "P4 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:278
-msgctxt "input-name"
-msgid "P4 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:279
-msgctxt "input-name"
-msgid "P4 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:280
-msgctxt "input-name"
-msgid "P4 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:281
-msgctxt "input-name"
-msgid "P4 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:282
-msgctxt "input-name"
-msgid "P4 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:283
-msgctxt "input-name"
-msgid "P4 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:284
-msgctxt "input-name"
-msgid "P4 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:289
-msgctxt "input-name"
-msgid "P5 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:290
-msgctxt "input-name"
-msgid "P5 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:291
-msgctxt "input-name"
-msgid "P5 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:292
-msgctxt "input-name"
-msgid "P5 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:293
-msgctxt "input-name"
-msgid "P5 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:294
-msgctxt "input-name"
-msgid "P5 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:295
-msgctxt "input-name"
-msgid "P5 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:296
-msgctxt "input-name"
-msgid "P5 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:297
-msgctxt "input-name"
-msgid "P5 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:298
-msgctxt "input-name"
-msgid "P5 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:299
-msgctxt "input-name"
-msgid "P5 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:300
-msgctxt "input-name"
-msgid "P5 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:301
-msgctxt "input-name"
-msgid "P5 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:302
-msgctxt "input-name"
-msgid "P5 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:303
-msgctxt "input-name"
-msgid "P5 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:304
-msgctxt "input-name"
-msgid "P5 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:305
-msgctxt "input-name"
-msgid "P5 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:306
-msgctxt "input-name"
-msgid "P5 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:307
-msgctxt "input-name"
-msgid "P5 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:308
-msgctxt "input-name"
-msgid "P5 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:309
-msgctxt "input-name"
-msgid "P5 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:310
-msgctxt "input-name"
-msgid "P5 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:311
-msgctxt "input-name"
-msgid "P5 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:312
-msgctxt "input-name"
-msgid "P5 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:313
-msgctxt "input-name"
-msgid "P5 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:314
-msgctxt "input-name"
-msgid "P5 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:315
-msgctxt "input-name"
-msgid "P5 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:316
-msgctxt "input-name"
-msgid "P5 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:317
-msgctxt "input-name"
-msgid "P5 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:318
-msgctxt "input-name"
-msgid "P5 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:323
-msgctxt "input-name"
-msgid "P6 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:324
-msgctxt "input-name"
-msgid "P6 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:325
-msgctxt "input-name"
-msgid "P6 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:326
-msgctxt "input-name"
-msgid "P6 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:327
-msgctxt "input-name"
-msgid "P6 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:328
-msgctxt "input-name"
-msgid "P6 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:329
-msgctxt "input-name"
-msgid "P6 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:330
-msgctxt "input-name"
-msgid "P6 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:331
-msgctxt "input-name"
-msgid "P6 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:332
-msgctxt "input-name"
-msgid "P6 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:333
-msgctxt "input-name"
-msgid "P6 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:334
-msgctxt "input-name"
-msgid "P6 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:335
-msgctxt "input-name"
-msgid "P6 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:336
-msgctxt "input-name"
-msgid "P6 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:337
-msgctxt "input-name"
-msgid "P6 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:338
-msgctxt "input-name"
-msgid "P6 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:339
-msgctxt "input-name"
-msgid "P6 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:340
-msgctxt "input-name"
-msgid "P6 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:341
-msgctxt "input-name"
-msgid "P6 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:342
-msgctxt "input-name"
-msgid "P6 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:343
-msgctxt "input-name"
-msgid "P6 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:344
-msgctxt "input-name"
-msgid "P6 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:345
-msgctxt "input-name"
-msgid "P6 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:346
-msgctxt "input-name"
-msgid "P6 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:347
-msgctxt "input-name"
-msgid "P6 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:348
-msgctxt "input-name"
-msgid "P6 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:349
-msgctxt "input-name"
-msgid "P6 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:350
-msgctxt "input-name"
-msgid "P6 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:351
-msgctxt "input-name"
-msgid "P6 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:352
-msgctxt "input-name"
-msgid "P6 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:357
-msgctxt "input-name"
-msgid "P7 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:358
-msgctxt "input-name"
-msgid "P7 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:359
-msgctxt "input-name"
-msgid "P7 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:360
-msgctxt "input-name"
-msgid "P7 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:361
-msgctxt "input-name"
-msgid "P7 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:362
-msgctxt "input-name"
-msgid "P7 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:363
-msgctxt "input-name"
-msgid "P7 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:364
-msgctxt "input-name"
-msgid "P7 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:365
-msgctxt "input-name"
-msgid "P7 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:366
-msgctxt "input-name"
-msgid "P7 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:367
-msgctxt "input-name"
-msgid "P7 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:368
-msgctxt "input-name"
-msgid "P7 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:369
-msgctxt "input-name"
-msgid "P7 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:370
-msgctxt "input-name"
-msgid "P7 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:371
-msgctxt "input-name"
-msgid "P7 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:372
-msgctxt "input-name"
-msgid "P7 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:373
-msgctxt "input-name"
-msgid "P7 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:374
-msgctxt "input-name"
-msgid "P7 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:375
-msgctxt "input-name"
-msgid "P7 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:376
-msgctxt "input-name"
-msgid "P7 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:377
-msgctxt "input-name"
-msgid "P7 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:378
-msgctxt "input-name"
-msgid "P7 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:379
-msgctxt "input-name"
-msgid "P7 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:380
-msgctxt "input-name"
-msgid "P7 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:381
-msgctxt "input-name"
-msgid "P7 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:382
-msgctxt "input-name"
-msgid "P7 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:383
-msgctxt "input-name"
-msgid "P7 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:384
-msgctxt "input-name"
-msgid "P7 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:385
-msgctxt "input-name"
-msgid "P7 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:386
-msgctxt "input-name"
-msgid "P7 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:391
-msgctxt "input-name"
-msgid "P8 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:392
-msgctxt "input-name"
-msgid "P8 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:393
-msgctxt "input-name"
-msgid "P8 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:394
-msgctxt "input-name"
-msgid "P8 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:395
-msgctxt "input-name"
-msgid "P8 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:396
-msgctxt "input-name"
-msgid "P8 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:397
-msgctxt "input-name"
-msgid "P8 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:398
-msgctxt "input-name"
-msgid "P8 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:399
-msgctxt "input-name"
-msgid "P8 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:400
-msgctxt "input-name"
-msgid "P8 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:401
-msgctxt "input-name"
-msgid "P8 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:402
-msgctxt "input-name"
-msgid "P8 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:403
-msgctxt "input-name"
-msgid "P8 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:404
-msgctxt "input-name"
-msgid "P8 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:405
-msgctxt "input-name"
-msgid "P8 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:406
-msgctxt "input-name"
-msgid "P8 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:407
-msgctxt "input-name"
-msgid "P8 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:408
-msgctxt "input-name"
-msgid "P8 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:409
-msgctxt "input-name"
-msgid "P8 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:410
-msgctxt "input-name"
-msgid "P8 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:411
-msgctxt "input-name"
-msgid "P8 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:412
-msgctxt "input-name"
-msgid "P8 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:413
-msgctxt "input-name"
-msgid "P8 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:414
-msgctxt "input-name"
-msgid "P8 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:415
-msgctxt "input-name"
-msgid "P8 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:416
-msgctxt "input-name"
-msgid "P8 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:417
-msgctxt "input-name"
-msgid "P8 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:418
-msgctxt "input-name"
-msgid "P8 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:419
-msgctxt "input-name"
-msgid "P8 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:420
-msgctxt "input-name"
-msgid "P8 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:425
-msgctxt "input-name"
-msgid "P9 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:426
-msgctxt "input-name"
-msgid "P9 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:427
-msgctxt "input-name"
-msgid "P9 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:428
-msgctxt "input-name"
-msgid "P9 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:429
-msgctxt "input-name"
-msgid "P9 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:430
-msgctxt "input-name"
-msgid "P9 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:431
-msgctxt "input-name"
-msgid "P9 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:432
-msgctxt "input-name"
-msgid "P9 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:433
-msgctxt "input-name"
-msgid "P9 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:434
-msgctxt "input-name"
-msgid "P9 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:435
-msgctxt "input-name"
-msgid "P9 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:436
-msgctxt "input-name"
-msgid "P9 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:437
-msgctxt "input-name"
-msgid "P9 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:438
-msgctxt "input-name"
-msgid "P9 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:439
-msgctxt "input-name"
-msgid "P9 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:440
-msgctxt "input-name"
-msgid "P9 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:441
-msgctxt "input-name"
-msgid "P9 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:442
-msgctxt "input-name"
-msgid "P9 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:443
-msgctxt "input-name"
-msgid "P9 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:444
-msgctxt "input-name"
-msgid "P9 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:445
-msgctxt "input-name"
-msgid "P9 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:446
-msgctxt "input-name"
-msgid "P9 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:447
-msgctxt "input-name"
-msgid "P9 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:448
-msgctxt "input-name"
-msgid "P9 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:449
-msgctxt "input-name"
-msgid "P9 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:450
-msgctxt "input-name"
-msgid "P9 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:451
-msgctxt "input-name"
-msgid "P9 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:452
-msgctxt "input-name"
-msgid "P9 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:453
-msgctxt "input-name"
-msgid "P9 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:454
-msgctxt "input-name"
-msgid "P9 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:459
-msgctxt "input-name"
-msgid "P10 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:460
-msgctxt "input-name"
-msgid "P10 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:461
-msgctxt "input-name"
-msgid "P10 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:462
-msgctxt "input-name"
-msgid "P10 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:463
-msgctxt "input-name"
-msgid "P10 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:464
-msgctxt "input-name"
-msgid "P10 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:465
-msgctxt "input-name"
-msgid "P10 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:466
-msgctxt "input-name"
-msgid "P10 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:467
-msgctxt "input-name"
-msgid "P10 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:468
-msgctxt "input-name"
-msgid "P10 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:469
-msgctxt "input-name"
-msgid "P10 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:470
-msgctxt "input-name"
-msgid "P10 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:471
-msgctxt "input-name"
-msgid "P10 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:472
-msgctxt "input-name"
-msgid "P10 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:473
-msgctxt "input-name"
-msgid "P10 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:474
-msgctxt "input-name"
-msgid "P10 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:475
-msgctxt "input-name"
-msgid "P10 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:476
-msgctxt "input-name"
-msgid "P10 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:477
-msgctxt "input-name"
-msgid "P10 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:478
-msgctxt "input-name"
-msgid "P10 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:479
-msgctxt "input-name"
-msgid "P10 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:480
-msgctxt "input-name"
-msgid "P10 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:481
-msgctxt "input-name"
-msgid "P10 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:482
-msgctxt "input-name"
-msgid "P10 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:483
-msgctxt "input-name"
-msgid "P10 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:484
-msgctxt "input-name"
-msgid "P10 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:485
-msgctxt "input-name"
-msgid "P10 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:486
-msgctxt "input-name"
-msgid "P10 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:487
-msgctxt "input-name"
-msgid "P10 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:488
-msgctxt "input-name"
-msgid "P10 Select"
-msgstr ""
-
 #: src/emu/inpttype.ipp:493
 msgctxt "input-name"
 msgid "1 Player Start"
@@ -5542,154 +4171,31 @@ msgctxt "input-name"
 msgid "Volume Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:550
-msgctxt "input-name"
-msgid "P1 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:551
-msgctxt "input-name"
-msgid "P2 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:552
-msgctxt "input-name"
-msgid "P3 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:553
-msgctxt "input-name"
-msgid "P4 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:554
-msgctxt "input-name"
-msgid "P5 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:555
-msgctxt "input-name"
-msgid "P6 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:556
-msgctxt "input-name"
-msgid "P7 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:557
-msgctxt "input-name"
-msgid "P8 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:558
-msgctxt "input-name"
-msgid "P9 Pedal 1"
-msgstr ""
-
+#: src/emu/inpttype.ipp:550 src/emu/inpttype.ipp:551 src/emu/inpttype.ipp:552
+#: src/emu/inpttype.ipp:553 src/emu/inpttype.ipp:554 src/emu/inpttype.ipp:555
+#: src/emu/inpttype.ipp:556 src/emu/inpttype.ipp:557 src/emu/inpttype.ipp:558
 #: src/emu/inpttype.ipp:559
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:564
-msgctxt "input-name"
-msgid "P1 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:565
-msgctxt "input-name"
-msgid "P2 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:566
-msgctxt "input-name"
-msgid "P3 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:567
-msgctxt "input-name"
-msgid "P4 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:568
-msgctxt "input-name"
-msgid "P5 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:569
-msgctxt "input-name"
-msgid "P6 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:570
-msgctxt "input-name"
-msgid "P7 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:571
-msgctxt "input-name"
-msgid "P8 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:572
-msgctxt "input-name"
-msgid "P9 Pedal 2"
+msgid "%p Pedal 1"
 msgstr ""
 
+#: src/emu/inpttype.ipp:564 src/emu/inpttype.ipp:565 src/emu/inpttype.ipp:566
+#: src/emu/inpttype.ipp:567 src/emu/inpttype.ipp:568 src/emu/inpttype.ipp:569
+#: src/emu/inpttype.ipp:570 src/emu/inpttype.ipp:571 src/emu/inpttype.ipp:572
 #: src/emu/inpttype.ipp:573
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:578
-msgctxt "input-name"
-msgid "P1 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:579
-msgctxt "input-name"
-msgid "P2 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:580
-msgctxt "input-name"
-msgid "P3 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:581
-msgctxt "input-name"
-msgid "P4 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:582
-msgctxt "input-name"
-msgid "P5 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:583
-msgctxt "input-name"
-msgid "P6 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:584
-msgctxt "input-name"
-msgid "P7 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:585
-msgctxt "input-name"
-msgid "P8 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:586
-msgctxt "input-name"
-msgid "P9 Pedal 3"
+msgid "%p Pedal 2"
 msgstr ""
 
+#: src/emu/inpttype.ipp:578 src/emu/inpttype.ipp:579 src/emu/inpttype.ipp:580
+#: src/emu/inpttype.ipp:581 src/emu/inpttype.ipp:582 src/emu/inpttype.ipp:583
+#: src/emu/inpttype.ipp:584 src/emu/inpttype.ipp:585 src/emu/inpttype.ipp:586
 #: src/emu/inpttype.ipp:587
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 3"
+msgid "%p Pedal 3"
 msgstr ""
 
 #: src/emu/inpttype.ipp:592
diff --git a/language/French_Canada/strings.po b/language/French_Canada/strings.po
index 334a03710ce..8b0c3ac47fe 100644
--- a/language/French_Canada/strings.po
+++ b/language/French_Canada/strings.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-19 02:50+1100\n"
+"POT-Creation-Date: 2021-12-09 04:44+1100\n"
 "PO-Revision-Date: 2016-02-20 18:03+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: MAME Language Team\n"
@@ -261,12 +261,12 @@ msgstr ""
 msgid "Driver: \"%1$s\" software list "
 msgstr ""
 
-#: src/frontend/mame/ui/selsoft.cpp:711 src/frontend/mame/ui/selgame.cpp:1066
+#: src/frontend/mame/ui/selsoft.cpp:711 src/frontend/mame/ui/selgame.cpp:1076
 #, c-format
 msgid "%1$s: %2$s - Search: %3$s_"
 msgstr ""
 
-#: src/frontend/mame/ui/selsoft.cpp:713 src/frontend/mame/ui/selgame.cpp:1068
+#: src/frontend/mame/ui/selsoft.cpp:713 src/frontend/mame/ui/selgame.cpp:1078
 #, c-format
 msgid "Search: %1$s_"
 msgstr ""
@@ -276,7 +276,7 @@ msgstr ""
 msgid "Software list/item: %1$s:%2$s"
 msgstr ""
 
-#: src/frontend/mame/ui/optsmenu.cpp:73 src/frontend/mame/ui/sndmenu.cpp:165
+#: src/frontend/mame/ui/optsmenu.cpp:73 src/frontend/mame/ui/sndmenu.cpp:161
 msgid "Sound Options"
 msgstr ""
 
@@ -371,11 +371,11 @@ msgid "Show mouse pointer"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:39
-msgid "Confirm quit from machines"
+msgid "Confirm quit from emulation"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:40
-msgid "Skip information screen at startup"
+msgid "Skip system information screen"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:41
@@ -391,7 +391,7 @@ msgid "Skip BIOS selection menu"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:44
-msgid "Skip software parts selection menu"
+msgid "Skip software part selection menu"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:45
@@ -543,7 +543,7 @@ msgid "UI active"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:91
-msgid "Offscreen reload"
+msgid "Off-screen reload"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:92
@@ -559,7 +559,7 @@ msgid "Natural keyboard"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:95
-msgid "Simultaneous contradictory"
+msgid "Allow contradictory joystick inputs"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:96
@@ -583,7 +583,7 @@ msgid "Pedal Device Assignment"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:106
-msgid "Adstick Device Assignment"
+msgid "AD Stick Device Assignment"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:107
@@ -670,14 +670,14 @@ msgstr ""
 msgid "Wait Vertical Sync"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:687
+#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:689
 #: src/frontend/mame/ui/videoopt.cpp:191 src/frontend/mame/ui/custui.cpp:490
 #: src/frontend/mame/ui/analogipt.cpp:471 plugins/cheatfind/init.lua:766
 #: plugins/cheatfind/init.lua:777 plugins/cheat/init.lua:668
 msgid "On"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:690
+#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:692
 #: src/frontend/mame/ui/videoopt.cpp:207 src/frontend/mame/ui/custui.cpp:490
 #: src/frontend/mame/ui/analogipt.cpp:471 plugins/cheatfind/init.lua:763
 #: plugins/cheatfind/init.lua:774 plugins/cheat/init.lua:671
@@ -685,11 +685,11 @@ msgstr ""
 msgid "Off"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:693
+#: src/frontend/mame/ui/menu.cpp:695
 msgid "Auto"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:1195
+#: src/frontend/mame/ui/menu.cpp:1197
 #: src/frontend/mame/ui/simpleselgame.cpp:278
 #: src/frontend/mame/ui/selmenu.cpp:1280
 msgid "Return to Previous Menu"
@@ -697,7 +697,7 @@ msgstr ""
 
 #: src/frontend/mame/ui/filemngr.cpp:139
 #: src/frontend/mame/ui/confswitch.cpp:119
-#: src/frontend/mame/ui/inputmap.cpp:559 src/frontend/mame/ui/analogipt.cpp:360
+#: src/frontend/mame/ui/inputmap.cpp:563 src/frontend/mame/ui/analogipt.cpp:360
 #, c-format
 msgid "[root%1$s]"
 msgstr ""
@@ -940,22 +940,22 @@ msgid ""
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "GHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "MHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "kHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "Hz"
 msgstr ""
 
@@ -979,38 +979,38 @@ msgstr ""
 msgid "Vector"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:480
+#: src/frontend/mame/ui/info.cpp:483
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:480
+#: src/frontend/mame/ui/info.cpp:483
 msgid "%2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:497
+#: src/frontend/mame/ui/info.cpp:500
 #, c-format
 msgid "Screen '%1$s'"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:499
+#: src/frontend/mame/ui/info.cpp:502
 msgid "Screen"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:570 src/frontend/mame/ui/info.cpp:581
+#: src/frontend/mame/ui/info.cpp:573 src/frontend/mame/ui/info.cpp:584
 #, c-format
 msgid "%1$s:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:662
+#: src/frontend/mame/ui/info.cpp:665
 msgid "Not supported"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:665
+#: src/frontend/mame/ui/info.cpp:668
 msgid "Partially supported"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:674
+#: src/frontend/mame/ui/info.cpp:677
 msgid "[empty]"
 msgstr ""
 
@@ -1083,7 +1083,7 @@ msgid "Emulated"
 msgstr ""
 
 #: src/frontend/mame/ui/keyboard.cpp:59 src/frontend/mame/ui/confswitch.cpp:117
-#: src/frontend/mame/ui/inputmap.cpp:557 src/frontend/mame/ui/analogipt.cpp:358
+#: src/frontend/mame/ui/inputmap.cpp:561 src/frontend/mame/ui/analogipt.cpp:358
 #, c-format
 msgid "%1$s [root%2$s]"
 msgstr ""
@@ -1443,7 +1443,7 @@ msgctxt "swlist-info"
 msgid "Software list/item"
 msgstr ""
 
-#: src/frontend/mame/ui/datmenu.cpp:88 src/frontend/mame/ui/selmenu.cpp:2698
+#: src/frontend/mame/ui/datmenu.cpp:88 src/frontend/mame/ui/selmenu.cpp:2707
 msgid "Software List Info"
 msgstr ""
 
@@ -1558,7 +1558,7 @@ msgstr ""
 msgid "Configure Machine:"
 msgstr ""
 
-#: src/frontend/mame/ui/miscmenu.cpp:858 src/frontend/mame/ui/selmenu.cpp:2638
+#: src/frontend/mame/ui/miscmenu.cpp:858 src/frontend/mame/ui/selmenu.cpp:2647
 msgid " (default)"
 msgstr ""
 
@@ -1575,7 +1575,7 @@ msgid ""
 "Press %2$s to return to emulation"
 msgstr ""
 
-#: src/frontend/mame/ui/info_pty.cpp:30 src/frontend/mame/ui/mainmenu.cpp:155
+#: src/frontend/mame/ui/info_pty.cpp:30
 msgid "Pseudo terminals"
 msgstr ""
 
@@ -1643,52 +1643,52 @@ msgstr ""
 msgid "Other Controls"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:227
+#: src/frontend/mame/ui/inputmap.cpp:231
 msgid "This machine has no configurable inputs."
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:327
+#: src/frontend/mame/ui/inputmap.cpp:331
 msgid "Pressed"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:397
+#: src/frontend/mame/ui/inputmap.cpp:401
 msgid "Invalid sequence entered"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:542
+#: src/frontend/mame/ui/inputmap.cpp:546
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:543
+#: src/frontend/mame/ui/inputmap.cpp:547
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog Inc"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:544
+#: src/frontend/mame/ui/inputmap.cpp:548
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog Dec"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:586
+#: src/frontend/mame/ui/inputmap.cpp:590
 #, c-format
 msgid "Press %1$s to set\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:587
+#: src/frontend/mame/ui/inputmap.cpp:591
 #, c-format
 msgid "Press %1$s to append\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:588
+#: src/frontend/mame/ui/inputmap.cpp:592
 #, c-format
 msgid "Press %1$s to clear\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:589
+#: src/frontend/mame/ui/inputmap.cpp:593
 #, c-format
 msgid "Press %1$s to restore default\n"
 msgstr ""
@@ -1752,7 +1752,7 @@ msgid ""
 msgstr ""
 
 #: src/frontend/mame/ui/simpleselgame.cpp:273
-#: src/frontend/mame/ui/selgame.cpp:436
+#: src/frontend/mame/ui/selgame.cpp:443
 msgid "Configure Options"
 msgstr ""
 
@@ -2080,16 +2080,16 @@ msgstr ""
 msgid "Expand to fit"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:437
+#: src/frontend/mame/ui/selgame.cpp:444
 msgid "Configure Machine"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:1050
+#: src/frontend/mame/ui/selgame.cpp:1060
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d machines (%5$d BIOS) )"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:1078
+#: src/frontend/mame/ui/selgame.cpp:1088
 #, c-format
 msgid "System: %1$-.100s"
 msgstr ""
@@ -2111,7 +2111,7 @@ msgstr ""
 #: src/frontend/mame/ui/auditmenu.cpp:98
 #, c-format
 msgid ""
-"Auditing ROMs for machine %2$u of %3$u...\n"
+"Auditing media for machine %2$u of %3$u...\n"
 "%1$s"
 msgstr ""
 
@@ -2126,12 +2126,12 @@ msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:136
 #, c-format
-msgid "Audit ROMs for %1$u machines marked unavailable"
+msgid "Audit media for %1$u machines marked unavailable"
 msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:137
 #, c-format
-msgid "Audit ROMs for all %1$u machines"
+msgid "Audit media for all %1$u machines"
 msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:154
@@ -2337,84 +2337,84 @@ msgctxt "color-sample"
 msgid "Clone"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:914
+#: src/frontend/mame/ui/custui.cpp:906
 msgid "ARGB Settings"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:919 src/frontend/mame/ui/custui.cpp:922
+#: src/frontend/mame/ui/custui.cpp:911 src/frontend/mame/ui/custui.cpp:914
 msgctxt "color-channel"
 msgid "Alpha"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:927 src/frontend/mame/ui/custui.cpp:930
+#: src/frontend/mame/ui/custui.cpp:919 src/frontend/mame/ui/custui.cpp:922
 msgctxt "color-channel"
 msgid "Red"
 msgstr ""
 
+#: src/frontend/mame/ui/custui.cpp:927 src/frontend/mame/ui/custui.cpp:930
+msgctxt "color-channel"
+msgid "Green"
+msgstr ""
+
 #: src/frontend/mame/ui/custui.cpp:935 src/frontend/mame/ui/custui.cpp:938
 msgctxt "color-channel"
-msgid "Green"
-msgstr ""
-
-#: src/frontend/mame/ui/custui.cpp:943 src/frontend/mame/ui/custui.cpp:946
-msgctxt "color-channel"
 msgid "Blue"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:949
+#: src/frontend/mame/ui/custui.cpp:941
 msgid "Choose from palette"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:996
+#: src/frontend/mame/ui/custui.cpp:988
 msgid "Color preview:"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1093
+#: src/frontend/mame/ui/custui.cpp:1085
 msgctxt "color-preset"
 msgid "White"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1094
+#: src/frontend/mame/ui/custui.cpp:1086
 msgctxt "color-preset"
 msgid "Silver"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1095
+#: src/frontend/mame/ui/custui.cpp:1087
 msgctxt "color-preset"
 msgid "Gray"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1096
+#: src/frontend/mame/ui/custui.cpp:1088
 msgctxt "color-preset"
 msgid "Black"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1097
+#: src/frontend/mame/ui/custui.cpp:1089
 msgctxt "color-preset"
 msgid "Red"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1098
+#: src/frontend/mame/ui/custui.cpp:1090
 msgctxt "color-preset"
 msgid "Orange"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1099
+#: src/frontend/mame/ui/custui.cpp:1091
 msgctxt "color-preset"
 msgid "Yellow"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1100
+#: src/frontend/mame/ui/custui.cpp:1092
 msgctxt "color-preset"
 msgid "Green"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1101
+#: src/frontend/mame/ui/custui.cpp:1093
 msgctxt "color-preset"
 msgid "Blue"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1102
+#: src/frontend/mame/ui/custui.cpp:1094
 msgctxt "color-preset"
 msgid "Violet"
 msgstr ""
@@ -2479,7 +2479,7 @@ msgid "Input (general)"
 msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:123
-msgid "Input (this Machine)"
+msgid "Input (this machine)"
 msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:126
@@ -2518,6 +2518,10 @@ msgstr ""
 msgid "Tape Control"
 msgstr ""
 
+#: src/frontend/mame/ui/mainmenu.cpp:155
+msgid "Pseudo Terminals"
+msgstr ""
+
 #: src/frontend/mame/ui/mainmenu.cpp:158
 msgid "BIOS Selection"
 msgstr ""
@@ -2556,7 +2560,7 @@ msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:200
 #, c-format
-msgid "About %s"
+msgid "About %1$s"
 msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:212
@@ -2716,373 +2720,373 @@ msgstr ""
 msgid "%1$s %2$s"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2235
+#: src/frontend/mame/ui/selmenu.cpp:2244
 msgid "Images"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2236
+#: src/frontend/mame/ui/selmenu.cpp:2245
 msgid "Infos"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2551
+#: src/frontend/mame/ui/selmenu.cpp:2560
 msgid ""
 "Required ROM/disk images for the selected system are missing or incorrect. "
 "Please acquire the correct files or select a different system.\n"
 "\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2567
+#: src/frontend/mame/ui/selmenu.cpp:2576
 msgid ""
 "Required ROM/disk images for the selected software are missing or incorrect. "
 "Please acquire the correct files or select a different software item.\n"
 "\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2583
+#: src/frontend/mame/ui/selmenu.cpp:2592
 msgid "incorrect checksum"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2586
+#: src/frontend/mame/ui/selmenu.cpp:2595
 msgid "incorrect length"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2589
+#: src/frontend/mame/ui/selmenu.cpp:2598
 msgid "not found"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2600
+#: src/frontend/mame/ui/selmenu.cpp:2609
 #, c-format
 msgid "%1$s (%2$s) - %3$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2602
+#: src/frontend/mame/ui/selmenu.cpp:2611
 #, c-format
 msgid "%1$s - %2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2606
+#: src/frontend/mame/ui/selmenu.cpp:2615
 msgid "Press any key to continue."
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2735
+#: src/frontend/mame/ui/selmenu.cpp:2744
 msgid "General Info"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2887
-#, c-format
-msgid "Romset\t%1$s\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2888
-#, c-format
-msgid "Year\t%1$s\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2889
-#, c-format
-msgid "Manufacturer\t%1$s\n"
-msgstr ""
-
 #: src/frontend/mame/ui/selmenu.cpp:2896
 #, c-format
-msgid "Driver is Clone of\t%1$s\n"
+msgid "Romset\t%1$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2901
-msgid "Driver is Parent\t\n"
+#: src/frontend/mame/ui/selmenu.cpp:2897
+#, c-format
+msgid "Year\t%1$s\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2898
+#, c-format
+msgid "Manufacturer\t%1$s\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2905
-msgid "Analog Controls\tYes\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2907
-msgid "Keyboard Inputs\tYes\n"
+#, c-format
+msgid "Driver is Clone of\t%1$s\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2910
-msgid "Overall\tNOT WORKING\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2912
-msgid "Overall\tUnemulated Protection\n"
+msgid "Driver is Parent\t\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2914
-msgid "Overall\tWorking\n"
+msgid "Analog Controls\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2917
-msgid "Graphics\tUnimplemented\n"
+#: src/frontend/mame/ui/selmenu.cpp:2916
+msgid "Keyboard Inputs\tYes\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2919
-msgid "Graphics\tWrong Colors\n"
+msgid "Overall\tNOT WORKING\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2921
-msgid "Graphics\tImperfect Colors\n"
+msgid "Overall\tUnemulated Protection\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2923
-msgid "Graphics\tImperfect\n"
+msgid "Overall\tWorking\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2925
-msgid "Graphics\tOK\n"
+#: src/frontend/mame/ui/selmenu.cpp:2926
+msgid "Graphics\tUnimplemented\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2928
-msgid "Sound\tNone\n"
+msgid "Graphics\tWrong Colors\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2930
-msgid "Sound\tUnimplemented\n"
+msgid "Graphics\tImperfect Colors\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2932
-msgid "Sound\tImperfect\n"
+msgid "Graphics\tImperfect\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2934
-msgid "Sound\tOK\n"
+msgid "Graphics\tOK\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2937
-msgid "Capture\tUnimplemented\n"
+msgid "Sound\tNone\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2939
+msgid "Sound\tUnimplemented\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2941
+msgid "Sound\tImperfect\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2943
+msgid "Sound\tOK\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2946
+msgid "Capture\tUnimplemented\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2948
 msgid "Capture\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2942
+#: src/frontend/mame/ui/selmenu.cpp:2951
 msgid "Camera\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2944
+#: src/frontend/mame/ui/selmenu.cpp:2953
 msgid "Camera\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2947
+#: src/frontend/mame/ui/selmenu.cpp:2956
 msgid "Microphone\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2949
+#: src/frontend/mame/ui/selmenu.cpp:2958
 msgid "Microphone\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2952
+#: src/frontend/mame/ui/selmenu.cpp:2961
 msgid "Controls\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2954
+#: src/frontend/mame/ui/selmenu.cpp:2963
 msgid "Controls\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2957
+#: src/frontend/mame/ui/selmenu.cpp:2966
 msgid "Keyboard\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2959
+#: src/frontend/mame/ui/selmenu.cpp:2968
 msgid "Keyboard\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2962
+#: src/frontend/mame/ui/selmenu.cpp:2971
 msgid "Mouse\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2964
+#: src/frontend/mame/ui/selmenu.cpp:2973
 msgid "Mouse\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2967
+#: src/frontend/mame/ui/selmenu.cpp:2976
 msgid "Media\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2969
+#: src/frontend/mame/ui/selmenu.cpp:2978
 msgid "Media\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2972
+#: src/frontend/mame/ui/selmenu.cpp:2981
 msgid "Disk\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2974
+#: src/frontend/mame/ui/selmenu.cpp:2983
 msgid "Disk\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2977
+#: src/frontend/mame/ui/selmenu.cpp:2986
 msgid "Printer\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2979
+#: src/frontend/mame/ui/selmenu.cpp:2988
 msgid "Printer\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2982
+#: src/frontend/mame/ui/selmenu.cpp:2991
 msgid "Mag. Tape\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2984
+#: src/frontend/mame/ui/selmenu.cpp:2993
 msgid "Mag. Tape\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2987
+#: src/frontend/mame/ui/selmenu.cpp:2996
 msgid "Punch Tape\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2989
+#: src/frontend/mame/ui/selmenu.cpp:2998
 msgid "Punch Tape\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2992
+#: src/frontend/mame/ui/selmenu.cpp:3001
 msgid "Mag. Drum\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2994
+#: src/frontend/mame/ui/selmenu.cpp:3003
 msgid "Mag. Drum\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2997
+#: src/frontend/mame/ui/selmenu.cpp:3006
 msgid "(EP)ROM\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2999
+#: src/frontend/mame/ui/selmenu.cpp:3008
 msgid "(EP)ROM\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3002
+#: src/frontend/mame/ui/selmenu.cpp:3011
 msgid "Communications\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3004
+#: src/frontend/mame/ui/selmenu.cpp:3013
 msgid "Communications\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3007
+#: src/frontend/mame/ui/selmenu.cpp:3016
 msgid "LAN\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3009
+#: src/frontend/mame/ui/selmenu.cpp:3018
 msgid "LAN\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3012
+#: src/frontend/mame/ui/selmenu.cpp:3021
 msgid "WAN\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3014
+#: src/frontend/mame/ui/selmenu.cpp:3023
 msgid "WAN\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3017
+#: src/frontend/mame/ui/selmenu.cpp:3026
 msgid "Timing\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3019
+#: src/frontend/mame/ui/selmenu.cpp:3028
 msgid "Timing\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3021
+#: src/frontend/mame/ui/selmenu.cpp:3030
 msgid "Mechanical Machine\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3021
+#: src/frontend/mame/ui/selmenu.cpp:3030
 msgid "Mechanical Machine\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3022
+#: src/frontend/mame/ui/selmenu.cpp:3031
 msgid "Requires Artwork\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3022
+#: src/frontend/mame/ui/selmenu.cpp:3031
 msgid "Requires Artwork\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3023
+#: src/frontend/mame/ui/selmenu.cpp:3032
 msgid "Requires Clickable Artwork\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3023
+#: src/frontend/mame/ui/selmenu.cpp:3032
 msgid "Requires Clickable Artwork\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3025
+#: src/frontend/mame/ui/selmenu.cpp:3034
 msgid "Support Cocktail\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3026
+#: src/frontend/mame/ui/selmenu.cpp:3035
 msgid "Driver is BIOS\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3026
+#: src/frontend/mame/ui/selmenu.cpp:3035
 msgid "Driver is BIOS\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3027
+#: src/frontend/mame/ui/selmenu.cpp:3036
 msgid "Support Save\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3027
+#: src/frontend/mame/ui/selmenu.cpp:3036
 msgid "Support Save\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3028
+#: src/frontend/mame/ui/selmenu.cpp:3037
 msgid "Screen Orientation\tVertical\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3028
+#: src/frontend/mame/ui/selmenu.cpp:3037
 msgid "Screen Orientation\tHorizontal\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3038
+#: src/frontend/mame/ui/selmenu.cpp:3047
 msgid "Requires CHD\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3038
+#: src/frontend/mame/ui/selmenu.cpp:3047
 msgid "Requires CHD\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3051
-msgid "ROM Audit Result\tOK\n"
+#: src/frontend/mame/ui/selmenu.cpp:3060
+msgid "Media Audit Result\tOK\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3053
-msgid "ROM Audit Result\tBAD\n"
+#: src/frontend/mame/ui/selmenu.cpp:3062
+msgid "Media Audit Result\tBAD\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3056
+#: src/frontend/mame/ui/selmenu.cpp:3065
 msgid "Samples Audit Result\tNone Needed\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3058
+#: src/frontend/mame/ui/selmenu.cpp:3067
 msgid "Samples Audit Result\tOK\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3060
+#: src/frontend/mame/ui/selmenu.cpp:3069
 msgid "Samples Audit Result\tBAD\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3064
+#: src/frontend/mame/ui/selmenu.cpp:3073
 msgid ""
-"ROM Audit \tDisabled\n"
-"Samples Audit \tDisabled\n"
+"Media Audit\tDisabled\n"
+"Samples Audit\tDisabled\n"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:150
+#: src/frontend/mame/ui/sndmenu.cpp:146
 msgid "Sound"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:151
+#: src/frontend/mame/ui/sndmenu.cpp:147
 msgid "Compressor"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:152
+#: src/frontend/mame/ui/sndmenu.cpp:148
 msgid "Sample Rate"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:153
+#: src/frontend/mame/ui/sndmenu.cpp:149
 msgid "Use External Samples"
 msgstr ""
 
@@ -3121,511 +3125,681 @@ msgstr ""
 msgid "  Screen '%1$s': Vector\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:132
+#: src/frontend/mame/ui/devopt.cpp:135
 #, c-format
 msgid "  Screen '%1$s': %2$d × %3$d (V) %4$s Hz\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:133
+#: src/frontend/mame/ui/devopt.cpp:136
 #, c-format
 msgid "  Screen '%1$s': %2$d × %3$d (H) %4$s Hz\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:147
+#: src/frontend/mame/ui/devopt.cpp:150
 msgid "* Sound:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:211
+#: src/frontend/mame/ui/devopt.cpp:214
 #, c-format
 msgid ""
 "* BIOS settings:\n"
 "  %1$d options    [default: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:255 src/frontend/mame/ui/devopt.cpp:271
-#: src/frontend/mame/ui/devopt.cpp:332
+#: src/frontend/mame/ui/devopt.cpp:258 src/frontend/mame/ui/devopt.cpp:274
+#: src/frontend/mame/ui/devopt.cpp:335
 #, c-format
 msgid "  %1$s    [default: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:260 src/frontend/mame/ui/devopt.cpp:276
+#: src/frontend/mame/ui/devopt.cpp:263 src/frontend/mame/ui/devopt.cpp:279
 #, c-format
 msgid "  %1$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:282
+#: src/frontend/mame/ui/devopt.cpp:285
 msgid "* DIP switch settings:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:287
+#: src/frontend/mame/ui/devopt.cpp:290
 msgid "* Configuration settings:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:291
+#: src/frontend/mame/ui/devopt.cpp:294
 msgid "* Input device(s):\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:293
+#: src/frontend/mame/ui/devopt.cpp:296
 #, c-format
 msgid "  User inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:295
+#: src/frontend/mame/ui/devopt.cpp:298
 #, c-format
 msgid "  Mahjong inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:297
+#: src/frontend/mame/ui/devopt.cpp:300
 #, c-format
 msgid "  Hanafuda inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:299
+#: src/frontend/mame/ui/devopt.cpp:302
 #, c-format
 msgid "  Gambling inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:301
+#: src/frontend/mame/ui/devopt.cpp:304
 #, c-format
 msgid "  Analog inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:303
+#: src/frontend/mame/ui/devopt.cpp:306
 #, c-format
 msgid "  Adjuster inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:305
+#: src/frontend/mame/ui/devopt.cpp:308
 #, c-format
 msgid "  Keypad inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:307
+#: src/frontend/mame/ui/devopt.cpp:310
 #, c-format
 msgid "  Keyboard inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:312
+#: src/frontend/mame/ui/devopt.cpp:315
 msgid "* Media Options:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:317
+#: src/frontend/mame/ui/devopt.cpp:320
 #, c-format
 msgid "  %1$s    [tag: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:327
+#: src/frontend/mame/ui/devopt.cpp:330
 msgid "* Slot Options:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:341
+#: src/frontend/mame/ui/devopt.cpp:344
 msgid "[None]\n"
 msgstr ""
 
-#: src/emu/render.cpp:1847
+#: src/emu/render.cpp:1796
 #, c-format
 msgctxt "view-name"
 msgid "Screen %1$u Standard (%2$u:%3$u)"
 msgstr ""
 
-#: src/emu/render.cpp:1873
+#: src/emu/render.cpp:1822
 #, c-format
 msgctxt "view-name"
 msgid "Screen %1$u Pixel Aspect (%2$u:%3$u)"
 msgstr ""
 
-#: src/emu/render.cpp:1895 src/emu/render.cpp:2030
+#: src/emu/render.cpp:1844 src/emu/render.cpp:1979
 msgctxt "view-name"
 msgid "Cocktail"
 msgstr ""
 
-#: src/emu/render.cpp:2015
+#: src/emu/render.cpp:1964
 msgctxt "view-name"
 msgid "Left-to-Right"
 msgstr ""
 
-#: src/emu/render.cpp:2016
+#: src/emu/render.cpp:1965
 msgctxt "view-name"
 msgid "Left-to-Right (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2017
+#: src/emu/render.cpp:1966
 msgctxt "view-name"
 msgid "Top-to-Bottom"
 msgstr ""
 
-#: src/emu/render.cpp:2018
+#: src/emu/render.cpp:1967
 msgctxt "view-name"
 msgid "Top-to-Bottom (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2069
+#: src/emu/render.cpp:2018
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Left-to-Right, Top-to-Bottom"
 msgstr ""
 
-#: src/emu/render.cpp:2078
+#: src/emu/render.cpp:2027
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Left-to-Right, Top-to-Bottom (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2087
+#: src/emu/render.cpp:2036
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Top-to-Bottom, Left-to-Right"
 msgstr ""
 
-#: src/emu/render.cpp:2096
+#: src/emu/render.cpp:2045
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Top-to-Bottom, Left-to-Right (Gapless)"
 msgstr ""
 
-#: src/emu/inpttype.ipp:22
+#: src/emu/ioport.cpp:332
+#, c-format
 msgctxt "input-name"
-msgid "P1 Up"
+msgid "P%1$u"
 msgstr ""
 
-#: src/emu/inpttype.ipp:23
+#: src/emu/ioport.cpp:1924
 msgctxt "input-name"
-msgid "P1 Down"
+msgid "???"
 msgstr ""
 
-#: src/emu/inpttype.ipp:24
+#: src/emu/inpttype.ipp:22 src/emu/inpttype.ipp:140 src/emu/inpttype.ipp:221
+#: src/emu/inpttype.ipp:255 src/emu/inpttype.ipp:289 src/emu/inpttype.ipp:323
+#: src/emu/inpttype.ipp:357 src/emu/inpttype.ipp:391 src/emu/inpttype.ipp:425
+#: src/emu/inpttype.ipp:459
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left"
+msgid "%p Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:25
+#: src/emu/inpttype.ipp:23 src/emu/inpttype.ipp:141 src/emu/inpttype.ipp:222
+#: src/emu/inpttype.ipp:256 src/emu/inpttype.ipp:290 src/emu/inpttype.ipp:324
+#: src/emu/inpttype.ipp:358 src/emu/inpttype.ipp:392 src/emu/inpttype.ipp:426
+#: src/emu/inpttype.ipp:460
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right"
+msgid "%p Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:26
+#: src/emu/inpttype.ipp:24 src/emu/inpttype.ipp:142 src/emu/inpttype.ipp:223
+#: src/emu/inpttype.ipp:257 src/emu/inpttype.ipp:291 src/emu/inpttype.ipp:325
+#: src/emu/inpttype.ipp:359 src/emu/inpttype.ipp:393 src/emu/inpttype.ipp:427
+#: src/emu/inpttype.ipp:461
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Up"
+msgid "%p Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:27
+#: src/emu/inpttype.ipp:25 src/emu/inpttype.ipp:143 src/emu/inpttype.ipp:224
+#: src/emu/inpttype.ipp:258 src/emu/inpttype.ipp:292 src/emu/inpttype.ipp:326
+#: src/emu/inpttype.ipp:360 src/emu/inpttype.ipp:394 src/emu/inpttype.ipp:428
+#: src/emu/inpttype.ipp:462
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Down"
+msgid "%p Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:28
+#: src/emu/inpttype.ipp:26 src/emu/inpttype.ipp:144 src/emu/inpttype.ipp:225
+#: src/emu/inpttype.ipp:259 src/emu/inpttype.ipp:293 src/emu/inpttype.ipp:327
+#: src/emu/inpttype.ipp:361 src/emu/inpttype.ipp:395 src/emu/inpttype.ipp:429
+#: src/emu/inpttype.ipp:463
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Left"
+msgid "%p Right Stick/Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:29
+#: src/emu/inpttype.ipp:27 src/emu/inpttype.ipp:145 src/emu/inpttype.ipp:226
+#: src/emu/inpttype.ipp:260 src/emu/inpttype.ipp:294 src/emu/inpttype.ipp:328
+#: src/emu/inpttype.ipp:362 src/emu/inpttype.ipp:396 src/emu/inpttype.ipp:430
+#: src/emu/inpttype.ipp:464
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Right"
+msgid "%p Right Stick/Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:30
+#: src/emu/inpttype.ipp:28 src/emu/inpttype.ipp:146 src/emu/inpttype.ipp:227
+#: src/emu/inpttype.ipp:261 src/emu/inpttype.ipp:295 src/emu/inpttype.ipp:329
+#: src/emu/inpttype.ipp:363 src/emu/inpttype.ipp:397 src/emu/inpttype.ipp:431
+#: src/emu/inpttype.ipp:465
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Up"
+msgid "%p Right Stick/Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:31
+#: src/emu/inpttype.ipp:29 src/emu/inpttype.ipp:147 src/emu/inpttype.ipp:228
+#: src/emu/inpttype.ipp:262 src/emu/inpttype.ipp:296 src/emu/inpttype.ipp:330
+#: src/emu/inpttype.ipp:364 src/emu/inpttype.ipp:398 src/emu/inpttype.ipp:432
+#: src/emu/inpttype.ipp:466
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Down"
+msgid "%p Right Stick/Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:32
+#: src/emu/inpttype.ipp:30 src/emu/inpttype.ipp:148 src/emu/inpttype.ipp:229
+#: src/emu/inpttype.ipp:263 src/emu/inpttype.ipp:297 src/emu/inpttype.ipp:331
+#: src/emu/inpttype.ipp:365 src/emu/inpttype.ipp:399 src/emu/inpttype.ipp:433
+#: src/emu/inpttype.ipp:467
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Left"
+msgid "%p Left Stick/Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:33
+#: src/emu/inpttype.ipp:31 src/emu/inpttype.ipp:149 src/emu/inpttype.ipp:230
+#: src/emu/inpttype.ipp:264 src/emu/inpttype.ipp:298 src/emu/inpttype.ipp:332
+#: src/emu/inpttype.ipp:366 src/emu/inpttype.ipp:400 src/emu/inpttype.ipp:434
+#: src/emu/inpttype.ipp:468
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Right"
+msgid "%p Left Stick/Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:34
+#: src/emu/inpttype.ipp:32 src/emu/inpttype.ipp:150 src/emu/inpttype.ipp:231
+#: src/emu/inpttype.ipp:265 src/emu/inpttype.ipp:299 src/emu/inpttype.ipp:333
+#: src/emu/inpttype.ipp:367 src/emu/inpttype.ipp:401 src/emu/inpttype.ipp:435
+#: src/emu/inpttype.ipp:469
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 1"
+msgid "%p Left Stick/Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:35
+#: src/emu/inpttype.ipp:33 src/emu/inpttype.ipp:151 src/emu/inpttype.ipp:232
+#: src/emu/inpttype.ipp:266 src/emu/inpttype.ipp:300 src/emu/inpttype.ipp:334
+#: src/emu/inpttype.ipp:368 src/emu/inpttype.ipp:402 src/emu/inpttype.ipp:436
+#: src/emu/inpttype.ipp:470
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 2"
+msgid "%p Left Stick/Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:36
+#: src/emu/inpttype.ipp:34 src/emu/inpttype.ipp:152 src/emu/inpttype.ipp:233
+#: src/emu/inpttype.ipp:267 src/emu/inpttype.ipp:301 src/emu/inpttype.ipp:335
+#: src/emu/inpttype.ipp:369 src/emu/inpttype.ipp:403 src/emu/inpttype.ipp:437
+#: src/emu/inpttype.ipp:471
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 3"
+msgid "%p Button 1"
 msgstr ""
 
-#: src/emu/inpttype.ipp:37
+#: src/emu/inpttype.ipp:35 src/emu/inpttype.ipp:153 src/emu/inpttype.ipp:234
+#: src/emu/inpttype.ipp:268 src/emu/inpttype.ipp:302 src/emu/inpttype.ipp:336
+#: src/emu/inpttype.ipp:370 src/emu/inpttype.ipp:404 src/emu/inpttype.ipp:438
+#: src/emu/inpttype.ipp:472
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 4"
+msgid "%p Button 2"
 msgstr ""
 
-#: src/emu/inpttype.ipp:38
+#: src/emu/inpttype.ipp:36 src/emu/inpttype.ipp:154 src/emu/inpttype.ipp:235
+#: src/emu/inpttype.ipp:269 src/emu/inpttype.ipp:303 src/emu/inpttype.ipp:337
+#: src/emu/inpttype.ipp:371 src/emu/inpttype.ipp:405 src/emu/inpttype.ipp:439
+#: src/emu/inpttype.ipp:473
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 5"
+msgid "%p Button 3"
 msgstr ""
 
-#: src/emu/inpttype.ipp:39
+#: src/emu/inpttype.ipp:37 src/emu/inpttype.ipp:155 src/emu/inpttype.ipp:236
+#: src/emu/inpttype.ipp:270 src/emu/inpttype.ipp:304 src/emu/inpttype.ipp:338
+#: src/emu/inpttype.ipp:372 src/emu/inpttype.ipp:406 src/emu/inpttype.ipp:440
+#: src/emu/inpttype.ipp:474
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 6"
+msgid "%p Button 4"
 msgstr ""
 
-#: src/emu/inpttype.ipp:40
+#: src/emu/inpttype.ipp:38 src/emu/inpttype.ipp:156 src/emu/inpttype.ipp:237
+#: src/emu/inpttype.ipp:271 src/emu/inpttype.ipp:305 src/emu/inpttype.ipp:339
+#: src/emu/inpttype.ipp:373 src/emu/inpttype.ipp:407 src/emu/inpttype.ipp:441
+#: src/emu/inpttype.ipp:475
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 7"
+msgid "%p Button 5"
 msgstr ""
 
-#: src/emu/inpttype.ipp:41
+#: src/emu/inpttype.ipp:39 src/emu/inpttype.ipp:157 src/emu/inpttype.ipp:238
+#: src/emu/inpttype.ipp:272 src/emu/inpttype.ipp:306 src/emu/inpttype.ipp:340
+#: src/emu/inpttype.ipp:374 src/emu/inpttype.ipp:408 src/emu/inpttype.ipp:442
+#: src/emu/inpttype.ipp:476
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 8"
+msgid "%p Button 6"
 msgstr ""
 
-#: src/emu/inpttype.ipp:42
+#: src/emu/inpttype.ipp:40 src/emu/inpttype.ipp:158 src/emu/inpttype.ipp:239
+#: src/emu/inpttype.ipp:273 src/emu/inpttype.ipp:307 src/emu/inpttype.ipp:341
+#: src/emu/inpttype.ipp:375 src/emu/inpttype.ipp:409 src/emu/inpttype.ipp:443
+#: src/emu/inpttype.ipp:477
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 9"
+msgid "%p Button 7"
 msgstr ""
 
-#: src/emu/inpttype.ipp:43
+#: src/emu/inpttype.ipp:41 src/emu/inpttype.ipp:159 src/emu/inpttype.ipp:240
+#: src/emu/inpttype.ipp:274 src/emu/inpttype.ipp:308 src/emu/inpttype.ipp:342
+#: src/emu/inpttype.ipp:376 src/emu/inpttype.ipp:410 src/emu/inpttype.ipp:444
+#: src/emu/inpttype.ipp:478
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 10"
+msgid "%p Button 8"
 msgstr ""
 
-#: src/emu/inpttype.ipp:44
+#: src/emu/inpttype.ipp:42 src/emu/inpttype.ipp:160 src/emu/inpttype.ipp:241
+#: src/emu/inpttype.ipp:275 src/emu/inpttype.ipp:309 src/emu/inpttype.ipp:343
+#: src/emu/inpttype.ipp:377 src/emu/inpttype.ipp:411 src/emu/inpttype.ipp:445
+#: src/emu/inpttype.ipp:479
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 11"
+msgid "%p Button 9"
 msgstr ""
 
-#: src/emu/inpttype.ipp:45
+#: src/emu/inpttype.ipp:43 src/emu/inpttype.ipp:161 src/emu/inpttype.ipp:242
+#: src/emu/inpttype.ipp:276 src/emu/inpttype.ipp:310 src/emu/inpttype.ipp:344
+#: src/emu/inpttype.ipp:378 src/emu/inpttype.ipp:412 src/emu/inpttype.ipp:446
+#: src/emu/inpttype.ipp:480
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 12"
+msgid "%p Button 10"
 msgstr ""
 
-#: src/emu/inpttype.ipp:46
+#: src/emu/inpttype.ipp:44 src/emu/inpttype.ipp:162 src/emu/inpttype.ipp:243
+#: src/emu/inpttype.ipp:277 src/emu/inpttype.ipp:311 src/emu/inpttype.ipp:345
+#: src/emu/inpttype.ipp:379 src/emu/inpttype.ipp:413 src/emu/inpttype.ipp:447
+#: src/emu/inpttype.ipp:481
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 13"
+msgid "%p Button 11"
 msgstr ""
 
-#: src/emu/inpttype.ipp:47
+#: src/emu/inpttype.ipp:45 src/emu/inpttype.ipp:163 src/emu/inpttype.ipp:244
+#: src/emu/inpttype.ipp:278 src/emu/inpttype.ipp:312 src/emu/inpttype.ipp:346
+#: src/emu/inpttype.ipp:380 src/emu/inpttype.ipp:414 src/emu/inpttype.ipp:448
+#: src/emu/inpttype.ipp:482
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 14"
+msgid "%p Button 12"
 msgstr ""
 
-#: src/emu/inpttype.ipp:48
+#: src/emu/inpttype.ipp:46 src/emu/inpttype.ipp:164 src/emu/inpttype.ipp:245
+#: src/emu/inpttype.ipp:279 src/emu/inpttype.ipp:313 src/emu/inpttype.ipp:347
+#: src/emu/inpttype.ipp:381 src/emu/inpttype.ipp:415 src/emu/inpttype.ipp:449
+#: src/emu/inpttype.ipp:483
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 15"
+msgid "%p Button 13"
 msgstr ""
 
-#: src/emu/inpttype.ipp:49
+#: src/emu/inpttype.ipp:47 src/emu/inpttype.ipp:165 src/emu/inpttype.ipp:246
+#: src/emu/inpttype.ipp:280 src/emu/inpttype.ipp:314 src/emu/inpttype.ipp:348
+#: src/emu/inpttype.ipp:382 src/emu/inpttype.ipp:416 src/emu/inpttype.ipp:450
+#: src/emu/inpttype.ipp:484
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 16"
+msgid "%p Button 14"
 msgstr ""
 
-#: src/emu/inpttype.ipp:50
+#: src/emu/inpttype.ipp:48 src/emu/inpttype.ipp:166 src/emu/inpttype.ipp:247
+#: src/emu/inpttype.ipp:281 src/emu/inpttype.ipp:315 src/emu/inpttype.ipp:349
+#: src/emu/inpttype.ipp:383 src/emu/inpttype.ipp:417 src/emu/inpttype.ipp:451
+#: src/emu/inpttype.ipp:485
+#, c-format
 msgctxt "input-name"
-msgid "P1 Start"
+msgid "%p Button 15"
 msgstr ""
 
-#: src/emu/inpttype.ipp:51
+#: src/emu/inpttype.ipp:49 src/emu/inpttype.ipp:167 src/emu/inpttype.ipp:248
+#: src/emu/inpttype.ipp:282 src/emu/inpttype.ipp:316 src/emu/inpttype.ipp:350
+#: src/emu/inpttype.ipp:384 src/emu/inpttype.ipp:418 src/emu/inpttype.ipp:452
+#: src/emu/inpttype.ipp:486
+#, c-format
 msgctxt "input-name"
-msgid "P1 Select"
+msgid "%p Button 16"
 msgstr ""
 
-#: src/emu/inpttype.ipp:56
+#: src/emu/inpttype.ipp:50 src/emu/inpttype.ipp:168 src/emu/inpttype.ipp:249
+#: src/emu/inpttype.ipp:283 src/emu/inpttype.ipp:317 src/emu/inpttype.ipp:351
+#: src/emu/inpttype.ipp:385 src/emu/inpttype.ipp:419 src/emu/inpttype.ipp:453
+#: src/emu/inpttype.ipp:487
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong A"
+msgid "%p Start"
 msgstr ""
 
-#: src/emu/inpttype.ipp:57
+#: src/emu/inpttype.ipp:51 src/emu/inpttype.ipp:169 src/emu/inpttype.ipp:250
+#: src/emu/inpttype.ipp:284 src/emu/inpttype.ipp:318 src/emu/inpttype.ipp:352
+#: src/emu/inpttype.ipp:386 src/emu/inpttype.ipp:420 src/emu/inpttype.ipp:454
+#: src/emu/inpttype.ipp:488
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong B"
+msgid "%p Select"
 msgstr ""
 
-#: src/emu/inpttype.ipp:58
+#: src/emu/inpttype.ipp:56 src/emu/inpttype.ipp:174
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong C"
+msgid "%p Mahjong A"
 msgstr ""
 
-#: src/emu/inpttype.ipp:59
+#: src/emu/inpttype.ipp:57 src/emu/inpttype.ipp:175
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong D"
+msgid "%p Mahjong B"
 msgstr ""
 
-#: src/emu/inpttype.ipp:60
+#: src/emu/inpttype.ipp:58 src/emu/inpttype.ipp:176
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong E"
+msgid "%p Mahjong C"
 msgstr ""
 
-#: src/emu/inpttype.ipp:61
+#: src/emu/inpttype.ipp:59 src/emu/inpttype.ipp:177
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong F"
+msgid "%p Mahjong D"
 msgstr ""
 
-#: src/emu/inpttype.ipp:62
+#: src/emu/inpttype.ipp:60 src/emu/inpttype.ipp:178
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong G"
+msgid "%p Mahjong E"
 msgstr ""
 
-#: src/emu/inpttype.ipp:63
+#: src/emu/inpttype.ipp:61 src/emu/inpttype.ipp:179
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong H"
+msgid "%p Mahjong F"
 msgstr ""
 
-#: src/emu/inpttype.ipp:64
+#: src/emu/inpttype.ipp:62 src/emu/inpttype.ipp:180
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong I"
+msgid "%p Mahjong G"
 msgstr ""
 
-#: src/emu/inpttype.ipp:65
+#: src/emu/inpttype.ipp:63 src/emu/inpttype.ipp:181
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong J"
+msgid "%p Mahjong H"
 msgstr ""
 
-#: src/emu/inpttype.ipp:66
+#: src/emu/inpttype.ipp:64 src/emu/inpttype.ipp:182
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong K"
+msgid "%p Mahjong I"
 msgstr ""
 
-#: src/emu/inpttype.ipp:67
+#: src/emu/inpttype.ipp:65 src/emu/inpttype.ipp:183
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong L"
+msgid "%p Mahjong J"
 msgstr ""
 
-#: src/emu/inpttype.ipp:68
+#: src/emu/inpttype.ipp:66 src/emu/inpttype.ipp:184
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong M"
+msgid "%p Mahjong K"
 msgstr ""
 
-#: src/emu/inpttype.ipp:69
+#: src/emu/inpttype.ipp:67 src/emu/inpttype.ipp:185
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong N"
+msgid "%p Mahjong L"
 msgstr ""
 
-#: src/emu/inpttype.ipp:70
+#: src/emu/inpttype.ipp:68 src/emu/inpttype.ipp:186
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong O"
+msgid "%p Mahjong M"
 msgstr ""
 
-#: src/emu/inpttype.ipp:71
+#: src/emu/inpttype.ipp:69 src/emu/inpttype.ipp:187
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong P"
+msgid "%p Mahjong N"
 msgstr ""
 
-#: src/emu/inpttype.ipp:72
+#: src/emu/inpttype.ipp:70 src/emu/inpttype.ipp:188
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Q"
+msgid "%p Mahjong O"
 msgstr ""
 
-#: src/emu/inpttype.ipp:73
+#: src/emu/inpttype.ipp:71 src/emu/inpttype.ipp:189
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Kan"
+msgid "%p Mahjong P"
 msgstr ""
 
-#: src/emu/inpttype.ipp:74
+#: src/emu/inpttype.ipp:72 src/emu/inpttype.ipp:190
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Pon"
+msgid "%p Mahjong Q"
 msgstr ""
 
-#: src/emu/inpttype.ipp:75
+#: src/emu/inpttype.ipp:73 src/emu/inpttype.ipp:191
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Chi"
+msgid "%p Mahjong Kan"
 msgstr ""
 
-#: src/emu/inpttype.ipp:76
+#: src/emu/inpttype.ipp:74 src/emu/inpttype.ipp:192
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Reach"
+msgid "%p Mahjong Pon"
 msgstr ""
 
-#: src/emu/inpttype.ipp:77
+#: src/emu/inpttype.ipp:75 src/emu/inpttype.ipp:193
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Ron"
+msgid "%p Mahjong Chi"
 msgstr ""
 
-#: src/emu/inpttype.ipp:78
+#: src/emu/inpttype.ipp:76 src/emu/inpttype.ipp:194
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Flip Flop"
+msgid "%p Mahjong Reach"
 msgstr ""
 
-#: src/emu/inpttype.ipp:79
+#: src/emu/inpttype.ipp:77 src/emu/inpttype.ipp:195
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Bet"
+msgid "%p Mahjong Ron"
 msgstr ""
 
-#: src/emu/inpttype.ipp:80
+#: src/emu/inpttype.ipp:78 src/emu/inpttype.ipp:200
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Take Score"
+msgid "%p Mahjong Flip Flop"
 msgstr ""
 
-#: src/emu/inpttype.ipp:81
+#: src/emu/inpttype.ipp:79 src/emu/inpttype.ipp:196
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Double Up"
+msgid "%p Mahjong Bet"
 msgstr ""
 
-#: src/emu/inpttype.ipp:82
+#: src/emu/inpttype.ipp:80 src/emu/inpttype.ipp:198
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Big"
+msgid "%p Mahjong Take Score"
 msgstr ""
 
-#: src/emu/inpttype.ipp:83
+#: src/emu/inpttype.ipp:81 src/emu/inpttype.ipp:199
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Small"
+msgid "%p Mahjong Double Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:84
+#: src/emu/inpttype.ipp:82 src/emu/inpttype.ipp:201
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Last Chance"
+msgid "%p Mahjong Big"
 msgstr ""
 
-#: src/emu/inpttype.ipp:89
+#: src/emu/inpttype.ipp:83 src/emu/inpttype.ipp:202
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda A/1"
+msgid "%p Mahjong Small"
 msgstr ""
 
-#: src/emu/inpttype.ipp:90
+#: src/emu/inpttype.ipp:84 src/emu/inpttype.ipp:197
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda B/2"
+msgid "%p Mahjong Last Chance"
 msgstr ""
 
-#: src/emu/inpttype.ipp:91
+#: src/emu/inpttype.ipp:89 src/emu/inpttype.ipp:207
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda C/3"
+msgid "%p Hanafuda A/1"
 msgstr ""
 
-#: src/emu/inpttype.ipp:92
+#: src/emu/inpttype.ipp:90 src/emu/inpttype.ipp:208
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda D/4"
+msgid "%p Hanafuda B/2"
 msgstr ""
 
-#: src/emu/inpttype.ipp:93
+#: src/emu/inpttype.ipp:91 src/emu/inpttype.ipp:209
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda E/5"
+msgid "%p Hanafuda C/3"
 msgstr ""
 
-#: src/emu/inpttype.ipp:94
+#: src/emu/inpttype.ipp:92 src/emu/inpttype.ipp:210
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda F/6"
+msgid "%p Hanafuda D/4"
 msgstr ""
 
-#: src/emu/inpttype.ipp:95
+#: src/emu/inpttype.ipp:93 src/emu/inpttype.ipp:211
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda G/7"
+msgid "%p Hanafuda E/5"
 msgstr ""
 
-#: src/emu/inpttype.ipp:96
+#: src/emu/inpttype.ipp:94 src/emu/inpttype.ipp:212
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda H/8"
+msgid "%p Hanafuda F/6"
 msgstr ""
 
-#: src/emu/inpttype.ipp:97
+#: src/emu/inpttype.ipp:95 src/emu/inpttype.ipp:213
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda Yes"
+msgid "%p Hanafuda G/7"
 msgstr ""
 
-#: src/emu/inpttype.ipp:98
+#: src/emu/inpttype.ipp:96 src/emu/inpttype.ipp:214
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda No"
+msgid "%p Hanafuda H/8"
+msgstr ""
+
+#: src/emu/inpttype.ipp:97 src/emu/inpttype.ipp:215
+#, c-format
+msgctxt "input-name"
+msgid "%p Hanafuda Yes"
+msgstr ""
+
+#: src/emu/inpttype.ipp:98 src/emu/inpttype.ipp:216
+#, c-format
+msgctxt "input-name"
+msgid "%p Hanafuda No"
 msgstr ""
 
 #: src/emu/inpttype.ipp:103
@@ -3753,1551 +3927,6 @@ msgctxt "input-name"
 msgid "Stop All Reels"
 msgstr ""
 
-#: src/emu/inpttype.ipp:140
-msgctxt "input-name"
-msgid "P2 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:141
-msgctxt "input-name"
-msgid "P2 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:142
-msgctxt "input-name"
-msgid "P2 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:143
-msgctxt "input-name"
-msgid "P2 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:144
-msgctxt "input-name"
-msgid "P2 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:145
-msgctxt "input-name"
-msgid "P2 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:146
-msgctxt "input-name"
-msgid "P2 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:147
-msgctxt "input-name"
-msgid "P2 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:148
-msgctxt "input-name"
-msgid "P2 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:149
-msgctxt "input-name"
-msgid "P2 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:150
-msgctxt "input-name"
-msgid "P2 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:151
-msgctxt "input-name"
-msgid "P2 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:152
-msgctxt "input-name"
-msgid "P2 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:153
-msgctxt "input-name"
-msgid "P2 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:154
-msgctxt "input-name"
-msgid "P2 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:155
-msgctxt "input-name"
-msgid "P2 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:156
-msgctxt "input-name"
-msgid "P2 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:157
-msgctxt "input-name"
-msgid "P2 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:158
-msgctxt "input-name"
-msgid "P2 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:159
-msgctxt "input-name"
-msgid "P2 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:160
-msgctxt "input-name"
-msgid "P2 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:161
-msgctxt "input-name"
-msgid "P2 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:162
-msgctxt "input-name"
-msgid "P2 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:163
-msgctxt "input-name"
-msgid "P2 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:164
-msgctxt "input-name"
-msgid "P2 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:165
-msgctxt "input-name"
-msgid "P2 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:166
-msgctxt "input-name"
-msgid "P2 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:167
-msgctxt "input-name"
-msgid "P2 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:168
-msgctxt "input-name"
-msgid "P2 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:169
-msgctxt "input-name"
-msgid "P2 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:174
-msgctxt "input-name"
-msgid "P2 Mahjong A"
-msgstr ""
-
-#: src/emu/inpttype.ipp:175
-msgctxt "input-name"
-msgid "P2 Mahjong B"
-msgstr ""
-
-#: src/emu/inpttype.ipp:176
-msgctxt "input-name"
-msgid "P2 Mahjong C"
-msgstr ""
-
-#: src/emu/inpttype.ipp:177
-msgctxt "input-name"
-msgid "P2 Mahjong D"
-msgstr ""
-
-#: src/emu/inpttype.ipp:178
-msgctxt "input-name"
-msgid "P2 Mahjong E"
-msgstr ""
-
-#: src/emu/inpttype.ipp:179
-msgctxt "input-name"
-msgid "P2 Mahjong F"
-msgstr ""
-
-#: src/emu/inpttype.ipp:180
-msgctxt "input-name"
-msgid "P2 Mahjong G"
-msgstr ""
-
-#: src/emu/inpttype.ipp:181
-msgctxt "input-name"
-msgid "P2 Mahjong H"
-msgstr ""
-
-#: src/emu/inpttype.ipp:182
-msgctxt "input-name"
-msgid "P2 Mahjong I"
-msgstr ""
-
-#: src/emu/inpttype.ipp:183
-msgctxt "input-name"
-msgid "P2 Mahjong J"
-msgstr ""
-
-#: src/emu/inpttype.ipp:184
-msgctxt "input-name"
-msgid "P2 Mahjong K"
-msgstr ""
-
-#: src/emu/inpttype.ipp:185
-msgctxt "input-name"
-msgid "P2 Mahjong L"
-msgstr ""
-
-#: src/emu/inpttype.ipp:186
-msgctxt "input-name"
-msgid "P2 Mahjong M"
-msgstr ""
-
-#: src/emu/inpttype.ipp:187
-msgctxt "input-name"
-msgid "P2 Mahjong N"
-msgstr ""
-
-#: src/emu/inpttype.ipp:188
-msgctxt "input-name"
-msgid "P2 Mahjong O"
-msgstr ""
-
-#: src/emu/inpttype.ipp:189
-msgctxt "input-name"
-msgid "P2 Mahjong P"
-msgstr ""
-
-#: src/emu/inpttype.ipp:190
-msgctxt "input-name"
-msgid "P2 Mahjong Q"
-msgstr ""
-
-#: src/emu/inpttype.ipp:191
-msgctxt "input-name"
-msgid "P2 Mahjong Kan"
-msgstr ""
-
-#: src/emu/inpttype.ipp:192
-msgctxt "input-name"
-msgid "P2 Mahjong Pon"
-msgstr ""
-
-#: src/emu/inpttype.ipp:193
-msgctxt "input-name"
-msgid "P2 Mahjong Chi"
-msgstr ""
-
-#: src/emu/inpttype.ipp:194
-msgctxt "input-name"
-msgid "P2 Mahjong Reach"
-msgstr ""
-
-#: src/emu/inpttype.ipp:195
-msgctxt "input-name"
-msgid "P2 Mahjong Ron"
-msgstr ""
-
-#: src/emu/inpttype.ipp:196
-msgctxt "input-name"
-msgid "P2 Mahjong Bet"
-msgstr ""
-
-#: src/emu/inpttype.ipp:197
-msgctxt "input-name"
-msgid "P2 Mahjong Last Chance"
-msgstr ""
-
-#: src/emu/inpttype.ipp:198
-msgctxt "input-name"
-msgid "P2 Mahjong Take Score"
-msgstr ""
-
-#: src/emu/inpttype.ipp:199
-msgctxt "input-name"
-msgid "P2 Mahjong Double Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:200
-msgctxt "input-name"
-msgid "P2 Mahjong Flip Flop"
-msgstr ""
-
-#: src/emu/inpttype.ipp:201
-msgctxt "input-name"
-msgid "P2 Mahjong Big"
-msgstr ""
-
-#: src/emu/inpttype.ipp:202
-msgctxt "input-name"
-msgid "P2 Mahjong Small"
-msgstr ""
-
-#: src/emu/inpttype.ipp:207
-msgctxt "input-name"
-msgid "P2 Hanafuda A/1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:208
-msgctxt "input-name"
-msgid "P2 Hanafuda B/2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:209
-msgctxt "input-name"
-msgid "P2 Hanafuda C/3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:210
-msgctxt "input-name"
-msgid "P2 Hanafuda D/4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:211
-msgctxt "input-name"
-msgid "P2 Hanafuda E/5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:212
-msgctxt "input-name"
-msgid "P2 Hanafuda F/6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:213
-msgctxt "input-name"
-msgid "P2 Hanafuda G/7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:214
-msgctxt "input-name"
-msgid "P2 Hanafuda H/8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:215
-msgctxt "input-name"
-msgid "P2 Hanafuda Yes"
-msgstr ""
-
-#: src/emu/inpttype.ipp:216
-msgctxt "input-name"
-msgid "P2 Hanafuda No"
-msgstr ""
-
-#: src/emu/inpttype.ipp:221
-msgctxt "input-name"
-msgid "P3 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:222
-msgctxt "input-name"
-msgid "P3 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:223
-msgctxt "input-name"
-msgid "P3 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:224
-msgctxt "input-name"
-msgid "P3 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:225
-msgctxt "input-name"
-msgid "P3 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:226
-msgctxt "input-name"
-msgid "P3 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:227
-msgctxt "input-name"
-msgid "P3 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:228
-msgctxt "input-name"
-msgid "P3 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:229
-msgctxt "input-name"
-msgid "P3 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:230
-msgctxt "input-name"
-msgid "P3 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:231
-msgctxt "input-name"
-msgid "P3 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:232
-msgctxt "input-name"
-msgid "P3 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:233
-msgctxt "input-name"
-msgid "P3 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:234
-msgctxt "input-name"
-msgid "P3 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:235
-msgctxt "input-name"
-msgid "P3 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:236
-msgctxt "input-name"
-msgid "P3 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:237
-msgctxt "input-name"
-msgid "P3 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:238
-msgctxt "input-name"
-msgid "P3 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:239
-msgctxt "input-name"
-msgid "P3 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:240
-msgctxt "input-name"
-msgid "P3 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:241
-msgctxt "input-name"
-msgid "P3 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:242
-msgctxt "input-name"
-msgid "P3 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:243
-msgctxt "input-name"
-msgid "P3 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:244
-msgctxt "input-name"
-msgid "P3 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:245
-msgctxt "input-name"
-msgid "P3 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:246
-msgctxt "input-name"
-msgid "P3 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:247
-msgctxt "input-name"
-msgid "P3 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:248
-msgctxt "input-name"
-msgid "P3 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:249
-msgctxt "input-name"
-msgid "P3 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:250
-msgctxt "input-name"
-msgid "P3 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:255
-msgctxt "input-name"
-msgid "P4 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:256
-msgctxt "input-name"
-msgid "P4 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:257
-msgctxt "input-name"
-msgid "P4 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:258
-msgctxt "input-name"
-msgid "P4 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:259
-msgctxt "input-name"
-msgid "P4 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:260
-msgctxt "input-name"
-msgid "P4 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:261
-msgctxt "input-name"
-msgid "P4 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:262
-msgctxt "input-name"
-msgid "P4 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:263
-msgctxt "input-name"
-msgid "P4 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:264
-msgctxt "input-name"
-msgid "P4 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:265
-msgctxt "input-name"
-msgid "P4 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:266
-msgctxt "input-name"
-msgid "P4 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:267
-msgctxt "input-name"
-msgid "P4 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:268
-msgctxt "input-name"
-msgid "P4 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:269
-msgctxt "input-name"
-msgid "P4 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:270
-msgctxt "input-name"
-msgid "P4 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:271
-msgctxt "input-name"
-msgid "P4 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:272
-msgctxt "input-name"
-msgid "P4 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:273
-msgctxt "input-name"
-msgid "P4 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:274
-msgctxt "input-name"
-msgid "P4 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:275
-msgctxt "input-name"
-msgid "P4 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:276
-msgctxt "input-name"
-msgid "P4 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:277
-msgctxt "input-name"
-msgid "P4 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:278
-msgctxt "input-name"
-msgid "P4 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:279
-msgctxt "input-name"
-msgid "P4 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:280
-msgctxt "input-name"
-msgid "P4 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:281
-msgctxt "input-name"
-msgid "P4 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:282
-msgctxt "input-name"
-msgid "P4 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:283
-msgctxt "input-name"
-msgid "P4 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:284
-msgctxt "input-name"
-msgid "P4 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:289
-msgctxt "input-name"
-msgid "P5 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:290
-msgctxt "input-name"
-msgid "P5 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:291
-msgctxt "input-name"
-msgid "P5 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:292
-msgctxt "input-name"
-msgid "P5 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:293
-msgctxt "input-name"
-msgid "P5 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:294
-msgctxt "input-name"
-msgid "P5 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:295
-msgctxt "input-name"
-msgid "P5 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:296
-msgctxt "input-name"
-msgid "P5 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:297
-msgctxt "input-name"
-msgid "P5 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:298
-msgctxt "input-name"
-msgid "P5 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:299
-msgctxt "input-name"
-msgid "P5 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:300
-msgctxt "input-name"
-msgid "P5 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:301
-msgctxt "input-name"
-msgid "P5 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:302
-msgctxt "input-name"
-msgid "P5 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:303
-msgctxt "input-name"
-msgid "P5 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:304
-msgctxt "input-name"
-msgid "P5 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:305
-msgctxt "input-name"
-msgid "P5 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:306
-msgctxt "input-name"
-msgid "P5 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:307
-msgctxt "input-name"
-msgid "P5 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:308
-msgctxt "input-name"
-msgid "P5 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:309
-msgctxt "input-name"
-msgid "P5 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:310
-msgctxt "input-name"
-msgid "P5 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:311
-msgctxt "input-name"
-msgid "P5 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:312
-msgctxt "input-name"
-msgid "P5 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:313
-msgctxt "input-name"
-msgid "P5 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:314
-msgctxt "input-name"
-msgid "P5 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:315
-msgctxt "input-name"
-msgid "P5 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:316
-msgctxt "input-name"
-msgid "P5 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:317
-msgctxt "input-name"
-msgid "P5 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:318
-msgctxt "input-name"
-msgid "P5 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:323
-msgctxt "input-name"
-msgid "P6 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:324
-msgctxt "input-name"
-msgid "P6 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:325
-msgctxt "input-name"
-msgid "P6 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:326
-msgctxt "input-name"
-msgid "P6 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:327
-msgctxt "input-name"
-msgid "P6 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:328
-msgctxt "input-name"
-msgid "P6 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:329
-msgctxt "input-name"
-msgid "P6 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:330
-msgctxt "input-name"
-msgid "P6 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:331
-msgctxt "input-name"
-msgid "P6 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:332
-msgctxt "input-name"
-msgid "P6 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:333
-msgctxt "input-name"
-msgid "P6 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:334
-msgctxt "input-name"
-msgid "P6 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:335
-msgctxt "input-name"
-msgid "P6 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:336
-msgctxt "input-name"
-msgid "P6 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:337
-msgctxt "input-name"
-msgid "P6 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:338
-msgctxt "input-name"
-msgid "P6 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:339
-msgctxt "input-name"
-msgid "P6 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:340
-msgctxt "input-name"
-msgid "P6 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:341
-msgctxt "input-name"
-msgid "P6 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:342
-msgctxt "input-name"
-msgid "P6 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:343
-msgctxt "input-name"
-msgid "P6 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:344
-msgctxt "input-name"
-msgid "P6 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:345
-msgctxt "input-name"
-msgid "P6 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:346
-msgctxt "input-name"
-msgid "P6 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:347
-msgctxt "input-name"
-msgid "P6 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:348
-msgctxt "input-name"
-msgid "P6 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:349
-msgctxt "input-name"
-msgid "P6 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:350
-msgctxt "input-name"
-msgid "P6 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:351
-msgctxt "input-name"
-msgid "P6 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:352
-msgctxt "input-name"
-msgid "P6 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:357
-msgctxt "input-name"
-msgid "P7 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:358
-msgctxt "input-name"
-msgid "P7 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:359
-msgctxt "input-name"
-msgid "P7 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:360
-msgctxt "input-name"
-msgid "P7 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:361
-msgctxt "input-name"
-msgid "P7 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:362
-msgctxt "input-name"
-msgid "P7 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:363
-msgctxt "input-name"
-msgid "P7 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:364
-msgctxt "input-name"
-msgid "P7 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:365
-msgctxt "input-name"
-msgid "P7 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:366
-msgctxt "input-name"
-msgid "P7 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:367
-msgctxt "input-name"
-msgid "P7 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:368
-msgctxt "input-name"
-msgid "P7 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:369
-msgctxt "input-name"
-msgid "P7 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:370
-msgctxt "input-name"
-msgid "P7 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:371
-msgctxt "input-name"
-msgid "P7 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:372
-msgctxt "input-name"
-msgid "P7 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:373
-msgctxt "input-name"
-msgid "P7 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:374
-msgctxt "input-name"
-msgid "P7 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:375
-msgctxt "input-name"
-msgid "P7 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:376
-msgctxt "input-name"
-msgid "P7 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:377
-msgctxt "input-name"
-msgid "P7 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:378
-msgctxt "input-name"
-msgid "P7 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:379
-msgctxt "input-name"
-msgid "P7 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:380
-msgctxt "input-name"
-msgid "P7 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:381
-msgctxt "input-name"
-msgid "P7 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:382
-msgctxt "input-name"
-msgid "P7 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:383
-msgctxt "input-name"
-msgid "P7 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:384
-msgctxt "input-name"
-msgid "P7 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:385
-msgctxt "input-name"
-msgid "P7 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:386
-msgctxt "input-name"
-msgid "P7 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:391
-msgctxt "input-name"
-msgid "P8 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:392
-msgctxt "input-name"
-msgid "P8 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:393
-msgctxt "input-name"
-msgid "P8 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:394
-msgctxt "input-name"
-msgid "P8 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:395
-msgctxt "input-name"
-msgid "P8 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:396
-msgctxt "input-name"
-msgid "P8 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:397
-msgctxt "input-name"
-msgid "P8 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:398
-msgctxt "input-name"
-msgid "P8 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:399
-msgctxt "input-name"
-msgid "P8 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:400
-msgctxt "input-name"
-msgid "P8 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:401
-msgctxt "input-name"
-msgid "P8 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:402
-msgctxt "input-name"
-msgid "P8 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:403
-msgctxt "input-name"
-msgid "P8 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:404
-msgctxt "input-name"
-msgid "P8 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:405
-msgctxt "input-name"
-msgid "P8 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:406
-msgctxt "input-name"
-msgid "P8 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:407
-msgctxt "input-name"
-msgid "P8 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:408
-msgctxt "input-name"
-msgid "P8 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:409
-msgctxt "input-name"
-msgid "P8 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:410
-msgctxt "input-name"
-msgid "P8 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:411
-msgctxt "input-name"
-msgid "P8 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:412
-msgctxt "input-name"
-msgid "P8 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:413
-msgctxt "input-name"
-msgid "P8 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:414
-msgctxt "input-name"
-msgid "P8 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:415
-msgctxt "input-name"
-msgid "P8 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:416
-msgctxt "input-name"
-msgid "P8 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:417
-msgctxt "input-name"
-msgid "P8 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:418
-msgctxt "input-name"
-msgid "P8 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:419
-msgctxt "input-name"
-msgid "P8 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:420
-msgctxt "input-name"
-msgid "P8 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:425
-msgctxt "input-name"
-msgid "P9 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:426
-msgctxt "input-name"
-msgid "P9 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:427
-msgctxt "input-name"
-msgid "P9 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:428
-msgctxt "input-name"
-msgid "P9 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:429
-msgctxt "input-name"
-msgid "P9 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:430
-msgctxt "input-name"
-msgid "P9 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:431
-msgctxt "input-name"
-msgid "P9 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:432
-msgctxt "input-name"
-msgid "P9 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:433
-msgctxt "input-name"
-msgid "P9 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:434
-msgctxt "input-name"
-msgid "P9 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:435
-msgctxt "input-name"
-msgid "P9 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:436
-msgctxt "input-name"
-msgid "P9 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:437
-msgctxt "input-name"
-msgid "P9 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:438
-msgctxt "input-name"
-msgid "P9 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:439
-msgctxt "input-name"
-msgid "P9 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:440
-msgctxt "input-name"
-msgid "P9 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:441
-msgctxt "input-name"
-msgid "P9 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:442
-msgctxt "input-name"
-msgid "P9 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:443
-msgctxt "input-name"
-msgid "P9 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:444
-msgctxt "input-name"
-msgid "P9 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:445
-msgctxt "input-name"
-msgid "P9 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:446
-msgctxt "input-name"
-msgid "P9 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:447
-msgctxt "input-name"
-msgid "P9 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:448
-msgctxt "input-name"
-msgid "P9 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:449
-msgctxt "input-name"
-msgid "P9 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:450
-msgctxt "input-name"
-msgid "P9 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:451
-msgctxt "input-name"
-msgid "P9 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:452
-msgctxt "input-name"
-msgid "P9 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:453
-msgctxt "input-name"
-msgid "P9 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:454
-msgctxt "input-name"
-msgid "P9 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:459
-msgctxt "input-name"
-msgid "P10 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:460
-msgctxt "input-name"
-msgid "P10 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:461
-msgctxt "input-name"
-msgid "P10 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:462
-msgctxt "input-name"
-msgid "P10 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:463
-msgctxt "input-name"
-msgid "P10 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:464
-msgctxt "input-name"
-msgid "P10 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:465
-msgctxt "input-name"
-msgid "P10 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:466
-msgctxt "input-name"
-msgid "P10 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:467
-msgctxt "input-name"
-msgid "P10 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:468
-msgctxt "input-name"
-msgid "P10 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:469
-msgctxt "input-name"
-msgid "P10 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:470
-msgctxt "input-name"
-msgid "P10 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:471
-msgctxt "input-name"
-msgid "P10 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:472
-msgctxt "input-name"
-msgid "P10 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:473
-msgctxt "input-name"
-msgid "P10 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:474
-msgctxt "input-name"
-msgid "P10 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:475
-msgctxt "input-name"
-msgid "P10 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:476
-msgctxt "input-name"
-msgid "P10 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:477
-msgctxt "input-name"
-msgid "P10 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:478
-msgctxt "input-name"
-msgid "P10 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:479
-msgctxt "input-name"
-msgid "P10 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:480
-msgctxt "input-name"
-msgid "P10 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:481
-msgctxt "input-name"
-msgid "P10 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:482
-msgctxt "input-name"
-msgid "P10 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:483
-msgctxt "input-name"
-msgid "P10 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:484
-msgctxt "input-name"
-msgid "P10 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:485
-msgctxt "input-name"
-msgid "P10 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:486
-msgctxt "input-name"
-msgid "P10 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:487
-msgctxt "input-name"
-msgid "P10 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:488
-msgctxt "input-name"
-msgid "P10 Select"
-msgstr ""
-
 #: src/emu/inpttype.ipp:493
 msgctxt "input-name"
 msgid "1 Player Start"
@@ -5478,154 +4107,31 @@ msgctxt "input-name"
 msgid "Volume Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:550
-msgctxt "input-name"
-msgid "P1 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:551
-msgctxt "input-name"
-msgid "P2 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:552
-msgctxt "input-name"
-msgid "P3 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:553
-msgctxt "input-name"
-msgid "P4 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:554
-msgctxt "input-name"
-msgid "P5 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:555
-msgctxt "input-name"
-msgid "P6 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:556
-msgctxt "input-name"
-msgid "P7 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:557
-msgctxt "input-name"
-msgid "P8 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:558
-msgctxt "input-name"
-msgid "P9 Pedal 1"
-msgstr ""
-
+#: src/emu/inpttype.ipp:550 src/emu/inpttype.ipp:551 src/emu/inpttype.ipp:552
+#: src/emu/inpttype.ipp:553 src/emu/inpttype.ipp:554 src/emu/inpttype.ipp:555
+#: src/emu/inpttype.ipp:556 src/emu/inpttype.ipp:557 src/emu/inpttype.ipp:558
 #: src/emu/inpttype.ipp:559
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:564
-msgctxt "input-name"
-msgid "P1 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:565
-msgctxt "input-name"
-msgid "P2 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:566
-msgctxt "input-name"
-msgid "P3 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:567
-msgctxt "input-name"
-msgid "P4 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:568
-msgctxt "input-name"
-msgid "P5 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:569
-msgctxt "input-name"
-msgid "P6 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:570
-msgctxt "input-name"
-msgid "P7 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:571
-msgctxt "input-name"
-msgid "P8 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:572
-msgctxt "input-name"
-msgid "P9 Pedal 2"
+msgid "%p Pedal 1"
 msgstr ""
 
+#: src/emu/inpttype.ipp:564 src/emu/inpttype.ipp:565 src/emu/inpttype.ipp:566
+#: src/emu/inpttype.ipp:567 src/emu/inpttype.ipp:568 src/emu/inpttype.ipp:569
+#: src/emu/inpttype.ipp:570 src/emu/inpttype.ipp:571 src/emu/inpttype.ipp:572
 #: src/emu/inpttype.ipp:573
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:578
-msgctxt "input-name"
-msgid "P1 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:579
-msgctxt "input-name"
-msgid "P2 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:580
-msgctxt "input-name"
-msgid "P3 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:581
-msgctxt "input-name"
-msgid "P4 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:582
-msgctxt "input-name"
-msgid "P5 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:583
-msgctxt "input-name"
-msgid "P6 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:584
-msgctxt "input-name"
-msgid "P7 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:585
-msgctxt "input-name"
-msgid "P8 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:586
-msgctxt "input-name"
-msgid "P9 Pedal 3"
+msgid "%p Pedal 2"
 msgstr ""
 
+#: src/emu/inpttype.ipp:578 src/emu/inpttype.ipp:579 src/emu/inpttype.ipp:580
+#: src/emu/inpttype.ipp:581 src/emu/inpttype.ipp:582 src/emu/inpttype.ipp:583
+#: src/emu/inpttype.ipp:584 src/emu/inpttype.ipp:585 src/emu/inpttype.ipp:586
 #: src/emu/inpttype.ipp:587
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 3"
+msgid "%p Pedal 3"
 msgstr ""
 
 #: src/emu/inpttype.ipp:592
diff --git a/language/Georgian/strings.po b/language/Georgian/strings.po
index ef8c428fb4b..74f280b45f4 100644
--- a/language/Georgian/strings.po
+++ b/language/Georgian/strings.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-19 02:50+1100\n"
+"POT-Creation-Date: 2021-12-09 04:44+1100\n"
 "PO-Revision-Date: 2016-02-20 18:03+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: MAME Language Team\n"
@@ -259,12 +259,12 @@ msgstr ""
 msgid "Driver: \"%1$s\" software list "
 msgstr ""
 
-#: src/frontend/mame/ui/selsoft.cpp:711 src/frontend/mame/ui/selgame.cpp:1066
+#: src/frontend/mame/ui/selsoft.cpp:711 src/frontend/mame/ui/selgame.cpp:1076
 #, c-format
 msgid "%1$s: %2$s - Search: %3$s_"
 msgstr ""
 
-#: src/frontend/mame/ui/selsoft.cpp:713 src/frontend/mame/ui/selgame.cpp:1068
+#: src/frontend/mame/ui/selsoft.cpp:713 src/frontend/mame/ui/selgame.cpp:1078
 #, c-format
 msgid "Search: %1$s_"
 msgstr ""
@@ -274,7 +274,7 @@ msgstr ""
 msgid "Software list/item: %1$s:%2$s"
 msgstr ""
 
-#: src/frontend/mame/ui/optsmenu.cpp:73 src/frontend/mame/ui/sndmenu.cpp:165
+#: src/frontend/mame/ui/optsmenu.cpp:73 src/frontend/mame/ui/sndmenu.cpp:161
 msgid "Sound Options"
 msgstr ""
 
@@ -369,11 +369,11 @@ msgid "Show mouse pointer"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:39
-msgid "Confirm quit from machines"
+msgid "Confirm quit from emulation"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:40
-msgid "Skip information screen at startup"
+msgid "Skip system information screen"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:41
@@ -389,7 +389,7 @@ msgid "Skip BIOS selection menu"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:44
-msgid "Skip software parts selection menu"
+msgid "Skip software part selection menu"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:45
@@ -541,7 +541,7 @@ msgid "UI active"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:91
-msgid "Offscreen reload"
+msgid "Off-screen reload"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:92
@@ -557,7 +557,7 @@ msgid "Natural keyboard"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:95
-msgid "Simultaneous contradictory"
+msgid "Allow contradictory joystick inputs"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:96
@@ -581,7 +581,7 @@ msgid "Pedal Device Assignment"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:106
-msgid "Adstick Device Assignment"
+msgid "AD Stick Device Assignment"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:107
@@ -668,14 +668,14 @@ msgstr ""
 msgid "Wait Vertical Sync"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:687
+#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:689
 #: src/frontend/mame/ui/videoopt.cpp:191 src/frontend/mame/ui/custui.cpp:490
 #: src/frontend/mame/ui/analogipt.cpp:471 plugins/cheatfind/init.lua:766
 #: plugins/cheatfind/init.lua:777 plugins/cheat/init.lua:668
 msgid "On"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:690
+#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:692
 #: src/frontend/mame/ui/videoopt.cpp:207 src/frontend/mame/ui/custui.cpp:490
 #: src/frontend/mame/ui/analogipt.cpp:471 plugins/cheatfind/init.lua:763
 #: plugins/cheatfind/init.lua:774 plugins/cheat/init.lua:671
@@ -683,11 +683,11 @@ msgstr ""
 msgid "Off"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:693
+#: src/frontend/mame/ui/menu.cpp:695
 msgid "Auto"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:1195
+#: src/frontend/mame/ui/menu.cpp:1197
 #: src/frontend/mame/ui/simpleselgame.cpp:278
 #: src/frontend/mame/ui/selmenu.cpp:1280
 msgid "Return to Previous Menu"
@@ -695,7 +695,7 @@ msgstr ""
 
 #: src/frontend/mame/ui/filemngr.cpp:139
 #: src/frontend/mame/ui/confswitch.cpp:119
-#: src/frontend/mame/ui/inputmap.cpp:559 src/frontend/mame/ui/analogipt.cpp:360
+#: src/frontend/mame/ui/inputmap.cpp:563 src/frontend/mame/ui/analogipt.cpp:360
 #, c-format
 msgid "[root%1$s]"
 msgstr ""
@@ -938,22 +938,22 @@ msgid ""
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "GHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "MHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "kHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "Hz"
 msgstr ""
 
@@ -977,38 +977,38 @@ msgstr ""
 msgid "Vector"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:480
+#: src/frontend/mame/ui/info.cpp:483
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:480
+#: src/frontend/mame/ui/info.cpp:483
 msgid "%2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:497
+#: src/frontend/mame/ui/info.cpp:500
 #, c-format
 msgid "Screen '%1$s'"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:499
+#: src/frontend/mame/ui/info.cpp:502
 msgid "Screen"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:570 src/frontend/mame/ui/info.cpp:581
+#: src/frontend/mame/ui/info.cpp:573 src/frontend/mame/ui/info.cpp:584
 #, c-format
 msgid "%1$s:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:662
+#: src/frontend/mame/ui/info.cpp:665
 msgid "Not supported"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:665
+#: src/frontend/mame/ui/info.cpp:668
 msgid "Partially supported"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:674
+#: src/frontend/mame/ui/info.cpp:677
 msgid "[empty]"
 msgstr ""
 
@@ -1081,7 +1081,7 @@ msgid "Emulated"
 msgstr ""
 
 #: src/frontend/mame/ui/keyboard.cpp:59 src/frontend/mame/ui/confswitch.cpp:117
-#: src/frontend/mame/ui/inputmap.cpp:557 src/frontend/mame/ui/analogipt.cpp:358
+#: src/frontend/mame/ui/inputmap.cpp:561 src/frontend/mame/ui/analogipt.cpp:358
 #, c-format
 msgid "%1$s [root%2$s]"
 msgstr ""
@@ -1441,7 +1441,7 @@ msgctxt "swlist-info"
 msgid "Software list/item"
 msgstr ""
 
-#: src/frontend/mame/ui/datmenu.cpp:88 src/frontend/mame/ui/selmenu.cpp:2698
+#: src/frontend/mame/ui/datmenu.cpp:88 src/frontend/mame/ui/selmenu.cpp:2707
 msgid "Software List Info"
 msgstr ""
 
@@ -1556,7 +1556,7 @@ msgstr ""
 msgid "Configure Machine:"
 msgstr ""
 
-#: src/frontend/mame/ui/miscmenu.cpp:858 src/frontend/mame/ui/selmenu.cpp:2638
+#: src/frontend/mame/ui/miscmenu.cpp:858 src/frontend/mame/ui/selmenu.cpp:2647
 msgid " (default)"
 msgstr ""
 
@@ -1573,7 +1573,7 @@ msgid ""
 "Press %2$s to return to emulation"
 msgstr ""
 
-#: src/frontend/mame/ui/info_pty.cpp:30 src/frontend/mame/ui/mainmenu.cpp:155
+#: src/frontend/mame/ui/info_pty.cpp:30
 msgid "Pseudo terminals"
 msgstr ""
 
@@ -1641,52 +1641,52 @@ msgstr ""
 msgid "Other Controls"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:227
+#: src/frontend/mame/ui/inputmap.cpp:231
 msgid "This machine has no configurable inputs."
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:327
+#: src/frontend/mame/ui/inputmap.cpp:331
 msgid "Pressed"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:397
+#: src/frontend/mame/ui/inputmap.cpp:401
 msgid "Invalid sequence entered"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:542
+#: src/frontend/mame/ui/inputmap.cpp:546
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:543
+#: src/frontend/mame/ui/inputmap.cpp:547
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog Inc"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:544
+#: src/frontend/mame/ui/inputmap.cpp:548
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog Dec"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:586
+#: src/frontend/mame/ui/inputmap.cpp:590
 #, c-format
 msgid "Press %1$s to set\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:587
+#: src/frontend/mame/ui/inputmap.cpp:591
 #, c-format
 msgid "Press %1$s to append\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:588
+#: src/frontend/mame/ui/inputmap.cpp:592
 #, c-format
 msgid "Press %1$s to clear\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:589
+#: src/frontend/mame/ui/inputmap.cpp:593
 #, c-format
 msgid "Press %1$s to restore default\n"
 msgstr ""
@@ -1750,7 +1750,7 @@ msgid ""
 msgstr ""
 
 #: src/frontend/mame/ui/simpleselgame.cpp:273
-#: src/frontend/mame/ui/selgame.cpp:436
+#: src/frontend/mame/ui/selgame.cpp:443
 msgid "Configure Options"
 msgstr ""
 
@@ -2078,16 +2078,16 @@ msgstr ""
 msgid "Expand to fit"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:437
+#: src/frontend/mame/ui/selgame.cpp:444
 msgid "Configure Machine"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:1050
+#: src/frontend/mame/ui/selgame.cpp:1060
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d machines (%5$d BIOS) )"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:1078
+#: src/frontend/mame/ui/selgame.cpp:1088
 #, c-format
 msgid "System: %1$-.100s"
 msgstr ""
@@ -2109,7 +2109,7 @@ msgstr ""
 #: src/frontend/mame/ui/auditmenu.cpp:98
 #, c-format
 msgid ""
-"Auditing ROMs for machine %2$u of %3$u...\n"
+"Auditing media for machine %2$u of %3$u...\n"
 "%1$s"
 msgstr ""
 
@@ -2124,12 +2124,12 @@ msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:136
 #, c-format
-msgid "Audit ROMs for %1$u machines marked unavailable"
+msgid "Audit media for %1$u machines marked unavailable"
 msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:137
 #, c-format
-msgid "Audit ROMs for all %1$u machines"
+msgid "Audit media for all %1$u machines"
 msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:154
@@ -2335,84 +2335,84 @@ msgctxt "color-sample"
 msgid "Clone"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:914
+#: src/frontend/mame/ui/custui.cpp:906
 msgid "ARGB Settings"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:919 src/frontend/mame/ui/custui.cpp:922
+#: src/frontend/mame/ui/custui.cpp:911 src/frontend/mame/ui/custui.cpp:914
 msgctxt "color-channel"
 msgid "Alpha"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:927 src/frontend/mame/ui/custui.cpp:930
+#: src/frontend/mame/ui/custui.cpp:919 src/frontend/mame/ui/custui.cpp:922
 msgctxt "color-channel"
 msgid "Red"
 msgstr ""
 
+#: src/frontend/mame/ui/custui.cpp:927 src/frontend/mame/ui/custui.cpp:930
+msgctxt "color-channel"
+msgid "Green"
+msgstr ""
+
 #: src/frontend/mame/ui/custui.cpp:935 src/frontend/mame/ui/custui.cpp:938
 msgctxt "color-channel"
-msgid "Green"
-msgstr ""
-
-#: src/frontend/mame/ui/custui.cpp:943 src/frontend/mame/ui/custui.cpp:946
-msgctxt "color-channel"
 msgid "Blue"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:949
+#: src/frontend/mame/ui/custui.cpp:941
 msgid "Choose from palette"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:996
+#: src/frontend/mame/ui/custui.cpp:988
 msgid "Color preview:"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1093
+#: src/frontend/mame/ui/custui.cpp:1085
 msgctxt "color-preset"
 msgid "White"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1094
+#: src/frontend/mame/ui/custui.cpp:1086
 msgctxt "color-preset"
 msgid "Silver"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1095
+#: src/frontend/mame/ui/custui.cpp:1087
 msgctxt "color-preset"
 msgid "Gray"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1096
+#: src/frontend/mame/ui/custui.cpp:1088
 msgctxt "color-preset"
 msgid "Black"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1097
+#: src/frontend/mame/ui/custui.cpp:1089
 msgctxt "color-preset"
 msgid "Red"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1098
+#: src/frontend/mame/ui/custui.cpp:1090
 msgctxt "color-preset"
 msgid "Orange"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1099
+#: src/frontend/mame/ui/custui.cpp:1091
 msgctxt "color-preset"
 msgid "Yellow"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1100
+#: src/frontend/mame/ui/custui.cpp:1092
 msgctxt "color-preset"
 msgid "Green"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1101
+#: src/frontend/mame/ui/custui.cpp:1093
 msgctxt "color-preset"
 msgid "Blue"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1102
+#: src/frontend/mame/ui/custui.cpp:1094
 msgctxt "color-preset"
 msgid "Violet"
 msgstr ""
@@ -2477,7 +2477,7 @@ msgid "Input (general)"
 msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:123
-msgid "Input (this Machine)"
+msgid "Input (this machine)"
 msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:126
@@ -2516,6 +2516,10 @@ msgstr ""
 msgid "Tape Control"
 msgstr ""
 
+#: src/frontend/mame/ui/mainmenu.cpp:155
+msgid "Pseudo Terminals"
+msgstr ""
+
 #: src/frontend/mame/ui/mainmenu.cpp:158
 msgid "BIOS Selection"
 msgstr ""
@@ -2554,7 +2558,7 @@ msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:200
 #, c-format
-msgid "About %s"
+msgid "About %1$s"
 msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:212
@@ -2714,373 +2718,373 @@ msgstr ""
 msgid "%1$s %2$s"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2235
+#: src/frontend/mame/ui/selmenu.cpp:2244
 msgid "Images"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2236
+#: src/frontend/mame/ui/selmenu.cpp:2245
 msgid "Infos"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2551
+#: src/frontend/mame/ui/selmenu.cpp:2560
 msgid ""
 "Required ROM/disk images for the selected system are missing or incorrect. "
 "Please acquire the correct files or select a different system.\n"
 "\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2567
+#: src/frontend/mame/ui/selmenu.cpp:2576
 msgid ""
 "Required ROM/disk images for the selected software are missing or incorrect. "
 "Please acquire the correct files or select a different software item.\n"
 "\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2583
+#: src/frontend/mame/ui/selmenu.cpp:2592
 msgid "incorrect checksum"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2586
+#: src/frontend/mame/ui/selmenu.cpp:2595
 msgid "incorrect length"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2589
+#: src/frontend/mame/ui/selmenu.cpp:2598
 msgid "not found"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2600
+#: src/frontend/mame/ui/selmenu.cpp:2609
 #, c-format
 msgid "%1$s (%2$s) - %3$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2602
+#: src/frontend/mame/ui/selmenu.cpp:2611
 #, c-format
 msgid "%1$s - %2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2606
+#: src/frontend/mame/ui/selmenu.cpp:2615
 msgid "Press any key to continue."
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2735
+#: src/frontend/mame/ui/selmenu.cpp:2744
 msgid "General Info"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2887
-#, c-format
-msgid "Romset\t%1$s\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2888
-#, c-format
-msgid "Year\t%1$s\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2889
-#, c-format
-msgid "Manufacturer\t%1$s\n"
-msgstr ""
-
 #: src/frontend/mame/ui/selmenu.cpp:2896
 #, c-format
-msgid "Driver is Clone of\t%1$s\n"
+msgid "Romset\t%1$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2901
-msgid "Driver is Parent\t\n"
+#: src/frontend/mame/ui/selmenu.cpp:2897
+#, c-format
+msgid "Year\t%1$s\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2898
+#, c-format
+msgid "Manufacturer\t%1$s\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2905
-msgid "Analog Controls\tYes\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2907
-msgid "Keyboard Inputs\tYes\n"
+#, c-format
+msgid "Driver is Clone of\t%1$s\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2910
-msgid "Overall\tNOT WORKING\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2912
-msgid "Overall\tUnemulated Protection\n"
+msgid "Driver is Parent\t\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2914
-msgid "Overall\tWorking\n"
+msgid "Analog Controls\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2917
-msgid "Graphics\tUnimplemented\n"
+#: src/frontend/mame/ui/selmenu.cpp:2916
+msgid "Keyboard Inputs\tYes\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2919
-msgid "Graphics\tWrong Colors\n"
+msgid "Overall\tNOT WORKING\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2921
-msgid "Graphics\tImperfect Colors\n"
+msgid "Overall\tUnemulated Protection\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2923
-msgid "Graphics\tImperfect\n"
+msgid "Overall\tWorking\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2925
-msgid "Graphics\tOK\n"
+#: src/frontend/mame/ui/selmenu.cpp:2926
+msgid "Graphics\tUnimplemented\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2928
-msgid "Sound\tNone\n"
+msgid "Graphics\tWrong Colors\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2930
-msgid "Sound\tUnimplemented\n"
+msgid "Graphics\tImperfect Colors\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2932
-msgid "Sound\tImperfect\n"
+msgid "Graphics\tImperfect\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2934
-msgid "Sound\tOK\n"
+msgid "Graphics\tOK\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2937
-msgid "Capture\tUnimplemented\n"
+msgid "Sound\tNone\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2939
+msgid "Sound\tUnimplemented\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2941
+msgid "Sound\tImperfect\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2943
+msgid "Sound\tOK\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2946
+msgid "Capture\tUnimplemented\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2948
 msgid "Capture\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2942
+#: src/frontend/mame/ui/selmenu.cpp:2951
 msgid "Camera\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2944
+#: src/frontend/mame/ui/selmenu.cpp:2953
 msgid "Camera\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2947
+#: src/frontend/mame/ui/selmenu.cpp:2956
 msgid "Microphone\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2949
+#: src/frontend/mame/ui/selmenu.cpp:2958
 msgid "Microphone\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2952
+#: src/frontend/mame/ui/selmenu.cpp:2961
 msgid "Controls\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2954
+#: src/frontend/mame/ui/selmenu.cpp:2963
 msgid "Controls\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2957
+#: src/frontend/mame/ui/selmenu.cpp:2966
 msgid "Keyboard\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2959
+#: src/frontend/mame/ui/selmenu.cpp:2968
 msgid "Keyboard\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2962
+#: src/frontend/mame/ui/selmenu.cpp:2971
 msgid "Mouse\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2964
+#: src/frontend/mame/ui/selmenu.cpp:2973
 msgid "Mouse\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2967
+#: src/frontend/mame/ui/selmenu.cpp:2976
 msgid "Media\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2969
+#: src/frontend/mame/ui/selmenu.cpp:2978
 msgid "Media\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2972
+#: src/frontend/mame/ui/selmenu.cpp:2981
 msgid "Disk\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2974
+#: src/frontend/mame/ui/selmenu.cpp:2983
 msgid "Disk\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2977
+#: src/frontend/mame/ui/selmenu.cpp:2986
 msgid "Printer\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2979
+#: src/frontend/mame/ui/selmenu.cpp:2988
 msgid "Printer\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2982
+#: src/frontend/mame/ui/selmenu.cpp:2991
 msgid "Mag. Tape\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2984
+#: src/frontend/mame/ui/selmenu.cpp:2993
 msgid "Mag. Tape\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2987
+#: src/frontend/mame/ui/selmenu.cpp:2996
 msgid "Punch Tape\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2989
+#: src/frontend/mame/ui/selmenu.cpp:2998
 msgid "Punch Tape\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2992
+#: src/frontend/mame/ui/selmenu.cpp:3001
 msgid "Mag. Drum\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2994
+#: src/frontend/mame/ui/selmenu.cpp:3003
 msgid "Mag. Drum\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2997
+#: src/frontend/mame/ui/selmenu.cpp:3006
 msgid "(EP)ROM\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2999
+#: src/frontend/mame/ui/selmenu.cpp:3008
 msgid "(EP)ROM\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3002
+#: src/frontend/mame/ui/selmenu.cpp:3011
 msgid "Communications\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3004
+#: src/frontend/mame/ui/selmenu.cpp:3013
 msgid "Communications\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3007
+#: src/frontend/mame/ui/selmenu.cpp:3016
 msgid "LAN\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3009
+#: src/frontend/mame/ui/selmenu.cpp:3018
 msgid "LAN\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3012
+#: src/frontend/mame/ui/selmenu.cpp:3021
 msgid "WAN\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3014
+#: src/frontend/mame/ui/selmenu.cpp:3023
 msgid "WAN\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3017
+#: src/frontend/mame/ui/selmenu.cpp:3026
 msgid "Timing\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3019
+#: src/frontend/mame/ui/selmenu.cpp:3028
 msgid "Timing\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3021
+#: src/frontend/mame/ui/selmenu.cpp:3030
 msgid "Mechanical Machine\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3021
+#: src/frontend/mame/ui/selmenu.cpp:3030
 msgid "Mechanical Machine\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3022
+#: src/frontend/mame/ui/selmenu.cpp:3031
 msgid "Requires Artwork\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3022
+#: src/frontend/mame/ui/selmenu.cpp:3031
 msgid "Requires Artwork\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3023
+#: src/frontend/mame/ui/selmenu.cpp:3032
 msgid "Requires Clickable Artwork\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3023
+#: src/frontend/mame/ui/selmenu.cpp:3032
 msgid "Requires Clickable Artwork\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3025
+#: src/frontend/mame/ui/selmenu.cpp:3034
 msgid "Support Cocktail\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3026
+#: src/frontend/mame/ui/selmenu.cpp:3035
 msgid "Driver is BIOS\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3026
+#: src/frontend/mame/ui/selmenu.cpp:3035
 msgid "Driver is BIOS\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3027
+#: src/frontend/mame/ui/selmenu.cpp:3036
 msgid "Support Save\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3027
+#: src/frontend/mame/ui/selmenu.cpp:3036
 msgid "Support Save\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3028
+#: src/frontend/mame/ui/selmenu.cpp:3037
 msgid "Screen Orientation\tVertical\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3028
+#: src/frontend/mame/ui/selmenu.cpp:3037
 msgid "Screen Orientation\tHorizontal\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3038
+#: src/frontend/mame/ui/selmenu.cpp:3047
 msgid "Requires CHD\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3038
+#: src/frontend/mame/ui/selmenu.cpp:3047
 msgid "Requires CHD\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3051
-msgid "ROM Audit Result\tOK\n"
+#: src/frontend/mame/ui/selmenu.cpp:3060
+msgid "Media Audit Result\tOK\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3053
-msgid "ROM Audit Result\tBAD\n"
+#: src/frontend/mame/ui/selmenu.cpp:3062
+msgid "Media Audit Result\tBAD\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3056
+#: src/frontend/mame/ui/selmenu.cpp:3065
 msgid "Samples Audit Result\tNone Needed\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3058
+#: src/frontend/mame/ui/selmenu.cpp:3067
 msgid "Samples Audit Result\tOK\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3060
+#: src/frontend/mame/ui/selmenu.cpp:3069
 msgid "Samples Audit Result\tBAD\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3064
+#: src/frontend/mame/ui/selmenu.cpp:3073
 msgid ""
-"ROM Audit \tDisabled\n"
-"Samples Audit \tDisabled\n"
+"Media Audit\tDisabled\n"
+"Samples Audit\tDisabled\n"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:150
+#: src/frontend/mame/ui/sndmenu.cpp:146
 msgid "Sound"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:151
+#: src/frontend/mame/ui/sndmenu.cpp:147
 msgid "Compressor"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:152
+#: src/frontend/mame/ui/sndmenu.cpp:148
 msgid "Sample Rate"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:153
+#: src/frontend/mame/ui/sndmenu.cpp:149
 msgid "Use External Samples"
 msgstr ""
 
@@ -3119,511 +3123,681 @@ msgstr ""
 msgid "  Screen '%1$s': Vector\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:132
+#: src/frontend/mame/ui/devopt.cpp:135
 #, c-format
 msgid "  Screen '%1$s': %2$d × %3$d (V) %4$s Hz\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:133
+#: src/frontend/mame/ui/devopt.cpp:136
 #, c-format
 msgid "  Screen '%1$s': %2$d × %3$d (H) %4$s Hz\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:147
+#: src/frontend/mame/ui/devopt.cpp:150
 msgid "* Sound:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:211
+#: src/frontend/mame/ui/devopt.cpp:214
 #, c-format
 msgid ""
 "* BIOS settings:\n"
 "  %1$d options    [default: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:255 src/frontend/mame/ui/devopt.cpp:271
-#: src/frontend/mame/ui/devopt.cpp:332
+#: src/frontend/mame/ui/devopt.cpp:258 src/frontend/mame/ui/devopt.cpp:274
+#: src/frontend/mame/ui/devopt.cpp:335
 #, c-format
 msgid "  %1$s    [default: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:260 src/frontend/mame/ui/devopt.cpp:276
+#: src/frontend/mame/ui/devopt.cpp:263 src/frontend/mame/ui/devopt.cpp:279
 #, c-format
 msgid "  %1$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:282
+#: src/frontend/mame/ui/devopt.cpp:285
 msgid "* DIP switch settings:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:287
+#: src/frontend/mame/ui/devopt.cpp:290
 msgid "* Configuration settings:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:291
+#: src/frontend/mame/ui/devopt.cpp:294
 msgid "* Input device(s):\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:293
+#: src/frontend/mame/ui/devopt.cpp:296
 #, c-format
 msgid "  User inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:295
+#: src/frontend/mame/ui/devopt.cpp:298
 #, c-format
 msgid "  Mahjong inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:297
+#: src/frontend/mame/ui/devopt.cpp:300
 #, c-format
 msgid "  Hanafuda inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:299
+#: src/frontend/mame/ui/devopt.cpp:302
 #, c-format
 msgid "  Gambling inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:301
+#: src/frontend/mame/ui/devopt.cpp:304
 #, c-format
 msgid "  Analog inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:303
+#: src/frontend/mame/ui/devopt.cpp:306
 #, c-format
 msgid "  Adjuster inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:305
+#: src/frontend/mame/ui/devopt.cpp:308
 #, c-format
 msgid "  Keypad inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:307
+#: src/frontend/mame/ui/devopt.cpp:310
 #, c-format
 msgid "  Keyboard inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:312
+#: src/frontend/mame/ui/devopt.cpp:315
 msgid "* Media Options:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:317
+#: src/frontend/mame/ui/devopt.cpp:320
 #, c-format
 msgid "  %1$s    [tag: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:327
+#: src/frontend/mame/ui/devopt.cpp:330
 msgid "* Slot Options:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:341
+#: src/frontend/mame/ui/devopt.cpp:344
 msgid "[None]\n"
 msgstr ""
 
-#: src/emu/render.cpp:1847
+#: src/emu/render.cpp:1796
 #, c-format
 msgctxt "view-name"
 msgid "Screen %1$u Standard (%2$u:%3$u)"
 msgstr ""
 
-#: src/emu/render.cpp:1873
+#: src/emu/render.cpp:1822
 #, c-format
 msgctxt "view-name"
 msgid "Screen %1$u Pixel Aspect (%2$u:%3$u)"
 msgstr ""
 
-#: src/emu/render.cpp:1895 src/emu/render.cpp:2030
+#: src/emu/render.cpp:1844 src/emu/render.cpp:1979
 msgctxt "view-name"
 msgid "Cocktail"
 msgstr ""
 
-#: src/emu/render.cpp:2015
+#: src/emu/render.cpp:1964
 msgctxt "view-name"
 msgid "Left-to-Right"
 msgstr ""
 
-#: src/emu/render.cpp:2016
+#: src/emu/render.cpp:1965
 msgctxt "view-name"
 msgid "Left-to-Right (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2017
+#: src/emu/render.cpp:1966
 msgctxt "view-name"
 msgid "Top-to-Bottom"
 msgstr ""
 
-#: src/emu/render.cpp:2018
+#: src/emu/render.cpp:1967
 msgctxt "view-name"
 msgid "Top-to-Bottom (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2069
+#: src/emu/render.cpp:2018
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Left-to-Right, Top-to-Bottom"
 msgstr ""
 
-#: src/emu/render.cpp:2078
+#: src/emu/render.cpp:2027
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Left-to-Right, Top-to-Bottom (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2087
+#: src/emu/render.cpp:2036
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Top-to-Bottom, Left-to-Right"
 msgstr ""
 
-#: src/emu/render.cpp:2096
+#: src/emu/render.cpp:2045
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Top-to-Bottom, Left-to-Right (Gapless)"
 msgstr ""
 
-#: src/emu/inpttype.ipp:22
+#: src/emu/ioport.cpp:332
+#, c-format
 msgctxt "input-name"
-msgid "P1 Up"
+msgid "P%1$u"
 msgstr ""
 
-#: src/emu/inpttype.ipp:23
+#: src/emu/ioport.cpp:1924
 msgctxt "input-name"
-msgid "P1 Down"
+msgid "???"
 msgstr ""
 
-#: src/emu/inpttype.ipp:24
+#: src/emu/inpttype.ipp:22 src/emu/inpttype.ipp:140 src/emu/inpttype.ipp:221
+#: src/emu/inpttype.ipp:255 src/emu/inpttype.ipp:289 src/emu/inpttype.ipp:323
+#: src/emu/inpttype.ipp:357 src/emu/inpttype.ipp:391 src/emu/inpttype.ipp:425
+#: src/emu/inpttype.ipp:459
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left"
+msgid "%p Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:25
+#: src/emu/inpttype.ipp:23 src/emu/inpttype.ipp:141 src/emu/inpttype.ipp:222
+#: src/emu/inpttype.ipp:256 src/emu/inpttype.ipp:290 src/emu/inpttype.ipp:324
+#: src/emu/inpttype.ipp:358 src/emu/inpttype.ipp:392 src/emu/inpttype.ipp:426
+#: src/emu/inpttype.ipp:460
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right"
+msgid "%p Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:26
+#: src/emu/inpttype.ipp:24 src/emu/inpttype.ipp:142 src/emu/inpttype.ipp:223
+#: src/emu/inpttype.ipp:257 src/emu/inpttype.ipp:291 src/emu/inpttype.ipp:325
+#: src/emu/inpttype.ipp:359 src/emu/inpttype.ipp:393 src/emu/inpttype.ipp:427
+#: src/emu/inpttype.ipp:461
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Up"
+msgid "%p Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:27
+#: src/emu/inpttype.ipp:25 src/emu/inpttype.ipp:143 src/emu/inpttype.ipp:224
+#: src/emu/inpttype.ipp:258 src/emu/inpttype.ipp:292 src/emu/inpttype.ipp:326
+#: src/emu/inpttype.ipp:360 src/emu/inpttype.ipp:394 src/emu/inpttype.ipp:428
+#: src/emu/inpttype.ipp:462
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Down"
+msgid "%p Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:28
+#: src/emu/inpttype.ipp:26 src/emu/inpttype.ipp:144 src/emu/inpttype.ipp:225
+#: src/emu/inpttype.ipp:259 src/emu/inpttype.ipp:293 src/emu/inpttype.ipp:327
+#: src/emu/inpttype.ipp:361 src/emu/inpttype.ipp:395 src/emu/inpttype.ipp:429
+#: src/emu/inpttype.ipp:463
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Left"
+msgid "%p Right Stick/Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:29
+#: src/emu/inpttype.ipp:27 src/emu/inpttype.ipp:145 src/emu/inpttype.ipp:226
+#: src/emu/inpttype.ipp:260 src/emu/inpttype.ipp:294 src/emu/inpttype.ipp:328
+#: src/emu/inpttype.ipp:362 src/emu/inpttype.ipp:396 src/emu/inpttype.ipp:430
+#: src/emu/inpttype.ipp:464
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Right"
+msgid "%p Right Stick/Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:30
+#: src/emu/inpttype.ipp:28 src/emu/inpttype.ipp:146 src/emu/inpttype.ipp:227
+#: src/emu/inpttype.ipp:261 src/emu/inpttype.ipp:295 src/emu/inpttype.ipp:329
+#: src/emu/inpttype.ipp:363 src/emu/inpttype.ipp:397 src/emu/inpttype.ipp:431
+#: src/emu/inpttype.ipp:465
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Up"
+msgid "%p Right Stick/Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:31
+#: src/emu/inpttype.ipp:29 src/emu/inpttype.ipp:147 src/emu/inpttype.ipp:228
+#: src/emu/inpttype.ipp:262 src/emu/inpttype.ipp:296 src/emu/inpttype.ipp:330
+#: src/emu/inpttype.ipp:364 src/emu/inpttype.ipp:398 src/emu/inpttype.ipp:432
+#: src/emu/inpttype.ipp:466
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Down"
+msgid "%p Right Stick/Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:32
+#: src/emu/inpttype.ipp:30 src/emu/inpttype.ipp:148 src/emu/inpttype.ipp:229
+#: src/emu/inpttype.ipp:263 src/emu/inpttype.ipp:297 src/emu/inpttype.ipp:331
+#: src/emu/inpttype.ipp:365 src/emu/inpttype.ipp:399 src/emu/inpttype.ipp:433
+#: src/emu/inpttype.ipp:467
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Left"
+msgid "%p Left Stick/Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:33
+#: src/emu/inpttype.ipp:31 src/emu/inpttype.ipp:149 src/emu/inpttype.ipp:230
+#: src/emu/inpttype.ipp:264 src/emu/inpttype.ipp:298 src/emu/inpttype.ipp:332
+#: src/emu/inpttype.ipp:366 src/emu/inpttype.ipp:400 src/emu/inpttype.ipp:434
+#: src/emu/inpttype.ipp:468
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Right"
+msgid "%p Left Stick/Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:34
+#: src/emu/inpttype.ipp:32 src/emu/inpttype.ipp:150 src/emu/inpttype.ipp:231
+#: src/emu/inpttype.ipp:265 src/emu/inpttype.ipp:299 src/emu/inpttype.ipp:333
+#: src/emu/inpttype.ipp:367 src/emu/inpttype.ipp:401 src/emu/inpttype.ipp:435
+#: src/emu/inpttype.ipp:469
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 1"
+msgid "%p Left Stick/Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:35
+#: src/emu/inpttype.ipp:33 src/emu/inpttype.ipp:151 src/emu/inpttype.ipp:232
+#: src/emu/inpttype.ipp:266 src/emu/inpttype.ipp:300 src/emu/inpttype.ipp:334
+#: src/emu/inpttype.ipp:368 src/emu/inpttype.ipp:402 src/emu/inpttype.ipp:436
+#: src/emu/inpttype.ipp:470
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 2"
+msgid "%p Left Stick/Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:36
+#: src/emu/inpttype.ipp:34 src/emu/inpttype.ipp:152 src/emu/inpttype.ipp:233
+#: src/emu/inpttype.ipp:267 src/emu/inpttype.ipp:301 src/emu/inpttype.ipp:335
+#: src/emu/inpttype.ipp:369 src/emu/inpttype.ipp:403 src/emu/inpttype.ipp:437
+#: src/emu/inpttype.ipp:471
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 3"
+msgid "%p Button 1"
 msgstr ""
 
-#: src/emu/inpttype.ipp:37
+#: src/emu/inpttype.ipp:35 src/emu/inpttype.ipp:153 src/emu/inpttype.ipp:234
+#: src/emu/inpttype.ipp:268 src/emu/inpttype.ipp:302 src/emu/inpttype.ipp:336
+#: src/emu/inpttype.ipp:370 src/emu/inpttype.ipp:404 src/emu/inpttype.ipp:438
+#: src/emu/inpttype.ipp:472
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 4"
+msgid "%p Button 2"
 msgstr ""
 
-#: src/emu/inpttype.ipp:38
+#: src/emu/inpttype.ipp:36 src/emu/inpttype.ipp:154 src/emu/inpttype.ipp:235
+#: src/emu/inpttype.ipp:269 src/emu/inpttype.ipp:303 src/emu/inpttype.ipp:337
+#: src/emu/inpttype.ipp:371 src/emu/inpttype.ipp:405 src/emu/inpttype.ipp:439
+#: src/emu/inpttype.ipp:473
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 5"
+msgid "%p Button 3"
 msgstr ""
 
-#: src/emu/inpttype.ipp:39
+#: src/emu/inpttype.ipp:37 src/emu/inpttype.ipp:155 src/emu/inpttype.ipp:236
+#: src/emu/inpttype.ipp:270 src/emu/inpttype.ipp:304 src/emu/inpttype.ipp:338
+#: src/emu/inpttype.ipp:372 src/emu/inpttype.ipp:406 src/emu/inpttype.ipp:440
+#: src/emu/inpttype.ipp:474
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 6"
+msgid "%p Button 4"
 msgstr ""
 
-#: src/emu/inpttype.ipp:40
+#: src/emu/inpttype.ipp:38 src/emu/inpttype.ipp:156 src/emu/inpttype.ipp:237
+#: src/emu/inpttype.ipp:271 src/emu/inpttype.ipp:305 src/emu/inpttype.ipp:339
+#: src/emu/inpttype.ipp:373 src/emu/inpttype.ipp:407 src/emu/inpttype.ipp:441
+#: src/emu/inpttype.ipp:475
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 7"
+msgid "%p Button 5"
 msgstr ""
 
-#: src/emu/inpttype.ipp:41
+#: src/emu/inpttype.ipp:39 src/emu/inpttype.ipp:157 src/emu/inpttype.ipp:238
+#: src/emu/inpttype.ipp:272 src/emu/inpttype.ipp:306 src/emu/inpttype.ipp:340
+#: src/emu/inpttype.ipp:374 src/emu/inpttype.ipp:408 src/emu/inpttype.ipp:442
+#: src/emu/inpttype.ipp:476
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 8"
+msgid "%p Button 6"
 msgstr ""
 
-#: src/emu/inpttype.ipp:42
+#: src/emu/inpttype.ipp:40 src/emu/inpttype.ipp:158 src/emu/inpttype.ipp:239
+#: src/emu/inpttype.ipp:273 src/emu/inpttype.ipp:307 src/emu/inpttype.ipp:341
+#: src/emu/inpttype.ipp:375 src/emu/inpttype.ipp:409 src/emu/inpttype.ipp:443
+#: src/emu/inpttype.ipp:477
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 9"
+msgid "%p Button 7"
 msgstr ""
 
-#: src/emu/inpttype.ipp:43
+#: src/emu/inpttype.ipp:41 src/emu/inpttype.ipp:159 src/emu/inpttype.ipp:240
+#: src/emu/inpttype.ipp:274 src/emu/inpttype.ipp:308 src/emu/inpttype.ipp:342
+#: src/emu/inpttype.ipp:376 src/emu/inpttype.ipp:410 src/emu/inpttype.ipp:444
+#: src/emu/inpttype.ipp:478
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 10"
+msgid "%p Button 8"
 msgstr ""
 
-#: src/emu/inpttype.ipp:44
+#: src/emu/inpttype.ipp:42 src/emu/inpttype.ipp:160 src/emu/inpttype.ipp:241
+#: src/emu/inpttype.ipp:275 src/emu/inpttype.ipp:309 src/emu/inpttype.ipp:343
+#: src/emu/inpttype.ipp:377 src/emu/inpttype.ipp:411 src/emu/inpttype.ipp:445
+#: src/emu/inpttype.ipp:479
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 11"
+msgid "%p Button 9"
 msgstr ""
 
-#: src/emu/inpttype.ipp:45
+#: src/emu/inpttype.ipp:43 src/emu/inpttype.ipp:161 src/emu/inpttype.ipp:242
+#: src/emu/inpttype.ipp:276 src/emu/inpttype.ipp:310 src/emu/inpttype.ipp:344
+#: src/emu/inpttype.ipp:378 src/emu/inpttype.ipp:412 src/emu/inpttype.ipp:446
+#: src/emu/inpttype.ipp:480
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 12"
+msgid "%p Button 10"
 msgstr ""
 
-#: src/emu/inpttype.ipp:46
+#: src/emu/inpttype.ipp:44 src/emu/inpttype.ipp:162 src/emu/inpttype.ipp:243
+#: src/emu/inpttype.ipp:277 src/emu/inpttype.ipp:311 src/emu/inpttype.ipp:345
+#: src/emu/inpttype.ipp:379 src/emu/inpttype.ipp:413 src/emu/inpttype.ipp:447
+#: src/emu/inpttype.ipp:481
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 13"
+msgid "%p Button 11"
 msgstr ""
 
-#: src/emu/inpttype.ipp:47
+#: src/emu/inpttype.ipp:45 src/emu/inpttype.ipp:163 src/emu/inpttype.ipp:244
+#: src/emu/inpttype.ipp:278 src/emu/inpttype.ipp:312 src/emu/inpttype.ipp:346
+#: src/emu/inpttype.ipp:380 src/emu/inpttype.ipp:414 src/emu/inpttype.ipp:448
+#: src/emu/inpttype.ipp:482
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 14"
+msgid "%p Button 12"
 msgstr ""
 
-#: src/emu/inpttype.ipp:48
+#: src/emu/inpttype.ipp:46 src/emu/inpttype.ipp:164 src/emu/inpttype.ipp:245
+#: src/emu/inpttype.ipp:279 src/emu/inpttype.ipp:313 src/emu/inpttype.ipp:347
+#: src/emu/inpttype.ipp:381 src/emu/inpttype.ipp:415 src/emu/inpttype.ipp:449
+#: src/emu/inpttype.ipp:483
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 15"
+msgid "%p Button 13"
 msgstr ""
 
-#: src/emu/inpttype.ipp:49
+#: src/emu/inpttype.ipp:47 src/emu/inpttype.ipp:165 src/emu/inpttype.ipp:246
+#: src/emu/inpttype.ipp:280 src/emu/inpttype.ipp:314 src/emu/inpttype.ipp:348
+#: src/emu/inpttype.ipp:382 src/emu/inpttype.ipp:416 src/emu/inpttype.ipp:450
+#: src/emu/inpttype.ipp:484
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 16"
+msgid "%p Button 14"
 msgstr ""
 
-#: src/emu/inpttype.ipp:50
+#: src/emu/inpttype.ipp:48 src/emu/inpttype.ipp:166 src/emu/inpttype.ipp:247
+#: src/emu/inpttype.ipp:281 src/emu/inpttype.ipp:315 src/emu/inpttype.ipp:349
+#: src/emu/inpttype.ipp:383 src/emu/inpttype.ipp:417 src/emu/inpttype.ipp:451
+#: src/emu/inpttype.ipp:485
+#, c-format
 msgctxt "input-name"
-msgid "P1 Start"
+msgid "%p Button 15"
 msgstr ""
 
-#: src/emu/inpttype.ipp:51
+#: src/emu/inpttype.ipp:49 src/emu/inpttype.ipp:167 src/emu/inpttype.ipp:248
+#: src/emu/inpttype.ipp:282 src/emu/inpttype.ipp:316 src/emu/inpttype.ipp:350
+#: src/emu/inpttype.ipp:384 src/emu/inpttype.ipp:418 src/emu/inpttype.ipp:452
+#: src/emu/inpttype.ipp:486
+#, c-format
 msgctxt "input-name"
-msgid "P1 Select"
+msgid "%p Button 16"
 msgstr ""
 
-#: src/emu/inpttype.ipp:56
+#: src/emu/inpttype.ipp:50 src/emu/inpttype.ipp:168 src/emu/inpttype.ipp:249
+#: src/emu/inpttype.ipp:283 src/emu/inpttype.ipp:317 src/emu/inpttype.ipp:351
+#: src/emu/inpttype.ipp:385 src/emu/inpttype.ipp:419 src/emu/inpttype.ipp:453
+#: src/emu/inpttype.ipp:487
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong A"
+msgid "%p Start"
 msgstr ""
 
-#: src/emu/inpttype.ipp:57
+#: src/emu/inpttype.ipp:51 src/emu/inpttype.ipp:169 src/emu/inpttype.ipp:250
+#: src/emu/inpttype.ipp:284 src/emu/inpttype.ipp:318 src/emu/inpttype.ipp:352
+#: src/emu/inpttype.ipp:386 src/emu/inpttype.ipp:420 src/emu/inpttype.ipp:454
+#: src/emu/inpttype.ipp:488
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong B"
+msgid "%p Select"
 msgstr ""
 
-#: src/emu/inpttype.ipp:58
+#: src/emu/inpttype.ipp:56 src/emu/inpttype.ipp:174
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong C"
+msgid "%p Mahjong A"
 msgstr ""
 
-#: src/emu/inpttype.ipp:59
+#: src/emu/inpttype.ipp:57 src/emu/inpttype.ipp:175
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong D"
+msgid "%p Mahjong B"
 msgstr ""
 
-#: src/emu/inpttype.ipp:60
+#: src/emu/inpttype.ipp:58 src/emu/inpttype.ipp:176
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong E"
+msgid "%p Mahjong C"
 msgstr ""
 
-#: src/emu/inpttype.ipp:61
+#: src/emu/inpttype.ipp:59 src/emu/inpttype.ipp:177
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong F"
+msgid "%p Mahjong D"
 msgstr ""
 
-#: src/emu/inpttype.ipp:62
+#: src/emu/inpttype.ipp:60 src/emu/inpttype.ipp:178
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong G"
+msgid "%p Mahjong E"
 msgstr ""
 
-#: src/emu/inpttype.ipp:63
+#: src/emu/inpttype.ipp:61 src/emu/inpttype.ipp:179
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong H"
+msgid "%p Mahjong F"
 msgstr ""
 
-#: src/emu/inpttype.ipp:64
+#: src/emu/inpttype.ipp:62 src/emu/inpttype.ipp:180
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong I"
+msgid "%p Mahjong G"
 msgstr ""
 
-#: src/emu/inpttype.ipp:65
+#: src/emu/inpttype.ipp:63 src/emu/inpttype.ipp:181
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong J"
+msgid "%p Mahjong H"
 msgstr ""
 
-#: src/emu/inpttype.ipp:66
+#: src/emu/inpttype.ipp:64 src/emu/inpttype.ipp:182
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong K"
+msgid "%p Mahjong I"
 msgstr ""
 
-#: src/emu/inpttype.ipp:67
+#: src/emu/inpttype.ipp:65 src/emu/inpttype.ipp:183
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong L"
+msgid "%p Mahjong J"
 msgstr ""
 
-#: src/emu/inpttype.ipp:68
+#: src/emu/inpttype.ipp:66 src/emu/inpttype.ipp:184
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong M"
+msgid "%p Mahjong K"
 msgstr ""
 
-#: src/emu/inpttype.ipp:69
+#: src/emu/inpttype.ipp:67 src/emu/inpttype.ipp:185
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong N"
+msgid "%p Mahjong L"
 msgstr ""
 
-#: src/emu/inpttype.ipp:70
+#: src/emu/inpttype.ipp:68 src/emu/inpttype.ipp:186
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong O"
+msgid "%p Mahjong M"
 msgstr ""
 
-#: src/emu/inpttype.ipp:71
+#: src/emu/inpttype.ipp:69 src/emu/inpttype.ipp:187
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong P"
+msgid "%p Mahjong N"
 msgstr ""
 
-#: src/emu/inpttype.ipp:72
+#: src/emu/inpttype.ipp:70 src/emu/inpttype.ipp:188
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Q"
+msgid "%p Mahjong O"
 msgstr ""
 
-#: src/emu/inpttype.ipp:73
+#: src/emu/inpttype.ipp:71 src/emu/inpttype.ipp:189
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Kan"
+msgid "%p Mahjong P"
 msgstr ""
 
-#: src/emu/inpttype.ipp:74
+#: src/emu/inpttype.ipp:72 src/emu/inpttype.ipp:190
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Pon"
+msgid "%p Mahjong Q"
 msgstr ""
 
-#: src/emu/inpttype.ipp:75
+#: src/emu/inpttype.ipp:73 src/emu/inpttype.ipp:191
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Chi"
+msgid "%p Mahjong Kan"
 msgstr ""
 
-#: src/emu/inpttype.ipp:76
+#: src/emu/inpttype.ipp:74 src/emu/inpttype.ipp:192
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Reach"
+msgid "%p Mahjong Pon"
 msgstr ""
 
-#: src/emu/inpttype.ipp:77
+#: src/emu/inpttype.ipp:75 src/emu/inpttype.ipp:193
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Ron"
+msgid "%p Mahjong Chi"
 msgstr ""
 
-#: src/emu/inpttype.ipp:78
+#: src/emu/inpttype.ipp:76 src/emu/inpttype.ipp:194
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Flip Flop"
+msgid "%p Mahjong Reach"
 msgstr ""
 
-#: src/emu/inpttype.ipp:79
+#: src/emu/inpttype.ipp:77 src/emu/inpttype.ipp:195
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Bet"
+msgid "%p Mahjong Ron"
 msgstr ""
 
-#: src/emu/inpttype.ipp:80
+#: src/emu/inpttype.ipp:78 src/emu/inpttype.ipp:200
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Take Score"
+msgid "%p Mahjong Flip Flop"
 msgstr ""
 
-#: src/emu/inpttype.ipp:81
+#: src/emu/inpttype.ipp:79 src/emu/inpttype.ipp:196
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Double Up"
+msgid "%p Mahjong Bet"
 msgstr ""
 
-#: src/emu/inpttype.ipp:82
+#: src/emu/inpttype.ipp:80 src/emu/inpttype.ipp:198
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Big"
+msgid "%p Mahjong Take Score"
 msgstr ""
 
-#: src/emu/inpttype.ipp:83
+#: src/emu/inpttype.ipp:81 src/emu/inpttype.ipp:199
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Small"
+msgid "%p Mahjong Double Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:84
+#: src/emu/inpttype.ipp:82 src/emu/inpttype.ipp:201
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Last Chance"
+msgid "%p Mahjong Big"
 msgstr ""
 
-#: src/emu/inpttype.ipp:89
+#: src/emu/inpttype.ipp:83 src/emu/inpttype.ipp:202
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda A/1"
+msgid "%p Mahjong Small"
 msgstr ""
 
-#: src/emu/inpttype.ipp:90
+#: src/emu/inpttype.ipp:84 src/emu/inpttype.ipp:197
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda B/2"
+msgid "%p Mahjong Last Chance"
 msgstr ""
 
-#: src/emu/inpttype.ipp:91
+#: src/emu/inpttype.ipp:89 src/emu/inpttype.ipp:207
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda C/3"
+msgid "%p Hanafuda A/1"
 msgstr ""
 
-#: src/emu/inpttype.ipp:92
+#: src/emu/inpttype.ipp:90 src/emu/inpttype.ipp:208
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda D/4"
+msgid "%p Hanafuda B/2"
 msgstr ""
 
-#: src/emu/inpttype.ipp:93
+#: src/emu/inpttype.ipp:91 src/emu/inpttype.ipp:209
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda E/5"
+msgid "%p Hanafuda C/3"
 msgstr ""
 
-#: src/emu/inpttype.ipp:94
+#: src/emu/inpttype.ipp:92 src/emu/inpttype.ipp:210
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda F/6"
+msgid "%p Hanafuda D/4"
 msgstr ""
 
-#: src/emu/inpttype.ipp:95
+#: src/emu/inpttype.ipp:93 src/emu/inpttype.ipp:211
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda G/7"
+msgid "%p Hanafuda E/5"
 msgstr ""
 
-#: src/emu/inpttype.ipp:96
+#: src/emu/inpttype.ipp:94 src/emu/inpttype.ipp:212
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda H/8"
+msgid "%p Hanafuda F/6"
 msgstr ""
 
-#: src/emu/inpttype.ipp:97
+#: src/emu/inpttype.ipp:95 src/emu/inpttype.ipp:213
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda Yes"
+msgid "%p Hanafuda G/7"
 msgstr ""
 
-#: src/emu/inpttype.ipp:98
+#: src/emu/inpttype.ipp:96 src/emu/inpttype.ipp:214
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda No"
+msgid "%p Hanafuda H/8"
+msgstr ""
+
+#: src/emu/inpttype.ipp:97 src/emu/inpttype.ipp:215
+#, c-format
+msgctxt "input-name"
+msgid "%p Hanafuda Yes"
+msgstr ""
+
+#: src/emu/inpttype.ipp:98 src/emu/inpttype.ipp:216
+#, c-format
+msgctxt "input-name"
+msgid "%p Hanafuda No"
 msgstr ""
 
 #: src/emu/inpttype.ipp:103
@@ -3751,1551 +3925,6 @@ msgctxt "input-name"
 msgid "Stop All Reels"
 msgstr ""
 
-#: src/emu/inpttype.ipp:140
-msgctxt "input-name"
-msgid "P2 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:141
-msgctxt "input-name"
-msgid "P2 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:142
-msgctxt "input-name"
-msgid "P2 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:143
-msgctxt "input-name"
-msgid "P2 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:144
-msgctxt "input-name"
-msgid "P2 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:145
-msgctxt "input-name"
-msgid "P2 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:146
-msgctxt "input-name"
-msgid "P2 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:147
-msgctxt "input-name"
-msgid "P2 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:148
-msgctxt "input-name"
-msgid "P2 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:149
-msgctxt "input-name"
-msgid "P2 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:150
-msgctxt "input-name"
-msgid "P2 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:151
-msgctxt "input-name"
-msgid "P2 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:152
-msgctxt "input-name"
-msgid "P2 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:153
-msgctxt "input-name"
-msgid "P2 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:154
-msgctxt "input-name"
-msgid "P2 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:155
-msgctxt "input-name"
-msgid "P2 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:156
-msgctxt "input-name"
-msgid "P2 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:157
-msgctxt "input-name"
-msgid "P2 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:158
-msgctxt "input-name"
-msgid "P2 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:159
-msgctxt "input-name"
-msgid "P2 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:160
-msgctxt "input-name"
-msgid "P2 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:161
-msgctxt "input-name"
-msgid "P2 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:162
-msgctxt "input-name"
-msgid "P2 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:163
-msgctxt "input-name"
-msgid "P2 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:164
-msgctxt "input-name"
-msgid "P2 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:165
-msgctxt "input-name"
-msgid "P2 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:166
-msgctxt "input-name"
-msgid "P2 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:167
-msgctxt "input-name"
-msgid "P2 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:168
-msgctxt "input-name"
-msgid "P2 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:169
-msgctxt "input-name"
-msgid "P2 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:174
-msgctxt "input-name"
-msgid "P2 Mahjong A"
-msgstr ""
-
-#: src/emu/inpttype.ipp:175
-msgctxt "input-name"
-msgid "P2 Mahjong B"
-msgstr ""
-
-#: src/emu/inpttype.ipp:176
-msgctxt "input-name"
-msgid "P2 Mahjong C"
-msgstr ""
-
-#: src/emu/inpttype.ipp:177
-msgctxt "input-name"
-msgid "P2 Mahjong D"
-msgstr ""
-
-#: src/emu/inpttype.ipp:178
-msgctxt "input-name"
-msgid "P2 Mahjong E"
-msgstr ""
-
-#: src/emu/inpttype.ipp:179
-msgctxt "input-name"
-msgid "P2 Mahjong F"
-msgstr ""
-
-#: src/emu/inpttype.ipp:180
-msgctxt "input-name"
-msgid "P2 Mahjong G"
-msgstr ""
-
-#: src/emu/inpttype.ipp:181
-msgctxt "input-name"
-msgid "P2 Mahjong H"
-msgstr ""
-
-#: src/emu/inpttype.ipp:182
-msgctxt "input-name"
-msgid "P2 Mahjong I"
-msgstr ""
-
-#: src/emu/inpttype.ipp:183
-msgctxt "input-name"
-msgid "P2 Mahjong J"
-msgstr ""
-
-#: src/emu/inpttype.ipp:184
-msgctxt "input-name"
-msgid "P2 Mahjong K"
-msgstr ""
-
-#: src/emu/inpttype.ipp:185
-msgctxt "input-name"
-msgid "P2 Mahjong L"
-msgstr ""
-
-#: src/emu/inpttype.ipp:186
-msgctxt "input-name"
-msgid "P2 Mahjong M"
-msgstr ""
-
-#: src/emu/inpttype.ipp:187
-msgctxt "input-name"
-msgid "P2 Mahjong N"
-msgstr ""
-
-#: src/emu/inpttype.ipp:188
-msgctxt "input-name"
-msgid "P2 Mahjong O"
-msgstr ""
-
-#: src/emu/inpttype.ipp:189
-msgctxt "input-name"
-msgid "P2 Mahjong P"
-msgstr ""
-
-#: src/emu/inpttype.ipp:190
-msgctxt "input-name"
-msgid "P2 Mahjong Q"
-msgstr ""
-
-#: src/emu/inpttype.ipp:191
-msgctxt "input-name"
-msgid "P2 Mahjong Kan"
-msgstr ""
-
-#: src/emu/inpttype.ipp:192
-msgctxt "input-name"
-msgid "P2 Mahjong Pon"
-msgstr ""
-
-#: src/emu/inpttype.ipp:193
-msgctxt "input-name"
-msgid "P2 Mahjong Chi"
-msgstr ""
-
-#: src/emu/inpttype.ipp:194
-msgctxt "input-name"
-msgid "P2 Mahjong Reach"
-msgstr ""
-
-#: src/emu/inpttype.ipp:195
-msgctxt "input-name"
-msgid "P2 Mahjong Ron"
-msgstr ""
-
-#: src/emu/inpttype.ipp:196
-msgctxt "input-name"
-msgid "P2 Mahjong Bet"
-msgstr ""
-
-#: src/emu/inpttype.ipp:197
-msgctxt "input-name"
-msgid "P2 Mahjong Last Chance"
-msgstr ""
-
-#: src/emu/inpttype.ipp:198
-msgctxt "input-name"
-msgid "P2 Mahjong Take Score"
-msgstr ""
-
-#: src/emu/inpttype.ipp:199
-msgctxt "input-name"
-msgid "P2 Mahjong Double Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:200
-msgctxt "input-name"
-msgid "P2 Mahjong Flip Flop"
-msgstr ""
-
-#: src/emu/inpttype.ipp:201
-msgctxt "input-name"
-msgid "P2 Mahjong Big"
-msgstr ""
-
-#: src/emu/inpttype.ipp:202
-msgctxt "input-name"
-msgid "P2 Mahjong Small"
-msgstr ""
-
-#: src/emu/inpttype.ipp:207
-msgctxt "input-name"
-msgid "P2 Hanafuda A/1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:208
-msgctxt "input-name"
-msgid "P2 Hanafuda B/2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:209
-msgctxt "input-name"
-msgid "P2 Hanafuda C/3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:210
-msgctxt "input-name"
-msgid "P2 Hanafuda D/4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:211
-msgctxt "input-name"
-msgid "P2 Hanafuda E/5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:212
-msgctxt "input-name"
-msgid "P2 Hanafuda F/6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:213
-msgctxt "input-name"
-msgid "P2 Hanafuda G/7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:214
-msgctxt "input-name"
-msgid "P2 Hanafuda H/8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:215
-msgctxt "input-name"
-msgid "P2 Hanafuda Yes"
-msgstr ""
-
-#: src/emu/inpttype.ipp:216
-msgctxt "input-name"
-msgid "P2 Hanafuda No"
-msgstr ""
-
-#: src/emu/inpttype.ipp:221
-msgctxt "input-name"
-msgid "P3 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:222
-msgctxt "input-name"
-msgid "P3 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:223
-msgctxt "input-name"
-msgid "P3 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:224
-msgctxt "input-name"
-msgid "P3 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:225
-msgctxt "input-name"
-msgid "P3 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:226
-msgctxt "input-name"
-msgid "P3 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:227
-msgctxt "input-name"
-msgid "P3 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:228
-msgctxt "input-name"
-msgid "P3 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:229
-msgctxt "input-name"
-msgid "P3 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:230
-msgctxt "input-name"
-msgid "P3 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:231
-msgctxt "input-name"
-msgid "P3 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:232
-msgctxt "input-name"
-msgid "P3 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:233
-msgctxt "input-name"
-msgid "P3 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:234
-msgctxt "input-name"
-msgid "P3 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:235
-msgctxt "input-name"
-msgid "P3 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:236
-msgctxt "input-name"
-msgid "P3 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:237
-msgctxt "input-name"
-msgid "P3 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:238
-msgctxt "input-name"
-msgid "P3 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:239
-msgctxt "input-name"
-msgid "P3 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:240
-msgctxt "input-name"
-msgid "P3 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:241
-msgctxt "input-name"
-msgid "P3 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:242
-msgctxt "input-name"
-msgid "P3 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:243
-msgctxt "input-name"
-msgid "P3 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:244
-msgctxt "input-name"
-msgid "P3 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:245
-msgctxt "input-name"
-msgid "P3 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:246
-msgctxt "input-name"
-msgid "P3 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:247
-msgctxt "input-name"
-msgid "P3 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:248
-msgctxt "input-name"
-msgid "P3 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:249
-msgctxt "input-name"
-msgid "P3 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:250
-msgctxt "input-name"
-msgid "P3 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:255
-msgctxt "input-name"
-msgid "P4 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:256
-msgctxt "input-name"
-msgid "P4 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:257
-msgctxt "input-name"
-msgid "P4 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:258
-msgctxt "input-name"
-msgid "P4 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:259
-msgctxt "input-name"
-msgid "P4 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:260
-msgctxt "input-name"
-msgid "P4 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:261
-msgctxt "input-name"
-msgid "P4 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:262
-msgctxt "input-name"
-msgid "P4 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:263
-msgctxt "input-name"
-msgid "P4 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:264
-msgctxt "input-name"
-msgid "P4 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:265
-msgctxt "input-name"
-msgid "P4 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:266
-msgctxt "input-name"
-msgid "P4 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:267
-msgctxt "input-name"
-msgid "P4 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:268
-msgctxt "input-name"
-msgid "P4 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:269
-msgctxt "input-name"
-msgid "P4 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:270
-msgctxt "input-name"
-msgid "P4 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:271
-msgctxt "input-name"
-msgid "P4 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:272
-msgctxt "input-name"
-msgid "P4 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:273
-msgctxt "input-name"
-msgid "P4 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:274
-msgctxt "input-name"
-msgid "P4 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:275
-msgctxt "input-name"
-msgid "P4 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:276
-msgctxt "input-name"
-msgid "P4 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:277
-msgctxt "input-name"
-msgid "P4 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:278
-msgctxt "input-name"
-msgid "P4 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:279
-msgctxt "input-name"
-msgid "P4 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:280
-msgctxt "input-name"
-msgid "P4 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:281
-msgctxt "input-name"
-msgid "P4 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:282
-msgctxt "input-name"
-msgid "P4 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:283
-msgctxt "input-name"
-msgid "P4 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:284
-msgctxt "input-name"
-msgid "P4 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:289
-msgctxt "input-name"
-msgid "P5 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:290
-msgctxt "input-name"
-msgid "P5 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:291
-msgctxt "input-name"
-msgid "P5 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:292
-msgctxt "input-name"
-msgid "P5 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:293
-msgctxt "input-name"
-msgid "P5 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:294
-msgctxt "input-name"
-msgid "P5 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:295
-msgctxt "input-name"
-msgid "P5 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:296
-msgctxt "input-name"
-msgid "P5 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:297
-msgctxt "input-name"
-msgid "P5 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:298
-msgctxt "input-name"
-msgid "P5 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:299
-msgctxt "input-name"
-msgid "P5 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:300
-msgctxt "input-name"
-msgid "P5 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:301
-msgctxt "input-name"
-msgid "P5 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:302
-msgctxt "input-name"
-msgid "P5 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:303
-msgctxt "input-name"
-msgid "P5 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:304
-msgctxt "input-name"
-msgid "P5 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:305
-msgctxt "input-name"
-msgid "P5 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:306
-msgctxt "input-name"
-msgid "P5 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:307
-msgctxt "input-name"
-msgid "P5 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:308
-msgctxt "input-name"
-msgid "P5 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:309
-msgctxt "input-name"
-msgid "P5 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:310
-msgctxt "input-name"
-msgid "P5 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:311
-msgctxt "input-name"
-msgid "P5 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:312
-msgctxt "input-name"
-msgid "P5 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:313
-msgctxt "input-name"
-msgid "P5 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:314
-msgctxt "input-name"
-msgid "P5 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:315
-msgctxt "input-name"
-msgid "P5 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:316
-msgctxt "input-name"
-msgid "P5 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:317
-msgctxt "input-name"
-msgid "P5 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:318
-msgctxt "input-name"
-msgid "P5 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:323
-msgctxt "input-name"
-msgid "P6 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:324
-msgctxt "input-name"
-msgid "P6 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:325
-msgctxt "input-name"
-msgid "P6 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:326
-msgctxt "input-name"
-msgid "P6 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:327
-msgctxt "input-name"
-msgid "P6 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:328
-msgctxt "input-name"
-msgid "P6 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:329
-msgctxt "input-name"
-msgid "P6 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:330
-msgctxt "input-name"
-msgid "P6 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:331
-msgctxt "input-name"
-msgid "P6 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:332
-msgctxt "input-name"
-msgid "P6 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:333
-msgctxt "input-name"
-msgid "P6 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:334
-msgctxt "input-name"
-msgid "P6 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:335
-msgctxt "input-name"
-msgid "P6 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:336
-msgctxt "input-name"
-msgid "P6 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:337
-msgctxt "input-name"
-msgid "P6 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:338
-msgctxt "input-name"
-msgid "P6 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:339
-msgctxt "input-name"
-msgid "P6 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:340
-msgctxt "input-name"
-msgid "P6 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:341
-msgctxt "input-name"
-msgid "P6 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:342
-msgctxt "input-name"
-msgid "P6 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:343
-msgctxt "input-name"
-msgid "P6 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:344
-msgctxt "input-name"
-msgid "P6 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:345
-msgctxt "input-name"
-msgid "P6 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:346
-msgctxt "input-name"
-msgid "P6 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:347
-msgctxt "input-name"
-msgid "P6 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:348
-msgctxt "input-name"
-msgid "P6 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:349
-msgctxt "input-name"
-msgid "P6 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:350
-msgctxt "input-name"
-msgid "P6 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:351
-msgctxt "input-name"
-msgid "P6 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:352
-msgctxt "input-name"
-msgid "P6 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:357
-msgctxt "input-name"
-msgid "P7 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:358
-msgctxt "input-name"
-msgid "P7 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:359
-msgctxt "input-name"
-msgid "P7 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:360
-msgctxt "input-name"
-msgid "P7 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:361
-msgctxt "input-name"
-msgid "P7 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:362
-msgctxt "input-name"
-msgid "P7 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:363
-msgctxt "input-name"
-msgid "P7 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:364
-msgctxt "input-name"
-msgid "P7 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:365
-msgctxt "input-name"
-msgid "P7 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:366
-msgctxt "input-name"
-msgid "P7 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:367
-msgctxt "input-name"
-msgid "P7 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:368
-msgctxt "input-name"
-msgid "P7 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:369
-msgctxt "input-name"
-msgid "P7 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:370
-msgctxt "input-name"
-msgid "P7 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:371
-msgctxt "input-name"
-msgid "P7 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:372
-msgctxt "input-name"
-msgid "P7 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:373
-msgctxt "input-name"
-msgid "P7 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:374
-msgctxt "input-name"
-msgid "P7 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:375
-msgctxt "input-name"
-msgid "P7 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:376
-msgctxt "input-name"
-msgid "P7 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:377
-msgctxt "input-name"
-msgid "P7 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:378
-msgctxt "input-name"
-msgid "P7 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:379
-msgctxt "input-name"
-msgid "P7 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:380
-msgctxt "input-name"
-msgid "P7 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:381
-msgctxt "input-name"
-msgid "P7 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:382
-msgctxt "input-name"
-msgid "P7 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:383
-msgctxt "input-name"
-msgid "P7 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:384
-msgctxt "input-name"
-msgid "P7 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:385
-msgctxt "input-name"
-msgid "P7 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:386
-msgctxt "input-name"
-msgid "P7 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:391
-msgctxt "input-name"
-msgid "P8 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:392
-msgctxt "input-name"
-msgid "P8 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:393
-msgctxt "input-name"
-msgid "P8 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:394
-msgctxt "input-name"
-msgid "P8 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:395
-msgctxt "input-name"
-msgid "P8 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:396
-msgctxt "input-name"
-msgid "P8 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:397
-msgctxt "input-name"
-msgid "P8 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:398
-msgctxt "input-name"
-msgid "P8 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:399
-msgctxt "input-name"
-msgid "P8 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:400
-msgctxt "input-name"
-msgid "P8 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:401
-msgctxt "input-name"
-msgid "P8 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:402
-msgctxt "input-name"
-msgid "P8 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:403
-msgctxt "input-name"
-msgid "P8 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:404
-msgctxt "input-name"
-msgid "P8 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:405
-msgctxt "input-name"
-msgid "P8 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:406
-msgctxt "input-name"
-msgid "P8 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:407
-msgctxt "input-name"
-msgid "P8 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:408
-msgctxt "input-name"
-msgid "P8 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:409
-msgctxt "input-name"
-msgid "P8 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:410
-msgctxt "input-name"
-msgid "P8 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:411
-msgctxt "input-name"
-msgid "P8 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:412
-msgctxt "input-name"
-msgid "P8 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:413
-msgctxt "input-name"
-msgid "P8 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:414
-msgctxt "input-name"
-msgid "P8 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:415
-msgctxt "input-name"
-msgid "P8 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:416
-msgctxt "input-name"
-msgid "P8 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:417
-msgctxt "input-name"
-msgid "P8 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:418
-msgctxt "input-name"
-msgid "P8 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:419
-msgctxt "input-name"
-msgid "P8 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:420
-msgctxt "input-name"
-msgid "P8 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:425
-msgctxt "input-name"
-msgid "P9 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:426
-msgctxt "input-name"
-msgid "P9 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:427
-msgctxt "input-name"
-msgid "P9 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:428
-msgctxt "input-name"
-msgid "P9 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:429
-msgctxt "input-name"
-msgid "P9 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:430
-msgctxt "input-name"
-msgid "P9 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:431
-msgctxt "input-name"
-msgid "P9 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:432
-msgctxt "input-name"
-msgid "P9 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:433
-msgctxt "input-name"
-msgid "P9 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:434
-msgctxt "input-name"
-msgid "P9 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:435
-msgctxt "input-name"
-msgid "P9 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:436
-msgctxt "input-name"
-msgid "P9 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:437
-msgctxt "input-name"
-msgid "P9 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:438
-msgctxt "input-name"
-msgid "P9 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:439
-msgctxt "input-name"
-msgid "P9 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:440
-msgctxt "input-name"
-msgid "P9 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:441
-msgctxt "input-name"
-msgid "P9 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:442
-msgctxt "input-name"
-msgid "P9 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:443
-msgctxt "input-name"
-msgid "P9 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:444
-msgctxt "input-name"
-msgid "P9 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:445
-msgctxt "input-name"
-msgid "P9 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:446
-msgctxt "input-name"
-msgid "P9 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:447
-msgctxt "input-name"
-msgid "P9 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:448
-msgctxt "input-name"
-msgid "P9 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:449
-msgctxt "input-name"
-msgid "P9 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:450
-msgctxt "input-name"
-msgid "P9 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:451
-msgctxt "input-name"
-msgid "P9 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:452
-msgctxt "input-name"
-msgid "P9 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:453
-msgctxt "input-name"
-msgid "P9 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:454
-msgctxt "input-name"
-msgid "P9 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:459
-msgctxt "input-name"
-msgid "P10 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:460
-msgctxt "input-name"
-msgid "P10 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:461
-msgctxt "input-name"
-msgid "P10 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:462
-msgctxt "input-name"
-msgid "P10 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:463
-msgctxt "input-name"
-msgid "P10 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:464
-msgctxt "input-name"
-msgid "P10 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:465
-msgctxt "input-name"
-msgid "P10 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:466
-msgctxt "input-name"
-msgid "P10 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:467
-msgctxt "input-name"
-msgid "P10 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:468
-msgctxt "input-name"
-msgid "P10 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:469
-msgctxt "input-name"
-msgid "P10 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:470
-msgctxt "input-name"
-msgid "P10 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:471
-msgctxt "input-name"
-msgid "P10 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:472
-msgctxt "input-name"
-msgid "P10 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:473
-msgctxt "input-name"
-msgid "P10 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:474
-msgctxt "input-name"
-msgid "P10 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:475
-msgctxt "input-name"
-msgid "P10 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:476
-msgctxt "input-name"
-msgid "P10 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:477
-msgctxt "input-name"
-msgid "P10 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:478
-msgctxt "input-name"
-msgid "P10 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:479
-msgctxt "input-name"
-msgid "P10 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:480
-msgctxt "input-name"
-msgid "P10 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:481
-msgctxt "input-name"
-msgid "P10 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:482
-msgctxt "input-name"
-msgid "P10 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:483
-msgctxt "input-name"
-msgid "P10 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:484
-msgctxt "input-name"
-msgid "P10 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:485
-msgctxt "input-name"
-msgid "P10 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:486
-msgctxt "input-name"
-msgid "P10 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:487
-msgctxt "input-name"
-msgid "P10 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:488
-msgctxt "input-name"
-msgid "P10 Select"
-msgstr ""
-
 #: src/emu/inpttype.ipp:493
 msgctxt "input-name"
 msgid "1 Player Start"
@@ -5476,154 +4105,31 @@ msgctxt "input-name"
 msgid "Volume Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:550
-msgctxt "input-name"
-msgid "P1 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:551
-msgctxt "input-name"
-msgid "P2 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:552
-msgctxt "input-name"
-msgid "P3 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:553
-msgctxt "input-name"
-msgid "P4 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:554
-msgctxt "input-name"
-msgid "P5 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:555
-msgctxt "input-name"
-msgid "P6 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:556
-msgctxt "input-name"
-msgid "P7 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:557
-msgctxt "input-name"
-msgid "P8 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:558
-msgctxt "input-name"
-msgid "P9 Pedal 1"
-msgstr ""
-
+#: src/emu/inpttype.ipp:550 src/emu/inpttype.ipp:551 src/emu/inpttype.ipp:552
+#: src/emu/inpttype.ipp:553 src/emu/inpttype.ipp:554 src/emu/inpttype.ipp:555
+#: src/emu/inpttype.ipp:556 src/emu/inpttype.ipp:557 src/emu/inpttype.ipp:558
 #: src/emu/inpttype.ipp:559
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:564
-msgctxt "input-name"
-msgid "P1 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:565
-msgctxt "input-name"
-msgid "P2 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:566
-msgctxt "input-name"
-msgid "P3 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:567
-msgctxt "input-name"
-msgid "P4 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:568
-msgctxt "input-name"
-msgid "P5 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:569
-msgctxt "input-name"
-msgid "P6 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:570
-msgctxt "input-name"
-msgid "P7 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:571
-msgctxt "input-name"
-msgid "P8 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:572
-msgctxt "input-name"
-msgid "P9 Pedal 2"
+msgid "%p Pedal 1"
 msgstr ""
 
+#: src/emu/inpttype.ipp:564 src/emu/inpttype.ipp:565 src/emu/inpttype.ipp:566
+#: src/emu/inpttype.ipp:567 src/emu/inpttype.ipp:568 src/emu/inpttype.ipp:569
+#: src/emu/inpttype.ipp:570 src/emu/inpttype.ipp:571 src/emu/inpttype.ipp:572
 #: src/emu/inpttype.ipp:573
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:578
-msgctxt "input-name"
-msgid "P1 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:579
-msgctxt "input-name"
-msgid "P2 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:580
-msgctxt "input-name"
-msgid "P3 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:581
-msgctxt "input-name"
-msgid "P4 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:582
-msgctxt "input-name"
-msgid "P5 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:583
-msgctxt "input-name"
-msgid "P6 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:584
-msgctxt "input-name"
-msgid "P7 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:585
-msgctxt "input-name"
-msgid "P8 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:586
-msgctxt "input-name"
-msgid "P9 Pedal 3"
+msgid "%p Pedal 2"
 msgstr ""
 
+#: src/emu/inpttype.ipp:578 src/emu/inpttype.ipp:579 src/emu/inpttype.ipp:580
+#: src/emu/inpttype.ipp:581 src/emu/inpttype.ipp:582 src/emu/inpttype.ipp:583
+#: src/emu/inpttype.ipp:584 src/emu/inpttype.ipp:585 src/emu/inpttype.ipp:586
 #: src/emu/inpttype.ipp:587
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 3"
+msgid "%p Pedal 3"
 msgstr ""
 
 #: src/emu/inpttype.ipp:592
diff --git a/language/German/strings.po b/language/German/strings.po
index ea986a2ac28..03fc4b0a21d 100644
--- a/language/German/strings.po
+++ b/language/German/strings.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-19 02:50+1100\n"
+"POT-Creation-Date: 2021-12-09 04:44+1100\n"
 "PO-Revision-Date: 2018-05-02 11:34+0200\n"
 "Last-Translator: Lothar Serra Mari <rootfather@scummvm.org>\n"
 "Language-Team: MAME Language Team\n"
@@ -274,12 +274,12 @@ msgstr "%1$s %2$s ( %3$d / %4$d Programm-Pakete )"
 msgid "Driver: \"%1$s\" software list "
 msgstr "Treiber: \"%1$s\" Softwareliste "
 
-#: src/frontend/mame/ui/selsoft.cpp:711 src/frontend/mame/ui/selgame.cpp:1066
+#: src/frontend/mame/ui/selsoft.cpp:711 src/frontend/mame/ui/selgame.cpp:1076
 #, c-format
 msgid "%1$s: %2$s - Search: %3$s_"
 msgstr "%1$s: %2$s - Suche: %3$s_"
 
-#: src/frontend/mame/ui/selsoft.cpp:713 src/frontend/mame/ui/selgame.cpp:1068
+#: src/frontend/mame/ui/selsoft.cpp:713 src/frontend/mame/ui/selgame.cpp:1078
 #, c-format
 msgid "Search: %1$s_"
 msgstr "Suche: %1$s_"
@@ -289,7 +289,7 @@ msgstr "Suche: %1$s_"
 msgid "Software list/item: %1$s:%2$s"
 msgstr ""
 
-#: src/frontend/mame/ui/optsmenu.cpp:73 src/frontend/mame/ui/sndmenu.cpp:165
+#: src/frontend/mame/ui/optsmenu.cpp:73 src/frontend/mame/ui/sndmenu.cpp:161
 msgid "Sound Options"
 msgstr "Soundeinstellungen"
 
@@ -384,12 +384,12 @@ msgid "Show mouse pointer"
 msgstr "Mauszeiger anzeigen"
 
 #: src/frontend/mame/ui/submenu.cpp:39
-msgid "Confirm quit from machines"
-msgstr "Beim Verlassen Bestätigung fordern"
+msgid "Confirm quit from emulation"
+msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:40
-msgid "Skip information screen at startup"
-msgstr "Informations-Bildschirm beim Start überspringen"
+msgid "Skip system information screen"
+msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:41
 msgid "Force 4:3 aspect for snapshot display"
@@ -404,8 +404,8 @@ msgid "Skip BIOS selection menu"
 msgstr "Menü zur BIOS-Auswahl überspringen"
 
 #: src/frontend/mame/ui/submenu.cpp:44
-msgid "Skip software parts selection menu"
-msgstr "Menü zur Softwareauswahl überspringen"
+msgid "Skip software part selection menu"
+msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:45
 msgid "Info auto audit"
@@ -556,7 +556,7 @@ msgid "UI active"
 msgstr "Benutzeroberfläche aktiv"
 
 #: src/frontend/mame/ui/submenu.cpp:91
-msgid "Offscreen reload"
+msgid "Off-screen reload"
 msgstr "Nachladen außerhalb des Bildschirms"
 
 #: src/frontend/mame/ui/submenu.cpp:92
@@ -572,8 +572,8 @@ msgid "Natural keyboard"
 msgstr "Natürliche Tastatur"
 
 #: src/frontend/mame/ui/submenu.cpp:95
-msgid "Simultaneous contradictory"
-msgstr "Widersprüchliche Eingaben erkennen"
+msgid "Allow contradictory joystick inputs"
+msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:96
 msgid "Coin impulse"
@@ -596,8 +596,8 @@ msgid "Pedal Device Assignment"
 msgstr "Pedal-Zuordnung"
 
 #: src/frontend/mame/ui/submenu.cpp:106
-msgid "Adstick Device Assignment"
-msgstr "ADStick-Zuordnung"
+msgid "AD Stick Device Assignment"
+msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:107
 msgid "Paddle Device Assignment"
@@ -683,14 +683,14 @@ msgstr "Synchronisierter Bildneuaufbau"
 msgid "Wait Vertical Sync"
 msgstr "Warten auf vertikalen Synchronisationsimpuls"
 
-#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:687
+#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:689
 #: src/frontend/mame/ui/videoopt.cpp:191 src/frontend/mame/ui/custui.cpp:490
 #: src/frontend/mame/ui/analogipt.cpp:471 plugins/cheatfind/init.lua:766
 #: plugins/cheatfind/init.lua:777 plugins/cheat/init.lua:668
 msgid "On"
 msgstr "An"
 
-#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:690
+#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:692
 #: src/frontend/mame/ui/videoopt.cpp:207 src/frontend/mame/ui/custui.cpp:490
 #: src/frontend/mame/ui/analogipt.cpp:471 plugins/cheatfind/init.lua:763
 #: plugins/cheatfind/init.lua:774 plugins/cheat/init.lua:671
@@ -698,11 +698,11 @@ msgstr "An"
 msgid "Off"
 msgstr "Aus"
 
-#: src/frontend/mame/ui/menu.cpp:693
+#: src/frontend/mame/ui/menu.cpp:695
 msgid "Auto"
 msgstr "Auto"
 
-#: src/frontend/mame/ui/menu.cpp:1195
+#: src/frontend/mame/ui/menu.cpp:1197
 #: src/frontend/mame/ui/simpleselgame.cpp:278
 #: src/frontend/mame/ui/selmenu.cpp:1280
 msgid "Return to Previous Menu"
@@ -710,7 +710,7 @@ msgstr "Zurück zum vorherigen Menü"
 
 #: src/frontend/mame/ui/filemngr.cpp:139
 #: src/frontend/mame/ui/confswitch.cpp:119
-#: src/frontend/mame/ui/inputmap.cpp:559 src/frontend/mame/ui/analogipt.cpp:360
+#: src/frontend/mame/ui/inputmap.cpp:563 src/frontend/mame/ui/analogipt.cpp:360
 #, c-format
 msgid "[root%1$s]"
 msgstr ""
@@ -975,22 +975,22 @@ msgstr ""
 "CPU:\n"
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "GHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "MHz"
 msgstr "MHz"
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "kHz"
 msgstr "kHz"
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "Hz"
 msgstr ""
 
@@ -1018,38 +1018,38 @@ msgstr "Keine\n"
 msgid "Vector"
 msgstr "Vektor"
 
-#: src/frontend/mame/ui/info.cpp:480
+#: src/frontend/mame/ui/info.cpp:483
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr "%1$s: %2$s\n"
 
-#: src/frontend/mame/ui/info.cpp:480
+#: src/frontend/mame/ui/info.cpp:483
 msgid "%2$s\n"
 msgstr "%2$s\n"
 
-#: src/frontend/mame/ui/info.cpp:497
+#: src/frontend/mame/ui/info.cpp:500
 #, c-format
 msgid "Screen '%1$s'"
 msgstr "Bildschirm '%1$s'"
 
-#: src/frontend/mame/ui/info.cpp:499
+#: src/frontend/mame/ui/info.cpp:502
 msgid "Screen"
 msgstr "Bildschirm"
 
-#: src/frontend/mame/ui/info.cpp:570 src/frontend/mame/ui/info.cpp:581
+#: src/frontend/mame/ui/info.cpp:573 src/frontend/mame/ui/info.cpp:584
 #, c-format
 msgid "%1$s:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:662
+#: src/frontend/mame/ui/info.cpp:665
 msgid "Not supported"
 msgstr "Nicht unterstützt"
 
-#: src/frontend/mame/ui/info.cpp:665
+#: src/frontend/mame/ui/info.cpp:668
 msgid "Partially supported"
 msgstr "Teilweise unterstützt"
 
-#: src/frontend/mame/ui/info.cpp:674
+#: src/frontend/mame/ui/info.cpp:677
 msgid "[empty]"
 msgstr "[leer]"
 
@@ -1122,7 +1122,7 @@ msgid "Emulated"
 msgstr "Emuliert"
 
 #: src/frontend/mame/ui/keyboard.cpp:59 src/frontend/mame/ui/confswitch.cpp:117
-#: src/frontend/mame/ui/inputmap.cpp:557 src/frontend/mame/ui/analogipt.cpp:358
+#: src/frontend/mame/ui/inputmap.cpp:561 src/frontend/mame/ui/analogipt.cpp:358
 #, c-format
 msgid "%1$s [root%2$s]"
 msgstr ""
@@ -1482,7 +1482,7 @@ msgctxt "swlist-info"
 msgid "Software list/item"
 msgstr ""
 
-#: src/frontend/mame/ui/datmenu.cpp:88 src/frontend/mame/ui/selmenu.cpp:2698
+#: src/frontend/mame/ui/datmenu.cpp:88 src/frontend/mame/ui/selmenu.cpp:2707
 msgid "Software List Info"
 msgstr ""
 
@@ -1604,7 +1604,7 @@ msgstr ""
 msgid "Configure Machine:"
 msgstr ""
 
-#: src/frontend/mame/ui/miscmenu.cpp:858 src/frontend/mame/ui/selmenu.cpp:2638
+#: src/frontend/mame/ui/miscmenu.cpp:858 src/frontend/mame/ui/selmenu.cpp:2647
 msgid " (default)"
 msgstr " (Standard)"
 
@@ -1625,7 +1625,7 @@ msgstr ""
 "Zum Beenden drücken Sie %1$s\n"
 "Um zur Emulation zurückzukehren drücken Sie %2$s"
 
-#: src/frontend/mame/ui/info_pty.cpp:30 src/frontend/mame/ui/mainmenu.cpp:155
+#: src/frontend/mame/ui/info_pty.cpp:30
 msgid "Pseudo terminals"
 msgstr "Pseudoterminals"
 
@@ -1693,52 +1693,52 @@ msgstr ""
 msgid "Other Controls"
 msgstr "Weitere Bedienelemente"
 
-#: src/frontend/mame/ui/inputmap.cpp:227
+#: src/frontend/mame/ui/inputmap.cpp:231
 msgid "This machine has no configurable inputs."
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:327
+#: src/frontend/mame/ui/inputmap.cpp:331
 msgid "Pressed"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:397
+#: src/frontend/mame/ui/inputmap.cpp:401
 msgid "Invalid sequence entered"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:542
+#: src/frontend/mame/ui/inputmap.cpp:546
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:543
+#: src/frontend/mame/ui/inputmap.cpp:547
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog Inc"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:544
+#: src/frontend/mame/ui/inputmap.cpp:548
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog Dec"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:586
+#: src/frontend/mame/ui/inputmap.cpp:590
 #, c-format
 msgid "Press %1$s to set\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:587
+#: src/frontend/mame/ui/inputmap.cpp:591
 #, c-format
 msgid "Press %1$s to append\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:588
+#: src/frontend/mame/ui/inputmap.cpp:592
 #, c-format
 msgid "Press %1$s to clear\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:589
+#: src/frontend/mame/ui/inputmap.cpp:593
 #, c-format
 msgid "Press %1$s to restore default\n"
 msgstr ""
@@ -1806,7 +1806,7 @@ msgstr ""
 "Drücken Sie eine beliebige Taste, um fortzufahren."
 
 #: src/frontend/mame/ui/simpleselgame.cpp:273
-#: src/frontend/mame/ui/selgame.cpp:436
+#: src/frontend/mame/ui/selgame.cpp:443
 msgid "Configure Options"
 msgstr "Optionen konfigurieren"
 
@@ -2141,16 +2141,16 @@ msgstr ""
 msgid "Expand to fit"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:437
+#: src/frontend/mame/ui/selgame.cpp:444
 msgid "Configure Machine"
 msgstr "Maschine konfigurieren"
 
-#: src/frontend/mame/ui/selgame.cpp:1050
+#: src/frontend/mame/ui/selgame.cpp:1060
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d machines (%5$d BIOS) )"
 msgstr "%1$s %2$s ( %3$d / %4$d Maschinen (%5$d BIOS) )"
 
-#: src/frontend/mame/ui/selgame.cpp:1078
+#: src/frontend/mame/ui/selgame.cpp:1088
 #, c-format
 msgid "System: %1$-.100s"
 msgstr "System: %1$-.100s"
@@ -2172,11 +2172,9 @@ msgstr "Ergebnisse werden unter %1$s gespeichert"
 #: src/frontend/mame/ui/auditmenu.cpp:98
 #, c-format
 msgid ""
-"Auditing ROMs for machine %2$u of %3$u...\n"
+"Auditing media for machine %2$u of %3$u...\n"
 "%1$s"
 msgstr ""
-"Prüfe ROMs für Maschine %2$u von %3$u...\n"
-"%1$s"
 
 #: src/frontend/mame/ui/auditmenu.cpp:116
 #, c-format
@@ -2189,12 +2187,12 @@ msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:136
 #, c-format
-msgid "Audit ROMs for %1$u machines marked unavailable"
+msgid "Audit media for %1$u machines marked unavailable"
 msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:137
 #, c-format
-msgid "Audit ROMs for all %1$u machines"
+msgid "Audit media for all %1$u machines"
 msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:154
@@ -2401,84 +2399,84 @@ msgctxt "color-sample"
 msgid "Clone"
 msgstr "Klon"
 
-#: src/frontend/mame/ui/custui.cpp:914
+#: src/frontend/mame/ui/custui.cpp:906
 msgid "ARGB Settings"
 msgstr "ARGB-Einstellungen"
 
-#: src/frontend/mame/ui/custui.cpp:919 src/frontend/mame/ui/custui.cpp:922
+#: src/frontend/mame/ui/custui.cpp:911 src/frontend/mame/ui/custui.cpp:914
 msgctxt "color-channel"
 msgid "Alpha"
 msgstr "Alpha"
 
-#: src/frontend/mame/ui/custui.cpp:927 src/frontend/mame/ui/custui.cpp:930
+#: src/frontend/mame/ui/custui.cpp:919 src/frontend/mame/ui/custui.cpp:922
 msgctxt "color-channel"
 msgid "Red"
 msgstr "Rot"
 
-#: src/frontend/mame/ui/custui.cpp:935 src/frontend/mame/ui/custui.cpp:938
+#: src/frontend/mame/ui/custui.cpp:927 src/frontend/mame/ui/custui.cpp:930
 msgctxt "color-channel"
 msgid "Green"
 msgstr "Grün"
 
-#: src/frontend/mame/ui/custui.cpp:943 src/frontend/mame/ui/custui.cpp:946
+#: src/frontend/mame/ui/custui.cpp:935 src/frontend/mame/ui/custui.cpp:938
 msgctxt "color-channel"
 msgid "Blue"
 msgstr "Blau"
 
-#: src/frontend/mame/ui/custui.cpp:949
+#: src/frontend/mame/ui/custui.cpp:941
 msgid "Choose from palette"
 msgstr "Aus Palette wählen"
 
-#: src/frontend/mame/ui/custui.cpp:996
+#: src/frontend/mame/ui/custui.cpp:988
 msgid "Color preview:"
 msgstr "Farbvorschau:"
 
-#: src/frontend/mame/ui/custui.cpp:1093
+#: src/frontend/mame/ui/custui.cpp:1085
 msgctxt "color-preset"
 msgid "White"
 msgstr "Weiß"
 
-#: src/frontend/mame/ui/custui.cpp:1094
+#: src/frontend/mame/ui/custui.cpp:1086
 msgctxt "color-preset"
 msgid "Silver"
 msgstr "Silber"
 
-#: src/frontend/mame/ui/custui.cpp:1095
+#: src/frontend/mame/ui/custui.cpp:1087
 msgctxt "color-preset"
 msgid "Gray"
 msgstr "Grau"
 
-#: src/frontend/mame/ui/custui.cpp:1096
+#: src/frontend/mame/ui/custui.cpp:1088
 msgctxt "color-preset"
 msgid "Black"
 msgstr "Schwarz"
 
-#: src/frontend/mame/ui/custui.cpp:1097
+#: src/frontend/mame/ui/custui.cpp:1089
 msgctxt "color-preset"
 msgid "Red"
 msgstr "Rot"
 
-#: src/frontend/mame/ui/custui.cpp:1098
+#: src/frontend/mame/ui/custui.cpp:1090
 msgctxt "color-preset"
 msgid "Orange"
 msgstr "Orange"
 
-#: src/frontend/mame/ui/custui.cpp:1099
+#: src/frontend/mame/ui/custui.cpp:1091
 msgctxt "color-preset"
 msgid "Yellow"
 msgstr "Gelb"
 
-#: src/frontend/mame/ui/custui.cpp:1100
+#: src/frontend/mame/ui/custui.cpp:1092
 msgctxt "color-preset"
 msgid "Green"
 msgstr "Grün"
 
-#: src/frontend/mame/ui/custui.cpp:1101
+#: src/frontend/mame/ui/custui.cpp:1093
 msgctxt "color-preset"
 msgid "Blue"
 msgstr "Blau"
 
-#: src/frontend/mame/ui/custui.cpp:1102
+#: src/frontend/mame/ui/custui.cpp:1094
 msgctxt "color-preset"
 msgid "Violet"
 msgstr "Violett"
@@ -2543,7 +2541,7 @@ msgid "Input (general)"
 msgstr "Eingabe (allgemein)"
 
 #: src/frontend/mame/ui/mainmenu.cpp:123
-msgid "Input (this Machine)"
+msgid "Input (this machine)"
 msgstr "Eingabe (für diese Maschine)"
 
 #: src/frontend/mame/ui/mainmenu.cpp:126
@@ -2582,6 +2580,10 @@ msgstr "Dateimanager"
 msgid "Tape Control"
 msgstr "Bedienung Cassettendeck"
 
+#: src/frontend/mame/ui/mainmenu.cpp:155
+msgid "Pseudo Terminals"
+msgstr ""
+
 #: src/frontend/mame/ui/mainmenu.cpp:158
 msgid "BIOS Selection"
 msgstr "BIOS-Auswahl"
@@ -2620,7 +2622,7 @@ msgstr "Externe DAT-Anzeige"
 
 #: src/frontend/mame/ui/mainmenu.cpp:200
 #, c-format
-msgid "About %s"
+msgid "About %1$s"
 msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:212
@@ -2780,375 +2782,373 @@ msgstr "Treiber ist ein Klon von: %1$s"
 msgid "%1$s %2$s"
 msgstr "%1$s %2$s"
 
-#: src/frontend/mame/ui/selmenu.cpp:2235
+#: src/frontend/mame/ui/selmenu.cpp:2244
 msgid "Images"
 msgstr "Images"
 
-#: src/frontend/mame/ui/selmenu.cpp:2236
+#: src/frontend/mame/ui/selmenu.cpp:2245
 msgid "Infos"
 msgstr "Informationen"
 
-#: src/frontend/mame/ui/selmenu.cpp:2551
+#: src/frontend/mame/ui/selmenu.cpp:2560
 msgid ""
 "Required ROM/disk images for the selected system are missing or incorrect. "
 "Please acquire the correct files or select a different system.\n"
 "\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2567
+#: src/frontend/mame/ui/selmenu.cpp:2576
 msgid ""
 "Required ROM/disk images for the selected software are missing or incorrect. "
 "Please acquire the correct files or select a different software item.\n"
 "\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2583
+#: src/frontend/mame/ui/selmenu.cpp:2592
 msgid "incorrect checksum"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2586
+#: src/frontend/mame/ui/selmenu.cpp:2595
 msgid "incorrect length"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2589
+#: src/frontend/mame/ui/selmenu.cpp:2598
 msgid "not found"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2600
+#: src/frontend/mame/ui/selmenu.cpp:2609
 #, c-format
 msgid "%1$s (%2$s) - %3$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2602
+#: src/frontend/mame/ui/selmenu.cpp:2611
 #, c-format
 msgid "%1$s - %2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2606
+#: src/frontend/mame/ui/selmenu.cpp:2615
 msgid "Press any key to continue."
 msgstr "Drücken Sie eine beliebige Taste, um fortzufahren."
 
-#: src/frontend/mame/ui/selmenu.cpp:2735
+#: src/frontend/mame/ui/selmenu.cpp:2744
 msgid "General Info"
 msgstr "Allgemeine Informationen"
 
-#: src/frontend/mame/ui/selmenu.cpp:2887
+#: src/frontend/mame/ui/selmenu.cpp:2896
 #, c-format
 msgid "Romset\t%1$s\n"
 msgstr "ROM-Satz\t%1$s\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2888
+#: src/frontend/mame/ui/selmenu.cpp:2897
 #, c-format
 msgid "Year\t%1$s\n"
 msgstr "Jahr\t%1$s\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2889
+#: src/frontend/mame/ui/selmenu.cpp:2898
 #, c-format
 msgid "Manufacturer\t%1$s\n"
 msgstr "Hersteller\t%1$s\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2896
+#: src/frontend/mame/ui/selmenu.cpp:2905
 #, c-format
 msgid "Driver is Clone of\t%1$s\n"
 msgstr "Treiber ist ein Klon von\t%1$s\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2901
+#: src/frontend/mame/ui/selmenu.cpp:2910
 msgid "Driver is Parent\t\n"
 msgstr "Treiber ist Ursprungs-Treiber\t\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2905
+#: src/frontend/mame/ui/selmenu.cpp:2914
 msgid "Analog Controls\tYes\n"
 msgstr "Analoge Bedienelemente\tVorhanden\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2907
+#: src/frontend/mame/ui/selmenu.cpp:2916
 msgid "Keyboard Inputs\tYes\n"
 msgstr "Tastatureingaben\tVorhanden\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2910
+#: src/frontend/mame/ui/selmenu.cpp:2919
 msgid "Overall\tNOT WORKING\n"
 msgstr "Insgesamt\tFUNKTIONIERT NICHT\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2912
+#: src/frontend/mame/ui/selmenu.cpp:2921
 msgid "Overall\tUnemulated Protection\n"
 msgstr "Insgesamt\tNicht emulierter Kopierschutz\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2914
+#: src/frontend/mame/ui/selmenu.cpp:2923
 msgid "Overall\tWorking\n"
 msgstr "Insgesamt\tFunktioniert\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2917
+#: src/frontend/mame/ui/selmenu.cpp:2926
 msgid "Graphics\tUnimplemented\n"
 msgstr "Grafik\tNicht implementiert\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2919
+#: src/frontend/mame/ui/selmenu.cpp:2928
 msgid "Graphics\tWrong Colors\n"
 msgstr "Grafik\tFarbwiedergabe falsch\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2921
+#: src/frontend/mame/ui/selmenu.cpp:2930
 msgid "Graphics\tImperfect Colors\n"
 msgstr "Grafik\tFarbwiedergabe fehlerhaft\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2923
+#: src/frontend/mame/ui/selmenu.cpp:2932
 msgid "Graphics\tImperfect\n"
 msgstr "Grafik\tFehlerhaft\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2925
+#: src/frontend/mame/ui/selmenu.cpp:2934
 msgid "Graphics\tOK\n"
 msgstr "Grafik\tOK\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2928
+#: src/frontend/mame/ui/selmenu.cpp:2937
 msgid "Sound\tNone\n"
 msgstr "Sound\tKeine\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2930
+#: src/frontend/mame/ui/selmenu.cpp:2939
 msgid "Sound\tUnimplemented\n"
 msgstr "Sound\tNicht implementiert\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2932
+#: src/frontend/mame/ui/selmenu.cpp:2941
 msgid "Sound\tImperfect\n"
 msgstr "Sound\tFehlerhaft\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2934
+#: src/frontend/mame/ui/selmenu.cpp:2943
 msgid "Sound\tOK\n"
 msgstr "Sound\tOK\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2937
+#: src/frontend/mame/ui/selmenu.cpp:2946
 msgid "Capture\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2939
+#: src/frontend/mame/ui/selmenu.cpp:2948
 msgid "Capture\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2942
+#: src/frontend/mame/ui/selmenu.cpp:2951
 msgid "Camera\tUnimplemented\n"
 msgstr "Kamera\tNicht implementiert\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2944
+#: src/frontend/mame/ui/selmenu.cpp:2953
 msgid "Camera\tImperfect\n"
 msgstr "Kamera\tFehlerhaft\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2947
+#: src/frontend/mame/ui/selmenu.cpp:2956
 msgid "Microphone\tUnimplemented\n"
 msgstr "Mikrofon\tNicht implementiert\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2949
+#: src/frontend/mame/ui/selmenu.cpp:2958
 msgid "Microphone\tImperfect\n"
 msgstr "Mikrofon\tFehlerhaft\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2952
+#: src/frontend/mame/ui/selmenu.cpp:2961
 msgid "Controls\tUnimplemented\n"
 msgstr "Bedienelemente\tNicht implementiert\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2954
+#: src/frontend/mame/ui/selmenu.cpp:2963
 msgid "Controls\tImperfect\n"
 msgstr "Bedienelemente\tFehlerhaft\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2957
+#: src/frontend/mame/ui/selmenu.cpp:2966
 msgid "Keyboard\tUnimplemented\n"
 msgstr "Tastatur\tNicht implementiert\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2959
+#: src/frontend/mame/ui/selmenu.cpp:2968
 msgid "Keyboard\tImperfect\n"
 msgstr "Tastatur\tFehlerhaft\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2962
+#: src/frontend/mame/ui/selmenu.cpp:2971
 msgid "Mouse\tUnimplemented\n"
 msgstr "Maus\tNicht implementiert\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2964
+#: src/frontend/mame/ui/selmenu.cpp:2973
 msgid "Mouse\tImperfect\n"
 msgstr "Maus\tFehlerhaft\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2967
+#: src/frontend/mame/ui/selmenu.cpp:2976
 msgid "Media\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2969
+#: src/frontend/mame/ui/selmenu.cpp:2978
 msgid "Media\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2972
+#: src/frontend/mame/ui/selmenu.cpp:2981
 msgid "Disk\tUnimplemented\n"
 msgstr "Festplatte\tNicht implementiert\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2974
+#: src/frontend/mame/ui/selmenu.cpp:2983
 msgid "Disk\tImperfect\n"
 msgstr "Festplatte\tFehlerhaft\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2977
+#: src/frontend/mame/ui/selmenu.cpp:2986
 msgid "Printer\tUnimplemented\n"
 msgstr "Drucker\tNicht implementiert\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2979
+#: src/frontend/mame/ui/selmenu.cpp:2988
 msgid "Printer\tImperfect\n"
 msgstr "Drucker\tFehlerhaft\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2982
+#: src/frontend/mame/ui/selmenu.cpp:2991
 msgid "Mag. Tape\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2984
+#: src/frontend/mame/ui/selmenu.cpp:2993
 msgid "Mag. Tape\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2987
+#: src/frontend/mame/ui/selmenu.cpp:2996
 msgid "Punch Tape\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2989
+#: src/frontend/mame/ui/selmenu.cpp:2998
 msgid "Punch Tape\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2992
+#: src/frontend/mame/ui/selmenu.cpp:3001
 msgid "Mag. Drum\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2994
+#: src/frontend/mame/ui/selmenu.cpp:3003
 msgid "Mag. Drum\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2997
+#: src/frontend/mame/ui/selmenu.cpp:3006
 msgid "(EP)ROM\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2999
+#: src/frontend/mame/ui/selmenu.cpp:3008
 msgid "(EP)ROM\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3002
+#: src/frontend/mame/ui/selmenu.cpp:3011
 msgid "Communications\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3004
+#: src/frontend/mame/ui/selmenu.cpp:3013
 msgid "Communications\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3007
+#: src/frontend/mame/ui/selmenu.cpp:3016
 msgid "LAN\tUnimplemented\n"
 msgstr "LAN\tNicht implementiert\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3009
+#: src/frontend/mame/ui/selmenu.cpp:3018
 msgid "LAN\tImperfect\n"
 msgstr "LAN\tFehlerhaft\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3012
+#: src/frontend/mame/ui/selmenu.cpp:3021
 msgid "WAN\tUnimplemented\n"
 msgstr "WAN\tNicht implementiert\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3014
+#: src/frontend/mame/ui/selmenu.cpp:3023
 msgid "WAN\tImperfect\n"
 msgstr "WAN\tFehlerhaft\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3017
+#: src/frontend/mame/ui/selmenu.cpp:3026
 msgid "Timing\tUnimplemented\n"
 msgstr "Zeitlicher Ablauf\tNicht implementiert\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3019
+#: src/frontend/mame/ui/selmenu.cpp:3028
 msgid "Timing\tImperfect\n"
 msgstr "Zeitlicher Ablauf\tFehlerhaft\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3021
+#: src/frontend/mame/ui/selmenu.cpp:3030
 msgid "Mechanical Machine\tYes\n"
 msgstr "Maschine ist mechanisch\tJa\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3021
+#: src/frontend/mame/ui/selmenu.cpp:3030
 msgid "Mechanical Machine\tNo\n"
 msgstr "Maschine ist mechanisch\tNein\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3022
+#: src/frontend/mame/ui/selmenu.cpp:3031
 msgid "Requires Artwork\tYes\n"
 msgstr "Benötigt Illustrationen\tJa\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3022
+#: src/frontend/mame/ui/selmenu.cpp:3031
 msgid "Requires Artwork\tNo\n"
 msgstr "Benötigt Illustrationen\tNein\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3023
+#: src/frontend/mame/ui/selmenu.cpp:3032
 msgid "Requires Clickable Artwork\tYes\n"
 msgstr "Benötigt klickbare Illustrationen\tJa\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3023
+#: src/frontend/mame/ui/selmenu.cpp:3032
 msgid "Requires Clickable Artwork\tNo\n"
 msgstr "Benötigt klickbare Illustrationen\tNein\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3025
+#: src/frontend/mame/ui/selmenu.cpp:3034
 msgid "Support Cocktail\tNo\n"
 msgstr "Unterstützt Cocktail-Modus\tNein\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3026
+#: src/frontend/mame/ui/selmenu.cpp:3035
 msgid "Driver is BIOS\tYes\n"
 msgstr "Treiber ist BIOS\tJa\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3026
+#: src/frontend/mame/ui/selmenu.cpp:3035
 msgid "Driver is BIOS\tNo\n"
 msgstr "Treiber ist BIOS\tNein\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3027
+#: src/frontend/mame/ui/selmenu.cpp:3036
 msgid "Support Save\tYes\n"
 msgstr "Unterstützt Speichern\tJa\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3027
+#: src/frontend/mame/ui/selmenu.cpp:3036
 msgid "Support Save\tNo\n"
 msgstr "Unterstützt Speichern\tNein\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3028
+#: src/frontend/mame/ui/selmenu.cpp:3037
 msgid "Screen Orientation\tVertical\n"
 msgstr "Bildschirm-Ausrichtung\tVertikal\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3028
+#: src/frontend/mame/ui/selmenu.cpp:3037
 msgid "Screen Orientation\tHorizontal\n"
 msgstr "Bildschirm-Ausrichtung\tHorizontal\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3038
+#: src/frontend/mame/ui/selmenu.cpp:3047
 msgid "Requires CHD\tYes\n"
 msgstr "Benötigt CHD\tJa\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3038
+#: src/frontend/mame/ui/selmenu.cpp:3047
 msgid "Requires CHD\tNo\n"
 msgstr "Benötigt CHD\tNein\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3051
-msgid "ROM Audit Result\tOK\n"
-msgstr "ROM-Überprüfung\tOK\n"
+#: src/frontend/mame/ui/selmenu.cpp:3060
+msgid "Media Audit Result\tOK\n"
+msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3053
-msgid "ROM Audit Result\tBAD\n"
-msgstr "ROM-Überprüfung\tFEHLERHAFT\n"
+#: src/frontend/mame/ui/selmenu.cpp:3062
+msgid "Media Audit Result\tBAD\n"
+msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3056
+#: src/frontend/mame/ui/selmenu.cpp:3065
 msgid "Samples Audit Result\tNone Needed\n"
 msgstr "Samples-Überprüfung\tNicht nötig\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3058
+#: src/frontend/mame/ui/selmenu.cpp:3067
 msgid "Samples Audit Result\tOK\n"
 msgstr "Samples-Überprüfung\tOK\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3060
+#: src/frontend/mame/ui/selmenu.cpp:3069
 msgid "Samples Audit Result\tBAD\n"
 msgstr "Samples-Überprüfung\tFEHLERHAFT\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3064
+#: src/frontend/mame/ui/selmenu.cpp:3073
 msgid ""
-"ROM Audit \tDisabled\n"
-"Samples Audit \tDisabled\n"
+"Media Audit\tDisabled\n"
+"Samples Audit\tDisabled\n"
 msgstr ""
-"ROM-Überprüfung\tDeaktiviert\n"
-"Samples-Überprüfung\tDeaktiviert\n"
 
-#: src/frontend/mame/ui/sndmenu.cpp:150
+#: src/frontend/mame/ui/sndmenu.cpp:146
 msgid "Sound"
 msgstr "Sound"
 
-#: src/frontend/mame/ui/sndmenu.cpp:151
+#: src/frontend/mame/ui/sndmenu.cpp:147
 msgid "Compressor"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:152
+#: src/frontend/mame/ui/sndmenu.cpp:148
 msgid "Sample Rate"
 msgstr "Samplerate"
 
-#: src/frontend/mame/ui/sndmenu.cpp:153
+#: src/frontend/mame/ui/sndmenu.cpp:149
 msgid "Use External Samples"
 msgstr "Verwende externe Samples"
 
@@ -3199,21 +3199,21 @@ msgstr "* Video:\n"
 msgid "  Screen '%1$s': Vector\n"
 msgstr "  Bildschirm '%1$s': Vektor\n"
 
-#: src/frontend/mame/ui/devopt.cpp:132
+#: src/frontend/mame/ui/devopt.cpp:135
 #, c-format
 msgid "  Screen '%1$s': %2$d × %3$d (V) %4$s Hz\n"
 msgstr "  Bildschirm '%1$s': %2$d × %3$d (V) %4$s Hz\n"
 
-#: src/frontend/mame/ui/devopt.cpp:133
+#: src/frontend/mame/ui/devopt.cpp:136
 #, c-format
 msgid "  Screen '%1$s': %2$d × %3$d (H) %4$s Hz\n"
 msgstr "  Bildschirm '%1$s': %2$d × %3$d (H) %4$s Hz\n"
 
-#: src/frontend/mame/ui/devopt.cpp:147
+#: src/frontend/mame/ui/devopt.cpp:150
 msgid "* Sound:\n"
 msgstr "* Sound:\n"
 
-#: src/frontend/mame/ui/devopt.cpp:211
+#: src/frontend/mame/ui/devopt.cpp:214
 #, c-format
 msgid ""
 "* BIOS settings:\n"
@@ -3222,490 +3222,660 @@ msgstr ""
 "* BIOS-Einstellungen:\n"
 "  %1$d Optionen    [Standard: %2$s]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:255 src/frontend/mame/ui/devopt.cpp:271
-#: src/frontend/mame/ui/devopt.cpp:332
+#: src/frontend/mame/ui/devopt.cpp:258 src/frontend/mame/ui/devopt.cpp:274
+#: src/frontend/mame/ui/devopt.cpp:335
 #, c-format
 msgid "  %1$s    [default: %2$s]\n"
 msgstr "  %1$s    [Standard: %2$s]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:260 src/frontend/mame/ui/devopt.cpp:276
+#: src/frontend/mame/ui/devopt.cpp:263 src/frontend/mame/ui/devopt.cpp:279
 #, c-format
 msgid "  %1$s\n"
 msgstr "  %1$s\n"
 
-#: src/frontend/mame/ui/devopt.cpp:282
+#: src/frontend/mame/ui/devopt.cpp:285
 msgid "* DIP switch settings:\n"
 msgstr "* DIP Schalter-Einstellungen:\n"
 
-#: src/frontend/mame/ui/devopt.cpp:287
+#: src/frontend/mame/ui/devopt.cpp:290
 msgid "* Configuration settings:\n"
 msgstr "* Konfigurationseinstellungen:\n"
 
-#: src/frontend/mame/ui/devopt.cpp:291
+#: src/frontend/mame/ui/devopt.cpp:294
 msgid "* Input device(s):\n"
 msgstr "* Eingabegerät(e):\n"
 
-#: src/frontend/mame/ui/devopt.cpp:293
+#: src/frontend/mame/ui/devopt.cpp:296
 #, c-format
 msgid "  User inputs    [%1$d inputs]\n"
 msgstr "  Benutzereingaben    [%1$d Eingaben]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:295
+#: src/frontend/mame/ui/devopt.cpp:298
 #, c-format
 msgid "  Mahjong inputs    [%1$d inputs]\n"
 msgstr "  Mahjongeingaben    [%1$d Eingaben]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:297
+#: src/frontend/mame/ui/devopt.cpp:300
 #, c-format
 msgid "  Hanafuda inputs    [%1$d inputs]\n"
 msgstr "  Hanafudaeingaben    [%1$d Eingaben]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:299
+#: src/frontend/mame/ui/devopt.cpp:302
 #, c-format
 msgid "  Gambling inputs    [%1$d inputs]\n"
 msgstr "  Glücksspieleingaben    [%1$d Eingaben]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:301
+#: src/frontend/mame/ui/devopt.cpp:304
 #, c-format
 msgid "  Analog inputs    [%1$d inputs]\n"
 msgstr "  Analogeingaben    [%1$d Eingaben]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:303
+#: src/frontend/mame/ui/devopt.cpp:306
 #, c-format
 msgid "  Adjuster inputs    [%1$d inputs]\n"
 msgstr "  Einstellerreingaben    [%1$d Eingaben]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:305
+#: src/frontend/mame/ui/devopt.cpp:308
 #, c-format
 msgid "  Keypad inputs    [%1$d inputs]\n"
 msgstr "  Tastenfeldeingaben    [%1$d Eingaben]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:307
+#: src/frontend/mame/ui/devopt.cpp:310
 #, c-format
 msgid "  Keyboard inputs    [%1$d inputs]\n"
 msgstr "  Tastatureingaben    [%1$d Eingaben]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:312
+#: src/frontend/mame/ui/devopt.cpp:315
 msgid "* Media Options:\n"
 msgstr "* Medienoptionen:\n"
 
-#: src/frontend/mame/ui/devopt.cpp:317
+#: src/frontend/mame/ui/devopt.cpp:320
 #, c-format
 msgid "  %1$s    [tag: %2$s]\n"
 msgstr "  %1$s    [tag: %2$s]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:327
+#: src/frontend/mame/ui/devopt.cpp:330
 msgid "* Slot Options:\n"
 msgstr "* Steckplatzoptionen:\n"
 
-#: src/frontend/mame/ui/devopt.cpp:341
+#: src/frontend/mame/ui/devopt.cpp:344
 msgid "[None]\n"
 msgstr "[Keine]\n"
 
-#: src/emu/render.cpp:1847
+#: src/emu/render.cpp:1796
 #, c-format
 msgctxt "view-name"
 msgid "Screen %1$u Standard (%2$u:%3$u)"
 msgstr ""
 
-#: src/emu/render.cpp:1873
+#: src/emu/render.cpp:1822
 #, c-format
 msgctxt "view-name"
 msgid "Screen %1$u Pixel Aspect (%2$u:%3$u)"
 msgstr ""
 
-#: src/emu/render.cpp:1895 src/emu/render.cpp:2030
+#: src/emu/render.cpp:1844 src/emu/render.cpp:1979
 msgctxt "view-name"
 msgid "Cocktail"
 msgstr ""
 
-#: src/emu/render.cpp:2015
+#: src/emu/render.cpp:1964
 msgctxt "view-name"
 msgid "Left-to-Right"
 msgstr ""
 
-#: src/emu/render.cpp:2016
+#: src/emu/render.cpp:1965
 msgctxt "view-name"
 msgid "Left-to-Right (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2017
+#: src/emu/render.cpp:1966
 msgctxt "view-name"
 msgid "Top-to-Bottom"
 msgstr ""
 
-#: src/emu/render.cpp:2018
+#: src/emu/render.cpp:1967
 msgctxt "view-name"
 msgid "Top-to-Bottom (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2069
+#: src/emu/render.cpp:2018
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Left-to-Right, Top-to-Bottom"
 msgstr ""
 
-#: src/emu/render.cpp:2078
+#: src/emu/render.cpp:2027
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Left-to-Right, Top-to-Bottom (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2087
+#: src/emu/render.cpp:2036
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Top-to-Bottom, Left-to-Right"
 msgstr ""
 
-#: src/emu/render.cpp:2096
+#: src/emu/render.cpp:2045
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Top-to-Bottom, Left-to-Right (Gapless)"
 msgstr ""
 
-#: src/emu/inpttype.ipp:22
+#: src/emu/ioport.cpp:332
+#, c-format
 msgctxt "input-name"
-msgid "P1 Up"
+msgid "P%1$u"
 msgstr ""
 
-#: src/emu/inpttype.ipp:23
+#: src/emu/ioport.cpp:1924
 msgctxt "input-name"
-msgid "P1 Down"
+msgid "???"
 msgstr ""
 
-#: src/emu/inpttype.ipp:24
+#: src/emu/inpttype.ipp:22 src/emu/inpttype.ipp:140 src/emu/inpttype.ipp:221
+#: src/emu/inpttype.ipp:255 src/emu/inpttype.ipp:289 src/emu/inpttype.ipp:323
+#: src/emu/inpttype.ipp:357 src/emu/inpttype.ipp:391 src/emu/inpttype.ipp:425
+#: src/emu/inpttype.ipp:459
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left"
+msgid "%p Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:25
+#: src/emu/inpttype.ipp:23 src/emu/inpttype.ipp:141 src/emu/inpttype.ipp:222
+#: src/emu/inpttype.ipp:256 src/emu/inpttype.ipp:290 src/emu/inpttype.ipp:324
+#: src/emu/inpttype.ipp:358 src/emu/inpttype.ipp:392 src/emu/inpttype.ipp:426
+#: src/emu/inpttype.ipp:460
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right"
+msgid "%p Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:26
+#: src/emu/inpttype.ipp:24 src/emu/inpttype.ipp:142 src/emu/inpttype.ipp:223
+#: src/emu/inpttype.ipp:257 src/emu/inpttype.ipp:291 src/emu/inpttype.ipp:325
+#: src/emu/inpttype.ipp:359 src/emu/inpttype.ipp:393 src/emu/inpttype.ipp:427
+#: src/emu/inpttype.ipp:461
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Up"
+msgid "%p Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:27
+#: src/emu/inpttype.ipp:25 src/emu/inpttype.ipp:143 src/emu/inpttype.ipp:224
+#: src/emu/inpttype.ipp:258 src/emu/inpttype.ipp:292 src/emu/inpttype.ipp:326
+#: src/emu/inpttype.ipp:360 src/emu/inpttype.ipp:394 src/emu/inpttype.ipp:428
+#: src/emu/inpttype.ipp:462
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Down"
+msgid "%p Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:28
+#: src/emu/inpttype.ipp:26 src/emu/inpttype.ipp:144 src/emu/inpttype.ipp:225
+#: src/emu/inpttype.ipp:259 src/emu/inpttype.ipp:293 src/emu/inpttype.ipp:327
+#: src/emu/inpttype.ipp:361 src/emu/inpttype.ipp:395 src/emu/inpttype.ipp:429
+#: src/emu/inpttype.ipp:463
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Left"
+msgid "%p Right Stick/Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:29
+#: src/emu/inpttype.ipp:27 src/emu/inpttype.ipp:145 src/emu/inpttype.ipp:226
+#: src/emu/inpttype.ipp:260 src/emu/inpttype.ipp:294 src/emu/inpttype.ipp:328
+#: src/emu/inpttype.ipp:362 src/emu/inpttype.ipp:396 src/emu/inpttype.ipp:430
+#: src/emu/inpttype.ipp:464
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Right"
+msgid "%p Right Stick/Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:30
+#: src/emu/inpttype.ipp:28 src/emu/inpttype.ipp:146 src/emu/inpttype.ipp:227
+#: src/emu/inpttype.ipp:261 src/emu/inpttype.ipp:295 src/emu/inpttype.ipp:329
+#: src/emu/inpttype.ipp:363 src/emu/inpttype.ipp:397 src/emu/inpttype.ipp:431
+#: src/emu/inpttype.ipp:465
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Up"
+msgid "%p Right Stick/Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:31
+#: src/emu/inpttype.ipp:29 src/emu/inpttype.ipp:147 src/emu/inpttype.ipp:228
+#: src/emu/inpttype.ipp:262 src/emu/inpttype.ipp:296 src/emu/inpttype.ipp:330
+#: src/emu/inpttype.ipp:364 src/emu/inpttype.ipp:398 src/emu/inpttype.ipp:432
+#: src/emu/inpttype.ipp:466
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Down"
+msgid "%p Right Stick/Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:32
+#: src/emu/inpttype.ipp:30 src/emu/inpttype.ipp:148 src/emu/inpttype.ipp:229
+#: src/emu/inpttype.ipp:263 src/emu/inpttype.ipp:297 src/emu/inpttype.ipp:331
+#: src/emu/inpttype.ipp:365 src/emu/inpttype.ipp:399 src/emu/inpttype.ipp:433
+#: src/emu/inpttype.ipp:467
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Left"
+msgid "%p Left Stick/Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:33
+#: src/emu/inpttype.ipp:31 src/emu/inpttype.ipp:149 src/emu/inpttype.ipp:230
+#: src/emu/inpttype.ipp:264 src/emu/inpttype.ipp:298 src/emu/inpttype.ipp:332
+#: src/emu/inpttype.ipp:366 src/emu/inpttype.ipp:400 src/emu/inpttype.ipp:434
+#: src/emu/inpttype.ipp:468
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Right"
+msgid "%p Left Stick/Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:34
+#: src/emu/inpttype.ipp:32 src/emu/inpttype.ipp:150 src/emu/inpttype.ipp:231
+#: src/emu/inpttype.ipp:265 src/emu/inpttype.ipp:299 src/emu/inpttype.ipp:333
+#: src/emu/inpttype.ipp:367 src/emu/inpttype.ipp:401 src/emu/inpttype.ipp:435
+#: src/emu/inpttype.ipp:469
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 1"
+msgid "%p Left Stick/Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:35
+#: src/emu/inpttype.ipp:33 src/emu/inpttype.ipp:151 src/emu/inpttype.ipp:232
+#: src/emu/inpttype.ipp:266 src/emu/inpttype.ipp:300 src/emu/inpttype.ipp:334
+#: src/emu/inpttype.ipp:368 src/emu/inpttype.ipp:402 src/emu/inpttype.ipp:436
+#: src/emu/inpttype.ipp:470
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 2"
+msgid "%p Left Stick/Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:36
+#: src/emu/inpttype.ipp:34 src/emu/inpttype.ipp:152 src/emu/inpttype.ipp:233
+#: src/emu/inpttype.ipp:267 src/emu/inpttype.ipp:301 src/emu/inpttype.ipp:335
+#: src/emu/inpttype.ipp:369 src/emu/inpttype.ipp:403 src/emu/inpttype.ipp:437
+#: src/emu/inpttype.ipp:471
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 3"
+msgid "%p Button 1"
 msgstr ""
 
-#: src/emu/inpttype.ipp:37
+#: src/emu/inpttype.ipp:35 src/emu/inpttype.ipp:153 src/emu/inpttype.ipp:234
+#: src/emu/inpttype.ipp:268 src/emu/inpttype.ipp:302 src/emu/inpttype.ipp:336
+#: src/emu/inpttype.ipp:370 src/emu/inpttype.ipp:404 src/emu/inpttype.ipp:438
+#: src/emu/inpttype.ipp:472
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 4"
+msgid "%p Button 2"
 msgstr ""
 
-#: src/emu/inpttype.ipp:38
+#: src/emu/inpttype.ipp:36 src/emu/inpttype.ipp:154 src/emu/inpttype.ipp:235
+#: src/emu/inpttype.ipp:269 src/emu/inpttype.ipp:303 src/emu/inpttype.ipp:337
+#: src/emu/inpttype.ipp:371 src/emu/inpttype.ipp:405 src/emu/inpttype.ipp:439
+#: src/emu/inpttype.ipp:473
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 5"
+msgid "%p Button 3"
 msgstr ""
 
-#: src/emu/inpttype.ipp:39
+#: src/emu/inpttype.ipp:37 src/emu/inpttype.ipp:155 src/emu/inpttype.ipp:236
+#: src/emu/inpttype.ipp:270 src/emu/inpttype.ipp:304 src/emu/inpttype.ipp:338
+#: src/emu/inpttype.ipp:372 src/emu/inpttype.ipp:406 src/emu/inpttype.ipp:440
+#: src/emu/inpttype.ipp:474
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 6"
+msgid "%p Button 4"
 msgstr ""
 
-#: src/emu/inpttype.ipp:40
+#: src/emu/inpttype.ipp:38 src/emu/inpttype.ipp:156 src/emu/inpttype.ipp:237
+#: src/emu/inpttype.ipp:271 src/emu/inpttype.ipp:305 src/emu/inpttype.ipp:339
+#: src/emu/inpttype.ipp:373 src/emu/inpttype.ipp:407 src/emu/inpttype.ipp:441
+#: src/emu/inpttype.ipp:475
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 7"
+msgid "%p Button 5"
 msgstr ""
 
-#: src/emu/inpttype.ipp:41
+#: src/emu/inpttype.ipp:39 src/emu/inpttype.ipp:157 src/emu/inpttype.ipp:238
+#: src/emu/inpttype.ipp:272 src/emu/inpttype.ipp:306 src/emu/inpttype.ipp:340
+#: src/emu/inpttype.ipp:374 src/emu/inpttype.ipp:408 src/emu/inpttype.ipp:442
+#: src/emu/inpttype.ipp:476
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 8"
+msgid "%p Button 6"
 msgstr ""
 
-#: src/emu/inpttype.ipp:42
+#: src/emu/inpttype.ipp:40 src/emu/inpttype.ipp:158 src/emu/inpttype.ipp:239
+#: src/emu/inpttype.ipp:273 src/emu/inpttype.ipp:307 src/emu/inpttype.ipp:341
+#: src/emu/inpttype.ipp:375 src/emu/inpttype.ipp:409 src/emu/inpttype.ipp:443
+#: src/emu/inpttype.ipp:477
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 9"
+msgid "%p Button 7"
 msgstr ""
 
-#: src/emu/inpttype.ipp:43
+#: src/emu/inpttype.ipp:41 src/emu/inpttype.ipp:159 src/emu/inpttype.ipp:240
+#: src/emu/inpttype.ipp:274 src/emu/inpttype.ipp:308 src/emu/inpttype.ipp:342
+#: src/emu/inpttype.ipp:376 src/emu/inpttype.ipp:410 src/emu/inpttype.ipp:444
+#: src/emu/inpttype.ipp:478
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 10"
+msgid "%p Button 8"
 msgstr ""
 
-#: src/emu/inpttype.ipp:44
+#: src/emu/inpttype.ipp:42 src/emu/inpttype.ipp:160 src/emu/inpttype.ipp:241
+#: src/emu/inpttype.ipp:275 src/emu/inpttype.ipp:309 src/emu/inpttype.ipp:343
+#: src/emu/inpttype.ipp:377 src/emu/inpttype.ipp:411 src/emu/inpttype.ipp:445
+#: src/emu/inpttype.ipp:479
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 11"
+msgid "%p Button 9"
 msgstr ""
 
-#: src/emu/inpttype.ipp:45
+#: src/emu/inpttype.ipp:43 src/emu/inpttype.ipp:161 src/emu/inpttype.ipp:242
+#: src/emu/inpttype.ipp:276 src/emu/inpttype.ipp:310 src/emu/inpttype.ipp:344
+#: src/emu/inpttype.ipp:378 src/emu/inpttype.ipp:412 src/emu/inpttype.ipp:446
+#: src/emu/inpttype.ipp:480
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 12"
+msgid "%p Button 10"
 msgstr ""
 
-#: src/emu/inpttype.ipp:46
+#: src/emu/inpttype.ipp:44 src/emu/inpttype.ipp:162 src/emu/inpttype.ipp:243
+#: src/emu/inpttype.ipp:277 src/emu/inpttype.ipp:311 src/emu/inpttype.ipp:345
+#: src/emu/inpttype.ipp:379 src/emu/inpttype.ipp:413 src/emu/inpttype.ipp:447
+#: src/emu/inpttype.ipp:481
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 13"
+msgid "%p Button 11"
 msgstr ""
 
-#: src/emu/inpttype.ipp:47
+#: src/emu/inpttype.ipp:45 src/emu/inpttype.ipp:163 src/emu/inpttype.ipp:244
+#: src/emu/inpttype.ipp:278 src/emu/inpttype.ipp:312 src/emu/inpttype.ipp:346
+#: src/emu/inpttype.ipp:380 src/emu/inpttype.ipp:414 src/emu/inpttype.ipp:448
+#: src/emu/inpttype.ipp:482
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 14"
+msgid "%p Button 12"
 msgstr ""
 
-#: src/emu/inpttype.ipp:48
+#: src/emu/inpttype.ipp:46 src/emu/inpttype.ipp:164 src/emu/inpttype.ipp:245
+#: src/emu/inpttype.ipp:279 src/emu/inpttype.ipp:313 src/emu/inpttype.ipp:347
+#: src/emu/inpttype.ipp:381 src/emu/inpttype.ipp:415 src/emu/inpttype.ipp:449
+#: src/emu/inpttype.ipp:483
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 15"
+msgid "%p Button 13"
 msgstr ""
 
-#: src/emu/inpttype.ipp:49
+#: src/emu/inpttype.ipp:47 src/emu/inpttype.ipp:165 src/emu/inpttype.ipp:246
+#: src/emu/inpttype.ipp:280 src/emu/inpttype.ipp:314 src/emu/inpttype.ipp:348
+#: src/emu/inpttype.ipp:382 src/emu/inpttype.ipp:416 src/emu/inpttype.ipp:450
+#: src/emu/inpttype.ipp:484
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 16"
+msgid "%p Button 14"
 msgstr ""
 
-#: src/emu/inpttype.ipp:50
+#: src/emu/inpttype.ipp:48 src/emu/inpttype.ipp:166 src/emu/inpttype.ipp:247
+#: src/emu/inpttype.ipp:281 src/emu/inpttype.ipp:315 src/emu/inpttype.ipp:349
+#: src/emu/inpttype.ipp:383 src/emu/inpttype.ipp:417 src/emu/inpttype.ipp:451
+#: src/emu/inpttype.ipp:485
+#, c-format
 msgctxt "input-name"
-msgid "P1 Start"
+msgid "%p Button 15"
 msgstr ""
 
-#: src/emu/inpttype.ipp:51
+#: src/emu/inpttype.ipp:49 src/emu/inpttype.ipp:167 src/emu/inpttype.ipp:248
+#: src/emu/inpttype.ipp:282 src/emu/inpttype.ipp:316 src/emu/inpttype.ipp:350
+#: src/emu/inpttype.ipp:384 src/emu/inpttype.ipp:418 src/emu/inpttype.ipp:452
+#: src/emu/inpttype.ipp:486
+#, c-format
 msgctxt "input-name"
-msgid "P1 Select"
+msgid "%p Button 16"
 msgstr ""
 
-#: src/emu/inpttype.ipp:56
+#: src/emu/inpttype.ipp:50 src/emu/inpttype.ipp:168 src/emu/inpttype.ipp:249
+#: src/emu/inpttype.ipp:283 src/emu/inpttype.ipp:317 src/emu/inpttype.ipp:351
+#: src/emu/inpttype.ipp:385 src/emu/inpttype.ipp:419 src/emu/inpttype.ipp:453
+#: src/emu/inpttype.ipp:487
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong A"
+msgid "%p Start"
 msgstr ""
 
-#: src/emu/inpttype.ipp:57
+#: src/emu/inpttype.ipp:51 src/emu/inpttype.ipp:169 src/emu/inpttype.ipp:250
+#: src/emu/inpttype.ipp:284 src/emu/inpttype.ipp:318 src/emu/inpttype.ipp:352
+#: src/emu/inpttype.ipp:386 src/emu/inpttype.ipp:420 src/emu/inpttype.ipp:454
+#: src/emu/inpttype.ipp:488
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong B"
+msgid "%p Select"
 msgstr ""
 
-#: src/emu/inpttype.ipp:58
+#: src/emu/inpttype.ipp:56 src/emu/inpttype.ipp:174
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong C"
+msgid "%p Mahjong A"
 msgstr ""
 
-#: src/emu/inpttype.ipp:59
+#: src/emu/inpttype.ipp:57 src/emu/inpttype.ipp:175
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong D"
+msgid "%p Mahjong B"
 msgstr ""
 
-#: src/emu/inpttype.ipp:60
+#: src/emu/inpttype.ipp:58 src/emu/inpttype.ipp:176
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong E"
+msgid "%p Mahjong C"
 msgstr ""
 
-#: src/emu/inpttype.ipp:61
+#: src/emu/inpttype.ipp:59 src/emu/inpttype.ipp:177
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong F"
+msgid "%p Mahjong D"
 msgstr ""
 
-#: src/emu/inpttype.ipp:62
+#: src/emu/inpttype.ipp:60 src/emu/inpttype.ipp:178
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong G"
+msgid "%p Mahjong E"
 msgstr ""
 
-#: src/emu/inpttype.ipp:63
+#: src/emu/inpttype.ipp:61 src/emu/inpttype.ipp:179
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong H"
+msgid "%p Mahjong F"
 msgstr ""
 
-#: src/emu/inpttype.ipp:64
+#: src/emu/inpttype.ipp:62 src/emu/inpttype.ipp:180
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong I"
+msgid "%p Mahjong G"
 msgstr ""
 
-#: src/emu/inpttype.ipp:65
+#: src/emu/inpttype.ipp:63 src/emu/inpttype.ipp:181
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong J"
+msgid "%p Mahjong H"
 msgstr ""
 
-#: src/emu/inpttype.ipp:66
+#: src/emu/inpttype.ipp:64 src/emu/inpttype.ipp:182
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong K"
+msgid "%p Mahjong I"
 msgstr ""
 
-#: src/emu/inpttype.ipp:67
+#: src/emu/inpttype.ipp:65 src/emu/inpttype.ipp:183
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong L"
+msgid "%p Mahjong J"
 msgstr ""
 
-#: src/emu/inpttype.ipp:68
+#: src/emu/inpttype.ipp:66 src/emu/inpttype.ipp:184
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong M"
+msgid "%p Mahjong K"
 msgstr ""
 
-#: src/emu/inpttype.ipp:69
+#: src/emu/inpttype.ipp:67 src/emu/inpttype.ipp:185
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong N"
+msgid "%p Mahjong L"
 msgstr ""
 
-#: src/emu/inpttype.ipp:70
+#: src/emu/inpttype.ipp:68 src/emu/inpttype.ipp:186
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong O"
+msgid "%p Mahjong M"
 msgstr ""
 
-#: src/emu/inpttype.ipp:71
+#: src/emu/inpttype.ipp:69 src/emu/inpttype.ipp:187
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong P"
+msgid "%p Mahjong N"
 msgstr ""
 
-#: src/emu/inpttype.ipp:72
+#: src/emu/inpttype.ipp:70 src/emu/inpttype.ipp:188
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Q"
+msgid "%p Mahjong O"
 msgstr ""
 
-#: src/emu/inpttype.ipp:73
+#: src/emu/inpttype.ipp:71 src/emu/inpttype.ipp:189
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Kan"
+msgid "%p Mahjong P"
 msgstr ""
 
-#: src/emu/inpttype.ipp:74
+#: src/emu/inpttype.ipp:72 src/emu/inpttype.ipp:190
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Pon"
+msgid "%p Mahjong Q"
 msgstr ""
 
-#: src/emu/inpttype.ipp:75
+#: src/emu/inpttype.ipp:73 src/emu/inpttype.ipp:191
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Chi"
+msgid "%p Mahjong Kan"
 msgstr ""
 
-#: src/emu/inpttype.ipp:76
+#: src/emu/inpttype.ipp:74 src/emu/inpttype.ipp:192
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Reach"
+msgid "%p Mahjong Pon"
 msgstr ""
 
-#: src/emu/inpttype.ipp:77
+#: src/emu/inpttype.ipp:75 src/emu/inpttype.ipp:193
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Ron"
+msgid "%p Mahjong Chi"
 msgstr ""
 
-#: src/emu/inpttype.ipp:78
+#: src/emu/inpttype.ipp:76 src/emu/inpttype.ipp:194
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Flip Flop"
+msgid "%p Mahjong Reach"
 msgstr ""
 
-#: src/emu/inpttype.ipp:79
+#: src/emu/inpttype.ipp:77 src/emu/inpttype.ipp:195
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Bet"
+msgid "%p Mahjong Ron"
 msgstr ""
 
-#: src/emu/inpttype.ipp:80
+#: src/emu/inpttype.ipp:78 src/emu/inpttype.ipp:200
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Take Score"
+msgid "%p Mahjong Flip Flop"
 msgstr ""
 
-#: src/emu/inpttype.ipp:81
+#: src/emu/inpttype.ipp:79 src/emu/inpttype.ipp:196
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Double Up"
+msgid "%p Mahjong Bet"
 msgstr ""
 
-#: src/emu/inpttype.ipp:82
+#: src/emu/inpttype.ipp:80 src/emu/inpttype.ipp:198
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Big"
+msgid "%p Mahjong Take Score"
 msgstr ""
 
-#: src/emu/inpttype.ipp:83
+#: src/emu/inpttype.ipp:81 src/emu/inpttype.ipp:199
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Small"
+msgid "%p Mahjong Double Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:84
+#: src/emu/inpttype.ipp:82 src/emu/inpttype.ipp:201
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Last Chance"
+msgid "%p Mahjong Big"
 msgstr ""
 
-#: src/emu/inpttype.ipp:89
+#: src/emu/inpttype.ipp:83 src/emu/inpttype.ipp:202
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda A/1"
+msgid "%p Mahjong Small"
 msgstr ""
 
-#: src/emu/inpttype.ipp:90
+#: src/emu/inpttype.ipp:84 src/emu/inpttype.ipp:197
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda B/2"
+msgid "%p Mahjong Last Chance"
 msgstr ""
 
-#: src/emu/inpttype.ipp:91
+#: src/emu/inpttype.ipp:89 src/emu/inpttype.ipp:207
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda C/3"
+msgid "%p Hanafuda A/1"
 msgstr ""
 
-#: src/emu/inpttype.ipp:92
+#: src/emu/inpttype.ipp:90 src/emu/inpttype.ipp:208
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda D/4"
+msgid "%p Hanafuda B/2"
 msgstr ""
 
-#: src/emu/inpttype.ipp:93
+#: src/emu/inpttype.ipp:91 src/emu/inpttype.ipp:209
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda E/5"
+msgid "%p Hanafuda C/3"
 msgstr ""
 
-#: src/emu/inpttype.ipp:94
+#: src/emu/inpttype.ipp:92 src/emu/inpttype.ipp:210
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda F/6"
+msgid "%p Hanafuda D/4"
 msgstr ""
 
-#: src/emu/inpttype.ipp:95
+#: src/emu/inpttype.ipp:93 src/emu/inpttype.ipp:211
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda G/7"
+msgid "%p Hanafuda E/5"
 msgstr ""
 
-#: src/emu/inpttype.ipp:96
+#: src/emu/inpttype.ipp:94 src/emu/inpttype.ipp:212
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda H/8"
+msgid "%p Hanafuda F/6"
 msgstr ""
 
-#: src/emu/inpttype.ipp:97
+#: src/emu/inpttype.ipp:95 src/emu/inpttype.ipp:213
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda Yes"
+msgid "%p Hanafuda G/7"
 msgstr ""
 
-#: src/emu/inpttype.ipp:98
+#: src/emu/inpttype.ipp:96 src/emu/inpttype.ipp:214
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda No"
+msgid "%p Hanafuda H/8"
+msgstr ""
+
+#: src/emu/inpttype.ipp:97 src/emu/inpttype.ipp:215
+#, c-format
+msgctxt "input-name"
+msgid "%p Hanafuda Yes"
+msgstr ""
+
+#: src/emu/inpttype.ipp:98 src/emu/inpttype.ipp:216
+#, c-format
+msgctxt "input-name"
+msgid "%p Hanafuda No"
 msgstr ""
 
 #: src/emu/inpttype.ipp:103
@@ -3833,1551 +4003,6 @@ msgctxt "input-name"
 msgid "Stop All Reels"
 msgstr ""
 
-#: src/emu/inpttype.ipp:140
-msgctxt "input-name"
-msgid "P2 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:141
-msgctxt "input-name"
-msgid "P2 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:142
-msgctxt "input-name"
-msgid "P2 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:143
-msgctxt "input-name"
-msgid "P2 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:144
-msgctxt "input-name"
-msgid "P2 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:145
-msgctxt "input-name"
-msgid "P2 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:146
-msgctxt "input-name"
-msgid "P2 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:147
-msgctxt "input-name"
-msgid "P2 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:148
-msgctxt "input-name"
-msgid "P2 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:149
-msgctxt "input-name"
-msgid "P2 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:150
-msgctxt "input-name"
-msgid "P2 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:151
-msgctxt "input-name"
-msgid "P2 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:152
-msgctxt "input-name"
-msgid "P2 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:153
-msgctxt "input-name"
-msgid "P2 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:154
-msgctxt "input-name"
-msgid "P2 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:155
-msgctxt "input-name"
-msgid "P2 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:156
-msgctxt "input-name"
-msgid "P2 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:157
-msgctxt "input-name"
-msgid "P2 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:158
-msgctxt "input-name"
-msgid "P2 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:159
-msgctxt "input-name"
-msgid "P2 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:160
-msgctxt "input-name"
-msgid "P2 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:161
-msgctxt "input-name"
-msgid "P2 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:162
-msgctxt "input-name"
-msgid "P2 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:163
-msgctxt "input-name"
-msgid "P2 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:164
-msgctxt "input-name"
-msgid "P2 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:165
-msgctxt "input-name"
-msgid "P2 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:166
-msgctxt "input-name"
-msgid "P2 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:167
-msgctxt "input-name"
-msgid "P2 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:168
-msgctxt "input-name"
-msgid "P2 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:169
-msgctxt "input-name"
-msgid "P2 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:174
-msgctxt "input-name"
-msgid "P2 Mahjong A"
-msgstr ""
-
-#: src/emu/inpttype.ipp:175
-msgctxt "input-name"
-msgid "P2 Mahjong B"
-msgstr ""
-
-#: src/emu/inpttype.ipp:176
-msgctxt "input-name"
-msgid "P2 Mahjong C"
-msgstr ""
-
-#: src/emu/inpttype.ipp:177
-msgctxt "input-name"
-msgid "P2 Mahjong D"
-msgstr ""
-
-#: src/emu/inpttype.ipp:178
-msgctxt "input-name"
-msgid "P2 Mahjong E"
-msgstr ""
-
-#: src/emu/inpttype.ipp:179
-msgctxt "input-name"
-msgid "P2 Mahjong F"
-msgstr ""
-
-#: src/emu/inpttype.ipp:180
-msgctxt "input-name"
-msgid "P2 Mahjong G"
-msgstr ""
-
-#: src/emu/inpttype.ipp:181
-msgctxt "input-name"
-msgid "P2 Mahjong H"
-msgstr ""
-
-#: src/emu/inpttype.ipp:182
-msgctxt "input-name"
-msgid "P2 Mahjong I"
-msgstr ""
-
-#: src/emu/inpttype.ipp:183
-msgctxt "input-name"
-msgid "P2 Mahjong J"
-msgstr ""
-
-#: src/emu/inpttype.ipp:184
-msgctxt "input-name"
-msgid "P2 Mahjong K"
-msgstr ""
-
-#: src/emu/inpttype.ipp:185
-msgctxt "input-name"
-msgid "P2 Mahjong L"
-msgstr ""
-
-#: src/emu/inpttype.ipp:186
-msgctxt "input-name"
-msgid "P2 Mahjong M"
-msgstr ""
-
-#: src/emu/inpttype.ipp:187
-msgctxt "input-name"
-msgid "P2 Mahjong N"
-msgstr ""
-
-#: src/emu/inpttype.ipp:188
-msgctxt "input-name"
-msgid "P2 Mahjong O"
-msgstr ""
-
-#: src/emu/inpttype.ipp:189
-msgctxt "input-name"
-msgid "P2 Mahjong P"
-msgstr ""
-
-#: src/emu/inpttype.ipp:190
-msgctxt "input-name"
-msgid "P2 Mahjong Q"
-msgstr ""
-
-#: src/emu/inpttype.ipp:191
-msgctxt "input-name"
-msgid "P2 Mahjong Kan"
-msgstr ""
-
-#: src/emu/inpttype.ipp:192
-msgctxt "input-name"
-msgid "P2 Mahjong Pon"
-msgstr ""
-
-#: src/emu/inpttype.ipp:193
-msgctxt "input-name"
-msgid "P2 Mahjong Chi"
-msgstr ""
-
-#: src/emu/inpttype.ipp:194
-msgctxt "input-name"
-msgid "P2 Mahjong Reach"
-msgstr ""
-
-#: src/emu/inpttype.ipp:195
-msgctxt "input-name"
-msgid "P2 Mahjong Ron"
-msgstr ""
-
-#: src/emu/inpttype.ipp:196
-msgctxt "input-name"
-msgid "P2 Mahjong Bet"
-msgstr ""
-
-#: src/emu/inpttype.ipp:197
-msgctxt "input-name"
-msgid "P2 Mahjong Last Chance"
-msgstr ""
-
-#: src/emu/inpttype.ipp:198
-msgctxt "input-name"
-msgid "P2 Mahjong Take Score"
-msgstr ""
-
-#: src/emu/inpttype.ipp:199
-msgctxt "input-name"
-msgid "P2 Mahjong Double Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:200
-msgctxt "input-name"
-msgid "P2 Mahjong Flip Flop"
-msgstr ""
-
-#: src/emu/inpttype.ipp:201
-msgctxt "input-name"
-msgid "P2 Mahjong Big"
-msgstr ""
-
-#: src/emu/inpttype.ipp:202
-msgctxt "input-name"
-msgid "P2 Mahjong Small"
-msgstr ""
-
-#: src/emu/inpttype.ipp:207
-msgctxt "input-name"
-msgid "P2 Hanafuda A/1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:208
-msgctxt "input-name"
-msgid "P2 Hanafuda B/2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:209
-msgctxt "input-name"
-msgid "P2 Hanafuda C/3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:210
-msgctxt "input-name"
-msgid "P2 Hanafuda D/4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:211
-msgctxt "input-name"
-msgid "P2 Hanafuda E/5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:212
-msgctxt "input-name"
-msgid "P2 Hanafuda F/6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:213
-msgctxt "input-name"
-msgid "P2 Hanafuda G/7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:214
-msgctxt "input-name"
-msgid "P2 Hanafuda H/8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:215
-msgctxt "input-name"
-msgid "P2 Hanafuda Yes"
-msgstr ""
-
-#: src/emu/inpttype.ipp:216
-msgctxt "input-name"
-msgid "P2 Hanafuda No"
-msgstr ""
-
-#: src/emu/inpttype.ipp:221
-msgctxt "input-name"
-msgid "P3 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:222
-msgctxt "input-name"
-msgid "P3 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:223
-msgctxt "input-name"
-msgid "P3 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:224
-msgctxt "input-name"
-msgid "P3 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:225
-msgctxt "input-name"
-msgid "P3 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:226
-msgctxt "input-name"
-msgid "P3 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:227
-msgctxt "input-name"
-msgid "P3 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:228
-msgctxt "input-name"
-msgid "P3 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:229
-msgctxt "input-name"
-msgid "P3 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:230
-msgctxt "input-name"
-msgid "P3 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:231
-msgctxt "input-name"
-msgid "P3 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:232
-msgctxt "input-name"
-msgid "P3 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:233
-msgctxt "input-name"
-msgid "P3 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:234
-msgctxt "input-name"
-msgid "P3 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:235
-msgctxt "input-name"
-msgid "P3 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:236
-msgctxt "input-name"
-msgid "P3 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:237
-msgctxt "input-name"
-msgid "P3 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:238
-msgctxt "input-name"
-msgid "P3 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:239
-msgctxt "input-name"
-msgid "P3 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:240
-msgctxt "input-name"
-msgid "P3 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:241
-msgctxt "input-name"
-msgid "P3 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:242
-msgctxt "input-name"
-msgid "P3 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:243
-msgctxt "input-name"
-msgid "P3 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:244
-msgctxt "input-name"
-msgid "P3 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:245
-msgctxt "input-name"
-msgid "P3 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:246
-msgctxt "input-name"
-msgid "P3 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:247
-msgctxt "input-name"
-msgid "P3 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:248
-msgctxt "input-name"
-msgid "P3 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:249
-msgctxt "input-name"
-msgid "P3 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:250
-msgctxt "input-name"
-msgid "P3 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:255
-msgctxt "input-name"
-msgid "P4 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:256
-msgctxt "input-name"
-msgid "P4 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:257
-msgctxt "input-name"
-msgid "P4 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:258
-msgctxt "input-name"
-msgid "P4 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:259
-msgctxt "input-name"
-msgid "P4 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:260
-msgctxt "input-name"
-msgid "P4 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:261
-msgctxt "input-name"
-msgid "P4 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:262
-msgctxt "input-name"
-msgid "P4 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:263
-msgctxt "input-name"
-msgid "P4 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:264
-msgctxt "input-name"
-msgid "P4 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:265
-msgctxt "input-name"
-msgid "P4 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:266
-msgctxt "input-name"
-msgid "P4 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:267
-msgctxt "input-name"
-msgid "P4 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:268
-msgctxt "input-name"
-msgid "P4 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:269
-msgctxt "input-name"
-msgid "P4 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:270
-msgctxt "input-name"
-msgid "P4 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:271
-msgctxt "input-name"
-msgid "P4 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:272
-msgctxt "input-name"
-msgid "P4 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:273
-msgctxt "input-name"
-msgid "P4 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:274
-msgctxt "input-name"
-msgid "P4 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:275
-msgctxt "input-name"
-msgid "P4 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:276
-msgctxt "input-name"
-msgid "P4 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:277
-msgctxt "input-name"
-msgid "P4 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:278
-msgctxt "input-name"
-msgid "P4 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:279
-msgctxt "input-name"
-msgid "P4 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:280
-msgctxt "input-name"
-msgid "P4 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:281
-msgctxt "input-name"
-msgid "P4 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:282
-msgctxt "input-name"
-msgid "P4 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:283
-msgctxt "input-name"
-msgid "P4 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:284
-msgctxt "input-name"
-msgid "P4 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:289
-msgctxt "input-name"
-msgid "P5 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:290
-msgctxt "input-name"
-msgid "P5 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:291
-msgctxt "input-name"
-msgid "P5 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:292
-msgctxt "input-name"
-msgid "P5 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:293
-msgctxt "input-name"
-msgid "P5 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:294
-msgctxt "input-name"
-msgid "P5 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:295
-msgctxt "input-name"
-msgid "P5 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:296
-msgctxt "input-name"
-msgid "P5 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:297
-msgctxt "input-name"
-msgid "P5 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:298
-msgctxt "input-name"
-msgid "P5 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:299
-msgctxt "input-name"
-msgid "P5 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:300
-msgctxt "input-name"
-msgid "P5 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:301
-msgctxt "input-name"
-msgid "P5 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:302
-msgctxt "input-name"
-msgid "P5 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:303
-msgctxt "input-name"
-msgid "P5 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:304
-msgctxt "input-name"
-msgid "P5 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:305
-msgctxt "input-name"
-msgid "P5 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:306
-msgctxt "input-name"
-msgid "P5 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:307
-msgctxt "input-name"
-msgid "P5 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:308
-msgctxt "input-name"
-msgid "P5 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:309
-msgctxt "input-name"
-msgid "P5 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:310
-msgctxt "input-name"
-msgid "P5 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:311
-msgctxt "input-name"
-msgid "P5 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:312
-msgctxt "input-name"
-msgid "P5 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:313
-msgctxt "input-name"
-msgid "P5 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:314
-msgctxt "input-name"
-msgid "P5 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:315
-msgctxt "input-name"
-msgid "P5 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:316
-msgctxt "input-name"
-msgid "P5 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:317
-msgctxt "input-name"
-msgid "P5 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:318
-msgctxt "input-name"
-msgid "P5 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:323
-msgctxt "input-name"
-msgid "P6 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:324
-msgctxt "input-name"
-msgid "P6 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:325
-msgctxt "input-name"
-msgid "P6 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:326
-msgctxt "input-name"
-msgid "P6 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:327
-msgctxt "input-name"
-msgid "P6 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:328
-msgctxt "input-name"
-msgid "P6 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:329
-msgctxt "input-name"
-msgid "P6 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:330
-msgctxt "input-name"
-msgid "P6 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:331
-msgctxt "input-name"
-msgid "P6 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:332
-msgctxt "input-name"
-msgid "P6 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:333
-msgctxt "input-name"
-msgid "P6 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:334
-msgctxt "input-name"
-msgid "P6 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:335
-msgctxt "input-name"
-msgid "P6 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:336
-msgctxt "input-name"
-msgid "P6 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:337
-msgctxt "input-name"
-msgid "P6 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:338
-msgctxt "input-name"
-msgid "P6 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:339
-msgctxt "input-name"
-msgid "P6 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:340
-msgctxt "input-name"
-msgid "P6 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:341
-msgctxt "input-name"
-msgid "P6 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:342
-msgctxt "input-name"
-msgid "P6 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:343
-msgctxt "input-name"
-msgid "P6 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:344
-msgctxt "input-name"
-msgid "P6 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:345
-msgctxt "input-name"
-msgid "P6 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:346
-msgctxt "input-name"
-msgid "P6 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:347
-msgctxt "input-name"
-msgid "P6 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:348
-msgctxt "input-name"
-msgid "P6 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:349
-msgctxt "input-name"
-msgid "P6 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:350
-msgctxt "input-name"
-msgid "P6 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:351
-msgctxt "input-name"
-msgid "P6 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:352
-msgctxt "input-name"
-msgid "P6 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:357
-msgctxt "input-name"
-msgid "P7 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:358
-msgctxt "input-name"
-msgid "P7 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:359
-msgctxt "input-name"
-msgid "P7 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:360
-msgctxt "input-name"
-msgid "P7 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:361
-msgctxt "input-name"
-msgid "P7 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:362
-msgctxt "input-name"
-msgid "P7 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:363
-msgctxt "input-name"
-msgid "P7 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:364
-msgctxt "input-name"
-msgid "P7 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:365
-msgctxt "input-name"
-msgid "P7 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:366
-msgctxt "input-name"
-msgid "P7 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:367
-msgctxt "input-name"
-msgid "P7 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:368
-msgctxt "input-name"
-msgid "P7 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:369
-msgctxt "input-name"
-msgid "P7 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:370
-msgctxt "input-name"
-msgid "P7 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:371
-msgctxt "input-name"
-msgid "P7 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:372
-msgctxt "input-name"
-msgid "P7 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:373
-msgctxt "input-name"
-msgid "P7 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:374
-msgctxt "input-name"
-msgid "P7 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:375
-msgctxt "input-name"
-msgid "P7 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:376
-msgctxt "input-name"
-msgid "P7 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:377
-msgctxt "input-name"
-msgid "P7 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:378
-msgctxt "input-name"
-msgid "P7 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:379
-msgctxt "input-name"
-msgid "P7 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:380
-msgctxt "input-name"
-msgid "P7 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:381
-msgctxt "input-name"
-msgid "P7 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:382
-msgctxt "input-name"
-msgid "P7 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:383
-msgctxt "input-name"
-msgid "P7 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:384
-msgctxt "input-name"
-msgid "P7 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:385
-msgctxt "input-name"
-msgid "P7 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:386
-msgctxt "input-name"
-msgid "P7 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:391
-msgctxt "input-name"
-msgid "P8 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:392
-msgctxt "input-name"
-msgid "P8 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:393
-msgctxt "input-name"
-msgid "P8 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:394
-msgctxt "input-name"
-msgid "P8 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:395
-msgctxt "input-name"
-msgid "P8 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:396
-msgctxt "input-name"
-msgid "P8 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:397
-msgctxt "input-name"
-msgid "P8 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:398
-msgctxt "input-name"
-msgid "P8 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:399
-msgctxt "input-name"
-msgid "P8 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:400
-msgctxt "input-name"
-msgid "P8 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:401
-msgctxt "input-name"
-msgid "P8 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:402
-msgctxt "input-name"
-msgid "P8 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:403
-msgctxt "input-name"
-msgid "P8 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:404
-msgctxt "input-name"
-msgid "P8 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:405
-msgctxt "input-name"
-msgid "P8 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:406
-msgctxt "input-name"
-msgid "P8 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:407
-msgctxt "input-name"
-msgid "P8 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:408
-msgctxt "input-name"
-msgid "P8 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:409
-msgctxt "input-name"
-msgid "P8 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:410
-msgctxt "input-name"
-msgid "P8 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:411
-msgctxt "input-name"
-msgid "P8 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:412
-msgctxt "input-name"
-msgid "P8 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:413
-msgctxt "input-name"
-msgid "P8 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:414
-msgctxt "input-name"
-msgid "P8 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:415
-msgctxt "input-name"
-msgid "P8 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:416
-msgctxt "input-name"
-msgid "P8 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:417
-msgctxt "input-name"
-msgid "P8 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:418
-msgctxt "input-name"
-msgid "P8 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:419
-msgctxt "input-name"
-msgid "P8 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:420
-msgctxt "input-name"
-msgid "P8 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:425
-msgctxt "input-name"
-msgid "P9 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:426
-msgctxt "input-name"
-msgid "P9 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:427
-msgctxt "input-name"
-msgid "P9 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:428
-msgctxt "input-name"
-msgid "P9 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:429
-msgctxt "input-name"
-msgid "P9 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:430
-msgctxt "input-name"
-msgid "P9 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:431
-msgctxt "input-name"
-msgid "P9 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:432
-msgctxt "input-name"
-msgid "P9 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:433
-msgctxt "input-name"
-msgid "P9 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:434
-msgctxt "input-name"
-msgid "P9 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:435
-msgctxt "input-name"
-msgid "P9 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:436
-msgctxt "input-name"
-msgid "P9 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:437
-msgctxt "input-name"
-msgid "P9 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:438
-msgctxt "input-name"
-msgid "P9 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:439
-msgctxt "input-name"
-msgid "P9 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:440
-msgctxt "input-name"
-msgid "P9 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:441
-msgctxt "input-name"
-msgid "P9 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:442
-msgctxt "input-name"
-msgid "P9 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:443
-msgctxt "input-name"
-msgid "P9 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:444
-msgctxt "input-name"
-msgid "P9 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:445
-msgctxt "input-name"
-msgid "P9 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:446
-msgctxt "input-name"
-msgid "P9 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:447
-msgctxt "input-name"
-msgid "P9 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:448
-msgctxt "input-name"
-msgid "P9 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:449
-msgctxt "input-name"
-msgid "P9 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:450
-msgctxt "input-name"
-msgid "P9 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:451
-msgctxt "input-name"
-msgid "P9 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:452
-msgctxt "input-name"
-msgid "P9 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:453
-msgctxt "input-name"
-msgid "P9 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:454
-msgctxt "input-name"
-msgid "P9 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:459
-msgctxt "input-name"
-msgid "P10 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:460
-msgctxt "input-name"
-msgid "P10 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:461
-msgctxt "input-name"
-msgid "P10 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:462
-msgctxt "input-name"
-msgid "P10 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:463
-msgctxt "input-name"
-msgid "P10 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:464
-msgctxt "input-name"
-msgid "P10 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:465
-msgctxt "input-name"
-msgid "P10 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:466
-msgctxt "input-name"
-msgid "P10 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:467
-msgctxt "input-name"
-msgid "P10 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:468
-msgctxt "input-name"
-msgid "P10 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:469
-msgctxt "input-name"
-msgid "P10 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:470
-msgctxt "input-name"
-msgid "P10 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:471
-msgctxt "input-name"
-msgid "P10 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:472
-msgctxt "input-name"
-msgid "P10 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:473
-msgctxt "input-name"
-msgid "P10 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:474
-msgctxt "input-name"
-msgid "P10 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:475
-msgctxt "input-name"
-msgid "P10 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:476
-msgctxt "input-name"
-msgid "P10 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:477
-msgctxt "input-name"
-msgid "P10 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:478
-msgctxt "input-name"
-msgid "P10 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:479
-msgctxt "input-name"
-msgid "P10 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:480
-msgctxt "input-name"
-msgid "P10 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:481
-msgctxt "input-name"
-msgid "P10 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:482
-msgctxt "input-name"
-msgid "P10 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:483
-msgctxt "input-name"
-msgid "P10 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:484
-msgctxt "input-name"
-msgid "P10 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:485
-msgctxt "input-name"
-msgid "P10 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:486
-msgctxt "input-name"
-msgid "P10 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:487
-msgctxt "input-name"
-msgid "P10 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:488
-msgctxt "input-name"
-msgid "P10 Select"
-msgstr ""
-
 #: src/emu/inpttype.ipp:493
 msgctxt "input-name"
 msgid "1 Player Start"
@@ -5558,154 +4183,31 @@ msgctxt "input-name"
 msgid "Volume Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:550
-msgctxt "input-name"
-msgid "P1 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:551
-msgctxt "input-name"
-msgid "P2 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:552
-msgctxt "input-name"
-msgid "P3 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:553
-msgctxt "input-name"
-msgid "P4 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:554
-msgctxt "input-name"
-msgid "P5 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:555
-msgctxt "input-name"
-msgid "P6 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:556
-msgctxt "input-name"
-msgid "P7 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:557
-msgctxt "input-name"
-msgid "P8 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:558
-msgctxt "input-name"
-msgid "P9 Pedal 1"
-msgstr ""
-
+#: src/emu/inpttype.ipp:550 src/emu/inpttype.ipp:551 src/emu/inpttype.ipp:552
+#: src/emu/inpttype.ipp:553 src/emu/inpttype.ipp:554 src/emu/inpttype.ipp:555
+#: src/emu/inpttype.ipp:556 src/emu/inpttype.ipp:557 src/emu/inpttype.ipp:558
 #: src/emu/inpttype.ipp:559
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:564
-msgctxt "input-name"
-msgid "P1 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:565
-msgctxt "input-name"
-msgid "P2 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:566
-msgctxt "input-name"
-msgid "P3 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:567
-msgctxt "input-name"
-msgid "P4 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:568
-msgctxt "input-name"
-msgid "P5 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:569
-msgctxt "input-name"
-msgid "P6 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:570
-msgctxt "input-name"
-msgid "P7 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:571
-msgctxt "input-name"
-msgid "P8 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:572
-msgctxt "input-name"
-msgid "P9 Pedal 2"
+msgid "%p Pedal 1"
 msgstr ""
 
+#: src/emu/inpttype.ipp:564 src/emu/inpttype.ipp:565 src/emu/inpttype.ipp:566
+#: src/emu/inpttype.ipp:567 src/emu/inpttype.ipp:568 src/emu/inpttype.ipp:569
+#: src/emu/inpttype.ipp:570 src/emu/inpttype.ipp:571 src/emu/inpttype.ipp:572
 #: src/emu/inpttype.ipp:573
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:578
-msgctxt "input-name"
-msgid "P1 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:579
-msgctxt "input-name"
-msgid "P2 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:580
-msgctxt "input-name"
-msgid "P3 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:581
-msgctxt "input-name"
-msgid "P4 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:582
-msgctxt "input-name"
-msgid "P5 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:583
-msgctxt "input-name"
-msgid "P6 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:584
-msgctxt "input-name"
-msgid "P7 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:585
-msgctxt "input-name"
-msgid "P8 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:586
-msgctxt "input-name"
-msgid "P9 Pedal 3"
+msgid "%p Pedal 2"
 msgstr ""
 
+#: src/emu/inpttype.ipp:578 src/emu/inpttype.ipp:579 src/emu/inpttype.ipp:580
+#: src/emu/inpttype.ipp:581 src/emu/inpttype.ipp:582 src/emu/inpttype.ipp:583
+#: src/emu/inpttype.ipp:584 src/emu/inpttype.ipp:585 src/emu/inpttype.ipp:586
 #: src/emu/inpttype.ipp:587
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 3"
+msgid "%p Pedal 3"
 msgstr ""
 
 #: src/emu/inpttype.ipp:592
@@ -7601,6 +6103,42 @@ msgid ""
 "%s"
 msgstr ""
 
+#~ msgid "Confirm quit from machines"
+#~ msgstr "Beim Verlassen Bestätigung fordern"
+
+#~ msgid "Skip information screen at startup"
+#~ msgstr "Informations-Bildschirm beim Start überspringen"
+
+#~ msgid "Skip software parts selection menu"
+#~ msgstr "Menü zur Softwareauswahl überspringen"
+
+#~ msgid "Simultaneous contradictory"
+#~ msgstr "Widersprüchliche Eingaben erkennen"
+
+#~ msgid "Adstick Device Assignment"
+#~ msgstr "ADStick-Zuordnung"
+
+#, c-format
+#~ msgid ""
+#~ "Auditing ROMs for machine %2$u of %3$u...\n"
+#~ "%1$s"
+#~ msgstr ""
+#~ "Prüfe ROMs für Maschine %2$u von %3$u...\n"
+#~ "%1$s"
+
+#~ msgid "ROM Audit Result\tOK\n"
+#~ msgstr "ROM-Überprüfung\tOK\n"
+
+#~ msgid "ROM Audit Result\tBAD\n"
+#~ msgstr "ROM-Überprüfung\tFEHLERHAFT\n"
+
+#~ msgid ""
+#~ "ROM Audit \tDisabled\n"
+#~ "Samples Audit \tDisabled\n"
+#~ msgstr ""
+#~ "ROM-Überprüfung\tDeaktiviert\n"
+#~ "Samples-Überprüfung\tDeaktiviert\n"
+
 #~ msgid "Device Mapping"
 #~ msgstr "Geräte-Zuordnung"
 
diff --git a/language/Greek/strings.po b/language/Greek/strings.po
index 794d8f5968f..4be139b49e2 100644
--- a/language/Greek/strings.po
+++ b/language/Greek/strings.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-19 02:50+1100\n"
+"POT-Creation-Date: 2021-12-09 04:44+1100\n"
 "PO-Revision-Date: 2021-11-21 11:00+0300\n"
 "Last-Translator: Mame.gr - BraiNKilleR\n"
 "Language-Team: MAME Language Team\n"
@@ -275,12 +275,12 @@ msgstr "%1$s %2$s ( %3$d / %4$d πακέτα λογισμικού)"
 msgid "Driver: \"%1$s\" software list "
 msgstr "Οδηγός: \"%1$s\" λίστα λογισμικού "
 
-#: src/frontend/mame/ui/selsoft.cpp:711 src/frontend/mame/ui/selgame.cpp:1066
+#: src/frontend/mame/ui/selsoft.cpp:711 src/frontend/mame/ui/selgame.cpp:1076
 #, c-format
 msgid "%1$s: %2$s - Search: %3$s_"
 msgstr "%1$s: %2$s - Αναζήτηση: %3$s_"
 
-#: src/frontend/mame/ui/selsoft.cpp:713 src/frontend/mame/ui/selgame.cpp:1068
+#: src/frontend/mame/ui/selsoft.cpp:713 src/frontend/mame/ui/selgame.cpp:1078
 #, c-format
 msgid "Search: %1$s_"
 msgstr "Αναζήτηση: %1$s_"
@@ -290,7 +290,7 @@ msgstr "Αναζήτηση: %1$s_"
 msgid "Software list/item: %1$s:%2$s"
 msgstr "Λίστα λογισμικού/αντικείμενο: %1$s:%2$s"
 
-#: src/frontend/mame/ui/optsmenu.cpp:73 src/frontend/mame/ui/sndmenu.cpp:165
+#: src/frontend/mame/ui/optsmenu.cpp:73 src/frontend/mame/ui/sndmenu.cpp:161
 msgid "Sound Options"
 msgstr "Επιλογές Ήχου"
 
@@ -385,12 +385,12 @@ msgid "Show mouse pointer"
 msgstr "Προβολή δείκτη ποντικιού"
 
 #: src/frontend/mame/ui/submenu.cpp:39
-msgid "Confirm quit from machines"
-msgstr "Επιβεβαίωση εγκατάληψης από μηχάνημα"
+msgid "Confirm quit from emulation"
+msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:40
-msgid "Skip information screen at startup"
-msgstr "Να μην εμφανίζεται η οθόνη πληροφοριών κατά την εκκίνηση"
+msgid "Skip system information screen"
+msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:41
 msgid "Force 4:3 aspect for snapshot display"
@@ -405,8 +405,8 @@ msgid "Skip BIOS selection menu"
 msgstr "Παράλειψη μενού επιλογής BIOS"
 
 #: src/frontend/mame/ui/submenu.cpp:44
-msgid "Skip software parts selection menu"
-msgstr "Παράλειψη μενού επιλογής τμημάτων λογισμικού"
+msgid "Skip software part selection menu"
+msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:45
 msgid "Info auto audit"
@@ -557,7 +557,7 @@ msgid "UI active"
 msgstr "UI ενεργοποιημένο"
 
 #: src/frontend/mame/ui/submenu.cpp:91
-msgid "Offscreen reload"
+msgid "Off-screen reload"
 msgstr "Επαναφόρτωση εκτός οθόνης"
 
 #: src/frontend/mame/ui/submenu.cpp:92
@@ -573,8 +573,8 @@ msgid "Natural keyboard"
 msgstr "Φυσικό πληκτρολόγιο"
 
 #: src/frontend/mame/ui/submenu.cpp:95
-msgid "Simultaneous contradictory"
-msgstr "Ταυτόχρονη αναίρεση"
+msgid "Allow contradictory joystick inputs"
+msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:96
 msgid "Coin impulse"
@@ -597,8 +597,8 @@ msgid "Pedal Device Assignment"
 msgstr "Ανάθεση Συσκευής Πεταλιού"
 
 #: src/frontend/mame/ui/submenu.cpp:106
-msgid "Adstick Device Assignment"
-msgstr "Ανάθεση Συσκευής AD μοχλού"
+msgid "AD Stick Device Assignment"
+msgstr "Ανάθεση Συσκευής AD Μοχλού"
 
 #: src/frontend/mame/ui/submenu.cpp:107
 msgid "Paddle Device Assignment"
@@ -684,14 +684,14 @@ msgstr "Συγχρονισμένη Ανανέωση"
 msgid "Wait Vertical Sync"
 msgstr "Αναμονή για Κάθετο Συγχρονισμό"
 
-#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:687
+#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:689
 #: src/frontend/mame/ui/videoopt.cpp:191 src/frontend/mame/ui/custui.cpp:490
 #: src/frontend/mame/ui/analogipt.cpp:471 plugins/cheatfind/init.lua:766
 #: plugins/cheatfind/init.lua:777 plugins/cheat/init.lua:668
 msgid "On"
 msgstr "On"
 
-#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:690
+#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:692
 #: src/frontend/mame/ui/videoopt.cpp:207 src/frontend/mame/ui/custui.cpp:490
 #: src/frontend/mame/ui/analogipt.cpp:471 plugins/cheatfind/init.lua:763
 #: plugins/cheatfind/init.lua:774 plugins/cheat/init.lua:671
@@ -699,11 +699,11 @@ msgstr "On"
 msgid "Off"
 msgstr "Off"
 
-#: src/frontend/mame/ui/menu.cpp:693
+#: src/frontend/mame/ui/menu.cpp:695
 msgid "Auto"
 msgstr "Αυτόματο"
 
-#: src/frontend/mame/ui/menu.cpp:1195
+#: src/frontend/mame/ui/menu.cpp:1197
 #: src/frontend/mame/ui/simpleselgame.cpp:278
 #: src/frontend/mame/ui/selmenu.cpp:1280
 msgid "Return to Previous Menu"
@@ -711,7 +711,7 @@ msgstr "Επιστροφή στο Προηγούμενο Μενού"
 
 #: src/frontend/mame/ui/filemngr.cpp:139
 #: src/frontend/mame/ui/confswitch.cpp:119
-#: src/frontend/mame/ui/inputmap.cpp:559 src/frontend/mame/ui/analogipt.cpp:360
+#: src/frontend/mame/ui/inputmap.cpp:563 src/frontend/mame/ui/analogipt.cpp:360
 #, c-format
 msgid "[root%1$s]"
 msgstr "[root%1$s]"
@@ -982,22 +982,22 @@ msgstr ""
 "Επεξεργαστής:\n"
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "GHz"
 msgstr "GHz"
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "MHz"
 msgstr "MHz"
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "kHz"
 msgstr "kHz"
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "Hz"
 msgstr "Hz"
 
@@ -1025,38 +1025,38 @@ msgstr "Κανένα\n"
 msgid "Vector"
 msgstr "Διάνυσμα"
 
-#: src/frontend/mame/ui/info.cpp:480
+#: src/frontend/mame/ui/info.cpp:483
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr "%1$s: %2$s\n"
 
-#: src/frontend/mame/ui/info.cpp:480
+#: src/frontend/mame/ui/info.cpp:483
 msgid "%2$s\n"
 msgstr "%2$s\n"
 
-#: src/frontend/mame/ui/info.cpp:497
+#: src/frontend/mame/ui/info.cpp:500
 #, c-format
 msgid "Screen '%1$s'"
 msgstr "Οθόνη '%1$s'"
 
-#: src/frontend/mame/ui/info.cpp:499
+#: src/frontend/mame/ui/info.cpp:502
 msgid "Screen"
 msgstr "Οθόνη"
 
-#: src/frontend/mame/ui/info.cpp:570 src/frontend/mame/ui/info.cpp:581
+#: src/frontend/mame/ui/info.cpp:573 src/frontend/mame/ui/info.cpp:584
 #, c-format
 msgid "%1$s:\n"
 msgstr "%1$s:\n"
 
-#: src/frontend/mame/ui/info.cpp:662
+#: src/frontend/mame/ui/info.cpp:665
 msgid "Not supported"
 msgstr "Δεν υποστηρίζεται"
 
-#: src/frontend/mame/ui/info.cpp:665
+#: src/frontend/mame/ui/info.cpp:668
 msgid "Partially supported"
 msgstr "Υποστηρίζεται μερικώς"
 
-#: src/frontend/mame/ui/info.cpp:674
+#: src/frontend/mame/ui/info.cpp:677
 msgid "[empty]"
 msgstr "[κενό]"
 
@@ -1129,7 +1129,7 @@ msgid "Emulated"
 msgstr "Εξομοιωμένο"
 
 #: src/frontend/mame/ui/keyboard.cpp:59 src/frontend/mame/ui/confswitch.cpp:117
-#: src/frontend/mame/ui/inputmap.cpp:557 src/frontend/mame/ui/analogipt.cpp:358
+#: src/frontend/mame/ui/inputmap.cpp:561 src/frontend/mame/ui/analogipt.cpp:358
 #, c-format
 msgid "%1$s [root%2$s]"
 msgstr "%1$s [root%2$s]"
@@ -1489,7 +1489,7 @@ msgctxt "swlist-info"
 msgid "Software list/item"
 msgstr "Λίστα λογισμικού/αντικείμενο"
 
-#: src/frontend/mame/ui/datmenu.cpp:88 src/frontend/mame/ui/selmenu.cpp:2698
+#: src/frontend/mame/ui/datmenu.cpp:88 src/frontend/mame/ui/selmenu.cpp:2707
 msgid "Software List Info"
 msgstr "Πληροφορίες Λίστας λογισμικού"
 
@@ -1610,7 +1610,7 @@ msgstr "Αποθήκευση Παραμετροποίησης Μηχανήματ
 msgid "Configure Machine:"
 msgstr "Ρύθμιση Μηχανήματος:"
 
-#: src/frontend/mame/ui/miscmenu.cpp:858 src/frontend/mame/ui/selmenu.cpp:2638
+#: src/frontend/mame/ui/miscmenu.cpp:858 src/frontend/mame/ui/selmenu.cpp:2647
 msgid " (default)"
 msgstr " (προεπιλογή)"
 
@@ -1631,7 +1631,7 @@ msgstr ""
 "Πατήστε %1$s για να εγκαταλείψετε\n"
 "Πατήστε %2$s για να επιστρέψετε στην εξομοίωση"
 
-#: src/frontend/mame/ui/info_pty.cpp:30 src/frontend/mame/ui/mainmenu.cpp:155
+#: src/frontend/mame/ui/info_pty.cpp:30
 msgid "Pseudo terminals"
 msgstr "Ψευδο τερματικά"
 
@@ -1703,52 +1703,52 @@ msgstr "Χειρισμός Παίκτη %1$d"
 msgid "Other Controls"
 msgstr "Άλλα Στοιχεία Ελέγχου"
 
-#: src/frontend/mame/ui/inputmap.cpp:227
+#: src/frontend/mame/ui/inputmap.cpp:231
 msgid "This machine has no configurable inputs."
 msgstr "Αυτό το μηχάνημα δεν έχει είσαγωγές προς ρύθμιση."
 
-#: src/frontend/mame/ui/inputmap.cpp:327
+#: src/frontend/mame/ui/inputmap.cpp:331
 msgid "Pressed"
 msgstr "Πατήθηκε"
 
-#: src/frontend/mame/ui/inputmap.cpp:397
+#: src/frontend/mame/ui/inputmap.cpp:401
 msgid "Invalid sequence entered"
 msgstr "Έγινε εισαγωγή μη έγκυρης ακολουθίας"
 
-#: src/frontend/mame/ui/inputmap.cpp:542
+#: src/frontend/mame/ui/inputmap.cpp:546
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog"
 msgstr "%1$s Αναλογικό"
 
-#: src/frontend/mame/ui/inputmap.cpp:543
+#: src/frontend/mame/ui/inputmap.cpp:547
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog Inc"
-msgstr "%1$s Αναλογικό Άυξηση "
+msgstr "%1$s Αναλογικό Άυξηση"
 
-#: src/frontend/mame/ui/inputmap.cpp:544
+#: src/frontend/mame/ui/inputmap.cpp:548
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog Dec"
 msgstr "%1$s Αναλογικό Μείωση"
 
-#: src/frontend/mame/ui/inputmap.cpp:586
+#: src/frontend/mame/ui/inputmap.cpp:590
 #, c-format
 msgid "Press %1$s to set\n"
 msgstr "Πιέστε το πλήκτρο %1$s για να ορίσετε\n"
 
-#: src/frontend/mame/ui/inputmap.cpp:587
+#: src/frontend/mame/ui/inputmap.cpp:591
 #, c-format
 msgid "Press %1$s to append\n"
 msgstr "Πιέστε το πλήκτρο %1$s για προσθήκη\n"
 
-#: src/frontend/mame/ui/inputmap.cpp:588
+#: src/frontend/mame/ui/inputmap.cpp:592
 #, c-format
 msgid "Press %1$s to clear\n"
 msgstr "Πιέστε το πλήκτρο %1$s για καθαρισμό"
 
-#: src/frontend/mame/ui/inputmap.cpp:589
+#: src/frontend/mame/ui/inputmap.cpp:593
 #, c-format
 msgid "Press %1$s to restore default\n"
 msgstr "Πιέστε το πλήκτρο %1$s για επαναφορά προεπιλογών\n"
@@ -1818,7 +1818,7 @@ msgstr ""
 "Πιέστε ένα πλήκτρο για συνέχεια."
 
 #: src/frontend/mame/ui/simpleselgame.cpp:273
-#: src/frontend/mame/ui/selgame.cpp:436
+#: src/frontend/mame/ui/selgame.cpp:443
 msgid "Configure Options"
 msgstr "Ρύθμιση Επιλογών"
 
@@ -2154,16 +2154,16 @@ msgstr "Μεγένθυση = %1$d"
 msgid "Expand to fit"
 msgstr "Μέγιστη Επέκταση"
 
-#: src/frontend/mame/ui/selgame.cpp:437
+#: src/frontend/mame/ui/selgame.cpp:444
 msgid "Configure Machine"
 msgstr "Ρύθμιση Μηχανήματος"
 
-#: src/frontend/mame/ui/selgame.cpp:1050
+#: src/frontend/mame/ui/selgame.cpp:1060
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d machines (%5$d BIOS) )"
 msgstr "%1$s %2$s ( %3$d / %4$d μηχανήματα (%5$d BIOS) )"
 
-#: src/frontend/mame/ui/selgame.cpp:1078
+#: src/frontend/mame/ui/selgame.cpp:1088
 #, c-format
 msgid "System: %1$-.100s"
 msgstr "Σύστημα: %1$-.100s"
@@ -2185,11 +2185,9 @@ msgstr "Τα αποτελέσματα θα αποθηκευτούν στο %1$s"
 #: src/frontend/mame/ui/auditmenu.cpp:98
 #, c-format
 msgid ""
-"Auditing ROMs for machine %2$u of %3$u...\n"
+"Auditing media for machine %2$u of %3$u...\n"
 "%1$s"
 msgstr ""
-"Γίνεται έλεγχος ROMs για το μηχάνημα %2$u από %3$u...\n"
-"%1$s"
 
 #: src/frontend/mame/ui/auditmenu.cpp:116
 #, c-format
@@ -2206,13 +2204,13 @@ msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:136
 #, c-format
-msgid "Audit ROMs for %1$u machines marked unavailable"
-msgstr "Έλεγχος ROMs για %1$u μηχανήματα που δεν είναι διαθέσιμα"
+msgid "Audit media for %1$u machines marked unavailable"
+msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:137
 #, c-format
-msgid "Audit ROMs for all %1$u machines"
-msgstr "Έλεγχος ROMs για όλα τα %1$u μηχανήματα"
+msgid "Audit media for all %1$u machines"
+msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:154
 #, c-format
@@ -2418,84 +2416,84 @@ msgctxt "color-sample"
 msgid "Clone"
 msgstr "Κλώνος"
 
-#: src/frontend/mame/ui/custui.cpp:914
+#: src/frontend/mame/ui/custui.cpp:906
 msgid "ARGB Settings"
 msgstr "Ρυθμίσεις ARGB"
 
-#: src/frontend/mame/ui/custui.cpp:919 src/frontend/mame/ui/custui.cpp:922
+#: src/frontend/mame/ui/custui.cpp:911 src/frontend/mame/ui/custui.cpp:914
 msgctxt "color-channel"
 msgid "Alpha"
 msgstr "Άλφα"
 
-#: src/frontend/mame/ui/custui.cpp:927 src/frontend/mame/ui/custui.cpp:930
+#: src/frontend/mame/ui/custui.cpp:919 src/frontend/mame/ui/custui.cpp:922
 msgctxt "color-channel"
 msgid "Red"
 msgstr "Κόκκινο"
 
-#: src/frontend/mame/ui/custui.cpp:935 src/frontend/mame/ui/custui.cpp:938
+#: src/frontend/mame/ui/custui.cpp:927 src/frontend/mame/ui/custui.cpp:930
 msgctxt "color-channel"
 msgid "Green"
 msgstr "Πράσινο"
 
-#: src/frontend/mame/ui/custui.cpp:943 src/frontend/mame/ui/custui.cpp:946
+#: src/frontend/mame/ui/custui.cpp:935 src/frontend/mame/ui/custui.cpp:938
 msgctxt "color-channel"
 msgid "Blue"
 msgstr "Μπλε"
 
-#: src/frontend/mame/ui/custui.cpp:949
+#: src/frontend/mame/ui/custui.cpp:941
 msgid "Choose from palette"
 msgstr "Επιλέξτε από την παλέτα"
 
-#: src/frontend/mame/ui/custui.cpp:996
+#: src/frontend/mame/ui/custui.cpp:988
 msgid "Color preview:"
 msgstr "Προεπισκόπηση χρώματος:"
 
-#: src/frontend/mame/ui/custui.cpp:1093
+#: src/frontend/mame/ui/custui.cpp:1085
 msgctxt "color-preset"
 msgid "White"
 msgstr "Λευκό"
 
-#: src/frontend/mame/ui/custui.cpp:1094
+#: src/frontend/mame/ui/custui.cpp:1086
 msgctxt "color-preset"
 msgid "Silver"
 msgstr "Ασημί"
 
-#: src/frontend/mame/ui/custui.cpp:1095
+#: src/frontend/mame/ui/custui.cpp:1087
 msgctxt "color-preset"
 msgid "Gray"
 msgstr "Γκρίζο"
 
-#: src/frontend/mame/ui/custui.cpp:1096
+#: src/frontend/mame/ui/custui.cpp:1088
 msgctxt "color-preset"
 msgid "Black"
 msgstr "Μαύρο"
 
-#: src/frontend/mame/ui/custui.cpp:1097
+#: src/frontend/mame/ui/custui.cpp:1089
 msgctxt "color-preset"
 msgid "Red"
 msgstr "Κόκκινο"
 
-#: src/frontend/mame/ui/custui.cpp:1098
+#: src/frontend/mame/ui/custui.cpp:1090
 msgctxt "color-preset"
 msgid "Orange"
 msgstr "Πορτοκαλί"
 
-#: src/frontend/mame/ui/custui.cpp:1099
+#: src/frontend/mame/ui/custui.cpp:1091
 msgctxt "color-preset"
 msgid "Yellow"
 msgstr "Κίτρινο"
 
-#: src/frontend/mame/ui/custui.cpp:1100
+#: src/frontend/mame/ui/custui.cpp:1092
 msgctxt "color-preset"
 msgid "Green"
 msgstr "Πράσινο"
 
-#: src/frontend/mame/ui/custui.cpp:1101
+#: src/frontend/mame/ui/custui.cpp:1093
 msgctxt "color-preset"
 msgid "Blue"
 msgstr "Μπλε"
 
-#: src/frontend/mame/ui/custui.cpp:1102
+#: src/frontend/mame/ui/custui.cpp:1094
 msgctxt "color-preset"
 msgid "Violet"
 msgstr "Βιολετί"
@@ -2560,8 +2558,8 @@ msgid "Input (general)"
 msgstr "Χειρισμός (γενικά)"
 
 #: src/frontend/mame/ui/mainmenu.cpp:123
-msgid "Input (this Machine)"
-msgstr "Χειρισμός (τρέχων Μηχάνημα)"
+msgid "Input (this machine)"
+msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:126
 msgid "Analog Controls"
@@ -2599,6 +2597,10 @@ msgstr "Διαχείριση Αρχείων"
 msgid "Tape Control"
 msgstr "Έλεγχος Κασέτας"
 
+#: src/frontend/mame/ui/mainmenu.cpp:155
+msgid "Pseudo Terminals"
+msgstr ""
+
 #: src/frontend/mame/ui/mainmenu.cpp:158
 msgid "BIOS Selection"
 msgstr "Επιλογή BIOS"
@@ -2637,8 +2639,8 @@ msgstr "Προβολή Εξωτερικού DAT"
 
 #: src/frontend/mame/ui/mainmenu.cpp:200
 #, c-format
-msgid "About %s"
-msgstr "Σχετικά με το %s"
+msgid "About %1$s"
+msgstr "Σχετικά με το %1$s"
 
 #: src/frontend/mame/ui/mainmenu.cpp:212
 msgid "Select New Machine"
@@ -2797,15 +2799,15 @@ msgstr "Ο Οδηγός είναι κλώνος του: %1$s"
 msgid "%1$s %2$s"
 msgstr "%1$s %2$s"
 
-#: src/frontend/mame/ui/selmenu.cpp:2235
+#: src/frontend/mame/ui/selmenu.cpp:2244
 msgid "Images"
 msgstr "Εικόνες"
 
-#: src/frontend/mame/ui/selmenu.cpp:2236
+#: src/frontend/mame/ui/selmenu.cpp:2245
 msgid "Infos"
 msgstr "Πληροφορίες"
 
-#: src/frontend/mame/ui/selmenu.cpp:2551
+#: src/frontend/mame/ui/selmenu.cpp:2560
 msgid ""
 "Required ROM/disk images for the selected system are missing or incorrect. "
 "Please acquire the correct files or select a different system.\n"
@@ -2816,7 +2818,7 @@ msgstr ""
 "Παρακαλώ προμηθευτείτε τα σωστά αρχεία ή επιλέξτε ένα διαφορετικό σύστημα.\n"
 "\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2567
+#: src/frontend/mame/ui/selmenu.cpp:2576
 msgid ""
 "Required ROM/disk images for the selected software are missing or incorrect. "
 "Please acquire the correct files or select a different software item.\n"
@@ -2828,353 +2830,351 @@ msgstr ""
 "αντικείμενο λογισμικού.\n"
 "\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2583
+#: src/frontend/mame/ui/selmenu.cpp:2592
 msgid "incorrect checksum"
 msgstr "λανθασμένο άθροισμα ελέγχου"
 
-#: src/frontend/mame/ui/selmenu.cpp:2586
+#: src/frontend/mame/ui/selmenu.cpp:2595
 msgid "incorrect length"
 msgstr "λανθασμένο μήκος"
 
-#: src/frontend/mame/ui/selmenu.cpp:2589
+#: src/frontend/mame/ui/selmenu.cpp:2598
 msgid "not found"
 msgstr "δεν βρέθηκε"
 
-#: src/frontend/mame/ui/selmenu.cpp:2600
+#: src/frontend/mame/ui/selmenu.cpp:2609
 #, c-format
 msgid "%1$s (%2$s) - %3$s\n"
 msgstr "%1$s (%2$s) - %3$s\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2602
+#: src/frontend/mame/ui/selmenu.cpp:2611
 #, c-format
 msgid "%1$s - %2$s\n"
 msgstr "%1$s - %2$s\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2606
+#: src/frontend/mame/ui/selmenu.cpp:2615
 msgid "Press any key to continue."
 msgstr "Πιέστε ένα πλήκτρο για συνέχεια."
 
-#: src/frontend/mame/ui/selmenu.cpp:2735
+#: src/frontend/mame/ui/selmenu.cpp:2744
 msgid "General Info"
 msgstr "Γενικές Πληροφορίες"
 
-#: src/frontend/mame/ui/selmenu.cpp:2887
+#: src/frontend/mame/ui/selmenu.cpp:2896
 #, c-format
 msgid "Romset\t%1$s\n"
 msgstr "Romset\t%1$s\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2888
+#: src/frontend/mame/ui/selmenu.cpp:2897
 #, c-format
 msgid "Year\t%1$s\n"
 msgstr "Έτος\t%1$s\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2889
+#: src/frontend/mame/ui/selmenu.cpp:2898
 #, c-format
 msgid "Manufacturer\t%1$s\n"
 msgstr "Κατασκευαστής\t%1$s\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2896
+#: src/frontend/mame/ui/selmenu.cpp:2905
 #, c-format
 msgid "Driver is Clone of\t%1$s\n"
 msgstr "Ο Οδηγός είναι Κλώνος του\t%1$s\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2901
+#: src/frontend/mame/ui/selmenu.cpp:2910
 msgid "Driver is Parent\t\n"
 msgstr "Ο Οδηγός είναι Γονικός\t\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2905
+#: src/frontend/mame/ui/selmenu.cpp:2914
 msgid "Analog Controls\tYes\n"
 msgstr "Αναλογικός Χειρισμός\tΝαι\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2907
+#: src/frontend/mame/ui/selmenu.cpp:2916
 msgid "Keyboard Inputs\tYes\n"
 msgstr "Εισαγωγή Πληκτρολογίου\tΝαι\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2910
+#: src/frontend/mame/ui/selmenu.cpp:2919
 msgid "Overall\tNOT WORKING\n"
 msgstr "Συνολικά\tΔΕΝ ΛΕΙΤΟΥΡΓΕΙ\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2912
+#: src/frontend/mame/ui/selmenu.cpp:2921
 msgid "Overall\tUnemulated Protection\n"
 msgstr "Συνολικά\tΜη Εξομοιωμένη Προστασία\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2914
+#: src/frontend/mame/ui/selmenu.cpp:2923
 msgid "Overall\tWorking\n"
 msgstr "Συνολικά\tΛειτουργεί\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2917
+#: src/frontend/mame/ui/selmenu.cpp:2926
 msgid "Graphics\tUnimplemented\n"
 msgstr "Γραφικά\tΜη υλοποιημένα\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2919
+#: src/frontend/mame/ui/selmenu.cpp:2928
 msgid "Graphics\tWrong Colors\n"
 msgstr "Γραφικά\tΛάθος Χρώματα\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2921
+#: src/frontend/mame/ui/selmenu.cpp:2930
 msgid "Graphics\tImperfect Colors\n"
 msgstr "Γραφικά\tΑτελή Χρώματα\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2923
+#: src/frontend/mame/ui/selmenu.cpp:2932
 msgid "Graphics\tImperfect\n"
 msgstr "Γραφικά\tΑτελή\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2925
+#: src/frontend/mame/ui/selmenu.cpp:2934
 msgid "Graphics\tOK\n"
 msgstr "Γραφικά\tOK\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2928
+#: src/frontend/mame/ui/selmenu.cpp:2937
 msgid "Sound\tNone\n"
 msgstr "Ήχος\tΚανένας\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2930
+#: src/frontend/mame/ui/selmenu.cpp:2939
 msgid "Sound\tUnimplemented\n"
 msgstr "Ήχος\tΜη υλοποιημένος\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2932
+#: src/frontend/mame/ui/selmenu.cpp:2941
 msgid "Sound\tImperfect\n"
 msgstr "Ήχος\tΑτελής\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2934
+#: src/frontend/mame/ui/selmenu.cpp:2943
 msgid "Sound\tOK\n"
 msgstr "Ήχος\tOK\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2937
+#: src/frontend/mame/ui/selmenu.cpp:2946
 msgid "Capture\tUnimplemented\n"
 msgstr "Καταγραφή\tΜη υλοποιημένη\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2939
+#: src/frontend/mame/ui/selmenu.cpp:2948
 msgid "Capture\tImperfect\n"
 msgstr "Καταγραφή\tΑτελής\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2942
+#: src/frontend/mame/ui/selmenu.cpp:2951
 msgid "Camera\tUnimplemented\n"
 msgstr "Κάμερα\tΜη υλοποιημένη\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2944
+#: src/frontend/mame/ui/selmenu.cpp:2953
 msgid "Camera\tImperfect\n"
 msgstr "Κάμερα\tΑτελής\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2947
+#: src/frontend/mame/ui/selmenu.cpp:2956
 msgid "Microphone\tUnimplemented\n"
 msgstr "Μικρόφωνο\tΜη υλοποιημένο\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2949
+#: src/frontend/mame/ui/selmenu.cpp:2958
 msgid "Microphone\tImperfect\n"
 msgstr "Μικρόφωνο\tΑτελές\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2952
+#: src/frontend/mame/ui/selmenu.cpp:2961
 msgid "Controls\tUnimplemented\n"
 msgstr "Χειρισμός\tΜη υλοποιημένος\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2954
+#: src/frontend/mame/ui/selmenu.cpp:2963
 msgid "Controls\tImperfect\n"
 msgstr "Χειρισμός\tΑτελής\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2957
+#: src/frontend/mame/ui/selmenu.cpp:2966
 msgid "Keyboard\tUnimplemented\n"
 msgstr "Πληκτρολόγιο\tΜη υλοποιημένο\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2959
+#: src/frontend/mame/ui/selmenu.cpp:2968
 msgid "Keyboard\tImperfect\n"
 msgstr "Πληκτρολόγιο\tΑτελές\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2962
+#: src/frontend/mame/ui/selmenu.cpp:2971
 msgid "Mouse\tUnimplemented\n"
 msgstr "Ποντίκι\tΜη υλοποιημένο\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2964
+#: src/frontend/mame/ui/selmenu.cpp:2973
 msgid "Mouse\tImperfect\n"
 msgstr "Ποντίκι\tΑτελές\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2967
+#: src/frontend/mame/ui/selmenu.cpp:2976
 msgid "Media\tUnimplemented\n"
 msgstr "Μέσα\tΜη υλοποιημένα\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2969
+#: src/frontend/mame/ui/selmenu.cpp:2978
 msgid "Media\tImperfect\n"
 msgstr "Μέσα\tΑτελή\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2972
+#: src/frontend/mame/ui/selmenu.cpp:2981
 msgid "Disk\tUnimplemented\n"
 msgstr "Δίσκος\tΜη υλοποιημένος\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2974
+#: src/frontend/mame/ui/selmenu.cpp:2983
 msgid "Disk\tImperfect\n"
 msgstr "Δίσκος\tΑτελής\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2977
+#: src/frontend/mame/ui/selmenu.cpp:2986
 msgid "Printer\tUnimplemented\n"
 msgstr "Εκτυπωτής\tΜη υλοποιημένος\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2979
+#: src/frontend/mame/ui/selmenu.cpp:2988
 msgid "Printer\tImperfect\n"
 msgstr "Εκτυπωτής\tΑτελής\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2982
+#: src/frontend/mame/ui/selmenu.cpp:2991
 msgid "Mag. Tape\tUnimplemented\n"
 msgstr "Μαγ. Ταινία\tΜη υλοποιημένη\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2984
+#: src/frontend/mame/ui/selmenu.cpp:2993
 msgid "Mag. Tape\tImperfect\n"
 msgstr "Μαγ. Ταινία\tΑτελής\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2987
+#: src/frontend/mame/ui/selmenu.cpp:2996
 msgid "Punch Tape\tUnimplemented\n"
 msgstr "Διάτρητη Ταινία\tΜη υλοποιημένη\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2989
+#: src/frontend/mame/ui/selmenu.cpp:2998
 msgid "Punch Tape\tImperfect\n"
 msgstr "Διάτρητη Ταινία\tΑτελής\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2992
+#: src/frontend/mame/ui/selmenu.cpp:3001
 msgid "Mag. Drum\tUnimplemented\n"
 msgstr "Μαγ. Τύμπανο\tΜη υλοποιημένο\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2994
+#: src/frontend/mame/ui/selmenu.cpp:3003
 msgid "Mag. Drum\tImperfect\n"
 msgstr "Μαγ. Τύμπανο\tΑτελές\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2997
+#: src/frontend/mame/ui/selmenu.cpp:3006
 msgid "(EP)ROM\tUnimplemented\n"
 msgstr "(EP)ROM\tΜη υλοποιημένη\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2999
+#: src/frontend/mame/ui/selmenu.cpp:3008
 msgid "(EP)ROM\tImperfect\n"
 msgstr "(EP)ROM\tΑτελής\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3002
+#: src/frontend/mame/ui/selmenu.cpp:3011
 msgid "Communications\tUnimplemented\n"
 msgstr "Επικοινωνίες\tΜη υλοποιημένες\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3004
+#: src/frontend/mame/ui/selmenu.cpp:3013
 msgid "Communications\tImperfect\n"
 msgstr "Επικοινωνίες\tΑτελής\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3007
+#: src/frontend/mame/ui/selmenu.cpp:3016
 msgid "LAN\tUnimplemented\n"
 msgstr "LAN\tΜη υλοποιημένο\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3009
+#: src/frontend/mame/ui/selmenu.cpp:3018
 msgid "LAN\tImperfect\n"
 msgstr "LAN\tΑτελές\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3012
+#: src/frontend/mame/ui/selmenu.cpp:3021
 msgid "WAN\tUnimplemented\n"
 msgstr "WAN\tΜη υλοποιημένο\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3014
+#: src/frontend/mame/ui/selmenu.cpp:3023
 msgid "WAN\tImperfect\n"
 msgstr "WAN\tΑτελές\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3017
+#: src/frontend/mame/ui/selmenu.cpp:3026
 msgid "Timing\tUnimplemented\n"
 msgstr "Χρονισμός\tΜη υλοποιημένος\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3019
+#: src/frontend/mame/ui/selmenu.cpp:3028
 msgid "Timing\tImperfect\n"
 msgstr "Χρονισμός\tΑτελής\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3021
+#: src/frontend/mame/ui/selmenu.cpp:3030
 msgid "Mechanical Machine\tYes\n"
 msgstr "Μηχανική Συσκευή\tΝαι\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3021
+#: src/frontend/mame/ui/selmenu.cpp:3030
 msgid "Mechanical Machine\tNo\n"
 msgstr "Μηχανική Συσκευή\tΌχι\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3022
+#: src/frontend/mame/ui/selmenu.cpp:3031
 msgid "Requires Artwork\tYes\n"
 msgstr "Απαιτεί Artwork\tΝαι\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3022
+#: src/frontend/mame/ui/selmenu.cpp:3031
 msgid "Requires Artwork\tNo\n"
 msgstr "Απαιτεί Artwork\tΌχι\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3023
+#: src/frontend/mame/ui/selmenu.cpp:3032
 msgid "Requires Clickable Artwork\tYes\n"
 msgstr "Απαιτεί Artwork για επιλογή\tΝαι\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3023
+#: src/frontend/mame/ui/selmenu.cpp:3032
 msgid "Requires Clickable Artwork\tNo\n"
 msgstr "Απαιτεί Artwork για επιλογή\tΌχι\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3025
+#: src/frontend/mame/ui/selmenu.cpp:3034
 msgid "Support Cocktail\tNo\n"
 msgstr "Υποστήριξη Κοκτέιλ\tΌχι\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3026
+#: src/frontend/mame/ui/selmenu.cpp:3035
 msgid "Driver is BIOS\tYes\n"
 msgstr "Ο οδηγός είναι BIOS\tΝαι\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3026
+#: src/frontend/mame/ui/selmenu.cpp:3035
 msgid "Driver is BIOS\tNo\n"
 msgstr "Ο οδηγός είναι BIOS\tΌχι\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3027
+#: src/frontend/mame/ui/selmenu.cpp:3036
 msgid "Support Save\tYes\n"
 msgstr "Υποστήριξη Αποθήκευσης\tΝαι\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3027
+#: src/frontend/mame/ui/selmenu.cpp:3036
 msgid "Support Save\tNo\n"
 msgstr "Υποστήριξη Αποθήκευσης\tΌχι\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3028
+#: src/frontend/mame/ui/selmenu.cpp:3037
 msgid "Screen Orientation\tVertical\n"
 msgstr "Προσανατολισμός Οθόνης\tΚάθετος\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3028
+#: src/frontend/mame/ui/selmenu.cpp:3037
 msgid "Screen Orientation\tHorizontal\n"
 msgstr "Προσανατολισμός Οθόνης\tΟριζόντιος\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3038
+#: src/frontend/mame/ui/selmenu.cpp:3047
 msgid "Requires CHD\tYes\n"
 msgstr "Απαιτεί CHD\tΝαι\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3038
+#: src/frontend/mame/ui/selmenu.cpp:3047
 msgid "Requires CHD\tNo\n"
 msgstr "Απαιτεί CHD\tΌχι\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3051
-msgid "ROM Audit Result\tOK\n"
-msgstr "Έλεγχος ROMs\tOK\n"
+#: src/frontend/mame/ui/selmenu.cpp:3060
+msgid "Media Audit Result\tOK\n"
+msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3053
-msgid "ROM Audit Result\tBAD\n"
-msgstr "Έλεγχος ROMs\tΛΑΘΟΣ\n"
+#: src/frontend/mame/ui/selmenu.cpp:3062
+msgid "Media Audit Result\tBAD\n"
+msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3056
+#: src/frontend/mame/ui/selmenu.cpp:3065
 msgid "Samples Audit Result\tNone Needed\n"
 msgstr "Έλεγχος Δειγμάτων Ήχου\tΔεν απαιτείται\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3058
+#: src/frontend/mame/ui/selmenu.cpp:3067
 msgid "Samples Audit Result\tOK\n"
 msgstr "Έλεγχος Δειγμάτων Ήχου\tOK\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3060
+#: src/frontend/mame/ui/selmenu.cpp:3069
 msgid "Samples Audit Result\tBAD\n"
 msgstr "Έλεγχος Δειγμάτων Ήχου\tΛΑΘΟΣ\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3064
+#: src/frontend/mame/ui/selmenu.cpp:3073
 msgid ""
-"ROM Audit \tDisabled\n"
-"Samples Audit \tDisabled\n"
+"Media Audit\tDisabled\n"
+"Samples Audit\tDisabled\n"
 msgstr ""
-"Έλεγχος ROMs \tΑπενεργοποιημένος\n"
-"Έλεγχος Δειγμάτων Ήχου \tΑπενεργοποιημένος\n"
 
-#: src/frontend/mame/ui/sndmenu.cpp:150
+#: src/frontend/mame/ui/sndmenu.cpp:146
 msgid "Sound"
 msgstr "Ήχος"
 
-#: src/frontend/mame/ui/sndmenu.cpp:151
+#: src/frontend/mame/ui/sndmenu.cpp:147
 msgid "Compressor"
 msgstr "Συμπιεστής"
 
-#: src/frontend/mame/ui/sndmenu.cpp:152
+#: src/frontend/mame/ui/sndmenu.cpp:148
 msgid "Sample Rate"
 msgstr "Ρυθμός Δειγματοληψίας"
 
-#: src/frontend/mame/ui/sndmenu.cpp:153
+#: src/frontend/mame/ui/sndmenu.cpp:149
 msgid "Use External Samples"
 msgstr "Χρήση Εξωτερικών Δειγμάτων Ήχου"
 
@@ -3225,21 +3225,21 @@ msgstr "* Βίντεο:\n"
 msgid "  Screen '%1$s': Vector\n"
 msgstr "  Οθόνη '%1$s': Διάνυσμα\n"
 
-#: src/frontend/mame/ui/devopt.cpp:132
+#: src/frontend/mame/ui/devopt.cpp:135
 #, c-format
 msgid "  Screen '%1$s': %2$d × %3$d (V) %4$s Hz\n"
 msgstr "  Οθόνη '%1$s': %2$d × %3$d (V) %4$s Hz\n"
 
-#: src/frontend/mame/ui/devopt.cpp:133
+#: src/frontend/mame/ui/devopt.cpp:136
 #, c-format
 msgid "  Screen '%1$s': %2$d × %3$d (H) %4$s Hz\n"
 msgstr "  Οθόνη '%1$s': %2$d × %3$d (H) %4$s Hz\n"
 
-#: src/frontend/mame/ui/devopt.cpp:147
+#: src/frontend/mame/ui/devopt.cpp:150
 msgid "* Sound:\n"
 msgstr "* Ήχος:\n"
 
-#: src/frontend/mame/ui/devopt.cpp:211
+#: src/frontend/mame/ui/devopt.cpp:214
 #, c-format
 msgid ""
 "* BIOS settings:\n"
@@ -3248,491 +3248,661 @@ msgstr ""
 "* Ρυθμίσεις BIOS:\n"
 "  %1$d επιλογές    [προεπιλογή: %2$s]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:255 src/frontend/mame/ui/devopt.cpp:271
-#: src/frontend/mame/ui/devopt.cpp:332
+#: src/frontend/mame/ui/devopt.cpp:258 src/frontend/mame/ui/devopt.cpp:274
+#: src/frontend/mame/ui/devopt.cpp:335
 #, c-format
 msgid "  %1$s    [default: %2$s]\n"
 msgstr "  %1$s    [προεπιλογή: %2$s]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:260 src/frontend/mame/ui/devopt.cpp:276
+#: src/frontend/mame/ui/devopt.cpp:263 src/frontend/mame/ui/devopt.cpp:279
 #, c-format
 msgid "  %1$s\n"
 msgstr "  %1$s\n"
 
-#: src/frontend/mame/ui/devopt.cpp:282
+#: src/frontend/mame/ui/devopt.cpp:285
 msgid "* DIP switch settings:\n"
 msgstr "* Ρυθμίσεις μικροδιακόπτων:\n"
 
-#: src/frontend/mame/ui/devopt.cpp:287
+#: src/frontend/mame/ui/devopt.cpp:290
 msgid "* Configuration settings:\n"
 msgstr "* Ρυθμίσεις διαμόρφωσης:\n"
 
-#: src/frontend/mame/ui/devopt.cpp:291
+#: src/frontend/mame/ui/devopt.cpp:294
 msgid "* Input device(s):\n"
 msgstr "* Συσκευή(ες) εισαγωγής:\n"
 
-#: src/frontend/mame/ui/devopt.cpp:293
+#: src/frontend/mame/ui/devopt.cpp:296
 #, c-format
 msgid "  User inputs    [%1$d inputs]\n"
 msgstr "  Εισαγωγές χρήστη    [%1$d εισαγωγές]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:295
+#: src/frontend/mame/ui/devopt.cpp:298
 #, c-format
 msgid "  Mahjong inputs    [%1$d inputs]\n"
 msgstr "  Εισαγωγές Mahjong    [%1$d εισαγωγές]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:297
+#: src/frontend/mame/ui/devopt.cpp:300
 #, c-format
 msgid "  Hanafuda inputs    [%1$d inputs]\n"
 msgstr "  Εισαγωγές Hanafuda    [%1$d εισαγωγές]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:299
+#: src/frontend/mame/ui/devopt.cpp:302
 #, c-format
 msgid "  Gambling inputs    [%1$d inputs]\n"
 msgstr "  Εισαγωγές τυχερών παιχνιδιών    [%1$d εισαγωγές]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:301
+#: src/frontend/mame/ui/devopt.cpp:304
 #, c-format
 msgid "  Analog inputs    [%1$d inputs]\n"
 msgstr "  Εισαγωγές αναλογικές    [%1$d εισαγωγές]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:303
+#: src/frontend/mame/ui/devopt.cpp:306
 #, c-format
 msgid "  Adjuster inputs    [%1$d inputs]\n"
 msgstr "  Εισαγωγές ρυθμιστή    [%1$d εισαγωγές]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:305
+#: src/frontend/mame/ui/devopt.cpp:308
 #, c-format
 msgid "  Keypad inputs    [%1$d inputs]\n"
 msgstr "  Εισαγωγές πλήκτρων    [%1$d εισαγωγές]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:307
+#: src/frontend/mame/ui/devopt.cpp:310
 #, c-format
 msgid "  Keyboard inputs    [%1$d inputs]\n"
 msgstr "  Εισαγωγές πληκτρολογίου    [%1$d εισαγωγές]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:312
+#: src/frontend/mame/ui/devopt.cpp:315
 msgid "* Media Options:\n"
 msgstr "* Επιλογές Μέσων:\n"
 
-#: src/frontend/mame/ui/devopt.cpp:317
+#: src/frontend/mame/ui/devopt.cpp:320
 #, c-format
 msgid "  %1$s    [tag: %2$s]\n"
 msgstr "  %1$s    [ετικέτα: %2$s]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:327
+#: src/frontend/mame/ui/devopt.cpp:330
 msgid "* Slot Options:\n"
 msgstr "* Επιλογές Υποδοχής:\n"
 
-#: src/frontend/mame/ui/devopt.cpp:341
+#: src/frontend/mame/ui/devopt.cpp:344
 msgid "[None]\n"
 msgstr "[Καμία]\n"
 
-#: src/emu/render.cpp:1847
+#: src/emu/render.cpp:1796
 #, c-format
 msgctxt "view-name"
 msgid "Screen %1$u Standard (%2$u:%3$u)"
 msgstr "Οθόνη %1$u Κανονική (%2$u:%3$u)"
 
-#: src/emu/render.cpp:1873
+#: src/emu/render.cpp:1822
 #, c-format
 msgctxt "view-name"
 msgid "Screen %1$u Pixel Aspect (%2$u:%3$u)"
 msgstr "Οθόνη %1$u Άποψη Πίξελ (%2$u:%3$u)"
 
-#: src/emu/render.cpp:1895 src/emu/render.cpp:2030
+#: src/emu/render.cpp:1844 src/emu/render.cpp:1979
 msgctxt "view-name"
 msgid "Cocktail"
 msgstr "Κοκτέιλ"
 
-#: src/emu/render.cpp:2015
+#: src/emu/render.cpp:1964
 msgctxt "view-name"
 msgid "Left-to-Right"
 msgstr "Αριστερά-προς-Δεξιά"
 
-#: src/emu/render.cpp:2016
+#: src/emu/render.cpp:1965
 msgctxt "view-name"
 msgid "Left-to-Right (Gapless)"
 msgstr "Αριστερά-προς-Δεξιά (Χωρίς κενό)"
 
-#: src/emu/render.cpp:2017
+#: src/emu/render.cpp:1966
 msgctxt "view-name"
 msgid "Top-to-Bottom"
 msgstr "Κορυφή-προς-Βάση"
 
-#: src/emu/render.cpp:2018
+#: src/emu/render.cpp:1967
 msgctxt "view-name"
 msgid "Top-to-Bottom (Gapless)"
 msgstr "Κορυφή-προς-Βάση (Χωρίς κενό)"
 
-#: src/emu/render.cpp:2069
+#: src/emu/render.cpp:2018
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Left-to-Right, Top-to-Bottom"
 msgstr "%1$u×%2$u Αριστερά-προς-Δεξιά, Κορυφή-προς-Βάση"
 
-#: src/emu/render.cpp:2078
+#: src/emu/render.cpp:2027
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Left-to-Right, Top-to-Bottom (Gapless)"
 msgstr "%1$u×%2$u Αριστερά-προς-Δεξιά, Κορυφή-προς-Βάση (Χωρίς Κενό)"
 
-#: src/emu/render.cpp:2087
+#: src/emu/render.cpp:2036
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Top-to-Bottom, Left-to-Right"
 msgstr "%1$u×%2$u Κορυφή-προς-Βάση, Αριστερά-προς-Δεξιά"
 
-#: src/emu/render.cpp:2096
+#: src/emu/render.cpp:2045
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Top-to-Bottom, Left-to-Right (Gapless)"
 msgstr "%1$u×%2$u Κορυφή-προς-Βάση, Αριστερά-προς-Δεξιά (Χωρίς Κενό)"
 
-#: src/emu/inpttype.ipp:22
+#: src/emu/ioport.cpp:332
+#, c-format
+msgctxt "input-name"
+msgid "P%1$u"
+msgstr "P%1$u"
+
+#: src/emu/ioport.cpp:1924
+msgctxt "input-name"
+msgid "???"
+msgstr ""
+
+#: src/emu/inpttype.ipp:22 src/emu/inpttype.ipp:140 src/emu/inpttype.ipp:221
+#: src/emu/inpttype.ipp:255 src/emu/inpttype.ipp:289 src/emu/inpttype.ipp:323
+#: src/emu/inpttype.ipp:357 src/emu/inpttype.ipp:391 src/emu/inpttype.ipp:425
+#: src/emu/inpttype.ipp:459
+#, c-format
+msgctxt "input-name"
+msgid "%p Up"
+msgstr "%p Επάνω"
+
+#: src/emu/inpttype.ipp:23 src/emu/inpttype.ipp:141 src/emu/inpttype.ipp:222
+#: src/emu/inpttype.ipp:256 src/emu/inpttype.ipp:290 src/emu/inpttype.ipp:324
+#: src/emu/inpttype.ipp:358 src/emu/inpttype.ipp:392 src/emu/inpttype.ipp:426
+#: src/emu/inpttype.ipp:460
+#, c-format
+msgctxt "input-name"
+msgid "%p Down"
+msgstr "%p Κάτω"
+
+#: src/emu/inpttype.ipp:24 src/emu/inpttype.ipp:142 src/emu/inpttype.ipp:223
+#: src/emu/inpttype.ipp:257 src/emu/inpttype.ipp:291 src/emu/inpttype.ipp:325
+#: src/emu/inpttype.ipp:359 src/emu/inpttype.ipp:393 src/emu/inpttype.ipp:427
+#: src/emu/inpttype.ipp:461
+#, c-format
+msgctxt "input-name"
+msgid "%p Left"
+msgstr "%p Αριστερά"
+
+#: src/emu/inpttype.ipp:25 src/emu/inpttype.ipp:143 src/emu/inpttype.ipp:224
+#: src/emu/inpttype.ipp:258 src/emu/inpttype.ipp:292 src/emu/inpttype.ipp:326
+#: src/emu/inpttype.ipp:360 src/emu/inpttype.ipp:394 src/emu/inpttype.ipp:428
+#: src/emu/inpttype.ipp:462
+#, c-format
+msgctxt "input-name"
+msgid "%p Right"
+msgstr "%p Δεξιά"
+
+#: src/emu/inpttype.ipp:26 src/emu/inpttype.ipp:144 src/emu/inpttype.ipp:225
+#: src/emu/inpttype.ipp:259 src/emu/inpttype.ipp:293 src/emu/inpttype.ipp:327
+#: src/emu/inpttype.ipp:361 src/emu/inpttype.ipp:395 src/emu/inpttype.ipp:429
+#: src/emu/inpttype.ipp:463
+#, c-format
+msgctxt "input-name"
+msgid "%p Right Stick/Up"
+msgstr "%p Δεξιός μοχλός/Επάνω"
+
+#: src/emu/inpttype.ipp:27 src/emu/inpttype.ipp:145 src/emu/inpttype.ipp:226
+#: src/emu/inpttype.ipp:260 src/emu/inpttype.ipp:294 src/emu/inpttype.ipp:328
+#: src/emu/inpttype.ipp:362 src/emu/inpttype.ipp:396 src/emu/inpttype.ipp:430
+#: src/emu/inpttype.ipp:464
+#, c-format
+msgctxt "input-name"
+msgid "%p Right Stick/Down"
+msgstr "%p Δεξιός μοχλός/Κάτω"
+
+#: src/emu/inpttype.ipp:28 src/emu/inpttype.ipp:146 src/emu/inpttype.ipp:227
+#: src/emu/inpttype.ipp:261 src/emu/inpttype.ipp:295 src/emu/inpttype.ipp:329
+#: src/emu/inpttype.ipp:363 src/emu/inpttype.ipp:397 src/emu/inpttype.ipp:431
+#: src/emu/inpttype.ipp:465
+#, c-format
+msgctxt "input-name"
+msgid "%p Right Stick/Left"
+msgstr "%p Δεξιός μοχλός/Αριστερά"
+
+#: src/emu/inpttype.ipp:29 src/emu/inpttype.ipp:147 src/emu/inpttype.ipp:228
+#: src/emu/inpttype.ipp:262 src/emu/inpttype.ipp:296 src/emu/inpttype.ipp:330
+#: src/emu/inpttype.ipp:364 src/emu/inpttype.ipp:398 src/emu/inpttype.ipp:432
+#: src/emu/inpttype.ipp:466
+#, c-format
+msgctxt "input-name"
+msgid "%p Right Stick/Right"
+msgstr "%p Δεξιός μοχλός/Δεξιά"
+
+#: src/emu/inpttype.ipp:30 src/emu/inpttype.ipp:148 src/emu/inpttype.ipp:229
+#: src/emu/inpttype.ipp:263 src/emu/inpttype.ipp:297 src/emu/inpttype.ipp:331
+#: src/emu/inpttype.ipp:365 src/emu/inpttype.ipp:399 src/emu/inpttype.ipp:433
+#: src/emu/inpttype.ipp:467
+#, c-format
+msgctxt "input-name"
+msgid "%p Left Stick/Up"
+msgstr "%p Αριστερός μοχλός/Επάνω"
+
+#: src/emu/inpttype.ipp:31 src/emu/inpttype.ipp:149 src/emu/inpttype.ipp:230
+#: src/emu/inpttype.ipp:264 src/emu/inpttype.ipp:298 src/emu/inpttype.ipp:332
+#: src/emu/inpttype.ipp:366 src/emu/inpttype.ipp:400 src/emu/inpttype.ipp:434
+#: src/emu/inpttype.ipp:468
+#, c-format
+msgctxt "input-name"
+msgid "%p Left Stick/Down"
+msgstr "%p Αριστερός μοχλός/Κάτω"
+
+#: src/emu/inpttype.ipp:32 src/emu/inpttype.ipp:150 src/emu/inpttype.ipp:231
+#: src/emu/inpttype.ipp:265 src/emu/inpttype.ipp:299 src/emu/inpttype.ipp:333
+#: src/emu/inpttype.ipp:367 src/emu/inpttype.ipp:401 src/emu/inpttype.ipp:435
+#: src/emu/inpttype.ipp:469
+#, c-format
+msgctxt "input-name"
+msgid "%p Left Stick/Left"
+msgstr "%p Αριστερός μοχλός/Αριστερά"
+
+#: src/emu/inpttype.ipp:33 src/emu/inpttype.ipp:151 src/emu/inpttype.ipp:232
+#: src/emu/inpttype.ipp:266 src/emu/inpttype.ipp:300 src/emu/inpttype.ipp:334
+#: src/emu/inpttype.ipp:368 src/emu/inpttype.ipp:402 src/emu/inpttype.ipp:436
+#: src/emu/inpttype.ipp:470
+#, c-format
+msgctxt "input-name"
+msgid "%p Left Stick/Right"
+msgstr "%p Αριστερός μοχλός/Δεξιά"
+
+#: src/emu/inpttype.ipp:34 src/emu/inpttype.ipp:152 src/emu/inpttype.ipp:233
+#: src/emu/inpttype.ipp:267 src/emu/inpttype.ipp:301 src/emu/inpttype.ipp:335
+#: src/emu/inpttype.ipp:369 src/emu/inpttype.ipp:403 src/emu/inpttype.ipp:437
+#: src/emu/inpttype.ipp:471
+#, c-format
+msgctxt "input-name"
+msgid "%p Button 1"
+msgstr "%p Πλήκτρο 1"
+
+#: src/emu/inpttype.ipp:35 src/emu/inpttype.ipp:153 src/emu/inpttype.ipp:234
+#: src/emu/inpttype.ipp:268 src/emu/inpttype.ipp:302 src/emu/inpttype.ipp:336
+#: src/emu/inpttype.ipp:370 src/emu/inpttype.ipp:404 src/emu/inpttype.ipp:438
+#: src/emu/inpttype.ipp:472
+#, c-format
+msgctxt "input-name"
+msgid "%p Button 2"
+msgstr "%p Πλήκτρο 2"
+
+#: src/emu/inpttype.ipp:36 src/emu/inpttype.ipp:154 src/emu/inpttype.ipp:235
+#: src/emu/inpttype.ipp:269 src/emu/inpttype.ipp:303 src/emu/inpttype.ipp:337
+#: src/emu/inpttype.ipp:371 src/emu/inpttype.ipp:405 src/emu/inpttype.ipp:439
+#: src/emu/inpttype.ipp:473
+#, c-format
+msgctxt "input-name"
+msgid "%p Button 3"
+msgstr "%p Πλήκτρο 3"
+
+#: src/emu/inpttype.ipp:37 src/emu/inpttype.ipp:155 src/emu/inpttype.ipp:236
+#: src/emu/inpttype.ipp:270 src/emu/inpttype.ipp:304 src/emu/inpttype.ipp:338
+#: src/emu/inpttype.ipp:372 src/emu/inpttype.ipp:406 src/emu/inpttype.ipp:440
+#: src/emu/inpttype.ipp:474
+#, c-format
+msgctxt "input-name"
+msgid "%p Button 4"
+msgstr "%p Πλήκτρο 4"
+
+#: src/emu/inpttype.ipp:38 src/emu/inpttype.ipp:156 src/emu/inpttype.ipp:237
+#: src/emu/inpttype.ipp:271 src/emu/inpttype.ipp:305 src/emu/inpttype.ipp:339
+#: src/emu/inpttype.ipp:373 src/emu/inpttype.ipp:407 src/emu/inpttype.ipp:441
+#: src/emu/inpttype.ipp:475
+#, c-format
+msgctxt "input-name"
+msgid "%p Button 5"
+msgstr "%p Πλήκτρο 5"
+
+#: src/emu/inpttype.ipp:39 src/emu/inpttype.ipp:157 src/emu/inpttype.ipp:238
+#: src/emu/inpttype.ipp:272 src/emu/inpttype.ipp:306 src/emu/inpttype.ipp:340
+#: src/emu/inpttype.ipp:374 src/emu/inpttype.ipp:408 src/emu/inpttype.ipp:442
+#: src/emu/inpttype.ipp:476
+#, c-format
+msgctxt "input-name"
+msgid "%p Button 6"
+msgstr "%p Πλήκτρο 6"
+
+#: src/emu/inpttype.ipp:40 src/emu/inpttype.ipp:158 src/emu/inpttype.ipp:239
+#: src/emu/inpttype.ipp:273 src/emu/inpttype.ipp:307 src/emu/inpttype.ipp:341
+#: src/emu/inpttype.ipp:375 src/emu/inpttype.ipp:409 src/emu/inpttype.ipp:443
+#: src/emu/inpttype.ipp:477
+#, c-format
+msgctxt "input-name"
+msgid "%p Button 7"
+msgstr "%p Πλήκτρο 7"
+
+#: src/emu/inpttype.ipp:41 src/emu/inpttype.ipp:159 src/emu/inpttype.ipp:240
+#: src/emu/inpttype.ipp:274 src/emu/inpttype.ipp:308 src/emu/inpttype.ipp:342
+#: src/emu/inpttype.ipp:376 src/emu/inpttype.ipp:410 src/emu/inpttype.ipp:444
+#: src/emu/inpttype.ipp:478
+#, c-format
+msgctxt "input-name"
+msgid "%p Button 8"
+msgstr "%p Πλήκτρο 8"
+
+#: src/emu/inpttype.ipp:42 src/emu/inpttype.ipp:160 src/emu/inpttype.ipp:241
+#: src/emu/inpttype.ipp:275 src/emu/inpttype.ipp:309 src/emu/inpttype.ipp:343
+#: src/emu/inpttype.ipp:377 src/emu/inpttype.ipp:411 src/emu/inpttype.ipp:445
+#: src/emu/inpttype.ipp:479
+#, c-format
+msgctxt "input-name"
+msgid "%p Button 9"
+msgstr "%p Πλήκτρο 9"
+
+#: src/emu/inpttype.ipp:43 src/emu/inpttype.ipp:161 src/emu/inpttype.ipp:242
+#: src/emu/inpttype.ipp:276 src/emu/inpttype.ipp:310 src/emu/inpttype.ipp:344
+#: src/emu/inpttype.ipp:378 src/emu/inpttype.ipp:412 src/emu/inpttype.ipp:446
+#: src/emu/inpttype.ipp:480
+#, c-format
+msgctxt "input-name"
+msgid "%p Button 10"
+msgstr "%p Πλήκτρο 10"
+
+#: src/emu/inpttype.ipp:44 src/emu/inpttype.ipp:162 src/emu/inpttype.ipp:243
+#: src/emu/inpttype.ipp:277 src/emu/inpttype.ipp:311 src/emu/inpttype.ipp:345
+#: src/emu/inpttype.ipp:379 src/emu/inpttype.ipp:413 src/emu/inpttype.ipp:447
+#: src/emu/inpttype.ipp:481
+#, c-format
+msgctxt "input-name"
+msgid "%p Button 11"
+msgstr "%p Πλήκτρο 11"
+
+#: src/emu/inpttype.ipp:45 src/emu/inpttype.ipp:163 src/emu/inpttype.ipp:244
+#: src/emu/inpttype.ipp:278 src/emu/inpttype.ipp:312 src/emu/inpttype.ipp:346
+#: src/emu/inpttype.ipp:380 src/emu/inpttype.ipp:414 src/emu/inpttype.ipp:448
+#: src/emu/inpttype.ipp:482
+#, c-format
 msgctxt "input-name"
-msgid "P1 Up"
-msgstr "P1 Επάνω"
+msgid "%p Button 12"
+msgstr "%p Πλήκτρο 12"
 
-#: src/emu/inpttype.ipp:23
+#: src/emu/inpttype.ipp:46 src/emu/inpttype.ipp:164 src/emu/inpttype.ipp:245
+#: src/emu/inpttype.ipp:279 src/emu/inpttype.ipp:313 src/emu/inpttype.ipp:347
+#: src/emu/inpttype.ipp:381 src/emu/inpttype.ipp:415 src/emu/inpttype.ipp:449
+#: src/emu/inpttype.ipp:483
+#, c-format
 msgctxt "input-name"
-msgid "P1 Down"
-msgstr "P1 Κάτω"
+msgid "%p Button 13"
+msgstr "%p Πλήκτρο 13"
 
-#: src/emu/inpttype.ipp:24
+#: src/emu/inpttype.ipp:47 src/emu/inpttype.ipp:165 src/emu/inpttype.ipp:246
+#: src/emu/inpttype.ipp:280 src/emu/inpttype.ipp:314 src/emu/inpttype.ipp:348
+#: src/emu/inpttype.ipp:382 src/emu/inpttype.ipp:416 src/emu/inpttype.ipp:450
+#: src/emu/inpttype.ipp:484
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left"
-msgstr "P1 Αριστερά"
+msgid "%p Button 14"
+msgstr "%p Πλήκτρο 14"
 
-#: src/emu/inpttype.ipp:25
+#: src/emu/inpttype.ipp:48 src/emu/inpttype.ipp:166 src/emu/inpttype.ipp:247
+#: src/emu/inpttype.ipp:281 src/emu/inpttype.ipp:315 src/emu/inpttype.ipp:349
+#: src/emu/inpttype.ipp:383 src/emu/inpttype.ipp:417 src/emu/inpttype.ipp:451
+#: src/emu/inpttype.ipp:485
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right"
-msgstr "P1 Δεξιά"
+msgid "%p Button 15"
+msgstr "%p Πλήκτρο 15"
 
-#: src/emu/inpttype.ipp:26
+#: src/emu/inpttype.ipp:49 src/emu/inpttype.ipp:167 src/emu/inpttype.ipp:248
+#: src/emu/inpttype.ipp:282 src/emu/inpttype.ipp:316 src/emu/inpttype.ipp:350
+#: src/emu/inpttype.ipp:384 src/emu/inpttype.ipp:418 src/emu/inpttype.ipp:452
+#: src/emu/inpttype.ipp:486
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Up"
-msgstr "P1 Δεξιός μοχλός/Επάνω"
+msgid "%p Button 16"
+msgstr "%p Πλήκτρο 16"
 
-#: src/emu/inpttype.ipp:27
+#: src/emu/inpttype.ipp:50 src/emu/inpttype.ipp:168 src/emu/inpttype.ipp:249
+#: src/emu/inpttype.ipp:283 src/emu/inpttype.ipp:317 src/emu/inpttype.ipp:351
+#: src/emu/inpttype.ipp:385 src/emu/inpttype.ipp:419 src/emu/inpttype.ipp:453
+#: src/emu/inpttype.ipp:487
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Down"
-msgstr "P1 Δεξιός μοχλός/Κάτω"
+msgid "%p Start"
+msgstr "%p Έναρξη"
 
-#: src/emu/inpttype.ipp:28
+#: src/emu/inpttype.ipp:51 src/emu/inpttype.ipp:169 src/emu/inpttype.ipp:250
+#: src/emu/inpttype.ipp:284 src/emu/inpttype.ipp:318 src/emu/inpttype.ipp:352
+#: src/emu/inpttype.ipp:386 src/emu/inpttype.ipp:420 src/emu/inpttype.ipp:454
+#: src/emu/inpttype.ipp:488
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Left"
-msgstr "P1 Δεξιός μοχλός/Αριστερά"
+msgid "%p Select"
+msgstr "%p Επιλογή"
 
-#: src/emu/inpttype.ipp:29
+#: src/emu/inpttype.ipp:56 src/emu/inpttype.ipp:174
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Right"
-msgstr "P1 Δεξιός μοχλός/Δεξιά"
+msgid "%p Mahjong A"
+msgstr "%p Mahjong A"
 
-#: src/emu/inpttype.ipp:30
+#: src/emu/inpttype.ipp:57 src/emu/inpttype.ipp:175
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Up"
-msgstr "P1 Αριστερός μοχλός/Επάνω"
+msgid "%p Mahjong B"
+msgstr "%p Mahjong B"
 
-#: src/emu/inpttype.ipp:31
+#: src/emu/inpttype.ipp:58 src/emu/inpttype.ipp:176
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Down"
-msgstr "P1 Αριστερός μοχλός/Κάτω"
+msgid "%p Mahjong C"
+msgstr "%p Mahjong C"
 
-#: src/emu/inpttype.ipp:32
+#: src/emu/inpttype.ipp:59 src/emu/inpttype.ipp:177
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Left"
-msgstr "P1 Αριστερός μοχλός/Αριστερά"
+msgid "%p Mahjong D"
+msgstr "%p Mahjong D"
 
-#: src/emu/inpttype.ipp:33
+#: src/emu/inpttype.ipp:60 src/emu/inpttype.ipp:178
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Right"
-msgstr "P1 Αριστερός μοχλός/Δεξιά"
+msgid "%p Mahjong E"
+msgstr "%p Mahjong E"
 
-#: src/emu/inpttype.ipp:34
+#: src/emu/inpttype.ipp:61 src/emu/inpttype.ipp:179
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 1"
-msgstr "P1 Πλήκτρο 1"
+msgid "%p Mahjong F"
+msgstr "%p Mahjong F"
 
-#: src/emu/inpttype.ipp:35
+#: src/emu/inpttype.ipp:62 src/emu/inpttype.ipp:180
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 2"
-msgstr "P1 Πλήκτρο 2"
+msgid "%p Mahjong G"
+msgstr "%p Mahjong G"
 
-#: src/emu/inpttype.ipp:36
+#: src/emu/inpttype.ipp:63 src/emu/inpttype.ipp:181
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 3"
-msgstr "P1 Πλήκτρο 3"
+msgid "%p Mahjong H"
+msgstr "%p Mahjong H"
 
-#: src/emu/inpttype.ipp:37
+#: src/emu/inpttype.ipp:64 src/emu/inpttype.ipp:182
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 4"
-msgstr "P1 Πλήκτρο 4"
+msgid "%p Mahjong I"
+msgstr "%p Mahjong I"
 
-#: src/emu/inpttype.ipp:38
+#: src/emu/inpttype.ipp:65 src/emu/inpttype.ipp:183
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 5"
-msgstr "P1 Πλήκτρο 5"
+msgid "%p Mahjong J"
+msgstr "%p Mahjong J"
 
-#: src/emu/inpttype.ipp:39
+#: src/emu/inpttype.ipp:66 src/emu/inpttype.ipp:184
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 6"
-msgstr "P1 Πλήκτρο 6"
+msgid "%p Mahjong K"
+msgstr "%p Mahjong K"
 
-#: src/emu/inpttype.ipp:40
+#: src/emu/inpttype.ipp:67 src/emu/inpttype.ipp:185
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 7"
-msgstr "P1 Πλήκτρο 7"
+msgid "%p Mahjong L"
+msgstr "%p Mahjong L"
 
-#: src/emu/inpttype.ipp:41
+#: src/emu/inpttype.ipp:68 src/emu/inpttype.ipp:186
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 8"
-msgstr "P1 Πλήκτρο 8"
+msgid "%p Mahjong M"
+msgstr "%p Mahjong M"
 
-#: src/emu/inpttype.ipp:42
+#: src/emu/inpttype.ipp:69 src/emu/inpttype.ipp:187
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 9"
-msgstr "P1 Πλήκτρο 9"
+msgid "%p Mahjong N"
+msgstr "%p Mahjong N"
 
-#: src/emu/inpttype.ipp:43
+#: src/emu/inpttype.ipp:70 src/emu/inpttype.ipp:188
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 10"
-msgstr "P1 Πλήκτρο 10"
+msgid "%p Mahjong O"
+msgstr "%p Mahjong O"
 
-#: src/emu/inpttype.ipp:44
+#: src/emu/inpttype.ipp:71 src/emu/inpttype.ipp:189
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 11"
-msgstr "P1 Πλήκτρο 11"
+msgid "%p Mahjong P"
+msgstr "%p Mahjong P"
 
-#: src/emu/inpttype.ipp:45
+#: src/emu/inpttype.ipp:72 src/emu/inpttype.ipp:190
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 12"
-msgstr "P1 Πλήκτρο 12"
+msgid "%p Mahjong Q"
+msgstr "%p Mahjong Q"
 
-#: src/emu/inpttype.ipp:46
+#: src/emu/inpttype.ipp:73 src/emu/inpttype.ipp:191
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 13"
-msgstr "P1 Πλήκτρο 13"
+msgid "%p Mahjong Kan"
+msgstr "%p Mahjong Kan"
 
-#: src/emu/inpttype.ipp:47
+#: src/emu/inpttype.ipp:74 src/emu/inpttype.ipp:192
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 14"
-msgstr "P1 Πλήκτρο 14"
+msgid "%p Mahjong Pon"
+msgstr "%p Mahjong Pon"
 
-#: src/emu/inpttype.ipp:48
+#: src/emu/inpttype.ipp:75 src/emu/inpttype.ipp:193
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 15"
-msgstr "P1 Πλήκτρο 15"
+msgid "%p Mahjong Chi"
+msgstr "%p Mahjong Chi"
 
-#: src/emu/inpttype.ipp:49
+#: src/emu/inpttype.ipp:76 src/emu/inpttype.ipp:194
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 16"
-msgstr "P1 Πλήκτρο 16"
+msgid "%p Mahjong Reach"
+msgstr "%p Mahjong Reach"
 
-#: src/emu/inpttype.ipp:50
+#: src/emu/inpttype.ipp:77 src/emu/inpttype.ipp:195
+#, c-format
 msgctxt "input-name"
-msgid "P1 Start"
-msgstr "P1 Έναρξη"
+msgid "%p Mahjong Ron"
+msgstr "%p Mahjong Ron"
 
-#: src/emu/inpttype.ipp:51
+#: src/emu/inpttype.ipp:78 src/emu/inpttype.ipp:200
+#, c-format
 msgctxt "input-name"
-msgid "P1 Select"
-msgstr "P1 Επιλογή"
+msgid "%p Mahjong Flip Flop"
+msgstr "%p Mahjong Flip Flop"
 
-#: src/emu/inpttype.ipp:56
+#: src/emu/inpttype.ipp:79 src/emu/inpttype.ipp:196
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong A"
-msgstr "P1 Mahjong A"
+msgid "%p Mahjong Bet"
+msgstr "%p Mahjong Ποντάρισμα"
 
-#: src/emu/inpttype.ipp:57
+#: src/emu/inpttype.ipp:80 src/emu/inpttype.ipp:198
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong B"
-msgstr "P1 Mahjong B"
+msgid "%p Mahjong Take Score"
+msgstr "%p Mahjong Πάρτε σκορ"
 
-#: src/emu/inpttype.ipp:58
+#: src/emu/inpttype.ipp:81 src/emu/inpttype.ipp:199
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong C"
-msgstr "P1 Mahjong C"
+msgid "%p Mahjong Double Up"
+msgstr "%p Mahjong Διπλασιασμός"
 
-#: src/emu/inpttype.ipp:59
+#: src/emu/inpttype.ipp:82 src/emu/inpttype.ipp:201
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong D"
-msgstr "P1 Mahjong D"
+msgid "%p Mahjong Big"
+msgstr "%p Mahjong Μεγάλο"
 
-#: src/emu/inpttype.ipp:60
+#: src/emu/inpttype.ipp:83 src/emu/inpttype.ipp:202
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong E"
-msgstr "P1 Mahjong E"
+msgid "%p Mahjong Small"
+msgstr "%p Mahjong Μικρό"
 
-#: src/emu/inpttype.ipp:61
+#: src/emu/inpttype.ipp:84 src/emu/inpttype.ipp:197
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong F"
-msgstr "P1 Mahjong F"
+msgid "%p Mahjong Last Chance"
+msgstr "%p Mahjong Τελευταία Ευκαιρία"
 
-#: src/emu/inpttype.ipp:62
+#: src/emu/inpttype.ipp:89 src/emu/inpttype.ipp:207
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong G"
-msgstr "P1 Mahjong G"
+msgid "%p Hanafuda A/1"
+msgstr "%p Hanafuda A/1"
 
-#: src/emu/inpttype.ipp:63
+#: src/emu/inpttype.ipp:90 src/emu/inpttype.ipp:208
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong H"
-msgstr "P1 Mahjong H"
+msgid "%p Hanafuda B/2"
+msgstr "%p Hanafuda B/2"
 
-#: src/emu/inpttype.ipp:64
+#: src/emu/inpttype.ipp:91 src/emu/inpttype.ipp:209
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong I"
-msgstr "P1 Mahjong I"
+msgid "%p Hanafuda C/3"
+msgstr "%p Hanafuda C/3"
 
-#: src/emu/inpttype.ipp:65
+#: src/emu/inpttype.ipp:92 src/emu/inpttype.ipp:210
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong J"
-msgstr "P1 Mahjong J"
+msgid "%p Hanafuda D/4"
+msgstr "%p Hanafuda D/4"
 
-#: src/emu/inpttype.ipp:66
+#: src/emu/inpttype.ipp:93 src/emu/inpttype.ipp:211
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong K"
-msgstr "P1 Mahjong K"
+msgid "%p Hanafuda E/5"
+msgstr "%p Hanafuda E/5"
 
-#: src/emu/inpttype.ipp:67
+#: src/emu/inpttype.ipp:94 src/emu/inpttype.ipp:212
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong L"
-msgstr "P1 Mahjong L"
+msgid "%p Hanafuda F/6"
+msgstr "%p Hanafuda F/6"
 
-#: src/emu/inpttype.ipp:68
+#: src/emu/inpttype.ipp:95 src/emu/inpttype.ipp:213
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong M"
-msgstr "P1 Mahjong M"
+msgid "%p Hanafuda G/7"
+msgstr "%p Hanafuda G/7"
 
-#: src/emu/inpttype.ipp:69
+#: src/emu/inpttype.ipp:96 src/emu/inpttype.ipp:214
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong N"
-msgstr "P1 Mahjong N"
+msgid "%p Hanafuda H/8"
+msgstr "%p Hanafuda H/8"
 
-#: src/emu/inpttype.ipp:70
+#: src/emu/inpttype.ipp:97 src/emu/inpttype.ipp:215
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong O"
-msgstr "P1 Mahjong O"
+msgid "%p Hanafuda Yes"
+msgstr "%p Hanafuda Ναι"
 
-#: src/emu/inpttype.ipp:71
+#: src/emu/inpttype.ipp:98 src/emu/inpttype.ipp:216
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong P"
-msgstr "P1 Mahjong P"
-
-#: src/emu/inpttype.ipp:72
-msgctxt "input-name"
-msgid "P1 Mahjong Q"
-msgstr "P1 Mahjong Q"
-
-#: src/emu/inpttype.ipp:73
-msgctxt "input-name"
-msgid "P1 Mahjong Kan"
-msgstr "P1 Mahjong Kan"
-
-#: src/emu/inpttype.ipp:74
-msgctxt "input-name"
-msgid "P1 Mahjong Pon"
-msgstr "P1 Mahjong Pon"
-
-#: src/emu/inpttype.ipp:75
-msgctxt "input-name"
-msgid "P1 Mahjong Chi"
-msgstr "P1 Mahjong Chi"
-
-#: src/emu/inpttype.ipp:76
-msgctxt "input-name"
-msgid "P1 Mahjong Reach"
-msgstr "P1 Mahjong Reach"
-
-#: src/emu/inpttype.ipp:77
-msgctxt "input-name"
-msgid "P1 Mahjong Ron"
-msgstr "P1 Mahjong Ron"
-
-#: src/emu/inpttype.ipp:78
-msgctxt "input-name"
-msgid "P1 Mahjong Flip Flop"
-msgstr "P1 Mahjong Flip Flop"
-
-#: src/emu/inpttype.ipp:79
-msgctxt "input-name"
-msgid "P1 Mahjong Bet"
-msgstr "P1 Mahjong Ποντάρισμα"
-
-#: src/emu/inpttype.ipp:80
-msgctxt "input-name"
-msgid "P1 Mahjong Take Score"
-msgstr "P1 Mahjong Πάρτε σκορ"
-
-#: src/emu/inpttype.ipp:81
-msgctxt "input-name"
-msgid "P1 Mahjong Double Up"
-msgstr "P1 Mahjong Διπλασιασμός"
-
-#: src/emu/inpttype.ipp:82
-msgctxt "input-name"
-msgid "P1 Mahjong Big"
-msgstr "P1 Mahjong Μεγάλο"
-
-#: src/emu/inpttype.ipp:83
-msgctxt "input-name"
-msgid "P1 Mahjong Small"
-msgstr "P1 Mahjong Μικρό"
-
-#: src/emu/inpttype.ipp:84
-msgctxt "input-name"
-msgid "P1 Mahjong Last Chance"
-msgstr "P1 Mahjong Τελευταία Ευκαιρία"
-
-#: src/emu/inpttype.ipp:89
-msgctxt "input-name"
-msgid "P1 Hanafuda A/1"
-msgstr "P1 Hanafuda A/1"
-
-#: src/emu/inpttype.ipp:90
-msgctxt "input-name"
-msgid "P1 Hanafuda B/2"
-msgstr "P1 Hanafuda B/2"
-
-#: src/emu/inpttype.ipp:91
-msgctxt "input-name"
-msgid "P1 Hanafuda C/3"
-msgstr "P1 Hanafuda C/3"
-
-#: src/emu/inpttype.ipp:92
-msgctxt "input-name"
-msgid "P1 Hanafuda D/4"
-msgstr "P1 Hanafuda D/4"
-
-#: src/emu/inpttype.ipp:93
-msgctxt "input-name"
-msgid "P1 Hanafuda E/5"
-msgstr "P1 Hanafuda E/5"
-
-#: src/emu/inpttype.ipp:94
-msgctxt "input-name"
-msgid "P1 Hanafuda F/6"
-msgstr "P1 Hanafuda F/6"
-
-#: src/emu/inpttype.ipp:95
-msgctxt "input-name"
-msgid "P1 Hanafuda G/7"
-msgstr "P1 Hanafuda G/7"
-
-#: src/emu/inpttype.ipp:96
-msgctxt "input-name"
-msgid "P1 Hanafuda H/8"
-msgstr "P1 Hanafuda H/8"
-
-#: src/emu/inpttype.ipp:97
-msgctxt "input-name"
-msgid "P1 Hanafuda Yes"
-msgstr "P1 Hanafuda Ναι"
-
-#: src/emu/inpttype.ipp:98
-msgctxt "input-name"
-msgid "P1 Hanafuda No"
-msgstr "P1 Hanafuda Όχι"
+msgid "%p Hanafuda No"
+msgstr "%p Hanafuda Όχι"
 
 #: src/emu/inpttype.ipp:103
 msgctxt "input-name"
@@ -3859,1551 +4029,6 @@ msgctxt "input-name"
 msgid "Stop All Reels"
 msgstr "Διακοπή Όλων των Κυλίνδρων"
 
-#: src/emu/inpttype.ipp:140
-msgctxt "input-name"
-msgid "P2 Up"
-msgstr "P2 Επάνω"
-
-#: src/emu/inpttype.ipp:141
-msgctxt "input-name"
-msgid "P2 Down"
-msgstr "P2 Κάτω"
-
-#: src/emu/inpttype.ipp:142
-msgctxt "input-name"
-msgid "P2 Left"
-msgstr "P2 Αριστερά"
-
-#: src/emu/inpttype.ipp:143
-msgctxt "input-name"
-msgid "P2 Right"
-msgstr "P2 Δεξιά"
-
-#: src/emu/inpttype.ipp:144
-msgctxt "input-name"
-msgid "P2 Right Stick/Up"
-msgstr "P2 Δεξιός μοχλός/Επάνω"
-
-#: src/emu/inpttype.ipp:145
-msgctxt "input-name"
-msgid "P2 Right Stick/Down"
-msgstr "P2 Δεξιός μοχλός/Κάτω"
-
-#: src/emu/inpttype.ipp:146
-msgctxt "input-name"
-msgid "P2 Right Stick/Left"
-msgstr "P2 Δεξιός μοχλός/Αριστερά"
-
-#: src/emu/inpttype.ipp:147
-msgctxt "input-name"
-msgid "P2 Right Stick/Right"
-msgstr "P2 Δεξιός μοχλός/Δεξιά"
-
-#: src/emu/inpttype.ipp:148
-msgctxt "input-name"
-msgid "P2 Left Stick/Up"
-msgstr "P2 Αριστερός μοχλός/Επάνω"
-
-#: src/emu/inpttype.ipp:149
-msgctxt "input-name"
-msgid "P2 Left Stick/Down"
-msgstr "P2 Αριστερός μοχλός/Κάτω"
-
-#: src/emu/inpttype.ipp:150
-msgctxt "input-name"
-msgid "P2 Left Stick/Left"
-msgstr "P2 Αριστερός μοχλός/Αριστερά"
-
-#: src/emu/inpttype.ipp:151
-msgctxt "input-name"
-msgid "P2 Left Stick/Right"
-msgstr "P2 Αριστερός μοχλός/Δεξιά"
-
-#: src/emu/inpttype.ipp:152
-msgctxt "input-name"
-msgid "P2 Button 1"
-msgstr "P2 Πλήκτρο 1"
-
-#: src/emu/inpttype.ipp:153
-msgctxt "input-name"
-msgid "P2 Button 2"
-msgstr "P2 Πλήκτρο 2"
-
-#: src/emu/inpttype.ipp:154
-msgctxt "input-name"
-msgid "P2 Button 3"
-msgstr "P2 Πλήκτρο 3"
-
-#: src/emu/inpttype.ipp:155
-msgctxt "input-name"
-msgid "P2 Button 4"
-msgstr "P2 Πλήκτρο 4"
-
-#: src/emu/inpttype.ipp:156
-msgctxt "input-name"
-msgid "P2 Button 5"
-msgstr "P2 Πλήκτρο 5"
-
-#: src/emu/inpttype.ipp:157
-msgctxt "input-name"
-msgid "P2 Button 6"
-msgstr "P2 Πλήκτρο 6"
-
-#: src/emu/inpttype.ipp:158
-msgctxt "input-name"
-msgid "P2 Button 7"
-msgstr "P2 Πλήκτρο 7"
-
-#: src/emu/inpttype.ipp:159
-msgctxt "input-name"
-msgid "P2 Button 8"
-msgstr "P2 Πλήκτρο 8"
-
-#: src/emu/inpttype.ipp:160
-msgctxt "input-name"
-msgid "P2 Button 9"
-msgstr "P2 Πλήκτρο 9"
-
-#: src/emu/inpttype.ipp:161
-msgctxt "input-name"
-msgid "P2 Button 10"
-msgstr "P2 Πλήκτρο 10"
-
-#: src/emu/inpttype.ipp:162
-msgctxt "input-name"
-msgid "P2 Button 11"
-msgstr "P2 Πλήκτρο 11"
-
-#: src/emu/inpttype.ipp:163
-msgctxt "input-name"
-msgid "P2 Button 12"
-msgstr "P2 Πλήκτρο 12"
-
-#: src/emu/inpttype.ipp:164
-msgctxt "input-name"
-msgid "P2 Button 13"
-msgstr "P2 Πλήκτρο 13"
-
-#: src/emu/inpttype.ipp:165
-msgctxt "input-name"
-msgid "P2 Button 14"
-msgstr "P2 Πλήκτρο 14"
-
-#: src/emu/inpttype.ipp:166
-msgctxt "input-name"
-msgid "P2 Button 15"
-msgstr "P2 Πλήκτρο 15"
-
-#: src/emu/inpttype.ipp:167
-msgctxt "input-name"
-msgid "P2 Button 16"
-msgstr "P2 Πλήκτρο 16"
-
-#: src/emu/inpttype.ipp:168
-msgctxt "input-name"
-msgid "P2 Start"
-msgstr "P2 Έναρξη"
-
-#: src/emu/inpttype.ipp:169
-msgctxt "input-name"
-msgid "P2 Select"
-msgstr "P2 Επιλογή"
-
-#: src/emu/inpttype.ipp:174
-msgctxt "input-name"
-msgid "P2 Mahjong A"
-msgstr "P2 Mahjong A"
-
-#: src/emu/inpttype.ipp:175
-msgctxt "input-name"
-msgid "P2 Mahjong B"
-msgstr "P2 Mahjong B"
-
-#: src/emu/inpttype.ipp:176
-msgctxt "input-name"
-msgid "P2 Mahjong C"
-msgstr "P2 Mahjong C"
-
-#: src/emu/inpttype.ipp:177
-msgctxt "input-name"
-msgid "P2 Mahjong D"
-msgstr "P2 Mahjong D"
-
-#: src/emu/inpttype.ipp:178
-msgctxt "input-name"
-msgid "P2 Mahjong E"
-msgstr "P2 Mahjong E"
-
-#: src/emu/inpttype.ipp:179
-msgctxt "input-name"
-msgid "P2 Mahjong F"
-msgstr "P2 Mahjong F"
-
-#: src/emu/inpttype.ipp:180
-msgctxt "input-name"
-msgid "P2 Mahjong G"
-msgstr "P2 Mahjong G"
-
-#: src/emu/inpttype.ipp:181
-msgctxt "input-name"
-msgid "P2 Mahjong H"
-msgstr "P2 Mahjong H"
-
-#: src/emu/inpttype.ipp:182
-msgctxt "input-name"
-msgid "P2 Mahjong I"
-msgstr "P2 Mahjong I"
-
-#: src/emu/inpttype.ipp:183
-msgctxt "input-name"
-msgid "P2 Mahjong J"
-msgstr "P2 Mahjong J"
-
-#: src/emu/inpttype.ipp:184
-msgctxt "input-name"
-msgid "P2 Mahjong K"
-msgstr "P2 Mahjong K"
-
-#: src/emu/inpttype.ipp:185
-msgctxt "input-name"
-msgid "P2 Mahjong L"
-msgstr "P2 Mahjong L"
-
-#: src/emu/inpttype.ipp:186
-msgctxt "input-name"
-msgid "P2 Mahjong M"
-msgstr "P2 Mahjong M"
-
-#: src/emu/inpttype.ipp:187
-msgctxt "input-name"
-msgid "P2 Mahjong N"
-msgstr "P2 Mahjong N"
-
-#: src/emu/inpttype.ipp:188
-msgctxt "input-name"
-msgid "P2 Mahjong O"
-msgstr "P2 Mahjong O"
-
-#: src/emu/inpttype.ipp:189
-msgctxt "input-name"
-msgid "P2 Mahjong P"
-msgstr "P2 Mahjong P"
-
-#: src/emu/inpttype.ipp:190
-msgctxt "input-name"
-msgid "P2 Mahjong Q"
-msgstr "P2 Mahjong Q"
-
-#: src/emu/inpttype.ipp:191
-msgctxt "input-name"
-msgid "P2 Mahjong Kan"
-msgstr "P2 Mahjong Kan"
-
-#: src/emu/inpttype.ipp:192
-msgctxt "input-name"
-msgid "P2 Mahjong Pon"
-msgstr "P2 Mahjong Pon"
-
-#: src/emu/inpttype.ipp:193
-msgctxt "input-name"
-msgid "P2 Mahjong Chi"
-msgstr "P2 Mahjong Chi"
-
-#: src/emu/inpttype.ipp:194
-msgctxt "input-name"
-msgid "P2 Mahjong Reach"
-msgstr "P2 Mahjong Reach"
-
-#: src/emu/inpttype.ipp:195
-msgctxt "input-name"
-msgid "P2 Mahjong Ron"
-msgstr "P2 Mahjong Ron"
-
-#: src/emu/inpttype.ipp:196
-msgctxt "input-name"
-msgid "P2 Mahjong Bet"
-msgstr "P2 Mahjong Ποντάρισμα"
-
-#: src/emu/inpttype.ipp:197
-msgctxt "input-name"
-msgid "P2 Mahjong Last Chance"
-msgstr "P2 Mahjong Τελευταία Ευκαιρία"
-
-#: src/emu/inpttype.ipp:198
-msgctxt "input-name"
-msgid "P2 Mahjong Take Score"
-msgstr "P2 Mahjong Πάρε σκορ"
-
-#: src/emu/inpttype.ipp:199
-msgctxt "input-name"
-msgid "P2 Mahjong Double Up"
-msgstr "P2 Mahjong Διπλασιασμός"
-
-#: src/emu/inpttype.ipp:200
-msgctxt "input-name"
-msgid "P2 Mahjong Flip Flop"
-msgstr "P2 Mahjong Flip Flop"
-
-#: src/emu/inpttype.ipp:201
-msgctxt "input-name"
-msgid "P2 Mahjong Big"
-msgstr "P2 Mahjong Μεγάλο"
-
-#: src/emu/inpttype.ipp:202
-msgctxt "input-name"
-msgid "P2 Mahjong Small"
-msgstr "P2 Mahjong Μικρό"
-
-#: src/emu/inpttype.ipp:207
-msgctxt "input-name"
-msgid "P2 Hanafuda A/1"
-msgstr "P2 Hanafuda A/1"
-
-#: src/emu/inpttype.ipp:208
-msgctxt "input-name"
-msgid "P2 Hanafuda B/2"
-msgstr "P2 Hanafuda B/2"
-
-#: src/emu/inpttype.ipp:209
-msgctxt "input-name"
-msgid "P2 Hanafuda C/3"
-msgstr "P2 Hanafuda C/3"
-
-#: src/emu/inpttype.ipp:210
-msgctxt "input-name"
-msgid "P2 Hanafuda D/4"
-msgstr "P2 Hanafuda D/4"
-
-#: src/emu/inpttype.ipp:211
-msgctxt "input-name"
-msgid "P2 Hanafuda E/5"
-msgstr "P2 Hanafuda E/5"
-
-#: src/emu/inpttype.ipp:212
-msgctxt "input-name"
-msgid "P2 Hanafuda F/6"
-msgstr "P2 Hanafuda F/6"
-
-#: src/emu/inpttype.ipp:213
-msgctxt "input-name"
-msgid "P2 Hanafuda G/7"
-msgstr "P2 Hanafuda G/7"
-
-#: src/emu/inpttype.ipp:214
-msgctxt "input-name"
-msgid "P2 Hanafuda H/8"
-msgstr "P2 Hanafuda H/8"
-
-#: src/emu/inpttype.ipp:215
-msgctxt "input-name"
-msgid "P2 Hanafuda Yes"
-msgstr "P2 Hanafuda Ναι"
-
-#: src/emu/inpttype.ipp:216
-msgctxt "input-name"
-msgid "P2 Hanafuda No"
-msgstr "P2 Hanafuda Όχι"
-
-#: src/emu/inpttype.ipp:221
-msgctxt "input-name"
-msgid "P3 Up"
-msgstr "P3 Επάνω"
-
-#: src/emu/inpttype.ipp:222
-msgctxt "input-name"
-msgid "P3 Down"
-msgstr "P3 Κάτω"
-
-#: src/emu/inpttype.ipp:223
-msgctxt "input-name"
-msgid "P3 Left"
-msgstr "P3 Αριστερά"
-
-#: src/emu/inpttype.ipp:224
-msgctxt "input-name"
-msgid "P3 Right"
-msgstr "P3 Δεξιά"
-
-#: src/emu/inpttype.ipp:225
-msgctxt "input-name"
-msgid "P3 Right Stick/Up"
-msgstr "P3 Δεξιός μοχλός/Επάνω"
-
-#: src/emu/inpttype.ipp:226
-msgctxt "input-name"
-msgid "P3 Right Stick/Down"
-msgstr "P3 Δεξιός μοχλός/Κάτω"
-
-#: src/emu/inpttype.ipp:227
-msgctxt "input-name"
-msgid "P3 Right Stick/Left"
-msgstr "P3 Δεξιός μοχλός/Αριστερά"
-
-#: src/emu/inpttype.ipp:228
-msgctxt "input-name"
-msgid "P3 Right Stick/Right"
-msgstr "P3 Δεξιός μοχλός/Δεξιά"
-
-#: src/emu/inpttype.ipp:229
-msgctxt "input-name"
-msgid "P3 Left Stick/Up"
-msgstr "P3 Αριστερός μοχλός/Επάνω"
-
-#: src/emu/inpttype.ipp:230
-msgctxt "input-name"
-msgid "P3 Left Stick/Down"
-msgstr "P3 Αριστερός μοχλός/Κάτω"
-
-#: src/emu/inpttype.ipp:231
-msgctxt "input-name"
-msgid "P3 Left Stick/Left"
-msgstr "P3 Αριστερός μοχλός/Αριστερά"
-
-#: src/emu/inpttype.ipp:232
-msgctxt "input-name"
-msgid "P3 Left Stick/Right"
-msgstr "P3 Αριστερός μοχλός/Δεξιά"
-
-#: src/emu/inpttype.ipp:233
-msgctxt "input-name"
-msgid "P3 Button 1"
-msgstr "P3 Πλήκτρο 1"
-
-#: src/emu/inpttype.ipp:234
-msgctxt "input-name"
-msgid "P3 Button 2"
-msgstr "P3 Πλήκτρο 2"
-
-#: src/emu/inpttype.ipp:235
-msgctxt "input-name"
-msgid "P3 Button 3"
-msgstr "P3 Πλήκτρο 3"
-
-#: src/emu/inpttype.ipp:236
-msgctxt "input-name"
-msgid "P3 Button 4"
-msgstr "P3 Πλήκτρο 4"
-
-#: src/emu/inpttype.ipp:237
-msgctxt "input-name"
-msgid "P3 Button 5"
-msgstr "P3 Πλήκτρο 5"
-
-#: src/emu/inpttype.ipp:238
-msgctxt "input-name"
-msgid "P3 Button 6"
-msgstr "P3 Πλήκτρο 6"
-
-#: src/emu/inpttype.ipp:239
-msgctxt "input-name"
-msgid "P3 Button 7"
-msgstr "P3 Πλήκτρο 7"
-
-#: src/emu/inpttype.ipp:240
-msgctxt "input-name"
-msgid "P3 Button 8"
-msgstr "P3 Πλήκτρο 8"
-
-#: src/emu/inpttype.ipp:241
-msgctxt "input-name"
-msgid "P3 Button 9"
-msgstr "P3 Πλήκτρο 9"
-
-#: src/emu/inpttype.ipp:242
-msgctxt "input-name"
-msgid "P3 Button 10"
-msgstr "P3 Πλήκτρο 10"
-
-#: src/emu/inpttype.ipp:243
-msgctxt "input-name"
-msgid "P3 Button 11"
-msgstr "P3 Πλήκτρο 11"
-
-#: src/emu/inpttype.ipp:244
-msgctxt "input-name"
-msgid "P3 Button 12"
-msgstr "P3 Πλήκτρο 12"
-
-#: src/emu/inpttype.ipp:245
-msgctxt "input-name"
-msgid "P3 Button 13"
-msgstr "P3 Πλήκτρο 13"
-
-#: src/emu/inpttype.ipp:246
-msgctxt "input-name"
-msgid "P3 Button 14"
-msgstr "P3 Πλήκτρο 14"
-
-#: src/emu/inpttype.ipp:247
-msgctxt "input-name"
-msgid "P3 Button 15"
-msgstr "P3 Πλήκτρο 15"
-
-#: src/emu/inpttype.ipp:248
-msgctxt "input-name"
-msgid "P3 Button 16"
-msgstr "P3 Πλήκτρο 16"
-
-#: src/emu/inpttype.ipp:249
-msgctxt "input-name"
-msgid "P3 Start"
-msgstr "P3 Έναρξη"
-
-#: src/emu/inpttype.ipp:250
-msgctxt "input-name"
-msgid "P3 Select"
-msgstr "P3 Επιλογή"
-
-#: src/emu/inpttype.ipp:255
-msgctxt "input-name"
-msgid "P4 Up"
-msgstr "P4 Επάνω"
-
-#: src/emu/inpttype.ipp:256
-msgctxt "input-name"
-msgid "P4 Down"
-msgstr "P4 Κάτω"
-
-#: src/emu/inpttype.ipp:257
-msgctxt "input-name"
-msgid "P4 Left"
-msgstr "P4 Αριστερά"
-
-#: src/emu/inpttype.ipp:258
-msgctxt "input-name"
-msgid "P4 Right"
-msgstr "P4 Δεξιά"
-
-#: src/emu/inpttype.ipp:259
-msgctxt "input-name"
-msgid "P4 Right Stick/Up"
-msgstr "P4 Δεξιός μοχλός/Επάνω"
-
-#: src/emu/inpttype.ipp:260
-msgctxt "input-name"
-msgid "P4 Right Stick/Down"
-msgstr "P4 Δεξιός μοχλός/Κάτω"
-
-#: src/emu/inpttype.ipp:261
-msgctxt "input-name"
-msgid "P4 Right Stick/Left"
-msgstr "P4 Δεξιός μοχλός/Αριστερά"
-
-#: src/emu/inpttype.ipp:262
-msgctxt "input-name"
-msgid "P4 Right Stick/Right"
-msgstr "P4 Δεξιός μοχλός/Δεξιά"
-
-#: src/emu/inpttype.ipp:263
-msgctxt "input-name"
-msgid "P4 Left Stick/Up"
-msgstr "P4 Αριστερός μοχλός/Επάνω"
-
-#: src/emu/inpttype.ipp:264
-msgctxt "input-name"
-msgid "P4 Left Stick/Down"
-msgstr "P4 Αριστερός μοχλός/Κάτω"
-
-#: src/emu/inpttype.ipp:265
-msgctxt "input-name"
-msgid "P4 Left Stick/Left"
-msgstr "P4 Αριστερός μοχλός/Αριστερά"
-
-#: src/emu/inpttype.ipp:266
-msgctxt "input-name"
-msgid "P4 Left Stick/Right"
-msgstr "P4 Αριστερός μοχλός/Δεξιά"
-
-#: src/emu/inpttype.ipp:267
-msgctxt "input-name"
-msgid "P4 Button 1"
-msgstr "P4 Πλήκτρο 1"
-
-#: src/emu/inpttype.ipp:268
-msgctxt "input-name"
-msgid "P4 Button 2"
-msgstr "P4 Πλήκτρο 2"
-
-#: src/emu/inpttype.ipp:269
-msgctxt "input-name"
-msgid "P4 Button 3"
-msgstr "P4 Πλήκτρο 3"
-
-#: src/emu/inpttype.ipp:270
-msgctxt "input-name"
-msgid "P4 Button 4"
-msgstr "P4 Πλήκτρο 4"
-
-#: src/emu/inpttype.ipp:271
-msgctxt "input-name"
-msgid "P4 Button 5"
-msgstr "P4 Πλήκτρο 5"
-
-#: src/emu/inpttype.ipp:272
-msgctxt "input-name"
-msgid "P4 Button 6"
-msgstr "P4 Πλήκτρο 6"
-
-#: src/emu/inpttype.ipp:273
-msgctxt "input-name"
-msgid "P4 Button 7"
-msgstr "P4 Πλήκτρο 7"
-
-#: src/emu/inpttype.ipp:274
-msgctxt "input-name"
-msgid "P4 Button 8"
-msgstr "P4 Πλήκτρο 8"
-
-#: src/emu/inpttype.ipp:275
-msgctxt "input-name"
-msgid "P4 Button 9"
-msgstr "P4 Πλήκτρο 9"
-
-#: src/emu/inpttype.ipp:276
-msgctxt "input-name"
-msgid "P4 Button 10"
-msgstr "P4 Πλήκτρο 10"
-
-#: src/emu/inpttype.ipp:277
-msgctxt "input-name"
-msgid "P4 Button 11"
-msgstr "P4 Πλήκτρο 11"
-
-#: src/emu/inpttype.ipp:278
-msgctxt "input-name"
-msgid "P4 Button 12"
-msgstr "P4 Πλήκτρο 12"
-
-#: src/emu/inpttype.ipp:279
-msgctxt "input-name"
-msgid "P4 Button 13"
-msgstr "P4 Πλήκτρο 13"
-
-#: src/emu/inpttype.ipp:280
-msgctxt "input-name"
-msgid "P4 Button 14"
-msgstr "P4 Πλήκτρο 14"
-
-#: src/emu/inpttype.ipp:281
-msgctxt "input-name"
-msgid "P4 Button 15"
-msgstr "P4 Πλήκτρο 15"
-
-#: src/emu/inpttype.ipp:282
-msgctxt "input-name"
-msgid "P4 Button 16"
-msgstr "P4 Πλήκτρο 16"
-
-#: src/emu/inpttype.ipp:283
-msgctxt "input-name"
-msgid "P4 Start"
-msgstr "P4 Έναρξη"
-
-#: src/emu/inpttype.ipp:284
-msgctxt "input-name"
-msgid "P4 Select"
-msgstr "P4 Επιλογή"
-
-#: src/emu/inpttype.ipp:289
-msgctxt "input-name"
-msgid "P5 Up"
-msgstr "P5 Επάνω"
-
-#: src/emu/inpttype.ipp:290
-msgctxt "input-name"
-msgid "P5 Down"
-msgstr "P5 Κάτω"
-
-#: src/emu/inpttype.ipp:291
-msgctxt "input-name"
-msgid "P5 Left"
-msgstr "P5 Αριστερά"
-
-#: src/emu/inpttype.ipp:292
-msgctxt "input-name"
-msgid "P5 Right"
-msgstr "P5 Δεξιά"
-
-#: src/emu/inpttype.ipp:293
-msgctxt "input-name"
-msgid "P5 Right Stick/Up"
-msgstr "P5 Δεξιός μοχλός/Επάνω"
-
-#: src/emu/inpttype.ipp:294
-msgctxt "input-name"
-msgid "P5 Right Stick/Down"
-msgstr "P5 Δεξιός μοχλός/Κάτω"
-
-#: src/emu/inpttype.ipp:295
-msgctxt "input-name"
-msgid "P5 Right Stick/Left"
-msgstr "P5 Δεξιός μοχλός/Αριστερά"
-
-#: src/emu/inpttype.ipp:296
-msgctxt "input-name"
-msgid "P5 Right Stick/Right"
-msgstr "P5 Δεξιός μοχλός/Δεξιά"
-
-#: src/emu/inpttype.ipp:297
-msgctxt "input-name"
-msgid "P5 Left Stick/Up"
-msgstr "P5 Αριστερός μοχλός/Επάνω"
-
-#: src/emu/inpttype.ipp:298
-msgctxt "input-name"
-msgid "P5 Left Stick/Down"
-msgstr "P5 Αριστερός μοχλός/Κάτω"
-
-#: src/emu/inpttype.ipp:299
-msgctxt "input-name"
-msgid "P5 Left Stick/Left"
-msgstr "P5 Αριστερός μοχλός/Αριστερά"
-
-#: src/emu/inpttype.ipp:300
-msgctxt "input-name"
-msgid "P5 Left Stick/Right"
-msgstr "P5 Αριστερός μοχλός/Δεξιά"
-
-#: src/emu/inpttype.ipp:301
-msgctxt "input-name"
-msgid "P5 Button 1"
-msgstr "P5 Πλήκτρο 1"
-
-#: src/emu/inpttype.ipp:302
-msgctxt "input-name"
-msgid "P5 Button 2"
-msgstr "P5 Πλήκτρο 2"
-
-#: src/emu/inpttype.ipp:303
-msgctxt "input-name"
-msgid "P5 Button 3"
-msgstr "P5 Πλήκτρο 3"
-
-#: src/emu/inpttype.ipp:304
-msgctxt "input-name"
-msgid "P5 Button 4"
-msgstr "P5 Πλήκτρο 4"
-
-#: src/emu/inpttype.ipp:305
-msgctxt "input-name"
-msgid "P5 Button 5"
-msgstr "P5 Πλήκτρο 5"
-
-#: src/emu/inpttype.ipp:306
-msgctxt "input-name"
-msgid "P5 Button 6"
-msgstr "P5 Πλήκτρο 6"
-
-#: src/emu/inpttype.ipp:307
-msgctxt "input-name"
-msgid "P5 Button 7"
-msgstr "P5 Πλήκτρο 7"
-
-#: src/emu/inpttype.ipp:308
-msgctxt "input-name"
-msgid "P5 Button 8"
-msgstr "P5 Πλήκτρο 8"
-
-#: src/emu/inpttype.ipp:309
-msgctxt "input-name"
-msgid "P5 Button 9"
-msgstr "P5 Πλήκτρο 9"
-
-#: src/emu/inpttype.ipp:310
-msgctxt "input-name"
-msgid "P5 Button 10"
-msgstr "P5 Πλήκτρο 10"
-
-#: src/emu/inpttype.ipp:311
-msgctxt "input-name"
-msgid "P5 Button 11"
-msgstr "P5 Πλήκτρο 11"
-
-#: src/emu/inpttype.ipp:312
-msgctxt "input-name"
-msgid "P5 Button 12"
-msgstr "P5 Πλήκτρο 12"
-
-#: src/emu/inpttype.ipp:313
-msgctxt "input-name"
-msgid "P5 Button 13"
-msgstr "P5 Πλήκτρο 13"
-
-#: src/emu/inpttype.ipp:314
-msgctxt "input-name"
-msgid "P5 Button 14"
-msgstr "P5 Πλήκτρο 14"
-
-#: src/emu/inpttype.ipp:315
-msgctxt "input-name"
-msgid "P5 Button 15"
-msgstr "P5 Πλήκτρο 15"
-
-#: src/emu/inpttype.ipp:316
-msgctxt "input-name"
-msgid "P5 Button 16"
-msgstr "P5 Πλήκτρο 16"
-
-#: src/emu/inpttype.ipp:317
-msgctxt "input-name"
-msgid "P5 Start"
-msgstr "P5 Έναρξη"
-
-#: src/emu/inpttype.ipp:318
-msgctxt "input-name"
-msgid "P5 Select"
-msgstr "P5 Επιλογή"
-
-#: src/emu/inpttype.ipp:323
-msgctxt "input-name"
-msgid "P6 Up"
-msgstr "P6 Επάνω"
-
-#: src/emu/inpttype.ipp:324
-msgctxt "input-name"
-msgid "P6 Down"
-msgstr "P6 Κάτω"
-
-#: src/emu/inpttype.ipp:325
-msgctxt "input-name"
-msgid "P6 Left"
-msgstr "P6 Αριστερά"
-
-#: src/emu/inpttype.ipp:326
-msgctxt "input-name"
-msgid "P6 Right"
-msgstr "P6 Δεξιά"
-
-#: src/emu/inpttype.ipp:327
-msgctxt "input-name"
-msgid "P6 Right Stick/Up"
-msgstr "P6 Δεξιός μοχλός/Επάνω"
-
-#: src/emu/inpttype.ipp:328
-msgctxt "input-name"
-msgid "P6 Right Stick/Down"
-msgstr "P6 Δεξιός μοχλός/Κάτω"
-
-#: src/emu/inpttype.ipp:329
-msgctxt "input-name"
-msgid "P6 Right Stick/Left"
-msgstr "P6 Δεξιός μοχλός/Αριστερά"
-
-#: src/emu/inpttype.ipp:330
-msgctxt "input-name"
-msgid "P6 Right Stick/Right"
-msgstr "P6 Δεξιός μοχλός/Δεξιά"
-
-#: src/emu/inpttype.ipp:331
-msgctxt "input-name"
-msgid "P6 Left Stick/Up"
-msgstr "P6 Αριστερός μοχλός/Επάνω"
-
-#: src/emu/inpttype.ipp:332
-msgctxt "input-name"
-msgid "P6 Left Stick/Down"
-msgstr "P6 Αριστερός μοχλός/Κάτω"
-
-#: src/emu/inpttype.ipp:333
-msgctxt "input-name"
-msgid "P6 Left Stick/Left"
-msgstr "P6 Αριστερός μοχλός/Αριστερά"
-
-#: src/emu/inpttype.ipp:334
-msgctxt "input-name"
-msgid "P6 Left Stick/Right"
-msgstr "P6 Αριστερός μοχλός/Δεξιά"
-
-#: src/emu/inpttype.ipp:335
-msgctxt "input-name"
-msgid "P6 Button 1"
-msgstr "P6 Πλήκτρο 1"
-
-#: src/emu/inpttype.ipp:336
-msgctxt "input-name"
-msgid "P6 Button 2"
-msgstr "P6 Πλήκτρο 2"
-
-#: src/emu/inpttype.ipp:337
-msgctxt "input-name"
-msgid "P6 Button 3"
-msgstr "P6 Πλήκτρο 3"
-
-#: src/emu/inpttype.ipp:338
-msgctxt "input-name"
-msgid "P6 Button 4"
-msgstr "P6 Πλήκτρο 4"
-
-#: src/emu/inpttype.ipp:339
-msgctxt "input-name"
-msgid "P6 Button 5"
-msgstr "P6 Πλήκτρο 5"
-
-#: src/emu/inpttype.ipp:340
-msgctxt "input-name"
-msgid "P6 Button 6"
-msgstr "P6 Πλήκτρο 6"
-
-#: src/emu/inpttype.ipp:341
-msgctxt "input-name"
-msgid "P6 Button 7"
-msgstr "P6 Πλήκτρο 7"
-
-#: src/emu/inpttype.ipp:342
-msgctxt "input-name"
-msgid "P6 Button 8"
-msgstr "P6 Πλήκτρο 8"
-
-#: src/emu/inpttype.ipp:343
-msgctxt "input-name"
-msgid "P6 Button 9"
-msgstr "P6 Πλήκτρο 9"
-
-#: src/emu/inpttype.ipp:344
-msgctxt "input-name"
-msgid "P6 Button 10"
-msgstr "P6 Πλήκτρο 10"
-
-#: src/emu/inpttype.ipp:345
-msgctxt "input-name"
-msgid "P6 Button 11"
-msgstr "P6 Πλήκτρο 11"
-
-#: src/emu/inpttype.ipp:346
-msgctxt "input-name"
-msgid "P6 Button 12"
-msgstr "P6 Πλήκτρο 12"
-
-#: src/emu/inpttype.ipp:347
-msgctxt "input-name"
-msgid "P6 Button 13"
-msgstr "P6 Πλήκτρο 13"
-
-#: src/emu/inpttype.ipp:348
-msgctxt "input-name"
-msgid "P6 Button 14"
-msgstr "P6 Πλήκτρο 14"
-
-#: src/emu/inpttype.ipp:349
-msgctxt "input-name"
-msgid "P6 Button 15"
-msgstr "P6 Πλήκτρο 15"
-
-#: src/emu/inpttype.ipp:350
-msgctxt "input-name"
-msgid "P6 Button 16"
-msgstr "P6 Πλήκτρο 16"
-
-#: src/emu/inpttype.ipp:351
-msgctxt "input-name"
-msgid "P6 Start"
-msgstr "P6 Έναρξη"
-
-#: src/emu/inpttype.ipp:352
-msgctxt "input-name"
-msgid "P6 Select"
-msgstr "P6 Επιλογή"
-
-#: src/emu/inpttype.ipp:357
-msgctxt "input-name"
-msgid "P7 Up"
-msgstr "P7 Επάνω"
-
-#: src/emu/inpttype.ipp:358
-msgctxt "input-name"
-msgid "P7 Down"
-msgstr "P7 Κάτω"
-
-#: src/emu/inpttype.ipp:359
-msgctxt "input-name"
-msgid "P7 Left"
-msgstr "P7 Αριστερά"
-
-#: src/emu/inpttype.ipp:360
-msgctxt "input-name"
-msgid "P7 Right"
-msgstr "P7 Δεξιά"
-
-#: src/emu/inpttype.ipp:361
-msgctxt "input-name"
-msgid "P7 Right Stick/Up"
-msgstr "P7 Δεξιός μοχλός/Επάνω"
-
-#: src/emu/inpttype.ipp:362
-msgctxt "input-name"
-msgid "P7 Right Stick/Down"
-msgstr "P7 Δεξιός μοχλός/Κάτω"
-
-#: src/emu/inpttype.ipp:363
-msgctxt "input-name"
-msgid "P7 Right Stick/Left"
-msgstr "P7 Δεξιός μοχλός/Αριστερά"
-
-#: src/emu/inpttype.ipp:364
-msgctxt "input-name"
-msgid "P7 Right Stick/Right"
-msgstr "P7 Δεξιός μοχλός/Δεξιά"
-
-#: src/emu/inpttype.ipp:365
-msgctxt "input-name"
-msgid "P7 Left Stick/Up"
-msgstr "P7 Αριστερός μοχλός/Επάνω"
-
-#: src/emu/inpttype.ipp:366
-msgctxt "input-name"
-msgid "P7 Left Stick/Down"
-msgstr "P7 Αριστερός μοχλός/Κάτω"
-
-#: src/emu/inpttype.ipp:367
-msgctxt "input-name"
-msgid "P7 Left Stick/Left"
-msgstr "P7 Αριστερός μοχλός/Αριστερά"
-
-#: src/emu/inpttype.ipp:368
-msgctxt "input-name"
-msgid "P7 Left Stick/Right"
-msgstr "P7 Αριστερός μοχλός/Δεξιά"
-
-#: src/emu/inpttype.ipp:369
-msgctxt "input-name"
-msgid "P7 Button 1"
-msgstr "P7 Πλήκτρο 1"
-
-#: src/emu/inpttype.ipp:370
-msgctxt "input-name"
-msgid "P7 Button 2"
-msgstr "P7 Πλήκτρο 2"
-
-#: src/emu/inpttype.ipp:371
-msgctxt "input-name"
-msgid "P7 Button 3"
-msgstr "P7 Πλήκτρο 3"
-
-#: src/emu/inpttype.ipp:372
-msgctxt "input-name"
-msgid "P7 Button 4"
-msgstr "P7 Πλήκτρο 4"
-
-#: src/emu/inpttype.ipp:373
-msgctxt "input-name"
-msgid "P7 Button 5"
-msgstr "P7 Πλήκτρο 5"
-
-#: src/emu/inpttype.ipp:374
-msgctxt "input-name"
-msgid "P7 Button 6"
-msgstr "P7 Πλήκτρο 6"
-
-#: src/emu/inpttype.ipp:375
-msgctxt "input-name"
-msgid "P7 Button 7"
-msgstr "P7 Πλήκτρο 7"
-
-#: src/emu/inpttype.ipp:376
-msgctxt "input-name"
-msgid "P7 Button 8"
-msgstr "P7 Πλήκτρο 8"
-
-#: src/emu/inpttype.ipp:377
-msgctxt "input-name"
-msgid "P7 Button 9"
-msgstr "P7 Πλήκτρο 9"
-
-#: src/emu/inpttype.ipp:378
-msgctxt "input-name"
-msgid "P7 Button 10"
-msgstr "P7 Πλήκτρο 10"
-
-#: src/emu/inpttype.ipp:379
-msgctxt "input-name"
-msgid "P7 Button 11"
-msgstr "P7 Πλήκτρο 11"
-
-#: src/emu/inpttype.ipp:380
-msgctxt "input-name"
-msgid "P7 Button 12"
-msgstr "P7 Πλήκτρο 12"
-
-#: src/emu/inpttype.ipp:381
-msgctxt "input-name"
-msgid "P7 Button 13"
-msgstr "P7 Πλήκτρο 13"
-
-#: src/emu/inpttype.ipp:382
-msgctxt "input-name"
-msgid "P7 Button 14"
-msgstr "P7 Πλήκτρο 14"
-
-#: src/emu/inpttype.ipp:383
-msgctxt "input-name"
-msgid "P7 Button 15"
-msgstr "P7 Πλήκτρο 15"
-
-#: src/emu/inpttype.ipp:384
-msgctxt "input-name"
-msgid "P7 Button 16"
-msgstr "P7 Πλήκτρο 16"
-
-#: src/emu/inpttype.ipp:385
-msgctxt "input-name"
-msgid "P7 Start"
-msgstr "P7 Έναρξη"
-
-#: src/emu/inpttype.ipp:386
-msgctxt "input-name"
-msgid "P7 Select"
-msgstr "P7 Επιλογή"
-
-#: src/emu/inpttype.ipp:391
-msgctxt "input-name"
-msgid "P8 Up"
-msgstr "P8 Επάνω"
-
-#: src/emu/inpttype.ipp:392
-msgctxt "input-name"
-msgid "P8 Down"
-msgstr "P8 Κάτω"
-
-#: src/emu/inpttype.ipp:393
-msgctxt "input-name"
-msgid "P8 Left"
-msgstr "P8 Αριστερά"
-
-#: src/emu/inpttype.ipp:394
-msgctxt "input-name"
-msgid "P8 Right"
-msgstr "P8 Δεξιά"
-
-#: src/emu/inpttype.ipp:395
-msgctxt "input-name"
-msgid "P8 Right Stick/Up"
-msgstr "P8 Δεξιός μοχλός/Επάνω"
-
-#: src/emu/inpttype.ipp:396
-msgctxt "input-name"
-msgid "P8 Right Stick/Down"
-msgstr "P8 Δεξιός μοχλός/Κάτω"
-
-#: src/emu/inpttype.ipp:397
-msgctxt "input-name"
-msgid "P8 Right Stick/Left"
-msgstr "P8 Δεξιός μοχλός/Αριστερά"
-
-#: src/emu/inpttype.ipp:398
-msgctxt "input-name"
-msgid "P8 Right Stick/Right"
-msgstr "P8 Δεξιός μοχλός/Δεξιά"
-
-#: src/emu/inpttype.ipp:399
-msgctxt "input-name"
-msgid "P8 Left Stick/Up"
-msgstr "P8 Αριστερός μοχλός/Επάνω"
-
-#: src/emu/inpttype.ipp:400
-msgctxt "input-name"
-msgid "P8 Left Stick/Down"
-msgstr "P8 Αριστερός μοχλός/Κάτω"
-
-#: src/emu/inpttype.ipp:401
-msgctxt "input-name"
-msgid "P8 Left Stick/Left"
-msgstr "P8 Αριστερός μοχλός/Αριστερά"
-
-#: src/emu/inpttype.ipp:402
-msgctxt "input-name"
-msgid "P8 Left Stick/Right"
-msgstr "P8 Αριστερός μοχλός/Δεξιά"
-
-#: src/emu/inpttype.ipp:403
-msgctxt "input-name"
-msgid "P8 Button 1"
-msgstr "P8 Πλήκτρο 1"
-
-#: src/emu/inpttype.ipp:404
-msgctxt "input-name"
-msgid "P8 Button 2"
-msgstr "P8 Πλήκτρο 2"
-
-#: src/emu/inpttype.ipp:405
-msgctxt "input-name"
-msgid "P8 Button 3"
-msgstr "P8 Πλήκτρο 3"
-
-#: src/emu/inpttype.ipp:406
-msgctxt "input-name"
-msgid "P8 Button 4"
-msgstr "P8 Πλήκτρο 4"
-
-#: src/emu/inpttype.ipp:407
-msgctxt "input-name"
-msgid "P8 Button 5"
-msgstr "P8 Πλήκτρο 5"
-
-#: src/emu/inpttype.ipp:408
-msgctxt "input-name"
-msgid "P8 Button 6"
-msgstr "P8 Πλήκτρο 6"
-
-#: src/emu/inpttype.ipp:409
-msgctxt "input-name"
-msgid "P8 Button 7"
-msgstr "P8 Πλήκτρο 7"
-
-#: src/emu/inpttype.ipp:410
-msgctxt "input-name"
-msgid "P8 Button 8"
-msgstr "P8 Πλήκτρο 8"
-
-#: src/emu/inpttype.ipp:411
-msgctxt "input-name"
-msgid "P8 Button 9"
-msgstr "P8 Πλήκτρο 9"
-
-#: src/emu/inpttype.ipp:412
-msgctxt "input-name"
-msgid "P8 Button 10"
-msgstr "P8 Πλήκτρο 10"
-
-#: src/emu/inpttype.ipp:413
-msgctxt "input-name"
-msgid "P8 Button 11"
-msgstr "P8 Πλήκτρο 11"
-
-#: src/emu/inpttype.ipp:414
-msgctxt "input-name"
-msgid "P8 Button 12"
-msgstr "P8 Πλήκτρο 12"
-
-#: src/emu/inpttype.ipp:415
-msgctxt "input-name"
-msgid "P8 Button 13"
-msgstr "P8 Πλήκτρο 13"
-
-#: src/emu/inpttype.ipp:416
-msgctxt "input-name"
-msgid "P8 Button 14"
-msgstr "P8 Πλήκτρο 14"
-
-#: src/emu/inpttype.ipp:417
-msgctxt "input-name"
-msgid "P8 Button 15"
-msgstr "P8 Πλήκτρο 15"
-
-#: src/emu/inpttype.ipp:418
-msgctxt "input-name"
-msgid "P8 Button 16"
-msgstr "P8 Πλήκτρο 16"
-
-#: src/emu/inpttype.ipp:419
-msgctxt "input-name"
-msgid "P8 Start"
-msgstr "P8 Έναρξη"
-
-#: src/emu/inpttype.ipp:420
-msgctxt "input-name"
-msgid "P8 Select"
-msgstr "P8 Επιλογή"
-
-#: src/emu/inpttype.ipp:425
-msgctxt "input-name"
-msgid "P9 Up"
-msgstr "P9 Επάνω"
-
-#: src/emu/inpttype.ipp:426
-msgctxt "input-name"
-msgid "P9 Down"
-msgstr "P9 Κάτω"
-
-#: src/emu/inpttype.ipp:427
-msgctxt "input-name"
-msgid "P9 Left"
-msgstr "P9 Αριστερά"
-
-#: src/emu/inpttype.ipp:428
-msgctxt "input-name"
-msgid "P9 Right"
-msgstr "P9 Δεξιά"
-
-#: src/emu/inpttype.ipp:429
-msgctxt "input-name"
-msgid "P9 Right Stick/Up"
-msgstr "P9 Δεξιός μοχλός/Επάνω"
-
-#: src/emu/inpttype.ipp:430
-msgctxt "input-name"
-msgid "P9 Right Stick/Down"
-msgstr "P9 Δεξιός μοχλός/Κάτω"
-
-#: src/emu/inpttype.ipp:431
-msgctxt "input-name"
-msgid "P9 Right Stick/Left"
-msgstr "P9 Δεξιός μοχλός/Αριστερά"
-
-#: src/emu/inpttype.ipp:432
-msgctxt "input-name"
-msgid "P9 Right Stick/Right"
-msgstr "P9 Δεξιός μοχλός/Δεξιά"
-
-#: src/emu/inpttype.ipp:433
-msgctxt "input-name"
-msgid "P9 Left Stick/Up"
-msgstr "P9 Αριστερός μοχλός/Επάνω"
-
-#: src/emu/inpttype.ipp:434
-msgctxt "input-name"
-msgid "P9 Left Stick/Down"
-msgstr "P9 Αριστερός μοχλός/Κάτω"
-
-#: src/emu/inpttype.ipp:435
-msgctxt "input-name"
-msgid "P9 Left Stick/Left"
-msgstr "P9 Αριστερός μοχλός/Αριστερά"
-
-#: src/emu/inpttype.ipp:436
-msgctxt "input-name"
-msgid "P9 Left Stick/Right"
-msgstr "P9 Αριστερός μοχλός/Δεξιά"
-
-#: src/emu/inpttype.ipp:437
-msgctxt "input-name"
-msgid "P9 Button 1"
-msgstr "P9 Πλήκτρο 1"
-
-#: src/emu/inpttype.ipp:438
-msgctxt "input-name"
-msgid "P9 Button 2"
-msgstr "P9 Πλήκτρο 2"
-
-#: src/emu/inpttype.ipp:439
-msgctxt "input-name"
-msgid "P9 Button 3"
-msgstr "P9 Πλήκτρο 3"
-
-#: src/emu/inpttype.ipp:440
-msgctxt "input-name"
-msgid "P9 Button 4"
-msgstr "P9 Πλήκτρο 4"
-
-#: src/emu/inpttype.ipp:441
-msgctxt "input-name"
-msgid "P9 Button 5"
-msgstr "P9 Πλήκτρο 5"
-
-#: src/emu/inpttype.ipp:442
-msgctxt "input-name"
-msgid "P9 Button 6"
-msgstr "P9 Πλήκτρο 6"
-
-#: src/emu/inpttype.ipp:443
-msgctxt "input-name"
-msgid "P9 Button 7"
-msgstr "P9 Πλήκτρο 7"
-
-#: src/emu/inpttype.ipp:444
-msgctxt "input-name"
-msgid "P9 Button 8"
-msgstr "P9 Πλήκτρο 8"
-
-#: src/emu/inpttype.ipp:445
-msgctxt "input-name"
-msgid "P9 Button 9"
-msgstr "P9 Πλήκτρο 9"
-
-#: src/emu/inpttype.ipp:446
-msgctxt "input-name"
-msgid "P9 Button 10"
-msgstr "P9 Πλήκτρο 10"
-
-#: src/emu/inpttype.ipp:447
-msgctxt "input-name"
-msgid "P9 Button 11"
-msgstr "P9 Πλήκτρο 11"
-
-#: src/emu/inpttype.ipp:448
-msgctxt "input-name"
-msgid "P9 Button 12"
-msgstr "P9 Πλήκτρο 12"
-
-#: src/emu/inpttype.ipp:449
-msgctxt "input-name"
-msgid "P9 Button 13"
-msgstr "P9 Πλήκτρο 13"
-
-#: src/emu/inpttype.ipp:450
-msgctxt "input-name"
-msgid "P9 Button 14"
-msgstr "P9 Πλήκτρο 14"
-
-#: src/emu/inpttype.ipp:451
-msgctxt "input-name"
-msgid "P9 Button 15"
-msgstr "P9 Πλήκτρο 15"
-
-#: src/emu/inpttype.ipp:452
-msgctxt "input-name"
-msgid "P9 Button 16"
-msgstr "P9 Πλήκτρο 16"
-
-#: src/emu/inpttype.ipp:453
-msgctxt "input-name"
-msgid "P9 Start"
-msgstr "P9 Έναρξη"
-
-#: src/emu/inpttype.ipp:454
-msgctxt "input-name"
-msgid "P9 Select"
-msgstr "P9 Επιλογή"
-
-#: src/emu/inpttype.ipp:459
-msgctxt "input-name"
-msgid "P10 Up"
-msgstr "P10 Επάνω"
-
-#: src/emu/inpttype.ipp:460
-msgctxt "input-name"
-msgid "P10 Down"
-msgstr "P10 Κάτω"
-
-#: src/emu/inpttype.ipp:461
-msgctxt "input-name"
-msgid "P10 Left"
-msgstr "P10 Αριστερά"
-
-#: src/emu/inpttype.ipp:462
-msgctxt "input-name"
-msgid "P10 Right"
-msgstr "P10 Δεξιά"
-
-#: src/emu/inpttype.ipp:463
-msgctxt "input-name"
-msgid "P10 Right Stick/Up"
-msgstr "P10 Δεξιός μοχλός/Επάνω"
-
-#: src/emu/inpttype.ipp:464
-msgctxt "input-name"
-msgid "P10 Right Stick/Down"
-msgstr "P10 Δεξιός μοχλός/Κάτω"
-
-#: src/emu/inpttype.ipp:465
-msgctxt "input-name"
-msgid "P10 Right Stick/Left"
-msgstr "P10 Δεξιός μοχλός/Αριστερά"
-
-#: src/emu/inpttype.ipp:466
-msgctxt "input-name"
-msgid "P10 Right Stick/Right"
-msgstr "P10 Δεξιός μοχλός/Δεξιά"
-
-#: src/emu/inpttype.ipp:467
-msgctxt "input-name"
-msgid "P10 Left Stick/Up"
-msgstr "P10 Αριστερός μοχλός/Επάνω"
-
-#: src/emu/inpttype.ipp:468
-msgctxt "input-name"
-msgid "P10 Left Stick/Down"
-msgstr "P10 Αριστερός μοχλός/Κάτω"
-
-#: src/emu/inpttype.ipp:469
-msgctxt "input-name"
-msgid "P10 Left Stick/Left"
-msgstr "P10 Αριστερός μοχλός/Αριστερά"
-
-#: src/emu/inpttype.ipp:470
-msgctxt "input-name"
-msgid "P10 Left Stick/Right"
-msgstr "P10 Αριστερός μοχλός/Δεξιά"
-
-#: src/emu/inpttype.ipp:471
-msgctxt "input-name"
-msgid "P10 Button 1"
-msgstr "P10 Πλήκτρο 1"
-
-#: src/emu/inpttype.ipp:472
-msgctxt "input-name"
-msgid "P10 Button 2"
-msgstr "P10 Πλήκτρο 2"
-
-#: src/emu/inpttype.ipp:473
-msgctxt "input-name"
-msgid "P10 Button 3"
-msgstr "P10 Πλήκτρο 3"
-
-#: src/emu/inpttype.ipp:474
-msgctxt "input-name"
-msgid "P10 Button 4"
-msgstr "P10 Πλήκτρο 4"
-
-#: src/emu/inpttype.ipp:475
-msgctxt "input-name"
-msgid "P10 Button 5"
-msgstr "P10 Πλήκτρο 5"
-
-#: src/emu/inpttype.ipp:476
-msgctxt "input-name"
-msgid "P10 Button 6"
-msgstr "P10 Πλήκτρο 6"
-
-#: src/emu/inpttype.ipp:477
-msgctxt "input-name"
-msgid "P10 Button 7"
-msgstr "P10 Πλήκτρο 7"
-
-#: src/emu/inpttype.ipp:478
-msgctxt "input-name"
-msgid "P10 Button 8"
-msgstr "P10 Πλήκτρο 8"
-
-#: src/emu/inpttype.ipp:479
-msgctxt "input-name"
-msgid "P10 Button 9"
-msgstr "P10 Πλήκτρο 9"
-
-#: src/emu/inpttype.ipp:480
-msgctxt "input-name"
-msgid "P10 Button 10"
-msgstr "P10 Πλήκτρο 10"
-
-#: src/emu/inpttype.ipp:481
-msgctxt "input-name"
-msgid "P10 Button 11"
-msgstr "P10 Πλήκτρο 11"
-
-#: src/emu/inpttype.ipp:482
-msgctxt "input-name"
-msgid "P10 Button 12"
-msgstr "P10 Πλήκτρο 12"
-
-#: src/emu/inpttype.ipp:483
-msgctxt "input-name"
-msgid "P10 Button 13"
-msgstr "P10 Πλήκτρο 13"
-
-#: src/emu/inpttype.ipp:484
-msgctxt "input-name"
-msgid "P10 Button 14"
-msgstr "P10 Πλήκτρο 14"
-
-#: src/emu/inpttype.ipp:485
-msgctxt "input-name"
-msgid "P10 Button 15"
-msgstr "P10 Πλήκτρο 15"
-
-#: src/emu/inpttype.ipp:486
-msgctxt "input-name"
-msgid "P10 Button 16"
-msgstr "P10 Πλήκτρο 16"
-
-#: src/emu/inpttype.ipp:487
-msgctxt "input-name"
-msgid "P10 Start"
-msgstr "P10 Έναρξη"
-
-#: src/emu/inpttype.ipp:488
-msgctxt "input-name"
-msgid "P10 Select"
-msgstr "P10 Επιλογή"
-
 #: src/emu/inpttype.ipp:493
 msgctxt "input-name"
 msgid "1 Player Start"
@@ -5584,155 +4209,32 @@ msgctxt "input-name"
 msgid "Volume Up"
 msgstr "Ένταση Ήχου Επάνω"
 
-#: src/emu/inpttype.ipp:550
-msgctxt "input-name"
-msgid "P1 Pedal 1"
-msgstr "P1 Πετάλι 1"
-
-#: src/emu/inpttype.ipp:551
-msgctxt "input-name"
-msgid "P2 Pedal 1"
-msgstr "P2 Πετάλι 1"
-
-#: src/emu/inpttype.ipp:552
-msgctxt "input-name"
-msgid "P3 Pedal 1"
-msgstr "P3 Πετάλι 1"
-
-#: src/emu/inpttype.ipp:553
-msgctxt "input-name"
-msgid "P4 Pedal 1"
-msgstr "P4 Πετάλι 1"
-
-#: src/emu/inpttype.ipp:554
-msgctxt "input-name"
-msgid "P5 Pedal 1"
-msgstr "P5 Πετάλι 1"
-
-#: src/emu/inpttype.ipp:555
-msgctxt "input-name"
-msgid "P6 Pedal 1"
-msgstr "P6 Πετάλι 1"
-
-#: src/emu/inpttype.ipp:556
-msgctxt "input-name"
-msgid "P7 Pedal 1"
-msgstr "P7 Πετάλι 1"
-
-#: src/emu/inpttype.ipp:557
-msgctxt "input-name"
-msgid "P8 Pedal 1"
-msgstr "P8 Πετάλι 1"
-
-#: src/emu/inpttype.ipp:558
-msgctxt "input-name"
-msgid "P9 Pedal 1"
-msgstr "P9 Πετάλι 1"
-
+#: src/emu/inpttype.ipp:550 src/emu/inpttype.ipp:551 src/emu/inpttype.ipp:552
+#: src/emu/inpttype.ipp:553 src/emu/inpttype.ipp:554 src/emu/inpttype.ipp:555
+#: src/emu/inpttype.ipp:556 src/emu/inpttype.ipp:557 src/emu/inpttype.ipp:558
 #: src/emu/inpttype.ipp:559
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 1"
-msgstr "P10 Πετάλι 1"
-
-#: src/emu/inpttype.ipp:564
-msgctxt "input-name"
-msgid "P1 Pedal 2"
-msgstr "P1 Πετάλι 2"
-
-#: src/emu/inpttype.ipp:565
-msgctxt "input-name"
-msgid "P2 Pedal 2"
-msgstr "P2 Πετάλι 2"
-
-#: src/emu/inpttype.ipp:566
-msgctxt "input-name"
-msgid "P3 Pedal 2"
-msgstr "P3 Πετάλι 2"
-
-#: src/emu/inpttype.ipp:567
-msgctxt "input-name"
-msgid "P4 Pedal 2"
-msgstr "P4 Πετάλι 2"
-
-#: src/emu/inpttype.ipp:568
-msgctxt "input-name"
-msgid "P5 Pedal 2"
-msgstr "P5 Πετάλι 2"
-
-#: src/emu/inpttype.ipp:569
-msgctxt "input-name"
-msgid "P6 Pedal 2"
-msgstr "P6 Πετάλι 2"
-
-#: src/emu/inpttype.ipp:570
-msgctxt "input-name"
-msgid "P7 Pedal 2"
-msgstr "P7 Πετάλι 2"
-
-#: src/emu/inpttype.ipp:571
-msgctxt "input-name"
-msgid "P8 Pedal 2"
-msgstr "P8 Πετάλι 2"
-
-#: src/emu/inpttype.ipp:572
-msgctxt "input-name"
-msgid "P9 Pedal 2"
-msgstr "P9 Πετάλι 2"
+msgid "%p Pedal 1"
+msgstr "%p Πετάλι 1"
 
+#: src/emu/inpttype.ipp:564 src/emu/inpttype.ipp:565 src/emu/inpttype.ipp:566
+#: src/emu/inpttype.ipp:567 src/emu/inpttype.ipp:568 src/emu/inpttype.ipp:569
+#: src/emu/inpttype.ipp:570 src/emu/inpttype.ipp:571 src/emu/inpttype.ipp:572
 #: src/emu/inpttype.ipp:573
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 2"
-msgstr "P10 Πετάλι 2"
-
-#: src/emu/inpttype.ipp:578
-msgctxt "input-name"
-msgid "P1 Pedal 3"
-msgstr "P1 Πετάλι 3"
-
-#: src/emu/inpttype.ipp:579
-msgctxt "input-name"
-msgid "P2 Pedal 3"
-msgstr "P2 Πετάλι 3"
-
-#: src/emu/inpttype.ipp:580
-msgctxt "input-name"
-msgid "P3 Pedal 3"
-msgstr "P3 Πετάλι 3"
-
-#: src/emu/inpttype.ipp:581
-msgctxt "input-name"
-msgid "P4 Pedal 3"
-msgstr "P4 Πετάλι 3"
-
-#: src/emu/inpttype.ipp:582
-msgctxt "input-name"
-msgid "P5 Pedal 3"
-msgstr "P5 Πετάλι 3"
-
-#: src/emu/inpttype.ipp:583
-msgctxt "input-name"
-msgid "P6 Pedal 3"
-msgstr "P6 Πετάλι 3"
-
-#: src/emu/inpttype.ipp:584
-msgctxt "input-name"
-msgid "P7 Pedal 3"
-msgstr "P7 Πετάλι 3"
-
-#: src/emu/inpttype.ipp:585
-msgctxt "input-name"
-msgid "P8 Pedal 3"
-msgstr "P8 Πετάλι 3"
-
-#: src/emu/inpttype.ipp:586
-msgctxt "input-name"
-msgid "P9 Pedal 3"
-msgstr "P9 Πετάλι 3"
+msgid "%p Pedal 2"
+msgstr "%p Πετάλι 2"
 
+#: src/emu/inpttype.ipp:578 src/emu/inpttype.ipp:579 src/emu/inpttype.ipp:580
+#: src/emu/inpttype.ipp:581 src/emu/inpttype.ipp:582 src/emu/inpttype.ipp:583
+#: src/emu/inpttype.ipp:584 src/emu/inpttype.ipp:585 src/emu/inpttype.ipp:586
 #: src/emu/inpttype.ipp:587
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 3"
-msgstr "P10 Πετάλι 3"
+msgid "%p Pedal 3"
+msgstr "%p Πετάλι 3"
 
 #: src/emu/inpttype.ipp:592
 msgctxt "input-name"
@@ -7633,3 +6135,47 @@ msgid ""
 msgstr ""
 "Δώστε ακολουθία ή πατήστε %s για ακύρωση\n"
 "%s"
+
+#~ msgid "Confirm quit from machines"
+#~ msgstr "Επιβεβαίωση εγκατάληψης από μηχάνημα"
+
+#~ msgid "Skip information screen at startup"
+#~ msgstr "Να μην εμφανίζεται η οθόνη πληροφοριών κατά την εκκίνηση"
+
+#~ msgid "Skip software parts selection menu"
+#~ msgstr "Παράλειψη μενού επιλογής τμημάτων λογισμικού"
+
+#~ msgid "Simultaneous contradictory"
+#~ msgstr "Ταυτόχρονη αναίρεση"
+
+#, c-format
+#~ msgid ""
+#~ "Auditing ROMs for machine %2$u of %3$u...\n"
+#~ "%1$s"
+#~ msgstr ""
+#~ "Γίνεται έλεγχος ROMs για το μηχάνημα %2$u από %3$u...\n"
+#~ "%1$s"
+
+#, c-format
+#~ msgid "Audit ROMs for %1$u machines marked unavailable"
+#~ msgstr "Έλεγχος ROMs για %1$u μηχανήματα που δεν είναι διαθέσιμα"
+
+#, c-format
+#~ msgid "Audit ROMs for all %1$u machines"
+#~ msgstr "Έλεγχος ROMs για όλα τα %1$u μηχανήματα"
+
+#~ msgid "Input (this Machine)"
+#~ msgstr "Χειρισμός (τρέχων Μηχάνημα)"
+
+#~ msgid "ROM Audit Result\tOK\n"
+#~ msgstr "Έλεγχος ROMs\tOK\n"
+
+#~ msgid "ROM Audit Result\tBAD\n"
+#~ msgstr "Έλεγχος ROMs\tΛΑΘΟΣ\n"
+
+#~ msgid ""
+#~ "ROM Audit \tDisabled\n"
+#~ "Samples Audit \tDisabled\n"
+#~ msgstr ""
+#~ "Έλεγχος ROMs \tΑπενεργοποιημένος\n"
+#~ "Έλεγχος Δειγμάτων Ήχου \tΑπενεργοποιημένος\n"
diff --git a/language/Hebrew/strings.po b/language/Hebrew/strings.po
index 0ff4b1973d3..32cbfd9a0f2 100644
--- a/language/Hebrew/strings.po
+++ b/language/Hebrew/strings.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-19 02:50+1100\n"
+"POT-Creation-Date: 2021-12-09 04:44+1100\n"
 "PO-Revision-Date: 2016-02-20 18:03+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: MAME Language Team\n"
@@ -260,12 +260,12 @@ msgstr ""
 msgid "Driver: \"%1$s\" software list "
 msgstr ""
 
-#: src/frontend/mame/ui/selsoft.cpp:711 src/frontend/mame/ui/selgame.cpp:1066
+#: src/frontend/mame/ui/selsoft.cpp:711 src/frontend/mame/ui/selgame.cpp:1076
 #, c-format
 msgid "%1$s: %2$s - Search: %3$s_"
 msgstr ""
 
-#: src/frontend/mame/ui/selsoft.cpp:713 src/frontend/mame/ui/selgame.cpp:1068
+#: src/frontend/mame/ui/selsoft.cpp:713 src/frontend/mame/ui/selgame.cpp:1078
 #, c-format
 msgid "Search: %1$s_"
 msgstr ""
@@ -275,7 +275,7 @@ msgstr ""
 msgid "Software list/item: %1$s:%2$s"
 msgstr ""
 
-#: src/frontend/mame/ui/optsmenu.cpp:73 src/frontend/mame/ui/sndmenu.cpp:165
+#: src/frontend/mame/ui/optsmenu.cpp:73 src/frontend/mame/ui/sndmenu.cpp:161
 msgid "Sound Options"
 msgstr ""
 
@@ -370,11 +370,11 @@ msgid "Show mouse pointer"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:39
-msgid "Confirm quit from machines"
+msgid "Confirm quit from emulation"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:40
-msgid "Skip information screen at startup"
+msgid "Skip system information screen"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:41
@@ -390,7 +390,7 @@ msgid "Skip BIOS selection menu"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:44
-msgid "Skip software parts selection menu"
+msgid "Skip software part selection menu"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:45
@@ -542,7 +542,7 @@ msgid "UI active"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:91
-msgid "Offscreen reload"
+msgid "Off-screen reload"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:92
@@ -558,7 +558,7 @@ msgid "Natural keyboard"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:95
-msgid "Simultaneous contradictory"
+msgid "Allow contradictory joystick inputs"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:96
@@ -582,7 +582,7 @@ msgid "Pedal Device Assignment"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:106
-msgid "Adstick Device Assignment"
+msgid "AD Stick Device Assignment"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:107
@@ -669,14 +669,14 @@ msgstr ""
 msgid "Wait Vertical Sync"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:687
+#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:689
 #: src/frontend/mame/ui/videoopt.cpp:191 src/frontend/mame/ui/custui.cpp:490
 #: src/frontend/mame/ui/analogipt.cpp:471 plugins/cheatfind/init.lua:766
 #: plugins/cheatfind/init.lua:777 plugins/cheat/init.lua:668
 msgid "On"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:690
+#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:692
 #: src/frontend/mame/ui/videoopt.cpp:207 src/frontend/mame/ui/custui.cpp:490
 #: src/frontend/mame/ui/analogipt.cpp:471 plugins/cheatfind/init.lua:763
 #: plugins/cheatfind/init.lua:774 plugins/cheat/init.lua:671
@@ -684,11 +684,11 @@ msgstr ""
 msgid "Off"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:693
+#: src/frontend/mame/ui/menu.cpp:695
 msgid "Auto"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:1195
+#: src/frontend/mame/ui/menu.cpp:1197
 #: src/frontend/mame/ui/simpleselgame.cpp:278
 #: src/frontend/mame/ui/selmenu.cpp:1280
 msgid "Return to Previous Menu"
@@ -696,7 +696,7 @@ msgstr ""
 
 #: src/frontend/mame/ui/filemngr.cpp:139
 #: src/frontend/mame/ui/confswitch.cpp:119
-#: src/frontend/mame/ui/inputmap.cpp:559 src/frontend/mame/ui/analogipt.cpp:360
+#: src/frontend/mame/ui/inputmap.cpp:563 src/frontend/mame/ui/analogipt.cpp:360
 #, c-format
 msgid "[root%1$s]"
 msgstr ""
@@ -939,22 +939,22 @@ msgid ""
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "GHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "MHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "kHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "Hz"
 msgstr ""
 
@@ -978,38 +978,38 @@ msgstr ""
 msgid "Vector"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:480
+#: src/frontend/mame/ui/info.cpp:483
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:480
+#: src/frontend/mame/ui/info.cpp:483
 msgid "%2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:497
+#: src/frontend/mame/ui/info.cpp:500
 #, c-format
 msgid "Screen '%1$s'"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:499
+#: src/frontend/mame/ui/info.cpp:502
 msgid "Screen"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:570 src/frontend/mame/ui/info.cpp:581
+#: src/frontend/mame/ui/info.cpp:573 src/frontend/mame/ui/info.cpp:584
 #, c-format
 msgid "%1$s:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:662
+#: src/frontend/mame/ui/info.cpp:665
 msgid "Not supported"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:665
+#: src/frontend/mame/ui/info.cpp:668
 msgid "Partially supported"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:674
+#: src/frontend/mame/ui/info.cpp:677
 msgid "[empty]"
 msgstr ""
 
@@ -1082,7 +1082,7 @@ msgid "Emulated"
 msgstr ""
 
 #: src/frontend/mame/ui/keyboard.cpp:59 src/frontend/mame/ui/confswitch.cpp:117
-#: src/frontend/mame/ui/inputmap.cpp:557 src/frontend/mame/ui/analogipt.cpp:358
+#: src/frontend/mame/ui/inputmap.cpp:561 src/frontend/mame/ui/analogipt.cpp:358
 #, c-format
 msgid "%1$s [root%2$s]"
 msgstr ""
@@ -1442,7 +1442,7 @@ msgctxt "swlist-info"
 msgid "Software list/item"
 msgstr ""
 
-#: src/frontend/mame/ui/datmenu.cpp:88 src/frontend/mame/ui/selmenu.cpp:2698
+#: src/frontend/mame/ui/datmenu.cpp:88 src/frontend/mame/ui/selmenu.cpp:2707
 msgid "Software List Info"
 msgstr ""
 
@@ -1557,7 +1557,7 @@ msgstr ""
 msgid "Configure Machine:"
 msgstr ""
 
-#: src/frontend/mame/ui/miscmenu.cpp:858 src/frontend/mame/ui/selmenu.cpp:2638
+#: src/frontend/mame/ui/miscmenu.cpp:858 src/frontend/mame/ui/selmenu.cpp:2647
 msgid " (default)"
 msgstr ""
 
@@ -1574,7 +1574,7 @@ msgid ""
 "Press %2$s to return to emulation"
 msgstr ""
 
-#: src/frontend/mame/ui/info_pty.cpp:30 src/frontend/mame/ui/mainmenu.cpp:155
+#: src/frontend/mame/ui/info_pty.cpp:30
 msgid "Pseudo terminals"
 msgstr ""
 
@@ -1642,52 +1642,52 @@ msgstr ""
 msgid "Other Controls"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:227
+#: src/frontend/mame/ui/inputmap.cpp:231
 msgid "This machine has no configurable inputs."
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:327
+#: src/frontend/mame/ui/inputmap.cpp:331
 msgid "Pressed"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:397
+#: src/frontend/mame/ui/inputmap.cpp:401
 msgid "Invalid sequence entered"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:542
+#: src/frontend/mame/ui/inputmap.cpp:546
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:543
+#: src/frontend/mame/ui/inputmap.cpp:547
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog Inc"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:544
+#: src/frontend/mame/ui/inputmap.cpp:548
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog Dec"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:586
+#: src/frontend/mame/ui/inputmap.cpp:590
 #, c-format
 msgid "Press %1$s to set\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:587
+#: src/frontend/mame/ui/inputmap.cpp:591
 #, c-format
 msgid "Press %1$s to append\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:588
+#: src/frontend/mame/ui/inputmap.cpp:592
 #, c-format
 msgid "Press %1$s to clear\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:589
+#: src/frontend/mame/ui/inputmap.cpp:593
 #, c-format
 msgid "Press %1$s to restore default\n"
 msgstr ""
@@ -1751,7 +1751,7 @@ msgid ""
 msgstr ""
 
 #: src/frontend/mame/ui/simpleselgame.cpp:273
-#: src/frontend/mame/ui/selgame.cpp:436
+#: src/frontend/mame/ui/selgame.cpp:443
 msgid "Configure Options"
 msgstr ""
 
@@ -2079,16 +2079,16 @@ msgstr ""
 msgid "Expand to fit"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:437
+#: src/frontend/mame/ui/selgame.cpp:444
 msgid "Configure Machine"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:1050
+#: src/frontend/mame/ui/selgame.cpp:1060
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d machines (%5$d BIOS) )"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:1078
+#: src/frontend/mame/ui/selgame.cpp:1088
 #, c-format
 msgid "System: %1$-.100s"
 msgstr ""
@@ -2110,7 +2110,7 @@ msgstr ""
 #: src/frontend/mame/ui/auditmenu.cpp:98
 #, c-format
 msgid ""
-"Auditing ROMs for machine %2$u of %3$u...\n"
+"Auditing media for machine %2$u of %3$u...\n"
 "%1$s"
 msgstr ""
 
@@ -2125,12 +2125,12 @@ msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:136
 #, c-format
-msgid "Audit ROMs for %1$u machines marked unavailable"
+msgid "Audit media for %1$u machines marked unavailable"
 msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:137
 #, c-format
-msgid "Audit ROMs for all %1$u machines"
+msgid "Audit media for all %1$u machines"
 msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:154
@@ -2336,84 +2336,84 @@ msgctxt "color-sample"
 msgid "Clone"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:914
+#: src/frontend/mame/ui/custui.cpp:906
 msgid "ARGB Settings"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:919 src/frontend/mame/ui/custui.cpp:922
+#: src/frontend/mame/ui/custui.cpp:911 src/frontend/mame/ui/custui.cpp:914
 msgctxt "color-channel"
 msgid "Alpha"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:927 src/frontend/mame/ui/custui.cpp:930
+#: src/frontend/mame/ui/custui.cpp:919 src/frontend/mame/ui/custui.cpp:922
 msgctxt "color-channel"
 msgid "Red"
 msgstr ""
 
+#: src/frontend/mame/ui/custui.cpp:927 src/frontend/mame/ui/custui.cpp:930
+msgctxt "color-channel"
+msgid "Green"
+msgstr ""
+
 #: src/frontend/mame/ui/custui.cpp:935 src/frontend/mame/ui/custui.cpp:938
 msgctxt "color-channel"
-msgid "Green"
-msgstr ""
-
-#: src/frontend/mame/ui/custui.cpp:943 src/frontend/mame/ui/custui.cpp:946
-msgctxt "color-channel"
 msgid "Blue"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:949
+#: src/frontend/mame/ui/custui.cpp:941
 msgid "Choose from palette"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:996
+#: src/frontend/mame/ui/custui.cpp:988
 msgid "Color preview:"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1093
+#: src/frontend/mame/ui/custui.cpp:1085
 msgctxt "color-preset"
 msgid "White"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1094
+#: src/frontend/mame/ui/custui.cpp:1086
 msgctxt "color-preset"
 msgid "Silver"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1095
+#: src/frontend/mame/ui/custui.cpp:1087
 msgctxt "color-preset"
 msgid "Gray"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1096
+#: src/frontend/mame/ui/custui.cpp:1088
 msgctxt "color-preset"
 msgid "Black"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1097
+#: src/frontend/mame/ui/custui.cpp:1089
 msgctxt "color-preset"
 msgid "Red"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1098
+#: src/frontend/mame/ui/custui.cpp:1090
 msgctxt "color-preset"
 msgid "Orange"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1099
+#: src/frontend/mame/ui/custui.cpp:1091
 msgctxt "color-preset"
 msgid "Yellow"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1100
+#: src/frontend/mame/ui/custui.cpp:1092
 msgctxt "color-preset"
 msgid "Green"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1101
+#: src/frontend/mame/ui/custui.cpp:1093
 msgctxt "color-preset"
 msgid "Blue"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1102
+#: src/frontend/mame/ui/custui.cpp:1094
 msgctxt "color-preset"
 msgid "Violet"
 msgstr ""
@@ -2478,7 +2478,7 @@ msgid "Input (general)"
 msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:123
-msgid "Input (this Machine)"
+msgid "Input (this machine)"
 msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:126
@@ -2517,6 +2517,10 @@ msgstr ""
 msgid "Tape Control"
 msgstr ""
 
+#: src/frontend/mame/ui/mainmenu.cpp:155
+msgid "Pseudo Terminals"
+msgstr ""
+
 #: src/frontend/mame/ui/mainmenu.cpp:158
 msgid "BIOS Selection"
 msgstr ""
@@ -2555,7 +2559,7 @@ msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:200
 #, c-format
-msgid "About %s"
+msgid "About %1$s"
 msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:212
@@ -2715,373 +2719,373 @@ msgstr ""
 msgid "%1$s %2$s"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2235
+#: src/frontend/mame/ui/selmenu.cpp:2244
 msgid "Images"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2236
+#: src/frontend/mame/ui/selmenu.cpp:2245
 msgid "Infos"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2551
+#: src/frontend/mame/ui/selmenu.cpp:2560
 msgid ""
 "Required ROM/disk images for the selected system are missing or incorrect. "
 "Please acquire the correct files or select a different system.\n"
 "\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2567
+#: src/frontend/mame/ui/selmenu.cpp:2576
 msgid ""
 "Required ROM/disk images for the selected software are missing or incorrect. "
 "Please acquire the correct files or select a different software item.\n"
 "\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2583
+#: src/frontend/mame/ui/selmenu.cpp:2592
 msgid "incorrect checksum"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2586
+#: src/frontend/mame/ui/selmenu.cpp:2595
 msgid "incorrect length"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2589
+#: src/frontend/mame/ui/selmenu.cpp:2598
 msgid "not found"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2600
+#: src/frontend/mame/ui/selmenu.cpp:2609
 #, c-format
 msgid "%1$s (%2$s) - %3$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2602
+#: src/frontend/mame/ui/selmenu.cpp:2611
 #, c-format
 msgid "%1$s - %2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2606
+#: src/frontend/mame/ui/selmenu.cpp:2615
 msgid "Press any key to continue."
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2735
+#: src/frontend/mame/ui/selmenu.cpp:2744
 msgid "General Info"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2887
-#, c-format
-msgid "Romset\t%1$s\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2888
-#, c-format
-msgid "Year\t%1$s\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2889
-#, c-format
-msgid "Manufacturer\t%1$s\n"
-msgstr ""
-
 #: src/frontend/mame/ui/selmenu.cpp:2896
 #, c-format
-msgid "Driver is Clone of\t%1$s\n"
+msgid "Romset\t%1$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2901
-msgid "Driver is Parent\t\n"
+#: src/frontend/mame/ui/selmenu.cpp:2897
+#, c-format
+msgid "Year\t%1$s\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2898
+#, c-format
+msgid "Manufacturer\t%1$s\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2905
-msgid "Analog Controls\tYes\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2907
-msgid "Keyboard Inputs\tYes\n"
+#, c-format
+msgid "Driver is Clone of\t%1$s\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2910
-msgid "Overall\tNOT WORKING\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2912
-msgid "Overall\tUnemulated Protection\n"
+msgid "Driver is Parent\t\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2914
-msgid "Overall\tWorking\n"
+msgid "Analog Controls\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2917
-msgid "Graphics\tUnimplemented\n"
+#: src/frontend/mame/ui/selmenu.cpp:2916
+msgid "Keyboard Inputs\tYes\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2919
-msgid "Graphics\tWrong Colors\n"
+msgid "Overall\tNOT WORKING\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2921
-msgid "Graphics\tImperfect Colors\n"
+msgid "Overall\tUnemulated Protection\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2923
-msgid "Graphics\tImperfect\n"
+msgid "Overall\tWorking\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2925
-msgid "Graphics\tOK\n"
+#: src/frontend/mame/ui/selmenu.cpp:2926
+msgid "Graphics\tUnimplemented\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2928
-msgid "Sound\tNone\n"
+msgid "Graphics\tWrong Colors\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2930
-msgid "Sound\tUnimplemented\n"
+msgid "Graphics\tImperfect Colors\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2932
-msgid "Sound\tImperfect\n"
+msgid "Graphics\tImperfect\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2934
-msgid "Sound\tOK\n"
+msgid "Graphics\tOK\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2937
-msgid "Capture\tUnimplemented\n"
+msgid "Sound\tNone\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2939
+msgid "Sound\tUnimplemented\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2941
+msgid "Sound\tImperfect\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2943
+msgid "Sound\tOK\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2946
+msgid "Capture\tUnimplemented\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2948
 msgid "Capture\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2942
+#: src/frontend/mame/ui/selmenu.cpp:2951
 msgid "Camera\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2944
+#: src/frontend/mame/ui/selmenu.cpp:2953
 msgid "Camera\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2947
+#: src/frontend/mame/ui/selmenu.cpp:2956
 msgid "Microphone\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2949
+#: src/frontend/mame/ui/selmenu.cpp:2958
 msgid "Microphone\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2952
+#: src/frontend/mame/ui/selmenu.cpp:2961
 msgid "Controls\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2954
+#: src/frontend/mame/ui/selmenu.cpp:2963
 msgid "Controls\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2957
+#: src/frontend/mame/ui/selmenu.cpp:2966
 msgid "Keyboard\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2959
+#: src/frontend/mame/ui/selmenu.cpp:2968
 msgid "Keyboard\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2962
+#: src/frontend/mame/ui/selmenu.cpp:2971
 msgid "Mouse\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2964
+#: src/frontend/mame/ui/selmenu.cpp:2973
 msgid "Mouse\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2967
+#: src/frontend/mame/ui/selmenu.cpp:2976
 msgid "Media\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2969
+#: src/frontend/mame/ui/selmenu.cpp:2978
 msgid "Media\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2972
+#: src/frontend/mame/ui/selmenu.cpp:2981
 msgid "Disk\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2974
+#: src/frontend/mame/ui/selmenu.cpp:2983
 msgid "Disk\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2977
+#: src/frontend/mame/ui/selmenu.cpp:2986
 msgid "Printer\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2979
+#: src/frontend/mame/ui/selmenu.cpp:2988
 msgid "Printer\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2982
+#: src/frontend/mame/ui/selmenu.cpp:2991
 msgid "Mag. Tape\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2984
+#: src/frontend/mame/ui/selmenu.cpp:2993
 msgid "Mag. Tape\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2987
+#: src/frontend/mame/ui/selmenu.cpp:2996
 msgid "Punch Tape\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2989
+#: src/frontend/mame/ui/selmenu.cpp:2998
 msgid "Punch Tape\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2992
+#: src/frontend/mame/ui/selmenu.cpp:3001
 msgid "Mag. Drum\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2994
+#: src/frontend/mame/ui/selmenu.cpp:3003
 msgid "Mag. Drum\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2997
+#: src/frontend/mame/ui/selmenu.cpp:3006
 msgid "(EP)ROM\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2999
+#: src/frontend/mame/ui/selmenu.cpp:3008
 msgid "(EP)ROM\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3002
+#: src/frontend/mame/ui/selmenu.cpp:3011
 msgid "Communications\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3004
+#: src/frontend/mame/ui/selmenu.cpp:3013
 msgid "Communications\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3007
+#: src/frontend/mame/ui/selmenu.cpp:3016
 msgid "LAN\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3009
+#: src/frontend/mame/ui/selmenu.cpp:3018
 msgid "LAN\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3012
+#: src/frontend/mame/ui/selmenu.cpp:3021
 msgid "WAN\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3014
+#: src/frontend/mame/ui/selmenu.cpp:3023
 msgid "WAN\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3017
+#: src/frontend/mame/ui/selmenu.cpp:3026
 msgid "Timing\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3019
+#: src/frontend/mame/ui/selmenu.cpp:3028
 msgid "Timing\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3021
+#: src/frontend/mame/ui/selmenu.cpp:3030
 msgid "Mechanical Machine\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3021
+#: src/frontend/mame/ui/selmenu.cpp:3030
 msgid "Mechanical Machine\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3022
+#: src/frontend/mame/ui/selmenu.cpp:3031
 msgid "Requires Artwork\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3022
+#: src/frontend/mame/ui/selmenu.cpp:3031
 msgid "Requires Artwork\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3023
+#: src/frontend/mame/ui/selmenu.cpp:3032
 msgid "Requires Clickable Artwork\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3023
+#: src/frontend/mame/ui/selmenu.cpp:3032
 msgid "Requires Clickable Artwork\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3025
+#: src/frontend/mame/ui/selmenu.cpp:3034
 msgid "Support Cocktail\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3026
+#: src/frontend/mame/ui/selmenu.cpp:3035
 msgid "Driver is BIOS\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3026
+#: src/frontend/mame/ui/selmenu.cpp:3035
 msgid "Driver is BIOS\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3027
+#: src/frontend/mame/ui/selmenu.cpp:3036
 msgid "Support Save\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3027
+#: src/frontend/mame/ui/selmenu.cpp:3036
 msgid "Support Save\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3028
+#: src/frontend/mame/ui/selmenu.cpp:3037
 msgid "Screen Orientation\tVertical\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3028
+#: src/frontend/mame/ui/selmenu.cpp:3037
 msgid "Screen Orientation\tHorizontal\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3038
+#: src/frontend/mame/ui/selmenu.cpp:3047
 msgid "Requires CHD\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3038
+#: src/frontend/mame/ui/selmenu.cpp:3047
 msgid "Requires CHD\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3051
-msgid "ROM Audit Result\tOK\n"
+#: src/frontend/mame/ui/selmenu.cpp:3060
+msgid "Media Audit Result\tOK\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3053
-msgid "ROM Audit Result\tBAD\n"
+#: src/frontend/mame/ui/selmenu.cpp:3062
+msgid "Media Audit Result\tBAD\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3056
+#: src/frontend/mame/ui/selmenu.cpp:3065
 msgid "Samples Audit Result\tNone Needed\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3058
+#: src/frontend/mame/ui/selmenu.cpp:3067
 msgid "Samples Audit Result\tOK\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3060
+#: src/frontend/mame/ui/selmenu.cpp:3069
 msgid "Samples Audit Result\tBAD\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3064
+#: src/frontend/mame/ui/selmenu.cpp:3073
 msgid ""
-"ROM Audit \tDisabled\n"
-"Samples Audit \tDisabled\n"
+"Media Audit\tDisabled\n"
+"Samples Audit\tDisabled\n"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:150
+#: src/frontend/mame/ui/sndmenu.cpp:146
 msgid "Sound"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:151
+#: src/frontend/mame/ui/sndmenu.cpp:147
 msgid "Compressor"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:152
+#: src/frontend/mame/ui/sndmenu.cpp:148
 msgid "Sample Rate"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:153
+#: src/frontend/mame/ui/sndmenu.cpp:149
 msgid "Use External Samples"
 msgstr ""
 
@@ -3120,511 +3124,681 @@ msgstr ""
 msgid "  Screen '%1$s': Vector\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:132
+#: src/frontend/mame/ui/devopt.cpp:135
 #, c-format
 msgid "  Screen '%1$s': %2$d × %3$d (V) %4$s Hz\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:133
+#: src/frontend/mame/ui/devopt.cpp:136
 #, c-format
 msgid "  Screen '%1$s': %2$d × %3$d (H) %4$s Hz\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:147
+#: src/frontend/mame/ui/devopt.cpp:150
 msgid "* Sound:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:211
+#: src/frontend/mame/ui/devopt.cpp:214
 #, c-format
 msgid ""
 "* BIOS settings:\n"
 "  %1$d options    [default: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:255 src/frontend/mame/ui/devopt.cpp:271
-#: src/frontend/mame/ui/devopt.cpp:332
+#: src/frontend/mame/ui/devopt.cpp:258 src/frontend/mame/ui/devopt.cpp:274
+#: src/frontend/mame/ui/devopt.cpp:335
 #, c-format
 msgid "  %1$s    [default: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:260 src/frontend/mame/ui/devopt.cpp:276
+#: src/frontend/mame/ui/devopt.cpp:263 src/frontend/mame/ui/devopt.cpp:279
 #, c-format
 msgid "  %1$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:282
+#: src/frontend/mame/ui/devopt.cpp:285
 msgid "* DIP switch settings:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:287
+#: src/frontend/mame/ui/devopt.cpp:290
 msgid "* Configuration settings:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:291
+#: src/frontend/mame/ui/devopt.cpp:294
 msgid "* Input device(s):\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:293
+#: src/frontend/mame/ui/devopt.cpp:296
 #, c-format
 msgid "  User inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:295
+#: src/frontend/mame/ui/devopt.cpp:298
 #, c-format
 msgid "  Mahjong inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:297
+#: src/frontend/mame/ui/devopt.cpp:300
 #, c-format
 msgid "  Hanafuda inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:299
+#: src/frontend/mame/ui/devopt.cpp:302
 #, c-format
 msgid "  Gambling inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:301
+#: src/frontend/mame/ui/devopt.cpp:304
 #, c-format
 msgid "  Analog inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:303
+#: src/frontend/mame/ui/devopt.cpp:306
 #, c-format
 msgid "  Adjuster inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:305
+#: src/frontend/mame/ui/devopt.cpp:308
 #, c-format
 msgid "  Keypad inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:307
+#: src/frontend/mame/ui/devopt.cpp:310
 #, c-format
 msgid "  Keyboard inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:312
+#: src/frontend/mame/ui/devopt.cpp:315
 msgid "* Media Options:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:317
+#: src/frontend/mame/ui/devopt.cpp:320
 #, c-format
 msgid "  %1$s    [tag: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:327
+#: src/frontend/mame/ui/devopt.cpp:330
 msgid "* Slot Options:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:341
+#: src/frontend/mame/ui/devopt.cpp:344
 msgid "[None]\n"
 msgstr ""
 
-#: src/emu/render.cpp:1847
+#: src/emu/render.cpp:1796
 #, c-format
 msgctxt "view-name"
 msgid "Screen %1$u Standard (%2$u:%3$u)"
 msgstr ""
 
-#: src/emu/render.cpp:1873
+#: src/emu/render.cpp:1822
 #, c-format
 msgctxt "view-name"
 msgid "Screen %1$u Pixel Aspect (%2$u:%3$u)"
 msgstr ""
 
-#: src/emu/render.cpp:1895 src/emu/render.cpp:2030
+#: src/emu/render.cpp:1844 src/emu/render.cpp:1979
 msgctxt "view-name"
 msgid "Cocktail"
 msgstr ""
 
-#: src/emu/render.cpp:2015
+#: src/emu/render.cpp:1964
 msgctxt "view-name"
 msgid "Left-to-Right"
 msgstr ""
 
-#: src/emu/render.cpp:2016
+#: src/emu/render.cpp:1965
 msgctxt "view-name"
 msgid "Left-to-Right (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2017
+#: src/emu/render.cpp:1966
 msgctxt "view-name"
 msgid "Top-to-Bottom"
 msgstr ""
 
-#: src/emu/render.cpp:2018
+#: src/emu/render.cpp:1967
 msgctxt "view-name"
 msgid "Top-to-Bottom (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2069
+#: src/emu/render.cpp:2018
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Left-to-Right, Top-to-Bottom"
 msgstr ""
 
-#: src/emu/render.cpp:2078
+#: src/emu/render.cpp:2027
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Left-to-Right, Top-to-Bottom (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2087
+#: src/emu/render.cpp:2036
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Top-to-Bottom, Left-to-Right"
 msgstr ""
 
-#: src/emu/render.cpp:2096
+#: src/emu/render.cpp:2045
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Top-to-Bottom, Left-to-Right (Gapless)"
 msgstr ""
 
-#: src/emu/inpttype.ipp:22
+#: src/emu/ioport.cpp:332
+#, c-format
 msgctxt "input-name"
-msgid "P1 Up"
+msgid "P%1$u"
 msgstr ""
 
-#: src/emu/inpttype.ipp:23
+#: src/emu/ioport.cpp:1924
 msgctxt "input-name"
-msgid "P1 Down"
+msgid "???"
 msgstr ""
 
-#: src/emu/inpttype.ipp:24
+#: src/emu/inpttype.ipp:22 src/emu/inpttype.ipp:140 src/emu/inpttype.ipp:221
+#: src/emu/inpttype.ipp:255 src/emu/inpttype.ipp:289 src/emu/inpttype.ipp:323
+#: src/emu/inpttype.ipp:357 src/emu/inpttype.ipp:391 src/emu/inpttype.ipp:425
+#: src/emu/inpttype.ipp:459
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left"
+msgid "%p Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:25
+#: src/emu/inpttype.ipp:23 src/emu/inpttype.ipp:141 src/emu/inpttype.ipp:222
+#: src/emu/inpttype.ipp:256 src/emu/inpttype.ipp:290 src/emu/inpttype.ipp:324
+#: src/emu/inpttype.ipp:358 src/emu/inpttype.ipp:392 src/emu/inpttype.ipp:426
+#: src/emu/inpttype.ipp:460
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right"
+msgid "%p Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:26
+#: src/emu/inpttype.ipp:24 src/emu/inpttype.ipp:142 src/emu/inpttype.ipp:223
+#: src/emu/inpttype.ipp:257 src/emu/inpttype.ipp:291 src/emu/inpttype.ipp:325
+#: src/emu/inpttype.ipp:359 src/emu/inpttype.ipp:393 src/emu/inpttype.ipp:427
+#: src/emu/inpttype.ipp:461
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Up"
+msgid "%p Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:27
+#: src/emu/inpttype.ipp:25 src/emu/inpttype.ipp:143 src/emu/inpttype.ipp:224
+#: src/emu/inpttype.ipp:258 src/emu/inpttype.ipp:292 src/emu/inpttype.ipp:326
+#: src/emu/inpttype.ipp:360 src/emu/inpttype.ipp:394 src/emu/inpttype.ipp:428
+#: src/emu/inpttype.ipp:462
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Down"
+msgid "%p Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:28
+#: src/emu/inpttype.ipp:26 src/emu/inpttype.ipp:144 src/emu/inpttype.ipp:225
+#: src/emu/inpttype.ipp:259 src/emu/inpttype.ipp:293 src/emu/inpttype.ipp:327
+#: src/emu/inpttype.ipp:361 src/emu/inpttype.ipp:395 src/emu/inpttype.ipp:429
+#: src/emu/inpttype.ipp:463
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Left"
+msgid "%p Right Stick/Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:29
+#: src/emu/inpttype.ipp:27 src/emu/inpttype.ipp:145 src/emu/inpttype.ipp:226
+#: src/emu/inpttype.ipp:260 src/emu/inpttype.ipp:294 src/emu/inpttype.ipp:328
+#: src/emu/inpttype.ipp:362 src/emu/inpttype.ipp:396 src/emu/inpttype.ipp:430
+#: src/emu/inpttype.ipp:464
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Right"
+msgid "%p Right Stick/Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:30
+#: src/emu/inpttype.ipp:28 src/emu/inpttype.ipp:146 src/emu/inpttype.ipp:227
+#: src/emu/inpttype.ipp:261 src/emu/inpttype.ipp:295 src/emu/inpttype.ipp:329
+#: src/emu/inpttype.ipp:363 src/emu/inpttype.ipp:397 src/emu/inpttype.ipp:431
+#: src/emu/inpttype.ipp:465
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Up"
+msgid "%p Right Stick/Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:31
+#: src/emu/inpttype.ipp:29 src/emu/inpttype.ipp:147 src/emu/inpttype.ipp:228
+#: src/emu/inpttype.ipp:262 src/emu/inpttype.ipp:296 src/emu/inpttype.ipp:330
+#: src/emu/inpttype.ipp:364 src/emu/inpttype.ipp:398 src/emu/inpttype.ipp:432
+#: src/emu/inpttype.ipp:466
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Down"
+msgid "%p Right Stick/Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:32
+#: src/emu/inpttype.ipp:30 src/emu/inpttype.ipp:148 src/emu/inpttype.ipp:229
+#: src/emu/inpttype.ipp:263 src/emu/inpttype.ipp:297 src/emu/inpttype.ipp:331
+#: src/emu/inpttype.ipp:365 src/emu/inpttype.ipp:399 src/emu/inpttype.ipp:433
+#: src/emu/inpttype.ipp:467
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Left"
+msgid "%p Left Stick/Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:33
+#: src/emu/inpttype.ipp:31 src/emu/inpttype.ipp:149 src/emu/inpttype.ipp:230
+#: src/emu/inpttype.ipp:264 src/emu/inpttype.ipp:298 src/emu/inpttype.ipp:332
+#: src/emu/inpttype.ipp:366 src/emu/inpttype.ipp:400 src/emu/inpttype.ipp:434
+#: src/emu/inpttype.ipp:468
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Right"
+msgid "%p Left Stick/Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:34
+#: src/emu/inpttype.ipp:32 src/emu/inpttype.ipp:150 src/emu/inpttype.ipp:231
+#: src/emu/inpttype.ipp:265 src/emu/inpttype.ipp:299 src/emu/inpttype.ipp:333
+#: src/emu/inpttype.ipp:367 src/emu/inpttype.ipp:401 src/emu/inpttype.ipp:435
+#: src/emu/inpttype.ipp:469
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 1"
+msgid "%p Left Stick/Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:35
+#: src/emu/inpttype.ipp:33 src/emu/inpttype.ipp:151 src/emu/inpttype.ipp:232
+#: src/emu/inpttype.ipp:266 src/emu/inpttype.ipp:300 src/emu/inpttype.ipp:334
+#: src/emu/inpttype.ipp:368 src/emu/inpttype.ipp:402 src/emu/inpttype.ipp:436
+#: src/emu/inpttype.ipp:470
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 2"
+msgid "%p Left Stick/Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:36
+#: src/emu/inpttype.ipp:34 src/emu/inpttype.ipp:152 src/emu/inpttype.ipp:233
+#: src/emu/inpttype.ipp:267 src/emu/inpttype.ipp:301 src/emu/inpttype.ipp:335
+#: src/emu/inpttype.ipp:369 src/emu/inpttype.ipp:403 src/emu/inpttype.ipp:437
+#: src/emu/inpttype.ipp:471
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 3"
+msgid "%p Button 1"
 msgstr ""
 
-#: src/emu/inpttype.ipp:37
+#: src/emu/inpttype.ipp:35 src/emu/inpttype.ipp:153 src/emu/inpttype.ipp:234
+#: src/emu/inpttype.ipp:268 src/emu/inpttype.ipp:302 src/emu/inpttype.ipp:336
+#: src/emu/inpttype.ipp:370 src/emu/inpttype.ipp:404 src/emu/inpttype.ipp:438
+#: src/emu/inpttype.ipp:472
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 4"
+msgid "%p Button 2"
 msgstr ""
 
-#: src/emu/inpttype.ipp:38
+#: src/emu/inpttype.ipp:36 src/emu/inpttype.ipp:154 src/emu/inpttype.ipp:235
+#: src/emu/inpttype.ipp:269 src/emu/inpttype.ipp:303 src/emu/inpttype.ipp:337
+#: src/emu/inpttype.ipp:371 src/emu/inpttype.ipp:405 src/emu/inpttype.ipp:439
+#: src/emu/inpttype.ipp:473
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 5"
+msgid "%p Button 3"
 msgstr ""
 
-#: src/emu/inpttype.ipp:39
+#: src/emu/inpttype.ipp:37 src/emu/inpttype.ipp:155 src/emu/inpttype.ipp:236
+#: src/emu/inpttype.ipp:270 src/emu/inpttype.ipp:304 src/emu/inpttype.ipp:338
+#: src/emu/inpttype.ipp:372 src/emu/inpttype.ipp:406 src/emu/inpttype.ipp:440
+#: src/emu/inpttype.ipp:474
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 6"
+msgid "%p Button 4"
 msgstr ""
 
-#: src/emu/inpttype.ipp:40
+#: src/emu/inpttype.ipp:38 src/emu/inpttype.ipp:156 src/emu/inpttype.ipp:237
+#: src/emu/inpttype.ipp:271 src/emu/inpttype.ipp:305 src/emu/inpttype.ipp:339
+#: src/emu/inpttype.ipp:373 src/emu/inpttype.ipp:407 src/emu/inpttype.ipp:441
+#: src/emu/inpttype.ipp:475
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 7"
+msgid "%p Button 5"
 msgstr ""
 
-#: src/emu/inpttype.ipp:41
+#: src/emu/inpttype.ipp:39 src/emu/inpttype.ipp:157 src/emu/inpttype.ipp:238
+#: src/emu/inpttype.ipp:272 src/emu/inpttype.ipp:306 src/emu/inpttype.ipp:340
+#: src/emu/inpttype.ipp:374 src/emu/inpttype.ipp:408 src/emu/inpttype.ipp:442
+#: src/emu/inpttype.ipp:476
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 8"
+msgid "%p Button 6"
 msgstr ""
 
-#: src/emu/inpttype.ipp:42
+#: src/emu/inpttype.ipp:40 src/emu/inpttype.ipp:158 src/emu/inpttype.ipp:239
+#: src/emu/inpttype.ipp:273 src/emu/inpttype.ipp:307 src/emu/inpttype.ipp:341
+#: src/emu/inpttype.ipp:375 src/emu/inpttype.ipp:409 src/emu/inpttype.ipp:443
+#: src/emu/inpttype.ipp:477
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 9"
+msgid "%p Button 7"
 msgstr ""
 
-#: src/emu/inpttype.ipp:43
+#: src/emu/inpttype.ipp:41 src/emu/inpttype.ipp:159 src/emu/inpttype.ipp:240
+#: src/emu/inpttype.ipp:274 src/emu/inpttype.ipp:308 src/emu/inpttype.ipp:342
+#: src/emu/inpttype.ipp:376 src/emu/inpttype.ipp:410 src/emu/inpttype.ipp:444
+#: src/emu/inpttype.ipp:478
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 10"
+msgid "%p Button 8"
 msgstr ""
 
-#: src/emu/inpttype.ipp:44
+#: src/emu/inpttype.ipp:42 src/emu/inpttype.ipp:160 src/emu/inpttype.ipp:241
+#: src/emu/inpttype.ipp:275 src/emu/inpttype.ipp:309 src/emu/inpttype.ipp:343
+#: src/emu/inpttype.ipp:377 src/emu/inpttype.ipp:411 src/emu/inpttype.ipp:445
+#: src/emu/inpttype.ipp:479
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 11"
+msgid "%p Button 9"
 msgstr ""
 
-#: src/emu/inpttype.ipp:45
+#: src/emu/inpttype.ipp:43 src/emu/inpttype.ipp:161 src/emu/inpttype.ipp:242
+#: src/emu/inpttype.ipp:276 src/emu/inpttype.ipp:310 src/emu/inpttype.ipp:344
+#: src/emu/inpttype.ipp:378 src/emu/inpttype.ipp:412 src/emu/inpttype.ipp:446
+#: src/emu/inpttype.ipp:480
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 12"
+msgid "%p Button 10"
 msgstr ""
 
-#: src/emu/inpttype.ipp:46
+#: src/emu/inpttype.ipp:44 src/emu/inpttype.ipp:162 src/emu/inpttype.ipp:243
+#: src/emu/inpttype.ipp:277 src/emu/inpttype.ipp:311 src/emu/inpttype.ipp:345
+#: src/emu/inpttype.ipp:379 src/emu/inpttype.ipp:413 src/emu/inpttype.ipp:447
+#: src/emu/inpttype.ipp:481
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 13"
+msgid "%p Button 11"
 msgstr ""
 
-#: src/emu/inpttype.ipp:47
+#: src/emu/inpttype.ipp:45 src/emu/inpttype.ipp:163 src/emu/inpttype.ipp:244
+#: src/emu/inpttype.ipp:278 src/emu/inpttype.ipp:312 src/emu/inpttype.ipp:346
+#: src/emu/inpttype.ipp:380 src/emu/inpttype.ipp:414 src/emu/inpttype.ipp:448
+#: src/emu/inpttype.ipp:482
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 14"
+msgid "%p Button 12"
 msgstr ""
 
-#: src/emu/inpttype.ipp:48
+#: src/emu/inpttype.ipp:46 src/emu/inpttype.ipp:164 src/emu/inpttype.ipp:245
+#: src/emu/inpttype.ipp:279 src/emu/inpttype.ipp:313 src/emu/inpttype.ipp:347
+#: src/emu/inpttype.ipp:381 src/emu/inpttype.ipp:415 src/emu/inpttype.ipp:449
+#: src/emu/inpttype.ipp:483
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 15"
+msgid "%p Button 13"
 msgstr ""
 
-#: src/emu/inpttype.ipp:49
+#: src/emu/inpttype.ipp:47 src/emu/inpttype.ipp:165 src/emu/inpttype.ipp:246
+#: src/emu/inpttype.ipp:280 src/emu/inpttype.ipp:314 src/emu/inpttype.ipp:348
+#: src/emu/inpttype.ipp:382 src/emu/inpttype.ipp:416 src/emu/inpttype.ipp:450
+#: src/emu/inpttype.ipp:484
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 16"
+msgid "%p Button 14"
 msgstr ""
 
-#: src/emu/inpttype.ipp:50
+#: src/emu/inpttype.ipp:48 src/emu/inpttype.ipp:166 src/emu/inpttype.ipp:247
+#: src/emu/inpttype.ipp:281 src/emu/inpttype.ipp:315 src/emu/inpttype.ipp:349
+#: src/emu/inpttype.ipp:383 src/emu/inpttype.ipp:417 src/emu/inpttype.ipp:451
+#: src/emu/inpttype.ipp:485
+#, c-format
 msgctxt "input-name"
-msgid "P1 Start"
+msgid "%p Button 15"
 msgstr ""
 
-#: src/emu/inpttype.ipp:51
+#: src/emu/inpttype.ipp:49 src/emu/inpttype.ipp:167 src/emu/inpttype.ipp:248
+#: src/emu/inpttype.ipp:282 src/emu/inpttype.ipp:316 src/emu/inpttype.ipp:350
+#: src/emu/inpttype.ipp:384 src/emu/inpttype.ipp:418 src/emu/inpttype.ipp:452
+#: src/emu/inpttype.ipp:486
+#, c-format
 msgctxt "input-name"
-msgid "P1 Select"
+msgid "%p Button 16"
 msgstr ""
 
-#: src/emu/inpttype.ipp:56
+#: src/emu/inpttype.ipp:50 src/emu/inpttype.ipp:168 src/emu/inpttype.ipp:249
+#: src/emu/inpttype.ipp:283 src/emu/inpttype.ipp:317 src/emu/inpttype.ipp:351
+#: src/emu/inpttype.ipp:385 src/emu/inpttype.ipp:419 src/emu/inpttype.ipp:453
+#: src/emu/inpttype.ipp:487
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong A"
+msgid "%p Start"
 msgstr ""
 
-#: src/emu/inpttype.ipp:57
+#: src/emu/inpttype.ipp:51 src/emu/inpttype.ipp:169 src/emu/inpttype.ipp:250
+#: src/emu/inpttype.ipp:284 src/emu/inpttype.ipp:318 src/emu/inpttype.ipp:352
+#: src/emu/inpttype.ipp:386 src/emu/inpttype.ipp:420 src/emu/inpttype.ipp:454
+#: src/emu/inpttype.ipp:488
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong B"
+msgid "%p Select"
 msgstr ""
 
-#: src/emu/inpttype.ipp:58
+#: src/emu/inpttype.ipp:56 src/emu/inpttype.ipp:174
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong C"
+msgid "%p Mahjong A"
 msgstr ""
 
-#: src/emu/inpttype.ipp:59
+#: src/emu/inpttype.ipp:57 src/emu/inpttype.ipp:175
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong D"
+msgid "%p Mahjong B"
 msgstr ""
 
-#: src/emu/inpttype.ipp:60
+#: src/emu/inpttype.ipp:58 src/emu/inpttype.ipp:176
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong E"
+msgid "%p Mahjong C"
 msgstr ""
 
-#: src/emu/inpttype.ipp:61
+#: src/emu/inpttype.ipp:59 src/emu/inpttype.ipp:177
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong F"
+msgid "%p Mahjong D"
 msgstr ""
 
-#: src/emu/inpttype.ipp:62
+#: src/emu/inpttype.ipp:60 src/emu/inpttype.ipp:178
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong G"
+msgid "%p Mahjong E"
 msgstr ""
 
-#: src/emu/inpttype.ipp:63
+#: src/emu/inpttype.ipp:61 src/emu/inpttype.ipp:179
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong H"
+msgid "%p Mahjong F"
 msgstr ""
 
-#: src/emu/inpttype.ipp:64
+#: src/emu/inpttype.ipp:62 src/emu/inpttype.ipp:180
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong I"
+msgid "%p Mahjong G"
 msgstr ""
 
-#: src/emu/inpttype.ipp:65
+#: src/emu/inpttype.ipp:63 src/emu/inpttype.ipp:181
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong J"
+msgid "%p Mahjong H"
 msgstr ""
 
-#: src/emu/inpttype.ipp:66
+#: src/emu/inpttype.ipp:64 src/emu/inpttype.ipp:182
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong K"
+msgid "%p Mahjong I"
 msgstr ""
 
-#: src/emu/inpttype.ipp:67
+#: src/emu/inpttype.ipp:65 src/emu/inpttype.ipp:183
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong L"
+msgid "%p Mahjong J"
 msgstr ""
 
-#: src/emu/inpttype.ipp:68
+#: src/emu/inpttype.ipp:66 src/emu/inpttype.ipp:184
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong M"
+msgid "%p Mahjong K"
 msgstr ""
 
-#: src/emu/inpttype.ipp:69
+#: src/emu/inpttype.ipp:67 src/emu/inpttype.ipp:185
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong N"
+msgid "%p Mahjong L"
 msgstr ""
 
-#: src/emu/inpttype.ipp:70
+#: src/emu/inpttype.ipp:68 src/emu/inpttype.ipp:186
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong O"
+msgid "%p Mahjong M"
 msgstr ""
 
-#: src/emu/inpttype.ipp:71
+#: src/emu/inpttype.ipp:69 src/emu/inpttype.ipp:187
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong P"
+msgid "%p Mahjong N"
 msgstr ""
 
-#: src/emu/inpttype.ipp:72
+#: src/emu/inpttype.ipp:70 src/emu/inpttype.ipp:188
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Q"
+msgid "%p Mahjong O"
 msgstr ""
 
-#: src/emu/inpttype.ipp:73
+#: src/emu/inpttype.ipp:71 src/emu/inpttype.ipp:189
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Kan"
+msgid "%p Mahjong P"
 msgstr ""
 
-#: src/emu/inpttype.ipp:74
+#: src/emu/inpttype.ipp:72 src/emu/inpttype.ipp:190
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Pon"
+msgid "%p Mahjong Q"
 msgstr ""
 
-#: src/emu/inpttype.ipp:75
+#: src/emu/inpttype.ipp:73 src/emu/inpttype.ipp:191
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Chi"
+msgid "%p Mahjong Kan"
 msgstr ""
 
-#: src/emu/inpttype.ipp:76
+#: src/emu/inpttype.ipp:74 src/emu/inpttype.ipp:192
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Reach"
+msgid "%p Mahjong Pon"
 msgstr ""
 
-#: src/emu/inpttype.ipp:77
+#: src/emu/inpttype.ipp:75 src/emu/inpttype.ipp:193
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Ron"
+msgid "%p Mahjong Chi"
 msgstr ""
 
-#: src/emu/inpttype.ipp:78
+#: src/emu/inpttype.ipp:76 src/emu/inpttype.ipp:194
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Flip Flop"
+msgid "%p Mahjong Reach"
 msgstr ""
 
-#: src/emu/inpttype.ipp:79
+#: src/emu/inpttype.ipp:77 src/emu/inpttype.ipp:195
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Bet"
+msgid "%p Mahjong Ron"
 msgstr ""
 
-#: src/emu/inpttype.ipp:80
+#: src/emu/inpttype.ipp:78 src/emu/inpttype.ipp:200
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Take Score"
+msgid "%p Mahjong Flip Flop"
 msgstr ""
 
-#: src/emu/inpttype.ipp:81
+#: src/emu/inpttype.ipp:79 src/emu/inpttype.ipp:196
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Double Up"
+msgid "%p Mahjong Bet"
 msgstr ""
 
-#: src/emu/inpttype.ipp:82
+#: src/emu/inpttype.ipp:80 src/emu/inpttype.ipp:198
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Big"
+msgid "%p Mahjong Take Score"
 msgstr ""
 
-#: src/emu/inpttype.ipp:83
+#: src/emu/inpttype.ipp:81 src/emu/inpttype.ipp:199
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Small"
+msgid "%p Mahjong Double Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:84
+#: src/emu/inpttype.ipp:82 src/emu/inpttype.ipp:201
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Last Chance"
+msgid "%p Mahjong Big"
 msgstr ""
 
-#: src/emu/inpttype.ipp:89
+#: src/emu/inpttype.ipp:83 src/emu/inpttype.ipp:202
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda A/1"
+msgid "%p Mahjong Small"
 msgstr ""
 
-#: src/emu/inpttype.ipp:90
+#: src/emu/inpttype.ipp:84 src/emu/inpttype.ipp:197
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda B/2"
+msgid "%p Mahjong Last Chance"
 msgstr ""
 
-#: src/emu/inpttype.ipp:91
+#: src/emu/inpttype.ipp:89 src/emu/inpttype.ipp:207
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda C/3"
+msgid "%p Hanafuda A/1"
 msgstr ""
 
-#: src/emu/inpttype.ipp:92
+#: src/emu/inpttype.ipp:90 src/emu/inpttype.ipp:208
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda D/4"
+msgid "%p Hanafuda B/2"
 msgstr ""
 
-#: src/emu/inpttype.ipp:93
+#: src/emu/inpttype.ipp:91 src/emu/inpttype.ipp:209
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda E/5"
+msgid "%p Hanafuda C/3"
 msgstr ""
 
-#: src/emu/inpttype.ipp:94
+#: src/emu/inpttype.ipp:92 src/emu/inpttype.ipp:210
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda F/6"
+msgid "%p Hanafuda D/4"
 msgstr ""
 
-#: src/emu/inpttype.ipp:95
+#: src/emu/inpttype.ipp:93 src/emu/inpttype.ipp:211
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda G/7"
+msgid "%p Hanafuda E/5"
 msgstr ""
 
-#: src/emu/inpttype.ipp:96
+#: src/emu/inpttype.ipp:94 src/emu/inpttype.ipp:212
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda H/8"
+msgid "%p Hanafuda F/6"
 msgstr ""
 
-#: src/emu/inpttype.ipp:97
+#: src/emu/inpttype.ipp:95 src/emu/inpttype.ipp:213
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda Yes"
+msgid "%p Hanafuda G/7"
 msgstr ""
 
-#: src/emu/inpttype.ipp:98
+#: src/emu/inpttype.ipp:96 src/emu/inpttype.ipp:214
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda No"
+msgid "%p Hanafuda H/8"
+msgstr ""
+
+#: src/emu/inpttype.ipp:97 src/emu/inpttype.ipp:215
+#, c-format
+msgctxt "input-name"
+msgid "%p Hanafuda Yes"
+msgstr ""
+
+#: src/emu/inpttype.ipp:98 src/emu/inpttype.ipp:216
+#, c-format
+msgctxt "input-name"
+msgid "%p Hanafuda No"
 msgstr ""
 
 #: src/emu/inpttype.ipp:103
@@ -3752,1551 +3926,6 @@ msgctxt "input-name"
 msgid "Stop All Reels"
 msgstr ""
 
-#: src/emu/inpttype.ipp:140
-msgctxt "input-name"
-msgid "P2 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:141
-msgctxt "input-name"
-msgid "P2 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:142
-msgctxt "input-name"
-msgid "P2 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:143
-msgctxt "input-name"
-msgid "P2 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:144
-msgctxt "input-name"
-msgid "P2 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:145
-msgctxt "input-name"
-msgid "P2 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:146
-msgctxt "input-name"
-msgid "P2 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:147
-msgctxt "input-name"
-msgid "P2 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:148
-msgctxt "input-name"
-msgid "P2 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:149
-msgctxt "input-name"
-msgid "P2 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:150
-msgctxt "input-name"
-msgid "P2 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:151
-msgctxt "input-name"
-msgid "P2 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:152
-msgctxt "input-name"
-msgid "P2 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:153
-msgctxt "input-name"
-msgid "P2 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:154
-msgctxt "input-name"
-msgid "P2 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:155
-msgctxt "input-name"
-msgid "P2 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:156
-msgctxt "input-name"
-msgid "P2 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:157
-msgctxt "input-name"
-msgid "P2 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:158
-msgctxt "input-name"
-msgid "P2 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:159
-msgctxt "input-name"
-msgid "P2 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:160
-msgctxt "input-name"
-msgid "P2 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:161
-msgctxt "input-name"
-msgid "P2 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:162
-msgctxt "input-name"
-msgid "P2 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:163
-msgctxt "input-name"
-msgid "P2 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:164
-msgctxt "input-name"
-msgid "P2 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:165
-msgctxt "input-name"
-msgid "P2 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:166
-msgctxt "input-name"
-msgid "P2 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:167
-msgctxt "input-name"
-msgid "P2 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:168
-msgctxt "input-name"
-msgid "P2 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:169
-msgctxt "input-name"
-msgid "P2 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:174
-msgctxt "input-name"
-msgid "P2 Mahjong A"
-msgstr ""
-
-#: src/emu/inpttype.ipp:175
-msgctxt "input-name"
-msgid "P2 Mahjong B"
-msgstr ""
-
-#: src/emu/inpttype.ipp:176
-msgctxt "input-name"
-msgid "P2 Mahjong C"
-msgstr ""
-
-#: src/emu/inpttype.ipp:177
-msgctxt "input-name"
-msgid "P2 Mahjong D"
-msgstr ""
-
-#: src/emu/inpttype.ipp:178
-msgctxt "input-name"
-msgid "P2 Mahjong E"
-msgstr ""
-
-#: src/emu/inpttype.ipp:179
-msgctxt "input-name"
-msgid "P2 Mahjong F"
-msgstr ""
-
-#: src/emu/inpttype.ipp:180
-msgctxt "input-name"
-msgid "P2 Mahjong G"
-msgstr ""
-
-#: src/emu/inpttype.ipp:181
-msgctxt "input-name"
-msgid "P2 Mahjong H"
-msgstr ""
-
-#: src/emu/inpttype.ipp:182
-msgctxt "input-name"
-msgid "P2 Mahjong I"
-msgstr ""
-
-#: src/emu/inpttype.ipp:183
-msgctxt "input-name"
-msgid "P2 Mahjong J"
-msgstr ""
-
-#: src/emu/inpttype.ipp:184
-msgctxt "input-name"
-msgid "P2 Mahjong K"
-msgstr ""
-
-#: src/emu/inpttype.ipp:185
-msgctxt "input-name"
-msgid "P2 Mahjong L"
-msgstr ""
-
-#: src/emu/inpttype.ipp:186
-msgctxt "input-name"
-msgid "P2 Mahjong M"
-msgstr ""
-
-#: src/emu/inpttype.ipp:187
-msgctxt "input-name"
-msgid "P2 Mahjong N"
-msgstr ""
-
-#: src/emu/inpttype.ipp:188
-msgctxt "input-name"
-msgid "P2 Mahjong O"
-msgstr ""
-
-#: src/emu/inpttype.ipp:189
-msgctxt "input-name"
-msgid "P2 Mahjong P"
-msgstr ""
-
-#: src/emu/inpttype.ipp:190
-msgctxt "input-name"
-msgid "P2 Mahjong Q"
-msgstr ""
-
-#: src/emu/inpttype.ipp:191
-msgctxt "input-name"
-msgid "P2 Mahjong Kan"
-msgstr ""
-
-#: src/emu/inpttype.ipp:192
-msgctxt "input-name"
-msgid "P2 Mahjong Pon"
-msgstr ""
-
-#: src/emu/inpttype.ipp:193
-msgctxt "input-name"
-msgid "P2 Mahjong Chi"
-msgstr ""
-
-#: src/emu/inpttype.ipp:194
-msgctxt "input-name"
-msgid "P2 Mahjong Reach"
-msgstr ""
-
-#: src/emu/inpttype.ipp:195
-msgctxt "input-name"
-msgid "P2 Mahjong Ron"
-msgstr ""
-
-#: src/emu/inpttype.ipp:196
-msgctxt "input-name"
-msgid "P2 Mahjong Bet"
-msgstr ""
-
-#: src/emu/inpttype.ipp:197
-msgctxt "input-name"
-msgid "P2 Mahjong Last Chance"
-msgstr ""
-
-#: src/emu/inpttype.ipp:198
-msgctxt "input-name"
-msgid "P2 Mahjong Take Score"
-msgstr ""
-
-#: src/emu/inpttype.ipp:199
-msgctxt "input-name"
-msgid "P2 Mahjong Double Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:200
-msgctxt "input-name"
-msgid "P2 Mahjong Flip Flop"
-msgstr ""
-
-#: src/emu/inpttype.ipp:201
-msgctxt "input-name"
-msgid "P2 Mahjong Big"
-msgstr ""
-
-#: src/emu/inpttype.ipp:202
-msgctxt "input-name"
-msgid "P2 Mahjong Small"
-msgstr ""
-
-#: src/emu/inpttype.ipp:207
-msgctxt "input-name"
-msgid "P2 Hanafuda A/1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:208
-msgctxt "input-name"
-msgid "P2 Hanafuda B/2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:209
-msgctxt "input-name"
-msgid "P2 Hanafuda C/3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:210
-msgctxt "input-name"
-msgid "P2 Hanafuda D/4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:211
-msgctxt "input-name"
-msgid "P2 Hanafuda E/5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:212
-msgctxt "input-name"
-msgid "P2 Hanafuda F/6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:213
-msgctxt "input-name"
-msgid "P2 Hanafuda G/7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:214
-msgctxt "input-name"
-msgid "P2 Hanafuda H/8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:215
-msgctxt "input-name"
-msgid "P2 Hanafuda Yes"
-msgstr ""
-
-#: src/emu/inpttype.ipp:216
-msgctxt "input-name"
-msgid "P2 Hanafuda No"
-msgstr ""
-
-#: src/emu/inpttype.ipp:221
-msgctxt "input-name"
-msgid "P3 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:222
-msgctxt "input-name"
-msgid "P3 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:223
-msgctxt "input-name"
-msgid "P3 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:224
-msgctxt "input-name"
-msgid "P3 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:225
-msgctxt "input-name"
-msgid "P3 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:226
-msgctxt "input-name"
-msgid "P3 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:227
-msgctxt "input-name"
-msgid "P3 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:228
-msgctxt "input-name"
-msgid "P3 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:229
-msgctxt "input-name"
-msgid "P3 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:230
-msgctxt "input-name"
-msgid "P3 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:231
-msgctxt "input-name"
-msgid "P3 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:232
-msgctxt "input-name"
-msgid "P3 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:233
-msgctxt "input-name"
-msgid "P3 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:234
-msgctxt "input-name"
-msgid "P3 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:235
-msgctxt "input-name"
-msgid "P3 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:236
-msgctxt "input-name"
-msgid "P3 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:237
-msgctxt "input-name"
-msgid "P3 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:238
-msgctxt "input-name"
-msgid "P3 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:239
-msgctxt "input-name"
-msgid "P3 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:240
-msgctxt "input-name"
-msgid "P3 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:241
-msgctxt "input-name"
-msgid "P3 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:242
-msgctxt "input-name"
-msgid "P3 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:243
-msgctxt "input-name"
-msgid "P3 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:244
-msgctxt "input-name"
-msgid "P3 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:245
-msgctxt "input-name"
-msgid "P3 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:246
-msgctxt "input-name"
-msgid "P3 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:247
-msgctxt "input-name"
-msgid "P3 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:248
-msgctxt "input-name"
-msgid "P3 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:249
-msgctxt "input-name"
-msgid "P3 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:250
-msgctxt "input-name"
-msgid "P3 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:255
-msgctxt "input-name"
-msgid "P4 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:256
-msgctxt "input-name"
-msgid "P4 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:257
-msgctxt "input-name"
-msgid "P4 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:258
-msgctxt "input-name"
-msgid "P4 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:259
-msgctxt "input-name"
-msgid "P4 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:260
-msgctxt "input-name"
-msgid "P4 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:261
-msgctxt "input-name"
-msgid "P4 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:262
-msgctxt "input-name"
-msgid "P4 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:263
-msgctxt "input-name"
-msgid "P4 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:264
-msgctxt "input-name"
-msgid "P4 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:265
-msgctxt "input-name"
-msgid "P4 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:266
-msgctxt "input-name"
-msgid "P4 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:267
-msgctxt "input-name"
-msgid "P4 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:268
-msgctxt "input-name"
-msgid "P4 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:269
-msgctxt "input-name"
-msgid "P4 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:270
-msgctxt "input-name"
-msgid "P4 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:271
-msgctxt "input-name"
-msgid "P4 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:272
-msgctxt "input-name"
-msgid "P4 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:273
-msgctxt "input-name"
-msgid "P4 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:274
-msgctxt "input-name"
-msgid "P4 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:275
-msgctxt "input-name"
-msgid "P4 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:276
-msgctxt "input-name"
-msgid "P4 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:277
-msgctxt "input-name"
-msgid "P4 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:278
-msgctxt "input-name"
-msgid "P4 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:279
-msgctxt "input-name"
-msgid "P4 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:280
-msgctxt "input-name"
-msgid "P4 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:281
-msgctxt "input-name"
-msgid "P4 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:282
-msgctxt "input-name"
-msgid "P4 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:283
-msgctxt "input-name"
-msgid "P4 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:284
-msgctxt "input-name"
-msgid "P4 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:289
-msgctxt "input-name"
-msgid "P5 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:290
-msgctxt "input-name"
-msgid "P5 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:291
-msgctxt "input-name"
-msgid "P5 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:292
-msgctxt "input-name"
-msgid "P5 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:293
-msgctxt "input-name"
-msgid "P5 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:294
-msgctxt "input-name"
-msgid "P5 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:295
-msgctxt "input-name"
-msgid "P5 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:296
-msgctxt "input-name"
-msgid "P5 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:297
-msgctxt "input-name"
-msgid "P5 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:298
-msgctxt "input-name"
-msgid "P5 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:299
-msgctxt "input-name"
-msgid "P5 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:300
-msgctxt "input-name"
-msgid "P5 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:301
-msgctxt "input-name"
-msgid "P5 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:302
-msgctxt "input-name"
-msgid "P5 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:303
-msgctxt "input-name"
-msgid "P5 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:304
-msgctxt "input-name"
-msgid "P5 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:305
-msgctxt "input-name"
-msgid "P5 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:306
-msgctxt "input-name"
-msgid "P5 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:307
-msgctxt "input-name"
-msgid "P5 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:308
-msgctxt "input-name"
-msgid "P5 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:309
-msgctxt "input-name"
-msgid "P5 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:310
-msgctxt "input-name"
-msgid "P5 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:311
-msgctxt "input-name"
-msgid "P5 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:312
-msgctxt "input-name"
-msgid "P5 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:313
-msgctxt "input-name"
-msgid "P5 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:314
-msgctxt "input-name"
-msgid "P5 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:315
-msgctxt "input-name"
-msgid "P5 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:316
-msgctxt "input-name"
-msgid "P5 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:317
-msgctxt "input-name"
-msgid "P5 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:318
-msgctxt "input-name"
-msgid "P5 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:323
-msgctxt "input-name"
-msgid "P6 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:324
-msgctxt "input-name"
-msgid "P6 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:325
-msgctxt "input-name"
-msgid "P6 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:326
-msgctxt "input-name"
-msgid "P6 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:327
-msgctxt "input-name"
-msgid "P6 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:328
-msgctxt "input-name"
-msgid "P6 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:329
-msgctxt "input-name"
-msgid "P6 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:330
-msgctxt "input-name"
-msgid "P6 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:331
-msgctxt "input-name"
-msgid "P6 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:332
-msgctxt "input-name"
-msgid "P6 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:333
-msgctxt "input-name"
-msgid "P6 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:334
-msgctxt "input-name"
-msgid "P6 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:335
-msgctxt "input-name"
-msgid "P6 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:336
-msgctxt "input-name"
-msgid "P6 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:337
-msgctxt "input-name"
-msgid "P6 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:338
-msgctxt "input-name"
-msgid "P6 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:339
-msgctxt "input-name"
-msgid "P6 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:340
-msgctxt "input-name"
-msgid "P6 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:341
-msgctxt "input-name"
-msgid "P6 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:342
-msgctxt "input-name"
-msgid "P6 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:343
-msgctxt "input-name"
-msgid "P6 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:344
-msgctxt "input-name"
-msgid "P6 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:345
-msgctxt "input-name"
-msgid "P6 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:346
-msgctxt "input-name"
-msgid "P6 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:347
-msgctxt "input-name"
-msgid "P6 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:348
-msgctxt "input-name"
-msgid "P6 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:349
-msgctxt "input-name"
-msgid "P6 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:350
-msgctxt "input-name"
-msgid "P6 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:351
-msgctxt "input-name"
-msgid "P6 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:352
-msgctxt "input-name"
-msgid "P6 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:357
-msgctxt "input-name"
-msgid "P7 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:358
-msgctxt "input-name"
-msgid "P7 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:359
-msgctxt "input-name"
-msgid "P7 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:360
-msgctxt "input-name"
-msgid "P7 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:361
-msgctxt "input-name"
-msgid "P7 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:362
-msgctxt "input-name"
-msgid "P7 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:363
-msgctxt "input-name"
-msgid "P7 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:364
-msgctxt "input-name"
-msgid "P7 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:365
-msgctxt "input-name"
-msgid "P7 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:366
-msgctxt "input-name"
-msgid "P7 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:367
-msgctxt "input-name"
-msgid "P7 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:368
-msgctxt "input-name"
-msgid "P7 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:369
-msgctxt "input-name"
-msgid "P7 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:370
-msgctxt "input-name"
-msgid "P7 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:371
-msgctxt "input-name"
-msgid "P7 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:372
-msgctxt "input-name"
-msgid "P7 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:373
-msgctxt "input-name"
-msgid "P7 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:374
-msgctxt "input-name"
-msgid "P7 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:375
-msgctxt "input-name"
-msgid "P7 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:376
-msgctxt "input-name"
-msgid "P7 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:377
-msgctxt "input-name"
-msgid "P7 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:378
-msgctxt "input-name"
-msgid "P7 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:379
-msgctxt "input-name"
-msgid "P7 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:380
-msgctxt "input-name"
-msgid "P7 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:381
-msgctxt "input-name"
-msgid "P7 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:382
-msgctxt "input-name"
-msgid "P7 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:383
-msgctxt "input-name"
-msgid "P7 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:384
-msgctxt "input-name"
-msgid "P7 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:385
-msgctxt "input-name"
-msgid "P7 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:386
-msgctxt "input-name"
-msgid "P7 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:391
-msgctxt "input-name"
-msgid "P8 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:392
-msgctxt "input-name"
-msgid "P8 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:393
-msgctxt "input-name"
-msgid "P8 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:394
-msgctxt "input-name"
-msgid "P8 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:395
-msgctxt "input-name"
-msgid "P8 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:396
-msgctxt "input-name"
-msgid "P8 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:397
-msgctxt "input-name"
-msgid "P8 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:398
-msgctxt "input-name"
-msgid "P8 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:399
-msgctxt "input-name"
-msgid "P8 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:400
-msgctxt "input-name"
-msgid "P8 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:401
-msgctxt "input-name"
-msgid "P8 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:402
-msgctxt "input-name"
-msgid "P8 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:403
-msgctxt "input-name"
-msgid "P8 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:404
-msgctxt "input-name"
-msgid "P8 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:405
-msgctxt "input-name"
-msgid "P8 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:406
-msgctxt "input-name"
-msgid "P8 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:407
-msgctxt "input-name"
-msgid "P8 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:408
-msgctxt "input-name"
-msgid "P8 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:409
-msgctxt "input-name"
-msgid "P8 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:410
-msgctxt "input-name"
-msgid "P8 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:411
-msgctxt "input-name"
-msgid "P8 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:412
-msgctxt "input-name"
-msgid "P8 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:413
-msgctxt "input-name"
-msgid "P8 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:414
-msgctxt "input-name"
-msgid "P8 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:415
-msgctxt "input-name"
-msgid "P8 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:416
-msgctxt "input-name"
-msgid "P8 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:417
-msgctxt "input-name"
-msgid "P8 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:418
-msgctxt "input-name"
-msgid "P8 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:419
-msgctxt "input-name"
-msgid "P8 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:420
-msgctxt "input-name"
-msgid "P8 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:425
-msgctxt "input-name"
-msgid "P9 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:426
-msgctxt "input-name"
-msgid "P9 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:427
-msgctxt "input-name"
-msgid "P9 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:428
-msgctxt "input-name"
-msgid "P9 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:429
-msgctxt "input-name"
-msgid "P9 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:430
-msgctxt "input-name"
-msgid "P9 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:431
-msgctxt "input-name"
-msgid "P9 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:432
-msgctxt "input-name"
-msgid "P9 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:433
-msgctxt "input-name"
-msgid "P9 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:434
-msgctxt "input-name"
-msgid "P9 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:435
-msgctxt "input-name"
-msgid "P9 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:436
-msgctxt "input-name"
-msgid "P9 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:437
-msgctxt "input-name"
-msgid "P9 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:438
-msgctxt "input-name"
-msgid "P9 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:439
-msgctxt "input-name"
-msgid "P9 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:440
-msgctxt "input-name"
-msgid "P9 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:441
-msgctxt "input-name"
-msgid "P9 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:442
-msgctxt "input-name"
-msgid "P9 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:443
-msgctxt "input-name"
-msgid "P9 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:444
-msgctxt "input-name"
-msgid "P9 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:445
-msgctxt "input-name"
-msgid "P9 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:446
-msgctxt "input-name"
-msgid "P9 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:447
-msgctxt "input-name"
-msgid "P9 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:448
-msgctxt "input-name"
-msgid "P9 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:449
-msgctxt "input-name"
-msgid "P9 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:450
-msgctxt "input-name"
-msgid "P9 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:451
-msgctxt "input-name"
-msgid "P9 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:452
-msgctxt "input-name"
-msgid "P9 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:453
-msgctxt "input-name"
-msgid "P9 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:454
-msgctxt "input-name"
-msgid "P9 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:459
-msgctxt "input-name"
-msgid "P10 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:460
-msgctxt "input-name"
-msgid "P10 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:461
-msgctxt "input-name"
-msgid "P10 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:462
-msgctxt "input-name"
-msgid "P10 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:463
-msgctxt "input-name"
-msgid "P10 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:464
-msgctxt "input-name"
-msgid "P10 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:465
-msgctxt "input-name"
-msgid "P10 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:466
-msgctxt "input-name"
-msgid "P10 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:467
-msgctxt "input-name"
-msgid "P10 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:468
-msgctxt "input-name"
-msgid "P10 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:469
-msgctxt "input-name"
-msgid "P10 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:470
-msgctxt "input-name"
-msgid "P10 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:471
-msgctxt "input-name"
-msgid "P10 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:472
-msgctxt "input-name"
-msgid "P10 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:473
-msgctxt "input-name"
-msgid "P10 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:474
-msgctxt "input-name"
-msgid "P10 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:475
-msgctxt "input-name"
-msgid "P10 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:476
-msgctxt "input-name"
-msgid "P10 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:477
-msgctxt "input-name"
-msgid "P10 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:478
-msgctxt "input-name"
-msgid "P10 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:479
-msgctxt "input-name"
-msgid "P10 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:480
-msgctxt "input-name"
-msgid "P10 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:481
-msgctxt "input-name"
-msgid "P10 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:482
-msgctxt "input-name"
-msgid "P10 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:483
-msgctxt "input-name"
-msgid "P10 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:484
-msgctxt "input-name"
-msgid "P10 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:485
-msgctxt "input-name"
-msgid "P10 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:486
-msgctxt "input-name"
-msgid "P10 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:487
-msgctxt "input-name"
-msgid "P10 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:488
-msgctxt "input-name"
-msgid "P10 Select"
-msgstr ""
-
 #: src/emu/inpttype.ipp:493
 msgctxt "input-name"
 msgid "1 Player Start"
@@ -5477,154 +4106,31 @@ msgctxt "input-name"
 msgid "Volume Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:550
-msgctxt "input-name"
-msgid "P1 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:551
-msgctxt "input-name"
-msgid "P2 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:552
-msgctxt "input-name"
-msgid "P3 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:553
-msgctxt "input-name"
-msgid "P4 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:554
-msgctxt "input-name"
-msgid "P5 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:555
-msgctxt "input-name"
-msgid "P6 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:556
-msgctxt "input-name"
-msgid "P7 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:557
-msgctxt "input-name"
-msgid "P8 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:558
-msgctxt "input-name"
-msgid "P9 Pedal 1"
-msgstr ""
-
+#: src/emu/inpttype.ipp:550 src/emu/inpttype.ipp:551 src/emu/inpttype.ipp:552
+#: src/emu/inpttype.ipp:553 src/emu/inpttype.ipp:554 src/emu/inpttype.ipp:555
+#: src/emu/inpttype.ipp:556 src/emu/inpttype.ipp:557 src/emu/inpttype.ipp:558
 #: src/emu/inpttype.ipp:559
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:564
-msgctxt "input-name"
-msgid "P1 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:565
-msgctxt "input-name"
-msgid "P2 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:566
-msgctxt "input-name"
-msgid "P3 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:567
-msgctxt "input-name"
-msgid "P4 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:568
-msgctxt "input-name"
-msgid "P5 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:569
-msgctxt "input-name"
-msgid "P6 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:570
-msgctxt "input-name"
-msgid "P7 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:571
-msgctxt "input-name"
-msgid "P8 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:572
-msgctxt "input-name"
-msgid "P9 Pedal 2"
+msgid "%p Pedal 1"
 msgstr ""
 
+#: src/emu/inpttype.ipp:564 src/emu/inpttype.ipp:565 src/emu/inpttype.ipp:566
+#: src/emu/inpttype.ipp:567 src/emu/inpttype.ipp:568 src/emu/inpttype.ipp:569
+#: src/emu/inpttype.ipp:570 src/emu/inpttype.ipp:571 src/emu/inpttype.ipp:572
 #: src/emu/inpttype.ipp:573
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:578
-msgctxt "input-name"
-msgid "P1 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:579
-msgctxt "input-name"
-msgid "P2 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:580
-msgctxt "input-name"
-msgid "P3 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:581
-msgctxt "input-name"
-msgid "P4 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:582
-msgctxt "input-name"
-msgid "P5 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:583
-msgctxt "input-name"
-msgid "P6 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:584
-msgctxt "input-name"
-msgid "P7 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:585
-msgctxt "input-name"
-msgid "P8 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:586
-msgctxt "input-name"
-msgid "P9 Pedal 3"
+msgid "%p Pedal 2"
 msgstr ""
 
+#: src/emu/inpttype.ipp:578 src/emu/inpttype.ipp:579 src/emu/inpttype.ipp:580
+#: src/emu/inpttype.ipp:581 src/emu/inpttype.ipp:582 src/emu/inpttype.ipp:583
+#: src/emu/inpttype.ipp:584 src/emu/inpttype.ipp:585 src/emu/inpttype.ipp:586
 #: src/emu/inpttype.ipp:587
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 3"
+msgid "%p Pedal 3"
 msgstr ""
 
 #: src/emu/inpttype.ipp:592
diff --git a/language/Hindi/strings.po b/language/Hindi/strings.po
index 3b740592805..8faf22a1468 100644
--- a/language/Hindi/strings.po
+++ b/language/Hindi/strings.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-19 02:50+1100\n"
+"POT-Creation-Date: 2021-12-09 04:44+1100\n"
 "PO-Revision-Date: 2016-02-20 18:03+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: MAME Language Team\n"
@@ -259,12 +259,12 @@ msgstr ""
 msgid "Driver: \"%1$s\" software list "
 msgstr ""
 
-#: src/frontend/mame/ui/selsoft.cpp:711 src/frontend/mame/ui/selgame.cpp:1066
+#: src/frontend/mame/ui/selsoft.cpp:711 src/frontend/mame/ui/selgame.cpp:1076
 #, c-format
 msgid "%1$s: %2$s - Search: %3$s_"
 msgstr ""
 
-#: src/frontend/mame/ui/selsoft.cpp:713 src/frontend/mame/ui/selgame.cpp:1068
+#: src/frontend/mame/ui/selsoft.cpp:713 src/frontend/mame/ui/selgame.cpp:1078
 #, c-format
 msgid "Search: %1$s_"
 msgstr ""
@@ -274,7 +274,7 @@ msgstr ""
 msgid "Software list/item: %1$s:%2$s"
 msgstr ""
 
-#: src/frontend/mame/ui/optsmenu.cpp:73 src/frontend/mame/ui/sndmenu.cpp:165
+#: src/frontend/mame/ui/optsmenu.cpp:73 src/frontend/mame/ui/sndmenu.cpp:161
 msgid "Sound Options"
 msgstr ""
 
@@ -369,11 +369,11 @@ msgid "Show mouse pointer"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:39
-msgid "Confirm quit from machines"
+msgid "Confirm quit from emulation"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:40
-msgid "Skip information screen at startup"
+msgid "Skip system information screen"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:41
@@ -389,7 +389,7 @@ msgid "Skip BIOS selection menu"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:44
-msgid "Skip software parts selection menu"
+msgid "Skip software part selection menu"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:45
@@ -541,7 +541,7 @@ msgid "UI active"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:91
-msgid "Offscreen reload"
+msgid "Off-screen reload"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:92
@@ -557,7 +557,7 @@ msgid "Natural keyboard"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:95
-msgid "Simultaneous contradictory"
+msgid "Allow contradictory joystick inputs"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:96
@@ -581,7 +581,7 @@ msgid "Pedal Device Assignment"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:106
-msgid "Adstick Device Assignment"
+msgid "AD Stick Device Assignment"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:107
@@ -668,14 +668,14 @@ msgstr ""
 msgid "Wait Vertical Sync"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:687
+#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:689
 #: src/frontend/mame/ui/videoopt.cpp:191 src/frontend/mame/ui/custui.cpp:490
 #: src/frontend/mame/ui/analogipt.cpp:471 plugins/cheatfind/init.lua:766
 #: plugins/cheatfind/init.lua:777 plugins/cheat/init.lua:668
 msgid "On"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:690
+#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:692
 #: src/frontend/mame/ui/videoopt.cpp:207 src/frontend/mame/ui/custui.cpp:490
 #: src/frontend/mame/ui/analogipt.cpp:471 plugins/cheatfind/init.lua:763
 #: plugins/cheatfind/init.lua:774 plugins/cheat/init.lua:671
@@ -683,11 +683,11 @@ msgstr ""
 msgid "Off"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:693
+#: src/frontend/mame/ui/menu.cpp:695
 msgid "Auto"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:1195
+#: src/frontend/mame/ui/menu.cpp:1197
 #: src/frontend/mame/ui/simpleselgame.cpp:278
 #: src/frontend/mame/ui/selmenu.cpp:1280
 msgid "Return to Previous Menu"
@@ -695,7 +695,7 @@ msgstr ""
 
 #: src/frontend/mame/ui/filemngr.cpp:139
 #: src/frontend/mame/ui/confswitch.cpp:119
-#: src/frontend/mame/ui/inputmap.cpp:559 src/frontend/mame/ui/analogipt.cpp:360
+#: src/frontend/mame/ui/inputmap.cpp:563 src/frontend/mame/ui/analogipt.cpp:360
 #, c-format
 msgid "[root%1$s]"
 msgstr ""
@@ -938,22 +938,22 @@ msgid ""
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "GHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "MHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "kHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "Hz"
 msgstr ""
 
@@ -977,38 +977,38 @@ msgstr ""
 msgid "Vector"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:480
+#: src/frontend/mame/ui/info.cpp:483
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:480
+#: src/frontend/mame/ui/info.cpp:483
 msgid "%2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:497
+#: src/frontend/mame/ui/info.cpp:500
 #, c-format
 msgid "Screen '%1$s'"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:499
+#: src/frontend/mame/ui/info.cpp:502
 msgid "Screen"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:570 src/frontend/mame/ui/info.cpp:581
+#: src/frontend/mame/ui/info.cpp:573 src/frontend/mame/ui/info.cpp:584
 #, c-format
 msgid "%1$s:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:662
+#: src/frontend/mame/ui/info.cpp:665
 msgid "Not supported"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:665
+#: src/frontend/mame/ui/info.cpp:668
 msgid "Partially supported"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:674
+#: src/frontend/mame/ui/info.cpp:677
 msgid "[empty]"
 msgstr ""
 
@@ -1081,7 +1081,7 @@ msgid "Emulated"
 msgstr ""
 
 #: src/frontend/mame/ui/keyboard.cpp:59 src/frontend/mame/ui/confswitch.cpp:117
-#: src/frontend/mame/ui/inputmap.cpp:557 src/frontend/mame/ui/analogipt.cpp:358
+#: src/frontend/mame/ui/inputmap.cpp:561 src/frontend/mame/ui/analogipt.cpp:358
 #, c-format
 msgid "%1$s [root%2$s]"
 msgstr ""
@@ -1441,7 +1441,7 @@ msgctxt "swlist-info"
 msgid "Software list/item"
 msgstr ""
 
-#: src/frontend/mame/ui/datmenu.cpp:88 src/frontend/mame/ui/selmenu.cpp:2698
+#: src/frontend/mame/ui/datmenu.cpp:88 src/frontend/mame/ui/selmenu.cpp:2707
 msgid "Software List Info"
 msgstr ""
 
@@ -1556,7 +1556,7 @@ msgstr ""
 msgid "Configure Machine:"
 msgstr ""
 
-#: src/frontend/mame/ui/miscmenu.cpp:858 src/frontend/mame/ui/selmenu.cpp:2638
+#: src/frontend/mame/ui/miscmenu.cpp:858 src/frontend/mame/ui/selmenu.cpp:2647
 msgid " (default)"
 msgstr ""
 
@@ -1573,7 +1573,7 @@ msgid ""
 "Press %2$s to return to emulation"
 msgstr ""
 
-#: src/frontend/mame/ui/info_pty.cpp:30 src/frontend/mame/ui/mainmenu.cpp:155
+#: src/frontend/mame/ui/info_pty.cpp:30
 msgid "Pseudo terminals"
 msgstr ""
 
@@ -1641,52 +1641,52 @@ msgstr ""
 msgid "Other Controls"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:227
+#: src/frontend/mame/ui/inputmap.cpp:231
 msgid "This machine has no configurable inputs."
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:327
+#: src/frontend/mame/ui/inputmap.cpp:331
 msgid "Pressed"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:397
+#: src/frontend/mame/ui/inputmap.cpp:401
 msgid "Invalid sequence entered"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:542
+#: src/frontend/mame/ui/inputmap.cpp:546
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:543
+#: src/frontend/mame/ui/inputmap.cpp:547
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog Inc"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:544
+#: src/frontend/mame/ui/inputmap.cpp:548
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog Dec"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:586
+#: src/frontend/mame/ui/inputmap.cpp:590
 #, c-format
 msgid "Press %1$s to set\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:587
+#: src/frontend/mame/ui/inputmap.cpp:591
 #, c-format
 msgid "Press %1$s to append\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:588
+#: src/frontend/mame/ui/inputmap.cpp:592
 #, c-format
 msgid "Press %1$s to clear\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:589
+#: src/frontend/mame/ui/inputmap.cpp:593
 #, c-format
 msgid "Press %1$s to restore default\n"
 msgstr ""
@@ -1750,7 +1750,7 @@ msgid ""
 msgstr ""
 
 #: src/frontend/mame/ui/simpleselgame.cpp:273
-#: src/frontend/mame/ui/selgame.cpp:436
+#: src/frontend/mame/ui/selgame.cpp:443
 msgid "Configure Options"
 msgstr ""
 
@@ -2078,16 +2078,16 @@ msgstr ""
 msgid "Expand to fit"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:437
+#: src/frontend/mame/ui/selgame.cpp:444
 msgid "Configure Machine"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:1050
+#: src/frontend/mame/ui/selgame.cpp:1060
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d machines (%5$d BIOS) )"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:1078
+#: src/frontend/mame/ui/selgame.cpp:1088
 #, c-format
 msgid "System: %1$-.100s"
 msgstr ""
@@ -2109,7 +2109,7 @@ msgstr ""
 #: src/frontend/mame/ui/auditmenu.cpp:98
 #, c-format
 msgid ""
-"Auditing ROMs for machine %2$u of %3$u...\n"
+"Auditing media for machine %2$u of %3$u...\n"
 "%1$s"
 msgstr ""
 
@@ -2124,12 +2124,12 @@ msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:136
 #, c-format
-msgid "Audit ROMs for %1$u machines marked unavailable"
+msgid "Audit media for %1$u machines marked unavailable"
 msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:137
 #, c-format
-msgid "Audit ROMs for all %1$u machines"
+msgid "Audit media for all %1$u machines"
 msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:154
@@ -2335,84 +2335,84 @@ msgctxt "color-sample"
 msgid "Clone"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:914
+#: src/frontend/mame/ui/custui.cpp:906
 msgid "ARGB Settings"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:919 src/frontend/mame/ui/custui.cpp:922
+#: src/frontend/mame/ui/custui.cpp:911 src/frontend/mame/ui/custui.cpp:914
 msgctxt "color-channel"
 msgid "Alpha"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:927 src/frontend/mame/ui/custui.cpp:930
+#: src/frontend/mame/ui/custui.cpp:919 src/frontend/mame/ui/custui.cpp:922
 msgctxt "color-channel"
 msgid "Red"
 msgstr ""
 
+#: src/frontend/mame/ui/custui.cpp:927 src/frontend/mame/ui/custui.cpp:930
+msgctxt "color-channel"
+msgid "Green"
+msgstr ""
+
 #: src/frontend/mame/ui/custui.cpp:935 src/frontend/mame/ui/custui.cpp:938
 msgctxt "color-channel"
-msgid "Green"
-msgstr ""
-
-#: src/frontend/mame/ui/custui.cpp:943 src/frontend/mame/ui/custui.cpp:946
-msgctxt "color-channel"
 msgid "Blue"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:949
+#: src/frontend/mame/ui/custui.cpp:941
 msgid "Choose from palette"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:996
+#: src/frontend/mame/ui/custui.cpp:988
 msgid "Color preview:"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1093
+#: src/frontend/mame/ui/custui.cpp:1085
 msgctxt "color-preset"
 msgid "White"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1094
+#: src/frontend/mame/ui/custui.cpp:1086
 msgctxt "color-preset"
 msgid "Silver"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1095
+#: src/frontend/mame/ui/custui.cpp:1087
 msgctxt "color-preset"
 msgid "Gray"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1096
+#: src/frontend/mame/ui/custui.cpp:1088
 msgctxt "color-preset"
 msgid "Black"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1097
+#: src/frontend/mame/ui/custui.cpp:1089
 msgctxt "color-preset"
 msgid "Red"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1098
+#: src/frontend/mame/ui/custui.cpp:1090
 msgctxt "color-preset"
 msgid "Orange"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1099
+#: src/frontend/mame/ui/custui.cpp:1091
 msgctxt "color-preset"
 msgid "Yellow"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1100
+#: src/frontend/mame/ui/custui.cpp:1092
 msgctxt "color-preset"
 msgid "Green"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1101
+#: src/frontend/mame/ui/custui.cpp:1093
 msgctxt "color-preset"
 msgid "Blue"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1102
+#: src/frontend/mame/ui/custui.cpp:1094
 msgctxt "color-preset"
 msgid "Violet"
 msgstr ""
@@ -2477,7 +2477,7 @@ msgid "Input (general)"
 msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:123
-msgid "Input (this Machine)"
+msgid "Input (this machine)"
 msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:126
@@ -2516,6 +2516,10 @@ msgstr ""
 msgid "Tape Control"
 msgstr ""
 
+#: src/frontend/mame/ui/mainmenu.cpp:155
+msgid "Pseudo Terminals"
+msgstr ""
+
 #: src/frontend/mame/ui/mainmenu.cpp:158
 msgid "BIOS Selection"
 msgstr ""
@@ -2554,7 +2558,7 @@ msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:200
 #, c-format
-msgid "About %s"
+msgid "About %1$s"
 msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:212
@@ -2714,373 +2718,373 @@ msgstr ""
 msgid "%1$s %2$s"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2235
+#: src/frontend/mame/ui/selmenu.cpp:2244
 msgid "Images"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2236
+#: src/frontend/mame/ui/selmenu.cpp:2245
 msgid "Infos"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2551
+#: src/frontend/mame/ui/selmenu.cpp:2560
 msgid ""
 "Required ROM/disk images for the selected system are missing or incorrect. "
 "Please acquire the correct files or select a different system.\n"
 "\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2567
+#: src/frontend/mame/ui/selmenu.cpp:2576
 msgid ""
 "Required ROM/disk images for the selected software are missing or incorrect. "
 "Please acquire the correct files or select a different software item.\n"
 "\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2583
+#: src/frontend/mame/ui/selmenu.cpp:2592
 msgid "incorrect checksum"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2586
+#: src/frontend/mame/ui/selmenu.cpp:2595
 msgid "incorrect length"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2589
+#: src/frontend/mame/ui/selmenu.cpp:2598
 msgid "not found"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2600
+#: src/frontend/mame/ui/selmenu.cpp:2609
 #, c-format
 msgid "%1$s (%2$s) - %3$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2602
+#: src/frontend/mame/ui/selmenu.cpp:2611
 #, c-format
 msgid "%1$s - %2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2606
+#: src/frontend/mame/ui/selmenu.cpp:2615
 msgid "Press any key to continue."
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2735
+#: src/frontend/mame/ui/selmenu.cpp:2744
 msgid "General Info"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2887
-#, c-format
-msgid "Romset\t%1$s\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2888
-#, c-format
-msgid "Year\t%1$s\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2889
-#, c-format
-msgid "Manufacturer\t%1$s\n"
-msgstr ""
-
 #: src/frontend/mame/ui/selmenu.cpp:2896
 #, c-format
-msgid "Driver is Clone of\t%1$s\n"
+msgid "Romset\t%1$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2901
-msgid "Driver is Parent\t\n"
+#: src/frontend/mame/ui/selmenu.cpp:2897
+#, c-format
+msgid "Year\t%1$s\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2898
+#, c-format
+msgid "Manufacturer\t%1$s\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2905
-msgid "Analog Controls\tYes\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2907
-msgid "Keyboard Inputs\tYes\n"
+#, c-format
+msgid "Driver is Clone of\t%1$s\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2910
-msgid "Overall\tNOT WORKING\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2912
-msgid "Overall\tUnemulated Protection\n"
+msgid "Driver is Parent\t\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2914
-msgid "Overall\tWorking\n"
+msgid "Analog Controls\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2917
-msgid "Graphics\tUnimplemented\n"
+#: src/frontend/mame/ui/selmenu.cpp:2916
+msgid "Keyboard Inputs\tYes\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2919
-msgid "Graphics\tWrong Colors\n"
+msgid "Overall\tNOT WORKING\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2921
-msgid "Graphics\tImperfect Colors\n"
+msgid "Overall\tUnemulated Protection\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2923
-msgid "Graphics\tImperfect\n"
+msgid "Overall\tWorking\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2925
-msgid "Graphics\tOK\n"
+#: src/frontend/mame/ui/selmenu.cpp:2926
+msgid "Graphics\tUnimplemented\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2928
-msgid "Sound\tNone\n"
+msgid "Graphics\tWrong Colors\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2930
-msgid "Sound\tUnimplemented\n"
+msgid "Graphics\tImperfect Colors\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2932
-msgid "Sound\tImperfect\n"
+msgid "Graphics\tImperfect\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2934
-msgid "Sound\tOK\n"
+msgid "Graphics\tOK\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2937
-msgid "Capture\tUnimplemented\n"
+msgid "Sound\tNone\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2939
+msgid "Sound\tUnimplemented\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2941
+msgid "Sound\tImperfect\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2943
+msgid "Sound\tOK\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2946
+msgid "Capture\tUnimplemented\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2948
 msgid "Capture\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2942
+#: src/frontend/mame/ui/selmenu.cpp:2951
 msgid "Camera\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2944
+#: src/frontend/mame/ui/selmenu.cpp:2953
 msgid "Camera\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2947
+#: src/frontend/mame/ui/selmenu.cpp:2956
 msgid "Microphone\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2949
+#: src/frontend/mame/ui/selmenu.cpp:2958
 msgid "Microphone\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2952
+#: src/frontend/mame/ui/selmenu.cpp:2961
 msgid "Controls\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2954
+#: src/frontend/mame/ui/selmenu.cpp:2963
 msgid "Controls\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2957
+#: src/frontend/mame/ui/selmenu.cpp:2966
 msgid "Keyboard\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2959
+#: src/frontend/mame/ui/selmenu.cpp:2968
 msgid "Keyboard\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2962
+#: src/frontend/mame/ui/selmenu.cpp:2971
 msgid "Mouse\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2964
+#: src/frontend/mame/ui/selmenu.cpp:2973
 msgid "Mouse\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2967
+#: src/frontend/mame/ui/selmenu.cpp:2976
 msgid "Media\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2969
+#: src/frontend/mame/ui/selmenu.cpp:2978
 msgid "Media\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2972
+#: src/frontend/mame/ui/selmenu.cpp:2981
 msgid "Disk\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2974
+#: src/frontend/mame/ui/selmenu.cpp:2983
 msgid "Disk\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2977
+#: src/frontend/mame/ui/selmenu.cpp:2986
 msgid "Printer\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2979
+#: src/frontend/mame/ui/selmenu.cpp:2988
 msgid "Printer\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2982
+#: src/frontend/mame/ui/selmenu.cpp:2991
 msgid "Mag. Tape\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2984
+#: src/frontend/mame/ui/selmenu.cpp:2993
 msgid "Mag. Tape\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2987
+#: src/frontend/mame/ui/selmenu.cpp:2996
 msgid "Punch Tape\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2989
+#: src/frontend/mame/ui/selmenu.cpp:2998
 msgid "Punch Tape\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2992
+#: src/frontend/mame/ui/selmenu.cpp:3001
 msgid "Mag. Drum\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2994
+#: src/frontend/mame/ui/selmenu.cpp:3003
 msgid "Mag. Drum\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2997
+#: src/frontend/mame/ui/selmenu.cpp:3006
 msgid "(EP)ROM\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2999
+#: src/frontend/mame/ui/selmenu.cpp:3008
 msgid "(EP)ROM\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3002
+#: src/frontend/mame/ui/selmenu.cpp:3011
 msgid "Communications\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3004
+#: src/frontend/mame/ui/selmenu.cpp:3013
 msgid "Communications\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3007
+#: src/frontend/mame/ui/selmenu.cpp:3016
 msgid "LAN\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3009
+#: src/frontend/mame/ui/selmenu.cpp:3018
 msgid "LAN\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3012
+#: src/frontend/mame/ui/selmenu.cpp:3021
 msgid "WAN\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3014
+#: src/frontend/mame/ui/selmenu.cpp:3023
 msgid "WAN\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3017
+#: src/frontend/mame/ui/selmenu.cpp:3026
 msgid "Timing\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3019
+#: src/frontend/mame/ui/selmenu.cpp:3028
 msgid "Timing\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3021
+#: src/frontend/mame/ui/selmenu.cpp:3030
 msgid "Mechanical Machine\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3021
+#: src/frontend/mame/ui/selmenu.cpp:3030
 msgid "Mechanical Machine\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3022
+#: src/frontend/mame/ui/selmenu.cpp:3031
 msgid "Requires Artwork\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3022
+#: src/frontend/mame/ui/selmenu.cpp:3031
 msgid "Requires Artwork\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3023
+#: src/frontend/mame/ui/selmenu.cpp:3032
 msgid "Requires Clickable Artwork\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3023
+#: src/frontend/mame/ui/selmenu.cpp:3032
 msgid "Requires Clickable Artwork\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3025
+#: src/frontend/mame/ui/selmenu.cpp:3034
 msgid "Support Cocktail\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3026
+#: src/frontend/mame/ui/selmenu.cpp:3035
 msgid "Driver is BIOS\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3026
+#: src/frontend/mame/ui/selmenu.cpp:3035
 msgid "Driver is BIOS\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3027
+#: src/frontend/mame/ui/selmenu.cpp:3036
 msgid "Support Save\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3027
+#: src/frontend/mame/ui/selmenu.cpp:3036
 msgid "Support Save\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3028
+#: src/frontend/mame/ui/selmenu.cpp:3037
 msgid "Screen Orientation\tVertical\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3028
+#: src/frontend/mame/ui/selmenu.cpp:3037
 msgid "Screen Orientation\tHorizontal\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3038
+#: src/frontend/mame/ui/selmenu.cpp:3047
 msgid "Requires CHD\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3038
+#: src/frontend/mame/ui/selmenu.cpp:3047
 msgid "Requires CHD\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3051
-msgid "ROM Audit Result\tOK\n"
+#: src/frontend/mame/ui/selmenu.cpp:3060
+msgid "Media Audit Result\tOK\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3053
-msgid "ROM Audit Result\tBAD\n"
+#: src/frontend/mame/ui/selmenu.cpp:3062
+msgid "Media Audit Result\tBAD\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3056
+#: src/frontend/mame/ui/selmenu.cpp:3065
 msgid "Samples Audit Result\tNone Needed\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3058
+#: src/frontend/mame/ui/selmenu.cpp:3067
 msgid "Samples Audit Result\tOK\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3060
+#: src/frontend/mame/ui/selmenu.cpp:3069
 msgid "Samples Audit Result\tBAD\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3064
+#: src/frontend/mame/ui/selmenu.cpp:3073
 msgid ""
-"ROM Audit \tDisabled\n"
-"Samples Audit \tDisabled\n"
+"Media Audit\tDisabled\n"
+"Samples Audit\tDisabled\n"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:150
+#: src/frontend/mame/ui/sndmenu.cpp:146
 msgid "Sound"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:151
+#: src/frontend/mame/ui/sndmenu.cpp:147
 msgid "Compressor"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:152
+#: src/frontend/mame/ui/sndmenu.cpp:148
 msgid "Sample Rate"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:153
+#: src/frontend/mame/ui/sndmenu.cpp:149
 msgid "Use External Samples"
 msgstr ""
 
@@ -3119,511 +3123,681 @@ msgstr ""
 msgid "  Screen '%1$s': Vector\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:132
+#: src/frontend/mame/ui/devopt.cpp:135
 #, c-format
 msgid "  Screen '%1$s': %2$d × %3$d (V) %4$s Hz\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:133
+#: src/frontend/mame/ui/devopt.cpp:136
 #, c-format
 msgid "  Screen '%1$s': %2$d × %3$d (H) %4$s Hz\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:147
+#: src/frontend/mame/ui/devopt.cpp:150
 msgid "* Sound:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:211
+#: src/frontend/mame/ui/devopt.cpp:214
 #, c-format
 msgid ""
 "* BIOS settings:\n"
 "  %1$d options    [default: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:255 src/frontend/mame/ui/devopt.cpp:271
-#: src/frontend/mame/ui/devopt.cpp:332
+#: src/frontend/mame/ui/devopt.cpp:258 src/frontend/mame/ui/devopt.cpp:274
+#: src/frontend/mame/ui/devopt.cpp:335
 #, c-format
 msgid "  %1$s    [default: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:260 src/frontend/mame/ui/devopt.cpp:276
+#: src/frontend/mame/ui/devopt.cpp:263 src/frontend/mame/ui/devopt.cpp:279
 #, c-format
 msgid "  %1$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:282
+#: src/frontend/mame/ui/devopt.cpp:285
 msgid "* DIP switch settings:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:287
+#: src/frontend/mame/ui/devopt.cpp:290
 msgid "* Configuration settings:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:291
+#: src/frontend/mame/ui/devopt.cpp:294
 msgid "* Input device(s):\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:293
+#: src/frontend/mame/ui/devopt.cpp:296
 #, c-format
 msgid "  User inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:295
+#: src/frontend/mame/ui/devopt.cpp:298
 #, c-format
 msgid "  Mahjong inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:297
+#: src/frontend/mame/ui/devopt.cpp:300
 #, c-format
 msgid "  Hanafuda inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:299
+#: src/frontend/mame/ui/devopt.cpp:302
 #, c-format
 msgid "  Gambling inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:301
+#: src/frontend/mame/ui/devopt.cpp:304
 #, c-format
 msgid "  Analog inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:303
+#: src/frontend/mame/ui/devopt.cpp:306
 #, c-format
 msgid "  Adjuster inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:305
+#: src/frontend/mame/ui/devopt.cpp:308
 #, c-format
 msgid "  Keypad inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:307
+#: src/frontend/mame/ui/devopt.cpp:310
 #, c-format
 msgid "  Keyboard inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:312
+#: src/frontend/mame/ui/devopt.cpp:315
 msgid "* Media Options:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:317
+#: src/frontend/mame/ui/devopt.cpp:320
 #, c-format
 msgid "  %1$s    [tag: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:327
+#: src/frontend/mame/ui/devopt.cpp:330
 msgid "* Slot Options:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:341
+#: src/frontend/mame/ui/devopt.cpp:344
 msgid "[None]\n"
 msgstr ""
 
-#: src/emu/render.cpp:1847
+#: src/emu/render.cpp:1796
 #, c-format
 msgctxt "view-name"
 msgid "Screen %1$u Standard (%2$u:%3$u)"
 msgstr ""
 
-#: src/emu/render.cpp:1873
+#: src/emu/render.cpp:1822
 #, c-format
 msgctxt "view-name"
 msgid "Screen %1$u Pixel Aspect (%2$u:%3$u)"
 msgstr ""
 
-#: src/emu/render.cpp:1895 src/emu/render.cpp:2030
+#: src/emu/render.cpp:1844 src/emu/render.cpp:1979
 msgctxt "view-name"
 msgid "Cocktail"
 msgstr ""
 
-#: src/emu/render.cpp:2015
+#: src/emu/render.cpp:1964
 msgctxt "view-name"
 msgid "Left-to-Right"
 msgstr ""
 
-#: src/emu/render.cpp:2016
+#: src/emu/render.cpp:1965
 msgctxt "view-name"
 msgid "Left-to-Right (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2017
+#: src/emu/render.cpp:1966
 msgctxt "view-name"
 msgid "Top-to-Bottom"
 msgstr ""
 
-#: src/emu/render.cpp:2018
+#: src/emu/render.cpp:1967
 msgctxt "view-name"
 msgid "Top-to-Bottom (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2069
+#: src/emu/render.cpp:2018
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Left-to-Right, Top-to-Bottom"
 msgstr ""
 
-#: src/emu/render.cpp:2078
+#: src/emu/render.cpp:2027
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Left-to-Right, Top-to-Bottom (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2087
+#: src/emu/render.cpp:2036
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Top-to-Bottom, Left-to-Right"
 msgstr ""
 
-#: src/emu/render.cpp:2096
+#: src/emu/render.cpp:2045
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Top-to-Bottom, Left-to-Right (Gapless)"
 msgstr ""
 
-#: src/emu/inpttype.ipp:22
+#: src/emu/ioport.cpp:332
+#, c-format
 msgctxt "input-name"
-msgid "P1 Up"
+msgid "P%1$u"
 msgstr ""
 
-#: src/emu/inpttype.ipp:23
+#: src/emu/ioport.cpp:1924
 msgctxt "input-name"
-msgid "P1 Down"
+msgid "???"
 msgstr ""
 
-#: src/emu/inpttype.ipp:24
+#: src/emu/inpttype.ipp:22 src/emu/inpttype.ipp:140 src/emu/inpttype.ipp:221
+#: src/emu/inpttype.ipp:255 src/emu/inpttype.ipp:289 src/emu/inpttype.ipp:323
+#: src/emu/inpttype.ipp:357 src/emu/inpttype.ipp:391 src/emu/inpttype.ipp:425
+#: src/emu/inpttype.ipp:459
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left"
+msgid "%p Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:25
+#: src/emu/inpttype.ipp:23 src/emu/inpttype.ipp:141 src/emu/inpttype.ipp:222
+#: src/emu/inpttype.ipp:256 src/emu/inpttype.ipp:290 src/emu/inpttype.ipp:324
+#: src/emu/inpttype.ipp:358 src/emu/inpttype.ipp:392 src/emu/inpttype.ipp:426
+#: src/emu/inpttype.ipp:460
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right"
+msgid "%p Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:26
+#: src/emu/inpttype.ipp:24 src/emu/inpttype.ipp:142 src/emu/inpttype.ipp:223
+#: src/emu/inpttype.ipp:257 src/emu/inpttype.ipp:291 src/emu/inpttype.ipp:325
+#: src/emu/inpttype.ipp:359 src/emu/inpttype.ipp:393 src/emu/inpttype.ipp:427
+#: src/emu/inpttype.ipp:461
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Up"
+msgid "%p Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:27
+#: src/emu/inpttype.ipp:25 src/emu/inpttype.ipp:143 src/emu/inpttype.ipp:224
+#: src/emu/inpttype.ipp:258 src/emu/inpttype.ipp:292 src/emu/inpttype.ipp:326
+#: src/emu/inpttype.ipp:360 src/emu/inpttype.ipp:394 src/emu/inpttype.ipp:428
+#: src/emu/inpttype.ipp:462
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Down"
+msgid "%p Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:28
+#: src/emu/inpttype.ipp:26 src/emu/inpttype.ipp:144 src/emu/inpttype.ipp:225
+#: src/emu/inpttype.ipp:259 src/emu/inpttype.ipp:293 src/emu/inpttype.ipp:327
+#: src/emu/inpttype.ipp:361 src/emu/inpttype.ipp:395 src/emu/inpttype.ipp:429
+#: src/emu/inpttype.ipp:463
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Left"
+msgid "%p Right Stick/Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:29
+#: src/emu/inpttype.ipp:27 src/emu/inpttype.ipp:145 src/emu/inpttype.ipp:226
+#: src/emu/inpttype.ipp:260 src/emu/inpttype.ipp:294 src/emu/inpttype.ipp:328
+#: src/emu/inpttype.ipp:362 src/emu/inpttype.ipp:396 src/emu/inpttype.ipp:430
+#: src/emu/inpttype.ipp:464
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Right"
+msgid "%p Right Stick/Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:30
+#: src/emu/inpttype.ipp:28 src/emu/inpttype.ipp:146 src/emu/inpttype.ipp:227
+#: src/emu/inpttype.ipp:261 src/emu/inpttype.ipp:295 src/emu/inpttype.ipp:329
+#: src/emu/inpttype.ipp:363 src/emu/inpttype.ipp:397 src/emu/inpttype.ipp:431
+#: src/emu/inpttype.ipp:465
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Up"
+msgid "%p Right Stick/Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:31
+#: src/emu/inpttype.ipp:29 src/emu/inpttype.ipp:147 src/emu/inpttype.ipp:228
+#: src/emu/inpttype.ipp:262 src/emu/inpttype.ipp:296 src/emu/inpttype.ipp:330
+#: src/emu/inpttype.ipp:364 src/emu/inpttype.ipp:398 src/emu/inpttype.ipp:432
+#: src/emu/inpttype.ipp:466
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Down"
+msgid "%p Right Stick/Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:32
+#: src/emu/inpttype.ipp:30 src/emu/inpttype.ipp:148 src/emu/inpttype.ipp:229
+#: src/emu/inpttype.ipp:263 src/emu/inpttype.ipp:297 src/emu/inpttype.ipp:331
+#: src/emu/inpttype.ipp:365 src/emu/inpttype.ipp:399 src/emu/inpttype.ipp:433
+#: src/emu/inpttype.ipp:467
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Left"
+msgid "%p Left Stick/Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:33
+#: src/emu/inpttype.ipp:31 src/emu/inpttype.ipp:149 src/emu/inpttype.ipp:230
+#: src/emu/inpttype.ipp:264 src/emu/inpttype.ipp:298 src/emu/inpttype.ipp:332
+#: src/emu/inpttype.ipp:366 src/emu/inpttype.ipp:400 src/emu/inpttype.ipp:434
+#: src/emu/inpttype.ipp:468
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Right"
+msgid "%p Left Stick/Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:34
+#: src/emu/inpttype.ipp:32 src/emu/inpttype.ipp:150 src/emu/inpttype.ipp:231
+#: src/emu/inpttype.ipp:265 src/emu/inpttype.ipp:299 src/emu/inpttype.ipp:333
+#: src/emu/inpttype.ipp:367 src/emu/inpttype.ipp:401 src/emu/inpttype.ipp:435
+#: src/emu/inpttype.ipp:469
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 1"
+msgid "%p Left Stick/Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:35
+#: src/emu/inpttype.ipp:33 src/emu/inpttype.ipp:151 src/emu/inpttype.ipp:232
+#: src/emu/inpttype.ipp:266 src/emu/inpttype.ipp:300 src/emu/inpttype.ipp:334
+#: src/emu/inpttype.ipp:368 src/emu/inpttype.ipp:402 src/emu/inpttype.ipp:436
+#: src/emu/inpttype.ipp:470
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 2"
+msgid "%p Left Stick/Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:36
+#: src/emu/inpttype.ipp:34 src/emu/inpttype.ipp:152 src/emu/inpttype.ipp:233
+#: src/emu/inpttype.ipp:267 src/emu/inpttype.ipp:301 src/emu/inpttype.ipp:335
+#: src/emu/inpttype.ipp:369 src/emu/inpttype.ipp:403 src/emu/inpttype.ipp:437
+#: src/emu/inpttype.ipp:471
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 3"
+msgid "%p Button 1"
 msgstr ""
 
-#: src/emu/inpttype.ipp:37
+#: src/emu/inpttype.ipp:35 src/emu/inpttype.ipp:153 src/emu/inpttype.ipp:234
+#: src/emu/inpttype.ipp:268 src/emu/inpttype.ipp:302 src/emu/inpttype.ipp:336
+#: src/emu/inpttype.ipp:370 src/emu/inpttype.ipp:404 src/emu/inpttype.ipp:438
+#: src/emu/inpttype.ipp:472
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 4"
+msgid "%p Button 2"
 msgstr ""
 
-#: src/emu/inpttype.ipp:38
+#: src/emu/inpttype.ipp:36 src/emu/inpttype.ipp:154 src/emu/inpttype.ipp:235
+#: src/emu/inpttype.ipp:269 src/emu/inpttype.ipp:303 src/emu/inpttype.ipp:337
+#: src/emu/inpttype.ipp:371 src/emu/inpttype.ipp:405 src/emu/inpttype.ipp:439
+#: src/emu/inpttype.ipp:473
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 5"
+msgid "%p Button 3"
 msgstr ""
 
-#: src/emu/inpttype.ipp:39
+#: src/emu/inpttype.ipp:37 src/emu/inpttype.ipp:155 src/emu/inpttype.ipp:236
+#: src/emu/inpttype.ipp:270 src/emu/inpttype.ipp:304 src/emu/inpttype.ipp:338
+#: src/emu/inpttype.ipp:372 src/emu/inpttype.ipp:406 src/emu/inpttype.ipp:440
+#: src/emu/inpttype.ipp:474
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 6"
+msgid "%p Button 4"
 msgstr ""
 
-#: src/emu/inpttype.ipp:40
+#: src/emu/inpttype.ipp:38 src/emu/inpttype.ipp:156 src/emu/inpttype.ipp:237
+#: src/emu/inpttype.ipp:271 src/emu/inpttype.ipp:305 src/emu/inpttype.ipp:339
+#: src/emu/inpttype.ipp:373 src/emu/inpttype.ipp:407 src/emu/inpttype.ipp:441
+#: src/emu/inpttype.ipp:475
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 7"
+msgid "%p Button 5"
 msgstr ""
 
-#: src/emu/inpttype.ipp:41
+#: src/emu/inpttype.ipp:39 src/emu/inpttype.ipp:157 src/emu/inpttype.ipp:238
+#: src/emu/inpttype.ipp:272 src/emu/inpttype.ipp:306 src/emu/inpttype.ipp:340
+#: src/emu/inpttype.ipp:374 src/emu/inpttype.ipp:408 src/emu/inpttype.ipp:442
+#: src/emu/inpttype.ipp:476
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 8"
+msgid "%p Button 6"
 msgstr ""
 
-#: src/emu/inpttype.ipp:42
+#: src/emu/inpttype.ipp:40 src/emu/inpttype.ipp:158 src/emu/inpttype.ipp:239
+#: src/emu/inpttype.ipp:273 src/emu/inpttype.ipp:307 src/emu/inpttype.ipp:341
+#: src/emu/inpttype.ipp:375 src/emu/inpttype.ipp:409 src/emu/inpttype.ipp:443
+#: src/emu/inpttype.ipp:477
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 9"
+msgid "%p Button 7"
 msgstr ""
 
-#: src/emu/inpttype.ipp:43
+#: src/emu/inpttype.ipp:41 src/emu/inpttype.ipp:159 src/emu/inpttype.ipp:240
+#: src/emu/inpttype.ipp:274 src/emu/inpttype.ipp:308 src/emu/inpttype.ipp:342
+#: src/emu/inpttype.ipp:376 src/emu/inpttype.ipp:410 src/emu/inpttype.ipp:444
+#: src/emu/inpttype.ipp:478
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 10"
+msgid "%p Button 8"
 msgstr ""
 
-#: src/emu/inpttype.ipp:44
+#: src/emu/inpttype.ipp:42 src/emu/inpttype.ipp:160 src/emu/inpttype.ipp:241
+#: src/emu/inpttype.ipp:275 src/emu/inpttype.ipp:309 src/emu/inpttype.ipp:343
+#: src/emu/inpttype.ipp:377 src/emu/inpttype.ipp:411 src/emu/inpttype.ipp:445
+#: src/emu/inpttype.ipp:479
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 11"
+msgid "%p Button 9"
 msgstr ""
 
-#: src/emu/inpttype.ipp:45
+#: src/emu/inpttype.ipp:43 src/emu/inpttype.ipp:161 src/emu/inpttype.ipp:242
+#: src/emu/inpttype.ipp:276 src/emu/inpttype.ipp:310 src/emu/inpttype.ipp:344
+#: src/emu/inpttype.ipp:378 src/emu/inpttype.ipp:412 src/emu/inpttype.ipp:446
+#: src/emu/inpttype.ipp:480
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 12"
+msgid "%p Button 10"
 msgstr ""
 
-#: src/emu/inpttype.ipp:46
+#: src/emu/inpttype.ipp:44 src/emu/inpttype.ipp:162 src/emu/inpttype.ipp:243
+#: src/emu/inpttype.ipp:277 src/emu/inpttype.ipp:311 src/emu/inpttype.ipp:345
+#: src/emu/inpttype.ipp:379 src/emu/inpttype.ipp:413 src/emu/inpttype.ipp:447
+#: src/emu/inpttype.ipp:481
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 13"
+msgid "%p Button 11"
 msgstr ""
 
-#: src/emu/inpttype.ipp:47
+#: src/emu/inpttype.ipp:45 src/emu/inpttype.ipp:163 src/emu/inpttype.ipp:244
+#: src/emu/inpttype.ipp:278 src/emu/inpttype.ipp:312 src/emu/inpttype.ipp:346
+#: src/emu/inpttype.ipp:380 src/emu/inpttype.ipp:414 src/emu/inpttype.ipp:448
+#: src/emu/inpttype.ipp:482
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 14"
+msgid "%p Button 12"
 msgstr ""
 
-#: src/emu/inpttype.ipp:48
+#: src/emu/inpttype.ipp:46 src/emu/inpttype.ipp:164 src/emu/inpttype.ipp:245
+#: src/emu/inpttype.ipp:279 src/emu/inpttype.ipp:313 src/emu/inpttype.ipp:347
+#: src/emu/inpttype.ipp:381 src/emu/inpttype.ipp:415 src/emu/inpttype.ipp:449
+#: src/emu/inpttype.ipp:483
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 15"
+msgid "%p Button 13"
 msgstr ""
 
-#: src/emu/inpttype.ipp:49
+#: src/emu/inpttype.ipp:47 src/emu/inpttype.ipp:165 src/emu/inpttype.ipp:246
+#: src/emu/inpttype.ipp:280 src/emu/inpttype.ipp:314 src/emu/inpttype.ipp:348
+#: src/emu/inpttype.ipp:382 src/emu/inpttype.ipp:416 src/emu/inpttype.ipp:450
+#: src/emu/inpttype.ipp:484
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 16"
+msgid "%p Button 14"
 msgstr ""
 
-#: src/emu/inpttype.ipp:50
+#: src/emu/inpttype.ipp:48 src/emu/inpttype.ipp:166 src/emu/inpttype.ipp:247
+#: src/emu/inpttype.ipp:281 src/emu/inpttype.ipp:315 src/emu/inpttype.ipp:349
+#: src/emu/inpttype.ipp:383 src/emu/inpttype.ipp:417 src/emu/inpttype.ipp:451
+#: src/emu/inpttype.ipp:485
+#, c-format
 msgctxt "input-name"
-msgid "P1 Start"
+msgid "%p Button 15"
 msgstr ""
 
-#: src/emu/inpttype.ipp:51
+#: src/emu/inpttype.ipp:49 src/emu/inpttype.ipp:167 src/emu/inpttype.ipp:248
+#: src/emu/inpttype.ipp:282 src/emu/inpttype.ipp:316 src/emu/inpttype.ipp:350
+#: src/emu/inpttype.ipp:384 src/emu/inpttype.ipp:418 src/emu/inpttype.ipp:452
+#: src/emu/inpttype.ipp:486
+#, c-format
 msgctxt "input-name"
-msgid "P1 Select"
+msgid "%p Button 16"
 msgstr ""
 
-#: src/emu/inpttype.ipp:56
+#: src/emu/inpttype.ipp:50 src/emu/inpttype.ipp:168 src/emu/inpttype.ipp:249
+#: src/emu/inpttype.ipp:283 src/emu/inpttype.ipp:317 src/emu/inpttype.ipp:351
+#: src/emu/inpttype.ipp:385 src/emu/inpttype.ipp:419 src/emu/inpttype.ipp:453
+#: src/emu/inpttype.ipp:487
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong A"
+msgid "%p Start"
 msgstr ""
 
-#: src/emu/inpttype.ipp:57
+#: src/emu/inpttype.ipp:51 src/emu/inpttype.ipp:169 src/emu/inpttype.ipp:250
+#: src/emu/inpttype.ipp:284 src/emu/inpttype.ipp:318 src/emu/inpttype.ipp:352
+#: src/emu/inpttype.ipp:386 src/emu/inpttype.ipp:420 src/emu/inpttype.ipp:454
+#: src/emu/inpttype.ipp:488
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong B"
+msgid "%p Select"
 msgstr ""
 
-#: src/emu/inpttype.ipp:58
+#: src/emu/inpttype.ipp:56 src/emu/inpttype.ipp:174
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong C"
+msgid "%p Mahjong A"
 msgstr ""
 
-#: src/emu/inpttype.ipp:59
+#: src/emu/inpttype.ipp:57 src/emu/inpttype.ipp:175
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong D"
+msgid "%p Mahjong B"
 msgstr ""
 
-#: src/emu/inpttype.ipp:60
+#: src/emu/inpttype.ipp:58 src/emu/inpttype.ipp:176
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong E"
+msgid "%p Mahjong C"
 msgstr ""
 
-#: src/emu/inpttype.ipp:61
+#: src/emu/inpttype.ipp:59 src/emu/inpttype.ipp:177
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong F"
+msgid "%p Mahjong D"
 msgstr ""
 
-#: src/emu/inpttype.ipp:62
+#: src/emu/inpttype.ipp:60 src/emu/inpttype.ipp:178
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong G"
+msgid "%p Mahjong E"
 msgstr ""
 
-#: src/emu/inpttype.ipp:63
+#: src/emu/inpttype.ipp:61 src/emu/inpttype.ipp:179
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong H"
+msgid "%p Mahjong F"
 msgstr ""
 
-#: src/emu/inpttype.ipp:64
+#: src/emu/inpttype.ipp:62 src/emu/inpttype.ipp:180
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong I"
+msgid "%p Mahjong G"
 msgstr ""
 
-#: src/emu/inpttype.ipp:65
+#: src/emu/inpttype.ipp:63 src/emu/inpttype.ipp:181
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong J"
+msgid "%p Mahjong H"
 msgstr ""
 
-#: src/emu/inpttype.ipp:66
+#: src/emu/inpttype.ipp:64 src/emu/inpttype.ipp:182
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong K"
+msgid "%p Mahjong I"
 msgstr ""
 
-#: src/emu/inpttype.ipp:67
+#: src/emu/inpttype.ipp:65 src/emu/inpttype.ipp:183
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong L"
+msgid "%p Mahjong J"
 msgstr ""
 
-#: src/emu/inpttype.ipp:68
+#: src/emu/inpttype.ipp:66 src/emu/inpttype.ipp:184
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong M"
+msgid "%p Mahjong K"
 msgstr ""
 
-#: src/emu/inpttype.ipp:69
+#: src/emu/inpttype.ipp:67 src/emu/inpttype.ipp:185
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong N"
+msgid "%p Mahjong L"
 msgstr ""
 
-#: src/emu/inpttype.ipp:70
+#: src/emu/inpttype.ipp:68 src/emu/inpttype.ipp:186
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong O"
+msgid "%p Mahjong M"
 msgstr ""
 
-#: src/emu/inpttype.ipp:71
+#: src/emu/inpttype.ipp:69 src/emu/inpttype.ipp:187
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong P"
+msgid "%p Mahjong N"
 msgstr ""
 
-#: src/emu/inpttype.ipp:72
+#: src/emu/inpttype.ipp:70 src/emu/inpttype.ipp:188
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Q"
+msgid "%p Mahjong O"
 msgstr ""
 
-#: src/emu/inpttype.ipp:73
+#: src/emu/inpttype.ipp:71 src/emu/inpttype.ipp:189
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Kan"
+msgid "%p Mahjong P"
 msgstr ""
 
-#: src/emu/inpttype.ipp:74
+#: src/emu/inpttype.ipp:72 src/emu/inpttype.ipp:190
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Pon"
+msgid "%p Mahjong Q"
 msgstr ""
 
-#: src/emu/inpttype.ipp:75
+#: src/emu/inpttype.ipp:73 src/emu/inpttype.ipp:191
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Chi"
+msgid "%p Mahjong Kan"
 msgstr ""
 
-#: src/emu/inpttype.ipp:76
+#: src/emu/inpttype.ipp:74 src/emu/inpttype.ipp:192
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Reach"
+msgid "%p Mahjong Pon"
 msgstr ""
 
-#: src/emu/inpttype.ipp:77
+#: src/emu/inpttype.ipp:75 src/emu/inpttype.ipp:193
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Ron"
+msgid "%p Mahjong Chi"
 msgstr ""
 
-#: src/emu/inpttype.ipp:78
+#: src/emu/inpttype.ipp:76 src/emu/inpttype.ipp:194
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Flip Flop"
+msgid "%p Mahjong Reach"
 msgstr ""
 
-#: src/emu/inpttype.ipp:79
+#: src/emu/inpttype.ipp:77 src/emu/inpttype.ipp:195
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Bet"
+msgid "%p Mahjong Ron"
 msgstr ""
 
-#: src/emu/inpttype.ipp:80
+#: src/emu/inpttype.ipp:78 src/emu/inpttype.ipp:200
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Take Score"
+msgid "%p Mahjong Flip Flop"
 msgstr ""
 
-#: src/emu/inpttype.ipp:81
+#: src/emu/inpttype.ipp:79 src/emu/inpttype.ipp:196
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Double Up"
+msgid "%p Mahjong Bet"
 msgstr ""
 
-#: src/emu/inpttype.ipp:82
+#: src/emu/inpttype.ipp:80 src/emu/inpttype.ipp:198
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Big"
+msgid "%p Mahjong Take Score"
 msgstr ""
 
-#: src/emu/inpttype.ipp:83
+#: src/emu/inpttype.ipp:81 src/emu/inpttype.ipp:199
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Small"
+msgid "%p Mahjong Double Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:84
+#: src/emu/inpttype.ipp:82 src/emu/inpttype.ipp:201
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Last Chance"
+msgid "%p Mahjong Big"
 msgstr ""
 
-#: src/emu/inpttype.ipp:89
+#: src/emu/inpttype.ipp:83 src/emu/inpttype.ipp:202
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda A/1"
+msgid "%p Mahjong Small"
 msgstr ""
 
-#: src/emu/inpttype.ipp:90
+#: src/emu/inpttype.ipp:84 src/emu/inpttype.ipp:197
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda B/2"
+msgid "%p Mahjong Last Chance"
 msgstr ""
 
-#: src/emu/inpttype.ipp:91
+#: src/emu/inpttype.ipp:89 src/emu/inpttype.ipp:207
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda C/3"
+msgid "%p Hanafuda A/1"
 msgstr ""
 
-#: src/emu/inpttype.ipp:92
+#: src/emu/inpttype.ipp:90 src/emu/inpttype.ipp:208
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda D/4"
+msgid "%p Hanafuda B/2"
 msgstr ""
 
-#: src/emu/inpttype.ipp:93
+#: src/emu/inpttype.ipp:91 src/emu/inpttype.ipp:209
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda E/5"
+msgid "%p Hanafuda C/3"
 msgstr ""
 
-#: src/emu/inpttype.ipp:94
+#: src/emu/inpttype.ipp:92 src/emu/inpttype.ipp:210
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda F/6"
+msgid "%p Hanafuda D/4"
 msgstr ""
 
-#: src/emu/inpttype.ipp:95
+#: src/emu/inpttype.ipp:93 src/emu/inpttype.ipp:211
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda G/7"
+msgid "%p Hanafuda E/5"
 msgstr ""
 
-#: src/emu/inpttype.ipp:96
+#: src/emu/inpttype.ipp:94 src/emu/inpttype.ipp:212
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda H/8"
+msgid "%p Hanafuda F/6"
 msgstr ""
 
-#: src/emu/inpttype.ipp:97
+#: src/emu/inpttype.ipp:95 src/emu/inpttype.ipp:213
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda Yes"
+msgid "%p Hanafuda G/7"
 msgstr ""
 
-#: src/emu/inpttype.ipp:98
+#: src/emu/inpttype.ipp:96 src/emu/inpttype.ipp:214
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda No"
+msgid "%p Hanafuda H/8"
+msgstr ""
+
+#: src/emu/inpttype.ipp:97 src/emu/inpttype.ipp:215
+#, c-format
+msgctxt "input-name"
+msgid "%p Hanafuda Yes"
+msgstr ""
+
+#: src/emu/inpttype.ipp:98 src/emu/inpttype.ipp:216
+#, c-format
+msgctxt "input-name"
+msgid "%p Hanafuda No"
 msgstr ""
 
 #: src/emu/inpttype.ipp:103
@@ -3751,1551 +3925,6 @@ msgctxt "input-name"
 msgid "Stop All Reels"
 msgstr ""
 
-#: src/emu/inpttype.ipp:140
-msgctxt "input-name"
-msgid "P2 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:141
-msgctxt "input-name"
-msgid "P2 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:142
-msgctxt "input-name"
-msgid "P2 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:143
-msgctxt "input-name"
-msgid "P2 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:144
-msgctxt "input-name"
-msgid "P2 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:145
-msgctxt "input-name"
-msgid "P2 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:146
-msgctxt "input-name"
-msgid "P2 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:147
-msgctxt "input-name"
-msgid "P2 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:148
-msgctxt "input-name"
-msgid "P2 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:149
-msgctxt "input-name"
-msgid "P2 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:150
-msgctxt "input-name"
-msgid "P2 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:151
-msgctxt "input-name"
-msgid "P2 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:152
-msgctxt "input-name"
-msgid "P2 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:153
-msgctxt "input-name"
-msgid "P2 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:154
-msgctxt "input-name"
-msgid "P2 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:155
-msgctxt "input-name"
-msgid "P2 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:156
-msgctxt "input-name"
-msgid "P2 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:157
-msgctxt "input-name"
-msgid "P2 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:158
-msgctxt "input-name"
-msgid "P2 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:159
-msgctxt "input-name"
-msgid "P2 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:160
-msgctxt "input-name"
-msgid "P2 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:161
-msgctxt "input-name"
-msgid "P2 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:162
-msgctxt "input-name"
-msgid "P2 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:163
-msgctxt "input-name"
-msgid "P2 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:164
-msgctxt "input-name"
-msgid "P2 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:165
-msgctxt "input-name"
-msgid "P2 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:166
-msgctxt "input-name"
-msgid "P2 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:167
-msgctxt "input-name"
-msgid "P2 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:168
-msgctxt "input-name"
-msgid "P2 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:169
-msgctxt "input-name"
-msgid "P2 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:174
-msgctxt "input-name"
-msgid "P2 Mahjong A"
-msgstr ""
-
-#: src/emu/inpttype.ipp:175
-msgctxt "input-name"
-msgid "P2 Mahjong B"
-msgstr ""
-
-#: src/emu/inpttype.ipp:176
-msgctxt "input-name"
-msgid "P2 Mahjong C"
-msgstr ""
-
-#: src/emu/inpttype.ipp:177
-msgctxt "input-name"
-msgid "P2 Mahjong D"
-msgstr ""
-
-#: src/emu/inpttype.ipp:178
-msgctxt "input-name"
-msgid "P2 Mahjong E"
-msgstr ""
-
-#: src/emu/inpttype.ipp:179
-msgctxt "input-name"
-msgid "P2 Mahjong F"
-msgstr ""
-
-#: src/emu/inpttype.ipp:180
-msgctxt "input-name"
-msgid "P2 Mahjong G"
-msgstr ""
-
-#: src/emu/inpttype.ipp:181
-msgctxt "input-name"
-msgid "P2 Mahjong H"
-msgstr ""
-
-#: src/emu/inpttype.ipp:182
-msgctxt "input-name"
-msgid "P2 Mahjong I"
-msgstr ""
-
-#: src/emu/inpttype.ipp:183
-msgctxt "input-name"
-msgid "P2 Mahjong J"
-msgstr ""
-
-#: src/emu/inpttype.ipp:184
-msgctxt "input-name"
-msgid "P2 Mahjong K"
-msgstr ""
-
-#: src/emu/inpttype.ipp:185
-msgctxt "input-name"
-msgid "P2 Mahjong L"
-msgstr ""
-
-#: src/emu/inpttype.ipp:186
-msgctxt "input-name"
-msgid "P2 Mahjong M"
-msgstr ""
-
-#: src/emu/inpttype.ipp:187
-msgctxt "input-name"
-msgid "P2 Mahjong N"
-msgstr ""
-
-#: src/emu/inpttype.ipp:188
-msgctxt "input-name"
-msgid "P2 Mahjong O"
-msgstr ""
-
-#: src/emu/inpttype.ipp:189
-msgctxt "input-name"
-msgid "P2 Mahjong P"
-msgstr ""
-
-#: src/emu/inpttype.ipp:190
-msgctxt "input-name"
-msgid "P2 Mahjong Q"
-msgstr ""
-
-#: src/emu/inpttype.ipp:191
-msgctxt "input-name"
-msgid "P2 Mahjong Kan"
-msgstr ""
-
-#: src/emu/inpttype.ipp:192
-msgctxt "input-name"
-msgid "P2 Mahjong Pon"
-msgstr ""
-
-#: src/emu/inpttype.ipp:193
-msgctxt "input-name"
-msgid "P2 Mahjong Chi"
-msgstr ""
-
-#: src/emu/inpttype.ipp:194
-msgctxt "input-name"
-msgid "P2 Mahjong Reach"
-msgstr ""
-
-#: src/emu/inpttype.ipp:195
-msgctxt "input-name"
-msgid "P2 Mahjong Ron"
-msgstr ""
-
-#: src/emu/inpttype.ipp:196
-msgctxt "input-name"
-msgid "P2 Mahjong Bet"
-msgstr ""
-
-#: src/emu/inpttype.ipp:197
-msgctxt "input-name"
-msgid "P2 Mahjong Last Chance"
-msgstr ""
-
-#: src/emu/inpttype.ipp:198
-msgctxt "input-name"
-msgid "P2 Mahjong Take Score"
-msgstr ""
-
-#: src/emu/inpttype.ipp:199
-msgctxt "input-name"
-msgid "P2 Mahjong Double Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:200
-msgctxt "input-name"
-msgid "P2 Mahjong Flip Flop"
-msgstr ""
-
-#: src/emu/inpttype.ipp:201
-msgctxt "input-name"
-msgid "P2 Mahjong Big"
-msgstr ""
-
-#: src/emu/inpttype.ipp:202
-msgctxt "input-name"
-msgid "P2 Mahjong Small"
-msgstr ""
-
-#: src/emu/inpttype.ipp:207
-msgctxt "input-name"
-msgid "P2 Hanafuda A/1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:208
-msgctxt "input-name"
-msgid "P2 Hanafuda B/2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:209
-msgctxt "input-name"
-msgid "P2 Hanafuda C/3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:210
-msgctxt "input-name"
-msgid "P2 Hanafuda D/4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:211
-msgctxt "input-name"
-msgid "P2 Hanafuda E/5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:212
-msgctxt "input-name"
-msgid "P2 Hanafuda F/6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:213
-msgctxt "input-name"
-msgid "P2 Hanafuda G/7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:214
-msgctxt "input-name"
-msgid "P2 Hanafuda H/8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:215
-msgctxt "input-name"
-msgid "P2 Hanafuda Yes"
-msgstr ""
-
-#: src/emu/inpttype.ipp:216
-msgctxt "input-name"
-msgid "P2 Hanafuda No"
-msgstr ""
-
-#: src/emu/inpttype.ipp:221
-msgctxt "input-name"
-msgid "P3 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:222
-msgctxt "input-name"
-msgid "P3 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:223
-msgctxt "input-name"
-msgid "P3 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:224
-msgctxt "input-name"
-msgid "P3 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:225
-msgctxt "input-name"
-msgid "P3 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:226
-msgctxt "input-name"
-msgid "P3 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:227
-msgctxt "input-name"
-msgid "P3 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:228
-msgctxt "input-name"
-msgid "P3 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:229
-msgctxt "input-name"
-msgid "P3 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:230
-msgctxt "input-name"
-msgid "P3 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:231
-msgctxt "input-name"
-msgid "P3 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:232
-msgctxt "input-name"
-msgid "P3 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:233
-msgctxt "input-name"
-msgid "P3 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:234
-msgctxt "input-name"
-msgid "P3 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:235
-msgctxt "input-name"
-msgid "P3 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:236
-msgctxt "input-name"
-msgid "P3 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:237
-msgctxt "input-name"
-msgid "P3 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:238
-msgctxt "input-name"
-msgid "P3 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:239
-msgctxt "input-name"
-msgid "P3 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:240
-msgctxt "input-name"
-msgid "P3 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:241
-msgctxt "input-name"
-msgid "P3 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:242
-msgctxt "input-name"
-msgid "P3 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:243
-msgctxt "input-name"
-msgid "P3 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:244
-msgctxt "input-name"
-msgid "P3 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:245
-msgctxt "input-name"
-msgid "P3 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:246
-msgctxt "input-name"
-msgid "P3 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:247
-msgctxt "input-name"
-msgid "P3 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:248
-msgctxt "input-name"
-msgid "P3 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:249
-msgctxt "input-name"
-msgid "P3 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:250
-msgctxt "input-name"
-msgid "P3 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:255
-msgctxt "input-name"
-msgid "P4 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:256
-msgctxt "input-name"
-msgid "P4 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:257
-msgctxt "input-name"
-msgid "P4 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:258
-msgctxt "input-name"
-msgid "P4 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:259
-msgctxt "input-name"
-msgid "P4 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:260
-msgctxt "input-name"
-msgid "P4 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:261
-msgctxt "input-name"
-msgid "P4 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:262
-msgctxt "input-name"
-msgid "P4 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:263
-msgctxt "input-name"
-msgid "P4 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:264
-msgctxt "input-name"
-msgid "P4 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:265
-msgctxt "input-name"
-msgid "P4 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:266
-msgctxt "input-name"
-msgid "P4 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:267
-msgctxt "input-name"
-msgid "P4 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:268
-msgctxt "input-name"
-msgid "P4 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:269
-msgctxt "input-name"
-msgid "P4 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:270
-msgctxt "input-name"
-msgid "P4 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:271
-msgctxt "input-name"
-msgid "P4 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:272
-msgctxt "input-name"
-msgid "P4 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:273
-msgctxt "input-name"
-msgid "P4 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:274
-msgctxt "input-name"
-msgid "P4 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:275
-msgctxt "input-name"
-msgid "P4 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:276
-msgctxt "input-name"
-msgid "P4 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:277
-msgctxt "input-name"
-msgid "P4 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:278
-msgctxt "input-name"
-msgid "P4 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:279
-msgctxt "input-name"
-msgid "P4 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:280
-msgctxt "input-name"
-msgid "P4 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:281
-msgctxt "input-name"
-msgid "P4 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:282
-msgctxt "input-name"
-msgid "P4 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:283
-msgctxt "input-name"
-msgid "P4 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:284
-msgctxt "input-name"
-msgid "P4 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:289
-msgctxt "input-name"
-msgid "P5 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:290
-msgctxt "input-name"
-msgid "P5 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:291
-msgctxt "input-name"
-msgid "P5 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:292
-msgctxt "input-name"
-msgid "P5 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:293
-msgctxt "input-name"
-msgid "P5 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:294
-msgctxt "input-name"
-msgid "P5 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:295
-msgctxt "input-name"
-msgid "P5 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:296
-msgctxt "input-name"
-msgid "P5 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:297
-msgctxt "input-name"
-msgid "P5 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:298
-msgctxt "input-name"
-msgid "P5 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:299
-msgctxt "input-name"
-msgid "P5 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:300
-msgctxt "input-name"
-msgid "P5 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:301
-msgctxt "input-name"
-msgid "P5 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:302
-msgctxt "input-name"
-msgid "P5 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:303
-msgctxt "input-name"
-msgid "P5 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:304
-msgctxt "input-name"
-msgid "P5 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:305
-msgctxt "input-name"
-msgid "P5 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:306
-msgctxt "input-name"
-msgid "P5 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:307
-msgctxt "input-name"
-msgid "P5 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:308
-msgctxt "input-name"
-msgid "P5 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:309
-msgctxt "input-name"
-msgid "P5 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:310
-msgctxt "input-name"
-msgid "P5 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:311
-msgctxt "input-name"
-msgid "P5 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:312
-msgctxt "input-name"
-msgid "P5 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:313
-msgctxt "input-name"
-msgid "P5 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:314
-msgctxt "input-name"
-msgid "P5 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:315
-msgctxt "input-name"
-msgid "P5 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:316
-msgctxt "input-name"
-msgid "P5 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:317
-msgctxt "input-name"
-msgid "P5 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:318
-msgctxt "input-name"
-msgid "P5 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:323
-msgctxt "input-name"
-msgid "P6 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:324
-msgctxt "input-name"
-msgid "P6 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:325
-msgctxt "input-name"
-msgid "P6 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:326
-msgctxt "input-name"
-msgid "P6 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:327
-msgctxt "input-name"
-msgid "P6 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:328
-msgctxt "input-name"
-msgid "P6 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:329
-msgctxt "input-name"
-msgid "P6 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:330
-msgctxt "input-name"
-msgid "P6 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:331
-msgctxt "input-name"
-msgid "P6 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:332
-msgctxt "input-name"
-msgid "P6 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:333
-msgctxt "input-name"
-msgid "P6 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:334
-msgctxt "input-name"
-msgid "P6 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:335
-msgctxt "input-name"
-msgid "P6 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:336
-msgctxt "input-name"
-msgid "P6 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:337
-msgctxt "input-name"
-msgid "P6 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:338
-msgctxt "input-name"
-msgid "P6 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:339
-msgctxt "input-name"
-msgid "P6 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:340
-msgctxt "input-name"
-msgid "P6 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:341
-msgctxt "input-name"
-msgid "P6 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:342
-msgctxt "input-name"
-msgid "P6 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:343
-msgctxt "input-name"
-msgid "P6 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:344
-msgctxt "input-name"
-msgid "P6 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:345
-msgctxt "input-name"
-msgid "P6 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:346
-msgctxt "input-name"
-msgid "P6 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:347
-msgctxt "input-name"
-msgid "P6 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:348
-msgctxt "input-name"
-msgid "P6 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:349
-msgctxt "input-name"
-msgid "P6 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:350
-msgctxt "input-name"
-msgid "P6 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:351
-msgctxt "input-name"
-msgid "P6 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:352
-msgctxt "input-name"
-msgid "P6 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:357
-msgctxt "input-name"
-msgid "P7 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:358
-msgctxt "input-name"
-msgid "P7 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:359
-msgctxt "input-name"
-msgid "P7 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:360
-msgctxt "input-name"
-msgid "P7 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:361
-msgctxt "input-name"
-msgid "P7 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:362
-msgctxt "input-name"
-msgid "P7 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:363
-msgctxt "input-name"
-msgid "P7 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:364
-msgctxt "input-name"
-msgid "P7 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:365
-msgctxt "input-name"
-msgid "P7 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:366
-msgctxt "input-name"
-msgid "P7 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:367
-msgctxt "input-name"
-msgid "P7 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:368
-msgctxt "input-name"
-msgid "P7 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:369
-msgctxt "input-name"
-msgid "P7 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:370
-msgctxt "input-name"
-msgid "P7 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:371
-msgctxt "input-name"
-msgid "P7 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:372
-msgctxt "input-name"
-msgid "P7 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:373
-msgctxt "input-name"
-msgid "P7 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:374
-msgctxt "input-name"
-msgid "P7 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:375
-msgctxt "input-name"
-msgid "P7 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:376
-msgctxt "input-name"
-msgid "P7 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:377
-msgctxt "input-name"
-msgid "P7 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:378
-msgctxt "input-name"
-msgid "P7 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:379
-msgctxt "input-name"
-msgid "P7 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:380
-msgctxt "input-name"
-msgid "P7 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:381
-msgctxt "input-name"
-msgid "P7 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:382
-msgctxt "input-name"
-msgid "P7 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:383
-msgctxt "input-name"
-msgid "P7 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:384
-msgctxt "input-name"
-msgid "P7 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:385
-msgctxt "input-name"
-msgid "P7 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:386
-msgctxt "input-name"
-msgid "P7 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:391
-msgctxt "input-name"
-msgid "P8 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:392
-msgctxt "input-name"
-msgid "P8 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:393
-msgctxt "input-name"
-msgid "P8 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:394
-msgctxt "input-name"
-msgid "P8 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:395
-msgctxt "input-name"
-msgid "P8 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:396
-msgctxt "input-name"
-msgid "P8 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:397
-msgctxt "input-name"
-msgid "P8 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:398
-msgctxt "input-name"
-msgid "P8 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:399
-msgctxt "input-name"
-msgid "P8 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:400
-msgctxt "input-name"
-msgid "P8 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:401
-msgctxt "input-name"
-msgid "P8 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:402
-msgctxt "input-name"
-msgid "P8 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:403
-msgctxt "input-name"
-msgid "P8 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:404
-msgctxt "input-name"
-msgid "P8 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:405
-msgctxt "input-name"
-msgid "P8 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:406
-msgctxt "input-name"
-msgid "P8 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:407
-msgctxt "input-name"
-msgid "P8 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:408
-msgctxt "input-name"
-msgid "P8 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:409
-msgctxt "input-name"
-msgid "P8 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:410
-msgctxt "input-name"
-msgid "P8 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:411
-msgctxt "input-name"
-msgid "P8 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:412
-msgctxt "input-name"
-msgid "P8 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:413
-msgctxt "input-name"
-msgid "P8 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:414
-msgctxt "input-name"
-msgid "P8 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:415
-msgctxt "input-name"
-msgid "P8 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:416
-msgctxt "input-name"
-msgid "P8 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:417
-msgctxt "input-name"
-msgid "P8 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:418
-msgctxt "input-name"
-msgid "P8 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:419
-msgctxt "input-name"
-msgid "P8 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:420
-msgctxt "input-name"
-msgid "P8 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:425
-msgctxt "input-name"
-msgid "P9 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:426
-msgctxt "input-name"
-msgid "P9 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:427
-msgctxt "input-name"
-msgid "P9 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:428
-msgctxt "input-name"
-msgid "P9 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:429
-msgctxt "input-name"
-msgid "P9 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:430
-msgctxt "input-name"
-msgid "P9 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:431
-msgctxt "input-name"
-msgid "P9 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:432
-msgctxt "input-name"
-msgid "P9 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:433
-msgctxt "input-name"
-msgid "P9 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:434
-msgctxt "input-name"
-msgid "P9 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:435
-msgctxt "input-name"
-msgid "P9 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:436
-msgctxt "input-name"
-msgid "P9 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:437
-msgctxt "input-name"
-msgid "P9 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:438
-msgctxt "input-name"
-msgid "P9 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:439
-msgctxt "input-name"
-msgid "P9 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:440
-msgctxt "input-name"
-msgid "P9 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:441
-msgctxt "input-name"
-msgid "P9 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:442
-msgctxt "input-name"
-msgid "P9 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:443
-msgctxt "input-name"
-msgid "P9 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:444
-msgctxt "input-name"
-msgid "P9 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:445
-msgctxt "input-name"
-msgid "P9 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:446
-msgctxt "input-name"
-msgid "P9 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:447
-msgctxt "input-name"
-msgid "P9 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:448
-msgctxt "input-name"
-msgid "P9 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:449
-msgctxt "input-name"
-msgid "P9 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:450
-msgctxt "input-name"
-msgid "P9 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:451
-msgctxt "input-name"
-msgid "P9 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:452
-msgctxt "input-name"
-msgid "P9 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:453
-msgctxt "input-name"
-msgid "P9 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:454
-msgctxt "input-name"
-msgid "P9 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:459
-msgctxt "input-name"
-msgid "P10 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:460
-msgctxt "input-name"
-msgid "P10 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:461
-msgctxt "input-name"
-msgid "P10 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:462
-msgctxt "input-name"
-msgid "P10 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:463
-msgctxt "input-name"
-msgid "P10 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:464
-msgctxt "input-name"
-msgid "P10 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:465
-msgctxt "input-name"
-msgid "P10 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:466
-msgctxt "input-name"
-msgid "P10 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:467
-msgctxt "input-name"
-msgid "P10 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:468
-msgctxt "input-name"
-msgid "P10 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:469
-msgctxt "input-name"
-msgid "P10 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:470
-msgctxt "input-name"
-msgid "P10 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:471
-msgctxt "input-name"
-msgid "P10 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:472
-msgctxt "input-name"
-msgid "P10 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:473
-msgctxt "input-name"
-msgid "P10 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:474
-msgctxt "input-name"
-msgid "P10 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:475
-msgctxt "input-name"
-msgid "P10 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:476
-msgctxt "input-name"
-msgid "P10 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:477
-msgctxt "input-name"
-msgid "P10 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:478
-msgctxt "input-name"
-msgid "P10 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:479
-msgctxt "input-name"
-msgid "P10 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:480
-msgctxt "input-name"
-msgid "P10 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:481
-msgctxt "input-name"
-msgid "P10 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:482
-msgctxt "input-name"
-msgid "P10 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:483
-msgctxt "input-name"
-msgid "P10 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:484
-msgctxt "input-name"
-msgid "P10 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:485
-msgctxt "input-name"
-msgid "P10 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:486
-msgctxt "input-name"
-msgid "P10 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:487
-msgctxt "input-name"
-msgid "P10 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:488
-msgctxt "input-name"
-msgid "P10 Select"
-msgstr ""
-
 #: src/emu/inpttype.ipp:493
 msgctxt "input-name"
 msgid "1 Player Start"
@@ -5476,154 +4105,31 @@ msgctxt "input-name"
 msgid "Volume Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:550
-msgctxt "input-name"
-msgid "P1 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:551
-msgctxt "input-name"
-msgid "P2 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:552
-msgctxt "input-name"
-msgid "P3 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:553
-msgctxt "input-name"
-msgid "P4 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:554
-msgctxt "input-name"
-msgid "P5 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:555
-msgctxt "input-name"
-msgid "P6 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:556
-msgctxt "input-name"
-msgid "P7 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:557
-msgctxt "input-name"
-msgid "P8 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:558
-msgctxt "input-name"
-msgid "P9 Pedal 1"
-msgstr ""
-
+#: src/emu/inpttype.ipp:550 src/emu/inpttype.ipp:551 src/emu/inpttype.ipp:552
+#: src/emu/inpttype.ipp:553 src/emu/inpttype.ipp:554 src/emu/inpttype.ipp:555
+#: src/emu/inpttype.ipp:556 src/emu/inpttype.ipp:557 src/emu/inpttype.ipp:558
 #: src/emu/inpttype.ipp:559
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:564
-msgctxt "input-name"
-msgid "P1 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:565
-msgctxt "input-name"
-msgid "P2 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:566
-msgctxt "input-name"
-msgid "P3 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:567
-msgctxt "input-name"
-msgid "P4 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:568
-msgctxt "input-name"
-msgid "P5 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:569
-msgctxt "input-name"
-msgid "P6 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:570
-msgctxt "input-name"
-msgid "P7 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:571
-msgctxt "input-name"
-msgid "P8 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:572
-msgctxt "input-name"
-msgid "P9 Pedal 2"
+msgid "%p Pedal 1"
 msgstr ""
 
+#: src/emu/inpttype.ipp:564 src/emu/inpttype.ipp:565 src/emu/inpttype.ipp:566
+#: src/emu/inpttype.ipp:567 src/emu/inpttype.ipp:568 src/emu/inpttype.ipp:569
+#: src/emu/inpttype.ipp:570 src/emu/inpttype.ipp:571 src/emu/inpttype.ipp:572
 #: src/emu/inpttype.ipp:573
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:578
-msgctxt "input-name"
-msgid "P1 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:579
-msgctxt "input-name"
-msgid "P2 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:580
-msgctxt "input-name"
-msgid "P3 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:581
-msgctxt "input-name"
-msgid "P4 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:582
-msgctxt "input-name"
-msgid "P5 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:583
-msgctxt "input-name"
-msgid "P6 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:584
-msgctxt "input-name"
-msgid "P7 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:585
-msgctxt "input-name"
-msgid "P8 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:586
-msgctxt "input-name"
-msgid "P9 Pedal 3"
+msgid "%p Pedal 2"
 msgstr ""
 
+#: src/emu/inpttype.ipp:578 src/emu/inpttype.ipp:579 src/emu/inpttype.ipp:580
+#: src/emu/inpttype.ipp:581 src/emu/inpttype.ipp:582 src/emu/inpttype.ipp:583
+#: src/emu/inpttype.ipp:584 src/emu/inpttype.ipp:585 src/emu/inpttype.ipp:586
 #: src/emu/inpttype.ipp:587
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 3"
+msgid "%p Pedal 3"
 msgstr ""
 
 #: src/emu/inpttype.ipp:592
diff --git a/language/Hungarian/strings.po b/language/Hungarian/strings.po
index 2f16e853982..9000536c3bf 100644
--- a/language/Hungarian/strings.po
+++ b/language/Hungarian/strings.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-19 02:50+1100\n"
+"POT-Creation-Date: 2021-12-09 04:44+1100\n"
 "PO-Revision-Date: 2017-05-20 09:18+0200\n"
 "Last-Translator: Delirious <zsoltn71@gmail.com>\n"
 "Language-Team: MAME Language Team\n"
@@ -270,12 +270,12 @@ msgstr "%1$s %2$s ( %3$d / %4$d szoftver csomag )"
 msgid "Driver: \"%1$s\" software list "
 msgstr "Vezérlőprogram: \"%1$s\" szoftver lista "
 
-#: src/frontend/mame/ui/selsoft.cpp:711 src/frontend/mame/ui/selgame.cpp:1066
+#: src/frontend/mame/ui/selsoft.cpp:711 src/frontend/mame/ui/selgame.cpp:1076
 #, c-format
 msgid "%1$s: %2$s - Search: %3$s_"
 msgstr ""
 
-#: src/frontend/mame/ui/selsoft.cpp:713 src/frontend/mame/ui/selgame.cpp:1068
+#: src/frontend/mame/ui/selsoft.cpp:713 src/frontend/mame/ui/selgame.cpp:1078
 #, c-format
 msgid "Search: %1$s_"
 msgstr ""
@@ -285,7 +285,7 @@ msgstr ""
 msgid "Software list/item: %1$s:%2$s"
 msgstr ""
 
-#: src/frontend/mame/ui/optsmenu.cpp:73 src/frontend/mame/ui/sndmenu.cpp:165
+#: src/frontend/mame/ui/optsmenu.cpp:73 src/frontend/mame/ui/sndmenu.cpp:161
 msgid "Sound Options"
 msgstr "Hang beállítások"
 
@@ -380,12 +380,12 @@ msgid "Show mouse pointer"
 msgstr "Egérmutató megjelenítése"
 
 #: src/frontend/mame/ui/submenu.cpp:39
-msgid "Confirm quit from machines"
-msgstr "Gépekből történő kilépés megerősítése"
+msgid "Confirm quit from emulation"
+msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:40
-msgid "Skip information screen at startup"
-msgstr "Indításkori tájékoztató képernyő kihagyása "
+msgid "Skip system information screen"
+msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:41
 msgid "Force 4:3 aspect for snapshot display"
@@ -400,7 +400,7 @@ msgid "Skip BIOS selection menu"
 msgstr "BIOS választási menü kihagyása"
 
 #: src/frontend/mame/ui/submenu.cpp:44
-msgid "Skip software parts selection menu"
+msgid "Skip software part selection menu"
 msgstr "Szoftver elemek választási menü kihagyása"
 
 #: src/frontend/mame/ui/submenu.cpp:45
@@ -552,7 +552,7 @@ msgid "UI active"
 msgstr "Felület aktív"
 
 #: src/frontend/mame/ui/submenu.cpp:91
-msgid "Offscreen reload"
+msgid "Off-screen reload"
 msgstr "Újratöltés képen kívül"
 
 #: src/frontend/mame/ui/submenu.cpp:92
@@ -568,8 +568,8 @@ msgid "Natural keyboard"
 msgstr "Természetes billentyűzet"
 
 #: src/frontend/mame/ui/submenu.cpp:95
-msgid "Simultaneous contradictory"
-msgstr "Folyamatos ellentmondás"
+msgid "Allow contradictory joystick inputs"
+msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:96
 msgid "Coin impulse"
@@ -592,8 +592,8 @@ msgid "Pedal Device Assignment"
 msgstr "Pedál eszköz gombkiosztása"
 
 #: src/frontend/mame/ui/submenu.cpp:106
-msgid "Adstick Device Assignment"
-msgstr "ADStick eszköz beállítás"
+msgid "AD Stick Device Assignment"
+msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:107
 msgid "Paddle Device Assignment"
@@ -679,14 +679,14 @@ msgstr "Szinkronizált frissítés"
 msgid "Wait Vertical Sync"
 msgstr "V-sync-re várás"
 
-#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:687
+#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:689
 #: src/frontend/mame/ui/videoopt.cpp:191 src/frontend/mame/ui/custui.cpp:490
 #: src/frontend/mame/ui/analogipt.cpp:471 plugins/cheatfind/init.lua:766
 #: plugins/cheatfind/init.lua:777 plugins/cheat/init.lua:668
 msgid "On"
 msgstr "Be"
 
-#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:690
+#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:692
 #: src/frontend/mame/ui/videoopt.cpp:207 src/frontend/mame/ui/custui.cpp:490
 #: src/frontend/mame/ui/analogipt.cpp:471 plugins/cheatfind/init.lua:763
 #: plugins/cheatfind/init.lua:774 plugins/cheat/init.lua:671
@@ -694,11 +694,11 @@ msgstr "Be"
 msgid "Off"
 msgstr "Ki"
 
-#: src/frontend/mame/ui/menu.cpp:693
+#: src/frontend/mame/ui/menu.cpp:695
 msgid "Auto"
 msgstr "Automata"
 
-#: src/frontend/mame/ui/menu.cpp:1195
+#: src/frontend/mame/ui/menu.cpp:1197
 #: src/frontend/mame/ui/simpleselgame.cpp:278
 #: src/frontend/mame/ui/selmenu.cpp:1280
 msgid "Return to Previous Menu"
@@ -706,7 +706,7 @@ msgstr "Vissza az előző menübe"
 
 #: src/frontend/mame/ui/filemngr.cpp:139
 #: src/frontend/mame/ui/confswitch.cpp:119
-#: src/frontend/mame/ui/inputmap.cpp:559 src/frontend/mame/ui/analogipt.cpp:360
+#: src/frontend/mame/ui/inputmap.cpp:563 src/frontend/mame/ui/analogipt.cpp:360
 #, c-format
 msgid "[root%1$s]"
 msgstr ""
@@ -969,22 +969,22 @@ msgstr ""
 "Processzor:\n"
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "GHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "MHz"
 msgstr "MHz"
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "kHz"
 msgstr "kHz"
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "Hz"
 msgstr ""
 
@@ -1012,38 +1012,38 @@ msgstr "Nincs\n"
 msgid "Vector"
 msgstr "Vektor"
 
-#: src/frontend/mame/ui/info.cpp:480
+#: src/frontend/mame/ui/info.cpp:483
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr "%1$s: %2$s\n"
 
-#: src/frontend/mame/ui/info.cpp:480
+#: src/frontend/mame/ui/info.cpp:483
 msgid "%2$s\n"
 msgstr "%2$s\n"
 
-#: src/frontend/mame/ui/info.cpp:497
+#: src/frontend/mame/ui/info.cpp:500
 #, c-format
 msgid "Screen '%1$s'"
 msgstr "Képernyő '%1$s'"
 
-#: src/frontend/mame/ui/info.cpp:499
+#: src/frontend/mame/ui/info.cpp:502
 msgid "Screen"
 msgstr "Képernyő"
 
-#: src/frontend/mame/ui/info.cpp:570 src/frontend/mame/ui/info.cpp:581
+#: src/frontend/mame/ui/info.cpp:573 src/frontend/mame/ui/info.cpp:584
 #, c-format
 msgid "%1$s:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:662
+#: src/frontend/mame/ui/info.cpp:665
 msgid "Not supported"
 msgstr "Nem támogatott"
 
-#: src/frontend/mame/ui/info.cpp:665
+#: src/frontend/mame/ui/info.cpp:668
 msgid "Partially supported"
 msgstr "Részlegesen támogatva"
 
-#: src/frontend/mame/ui/info.cpp:674
+#: src/frontend/mame/ui/info.cpp:677
 msgid "[empty]"
 msgstr "[üres]"
 
@@ -1116,7 +1116,7 @@ msgid "Emulated"
 msgstr "Emulálva"
 
 #: src/frontend/mame/ui/keyboard.cpp:59 src/frontend/mame/ui/confswitch.cpp:117
-#: src/frontend/mame/ui/inputmap.cpp:557 src/frontend/mame/ui/analogipt.cpp:358
+#: src/frontend/mame/ui/inputmap.cpp:561 src/frontend/mame/ui/analogipt.cpp:358
 #, c-format
 msgid "%1$s [root%2$s]"
 msgstr ""
@@ -1476,7 +1476,7 @@ msgctxt "swlist-info"
 msgid "Software list/item"
 msgstr ""
 
-#: src/frontend/mame/ui/datmenu.cpp:88 src/frontend/mame/ui/selmenu.cpp:2698
+#: src/frontend/mame/ui/datmenu.cpp:88 src/frontend/mame/ui/selmenu.cpp:2707
 msgid "Software List Info"
 msgstr ""
 
@@ -1599,7 +1599,7 @@ msgstr ""
 msgid "Configure Machine:"
 msgstr ""
 
-#: src/frontend/mame/ui/miscmenu.cpp:858 src/frontend/mame/ui/selmenu.cpp:2638
+#: src/frontend/mame/ui/miscmenu.cpp:858 src/frontend/mame/ui/selmenu.cpp:2647
 msgid " (default)"
 msgstr " (alap)"
 
@@ -1616,7 +1616,7 @@ msgid ""
 "Press %2$s to return to emulation"
 msgstr ""
 
-#: src/frontend/mame/ui/info_pty.cpp:30 src/frontend/mame/ui/mainmenu.cpp:155
+#: src/frontend/mame/ui/info_pty.cpp:30
 msgid "Pseudo terminals"
 msgstr "Pszeudó terminálok"
 
@@ -1684,52 +1684,52 @@ msgstr ""
 msgid "Other Controls"
 msgstr "Egyéb irányítók"
 
-#: src/frontend/mame/ui/inputmap.cpp:227
+#: src/frontend/mame/ui/inputmap.cpp:231
 msgid "This machine has no configurable inputs."
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:327
+#: src/frontend/mame/ui/inputmap.cpp:331
 msgid "Pressed"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:397
+#: src/frontend/mame/ui/inputmap.cpp:401
 msgid "Invalid sequence entered"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:542
+#: src/frontend/mame/ui/inputmap.cpp:546
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:543
+#: src/frontend/mame/ui/inputmap.cpp:547
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog Inc"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:544
+#: src/frontend/mame/ui/inputmap.cpp:548
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog Dec"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:586
+#: src/frontend/mame/ui/inputmap.cpp:590
 #, c-format
 msgid "Press %1$s to set\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:587
+#: src/frontend/mame/ui/inputmap.cpp:591
 #, c-format
 msgid "Press %1$s to append\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:588
+#: src/frontend/mame/ui/inputmap.cpp:592
 #, c-format
 msgid "Press %1$s to clear\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:589
+#: src/frontend/mame/ui/inputmap.cpp:593
 #, c-format
 msgid "Press %1$s to restore default\n"
 msgstr ""
@@ -1793,7 +1793,7 @@ msgid ""
 msgstr ""
 
 #: src/frontend/mame/ui/simpleselgame.cpp:273
-#: src/frontend/mame/ui/selgame.cpp:436
+#: src/frontend/mame/ui/selgame.cpp:443
 msgid "Configure Options"
 msgstr "Beállítási lehetőségek"
 
@@ -2129,16 +2129,16 @@ msgstr ""
 msgid "Expand to fit"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:437
+#: src/frontend/mame/ui/selgame.cpp:444
 msgid "Configure Machine"
 msgstr "Gép beállítások"
 
-#: src/frontend/mame/ui/selgame.cpp:1050
+#: src/frontend/mame/ui/selgame.cpp:1060
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d machines (%5$d BIOS) )"
 msgstr "%1$s %2$s ( %3$d / %4$d gép (%5$d BIOS) )"
 
-#: src/frontend/mame/ui/selgame.cpp:1078
+#: src/frontend/mame/ui/selgame.cpp:1088
 #, c-format
 msgid "System: %1$-.100s"
 msgstr "Rendszer: %1$-.100s"
@@ -2160,7 +2160,7 @@ msgstr ""
 #: src/frontend/mame/ui/auditmenu.cpp:98
 #, c-format
 msgid ""
-"Auditing ROMs for machine %2$u of %3$u...\n"
+"Auditing media for machine %2$u of %3$u...\n"
 "%1$s"
 msgstr ""
 
@@ -2175,12 +2175,12 @@ msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:136
 #, c-format
-msgid "Audit ROMs for %1$u machines marked unavailable"
+msgid "Audit media for %1$u machines marked unavailable"
 msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:137
 #, c-format
-msgid "Audit ROMs for all %1$u machines"
+msgid "Audit media for all %1$u machines"
 msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:154
@@ -2387,84 +2387,84 @@ msgctxt "color-sample"
 msgid "Clone"
 msgstr "Klón"
 
-#: src/frontend/mame/ui/custui.cpp:914
+#: src/frontend/mame/ui/custui.cpp:906
 msgid "ARGB Settings"
 msgstr "ARGB beállítások"
 
-#: src/frontend/mame/ui/custui.cpp:919 src/frontend/mame/ui/custui.cpp:922
+#: src/frontend/mame/ui/custui.cpp:911 src/frontend/mame/ui/custui.cpp:914
 msgctxt "color-channel"
 msgid "Alpha"
 msgstr "Alpha"
 
-#: src/frontend/mame/ui/custui.cpp:927 src/frontend/mame/ui/custui.cpp:930
+#: src/frontend/mame/ui/custui.cpp:919 src/frontend/mame/ui/custui.cpp:922
 msgctxt "color-channel"
 msgid "Red"
 msgstr "Vörös"
 
-#: src/frontend/mame/ui/custui.cpp:935 src/frontend/mame/ui/custui.cpp:938
+#: src/frontend/mame/ui/custui.cpp:927 src/frontend/mame/ui/custui.cpp:930
 msgctxt "color-channel"
 msgid "Green"
 msgstr "Zöld"
 
-#: src/frontend/mame/ui/custui.cpp:943 src/frontend/mame/ui/custui.cpp:946
+#: src/frontend/mame/ui/custui.cpp:935 src/frontend/mame/ui/custui.cpp:938
 msgctxt "color-channel"
 msgid "Blue"
 msgstr "Kék"
 
-#: src/frontend/mame/ui/custui.cpp:949
+#: src/frontend/mame/ui/custui.cpp:941
 msgid "Choose from palette"
 msgstr "Választás a palettából"
 
-#: src/frontend/mame/ui/custui.cpp:996
+#: src/frontend/mame/ui/custui.cpp:988
 msgid "Color preview:"
 msgstr "Szín előnézet:"
 
-#: src/frontend/mame/ui/custui.cpp:1093
+#: src/frontend/mame/ui/custui.cpp:1085
 msgctxt "color-preset"
 msgid "White"
 msgstr "Fehér"
 
-#: src/frontend/mame/ui/custui.cpp:1094
+#: src/frontend/mame/ui/custui.cpp:1086
 msgctxt "color-preset"
 msgid "Silver"
 msgstr "Ezüst"
 
-#: src/frontend/mame/ui/custui.cpp:1095
+#: src/frontend/mame/ui/custui.cpp:1087
 msgctxt "color-preset"
 msgid "Gray"
 msgstr "Szürke"
 
-#: src/frontend/mame/ui/custui.cpp:1096
+#: src/frontend/mame/ui/custui.cpp:1088
 msgctxt "color-preset"
 msgid "Black"
 msgstr "Fekete"
 
-#: src/frontend/mame/ui/custui.cpp:1097
+#: src/frontend/mame/ui/custui.cpp:1089
 msgctxt "color-preset"
 msgid "Red"
 msgstr "Vörös"
 
-#: src/frontend/mame/ui/custui.cpp:1098
+#: src/frontend/mame/ui/custui.cpp:1090
 msgctxt "color-preset"
 msgid "Orange"
 msgstr "Narancs"
 
-#: src/frontend/mame/ui/custui.cpp:1099
+#: src/frontend/mame/ui/custui.cpp:1091
 msgctxt "color-preset"
 msgid "Yellow"
 msgstr "Sárga"
 
-#: src/frontend/mame/ui/custui.cpp:1100
+#: src/frontend/mame/ui/custui.cpp:1092
 msgctxt "color-preset"
 msgid "Green"
 msgstr "Zöld"
 
-#: src/frontend/mame/ui/custui.cpp:1101
+#: src/frontend/mame/ui/custui.cpp:1093
 msgctxt "color-preset"
 msgid "Blue"
 msgstr "Kék"
 
-#: src/frontend/mame/ui/custui.cpp:1102
+#: src/frontend/mame/ui/custui.cpp:1094
 msgctxt "color-preset"
 msgid "Violet"
 msgstr "Ibolya"
@@ -2529,7 +2529,7 @@ msgid "Input (general)"
 msgstr "Irányítás (általános)"
 
 #: src/frontend/mame/ui/mainmenu.cpp:123
-msgid "Input (this Machine)"
+msgid "Input (this machine)"
 msgstr "Irányítás (ez a gép)"
 
 #: src/frontend/mame/ui/mainmenu.cpp:126
@@ -2568,6 +2568,10 @@ msgstr "Fájl kezelő"
 msgid "Tape Control"
 msgstr "Kazetta irányítók"
 
+#: src/frontend/mame/ui/mainmenu.cpp:155
+msgid "Pseudo Terminals"
+msgstr ""
+
 #: src/frontend/mame/ui/mainmenu.cpp:158
 msgid "BIOS Selection"
 msgstr "BIOS választás"
@@ -2606,7 +2610,7 @@ msgstr "Külső DAT nézet"
 
 #: src/frontend/mame/ui/mainmenu.cpp:200
 #, c-format
-msgid "About %s"
+msgid "About %1$s"
 msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:212
@@ -2766,373 +2770,373 @@ msgstr "A vezérlőprogram a következő klónja: %1$s"
 msgid "%1$s %2$s"
 msgstr "%1$s %2$s"
 
-#: src/frontend/mame/ui/selmenu.cpp:2235
+#: src/frontend/mame/ui/selmenu.cpp:2244
 msgid "Images"
 msgstr "Képek"
 
-#: src/frontend/mame/ui/selmenu.cpp:2236
+#: src/frontend/mame/ui/selmenu.cpp:2245
 msgid "Infos"
 msgstr "Infók"
 
-#: src/frontend/mame/ui/selmenu.cpp:2551
+#: src/frontend/mame/ui/selmenu.cpp:2560
 msgid ""
 "Required ROM/disk images for the selected system are missing or incorrect. "
 "Please acquire the correct files or select a different system.\n"
 "\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2567
+#: src/frontend/mame/ui/selmenu.cpp:2576
 msgid ""
 "Required ROM/disk images for the selected software are missing or incorrect. "
 "Please acquire the correct files or select a different software item.\n"
 "\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2583
+#: src/frontend/mame/ui/selmenu.cpp:2592
 msgid "incorrect checksum"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2586
+#: src/frontend/mame/ui/selmenu.cpp:2595
 msgid "incorrect length"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2589
+#: src/frontend/mame/ui/selmenu.cpp:2598
 msgid "not found"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2600
+#: src/frontend/mame/ui/selmenu.cpp:2609
 #, c-format
 msgid "%1$s (%2$s) - %3$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2602
+#: src/frontend/mame/ui/selmenu.cpp:2611
 #, c-format
 msgid "%1$s - %2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2606
+#: src/frontend/mame/ui/selmenu.cpp:2615
 msgid "Press any key to continue."
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2735
+#: src/frontend/mame/ui/selmenu.cpp:2744
 msgid "General Info"
 msgstr "Általános infók"
 
-#: src/frontend/mame/ui/selmenu.cpp:2887
+#: src/frontend/mame/ui/selmenu.cpp:2896
 #, c-format
 msgid "Romset\t%1$s\n"
 msgstr "Romkészlet\t%1$s\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2888
+#: src/frontend/mame/ui/selmenu.cpp:2897
 #, c-format
 msgid "Year\t%1$s\n"
 msgstr "Év\t%1$s\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2889
+#: src/frontend/mame/ui/selmenu.cpp:2898
 #, c-format
 msgid "Manufacturer\t%1$s\n"
 msgstr "Gyártó\t%1$s\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2896
+#: src/frontend/mame/ui/selmenu.cpp:2905
 #, c-format
 msgid "Driver is Clone of\t%1$s\n"
 msgstr "Vezérlőprogram klónja ennek\t%1$s\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2901
+#: src/frontend/mame/ui/selmenu.cpp:2910
 msgid "Driver is Parent\t\n"
 msgstr "A vezérlőprogram Alap\t\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2905
+#: src/frontend/mame/ui/selmenu.cpp:2914
 msgid "Analog Controls\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2907
+#: src/frontend/mame/ui/selmenu.cpp:2916
 msgid "Keyboard Inputs\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2910
+#: src/frontend/mame/ui/selmenu.cpp:2919
 msgid "Overall\tNOT WORKING\n"
 msgstr "Összegezve\tNEM MŰKÖDIK\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2912
+#: src/frontend/mame/ui/selmenu.cpp:2921
 msgid "Overall\tUnemulated Protection\n"
 msgstr "Összegezve\tEmulálatlan védelem\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2914
+#: src/frontend/mame/ui/selmenu.cpp:2923
 msgid "Overall\tWorking\n"
 msgstr "Összegezve\tMűködik\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2917
+#: src/frontend/mame/ui/selmenu.cpp:2926
 msgid "Graphics\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2919
+#: src/frontend/mame/ui/selmenu.cpp:2928
 msgid "Graphics\tWrong Colors\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2921
+#: src/frontend/mame/ui/selmenu.cpp:2930
 msgid "Graphics\tImperfect Colors\n"
 msgstr "Grafika\tHibás színek\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2923
+#: src/frontend/mame/ui/selmenu.cpp:2932
 msgid "Graphics\tImperfect\n"
 msgstr "Grafika\tHibás\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2925
+#: src/frontend/mame/ui/selmenu.cpp:2934
 msgid "Graphics\tOK\n"
 msgstr "Grafika\tJó\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2928
+#: src/frontend/mame/ui/selmenu.cpp:2937
 msgid "Sound\tNone\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2930
+#: src/frontend/mame/ui/selmenu.cpp:2939
 msgid "Sound\tUnimplemented\n"
 msgstr "Hang\tnincs beépítve\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2932
+#: src/frontend/mame/ui/selmenu.cpp:2941
 msgid "Sound\tImperfect\n"
 msgstr "Hang\tHibás\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2934
+#: src/frontend/mame/ui/selmenu.cpp:2943
 msgid "Sound\tOK\n"
 msgstr "Hang\tJó\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2937
+#: src/frontend/mame/ui/selmenu.cpp:2946
 msgid "Capture\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2939
+#: src/frontend/mame/ui/selmenu.cpp:2948
 msgid "Capture\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2942
+#: src/frontend/mame/ui/selmenu.cpp:2951
 msgid "Camera\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2944
+#: src/frontend/mame/ui/selmenu.cpp:2953
 msgid "Camera\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2947
+#: src/frontend/mame/ui/selmenu.cpp:2956
 msgid "Microphone\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2949
+#: src/frontend/mame/ui/selmenu.cpp:2958
 msgid "Microphone\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2952
+#: src/frontend/mame/ui/selmenu.cpp:2961
 msgid "Controls\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2954
+#: src/frontend/mame/ui/selmenu.cpp:2963
 msgid "Controls\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2957
+#: src/frontend/mame/ui/selmenu.cpp:2966
 msgid "Keyboard\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2959
+#: src/frontend/mame/ui/selmenu.cpp:2968
 msgid "Keyboard\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2962
+#: src/frontend/mame/ui/selmenu.cpp:2971
 msgid "Mouse\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2964
+#: src/frontend/mame/ui/selmenu.cpp:2973
 msgid "Mouse\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2967
+#: src/frontend/mame/ui/selmenu.cpp:2976
 msgid "Media\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2969
+#: src/frontend/mame/ui/selmenu.cpp:2978
 msgid "Media\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2972
+#: src/frontend/mame/ui/selmenu.cpp:2981
 msgid "Disk\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2974
+#: src/frontend/mame/ui/selmenu.cpp:2983
 msgid "Disk\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2977
+#: src/frontend/mame/ui/selmenu.cpp:2986
 msgid "Printer\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2979
+#: src/frontend/mame/ui/selmenu.cpp:2988
 msgid "Printer\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2982
+#: src/frontend/mame/ui/selmenu.cpp:2991
 msgid "Mag. Tape\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2984
+#: src/frontend/mame/ui/selmenu.cpp:2993
 msgid "Mag. Tape\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2987
+#: src/frontend/mame/ui/selmenu.cpp:2996
 msgid "Punch Tape\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2989
+#: src/frontend/mame/ui/selmenu.cpp:2998
 msgid "Punch Tape\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2992
+#: src/frontend/mame/ui/selmenu.cpp:3001
 msgid "Mag. Drum\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2994
+#: src/frontend/mame/ui/selmenu.cpp:3003
 msgid "Mag. Drum\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2997
+#: src/frontend/mame/ui/selmenu.cpp:3006
 msgid "(EP)ROM\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2999
+#: src/frontend/mame/ui/selmenu.cpp:3008
 msgid "(EP)ROM\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3002
+#: src/frontend/mame/ui/selmenu.cpp:3011
 msgid "Communications\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3004
+#: src/frontend/mame/ui/selmenu.cpp:3013
 msgid "Communications\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3007
+#: src/frontend/mame/ui/selmenu.cpp:3016
 msgid "LAN\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3009
+#: src/frontend/mame/ui/selmenu.cpp:3018
 msgid "LAN\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3012
+#: src/frontend/mame/ui/selmenu.cpp:3021
 msgid "WAN\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3014
+#: src/frontend/mame/ui/selmenu.cpp:3023
 msgid "WAN\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3017
+#: src/frontend/mame/ui/selmenu.cpp:3026
 msgid "Timing\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3019
+#: src/frontend/mame/ui/selmenu.cpp:3028
 msgid "Timing\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3021
+#: src/frontend/mame/ui/selmenu.cpp:3030
 msgid "Mechanical Machine\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3021
+#: src/frontend/mame/ui/selmenu.cpp:3030
 msgid "Mechanical Machine\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3022
+#: src/frontend/mame/ui/selmenu.cpp:3031
 msgid "Requires Artwork\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3022
+#: src/frontend/mame/ui/selmenu.cpp:3031
 msgid "Requires Artwork\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3023
+#: src/frontend/mame/ui/selmenu.cpp:3032
 msgid "Requires Clickable Artwork\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3023
+#: src/frontend/mame/ui/selmenu.cpp:3032
 msgid "Requires Clickable Artwork\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3025
+#: src/frontend/mame/ui/selmenu.cpp:3034
 msgid "Support Cocktail\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3026
+#: src/frontend/mame/ui/selmenu.cpp:3035
 msgid "Driver is BIOS\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3026
+#: src/frontend/mame/ui/selmenu.cpp:3035
 msgid "Driver is BIOS\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3027
+#: src/frontend/mame/ui/selmenu.cpp:3036
 msgid "Support Save\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3027
+#: src/frontend/mame/ui/selmenu.cpp:3036
 msgid "Support Save\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3028
+#: src/frontend/mame/ui/selmenu.cpp:3037
 msgid "Screen Orientation\tVertical\n"
 msgstr "Kép igazítottság\tFüggőleges"
 
-#: src/frontend/mame/ui/selmenu.cpp:3028
+#: src/frontend/mame/ui/selmenu.cpp:3037
 msgid "Screen Orientation\tHorizontal\n"
 msgstr "Kép igazítottság\tVízszintes"
 
-#: src/frontend/mame/ui/selmenu.cpp:3038
+#: src/frontend/mame/ui/selmenu.cpp:3047
 msgid "Requires CHD\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3038
+#: src/frontend/mame/ui/selmenu.cpp:3047
 msgid "Requires CHD\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3051
-msgid "ROM Audit Result\tOK\n"
+#: src/frontend/mame/ui/selmenu.cpp:3060
+msgid "Media Audit Result\tOK\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3053
-msgid "ROM Audit Result\tBAD\n"
+#: src/frontend/mame/ui/selmenu.cpp:3062
+msgid "Media Audit Result\tBAD\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3056
+#: src/frontend/mame/ui/selmenu.cpp:3065
 msgid "Samples Audit Result\tNone Needed\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3058
+#: src/frontend/mame/ui/selmenu.cpp:3067
 msgid "Samples Audit Result\tOK\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3060
+#: src/frontend/mame/ui/selmenu.cpp:3069
 msgid "Samples Audit Result\tBAD\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3064
+#: src/frontend/mame/ui/selmenu.cpp:3073
 msgid ""
-"ROM Audit \tDisabled\n"
-"Samples Audit \tDisabled\n"
+"Media Audit\tDisabled\n"
+"Samples Audit\tDisabled\n"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:150
+#: src/frontend/mame/ui/sndmenu.cpp:146
 msgid "Sound"
 msgstr "Hang"
 
-#: src/frontend/mame/ui/sndmenu.cpp:151
+#: src/frontend/mame/ui/sndmenu.cpp:147
 msgid "Compressor"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:152
+#: src/frontend/mame/ui/sndmenu.cpp:148
 msgid "Sample Rate"
 msgstr "Mintavételezés"
 
-#: src/frontend/mame/ui/sndmenu.cpp:153
+#: src/frontend/mame/ui/sndmenu.cpp:149
 msgid "Use External Samples"
 msgstr "Külső minták használata"
 
@@ -3171,511 +3175,681 @@ msgstr ""
 msgid "  Screen '%1$s': Vector\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:132
+#: src/frontend/mame/ui/devopt.cpp:135
 #, c-format
 msgid "  Screen '%1$s': %2$d × %3$d (V) %4$s Hz\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:133
+#: src/frontend/mame/ui/devopt.cpp:136
 #, c-format
 msgid "  Screen '%1$s': %2$d × %3$d (H) %4$s Hz\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:147
+#: src/frontend/mame/ui/devopt.cpp:150
 msgid "* Sound:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:211
+#: src/frontend/mame/ui/devopt.cpp:214
 #, c-format
 msgid ""
 "* BIOS settings:\n"
 "  %1$d options    [default: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:255 src/frontend/mame/ui/devopt.cpp:271
-#: src/frontend/mame/ui/devopt.cpp:332
+#: src/frontend/mame/ui/devopt.cpp:258 src/frontend/mame/ui/devopt.cpp:274
+#: src/frontend/mame/ui/devopt.cpp:335
 #, c-format
 msgid "  %1$s    [default: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:260 src/frontend/mame/ui/devopt.cpp:276
+#: src/frontend/mame/ui/devopt.cpp:263 src/frontend/mame/ui/devopt.cpp:279
 #, c-format
 msgid "  %1$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:282
+#: src/frontend/mame/ui/devopt.cpp:285
 msgid "* DIP switch settings:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:287
+#: src/frontend/mame/ui/devopt.cpp:290
 msgid "* Configuration settings:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:291
+#: src/frontend/mame/ui/devopt.cpp:294
 msgid "* Input device(s):\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:293
+#: src/frontend/mame/ui/devopt.cpp:296
 #, c-format
 msgid "  User inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:295
+#: src/frontend/mame/ui/devopt.cpp:298
 #, c-format
 msgid "  Mahjong inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:297
+#: src/frontend/mame/ui/devopt.cpp:300
 #, c-format
 msgid "  Hanafuda inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:299
+#: src/frontend/mame/ui/devopt.cpp:302
 #, c-format
 msgid "  Gambling inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:301
+#: src/frontend/mame/ui/devopt.cpp:304
 #, c-format
 msgid "  Analog inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:303
+#: src/frontend/mame/ui/devopt.cpp:306
 #, c-format
 msgid "  Adjuster inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:305
+#: src/frontend/mame/ui/devopt.cpp:308
 #, c-format
 msgid "  Keypad inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:307
+#: src/frontend/mame/ui/devopt.cpp:310
 #, c-format
 msgid "  Keyboard inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:312
+#: src/frontend/mame/ui/devopt.cpp:315
 msgid "* Media Options:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:317
+#: src/frontend/mame/ui/devopt.cpp:320
 #, c-format
 msgid "  %1$s    [tag: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:327
+#: src/frontend/mame/ui/devopt.cpp:330
 msgid "* Slot Options:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:341
+#: src/frontend/mame/ui/devopt.cpp:344
 msgid "[None]\n"
 msgstr ""
 
-#: src/emu/render.cpp:1847
+#: src/emu/render.cpp:1796
 #, c-format
 msgctxt "view-name"
 msgid "Screen %1$u Standard (%2$u:%3$u)"
 msgstr ""
 
-#: src/emu/render.cpp:1873
+#: src/emu/render.cpp:1822
 #, c-format
 msgctxt "view-name"
 msgid "Screen %1$u Pixel Aspect (%2$u:%3$u)"
 msgstr ""
 
-#: src/emu/render.cpp:1895 src/emu/render.cpp:2030
+#: src/emu/render.cpp:1844 src/emu/render.cpp:1979
 msgctxt "view-name"
 msgid "Cocktail"
 msgstr ""
 
-#: src/emu/render.cpp:2015
+#: src/emu/render.cpp:1964
 msgctxt "view-name"
 msgid "Left-to-Right"
 msgstr ""
 
-#: src/emu/render.cpp:2016
+#: src/emu/render.cpp:1965
 msgctxt "view-name"
 msgid "Left-to-Right (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2017
+#: src/emu/render.cpp:1966
 msgctxt "view-name"
 msgid "Top-to-Bottom"
 msgstr ""
 
-#: src/emu/render.cpp:2018
+#: src/emu/render.cpp:1967
 msgctxt "view-name"
 msgid "Top-to-Bottom (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2069
+#: src/emu/render.cpp:2018
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Left-to-Right, Top-to-Bottom"
 msgstr ""
 
-#: src/emu/render.cpp:2078
+#: src/emu/render.cpp:2027
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Left-to-Right, Top-to-Bottom (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2087
+#: src/emu/render.cpp:2036
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Top-to-Bottom, Left-to-Right"
 msgstr ""
 
-#: src/emu/render.cpp:2096
+#: src/emu/render.cpp:2045
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Top-to-Bottom, Left-to-Right (Gapless)"
 msgstr ""
 
-#: src/emu/inpttype.ipp:22
+#: src/emu/ioport.cpp:332
+#, c-format
 msgctxt "input-name"
-msgid "P1 Up"
+msgid "P%1$u"
 msgstr ""
 
-#: src/emu/inpttype.ipp:23
+#: src/emu/ioport.cpp:1924
 msgctxt "input-name"
-msgid "P1 Down"
+msgid "???"
 msgstr ""
 
-#: src/emu/inpttype.ipp:24
+#: src/emu/inpttype.ipp:22 src/emu/inpttype.ipp:140 src/emu/inpttype.ipp:221
+#: src/emu/inpttype.ipp:255 src/emu/inpttype.ipp:289 src/emu/inpttype.ipp:323
+#: src/emu/inpttype.ipp:357 src/emu/inpttype.ipp:391 src/emu/inpttype.ipp:425
+#: src/emu/inpttype.ipp:459
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left"
+msgid "%p Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:25
+#: src/emu/inpttype.ipp:23 src/emu/inpttype.ipp:141 src/emu/inpttype.ipp:222
+#: src/emu/inpttype.ipp:256 src/emu/inpttype.ipp:290 src/emu/inpttype.ipp:324
+#: src/emu/inpttype.ipp:358 src/emu/inpttype.ipp:392 src/emu/inpttype.ipp:426
+#: src/emu/inpttype.ipp:460
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right"
+msgid "%p Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:26
+#: src/emu/inpttype.ipp:24 src/emu/inpttype.ipp:142 src/emu/inpttype.ipp:223
+#: src/emu/inpttype.ipp:257 src/emu/inpttype.ipp:291 src/emu/inpttype.ipp:325
+#: src/emu/inpttype.ipp:359 src/emu/inpttype.ipp:393 src/emu/inpttype.ipp:427
+#: src/emu/inpttype.ipp:461
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Up"
+msgid "%p Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:27
+#: src/emu/inpttype.ipp:25 src/emu/inpttype.ipp:143 src/emu/inpttype.ipp:224
+#: src/emu/inpttype.ipp:258 src/emu/inpttype.ipp:292 src/emu/inpttype.ipp:326
+#: src/emu/inpttype.ipp:360 src/emu/inpttype.ipp:394 src/emu/inpttype.ipp:428
+#: src/emu/inpttype.ipp:462
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Down"
+msgid "%p Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:28
+#: src/emu/inpttype.ipp:26 src/emu/inpttype.ipp:144 src/emu/inpttype.ipp:225
+#: src/emu/inpttype.ipp:259 src/emu/inpttype.ipp:293 src/emu/inpttype.ipp:327
+#: src/emu/inpttype.ipp:361 src/emu/inpttype.ipp:395 src/emu/inpttype.ipp:429
+#: src/emu/inpttype.ipp:463
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Left"
+msgid "%p Right Stick/Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:29
+#: src/emu/inpttype.ipp:27 src/emu/inpttype.ipp:145 src/emu/inpttype.ipp:226
+#: src/emu/inpttype.ipp:260 src/emu/inpttype.ipp:294 src/emu/inpttype.ipp:328
+#: src/emu/inpttype.ipp:362 src/emu/inpttype.ipp:396 src/emu/inpttype.ipp:430
+#: src/emu/inpttype.ipp:464
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Right"
+msgid "%p Right Stick/Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:30
+#: src/emu/inpttype.ipp:28 src/emu/inpttype.ipp:146 src/emu/inpttype.ipp:227
+#: src/emu/inpttype.ipp:261 src/emu/inpttype.ipp:295 src/emu/inpttype.ipp:329
+#: src/emu/inpttype.ipp:363 src/emu/inpttype.ipp:397 src/emu/inpttype.ipp:431
+#: src/emu/inpttype.ipp:465
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Up"
+msgid "%p Right Stick/Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:31
+#: src/emu/inpttype.ipp:29 src/emu/inpttype.ipp:147 src/emu/inpttype.ipp:228
+#: src/emu/inpttype.ipp:262 src/emu/inpttype.ipp:296 src/emu/inpttype.ipp:330
+#: src/emu/inpttype.ipp:364 src/emu/inpttype.ipp:398 src/emu/inpttype.ipp:432
+#: src/emu/inpttype.ipp:466
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Down"
+msgid "%p Right Stick/Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:32
+#: src/emu/inpttype.ipp:30 src/emu/inpttype.ipp:148 src/emu/inpttype.ipp:229
+#: src/emu/inpttype.ipp:263 src/emu/inpttype.ipp:297 src/emu/inpttype.ipp:331
+#: src/emu/inpttype.ipp:365 src/emu/inpttype.ipp:399 src/emu/inpttype.ipp:433
+#: src/emu/inpttype.ipp:467
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Left"
+msgid "%p Left Stick/Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:33
+#: src/emu/inpttype.ipp:31 src/emu/inpttype.ipp:149 src/emu/inpttype.ipp:230
+#: src/emu/inpttype.ipp:264 src/emu/inpttype.ipp:298 src/emu/inpttype.ipp:332
+#: src/emu/inpttype.ipp:366 src/emu/inpttype.ipp:400 src/emu/inpttype.ipp:434
+#: src/emu/inpttype.ipp:468
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Right"
+msgid "%p Left Stick/Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:34
+#: src/emu/inpttype.ipp:32 src/emu/inpttype.ipp:150 src/emu/inpttype.ipp:231
+#: src/emu/inpttype.ipp:265 src/emu/inpttype.ipp:299 src/emu/inpttype.ipp:333
+#: src/emu/inpttype.ipp:367 src/emu/inpttype.ipp:401 src/emu/inpttype.ipp:435
+#: src/emu/inpttype.ipp:469
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 1"
+msgid "%p Left Stick/Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:35
+#: src/emu/inpttype.ipp:33 src/emu/inpttype.ipp:151 src/emu/inpttype.ipp:232
+#: src/emu/inpttype.ipp:266 src/emu/inpttype.ipp:300 src/emu/inpttype.ipp:334
+#: src/emu/inpttype.ipp:368 src/emu/inpttype.ipp:402 src/emu/inpttype.ipp:436
+#: src/emu/inpttype.ipp:470
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 2"
+msgid "%p Left Stick/Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:36
+#: src/emu/inpttype.ipp:34 src/emu/inpttype.ipp:152 src/emu/inpttype.ipp:233
+#: src/emu/inpttype.ipp:267 src/emu/inpttype.ipp:301 src/emu/inpttype.ipp:335
+#: src/emu/inpttype.ipp:369 src/emu/inpttype.ipp:403 src/emu/inpttype.ipp:437
+#: src/emu/inpttype.ipp:471
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 3"
+msgid "%p Button 1"
 msgstr ""
 
-#: src/emu/inpttype.ipp:37
+#: src/emu/inpttype.ipp:35 src/emu/inpttype.ipp:153 src/emu/inpttype.ipp:234
+#: src/emu/inpttype.ipp:268 src/emu/inpttype.ipp:302 src/emu/inpttype.ipp:336
+#: src/emu/inpttype.ipp:370 src/emu/inpttype.ipp:404 src/emu/inpttype.ipp:438
+#: src/emu/inpttype.ipp:472
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 4"
+msgid "%p Button 2"
 msgstr ""
 
-#: src/emu/inpttype.ipp:38
+#: src/emu/inpttype.ipp:36 src/emu/inpttype.ipp:154 src/emu/inpttype.ipp:235
+#: src/emu/inpttype.ipp:269 src/emu/inpttype.ipp:303 src/emu/inpttype.ipp:337
+#: src/emu/inpttype.ipp:371 src/emu/inpttype.ipp:405 src/emu/inpttype.ipp:439
+#: src/emu/inpttype.ipp:473
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 5"
+msgid "%p Button 3"
 msgstr ""
 
-#: src/emu/inpttype.ipp:39
+#: src/emu/inpttype.ipp:37 src/emu/inpttype.ipp:155 src/emu/inpttype.ipp:236
+#: src/emu/inpttype.ipp:270 src/emu/inpttype.ipp:304 src/emu/inpttype.ipp:338
+#: src/emu/inpttype.ipp:372 src/emu/inpttype.ipp:406 src/emu/inpttype.ipp:440
+#: src/emu/inpttype.ipp:474
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 6"
+msgid "%p Button 4"
 msgstr ""
 
-#: src/emu/inpttype.ipp:40
+#: src/emu/inpttype.ipp:38 src/emu/inpttype.ipp:156 src/emu/inpttype.ipp:237
+#: src/emu/inpttype.ipp:271 src/emu/inpttype.ipp:305 src/emu/inpttype.ipp:339
+#: src/emu/inpttype.ipp:373 src/emu/inpttype.ipp:407 src/emu/inpttype.ipp:441
+#: src/emu/inpttype.ipp:475
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 7"
+msgid "%p Button 5"
 msgstr ""
 
-#: src/emu/inpttype.ipp:41
+#: src/emu/inpttype.ipp:39 src/emu/inpttype.ipp:157 src/emu/inpttype.ipp:238
+#: src/emu/inpttype.ipp:272 src/emu/inpttype.ipp:306 src/emu/inpttype.ipp:340
+#: src/emu/inpttype.ipp:374 src/emu/inpttype.ipp:408 src/emu/inpttype.ipp:442
+#: src/emu/inpttype.ipp:476
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 8"
+msgid "%p Button 6"
 msgstr ""
 
-#: src/emu/inpttype.ipp:42
+#: src/emu/inpttype.ipp:40 src/emu/inpttype.ipp:158 src/emu/inpttype.ipp:239
+#: src/emu/inpttype.ipp:273 src/emu/inpttype.ipp:307 src/emu/inpttype.ipp:341
+#: src/emu/inpttype.ipp:375 src/emu/inpttype.ipp:409 src/emu/inpttype.ipp:443
+#: src/emu/inpttype.ipp:477
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 9"
+msgid "%p Button 7"
 msgstr ""
 
-#: src/emu/inpttype.ipp:43
+#: src/emu/inpttype.ipp:41 src/emu/inpttype.ipp:159 src/emu/inpttype.ipp:240
+#: src/emu/inpttype.ipp:274 src/emu/inpttype.ipp:308 src/emu/inpttype.ipp:342
+#: src/emu/inpttype.ipp:376 src/emu/inpttype.ipp:410 src/emu/inpttype.ipp:444
+#: src/emu/inpttype.ipp:478
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 10"
+msgid "%p Button 8"
 msgstr ""
 
-#: src/emu/inpttype.ipp:44
+#: src/emu/inpttype.ipp:42 src/emu/inpttype.ipp:160 src/emu/inpttype.ipp:241
+#: src/emu/inpttype.ipp:275 src/emu/inpttype.ipp:309 src/emu/inpttype.ipp:343
+#: src/emu/inpttype.ipp:377 src/emu/inpttype.ipp:411 src/emu/inpttype.ipp:445
+#: src/emu/inpttype.ipp:479
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 11"
+msgid "%p Button 9"
 msgstr ""
 
-#: src/emu/inpttype.ipp:45
+#: src/emu/inpttype.ipp:43 src/emu/inpttype.ipp:161 src/emu/inpttype.ipp:242
+#: src/emu/inpttype.ipp:276 src/emu/inpttype.ipp:310 src/emu/inpttype.ipp:344
+#: src/emu/inpttype.ipp:378 src/emu/inpttype.ipp:412 src/emu/inpttype.ipp:446
+#: src/emu/inpttype.ipp:480
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 12"
+msgid "%p Button 10"
 msgstr ""
 
-#: src/emu/inpttype.ipp:46
+#: src/emu/inpttype.ipp:44 src/emu/inpttype.ipp:162 src/emu/inpttype.ipp:243
+#: src/emu/inpttype.ipp:277 src/emu/inpttype.ipp:311 src/emu/inpttype.ipp:345
+#: src/emu/inpttype.ipp:379 src/emu/inpttype.ipp:413 src/emu/inpttype.ipp:447
+#: src/emu/inpttype.ipp:481
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 13"
+msgid "%p Button 11"
 msgstr ""
 
-#: src/emu/inpttype.ipp:47
+#: src/emu/inpttype.ipp:45 src/emu/inpttype.ipp:163 src/emu/inpttype.ipp:244
+#: src/emu/inpttype.ipp:278 src/emu/inpttype.ipp:312 src/emu/inpttype.ipp:346
+#: src/emu/inpttype.ipp:380 src/emu/inpttype.ipp:414 src/emu/inpttype.ipp:448
+#: src/emu/inpttype.ipp:482
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 14"
+msgid "%p Button 12"
 msgstr ""
 
-#: src/emu/inpttype.ipp:48
+#: src/emu/inpttype.ipp:46 src/emu/inpttype.ipp:164 src/emu/inpttype.ipp:245
+#: src/emu/inpttype.ipp:279 src/emu/inpttype.ipp:313 src/emu/inpttype.ipp:347
+#: src/emu/inpttype.ipp:381 src/emu/inpttype.ipp:415 src/emu/inpttype.ipp:449
+#: src/emu/inpttype.ipp:483
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 15"
+msgid "%p Button 13"
 msgstr ""
 
-#: src/emu/inpttype.ipp:49
+#: src/emu/inpttype.ipp:47 src/emu/inpttype.ipp:165 src/emu/inpttype.ipp:246
+#: src/emu/inpttype.ipp:280 src/emu/inpttype.ipp:314 src/emu/inpttype.ipp:348
+#: src/emu/inpttype.ipp:382 src/emu/inpttype.ipp:416 src/emu/inpttype.ipp:450
+#: src/emu/inpttype.ipp:484
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 16"
+msgid "%p Button 14"
 msgstr ""
 
-#: src/emu/inpttype.ipp:50
+#: src/emu/inpttype.ipp:48 src/emu/inpttype.ipp:166 src/emu/inpttype.ipp:247
+#: src/emu/inpttype.ipp:281 src/emu/inpttype.ipp:315 src/emu/inpttype.ipp:349
+#: src/emu/inpttype.ipp:383 src/emu/inpttype.ipp:417 src/emu/inpttype.ipp:451
+#: src/emu/inpttype.ipp:485
+#, c-format
 msgctxt "input-name"
-msgid "P1 Start"
+msgid "%p Button 15"
 msgstr ""
 
-#: src/emu/inpttype.ipp:51
+#: src/emu/inpttype.ipp:49 src/emu/inpttype.ipp:167 src/emu/inpttype.ipp:248
+#: src/emu/inpttype.ipp:282 src/emu/inpttype.ipp:316 src/emu/inpttype.ipp:350
+#: src/emu/inpttype.ipp:384 src/emu/inpttype.ipp:418 src/emu/inpttype.ipp:452
+#: src/emu/inpttype.ipp:486
+#, c-format
 msgctxt "input-name"
-msgid "P1 Select"
+msgid "%p Button 16"
 msgstr ""
 
-#: src/emu/inpttype.ipp:56
+#: src/emu/inpttype.ipp:50 src/emu/inpttype.ipp:168 src/emu/inpttype.ipp:249
+#: src/emu/inpttype.ipp:283 src/emu/inpttype.ipp:317 src/emu/inpttype.ipp:351
+#: src/emu/inpttype.ipp:385 src/emu/inpttype.ipp:419 src/emu/inpttype.ipp:453
+#: src/emu/inpttype.ipp:487
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong A"
+msgid "%p Start"
 msgstr ""
 
-#: src/emu/inpttype.ipp:57
+#: src/emu/inpttype.ipp:51 src/emu/inpttype.ipp:169 src/emu/inpttype.ipp:250
+#: src/emu/inpttype.ipp:284 src/emu/inpttype.ipp:318 src/emu/inpttype.ipp:352
+#: src/emu/inpttype.ipp:386 src/emu/inpttype.ipp:420 src/emu/inpttype.ipp:454
+#: src/emu/inpttype.ipp:488
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong B"
+msgid "%p Select"
 msgstr ""
 
-#: src/emu/inpttype.ipp:58
+#: src/emu/inpttype.ipp:56 src/emu/inpttype.ipp:174
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong C"
+msgid "%p Mahjong A"
 msgstr ""
 
-#: src/emu/inpttype.ipp:59
+#: src/emu/inpttype.ipp:57 src/emu/inpttype.ipp:175
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong D"
+msgid "%p Mahjong B"
 msgstr ""
 
-#: src/emu/inpttype.ipp:60
+#: src/emu/inpttype.ipp:58 src/emu/inpttype.ipp:176
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong E"
+msgid "%p Mahjong C"
 msgstr ""
 
-#: src/emu/inpttype.ipp:61
+#: src/emu/inpttype.ipp:59 src/emu/inpttype.ipp:177
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong F"
+msgid "%p Mahjong D"
 msgstr ""
 
-#: src/emu/inpttype.ipp:62
+#: src/emu/inpttype.ipp:60 src/emu/inpttype.ipp:178
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong G"
+msgid "%p Mahjong E"
 msgstr ""
 
-#: src/emu/inpttype.ipp:63
+#: src/emu/inpttype.ipp:61 src/emu/inpttype.ipp:179
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong H"
+msgid "%p Mahjong F"
 msgstr ""
 
-#: src/emu/inpttype.ipp:64
+#: src/emu/inpttype.ipp:62 src/emu/inpttype.ipp:180
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong I"
+msgid "%p Mahjong G"
 msgstr ""
 
-#: src/emu/inpttype.ipp:65
+#: src/emu/inpttype.ipp:63 src/emu/inpttype.ipp:181
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong J"
+msgid "%p Mahjong H"
 msgstr ""
 
-#: src/emu/inpttype.ipp:66
+#: src/emu/inpttype.ipp:64 src/emu/inpttype.ipp:182
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong K"
+msgid "%p Mahjong I"
 msgstr ""
 
-#: src/emu/inpttype.ipp:67
+#: src/emu/inpttype.ipp:65 src/emu/inpttype.ipp:183
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong L"
+msgid "%p Mahjong J"
 msgstr ""
 
-#: src/emu/inpttype.ipp:68
+#: src/emu/inpttype.ipp:66 src/emu/inpttype.ipp:184
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong M"
+msgid "%p Mahjong K"
 msgstr ""
 
-#: src/emu/inpttype.ipp:69
+#: src/emu/inpttype.ipp:67 src/emu/inpttype.ipp:185
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong N"
+msgid "%p Mahjong L"
 msgstr ""
 
-#: src/emu/inpttype.ipp:70
+#: src/emu/inpttype.ipp:68 src/emu/inpttype.ipp:186
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong O"
+msgid "%p Mahjong M"
 msgstr ""
 
-#: src/emu/inpttype.ipp:71
+#: src/emu/inpttype.ipp:69 src/emu/inpttype.ipp:187
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong P"
+msgid "%p Mahjong N"
 msgstr ""
 
-#: src/emu/inpttype.ipp:72
+#: src/emu/inpttype.ipp:70 src/emu/inpttype.ipp:188
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Q"
+msgid "%p Mahjong O"
 msgstr ""
 
-#: src/emu/inpttype.ipp:73
+#: src/emu/inpttype.ipp:71 src/emu/inpttype.ipp:189
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Kan"
+msgid "%p Mahjong P"
 msgstr ""
 
-#: src/emu/inpttype.ipp:74
+#: src/emu/inpttype.ipp:72 src/emu/inpttype.ipp:190
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Pon"
+msgid "%p Mahjong Q"
 msgstr ""
 
-#: src/emu/inpttype.ipp:75
+#: src/emu/inpttype.ipp:73 src/emu/inpttype.ipp:191
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Chi"
+msgid "%p Mahjong Kan"
 msgstr ""
 
-#: src/emu/inpttype.ipp:76
+#: src/emu/inpttype.ipp:74 src/emu/inpttype.ipp:192
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Reach"
+msgid "%p Mahjong Pon"
 msgstr ""
 
-#: src/emu/inpttype.ipp:77
+#: src/emu/inpttype.ipp:75 src/emu/inpttype.ipp:193
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Ron"
+msgid "%p Mahjong Chi"
 msgstr ""
 
-#: src/emu/inpttype.ipp:78
+#: src/emu/inpttype.ipp:76 src/emu/inpttype.ipp:194
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Flip Flop"
+msgid "%p Mahjong Reach"
 msgstr ""
 
-#: src/emu/inpttype.ipp:79
+#: src/emu/inpttype.ipp:77 src/emu/inpttype.ipp:195
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Bet"
+msgid "%p Mahjong Ron"
 msgstr ""
 
-#: src/emu/inpttype.ipp:80
+#: src/emu/inpttype.ipp:78 src/emu/inpttype.ipp:200
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Take Score"
+msgid "%p Mahjong Flip Flop"
 msgstr ""
 
-#: src/emu/inpttype.ipp:81
+#: src/emu/inpttype.ipp:79 src/emu/inpttype.ipp:196
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Double Up"
+msgid "%p Mahjong Bet"
 msgstr ""
 
-#: src/emu/inpttype.ipp:82
+#: src/emu/inpttype.ipp:80 src/emu/inpttype.ipp:198
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Big"
+msgid "%p Mahjong Take Score"
 msgstr ""
 
-#: src/emu/inpttype.ipp:83
+#: src/emu/inpttype.ipp:81 src/emu/inpttype.ipp:199
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Small"
+msgid "%p Mahjong Double Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:84
+#: src/emu/inpttype.ipp:82 src/emu/inpttype.ipp:201
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Last Chance"
+msgid "%p Mahjong Big"
 msgstr ""
 
-#: src/emu/inpttype.ipp:89
+#: src/emu/inpttype.ipp:83 src/emu/inpttype.ipp:202
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda A/1"
+msgid "%p Mahjong Small"
 msgstr ""
 
-#: src/emu/inpttype.ipp:90
+#: src/emu/inpttype.ipp:84 src/emu/inpttype.ipp:197
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda B/2"
+msgid "%p Mahjong Last Chance"
 msgstr ""
 
-#: src/emu/inpttype.ipp:91
+#: src/emu/inpttype.ipp:89 src/emu/inpttype.ipp:207
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda C/3"
+msgid "%p Hanafuda A/1"
 msgstr ""
 
-#: src/emu/inpttype.ipp:92
+#: src/emu/inpttype.ipp:90 src/emu/inpttype.ipp:208
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda D/4"
+msgid "%p Hanafuda B/2"
 msgstr ""
 
-#: src/emu/inpttype.ipp:93
+#: src/emu/inpttype.ipp:91 src/emu/inpttype.ipp:209
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda E/5"
+msgid "%p Hanafuda C/3"
 msgstr ""
 
-#: src/emu/inpttype.ipp:94
+#: src/emu/inpttype.ipp:92 src/emu/inpttype.ipp:210
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda F/6"
+msgid "%p Hanafuda D/4"
 msgstr ""
 
-#: src/emu/inpttype.ipp:95
+#: src/emu/inpttype.ipp:93 src/emu/inpttype.ipp:211
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda G/7"
+msgid "%p Hanafuda E/5"
 msgstr ""
 
-#: src/emu/inpttype.ipp:96
+#: src/emu/inpttype.ipp:94 src/emu/inpttype.ipp:212
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda H/8"
+msgid "%p Hanafuda F/6"
 msgstr ""
 
-#: src/emu/inpttype.ipp:97
+#: src/emu/inpttype.ipp:95 src/emu/inpttype.ipp:213
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda Yes"
+msgid "%p Hanafuda G/7"
 msgstr ""
 
-#: src/emu/inpttype.ipp:98
+#: src/emu/inpttype.ipp:96 src/emu/inpttype.ipp:214
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda No"
+msgid "%p Hanafuda H/8"
+msgstr ""
+
+#: src/emu/inpttype.ipp:97 src/emu/inpttype.ipp:215
+#, c-format
+msgctxt "input-name"
+msgid "%p Hanafuda Yes"
+msgstr ""
+
+#: src/emu/inpttype.ipp:98 src/emu/inpttype.ipp:216
+#, c-format
+msgctxt "input-name"
+msgid "%p Hanafuda No"
 msgstr ""
 
 #: src/emu/inpttype.ipp:103
@@ -3803,1551 +3977,6 @@ msgctxt "input-name"
 msgid "Stop All Reels"
 msgstr ""
 
-#: src/emu/inpttype.ipp:140
-msgctxt "input-name"
-msgid "P2 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:141
-msgctxt "input-name"
-msgid "P2 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:142
-msgctxt "input-name"
-msgid "P2 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:143
-msgctxt "input-name"
-msgid "P2 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:144
-msgctxt "input-name"
-msgid "P2 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:145
-msgctxt "input-name"
-msgid "P2 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:146
-msgctxt "input-name"
-msgid "P2 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:147
-msgctxt "input-name"
-msgid "P2 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:148
-msgctxt "input-name"
-msgid "P2 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:149
-msgctxt "input-name"
-msgid "P2 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:150
-msgctxt "input-name"
-msgid "P2 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:151
-msgctxt "input-name"
-msgid "P2 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:152
-msgctxt "input-name"
-msgid "P2 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:153
-msgctxt "input-name"
-msgid "P2 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:154
-msgctxt "input-name"
-msgid "P2 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:155
-msgctxt "input-name"
-msgid "P2 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:156
-msgctxt "input-name"
-msgid "P2 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:157
-msgctxt "input-name"
-msgid "P2 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:158
-msgctxt "input-name"
-msgid "P2 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:159
-msgctxt "input-name"
-msgid "P2 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:160
-msgctxt "input-name"
-msgid "P2 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:161
-msgctxt "input-name"
-msgid "P2 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:162
-msgctxt "input-name"
-msgid "P2 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:163
-msgctxt "input-name"
-msgid "P2 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:164
-msgctxt "input-name"
-msgid "P2 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:165
-msgctxt "input-name"
-msgid "P2 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:166
-msgctxt "input-name"
-msgid "P2 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:167
-msgctxt "input-name"
-msgid "P2 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:168
-msgctxt "input-name"
-msgid "P2 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:169
-msgctxt "input-name"
-msgid "P2 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:174
-msgctxt "input-name"
-msgid "P2 Mahjong A"
-msgstr ""
-
-#: src/emu/inpttype.ipp:175
-msgctxt "input-name"
-msgid "P2 Mahjong B"
-msgstr ""
-
-#: src/emu/inpttype.ipp:176
-msgctxt "input-name"
-msgid "P2 Mahjong C"
-msgstr ""
-
-#: src/emu/inpttype.ipp:177
-msgctxt "input-name"
-msgid "P2 Mahjong D"
-msgstr ""
-
-#: src/emu/inpttype.ipp:178
-msgctxt "input-name"
-msgid "P2 Mahjong E"
-msgstr ""
-
-#: src/emu/inpttype.ipp:179
-msgctxt "input-name"
-msgid "P2 Mahjong F"
-msgstr ""
-
-#: src/emu/inpttype.ipp:180
-msgctxt "input-name"
-msgid "P2 Mahjong G"
-msgstr ""
-
-#: src/emu/inpttype.ipp:181
-msgctxt "input-name"
-msgid "P2 Mahjong H"
-msgstr ""
-
-#: src/emu/inpttype.ipp:182
-msgctxt "input-name"
-msgid "P2 Mahjong I"
-msgstr ""
-
-#: src/emu/inpttype.ipp:183
-msgctxt "input-name"
-msgid "P2 Mahjong J"
-msgstr ""
-
-#: src/emu/inpttype.ipp:184
-msgctxt "input-name"
-msgid "P2 Mahjong K"
-msgstr ""
-
-#: src/emu/inpttype.ipp:185
-msgctxt "input-name"
-msgid "P2 Mahjong L"
-msgstr ""
-
-#: src/emu/inpttype.ipp:186
-msgctxt "input-name"
-msgid "P2 Mahjong M"
-msgstr ""
-
-#: src/emu/inpttype.ipp:187
-msgctxt "input-name"
-msgid "P2 Mahjong N"
-msgstr ""
-
-#: src/emu/inpttype.ipp:188
-msgctxt "input-name"
-msgid "P2 Mahjong O"
-msgstr ""
-
-#: src/emu/inpttype.ipp:189
-msgctxt "input-name"
-msgid "P2 Mahjong P"
-msgstr ""
-
-#: src/emu/inpttype.ipp:190
-msgctxt "input-name"
-msgid "P2 Mahjong Q"
-msgstr ""
-
-#: src/emu/inpttype.ipp:191
-msgctxt "input-name"
-msgid "P2 Mahjong Kan"
-msgstr ""
-
-#: src/emu/inpttype.ipp:192
-msgctxt "input-name"
-msgid "P2 Mahjong Pon"
-msgstr ""
-
-#: src/emu/inpttype.ipp:193
-msgctxt "input-name"
-msgid "P2 Mahjong Chi"
-msgstr ""
-
-#: src/emu/inpttype.ipp:194
-msgctxt "input-name"
-msgid "P2 Mahjong Reach"
-msgstr ""
-
-#: src/emu/inpttype.ipp:195
-msgctxt "input-name"
-msgid "P2 Mahjong Ron"
-msgstr ""
-
-#: src/emu/inpttype.ipp:196
-msgctxt "input-name"
-msgid "P2 Mahjong Bet"
-msgstr ""
-
-#: src/emu/inpttype.ipp:197
-msgctxt "input-name"
-msgid "P2 Mahjong Last Chance"
-msgstr ""
-
-#: src/emu/inpttype.ipp:198
-msgctxt "input-name"
-msgid "P2 Mahjong Take Score"
-msgstr ""
-
-#: src/emu/inpttype.ipp:199
-msgctxt "input-name"
-msgid "P2 Mahjong Double Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:200
-msgctxt "input-name"
-msgid "P2 Mahjong Flip Flop"
-msgstr ""
-
-#: src/emu/inpttype.ipp:201
-msgctxt "input-name"
-msgid "P2 Mahjong Big"
-msgstr ""
-
-#: src/emu/inpttype.ipp:202
-msgctxt "input-name"
-msgid "P2 Mahjong Small"
-msgstr ""
-
-#: src/emu/inpttype.ipp:207
-msgctxt "input-name"
-msgid "P2 Hanafuda A/1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:208
-msgctxt "input-name"
-msgid "P2 Hanafuda B/2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:209
-msgctxt "input-name"
-msgid "P2 Hanafuda C/3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:210
-msgctxt "input-name"
-msgid "P2 Hanafuda D/4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:211
-msgctxt "input-name"
-msgid "P2 Hanafuda E/5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:212
-msgctxt "input-name"
-msgid "P2 Hanafuda F/6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:213
-msgctxt "input-name"
-msgid "P2 Hanafuda G/7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:214
-msgctxt "input-name"
-msgid "P2 Hanafuda H/8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:215
-msgctxt "input-name"
-msgid "P2 Hanafuda Yes"
-msgstr ""
-
-#: src/emu/inpttype.ipp:216
-msgctxt "input-name"
-msgid "P2 Hanafuda No"
-msgstr ""
-
-#: src/emu/inpttype.ipp:221
-msgctxt "input-name"
-msgid "P3 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:222
-msgctxt "input-name"
-msgid "P3 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:223
-msgctxt "input-name"
-msgid "P3 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:224
-msgctxt "input-name"
-msgid "P3 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:225
-msgctxt "input-name"
-msgid "P3 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:226
-msgctxt "input-name"
-msgid "P3 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:227
-msgctxt "input-name"
-msgid "P3 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:228
-msgctxt "input-name"
-msgid "P3 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:229
-msgctxt "input-name"
-msgid "P3 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:230
-msgctxt "input-name"
-msgid "P3 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:231
-msgctxt "input-name"
-msgid "P3 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:232
-msgctxt "input-name"
-msgid "P3 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:233
-msgctxt "input-name"
-msgid "P3 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:234
-msgctxt "input-name"
-msgid "P3 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:235
-msgctxt "input-name"
-msgid "P3 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:236
-msgctxt "input-name"
-msgid "P3 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:237
-msgctxt "input-name"
-msgid "P3 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:238
-msgctxt "input-name"
-msgid "P3 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:239
-msgctxt "input-name"
-msgid "P3 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:240
-msgctxt "input-name"
-msgid "P3 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:241
-msgctxt "input-name"
-msgid "P3 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:242
-msgctxt "input-name"
-msgid "P3 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:243
-msgctxt "input-name"
-msgid "P3 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:244
-msgctxt "input-name"
-msgid "P3 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:245
-msgctxt "input-name"
-msgid "P3 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:246
-msgctxt "input-name"
-msgid "P3 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:247
-msgctxt "input-name"
-msgid "P3 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:248
-msgctxt "input-name"
-msgid "P3 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:249
-msgctxt "input-name"
-msgid "P3 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:250
-msgctxt "input-name"
-msgid "P3 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:255
-msgctxt "input-name"
-msgid "P4 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:256
-msgctxt "input-name"
-msgid "P4 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:257
-msgctxt "input-name"
-msgid "P4 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:258
-msgctxt "input-name"
-msgid "P4 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:259
-msgctxt "input-name"
-msgid "P4 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:260
-msgctxt "input-name"
-msgid "P4 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:261
-msgctxt "input-name"
-msgid "P4 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:262
-msgctxt "input-name"
-msgid "P4 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:263
-msgctxt "input-name"
-msgid "P4 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:264
-msgctxt "input-name"
-msgid "P4 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:265
-msgctxt "input-name"
-msgid "P4 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:266
-msgctxt "input-name"
-msgid "P4 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:267
-msgctxt "input-name"
-msgid "P4 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:268
-msgctxt "input-name"
-msgid "P4 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:269
-msgctxt "input-name"
-msgid "P4 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:270
-msgctxt "input-name"
-msgid "P4 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:271
-msgctxt "input-name"
-msgid "P4 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:272
-msgctxt "input-name"
-msgid "P4 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:273
-msgctxt "input-name"
-msgid "P4 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:274
-msgctxt "input-name"
-msgid "P4 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:275
-msgctxt "input-name"
-msgid "P4 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:276
-msgctxt "input-name"
-msgid "P4 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:277
-msgctxt "input-name"
-msgid "P4 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:278
-msgctxt "input-name"
-msgid "P4 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:279
-msgctxt "input-name"
-msgid "P4 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:280
-msgctxt "input-name"
-msgid "P4 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:281
-msgctxt "input-name"
-msgid "P4 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:282
-msgctxt "input-name"
-msgid "P4 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:283
-msgctxt "input-name"
-msgid "P4 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:284
-msgctxt "input-name"
-msgid "P4 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:289
-msgctxt "input-name"
-msgid "P5 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:290
-msgctxt "input-name"
-msgid "P5 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:291
-msgctxt "input-name"
-msgid "P5 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:292
-msgctxt "input-name"
-msgid "P5 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:293
-msgctxt "input-name"
-msgid "P5 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:294
-msgctxt "input-name"
-msgid "P5 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:295
-msgctxt "input-name"
-msgid "P5 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:296
-msgctxt "input-name"
-msgid "P5 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:297
-msgctxt "input-name"
-msgid "P5 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:298
-msgctxt "input-name"
-msgid "P5 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:299
-msgctxt "input-name"
-msgid "P5 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:300
-msgctxt "input-name"
-msgid "P5 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:301
-msgctxt "input-name"
-msgid "P5 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:302
-msgctxt "input-name"
-msgid "P5 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:303
-msgctxt "input-name"
-msgid "P5 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:304
-msgctxt "input-name"
-msgid "P5 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:305
-msgctxt "input-name"
-msgid "P5 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:306
-msgctxt "input-name"
-msgid "P5 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:307
-msgctxt "input-name"
-msgid "P5 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:308
-msgctxt "input-name"
-msgid "P5 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:309
-msgctxt "input-name"
-msgid "P5 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:310
-msgctxt "input-name"
-msgid "P5 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:311
-msgctxt "input-name"
-msgid "P5 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:312
-msgctxt "input-name"
-msgid "P5 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:313
-msgctxt "input-name"
-msgid "P5 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:314
-msgctxt "input-name"
-msgid "P5 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:315
-msgctxt "input-name"
-msgid "P5 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:316
-msgctxt "input-name"
-msgid "P5 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:317
-msgctxt "input-name"
-msgid "P5 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:318
-msgctxt "input-name"
-msgid "P5 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:323
-msgctxt "input-name"
-msgid "P6 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:324
-msgctxt "input-name"
-msgid "P6 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:325
-msgctxt "input-name"
-msgid "P6 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:326
-msgctxt "input-name"
-msgid "P6 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:327
-msgctxt "input-name"
-msgid "P6 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:328
-msgctxt "input-name"
-msgid "P6 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:329
-msgctxt "input-name"
-msgid "P6 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:330
-msgctxt "input-name"
-msgid "P6 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:331
-msgctxt "input-name"
-msgid "P6 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:332
-msgctxt "input-name"
-msgid "P6 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:333
-msgctxt "input-name"
-msgid "P6 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:334
-msgctxt "input-name"
-msgid "P6 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:335
-msgctxt "input-name"
-msgid "P6 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:336
-msgctxt "input-name"
-msgid "P6 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:337
-msgctxt "input-name"
-msgid "P6 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:338
-msgctxt "input-name"
-msgid "P6 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:339
-msgctxt "input-name"
-msgid "P6 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:340
-msgctxt "input-name"
-msgid "P6 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:341
-msgctxt "input-name"
-msgid "P6 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:342
-msgctxt "input-name"
-msgid "P6 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:343
-msgctxt "input-name"
-msgid "P6 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:344
-msgctxt "input-name"
-msgid "P6 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:345
-msgctxt "input-name"
-msgid "P6 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:346
-msgctxt "input-name"
-msgid "P6 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:347
-msgctxt "input-name"
-msgid "P6 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:348
-msgctxt "input-name"
-msgid "P6 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:349
-msgctxt "input-name"
-msgid "P6 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:350
-msgctxt "input-name"
-msgid "P6 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:351
-msgctxt "input-name"
-msgid "P6 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:352
-msgctxt "input-name"
-msgid "P6 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:357
-msgctxt "input-name"
-msgid "P7 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:358
-msgctxt "input-name"
-msgid "P7 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:359
-msgctxt "input-name"
-msgid "P7 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:360
-msgctxt "input-name"
-msgid "P7 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:361
-msgctxt "input-name"
-msgid "P7 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:362
-msgctxt "input-name"
-msgid "P7 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:363
-msgctxt "input-name"
-msgid "P7 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:364
-msgctxt "input-name"
-msgid "P7 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:365
-msgctxt "input-name"
-msgid "P7 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:366
-msgctxt "input-name"
-msgid "P7 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:367
-msgctxt "input-name"
-msgid "P7 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:368
-msgctxt "input-name"
-msgid "P7 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:369
-msgctxt "input-name"
-msgid "P7 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:370
-msgctxt "input-name"
-msgid "P7 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:371
-msgctxt "input-name"
-msgid "P7 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:372
-msgctxt "input-name"
-msgid "P7 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:373
-msgctxt "input-name"
-msgid "P7 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:374
-msgctxt "input-name"
-msgid "P7 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:375
-msgctxt "input-name"
-msgid "P7 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:376
-msgctxt "input-name"
-msgid "P7 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:377
-msgctxt "input-name"
-msgid "P7 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:378
-msgctxt "input-name"
-msgid "P7 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:379
-msgctxt "input-name"
-msgid "P7 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:380
-msgctxt "input-name"
-msgid "P7 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:381
-msgctxt "input-name"
-msgid "P7 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:382
-msgctxt "input-name"
-msgid "P7 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:383
-msgctxt "input-name"
-msgid "P7 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:384
-msgctxt "input-name"
-msgid "P7 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:385
-msgctxt "input-name"
-msgid "P7 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:386
-msgctxt "input-name"
-msgid "P7 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:391
-msgctxt "input-name"
-msgid "P8 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:392
-msgctxt "input-name"
-msgid "P8 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:393
-msgctxt "input-name"
-msgid "P8 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:394
-msgctxt "input-name"
-msgid "P8 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:395
-msgctxt "input-name"
-msgid "P8 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:396
-msgctxt "input-name"
-msgid "P8 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:397
-msgctxt "input-name"
-msgid "P8 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:398
-msgctxt "input-name"
-msgid "P8 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:399
-msgctxt "input-name"
-msgid "P8 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:400
-msgctxt "input-name"
-msgid "P8 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:401
-msgctxt "input-name"
-msgid "P8 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:402
-msgctxt "input-name"
-msgid "P8 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:403
-msgctxt "input-name"
-msgid "P8 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:404
-msgctxt "input-name"
-msgid "P8 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:405
-msgctxt "input-name"
-msgid "P8 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:406
-msgctxt "input-name"
-msgid "P8 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:407
-msgctxt "input-name"
-msgid "P8 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:408
-msgctxt "input-name"
-msgid "P8 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:409
-msgctxt "input-name"
-msgid "P8 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:410
-msgctxt "input-name"
-msgid "P8 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:411
-msgctxt "input-name"
-msgid "P8 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:412
-msgctxt "input-name"
-msgid "P8 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:413
-msgctxt "input-name"
-msgid "P8 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:414
-msgctxt "input-name"
-msgid "P8 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:415
-msgctxt "input-name"
-msgid "P8 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:416
-msgctxt "input-name"
-msgid "P8 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:417
-msgctxt "input-name"
-msgid "P8 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:418
-msgctxt "input-name"
-msgid "P8 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:419
-msgctxt "input-name"
-msgid "P8 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:420
-msgctxt "input-name"
-msgid "P8 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:425
-msgctxt "input-name"
-msgid "P9 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:426
-msgctxt "input-name"
-msgid "P9 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:427
-msgctxt "input-name"
-msgid "P9 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:428
-msgctxt "input-name"
-msgid "P9 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:429
-msgctxt "input-name"
-msgid "P9 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:430
-msgctxt "input-name"
-msgid "P9 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:431
-msgctxt "input-name"
-msgid "P9 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:432
-msgctxt "input-name"
-msgid "P9 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:433
-msgctxt "input-name"
-msgid "P9 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:434
-msgctxt "input-name"
-msgid "P9 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:435
-msgctxt "input-name"
-msgid "P9 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:436
-msgctxt "input-name"
-msgid "P9 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:437
-msgctxt "input-name"
-msgid "P9 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:438
-msgctxt "input-name"
-msgid "P9 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:439
-msgctxt "input-name"
-msgid "P9 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:440
-msgctxt "input-name"
-msgid "P9 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:441
-msgctxt "input-name"
-msgid "P9 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:442
-msgctxt "input-name"
-msgid "P9 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:443
-msgctxt "input-name"
-msgid "P9 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:444
-msgctxt "input-name"
-msgid "P9 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:445
-msgctxt "input-name"
-msgid "P9 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:446
-msgctxt "input-name"
-msgid "P9 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:447
-msgctxt "input-name"
-msgid "P9 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:448
-msgctxt "input-name"
-msgid "P9 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:449
-msgctxt "input-name"
-msgid "P9 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:450
-msgctxt "input-name"
-msgid "P9 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:451
-msgctxt "input-name"
-msgid "P9 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:452
-msgctxt "input-name"
-msgid "P9 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:453
-msgctxt "input-name"
-msgid "P9 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:454
-msgctxt "input-name"
-msgid "P9 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:459
-msgctxt "input-name"
-msgid "P10 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:460
-msgctxt "input-name"
-msgid "P10 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:461
-msgctxt "input-name"
-msgid "P10 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:462
-msgctxt "input-name"
-msgid "P10 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:463
-msgctxt "input-name"
-msgid "P10 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:464
-msgctxt "input-name"
-msgid "P10 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:465
-msgctxt "input-name"
-msgid "P10 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:466
-msgctxt "input-name"
-msgid "P10 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:467
-msgctxt "input-name"
-msgid "P10 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:468
-msgctxt "input-name"
-msgid "P10 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:469
-msgctxt "input-name"
-msgid "P10 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:470
-msgctxt "input-name"
-msgid "P10 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:471
-msgctxt "input-name"
-msgid "P10 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:472
-msgctxt "input-name"
-msgid "P10 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:473
-msgctxt "input-name"
-msgid "P10 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:474
-msgctxt "input-name"
-msgid "P10 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:475
-msgctxt "input-name"
-msgid "P10 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:476
-msgctxt "input-name"
-msgid "P10 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:477
-msgctxt "input-name"
-msgid "P10 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:478
-msgctxt "input-name"
-msgid "P10 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:479
-msgctxt "input-name"
-msgid "P10 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:480
-msgctxt "input-name"
-msgid "P10 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:481
-msgctxt "input-name"
-msgid "P10 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:482
-msgctxt "input-name"
-msgid "P10 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:483
-msgctxt "input-name"
-msgid "P10 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:484
-msgctxt "input-name"
-msgid "P10 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:485
-msgctxt "input-name"
-msgid "P10 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:486
-msgctxt "input-name"
-msgid "P10 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:487
-msgctxt "input-name"
-msgid "P10 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:488
-msgctxt "input-name"
-msgid "P10 Select"
-msgstr ""
-
 #: src/emu/inpttype.ipp:493
 msgctxt "input-name"
 msgid "1 Player Start"
@@ -5528,154 +4157,31 @@ msgctxt "input-name"
 msgid "Volume Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:550
-msgctxt "input-name"
-msgid "P1 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:551
-msgctxt "input-name"
-msgid "P2 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:552
-msgctxt "input-name"
-msgid "P3 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:553
-msgctxt "input-name"
-msgid "P4 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:554
-msgctxt "input-name"
-msgid "P5 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:555
-msgctxt "input-name"
-msgid "P6 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:556
-msgctxt "input-name"
-msgid "P7 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:557
-msgctxt "input-name"
-msgid "P8 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:558
-msgctxt "input-name"
-msgid "P9 Pedal 1"
-msgstr ""
-
+#: src/emu/inpttype.ipp:550 src/emu/inpttype.ipp:551 src/emu/inpttype.ipp:552
+#: src/emu/inpttype.ipp:553 src/emu/inpttype.ipp:554 src/emu/inpttype.ipp:555
+#: src/emu/inpttype.ipp:556 src/emu/inpttype.ipp:557 src/emu/inpttype.ipp:558
 #: src/emu/inpttype.ipp:559
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:564
-msgctxt "input-name"
-msgid "P1 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:565
-msgctxt "input-name"
-msgid "P2 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:566
-msgctxt "input-name"
-msgid "P3 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:567
-msgctxt "input-name"
-msgid "P4 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:568
-msgctxt "input-name"
-msgid "P5 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:569
-msgctxt "input-name"
-msgid "P6 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:570
-msgctxt "input-name"
-msgid "P7 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:571
-msgctxt "input-name"
-msgid "P8 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:572
-msgctxt "input-name"
-msgid "P9 Pedal 2"
+msgid "%p Pedal 1"
 msgstr ""
 
+#: src/emu/inpttype.ipp:564 src/emu/inpttype.ipp:565 src/emu/inpttype.ipp:566
+#: src/emu/inpttype.ipp:567 src/emu/inpttype.ipp:568 src/emu/inpttype.ipp:569
+#: src/emu/inpttype.ipp:570 src/emu/inpttype.ipp:571 src/emu/inpttype.ipp:572
 #: src/emu/inpttype.ipp:573
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:578
-msgctxt "input-name"
-msgid "P1 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:579
-msgctxt "input-name"
-msgid "P2 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:580
-msgctxt "input-name"
-msgid "P3 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:581
-msgctxt "input-name"
-msgid "P4 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:582
-msgctxt "input-name"
-msgid "P5 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:583
-msgctxt "input-name"
-msgid "P6 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:584
-msgctxt "input-name"
-msgid "P7 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:585
-msgctxt "input-name"
-msgid "P8 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:586
-msgctxt "input-name"
-msgid "P9 Pedal 3"
+msgid "%p Pedal 2"
 msgstr ""
 
+#: src/emu/inpttype.ipp:578 src/emu/inpttype.ipp:579 src/emu/inpttype.ipp:580
+#: src/emu/inpttype.ipp:581 src/emu/inpttype.ipp:582 src/emu/inpttype.ipp:583
+#: src/emu/inpttype.ipp:584 src/emu/inpttype.ipp:585 src/emu/inpttype.ipp:586
 #: src/emu/inpttype.ipp:587
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 3"
+msgid "%p Pedal 3"
 msgstr ""
 
 #: src/emu/inpttype.ipp:592
@@ -7563,6 +6069,18 @@ msgid ""
 "%s"
 msgstr ""
 
+#~ msgid "Confirm quit from machines"
+#~ msgstr "Gépekből történő kilépés megerősítése"
+
+#~ msgid "Skip information screen at startup"
+#~ msgstr "Indításkori tájékoztató képernyő kihagyása "
+
+#~ msgid "Simultaneous contradictory"
+#~ msgstr "Folyamatos ellentmondás"
+
+#~ msgid "Adstick Device Assignment"
+#~ msgstr "ADStick eszköz beállítás"
+
 #, c-format
 #~ msgid ""
 #~ "Are you sure you want to quit?\n"
diff --git a/language/Indonesian/strings.po b/language/Indonesian/strings.po
index 09a96f2978d..512899bbb8a 100644
--- a/language/Indonesian/strings.po
+++ b/language/Indonesian/strings.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-19 02:50+1100\n"
+"POT-Creation-Date: 2021-12-09 04:44+1100\n"
 "PO-Revision-Date: 2016-02-20 18:03+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: MAME Language Team\n"
@@ -260,12 +260,12 @@ msgstr ""
 msgid "Driver: \"%1$s\" software list "
 msgstr ""
 
-#: src/frontend/mame/ui/selsoft.cpp:711 src/frontend/mame/ui/selgame.cpp:1066
+#: src/frontend/mame/ui/selsoft.cpp:711 src/frontend/mame/ui/selgame.cpp:1076
 #, c-format
 msgid "%1$s: %2$s - Search: %3$s_"
 msgstr ""
 
-#: src/frontend/mame/ui/selsoft.cpp:713 src/frontend/mame/ui/selgame.cpp:1068
+#: src/frontend/mame/ui/selsoft.cpp:713 src/frontend/mame/ui/selgame.cpp:1078
 #, c-format
 msgid "Search: %1$s_"
 msgstr ""
@@ -275,7 +275,7 @@ msgstr ""
 msgid "Software list/item: %1$s:%2$s"
 msgstr ""
 
-#: src/frontend/mame/ui/optsmenu.cpp:73 src/frontend/mame/ui/sndmenu.cpp:165
+#: src/frontend/mame/ui/optsmenu.cpp:73 src/frontend/mame/ui/sndmenu.cpp:161
 msgid "Sound Options"
 msgstr ""
 
@@ -370,11 +370,11 @@ msgid "Show mouse pointer"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:39
-msgid "Confirm quit from machines"
+msgid "Confirm quit from emulation"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:40
-msgid "Skip information screen at startup"
+msgid "Skip system information screen"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:41
@@ -390,7 +390,7 @@ msgid "Skip BIOS selection menu"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:44
-msgid "Skip software parts selection menu"
+msgid "Skip software part selection menu"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:45
@@ -542,7 +542,7 @@ msgid "UI active"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:91
-msgid "Offscreen reload"
+msgid "Off-screen reload"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:92
@@ -558,7 +558,7 @@ msgid "Natural keyboard"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:95
-msgid "Simultaneous contradictory"
+msgid "Allow contradictory joystick inputs"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:96
@@ -582,7 +582,7 @@ msgid "Pedal Device Assignment"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:106
-msgid "Adstick Device Assignment"
+msgid "AD Stick Device Assignment"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:107
@@ -669,14 +669,14 @@ msgstr ""
 msgid "Wait Vertical Sync"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:687
+#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:689
 #: src/frontend/mame/ui/videoopt.cpp:191 src/frontend/mame/ui/custui.cpp:490
 #: src/frontend/mame/ui/analogipt.cpp:471 plugins/cheatfind/init.lua:766
 #: plugins/cheatfind/init.lua:777 plugins/cheat/init.lua:668
 msgid "On"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:690
+#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:692
 #: src/frontend/mame/ui/videoopt.cpp:207 src/frontend/mame/ui/custui.cpp:490
 #: src/frontend/mame/ui/analogipt.cpp:471 plugins/cheatfind/init.lua:763
 #: plugins/cheatfind/init.lua:774 plugins/cheat/init.lua:671
@@ -684,11 +684,11 @@ msgstr ""
 msgid "Off"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:693
+#: src/frontend/mame/ui/menu.cpp:695
 msgid "Auto"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:1195
+#: src/frontend/mame/ui/menu.cpp:1197
 #: src/frontend/mame/ui/simpleselgame.cpp:278
 #: src/frontend/mame/ui/selmenu.cpp:1280
 msgid "Return to Previous Menu"
@@ -696,7 +696,7 @@ msgstr ""
 
 #: src/frontend/mame/ui/filemngr.cpp:139
 #: src/frontend/mame/ui/confswitch.cpp:119
-#: src/frontend/mame/ui/inputmap.cpp:559 src/frontend/mame/ui/analogipt.cpp:360
+#: src/frontend/mame/ui/inputmap.cpp:563 src/frontend/mame/ui/analogipt.cpp:360
 #, c-format
 msgid "[root%1$s]"
 msgstr ""
@@ -939,22 +939,22 @@ msgid ""
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "GHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "MHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "kHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "Hz"
 msgstr ""
 
@@ -978,38 +978,38 @@ msgstr ""
 msgid "Vector"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:480
+#: src/frontend/mame/ui/info.cpp:483
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:480
+#: src/frontend/mame/ui/info.cpp:483
 msgid "%2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:497
+#: src/frontend/mame/ui/info.cpp:500
 #, c-format
 msgid "Screen '%1$s'"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:499
+#: src/frontend/mame/ui/info.cpp:502
 msgid "Screen"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:570 src/frontend/mame/ui/info.cpp:581
+#: src/frontend/mame/ui/info.cpp:573 src/frontend/mame/ui/info.cpp:584
 #, c-format
 msgid "%1$s:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:662
+#: src/frontend/mame/ui/info.cpp:665
 msgid "Not supported"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:665
+#: src/frontend/mame/ui/info.cpp:668
 msgid "Partially supported"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:674
+#: src/frontend/mame/ui/info.cpp:677
 msgid "[empty]"
 msgstr ""
 
@@ -1082,7 +1082,7 @@ msgid "Emulated"
 msgstr ""
 
 #: src/frontend/mame/ui/keyboard.cpp:59 src/frontend/mame/ui/confswitch.cpp:117
-#: src/frontend/mame/ui/inputmap.cpp:557 src/frontend/mame/ui/analogipt.cpp:358
+#: src/frontend/mame/ui/inputmap.cpp:561 src/frontend/mame/ui/analogipt.cpp:358
 #, c-format
 msgid "%1$s [root%2$s]"
 msgstr ""
@@ -1442,7 +1442,7 @@ msgctxt "swlist-info"
 msgid "Software list/item"
 msgstr ""
 
-#: src/frontend/mame/ui/datmenu.cpp:88 src/frontend/mame/ui/selmenu.cpp:2698
+#: src/frontend/mame/ui/datmenu.cpp:88 src/frontend/mame/ui/selmenu.cpp:2707
 msgid "Software List Info"
 msgstr ""
 
@@ -1557,7 +1557,7 @@ msgstr ""
 msgid "Configure Machine:"
 msgstr ""
 
-#: src/frontend/mame/ui/miscmenu.cpp:858 src/frontend/mame/ui/selmenu.cpp:2638
+#: src/frontend/mame/ui/miscmenu.cpp:858 src/frontend/mame/ui/selmenu.cpp:2647
 msgid " (default)"
 msgstr ""
 
@@ -1574,7 +1574,7 @@ msgid ""
 "Press %2$s to return to emulation"
 msgstr ""
 
-#: src/frontend/mame/ui/info_pty.cpp:30 src/frontend/mame/ui/mainmenu.cpp:155
+#: src/frontend/mame/ui/info_pty.cpp:30
 msgid "Pseudo terminals"
 msgstr ""
 
@@ -1642,52 +1642,52 @@ msgstr ""
 msgid "Other Controls"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:227
+#: src/frontend/mame/ui/inputmap.cpp:231
 msgid "This machine has no configurable inputs."
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:327
+#: src/frontend/mame/ui/inputmap.cpp:331
 msgid "Pressed"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:397
+#: src/frontend/mame/ui/inputmap.cpp:401
 msgid "Invalid sequence entered"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:542
+#: src/frontend/mame/ui/inputmap.cpp:546
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:543
+#: src/frontend/mame/ui/inputmap.cpp:547
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog Inc"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:544
+#: src/frontend/mame/ui/inputmap.cpp:548
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog Dec"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:586
+#: src/frontend/mame/ui/inputmap.cpp:590
 #, c-format
 msgid "Press %1$s to set\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:587
+#: src/frontend/mame/ui/inputmap.cpp:591
 #, c-format
 msgid "Press %1$s to append\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:588
+#: src/frontend/mame/ui/inputmap.cpp:592
 #, c-format
 msgid "Press %1$s to clear\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:589
+#: src/frontend/mame/ui/inputmap.cpp:593
 #, c-format
 msgid "Press %1$s to restore default\n"
 msgstr ""
@@ -1751,7 +1751,7 @@ msgid ""
 msgstr ""
 
 #: src/frontend/mame/ui/simpleselgame.cpp:273
-#: src/frontend/mame/ui/selgame.cpp:436
+#: src/frontend/mame/ui/selgame.cpp:443
 msgid "Configure Options"
 msgstr ""
 
@@ -2079,16 +2079,16 @@ msgstr ""
 msgid "Expand to fit"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:437
+#: src/frontend/mame/ui/selgame.cpp:444
 msgid "Configure Machine"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:1050
+#: src/frontend/mame/ui/selgame.cpp:1060
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d machines (%5$d BIOS) )"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:1078
+#: src/frontend/mame/ui/selgame.cpp:1088
 #, c-format
 msgid "System: %1$-.100s"
 msgstr ""
@@ -2110,7 +2110,7 @@ msgstr ""
 #: src/frontend/mame/ui/auditmenu.cpp:98
 #, c-format
 msgid ""
-"Auditing ROMs for machine %2$u of %3$u...\n"
+"Auditing media for machine %2$u of %3$u...\n"
 "%1$s"
 msgstr ""
 
@@ -2125,12 +2125,12 @@ msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:136
 #, c-format
-msgid "Audit ROMs for %1$u machines marked unavailable"
+msgid "Audit media for %1$u machines marked unavailable"
 msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:137
 #, c-format
-msgid "Audit ROMs for all %1$u machines"
+msgid "Audit media for all %1$u machines"
 msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:154
@@ -2336,84 +2336,84 @@ msgctxt "color-sample"
 msgid "Clone"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:914
+#: src/frontend/mame/ui/custui.cpp:906
 msgid "ARGB Settings"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:919 src/frontend/mame/ui/custui.cpp:922
+#: src/frontend/mame/ui/custui.cpp:911 src/frontend/mame/ui/custui.cpp:914
 msgctxt "color-channel"
 msgid "Alpha"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:927 src/frontend/mame/ui/custui.cpp:930
+#: src/frontend/mame/ui/custui.cpp:919 src/frontend/mame/ui/custui.cpp:922
 msgctxt "color-channel"
 msgid "Red"
 msgstr ""
 
+#: src/frontend/mame/ui/custui.cpp:927 src/frontend/mame/ui/custui.cpp:930
+msgctxt "color-channel"
+msgid "Green"
+msgstr ""
+
 #: src/frontend/mame/ui/custui.cpp:935 src/frontend/mame/ui/custui.cpp:938
 msgctxt "color-channel"
-msgid "Green"
-msgstr ""
-
-#: src/frontend/mame/ui/custui.cpp:943 src/frontend/mame/ui/custui.cpp:946
-msgctxt "color-channel"
 msgid "Blue"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:949
+#: src/frontend/mame/ui/custui.cpp:941
 msgid "Choose from palette"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:996
+#: src/frontend/mame/ui/custui.cpp:988
 msgid "Color preview:"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1093
+#: src/frontend/mame/ui/custui.cpp:1085
 msgctxt "color-preset"
 msgid "White"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1094
+#: src/frontend/mame/ui/custui.cpp:1086
 msgctxt "color-preset"
 msgid "Silver"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1095
+#: src/frontend/mame/ui/custui.cpp:1087
 msgctxt "color-preset"
 msgid "Gray"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1096
+#: src/frontend/mame/ui/custui.cpp:1088
 msgctxt "color-preset"
 msgid "Black"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1097
+#: src/frontend/mame/ui/custui.cpp:1089
 msgctxt "color-preset"
 msgid "Red"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1098
+#: src/frontend/mame/ui/custui.cpp:1090
 msgctxt "color-preset"
 msgid "Orange"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1099
+#: src/frontend/mame/ui/custui.cpp:1091
 msgctxt "color-preset"
 msgid "Yellow"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1100
+#: src/frontend/mame/ui/custui.cpp:1092
 msgctxt "color-preset"
 msgid "Green"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1101
+#: src/frontend/mame/ui/custui.cpp:1093
 msgctxt "color-preset"
 msgid "Blue"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1102
+#: src/frontend/mame/ui/custui.cpp:1094
 msgctxt "color-preset"
 msgid "Violet"
 msgstr ""
@@ -2478,7 +2478,7 @@ msgid "Input (general)"
 msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:123
-msgid "Input (this Machine)"
+msgid "Input (this machine)"
 msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:126
@@ -2517,6 +2517,10 @@ msgstr ""
 msgid "Tape Control"
 msgstr ""
 
+#: src/frontend/mame/ui/mainmenu.cpp:155
+msgid "Pseudo Terminals"
+msgstr ""
+
 #: src/frontend/mame/ui/mainmenu.cpp:158
 msgid "BIOS Selection"
 msgstr ""
@@ -2555,7 +2559,7 @@ msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:200
 #, c-format
-msgid "About %s"
+msgid "About %1$s"
 msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:212
@@ -2715,373 +2719,373 @@ msgstr ""
 msgid "%1$s %2$s"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2235
+#: src/frontend/mame/ui/selmenu.cpp:2244
 msgid "Images"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2236
+#: src/frontend/mame/ui/selmenu.cpp:2245
 msgid "Infos"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2551
+#: src/frontend/mame/ui/selmenu.cpp:2560
 msgid ""
 "Required ROM/disk images for the selected system are missing or incorrect. "
 "Please acquire the correct files or select a different system.\n"
 "\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2567
+#: src/frontend/mame/ui/selmenu.cpp:2576
 msgid ""
 "Required ROM/disk images for the selected software are missing or incorrect. "
 "Please acquire the correct files or select a different software item.\n"
 "\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2583
+#: src/frontend/mame/ui/selmenu.cpp:2592
 msgid "incorrect checksum"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2586
+#: src/frontend/mame/ui/selmenu.cpp:2595
 msgid "incorrect length"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2589
+#: src/frontend/mame/ui/selmenu.cpp:2598
 msgid "not found"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2600
+#: src/frontend/mame/ui/selmenu.cpp:2609
 #, c-format
 msgid "%1$s (%2$s) - %3$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2602
+#: src/frontend/mame/ui/selmenu.cpp:2611
 #, c-format
 msgid "%1$s - %2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2606
+#: src/frontend/mame/ui/selmenu.cpp:2615
 msgid "Press any key to continue."
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2735
+#: src/frontend/mame/ui/selmenu.cpp:2744
 msgid "General Info"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2887
-#, c-format
-msgid "Romset\t%1$s\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2888
-#, c-format
-msgid "Year\t%1$s\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2889
-#, c-format
-msgid "Manufacturer\t%1$s\n"
-msgstr ""
-
 #: src/frontend/mame/ui/selmenu.cpp:2896
 #, c-format
-msgid "Driver is Clone of\t%1$s\n"
+msgid "Romset\t%1$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2901
-msgid "Driver is Parent\t\n"
+#: src/frontend/mame/ui/selmenu.cpp:2897
+#, c-format
+msgid "Year\t%1$s\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2898
+#, c-format
+msgid "Manufacturer\t%1$s\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2905
-msgid "Analog Controls\tYes\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2907
-msgid "Keyboard Inputs\tYes\n"
+#, c-format
+msgid "Driver is Clone of\t%1$s\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2910
-msgid "Overall\tNOT WORKING\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2912
-msgid "Overall\tUnemulated Protection\n"
+msgid "Driver is Parent\t\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2914
-msgid "Overall\tWorking\n"
+msgid "Analog Controls\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2917
-msgid "Graphics\tUnimplemented\n"
+#: src/frontend/mame/ui/selmenu.cpp:2916
+msgid "Keyboard Inputs\tYes\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2919
-msgid "Graphics\tWrong Colors\n"
+msgid "Overall\tNOT WORKING\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2921
-msgid "Graphics\tImperfect Colors\n"
+msgid "Overall\tUnemulated Protection\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2923
-msgid "Graphics\tImperfect\n"
+msgid "Overall\tWorking\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2925
-msgid "Graphics\tOK\n"
+#: src/frontend/mame/ui/selmenu.cpp:2926
+msgid "Graphics\tUnimplemented\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2928
-msgid "Sound\tNone\n"
+msgid "Graphics\tWrong Colors\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2930
-msgid "Sound\tUnimplemented\n"
+msgid "Graphics\tImperfect Colors\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2932
-msgid "Sound\tImperfect\n"
+msgid "Graphics\tImperfect\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2934
-msgid "Sound\tOK\n"
+msgid "Graphics\tOK\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2937
-msgid "Capture\tUnimplemented\n"
+msgid "Sound\tNone\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2939
+msgid "Sound\tUnimplemented\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2941
+msgid "Sound\tImperfect\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2943
+msgid "Sound\tOK\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2946
+msgid "Capture\tUnimplemented\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2948
 msgid "Capture\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2942
+#: src/frontend/mame/ui/selmenu.cpp:2951
 msgid "Camera\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2944
+#: src/frontend/mame/ui/selmenu.cpp:2953
 msgid "Camera\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2947
+#: src/frontend/mame/ui/selmenu.cpp:2956
 msgid "Microphone\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2949
+#: src/frontend/mame/ui/selmenu.cpp:2958
 msgid "Microphone\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2952
+#: src/frontend/mame/ui/selmenu.cpp:2961
 msgid "Controls\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2954
+#: src/frontend/mame/ui/selmenu.cpp:2963
 msgid "Controls\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2957
+#: src/frontend/mame/ui/selmenu.cpp:2966
 msgid "Keyboard\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2959
+#: src/frontend/mame/ui/selmenu.cpp:2968
 msgid "Keyboard\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2962
+#: src/frontend/mame/ui/selmenu.cpp:2971
 msgid "Mouse\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2964
+#: src/frontend/mame/ui/selmenu.cpp:2973
 msgid "Mouse\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2967
+#: src/frontend/mame/ui/selmenu.cpp:2976
 msgid "Media\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2969
+#: src/frontend/mame/ui/selmenu.cpp:2978
 msgid "Media\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2972
+#: src/frontend/mame/ui/selmenu.cpp:2981
 msgid "Disk\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2974
+#: src/frontend/mame/ui/selmenu.cpp:2983
 msgid "Disk\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2977
+#: src/frontend/mame/ui/selmenu.cpp:2986
 msgid "Printer\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2979
+#: src/frontend/mame/ui/selmenu.cpp:2988
 msgid "Printer\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2982
+#: src/frontend/mame/ui/selmenu.cpp:2991
 msgid "Mag. Tape\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2984
+#: src/frontend/mame/ui/selmenu.cpp:2993
 msgid "Mag. Tape\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2987
+#: src/frontend/mame/ui/selmenu.cpp:2996
 msgid "Punch Tape\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2989
+#: src/frontend/mame/ui/selmenu.cpp:2998
 msgid "Punch Tape\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2992
+#: src/frontend/mame/ui/selmenu.cpp:3001
 msgid "Mag. Drum\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2994
+#: src/frontend/mame/ui/selmenu.cpp:3003
 msgid "Mag. Drum\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2997
+#: src/frontend/mame/ui/selmenu.cpp:3006
 msgid "(EP)ROM\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2999
+#: src/frontend/mame/ui/selmenu.cpp:3008
 msgid "(EP)ROM\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3002
+#: src/frontend/mame/ui/selmenu.cpp:3011
 msgid "Communications\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3004
+#: src/frontend/mame/ui/selmenu.cpp:3013
 msgid "Communications\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3007
+#: src/frontend/mame/ui/selmenu.cpp:3016
 msgid "LAN\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3009
+#: src/frontend/mame/ui/selmenu.cpp:3018
 msgid "LAN\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3012
+#: src/frontend/mame/ui/selmenu.cpp:3021
 msgid "WAN\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3014
+#: src/frontend/mame/ui/selmenu.cpp:3023
 msgid "WAN\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3017
+#: src/frontend/mame/ui/selmenu.cpp:3026
 msgid "Timing\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3019
+#: src/frontend/mame/ui/selmenu.cpp:3028
 msgid "Timing\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3021
+#: src/frontend/mame/ui/selmenu.cpp:3030
 msgid "Mechanical Machine\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3021
+#: src/frontend/mame/ui/selmenu.cpp:3030
 msgid "Mechanical Machine\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3022
+#: src/frontend/mame/ui/selmenu.cpp:3031
 msgid "Requires Artwork\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3022
+#: src/frontend/mame/ui/selmenu.cpp:3031
 msgid "Requires Artwork\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3023
+#: src/frontend/mame/ui/selmenu.cpp:3032
 msgid "Requires Clickable Artwork\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3023
+#: src/frontend/mame/ui/selmenu.cpp:3032
 msgid "Requires Clickable Artwork\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3025
+#: src/frontend/mame/ui/selmenu.cpp:3034
 msgid "Support Cocktail\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3026
+#: src/frontend/mame/ui/selmenu.cpp:3035
 msgid "Driver is BIOS\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3026
+#: src/frontend/mame/ui/selmenu.cpp:3035
 msgid "Driver is BIOS\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3027
+#: src/frontend/mame/ui/selmenu.cpp:3036
 msgid "Support Save\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3027
+#: src/frontend/mame/ui/selmenu.cpp:3036
 msgid "Support Save\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3028
+#: src/frontend/mame/ui/selmenu.cpp:3037
 msgid "Screen Orientation\tVertical\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3028
+#: src/frontend/mame/ui/selmenu.cpp:3037
 msgid "Screen Orientation\tHorizontal\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3038
+#: src/frontend/mame/ui/selmenu.cpp:3047
 msgid "Requires CHD\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3038
+#: src/frontend/mame/ui/selmenu.cpp:3047
 msgid "Requires CHD\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3051
-msgid "ROM Audit Result\tOK\n"
+#: src/frontend/mame/ui/selmenu.cpp:3060
+msgid "Media Audit Result\tOK\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3053
-msgid "ROM Audit Result\tBAD\n"
+#: src/frontend/mame/ui/selmenu.cpp:3062
+msgid "Media Audit Result\tBAD\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3056
+#: src/frontend/mame/ui/selmenu.cpp:3065
 msgid "Samples Audit Result\tNone Needed\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3058
+#: src/frontend/mame/ui/selmenu.cpp:3067
 msgid "Samples Audit Result\tOK\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3060
+#: src/frontend/mame/ui/selmenu.cpp:3069
 msgid "Samples Audit Result\tBAD\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3064
+#: src/frontend/mame/ui/selmenu.cpp:3073
 msgid ""
-"ROM Audit \tDisabled\n"
-"Samples Audit \tDisabled\n"
+"Media Audit\tDisabled\n"
+"Samples Audit\tDisabled\n"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:150
+#: src/frontend/mame/ui/sndmenu.cpp:146
 msgid "Sound"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:151
+#: src/frontend/mame/ui/sndmenu.cpp:147
 msgid "Compressor"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:152
+#: src/frontend/mame/ui/sndmenu.cpp:148
 msgid "Sample Rate"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:153
+#: src/frontend/mame/ui/sndmenu.cpp:149
 msgid "Use External Samples"
 msgstr ""
 
@@ -3120,511 +3124,681 @@ msgstr ""
 msgid "  Screen '%1$s': Vector\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:132
+#: src/frontend/mame/ui/devopt.cpp:135
 #, c-format
 msgid "  Screen '%1$s': %2$d × %3$d (V) %4$s Hz\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:133
+#: src/frontend/mame/ui/devopt.cpp:136
 #, c-format
 msgid "  Screen '%1$s': %2$d × %3$d (H) %4$s Hz\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:147
+#: src/frontend/mame/ui/devopt.cpp:150
 msgid "* Sound:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:211
+#: src/frontend/mame/ui/devopt.cpp:214
 #, c-format
 msgid ""
 "* BIOS settings:\n"
 "  %1$d options    [default: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:255 src/frontend/mame/ui/devopt.cpp:271
-#: src/frontend/mame/ui/devopt.cpp:332
+#: src/frontend/mame/ui/devopt.cpp:258 src/frontend/mame/ui/devopt.cpp:274
+#: src/frontend/mame/ui/devopt.cpp:335
 #, c-format
 msgid "  %1$s    [default: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:260 src/frontend/mame/ui/devopt.cpp:276
+#: src/frontend/mame/ui/devopt.cpp:263 src/frontend/mame/ui/devopt.cpp:279
 #, c-format
 msgid "  %1$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:282
+#: src/frontend/mame/ui/devopt.cpp:285
 msgid "* DIP switch settings:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:287
+#: src/frontend/mame/ui/devopt.cpp:290
 msgid "* Configuration settings:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:291
+#: src/frontend/mame/ui/devopt.cpp:294
 msgid "* Input device(s):\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:293
+#: src/frontend/mame/ui/devopt.cpp:296
 #, c-format
 msgid "  User inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:295
+#: src/frontend/mame/ui/devopt.cpp:298
 #, c-format
 msgid "  Mahjong inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:297
+#: src/frontend/mame/ui/devopt.cpp:300
 #, c-format
 msgid "  Hanafuda inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:299
+#: src/frontend/mame/ui/devopt.cpp:302
 #, c-format
 msgid "  Gambling inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:301
+#: src/frontend/mame/ui/devopt.cpp:304
 #, c-format
 msgid "  Analog inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:303
+#: src/frontend/mame/ui/devopt.cpp:306
 #, c-format
 msgid "  Adjuster inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:305
+#: src/frontend/mame/ui/devopt.cpp:308
 #, c-format
 msgid "  Keypad inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:307
+#: src/frontend/mame/ui/devopt.cpp:310
 #, c-format
 msgid "  Keyboard inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:312
+#: src/frontend/mame/ui/devopt.cpp:315
 msgid "* Media Options:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:317
+#: src/frontend/mame/ui/devopt.cpp:320
 #, c-format
 msgid "  %1$s    [tag: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:327
+#: src/frontend/mame/ui/devopt.cpp:330
 msgid "* Slot Options:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:341
+#: src/frontend/mame/ui/devopt.cpp:344
 msgid "[None]\n"
 msgstr ""
 
-#: src/emu/render.cpp:1847
+#: src/emu/render.cpp:1796
 #, c-format
 msgctxt "view-name"
 msgid "Screen %1$u Standard (%2$u:%3$u)"
 msgstr ""
 
-#: src/emu/render.cpp:1873
+#: src/emu/render.cpp:1822
 #, c-format
 msgctxt "view-name"
 msgid "Screen %1$u Pixel Aspect (%2$u:%3$u)"
 msgstr ""
 
-#: src/emu/render.cpp:1895 src/emu/render.cpp:2030
+#: src/emu/render.cpp:1844 src/emu/render.cpp:1979
 msgctxt "view-name"
 msgid "Cocktail"
 msgstr ""
 
-#: src/emu/render.cpp:2015
+#: src/emu/render.cpp:1964
 msgctxt "view-name"
 msgid "Left-to-Right"
 msgstr ""
 
-#: src/emu/render.cpp:2016
+#: src/emu/render.cpp:1965
 msgctxt "view-name"
 msgid "Left-to-Right (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2017
+#: src/emu/render.cpp:1966
 msgctxt "view-name"
 msgid "Top-to-Bottom"
 msgstr ""
 
-#: src/emu/render.cpp:2018
+#: src/emu/render.cpp:1967
 msgctxt "view-name"
 msgid "Top-to-Bottom (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2069
+#: src/emu/render.cpp:2018
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Left-to-Right, Top-to-Bottom"
 msgstr ""
 
-#: src/emu/render.cpp:2078
+#: src/emu/render.cpp:2027
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Left-to-Right, Top-to-Bottom (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2087
+#: src/emu/render.cpp:2036
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Top-to-Bottom, Left-to-Right"
 msgstr ""
 
-#: src/emu/render.cpp:2096
+#: src/emu/render.cpp:2045
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Top-to-Bottom, Left-to-Right (Gapless)"
 msgstr ""
 
-#: src/emu/inpttype.ipp:22
+#: src/emu/ioport.cpp:332
+#, c-format
 msgctxt "input-name"
-msgid "P1 Up"
+msgid "P%1$u"
 msgstr ""
 
-#: src/emu/inpttype.ipp:23
+#: src/emu/ioport.cpp:1924
 msgctxt "input-name"
-msgid "P1 Down"
+msgid "???"
 msgstr ""
 
-#: src/emu/inpttype.ipp:24
+#: src/emu/inpttype.ipp:22 src/emu/inpttype.ipp:140 src/emu/inpttype.ipp:221
+#: src/emu/inpttype.ipp:255 src/emu/inpttype.ipp:289 src/emu/inpttype.ipp:323
+#: src/emu/inpttype.ipp:357 src/emu/inpttype.ipp:391 src/emu/inpttype.ipp:425
+#: src/emu/inpttype.ipp:459
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left"
+msgid "%p Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:25
+#: src/emu/inpttype.ipp:23 src/emu/inpttype.ipp:141 src/emu/inpttype.ipp:222
+#: src/emu/inpttype.ipp:256 src/emu/inpttype.ipp:290 src/emu/inpttype.ipp:324
+#: src/emu/inpttype.ipp:358 src/emu/inpttype.ipp:392 src/emu/inpttype.ipp:426
+#: src/emu/inpttype.ipp:460
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right"
+msgid "%p Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:26
+#: src/emu/inpttype.ipp:24 src/emu/inpttype.ipp:142 src/emu/inpttype.ipp:223
+#: src/emu/inpttype.ipp:257 src/emu/inpttype.ipp:291 src/emu/inpttype.ipp:325
+#: src/emu/inpttype.ipp:359 src/emu/inpttype.ipp:393 src/emu/inpttype.ipp:427
+#: src/emu/inpttype.ipp:461
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Up"
+msgid "%p Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:27
+#: src/emu/inpttype.ipp:25 src/emu/inpttype.ipp:143 src/emu/inpttype.ipp:224
+#: src/emu/inpttype.ipp:258 src/emu/inpttype.ipp:292 src/emu/inpttype.ipp:326
+#: src/emu/inpttype.ipp:360 src/emu/inpttype.ipp:394 src/emu/inpttype.ipp:428
+#: src/emu/inpttype.ipp:462
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Down"
+msgid "%p Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:28
+#: src/emu/inpttype.ipp:26 src/emu/inpttype.ipp:144 src/emu/inpttype.ipp:225
+#: src/emu/inpttype.ipp:259 src/emu/inpttype.ipp:293 src/emu/inpttype.ipp:327
+#: src/emu/inpttype.ipp:361 src/emu/inpttype.ipp:395 src/emu/inpttype.ipp:429
+#: src/emu/inpttype.ipp:463
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Left"
+msgid "%p Right Stick/Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:29
+#: src/emu/inpttype.ipp:27 src/emu/inpttype.ipp:145 src/emu/inpttype.ipp:226
+#: src/emu/inpttype.ipp:260 src/emu/inpttype.ipp:294 src/emu/inpttype.ipp:328
+#: src/emu/inpttype.ipp:362 src/emu/inpttype.ipp:396 src/emu/inpttype.ipp:430
+#: src/emu/inpttype.ipp:464
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Right"
+msgid "%p Right Stick/Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:30
+#: src/emu/inpttype.ipp:28 src/emu/inpttype.ipp:146 src/emu/inpttype.ipp:227
+#: src/emu/inpttype.ipp:261 src/emu/inpttype.ipp:295 src/emu/inpttype.ipp:329
+#: src/emu/inpttype.ipp:363 src/emu/inpttype.ipp:397 src/emu/inpttype.ipp:431
+#: src/emu/inpttype.ipp:465
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Up"
+msgid "%p Right Stick/Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:31
+#: src/emu/inpttype.ipp:29 src/emu/inpttype.ipp:147 src/emu/inpttype.ipp:228
+#: src/emu/inpttype.ipp:262 src/emu/inpttype.ipp:296 src/emu/inpttype.ipp:330
+#: src/emu/inpttype.ipp:364 src/emu/inpttype.ipp:398 src/emu/inpttype.ipp:432
+#: src/emu/inpttype.ipp:466
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Down"
+msgid "%p Right Stick/Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:32
+#: src/emu/inpttype.ipp:30 src/emu/inpttype.ipp:148 src/emu/inpttype.ipp:229
+#: src/emu/inpttype.ipp:263 src/emu/inpttype.ipp:297 src/emu/inpttype.ipp:331
+#: src/emu/inpttype.ipp:365 src/emu/inpttype.ipp:399 src/emu/inpttype.ipp:433
+#: src/emu/inpttype.ipp:467
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Left"
+msgid "%p Left Stick/Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:33
+#: src/emu/inpttype.ipp:31 src/emu/inpttype.ipp:149 src/emu/inpttype.ipp:230
+#: src/emu/inpttype.ipp:264 src/emu/inpttype.ipp:298 src/emu/inpttype.ipp:332
+#: src/emu/inpttype.ipp:366 src/emu/inpttype.ipp:400 src/emu/inpttype.ipp:434
+#: src/emu/inpttype.ipp:468
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Right"
+msgid "%p Left Stick/Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:34
+#: src/emu/inpttype.ipp:32 src/emu/inpttype.ipp:150 src/emu/inpttype.ipp:231
+#: src/emu/inpttype.ipp:265 src/emu/inpttype.ipp:299 src/emu/inpttype.ipp:333
+#: src/emu/inpttype.ipp:367 src/emu/inpttype.ipp:401 src/emu/inpttype.ipp:435
+#: src/emu/inpttype.ipp:469
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 1"
+msgid "%p Left Stick/Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:35
+#: src/emu/inpttype.ipp:33 src/emu/inpttype.ipp:151 src/emu/inpttype.ipp:232
+#: src/emu/inpttype.ipp:266 src/emu/inpttype.ipp:300 src/emu/inpttype.ipp:334
+#: src/emu/inpttype.ipp:368 src/emu/inpttype.ipp:402 src/emu/inpttype.ipp:436
+#: src/emu/inpttype.ipp:470
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 2"
+msgid "%p Left Stick/Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:36
+#: src/emu/inpttype.ipp:34 src/emu/inpttype.ipp:152 src/emu/inpttype.ipp:233
+#: src/emu/inpttype.ipp:267 src/emu/inpttype.ipp:301 src/emu/inpttype.ipp:335
+#: src/emu/inpttype.ipp:369 src/emu/inpttype.ipp:403 src/emu/inpttype.ipp:437
+#: src/emu/inpttype.ipp:471
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 3"
+msgid "%p Button 1"
 msgstr ""
 
-#: src/emu/inpttype.ipp:37
+#: src/emu/inpttype.ipp:35 src/emu/inpttype.ipp:153 src/emu/inpttype.ipp:234
+#: src/emu/inpttype.ipp:268 src/emu/inpttype.ipp:302 src/emu/inpttype.ipp:336
+#: src/emu/inpttype.ipp:370 src/emu/inpttype.ipp:404 src/emu/inpttype.ipp:438
+#: src/emu/inpttype.ipp:472
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 4"
+msgid "%p Button 2"
 msgstr ""
 
-#: src/emu/inpttype.ipp:38
+#: src/emu/inpttype.ipp:36 src/emu/inpttype.ipp:154 src/emu/inpttype.ipp:235
+#: src/emu/inpttype.ipp:269 src/emu/inpttype.ipp:303 src/emu/inpttype.ipp:337
+#: src/emu/inpttype.ipp:371 src/emu/inpttype.ipp:405 src/emu/inpttype.ipp:439
+#: src/emu/inpttype.ipp:473
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 5"
+msgid "%p Button 3"
 msgstr ""
 
-#: src/emu/inpttype.ipp:39
+#: src/emu/inpttype.ipp:37 src/emu/inpttype.ipp:155 src/emu/inpttype.ipp:236
+#: src/emu/inpttype.ipp:270 src/emu/inpttype.ipp:304 src/emu/inpttype.ipp:338
+#: src/emu/inpttype.ipp:372 src/emu/inpttype.ipp:406 src/emu/inpttype.ipp:440
+#: src/emu/inpttype.ipp:474
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 6"
+msgid "%p Button 4"
 msgstr ""
 
-#: src/emu/inpttype.ipp:40
+#: src/emu/inpttype.ipp:38 src/emu/inpttype.ipp:156 src/emu/inpttype.ipp:237
+#: src/emu/inpttype.ipp:271 src/emu/inpttype.ipp:305 src/emu/inpttype.ipp:339
+#: src/emu/inpttype.ipp:373 src/emu/inpttype.ipp:407 src/emu/inpttype.ipp:441
+#: src/emu/inpttype.ipp:475
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 7"
+msgid "%p Button 5"
 msgstr ""
 
-#: src/emu/inpttype.ipp:41
+#: src/emu/inpttype.ipp:39 src/emu/inpttype.ipp:157 src/emu/inpttype.ipp:238
+#: src/emu/inpttype.ipp:272 src/emu/inpttype.ipp:306 src/emu/inpttype.ipp:340
+#: src/emu/inpttype.ipp:374 src/emu/inpttype.ipp:408 src/emu/inpttype.ipp:442
+#: src/emu/inpttype.ipp:476
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 8"
+msgid "%p Button 6"
 msgstr ""
 
-#: src/emu/inpttype.ipp:42
+#: src/emu/inpttype.ipp:40 src/emu/inpttype.ipp:158 src/emu/inpttype.ipp:239
+#: src/emu/inpttype.ipp:273 src/emu/inpttype.ipp:307 src/emu/inpttype.ipp:341
+#: src/emu/inpttype.ipp:375 src/emu/inpttype.ipp:409 src/emu/inpttype.ipp:443
+#: src/emu/inpttype.ipp:477
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 9"
+msgid "%p Button 7"
 msgstr ""
 
-#: src/emu/inpttype.ipp:43
+#: src/emu/inpttype.ipp:41 src/emu/inpttype.ipp:159 src/emu/inpttype.ipp:240
+#: src/emu/inpttype.ipp:274 src/emu/inpttype.ipp:308 src/emu/inpttype.ipp:342
+#: src/emu/inpttype.ipp:376 src/emu/inpttype.ipp:410 src/emu/inpttype.ipp:444
+#: src/emu/inpttype.ipp:478
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 10"
+msgid "%p Button 8"
 msgstr ""
 
-#: src/emu/inpttype.ipp:44
+#: src/emu/inpttype.ipp:42 src/emu/inpttype.ipp:160 src/emu/inpttype.ipp:241
+#: src/emu/inpttype.ipp:275 src/emu/inpttype.ipp:309 src/emu/inpttype.ipp:343
+#: src/emu/inpttype.ipp:377 src/emu/inpttype.ipp:411 src/emu/inpttype.ipp:445
+#: src/emu/inpttype.ipp:479
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 11"
+msgid "%p Button 9"
 msgstr ""
 
-#: src/emu/inpttype.ipp:45
+#: src/emu/inpttype.ipp:43 src/emu/inpttype.ipp:161 src/emu/inpttype.ipp:242
+#: src/emu/inpttype.ipp:276 src/emu/inpttype.ipp:310 src/emu/inpttype.ipp:344
+#: src/emu/inpttype.ipp:378 src/emu/inpttype.ipp:412 src/emu/inpttype.ipp:446
+#: src/emu/inpttype.ipp:480
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 12"
+msgid "%p Button 10"
 msgstr ""
 
-#: src/emu/inpttype.ipp:46
+#: src/emu/inpttype.ipp:44 src/emu/inpttype.ipp:162 src/emu/inpttype.ipp:243
+#: src/emu/inpttype.ipp:277 src/emu/inpttype.ipp:311 src/emu/inpttype.ipp:345
+#: src/emu/inpttype.ipp:379 src/emu/inpttype.ipp:413 src/emu/inpttype.ipp:447
+#: src/emu/inpttype.ipp:481
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 13"
+msgid "%p Button 11"
 msgstr ""
 
-#: src/emu/inpttype.ipp:47
+#: src/emu/inpttype.ipp:45 src/emu/inpttype.ipp:163 src/emu/inpttype.ipp:244
+#: src/emu/inpttype.ipp:278 src/emu/inpttype.ipp:312 src/emu/inpttype.ipp:346
+#: src/emu/inpttype.ipp:380 src/emu/inpttype.ipp:414 src/emu/inpttype.ipp:448
+#: src/emu/inpttype.ipp:482
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 14"
+msgid "%p Button 12"
 msgstr ""
 
-#: src/emu/inpttype.ipp:48
+#: src/emu/inpttype.ipp:46 src/emu/inpttype.ipp:164 src/emu/inpttype.ipp:245
+#: src/emu/inpttype.ipp:279 src/emu/inpttype.ipp:313 src/emu/inpttype.ipp:347
+#: src/emu/inpttype.ipp:381 src/emu/inpttype.ipp:415 src/emu/inpttype.ipp:449
+#: src/emu/inpttype.ipp:483
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 15"
+msgid "%p Button 13"
 msgstr ""
 
-#: src/emu/inpttype.ipp:49
+#: src/emu/inpttype.ipp:47 src/emu/inpttype.ipp:165 src/emu/inpttype.ipp:246
+#: src/emu/inpttype.ipp:280 src/emu/inpttype.ipp:314 src/emu/inpttype.ipp:348
+#: src/emu/inpttype.ipp:382 src/emu/inpttype.ipp:416 src/emu/inpttype.ipp:450
+#: src/emu/inpttype.ipp:484
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 16"
+msgid "%p Button 14"
 msgstr ""
 
-#: src/emu/inpttype.ipp:50
+#: src/emu/inpttype.ipp:48 src/emu/inpttype.ipp:166 src/emu/inpttype.ipp:247
+#: src/emu/inpttype.ipp:281 src/emu/inpttype.ipp:315 src/emu/inpttype.ipp:349
+#: src/emu/inpttype.ipp:383 src/emu/inpttype.ipp:417 src/emu/inpttype.ipp:451
+#: src/emu/inpttype.ipp:485
+#, c-format
 msgctxt "input-name"
-msgid "P1 Start"
+msgid "%p Button 15"
 msgstr ""
 
-#: src/emu/inpttype.ipp:51
+#: src/emu/inpttype.ipp:49 src/emu/inpttype.ipp:167 src/emu/inpttype.ipp:248
+#: src/emu/inpttype.ipp:282 src/emu/inpttype.ipp:316 src/emu/inpttype.ipp:350
+#: src/emu/inpttype.ipp:384 src/emu/inpttype.ipp:418 src/emu/inpttype.ipp:452
+#: src/emu/inpttype.ipp:486
+#, c-format
 msgctxt "input-name"
-msgid "P1 Select"
+msgid "%p Button 16"
 msgstr ""
 
-#: src/emu/inpttype.ipp:56
+#: src/emu/inpttype.ipp:50 src/emu/inpttype.ipp:168 src/emu/inpttype.ipp:249
+#: src/emu/inpttype.ipp:283 src/emu/inpttype.ipp:317 src/emu/inpttype.ipp:351
+#: src/emu/inpttype.ipp:385 src/emu/inpttype.ipp:419 src/emu/inpttype.ipp:453
+#: src/emu/inpttype.ipp:487
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong A"
+msgid "%p Start"
 msgstr ""
 
-#: src/emu/inpttype.ipp:57
+#: src/emu/inpttype.ipp:51 src/emu/inpttype.ipp:169 src/emu/inpttype.ipp:250
+#: src/emu/inpttype.ipp:284 src/emu/inpttype.ipp:318 src/emu/inpttype.ipp:352
+#: src/emu/inpttype.ipp:386 src/emu/inpttype.ipp:420 src/emu/inpttype.ipp:454
+#: src/emu/inpttype.ipp:488
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong B"
+msgid "%p Select"
 msgstr ""
 
-#: src/emu/inpttype.ipp:58
+#: src/emu/inpttype.ipp:56 src/emu/inpttype.ipp:174
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong C"
+msgid "%p Mahjong A"
 msgstr ""
 
-#: src/emu/inpttype.ipp:59
+#: src/emu/inpttype.ipp:57 src/emu/inpttype.ipp:175
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong D"
+msgid "%p Mahjong B"
 msgstr ""
 
-#: src/emu/inpttype.ipp:60
+#: src/emu/inpttype.ipp:58 src/emu/inpttype.ipp:176
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong E"
+msgid "%p Mahjong C"
 msgstr ""
 
-#: src/emu/inpttype.ipp:61
+#: src/emu/inpttype.ipp:59 src/emu/inpttype.ipp:177
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong F"
+msgid "%p Mahjong D"
 msgstr ""
 
-#: src/emu/inpttype.ipp:62
+#: src/emu/inpttype.ipp:60 src/emu/inpttype.ipp:178
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong G"
+msgid "%p Mahjong E"
 msgstr ""
 
-#: src/emu/inpttype.ipp:63
+#: src/emu/inpttype.ipp:61 src/emu/inpttype.ipp:179
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong H"
+msgid "%p Mahjong F"
 msgstr ""
 
-#: src/emu/inpttype.ipp:64
+#: src/emu/inpttype.ipp:62 src/emu/inpttype.ipp:180
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong I"
+msgid "%p Mahjong G"
 msgstr ""
 
-#: src/emu/inpttype.ipp:65
+#: src/emu/inpttype.ipp:63 src/emu/inpttype.ipp:181
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong J"
+msgid "%p Mahjong H"
 msgstr ""
 
-#: src/emu/inpttype.ipp:66
+#: src/emu/inpttype.ipp:64 src/emu/inpttype.ipp:182
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong K"
+msgid "%p Mahjong I"
 msgstr ""
 
-#: src/emu/inpttype.ipp:67
+#: src/emu/inpttype.ipp:65 src/emu/inpttype.ipp:183
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong L"
+msgid "%p Mahjong J"
 msgstr ""
 
-#: src/emu/inpttype.ipp:68
+#: src/emu/inpttype.ipp:66 src/emu/inpttype.ipp:184
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong M"
+msgid "%p Mahjong K"
 msgstr ""
 
-#: src/emu/inpttype.ipp:69
+#: src/emu/inpttype.ipp:67 src/emu/inpttype.ipp:185
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong N"
+msgid "%p Mahjong L"
 msgstr ""
 
-#: src/emu/inpttype.ipp:70
+#: src/emu/inpttype.ipp:68 src/emu/inpttype.ipp:186
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong O"
+msgid "%p Mahjong M"
 msgstr ""
 
-#: src/emu/inpttype.ipp:71
+#: src/emu/inpttype.ipp:69 src/emu/inpttype.ipp:187
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong P"
+msgid "%p Mahjong N"
 msgstr ""
 
-#: src/emu/inpttype.ipp:72
+#: src/emu/inpttype.ipp:70 src/emu/inpttype.ipp:188
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Q"
+msgid "%p Mahjong O"
 msgstr ""
 
-#: src/emu/inpttype.ipp:73
+#: src/emu/inpttype.ipp:71 src/emu/inpttype.ipp:189
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Kan"
+msgid "%p Mahjong P"
 msgstr ""
 
-#: src/emu/inpttype.ipp:74
+#: src/emu/inpttype.ipp:72 src/emu/inpttype.ipp:190
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Pon"
+msgid "%p Mahjong Q"
 msgstr ""
 
-#: src/emu/inpttype.ipp:75
+#: src/emu/inpttype.ipp:73 src/emu/inpttype.ipp:191
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Chi"
+msgid "%p Mahjong Kan"
 msgstr ""
 
-#: src/emu/inpttype.ipp:76
+#: src/emu/inpttype.ipp:74 src/emu/inpttype.ipp:192
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Reach"
+msgid "%p Mahjong Pon"
 msgstr ""
 
-#: src/emu/inpttype.ipp:77
+#: src/emu/inpttype.ipp:75 src/emu/inpttype.ipp:193
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Ron"
+msgid "%p Mahjong Chi"
 msgstr ""
 
-#: src/emu/inpttype.ipp:78
+#: src/emu/inpttype.ipp:76 src/emu/inpttype.ipp:194
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Flip Flop"
+msgid "%p Mahjong Reach"
 msgstr ""
 
-#: src/emu/inpttype.ipp:79
+#: src/emu/inpttype.ipp:77 src/emu/inpttype.ipp:195
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Bet"
+msgid "%p Mahjong Ron"
 msgstr ""
 
-#: src/emu/inpttype.ipp:80
+#: src/emu/inpttype.ipp:78 src/emu/inpttype.ipp:200
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Take Score"
+msgid "%p Mahjong Flip Flop"
 msgstr ""
 
-#: src/emu/inpttype.ipp:81
+#: src/emu/inpttype.ipp:79 src/emu/inpttype.ipp:196
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Double Up"
+msgid "%p Mahjong Bet"
 msgstr ""
 
-#: src/emu/inpttype.ipp:82
+#: src/emu/inpttype.ipp:80 src/emu/inpttype.ipp:198
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Big"
+msgid "%p Mahjong Take Score"
 msgstr ""
 
-#: src/emu/inpttype.ipp:83
+#: src/emu/inpttype.ipp:81 src/emu/inpttype.ipp:199
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Small"
+msgid "%p Mahjong Double Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:84
+#: src/emu/inpttype.ipp:82 src/emu/inpttype.ipp:201
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Last Chance"
+msgid "%p Mahjong Big"
 msgstr ""
 
-#: src/emu/inpttype.ipp:89
+#: src/emu/inpttype.ipp:83 src/emu/inpttype.ipp:202
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda A/1"
+msgid "%p Mahjong Small"
 msgstr ""
 
-#: src/emu/inpttype.ipp:90
+#: src/emu/inpttype.ipp:84 src/emu/inpttype.ipp:197
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda B/2"
+msgid "%p Mahjong Last Chance"
 msgstr ""
 
-#: src/emu/inpttype.ipp:91
+#: src/emu/inpttype.ipp:89 src/emu/inpttype.ipp:207
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda C/3"
+msgid "%p Hanafuda A/1"
 msgstr ""
 
-#: src/emu/inpttype.ipp:92
+#: src/emu/inpttype.ipp:90 src/emu/inpttype.ipp:208
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda D/4"
+msgid "%p Hanafuda B/2"
 msgstr ""
 
-#: src/emu/inpttype.ipp:93
+#: src/emu/inpttype.ipp:91 src/emu/inpttype.ipp:209
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda E/5"
+msgid "%p Hanafuda C/3"
 msgstr ""
 
-#: src/emu/inpttype.ipp:94
+#: src/emu/inpttype.ipp:92 src/emu/inpttype.ipp:210
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda F/6"
+msgid "%p Hanafuda D/4"
 msgstr ""
 
-#: src/emu/inpttype.ipp:95
+#: src/emu/inpttype.ipp:93 src/emu/inpttype.ipp:211
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda G/7"
+msgid "%p Hanafuda E/5"
 msgstr ""
 
-#: src/emu/inpttype.ipp:96
+#: src/emu/inpttype.ipp:94 src/emu/inpttype.ipp:212
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda H/8"
+msgid "%p Hanafuda F/6"
 msgstr ""
 
-#: src/emu/inpttype.ipp:97
+#: src/emu/inpttype.ipp:95 src/emu/inpttype.ipp:213
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda Yes"
+msgid "%p Hanafuda G/7"
 msgstr ""
 
-#: src/emu/inpttype.ipp:98
+#: src/emu/inpttype.ipp:96 src/emu/inpttype.ipp:214
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda No"
+msgid "%p Hanafuda H/8"
+msgstr ""
+
+#: src/emu/inpttype.ipp:97 src/emu/inpttype.ipp:215
+#, c-format
+msgctxt "input-name"
+msgid "%p Hanafuda Yes"
+msgstr ""
+
+#: src/emu/inpttype.ipp:98 src/emu/inpttype.ipp:216
+#, c-format
+msgctxt "input-name"
+msgid "%p Hanafuda No"
 msgstr ""
 
 #: src/emu/inpttype.ipp:103
@@ -3752,1551 +3926,6 @@ msgctxt "input-name"
 msgid "Stop All Reels"
 msgstr ""
 
-#: src/emu/inpttype.ipp:140
-msgctxt "input-name"
-msgid "P2 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:141
-msgctxt "input-name"
-msgid "P2 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:142
-msgctxt "input-name"
-msgid "P2 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:143
-msgctxt "input-name"
-msgid "P2 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:144
-msgctxt "input-name"
-msgid "P2 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:145
-msgctxt "input-name"
-msgid "P2 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:146
-msgctxt "input-name"
-msgid "P2 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:147
-msgctxt "input-name"
-msgid "P2 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:148
-msgctxt "input-name"
-msgid "P2 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:149
-msgctxt "input-name"
-msgid "P2 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:150
-msgctxt "input-name"
-msgid "P2 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:151
-msgctxt "input-name"
-msgid "P2 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:152
-msgctxt "input-name"
-msgid "P2 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:153
-msgctxt "input-name"
-msgid "P2 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:154
-msgctxt "input-name"
-msgid "P2 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:155
-msgctxt "input-name"
-msgid "P2 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:156
-msgctxt "input-name"
-msgid "P2 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:157
-msgctxt "input-name"
-msgid "P2 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:158
-msgctxt "input-name"
-msgid "P2 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:159
-msgctxt "input-name"
-msgid "P2 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:160
-msgctxt "input-name"
-msgid "P2 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:161
-msgctxt "input-name"
-msgid "P2 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:162
-msgctxt "input-name"
-msgid "P2 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:163
-msgctxt "input-name"
-msgid "P2 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:164
-msgctxt "input-name"
-msgid "P2 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:165
-msgctxt "input-name"
-msgid "P2 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:166
-msgctxt "input-name"
-msgid "P2 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:167
-msgctxt "input-name"
-msgid "P2 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:168
-msgctxt "input-name"
-msgid "P2 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:169
-msgctxt "input-name"
-msgid "P2 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:174
-msgctxt "input-name"
-msgid "P2 Mahjong A"
-msgstr ""
-
-#: src/emu/inpttype.ipp:175
-msgctxt "input-name"
-msgid "P2 Mahjong B"
-msgstr ""
-
-#: src/emu/inpttype.ipp:176
-msgctxt "input-name"
-msgid "P2 Mahjong C"
-msgstr ""
-
-#: src/emu/inpttype.ipp:177
-msgctxt "input-name"
-msgid "P2 Mahjong D"
-msgstr ""
-
-#: src/emu/inpttype.ipp:178
-msgctxt "input-name"
-msgid "P2 Mahjong E"
-msgstr ""
-
-#: src/emu/inpttype.ipp:179
-msgctxt "input-name"
-msgid "P2 Mahjong F"
-msgstr ""
-
-#: src/emu/inpttype.ipp:180
-msgctxt "input-name"
-msgid "P2 Mahjong G"
-msgstr ""
-
-#: src/emu/inpttype.ipp:181
-msgctxt "input-name"
-msgid "P2 Mahjong H"
-msgstr ""
-
-#: src/emu/inpttype.ipp:182
-msgctxt "input-name"
-msgid "P2 Mahjong I"
-msgstr ""
-
-#: src/emu/inpttype.ipp:183
-msgctxt "input-name"
-msgid "P2 Mahjong J"
-msgstr ""
-
-#: src/emu/inpttype.ipp:184
-msgctxt "input-name"
-msgid "P2 Mahjong K"
-msgstr ""
-
-#: src/emu/inpttype.ipp:185
-msgctxt "input-name"
-msgid "P2 Mahjong L"
-msgstr ""
-
-#: src/emu/inpttype.ipp:186
-msgctxt "input-name"
-msgid "P2 Mahjong M"
-msgstr ""
-
-#: src/emu/inpttype.ipp:187
-msgctxt "input-name"
-msgid "P2 Mahjong N"
-msgstr ""
-
-#: src/emu/inpttype.ipp:188
-msgctxt "input-name"
-msgid "P2 Mahjong O"
-msgstr ""
-
-#: src/emu/inpttype.ipp:189
-msgctxt "input-name"
-msgid "P2 Mahjong P"
-msgstr ""
-
-#: src/emu/inpttype.ipp:190
-msgctxt "input-name"
-msgid "P2 Mahjong Q"
-msgstr ""
-
-#: src/emu/inpttype.ipp:191
-msgctxt "input-name"
-msgid "P2 Mahjong Kan"
-msgstr ""
-
-#: src/emu/inpttype.ipp:192
-msgctxt "input-name"
-msgid "P2 Mahjong Pon"
-msgstr ""
-
-#: src/emu/inpttype.ipp:193
-msgctxt "input-name"
-msgid "P2 Mahjong Chi"
-msgstr ""
-
-#: src/emu/inpttype.ipp:194
-msgctxt "input-name"
-msgid "P2 Mahjong Reach"
-msgstr ""
-
-#: src/emu/inpttype.ipp:195
-msgctxt "input-name"
-msgid "P2 Mahjong Ron"
-msgstr ""
-
-#: src/emu/inpttype.ipp:196
-msgctxt "input-name"
-msgid "P2 Mahjong Bet"
-msgstr ""
-
-#: src/emu/inpttype.ipp:197
-msgctxt "input-name"
-msgid "P2 Mahjong Last Chance"
-msgstr ""
-
-#: src/emu/inpttype.ipp:198
-msgctxt "input-name"
-msgid "P2 Mahjong Take Score"
-msgstr ""
-
-#: src/emu/inpttype.ipp:199
-msgctxt "input-name"
-msgid "P2 Mahjong Double Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:200
-msgctxt "input-name"
-msgid "P2 Mahjong Flip Flop"
-msgstr ""
-
-#: src/emu/inpttype.ipp:201
-msgctxt "input-name"
-msgid "P2 Mahjong Big"
-msgstr ""
-
-#: src/emu/inpttype.ipp:202
-msgctxt "input-name"
-msgid "P2 Mahjong Small"
-msgstr ""
-
-#: src/emu/inpttype.ipp:207
-msgctxt "input-name"
-msgid "P2 Hanafuda A/1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:208
-msgctxt "input-name"
-msgid "P2 Hanafuda B/2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:209
-msgctxt "input-name"
-msgid "P2 Hanafuda C/3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:210
-msgctxt "input-name"
-msgid "P2 Hanafuda D/4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:211
-msgctxt "input-name"
-msgid "P2 Hanafuda E/5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:212
-msgctxt "input-name"
-msgid "P2 Hanafuda F/6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:213
-msgctxt "input-name"
-msgid "P2 Hanafuda G/7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:214
-msgctxt "input-name"
-msgid "P2 Hanafuda H/8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:215
-msgctxt "input-name"
-msgid "P2 Hanafuda Yes"
-msgstr ""
-
-#: src/emu/inpttype.ipp:216
-msgctxt "input-name"
-msgid "P2 Hanafuda No"
-msgstr ""
-
-#: src/emu/inpttype.ipp:221
-msgctxt "input-name"
-msgid "P3 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:222
-msgctxt "input-name"
-msgid "P3 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:223
-msgctxt "input-name"
-msgid "P3 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:224
-msgctxt "input-name"
-msgid "P3 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:225
-msgctxt "input-name"
-msgid "P3 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:226
-msgctxt "input-name"
-msgid "P3 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:227
-msgctxt "input-name"
-msgid "P3 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:228
-msgctxt "input-name"
-msgid "P3 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:229
-msgctxt "input-name"
-msgid "P3 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:230
-msgctxt "input-name"
-msgid "P3 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:231
-msgctxt "input-name"
-msgid "P3 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:232
-msgctxt "input-name"
-msgid "P3 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:233
-msgctxt "input-name"
-msgid "P3 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:234
-msgctxt "input-name"
-msgid "P3 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:235
-msgctxt "input-name"
-msgid "P3 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:236
-msgctxt "input-name"
-msgid "P3 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:237
-msgctxt "input-name"
-msgid "P3 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:238
-msgctxt "input-name"
-msgid "P3 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:239
-msgctxt "input-name"
-msgid "P3 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:240
-msgctxt "input-name"
-msgid "P3 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:241
-msgctxt "input-name"
-msgid "P3 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:242
-msgctxt "input-name"
-msgid "P3 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:243
-msgctxt "input-name"
-msgid "P3 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:244
-msgctxt "input-name"
-msgid "P3 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:245
-msgctxt "input-name"
-msgid "P3 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:246
-msgctxt "input-name"
-msgid "P3 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:247
-msgctxt "input-name"
-msgid "P3 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:248
-msgctxt "input-name"
-msgid "P3 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:249
-msgctxt "input-name"
-msgid "P3 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:250
-msgctxt "input-name"
-msgid "P3 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:255
-msgctxt "input-name"
-msgid "P4 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:256
-msgctxt "input-name"
-msgid "P4 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:257
-msgctxt "input-name"
-msgid "P4 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:258
-msgctxt "input-name"
-msgid "P4 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:259
-msgctxt "input-name"
-msgid "P4 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:260
-msgctxt "input-name"
-msgid "P4 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:261
-msgctxt "input-name"
-msgid "P4 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:262
-msgctxt "input-name"
-msgid "P4 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:263
-msgctxt "input-name"
-msgid "P4 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:264
-msgctxt "input-name"
-msgid "P4 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:265
-msgctxt "input-name"
-msgid "P4 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:266
-msgctxt "input-name"
-msgid "P4 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:267
-msgctxt "input-name"
-msgid "P4 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:268
-msgctxt "input-name"
-msgid "P4 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:269
-msgctxt "input-name"
-msgid "P4 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:270
-msgctxt "input-name"
-msgid "P4 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:271
-msgctxt "input-name"
-msgid "P4 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:272
-msgctxt "input-name"
-msgid "P4 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:273
-msgctxt "input-name"
-msgid "P4 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:274
-msgctxt "input-name"
-msgid "P4 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:275
-msgctxt "input-name"
-msgid "P4 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:276
-msgctxt "input-name"
-msgid "P4 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:277
-msgctxt "input-name"
-msgid "P4 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:278
-msgctxt "input-name"
-msgid "P4 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:279
-msgctxt "input-name"
-msgid "P4 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:280
-msgctxt "input-name"
-msgid "P4 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:281
-msgctxt "input-name"
-msgid "P4 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:282
-msgctxt "input-name"
-msgid "P4 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:283
-msgctxt "input-name"
-msgid "P4 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:284
-msgctxt "input-name"
-msgid "P4 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:289
-msgctxt "input-name"
-msgid "P5 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:290
-msgctxt "input-name"
-msgid "P5 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:291
-msgctxt "input-name"
-msgid "P5 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:292
-msgctxt "input-name"
-msgid "P5 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:293
-msgctxt "input-name"
-msgid "P5 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:294
-msgctxt "input-name"
-msgid "P5 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:295
-msgctxt "input-name"
-msgid "P5 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:296
-msgctxt "input-name"
-msgid "P5 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:297
-msgctxt "input-name"
-msgid "P5 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:298
-msgctxt "input-name"
-msgid "P5 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:299
-msgctxt "input-name"
-msgid "P5 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:300
-msgctxt "input-name"
-msgid "P5 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:301
-msgctxt "input-name"
-msgid "P5 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:302
-msgctxt "input-name"
-msgid "P5 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:303
-msgctxt "input-name"
-msgid "P5 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:304
-msgctxt "input-name"
-msgid "P5 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:305
-msgctxt "input-name"
-msgid "P5 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:306
-msgctxt "input-name"
-msgid "P5 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:307
-msgctxt "input-name"
-msgid "P5 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:308
-msgctxt "input-name"
-msgid "P5 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:309
-msgctxt "input-name"
-msgid "P5 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:310
-msgctxt "input-name"
-msgid "P5 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:311
-msgctxt "input-name"
-msgid "P5 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:312
-msgctxt "input-name"
-msgid "P5 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:313
-msgctxt "input-name"
-msgid "P5 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:314
-msgctxt "input-name"
-msgid "P5 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:315
-msgctxt "input-name"
-msgid "P5 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:316
-msgctxt "input-name"
-msgid "P5 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:317
-msgctxt "input-name"
-msgid "P5 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:318
-msgctxt "input-name"
-msgid "P5 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:323
-msgctxt "input-name"
-msgid "P6 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:324
-msgctxt "input-name"
-msgid "P6 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:325
-msgctxt "input-name"
-msgid "P6 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:326
-msgctxt "input-name"
-msgid "P6 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:327
-msgctxt "input-name"
-msgid "P6 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:328
-msgctxt "input-name"
-msgid "P6 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:329
-msgctxt "input-name"
-msgid "P6 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:330
-msgctxt "input-name"
-msgid "P6 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:331
-msgctxt "input-name"
-msgid "P6 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:332
-msgctxt "input-name"
-msgid "P6 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:333
-msgctxt "input-name"
-msgid "P6 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:334
-msgctxt "input-name"
-msgid "P6 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:335
-msgctxt "input-name"
-msgid "P6 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:336
-msgctxt "input-name"
-msgid "P6 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:337
-msgctxt "input-name"
-msgid "P6 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:338
-msgctxt "input-name"
-msgid "P6 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:339
-msgctxt "input-name"
-msgid "P6 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:340
-msgctxt "input-name"
-msgid "P6 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:341
-msgctxt "input-name"
-msgid "P6 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:342
-msgctxt "input-name"
-msgid "P6 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:343
-msgctxt "input-name"
-msgid "P6 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:344
-msgctxt "input-name"
-msgid "P6 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:345
-msgctxt "input-name"
-msgid "P6 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:346
-msgctxt "input-name"
-msgid "P6 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:347
-msgctxt "input-name"
-msgid "P6 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:348
-msgctxt "input-name"
-msgid "P6 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:349
-msgctxt "input-name"
-msgid "P6 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:350
-msgctxt "input-name"
-msgid "P6 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:351
-msgctxt "input-name"
-msgid "P6 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:352
-msgctxt "input-name"
-msgid "P6 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:357
-msgctxt "input-name"
-msgid "P7 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:358
-msgctxt "input-name"
-msgid "P7 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:359
-msgctxt "input-name"
-msgid "P7 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:360
-msgctxt "input-name"
-msgid "P7 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:361
-msgctxt "input-name"
-msgid "P7 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:362
-msgctxt "input-name"
-msgid "P7 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:363
-msgctxt "input-name"
-msgid "P7 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:364
-msgctxt "input-name"
-msgid "P7 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:365
-msgctxt "input-name"
-msgid "P7 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:366
-msgctxt "input-name"
-msgid "P7 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:367
-msgctxt "input-name"
-msgid "P7 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:368
-msgctxt "input-name"
-msgid "P7 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:369
-msgctxt "input-name"
-msgid "P7 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:370
-msgctxt "input-name"
-msgid "P7 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:371
-msgctxt "input-name"
-msgid "P7 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:372
-msgctxt "input-name"
-msgid "P7 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:373
-msgctxt "input-name"
-msgid "P7 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:374
-msgctxt "input-name"
-msgid "P7 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:375
-msgctxt "input-name"
-msgid "P7 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:376
-msgctxt "input-name"
-msgid "P7 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:377
-msgctxt "input-name"
-msgid "P7 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:378
-msgctxt "input-name"
-msgid "P7 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:379
-msgctxt "input-name"
-msgid "P7 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:380
-msgctxt "input-name"
-msgid "P7 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:381
-msgctxt "input-name"
-msgid "P7 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:382
-msgctxt "input-name"
-msgid "P7 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:383
-msgctxt "input-name"
-msgid "P7 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:384
-msgctxt "input-name"
-msgid "P7 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:385
-msgctxt "input-name"
-msgid "P7 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:386
-msgctxt "input-name"
-msgid "P7 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:391
-msgctxt "input-name"
-msgid "P8 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:392
-msgctxt "input-name"
-msgid "P8 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:393
-msgctxt "input-name"
-msgid "P8 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:394
-msgctxt "input-name"
-msgid "P8 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:395
-msgctxt "input-name"
-msgid "P8 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:396
-msgctxt "input-name"
-msgid "P8 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:397
-msgctxt "input-name"
-msgid "P8 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:398
-msgctxt "input-name"
-msgid "P8 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:399
-msgctxt "input-name"
-msgid "P8 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:400
-msgctxt "input-name"
-msgid "P8 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:401
-msgctxt "input-name"
-msgid "P8 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:402
-msgctxt "input-name"
-msgid "P8 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:403
-msgctxt "input-name"
-msgid "P8 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:404
-msgctxt "input-name"
-msgid "P8 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:405
-msgctxt "input-name"
-msgid "P8 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:406
-msgctxt "input-name"
-msgid "P8 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:407
-msgctxt "input-name"
-msgid "P8 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:408
-msgctxt "input-name"
-msgid "P8 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:409
-msgctxt "input-name"
-msgid "P8 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:410
-msgctxt "input-name"
-msgid "P8 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:411
-msgctxt "input-name"
-msgid "P8 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:412
-msgctxt "input-name"
-msgid "P8 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:413
-msgctxt "input-name"
-msgid "P8 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:414
-msgctxt "input-name"
-msgid "P8 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:415
-msgctxt "input-name"
-msgid "P8 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:416
-msgctxt "input-name"
-msgid "P8 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:417
-msgctxt "input-name"
-msgid "P8 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:418
-msgctxt "input-name"
-msgid "P8 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:419
-msgctxt "input-name"
-msgid "P8 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:420
-msgctxt "input-name"
-msgid "P8 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:425
-msgctxt "input-name"
-msgid "P9 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:426
-msgctxt "input-name"
-msgid "P9 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:427
-msgctxt "input-name"
-msgid "P9 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:428
-msgctxt "input-name"
-msgid "P9 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:429
-msgctxt "input-name"
-msgid "P9 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:430
-msgctxt "input-name"
-msgid "P9 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:431
-msgctxt "input-name"
-msgid "P9 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:432
-msgctxt "input-name"
-msgid "P9 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:433
-msgctxt "input-name"
-msgid "P9 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:434
-msgctxt "input-name"
-msgid "P9 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:435
-msgctxt "input-name"
-msgid "P9 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:436
-msgctxt "input-name"
-msgid "P9 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:437
-msgctxt "input-name"
-msgid "P9 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:438
-msgctxt "input-name"
-msgid "P9 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:439
-msgctxt "input-name"
-msgid "P9 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:440
-msgctxt "input-name"
-msgid "P9 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:441
-msgctxt "input-name"
-msgid "P9 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:442
-msgctxt "input-name"
-msgid "P9 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:443
-msgctxt "input-name"
-msgid "P9 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:444
-msgctxt "input-name"
-msgid "P9 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:445
-msgctxt "input-name"
-msgid "P9 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:446
-msgctxt "input-name"
-msgid "P9 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:447
-msgctxt "input-name"
-msgid "P9 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:448
-msgctxt "input-name"
-msgid "P9 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:449
-msgctxt "input-name"
-msgid "P9 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:450
-msgctxt "input-name"
-msgid "P9 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:451
-msgctxt "input-name"
-msgid "P9 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:452
-msgctxt "input-name"
-msgid "P9 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:453
-msgctxt "input-name"
-msgid "P9 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:454
-msgctxt "input-name"
-msgid "P9 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:459
-msgctxt "input-name"
-msgid "P10 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:460
-msgctxt "input-name"
-msgid "P10 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:461
-msgctxt "input-name"
-msgid "P10 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:462
-msgctxt "input-name"
-msgid "P10 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:463
-msgctxt "input-name"
-msgid "P10 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:464
-msgctxt "input-name"
-msgid "P10 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:465
-msgctxt "input-name"
-msgid "P10 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:466
-msgctxt "input-name"
-msgid "P10 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:467
-msgctxt "input-name"
-msgid "P10 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:468
-msgctxt "input-name"
-msgid "P10 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:469
-msgctxt "input-name"
-msgid "P10 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:470
-msgctxt "input-name"
-msgid "P10 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:471
-msgctxt "input-name"
-msgid "P10 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:472
-msgctxt "input-name"
-msgid "P10 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:473
-msgctxt "input-name"
-msgid "P10 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:474
-msgctxt "input-name"
-msgid "P10 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:475
-msgctxt "input-name"
-msgid "P10 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:476
-msgctxt "input-name"
-msgid "P10 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:477
-msgctxt "input-name"
-msgid "P10 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:478
-msgctxt "input-name"
-msgid "P10 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:479
-msgctxt "input-name"
-msgid "P10 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:480
-msgctxt "input-name"
-msgid "P10 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:481
-msgctxt "input-name"
-msgid "P10 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:482
-msgctxt "input-name"
-msgid "P10 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:483
-msgctxt "input-name"
-msgid "P10 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:484
-msgctxt "input-name"
-msgid "P10 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:485
-msgctxt "input-name"
-msgid "P10 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:486
-msgctxt "input-name"
-msgid "P10 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:487
-msgctxt "input-name"
-msgid "P10 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:488
-msgctxt "input-name"
-msgid "P10 Select"
-msgstr ""
-
 #: src/emu/inpttype.ipp:493
 msgctxt "input-name"
 msgid "1 Player Start"
@@ -5477,154 +4106,31 @@ msgctxt "input-name"
 msgid "Volume Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:550
-msgctxt "input-name"
-msgid "P1 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:551
-msgctxt "input-name"
-msgid "P2 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:552
-msgctxt "input-name"
-msgid "P3 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:553
-msgctxt "input-name"
-msgid "P4 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:554
-msgctxt "input-name"
-msgid "P5 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:555
-msgctxt "input-name"
-msgid "P6 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:556
-msgctxt "input-name"
-msgid "P7 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:557
-msgctxt "input-name"
-msgid "P8 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:558
-msgctxt "input-name"
-msgid "P9 Pedal 1"
-msgstr ""
-
+#: src/emu/inpttype.ipp:550 src/emu/inpttype.ipp:551 src/emu/inpttype.ipp:552
+#: src/emu/inpttype.ipp:553 src/emu/inpttype.ipp:554 src/emu/inpttype.ipp:555
+#: src/emu/inpttype.ipp:556 src/emu/inpttype.ipp:557 src/emu/inpttype.ipp:558
 #: src/emu/inpttype.ipp:559
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:564
-msgctxt "input-name"
-msgid "P1 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:565
-msgctxt "input-name"
-msgid "P2 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:566
-msgctxt "input-name"
-msgid "P3 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:567
-msgctxt "input-name"
-msgid "P4 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:568
-msgctxt "input-name"
-msgid "P5 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:569
-msgctxt "input-name"
-msgid "P6 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:570
-msgctxt "input-name"
-msgid "P7 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:571
-msgctxt "input-name"
-msgid "P8 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:572
-msgctxt "input-name"
-msgid "P9 Pedal 2"
+msgid "%p Pedal 1"
 msgstr ""
 
+#: src/emu/inpttype.ipp:564 src/emu/inpttype.ipp:565 src/emu/inpttype.ipp:566
+#: src/emu/inpttype.ipp:567 src/emu/inpttype.ipp:568 src/emu/inpttype.ipp:569
+#: src/emu/inpttype.ipp:570 src/emu/inpttype.ipp:571 src/emu/inpttype.ipp:572
 #: src/emu/inpttype.ipp:573
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:578
-msgctxt "input-name"
-msgid "P1 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:579
-msgctxt "input-name"
-msgid "P2 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:580
-msgctxt "input-name"
-msgid "P3 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:581
-msgctxt "input-name"
-msgid "P4 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:582
-msgctxt "input-name"
-msgid "P5 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:583
-msgctxt "input-name"
-msgid "P6 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:584
-msgctxt "input-name"
-msgid "P7 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:585
-msgctxt "input-name"
-msgid "P8 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:586
-msgctxt "input-name"
-msgid "P9 Pedal 3"
+msgid "%p Pedal 2"
 msgstr ""
 
+#: src/emu/inpttype.ipp:578 src/emu/inpttype.ipp:579 src/emu/inpttype.ipp:580
+#: src/emu/inpttype.ipp:581 src/emu/inpttype.ipp:582 src/emu/inpttype.ipp:583
+#: src/emu/inpttype.ipp:584 src/emu/inpttype.ipp:585 src/emu/inpttype.ipp:586
 #: src/emu/inpttype.ipp:587
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 3"
+msgid "%p Pedal 3"
 msgstr ""
 
 #: src/emu/inpttype.ipp:592
diff --git a/language/Italian/strings.po b/language/Italian/strings.po
index 870c217a422..7b0b4e86ae7 100644
--- a/language/Italian/strings.po
+++ b/language/Italian/strings.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-19 02:50+1100\n"
+"POT-Creation-Date: 2021-12-09 04:44+1100\n"
 "PO-Revision-Date: 2017-08-30 09:37+0200\n"
 "Last-Translator: theheroGAC\n"
 "Language-Team: MAME Language Team\n"
@@ -271,12 +271,12 @@ msgstr "%1$s %2$s ( %3$d / %4$d pacchetti software )"
 msgid "Driver: \"%1$s\" software list "
 msgstr "Driver: \"%1$s\" lista software "
 
-#: src/frontend/mame/ui/selsoft.cpp:711 src/frontend/mame/ui/selgame.cpp:1066
+#: src/frontend/mame/ui/selsoft.cpp:711 src/frontend/mame/ui/selgame.cpp:1076
 #, c-format
 msgid "%1$s: %2$s - Search: %3$s_"
 msgstr "%1$s: %2$s - Cerca: %3$s_"
 
-#: src/frontend/mame/ui/selsoft.cpp:713 src/frontend/mame/ui/selgame.cpp:1068
+#: src/frontend/mame/ui/selsoft.cpp:713 src/frontend/mame/ui/selgame.cpp:1078
 #, c-format
 msgid "Search: %1$s_"
 msgstr "Cerca: %1$s_"
@@ -286,7 +286,7 @@ msgstr "Cerca: %1$s_"
 msgid "Software list/item: %1$s:%2$s"
 msgstr ""
 
-#: src/frontend/mame/ui/optsmenu.cpp:73 src/frontend/mame/ui/sndmenu.cpp:165
+#: src/frontend/mame/ui/optsmenu.cpp:73 src/frontend/mame/ui/sndmenu.cpp:161
 msgid "Sound Options"
 msgstr "Opzioni Audio"
 
@@ -381,12 +381,12 @@ msgid "Show mouse pointer"
 msgstr "Mostra puntatore mouse"
 
 #: src/frontend/mame/ui/submenu.cpp:39
-msgid "Confirm quit from machines"
-msgstr "Confermi l'uscita"
+msgid "Confirm quit from emulation"
+msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:40
-msgid "Skip information screen at startup"
-msgstr "Salta la schermata delle informazioni all'avvio"
+msgid "Skip system information screen"
+msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:41
 msgid "Force 4:3 aspect for snapshot display"
@@ -401,8 +401,8 @@ msgid "Skip BIOS selection menu"
 msgstr "Salta il menu di selezione del BIOS"
 
 #: src/frontend/mame/ui/submenu.cpp:44
-msgid "Skip software parts selection menu"
-msgstr "Non mostrare il menu di selezione del software"
+msgid "Skip software part selection menu"
+msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:45
 msgid "Info auto audit"
@@ -553,8 +553,8 @@ msgid "UI active"
 msgstr "UI attivo"
 
 #: src/frontend/mame/ui/submenu.cpp:91
-msgid "Offscreen reload"
-msgstr "Ricarica schermo spento"
+msgid "Off-screen reload"
+msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:92
 msgid "Joystick deadzone"
@@ -569,8 +569,8 @@ msgid "Natural keyboard"
 msgstr "Tastiera naturale"
 
 #: src/frontend/mame/ui/submenu.cpp:95
-msgid "Simultaneous contradictory"
-msgstr "Contraddizione simultanea"
+msgid "Allow contradictory joystick inputs"
+msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:96
 msgid "Coin impulse"
@@ -593,8 +593,8 @@ msgid "Pedal Device Assignment"
 msgstr "Assegnazione Dispositivo Pedaliera"
 
 #: src/frontend/mame/ui/submenu.cpp:106
-msgid "Adstick Device Assignment"
-msgstr "Assegnazione Dispositivo Adstick"
+msgid "AD Stick Device Assignment"
+msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:107
 msgid "Paddle Device Assignment"
@@ -680,14 +680,14 @@ msgstr "Aggiornamento Sincronizzato"
 msgid "Wait Vertical Sync"
 msgstr "Attendi la Sincronizzazione Verticale"
 
-#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:687
+#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:689
 #: src/frontend/mame/ui/videoopt.cpp:191 src/frontend/mame/ui/custui.cpp:490
 #: src/frontend/mame/ui/analogipt.cpp:471 plugins/cheatfind/init.lua:766
 #: plugins/cheatfind/init.lua:777 plugins/cheat/init.lua:668
 msgid "On"
 msgstr "Attivo"
 
-#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:690
+#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:692
 #: src/frontend/mame/ui/videoopt.cpp:207 src/frontend/mame/ui/custui.cpp:490
 #: src/frontend/mame/ui/analogipt.cpp:471 plugins/cheatfind/init.lua:763
 #: plugins/cheatfind/init.lua:774 plugins/cheat/init.lua:671
@@ -695,11 +695,11 @@ msgstr "Attivo"
 msgid "Off"
 msgstr "Non Attivo"
 
-#: src/frontend/mame/ui/menu.cpp:693
+#: src/frontend/mame/ui/menu.cpp:695
 msgid "Auto"
 msgstr "Auto"
 
-#: src/frontend/mame/ui/menu.cpp:1195
+#: src/frontend/mame/ui/menu.cpp:1197
 #: src/frontend/mame/ui/simpleselgame.cpp:278
 #: src/frontend/mame/ui/selmenu.cpp:1280
 msgid "Return to Previous Menu"
@@ -707,7 +707,7 @@ msgstr "Torna al Menu Precedente"
 
 #: src/frontend/mame/ui/filemngr.cpp:139
 #: src/frontend/mame/ui/confswitch.cpp:119
-#: src/frontend/mame/ui/inputmap.cpp:559 src/frontend/mame/ui/analogipt.cpp:360
+#: src/frontend/mame/ui/inputmap.cpp:563 src/frontend/mame/ui/analogipt.cpp:360
 #, c-format
 msgid "[root%1$s]"
 msgstr ""
@@ -970,22 +970,22 @@ msgstr ""
 "CPU:\n"
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "GHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "MHz"
 msgstr "MHz"
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "kHz"
 msgstr "kHz"
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "Hz"
 msgstr ""
 
@@ -1013,38 +1013,38 @@ msgstr "Nessuno\n"
 msgid "Vector"
 msgstr "Vettoriale"
 
-#: src/frontend/mame/ui/info.cpp:480
+#: src/frontend/mame/ui/info.cpp:483
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr "%1$s: %2$s\n"
 
-#: src/frontend/mame/ui/info.cpp:480
+#: src/frontend/mame/ui/info.cpp:483
 msgid "%2$s\n"
 msgstr "%2$s\n"
 
-#: src/frontend/mame/ui/info.cpp:497
+#: src/frontend/mame/ui/info.cpp:500
 #, c-format
 msgid "Screen '%1$s'"
 msgstr "Schermo '%1$s'"
 
-#: src/frontend/mame/ui/info.cpp:499
+#: src/frontend/mame/ui/info.cpp:502
 msgid "Screen"
 msgstr "Schermo"
 
-#: src/frontend/mame/ui/info.cpp:570 src/frontend/mame/ui/info.cpp:581
+#: src/frontend/mame/ui/info.cpp:573 src/frontend/mame/ui/info.cpp:584
 #, c-format
 msgid "%1$s:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:662
+#: src/frontend/mame/ui/info.cpp:665
 msgid "Not supported"
 msgstr "Non supportato"
 
-#: src/frontend/mame/ui/info.cpp:665
+#: src/frontend/mame/ui/info.cpp:668
 msgid "Partially supported"
 msgstr "Parzialmente supportato"
 
-#: src/frontend/mame/ui/info.cpp:674
+#: src/frontend/mame/ui/info.cpp:677
 msgid "[empty]"
 msgstr "[vuoto]"
 
@@ -1117,7 +1117,7 @@ msgid "Emulated"
 msgstr "Emulata"
 
 #: src/frontend/mame/ui/keyboard.cpp:59 src/frontend/mame/ui/confswitch.cpp:117
-#: src/frontend/mame/ui/inputmap.cpp:557 src/frontend/mame/ui/analogipt.cpp:358
+#: src/frontend/mame/ui/inputmap.cpp:561 src/frontend/mame/ui/analogipt.cpp:358
 #, c-format
 msgid "%1$s [root%2$s]"
 msgstr ""
@@ -1477,7 +1477,7 @@ msgctxt "swlist-info"
 msgid "Software list/item"
 msgstr ""
 
-#: src/frontend/mame/ui/datmenu.cpp:88 src/frontend/mame/ui/selmenu.cpp:2698
+#: src/frontend/mame/ui/datmenu.cpp:88 src/frontend/mame/ui/selmenu.cpp:2707
 msgid "Software List Info"
 msgstr ""
 
@@ -1598,7 +1598,7 @@ msgstr "Salva Configurazione Macchina"
 msgid "Configure Machine:"
 msgstr ""
 
-#: src/frontend/mame/ui/miscmenu.cpp:858 src/frontend/mame/ui/selmenu.cpp:2638
+#: src/frontend/mame/ui/miscmenu.cpp:858 src/frontend/mame/ui/selmenu.cpp:2647
 msgid " (default)"
 msgstr " (predefinito)"
 
@@ -1619,7 +1619,7 @@ msgstr ""
 "Premi %1$s per uscire\n"
 "Premi %2$s per contrinuare l'emulazione"
 
-#: src/frontend/mame/ui/info_pty.cpp:30 src/frontend/mame/ui/mainmenu.cpp:155
+#: src/frontend/mame/ui/info_pty.cpp:30
 msgid "Pseudo terminals"
 msgstr "Pseudo terminali"
 
@@ -1687,52 +1687,52 @@ msgstr ""
 msgid "Other Controls"
 msgstr "Altri Controlli"
 
-#: src/frontend/mame/ui/inputmap.cpp:227
+#: src/frontend/mame/ui/inputmap.cpp:231
 msgid "This machine has no configurable inputs."
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:327
+#: src/frontend/mame/ui/inputmap.cpp:331
 msgid "Pressed"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:397
+#: src/frontend/mame/ui/inputmap.cpp:401
 msgid "Invalid sequence entered"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:542
+#: src/frontend/mame/ui/inputmap.cpp:546
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:543
+#: src/frontend/mame/ui/inputmap.cpp:547
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog Inc"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:544
+#: src/frontend/mame/ui/inputmap.cpp:548
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog Dec"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:586
+#: src/frontend/mame/ui/inputmap.cpp:590
 #, c-format
 msgid "Press %1$s to set\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:587
+#: src/frontend/mame/ui/inputmap.cpp:591
 #, c-format
 msgid "Press %1$s to append\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:588
+#: src/frontend/mame/ui/inputmap.cpp:592
 #, c-format
 msgid "Press %1$s to clear\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:589
+#: src/frontend/mame/ui/inputmap.cpp:593
 #, c-format
 msgid "Press %1$s to restore default\n"
 msgstr ""
@@ -1800,7 +1800,7 @@ msgstr ""
 "Premi qualsiasi tasto per continuare."
 
 #: src/frontend/mame/ui/simpleselgame.cpp:273
-#: src/frontend/mame/ui/selgame.cpp:436
+#: src/frontend/mame/ui/selgame.cpp:443
 msgid "Configure Options"
 msgstr "Configura Opzioni"
 
@@ -2135,16 +2135,16 @@ msgstr ""
 msgid "Expand to fit"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:437
+#: src/frontend/mame/ui/selgame.cpp:444
 msgid "Configure Machine"
 msgstr "Configura Macchina"
 
-#: src/frontend/mame/ui/selgame.cpp:1050
+#: src/frontend/mame/ui/selgame.cpp:1060
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d machines (%5$d BIOS) )"
 msgstr "%1$s %2$s ( %3$d / %4$d macchine (%5$d BIOS) )"
 
-#: src/frontend/mame/ui/selgame.cpp:1078
+#: src/frontend/mame/ui/selgame.cpp:1088
 #, c-format
 msgid "System: %1$-.100s"
 msgstr "Sistema: %1$-.100s"
@@ -2166,11 +2166,9 @@ msgstr "I risultati verranno salvati su %1$s"
 #: src/frontend/mame/ui/auditmenu.cpp:98
 #, c-format
 msgid ""
-"Auditing ROMs for machine %2$u of %3$u...\n"
+"Auditing media for machine %2$u of %3$u...\n"
 "%1$s"
 msgstr ""
-"Verifica delle ROMs per la macchina %2$u di %3$u...\n"
-"%1$s"
 
 #: src/frontend/mame/ui/auditmenu.cpp:116
 #, c-format
@@ -2183,13 +2181,13 @@ msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:136
 #, c-format
-msgid "Audit ROMs for %1$u machines marked unavailable"
-msgstr "Verifico le ROMs per %1$u le macchine marcate come non disponibili"
+msgid "Audit media for %1$u machines marked unavailable"
+msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:137
 #, c-format
-msgid "Audit ROMs for all %1$u machines"
-msgstr "Verifico le ROMs per tutte %1$u le macchine"
+msgid "Audit media for all %1$u machines"
+msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:154
 #, c-format
@@ -2395,84 +2393,84 @@ msgctxt "color-sample"
 msgid "Clone"
 msgstr "Clone"
 
-#: src/frontend/mame/ui/custui.cpp:914
+#: src/frontend/mame/ui/custui.cpp:906
 msgid "ARGB Settings"
 msgstr "Impostazioni ARGB"
 
-#: src/frontend/mame/ui/custui.cpp:919 src/frontend/mame/ui/custui.cpp:922
+#: src/frontend/mame/ui/custui.cpp:911 src/frontend/mame/ui/custui.cpp:914
 msgctxt "color-channel"
 msgid "Alpha"
 msgstr "Alfa"
 
-#: src/frontend/mame/ui/custui.cpp:927 src/frontend/mame/ui/custui.cpp:930
+#: src/frontend/mame/ui/custui.cpp:919 src/frontend/mame/ui/custui.cpp:922
 msgctxt "color-channel"
 msgid "Red"
 msgstr "Rosso"
 
-#: src/frontend/mame/ui/custui.cpp:935 src/frontend/mame/ui/custui.cpp:938
+#: src/frontend/mame/ui/custui.cpp:927 src/frontend/mame/ui/custui.cpp:930
 msgctxt "color-channel"
 msgid "Green"
 msgstr "Verde"
 
-#: src/frontend/mame/ui/custui.cpp:943 src/frontend/mame/ui/custui.cpp:946
+#: src/frontend/mame/ui/custui.cpp:935 src/frontend/mame/ui/custui.cpp:938
 msgctxt "color-channel"
 msgid "Blue"
 msgstr "Blu"
 
-#: src/frontend/mame/ui/custui.cpp:949
+#: src/frontend/mame/ui/custui.cpp:941
 msgid "Choose from palette"
 msgstr "Seleziona dalla tavolozza"
 
-#: src/frontend/mame/ui/custui.cpp:996
+#: src/frontend/mame/ui/custui.cpp:988
 msgid "Color preview:"
 msgstr "Anteprima colore:"
 
-#: src/frontend/mame/ui/custui.cpp:1093
+#: src/frontend/mame/ui/custui.cpp:1085
 msgctxt "color-preset"
 msgid "White"
 msgstr "Bianco"
 
-#: src/frontend/mame/ui/custui.cpp:1094
+#: src/frontend/mame/ui/custui.cpp:1086
 msgctxt "color-preset"
 msgid "Silver"
 msgstr "Argento"
 
-#: src/frontend/mame/ui/custui.cpp:1095
+#: src/frontend/mame/ui/custui.cpp:1087
 msgctxt "color-preset"
 msgid "Gray"
 msgstr "Grigio"
 
-#: src/frontend/mame/ui/custui.cpp:1096
+#: src/frontend/mame/ui/custui.cpp:1088
 msgctxt "color-preset"
 msgid "Black"
 msgstr "Nero"
 
-#: src/frontend/mame/ui/custui.cpp:1097
+#: src/frontend/mame/ui/custui.cpp:1089
 msgctxt "color-preset"
 msgid "Red"
 msgstr "Rosso"
 
-#: src/frontend/mame/ui/custui.cpp:1098
+#: src/frontend/mame/ui/custui.cpp:1090
 msgctxt "color-preset"
 msgid "Orange"
 msgstr "Arancio"
 
-#: src/frontend/mame/ui/custui.cpp:1099
+#: src/frontend/mame/ui/custui.cpp:1091
 msgctxt "color-preset"
 msgid "Yellow"
 msgstr "Giallo"
 
-#: src/frontend/mame/ui/custui.cpp:1100
+#: src/frontend/mame/ui/custui.cpp:1092
 msgctxt "color-preset"
 msgid "Green"
 msgstr "Verde"
 
-#: src/frontend/mame/ui/custui.cpp:1101
+#: src/frontend/mame/ui/custui.cpp:1093
 msgctxt "color-preset"
 msgid "Blue"
 msgstr "Blu"
 
-#: src/frontend/mame/ui/custui.cpp:1102
+#: src/frontend/mame/ui/custui.cpp:1094
 msgctxt "color-preset"
 msgid "Violet"
 msgstr "Viola"
@@ -2537,8 +2535,8 @@ msgid "Input (general)"
 msgstr "Input (generali)"
 
 #: src/frontend/mame/ui/mainmenu.cpp:123
-msgid "Input (this Machine)"
-msgstr "Input (questa Macchina)"
+msgid "Input (this machine)"
+msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:126
 msgid "Analog Controls"
@@ -2576,6 +2574,10 @@ msgstr "Gestore File"
 msgid "Tape Control"
 msgstr "Controllo Cassetta"
 
+#: src/frontend/mame/ui/mainmenu.cpp:155
+msgid "Pseudo Terminals"
+msgstr ""
+
 #: src/frontend/mame/ui/mainmenu.cpp:158
 msgid "BIOS Selection"
 msgstr "Selezione BIOS"
@@ -2614,7 +2616,7 @@ msgstr "Visualizza DAT Aggiuntivi"
 
 #: src/frontend/mame/ui/mainmenu.cpp:200
 #, c-format
-msgid "About %s"
+msgid "About %1$s"
 msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:212
@@ -2774,373 +2776,373 @@ msgstr "Il Driver è un clone di: %1$s"
 msgid "%1$s %2$s"
 msgstr "%1$s %2$s"
 
-#: src/frontend/mame/ui/selmenu.cpp:2235
+#: src/frontend/mame/ui/selmenu.cpp:2244
 msgid "Images"
 msgstr "Immagini"
 
-#: src/frontend/mame/ui/selmenu.cpp:2236
+#: src/frontend/mame/ui/selmenu.cpp:2245
 msgid "Infos"
 msgstr "Informazioni"
 
-#: src/frontend/mame/ui/selmenu.cpp:2551
+#: src/frontend/mame/ui/selmenu.cpp:2560
 msgid ""
 "Required ROM/disk images for the selected system are missing or incorrect. "
 "Please acquire the correct files or select a different system.\n"
 "\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2567
+#: src/frontend/mame/ui/selmenu.cpp:2576
 msgid ""
 "Required ROM/disk images for the selected software are missing or incorrect. "
 "Please acquire the correct files or select a different software item.\n"
 "\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2583
+#: src/frontend/mame/ui/selmenu.cpp:2592
 msgid "incorrect checksum"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2586
+#: src/frontend/mame/ui/selmenu.cpp:2595
 msgid "incorrect length"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2589
+#: src/frontend/mame/ui/selmenu.cpp:2598
 msgid "not found"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2600
+#: src/frontend/mame/ui/selmenu.cpp:2609
 #, c-format
 msgid "%1$s (%2$s) - %3$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2602
+#: src/frontend/mame/ui/selmenu.cpp:2611
 #, c-format
 msgid "%1$s - %2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2606
+#: src/frontend/mame/ui/selmenu.cpp:2615
 msgid "Press any key to continue."
 msgstr "Premi un tasto per continuare."
 
-#: src/frontend/mame/ui/selmenu.cpp:2735
+#: src/frontend/mame/ui/selmenu.cpp:2744
 msgid "General Info"
 msgstr "Informazioni Generali"
 
-#: src/frontend/mame/ui/selmenu.cpp:2887
+#: src/frontend/mame/ui/selmenu.cpp:2896
 #, c-format
 msgid "Romset\t%1$s\n"
 msgstr "Set di rom\t%1$s\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2888
+#: src/frontend/mame/ui/selmenu.cpp:2897
 #, c-format
 msgid "Year\t%1$s\n"
 msgstr "Anno\t%1$s\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2889
+#: src/frontend/mame/ui/selmenu.cpp:2898
 #, c-format
 msgid "Manufacturer\t%1$s\n"
 msgstr "Produttore\t%1$s\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2896
+#: src/frontend/mame/ui/selmenu.cpp:2905
 #, c-format
 msgid "Driver is Clone of\t%1$s\n"
 msgstr "Il Driver è un Clone di\t%1$s\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2901
+#: src/frontend/mame/ui/selmenu.cpp:2910
 msgid "Driver is Parent\t\n"
 msgstr "Il Driver è un Parent\t\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2905
+#: src/frontend/mame/ui/selmenu.cpp:2914
 msgid "Analog Controls\tYes\n"
 msgstr "Controlli Analogici\tSì\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2907
+#: src/frontend/mame/ui/selmenu.cpp:2916
 msgid "Keyboard Inputs\tYes\n"
 msgstr "Input di Tastiera\tSì\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2910
+#: src/frontend/mame/ui/selmenu.cpp:2919
 msgid "Overall\tNOT WORKING\n"
 msgstr "Complessivamente\tNON FUNZIONANTE\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2912
+#: src/frontend/mame/ui/selmenu.cpp:2921
 msgid "Overall\tUnemulated Protection\n"
 msgstr "Complessivamente\tProtezione Non Emulata\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2914
+#: src/frontend/mame/ui/selmenu.cpp:2923
 msgid "Overall\tWorking\n"
 msgstr "Complessivamente\tFunzionante\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2917
+#: src/frontend/mame/ui/selmenu.cpp:2926
 msgid "Graphics\tUnimplemented\n"
 msgstr "Grafica\tNon implementata\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2919
+#: src/frontend/mame/ui/selmenu.cpp:2928
 msgid "Graphics\tWrong Colors\n"
 msgstr "Grafica\tColori Errati\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2921
+#: src/frontend/mame/ui/selmenu.cpp:2930
 msgid "Graphics\tImperfect Colors\n"
 msgstr "Grafica\tColori Non Perfetti\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2923
+#: src/frontend/mame/ui/selmenu.cpp:2932
 msgid "Graphics\tImperfect\n"
 msgstr "Grafica\tNon Perfetta\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2925
+#: src/frontend/mame/ui/selmenu.cpp:2934
 msgid "Graphics\tOK\n"
 msgstr "Grafica\tOK\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2928
+#: src/frontend/mame/ui/selmenu.cpp:2937
 msgid "Sound\tNone\n"
 msgstr "Suoni\tNessuno\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2930
+#: src/frontend/mame/ui/selmenu.cpp:2939
 msgid "Sound\tUnimplemented\n"
 msgstr "Audio\tNon Implementato\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2932
+#: src/frontend/mame/ui/selmenu.cpp:2941
 msgid "Sound\tImperfect\n"
 msgstr "Audio\tNon Perfetto\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2934
+#: src/frontend/mame/ui/selmenu.cpp:2943
 msgid "Sound\tOK\n"
 msgstr "Audio\tOK\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2937
+#: src/frontend/mame/ui/selmenu.cpp:2946
 msgid "Capture\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2939
+#: src/frontend/mame/ui/selmenu.cpp:2948
 msgid "Capture\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2942
+#: src/frontend/mame/ui/selmenu.cpp:2951
 msgid "Camera\tUnimplemented\n"
 msgstr "Camera\tNon implementata\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2944
+#: src/frontend/mame/ui/selmenu.cpp:2953
 msgid "Camera\tImperfect\n"
 msgstr "Camera\tImperfetta\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2947
+#: src/frontend/mame/ui/selmenu.cpp:2956
 msgid "Microphone\tUnimplemented\n"
 msgstr "Microfono\tNon implementato\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2949
+#: src/frontend/mame/ui/selmenu.cpp:2958
 msgid "Microphone\tImperfect\n"
 msgstr "Microfono\tImperfetto\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2952
+#: src/frontend/mame/ui/selmenu.cpp:2961
 msgid "Controls\tUnimplemented\n"
 msgstr "Controlli\tNon implementati\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2954
+#: src/frontend/mame/ui/selmenu.cpp:2963
 msgid "Controls\tImperfect\n"
 msgstr "Controlli\tImperfetti\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2957
+#: src/frontend/mame/ui/selmenu.cpp:2966
 msgid "Keyboard\tUnimplemented\n"
 msgstr "Tastiera\tNon implementata\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2959
+#: src/frontend/mame/ui/selmenu.cpp:2968
 msgid "Keyboard\tImperfect\n"
 msgstr "Tastiera\tImperfetta\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2962
+#: src/frontend/mame/ui/selmenu.cpp:2971
 msgid "Mouse\tUnimplemented\n"
 msgstr "Mouse\tNon implementato\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2964
+#: src/frontend/mame/ui/selmenu.cpp:2973
 msgid "Mouse\tImperfect\n"
 msgstr "Mouse\tImperfetto\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2967
+#: src/frontend/mame/ui/selmenu.cpp:2976
 msgid "Media\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2969
+#: src/frontend/mame/ui/selmenu.cpp:2978
 msgid "Media\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2972
+#: src/frontend/mame/ui/selmenu.cpp:2981
 msgid "Disk\tUnimplemented\n"
 msgstr "Disco\tNon implementato\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2974
+#: src/frontend/mame/ui/selmenu.cpp:2983
 msgid "Disk\tImperfect\n"
 msgstr "Disco\tImperfetto\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2977
+#: src/frontend/mame/ui/selmenu.cpp:2986
 msgid "Printer\tUnimplemented\n"
 msgstr "Stampante\tNon implementata\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2979
+#: src/frontend/mame/ui/selmenu.cpp:2988
 msgid "Printer\tImperfect\n"
 msgstr "Stampante\tImperfetta\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2982
+#: src/frontend/mame/ui/selmenu.cpp:2991
 msgid "Mag. Tape\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2984
+#: src/frontend/mame/ui/selmenu.cpp:2993
 msgid "Mag. Tape\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2987
+#: src/frontend/mame/ui/selmenu.cpp:2996
 msgid "Punch Tape\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2989
+#: src/frontend/mame/ui/selmenu.cpp:2998
 msgid "Punch Tape\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2992
+#: src/frontend/mame/ui/selmenu.cpp:3001
 msgid "Mag. Drum\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2994
+#: src/frontend/mame/ui/selmenu.cpp:3003
 msgid "Mag. Drum\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2997
+#: src/frontend/mame/ui/selmenu.cpp:3006
 msgid "(EP)ROM\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2999
+#: src/frontend/mame/ui/selmenu.cpp:3008
 msgid "(EP)ROM\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3002
+#: src/frontend/mame/ui/selmenu.cpp:3011
 msgid "Communications\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3004
+#: src/frontend/mame/ui/selmenu.cpp:3013
 msgid "Communications\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3007
+#: src/frontend/mame/ui/selmenu.cpp:3016
 msgid "LAN\tUnimplemented\n"
 msgstr "LAN\tNon implementata\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3009
+#: src/frontend/mame/ui/selmenu.cpp:3018
 msgid "LAN\tImperfect\n"
 msgstr "LAN\tImperfetta\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3012
+#: src/frontend/mame/ui/selmenu.cpp:3021
 msgid "WAN\tUnimplemented\n"
 msgstr "WAN\tNon implementata\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3014
+#: src/frontend/mame/ui/selmenu.cpp:3023
 msgid "WAN\tImperfect\n"
 msgstr "WAN\tImperfetta\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3017
+#: src/frontend/mame/ui/selmenu.cpp:3026
 msgid "Timing\tUnimplemented\n"
 msgstr "Temporizzazione\tNon implementata\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3019
+#: src/frontend/mame/ui/selmenu.cpp:3028
 msgid "Timing\tImperfect\n"
 msgstr "Temporizzazione\tImperfetta\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3021
+#: src/frontend/mame/ui/selmenu.cpp:3030
 msgid "Mechanical Machine\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3021
+#: src/frontend/mame/ui/selmenu.cpp:3030
 msgid "Mechanical Machine\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3022
+#: src/frontend/mame/ui/selmenu.cpp:3031
 msgid "Requires Artwork\tYes\n"
 msgstr "Richiede Artwork\tSi\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3022
+#: src/frontend/mame/ui/selmenu.cpp:3031
 msgid "Requires Artwork\tNo\n"
 msgstr "Richiede Artwork\tNo\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3023
+#: src/frontend/mame/ui/selmenu.cpp:3032
 msgid "Requires Clickable Artwork\tYes\n"
 msgstr "Richiede Artwork Cliccabile\tSi\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3023
+#: src/frontend/mame/ui/selmenu.cpp:3032
 msgid "Requires Clickable Artwork\tNo\n"
 msgstr "Richiede Artwork Cliccabile\tNo\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3025
+#: src/frontend/mame/ui/selmenu.cpp:3034
 msgid "Support Cocktail\tNo\n"
 msgstr "Supporto Cocktail\tNo\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3026
+#: src/frontend/mame/ui/selmenu.cpp:3035
 msgid "Driver is BIOS\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3026
+#: src/frontend/mame/ui/selmenu.cpp:3035
 msgid "Driver is BIOS\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3027
+#: src/frontend/mame/ui/selmenu.cpp:3036
 msgid "Support Save\tYes\n"
 msgstr "Supporto Salvataggio\tSi\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3027
+#: src/frontend/mame/ui/selmenu.cpp:3036
 msgid "Support Save\tNo\n"
 msgstr "Supporto Salvataggio\tNo\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3028
+#: src/frontend/mame/ui/selmenu.cpp:3037
 msgid "Screen Orientation\tVertical\n"
 msgstr "Orientamento Schermo\tVerticale\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3028
+#: src/frontend/mame/ui/selmenu.cpp:3037
 msgid "Screen Orientation\tHorizontal\n"
 msgstr "Orientamento Schermo\tOrizzontale\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3038
+#: src/frontend/mame/ui/selmenu.cpp:3047
 msgid "Requires CHD\tYes\n"
 msgstr "Richiede CHD\tSi\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3038
+#: src/frontend/mame/ui/selmenu.cpp:3047
 msgid "Requires CHD\tNo\n"
 msgstr "Richiede CHD\tNo\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3051
-msgid "ROM Audit Result\tOK\n"
+#: src/frontend/mame/ui/selmenu.cpp:3060
+msgid "Media Audit Result\tOK\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3053
-msgid "ROM Audit Result\tBAD\n"
+#: src/frontend/mame/ui/selmenu.cpp:3062
+msgid "Media Audit Result\tBAD\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3056
+#: src/frontend/mame/ui/selmenu.cpp:3065
 msgid "Samples Audit Result\tNone Needed\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3058
+#: src/frontend/mame/ui/selmenu.cpp:3067
 msgid "Samples Audit Result\tOK\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3060
+#: src/frontend/mame/ui/selmenu.cpp:3069
 msgid "Samples Audit Result\tBAD\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3064
+#: src/frontend/mame/ui/selmenu.cpp:3073
 msgid ""
-"ROM Audit \tDisabled\n"
-"Samples Audit \tDisabled\n"
+"Media Audit\tDisabled\n"
+"Samples Audit\tDisabled\n"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:150
+#: src/frontend/mame/ui/sndmenu.cpp:146
 msgid "Sound"
 msgstr "Audio"
 
-#: src/frontend/mame/ui/sndmenu.cpp:151
+#: src/frontend/mame/ui/sndmenu.cpp:147
 msgid "Compressor"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:152
+#: src/frontend/mame/ui/sndmenu.cpp:148
 msgid "Sample Rate"
 msgstr "Frequenza di Campionamento"
 
-#: src/frontend/mame/ui/sndmenu.cpp:153
+#: src/frontend/mame/ui/sndmenu.cpp:149
 msgid "Use External Samples"
 msgstr "Usa Sample Aggiuntivi"
 
@@ -3179,511 +3181,681 @@ msgstr ""
 msgid "  Screen '%1$s': Vector\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:132
+#: src/frontend/mame/ui/devopt.cpp:135
 #, c-format
 msgid "  Screen '%1$s': %2$d × %3$d (V) %4$s Hz\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:133
+#: src/frontend/mame/ui/devopt.cpp:136
 #, c-format
 msgid "  Screen '%1$s': %2$d × %3$d (H) %4$s Hz\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:147
+#: src/frontend/mame/ui/devopt.cpp:150
 msgid "* Sound:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:211
+#: src/frontend/mame/ui/devopt.cpp:214
 #, c-format
 msgid ""
 "* BIOS settings:\n"
 "  %1$d options    [default: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:255 src/frontend/mame/ui/devopt.cpp:271
-#: src/frontend/mame/ui/devopt.cpp:332
+#: src/frontend/mame/ui/devopt.cpp:258 src/frontend/mame/ui/devopt.cpp:274
+#: src/frontend/mame/ui/devopt.cpp:335
 #, c-format
 msgid "  %1$s    [default: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:260 src/frontend/mame/ui/devopt.cpp:276
+#: src/frontend/mame/ui/devopt.cpp:263 src/frontend/mame/ui/devopt.cpp:279
 #, c-format
 msgid "  %1$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:282
+#: src/frontend/mame/ui/devopt.cpp:285
 msgid "* DIP switch settings:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:287
+#: src/frontend/mame/ui/devopt.cpp:290
 msgid "* Configuration settings:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:291
+#: src/frontend/mame/ui/devopt.cpp:294
 msgid "* Input device(s):\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:293
+#: src/frontend/mame/ui/devopt.cpp:296
 #, c-format
 msgid "  User inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:295
+#: src/frontend/mame/ui/devopt.cpp:298
 #, c-format
 msgid "  Mahjong inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:297
+#: src/frontend/mame/ui/devopt.cpp:300
 #, c-format
 msgid "  Hanafuda inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:299
+#: src/frontend/mame/ui/devopt.cpp:302
 #, c-format
 msgid "  Gambling inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:301
+#: src/frontend/mame/ui/devopt.cpp:304
 #, c-format
 msgid "  Analog inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:303
+#: src/frontend/mame/ui/devopt.cpp:306
 #, c-format
 msgid "  Adjuster inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:305
+#: src/frontend/mame/ui/devopt.cpp:308
 #, c-format
 msgid "  Keypad inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:307
+#: src/frontend/mame/ui/devopt.cpp:310
 #, c-format
 msgid "  Keyboard inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:312
+#: src/frontend/mame/ui/devopt.cpp:315
 msgid "* Media Options:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:317
+#: src/frontend/mame/ui/devopt.cpp:320
 #, c-format
 msgid "  %1$s    [tag: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:327
+#: src/frontend/mame/ui/devopt.cpp:330
 msgid "* Slot Options:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:341
+#: src/frontend/mame/ui/devopt.cpp:344
 msgid "[None]\n"
 msgstr ""
 
-#: src/emu/render.cpp:1847
+#: src/emu/render.cpp:1796
 #, c-format
 msgctxt "view-name"
 msgid "Screen %1$u Standard (%2$u:%3$u)"
 msgstr ""
 
-#: src/emu/render.cpp:1873
+#: src/emu/render.cpp:1822
 #, c-format
 msgctxt "view-name"
 msgid "Screen %1$u Pixel Aspect (%2$u:%3$u)"
 msgstr ""
 
-#: src/emu/render.cpp:1895 src/emu/render.cpp:2030
+#: src/emu/render.cpp:1844 src/emu/render.cpp:1979
 msgctxt "view-name"
 msgid "Cocktail"
 msgstr ""
 
-#: src/emu/render.cpp:2015
+#: src/emu/render.cpp:1964
 msgctxt "view-name"
 msgid "Left-to-Right"
 msgstr ""
 
-#: src/emu/render.cpp:2016
+#: src/emu/render.cpp:1965
 msgctxt "view-name"
 msgid "Left-to-Right (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2017
+#: src/emu/render.cpp:1966
 msgctxt "view-name"
 msgid "Top-to-Bottom"
 msgstr ""
 
-#: src/emu/render.cpp:2018
+#: src/emu/render.cpp:1967
 msgctxt "view-name"
 msgid "Top-to-Bottom (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2069
+#: src/emu/render.cpp:2018
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Left-to-Right, Top-to-Bottom"
 msgstr ""
 
-#: src/emu/render.cpp:2078
+#: src/emu/render.cpp:2027
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Left-to-Right, Top-to-Bottom (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2087
+#: src/emu/render.cpp:2036
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Top-to-Bottom, Left-to-Right"
 msgstr ""
 
-#: src/emu/render.cpp:2096
+#: src/emu/render.cpp:2045
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Top-to-Bottom, Left-to-Right (Gapless)"
 msgstr ""
 
-#: src/emu/inpttype.ipp:22
+#: src/emu/ioport.cpp:332
+#, c-format
 msgctxt "input-name"
-msgid "P1 Up"
+msgid "P%1$u"
 msgstr ""
 
-#: src/emu/inpttype.ipp:23
+#: src/emu/ioport.cpp:1924
 msgctxt "input-name"
-msgid "P1 Down"
+msgid "???"
 msgstr ""
 
-#: src/emu/inpttype.ipp:24
+#: src/emu/inpttype.ipp:22 src/emu/inpttype.ipp:140 src/emu/inpttype.ipp:221
+#: src/emu/inpttype.ipp:255 src/emu/inpttype.ipp:289 src/emu/inpttype.ipp:323
+#: src/emu/inpttype.ipp:357 src/emu/inpttype.ipp:391 src/emu/inpttype.ipp:425
+#: src/emu/inpttype.ipp:459
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left"
+msgid "%p Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:25
+#: src/emu/inpttype.ipp:23 src/emu/inpttype.ipp:141 src/emu/inpttype.ipp:222
+#: src/emu/inpttype.ipp:256 src/emu/inpttype.ipp:290 src/emu/inpttype.ipp:324
+#: src/emu/inpttype.ipp:358 src/emu/inpttype.ipp:392 src/emu/inpttype.ipp:426
+#: src/emu/inpttype.ipp:460
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right"
+msgid "%p Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:26
+#: src/emu/inpttype.ipp:24 src/emu/inpttype.ipp:142 src/emu/inpttype.ipp:223
+#: src/emu/inpttype.ipp:257 src/emu/inpttype.ipp:291 src/emu/inpttype.ipp:325
+#: src/emu/inpttype.ipp:359 src/emu/inpttype.ipp:393 src/emu/inpttype.ipp:427
+#: src/emu/inpttype.ipp:461
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Up"
+msgid "%p Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:27
+#: src/emu/inpttype.ipp:25 src/emu/inpttype.ipp:143 src/emu/inpttype.ipp:224
+#: src/emu/inpttype.ipp:258 src/emu/inpttype.ipp:292 src/emu/inpttype.ipp:326
+#: src/emu/inpttype.ipp:360 src/emu/inpttype.ipp:394 src/emu/inpttype.ipp:428
+#: src/emu/inpttype.ipp:462
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Down"
+msgid "%p Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:28
+#: src/emu/inpttype.ipp:26 src/emu/inpttype.ipp:144 src/emu/inpttype.ipp:225
+#: src/emu/inpttype.ipp:259 src/emu/inpttype.ipp:293 src/emu/inpttype.ipp:327
+#: src/emu/inpttype.ipp:361 src/emu/inpttype.ipp:395 src/emu/inpttype.ipp:429
+#: src/emu/inpttype.ipp:463
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Left"
+msgid "%p Right Stick/Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:29
+#: src/emu/inpttype.ipp:27 src/emu/inpttype.ipp:145 src/emu/inpttype.ipp:226
+#: src/emu/inpttype.ipp:260 src/emu/inpttype.ipp:294 src/emu/inpttype.ipp:328
+#: src/emu/inpttype.ipp:362 src/emu/inpttype.ipp:396 src/emu/inpttype.ipp:430
+#: src/emu/inpttype.ipp:464
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Right"
+msgid "%p Right Stick/Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:30
+#: src/emu/inpttype.ipp:28 src/emu/inpttype.ipp:146 src/emu/inpttype.ipp:227
+#: src/emu/inpttype.ipp:261 src/emu/inpttype.ipp:295 src/emu/inpttype.ipp:329
+#: src/emu/inpttype.ipp:363 src/emu/inpttype.ipp:397 src/emu/inpttype.ipp:431
+#: src/emu/inpttype.ipp:465
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Up"
+msgid "%p Right Stick/Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:31
+#: src/emu/inpttype.ipp:29 src/emu/inpttype.ipp:147 src/emu/inpttype.ipp:228
+#: src/emu/inpttype.ipp:262 src/emu/inpttype.ipp:296 src/emu/inpttype.ipp:330
+#: src/emu/inpttype.ipp:364 src/emu/inpttype.ipp:398 src/emu/inpttype.ipp:432
+#: src/emu/inpttype.ipp:466
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Down"
+msgid "%p Right Stick/Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:32
+#: src/emu/inpttype.ipp:30 src/emu/inpttype.ipp:148 src/emu/inpttype.ipp:229
+#: src/emu/inpttype.ipp:263 src/emu/inpttype.ipp:297 src/emu/inpttype.ipp:331
+#: src/emu/inpttype.ipp:365 src/emu/inpttype.ipp:399 src/emu/inpttype.ipp:433
+#: src/emu/inpttype.ipp:467
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Left"
+msgid "%p Left Stick/Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:33
+#: src/emu/inpttype.ipp:31 src/emu/inpttype.ipp:149 src/emu/inpttype.ipp:230
+#: src/emu/inpttype.ipp:264 src/emu/inpttype.ipp:298 src/emu/inpttype.ipp:332
+#: src/emu/inpttype.ipp:366 src/emu/inpttype.ipp:400 src/emu/inpttype.ipp:434
+#: src/emu/inpttype.ipp:468
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Right"
+msgid "%p Left Stick/Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:34
+#: src/emu/inpttype.ipp:32 src/emu/inpttype.ipp:150 src/emu/inpttype.ipp:231
+#: src/emu/inpttype.ipp:265 src/emu/inpttype.ipp:299 src/emu/inpttype.ipp:333
+#: src/emu/inpttype.ipp:367 src/emu/inpttype.ipp:401 src/emu/inpttype.ipp:435
+#: src/emu/inpttype.ipp:469
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 1"
+msgid "%p Left Stick/Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:35
+#: src/emu/inpttype.ipp:33 src/emu/inpttype.ipp:151 src/emu/inpttype.ipp:232
+#: src/emu/inpttype.ipp:266 src/emu/inpttype.ipp:300 src/emu/inpttype.ipp:334
+#: src/emu/inpttype.ipp:368 src/emu/inpttype.ipp:402 src/emu/inpttype.ipp:436
+#: src/emu/inpttype.ipp:470
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 2"
+msgid "%p Left Stick/Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:36
+#: src/emu/inpttype.ipp:34 src/emu/inpttype.ipp:152 src/emu/inpttype.ipp:233
+#: src/emu/inpttype.ipp:267 src/emu/inpttype.ipp:301 src/emu/inpttype.ipp:335
+#: src/emu/inpttype.ipp:369 src/emu/inpttype.ipp:403 src/emu/inpttype.ipp:437
+#: src/emu/inpttype.ipp:471
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 3"
+msgid "%p Button 1"
 msgstr ""
 
-#: src/emu/inpttype.ipp:37
+#: src/emu/inpttype.ipp:35 src/emu/inpttype.ipp:153 src/emu/inpttype.ipp:234
+#: src/emu/inpttype.ipp:268 src/emu/inpttype.ipp:302 src/emu/inpttype.ipp:336
+#: src/emu/inpttype.ipp:370 src/emu/inpttype.ipp:404 src/emu/inpttype.ipp:438
+#: src/emu/inpttype.ipp:472
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 4"
+msgid "%p Button 2"
 msgstr ""
 
-#: src/emu/inpttype.ipp:38
+#: src/emu/inpttype.ipp:36 src/emu/inpttype.ipp:154 src/emu/inpttype.ipp:235
+#: src/emu/inpttype.ipp:269 src/emu/inpttype.ipp:303 src/emu/inpttype.ipp:337
+#: src/emu/inpttype.ipp:371 src/emu/inpttype.ipp:405 src/emu/inpttype.ipp:439
+#: src/emu/inpttype.ipp:473
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 5"
+msgid "%p Button 3"
 msgstr ""
 
-#: src/emu/inpttype.ipp:39
+#: src/emu/inpttype.ipp:37 src/emu/inpttype.ipp:155 src/emu/inpttype.ipp:236
+#: src/emu/inpttype.ipp:270 src/emu/inpttype.ipp:304 src/emu/inpttype.ipp:338
+#: src/emu/inpttype.ipp:372 src/emu/inpttype.ipp:406 src/emu/inpttype.ipp:440
+#: src/emu/inpttype.ipp:474
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 6"
+msgid "%p Button 4"
 msgstr ""
 
-#: src/emu/inpttype.ipp:40
+#: src/emu/inpttype.ipp:38 src/emu/inpttype.ipp:156 src/emu/inpttype.ipp:237
+#: src/emu/inpttype.ipp:271 src/emu/inpttype.ipp:305 src/emu/inpttype.ipp:339
+#: src/emu/inpttype.ipp:373 src/emu/inpttype.ipp:407 src/emu/inpttype.ipp:441
+#: src/emu/inpttype.ipp:475
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 7"
+msgid "%p Button 5"
 msgstr ""
 
-#: src/emu/inpttype.ipp:41
+#: src/emu/inpttype.ipp:39 src/emu/inpttype.ipp:157 src/emu/inpttype.ipp:238
+#: src/emu/inpttype.ipp:272 src/emu/inpttype.ipp:306 src/emu/inpttype.ipp:340
+#: src/emu/inpttype.ipp:374 src/emu/inpttype.ipp:408 src/emu/inpttype.ipp:442
+#: src/emu/inpttype.ipp:476
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 8"
+msgid "%p Button 6"
 msgstr ""
 
-#: src/emu/inpttype.ipp:42
+#: src/emu/inpttype.ipp:40 src/emu/inpttype.ipp:158 src/emu/inpttype.ipp:239
+#: src/emu/inpttype.ipp:273 src/emu/inpttype.ipp:307 src/emu/inpttype.ipp:341
+#: src/emu/inpttype.ipp:375 src/emu/inpttype.ipp:409 src/emu/inpttype.ipp:443
+#: src/emu/inpttype.ipp:477
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 9"
+msgid "%p Button 7"
 msgstr ""
 
-#: src/emu/inpttype.ipp:43
+#: src/emu/inpttype.ipp:41 src/emu/inpttype.ipp:159 src/emu/inpttype.ipp:240
+#: src/emu/inpttype.ipp:274 src/emu/inpttype.ipp:308 src/emu/inpttype.ipp:342
+#: src/emu/inpttype.ipp:376 src/emu/inpttype.ipp:410 src/emu/inpttype.ipp:444
+#: src/emu/inpttype.ipp:478
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 10"
+msgid "%p Button 8"
 msgstr ""
 
-#: src/emu/inpttype.ipp:44
+#: src/emu/inpttype.ipp:42 src/emu/inpttype.ipp:160 src/emu/inpttype.ipp:241
+#: src/emu/inpttype.ipp:275 src/emu/inpttype.ipp:309 src/emu/inpttype.ipp:343
+#: src/emu/inpttype.ipp:377 src/emu/inpttype.ipp:411 src/emu/inpttype.ipp:445
+#: src/emu/inpttype.ipp:479
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 11"
+msgid "%p Button 9"
 msgstr ""
 
-#: src/emu/inpttype.ipp:45
+#: src/emu/inpttype.ipp:43 src/emu/inpttype.ipp:161 src/emu/inpttype.ipp:242
+#: src/emu/inpttype.ipp:276 src/emu/inpttype.ipp:310 src/emu/inpttype.ipp:344
+#: src/emu/inpttype.ipp:378 src/emu/inpttype.ipp:412 src/emu/inpttype.ipp:446
+#: src/emu/inpttype.ipp:480
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 12"
+msgid "%p Button 10"
 msgstr ""
 
-#: src/emu/inpttype.ipp:46
+#: src/emu/inpttype.ipp:44 src/emu/inpttype.ipp:162 src/emu/inpttype.ipp:243
+#: src/emu/inpttype.ipp:277 src/emu/inpttype.ipp:311 src/emu/inpttype.ipp:345
+#: src/emu/inpttype.ipp:379 src/emu/inpttype.ipp:413 src/emu/inpttype.ipp:447
+#: src/emu/inpttype.ipp:481
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 13"
+msgid "%p Button 11"
 msgstr ""
 
-#: src/emu/inpttype.ipp:47
+#: src/emu/inpttype.ipp:45 src/emu/inpttype.ipp:163 src/emu/inpttype.ipp:244
+#: src/emu/inpttype.ipp:278 src/emu/inpttype.ipp:312 src/emu/inpttype.ipp:346
+#: src/emu/inpttype.ipp:380 src/emu/inpttype.ipp:414 src/emu/inpttype.ipp:448
+#: src/emu/inpttype.ipp:482
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 14"
+msgid "%p Button 12"
 msgstr ""
 
-#: src/emu/inpttype.ipp:48
+#: src/emu/inpttype.ipp:46 src/emu/inpttype.ipp:164 src/emu/inpttype.ipp:245
+#: src/emu/inpttype.ipp:279 src/emu/inpttype.ipp:313 src/emu/inpttype.ipp:347
+#: src/emu/inpttype.ipp:381 src/emu/inpttype.ipp:415 src/emu/inpttype.ipp:449
+#: src/emu/inpttype.ipp:483
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 15"
+msgid "%p Button 13"
 msgstr ""
 
-#: src/emu/inpttype.ipp:49
+#: src/emu/inpttype.ipp:47 src/emu/inpttype.ipp:165 src/emu/inpttype.ipp:246
+#: src/emu/inpttype.ipp:280 src/emu/inpttype.ipp:314 src/emu/inpttype.ipp:348
+#: src/emu/inpttype.ipp:382 src/emu/inpttype.ipp:416 src/emu/inpttype.ipp:450
+#: src/emu/inpttype.ipp:484
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 16"
+msgid "%p Button 14"
 msgstr ""
 
-#: src/emu/inpttype.ipp:50
+#: src/emu/inpttype.ipp:48 src/emu/inpttype.ipp:166 src/emu/inpttype.ipp:247
+#: src/emu/inpttype.ipp:281 src/emu/inpttype.ipp:315 src/emu/inpttype.ipp:349
+#: src/emu/inpttype.ipp:383 src/emu/inpttype.ipp:417 src/emu/inpttype.ipp:451
+#: src/emu/inpttype.ipp:485
+#, c-format
 msgctxt "input-name"
-msgid "P1 Start"
+msgid "%p Button 15"
 msgstr ""
 
-#: src/emu/inpttype.ipp:51
+#: src/emu/inpttype.ipp:49 src/emu/inpttype.ipp:167 src/emu/inpttype.ipp:248
+#: src/emu/inpttype.ipp:282 src/emu/inpttype.ipp:316 src/emu/inpttype.ipp:350
+#: src/emu/inpttype.ipp:384 src/emu/inpttype.ipp:418 src/emu/inpttype.ipp:452
+#: src/emu/inpttype.ipp:486
+#, c-format
 msgctxt "input-name"
-msgid "P1 Select"
+msgid "%p Button 16"
 msgstr ""
 
-#: src/emu/inpttype.ipp:56
+#: src/emu/inpttype.ipp:50 src/emu/inpttype.ipp:168 src/emu/inpttype.ipp:249
+#: src/emu/inpttype.ipp:283 src/emu/inpttype.ipp:317 src/emu/inpttype.ipp:351
+#: src/emu/inpttype.ipp:385 src/emu/inpttype.ipp:419 src/emu/inpttype.ipp:453
+#: src/emu/inpttype.ipp:487
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong A"
+msgid "%p Start"
 msgstr ""
 
-#: src/emu/inpttype.ipp:57
+#: src/emu/inpttype.ipp:51 src/emu/inpttype.ipp:169 src/emu/inpttype.ipp:250
+#: src/emu/inpttype.ipp:284 src/emu/inpttype.ipp:318 src/emu/inpttype.ipp:352
+#: src/emu/inpttype.ipp:386 src/emu/inpttype.ipp:420 src/emu/inpttype.ipp:454
+#: src/emu/inpttype.ipp:488
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong B"
+msgid "%p Select"
 msgstr ""
 
-#: src/emu/inpttype.ipp:58
+#: src/emu/inpttype.ipp:56 src/emu/inpttype.ipp:174
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong C"
+msgid "%p Mahjong A"
 msgstr ""
 
-#: src/emu/inpttype.ipp:59
+#: src/emu/inpttype.ipp:57 src/emu/inpttype.ipp:175
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong D"
+msgid "%p Mahjong B"
 msgstr ""
 
-#: src/emu/inpttype.ipp:60
+#: src/emu/inpttype.ipp:58 src/emu/inpttype.ipp:176
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong E"
+msgid "%p Mahjong C"
 msgstr ""
 
-#: src/emu/inpttype.ipp:61
+#: src/emu/inpttype.ipp:59 src/emu/inpttype.ipp:177
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong F"
+msgid "%p Mahjong D"
 msgstr ""
 
-#: src/emu/inpttype.ipp:62
+#: src/emu/inpttype.ipp:60 src/emu/inpttype.ipp:178
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong G"
+msgid "%p Mahjong E"
 msgstr ""
 
-#: src/emu/inpttype.ipp:63
+#: src/emu/inpttype.ipp:61 src/emu/inpttype.ipp:179
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong H"
+msgid "%p Mahjong F"
 msgstr ""
 
-#: src/emu/inpttype.ipp:64
+#: src/emu/inpttype.ipp:62 src/emu/inpttype.ipp:180
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong I"
+msgid "%p Mahjong G"
 msgstr ""
 
-#: src/emu/inpttype.ipp:65
+#: src/emu/inpttype.ipp:63 src/emu/inpttype.ipp:181
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong J"
+msgid "%p Mahjong H"
 msgstr ""
 
-#: src/emu/inpttype.ipp:66
+#: src/emu/inpttype.ipp:64 src/emu/inpttype.ipp:182
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong K"
+msgid "%p Mahjong I"
 msgstr ""
 
-#: src/emu/inpttype.ipp:67
+#: src/emu/inpttype.ipp:65 src/emu/inpttype.ipp:183
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong L"
+msgid "%p Mahjong J"
 msgstr ""
 
-#: src/emu/inpttype.ipp:68
+#: src/emu/inpttype.ipp:66 src/emu/inpttype.ipp:184
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong M"
+msgid "%p Mahjong K"
 msgstr ""
 
-#: src/emu/inpttype.ipp:69
+#: src/emu/inpttype.ipp:67 src/emu/inpttype.ipp:185
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong N"
+msgid "%p Mahjong L"
 msgstr ""
 
-#: src/emu/inpttype.ipp:70
+#: src/emu/inpttype.ipp:68 src/emu/inpttype.ipp:186
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong O"
+msgid "%p Mahjong M"
 msgstr ""
 
-#: src/emu/inpttype.ipp:71
+#: src/emu/inpttype.ipp:69 src/emu/inpttype.ipp:187
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong P"
+msgid "%p Mahjong N"
 msgstr ""
 
-#: src/emu/inpttype.ipp:72
+#: src/emu/inpttype.ipp:70 src/emu/inpttype.ipp:188
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Q"
+msgid "%p Mahjong O"
 msgstr ""
 
-#: src/emu/inpttype.ipp:73
+#: src/emu/inpttype.ipp:71 src/emu/inpttype.ipp:189
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Kan"
+msgid "%p Mahjong P"
 msgstr ""
 
-#: src/emu/inpttype.ipp:74
+#: src/emu/inpttype.ipp:72 src/emu/inpttype.ipp:190
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Pon"
+msgid "%p Mahjong Q"
 msgstr ""
 
-#: src/emu/inpttype.ipp:75
+#: src/emu/inpttype.ipp:73 src/emu/inpttype.ipp:191
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Chi"
+msgid "%p Mahjong Kan"
 msgstr ""
 
-#: src/emu/inpttype.ipp:76
+#: src/emu/inpttype.ipp:74 src/emu/inpttype.ipp:192
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Reach"
+msgid "%p Mahjong Pon"
 msgstr ""
 
-#: src/emu/inpttype.ipp:77
+#: src/emu/inpttype.ipp:75 src/emu/inpttype.ipp:193
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Ron"
+msgid "%p Mahjong Chi"
 msgstr ""
 
-#: src/emu/inpttype.ipp:78
+#: src/emu/inpttype.ipp:76 src/emu/inpttype.ipp:194
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Flip Flop"
+msgid "%p Mahjong Reach"
 msgstr ""
 
-#: src/emu/inpttype.ipp:79
+#: src/emu/inpttype.ipp:77 src/emu/inpttype.ipp:195
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Bet"
+msgid "%p Mahjong Ron"
 msgstr ""
 
-#: src/emu/inpttype.ipp:80
+#: src/emu/inpttype.ipp:78 src/emu/inpttype.ipp:200
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Take Score"
+msgid "%p Mahjong Flip Flop"
 msgstr ""
 
-#: src/emu/inpttype.ipp:81
+#: src/emu/inpttype.ipp:79 src/emu/inpttype.ipp:196
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Double Up"
+msgid "%p Mahjong Bet"
 msgstr ""
 
-#: src/emu/inpttype.ipp:82
+#: src/emu/inpttype.ipp:80 src/emu/inpttype.ipp:198
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Big"
+msgid "%p Mahjong Take Score"
 msgstr ""
 
-#: src/emu/inpttype.ipp:83
+#: src/emu/inpttype.ipp:81 src/emu/inpttype.ipp:199
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Small"
+msgid "%p Mahjong Double Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:84
+#: src/emu/inpttype.ipp:82 src/emu/inpttype.ipp:201
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Last Chance"
+msgid "%p Mahjong Big"
 msgstr ""
 
-#: src/emu/inpttype.ipp:89
+#: src/emu/inpttype.ipp:83 src/emu/inpttype.ipp:202
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda A/1"
+msgid "%p Mahjong Small"
 msgstr ""
 
-#: src/emu/inpttype.ipp:90
+#: src/emu/inpttype.ipp:84 src/emu/inpttype.ipp:197
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda B/2"
+msgid "%p Mahjong Last Chance"
 msgstr ""
 
-#: src/emu/inpttype.ipp:91
+#: src/emu/inpttype.ipp:89 src/emu/inpttype.ipp:207
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda C/3"
+msgid "%p Hanafuda A/1"
 msgstr ""
 
-#: src/emu/inpttype.ipp:92
+#: src/emu/inpttype.ipp:90 src/emu/inpttype.ipp:208
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda D/4"
+msgid "%p Hanafuda B/2"
 msgstr ""
 
-#: src/emu/inpttype.ipp:93
+#: src/emu/inpttype.ipp:91 src/emu/inpttype.ipp:209
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda E/5"
+msgid "%p Hanafuda C/3"
 msgstr ""
 
-#: src/emu/inpttype.ipp:94
+#: src/emu/inpttype.ipp:92 src/emu/inpttype.ipp:210
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda F/6"
+msgid "%p Hanafuda D/4"
 msgstr ""
 
-#: src/emu/inpttype.ipp:95
+#: src/emu/inpttype.ipp:93 src/emu/inpttype.ipp:211
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda G/7"
+msgid "%p Hanafuda E/5"
 msgstr ""
 
-#: src/emu/inpttype.ipp:96
+#: src/emu/inpttype.ipp:94 src/emu/inpttype.ipp:212
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda H/8"
+msgid "%p Hanafuda F/6"
 msgstr ""
 
-#: src/emu/inpttype.ipp:97
+#: src/emu/inpttype.ipp:95 src/emu/inpttype.ipp:213
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda Yes"
+msgid "%p Hanafuda G/7"
 msgstr ""
 
-#: src/emu/inpttype.ipp:98
+#: src/emu/inpttype.ipp:96 src/emu/inpttype.ipp:214
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda No"
+msgid "%p Hanafuda H/8"
+msgstr ""
+
+#: src/emu/inpttype.ipp:97 src/emu/inpttype.ipp:215
+#, c-format
+msgctxt "input-name"
+msgid "%p Hanafuda Yes"
+msgstr ""
+
+#: src/emu/inpttype.ipp:98 src/emu/inpttype.ipp:216
+#, c-format
+msgctxt "input-name"
+msgid "%p Hanafuda No"
 msgstr ""
 
 #: src/emu/inpttype.ipp:103
@@ -3811,1551 +3983,6 @@ msgctxt "input-name"
 msgid "Stop All Reels"
 msgstr ""
 
-#: src/emu/inpttype.ipp:140
-msgctxt "input-name"
-msgid "P2 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:141
-msgctxt "input-name"
-msgid "P2 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:142
-msgctxt "input-name"
-msgid "P2 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:143
-msgctxt "input-name"
-msgid "P2 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:144
-msgctxt "input-name"
-msgid "P2 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:145
-msgctxt "input-name"
-msgid "P2 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:146
-msgctxt "input-name"
-msgid "P2 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:147
-msgctxt "input-name"
-msgid "P2 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:148
-msgctxt "input-name"
-msgid "P2 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:149
-msgctxt "input-name"
-msgid "P2 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:150
-msgctxt "input-name"
-msgid "P2 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:151
-msgctxt "input-name"
-msgid "P2 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:152
-msgctxt "input-name"
-msgid "P2 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:153
-msgctxt "input-name"
-msgid "P2 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:154
-msgctxt "input-name"
-msgid "P2 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:155
-msgctxt "input-name"
-msgid "P2 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:156
-msgctxt "input-name"
-msgid "P2 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:157
-msgctxt "input-name"
-msgid "P2 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:158
-msgctxt "input-name"
-msgid "P2 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:159
-msgctxt "input-name"
-msgid "P2 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:160
-msgctxt "input-name"
-msgid "P2 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:161
-msgctxt "input-name"
-msgid "P2 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:162
-msgctxt "input-name"
-msgid "P2 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:163
-msgctxt "input-name"
-msgid "P2 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:164
-msgctxt "input-name"
-msgid "P2 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:165
-msgctxt "input-name"
-msgid "P2 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:166
-msgctxt "input-name"
-msgid "P2 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:167
-msgctxt "input-name"
-msgid "P2 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:168
-msgctxt "input-name"
-msgid "P2 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:169
-msgctxt "input-name"
-msgid "P2 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:174
-msgctxt "input-name"
-msgid "P2 Mahjong A"
-msgstr ""
-
-#: src/emu/inpttype.ipp:175
-msgctxt "input-name"
-msgid "P2 Mahjong B"
-msgstr ""
-
-#: src/emu/inpttype.ipp:176
-msgctxt "input-name"
-msgid "P2 Mahjong C"
-msgstr ""
-
-#: src/emu/inpttype.ipp:177
-msgctxt "input-name"
-msgid "P2 Mahjong D"
-msgstr ""
-
-#: src/emu/inpttype.ipp:178
-msgctxt "input-name"
-msgid "P2 Mahjong E"
-msgstr ""
-
-#: src/emu/inpttype.ipp:179
-msgctxt "input-name"
-msgid "P2 Mahjong F"
-msgstr ""
-
-#: src/emu/inpttype.ipp:180
-msgctxt "input-name"
-msgid "P2 Mahjong G"
-msgstr ""
-
-#: src/emu/inpttype.ipp:181
-msgctxt "input-name"
-msgid "P2 Mahjong H"
-msgstr ""
-
-#: src/emu/inpttype.ipp:182
-msgctxt "input-name"
-msgid "P2 Mahjong I"
-msgstr ""
-
-#: src/emu/inpttype.ipp:183
-msgctxt "input-name"
-msgid "P2 Mahjong J"
-msgstr ""
-
-#: src/emu/inpttype.ipp:184
-msgctxt "input-name"
-msgid "P2 Mahjong K"
-msgstr ""
-
-#: src/emu/inpttype.ipp:185
-msgctxt "input-name"
-msgid "P2 Mahjong L"
-msgstr ""
-
-#: src/emu/inpttype.ipp:186
-msgctxt "input-name"
-msgid "P2 Mahjong M"
-msgstr ""
-
-#: src/emu/inpttype.ipp:187
-msgctxt "input-name"
-msgid "P2 Mahjong N"
-msgstr ""
-
-#: src/emu/inpttype.ipp:188
-msgctxt "input-name"
-msgid "P2 Mahjong O"
-msgstr ""
-
-#: src/emu/inpttype.ipp:189
-msgctxt "input-name"
-msgid "P2 Mahjong P"
-msgstr ""
-
-#: src/emu/inpttype.ipp:190
-msgctxt "input-name"
-msgid "P2 Mahjong Q"
-msgstr ""
-
-#: src/emu/inpttype.ipp:191
-msgctxt "input-name"
-msgid "P2 Mahjong Kan"
-msgstr ""
-
-#: src/emu/inpttype.ipp:192
-msgctxt "input-name"
-msgid "P2 Mahjong Pon"
-msgstr ""
-
-#: src/emu/inpttype.ipp:193
-msgctxt "input-name"
-msgid "P2 Mahjong Chi"
-msgstr ""
-
-#: src/emu/inpttype.ipp:194
-msgctxt "input-name"
-msgid "P2 Mahjong Reach"
-msgstr ""
-
-#: src/emu/inpttype.ipp:195
-msgctxt "input-name"
-msgid "P2 Mahjong Ron"
-msgstr ""
-
-#: src/emu/inpttype.ipp:196
-msgctxt "input-name"
-msgid "P2 Mahjong Bet"
-msgstr ""
-
-#: src/emu/inpttype.ipp:197
-msgctxt "input-name"
-msgid "P2 Mahjong Last Chance"
-msgstr ""
-
-#: src/emu/inpttype.ipp:198
-msgctxt "input-name"
-msgid "P2 Mahjong Take Score"
-msgstr ""
-
-#: src/emu/inpttype.ipp:199
-msgctxt "input-name"
-msgid "P2 Mahjong Double Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:200
-msgctxt "input-name"
-msgid "P2 Mahjong Flip Flop"
-msgstr ""
-
-#: src/emu/inpttype.ipp:201
-msgctxt "input-name"
-msgid "P2 Mahjong Big"
-msgstr ""
-
-#: src/emu/inpttype.ipp:202
-msgctxt "input-name"
-msgid "P2 Mahjong Small"
-msgstr ""
-
-#: src/emu/inpttype.ipp:207
-msgctxt "input-name"
-msgid "P2 Hanafuda A/1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:208
-msgctxt "input-name"
-msgid "P2 Hanafuda B/2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:209
-msgctxt "input-name"
-msgid "P2 Hanafuda C/3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:210
-msgctxt "input-name"
-msgid "P2 Hanafuda D/4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:211
-msgctxt "input-name"
-msgid "P2 Hanafuda E/5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:212
-msgctxt "input-name"
-msgid "P2 Hanafuda F/6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:213
-msgctxt "input-name"
-msgid "P2 Hanafuda G/7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:214
-msgctxt "input-name"
-msgid "P2 Hanafuda H/8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:215
-msgctxt "input-name"
-msgid "P2 Hanafuda Yes"
-msgstr ""
-
-#: src/emu/inpttype.ipp:216
-msgctxt "input-name"
-msgid "P2 Hanafuda No"
-msgstr ""
-
-#: src/emu/inpttype.ipp:221
-msgctxt "input-name"
-msgid "P3 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:222
-msgctxt "input-name"
-msgid "P3 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:223
-msgctxt "input-name"
-msgid "P3 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:224
-msgctxt "input-name"
-msgid "P3 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:225
-msgctxt "input-name"
-msgid "P3 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:226
-msgctxt "input-name"
-msgid "P3 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:227
-msgctxt "input-name"
-msgid "P3 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:228
-msgctxt "input-name"
-msgid "P3 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:229
-msgctxt "input-name"
-msgid "P3 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:230
-msgctxt "input-name"
-msgid "P3 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:231
-msgctxt "input-name"
-msgid "P3 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:232
-msgctxt "input-name"
-msgid "P3 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:233
-msgctxt "input-name"
-msgid "P3 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:234
-msgctxt "input-name"
-msgid "P3 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:235
-msgctxt "input-name"
-msgid "P3 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:236
-msgctxt "input-name"
-msgid "P3 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:237
-msgctxt "input-name"
-msgid "P3 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:238
-msgctxt "input-name"
-msgid "P3 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:239
-msgctxt "input-name"
-msgid "P3 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:240
-msgctxt "input-name"
-msgid "P3 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:241
-msgctxt "input-name"
-msgid "P3 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:242
-msgctxt "input-name"
-msgid "P3 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:243
-msgctxt "input-name"
-msgid "P3 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:244
-msgctxt "input-name"
-msgid "P3 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:245
-msgctxt "input-name"
-msgid "P3 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:246
-msgctxt "input-name"
-msgid "P3 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:247
-msgctxt "input-name"
-msgid "P3 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:248
-msgctxt "input-name"
-msgid "P3 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:249
-msgctxt "input-name"
-msgid "P3 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:250
-msgctxt "input-name"
-msgid "P3 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:255
-msgctxt "input-name"
-msgid "P4 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:256
-msgctxt "input-name"
-msgid "P4 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:257
-msgctxt "input-name"
-msgid "P4 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:258
-msgctxt "input-name"
-msgid "P4 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:259
-msgctxt "input-name"
-msgid "P4 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:260
-msgctxt "input-name"
-msgid "P4 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:261
-msgctxt "input-name"
-msgid "P4 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:262
-msgctxt "input-name"
-msgid "P4 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:263
-msgctxt "input-name"
-msgid "P4 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:264
-msgctxt "input-name"
-msgid "P4 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:265
-msgctxt "input-name"
-msgid "P4 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:266
-msgctxt "input-name"
-msgid "P4 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:267
-msgctxt "input-name"
-msgid "P4 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:268
-msgctxt "input-name"
-msgid "P4 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:269
-msgctxt "input-name"
-msgid "P4 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:270
-msgctxt "input-name"
-msgid "P4 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:271
-msgctxt "input-name"
-msgid "P4 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:272
-msgctxt "input-name"
-msgid "P4 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:273
-msgctxt "input-name"
-msgid "P4 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:274
-msgctxt "input-name"
-msgid "P4 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:275
-msgctxt "input-name"
-msgid "P4 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:276
-msgctxt "input-name"
-msgid "P4 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:277
-msgctxt "input-name"
-msgid "P4 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:278
-msgctxt "input-name"
-msgid "P4 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:279
-msgctxt "input-name"
-msgid "P4 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:280
-msgctxt "input-name"
-msgid "P4 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:281
-msgctxt "input-name"
-msgid "P4 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:282
-msgctxt "input-name"
-msgid "P4 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:283
-msgctxt "input-name"
-msgid "P4 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:284
-msgctxt "input-name"
-msgid "P4 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:289
-msgctxt "input-name"
-msgid "P5 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:290
-msgctxt "input-name"
-msgid "P5 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:291
-msgctxt "input-name"
-msgid "P5 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:292
-msgctxt "input-name"
-msgid "P5 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:293
-msgctxt "input-name"
-msgid "P5 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:294
-msgctxt "input-name"
-msgid "P5 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:295
-msgctxt "input-name"
-msgid "P5 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:296
-msgctxt "input-name"
-msgid "P5 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:297
-msgctxt "input-name"
-msgid "P5 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:298
-msgctxt "input-name"
-msgid "P5 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:299
-msgctxt "input-name"
-msgid "P5 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:300
-msgctxt "input-name"
-msgid "P5 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:301
-msgctxt "input-name"
-msgid "P5 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:302
-msgctxt "input-name"
-msgid "P5 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:303
-msgctxt "input-name"
-msgid "P5 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:304
-msgctxt "input-name"
-msgid "P5 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:305
-msgctxt "input-name"
-msgid "P5 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:306
-msgctxt "input-name"
-msgid "P5 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:307
-msgctxt "input-name"
-msgid "P5 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:308
-msgctxt "input-name"
-msgid "P5 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:309
-msgctxt "input-name"
-msgid "P5 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:310
-msgctxt "input-name"
-msgid "P5 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:311
-msgctxt "input-name"
-msgid "P5 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:312
-msgctxt "input-name"
-msgid "P5 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:313
-msgctxt "input-name"
-msgid "P5 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:314
-msgctxt "input-name"
-msgid "P5 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:315
-msgctxt "input-name"
-msgid "P5 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:316
-msgctxt "input-name"
-msgid "P5 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:317
-msgctxt "input-name"
-msgid "P5 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:318
-msgctxt "input-name"
-msgid "P5 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:323
-msgctxt "input-name"
-msgid "P6 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:324
-msgctxt "input-name"
-msgid "P6 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:325
-msgctxt "input-name"
-msgid "P6 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:326
-msgctxt "input-name"
-msgid "P6 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:327
-msgctxt "input-name"
-msgid "P6 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:328
-msgctxt "input-name"
-msgid "P6 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:329
-msgctxt "input-name"
-msgid "P6 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:330
-msgctxt "input-name"
-msgid "P6 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:331
-msgctxt "input-name"
-msgid "P6 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:332
-msgctxt "input-name"
-msgid "P6 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:333
-msgctxt "input-name"
-msgid "P6 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:334
-msgctxt "input-name"
-msgid "P6 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:335
-msgctxt "input-name"
-msgid "P6 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:336
-msgctxt "input-name"
-msgid "P6 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:337
-msgctxt "input-name"
-msgid "P6 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:338
-msgctxt "input-name"
-msgid "P6 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:339
-msgctxt "input-name"
-msgid "P6 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:340
-msgctxt "input-name"
-msgid "P6 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:341
-msgctxt "input-name"
-msgid "P6 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:342
-msgctxt "input-name"
-msgid "P6 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:343
-msgctxt "input-name"
-msgid "P6 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:344
-msgctxt "input-name"
-msgid "P6 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:345
-msgctxt "input-name"
-msgid "P6 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:346
-msgctxt "input-name"
-msgid "P6 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:347
-msgctxt "input-name"
-msgid "P6 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:348
-msgctxt "input-name"
-msgid "P6 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:349
-msgctxt "input-name"
-msgid "P6 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:350
-msgctxt "input-name"
-msgid "P6 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:351
-msgctxt "input-name"
-msgid "P6 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:352
-msgctxt "input-name"
-msgid "P6 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:357
-msgctxt "input-name"
-msgid "P7 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:358
-msgctxt "input-name"
-msgid "P7 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:359
-msgctxt "input-name"
-msgid "P7 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:360
-msgctxt "input-name"
-msgid "P7 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:361
-msgctxt "input-name"
-msgid "P7 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:362
-msgctxt "input-name"
-msgid "P7 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:363
-msgctxt "input-name"
-msgid "P7 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:364
-msgctxt "input-name"
-msgid "P7 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:365
-msgctxt "input-name"
-msgid "P7 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:366
-msgctxt "input-name"
-msgid "P7 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:367
-msgctxt "input-name"
-msgid "P7 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:368
-msgctxt "input-name"
-msgid "P7 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:369
-msgctxt "input-name"
-msgid "P7 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:370
-msgctxt "input-name"
-msgid "P7 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:371
-msgctxt "input-name"
-msgid "P7 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:372
-msgctxt "input-name"
-msgid "P7 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:373
-msgctxt "input-name"
-msgid "P7 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:374
-msgctxt "input-name"
-msgid "P7 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:375
-msgctxt "input-name"
-msgid "P7 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:376
-msgctxt "input-name"
-msgid "P7 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:377
-msgctxt "input-name"
-msgid "P7 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:378
-msgctxt "input-name"
-msgid "P7 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:379
-msgctxt "input-name"
-msgid "P7 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:380
-msgctxt "input-name"
-msgid "P7 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:381
-msgctxt "input-name"
-msgid "P7 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:382
-msgctxt "input-name"
-msgid "P7 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:383
-msgctxt "input-name"
-msgid "P7 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:384
-msgctxt "input-name"
-msgid "P7 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:385
-msgctxt "input-name"
-msgid "P7 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:386
-msgctxt "input-name"
-msgid "P7 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:391
-msgctxt "input-name"
-msgid "P8 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:392
-msgctxt "input-name"
-msgid "P8 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:393
-msgctxt "input-name"
-msgid "P8 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:394
-msgctxt "input-name"
-msgid "P8 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:395
-msgctxt "input-name"
-msgid "P8 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:396
-msgctxt "input-name"
-msgid "P8 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:397
-msgctxt "input-name"
-msgid "P8 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:398
-msgctxt "input-name"
-msgid "P8 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:399
-msgctxt "input-name"
-msgid "P8 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:400
-msgctxt "input-name"
-msgid "P8 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:401
-msgctxt "input-name"
-msgid "P8 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:402
-msgctxt "input-name"
-msgid "P8 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:403
-msgctxt "input-name"
-msgid "P8 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:404
-msgctxt "input-name"
-msgid "P8 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:405
-msgctxt "input-name"
-msgid "P8 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:406
-msgctxt "input-name"
-msgid "P8 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:407
-msgctxt "input-name"
-msgid "P8 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:408
-msgctxt "input-name"
-msgid "P8 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:409
-msgctxt "input-name"
-msgid "P8 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:410
-msgctxt "input-name"
-msgid "P8 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:411
-msgctxt "input-name"
-msgid "P8 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:412
-msgctxt "input-name"
-msgid "P8 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:413
-msgctxt "input-name"
-msgid "P8 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:414
-msgctxt "input-name"
-msgid "P8 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:415
-msgctxt "input-name"
-msgid "P8 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:416
-msgctxt "input-name"
-msgid "P8 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:417
-msgctxt "input-name"
-msgid "P8 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:418
-msgctxt "input-name"
-msgid "P8 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:419
-msgctxt "input-name"
-msgid "P8 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:420
-msgctxt "input-name"
-msgid "P8 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:425
-msgctxt "input-name"
-msgid "P9 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:426
-msgctxt "input-name"
-msgid "P9 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:427
-msgctxt "input-name"
-msgid "P9 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:428
-msgctxt "input-name"
-msgid "P9 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:429
-msgctxt "input-name"
-msgid "P9 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:430
-msgctxt "input-name"
-msgid "P9 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:431
-msgctxt "input-name"
-msgid "P9 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:432
-msgctxt "input-name"
-msgid "P9 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:433
-msgctxt "input-name"
-msgid "P9 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:434
-msgctxt "input-name"
-msgid "P9 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:435
-msgctxt "input-name"
-msgid "P9 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:436
-msgctxt "input-name"
-msgid "P9 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:437
-msgctxt "input-name"
-msgid "P9 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:438
-msgctxt "input-name"
-msgid "P9 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:439
-msgctxt "input-name"
-msgid "P9 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:440
-msgctxt "input-name"
-msgid "P9 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:441
-msgctxt "input-name"
-msgid "P9 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:442
-msgctxt "input-name"
-msgid "P9 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:443
-msgctxt "input-name"
-msgid "P9 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:444
-msgctxt "input-name"
-msgid "P9 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:445
-msgctxt "input-name"
-msgid "P9 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:446
-msgctxt "input-name"
-msgid "P9 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:447
-msgctxt "input-name"
-msgid "P9 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:448
-msgctxt "input-name"
-msgid "P9 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:449
-msgctxt "input-name"
-msgid "P9 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:450
-msgctxt "input-name"
-msgid "P9 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:451
-msgctxt "input-name"
-msgid "P9 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:452
-msgctxt "input-name"
-msgid "P9 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:453
-msgctxt "input-name"
-msgid "P9 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:454
-msgctxt "input-name"
-msgid "P9 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:459
-msgctxt "input-name"
-msgid "P10 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:460
-msgctxt "input-name"
-msgid "P10 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:461
-msgctxt "input-name"
-msgid "P10 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:462
-msgctxt "input-name"
-msgid "P10 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:463
-msgctxt "input-name"
-msgid "P10 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:464
-msgctxt "input-name"
-msgid "P10 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:465
-msgctxt "input-name"
-msgid "P10 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:466
-msgctxt "input-name"
-msgid "P10 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:467
-msgctxt "input-name"
-msgid "P10 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:468
-msgctxt "input-name"
-msgid "P10 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:469
-msgctxt "input-name"
-msgid "P10 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:470
-msgctxt "input-name"
-msgid "P10 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:471
-msgctxt "input-name"
-msgid "P10 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:472
-msgctxt "input-name"
-msgid "P10 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:473
-msgctxt "input-name"
-msgid "P10 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:474
-msgctxt "input-name"
-msgid "P10 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:475
-msgctxt "input-name"
-msgid "P10 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:476
-msgctxt "input-name"
-msgid "P10 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:477
-msgctxt "input-name"
-msgid "P10 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:478
-msgctxt "input-name"
-msgid "P10 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:479
-msgctxt "input-name"
-msgid "P10 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:480
-msgctxt "input-name"
-msgid "P10 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:481
-msgctxt "input-name"
-msgid "P10 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:482
-msgctxt "input-name"
-msgid "P10 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:483
-msgctxt "input-name"
-msgid "P10 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:484
-msgctxt "input-name"
-msgid "P10 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:485
-msgctxt "input-name"
-msgid "P10 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:486
-msgctxt "input-name"
-msgid "P10 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:487
-msgctxt "input-name"
-msgid "P10 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:488
-msgctxt "input-name"
-msgid "P10 Select"
-msgstr ""
-
 #: src/emu/inpttype.ipp:493
 msgctxt "input-name"
 msgid "1 Player Start"
@@ -5536,154 +4163,31 @@ msgctxt "input-name"
 msgid "Volume Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:550
-msgctxt "input-name"
-msgid "P1 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:551
-msgctxt "input-name"
-msgid "P2 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:552
-msgctxt "input-name"
-msgid "P3 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:553
-msgctxt "input-name"
-msgid "P4 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:554
-msgctxt "input-name"
-msgid "P5 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:555
-msgctxt "input-name"
-msgid "P6 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:556
-msgctxt "input-name"
-msgid "P7 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:557
-msgctxt "input-name"
-msgid "P8 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:558
-msgctxt "input-name"
-msgid "P9 Pedal 1"
-msgstr ""
-
+#: src/emu/inpttype.ipp:550 src/emu/inpttype.ipp:551 src/emu/inpttype.ipp:552
+#: src/emu/inpttype.ipp:553 src/emu/inpttype.ipp:554 src/emu/inpttype.ipp:555
+#: src/emu/inpttype.ipp:556 src/emu/inpttype.ipp:557 src/emu/inpttype.ipp:558
 #: src/emu/inpttype.ipp:559
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:564
-msgctxt "input-name"
-msgid "P1 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:565
-msgctxt "input-name"
-msgid "P2 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:566
-msgctxt "input-name"
-msgid "P3 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:567
-msgctxt "input-name"
-msgid "P4 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:568
-msgctxt "input-name"
-msgid "P5 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:569
-msgctxt "input-name"
-msgid "P6 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:570
-msgctxt "input-name"
-msgid "P7 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:571
-msgctxt "input-name"
-msgid "P8 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:572
-msgctxt "input-name"
-msgid "P9 Pedal 2"
+msgid "%p Pedal 1"
 msgstr ""
 
+#: src/emu/inpttype.ipp:564 src/emu/inpttype.ipp:565 src/emu/inpttype.ipp:566
+#: src/emu/inpttype.ipp:567 src/emu/inpttype.ipp:568 src/emu/inpttype.ipp:569
+#: src/emu/inpttype.ipp:570 src/emu/inpttype.ipp:571 src/emu/inpttype.ipp:572
 #: src/emu/inpttype.ipp:573
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:578
-msgctxt "input-name"
-msgid "P1 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:579
-msgctxt "input-name"
-msgid "P2 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:580
-msgctxt "input-name"
-msgid "P3 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:581
-msgctxt "input-name"
-msgid "P4 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:582
-msgctxt "input-name"
-msgid "P5 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:583
-msgctxt "input-name"
-msgid "P6 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:584
-msgctxt "input-name"
-msgid "P7 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:585
-msgctxt "input-name"
-msgid "P8 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:586
-msgctxt "input-name"
-msgid "P9 Pedal 3"
+msgid "%p Pedal 2"
 msgstr ""
 
+#: src/emu/inpttype.ipp:578 src/emu/inpttype.ipp:579 src/emu/inpttype.ipp:580
+#: src/emu/inpttype.ipp:581 src/emu/inpttype.ipp:582 src/emu/inpttype.ipp:583
+#: src/emu/inpttype.ipp:584 src/emu/inpttype.ipp:585 src/emu/inpttype.ipp:586
 #: src/emu/inpttype.ipp:587
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 3"
+msgid "%p Pedal 3"
 msgstr ""
 
 #: src/emu/inpttype.ipp:592
@@ -7573,6 +6077,43 @@ msgid ""
 "%s"
 msgstr ""
 
+#~ msgid "Confirm quit from machines"
+#~ msgstr "Confermi l'uscita"
+
+#~ msgid "Skip information screen at startup"
+#~ msgstr "Salta la schermata delle informazioni all'avvio"
+
+#~ msgid "Skip software parts selection menu"
+#~ msgstr "Non mostrare il menu di selezione del software"
+
+#~ msgid "Offscreen reload"
+#~ msgstr "Ricarica schermo spento"
+
+#~ msgid "Simultaneous contradictory"
+#~ msgstr "Contraddizione simultanea"
+
+#~ msgid "Adstick Device Assignment"
+#~ msgstr "Assegnazione Dispositivo Adstick"
+
+#, c-format
+#~ msgid ""
+#~ "Auditing ROMs for machine %2$u of %3$u...\n"
+#~ "%1$s"
+#~ msgstr ""
+#~ "Verifica delle ROMs per la macchina %2$u di %3$u...\n"
+#~ "%1$s"
+
+#, c-format
+#~ msgid "Audit ROMs for %1$u machines marked unavailable"
+#~ msgstr "Verifico le ROMs per %1$u le macchine marcate come non disponibili"
+
+#, c-format
+#~ msgid "Audit ROMs for all %1$u machines"
+#~ msgstr "Verifico le ROMs per tutte %1$u le macchine"
+
+#~ msgid "Input (this Machine)"
+#~ msgstr "Input (questa Macchina)"
+
 #~ msgid "Device Mapping"
 #~ msgstr "Mappatura Dispositivo"
 
diff --git a/language/Japanese/strings.po b/language/Japanese/strings.po
index b4598cd4d4f..d1c2964252c 100644
--- a/language/Japanese/strings.po
+++ b/language/Japanese/strings.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-19 02:50+1100\n"
+"POT-Creation-Date: 2021-12-09 04:44+1100\n"
 "PO-Revision-Date: 2016-02-23 01:39+0900\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: MAME Language Team\n"
@@ -271,12 +271,12 @@ msgstr "%1$s %2$s （ %3$d / %4$d ソフトウェアパッケージ ）"
 msgid "Driver: \"%1$s\" software list "
 msgstr "ドライバ：「%1$s」　ソフトウェアリスト"
 
-#: src/frontend/mame/ui/selsoft.cpp:711 src/frontend/mame/ui/selgame.cpp:1066
+#: src/frontend/mame/ui/selsoft.cpp:711 src/frontend/mame/ui/selgame.cpp:1076
 #, c-format
 msgid "%1$s: %2$s - Search: %3$s_"
 msgstr "%1$s：%2$s〜検索：%3$s_"
 
-#: src/frontend/mame/ui/selsoft.cpp:713 src/frontend/mame/ui/selgame.cpp:1068
+#: src/frontend/mame/ui/selsoft.cpp:713 src/frontend/mame/ui/selgame.cpp:1078
 #, c-format
 msgid "Search: %1$s_"
 msgstr "検索：%1$s_"
@@ -286,7 +286,7 @@ msgstr "検索：%1$s_"
 msgid "Software list/item: %1$s:%2$s"
 msgstr ""
 
-#: src/frontend/mame/ui/optsmenu.cpp:73 src/frontend/mame/ui/sndmenu.cpp:165
+#: src/frontend/mame/ui/optsmenu.cpp:73 src/frontend/mame/ui/sndmenu.cpp:161
 msgid "Sound Options"
 msgstr "サウンド設定"
 
@@ -381,12 +381,12 @@ msgid "Show mouse pointer"
 msgstr "マウスポインタを表示"
 
 #: src/frontend/mame/ui/submenu.cpp:39
-msgid "Confirm quit from machines"
-msgstr "マシン終了時に確認"
+msgid "Confirm quit from emulation"
+msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:40
-msgid "Skip information screen at startup"
-msgstr "起動時に情報画面をスキップ"
+msgid "Skip system information screen"
+msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:41
 msgid "Force 4:3 aspect for snapshot display"
@@ -401,8 +401,8 @@ msgid "Skip BIOS selection menu"
 msgstr "BIOS選択メニューをスキップする"
 
 #: src/frontend/mame/ui/submenu.cpp:44
-msgid "Skip software parts selection menu"
-msgstr "ソフトウェアパーツ選択メニューをスキップする"
+msgid "Skip software part selection menu"
+msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:45
 msgid "Info auto audit"
@@ -553,7 +553,7 @@ msgid "UI active"
 msgstr "UI有効"
 
 #: src/frontend/mame/ui/submenu.cpp:91
-msgid "Offscreen reload"
+msgid "Off-screen reload"
 msgstr "画面外でのリロード"
 
 #: src/frontend/mame/ui/submenu.cpp:92
@@ -569,8 +569,8 @@ msgid "Natural keyboard"
 msgstr "ナチュラルキーボード"
 
 #: src/frontend/mame/ui/submenu.cpp:95
-msgid "Simultaneous contradictory"
-msgstr "対称方向の同時入力"
+msgid "Allow contradictory joystick inputs"
+msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:96
 msgid "Coin impulse"
@@ -593,7 +593,7 @@ msgid "Pedal Device Assignment"
 msgstr "ペダルデバイス割り当て"
 
 #: src/frontend/mame/ui/submenu.cpp:106
-msgid "Adstick Device Assignment"
+msgid "AD Stick Device Assignment"
 msgstr "アナログスティックデバイス割り当て"
 
 #: src/frontend/mame/ui/submenu.cpp:107
@@ -680,14 +680,14 @@ msgstr "リフレッシュを同期"
 msgid "Wait Vertical Sync"
 msgstr "V-Syncを待つ"
 
-#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:687
+#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:689
 #: src/frontend/mame/ui/videoopt.cpp:191 src/frontend/mame/ui/custui.cpp:490
 #: src/frontend/mame/ui/analogipt.cpp:471 plugins/cheatfind/init.lua:766
 #: plugins/cheatfind/init.lua:777 plugins/cheat/init.lua:668
 msgid "On"
 msgstr "オン"
 
-#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:690
+#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:692
 #: src/frontend/mame/ui/videoopt.cpp:207 src/frontend/mame/ui/custui.cpp:490
 #: src/frontend/mame/ui/analogipt.cpp:471 plugins/cheatfind/init.lua:763
 #: plugins/cheatfind/init.lua:774 plugins/cheat/init.lua:671
@@ -695,11 +695,11 @@ msgstr "オン"
 msgid "Off"
 msgstr "オフ"
 
-#: src/frontend/mame/ui/menu.cpp:693
+#: src/frontend/mame/ui/menu.cpp:695
 msgid "Auto"
 msgstr "自動"
 
-#: src/frontend/mame/ui/menu.cpp:1195
+#: src/frontend/mame/ui/menu.cpp:1197
 #: src/frontend/mame/ui/simpleselgame.cpp:278
 #: src/frontend/mame/ui/selmenu.cpp:1280
 msgid "Return to Previous Menu"
@@ -707,7 +707,7 @@ msgstr "前のメニューに戻る"
 
 #: src/frontend/mame/ui/filemngr.cpp:139
 #: src/frontend/mame/ui/confswitch.cpp:119
-#: src/frontend/mame/ui/inputmap.cpp:559 src/frontend/mame/ui/analogipt.cpp:360
+#: src/frontend/mame/ui/inputmap.cpp:563 src/frontend/mame/ui/analogipt.cpp:360
 #, c-format
 msgid "[root%1$s]"
 msgstr ""
@@ -971,22 +971,22 @@ msgstr ""
 "CPU：\n"
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "GHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "MHz"
 msgstr "MHz"
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "kHz"
 msgstr "kHz"
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "Hz"
 msgstr ""
 
@@ -1014,38 +1014,38 @@ msgstr "なし\n"
 msgid "Vector"
 msgstr "ベクター"
 
-#: src/frontend/mame/ui/info.cpp:480
+#: src/frontend/mame/ui/info.cpp:483
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr "%1$s：%2$s\n"
 
-#: src/frontend/mame/ui/info.cpp:480
+#: src/frontend/mame/ui/info.cpp:483
 msgid "%2$s\n"
 msgstr "%2$s\n"
 
-#: src/frontend/mame/ui/info.cpp:497
+#: src/frontend/mame/ui/info.cpp:500
 #, c-format
 msgid "Screen '%1$s'"
 msgstr "画面「%1$s」"
 
-#: src/frontend/mame/ui/info.cpp:499
+#: src/frontend/mame/ui/info.cpp:502
 msgid "Screen"
 msgstr "画面"
 
-#: src/frontend/mame/ui/info.cpp:570 src/frontend/mame/ui/info.cpp:581
+#: src/frontend/mame/ui/info.cpp:573 src/frontend/mame/ui/info.cpp:584
 #, c-format
 msgid "%1$s:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:662
+#: src/frontend/mame/ui/info.cpp:665
 msgid "Not supported"
 msgstr "対応していません"
 
-#: src/frontend/mame/ui/info.cpp:665
+#: src/frontend/mame/ui/info.cpp:668
 msgid "Partially supported"
 msgstr "部分的に対応"
 
-#: src/frontend/mame/ui/info.cpp:674
+#: src/frontend/mame/ui/info.cpp:677
 msgid "[empty]"
 msgstr "〔空〕"
 
@@ -1118,7 +1118,7 @@ msgid "Emulated"
 msgstr "エミュレート"
 
 #: src/frontend/mame/ui/keyboard.cpp:59 src/frontend/mame/ui/confswitch.cpp:117
-#: src/frontend/mame/ui/inputmap.cpp:557 src/frontend/mame/ui/analogipt.cpp:358
+#: src/frontend/mame/ui/inputmap.cpp:561 src/frontend/mame/ui/analogipt.cpp:358
 #, c-format
 msgid "%1$s [root%2$s]"
 msgstr ""
@@ -1478,7 +1478,7 @@ msgctxt "swlist-info"
 msgid "Software list/item"
 msgstr ""
 
-#: src/frontend/mame/ui/datmenu.cpp:88 src/frontend/mame/ui/selmenu.cpp:2698
+#: src/frontend/mame/ui/datmenu.cpp:88 src/frontend/mame/ui/selmenu.cpp:2707
 msgid "Software List Info"
 msgstr ""
 
@@ -1599,7 +1599,7 @@ msgstr ""
 msgid "Configure Machine:"
 msgstr ""
 
-#: src/frontend/mame/ui/miscmenu.cpp:858 src/frontend/mame/ui/selmenu.cpp:2638
+#: src/frontend/mame/ui/miscmenu.cpp:858 src/frontend/mame/ui/selmenu.cpp:2647
 msgid " (default)"
 msgstr "（デフォルト）"
 
@@ -1620,7 +1620,7 @@ msgstr ""
 "%1$sで終了\n"
 "%2$sでエミュレーションに戻る"
 
-#: src/frontend/mame/ui/info_pty.cpp:30 src/frontend/mame/ui/mainmenu.cpp:155
+#: src/frontend/mame/ui/info_pty.cpp:30
 msgid "Pseudo terminals"
 msgstr "擬似ターミナル"
 
@@ -1688,52 +1688,52 @@ msgstr ""
 msgid "Other Controls"
 msgstr "その他のコントロール"
 
-#: src/frontend/mame/ui/inputmap.cpp:227
+#: src/frontend/mame/ui/inputmap.cpp:231
 msgid "This machine has no configurable inputs."
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:327
+#: src/frontend/mame/ui/inputmap.cpp:331
 msgid "Pressed"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:397
+#: src/frontend/mame/ui/inputmap.cpp:401
 msgid "Invalid sequence entered"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:542
+#: src/frontend/mame/ui/inputmap.cpp:546
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:543
+#: src/frontend/mame/ui/inputmap.cpp:547
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog Inc"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:544
+#: src/frontend/mame/ui/inputmap.cpp:548
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog Dec"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:586
+#: src/frontend/mame/ui/inputmap.cpp:590
 #, c-format
 msgid "Press %1$s to set\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:587
+#: src/frontend/mame/ui/inputmap.cpp:591
 #, c-format
 msgid "Press %1$s to append\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:588
+#: src/frontend/mame/ui/inputmap.cpp:592
 #, c-format
 msgid "Press %1$s to clear\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:589
+#: src/frontend/mame/ui/inputmap.cpp:593
 #, c-format
 msgid "Press %1$s to restore default\n"
 msgstr ""
@@ -1801,7 +1801,7 @@ msgstr ""
 "進めるには、何かキーを押してください。"
 
 #: src/frontend/mame/ui/simpleselgame.cpp:273
-#: src/frontend/mame/ui/selgame.cpp:436
+#: src/frontend/mame/ui/selgame.cpp:443
 msgid "Configure Options"
 msgstr "オプションの設定"
 
@@ -2136,16 +2136,16 @@ msgstr ""
 msgid "Expand to fit"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:437
+#: src/frontend/mame/ui/selgame.cpp:444
 msgid "Configure Machine"
 msgstr "マシンの設定"
 
-#: src/frontend/mame/ui/selgame.cpp:1050
+#: src/frontend/mame/ui/selgame.cpp:1060
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d machines (%5$d BIOS) )"
 msgstr "%1$s %2$s ( %3$d / %4$d マシン (%5$d BIOS) )"
 
-#: src/frontend/mame/ui/selgame.cpp:1078
+#: src/frontend/mame/ui/selgame.cpp:1088
 #, c-format
 msgid "System: %1$-.100s"
 msgstr "システム：%1$-.100s"
@@ -2167,11 +2167,9 @@ msgstr "結果は%1$sに保存されます"
 #: src/frontend/mame/ui/auditmenu.cpp:98
 #, c-format
 msgid ""
-"Auditing ROMs for machine %2$u of %3$u...\n"
+"Auditing media for machine %2$u of %3$u...\n"
 "%1$s"
 msgstr ""
-"マシン%2$u／%3$uのROMを検査中...\n"
-"%1$s"
 
 #: src/frontend/mame/ui/auditmenu.cpp:116
 #, c-format
@@ -2184,13 +2182,13 @@ msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:136
 #, c-format
-msgid "Audit ROMs for %1$u machines marked unavailable"
-msgstr "存在しないに分類された%1$uマシンのROMを検査します"
+msgid "Audit media for %1$u machines marked unavailable"
+msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:137
 #, c-format
-msgid "Audit ROMs for all %1$u machines"
-msgstr "全%1$uマシンのROMを検査します"
+msgid "Audit media for all %1$u machines"
+msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:154
 #, c-format
@@ -2396,84 +2394,84 @@ msgctxt "color-sample"
 msgid "Clone"
 msgstr "クローン"
 
-#: src/frontend/mame/ui/custui.cpp:914
+#: src/frontend/mame/ui/custui.cpp:906
 msgid "ARGB Settings"
 msgstr "ARGB設定"
 
-#: src/frontend/mame/ui/custui.cpp:919 src/frontend/mame/ui/custui.cpp:922
+#: src/frontend/mame/ui/custui.cpp:911 src/frontend/mame/ui/custui.cpp:914
 msgctxt "color-channel"
 msgid "Alpha"
 msgstr "アルファ"
 
-#: src/frontend/mame/ui/custui.cpp:927 src/frontend/mame/ui/custui.cpp:930
+#: src/frontend/mame/ui/custui.cpp:919 src/frontend/mame/ui/custui.cpp:922
 msgctxt "color-channel"
 msgid "Red"
 msgstr "赤"
 
-#: src/frontend/mame/ui/custui.cpp:935 src/frontend/mame/ui/custui.cpp:938
+#: src/frontend/mame/ui/custui.cpp:927 src/frontend/mame/ui/custui.cpp:930
 msgctxt "color-channel"
 msgid "Green"
 msgstr "緑"
 
-#: src/frontend/mame/ui/custui.cpp:943 src/frontend/mame/ui/custui.cpp:946
+#: src/frontend/mame/ui/custui.cpp:935 src/frontend/mame/ui/custui.cpp:938
 msgctxt "color-channel"
 msgid "Blue"
 msgstr "青"
 
-#: src/frontend/mame/ui/custui.cpp:949
+#: src/frontend/mame/ui/custui.cpp:941
 msgid "Choose from palette"
 msgstr "パレットから選ぶ"
 
-#: src/frontend/mame/ui/custui.cpp:996
+#: src/frontend/mame/ui/custui.cpp:988
 msgid "Color preview:"
 msgstr "色のプレビュー："
 
-#: src/frontend/mame/ui/custui.cpp:1093
+#: src/frontend/mame/ui/custui.cpp:1085
 msgctxt "color-preset"
 msgid "White"
 msgstr "白"
 
-#: src/frontend/mame/ui/custui.cpp:1094
+#: src/frontend/mame/ui/custui.cpp:1086
 msgctxt "color-preset"
 msgid "Silver"
 msgstr "銀色"
 
-#: src/frontend/mame/ui/custui.cpp:1095
+#: src/frontend/mame/ui/custui.cpp:1087
 msgctxt "color-preset"
 msgid "Gray"
 msgstr "灰色"
 
-#: src/frontend/mame/ui/custui.cpp:1096
+#: src/frontend/mame/ui/custui.cpp:1088
 msgctxt "color-preset"
 msgid "Black"
 msgstr "黒"
 
-#: src/frontend/mame/ui/custui.cpp:1097
+#: src/frontend/mame/ui/custui.cpp:1089
 msgctxt "color-preset"
 msgid "Red"
 msgstr "赤"
 
-#: src/frontend/mame/ui/custui.cpp:1098
+#: src/frontend/mame/ui/custui.cpp:1090
 msgctxt "color-preset"
 msgid "Orange"
 msgstr "オレンジ"
 
-#: src/frontend/mame/ui/custui.cpp:1099
+#: src/frontend/mame/ui/custui.cpp:1091
 msgctxt "color-preset"
 msgid "Yellow"
 msgstr "黄"
 
-#: src/frontend/mame/ui/custui.cpp:1100
+#: src/frontend/mame/ui/custui.cpp:1092
 msgctxt "color-preset"
 msgid "Green"
 msgstr "緑"
 
-#: src/frontend/mame/ui/custui.cpp:1101
+#: src/frontend/mame/ui/custui.cpp:1093
 msgctxt "color-preset"
 msgid "Blue"
 msgstr "青"
 
-#: src/frontend/mame/ui/custui.cpp:1102
+#: src/frontend/mame/ui/custui.cpp:1094
 msgctxt "color-preset"
 msgid "Violet"
 msgstr "紫"
@@ -2538,8 +2536,8 @@ msgid "Input (general)"
 msgstr "入力（共通）"
 
 #: src/frontend/mame/ui/mainmenu.cpp:123
-msgid "Input (this Machine)"
-msgstr "入力（現在のマシン）"
+msgid "Input (this machine)"
+msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:126
 msgid "Analog Controls"
@@ -2577,6 +2575,10 @@ msgstr "ファイルマネージャ"
 msgid "Tape Control"
 msgstr "テープ操作"
 
+#: src/frontend/mame/ui/mainmenu.cpp:155
+msgid "Pseudo Terminals"
+msgstr ""
+
 #: src/frontend/mame/ui/mainmenu.cpp:158
 msgid "BIOS Selection"
 msgstr "BIOS選択"
@@ -2615,7 +2617,7 @@ msgstr "外部DATビュー"
 
 #: src/frontend/mame/ui/mainmenu.cpp:200
 #, c-format
-msgid "About %s"
+msgid "About %1$s"
 msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:212
@@ -2775,375 +2777,373 @@ msgstr "次のクローンのドライバ：%1$s"
 msgid "%1$s %2$s"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2235
+#: src/frontend/mame/ui/selmenu.cpp:2244
 msgid "Images"
 msgstr "画像"
 
-#: src/frontend/mame/ui/selmenu.cpp:2236
+#: src/frontend/mame/ui/selmenu.cpp:2245
 msgid "Infos"
 msgstr "情報"
 
-#: src/frontend/mame/ui/selmenu.cpp:2551
+#: src/frontend/mame/ui/selmenu.cpp:2560
 msgid ""
 "Required ROM/disk images for the selected system are missing or incorrect. "
 "Please acquire the correct files or select a different system.\n"
 "\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2567
+#: src/frontend/mame/ui/selmenu.cpp:2576
 msgid ""
 "Required ROM/disk images for the selected software are missing or incorrect. "
 "Please acquire the correct files or select a different software item.\n"
 "\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2583
+#: src/frontend/mame/ui/selmenu.cpp:2592
 msgid "incorrect checksum"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2586
+#: src/frontend/mame/ui/selmenu.cpp:2595
 msgid "incorrect length"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2589
+#: src/frontend/mame/ui/selmenu.cpp:2598
 msgid "not found"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2600
+#: src/frontend/mame/ui/selmenu.cpp:2609
 #, c-format
 msgid "%1$s (%2$s) - %3$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2602
+#: src/frontend/mame/ui/selmenu.cpp:2611
 #, c-format
 msgid "%1$s - %2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2606
+#: src/frontend/mame/ui/selmenu.cpp:2615
 msgid "Press any key to continue."
 msgstr "進めるには、何かキーを押してください。"
 
-#: src/frontend/mame/ui/selmenu.cpp:2735
+#: src/frontend/mame/ui/selmenu.cpp:2744
 msgid "General Info"
 msgstr "一般情報"
 
-#: src/frontend/mame/ui/selmenu.cpp:2887
+#: src/frontend/mame/ui/selmenu.cpp:2896
 #, c-format
 msgid "Romset\t%1$s\n"
 msgstr "ROMセット\t%1$s\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2888
+#: src/frontend/mame/ui/selmenu.cpp:2897
 #, c-format
 msgid "Year\t%1$s\n"
 msgstr "年度\t%1$s\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2889
+#: src/frontend/mame/ui/selmenu.cpp:2898
 #, c-format
 msgid "Manufacturer\t%1$s\n"
 msgstr "製造元\t%1$s\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2896
+#: src/frontend/mame/ui/selmenu.cpp:2905
 #, c-format
 msgid "Driver is Clone of\t%1$s\n"
 msgstr "次のクローンのドライバ\t%1$s\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2901
+#: src/frontend/mame/ui/selmenu.cpp:2910
 msgid "Driver is Parent\t\n"
 msgstr "親セットのドライバ\t\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2905
+#: src/frontend/mame/ui/selmenu.cpp:2914
 msgid "Analog Controls\tYes\n"
 msgstr "アナログコントロール\tはい\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2907
+#: src/frontend/mame/ui/selmenu.cpp:2916
 msgid "Keyboard Inputs\tYes\n"
 msgstr "キーボード入力\tはい\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2910
+#: src/frontend/mame/ui/selmenu.cpp:2919
 msgid "Overall\tNOT WORKING\n"
 msgstr "概略\t動作不可\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2912
+#: src/frontend/mame/ui/selmenu.cpp:2921
 msgid "Overall\tUnemulated Protection\n"
 msgstr "概略\tプロテクトが未エミュレート\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2914
+#: src/frontend/mame/ui/selmenu.cpp:2923
 msgid "Overall\tWorking\n"
 msgstr "概略\t動作可\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2917
+#: src/frontend/mame/ui/selmenu.cpp:2926
 msgid "Graphics\tUnimplemented\n"
 msgstr "グラフィック\t未実装\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2919
+#: src/frontend/mame/ui/selmenu.cpp:2928
 msgid "Graphics\tWrong Colors\n"
 msgstr "グラフィック\t色の誤り\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2921
+#: src/frontend/mame/ui/selmenu.cpp:2930
 msgid "Graphics\tImperfect Colors\n"
 msgstr "グラフィック\t色が不完全\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2923
+#: src/frontend/mame/ui/selmenu.cpp:2932
 msgid "Graphics\tImperfect\n"
 msgstr "グラフィック\t不完全\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2925
+#: src/frontend/mame/ui/selmenu.cpp:2934
 msgid "Graphics\tOK\n"
 msgstr "グラフィック\t正常\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2928
+#: src/frontend/mame/ui/selmenu.cpp:2937
 msgid "Sound\tNone\n"
 msgstr "グラフィック\tなし\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2930
+#: src/frontend/mame/ui/selmenu.cpp:2939
 msgid "Sound\tUnimplemented\n"
 msgstr "サウンド\t未実装\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2932
+#: src/frontend/mame/ui/selmenu.cpp:2941
 msgid "Sound\tImperfect\n"
 msgstr "サウンド\t不完全\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2934
+#: src/frontend/mame/ui/selmenu.cpp:2943
 msgid "Sound\tOK\n"
 msgstr "サウンド\t正常\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2937
+#: src/frontend/mame/ui/selmenu.cpp:2946
 msgid "Capture\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2939
+#: src/frontend/mame/ui/selmenu.cpp:2948
 msgid "Capture\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2942
+#: src/frontend/mame/ui/selmenu.cpp:2951
 msgid "Camera\tUnimplemented\n"
 msgstr "カメラ\t未実装\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2944
+#: src/frontend/mame/ui/selmenu.cpp:2953
 msgid "Camera\tImperfect\n"
 msgstr "カメラ\t不完全\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2947
+#: src/frontend/mame/ui/selmenu.cpp:2956
 msgid "Microphone\tUnimplemented\n"
 msgstr "マクロフォン\t未実装\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2949
+#: src/frontend/mame/ui/selmenu.cpp:2958
 msgid "Microphone\tImperfect\n"
 msgstr "マクロフォン\t不完全\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2952
+#: src/frontend/mame/ui/selmenu.cpp:2961
 msgid "Controls\tUnimplemented\n"
 msgstr "コントロール\t未実装\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2954
+#: src/frontend/mame/ui/selmenu.cpp:2963
 msgid "Controls\tImperfect\n"
 msgstr "コントロール\t不完全\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2957
+#: src/frontend/mame/ui/selmenu.cpp:2966
 msgid "Keyboard\tUnimplemented\n"
 msgstr "キーボード\t未実装\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2959
+#: src/frontend/mame/ui/selmenu.cpp:2968
 msgid "Keyboard\tImperfect\n"
 msgstr "キーボード\t不完全\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2962
+#: src/frontend/mame/ui/selmenu.cpp:2971
 msgid "Mouse\tUnimplemented\n"
 msgstr "マウス\t未実装\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2964
+#: src/frontend/mame/ui/selmenu.cpp:2973
 msgid "Mouse\tImperfect\n"
 msgstr "マウス\t不完全\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2967
+#: src/frontend/mame/ui/selmenu.cpp:2976
 msgid "Media\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2969
+#: src/frontend/mame/ui/selmenu.cpp:2978
 msgid "Media\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2972
+#: src/frontend/mame/ui/selmenu.cpp:2981
 msgid "Disk\tUnimplemented\n"
 msgstr "ディスク\t未実装\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2974
+#: src/frontend/mame/ui/selmenu.cpp:2983
 msgid "Disk\tImperfect\n"
 msgstr "ディスク\t不完全\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2977
+#: src/frontend/mame/ui/selmenu.cpp:2986
 msgid "Printer\tUnimplemented\n"
 msgstr "プリンター\t未実装\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2979
+#: src/frontend/mame/ui/selmenu.cpp:2988
 msgid "Printer\tImperfect\n"
 msgstr "プリンター\t不完全\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2982
+#: src/frontend/mame/ui/selmenu.cpp:2991
 msgid "Mag. Tape\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2984
+#: src/frontend/mame/ui/selmenu.cpp:2993
 msgid "Mag. Tape\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2987
+#: src/frontend/mame/ui/selmenu.cpp:2996
 msgid "Punch Tape\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2989
+#: src/frontend/mame/ui/selmenu.cpp:2998
 msgid "Punch Tape\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2992
+#: src/frontend/mame/ui/selmenu.cpp:3001
 msgid "Mag. Drum\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2994
+#: src/frontend/mame/ui/selmenu.cpp:3003
 msgid "Mag. Drum\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2997
+#: src/frontend/mame/ui/selmenu.cpp:3006
 msgid "(EP)ROM\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2999
+#: src/frontend/mame/ui/selmenu.cpp:3008
 msgid "(EP)ROM\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3002
+#: src/frontend/mame/ui/selmenu.cpp:3011
 msgid "Communications\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3004
+#: src/frontend/mame/ui/selmenu.cpp:3013
 msgid "Communications\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3007
+#: src/frontend/mame/ui/selmenu.cpp:3016
 msgid "LAN\tUnimplemented\n"
 msgstr "ＬＡＮ\t未実装\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3009
+#: src/frontend/mame/ui/selmenu.cpp:3018
 msgid "LAN\tImperfect\n"
 msgstr "ＬＡＮ\t不完全\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3012
+#: src/frontend/mame/ui/selmenu.cpp:3021
 msgid "WAN\tUnimplemented\n"
 msgstr "ＷＡＮ\t未実装\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3014
+#: src/frontend/mame/ui/selmenu.cpp:3023
 msgid "WAN\tImperfect\n"
 msgstr "ＷＡＮ\t不完全\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3017
+#: src/frontend/mame/ui/selmenu.cpp:3026
 msgid "Timing\tUnimplemented\n"
 msgstr "タイミング\t未実装\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3019
+#: src/frontend/mame/ui/selmenu.cpp:3028
 msgid "Timing\tImperfect\n"
 msgstr "タイミング\t不完全\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3021
+#: src/frontend/mame/ui/selmenu.cpp:3030
 msgid "Mechanical Machine\tYes\n"
 msgstr "機械仕掛けのマシン\tはい\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3021
+#: src/frontend/mame/ui/selmenu.cpp:3030
 msgid "Mechanical Machine\tNo\n"
 msgstr "機械仕掛けのマシン\tいいえ\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3022
+#: src/frontend/mame/ui/selmenu.cpp:3031
 msgid "Requires Artwork\tYes\n"
 msgstr "アートワークが必要\tはい\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3022
+#: src/frontend/mame/ui/selmenu.cpp:3031
 msgid "Requires Artwork\tNo\n"
 msgstr "アートワークが必要\tいいえ\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3023
+#: src/frontend/mame/ui/selmenu.cpp:3032
 msgid "Requires Clickable Artwork\tYes\n"
 msgstr "クリック可のアートワークが必要\tはい\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3023
+#: src/frontend/mame/ui/selmenu.cpp:3032
 msgid "Requires Clickable Artwork\tNo\n"
 msgstr "クリック可のアートワークが必要\tいいえ\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3025
+#: src/frontend/mame/ui/selmenu.cpp:3034
 msgid "Support Cocktail\tNo\n"
 msgstr "カクテルモード対応\tいいえ\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3026
+#: src/frontend/mame/ui/selmenu.cpp:3035
 msgid "Driver is BIOS\tYes\n"
 msgstr "BIOSドライバ\tはい\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3026
+#: src/frontend/mame/ui/selmenu.cpp:3035
 msgid "Driver is BIOS\tNo\n"
 msgstr "BIOSドライバ\tいいえ\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3027
+#: src/frontend/mame/ui/selmenu.cpp:3036
 msgid "Support Save\tYes\n"
 msgstr "セーブ対応\tはい\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3027
+#: src/frontend/mame/ui/selmenu.cpp:3036
 msgid "Support Save\tNo\n"
 msgstr "セーブ対応\tいいえ\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3028
+#: src/frontend/mame/ui/selmenu.cpp:3037
 msgid "Screen Orientation\tVertical\n"
 msgstr "画面の向き\t縦\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3028
+#: src/frontend/mame/ui/selmenu.cpp:3037
 msgid "Screen Orientation\tHorizontal\n"
 msgstr "画面の向き\t横\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3038
+#: src/frontend/mame/ui/selmenu.cpp:3047
 msgid "Requires CHD\tYes\n"
 msgstr "CHDが必要\tはい\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3038
+#: src/frontend/mame/ui/selmenu.cpp:3047
 msgid "Requires CHD\tNo\n"
 msgstr "CHDが必要\tいいえ\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3051
-msgid "ROM Audit Result\tOK\n"
-msgstr "ROM検証結果\t正常\n"
+#: src/frontend/mame/ui/selmenu.cpp:3060
+msgid "Media Audit Result\tOK\n"
+msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3053
-msgid "ROM Audit Result\tBAD\n"
-msgstr "ROM検証結果\t異常\n"
+#: src/frontend/mame/ui/selmenu.cpp:3062
+msgid "Media Audit Result\tBAD\n"
+msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3056
+#: src/frontend/mame/ui/selmenu.cpp:3065
 msgid "Samples Audit Result\tNone Needed\n"
 msgstr "サンプル検証結果\t不要\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3058
+#: src/frontend/mame/ui/selmenu.cpp:3067
 msgid "Samples Audit Result\tOK\n"
 msgstr "サンプル検証結果\t正常\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3060
+#: src/frontend/mame/ui/selmenu.cpp:3069
 msgid "Samples Audit Result\tBAD\n"
 msgstr "サンプル検証結果\t異常\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3064
+#: src/frontend/mame/ui/selmenu.cpp:3073
 msgid ""
-"ROM Audit \tDisabled\n"
-"Samples Audit \tDisabled\n"
+"Media Audit\tDisabled\n"
+"Samples Audit\tDisabled\n"
 msgstr ""
-"ROM検証\t無効\n"
-"サンプル検証\t無効\n"
 
-#: src/frontend/mame/ui/sndmenu.cpp:150
+#: src/frontend/mame/ui/sndmenu.cpp:146
 msgid "Sound"
 msgstr "サウンド"
 
-#: src/frontend/mame/ui/sndmenu.cpp:151
+#: src/frontend/mame/ui/sndmenu.cpp:147
 msgid "Compressor"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:152
+#: src/frontend/mame/ui/sndmenu.cpp:148
 msgid "Sample Rate"
 msgstr "サンプルレート"
 
-#: src/frontend/mame/ui/sndmenu.cpp:153
+#: src/frontend/mame/ui/sndmenu.cpp:149
 msgid "Use External Samples"
 msgstr "外部サンプル使用"
 
@@ -3194,21 +3194,21 @@ msgstr "* ビデオ：\n"
 msgid "  Screen '%1$s': Vector\n"
 msgstr "  画面 '%1$s'：ベクター\n"
 
-#: src/frontend/mame/ui/devopt.cpp:132
+#: src/frontend/mame/ui/devopt.cpp:135
 #, c-format
 msgid "  Screen '%1$s': %2$d × %3$d (V) %4$s Hz\n"
 msgstr "  画面 '%1$s'：%2$d × %3$d (V) %4$s Hz\n"
 
-#: src/frontend/mame/ui/devopt.cpp:133
+#: src/frontend/mame/ui/devopt.cpp:136
 #, c-format
 msgid "  Screen '%1$s': %2$d × %3$d (H) %4$s Hz\n"
 msgstr "  画面 '%1$s'：%2$d × %3$d (H) %4$s Hz\n"
 
-#: src/frontend/mame/ui/devopt.cpp:147
+#: src/frontend/mame/ui/devopt.cpp:150
 msgid "* Sound:\n"
 msgstr "* サウンド：\n"
 
-#: src/frontend/mame/ui/devopt.cpp:211
+#: src/frontend/mame/ui/devopt.cpp:214
 #, c-format
 msgid ""
 "* BIOS settings:\n"
@@ -3217,490 +3217,660 @@ msgstr ""
 "* BIOS設定：\n"
 "  %1$d オプション    [デフォルト：%2$s]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:255 src/frontend/mame/ui/devopt.cpp:271
-#: src/frontend/mame/ui/devopt.cpp:332
+#: src/frontend/mame/ui/devopt.cpp:258 src/frontend/mame/ui/devopt.cpp:274
+#: src/frontend/mame/ui/devopt.cpp:335
 #, c-format
 msgid "  %1$s    [default: %2$s]\n"
 msgstr "  %1$s    [デフォルト：%2$s]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:260 src/frontend/mame/ui/devopt.cpp:276
+#: src/frontend/mame/ui/devopt.cpp:263 src/frontend/mame/ui/devopt.cpp:279
 #, c-format
 msgid "  %1$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:282
+#: src/frontend/mame/ui/devopt.cpp:285
 msgid "* DIP switch settings:\n"
 msgstr "* DIPスイッチ設定：\n"
 
-#: src/frontend/mame/ui/devopt.cpp:287
+#: src/frontend/mame/ui/devopt.cpp:290
 msgid "* Configuration settings:\n"
 msgstr "* 構成設定：\n"
 
-#: src/frontend/mame/ui/devopt.cpp:291
+#: src/frontend/mame/ui/devopt.cpp:294
 msgid "* Input device(s):\n"
 msgstr "* 入力デバイス：\n"
 
-#: src/frontend/mame/ui/devopt.cpp:293
+#: src/frontend/mame/ui/devopt.cpp:296
 #, c-format
 msgid "  User inputs    [%1$d inputs]\n"
 msgstr "  ユーザ入力    [%1$d 入力]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:295
+#: src/frontend/mame/ui/devopt.cpp:298
 #, c-format
 msgid "  Mahjong inputs    [%1$d inputs]\n"
 msgstr "  麻雀入力    [%1$d 入力]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:297
+#: src/frontend/mame/ui/devopt.cpp:300
 #, c-format
 msgid "  Hanafuda inputs    [%1$d inputs]\n"
 msgstr "  花札入力    [%1$d 入力]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:299
+#: src/frontend/mame/ui/devopt.cpp:302
 #, c-format
 msgid "  Gambling inputs    [%1$d inputs]\n"
 msgstr "  ギャンブル入力    [%1$d 入力]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:301
+#: src/frontend/mame/ui/devopt.cpp:304
 #, c-format
 msgid "  Analog inputs    [%1$d inputs]\n"
 msgstr "  アナログ入力    [%1$d 入力]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:303
+#: src/frontend/mame/ui/devopt.cpp:306
 #, c-format
 msgid "  Adjuster inputs    [%1$d inputs]\n"
 msgstr "  アドジャスター入力    [%1$d 入力]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:305
+#: src/frontend/mame/ui/devopt.cpp:308
 #, c-format
 msgid "  Keypad inputs    [%1$d inputs]\n"
 msgstr "  キーパッド入力    [%1$d 入力]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:307
+#: src/frontend/mame/ui/devopt.cpp:310
 #, c-format
 msgid "  Keyboard inputs    [%1$d inputs]\n"
 msgstr "  キーボード入力    [%1$d 入力]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:312
+#: src/frontend/mame/ui/devopt.cpp:315
 msgid "* Media Options:\n"
 msgstr "* メディア設定：\n"
 
-#: src/frontend/mame/ui/devopt.cpp:317
+#: src/frontend/mame/ui/devopt.cpp:320
 #, c-format
 msgid "  %1$s    [tag: %2$s]\n"
 msgstr "  %1$s    [タグ：%2$s]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:327
+#: src/frontend/mame/ui/devopt.cpp:330
 msgid "* Slot Options:\n"
 msgstr "* スロット設定：\n"
 
-#: src/frontend/mame/ui/devopt.cpp:341
+#: src/frontend/mame/ui/devopt.cpp:344
 msgid "[None]\n"
 msgstr "[なし]\n"
 
-#: src/emu/render.cpp:1847
+#: src/emu/render.cpp:1796
 #, c-format
 msgctxt "view-name"
 msgid "Screen %1$u Standard (%2$u:%3$u)"
 msgstr ""
 
-#: src/emu/render.cpp:1873
+#: src/emu/render.cpp:1822
 #, c-format
 msgctxt "view-name"
 msgid "Screen %1$u Pixel Aspect (%2$u:%3$u)"
 msgstr ""
 
-#: src/emu/render.cpp:1895 src/emu/render.cpp:2030
+#: src/emu/render.cpp:1844 src/emu/render.cpp:1979
 msgctxt "view-name"
 msgid "Cocktail"
 msgstr ""
 
-#: src/emu/render.cpp:2015
+#: src/emu/render.cpp:1964
 msgctxt "view-name"
 msgid "Left-to-Right"
 msgstr ""
 
-#: src/emu/render.cpp:2016
+#: src/emu/render.cpp:1965
 msgctxt "view-name"
 msgid "Left-to-Right (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2017
+#: src/emu/render.cpp:1966
 msgctxt "view-name"
 msgid "Top-to-Bottom"
 msgstr ""
 
-#: src/emu/render.cpp:2018
+#: src/emu/render.cpp:1967
 msgctxt "view-name"
 msgid "Top-to-Bottom (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2069
+#: src/emu/render.cpp:2018
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Left-to-Right, Top-to-Bottom"
 msgstr ""
 
-#: src/emu/render.cpp:2078
+#: src/emu/render.cpp:2027
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Left-to-Right, Top-to-Bottom (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2087
+#: src/emu/render.cpp:2036
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Top-to-Bottom, Left-to-Right"
 msgstr ""
 
-#: src/emu/render.cpp:2096
+#: src/emu/render.cpp:2045
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Top-to-Bottom, Left-to-Right (Gapless)"
 msgstr ""
 
-#: src/emu/inpttype.ipp:22
+#: src/emu/ioport.cpp:332
+#, c-format
 msgctxt "input-name"
-msgid "P1 Up"
-msgstr "1P上"
+msgid "P%1$u"
+msgstr "%1$uP"
 
-#: src/emu/inpttype.ipp:23
+#: src/emu/ioport.cpp:1924
 msgctxt "input-name"
-msgid "P1 Down"
-msgstr "1P下"
-
-#: src/emu/inpttype.ipp:24
-msgctxt "input-name"
-msgid "P1 Left"
-msgstr "1P左"
-
-#: src/emu/inpttype.ipp:25
-msgctxt "input-name"
-msgid "P1 Right"
-msgstr "1P右"
-
-#: src/emu/inpttype.ipp:26
-msgctxt "input-name"
-msgid "P1 Right Stick/Up"
-msgstr "1P右レバー／上"
-
-#: src/emu/inpttype.ipp:27
-msgctxt "input-name"
-msgid "P1 Right Stick/Down"
-msgstr "1P右レバー／下"
-
-#: src/emu/inpttype.ipp:28
-msgctxt "input-name"
-msgid "P1 Right Stick/Left"
-msgstr "1P右レバー／左"
-
-#: src/emu/inpttype.ipp:29
-msgctxt "input-name"
-msgid "P1 Right Stick/Right"
-msgstr "1P右レバー／右"
-
-#: src/emu/inpttype.ipp:30
-msgctxt "input-name"
-msgid "P1 Left Stick/Up"
-msgstr "1P左レバー／上"
-
-#: src/emu/inpttype.ipp:31
-msgctxt "input-name"
-msgid "P1 Left Stick/Down"
-msgstr "1P左レバー／下"
-
-#: src/emu/inpttype.ipp:32
-msgctxt "input-name"
-msgid "P1 Left Stick/Left"
-msgstr "1P左レバー／左"
-
-#: src/emu/inpttype.ipp:33
-msgctxt "input-name"
-msgid "P1 Left Stick/Right"
-msgstr "1P左レバー／右"
-
-#: src/emu/inpttype.ipp:34
-msgctxt "input-name"
-msgid "P1 Button 1"
-msgstr "1Pボタン1"
-
-#: src/emu/inpttype.ipp:35
-msgctxt "input-name"
-msgid "P1 Button 2"
-msgstr "1Pボタン2"
-
-#: src/emu/inpttype.ipp:36
-msgctxt "input-name"
-msgid "P1 Button 3"
-msgstr "1Pボタン3"
-
-#: src/emu/inpttype.ipp:37
-msgctxt "input-name"
-msgid "P1 Button 4"
-msgstr "1Pボタン4"
-
-#: src/emu/inpttype.ipp:38
-msgctxt "input-name"
-msgid "P1 Button 5"
-msgstr "1Pボタン5"
-
-#: src/emu/inpttype.ipp:39
-msgctxt "input-name"
-msgid "P1 Button 6"
-msgstr "1Pボタン6"
-
-#: src/emu/inpttype.ipp:40
-msgctxt "input-name"
-msgid "P1 Button 7"
-msgstr "1Pボタン7"
-
-#: src/emu/inpttype.ipp:41
-msgctxt "input-name"
-msgid "P1 Button 8"
-msgstr "1Pボタン8"
-
-#: src/emu/inpttype.ipp:42
-msgctxt "input-name"
-msgid "P1 Button 9"
-msgstr "1Pボタン9"
-
-#: src/emu/inpttype.ipp:43
-msgctxt "input-name"
-msgid "P1 Button 10"
-msgstr "1Pボタン10"
-
-#: src/emu/inpttype.ipp:44
-msgctxt "input-name"
-msgid "P1 Button 11"
-msgstr "1Pボタン11"
-
-#: src/emu/inpttype.ipp:45
-msgctxt "input-name"
-msgid "P1 Button 12"
-msgstr "1Pボタン12"
-
-#: src/emu/inpttype.ipp:46
-msgctxt "input-name"
-msgid "P1 Button 13"
-msgstr "1Pボタン13"
-
-#: src/emu/inpttype.ipp:47
-msgctxt "input-name"
-msgid "P1 Button 14"
-msgstr "1Pボタン14"
-
-#: src/emu/inpttype.ipp:48
-msgctxt "input-name"
-msgid "P1 Button 15"
-msgstr "1Pボタン15"
-
-#: src/emu/inpttype.ipp:49
-msgctxt "input-name"
-msgid "P1 Button 16"
-msgstr "1Pボタン16"
-
-#: src/emu/inpttype.ipp:50
-msgctxt "input-name"
-msgid "P1 Start"
-msgstr "1Pスタート"
-
-#: src/emu/inpttype.ipp:51
-msgctxt "input-name"
-msgid "P1 Select"
-msgstr "1Pセレクト"
-
-#: src/emu/inpttype.ipp:56
-msgctxt "input-name"
-msgid "P1 Mahjong A"
-msgstr "1P麻雀Ａ"
-
-#: src/emu/inpttype.ipp:57
-msgctxt "input-name"
-msgid "P1 Mahjong B"
-msgstr "1P麻雀Ｂ"
-
-#: src/emu/inpttype.ipp:58
-msgctxt "input-name"
-msgid "P1 Mahjong C"
-msgstr "1P麻雀Ｃ"
-
-#: src/emu/inpttype.ipp:59
-msgctxt "input-name"
-msgid "P1 Mahjong D"
-msgstr "1P麻雀Ｄ"
-
-#: src/emu/inpttype.ipp:60
-msgctxt "input-name"
-msgid "P1 Mahjong E"
-msgstr "1P麻雀Ｅ"
-
-#: src/emu/inpttype.ipp:61
-msgctxt "input-name"
-msgid "P1 Mahjong F"
-msgstr "1P麻雀Ｆ"
-
-#: src/emu/inpttype.ipp:62
-msgctxt "input-name"
-msgid "P1 Mahjong G"
-msgstr "1P麻雀Ｇ"
-
-#: src/emu/inpttype.ipp:63
-msgctxt "input-name"
-msgid "P1 Mahjong H"
-msgstr "1P麻雀Ｈ"
-
-#: src/emu/inpttype.ipp:64
-msgctxt "input-name"
-msgid "P1 Mahjong I"
-msgstr "1P麻雀Ｉ"
-
-#: src/emu/inpttype.ipp:65
-msgctxt "input-name"
-msgid "P1 Mahjong J"
-msgstr "1P麻雀Ｊ"
-
-#: src/emu/inpttype.ipp:66
-msgctxt "input-name"
-msgid "P1 Mahjong K"
-msgstr "1P麻雀Ｋ"
-
-#: src/emu/inpttype.ipp:67
-msgctxt "input-name"
-msgid "P1 Mahjong L"
-msgstr "1P麻雀Ｌ"
-
-#: src/emu/inpttype.ipp:68
-msgctxt "input-name"
-msgid "P1 Mahjong M"
-msgstr "1P麻雀Ｍ"
-
-#: src/emu/inpttype.ipp:69
-msgctxt "input-name"
-msgid "P1 Mahjong N"
-msgstr "1P麻雀Ｎ"
-
-#: src/emu/inpttype.ipp:70
-msgctxt "input-name"
-msgid "P1 Mahjong O"
-msgstr "1P麻雀Ｏ"
-
-#: src/emu/inpttype.ipp:71
-msgctxt "input-name"
-msgid "P1 Mahjong P"
-msgstr "1P麻雀Ｐ"
-
-#: src/emu/inpttype.ipp:72
-msgctxt "input-name"
-msgid "P1 Mahjong Q"
-msgstr "1P麻雀Ｑ"
-
-#: src/emu/inpttype.ipp:73
-msgctxt "input-name"
-msgid "P1 Mahjong Kan"
-msgstr "1P麻雀カン"
-
-#: src/emu/inpttype.ipp:74
-msgctxt "input-name"
-msgid "P1 Mahjong Pon"
-msgstr "1P麻雀ポン"
-
-#: src/emu/inpttype.ipp:75
-msgctxt "input-name"
-msgid "P1 Mahjong Chi"
-msgstr "1P麻雀チー"
-
-#: src/emu/inpttype.ipp:76
-msgctxt "input-name"
-msgid "P1 Mahjong Reach"
-msgstr "1P麻雀リーチ"
-
-#: src/emu/inpttype.ipp:77
-msgctxt "input-name"
-msgid "P1 Mahjong Ron"
-msgstr "1P麻雀ロン"
-
-#: src/emu/inpttype.ipp:78
-msgctxt "input-name"
-msgid "P1 Mahjong Flip Flop"
-msgstr "1P麻雀フリップフロップ"
-
-#: src/emu/inpttype.ipp:79
-msgctxt "input-name"
-msgid "P1 Mahjong Bet"
-msgstr "1P麻雀ベット"
-
-#: src/emu/inpttype.ipp:80
-msgctxt "input-name"
-msgid "P1 Mahjong Take Score"
-msgstr "1P麻雀テイクスコアー"
-
-#: src/emu/inpttype.ipp:81
-msgctxt "input-name"
-msgid "P1 Mahjong Double Up"
-msgstr "1P麻雀ダブルアップ"
-
-#: src/emu/inpttype.ipp:82
-msgctxt "input-name"
-msgid "P1 Mahjong Big"
-msgstr "1P麻雀ビッグ"
-
-#: src/emu/inpttype.ipp:83
-msgctxt "input-name"
-msgid "P1 Mahjong Small"
-msgstr "1P麻雀スモール"
-
-#: src/emu/inpttype.ipp:84
-msgctxt "input-name"
-msgid "P1 Mahjong Last Chance"
-msgstr "1P麻雀ラストチャンス"
-
-#: src/emu/inpttype.ipp:89
-msgctxt "input-name"
-msgid "P1 Hanafuda A/1"
+msgid "???"
 msgstr ""
 
-#: src/emu/inpttype.ipp:90
+#: src/emu/inpttype.ipp:22 src/emu/inpttype.ipp:140 src/emu/inpttype.ipp:221
+#: src/emu/inpttype.ipp:255 src/emu/inpttype.ipp:289 src/emu/inpttype.ipp:323
+#: src/emu/inpttype.ipp:357 src/emu/inpttype.ipp:391 src/emu/inpttype.ipp:425
+#: src/emu/inpttype.ipp:459
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda B/2"
+msgid "%p Up"
+msgstr "%p上"
+
+#: src/emu/inpttype.ipp:23 src/emu/inpttype.ipp:141 src/emu/inpttype.ipp:222
+#: src/emu/inpttype.ipp:256 src/emu/inpttype.ipp:290 src/emu/inpttype.ipp:324
+#: src/emu/inpttype.ipp:358 src/emu/inpttype.ipp:392 src/emu/inpttype.ipp:426
+#: src/emu/inpttype.ipp:460
+#, c-format
+msgctxt "input-name"
+msgid "%p Down"
+msgstr "%p下"
+
+#: src/emu/inpttype.ipp:24 src/emu/inpttype.ipp:142 src/emu/inpttype.ipp:223
+#: src/emu/inpttype.ipp:257 src/emu/inpttype.ipp:291 src/emu/inpttype.ipp:325
+#: src/emu/inpttype.ipp:359 src/emu/inpttype.ipp:393 src/emu/inpttype.ipp:427
+#: src/emu/inpttype.ipp:461
+#, c-format
+msgctxt "input-name"
+msgid "%p Left"
+msgstr "%p左"
+
+#: src/emu/inpttype.ipp:25 src/emu/inpttype.ipp:143 src/emu/inpttype.ipp:224
+#: src/emu/inpttype.ipp:258 src/emu/inpttype.ipp:292 src/emu/inpttype.ipp:326
+#: src/emu/inpttype.ipp:360 src/emu/inpttype.ipp:394 src/emu/inpttype.ipp:428
+#: src/emu/inpttype.ipp:462
+#, c-format
+msgctxt "input-name"
+msgid "%p Right"
+msgstr "%p右"
+
+#: src/emu/inpttype.ipp:26 src/emu/inpttype.ipp:144 src/emu/inpttype.ipp:225
+#: src/emu/inpttype.ipp:259 src/emu/inpttype.ipp:293 src/emu/inpttype.ipp:327
+#: src/emu/inpttype.ipp:361 src/emu/inpttype.ipp:395 src/emu/inpttype.ipp:429
+#: src/emu/inpttype.ipp:463
+#, c-format
+msgctxt "input-name"
+msgid "%p Right Stick/Up"
+msgstr "%p右レバー／上"
+
+#: src/emu/inpttype.ipp:27 src/emu/inpttype.ipp:145 src/emu/inpttype.ipp:226
+#: src/emu/inpttype.ipp:260 src/emu/inpttype.ipp:294 src/emu/inpttype.ipp:328
+#: src/emu/inpttype.ipp:362 src/emu/inpttype.ipp:396 src/emu/inpttype.ipp:430
+#: src/emu/inpttype.ipp:464
+#, c-format
+msgctxt "input-name"
+msgid "%p Right Stick/Down"
+msgstr "%p右レバー／下"
+
+#: src/emu/inpttype.ipp:28 src/emu/inpttype.ipp:146 src/emu/inpttype.ipp:227
+#: src/emu/inpttype.ipp:261 src/emu/inpttype.ipp:295 src/emu/inpttype.ipp:329
+#: src/emu/inpttype.ipp:363 src/emu/inpttype.ipp:397 src/emu/inpttype.ipp:431
+#: src/emu/inpttype.ipp:465
+#, c-format
+msgctxt "input-name"
+msgid "%p Right Stick/Left"
+msgstr "%p右レバー／左"
+
+#: src/emu/inpttype.ipp:29 src/emu/inpttype.ipp:147 src/emu/inpttype.ipp:228
+#: src/emu/inpttype.ipp:262 src/emu/inpttype.ipp:296 src/emu/inpttype.ipp:330
+#: src/emu/inpttype.ipp:364 src/emu/inpttype.ipp:398 src/emu/inpttype.ipp:432
+#: src/emu/inpttype.ipp:466
+#, c-format
+msgctxt "input-name"
+msgid "%p Right Stick/Right"
+msgstr "%p右レバー／右"
+
+#: src/emu/inpttype.ipp:30 src/emu/inpttype.ipp:148 src/emu/inpttype.ipp:229
+#: src/emu/inpttype.ipp:263 src/emu/inpttype.ipp:297 src/emu/inpttype.ipp:331
+#: src/emu/inpttype.ipp:365 src/emu/inpttype.ipp:399 src/emu/inpttype.ipp:433
+#: src/emu/inpttype.ipp:467
+#, c-format
+msgctxt "input-name"
+msgid "%p Left Stick/Up"
+msgstr "%p左レバー／上"
+
+#: src/emu/inpttype.ipp:31 src/emu/inpttype.ipp:149 src/emu/inpttype.ipp:230
+#: src/emu/inpttype.ipp:264 src/emu/inpttype.ipp:298 src/emu/inpttype.ipp:332
+#: src/emu/inpttype.ipp:366 src/emu/inpttype.ipp:400 src/emu/inpttype.ipp:434
+#: src/emu/inpttype.ipp:468
+#, c-format
+msgctxt "input-name"
+msgid "%p Left Stick/Down"
+msgstr "%p左レバー／下"
+
+#: src/emu/inpttype.ipp:32 src/emu/inpttype.ipp:150 src/emu/inpttype.ipp:231
+#: src/emu/inpttype.ipp:265 src/emu/inpttype.ipp:299 src/emu/inpttype.ipp:333
+#: src/emu/inpttype.ipp:367 src/emu/inpttype.ipp:401 src/emu/inpttype.ipp:435
+#: src/emu/inpttype.ipp:469
+#, c-format
+msgctxt "input-name"
+msgid "%p Left Stick/Left"
+msgstr "%p左レバー／左"
+
+#: src/emu/inpttype.ipp:33 src/emu/inpttype.ipp:151 src/emu/inpttype.ipp:232
+#: src/emu/inpttype.ipp:266 src/emu/inpttype.ipp:300 src/emu/inpttype.ipp:334
+#: src/emu/inpttype.ipp:368 src/emu/inpttype.ipp:402 src/emu/inpttype.ipp:436
+#: src/emu/inpttype.ipp:470
+#, c-format
+msgctxt "input-name"
+msgid "%p Left Stick/Right"
+msgstr "%p左レバー／右"
+
+#: src/emu/inpttype.ipp:34 src/emu/inpttype.ipp:152 src/emu/inpttype.ipp:233
+#: src/emu/inpttype.ipp:267 src/emu/inpttype.ipp:301 src/emu/inpttype.ipp:335
+#: src/emu/inpttype.ipp:369 src/emu/inpttype.ipp:403 src/emu/inpttype.ipp:437
+#: src/emu/inpttype.ipp:471
+#, c-format
+msgctxt "input-name"
+msgid "%p Button 1"
+msgstr "%pボタン1"
+
+#: src/emu/inpttype.ipp:35 src/emu/inpttype.ipp:153 src/emu/inpttype.ipp:234
+#: src/emu/inpttype.ipp:268 src/emu/inpttype.ipp:302 src/emu/inpttype.ipp:336
+#: src/emu/inpttype.ipp:370 src/emu/inpttype.ipp:404 src/emu/inpttype.ipp:438
+#: src/emu/inpttype.ipp:472
+#, c-format
+msgctxt "input-name"
+msgid "%p Button 2"
+msgstr "%pボタン2"
+
+#: src/emu/inpttype.ipp:36 src/emu/inpttype.ipp:154 src/emu/inpttype.ipp:235
+#: src/emu/inpttype.ipp:269 src/emu/inpttype.ipp:303 src/emu/inpttype.ipp:337
+#: src/emu/inpttype.ipp:371 src/emu/inpttype.ipp:405 src/emu/inpttype.ipp:439
+#: src/emu/inpttype.ipp:473
+#, c-format
+msgctxt "input-name"
+msgid "%p Button 3"
+msgstr "%pボタン3"
+
+#: src/emu/inpttype.ipp:37 src/emu/inpttype.ipp:155 src/emu/inpttype.ipp:236
+#: src/emu/inpttype.ipp:270 src/emu/inpttype.ipp:304 src/emu/inpttype.ipp:338
+#: src/emu/inpttype.ipp:372 src/emu/inpttype.ipp:406 src/emu/inpttype.ipp:440
+#: src/emu/inpttype.ipp:474
+#, c-format
+msgctxt "input-name"
+msgid "%p Button 4"
+msgstr "%pボタン4"
+
+#: src/emu/inpttype.ipp:38 src/emu/inpttype.ipp:156 src/emu/inpttype.ipp:237
+#: src/emu/inpttype.ipp:271 src/emu/inpttype.ipp:305 src/emu/inpttype.ipp:339
+#: src/emu/inpttype.ipp:373 src/emu/inpttype.ipp:407 src/emu/inpttype.ipp:441
+#: src/emu/inpttype.ipp:475
+#, c-format
+msgctxt "input-name"
+msgid "%p Button 5"
+msgstr "%pボタン5"
+
+#: src/emu/inpttype.ipp:39 src/emu/inpttype.ipp:157 src/emu/inpttype.ipp:238
+#: src/emu/inpttype.ipp:272 src/emu/inpttype.ipp:306 src/emu/inpttype.ipp:340
+#: src/emu/inpttype.ipp:374 src/emu/inpttype.ipp:408 src/emu/inpttype.ipp:442
+#: src/emu/inpttype.ipp:476
+#, c-format
+msgctxt "input-name"
+msgid "%p Button 6"
+msgstr "%pボタン6"
+
+#: src/emu/inpttype.ipp:40 src/emu/inpttype.ipp:158 src/emu/inpttype.ipp:239
+#: src/emu/inpttype.ipp:273 src/emu/inpttype.ipp:307 src/emu/inpttype.ipp:341
+#: src/emu/inpttype.ipp:375 src/emu/inpttype.ipp:409 src/emu/inpttype.ipp:443
+#: src/emu/inpttype.ipp:477
+#, c-format
+msgctxt "input-name"
+msgid "%p Button 7"
+msgstr "%pボタン7"
+
+#: src/emu/inpttype.ipp:41 src/emu/inpttype.ipp:159 src/emu/inpttype.ipp:240
+#: src/emu/inpttype.ipp:274 src/emu/inpttype.ipp:308 src/emu/inpttype.ipp:342
+#: src/emu/inpttype.ipp:376 src/emu/inpttype.ipp:410 src/emu/inpttype.ipp:444
+#: src/emu/inpttype.ipp:478
+#, c-format
+msgctxt "input-name"
+msgid "%p Button 8"
+msgstr "%pボタン8"
+
+#: src/emu/inpttype.ipp:42 src/emu/inpttype.ipp:160 src/emu/inpttype.ipp:241
+#: src/emu/inpttype.ipp:275 src/emu/inpttype.ipp:309 src/emu/inpttype.ipp:343
+#: src/emu/inpttype.ipp:377 src/emu/inpttype.ipp:411 src/emu/inpttype.ipp:445
+#: src/emu/inpttype.ipp:479
+#, c-format
+msgctxt "input-name"
+msgid "%p Button 9"
+msgstr "%pボタン9"
+
+#: src/emu/inpttype.ipp:43 src/emu/inpttype.ipp:161 src/emu/inpttype.ipp:242
+#: src/emu/inpttype.ipp:276 src/emu/inpttype.ipp:310 src/emu/inpttype.ipp:344
+#: src/emu/inpttype.ipp:378 src/emu/inpttype.ipp:412 src/emu/inpttype.ipp:446
+#: src/emu/inpttype.ipp:480
+#, c-format
+msgctxt "input-name"
+msgid "%p Button 10"
+msgstr "%pボタン10"
+
+#: src/emu/inpttype.ipp:44 src/emu/inpttype.ipp:162 src/emu/inpttype.ipp:243
+#: src/emu/inpttype.ipp:277 src/emu/inpttype.ipp:311 src/emu/inpttype.ipp:345
+#: src/emu/inpttype.ipp:379 src/emu/inpttype.ipp:413 src/emu/inpttype.ipp:447
+#: src/emu/inpttype.ipp:481
+#, c-format
+msgctxt "input-name"
+msgid "%p Button 11"
+msgstr "%pボタン11"
+
+#: src/emu/inpttype.ipp:45 src/emu/inpttype.ipp:163 src/emu/inpttype.ipp:244
+#: src/emu/inpttype.ipp:278 src/emu/inpttype.ipp:312 src/emu/inpttype.ipp:346
+#: src/emu/inpttype.ipp:380 src/emu/inpttype.ipp:414 src/emu/inpttype.ipp:448
+#: src/emu/inpttype.ipp:482
+#, c-format
+msgctxt "input-name"
+msgid "%p Button 12"
+msgstr "%pボタン12"
+
+#: src/emu/inpttype.ipp:46 src/emu/inpttype.ipp:164 src/emu/inpttype.ipp:245
+#: src/emu/inpttype.ipp:279 src/emu/inpttype.ipp:313 src/emu/inpttype.ipp:347
+#: src/emu/inpttype.ipp:381 src/emu/inpttype.ipp:415 src/emu/inpttype.ipp:449
+#: src/emu/inpttype.ipp:483
+#, c-format
+msgctxt "input-name"
+msgid "%p Button 13"
+msgstr "%pボタン13"
+
+#: src/emu/inpttype.ipp:47 src/emu/inpttype.ipp:165 src/emu/inpttype.ipp:246
+#: src/emu/inpttype.ipp:280 src/emu/inpttype.ipp:314 src/emu/inpttype.ipp:348
+#: src/emu/inpttype.ipp:382 src/emu/inpttype.ipp:416 src/emu/inpttype.ipp:450
+#: src/emu/inpttype.ipp:484
+#, c-format
+msgctxt "input-name"
+msgid "%p Button 14"
+msgstr "%pボタン14"
+
+#: src/emu/inpttype.ipp:48 src/emu/inpttype.ipp:166 src/emu/inpttype.ipp:247
+#: src/emu/inpttype.ipp:281 src/emu/inpttype.ipp:315 src/emu/inpttype.ipp:349
+#: src/emu/inpttype.ipp:383 src/emu/inpttype.ipp:417 src/emu/inpttype.ipp:451
+#: src/emu/inpttype.ipp:485
+#, c-format
+msgctxt "input-name"
+msgid "%p Button 15"
+msgstr "%pボタン15"
+
+#: src/emu/inpttype.ipp:49 src/emu/inpttype.ipp:167 src/emu/inpttype.ipp:248
+#: src/emu/inpttype.ipp:282 src/emu/inpttype.ipp:316 src/emu/inpttype.ipp:350
+#: src/emu/inpttype.ipp:384 src/emu/inpttype.ipp:418 src/emu/inpttype.ipp:452
+#: src/emu/inpttype.ipp:486
+#, c-format
+msgctxt "input-name"
+msgid "%p Button 16"
+msgstr "%pボタン16"
+
+#: src/emu/inpttype.ipp:50 src/emu/inpttype.ipp:168 src/emu/inpttype.ipp:249
+#: src/emu/inpttype.ipp:283 src/emu/inpttype.ipp:317 src/emu/inpttype.ipp:351
+#: src/emu/inpttype.ipp:385 src/emu/inpttype.ipp:419 src/emu/inpttype.ipp:453
+#: src/emu/inpttype.ipp:487
+#, c-format
+msgctxt "input-name"
+msgid "%p Start"
+msgstr "%pスタート"
+
+#: src/emu/inpttype.ipp:51 src/emu/inpttype.ipp:169 src/emu/inpttype.ipp:250
+#: src/emu/inpttype.ipp:284 src/emu/inpttype.ipp:318 src/emu/inpttype.ipp:352
+#: src/emu/inpttype.ipp:386 src/emu/inpttype.ipp:420 src/emu/inpttype.ipp:454
+#: src/emu/inpttype.ipp:488
+#, c-format
+msgctxt "input-name"
+msgid "%p Select"
+msgstr "%pセレクト"
+
+#: src/emu/inpttype.ipp:56 src/emu/inpttype.ipp:174
+#, c-format
+msgctxt "input-name"
+msgid "%p Mahjong A"
+msgstr "%p麻雀Ａ"
+
+#: src/emu/inpttype.ipp:57 src/emu/inpttype.ipp:175
+#, c-format
+msgctxt "input-name"
+msgid "%p Mahjong B"
+msgstr "%p麻雀Ｂ"
+
+#: src/emu/inpttype.ipp:58 src/emu/inpttype.ipp:176
+#, c-format
+msgctxt "input-name"
+msgid "%p Mahjong C"
+msgstr "%p麻雀Ｃ"
+
+#: src/emu/inpttype.ipp:59 src/emu/inpttype.ipp:177
+#, c-format
+msgctxt "input-name"
+msgid "%p Mahjong D"
+msgstr "%p麻雀Ｄ"
+
+#: src/emu/inpttype.ipp:60 src/emu/inpttype.ipp:178
+#, c-format
+msgctxt "input-name"
+msgid "%p Mahjong E"
+msgstr "%p麻雀Ｅ"
+
+#: src/emu/inpttype.ipp:61 src/emu/inpttype.ipp:179
+#, c-format
+msgctxt "input-name"
+msgid "%p Mahjong F"
+msgstr "%p麻雀Ｆ"
+
+#: src/emu/inpttype.ipp:62 src/emu/inpttype.ipp:180
+#, c-format
+msgctxt "input-name"
+msgid "%p Mahjong G"
+msgstr "%p麻雀Ｇ"
+
+#: src/emu/inpttype.ipp:63 src/emu/inpttype.ipp:181
+#, c-format
+msgctxt "input-name"
+msgid "%p Mahjong H"
+msgstr "%p麻雀Ｈ"
+
+#: src/emu/inpttype.ipp:64 src/emu/inpttype.ipp:182
+#, c-format
+msgctxt "input-name"
+msgid "%p Mahjong I"
+msgstr "%p麻雀Ｉ"
+
+#: src/emu/inpttype.ipp:65 src/emu/inpttype.ipp:183
+#, c-format
+msgctxt "input-name"
+msgid "%p Mahjong J"
+msgstr "%p麻雀Ｊ"
+
+#: src/emu/inpttype.ipp:66 src/emu/inpttype.ipp:184
+#, c-format
+msgctxt "input-name"
+msgid "%p Mahjong K"
+msgstr "%p麻雀Ｋ"
+
+#: src/emu/inpttype.ipp:67 src/emu/inpttype.ipp:185
+#, c-format
+msgctxt "input-name"
+msgid "%p Mahjong L"
+msgstr "%p麻雀Ｌ"
+
+#: src/emu/inpttype.ipp:68 src/emu/inpttype.ipp:186
+#, c-format
+msgctxt "input-name"
+msgid "%p Mahjong M"
+msgstr "%p麻雀Ｍ"
+
+#: src/emu/inpttype.ipp:69 src/emu/inpttype.ipp:187
+#, c-format
+msgctxt "input-name"
+msgid "%p Mahjong N"
+msgstr "%p麻雀Ｎ"
+
+#: src/emu/inpttype.ipp:70 src/emu/inpttype.ipp:188
+#, c-format
+msgctxt "input-name"
+msgid "%p Mahjong O"
+msgstr "%p麻雀Ｏ"
+
+#: src/emu/inpttype.ipp:71 src/emu/inpttype.ipp:189
+#, c-format
+msgctxt "input-name"
+msgid "%p Mahjong P"
+msgstr "%p麻雀Ｐ"
+
+#: src/emu/inpttype.ipp:72 src/emu/inpttype.ipp:190
+#, c-format
+msgctxt "input-name"
+msgid "%p Mahjong Q"
+msgstr "%p麻雀Ｑ"
+
+#: src/emu/inpttype.ipp:73 src/emu/inpttype.ipp:191
+#, c-format
+msgctxt "input-name"
+msgid "%p Mahjong Kan"
+msgstr "%p麻雀カン"
+
+#: src/emu/inpttype.ipp:74 src/emu/inpttype.ipp:192
+#, c-format
+msgctxt "input-name"
+msgid "%p Mahjong Pon"
+msgstr "%p麻雀ポン"
+
+#: src/emu/inpttype.ipp:75 src/emu/inpttype.ipp:193
+#, c-format
+msgctxt "input-name"
+msgid "%p Mahjong Chi"
+msgstr "%p麻雀チー"
+
+#: src/emu/inpttype.ipp:76 src/emu/inpttype.ipp:194
+#, c-format
+msgctxt "input-name"
+msgid "%p Mahjong Reach"
+msgstr "%p麻雀リーチ"
+
+#: src/emu/inpttype.ipp:77 src/emu/inpttype.ipp:195
+#, c-format
+msgctxt "input-name"
+msgid "%p Mahjong Ron"
+msgstr "%p麻雀ロン"
+
+#: src/emu/inpttype.ipp:78 src/emu/inpttype.ipp:200
+#, c-format
+msgctxt "input-name"
+msgid "%p Mahjong Flip Flop"
+msgstr "%p麻雀フリップフロップ"
+
+#: src/emu/inpttype.ipp:79 src/emu/inpttype.ipp:196
+#, c-format
+msgctxt "input-name"
+msgid "%p Mahjong Bet"
+msgstr "%p麻雀ベット"
+
+#: src/emu/inpttype.ipp:80 src/emu/inpttype.ipp:198
+#, c-format
+msgctxt "input-name"
+msgid "%p Mahjong Take Score"
+msgstr "%p麻雀テイクスコアー"
+
+#: src/emu/inpttype.ipp:81 src/emu/inpttype.ipp:199
+#, c-format
+msgctxt "input-name"
+msgid "%p Mahjong Double Up"
+msgstr "%p麻雀ダブルアップ"
+
+#: src/emu/inpttype.ipp:82 src/emu/inpttype.ipp:201
+#, c-format
+msgctxt "input-name"
+msgid "%p Mahjong Big"
+msgstr "%p麻雀ビッグ"
+
+#: src/emu/inpttype.ipp:83 src/emu/inpttype.ipp:202
+#, c-format
+msgctxt "input-name"
+msgid "%p Mahjong Small"
+msgstr "%p麻雀スモール"
+
+#: src/emu/inpttype.ipp:84 src/emu/inpttype.ipp:197
+#, c-format
+msgctxt "input-name"
+msgid "%p Mahjong Last Chance"
+msgstr "%p麻雀ラストチャンス"
+
+#: src/emu/inpttype.ipp:89 src/emu/inpttype.ipp:207
+#, c-format
+msgctxt "input-name"
+msgid "%p Hanafuda A/1"
 msgstr ""
 
-#: src/emu/inpttype.ipp:91
+#: src/emu/inpttype.ipp:90 src/emu/inpttype.ipp:208
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda C/3"
+msgid "%p Hanafuda B/2"
 msgstr ""
 
-#: src/emu/inpttype.ipp:92
+#: src/emu/inpttype.ipp:91 src/emu/inpttype.ipp:209
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda D/4"
+msgid "%p Hanafuda C/3"
 msgstr ""
 
-#: src/emu/inpttype.ipp:93
+#: src/emu/inpttype.ipp:92 src/emu/inpttype.ipp:210
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda E/5"
+msgid "%p Hanafuda D/4"
 msgstr ""
 
-#: src/emu/inpttype.ipp:94
+#: src/emu/inpttype.ipp:93 src/emu/inpttype.ipp:211
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda F/6"
+msgid "%p Hanafuda E/5"
 msgstr ""
 
-#: src/emu/inpttype.ipp:95
+#: src/emu/inpttype.ipp:94 src/emu/inpttype.ipp:212
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda G/7"
+msgid "%p Hanafuda F/6"
 msgstr ""
 
-#: src/emu/inpttype.ipp:96
+#: src/emu/inpttype.ipp:95 src/emu/inpttype.ipp:213
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda H/8"
+msgid "%p Hanafuda G/7"
 msgstr ""
 
-#: src/emu/inpttype.ipp:97
+#: src/emu/inpttype.ipp:96 src/emu/inpttype.ipp:214
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda Yes"
+msgid "%p Hanafuda H/8"
 msgstr ""
 
-#: src/emu/inpttype.ipp:98
+#: src/emu/inpttype.ipp:97 src/emu/inpttype.ipp:215
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda No"
+msgid "%p Hanafuda Yes"
+msgstr ""
+
+#: src/emu/inpttype.ipp:98 src/emu/inpttype.ipp:216
+#, c-format
+msgctxt "input-name"
+msgid "%p Hanafuda No"
 msgstr ""
 
 #: src/emu/inpttype.ipp:103
@@ -3828,1551 +3998,6 @@ msgctxt "input-name"
 msgid "Stop All Reels"
 msgstr ""
 
-#: src/emu/inpttype.ipp:140
-msgctxt "input-name"
-msgid "P2 Up"
-msgstr "2P上"
-
-#: src/emu/inpttype.ipp:141
-msgctxt "input-name"
-msgid "P2 Down"
-msgstr "2P下"
-
-#: src/emu/inpttype.ipp:142
-msgctxt "input-name"
-msgid "P2 Left"
-msgstr "2P左"
-
-#: src/emu/inpttype.ipp:143
-msgctxt "input-name"
-msgid "P2 Right"
-msgstr "2P右"
-
-#: src/emu/inpttype.ipp:144
-msgctxt "input-name"
-msgid "P2 Right Stick/Up"
-msgstr "2P右レバー／上"
-
-#: src/emu/inpttype.ipp:145
-msgctxt "input-name"
-msgid "P2 Right Stick/Down"
-msgstr "2P右レバー／下"
-
-#: src/emu/inpttype.ipp:146
-msgctxt "input-name"
-msgid "P2 Right Stick/Left"
-msgstr "2P右レバー／左"
-
-#: src/emu/inpttype.ipp:147
-msgctxt "input-name"
-msgid "P2 Right Stick/Right"
-msgstr "2P右レバー／右"
-
-#: src/emu/inpttype.ipp:148
-msgctxt "input-name"
-msgid "P2 Left Stick/Up"
-msgstr "2P左レバー／上"
-
-#: src/emu/inpttype.ipp:149
-msgctxt "input-name"
-msgid "P2 Left Stick/Down"
-msgstr "2P左レバー／下"
-
-#: src/emu/inpttype.ipp:150
-msgctxt "input-name"
-msgid "P2 Left Stick/Left"
-msgstr "2P左レバー／左"
-
-#: src/emu/inpttype.ipp:151
-msgctxt "input-name"
-msgid "P2 Left Stick/Right"
-msgstr "2P左レバー／右"
-
-#: src/emu/inpttype.ipp:152
-msgctxt "input-name"
-msgid "P2 Button 1"
-msgstr "2Pボタン1"
-
-#: src/emu/inpttype.ipp:153
-msgctxt "input-name"
-msgid "P2 Button 2"
-msgstr "2Pボタン2"
-
-#: src/emu/inpttype.ipp:154
-msgctxt "input-name"
-msgid "P2 Button 3"
-msgstr "2Pボタン3"
-
-#: src/emu/inpttype.ipp:155
-msgctxt "input-name"
-msgid "P2 Button 4"
-msgstr "2Pボタン4"
-
-#: src/emu/inpttype.ipp:156
-msgctxt "input-name"
-msgid "P2 Button 5"
-msgstr "2Pボタン5"
-
-#: src/emu/inpttype.ipp:157
-msgctxt "input-name"
-msgid "P2 Button 6"
-msgstr "2Pボタン6"
-
-#: src/emu/inpttype.ipp:158
-msgctxt "input-name"
-msgid "P2 Button 7"
-msgstr "2Pボタン7"
-
-#: src/emu/inpttype.ipp:159
-msgctxt "input-name"
-msgid "P2 Button 8"
-msgstr "2Pボタン8"
-
-#: src/emu/inpttype.ipp:160
-msgctxt "input-name"
-msgid "P2 Button 9"
-msgstr "2Pボタン9"
-
-#: src/emu/inpttype.ipp:161
-msgctxt "input-name"
-msgid "P2 Button 10"
-msgstr "2Pボタン10"
-
-#: src/emu/inpttype.ipp:162
-msgctxt "input-name"
-msgid "P2 Button 11"
-msgstr "2Pボタン11"
-
-#: src/emu/inpttype.ipp:163
-msgctxt "input-name"
-msgid "P2 Button 12"
-msgstr "2Pボタン12"
-
-#: src/emu/inpttype.ipp:164
-msgctxt "input-name"
-msgid "P2 Button 13"
-msgstr "2Pボタン13"
-
-#: src/emu/inpttype.ipp:165
-msgctxt "input-name"
-msgid "P2 Button 14"
-msgstr "2Pボタン14"
-
-#: src/emu/inpttype.ipp:166
-msgctxt "input-name"
-msgid "P2 Button 15"
-msgstr "2Pボタン15"
-
-#: src/emu/inpttype.ipp:167
-msgctxt "input-name"
-msgid "P2 Button 16"
-msgstr "2Pボタン16"
-
-#: src/emu/inpttype.ipp:168
-msgctxt "input-name"
-msgid "P2 Start"
-msgstr "2Pスタート"
-
-#: src/emu/inpttype.ipp:169
-msgctxt "input-name"
-msgid "P2 Select"
-msgstr "2Pセレクト"
-
-#: src/emu/inpttype.ipp:174
-msgctxt "input-name"
-msgid "P2 Mahjong A"
-msgstr "2P麻雀Ａ"
-
-#: src/emu/inpttype.ipp:175
-msgctxt "input-name"
-msgid "P2 Mahjong B"
-msgstr "2P麻雀Ｂ"
-
-#: src/emu/inpttype.ipp:176
-msgctxt "input-name"
-msgid "P2 Mahjong C"
-msgstr "2P麻雀Ｃ"
-
-#: src/emu/inpttype.ipp:177
-msgctxt "input-name"
-msgid "P2 Mahjong D"
-msgstr "2P麻雀Ｄ"
-
-#: src/emu/inpttype.ipp:178
-msgctxt "input-name"
-msgid "P2 Mahjong E"
-msgstr "2P麻雀Ｅ"
-
-#: src/emu/inpttype.ipp:179
-msgctxt "input-name"
-msgid "P2 Mahjong F"
-msgstr "2P麻雀Ｆ"
-
-#: src/emu/inpttype.ipp:180
-msgctxt "input-name"
-msgid "P2 Mahjong G"
-msgstr "2P麻雀Ｇ"
-
-#: src/emu/inpttype.ipp:181
-msgctxt "input-name"
-msgid "P2 Mahjong H"
-msgstr "2P麻雀Ｈ"
-
-#: src/emu/inpttype.ipp:182
-msgctxt "input-name"
-msgid "P2 Mahjong I"
-msgstr "2P麻雀Ｉ"
-
-#: src/emu/inpttype.ipp:183
-msgctxt "input-name"
-msgid "P2 Mahjong J"
-msgstr "2P麻雀Ｊ"
-
-#: src/emu/inpttype.ipp:184
-msgctxt "input-name"
-msgid "P2 Mahjong K"
-msgstr "2P麻雀Ｋ"
-
-#: src/emu/inpttype.ipp:185
-msgctxt "input-name"
-msgid "P2 Mahjong L"
-msgstr "2P麻雀Ｌ"
-
-#: src/emu/inpttype.ipp:186
-msgctxt "input-name"
-msgid "P2 Mahjong M"
-msgstr "2P麻雀Ｍ"
-
-#: src/emu/inpttype.ipp:187
-msgctxt "input-name"
-msgid "P2 Mahjong N"
-msgstr "2P麻雀Ｎ"
-
-#: src/emu/inpttype.ipp:188
-msgctxt "input-name"
-msgid "P2 Mahjong O"
-msgstr "2P麻雀Ｏ"
-
-#: src/emu/inpttype.ipp:189
-msgctxt "input-name"
-msgid "P2 Mahjong P"
-msgstr "2P麻雀Ｐ"
-
-#: src/emu/inpttype.ipp:190
-msgctxt "input-name"
-msgid "P2 Mahjong Q"
-msgstr "2P麻雀Ｑ"
-
-#: src/emu/inpttype.ipp:191
-msgctxt "input-name"
-msgid "P2 Mahjong Kan"
-msgstr "2P麻雀カン"
-
-#: src/emu/inpttype.ipp:192
-msgctxt "input-name"
-msgid "P2 Mahjong Pon"
-msgstr "2P麻雀ポン"
-
-#: src/emu/inpttype.ipp:193
-msgctxt "input-name"
-msgid "P2 Mahjong Chi"
-msgstr "2P麻雀チー"
-
-#: src/emu/inpttype.ipp:194
-msgctxt "input-name"
-msgid "P2 Mahjong Reach"
-msgstr "2P麻雀リーチ"
-
-#: src/emu/inpttype.ipp:195
-msgctxt "input-name"
-msgid "P2 Mahjong Ron"
-msgstr "2P麻雀ロン"
-
-#: src/emu/inpttype.ipp:196
-msgctxt "input-name"
-msgid "P2 Mahjong Bet"
-msgstr "2P麻雀ベット"
-
-#: src/emu/inpttype.ipp:197
-msgctxt "input-name"
-msgid "P2 Mahjong Last Chance"
-msgstr "2P麻雀ラストチャンス"
-
-#: src/emu/inpttype.ipp:198
-msgctxt "input-name"
-msgid "P2 Mahjong Take Score"
-msgstr "2P麻雀テイクスコアー"
-
-#: src/emu/inpttype.ipp:199
-msgctxt "input-name"
-msgid "P2 Mahjong Double Up"
-msgstr "2P麻雀ダブルアップ"
-
-#: src/emu/inpttype.ipp:200
-msgctxt "input-name"
-msgid "P2 Mahjong Flip Flop"
-msgstr "2P麻雀フリップフロップ"
-
-#: src/emu/inpttype.ipp:201
-msgctxt "input-name"
-msgid "P2 Mahjong Big"
-msgstr "2P麻雀ビッグ"
-
-#: src/emu/inpttype.ipp:202
-msgctxt "input-name"
-msgid "P2 Mahjong Small"
-msgstr "2P麻雀スモール"
-
-#: src/emu/inpttype.ipp:207
-msgctxt "input-name"
-msgid "P2 Hanafuda A/1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:208
-msgctxt "input-name"
-msgid "P2 Hanafuda B/2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:209
-msgctxt "input-name"
-msgid "P2 Hanafuda C/3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:210
-msgctxt "input-name"
-msgid "P2 Hanafuda D/4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:211
-msgctxt "input-name"
-msgid "P2 Hanafuda E/5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:212
-msgctxt "input-name"
-msgid "P2 Hanafuda F/6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:213
-msgctxt "input-name"
-msgid "P2 Hanafuda G/7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:214
-msgctxt "input-name"
-msgid "P2 Hanafuda H/8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:215
-msgctxt "input-name"
-msgid "P2 Hanafuda Yes"
-msgstr ""
-
-#: src/emu/inpttype.ipp:216
-msgctxt "input-name"
-msgid "P2 Hanafuda No"
-msgstr ""
-
-#: src/emu/inpttype.ipp:221
-msgctxt "input-name"
-msgid "P3 Up"
-msgstr "3P上"
-
-#: src/emu/inpttype.ipp:222
-msgctxt "input-name"
-msgid "P3 Down"
-msgstr "3P下"
-
-#: src/emu/inpttype.ipp:223
-msgctxt "input-name"
-msgid "P3 Left"
-msgstr "3P左"
-
-#: src/emu/inpttype.ipp:224
-msgctxt "input-name"
-msgid "P3 Right"
-msgstr "3P右"
-
-#: src/emu/inpttype.ipp:225
-msgctxt "input-name"
-msgid "P3 Right Stick/Up"
-msgstr "3P右レバー／上"
-
-#: src/emu/inpttype.ipp:226
-msgctxt "input-name"
-msgid "P3 Right Stick/Down"
-msgstr "3P右レバー／下"
-
-#: src/emu/inpttype.ipp:227
-msgctxt "input-name"
-msgid "P3 Right Stick/Left"
-msgstr "3P右レバー／左"
-
-#: src/emu/inpttype.ipp:228
-msgctxt "input-name"
-msgid "P3 Right Stick/Right"
-msgstr "3P右レバー／右"
-
-#: src/emu/inpttype.ipp:229
-msgctxt "input-name"
-msgid "P3 Left Stick/Up"
-msgstr "3P左レバー／上"
-
-#: src/emu/inpttype.ipp:230
-msgctxt "input-name"
-msgid "P3 Left Stick/Down"
-msgstr "3P左レバー／下"
-
-#: src/emu/inpttype.ipp:231
-msgctxt "input-name"
-msgid "P3 Left Stick/Left"
-msgstr "3P左レバー／左"
-
-#: src/emu/inpttype.ipp:232
-msgctxt "input-name"
-msgid "P3 Left Stick/Right"
-msgstr "3P左レバー／右"
-
-#: src/emu/inpttype.ipp:233
-msgctxt "input-name"
-msgid "P3 Button 1"
-msgstr "3Pボタン1"
-
-#: src/emu/inpttype.ipp:234
-msgctxt "input-name"
-msgid "P3 Button 2"
-msgstr "3Pボタン2"
-
-#: src/emu/inpttype.ipp:235
-msgctxt "input-name"
-msgid "P3 Button 3"
-msgstr "3Pボタン3"
-
-#: src/emu/inpttype.ipp:236
-msgctxt "input-name"
-msgid "P3 Button 4"
-msgstr "3Pボタン4"
-
-#: src/emu/inpttype.ipp:237
-msgctxt "input-name"
-msgid "P3 Button 5"
-msgstr "3Pボタン5"
-
-#: src/emu/inpttype.ipp:238
-msgctxt "input-name"
-msgid "P3 Button 6"
-msgstr "3Pボタン6"
-
-#: src/emu/inpttype.ipp:239
-msgctxt "input-name"
-msgid "P3 Button 7"
-msgstr "3Pボタン7"
-
-#: src/emu/inpttype.ipp:240
-msgctxt "input-name"
-msgid "P3 Button 8"
-msgstr "3Pボタン8"
-
-#: src/emu/inpttype.ipp:241
-msgctxt "input-name"
-msgid "P3 Button 9"
-msgstr "3Pボタン9"
-
-#: src/emu/inpttype.ipp:242
-msgctxt "input-name"
-msgid "P3 Button 10"
-msgstr "3Pボタン10"
-
-#: src/emu/inpttype.ipp:243
-msgctxt "input-name"
-msgid "P3 Button 11"
-msgstr "3Pボタン11"
-
-#: src/emu/inpttype.ipp:244
-msgctxt "input-name"
-msgid "P3 Button 12"
-msgstr "3Pボタン12"
-
-#: src/emu/inpttype.ipp:245
-msgctxt "input-name"
-msgid "P3 Button 13"
-msgstr "3Pボタン13"
-
-#: src/emu/inpttype.ipp:246
-msgctxt "input-name"
-msgid "P3 Button 14"
-msgstr "3Pボタン14"
-
-#: src/emu/inpttype.ipp:247
-msgctxt "input-name"
-msgid "P3 Button 15"
-msgstr "3Pボタン15"
-
-#: src/emu/inpttype.ipp:248
-msgctxt "input-name"
-msgid "P3 Button 16"
-msgstr "3Pボタン16"
-
-#: src/emu/inpttype.ipp:249
-msgctxt "input-name"
-msgid "P3 Start"
-msgstr "3Pスタート"
-
-#: src/emu/inpttype.ipp:250
-msgctxt "input-name"
-msgid "P3 Select"
-msgstr "3Pセレクト"
-
-#: src/emu/inpttype.ipp:255
-msgctxt "input-name"
-msgid "P4 Up"
-msgstr "4P上"
-
-#: src/emu/inpttype.ipp:256
-msgctxt "input-name"
-msgid "P4 Down"
-msgstr "4P下"
-
-#: src/emu/inpttype.ipp:257
-msgctxt "input-name"
-msgid "P4 Left"
-msgstr "4P左"
-
-#: src/emu/inpttype.ipp:258
-msgctxt "input-name"
-msgid "P4 Right"
-msgstr "4P右"
-
-#: src/emu/inpttype.ipp:259
-msgctxt "input-name"
-msgid "P4 Right Stick/Up"
-msgstr "4P右レバー／上"
-
-#: src/emu/inpttype.ipp:260
-msgctxt "input-name"
-msgid "P4 Right Stick/Down"
-msgstr "4P右レバー／下"
-
-#: src/emu/inpttype.ipp:261
-msgctxt "input-name"
-msgid "P4 Right Stick/Left"
-msgstr "4P右レバー／左"
-
-#: src/emu/inpttype.ipp:262
-msgctxt "input-name"
-msgid "P4 Right Stick/Right"
-msgstr "4P右レバー／右"
-
-#: src/emu/inpttype.ipp:263
-msgctxt "input-name"
-msgid "P4 Left Stick/Up"
-msgstr "4P左レバー／上"
-
-#: src/emu/inpttype.ipp:264
-msgctxt "input-name"
-msgid "P4 Left Stick/Down"
-msgstr "4P左レバー／下"
-
-#: src/emu/inpttype.ipp:265
-msgctxt "input-name"
-msgid "P4 Left Stick/Left"
-msgstr "4P左レバー／左"
-
-#: src/emu/inpttype.ipp:266
-msgctxt "input-name"
-msgid "P4 Left Stick/Right"
-msgstr "4P左レバー／右"
-
-#: src/emu/inpttype.ipp:267
-msgctxt "input-name"
-msgid "P4 Button 1"
-msgstr "4Pボタン1"
-
-#: src/emu/inpttype.ipp:268
-msgctxt "input-name"
-msgid "P4 Button 2"
-msgstr "4Pボタン2"
-
-#: src/emu/inpttype.ipp:269
-msgctxt "input-name"
-msgid "P4 Button 3"
-msgstr "4Pボタン3"
-
-#: src/emu/inpttype.ipp:270
-msgctxt "input-name"
-msgid "P4 Button 4"
-msgstr "4Pボタン4"
-
-#: src/emu/inpttype.ipp:271
-msgctxt "input-name"
-msgid "P4 Button 5"
-msgstr "4Pボタン5"
-
-#: src/emu/inpttype.ipp:272
-msgctxt "input-name"
-msgid "P4 Button 6"
-msgstr "4Pボタン6"
-
-#: src/emu/inpttype.ipp:273
-msgctxt "input-name"
-msgid "P4 Button 7"
-msgstr "4Pボタン7"
-
-#: src/emu/inpttype.ipp:274
-msgctxt "input-name"
-msgid "P4 Button 8"
-msgstr "4Pボタン8"
-
-#: src/emu/inpttype.ipp:275
-msgctxt "input-name"
-msgid "P4 Button 9"
-msgstr "4Pボタン9"
-
-#: src/emu/inpttype.ipp:276
-msgctxt "input-name"
-msgid "P4 Button 10"
-msgstr "4Pボタン10"
-
-#: src/emu/inpttype.ipp:277
-msgctxt "input-name"
-msgid "P4 Button 11"
-msgstr "4Pボタン11"
-
-#: src/emu/inpttype.ipp:278
-msgctxt "input-name"
-msgid "P4 Button 12"
-msgstr "4Pボタン12"
-
-#: src/emu/inpttype.ipp:279
-msgctxt "input-name"
-msgid "P4 Button 13"
-msgstr "4Pボタン13"
-
-#: src/emu/inpttype.ipp:280
-msgctxt "input-name"
-msgid "P4 Button 14"
-msgstr "4Pボタン14"
-
-#: src/emu/inpttype.ipp:281
-msgctxt "input-name"
-msgid "P4 Button 15"
-msgstr "4Pボタン15"
-
-#: src/emu/inpttype.ipp:282
-msgctxt "input-name"
-msgid "P4 Button 16"
-msgstr "4Pボタン16"
-
-#: src/emu/inpttype.ipp:283
-msgctxt "input-name"
-msgid "P4 Start"
-msgstr "4Pスタート"
-
-#: src/emu/inpttype.ipp:284
-msgctxt "input-name"
-msgid "P4 Select"
-msgstr "4Pセレクト"
-
-#: src/emu/inpttype.ipp:289
-msgctxt "input-name"
-msgid "P5 Up"
-msgstr "5P上"
-
-#: src/emu/inpttype.ipp:290
-msgctxt "input-name"
-msgid "P5 Down"
-msgstr "5P下"
-
-#: src/emu/inpttype.ipp:291
-msgctxt "input-name"
-msgid "P5 Left"
-msgstr "5P左"
-
-#: src/emu/inpttype.ipp:292
-msgctxt "input-name"
-msgid "P5 Right"
-msgstr "5P右"
-
-#: src/emu/inpttype.ipp:293
-msgctxt "input-name"
-msgid "P5 Right Stick/Up"
-msgstr "5P右レバー／上"
-
-#: src/emu/inpttype.ipp:294
-msgctxt "input-name"
-msgid "P5 Right Stick/Down"
-msgstr "5P右レバー／下"
-
-#: src/emu/inpttype.ipp:295
-msgctxt "input-name"
-msgid "P5 Right Stick/Left"
-msgstr "5P右レバー／左"
-
-#: src/emu/inpttype.ipp:296
-msgctxt "input-name"
-msgid "P5 Right Stick/Right"
-msgstr "5P右レバー／右"
-
-#: src/emu/inpttype.ipp:297
-msgctxt "input-name"
-msgid "P5 Left Stick/Up"
-msgstr "5P左レバー／上"
-
-#: src/emu/inpttype.ipp:298
-msgctxt "input-name"
-msgid "P5 Left Stick/Down"
-msgstr "5P左レバー／下"
-
-#: src/emu/inpttype.ipp:299
-msgctxt "input-name"
-msgid "P5 Left Stick/Left"
-msgstr "5P左レバー／左"
-
-#: src/emu/inpttype.ipp:300
-msgctxt "input-name"
-msgid "P5 Left Stick/Right"
-msgstr "5P左レバー／右"
-
-#: src/emu/inpttype.ipp:301
-msgctxt "input-name"
-msgid "P5 Button 1"
-msgstr "5Pボタン1"
-
-#: src/emu/inpttype.ipp:302
-msgctxt "input-name"
-msgid "P5 Button 2"
-msgstr "5Pボタン2"
-
-#: src/emu/inpttype.ipp:303
-msgctxt "input-name"
-msgid "P5 Button 3"
-msgstr "5Pボタン3"
-
-#: src/emu/inpttype.ipp:304
-msgctxt "input-name"
-msgid "P5 Button 4"
-msgstr "5Pボタン4"
-
-#: src/emu/inpttype.ipp:305
-msgctxt "input-name"
-msgid "P5 Button 5"
-msgstr "5Pボタン5"
-
-#: src/emu/inpttype.ipp:306
-msgctxt "input-name"
-msgid "P5 Button 6"
-msgstr "5Pボタン6"
-
-#: src/emu/inpttype.ipp:307
-msgctxt "input-name"
-msgid "P5 Button 7"
-msgstr "5Pボタン7"
-
-#: src/emu/inpttype.ipp:308
-msgctxt "input-name"
-msgid "P5 Button 8"
-msgstr "5Pボタン8"
-
-#: src/emu/inpttype.ipp:309
-msgctxt "input-name"
-msgid "P5 Button 9"
-msgstr "5Pボタン9"
-
-#: src/emu/inpttype.ipp:310
-msgctxt "input-name"
-msgid "P5 Button 10"
-msgstr "5Pボタン10"
-
-#: src/emu/inpttype.ipp:311
-msgctxt "input-name"
-msgid "P5 Button 11"
-msgstr "5Pボタン11"
-
-#: src/emu/inpttype.ipp:312
-msgctxt "input-name"
-msgid "P5 Button 12"
-msgstr "5Pボタン12"
-
-#: src/emu/inpttype.ipp:313
-msgctxt "input-name"
-msgid "P5 Button 13"
-msgstr "5Pボタン13"
-
-#: src/emu/inpttype.ipp:314
-msgctxt "input-name"
-msgid "P5 Button 14"
-msgstr "5Pボタン14"
-
-#: src/emu/inpttype.ipp:315
-msgctxt "input-name"
-msgid "P5 Button 15"
-msgstr "5Pボタン15"
-
-#: src/emu/inpttype.ipp:316
-msgctxt "input-name"
-msgid "P5 Button 16"
-msgstr "5Pボタン16"
-
-#: src/emu/inpttype.ipp:317
-msgctxt "input-name"
-msgid "P5 Start"
-msgstr "5Pスタート"
-
-#: src/emu/inpttype.ipp:318
-msgctxt "input-name"
-msgid "P5 Select"
-msgstr "5Pセレクト"
-
-#: src/emu/inpttype.ipp:323
-msgctxt "input-name"
-msgid "P6 Up"
-msgstr "6P上"
-
-#: src/emu/inpttype.ipp:324
-msgctxt "input-name"
-msgid "P6 Down"
-msgstr "6P下"
-
-#: src/emu/inpttype.ipp:325
-msgctxt "input-name"
-msgid "P6 Left"
-msgstr "6P左"
-
-#: src/emu/inpttype.ipp:326
-msgctxt "input-name"
-msgid "P6 Right"
-msgstr "6P右"
-
-#: src/emu/inpttype.ipp:327
-msgctxt "input-name"
-msgid "P6 Right Stick/Up"
-msgstr "6P右レバー／上"
-
-#: src/emu/inpttype.ipp:328
-msgctxt "input-name"
-msgid "P6 Right Stick/Down"
-msgstr "6P右レバー／下"
-
-#: src/emu/inpttype.ipp:329
-msgctxt "input-name"
-msgid "P6 Right Stick/Left"
-msgstr "6P右レバー／左"
-
-#: src/emu/inpttype.ipp:330
-msgctxt "input-name"
-msgid "P6 Right Stick/Right"
-msgstr "6P右レバー／右"
-
-#: src/emu/inpttype.ipp:331
-msgctxt "input-name"
-msgid "P6 Left Stick/Up"
-msgstr "6P左レバー／上"
-
-#: src/emu/inpttype.ipp:332
-msgctxt "input-name"
-msgid "P6 Left Stick/Down"
-msgstr "6P左レバー／下"
-
-#: src/emu/inpttype.ipp:333
-msgctxt "input-name"
-msgid "P6 Left Stick/Left"
-msgstr "6P左レバー／左"
-
-#: src/emu/inpttype.ipp:334
-msgctxt "input-name"
-msgid "P6 Left Stick/Right"
-msgstr "6P左レバー／右"
-
-#: src/emu/inpttype.ipp:335
-msgctxt "input-name"
-msgid "P6 Button 1"
-msgstr "6Pボタン1"
-
-#: src/emu/inpttype.ipp:336
-msgctxt "input-name"
-msgid "P6 Button 2"
-msgstr "6Pボタン2"
-
-#: src/emu/inpttype.ipp:337
-msgctxt "input-name"
-msgid "P6 Button 3"
-msgstr "6Pボタン3"
-
-#: src/emu/inpttype.ipp:338
-msgctxt "input-name"
-msgid "P6 Button 4"
-msgstr "6Pボタン4"
-
-#: src/emu/inpttype.ipp:339
-msgctxt "input-name"
-msgid "P6 Button 5"
-msgstr "6Pボタン5"
-
-#: src/emu/inpttype.ipp:340
-msgctxt "input-name"
-msgid "P6 Button 6"
-msgstr "6Pボタン6"
-
-#: src/emu/inpttype.ipp:341
-msgctxt "input-name"
-msgid "P6 Button 7"
-msgstr "6Pボタン7"
-
-#: src/emu/inpttype.ipp:342
-msgctxt "input-name"
-msgid "P6 Button 8"
-msgstr "6Pボタン8"
-
-#: src/emu/inpttype.ipp:343
-msgctxt "input-name"
-msgid "P6 Button 9"
-msgstr "6Pボタン9"
-
-#: src/emu/inpttype.ipp:344
-msgctxt "input-name"
-msgid "P6 Button 10"
-msgstr "6Pボタン10"
-
-#: src/emu/inpttype.ipp:345
-msgctxt "input-name"
-msgid "P6 Button 11"
-msgstr "6Pボタン11"
-
-#: src/emu/inpttype.ipp:346
-msgctxt "input-name"
-msgid "P6 Button 12"
-msgstr "6Pボタン12"
-
-#: src/emu/inpttype.ipp:347
-msgctxt "input-name"
-msgid "P6 Button 13"
-msgstr "6Pボタン13"
-
-#: src/emu/inpttype.ipp:348
-msgctxt "input-name"
-msgid "P6 Button 14"
-msgstr "6Pボタン14"
-
-#: src/emu/inpttype.ipp:349
-msgctxt "input-name"
-msgid "P6 Button 15"
-msgstr "6Pボタン15"
-
-#: src/emu/inpttype.ipp:350
-msgctxt "input-name"
-msgid "P6 Button 16"
-msgstr "6Pボタン16"
-
-#: src/emu/inpttype.ipp:351
-msgctxt "input-name"
-msgid "P6 Start"
-msgstr "6Pスタート"
-
-#: src/emu/inpttype.ipp:352
-msgctxt "input-name"
-msgid "P6 Select"
-msgstr "6Pセレクト"
-
-#: src/emu/inpttype.ipp:357
-msgctxt "input-name"
-msgid "P7 Up"
-msgstr "7P上"
-
-#: src/emu/inpttype.ipp:358
-msgctxt "input-name"
-msgid "P7 Down"
-msgstr "7P下"
-
-#: src/emu/inpttype.ipp:359
-msgctxt "input-name"
-msgid "P7 Left"
-msgstr "7P左"
-
-#: src/emu/inpttype.ipp:360
-msgctxt "input-name"
-msgid "P7 Right"
-msgstr "7P右"
-
-#: src/emu/inpttype.ipp:361
-msgctxt "input-name"
-msgid "P7 Right Stick/Up"
-msgstr "7P右レバー／上"
-
-#: src/emu/inpttype.ipp:362
-msgctxt "input-name"
-msgid "P7 Right Stick/Down"
-msgstr "7P右レバー／下"
-
-#: src/emu/inpttype.ipp:363
-msgctxt "input-name"
-msgid "P7 Right Stick/Left"
-msgstr "7P右レバー／左"
-
-#: src/emu/inpttype.ipp:364
-msgctxt "input-name"
-msgid "P7 Right Stick/Right"
-msgstr "7P右レバー／右"
-
-#: src/emu/inpttype.ipp:365
-msgctxt "input-name"
-msgid "P7 Left Stick/Up"
-msgstr "7P左レバー／上"
-
-#: src/emu/inpttype.ipp:366
-msgctxt "input-name"
-msgid "P7 Left Stick/Down"
-msgstr "7P左レバー／下"
-
-#: src/emu/inpttype.ipp:367
-msgctxt "input-name"
-msgid "P7 Left Stick/Left"
-msgstr "7P左レバー／左"
-
-#: src/emu/inpttype.ipp:368
-msgctxt "input-name"
-msgid "P7 Left Stick/Right"
-msgstr "7P左レバー／右"
-
-#: src/emu/inpttype.ipp:369
-msgctxt "input-name"
-msgid "P7 Button 1"
-msgstr "7Pボタン1"
-
-#: src/emu/inpttype.ipp:370
-msgctxt "input-name"
-msgid "P7 Button 2"
-msgstr "7Pボタン2"
-
-#: src/emu/inpttype.ipp:371
-msgctxt "input-name"
-msgid "P7 Button 3"
-msgstr "7Pボタン3"
-
-#: src/emu/inpttype.ipp:372
-msgctxt "input-name"
-msgid "P7 Button 4"
-msgstr "7Pボタン4"
-
-#: src/emu/inpttype.ipp:373
-msgctxt "input-name"
-msgid "P7 Button 5"
-msgstr "7Pボタン5"
-
-#: src/emu/inpttype.ipp:374
-msgctxt "input-name"
-msgid "P7 Button 6"
-msgstr "7Pボタン6"
-
-#: src/emu/inpttype.ipp:375
-msgctxt "input-name"
-msgid "P7 Button 7"
-msgstr "7Pボタン7"
-
-#: src/emu/inpttype.ipp:376
-msgctxt "input-name"
-msgid "P7 Button 8"
-msgstr "7Pボタン8"
-
-#: src/emu/inpttype.ipp:377
-msgctxt "input-name"
-msgid "P7 Button 9"
-msgstr "7Pボタン9"
-
-#: src/emu/inpttype.ipp:378
-msgctxt "input-name"
-msgid "P7 Button 10"
-msgstr "7Pボタン10"
-
-#: src/emu/inpttype.ipp:379
-msgctxt "input-name"
-msgid "P7 Button 11"
-msgstr "7Pボタン11"
-
-#: src/emu/inpttype.ipp:380
-msgctxt "input-name"
-msgid "P7 Button 12"
-msgstr "7Pボタン12"
-
-#: src/emu/inpttype.ipp:381
-msgctxt "input-name"
-msgid "P7 Button 13"
-msgstr "7Pボタン13"
-
-#: src/emu/inpttype.ipp:382
-msgctxt "input-name"
-msgid "P7 Button 14"
-msgstr "7Pボタン14"
-
-#: src/emu/inpttype.ipp:383
-msgctxt "input-name"
-msgid "P7 Button 15"
-msgstr "7Pボタン15"
-
-#: src/emu/inpttype.ipp:384
-msgctxt "input-name"
-msgid "P7 Button 16"
-msgstr "7Pボタン16"
-
-#: src/emu/inpttype.ipp:385
-msgctxt "input-name"
-msgid "P7 Start"
-msgstr "7Pスタート"
-
-#: src/emu/inpttype.ipp:386
-msgctxt "input-name"
-msgid "P7 Select"
-msgstr "7Pセレクト"
-
-#: src/emu/inpttype.ipp:391
-msgctxt "input-name"
-msgid "P8 Up"
-msgstr "8P上"
-
-#: src/emu/inpttype.ipp:392
-msgctxt "input-name"
-msgid "P8 Down"
-msgstr "8P下"
-
-#: src/emu/inpttype.ipp:393
-msgctxt "input-name"
-msgid "P8 Left"
-msgstr "8P左"
-
-#: src/emu/inpttype.ipp:394
-msgctxt "input-name"
-msgid "P8 Right"
-msgstr "8P右"
-
-#: src/emu/inpttype.ipp:395
-msgctxt "input-name"
-msgid "P8 Right Stick/Up"
-msgstr "8P右レバー／上"
-
-#: src/emu/inpttype.ipp:396
-msgctxt "input-name"
-msgid "P8 Right Stick/Down"
-msgstr "8P右レバー／下"
-
-#: src/emu/inpttype.ipp:397
-msgctxt "input-name"
-msgid "P8 Right Stick/Left"
-msgstr "8P右レバー／左"
-
-#: src/emu/inpttype.ipp:398
-msgctxt "input-name"
-msgid "P8 Right Stick/Right"
-msgstr "8P右レバー／右"
-
-#: src/emu/inpttype.ipp:399
-msgctxt "input-name"
-msgid "P8 Left Stick/Up"
-msgstr "8P左レバー／上"
-
-#: src/emu/inpttype.ipp:400
-msgctxt "input-name"
-msgid "P8 Left Stick/Down"
-msgstr "8P左レバー／下"
-
-#: src/emu/inpttype.ipp:401
-msgctxt "input-name"
-msgid "P8 Left Stick/Left"
-msgstr "8P左レバー／左"
-
-#: src/emu/inpttype.ipp:402
-msgctxt "input-name"
-msgid "P8 Left Stick/Right"
-msgstr "8P左レバー／右"
-
-#: src/emu/inpttype.ipp:403
-msgctxt "input-name"
-msgid "P8 Button 1"
-msgstr "8Pボタン1"
-
-#: src/emu/inpttype.ipp:404
-msgctxt "input-name"
-msgid "P8 Button 2"
-msgstr "8Pボタン2"
-
-#: src/emu/inpttype.ipp:405
-msgctxt "input-name"
-msgid "P8 Button 3"
-msgstr "8Pボタン3"
-
-#: src/emu/inpttype.ipp:406
-msgctxt "input-name"
-msgid "P8 Button 4"
-msgstr "8Pボタン4"
-
-#: src/emu/inpttype.ipp:407
-msgctxt "input-name"
-msgid "P8 Button 5"
-msgstr "8Pボタン5"
-
-#: src/emu/inpttype.ipp:408
-msgctxt "input-name"
-msgid "P8 Button 6"
-msgstr "8Pボタン6"
-
-#: src/emu/inpttype.ipp:409
-msgctxt "input-name"
-msgid "P8 Button 7"
-msgstr "8Pボタン7"
-
-#: src/emu/inpttype.ipp:410
-msgctxt "input-name"
-msgid "P8 Button 8"
-msgstr "8Pボタン8"
-
-#: src/emu/inpttype.ipp:411
-msgctxt "input-name"
-msgid "P8 Button 9"
-msgstr "8Pボタン9"
-
-#: src/emu/inpttype.ipp:412
-msgctxt "input-name"
-msgid "P8 Button 10"
-msgstr "8Pボタン10"
-
-#: src/emu/inpttype.ipp:413
-msgctxt "input-name"
-msgid "P8 Button 11"
-msgstr "8Pボタン11"
-
-#: src/emu/inpttype.ipp:414
-msgctxt "input-name"
-msgid "P8 Button 12"
-msgstr "8Pボタン12"
-
-#: src/emu/inpttype.ipp:415
-msgctxt "input-name"
-msgid "P8 Button 13"
-msgstr "8Pボタン13"
-
-#: src/emu/inpttype.ipp:416
-msgctxt "input-name"
-msgid "P8 Button 14"
-msgstr "8Pボタン14"
-
-#: src/emu/inpttype.ipp:417
-msgctxt "input-name"
-msgid "P8 Button 15"
-msgstr "8Pボタン15"
-
-#: src/emu/inpttype.ipp:418
-msgctxt "input-name"
-msgid "P8 Button 16"
-msgstr "8Pボタン16"
-
-#: src/emu/inpttype.ipp:419
-msgctxt "input-name"
-msgid "P8 Start"
-msgstr "8Pスタート"
-
-#: src/emu/inpttype.ipp:420
-msgctxt "input-name"
-msgid "P8 Select"
-msgstr "8Pセレクト"
-
-#: src/emu/inpttype.ipp:425
-msgctxt "input-name"
-msgid "P9 Up"
-msgstr "9P上"
-
-#: src/emu/inpttype.ipp:426
-msgctxt "input-name"
-msgid "P9 Down"
-msgstr "9P下"
-
-#: src/emu/inpttype.ipp:427
-msgctxt "input-name"
-msgid "P9 Left"
-msgstr "9P左"
-
-#: src/emu/inpttype.ipp:428
-msgctxt "input-name"
-msgid "P9 Right"
-msgstr "9P右"
-
-#: src/emu/inpttype.ipp:429
-msgctxt "input-name"
-msgid "P9 Right Stick/Up"
-msgstr "9P右レバー／上"
-
-#: src/emu/inpttype.ipp:430
-msgctxt "input-name"
-msgid "P9 Right Stick/Down"
-msgstr "9P右レバー／下"
-
-#: src/emu/inpttype.ipp:431
-msgctxt "input-name"
-msgid "P9 Right Stick/Left"
-msgstr "9P右レバー／左"
-
-#: src/emu/inpttype.ipp:432
-msgctxt "input-name"
-msgid "P9 Right Stick/Right"
-msgstr "9P右レバー／右"
-
-#: src/emu/inpttype.ipp:433
-msgctxt "input-name"
-msgid "P9 Left Stick/Up"
-msgstr "9P左レバー／上"
-
-#: src/emu/inpttype.ipp:434
-msgctxt "input-name"
-msgid "P9 Left Stick/Down"
-msgstr "9P左レバー／下"
-
-#: src/emu/inpttype.ipp:435
-msgctxt "input-name"
-msgid "P9 Left Stick/Left"
-msgstr "9P左レバー／左"
-
-#: src/emu/inpttype.ipp:436
-msgctxt "input-name"
-msgid "P9 Left Stick/Right"
-msgstr "9P左レバー／右"
-
-#: src/emu/inpttype.ipp:437
-msgctxt "input-name"
-msgid "P9 Button 1"
-msgstr "9Pボタン1"
-
-#: src/emu/inpttype.ipp:438
-msgctxt "input-name"
-msgid "P9 Button 2"
-msgstr "9Pボタン2"
-
-#: src/emu/inpttype.ipp:439
-msgctxt "input-name"
-msgid "P9 Button 3"
-msgstr "9Pボタン3"
-
-#: src/emu/inpttype.ipp:440
-msgctxt "input-name"
-msgid "P9 Button 4"
-msgstr "9Pボタン4"
-
-#: src/emu/inpttype.ipp:441
-msgctxt "input-name"
-msgid "P9 Button 5"
-msgstr "9Pボタン5"
-
-#: src/emu/inpttype.ipp:442
-msgctxt "input-name"
-msgid "P9 Button 6"
-msgstr "9Pボタン6"
-
-#: src/emu/inpttype.ipp:443
-msgctxt "input-name"
-msgid "P9 Button 7"
-msgstr "9Pボタン7"
-
-#: src/emu/inpttype.ipp:444
-msgctxt "input-name"
-msgid "P9 Button 8"
-msgstr "9Pボタン8"
-
-#: src/emu/inpttype.ipp:445
-msgctxt "input-name"
-msgid "P9 Button 9"
-msgstr "9Pボタン9"
-
-#: src/emu/inpttype.ipp:446
-msgctxt "input-name"
-msgid "P9 Button 10"
-msgstr "9Pボタン10"
-
-#: src/emu/inpttype.ipp:447
-msgctxt "input-name"
-msgid "P9 Button 11"
-msgstr "9Pボタン11"
-
-#: src/emu/inpttype.ipp:448
-msgctxt "input-name"
-msgid "P9 Button 12"
-msgstr "9Pボタン12"
-
-#: src/emu/inpttype.ipp:449
-msgctxt "input-name"
-msgid "P9 Button 13"
-msgstr "9Pボタン13"
-
-#: src/emu/inpttype.ipp:450
-msgctxt "input-name"
-msgid "P9 Button 14"
-msgstr "9Pボタン14"
-
-#: src/emu/inpttype.ipp:451
-msgctxt "input-name"
-msgid "P9 Button 15"
-msgstr "9Pボタン15"
-
-#: src/emu/inpttype.ipp:452
-msgctxt "input-name"
-msgid "P9 Button 16"
-msgstr "9Pボタン16"
-
-#: src/emu/inpttype.ipp:453
-msgctxt "input-name"
-msgid "P9 Start"
-msgstr "9Pスタート"
-
-#: src/emu/inpttype.ipp:454
-msgctxt "input-name"
-msgid "P9 Select"
-msgstr "9Pセレクト"
-
-#: src/emu/inpttype.ipp:459
-msgctxt "input-name"
-msgid "P10 Up"
-msgstr "10P上"
-
-#: src/emu/inpttype.ipp:460
-msgctxt "input-name"
-msgid "P10 Down"
-msgstr "10P下"
-
-#: src/emu/inpttype.ipp:461
-msgctxt "input-name"
-msgid "P10 Left"
-msgstr "10P左"
-
-#: src/emu/inpttype.ipp:462
-msgctxt "input-name"
-msgid "P10 Right"
-msgstr "10P右"
-
-#: src/emu/inpttype.ipp:463
-msgctxt "input-name"
-msgid "P10 Right Stick/Up"
-msgstr "10P右レバー／上"
-
-#: src/emu/inpttype.ipp:464
-msgctxt "input-name"
-msgid "P10 Right Stick/Down"
-msgstr "10P右レバー／下"
-
-#: src/emu/inpttype.ipp:465
-msgctxt "input-name"
-msgid "P10 Right Stick/Left"
-msgstr "10P右レバー／左"
-
-#: src/emu/inpttype.ipp:466
-msgctxt "input-name"
-msgid "P10 Right Stick/Right"
-msgstr "10P右レバー／右"
-
-#: src/emu/inpttype.ipp:467
-msgctxt "input-name"
-msgid "P10 Left Stick/Up"
-msgstr "10P左レバー／上"
-
-#: src/emu/inpttype.ipp:468
-msgctxt "input-name"
-msgid "P10 Left Stick/Down"
-msgstr "10P左レバー／下"
-
-#: src/emu/inpttype.ipp:469
-msgctxt "input-name"
-msgid "P10 Left Stick/Left"
-msgstr "10P左レバー／左"
-
-#: src/emu/inpttype.ipp:470
-msgctxt "input-name"
-msgid "P10 Left Stick/Right"
-msgstr "10P左レバー／右"
-
-#: src/emu/inpttype.ipp:471
-msgctxt "input-name"
-msgid "P10 Button 1"
-msgstr "10Pボタン1"
-
-#: src/emu/inpttype.ipp:472
-msgctxt "input-name"
-msgid "P10 Button 2"
-msgstr "10Pボタン2"
-
-#: src/emu/inpttype.ipp:473
-msgctxt "input-name"
-msgid "P10 Button 3"
-msgstr "10Pボタン3"
-
-#: src/emu/inpttype.ipp:474
-msgctxt "input-name"
-msgid "P10 Button 4"
-msgstr "10Pボタン4"
-
-#: src/emu/inpttype.ipp:475
-msgctxt "input-name"
-msgid "P10 Button 5"
-msgstr "10Pボタン5"
-
-#: src/emu/inpttype.ipp:476
-msgctxt "input-name"
-msgid "P10 Button 6"
-msgstr "10Pボタン6"
-
-#: src/emu/inpttype.ipp:477
-msgctxt "input-name"
-msgid "P10 Button 7"
-msgstr "10Pボタン7"
-
-#: src/emu/inpttype.ipp:478
-msgctxt "input-name"
-msgid "P10 Button 8"
-msgstr "10Pボタン8"
-
-#: src/emu/inpttype.ipp:479
-msgctxt "input-name"
-msgid "P10 Button 9"
-msgstr "10Pボタン9"
-
-#: src/emu/inpttype.ipp:480
-msgctxt "input-name"
-msgid "P10 Button 10"
-msgstr "10Pボタン10"
-
-#: src/emu/inpttype.ipp:481
-msgctxt "input-name"
-msgid "P10 Button 11"
-msgstr "10Pボタン11"
-
-#: src/emu/inpttype.ipp:482
-msgctxt "input-name"
-msgid "P10 Button 12"
-msgstr "10Pボタン12"
-
-#: src/emu/inpttype.ipp:483
-msgctxt "input-name"
-msgid "P10 Button 13"
-msgstr "10Pボタン13"
-
-#: src/emu/inpttype.ipp:484
-msgctxt "input-name"
-msgid "P10 Button 14"
-msgstr "10Pボタン14"
-
-#: src/emu/inpttype.ipp:485
-msgctxt "input-name"
-msgid "P10 Button 15"
-msgstr "10Pボタン15"
-
-#: src/emu/inpttype.ipp:486
-msgctxt "input-name"
-msgid "P10 Button 16"
-msgstr "10Pボタン16"
-
-#: src/emu/inpttype.ipp:487
-msgctxt "input-name"
-msgid "P10 Start"
-msgstr "10Pスタート"
-
-#: src/emu/inpttype.ipp:488
-msgctxt "input-name"
-msgid "P10 Select"
-msgstr "10Pセレクト"
-
 #: src/emu/inpttype.ipp:493
 msgctxt "input-name"
 msgid "1 Player Start"
@@ -5553,155 +4178,32 @@ msgctxt "input-name"
 msgid "Volume Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:550
-msgctxt "input-name"
-msgid "P1 Pedal 1"
-msgstr "1Pペダル1"
-
-#: src/emu/inpttype.ipp:551
-msgctxt "input-name"
-msgid "P2 Pedal 1"
-msgstr "2Pペダル1"
-
-#: src/emu/inpttype.ipp:552
-msgctxt "input-name"
-msgid "P3 Pedal 1"
-msgstr "3Pペダル1"
-
-#: src/emu/inpttype.ipp:553
-msgctxt "input-name"
-msgid "P4 Pedal 1"
-msgstr "4Pペダル1"
-
-#: src/emu/inpttype.ipp:554
-msgctxt "input-name"
-msgid "P5 Pedal 1"
-msgstr "5Pペダル1"
-
-#: src/emu/inpttype.ipp:555
-msgctxt "input-name"
-msgid "P6 Pedal 1"
-msgstr "6Pペダル1"
-
-#: src/emu/inpttype.ipp:556
-msgctxt "input-name"
-msgid "P7 Pedal 1"
-msgstr "7Pペダル1"
-
-#: src/emu/inpttype.ipp:557
-msgctxt "input-name"
-msgid "P8 Pedal 1"
-msgstr "8Pペダル1"
-
-#: src/emu/inpttype.ipp:558
-msgctxt "input-name"
-msgid "P9 Pedal 1"
-msgstr "9Pペダル1"
-
+#: src/emu/inpttype.ipp:550 src/emu/inpttype.ipp:551 src/emu/inpttype.ipp:552
+#: src/emu/inpttype.ipp:553 src/emu/inpttype.ipp:554 src/emu/inpttype.ipp:555
+#: src/emu/inpttype.ipp:556 src/emu/inpttype.ipp:557 src/emu/inpttype.ipp:558
 #: src/emu/inpttype.ipp:559
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 1"
-msgstr "10Pペダル1"
-
-#: src/emu/inpttype.ipp:564
-msgctxt "input-name"
-msgid "P1 Pedal 2"
-msgstr "1Pペダル2"
-
-#: src/emu/inpttype.ipp:565
-msgctxt "input-name"
-msgid "P2 Pedal 2"
-msgstr "2Pペダル2"
-
-#: src/emu/inpttype.ipp:566
-msgctxt "input-name"
-msgid "P3 Pedal 2"
-msgstr "3Pペダル2"
-
-#: src/emu/inpttype.ipp:567
-msgctxt "input-name"
-msgid "P4 Pedal 2"
-msgstr "4Pペダル2"
-
-#: src/emu/inpttype.ipp:568
-msgctxt "input-name"
-msgid "P5 Pedal 2"
-msgstr "5Pペダル2"
-
-#: src/emu/inpttype.ipp:569
-msgctxt "input-name"
-msgid "P6 Pedal 2"
-msgstr "6Pペダル2"
-
-#: src/emu/inpttype.ipp:570
-msgctxt "input-name"
-msgid "P7 Pedal 2"
-msgstr "7Pペダル2"
-
-#: src/emu/inpttype.ipp:571
-msgctxt "input-name"
-msgid "P8 Pedal 2"
-msgstr "8Pペダル2"
-
-#: src/emu/inpttype.ipp:572
-msgctxt "input-name"
-msgid "P9 Pedal 2"
-msgstr "9Pペダル2"
+msgid "%p Pedal 1"
+msgstr "%pペダル1"
 
+#: src/emu/inpttype.ipp:564 src/emu/inpttype.ipp:565 src/emu/inpttype.ipp:566
+#: src/emu/inpttype.ipp:567 src/emu/inpttype.ipp:568 src/emu/inpttype.ipp:569
+#: src/emu/inpttype.ipp:570 src/emu/inpttype.ipp:571 src/emu/inpttype.ipp:572
 #: src/emu/inpttype.ipp:573
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 2"
-msgstr "10Pペダル2"
-
-#: src/emu/inpttype.ipp:578
-msgctxt "input-name"
-msgid "P1 Pedal 3"
-msgstr "1Pペダル3"
-
-#: src/emu/inpttype.ipp:579
-msgctxt "input-name"
-msgid "P2 Pedal 3"
-msgstr "2Pペダル3"
-
-#: src/emu/inpttype.ipp:580
-msgctxt "input-name"
-msgid "P3 Pedal 3"
-msgstr "3Pペダル3"
-
-#: src/emu/inpttype.ipp:581
-msgctxt "input-name"
-msgid "P4 Pedal 3"
-msgstr "4Pペダル3"
-
-#: src/emu/inpttype.ipp:582
-msgctxt "input-name"
-msgid "P5 Pedal 3"
-msgstr "5Pペダル3"
-
-#: src/emu/inpttype.ipp:583
-msgctxt "input-name"
-msgid "P6 Pedal 3"
-msgstr "6Pペダル3"
-
-#: src/emu/inpttype.ipp:584
-msgctxt "input-name"
-msgid "P7 Pedal 3"
-msgstr "7Pペダル3"
-
-#: src/emu/inpttype.ipp:585
-msgctxt "input-name"
-msgid "P8 Pedal 3"
-msgstr "8Pペダル3"
-
-#: src/emu/inpttype.ipp:586
-msgctxt "input-name"
-msgid "P9 Pedal 3"
-msgstr "9Pペダル3"
+msgid "%p Pedal 2"
+msgstr "%pペダル2"
 
+#: src/emu/inpttype.ipp:578 src/emu/inpttype.ipp:579 src/emu/inpttype.ipp:580
+#: src/emu/inpttype.ipp:581 src/emu/inpttype.ipp:582 src/emu/inpttype.ipp:583
+#: src/emu/inpttype.ipp:584 src/emu/inpttype.ipp:585 src/emu/inpttype.ipp:586
 #: src/emu/inpttype.ipp:587
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 3"
-msgstr "10Pペダル3"
+msgid "%p Pedal 3"
+msgstr "%pペダル3"
 
 #: src/emu/inpttype.ipp:592
 msgctxt "input-name"
@@ -7594,6 +6096,50 @@ msgid ""
 "%s"
 msgstr ""
 
+#~ msgid "Confirm quit from machines"
+#~ msgstr "マシン終了時に確認"
+
+#~ msgid "Skip information screen at startup"
+#~ msgstr "起動時に情報画面をスキップ"
+
+#~ msgid "Skip software parts selection menu"
+#~ msgstr "ソフトウェアパーツ選択メニューをスキップする"
+
+#~ msgid "Simultaneous contradictory"
+#~ msgstr "対称方向の同時入力"
+
+#, c-format
+#~ msgid ""
+#~ "Auditing ROMs for machine %2$u of %3$u...\n"
+#~ "%1$s"
+#~ msgstr ""
+#~ "マシン%2$u／%3$uのROMを検査中...\n"
+#~ "%1$s"
+
+#, c-format
+#~ msgid "Audit ROMs for %1$u machines marked unavailable"
+#~ msgstr "存在しないに分類された%1$uマシンのROMを検査します"
+
+#, c-format
+#~ msgid "Audit ROMs for all %1$u machines"
+#~ msgstr "全%1$uマシンのROMを検査します"
+
+#~ msgid "Input (this Machine)"
+#~ msgstr "入力（現在のマシン）"
+
+#~ msgid "ROM Audit Result\tOK\n"
+#~ msgstr "ROM検証結果\t正常\n"
+
+#~ msgid "ROM Audit Result\tBAD\n"
+#~ msgstr "ROM検証結果\t異常\n"
+
+#~ msgid ""
+#~ "ROM Audit \tDisabled\n"
+#~ "Samples Audit \tDisabled\n"
+#~ msgstr ""
+#~ "ROM検証\t無効\n"
+#~ "サンプル検証\t無効\n"
+
 #~ msgid "Device Mapping"
 #~ msgstr "デバイスマッピング"
 
diff --git a/language/Korean/strings.po b/language/Korean/strings.po
index cb3c654d74b..fa7ef5b0faa 100644
--- a/language/Korean/strings.po
+++ b/language/Korean/strings.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-19 02:50+1100\n"
+"POT-Creation-Date: 2021-12-09 04:44+1100\n"
 "PO-Revision-Date: 2016-02-20 18:03+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: MAME Language Team\n"
@@ -272,12 +272,12 @@ msgstr "%1$s %2$s ( %3$d / %4$d 소프트웨어 패키지 )"
 msgid "Driver: \"%1$s\" software list "
 msgstr "드라이버: \"%1$s\" 소프트웨어 목록 "
 
-#: src/frontend/mame/ui/selsoft.cpp:711 src/frontend/mame/ui/selgame.cpp:1066
+#: src/frontend/mame/ui/selsoft.cpp:711 src/frontend/mame/ui/selgame.cpp:1076
 #, c-format
 msgid "%1$s: %2$s - Search: %3$s_"
 msgstr "%1$s: %2$s - 검색: %3$s_"
 
-#: src/frontend/mame/ui/selsoft.cpp:713 src/frontend/mame/ui/selgame.cpp:1068
+#: src/frontend/mame/ui/selsoft.cpp:713 src/frontend/mame/ui/selgame.cpp:1078
 #, c-format
 msgid "Search: %1$s_"
 msgstr "검색: %1$s_"
@@ -287,7 +287,7 @@ msgstr "검색: %1$s_"
 msgid "Software list/item: %1$s:%2$s"
 msgstr ""
 
-#: src/frontend/mame/ui/optsmenu.cpp:73 src/frontend/mame/ui/sndmenu.cpp:165
+#: src/frontend/mame/ui/optsmenu.cpp:73 src/frontend/mame/ui/sndmenu.cpp:161
 msgid "Sound Options"
 msgstr "사운드 설정"
 
@@ -382,12 +382,12 @@ msgid "Show mouse pointer"
 msgstr "마우스 포인터 보이기"
 
 #: src/frontend/mame/ui/submenu.cpp:39
-msgid "Confirm quit from machines"
-msgstr "장치 종료시 재확인"
+msgid "Confirm quit from emulation"
+msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:40
-msgid "Skip information screen at startup"
-msgstr "가동시 정보 화면 건너뛰기"
+msgid "Skip system information screen"
+msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:41
 msgid "Force 4:3 aspect for snapshot display"
@@ -402,7 +402,7 @@ msgid "Skip BIOS selection menu"
 msgstr "BIOS 선택 메뉴 건너뛰기"
 
 #: src/frontend/mame/ui/submenu.cpp:44
-msgid "Skip software parts selection menu"
+msgid "Skip software part selection menu"
 msgstr "소프트웨어 요소 선택 메뉴 건너뛰기"
 
 #: src/frontend/mame/ui/submenu.cpp:45
@@ -554,7 +554,7 @@ msgid "UI active"
 msgstr "UI 활성"
 
 #: src/frontend/mame/ui/submenu.cpp:91
-msgid "Offscreen reload"
+msgid "Off-screen reload"
 msgstr "화면 밖에서 재실행"
 
 #: src/frontend/mame/ui/submenu.cpp:92
@@ -570,8 +570,8 @@ msgid "Natural keyboard"
 msgstr "실재 키보드"
 
 #: src/frontend/mame/ui/submenu.cpp:95
-msgid "Simultaneous contradictory"
-msgstr "대칭방향 동시입력"
+msgid "Allow contradictory joystick inputs"
+msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:96
 msgid "Coin impulse"
@@ -594,7 +594,7 @@ msgid "Pedal Device Assignment"
 msgstr "페달 장치 조정"
 
 #: src/frontend/mame/ui/submenu.cpp:106
-msgid "Adstick Device Assignment"
+msgid "AD Stick Device Assignment"
 msgstr "아날로그 스틱 장치 조정"
 
 #: src/frontend/mame/ui/submenu.cpp:107
@@ -681,14 +681,14 @@ msgstr "새로고침 동기화"
 msgid "Wait Vertical Sync"
 msgstr "수직동기화 기다림"
 
-#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:687
+#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:689
 #: src/frontend/mame/ui/videoopt.cpp:191 src/frontend/mame/ui/custui.cpp:490
 #: src/frontend/mame/ui/analogipt.cpp:471 plugins/cheatfind/init.lua:766
 #: plugins/cheatfind/init.lua:777 plugins/cheat/init.lua:668
 msgid "On"
 msgstr "켜기"
 
-#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:690
+#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:692
 #: src/frontend/mame/ui/videoopt.cpp:207 src/frontend/mame/ui/custui.cpp:490
 #: src/frontend/mame/ui/analogipt.cpp:471 plugins/cheatfind/init.lua:763
 #: plugins/cheatfind/init.lua:774 plugins/cheat/init.lua:671
@@ -696,11 +696,11 @@ msgstr "켜기"
 msgid "Off"
 msgstr "끄기"
 
-#: src/frontend/mame/ui/menu.cpp:693
+#: src/frontend/mame/ui/menu.cpp:695
 msgid "Auto"
 msgstr "자동"
 
-#: src/frontend/mame/ui/menu.cpp:1195
+#: src/frontend/mame/ui/menu.cpp:1197
 #: src/frontend/mame/ui/simpleselgame.cpp:278
 #: src/frontend/mame/ui/selmenu.cpp:1280
 msgid "Return to Previous Menu"
@@ -708,7 +708,7 @@ msgstr "이전 메뉴로 돌아가기"
 
 #: src/frontend/mame/ui/filemngr.cpp:139
 #: src/frontend/mame/ui/confswitch.cpp:119
-#: src/frontend/mame/ui/inputmap.cpp:559 src/frontend/mame/ui/analogipt.cpp:360
+#: src/frontend/mame/ui/inputmap.cpp:563 src/frontend/mame/ui/analogipt.cpp:360
 #, c-format
 msgid "[root%1$s]"
 msgstr ""
@@ -971,22 +971,22 @@ msgstr ""
 "CPU:\n"
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "GHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "MHz"
 msgstr "MHz"
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "kHz"
 msgstr "kHZ"
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "Hz"
 msgstr ""
 
@@ -1014,38 +1014,38 @@ msgstr "없음\n"
 msgid "Vector"
 msgstr "벡터"
 
-#: src/frontend/mame/ui/info.cpp:480
+#: src/frontend/mame/ui/info.cpp:483
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr "%1$s: %2$s\n"
 
-#: src/frontend/mame/ui/info.cpp:480
+#: src/frontend/mame/ui/info.cpp:483
 msgid "%2$s\n"
 msgstr "%2$s\n"
 
-#: src/frontend/mame/ui/info.cpp:497
+#: src/frontend/mame/ui/info.cpp:500
 #, c-format
 msgid "Screen '%1$s'"
 msgstr "화면 '%1$s'"
 
-#: src/frontend/mame/ui/info.cpp:499
+#: src/frontend/mame/ui/info.cpp:502
 msgid "Screen"
 msgstr "화면"
 
-#: src/frontend/mame/ui/info.cpp:570 src/frontend/mame/ui/info.cpp:581
+#: src/frontend/mame/ui/info.cpp:573 src/frontend/mame/ui/info.cpp:584
 #, c-format
 msgid "%1$s:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:662
+#: src/frontend/mame/ui/info.cpp:665
 msgid "Not supported"
 msgstr "지원 안 함"
 
-#: src/frontend/mame/ui/info.cpp:665
+#: src/frontend/mame/ui/info.cpp:668
 msgid "Partially supported"
 msgstr "부분적으로 지원함"
 
-#: src/frontend/mame/ui/info.cpp:674
+#: src/frontend/mame/ui/info.cpp:677
 msgid "[empty]"
 msgstr "[공백]"
 
@@ -1118,7 +1118,7 @@ msgid "Emulated"
 msgstr "에뮬레이션"
 
 #: src/frontend/mame/ui/keyboard.cpp:59 src/frontend/mame/ui/confswitch.cpp:117
-#: src/frontend/mame/ui/inputmap.cpp:557 src/frontend/mame/ui/analogipt.cpp:358
+#: src/frontend/mame/ui/inputmap.cpp:561 src/frontend/mame/ui/analogipt.cpp:358
 #, c-format
 msgid "%1$s [root%2$s]"
 msgstr ""
@@ -1478,7 +1478,7 @@ msgctxt "swlist-info"
 msgid "Software list/item"
 msgstr ""
 
-#: src/frontend/mame/ui/datmenu.cpp:88 src/frontend/mame/ui/selmenu.cpp:2698
+#: src/frontend/mame/ui/datmenu.cpp:88 src/frontend/mame/ui/selmenu.cpp:2707
 msgid "Software List Info"
 msgstr ""
 
@@ -1599,7 +1599,7 @@ msgstr ""
 msgid "Configure Machine:"
 msgstr ""
 
-#: src/frontend/mame/ui/miscmenu.cpp:858 src/frontend/mame/ui/selmenu.cpp:2638
+#: src/frontend/mame/ui/miscmenu.cpp:858 src/frontend/mame/ui/selmenu.cpp:2647
 msgid " (default)"
 msgstr " (기본)"
 
@@ -1620,7 +1620,7 @@ msgstr ""
 "%1$s를 누르면 종료\n"
 "%2$s를 누르면 원래 화면으로 복귀"
 
-#: src/frontend/mame/ui/info_pty.cpp:30 src/frontend/mame/ui/mainmenu.cpp:155
+#: src/frontend/mame/ui/info_pty.cpp:30
 msgid "Pseudo terminals"
 msgstr "유사 터미널"
 
@@ -1688,52 +1688,52 @@ msgstr ""
 msgid "Other Controls"
 msgstr "기타 조작"
 
-#: src/frontend/mame/ui/inputmap.cpp:227
+#: src/frontend/mame/ui/inputmap.cpp:231
 msgid "This machine has no configurable inputs."
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:327
+#: src/frontend/mame/ui/inputmap.cpp:331
 msgid "Pressed"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:397
+#: src/frontend/mame/ui/inputmap.cpp:401
 msgid "Invalid sequence entered"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:542
+#: src/frontend/mame/ui/inputmap.cpp:546
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:543
+#: src/frontend/mame/ui/inputmap.cpp:547
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog Inc"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:544
+#: src/frontend/mame/ui/inputmap.cpp:548
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog Dec"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:586
+#: src/frontend/mame/ui/inputmap.cpp:590
 #, c-format
 msgid "Press %1$s to set\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:587
+#: src/frontend/mame/ui/inputmap.cpp:591
 #, c-format
 msgid "Press %1$s to append\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:588
+#: src/frontend/mame/ui/inputmap.cpp:592
 #, c-format
 msgid "Press %1$s to clear\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:589
+#: src/frontend/mame/ui/inputmap.cpp:593
 #, c-format
 msgid "Press %1$s to restore default\n"
 msgstr ""
@@ -1801,7 +1801,7 @@ msgstr ""
 "아무 키를 누르면 진행합니다."
 
 #: src/frontend/mame/ui/simpleselgame.cpp:273
-#: src/frontend/mame/ui/selgame.cpp:436
+#: src/frontend/mame/ui/selgame.cpp:443
 msgid "Configure Options"
 msgstr "옵션 환경설정"
 
@@ -2135,16 +2135,16 @@ msgstr ""
 msgid "Expand to fit"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:437
+#: src/frontend/mame/ui/selgame.cpp:444
 msgid "Configure Machine"
 msgstr "장치 환경설정"
 
-#: src/frontend/mame/ui/selgame.cpp:1050
+#: src/frontend/mame/ui/selgame.cpp:1060
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d machines (%5$d BIOS) )"
 msgstr "%1$s %2$s ( %3$d / %4$d 장치 (%5$d BIOS) "
 
-#: src/frontend/mame/ui/selgame.cpp:1078
+#: src/frontend/mame/ui/selgame.cpp:1088
 #, c-format
 msgid "System: %1$-.100s"
 msgstr "시스템: %1$-.100s"
@@ -2166,11 +2166,9 @@ msgstr "결과는 %1$s에 저장됩니다"
 #: src/frontend/mame/ui/auditmenu.cpp:98
 #, c-format
 msgid ""
-"Auditing ROMs for machine %2$u of %3$u...\n"
+"Auditing media for machine %2$u of %3$u...\n"
 "%1$s"
 msgstr ""
-"%3$u %2$u 장치의 ROM을 검사중...\n"
-"%1$s"
 
 #: src/frontend/mame/ui/auditmenu.cpp:116
 #, c-format
@@ -2183,12 +2181,12 @@ msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:136
 #, c-format
-msgid "Audit ROMs for %1$u machines marked unavailable"
+msgid "Audit media for %1$u machines marked unavailable"
 msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:137
 #, c-format
-msgid "Audit ROMs for all %1$u machines"
+msgid "Audit media for all %1$u machines"
 msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:154
@@ -2395,84 +2393,84 @@ msgctxt "color-sample"
 msgid "Clone"
 msgstr "클론"
 
-#: src/frontend/mame/ui/custui.cpp:914
+#: src/frontend/mame/ui/custui.cpp:906
 msgid "ARGB Settings"
 msgstr "ARGB 설정"
 
-#: src/frontend/mame/ui/custui.cpp:919 src/frontend/mame/ui/custui.cpp:922
+#: src/frontend/mame/ui/custui.cpp:911 src/frontend/mame/ui/custui.cpp:914
 msgctxt "color-channel"
 msgid "Alpha"
 msgstr "불투명도"
 
-#: src/frontend/mame/ui/custui.cpp:927 src/frontend/mame/ui/custui.cpp:930
+#: src/frontend/mame/ui/custui.cpp:919 src/frontend/mame/ui/custui.cpp:922
 msgctxt "color-channel"
 msgid "Red"
 msgstr "적"
 
-#: src/frontend/mame/ui/custui.cpp:935 src/frontend/mame/ui/custui.cpp:938
+#: src/frontend/mame/ui/custui.cpp:927 src/frontend/mame/ui/custui.cpp:930
 msgctxt "color-channel"
 msgid "Green"
 msgstr "녹"
 
-#: src/frontend/mame/ui/custui.cpp:943 src/frontend/mame/ui/custui.cpp:946
+#: src/frontend/mame/ui/custui.cpp:935 src/frontend/mame/ui/custui.cpp:938
 msgctxt "color-channel"
 msgid "Blue"
 msgstr "청"
 
-#: src/frontend/mame/ui/custui.cpp:949
+#: src/frontend/mame/ui/custui.cpp:941
 msgid "Choose from palette"
 msgstr "팔레트에서 고르기"
 
-#: src/frontend/mame/ui/custui.cpp:996
+#: src/frontend/mame/ui/custui.cpp:988
 msgid "Color preview:"
 msgstr "색상 미리보기:"
 
-#: src/frontend/mame/ui/custui.cpp:1093
+#: src/frontend/mame/ui/custui.cpp:1085
 msgctxt "color-preset"
 msgid "White"
 msgstr "하양"
 
-#: src/frontend/mame/ui/custui.cpp:1094
+#: src/frontend/mame/ui/custui.cpp:1086
 msgctxt "color-preset"
 msgid "Silver"
 msgstr "은색"
 
-#: src/frontend/mame/ui/custui.cpp:1095
+#: src/frontend/mame/ui/custui.cpp:1087
 msgctxt "color-preset"
 msgid "Gray"
 msgstr "회색"
 
-#: src/frontend/mame/ui/custui.cpp:1096
+#: src/frontend/mame/ui/custui.cpp:1088
 msgctxt "color-preset"
 msgid "Black"
 msgstr "검정"
 
-#: src/frontend/mame/ui/custui.cpp:1097
+#: src/frontend/mame/ui/custui.cpp:1089
 msgctxt "color-preset"
 msgid "Red"
 msgstr "적"
 
-#: src/frontend/mame/ui/custui.cpp:1098
+#: src/frontend/mame/ui/custui.cpp:1090
 msgctxt "color-preset"
 msgid "Orange"
 msgstr "주황"
 
-#: src/frontend/mame/ui/custui.cpp:1099
+#: src/frontend/mame/ui/custui.cpp:1091
 msgctxt "color-preset"
 msgid "Yellow"
 msgstr "노랑"
 
-#: src/frontend/mame/ui/custui.cpp:1100
+#: src/frontend/mame/ui/custui.cpp:1092
 msgctxt "color-preset"
 msgid "Green"
 msgstr "녹"
 
-#: src/frontend/mame/ui/custui.cpp:1101
+#: src/frontend/mame/ui/custui.cpp:1093
 msgctxt "color-preset"
 msgid "Blue"
 msgstr "청"
 
-#: src/frontend/mame/ui/custui.cpp:1102
+#: src/frontend/mame/ui/custui.cpp:1094
 msgctxt "color-preset"
 msgid "Violet"
 msgstr "보라"
@@ -2537,7 +2535,7 @@ msgid "Input (general)"
 msgstr "입력 (일반)"
 
 #: src/frontend/mame/ui/mainmenu.cpp:123
-msgid "Input (this Machine)"
+msgid "Input (this machine)"
 msgstr "입력 (현재 장치)"
 
 #: src/frontend/mame/ui/mainmenu.cpp:126
@@ -2576,6 +2574,10 @@ msgstr "파일 관리자"
 msgid "Tape Control"
 msgstr "테이프 조작"
 
+#: src/frontend/mame/ui/mainmenu.cpp:155
+msgid "Pseudo Terminals"
+msgstr ""
+
 #: src/frontend/mame/ui/mainmenu.cpp:158
 msgid "BIOS Selection"
 msgstr "바이오스 선택"
@@ -2614,7 +2616,7 @@ msgstr "외부 DAT 화면"
 
 #: src/frontend/mame/ui/mainmenu.cpp:200
 #, c-format
-msgid "About %s"
+msgid "About %1$s"
 msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:212
@@ -2774,375 +2776,373 @@ msgstr "이 드라이버는 다음의 복제입니다: %1$s"
 msgid "%1$s %2$s"
 msgstr "%1$s %2$s"
 
-#: src/frontend/mame/ui/selmenu.cpp:2235
+#: src/frontend/mame/ui/selmenu.cpp:2244
 msgid "Images"
 msgstr "사진"
 
-#: src/frontend/mame/ui/selmenu.cpp:2236
+#: src/frontend/mame/ui/selmenu.cpp:2245
 msgid "Infos"
 msgstr "정보"
 
-#: src/frontend/mame/ui/selmenu.cpp:2551
+#: src/frontend/mame/ui/selmenu.cpp:2560
 msgid ""
 "Required ROM/disk images for the selected system are missing or incorrect. "
 "Please acquire the correct files or select a different system.\n"
 "\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2567
+#: src/frontend/mame/ui/selmenu.cpp:2576
 msgid ""
 "Required ROM/disk images for the selected software are missing or incorrect. "
 "Please acquire the correct files or select a different software item.\n"
 "\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2583
+#: src/frontend/mame/ui/selmenu.cpp:2592
 msgid "incorrect checksum"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2586
+#: src/frontend/mame/ui/selmenu.cpp:2595
 msgid "incorrect length"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2589
+#: src/frontend/mame/ui/selmenu.cpp:2598
 msgid "not found"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2600
+#: src/frontend/mame/ui/selmenu.cpp:2609
 #, c-format
 msgid "%1$s (%2$s) - %3$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2602
+#: src/frontend/mame/ui/selmenu.cpp:2611
 #, c-format
 msgid "%1$s - %2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2606
+#: src/frontend/mame/ui/selmenu.cpp:2615
 msgid "Press any key to continue."
 msgstr "아무 키를 누르면 진행합니다."
 
-#: src/frontend/mame/ui/selmenu.cpp:2735
+#: src/frontend/mame/ui/selmenu.cpp:2744
 msgid "General Info"
 msgstr "일반 정보"
 
-#: src/frontend/mame/ui/selmenu.cpp:2887
+#: src/frontend/mame/ui/selmenu.cpp:2896
 #, c-format
 msgid "Romset\t%1$s\n"
 msgstr "롬셋\t%1$s\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2888
+#: src/frontend/mame/ui/selmenu.cpp:2897
 #, c-format
 msgid "Year\t%1$s\n"
 msgstr "연도\t%1$s\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2889
+#: src/frontend/mame/ui/selmenu.cpp:2898
 #, c-format
 msgid "Manufacturer\t%1$s\n"
 msgstr "제조사\t%1$s\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2896
+#: src/frontend/mame/ui/selmenu.cpp:2905
 #, c-format
 msgid "Driver is Clone of\t%1$s\n"
 msgstr "다음 드라이버의 복제\t%1$s\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2901
+#: src/frontend/mame/ui/selmenu.cpp:2910
 msgid "Driver is Parent\t\n"
 msgstr "원형 드라이버\t\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2905
+#: src/frontend/mame/ui/selmenu.cpp:2914
 msgid "Analog Controls\tYes\n"
 msgstr "아날로그 조작\t예\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2907
+#: src/frontend/mame/ui/selmenu.cpp:2916
 msgid "Keyboard Inputs\tYes\n"
 msgstr "키보드 입력\t예\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2910
+#: src/frontend/mame/ui/selmenu.cpp:2919
 msgid "Overall\tNOT WORKING\n"
 msgstr "종합\t작동 불가\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2912
+#: src/frontend/mame/ui/selmenu.cpp:2921
 msgid "Overall\tUnemulated Protection\n"
 msgstr "종합\t보호처리 에뮬레이션 미완\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2914
+#: src/frontend/mame/ui/selmenu.cpp:2923
 msgid "Overall\tWorking\n"
 msgstr "종합\t작동\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2917
+#: src/frontend/mame/ui/selmenu.cpp:2926
 msgid "Graphics\tUnimplemented\n"
 msgstr "그래픽\t적용 안 됨\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2919
+#: src/frontend/mame/ui/selmenu.cpp:2928
 msgid "Graphics\tWrong Colors\n"
 msgstr "그래픽\t잘못된 색상\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2921
+#: src/frontend/mame/ui/selmenu.cpp:2930
 msgid "Graphics\tImperfect Colors\n"
 msgstr "그래픽\t불완전한 색상\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2923
+#: src/frontend/mame/ui/selmenu.cpp:2932
 msgid "Graphics\tImperfect\n"
 msgstr "그래픽\t불완전\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2925
+#: src/frontend/mame/ui/selmenu.cpp:2934
 msgid "Graphics\tOK\n"
 msgstr "그래픽\t양호\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2928
+#: src/frontend/mame/ui/selmenu.cpp:2937
 msgid "Sound\tNone\n"
 msgstr "사운드\t없음\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2930
+#: src/frontend/mame/ui/selmenu.cpp:2939
 msgid "Sound\tUnimplemented\n"
 msgstr "사운드\t적용 안 됨\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2932
+#: src/frontend/mame/ui/selmenu.cpp:2941
 msgid "Sound\tImperfect\n"
 msgstr "사운드\t불완전\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2934
+#: src/frontend/mame/ui/selmenu.cpp:2943
 msgid "Sound\tOK\n"
 msgstr "사운드\t양호\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2937
+#: src/frontend/mame/ui/selmenu.cpp:2946
 msgid "Capture\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2939
+#: src/frontend/mame/ui/selmenu.cpp:2948
 msgid "Capture\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2942
+#: src/frontend/mame/ui/selmenu.cpp:2951
 msgid "Camera\tUnimplemented\n"
 msgstr "카메라\t적용 안 됨\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2944
+#: src/frontend/mame/ui/selmenu.cpp:2953
 msgid "Camera\tImperfect\n"
 msgstr "카메라\t불완전\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2947
+#: src/frontend/mame/ui/selmenu.cpp:2956
 msgid "Microphone\tUnimplemented\n"
 msgstr "마이크로폰\t적용 안 됨\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2949
+#: src/frontend/mame/ui/selmenu.cpp:2958
 msgid "Microphone\tImperfect\n"
 msgstr "마이크로폰\t불완전\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2952
+#: src/frontend/mame/ui/selmenu.cpp:2961
 msgid "Controls\tUnimplemented\n"
 msgstr "컨트롤\t적용 안 됨\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2954
+#: src/frontend/mame/ui/selmenu.cpp:2963
 msgid "Controls\tImperfect\n"
 msgstr "컨트롤\t불완전\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2957
+#: src/frontend/mame/ui/selmenu.cpp:2966
 msgid "Keyboard\tUnimplemented\n"
 msgstr "키보드\t적용 안 됨\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2959
+#: src/frontend/mame/ui/selmenu.cpp:2968
 msgid "Keyboard\tImperfect\n"
 msgstr "키보드\t불완전\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2962
+#: src/frontend/mame/ui/selmenu.cpp:2971
 msgid "Mouse\tUnimplemented\n"
 msgstr "마우스\t적용 안 됨\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2964
+#: src/frontend/mame/ui/selmenu.cpp:2973
 msgid "Mouse\tImperfect\n"
 msgstr "마우스\t불완전\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2967
+#: src/frontend/mame/ui/selmenu.cpp:2976
 msgid "Media\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2969
+#: src/frontend/mame/ui/selmenu.cpp:2978
 msgid "Media\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2972
+#: src/frontend/mame/ui/selmenu.cpp:2981
 msgid "Disk\tUnimplemented\n"
 msgstr "디스크\t적용 안 됨\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2974
+#: src/frontend/mame/ui/selmenu.cpp:2983
 msgid "Disk\tImperfect\n"
 msgstr "디스크\t불완전\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2977
+#: src/frontend/mame/ui/selmenu.cpp:2986
 msgid "Printer\tUnimplemented\n"
 msgstr "프린터\t적용 안 됨\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2979
+#: src/frontend/mame/ui/selmenu.cpp:2988
 msgid "Printer\tImperfect\n"
 msgstr "프린터\t불완전\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2982
+#: src/frontend/mame/ui/selmenu.cpp:2991
 msgid "Mag. Tape\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2984
+#: src/frontend/mame/ui/selmenu.cpp:2993
 msgid "Mag. Tape\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2987
+#: src/frontend/mame/ui/selmenu.cpp:2996
 msgid "Punch Tape\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2989
+#: src/frontend/mame/ui/selmenu.cpp:2998
 msgid "Punch Tape\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2992
+#: src/frontend/mame/ui/selmenu.cpp:3001
 msgid "Mag. Drum\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2994
+#: src/frontend/mame/ui/selmenu.cpp:3003
 msgid "Mag. Drum\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2997
+#: src/frontend/mame/ui/selmenu.cpp:3006
 msgid "(EP)ROM\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2999
+#: src/frontend/mame/ui/selmenu.cpp:3008
 msgid "(EP)ROM\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3002
+#: src/frontend/mame/ui/selmenu.cpp:3011
 msgid "Communications\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3004
+#: src/frontend/mame/ui/selmenu.cpp:3013
 msgid "Communications\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3007
+#: src/frontend/mame/ui/selmenu.cpp:3016
 msgid "LAN\tUnimplemented\n"
 msgstr "LAN\t적용 안 됨\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3009
+#: src/frontend/mame/ui/selmenu.cpp:3018
 msgid "LAN\tImperfect\n"
 msgstr "LAN\t불완전\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3012
+#: src/frontend/mame/ui/selmenu.cpp:3021
 msgid "WAN\tUnimplemented\n"
 msgstr "WAN\t적용 안 됨\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3014
+#: src/frontend/mame/ui/selmenu.cpp:3023
 msgid "WAN\tImperfect\n"
 msgstr "WAN\t불완전\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3017
+#: src/frontend/mame/ui/selmenu.cpp:3026
 msgid "Timing\tUnimplemented\n"
 msgstr "타이밍\t적용 안 됨\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3019
+#: src/frontend/mame/ui/selmenu.cpp:3028
 msgid "Timing\tImperfect\n"
 msgstr "타이밍\t불완전\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3021
+#: src/frontend/mame/ui/selmenu.cpp:3030
 msgid "Mechanical Machine\tYes\n"
 msgstr "기계적 장치\t예\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3021
+#: src/frontend/mame/ui/selmenu.cpp:3030
 msgid "Mechanical Machine\tNo\n"
 msgstr "기계적 장치\t아니오\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3022
+#: src/frontend/mame/ui/selmenu.cpp:3031
 msgid "Requires Artwork\tYes\n"
 msgstr "삽화 필요\t예\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3022
+#: src/frontend/mame/ui/selmenu.cpp:3031
 msgid "Requires Artwork\tNo\n"
 msgstr "삽화 필요\t아니오\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3023
+#: src/frontend/mame/ui/selmenu.cpp:3032
 msgid "Requires Clickable Artwork\tYes\n"
 msgstr "클릭가능한 삽화 필요\t예\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3023
+#: src/frontend/mame/ui/selmenu.cpp:3032
 msgid "Requires Clickable Artwork\tNo\n"
 msgstr "클릭가능한 삽화 필요\t아니오\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3025
+#: src/frontend/mame/ui/selmenu.cpp:3034
 msgid "Support Cocktail\tNo\n"
 msgstr "칵테일 지원\t아니오\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3026
+#: src/frontend/mame/ui/selmenu.cpp:3035
 msgid "Driver is BIOS\tYes\n"
 msgstr "드라이버가 바이오스\t예\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3026
+#: src/frontend/mame/ui/selmenu.cpp:3035
 msgid "Driver is BIOS\tNo\n"
 msgstr "드라이버가 바이오스\t아니오\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3027
+#: src/frontend/mame/ui/selmenu.cpp:3036
 msgid "Support Save\tYes\n"
 msgstr "저장 지원\t예\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3027
+#: src/frontend/mame/ui/selmenu.cpp:3036
 msgid "Support Save\tNo\n"
 msgstr "저장 지원\t아니오\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3028
+#: src/frontend/mame/ui/selmenu.cpp:3037
 msgid "Screen Orientation\tVertical\n"
 msgstr "화면 방향\t세로형\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3028
+#: src/frontend/mame/ui/selmenu.cpp:3037
 msgid "Screen Orientation\tHorizontal\n"
 msgstr "화면 방향\t가로형\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3038
+#: src/frontend/mame/ui/selmenu.cpp:3047
 msgid "Requires CHD\tYes\n"
 msgstr "CHD 필요\t예\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3038
+#: src/frontend/mame/ui/selmenu.cpp:3047
 msgid "Requires CHD\tNo\n"
 msgstr "CHD 필요\t아니오\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3051
-msgid "ROM Audit Result\tOK\n"
-msgstr "ROM 검사 결과\t양호\n"
+#: src/frontend/mame/ui/selmenu.cpp:3060
+msgid "Media Audit Result\tOK\n"
+msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3053
-msgid "ROM Audit Result\tBAD\n"
-msgstr "ROM 검사 결과\t불량\n"
+#: src/frontend/mame/ui/selmenu.cpp:3062
+msgid "Media Audit Result\tBAD\n"
+msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3056
+#: src/frontend/mame/ui/selmenu.cpp:3065
 msgid "Samples Audit Result\tNone Needed\n"
 msgstr "견본 검사 결과\t불필요\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3058
+#: src/frontend/mame/ui/selmenu.cpp:3067
 msgid "Samples Audit Result\tOK\n"
 msgstr "견본 검사 결과\t양호\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3060
+#: src/frontend/mame/ui/selmenu.cpp:3069
 msgid "Samples Audit Result\tBAD\n"
 msgstr "견본 검사 결과\t불량\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3064
+#: src/frontend/mame/ui/selmenu.cpp:3073
 msgid ""
-"ROM Audit \tDisabled\n"
-"Samples Audit \tDisabled\n"
+"Media Audit\tDisabled\n"
+"Samples Audit\tDisabled\n"
 msgstr ""
-"ROM 검사 \t사용 안 함\n"
-"견본 검사 \t사용 안 함\n"
 
-#: src/frontend/mame/ui/sndmenu.cpp:150
+#: src/frontend/mame/ui/sndmenu.cpp:146
 msgid "Sound"
 msgstr "사운드"
 
-#: src/frontend/mame/ui/sndmenu.cpp:151
+#: src/frontend/mame/ui/sndmenu.cpp:147
 msgid "Compressor"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:152
+#: src/frontend/mame/ui/sndmenu.cpp:148
 msgid "Sample Rate"
 msgstr "샘플 레이트"
 
-#: src/frontend/mame/ui/sndmenu.cpp:153
+#: src/frontend/mame/ui/sndmenu.cpp:149
 msgid "Use External Samples"
 msgstr "외부 샘플 이용"
 
@@ -3193,21 +3193,21 @@ msgstr "* 비디오:\n"
 msgid "  Screen '%1$s': Vector\n"
 msgstr "  화면 '%1$s': 벡터\n"
 
-#: src/frontend/mame/ui/devopt.cpp:132
+#: src/frontend/mame/ui/devopt.cpp:135
 #, c-format
 msgid "  Screen '%1$s': %2$d × %3$d (V) %4$s Hz\n"
 msgstr "  화면 '%1$s': %2$d × %3$d (V) %4$s Hz\n"
 
-#: src/frontend/mame/ui/devopt.cpp:133
+#: src/frontend/mame/ui/devopt.cpp:136
 #, c-format
 msgid "  Screen '%1$s': %2$d × %3$d (H) %4$s Hz\n"
 msgstr "  화면 '%1$s': %2$d × %3$d (H) %4$s Hz\n"
 
-#: src/frontend/mame/ui/devopt.cpp:147
+#: src/frontend/mame/ui/devopt.cpp:150
 msgid "* Sound:\n"
 msgstr "* 사운드:\n"
 
-#: src/frontend/mame/ui/devopt.cpp:211
+#: src/frontend/mame/ui/devopt.cpp:214
 #, c-format
 msgid ""
 "* BIOS settings:\n"
@@ -3216,490 +3216,660 @@ msgstr ""
 "* BIOS 설정:\n"
 "  %1$d 옵션    [기본: %2$s]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:255 src/frontend/mame/ui/devopt.cpp:271
-#: src/frontend/mame/ui/devopt.cpp:332
+#: src/frontend/mame/ui/devopt.cpp:258 src/frontend/mame/ui/devopt.cpp:274
+#: src/frontend/mame/ui/devopt.cpp:335
 #, c-format
 msgid "  %1$s    [default: %2$s]\n"
 msgstr "  %1$s    [기본: %2$s]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:260 src/frontend/mame/ui/devopt.cpp:276
+#: src/frontend/mame/ui/devopt.cpp:263 src/frontend/mame/ui/devopt.cpp:279
 #, c-format
 msgid "  %1$s\n"
 msgstr "  %1$s\n"
 
-#: src/frontend/mame/ui/devopt.cpp:282
+#: src/frontend/mame/ui/devopt.cpp:285
 msgid "* DIP switch settings:\n"
 msgstr "* DIP 스위치 설정:\n"
 
-#: src/frontend/mame/ui/devopt.cpp:287
+#: src/frontend/mame/ui/devopt.cpp:290
 msgid "* Configuration settings:\n"
 msgstr "* 환경 설정:\n"
 
-#: src/frontend/mame/ui/devopt.cpp:291
+#: src/frontend/mame/ui/devopt.cpp:294
 msgid "* Input device(s):\n"
 msgstr "* 입력 장치:\n"
 
-#: src/frontend/mame/ui/devopt.cpp:293
+#: src/frontend/mame/ui/devopt.cpp:296
 #, c-format
 msgid "  User inputs    [%1$d inputs]\n"
 msgstr "  사용자 입력    [%1$d 입력]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:295
+#: src/frontend/mame/ui/devopt.cpp:298
 #, c-format
 msgid "  Mahjong inputs    [%1$d inputs]\n"
 msgstr "  마작 입력    [%1$d 입력]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:297
+#: src/frontend/mame/ui/devopt.cpp:300
 #, c-format
 msgid "  Hanafuda inputs    [%1$d inputs]\n"
 msgstr "  화투 입력    [%1$d 입력]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:299
+#: src/frontend/mame/ui/devopt.cpp:302
 #, c-format
 msgid "  Gambling inputs    [%1$d inputs]\n"
 msgstr "  겜블링 입력    [%1$d 입력]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:301
+#: src/frontend/mame/ui/devopt.cpp:304
 #, c-format
 msgid "  Analog inputs    [%1$d inputs]\n"
 msgstr "  아날로그 입력    [%1$d 입력]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:303
+#: src/frontend/mame/ui/devopt.cpp:306
 #, c-format
 msgid "  Adjuster inputs    [%1$d inputs]\n"
 msgstr "  조정자 입력    [%1$d 입력]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:305
+#: src/frontend/mame/ui/devopt.cpp:308
 #, c-format
 msgid "  Keypad inputs    [%1$d inputs]\n"
 msgstr "  키패드 입력    [%1$d 입력]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:307
+#: src/frontend/mame/ui/devopt.cpp:310
 #, c-format
 msgid "  Keyboard inputs    [%1$d inputs]\n"
 msgstr "  키보드 입력    [%1$d 입력]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:312
+#: src/frontend/mame/ui/devopt.cpp:315
 msgid "* Media Options:\n"
 msgstr "* 미디어 설정:\n"
 
-#: src/frontend/mame/ui/devopt.cpp:317
+#: src/frontend/mame/ui/devopt.cpp:320
 #, c-format
 msgid "  %1$s    [tag: %2$s]\n"
 msgstr "  %1$s    [태그: %2$s]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:327
+#: src/frontend/mame/ui/devopt.cpp:330
 msgid "* Slot Options:\n"
 msgstr "* 슬롯 설정:\n"
 
-#: src/frontend/mame/ui/devopt.cpp:341
+#: src/frontend/mame/ui/devopt.cpp:344
 msgid "[None]\n"
 msgstr "[없음]\n"
 
-#: src/emu/render.cpp:1847
+#: src/emu/render.cpp:1796
 #, c-format
 msgctxt "view-name"
 msgid "Screen %1$u Standard (%2$u:%3$u)"
 msgstr ""
 
-#: src/emu/render.cpp:1873
+#: src/emu/render.cpp:1822
 #, c-format
 msgctxt "view-name"
 msgid "Screen %1$u Pixel Aspect (%2$u:%3$u)"
 msgstr ""
 
-#: src/emu/render.cpp:1895 src/emu/render.cpp:2030
+#: src/emu/render.cpp:1844 src/emu/render.cpp:1979
 msgctxt "view-name"
 msgid "Cocktail"
 msgstr ""
 
-#: src/emu/render.cpp:2015
+#: src/emu/render.cpp:1964
 msgctxt "view-name"
 msgid "Left-to-Right"
 msgstr ""
 
-#: src/emu/render.cpp:2016
+#: src/emu/render.cpp:1965
 msgctxt "view-name"
 msgid "Left-to-Right (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2017
+#: src/emu/render.cpp:1966
 msgctxt "view-name"
 msgid "Top-to-Bottom"
 msgstr ""
 
-#: src/emu/render.cpp:2018
+#: src/emu/render.cpp:1967
 msgctxt "view-name"
 msgid "Top-to-Bottom (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2069
+#: src/emu/render.cpp:2018
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Left-to-Right, Top-to-Bottom"
 msgstr ""
 
-#: src/emu/render.cpp:2078
+#: src/emu/render.cpp:2027
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Left-to-Right, Top-to-Bottom (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2087
+#: src/emu/render.cpp:2036
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Top-to-Bottom, Left-to-Right"
 msgstr ""
 
-#: src/emu/render.cpp:2096
+#: src/emu/render.cpp:2045
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Top-to-Bottom, Left-to-Right (Gapless)"
 msgstr ""
 
-#: src/emu/inpttype.ipp:22
+#: src/emu/ioport.cpp:332
+#, c-format
 msgctxt "input-name"
-msgid "P1 Up"
+msgid "P%1$u"
 msgstr ""
 
-#: src/emu/inpttype.ipp:23
+#: src/emu/ioport.cpp:1924
 msgctxt "input-name"
-msgid "P1 Down"
+msgid "???"
 msgstr ""
 
-#: src/emu/inpttype.ipp:24
+#: src/emu/inpttype.ipp:22 src/emu/inpttype.ipp:140 src/emu/inpttype.ipp:221
+#: src/emu/inpttype.ipp:255 src/emu/inpttype.ipp:289 src/emu/inpttype.ipp:323
+#: src/emu/inpttype.ipp:357 src/emu/inpttype.ipp:391 src/emu/inpttype.ipp:425
+#: src/emu/inpttype.ipp:459
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left"
+msgid "%p Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:25
+#: src/emu/inpttype.ipp:23 src/emu/inpttype.ipp:141 src/emu/inpttype.ipp:222
+#: src/emu/inpttype.ipp:256 src/emu/inpttype.ipp:290 src/emu/inpttype.ipp:324
+#: src/emu/inpttype.ipp:358 src/emu/inpttype.ipp:392 src/emu/inpttype.ipp:426
+#: src/emu/inpttype.ipp:460
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right"
+msgid "%p Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:26
+#: src/emu/inpttype.ipp:24 src/emu/inpttype.ipp:142 src/emu/inpttype.ipp:223
+#: src/emu/inpttype.ipp:257 src/emu/inpttype.ipp:291 src/emu/inpttype.ipp:325
+#: src/emu/inpttype.ipp:359 src/emu/inpttype.ipp:393 src/emu/inpttype.ipp:427
+#: src/emu/inpttype.ipp:461
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Up"
+msgid "%p Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:27
+#: src/emu/inpttype.ipp:25 src/emu/inpttype.ipp:143 src/emu/inpttype.ipp:224
+#: src/emu/inpttype.ipp:258 src/emu/inpttype.ipp:292 src/emu/inpttype.ipp:326
+#: src/emu/inpttype.ipp:360 src/emu/inpttype.ipp:394 src/emu/inpttype.ipp:428
+#: src/emu/inpttype.ipp:462
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Down"
+msgid "%p Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:28
+#: src/emu/inpttype.ipp:26 src/emu/inpttype.ipp:144 src/emu/inpttype.ipp:225
+#: src/emu/inpttype.ipp:259 src/emu/inpttype.ipp:293 src/emu/inpttype.ipp:327
+#: src/emu/inpttype.ipp:361 src/emu/inpttype.ipp:395 src/emu/inpttype.ipp:429
+#: src/emu/inpttype.ipp:463
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Left"
+msgid "%p Right Stick/Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:29
+#: src/emu/inpttype.ipp:27 src/emu/inpttype.ipp:145 src/emu/inpttype.ipp:226
+#: src/emu/inpttype.ipp:260 src/emu/inpttype.ipp:294 src/emu/inpttype.ipp:328
+#: src/emu/inpttype.ipp:362 src/emu/inpttype.ipp:396 src/emu/inpttype.ipp:430
+#: src/emu/inpttype.ipp:464
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Right"
+msgid "%p Right Stick/Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:30
+#: src/emu/inpttype.ipp:28 src/emu/inpttype.ipp:146 src/emu/inpttype.ipp:227
+#: src/emu/inpttype.ipp:261 src/emu/inpttype.ipp:295 src/emu/inpttype.ipp:329
+#: src/emu/inpttype.ipp:363 src/emu/inpttype.ipp:397 src/emu/inpttype.ipp:431
+#: src/emu/inpttype.ipp:465
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Up"
+msgid "%p Right Stick/Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:31
+#: src/emu/inpttype.ipp:29 src/emu/inpttype.ipp:147 src/emu/inpttype.ipp:228
+#: src/emu/inpttype.ipp:262 src/emu/inpttype.ipp:296 src/emu/inpttype.ipp:330
+#: src/emu/inpttype.ipp:364 src/emu/inpttype.ipp:398 src/emu/inpttype.ipp:432
+#: src/emu/inpttype.ipp:466
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Down"
+msgid "%p Right Stick/Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:32
+#: src/emu/inpttype.ipp:30 src/emu/inpttype.ipp:148 src/emu/inpttype.ipp:229
+#: src/emu/inpttype.ipp:263 src/emu/inpttype.ipp:297 src/emu/inpttype.ipp:331
+#: src/emu/inpttype.ipp:365 src/emu/inpttype.ipp:399 src/emu/inpttype.ipp:433
+#: src/emu/inpttype.ipp:467
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Left"
+msgid "%p Left Stick/Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:33
+#: src/emu/inpttype.ipp:31 src/emu/inpttype.ipp:149 src/emu/inpttype.ipp:230
+#: src/emu/inpttype.ipp:264 src/emu/inpttype.ipp:298 src/emu/inpttype.ipp:332
+#: src/emu/inpttype.ipp:366 src/emu/inpttype.ipp:400 src/emu/inpttype.ipp:434
+#: src/emu/inpttype.ipp:468
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Right"
+msgid "%p Left Stick/Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:34
+#: src/emu/inpttype.ipp:32 src/emu/inpttype.ipp:150 src/emu/inpttype.ipp:231
+#: src/emu/inpttype.ipp:265 src/emu/inpttype.ipp:299 src/emu/inpttype.ipp:333
+#: src/emu/inpttype.ipp:367 src/emu/inpttype.ipp:401 src/emu/inpttype.ipp:435
+#: src/emu/inpttype.ipp:469
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 1"
+msgid "%p Left Stick/Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:35
+#: src/emu/inpttype.ipp:33 src/emu/inpttype.ipp:151 src/emu/inpttype.ipp:232
+#: src/emu/inpttype.ipp:266 src/emu/inpttype.ipp:300 src/emu/inpttype.ipp:334
+#: src/emu/inpttype.ipp:368 src/emu/inpttype.ipp:402 src/emu/inpttype.ipp:436
+#: src/emu/inpttype.ipp:470
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 2"
+msgid "%p Left Stick/Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:36
+#: src/emu/inpttype.ipp:34 src/emu/inpttype.ipp:152 src/emu/inpttype.ipp:233
+#: src/emu/inpttype.ipp:267 src/emu/inpttype.ipp:301 src/emu/inpttype.ipp:335
+#: src/emu/inpttype.ipp:369 src/emu/inpttype.ipp:403 src/emu/inpttype.ipp:437
+#: src/emu/inpttype.ipp:471
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 3"
+msgid "%p Button 1"
 msgstr ""
 
-#: src/emu/inpttype.ipp:37
+#: src/emu/inpttype.ipp:35 src/emu/inpttype.ipp:153 src/emu/inpttype.ipp:234
+#: src/emu/inpttype.ipp:268 src/emu/inpttype.ipp:302 src/emu/inpttype.ipp:336
+#: src/emu/inpttype.ipp:370 src/emu/inpttype.ipp:404 src/emu/inpttype.ipp:438
+#: src/emu/inpttype.ipp:472
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 4"
+msgid "%p Button 2"
 msgstr ""
 
-#: src/emu/inpttype.ipp:38
+#: src/emu/inpttype.ipp:36 src/emu/inpttype.ipp:154 src/emu/inpttype.ipp:235
+#: src/emu/inpttype.ipp:269 src/emu/inpttype.ipp:303 src/emu/inpttype.ipp:337
+#: src/emu/inpttype.ipp:371 src/emu/inpttype.ipp:405 src/emu/inpttype.ipp:439
+#: src/emu/inpttype.ipp:473
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 5"
+msgid "%p Button 3"
 msgstr ""
 
-#: src/emu/inpttype.ipp:39
+#: src/emu/inpttype.ipp:37 src/emu/inpttype.ipp:155 src/emu/inpttype.ipp:236
+#: src/emu/inpttype.ipp:270 src/emu/inpttype.ipp:304 src/emu/inpttype.ipp:338
+#: src/emu/inpttype.ipp:372 src/emu/inpttype.ipp:406 src/emu/inpttype.ipp:440
+#: src/emu/inpttype.ipp:474
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 6"
+msgid "%p Button 4"
 msgstr ""
 
-#: src/emu/inpttype.ipp:40
+#: src/emu/inpttype.ipp:38 src/emu/inpttype.ipp:156 src/emu/inpttype.ipp:237
+#: src/emu/inpttype.ipp:271 src/emu/inpttype.ipp:305 src/emu/inpttype.ipp:339
+#: src/emu/inpttype.ipp:373 src/emu/inpttype.ipp:407 src/emu/inpttype.ipp:441
+#: src/emu/inpttype.ipp:475
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 7"
+msgid "%p Button 5"
 msgstr ""
 
-#: src/emu/inpttype.ipp:41
+#: src/emu/inpttype.ipp:39 src/emu/inpttype.ipp:157 src/emu/inpttype.ipp:238
+#: src/emu/inpttype.ipp:272 src/emu/inpttype.ipp:306 src/emu/inpttype.ipp:340
+#: src/emu/inpttype.ipp:374 src/emu/inpttype.ipp:408 src/emu/inpttype.ipp:442
+#: src/emu/inpttype.ipp:476
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 8"
+msgid "%p Button 6"
 msgstr ""
 
-#: src/emu/inpttype.ipp:42
+#: src/emu/inpttype.ipp:40 src/emu/inpttype.ipp:158 src/emu/inpttype.ipp:239
+#: src/emu/inpttype.ipp:273 src/emu/inpttype.ipp:307 src/emu/inpttype.ipp:341
+#: src/emu/inpttype.ipp:375 src/emu/inpttype.ipp:409 src/emu/inpttype.ipp:443
+#: src/emu/inpttype.ipp:477
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 9"
+msgid "%p Button 7"
 msgstr ""
 
-#: src/emu/inpttype.ipp:43
+#: src/emu/inpttype.ipp:41 src/emu/inpttype.ipp:159 src/emu/inpttype.ipp:240
+#: src/emu/inpttype.ipp:274 src/emu/inpttype.ipp:308 src/emu/inpttype.ipp:342
+#: src/emu/inpttype.ipp:376 src/emu/inpttype.ipp:410 src/emu/inpttype.ipp:444
+#: src/emu/inpttype.ipp:478
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 10"
+msgid "%p Button 8"
 msgstr ""
 
-#: src/emu/inpttype.ipp:44
+#: src/emu/inpttype.ipp:42 src/emu/inpttype.ipp:160 src/emu/inpttype.ipp:241
+#: src/emu/inpttype.ipp:275 src/emu/inpttype.ipp:309 src/emu/inpttype.ipp:343
+#: src/emu/inpttype.ipp:377 src/emu/inpttype.ipp:411 src/emu/inpttype.ipp:445
+#: src/emu/inpttype.ipp:479
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 11"
+msgid "%p Button 9"
 msgstr ""
 
-#: src/emu/inpttype.ipp:45
+#: src/emu/inpttype.ipp:43 src/emu/inpttype.ipp:161 src/emu/inpttype.ipp:242
+#: src/emu/inpttype.ipp:276 src/emu/inpttype.ipp:310 src/emu/inpttype.ipp:344
+#: src/emu/inpttype.ipp:378 src/emu/inpttype.ipp:412 src/emu/inpttype.ipp:446
+#: src/emu/inpttype.ipp:480
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 12"
+msgid "%p Button 10"
 msgstr ""
 
-#: src/emu/inpttype.ipp:46
+#: src/emu/inpttype.ipp:44 src/emu/inpttype.ipp:162 src/emu/inpttype.ipp:243
+#: src/emu/inpttype.ipp:277 src/emu/inpttype.ipp:311 src/emu/inpttype.ipp:345
+#: src/emu/inpttype.ipp:379 src/emu/inpttype.ipp:413 src/emu/inpttype.ipp:447
+#: src/emu/inpttype.ipp:481
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 13"
+msgid "%p Button 11"
 msgstr ""
 
-#: src/emu/inpttype.ipp:47
+#: src/emu/inpttype.ipp:45 src/emu/inpttype.ipp:163 src/emu/inpttype.ipp:244
+#: src/emu/inpttype.ipp:278 src/emu/inpttype.ipp:312 src/emu/inpttype.ipp:346
+#: src/emu/inpttype.ipp:380 src/emu/inpttype.ipp:414 src/emu/inpttype.ipp:448
+#: src/emu/inpttype.ipp:482
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 14"
+msgid "%p Button 12"
 msgstr ""
 
-#: src/emu/inpttype.ipp:48
+#: src/emu/inpttype.ipp:46 src/emu/inpttype.ipp:164 src/emu/inpttype.ipp:245
+#: src/emu/inpttype.ipp:279 src/emu/inpttype.ipp:313 src/emu/inpttype.ipp:347
+#: src/emu/inpttype.ipp:381 src/emu/inpttype.ipp:415 src/emu/inpttype.ipp:449
+#: src/emu/inpttype.ipp:483
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 15"
+msgid "%p Button 13"
 msgstr ""
 
-#: src/emu/inpttype.ipp:49
+#: src/emu/inpttype.ipp:47 src/emu/inpttype.ipp:165 src/emu/inpttype.ipp:246
+#: src/emu/inpttype.ipp:280 src/emu/inpttype.ipp:314 src/emu/inpttype.ipp:348
+#: src/emu/inpttype.ipp:382 src/emu/inpttype.ipp:416 src/emu/inpttype.ipp:450
+#: src/emu/inpttype.ipp:484
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 16"
+msgid "%p Button 14"
 msgstr ""
 
-#: src/emu/inpttype.ipp:50
+#: src/emu/inpttype.ipp:48 src/emu/inpttype.ipp:166 src/emu/inpttype.ipp:247
+#: src/emu/inpttype.ipp:281 src/emu/inpttype.ipp:315 src/emu/inpttype.ipp:349
+#: src/emu/inpttype.ipp:383 src/emu/inpttype.ipp:417 src/emu/inpttype.ipp:451
+#: src/emu/inpttype.ipp:485
+#, c-format
 msgctxt "input-name"
-msgid "P1 Start"
+msgid "%p Button 15"
 msgstr ""
 
-#: src/emu/inpttype.ipp:51
+#: src/emu/inpttype.ipp:49 src/emu/inpttype.ipp:167 src/emu/inpttype.ipp:248
+#: src/emu/inpttype.ipp:282 src/emu/inpttype.ipp:316 src/emu/inpttype.ipp:350
+#: src/emu/inpttype.ipp:384 src/emu/inpttype.ipp:418 src/emu/inpttype.ipp:452
+#: src/emu/inpttype.ipp:486
+#, c-format
 msgctxt "input-name"
-msgid "P1 Select"
+msgid "%p Button 16"
 msgstr ""
 
-#: src/emu/inpttype.ipp:56
+#: src/emu/inpttype.ipp:50 src/emu/inpttype.ipp:168 src/emu/inpttype.ipp:249
+#: src/emu/inpttype.ipp:283 src/emu/inpttype.ipp:317 src/emu/inpttype.ipp:351
+#: src/emu/inpttype.ipp:385 src/emu/inpttype.ipp:419 src/emu/inpttype.ipp:453
+#: src/emu/inpttype.ipp:487
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong A"
+msgid "%p Start"
 msgstr ""
 
-#: src/emu/inpttype.ipp:57
+#: src/emu/inpttype.ipp:51 src/emu/inpttype.ipp:169 src/emu/inpttype.ipp:250
+#: src/emu/inpttype.ipp:284 src/emu/inpttype.ipp:318 src/emu/inpttype.ipp:352
+#: src/emu/inpttype.ipp:386 src/emu/inpttype.ipp:420 src/emu/inpttype.ipp:454
+#: src/emu/inpttype.ipp:488
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong B"
+msgid "%p Select"
 msgstr ""
 
-#: src/emu/inpttype.ipp:58
+#: src/emu/inpttype.ipp:56 src/emu/inpttype.ipp:174
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong C"
+msgid "%p Mahjong A"
 msgstr ""
 
-#: src/emu/inpttype.ipp:59
+#: src/emu/inpttype.ipp:57 src/emu/inpttype.ipp:175
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong D"
+msgid "%p Mahjong B"
 msgstr ""
 
-#: src/emu/inpttype.ipp:60
+#: src/emu/inpttype.ipp:58 src/emu/inpttype.ipp:176
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong E"
+msgid "%p Mahjong C"
 msgstr ""
 
-#: src/emu/inpttype.ipp:61
+#: src/emu/inpttype.ipp:59 src/emu/inpttype.ipp:177
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong F"
+msgid "%p Mahjong D"
 msgstr ""
 
-#: src/emu/inpttype.ipp:62
+#: src/emu/inpttype.ipp:60 src/emu/inpttype.ipp:178
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong G"
+msgid "%p Mahjong E"
 msgstr ""
 
-#: src/emu/inpttype.ipp:63
+#: src/emu/inpttype.ipp:61 src/emu/inpttype.ipp:179
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong H"
+msgid "%p Mahjong F"
 msgstr ""
 
-#: src/emu/inpttype.ipp:64
+#: src/emu/inpttype.ipp:62 src/emu/inpttype.ipp:180
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong I"
+msgid "%p Mahjong G"
 msgstr ""
 
-#: src/emu/inpttype.ipp:65
+#: src/emu/inpttype.ipp:63 src/emu/inpttype.ipp:181
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong J"
+msgid "%p Mahjong H"
 msgstr ""
 
-#: src/emu/inpttype.ipp:66
+#: src/emu/inpttype.ipp:64 src/emu/inpttype.ipp:182
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong K"
+msgid "%p Mahjong I"
 msgstr ""
 
-#: src/emu/inpttype.ipp:67
+#: src/emu/inpttype.ipp:65 src/emu/inpttype.ipp:183
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong L"
+msgid "%p Mahjong J"
 msgstr ""
 
-#: src/emu/inpttype.ipp:68
+#: src/emu/inpttype.ipp:66 src/emu/inpttype.ipp:184
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong M"
+msgid "%p Mahjong K"
 msgstr ""
 
-#: src/emu/inpttype.ipp:69
+#: src/emu/inpttype.ipp:67 src/emu/inpttype.ipp:185
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong N"
+msgid "%p Mahjong L"
 msgstr ""
 
-#: src/emu/inpttype.ipp:70
+#: src/emu/inpttype.ipp:68 src/emu/inpttype.ipp:186
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong O"
+msgid "%p Mahjong M"
 msgstr ""
 
-#: src/emu/inpttype.ipp:71
+#: src/emu/inpttype.ipp:69 src/emu/inpttype.ipp:187
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong P"
+msgid "%p Mahjong N"
 msgstr ""
 
-#: src/emu/inpttype.ipp:72
+#: src/emu/inpttype.ipp:70 src/emu/inpttype.ipp:188
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Q"
+msgid "%p Mahjong O"
 msgstr ""
 
-#: src/emu/inpttype.ipp:73
+#: src/emu/inpttype.ipp:71 src/emu/inpttype.ipp:189
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Kan"
+msgid "%p Mahjong P"
 msgstr ""
 
-#: src/emu/inpttype.ipp:74
+#: src/emu/inpttype.ipp:72 src/emu/inpttype.ipp:190
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Pon"
+msgid "%p Mahjong Q"
 msgstr ""
 
-#: src/emu/inpttype.ipp:75
+#: src/emu/inpttype.ipp:73 src/emu/inpttype.ipp:191
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Chi"
+msgid "%p Mahjong Kan"
 msgstr ""
 
-#: src/emu/inpttype.ipp:76
+#: src/emu/inpttype.ipp:74 src/emu/inpttype.ipp:192
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Reach"
+msgid "%p Mahjong Pon"
 msgstr ""
 
-#: src/emu/inpttype.ipp:77
+#: src/emu/inpttype.ipp:75 src/emu/inpttype.ipp:193
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Ron"
+msgid "%p Mahjong Chi"
 msgstr ""
 
-#: src/emu/inpttype.ipp:78
+#: src/emu/inpttype.ipp:76 src/emu/inpttype.ipp:194
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Flip Flop"
+msgid "%p Mahjong Reach"
 msgstr ""
 
-#: src/emu/inpttype.ipp:79
+#: src/emu/inpttype.ipp:77 src/emu/inpttype.ipp:195
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Bet"
+msgid "%p Mahjong Ron"
 msgstr ""
 
-#: src/emu/inpttype.ipp:80
+#: src/emu/inpttype.ipp:78 src/emu/inpttype.ipp:200
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Take Score"
+msgid "%p Mahjong Flip Flop"
 msgstr ""
 
-#: src/emu/inpttype.ipp:81
+#: src/emu/inpttype.ipp:79 src/emu/inpttype.ipp:196
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Double Up"
+msgid "%p Mahjong Bet"
 msgstr ""
 
-#: src/emu/inpttype.ipp:82
+#: src/emu/inpttype.ipp:80 src/emu/inpttype.ipp:198
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Big"
+msgid "%p Mahjong Take Score"
 msgstr ""
 
-#: src/emu/inpttype.ipp:83
+#: src/emu/inpttype.ipp:81 src/emu/inpttype.ipp:199
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Small"
+msgid "%p Mahjong Double Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:84
+#: src/emu/inpttype.ipp:82 src/emu/inpttype.ipp:201
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Last Chance"
+msgid "%p Mahjong Big"
 msgstr ""
 
-#: src/emu/inpttype.ipp:89
+#: src/emu/inpttype.ipp:83 src/emu/inpttype.ipp:202
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda A/1"
+msgid "%p Mahjong Small"
 msgstr ""
 
-#: src/emu/inpttype.ipp:90
+#: src/emu/inpttype.ipp:84 src/emu/inpttype.ipp:197
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda B/2"
+msgid "%p Mahjong Last Chance"
 msgstr ""
 
-#: src/emu/inpttype.ipp:91
+#: src/emu/inpttype.ipp:89 src/emu/inpttype.ipp:207
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda C/3"
+msgid "%p Hanafuda A/1"
 msgstr ""
 
-#: src/emu/inpttype.ipp:92
+#: src/emu/inpttype.ipp:90 src/emu/inpttype.ipp:208
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda D/4"
+msgid "%p Hanafuda B/2"
 msgstr ""
 
-#: src/emu/inpttype.ipp:93
+#: src/emu/inpttype.ipp:91 src/emu/inpttype.ipp:209
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda E/5"
+msgid "%p Hanafuda C/3"
 msgstr ""
 
-#: src/emu/inpttype.ipp:94
+#: src/emu/inpttype.ipp:92 src/emu/inpttype.ipp:210
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda F/6"
+msgid "%p Hanafuda D/4"
 msgstr ""
 
-#: src/emu/inpttype.ipp:95
+#: src/emu/inpttype.ipp:93 src/emu/inpttype.ipp:211
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda G/7"
+msgid "%p Hanafuda E/5"
 msgstr ""
 
-#: src/emu/inpttype.ipp:96
+#: src/emu/inpttype.ipp:94 src/emu/inpttype.ipp:212
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda H/8"
+msgid "%p Hanafuda F/6"
 msgstr ""
 
-#: src/emu/inpttype.ipp:97
+#: src/emu/inpttype.ipp:95 src/emu/inpttype.ipp:213
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda Yes"
+msgid "%p Hanafuda G/7"
 msgstr ""
 
-#: src/emu/inpttype.ipp:98
+#: src/emu/inpttype.ipp:96 src/emu/inpttype.ipp:214
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda No"
+msgid "%p Hanafuda H/8"
+msgstr ""
+
+#: src/emu/inpttype.ipp:97 src/emu/inpttype.ipp:215
+#, c-format
+msgctxt "input-name"
+msgid "%p Hanafuda Yes"
+msgstr ""
+
+#: src/emu/inpttype.ipp:98 src/emu/inpttype.ipp:216
+#, c-format
+msgctxt "input-name"
+msgid "%p Hanafuda No"
 msgstr ""
 
 #: src/emu/inpttype.ipp:103
@@ -3827,1551 +3997,6 @@ msgctxt "input-name"
 msgid "Stop All Reels"
 msgstr ""
 
-#: src/emu/inpttype.ipp:140
-msgctxt "input-name"
-msgid "P2 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:141
-msgctxt "input-name"
-msgid "P2 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:142
-msgctxt "input-name"
-msgid "P2 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:143
-msgctxt "input-name"
-msgid "P2 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:144
-msgctxt "input-name"
-msgid "P2 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:145
-msgctxt "input-name"
-msgid "P2 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:146
-msgctxt "input-name"
-msgid "P2 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:147
-msgctxt "input-name"
-msgid "P2 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:148
-msgctxt "input-name"
-msgid "P2 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:149
-msgctxt "input-name"
-msgid "P2 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:150
-msgctxt "input-name"
-msgid "P2 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:151
-msgctxt "input-name"
-msgid "P2 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:152
-msgctxt "input-name"
-msgid "P2 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:153
-msgctxt "input-name"
-msgid "P2 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:154
-msgctxt "input-name"
-msgid "P2 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:155
-msgctxt "input-name"
-msgid "P2 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:156
-msgctxt "input-name"
-msgid "P2 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:157
-msgctxt "input-name"
-msgid "P2 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:158
-msgctxt "input-name"
-msgid "P2 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:159
-msgctxt "input-name"
-msgid "P2 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:160
-msgctxt "input-name"
-msgid "P2 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:161
-msgctxt "input-name"
-msgid "P2 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:162
-msgctxt "input-name"
-msgid "P2 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:163
-msgctxt "input-name"
-msgid "P2 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:164
-msgctxt "input-name"
-msgid "P2 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:165
-msgctxt "input-name"
-msgid "P2 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:166
-msgctxt "input-name"
-msgid "P2 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:167
-msgctxt "input-name"
-msgid "P2 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:168
-msgctxt "input-name"
-msgid "P2 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:169
-msgctxt "input-name"
-msgid "P2 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:174
-msgctxt "input-name"
-msgid "P2 Mahjong A"
-msgstr ""
-
-#: src/emu/inpttype.ipp:175
-msgctxt "input-name"
-msgid "P2 Mahjong B"
-msgstr ""
-
-#: src/emu/inpttype.ipp:176
-msgctxt "input-name"
-msgid "P2 Mahjong C"
-msgstr ""
-
-#: src/emu/inpttype.ipp:177
-msgctxt "input-name"
-msgid "P2 Mahjong D"
-msgstr ""
-
-#: src/emu/inpttype.ipp:178
-msgctxt "input-name"
-msgid "P2 Mahjong E"
-msgstr ""
-
-#: src/emu/inpttype.ipp:179
-msgctxt "input-name"
-msgid "P2 Mahjong F"
-msgstr ""
-
-#: src/emu/inpttype.ipp:180
-msgctxt "input-name"
-msgid "P2 Mahjong G"
-msgstr ""
-
-#: src/emu/inpttype.ipp:181
-msgctxt "input-name"
-msgid "P2 Mahjong H"
-msgstr ""
-
-#: src/emu/inpttype.ipp:182
-msgctxt "input-name"
-msgid "P2 Mahjong I"
-msgstr ""
-
-#: src/emu/inpttype.ipp:183
-msgctxt "input-name"
-msgid "P2 Mahjong J"
-msgstr ""
-
-#: src/emu/inpttype.ipp:184
-msgctxt "input-name"
-msgid "P2 Mahjong K"
-msgstr ""
-
-#: src/emu/inpttype.ipp:185
-msgctxt "input-name"
-msgid "P2 Mahjong L"
-msgstr ""
-
-#: src/emu/inpttype.ipp:186
-msgctxt "input-name"
-msgid "P2 Mahjong M"
-msgstr ""
-
-#: src/emu/inpttype.ipp:187
-msgctxt "input-name"
-msgid "P2 Mahjong N"
-msgstr ""
-
-#: src/emu/inpttype.ipp:188
-msgctxt "input-name"
-msgid "P2 Mahjong O"
-msgstr ""
-
-#: src/emu/inpttype.ipp:189
-msgctxt "input-name"
-msgid "P2 Mahjong P"
-msgstr ""
-
-#: src/emu/inpttype.ipp:190
-msgctxt "input-name"
-msgid "P2 Mahjong Q"
-msgstr ""
-
-#: src/emu/inpttype.ipp:191
-msgctxt "input-name"
-msgid "P2 Mahjong Kan"
-msgstr ""
-
-#: src/emu/inpttype.ipp:192
-msgctxt "input-name"
-msgid "P2 Mahjong Pon"
-msgstr ""
-
-#: src/emu/inpttype.ipp:193
-msgctxt "input-name"
-msgid "P2 Mahjong Chi"
-msgstr ""
-
-#: src/emu/inpttype.ipp:194
-msgctxt "input-name"
-msgid "P2 Mahjong Reach"
-msgstr ""
-
-#: src/emu/inpttype.ipp:195
-msgctxt "input-name"
-msgid "P2 Mahjong Ron"
-msgstr ""
-
-#: src/emu/inpttype.ipp:196
-msgctxt "input-name"
-msgid "P2 Mahjong Bet"
-msgstr ""
-
-#: src/emu/inpttype.ipp:197
-msgctxt "input-name"
-msgid "P2 Mahjong Last Chance"
-msgstr ""
-
-#: src/emu/inpttype.ipp:198
-msgctxt "input-name"
-msgid "P2 Mahjong Take Score"
-msgstr ""
-
-#: src/emu/inpttype.ipp:199
-msgctxt "input-name"
-msgid "P2 Mahjong Double Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:200
-msgctxt "input-name"
-msgid "P2 Mahjong Flip Flop"
-msgstr ""
-
-#: src/emu/inpttype.ipp:201
-msgctxt "input-name"
-msgid "P2 Mahjong Big"
-msgstr ""
-
-#: src/emu/inpttype.ipp:202
-msgctxt "input-name"
-msgid "P2 Mahjong Small"
-msgstr ""
-
-#: src/emu/inpttype.ipp:207
-msgctxt "input-name"
-msgid "P2 Hanafuda A/1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:208
-msgctxt "input-name"
-msgid "P2 Hanafuda B/2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:209
-msgctxt "input-name"
-msgid "P2 Hanafuda C/3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:210
-msgctxt "input-name"
-msgid "P2 Hanafuda D/4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:211
-msgctxt "input-name"
-msgid "P2 Hanafuda E/5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:212
-msgctxt "input-name"
-msgid "P2 Hanafuda F/6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:213
-msgctxt "input-name"
-msgid "P2 Hanafuda G/7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:214
-msgctxt "input-name"
-msgid "P2 Hanafuda H/8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:215
-msgctxt "input-name"
-msgid "P2 Hanafuda Yes"
-msgstr ""
-
-#: src/emu/inpttype.ipp:216
-msgctxt "input-name"
-msgid "P2 Hanafuda No"
-msgstr ""
-
-#: src/emu/inpttype.ipp:221
-msgctxt "input-name"
-msgid "P3 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:222
-msgctxt "input-name"
-msgid "P3 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:223
-msgctxt "input-name"
-msgid "P3 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:224
-msgctxt "input-name"
-msgid "P3 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:225
-msgctxt "input-name"
-msgid "P3 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:226
-msgctxt "input-name"
-msgid "P3 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:227
-msgctxt "input-name"
-msgid "P3 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:228
-msgctxt "input-name"
-msgid "P3 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:229
-msgctxt "input-name"
-msgid "P3 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:230
-msgctxt "input-name"
-msgid "P3 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:231
-msgctxt "input-name"
-msgid "P3 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:232
-msgctxt "input-name"
-msgid "P3 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:233
-msgctxt "input-name"
-msgid "P3 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:234
-msgctxt "input-name"
-msgid "P3 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:235
-msgctxt "input-name"
-msgid "P3 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:236
-msgctxt "input-name"
-msgid "P3 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:237
-msgctxt "input-name"
-msgid "P3 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:238
-msgctxt "input-name"
-msgid "P3 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:239
-msgctxt "input-name"
-msgid "P3 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:240
-msgctxt "input-name"
-msgid "P3 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:241
-msgctxt "input-name"
-msgid "P3 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:242
-msgctxt "input-name"
-msgid "P3 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:243
-msgctxt "input-name"
-msgid "P3 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:244
-msgctxt "input-name"
-msgid "P3 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:245
-msgctxt "input-name"
-msgid "P3 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:246
-msgctxt "input-name"
-msgid "P3 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:247
-msgctxt "input-name"
-msgid "P3 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:248
-msgctxt "input-name"
-msgid "P3 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:249
-msgctxt "input-name"
-msgid "P3 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:250
-msgctxt "input-name"
-msgid "P3 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:255
-msgctxt "input-name"
-msgid "P4 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:256
-msgctxt "input-name"
-msgid "P4 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:257
-msgctxt "input-name"
-msgid "P4 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:258
-msgctxt "input-name"
-msgid "P4 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:259
-msgctxt "input-name"
-msgid "P4 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:260
-msgctxt "input-name"
-msgid "P4 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:261
-msgctxt "input-name"
-msgid "P4 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:262
-msgctxt "input-name"
-msgid "P4 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:263
-msgctxt "input-name"
-msgid "P4 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:264
-msgctxt "input-name"
-msgid "P4 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:265
-msgctxt "input-name"
-msgid "P4 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:266
-msgctxt "input-name"
-msgid "P4 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:267
-msgctxt "input-name"
-msgid "P4 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:268
-msgctxt "input-name"
-msgid "P4 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:269
-msgctxt "input-name"
-msgid "P4 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:270
-msgctxt "input-name"
-msgid "P4 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:271
-msgctxt "input-name"
-msgid "P4 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:272
-msgctxt "input-name"
-msgid "P4 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:273
-msgctxt "input-name"
-msgid "P4 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:274
-msgctxt "input-name"
-msgid "P4 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:275
-msgctxt "input-name"
-msgid "P4 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:276
-msgctxt "input-name"
-msgid "P4 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:277
-msgctxt "input-name"
-msgid "P4 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:278
-msgctxt "input-name"
-msgid "P4 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:279
-msgctxt "input-name"
-msgid "P4 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:280
-msgctxt "input-name"
-msgid "P4 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:281
-msgctxt "input-name"
-msgid "P4 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:282
-msgctxt "input-name"
-msgid "P4 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:283
-msgctxt "input-name"
-msgid "P4 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:284
-msgctxt "input-name"
-msgid "P4 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:289
-msgctxt "input-name"
-msgid "P5 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:290
-msgctxt "input-name"
-msgid "P5 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:291
-msgctxt "input-name"
-msgid "P5 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:292
-msgctxt "input-name"
-msgid "P5 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:293
-msgctxt "input-name"
-msgid "P5 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:294
-msgctxt "input-name"
-msgid "P5 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:295
-msgctxt "input-name"
-msgid "P5 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:296
-msgctxt "input-name"
-msgid "P5 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:297
-msgctxt "input-name"
-msgid "P5 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:298
-msgctxt "input-name"
-msgid "P5 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:299
-msgctxt "input-name"
-msgid "P5 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:300
-msgctxt "input-name"
-msgid "P5 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:301
-msgctxt "input-name"
-msgid "P5 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:302
-msgctxt "input-name"
-msgid "P5 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:303
-msgctxt "input-name"
-msgid "P5 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:304
-msgctxt "input-name"
-msgid "P5 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:305
-msgctxt "input-name"
-msgid "P5 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:306
-msgctxt "input-name"
-msgid "P5 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:307
-msgctxt "input-name"
-msgid "P5 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:308
-msgctxt "input-name"
-msgid "P5 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:309
-msgctxt "input-name"
-msgid "P5 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:310
-msgctxt "input-name"
-msgid "P5 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:311
-msgctxt "input-name"
-msgid "P5 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:312
-msgctxt "input-name"
-msgid "P5 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:313
-msgctxt "input-name"
-msgid "P5 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:314
-msgctxt "input-name"
-msgid "P5 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:315
-msgctxt "input-name"
-msgid "P5 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:316
-msgctxt "input-name"
-msgid "P5 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:317
-msgctxt "input-name"
-msgid "P5 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:318
-msgctxt "input-name"
-msgid "P5 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:323
-msgctxt "input-name"
-msgid "P6 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:324
-msgctxt "input-name"
-msgid "P6 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:325
-msgctxt "input-name"
-msgid "P6 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:326
-msgctxt "input-name"
-msgid "P6 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:327
-msgctxt "input-name"
-msgid "P6 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:328
-msgctxt "input-name"
-msgid "P6 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:329
-msgctxt "input-name"
-msgid "P6 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:330
-msgctxt "input-name"
-msgid "P6 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:331
-msgctxt "input-name"
-msgid "P6 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:332
-msgctxt "input-name"
-msgid "P6 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:333
-msgctxt "input-name"
-msgid "P6 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:334
-msgctxt "input-name"
-msgid "P6 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:335
-msgctxt "input-name"
-msgid "P6 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:336
-msgctxt "input-name"
-msgid "P6 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:337
-msgctxt "input-name"
-msgid "P6 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:338
-msgctxt "input-name"
-msgid "P6 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:339
-msgctxt "input-name"
-msgid "P6 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:340
-msgctxt "input-name"
-msgid "P6 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:341
-msgctxt "input-name"
-msgid "P6 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:342
-msgctxt "input-name"
-msgid "P6 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:343
-msgctxt "input-name"
-msgid "P6 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:344
-msgctxt "input-name"
-msgid "P6 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:345
-msgctxt "input-name"
-msgid "P6 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:346
-msgctxt "input-name"
-msgid "P6 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:347
-msgctxt "input-name"
-msgid "P6 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:348
-msgctxt "input-name"
-msgid "P6 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:349
-msgctxt "input-name"
-msgid "P6 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:350
-msgctxt "input-name"
-msgid "P6 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:351
-msgctxt "input-name"
-msgid "P6 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:352
-msgctxt "input-name"
-msgid "P6 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:357
-msgctxt "input-name"
-msgid "P7 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:358
-msgctxt "input-name"
-msgid "P7 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:359
-msgctxt "input-name"
-msgid "P7 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:360
-msgctxt "input-name"
-msgid "P7 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:361
-msgctxt "input-name"
-msgid "P7 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:362
-msgctxt "input-name"
-msgid "P7 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:363
-msgctxt "input-name"
-msgid "P7 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:364
-msgctxt "input-name"
-msgid "P7 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:365
-msgctxt "input-name"
-msgid "P7 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:366
-msgctxt "input-name"
-msgid "P7 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:367
-msgctxt "input-name"
-msgid "P7 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:368
-msgctxt "input-name"
-msgid "P7 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:369
-msgctxt "input-name"
-msgid "P7 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:370
-msgctxt "input-name"
-msgid "P7 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:371
-msgctxt "input-name"
-msgid "P7 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:372
-msgctxt "input-name"
-msgid "P7 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:373
-msgctxt "input-name"
-msgid "P7 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:374
-msgctxt "input-name"
-msgid "P7 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:375
-msgctxt "input-name"
-msgid "P7 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:376
-msgctxt "input-name"
-msgid "P7 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:377
-msgctxt "input-name"
-msgid "P7 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:378
-msgctxt "input-name"
-msgid "P7 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:379
-msgctxt "input-name"
-msgid "P7 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:380
-msgctxt "input-name"
-msgid "P7 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:381
-msgctxt "input-name"
-msgid "P7 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:382
-msgctxt "input-name"
-msgid "P7 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:383
-msgctxt "input-name"
-msgid "P7 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:384
-msgctxt "input-name"
-msgid "P7 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:385
-msgctxt "input-name"
-msgid "P7 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:386
-msgctxt "input-name"
-msgid "P7 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:391
-msgctxt "input-name"
-msgid "P8 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:392
-msgctxt "input-name"
-msgid "P8 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:393
-msgctxt "input-name"
-msgid "P8 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:394
-msgctxt "input-name"
-msgid "P8 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:395
-msgctxt "input-name"
-msgid "P8 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:396
-msgctxt "input-name"
-msgid "P8 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:397
-msgctxt "input-name"
-msgid "P8 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:398
-msgctxt "input-name"
-msgid "P8 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:399
-msgctxt "input-name"
-msgid "P8 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:400
-msgctxt "input-name"
-msgid "P8 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:401
-msgctxt "input-name"
-msgid "P8 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:402
-msgctxt "input-name"
-msgid "P8 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:403
-msgctxt "input-name"
-msgid "P8 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:404
-msgctxt "input-name"
-msgid "P8 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:405
-msgctxt "input-name"
-msgid "P8 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:406
-msgctxt "input-name"
-msgid "P8 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:407
-msgctxt "input-name"
-msgid "P8 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:408
-msgctxt "input-name"
-msgid "P8 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:409
-msgctxt "input-name"
-msgid "P8 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:410
-msgctxt "input-name"
-msgid "P8 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:411
-msgctxt "input-name"
-msgid "P8 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:412
-msgctxt "input-name"
-msgid "P8 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:413
-msgctxt "input-name"
-msgid "P8 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:414
-msgctxt "input-name"
-msgid "P8 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:415
-msgctxt "input-name"
-msgid "P8 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:416
-msgctxt "input-name"
-msgid "P8 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:417
-msgctxt "input-name"
-msgid "P8 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:418
-msgctxt "input-name"
-msgid "P8 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:419
-msgctxt "input-name"
-msgid "P8 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:420
-msgctxt "input-name"
-msgid "P8 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:425
-msgctxt "input-name"
-msgid "P9 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:426
-msgctxt "input-name"
-msgid "P9 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:427
-msgctxt "input-name"
-msgid "P9 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:428
-msgctxt "input-name"
-msgid "P9 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:429
-msgctxt "input-name"
-msgid "P9 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:430
-msgctxt "input-name"
-msgid "P9 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:431
-msgctxt "input-name"
-msgid "P9 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:432
-msgctxt "input-name"
-msgid "P9 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:433
-msgctxt "input-name"
-msgid "P9 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:434
-msgctxt "input-name"
-msgid "P9 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:435
-msgctxt "input-name"
-msgid "P9 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:436
-msgctxt "input-name"
-msgid "P9 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:437
-msgctxt "input-name"
-msgid "P9 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:438
-msgctxt "input-name"
-msgid "P9 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:439
-msgctxt "input-name"
-msgid "P9 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:440
-msgctxt "input-name"
-msgid "P9 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:441
-msgctxt "input-name"
-msgid "P9 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:442
-msgctxt "input-name"
-msgid "P9 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:443
-msgctxt "input-name"
-msgid "P9 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:444
-msgctxt "input-name"
-msgid "P9 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:445
-msgctxt "input-name"
-msgid "P9 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:446
-msgctxt "input-name"
-msgid "P9 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:447
-msgctxt "input-name"
-msgid "P9 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:448
-msgctxt "input-name"
-msgid "P9 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:449
-msgctxt "input-name"
-msgid "P9 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:450
-msgctxt "input-name"
-msgid "P9 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:451
-msgctxt "input-name"
-msgid "P9 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:452
-msgctxt "input-name"
-msgid "P9 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:453
-msgctxt "input-name"
-msgid "P9 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:454
-msgctxt "input-name"
-msgid "P9 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:459
-msgctxt "input-name"
-msgid "P10 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:460
-msgctxt "input-name"
-msgid "P10 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:461
-msgctxt "input-name"
-msgid "P10 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:462
-msgctxt "input-name"
-msgid "P10 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:463
-msgctxt "input-name"
-msgid "P10 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:464
-msgctxt "input-name"
-msgid "P10 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:465
-msgctxt "input-name"
-msgid "P10 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:466
-msgctxt "input-name"
-msgid "P10 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:467
-msgctxt "input-name"
-msgid "P10 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:468
-msgctxt "input-name"
-msgid "P10 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:469
-msgctxt "input-name"
-msgid "P10 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:470
-msgctxt "input-name"
-msgid "P10 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:471
-msgctxt "input-name"
-msgid "P10 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:472
-msgctxt "input-name"
-msgid "P10 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:473
-msgctxt "input-name"
-msgid "P10 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:474
-msgctxt "input-name"
-msgid "P10 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:475
-msgctxt "input-name"
-msgid "P10 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:476
-msgctxt "input-name"
-msgid "P10 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:477
-msgctxt "input-name"
-msgid "P10 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:478
-msgctxt "input-name"
-msgid "P10 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:479
-msgctxt "input-name"
-msgid "P10 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:480
-msgctxt "input-name"
-msgid "P10 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:481
-msgctxt "input-name"
-msgid "P10 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:482
-msgctxt "input-name"
-msgid "P10 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:483
-msgctxt "input-name"
-msgid "P10 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:484
-msgctxt "input-name"
-msgid "P10 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:485
-msgctxt "input-name"
-msgid "P10 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:486
-msgctxt "input-name"
-msgid "P10 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:487
-msgctxt "input-name"
-msgid "P10 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:488
-msgctxt "input-name"
-msgid "P10 Select"
-msgstr ""
-
 #: src/emu/inpttype.ipp:493
 msgctxt "input-name"
 msgid "1 Player Start"
@@ -5552,154 +4177,31 @@ msgctxt "input-name"
 msgid "Volume Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:550
-msgctxt "input-name"
-msgid "P1 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:551
-msgctxt "input-name"
-msgid "P2 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:552
-msgctxt "input-name"
-msgid "P3 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:553
-msgctxt "input-name"
-msgid "P4 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:554
-msgctxt "input-name"
-msgid "P5 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:555
-msgctxt "input-name"
-msgid "P6 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:556
-msgctxt "input-name"
-msgid "P7 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:557
-msgctxt "input-name"
-msgid "P8 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:558
-msgctxt "input-name"
-msgid "P9 Pedal 1"
-msgstr ""
-
+#: src/emu/inpttype.ipp:550 src/emu/inpttype.ipp:551 src/emu/inpttype.ipp:552
+#: src/emu/inpttype.ipp:553 src/emu/inpttype.ipp:554 src/emu/inpttype.ipp:555
+#: src/emu/inpttype.ipp:556 src/emu/inpttype.ipp:557 src/emu/inpttype.ipp:558
 #: src/emu/inpttype.ipp:559
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:564
-msgctxt "input-name"
-msgid "P1 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:565
-msgctxt "input-name"
-msgid "P2 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:566
-msgctxt "input-name"
-msgid "P3 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:567
-msgctxt "input-name"
-msgid "P4 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:568
-msgctxt "input-name"
-msgid "P5 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:569
-msgctxt "input-name"
-msgid "P6 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:570
-msgctxt "input-name"
-msgid "P7 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:571
-msgctxt "input-name"
-msgid "P8 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:572
-msgctxt "input-name"
-msgid "P9 Pedal 2"
+msgid "%p Pedal 1"
 msgstr ""
 
+#: src/emu/inpttype.ipp:564 src/emu/inpttype.ipp:565 src/emu/inpttype.ipp:566
+#: src/emu/inpttype.ipp:567 src/emu/inpttype.ipp:568 src/emu/inpttype.ipp:569
+#: src/emu/inpttype.ipp:570 src/emu/inpttype.ipp:571 src/emu/inpttype.ipp:572
 #: src/emu/inpttype.ipp:573
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:578
-msgctxt "input-name"
-msgid "P1 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:579
-msgctxt "input-name"
-msgid "P2 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:580
-msgctxt "input-name"
-msgid "P3 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:581
-msgctxt "input-name"
-msgid "P4 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:582
-msgctxt "input-name"
-msgid "P5 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:583
-msgctxt "input-name"
-msgid "P6 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:584
-msgctxt "input-name"
-msgid "P7 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:585
-msgctxt "input-name"
-msgid "P8 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:586
-msgctxt "input-name"
-msgid "P9 Pedal 3"
+msgid "%p Pedal 2"
 msgstr ""
 
+#: src/emu/inpttype.ipp:578 src/emu/inpttype.ipp:579 src/emu/inpttype.ipp:580
+#: src/emu/inpttype.ipp:581 src/emu/inpttype.ipp:582 src/emu/inpttype.ipp:583
+#: src/emu/inpttype.ipp:584 src/emu/inpttype.ipp:585 src/emu/inpttype.ipp:586
 #: src/emu/inpttype.ipp:587
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 3"
+msgid "%p Pedal 3"
 msgstr ""
 
 #: src/emu/inpttype.ipp:592
@@ -7593,6 +6095,36 @@ msgid ""
 "%s"
 msgstr ""
 
+#~ msgid "Confirm quit from machines"
+#~ msgstr "장치 종료시 재확인"
+
+#~ msgid "Skip information screen at startup"
+#~ msgstr "가동시 정보 화면 건너뛰기"
+
+#~ msgid "Simultaneous contradictory"
+#~ msgstr "대칭방향 동시입력"
+
+#, c-format
+#~ msgid ""
+#~ "Auditing ROMs for machine %2$u of %3$u...\n"
+#~ "%1$s"
+#~ msgstr ""
+#~ "%3$u %2$u 장치의 ROM을 검사중...\n"
+#~ "%1$s"
+
+#~ msgid "ROM Audit Result\tOK\n"
+#~ msgstr "ROM 검사 결과\t양호\n"
+
+#~ msgid "ROM Audit Result\tBAD\n"
+#~ msgstr "ROM 검사 결과\t불량\n"
+
+#~ msgid ""
+#~ "ROM Audit \tDisabled\n"
+#~ "Samples Audit \tDisabled\n"
+#~ msgstr ""
+#~ "ROM 검사 \t사용 안 함\n"
+#~ "견본 검사 \t사용 안 함\n"
+
 #~ msgid "Device Mapping"
 #~ msgstr "입력장치 매핑"
 
diff --git a/language/Latvian/strings.po b/language/Latvian/strings.po
index 30cbbcae71c..d08e31e94e7 100644
--- a/language/Latvian/strings.po
+++ b/language/Latvian/strings.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-19 02:50+1100\n"
+"POT-Creation-Date: 2021-12-09 04:44+1100\n"
 "PO-Revision-Date: 2016-02-20 18:03+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: MAME Language Team\n"
@@ -261,12 +261,12 @@ msgstr ""
 msgid "Driver: \"%1$s\" software list "
 msgstr ""
 
-#: src/frontend/mame/ui/selsoft.cpp:711 src/frontend/mame/ui/selgame.cpp:1066
+#: src/frontend/mame/ui/selsoft.cpp:711 src/frontend/mame/ui/selgame.cpp:1076
 #, c-format
 msgid "%1$s: %2$s - Search: %3$s_"
 msgstr ""
 
-#: src/frontend/mame/ui/selsoft.cpp:713 src/frontend/mame/ui/selgame.cpp:1068
+#: src/frontend/mame/ui/selsoft.cpp:713 src/frontend/mame/ui/selgame.cpp:1078
 #, c-format
 msgid "Search: %1$s_"
 msgstr ""
@@ -276,7 +276,7 @@ msgstr ""
 msgid "Software list/item: %1$s:%2$s"
 msgstr ""
 
-#: src/frontend/mame/ui/optsmenu.cpp:73 src/frontend/mame/ui/sndmenu.cpp:165
+#: src/frontend/mame/ui/optsmenu.cpp:73 src/frontend/mame/ui/sndmenu.cpp:161
 msgid "Sound Options"
 msgstr ""
 
@@ -371,11 +371,11 @@ msgid "Show mouse pointer"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:39
-msgid "Confirm quit from machines"
+msgid "Confirm quit from emulation"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:40
-msgid "Skip information screen at startup"
+msgid "Skip system information screen"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:41
@@ -391,7 +391,7 @@ msgid "Skip BIOS selection menu"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:44
-msgid "Skip software parts selection menu"
+msgid "Skip software part selection menu"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:45
@@ -543,7 +543,7 @@ msgid "UI active"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:91
-msgid "Offscreen reload"
+msgid "Off-screen reload"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:92
@@ -559,7 +559,7 @@ msgid "Natural keyboard"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:95
-msgid "Simultaneous contradictory"
+msgid "Allow contradictory joystick inputs"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:96
@@ -583,7 +583,7 @@ msgid "Pedal Device Assignment"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:106
-msgid "Adstick Device Assignment"
+msgid "AD Stick Device Assignment"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:107
@@ -670,14 +670,14 @@ msgstr ""
 msgid "Wait Vertical Sync"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:687
+#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:689
 #: src/frontend/mame/ui/videoopt.cpp:191 src/frontend/mame/ui/custui.cpp:490
 #: src/frontend/mame/ui/analogipt.cpp:471 plugins/cheatfind/init.lua:766
 #: plugins/cheatfind/init.lua:777 plugins/cheat/init.lua:668
 msgid "On"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:690
+#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:692
 #: src/frontend/mame/ui/videoopt.cpp:207 src/frontend/mame/ui/custui.cpp:490
 #: src/frontend/mame/ui/analogipt.cpp:471 plugins/cheatfind/init.lua:763
 #: plugins/cheatfind/init.lua:774 plugins/cheat/init.lua:671
@@ -685,11 +685,11 @@ msgstr ""
 msgid "Off"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:693
+#: src/frontend/mame/ui/menu.cpp:695
 msgid "Auto"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:1195
+#: src/frontend/mame/ui/menu.cpp:1197
 #: src/frontend/mame/ui/simpleselgame.cpp:278
 #: src/frontend/mame/ui/selmenu.cpp:1280
 msgid "Return to Previous Menu"
@@ -697,7 +697,7 @@ msgstr ""
 
 #: src/frontend/mame/ui/filemngr.cpp:139
 #: src/frontend/mame/ui/confswitch.cpp:119
-#: src/frontend/mame/ui/inputmap.cpp:559 src/frontend/mame/ui/analogipt.cpp:360
+#: src/frontend/mame/ui/inputmap.cpp:563 src/frontend/mame/ui/analogipt.cpp:360
 #, c-format
 msgid "[root%1$s]"
 msgstr ""
@@ -940,22 +940,22 @@ msgid ""
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "GHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "MHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "kHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "Hz"
 msgstr ""
 
@@ -979,38 +979,38 @@ msgstr ""
 msgid "Vector"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:480
+#: src/frontend/mame/ui/info.cpp:483
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:480
+#: src/frontend/mame/ui/info.cpp:483
 msgid "%2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:497
+#: src/frontend/mame/ui/info.cpp:500
 #, c-format
 msgid "Screen '%1$s'"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:499
+#: src/frontend/mame/ui/info.cpp:502
 msgid "Screen"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:570 src/frontend/mame/ui/info.cpp:581
+#: src/frontend/mame/ui/info.cpp:573 src/frontend/mame/ui/info.cpp:584
 #, c-format
 msgid "%1$s:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:662
+#: src/frontend/mame/ui/info.cpp:665
 msgid "Not supported"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:665
+#: src/frontend/mame/ui/info.cpp:668
 msgid "Partially supported"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:674
+#: src/frontend/mame/ui/info.cpp:677
 msgid "[empty]"
 msgstr ""
 
@@ -1083,7 +1083,7 @@ msgid "Emulated"
 msgstr ""
 
 #: src/frontend/mame/ui/keyboard.cpp:59 src/frontend/mame/ui/confswitch.cpp:117
-#: src/frontend/mame/ui/inputmap.cpp:557 src/frontend/mame/ui/analogipt.cpp:358
+#: src/frontend/mame/ui/inputmap.cpp:561 src/frontend/mame/ui/analogipt.cpp:358
 #, c-format
 msgid "%1$s [root%2$s]"
 msgstr ""
@@ -1443,7 +1443,7 @@ msgctxt "swlist-info"
 msgid "Software list/item"
 msgstr ""
 
-#: src/frontend/mame/ui/datmenu.cpp:88 src/frontend/mame/ui/selmenu.cpp:2698
+#: src/frontend/mame/ui/datmenu.cpp:88 src/frontend/mame/ui/selmenu.cpp:2707
 msgid "Software List Info"
 msgstr ""
 
@@ -1558,7 +1558,7 @@ msgstr ""
 msgid "Configure Machine:"
 msgstr ""
 
-#: src/frontend/mame/ui/miscmenu.cpp:858 src/frontend/mame/ui/selmenu.cpp:2638
+#: src/frontend/mame/ui/miscmenu.cpp:858 src/frontend/mame/ui/selmenu.cpp:2647
 msgid " (default)"
 msgstr ""
 
@@ -1575,7 +1575,7 @@ msgid ""
 "Press %2$s to return to emulation"
 msgstr ""
 
-#: src/frontend/mame/ui/info_pty.cpp:30 src/frontend/mame/ui/mainmenu.cpp:155
+#: src/frontend/mame/ui/info_pty.cpp:30
 msgid "Pseudo terminals"
 msgstr ""
 
@@ -1643,52 +1643,52 @@ msgstr ""
 msgid "Other Controls"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:227
+#: src/frontend/mame/ui/inputmap.cpp:231
 msgid "This machine has no configurable inputs."
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:327
+#: src/frontend/mame/ui/inputmap.cpp:331
 msgid "Pressed"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:397
+#: src/frontend/mame/ui/inputmap.cpp:401
 msgid "Invalid sequence entered"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:542
+#: src/frontend/mame/ui/inputmap.cpp:546
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:543
+#: src/frontend/mame/ui/inputmap.cpp:547
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog Inc"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:544
+#: src/frontend/mame/ui/inputmap.cpp:548
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog Dec"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:586
+#: src/frontend/mame/ui/inputmap.cpp:590
 #, c-format
 msgid "Press %1$s to set\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:587
+#: src/frontend/mame/ui/inputmap.cpp:591
 #, c-format
 msgid "Press %1$s to append\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:588
+#: src/frontend/mame/ui/inputmap.cpp:592
 #, c-format
 msgid "Press %1$s to clear\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:589
+#: src/frontend/mame/ui/inputmap.cpp:593
 #, c-format
 msgid "Press %1$s to restore default\n"
 msgstr ""
@@ -1752,7 +1752,7 @@ msgid ""
 msgstr ""
 
 #: src/frontend/mame/ui/simpleselgame.cpp:273
-#: src/frontend/mame/ui/selgame.cpp:436
+#: src/frontend/mame/ui/selgame.cpp:443
 msgid "Configure Options"
 msgstr ""
 
@@ -2080,16 +2080,16 @@ msgstr ""
 msgid "Expand to fit"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:437
+#: src/frontend/mame/ui/selgame.cpp:444
 msgid "Configure Machine"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:1050
+#: src/frontend/mame/ui/selgame.cpp:1060
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d machines (%5$d BIOS) )"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:1078
+#: src/frontend/mame/ui/selgame.cpp:1088
 #, c-format
 msgid "System: %1$-.100s"
 msgstr ""
@@ -2111,7 +2111,7 @@ msgstr ""
 #: src/frontend/mame/ui/auditmenu.cpp:98
 #, c-format
 msgid ""
-"Auditing ROMs for machine %2$u of %3$u...\n"
+"Auditing media for machine %2$u of %3$u...\n"
 "%1$s"
 msgstr ""
 
@@ -2126,12 +2126,12 @@ msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:136
 #, c-format
-msgid "Audit ROMs for %1$u machines marked unavailable"
+msgid "Audit media for %1$u machines marked unavailable"
 msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:137
 #, c-format
-msgid "Audit ROMs for all %1$u machines"
+msgid "Audit media for all %1$u machines"
 msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:154
@@ -2337,84 +2337,84 @@ msgctxt "color-sample"
 msgid "Clone"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:914
+#: src/frontend/mame/ui/custui.cpp:906
 msgid "ARGB Settings"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:919 src/frontend/mame/ui/custui.cpp:922
+#: src/frontend/mame/ui/custui.cpp:911 src/frontend/mame/ui/custui.cpp:914
 msgctxt "color-channel"
 msgid "Alpha"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:927 src/frontend/mame/ui/custui.cpp:930
+#: src/frontend/mame/ui/custui.cpp:919 src/frontend/mame/ui/custui.cpp:922
 msgctxt "color-channel"
 msgid "Red"
 msgstr ""
 
+#: src/frontend/mame/ui/custui.cpp:927 src/frontend/mame/ui/custui.cpp:930
+msgctxt "color-channel"
+msgid "Green"
+msgstr ""
+
 #: src/frontend/mame/ui/custui.cpp:935 src/frontend/mame/ui/custui.cpp:938
 msgctxt "color-channel"
-msgid "Green"
-msgstr ""
-
-#: src/frontend/mame/ui/custui.cpp:943 src/frontend/mame/ui/custui.cpp:946
-msgctxt "color-channel"
 msgid "Blue"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:949
+#: src/frontend/mame/ui/custui.cpp:941
 msgid "Choose from palette"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:996
+#: src/frontend/mame/ui/custui.cpp:988
 msgid "Color preview:"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1093
+#: src/frontend/mame/ui/custui.cpp:1085
 msgctxt "color-preset"
 msgid "White"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1094
+#: src/frontend/mame/ui/custui.cpp:1086
 msgctxt "color-preset"
 msgid "Silver"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1095
+#: src/frontend/mame/ui/custui.cpp:1087
 msgctxt "color-preset"
 msgid "Gray"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1096
+#: src/frontend/mame/ui/custui.cpp:1088
 msgctxt "color-preset"
 msgid "Black"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1097
+#: src/frontend/mame/ui/custui.cpp:1089
 msgctxt "color-preset"
 msgid "Red"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1098
+#: src/frontend/mame/ui/custui.cpp:1090
 msgctxt "color-preset"
 msgid "Orange"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1099
+#: src/frontend/mame/ui/custui.cpp:1091
 msgctxt "color-preset"
 msgid "Yellow"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1100
+#: src/frontend/mame/ui/custui.cpp:1092
 msgctxt "color-preset"
 msgid "Green"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1101
+#: src/frontend/mame/ui/custui.cpp:1093
 msgctxt "color-preset"
 msgid "Blue"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1102
+#: src/frontend/mame/ui/custui.cpp:1094
 msgctxt "color-preset"
 msgid "Violet"
 msgstr ""
@@ -2479,7 +2479,7 @@ msgid "Input (general)"
 msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:123
-msgid "Input (this Machine)"
+msgid "Input (this machine)"
 msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:126
@@ -2518,6 +2518,10 @@ msgstr ""
 msgid "Tape Control"
 msgstr ""
 
+#: src/frontend/mame/ui/mainmenu.cpp:155
+msgid "Pseudo Terminals"
+msgstr ""
+
 #: src/frontend/mame/ui/mainmenu.cpp:158
 msgid "BIOS Selection"
 msgstr ""
@@ -2556,7 +2560,7 @@ msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:200
 #, c-format
-msgid "About %s"
+msgid "About %1$s"
 msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:212
@@ -2716,373 +2720,373 @@ msgstr ""
 msgid "%1$s %2$s"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2235
+#: src/frontend/mame/ui/selmenu.cpp:2244
 msgid "Images"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2236
+#: src/frontend/mame/ui/selmenu.cpp:2245
 msgid "Infos"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2551
+#: src/frontend/mame/ui/selmenu.cpp:2560
 msgid ""
 "Required ROM/disk images for the selected system are missing or incorrect. "
 "Please acquire the correct files or select a different system.\n"
 "\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2567
+#: src/frontend/mame/ui/selmenu.cpp:2576
 msgid ""
 "Required ROM/disk images for the selected software are missing or incorrect. "
 "Please acquire the correct files or select a different software item.\n"
 "\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2583
+#: src/frontend/mame/ui/selmenu.cpp:2592
 msgid "incorrect checksum"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2586
+#: src/frontend/mame/ui/selmenu.cpp:2595
 msgid "incorrect length"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2589
+#: src/frontend/mame/ui/selmenu.cpp:2598
 msgid "not found"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2600
+#: src/frontend/mame/ui/selmenu.cpp:2609
 #, c-format
 msgid "%1$s (%2$s) - %3$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2602
+#: src/frontend/mame/ui/selmenu.cpp:2611
 #, c-format
 msgid "%1$s - %2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2606
+#: src/frontend/mame/ui/selmenu.cpp:2615
 msgid "Press any key to continue."
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2735
+#: src/frontend/mame/ui/selmenu.cpp:2744
 msgid "General Info"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2887
-#, c-format
-msgid "Romset\t%1$s\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2888
-#, c-format
-msgid "Year\t%1$s\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2889
-#, c-format
-msgid "Manufacturer\t%1$s\n"
-msgstr ""
-
 #: src/frontend/mame/ui/selmenu.cpp:2896
 #, c-format
-msgid "Driver is Clone of\t%1$s\n"
+msgid "Romset\t%1$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2901
-msgid "Driver is Parent\t\n"
+#: src/frontend/mame/ui/selmenu.cpp:2897
+#, c-format
+msgid "Year\t%1$s\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2898
+#, c-format
+msgid "Manufacturer\t%1$s\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2905
-msgid "Analog Controls\tYes\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2907
-msgid "Keyboard Inputs\tYes\n"
+#, c-format
+msgid "Driver is Clone of\t%1$s\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2910
-msgid "Overall\tNOT WORKING\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2912
-msgid "Overall\tUnemulated Protection\n"
+msgid "Driver is Parent\t\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2914
-msgid "Overall\tWorking\n"
+msgid "Analog Controls\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2917
-msgid "Graphics\tUnimplemented\n"
+#: src/frontend/mame/ui/selmenu.cpp:2916
+msgid "Keyboard Inputs\tYes\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2919
-msgid "Graphics\tWrong Colors\n"
+msgid "Overall\tNOT WORKING\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2921
-msgid "Graphics\tImperfect Colors\n"
+msgid "Overall\tUnemulated Protection\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2923
-msgid "Graphics\tImperfect\n"
+msgid "Overall\tWorking\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2925
-msgid "Graphics\tOK\n"
+#: src/frontend/mame/ui/selmenu.cpp:2926
+msgid "Graphics\tUnimplemented\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2928
-msgid "Sound\tNone\n"
+msgid "Graphics\tWrong Colors\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2930
-msgid "Sound\tUnimplemented\n"
+msgid "Graphics\tImperfect Colors\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2932
-msgid "Sound\tImperfect\n"
+msgid "Graphics\tImperfect\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2934
-msgid "Sound\tOK\n"
+msgid "Graphics\tOK\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2937
-msgid "Capture\tUnimplemented\n"
+msgid "Sound\tNone\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2939
+msgid "Sound\tUnimplemented\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2941
+msgid "Sound\tImperfect\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2943
+msgid "Sound\tOK\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2946
+msgid "Capture\tUnimplemented\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2948
 msgid "Capture\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2942
+#: src/frontend/mame/ui/selmenu.cpp:2951
 msgid "Camera\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2944
+#: src/frontend/mame/ui/selmenu.cpp:2953
 msgid "Camera\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2947
+#: src/frontend/mame/ui/selmenu.cpp:2956
 msgid "Microphone\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2949
+#: src/frontend/mame/ui/selmenu.cpp:2958
 msgid "Microphone\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2952
+#: src/frontend/mame/ui/selmenu.cpp:2961
 msgid "Controls\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2954
+#: src/frontend/mame/ui/selmenu.cpp:2963
 msgid "Controls\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2957
+#: src/frontend/mame/ui/selmenu.cpp:2966
 msgid "Keyboard\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2959
+#: src/frontend/mame/ui/selmenu.cpp:2968
 msgid "Keyboard\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2962
+#: src/frontend/mame/ui/selmenu.cpp:2971
 msgid "Mouse\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2964
+#: src/frontend/mame/ui/selmenu.cpp:2973
 msgid "Mouse\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2967
+#: src/frontend/mame/ui/selmenu.cpp:2976
 msgid "Media\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2969
+#: src/frontend/mame/ui/selmenu.cpp:2978
 msgid "Media\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2972
+#: src/frontend/mame/ui/selmenu.cpp:2981
 msgid "Disk\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2974
+#: src/frontend/mame/ui/selmenu.cpp:2983
 msgid "Disk\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2977
+#: src/frontend/mame/ui/selmenu.cpp:2986
 msgid "Printer\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2979
+#: src/frontend/mame/ui/selmenu.cpp:2988
 msgid "Printer\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2982
+#: src/frontend/mame/ui/selmenu.cpp:2991
 msgid "Mag. Tape\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2984
+#: src/frontend/mame/ui/selmenu.cpp:2993
 msgid "Mag. Tape\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2987
+#: src/frontend/mame/ui/selmenu.cpp:2996
 msgid "Punch Tape\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2989
+#: src/frontend/mame/ui/selmenu.cpp:2998
 msgid "Punch Tape\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2992
+#: src/frontend/mame/ui/selmenu.cpp:3001
 msgid "Mag. Drum\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2994
+#: src/frontend/mame/ui/selmenu.cpp:3003
 msgid "Mag. Drum\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2997
+#: src/frontend/mame/ui/selmenu.cpp:3006
 msgid "(EP)ROM\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2999
+#: src/frontend/mame/ui/selmenu.cpp:3008
 msgid "(EP)ROM\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3002
+#: src/frontend/mame/ui/selmenu.cpp:3011
 msgid "Communications\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3004
+#: src/frontend/mame/ui/selmenu.cpp:3013
 msgid "Communications\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3007
+#: src/frontend/mame/ui/selmenu.cpp:3016
 msgid "LAN\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3009
+#: src/frontend/mame/ui/selmenu.cpp:3018
 msgid "LAN\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3012
+#: src/frontend/mame/ui/selmenu.cpp:3021
 msgid "WAN\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3014
+#: src/frontend/mame/ui/selmenu.cpp:3023
 msgid "WAN\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3017
+#: src/frontend/mame/ui/selmenu.cpp:3026
 msgid "Timing\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3019
+#: src/frontend/mame/ui/selmenu.cpp:3028
 msgid "Timing\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3021
+#: src/frontend/mame/ui/selmenu.cpp:3030
 msgid "Mechanical Machine\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3021
+#: src/frontend/mame/ui/selmenu.cpp:3030
 msgid "Mechanical Machine\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3022
+#: src/frontend/mame/ui/selmenu.cpp:3031
 msgid "Requires Artwork\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3022
+#: src/frontend/mame/ui/selmenu.cpp:3031
 msgid "Requires Artwork\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3023
+#: src/frontend/mame/ui/selmenu.cpp:3032
 msgid "Requires Clickable Artwork\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3023
+#: src/frontend/mame/ui/selmenu.cpp:3032
 msgid "Requires Clickable Artwork\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3025
+#: src/frontend/mame/ui/selmenu.cpp:3034
 msgid "Support Cocktail\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3026
+#: src/frontend/mame/ui/selmenu.cpp:3035
 msgid "Driver is BIOS\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3026
+#: src/frontend/mame/ui/selmenu.cpp:3035
 msgid "Driver is BIOS\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3027
+#: src/frontend/mame/ui/selmenu.cpp:3036
 msgid "Support Save\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3027
+#: src/frontend/mame/ui/selmenu.cpp:3036
 msgid "Support Save\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3028
+#: src/frontend/mame/ui/selmenu.cpp:3037
 msgid "Screen Orientation\tVertical\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3028
+#: src/frontend/mame/ui/selmenu.cpp:3037
 msgid "Screen Orientation\tHorizontal\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3038
+#: src/frontend/mame/ui/selmenu.cpp:3047
 msgid "Requires CHD\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3038
+#: src/frontend/mame/ui/selmenu.cpp:3047
 msgid "Requires CHD\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3051
-msgid "ROM Audit Result\tOK\n"
+#: src/frontend/mame/ui/selmenu.cpp:3060
+msgid "Media Audit Result\tOK\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3053
-msgid "ROM Audit Result\tBAD\n"
+#: src/frontend/mame/ui/selmenu.cpp:3062
+msgid "Media Audit Result\tBAD\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3056
+#: src/frontend/mame/ui/selmenu.cpp:3065
 msgid "Samples Audit Result\tNone Needed\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3058
+#: src/frontend/mame/ui/selmenu.cpp:3067
 msgid "Samples Audit Result\tOK\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3060
+#: src/frontend/mame/ui/selmenu.cpp:3069
 msgid "Samples Audit Result\tBAD\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3064
+#: src/frontend/mame/ui/selmenu.cpp:3073
 msgid ""
-"ROM Audit \tDisabled\n"
-"Samples Audit \tDisabled\n"
+"Media Audit\tDisabled\n"
+"Samples Audit\tDisabled\n"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:150
+#: src/frontend/mame/ui/sndmenu.cpp:146
 msgid "Sound"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:151
+#: src/frontend/mame/ui/sndmenu.cpp:147
 msgid "Compressor"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:152
+#: src/frontend/mame/ui/sndmenu.cpp:148
 msgid "Sample Rate"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:153
+#: src/frontend/mame/ui/sndmenu.cpp:149
 msgid "Use External Samples"
 msgstr ""
 
@@ -3121,511 +3125,681 @@ msgstr ""
 msgid "  Screen '%1$s': Vector\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:132
+#: src/frontend/mame/ui/devopt.cpp:135
 #, c-format
 msgid "  Screen '%1$s': %2$d × %3$d (V) %4$s Hz\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:133
+#: src/frontend/mame/ui/devopt.cpp:136
 #, c-format
 msgid "  Screen '%1$s': %2$d × %3$d (H) %4$s Hz\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:147
+#: src/frontend/mame/ui/devopt.cpp:150
 msgid "* Sound:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:211
+#: src/frontend/mame/ui/devopt.cpp:214
 #, c-format
 msgid ""
 "* BIOS settings:\n"
 "  %1$d options    [default: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:255 src/frontend/mame/ui/devopt.cpp:271
-#: src/frontend/mame/ui/devopt.cpp:332
+#: src/frontend/mame/ui/devopt.cpp:258 src/frontend/mame/ui/devopt.cpp:274
+#: src/frontend/mame/ui/devopt.cpp:335
 #, c-format
 msgid "  %1$s    [default: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:260 src/frontend/mame/ui/devopt.cpp:276
+#: src/frontend/mame/ui/devopt.cpp:263 src/frontend/mame/ui/devopt.cpp:279
 #, c-format
 msgid "  %1$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:282
+#: src/frontend/mame/ui/devopt.cpp:285
 msgid "* DIP switch settings:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:287
+#: src/frontend/mame/ui/devopt.cpp:290
 msgid "* Configuration settings:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:291
+#: src/frontend/mame/ui/devopt.cpp:294
 msgid "* Input device(s):\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:293
+#: src/frontend/mame/ui/devopt.cpp:296
 #, c-format
 msgid "  User inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:295
+#: src/frontend/mame/ui/devopt.cpp:298
 #, c-format
 msgid "  Mahjong inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:297
+#: src/frontend/mame/ui/devopt.cpp:300
 #, c-format
 msgid "  Hanafuda inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:299
+#: src/frontend/mame/ui/devopt.cpp:302
 #, c-format
 msgid "  Gambling inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:301
+#: src/frontend/mame/ui/devopt.cpp:304
 #, c-format
 msgid "  Analog inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:303
+#: src/frontend/mame/ui/devopt.cpp:306
 #, c-format
 msgid "  Adjuster inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:305
+#: src/frontend/mame/ui/devopt.cpp:308
 #, c-format
 msgid "  Keypad inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:307
+#: src/frontend/mame/ui/devopt.cpp:310
 #, c-format
 msgid "  Keyboard inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:312
+#: src/frontend/mame/ui/devopt.cpp:315
 msgid "* Media Options:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:317
+#: src/frontend/mame/ui/devopt.cpp:320
 #, c-format
 msgid "  %1$s    [tag: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:327
+#: src/frontend/mame/ui/devopt.cpp:330
 msgid "* Slot Options:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:341
+#: src/frontend/mame/ui/devopt.cpp:344
 msgid "[None]\n"
 msgstr ""
 
-#: src/emu/render.cpp:1847
+#: src/emu/render.cpp:1796
 #, c-format
 msgctxt "view-name"
 msgid "Screen %1$u Standard (%2$u:%3$u)"
 msgstr ""
 
-#: src/emu/render.cpp:1873
+#: src/emu/render.cpp:1822
 #, c-format
 msgctxt "view-name"
 msgid "Screen %1$u Pixel Aspect (%2$u:%3$u)"
 msgstr ""
 
-#: src/emu/render.cpp:1895 src/emu/render.cpp:2030
+#: src/emu/render.cpp:1844 src/emu/render.cpp:1979
 msgctxt "view-name"
 msgid "Cocktail"
 msgstr ""
 
-#: src/emu/render.cpp:2015
+#: src/emu/render.cpp:1964
 msgctxt "view-name"
 msgid "Left-to-Right"
 msgstr ""
 
-#: src/emu/render.cpp:2016
+#: src/emu/render.cpp:1965
 msgctxt "view-name"
 msgid "Left-to-Right (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2017
+#: src/emu/render.cpp:1966
 msgctxt "view-name"
 msgid "Top-to-Bottom"
 msgstr ""
 
-#: src/emu/render.cpp:2018
+#: src/emu/render.cpp:1967
 msgctxt "view-name"
 msgid "Top-to-Bottom (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2069
+#: src/emu/render.cpp:2018
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Left-to-Right, Top-to-Bottom"
 msgstr ""
 
-#: src/emu/render.cpp:2078
+#: src/emu/render.cpp:2027
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Left-to-Right, Top-to-Bottom (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2087
+#: src/emu/render.cpp:2036
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Top-to-Bottom, Left-to-Right"
 msgstr ""
 
-#: src/emu/render.cpp:2096
+#: src/emu/render.cpp:2045
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Top-to-Bottom, Left-to-Right (Gapless)"
 msgstr ""
 
-#: src/emu/inpttype.ipp:22
+#: src/emu/ioport.cpp:332
+#, c-format
 msgctxt "input-name"
-msgid "P1 Up"
+msgid "P%1$u"
 msgstr ""
 
-#: src/emu/inpttype.ipp:23
+#: src/emu/ioport.cpp:1924
 msgctxt "input-name"
-msgid "P1 Down"
+msgid "???"
 msgstr ""
 
-#: src/emu/inpttype.ipp:24
+#: src/emu/inpttype.ipp:22 src/emu/inpttype.ipp:140 src/emu/inpttype.ipp:221
+#: src/emu/inpttype.ipp:255 src/emu/inpttype.ipp:289 src/emu/inpttype.ipp:323
+#: src/emu/inpttype.ipp:357 src/emu/inpttype.ipp:391 src/emu/inpttype.ipp:425
+#: src/emu/inpttype.ipp:459
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left"
+msgid "%p Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:25
+#: src/emu/inpttype.ipp:23 src/emu/inpttype.ipp:141 src/emu/inpttype.ipp:222
+#: src/emu/inpttype.ipp:256 src/emu/inpttype.ipp:290 src/emu/inpttype.ipp:324
+#: src/emu/inpttype.ipp:358 src/emu/inpttype.ipp:392 src/emu/inpttype.ipp:426
+#: src/emu/inpttype.ipp:460
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right"
+msgid "%p Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:26
+#: src/emu/inpttype.ipp:24 src/emu/inpttype.ipp:142 src/emu/inpttype.ipp:223
+#: src/emu/inpttype.ipp:257 src/emu/inpttype.ipp:291 src/emu/inpttype.ipp:325
+#: src/emu/inpttype.ipp:359 src/emu/inpttype.ipp:393 src/emu/inpttype.ipp:427
+#: src/emu/inpttype.ipp:461
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Up"
+msgid "%p Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:27
+#: src/emu/inpttype.ipp:25 src/emu/inpttype.ipp:143 src/emu/inpttype.ipp:224
+#: src/emu/inpttype.ipp:258 src/emu/inpttype.ipp:292 src/emu/inpttype.ipp:326
+#: src/emu/inpttype.ipp:360 src/emu/inpttype.ipp:394 src/emu/inpttype.ipp:428
+#: src/emu/inpttype.ipp:462
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Down"
+msgid "%p Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:28
+#: src/emu/inpttype.ipp:26 src/emu/inpttype.ipp:144 src/emu/inpttype.ipp:225
+#: src/emu/inpttype.ipp:259 src/emu/inpttype.ipp:293 src/emu/inpttype.ipp:327
+#: src/emu/inpttype.ipp:361 src/emu/inpttype.ipp:395 src/emu/inpttype.ipp:429
+#: src/emu/inpttype.ipp:463
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Left"
+msgid "%p Right Stick/Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:29
+#: src/emu/inpttype.ipp:27 src/emu/inpttype.ipp:145 src/emu/inpttype.ipp:226
+#: src/emu/inpttype.ipp:260 src/emu/inpttype.ipp:294 src/emu/inpttype.ipp:328
+#: src/emu/inpttype.ipp:362 src/emu/inpttype.ipp:396 src/emu/inpttype.ipp:430
+#: src/emu/inpttype.ipp:464
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Right"
+msgid "%p Right Stick/Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:30
+#: src/emu/inpttype.ipp:28 src/emu/inpttype.ipp:146 src/emu/inpttype.ipp:227
+#: src/emu/inpttype.ipp:261 src/emu/inpttype.ipp:295 src/emu/inpttype.ipp:329
+#: src/emu/inpttype.ipp:363 src/emu/inpttype.ipp:397 src/emu/inpttype.ipp:431
+#: src/emu/inpttype.ipp:465
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Up"
+msgid "%p Right Stick/Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:31
+#: src/emu/inpttype.ipp:29 src/emu/inpttype.ipp:147 src/emu/inpttype.ipp:228
+#: src/emu/inpttype.ipp:262 src/emu/inpttype.ipp:296 src/emu/inpttype.ipp:330
+#: src/emu/inpttype.ipp:364 src/emu/inpttype.ipp:398 src/emu/inpttype.ipp:432
+#: src/emu/inpttype.ipp:466
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Down"
+msgid "%p Right Stick/Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:32
+#: src/emu/inpttype.ipp:30 src/emu/inpttype.ipp:148 src/emu/inpttype.ipp:229
+#: src/emu/inpttype.ipp:263 src/emu/inpttype.ipp:297 src/emu/inpttype.ipp:331
+#: src/emu/inpttype.ipp:365 src/emu/inpttype.ipp:399 src/emu/inpttype.ipp:433
+#: src/emu/inpttype.ipp:467
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Left"
+msgid "%p Left Stick/Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:33
+#: src/emu/inpttype.ipp:31 src/emu/inpttype.ipp:149 src/emu/inpttype.ipp:230
+#: src/emu/inpttype.ipp:264 src/emu/inpttype.ipp:298 src/emu/inpttype.ipp:332
+#: src/emu/inpttype.ipp:366 src/emu/inpttype.ipp:400 src/emu/inpttype.ipp:434
+#: src/emu/inpttype.ipp:468
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Right"
+msgid "%p Left Stick/Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:34
+#: src/emu/inpttype.ipp:32 src/emu/inpttype.ipp:150 src/emu/inpttype.ipp:231
+#: src/emu/inpttype.ipp:265 src/emu/inpttype.ipp:299 src/emu/inpttype.ipp:333
+#: src/emu/inpttype.ipp:367 src/emu/inpttype.ipp:401 src/emu/inpttype.ipp:435
+#: src/emu/inpttype.ipp:469
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 1"
+msgid "%p Left Stick/Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:35
+#: src/emu/inpttype.ipp:33 src/emu/inpttype.ipp:151 src/emu/inpttype.ipp:232
+#: src/emu/inpttype.ipp:266 src/emu/inpttype.ipp:300 src/emu/inpttype.ipp:334
+#: src/emu/inpttype.ipp:368 src/emu/inpttype.ipp:402 src/emu/inpttype.ipp:436
+#: src/emu/inpttype.ipp:470
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 2"
+msgid "%p Left Stick/Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:36
+#: src/emu/inpttype.ipp:34 src/emu/inpttype.ipp:152 src/emu/inpttype.ipp:233
+#: src/emu/inpttype.ipp:267 src/emu/inpttype.ipp:301 src/emu/inpttype.ipp:335
+#: src/emu/inpttype.ipp:369 src/emu/inpttype.ipp:403 src/emu/inpttype.ipp:437
+#: src/emu/inpttype.ipp:471
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 3"
+msgid "%p Button 1"
 msgstr ""
 
-#: src/emu/inpttype.ipp:37
+#: src/emu/inpttype.ipp:35 src/emu/inpttype.ipp:153 src/emu/inpttype.ipp:234
+#: src/emu/inpttype.ipp:268 src/emu/inpttype.ipp:302 src/emu/inpttype.ipp:336
+#: src/emu/inpttype.ipp:370 src/emu/inpttype.ipp:404 src/emu/inpttype.ipp:438
+#: src/emu/inpttype.ipp:472
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 4"
+msgid "%p Button 2"
 msgstr ""
 
-#: src/emu/inpttype.ipp:38
+#: src/emu/inpttype.ipp:36 src/emu/inpttype.ipp:154 src/emu/inpttype.ipp:235
+#: src/emu/inpttype.ipp:269 src/emu/inpttype.ipp:303 src/emu/inpttype.ipp:337
+#: src/emu/inpttype.ipp:371 src/emu/inpttype.ipp:405 src/emu/inpttype.ipp:439
+#: src/emu/inpttype.ipp:473
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 5"
+msgid "%p Button 3"
 msgstr ""
 
-#: src/emu/inpttype.ipp:39
+#: src/emu/inpttype.ipp:37 src/emu/inpttype.ipp:155 src/emu/inpttype.ipp:236
+#: src/emu/inpttype.ipp:270 src/emu/inpttype.ipp:304 src/emu/inpttype.ipp:338
+#: src/emu/inpttype.ipp:372 src/emu/inpttype.ipp:406 src/emu/inpttype.ipp:440
+#: src/emu/inpttype.ipp:474
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 6"
+msgid "%p Button 4"
 msgstr ""
 
-#: src/emu/inpttype.ipp:40
+#: src/emu/inpttype.ipp:38 src/emu/inpttype.ipp:156 src/emu/inpttype.ipp:237
+#: src/emu/inpttype.ipp:271 src/emu/inpttype.ipp:305 src/emu/inpttype.ipp:339
+#: src/emu/inpttype.ipp:373 src/emu/inpttype.ipp:407 src/emu/inpttype.ipp:441
+#: src/emu/inpttype.ipp:475
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 7"
+msgid "%p Button 5"
 msgstr ""
 
-#: src/emu/inpttype.ipp:41
+#: src/emu/inpttype.ipp:39 src/emu/inpttype.ipp:157 src/emu/inpttype.ipp:238
+#: src/emu/inpttype.ipp:272 src/emu/inpttype.ipp:306 src/emu/inpttype.ipp:340
+#: src/emu/inpttype.ipp:374 src/emu/inpttype.ipp:408 src/emu/inpttype.ipp:442
+#: src/emu/inpttype.ipp:476
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 8"
+msgid "%p Button 6"
 msgstr ""
 
-#: src/emu/inpttype.ipp:42
+#: src/emu/inpttype.ipp:40 src/emu/inpttype.ipp:158 src/emu/inpttype.ipp:239
+#: src/emu/inpttype.ipp:273 src/emu/inpttype.ipp:307 src/emu/inpttype.ipp:341
+#: src/emu/inpttype.ipp:375 src/emu/inpttype.ipp:409 src/emu/inpttype.ipp:443
+#: src/emu/inpttype.ipp:477
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 9"
+msgid "%p Button 7"
 msgstr ""
 
-#: src/emu/inpttype.ipp:43
+#: src/emu/inpttype.ipp:41 src/emu/inpttype.ipp:159 src/emu/inpttype.ipp:240
+#: src/emu/inpttype.ipp:274 src/emu/inpttype.ipp:308 src/emu/inpttype.ipp:342
+#: src/emu/inpttype.ipp:376 src/emu/inpttype.ipp:410 src/emu/inpttype.ipp:444
+#: src/emu/inpttype.ipp:478
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 10"
+msgid "%p Button 8"
 msgstr ""
 
-#: src/emu/inpttype.ipp:44
+#: src/emu/inpttype.ipp:42 src/emu/inpttype.ipp:160 src/emu/inpttype.ipp:241
+#: src/emu/inpttype.ipp:275 src/emu/inpttype.ipp:309 src/emu/inpttype.ipp:343
+#: src/emu/inpttype.ipp:377 src/emu/inpttype.ipp:411 src/emu/inpttype.ipp:445
+#: src/emu/inpttype.ipp:479
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 11"
+msgid "%p Button 9"
 msgstr ""
 
-#: src/emu/inpttype.ipp:45
+#: src/emu/inpttype.ipp:43 src/emu/inpttype.ipp:161 src/emu/inpttype.ipp:242
+#: src/emu/inpttype.ipp:276 src/emu/inpttype.ipp:310 src/emu/inpttype.ipp:344
+#: src/emu/inpttype.ipp:378 src/emu/inpttype.ipp:412 src/emu/inpttype.ipp:446
+#: src/emu/inpttype.ipp:480
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 12"
+msgid "%p Button 10"
 msgstr ""
 
-#: src/emu/inpttype.ipp:46
+#: src/emu/inpttype.ipp:44 src/emu/inpttype.ipp:162 src/emu/inpttype.ipp:243
+#: src/emu/inpttype.ipp:277 src/emu/inpttype.ipp:311 src/emu/inpttype.ipp:345
+#: src/emu/inpttype.ipp:379 src/emu/inpttype.ipp:413 src/emu/inpttype.ipp:447
+#: src/emu/inpttype.ipp:481
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 13"
+msgid "%p Button 11"
 msgstr ""
 
-#: src/emu/inpttype.ipp:47
+#: src/emu/inpttype.ipp:45 src/emu/inpttype.ipp:163 src/emu/inpttype.ipp:244
+#: src/emu/inpttype.ipp:278 src/emu/inpttype.ipp:312 src/emu/inpttype.ipp:346
+#: src/emu/inpttype.ipp:380 src/emu/inpttype.ipp:414 src/emu/inpttype.ipp:448
+#: src/emu/inpttype.ipp:482
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 14"
+msgid "%p Button 12"
 msgstr ""
 
-#: src/emu/inpttype.ipp:48
+#: src/emu/inpttype.ipp:46 src/emu/inpttype.ipp:164 src/emu/inpttype.ipp:245
+#: src/emu/inpttype.ipp:279 src/emu/inpttype.ipp:313 src/emu/inpttype.ipp:347
+#: src/emu/inpttype.ipp:381 src/emu/inpttype.ipp:415 src/emu/inpttype.ipp:449
+#: src/emu/inpttype.ipp:483
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 15"
+msgid "%p Button 13"
 msgstr ""
 
-#: src/emu/inpttype.ipp:49
+#: src/emu/inpttype.ipp:47 src/emu/inpttype.ipp:165 src/emu/inpttype.ipp:246
+#: src/emu/inpttype.ipp:280 src/emu/inpttype.ipp:314 src/emu/inpttype.ipp:348
+#: src/emu/inpttype.ipp:382 src/emu/inpttype.ipp:416 src/emu/inpttype.ipp:450
+#: src/emu/inpttype.ipp:484
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 16"
+msgid "%p Button 14"
 msgstr ""
 
-#: src/emu/inpttype.ipp:50
+#: src/emu/inpttype.ipp:48 src/emu/inpttype.ipp:166 src/emu/inpttype.ipp:247
+#: src/emu/inpttype.ipp:281 src/emu/inpttype.ipp:315 src/emu/inpttype.ipp:349
+#: src/emu/inpttype.ipp:383 src/emu/inpttype.ipp:417 src/emu/inpttype.ipp:451
+#: src/emu/inpttype.ipp:485
+#, c-format
 msgctxt "input-name"
-msgid "P1 Start"
+msgid "%p Button 15"
 msgstr ""
 
-#: src/emu/inpttype.ipp:51
+#: src/emu/inpttype.ipp:49 src/emu/inpttype.ipp:167 src/emu/inpttype.ipp:248
+#: src/emu/inpttype.ipp:282 src/emu/inpttype.ipp:316 src/emu/inpttype.ipp:350
+#: src/emu/inpttype.ipp:384 src/emu/inpttype.ipp:418 src/emu/inpttype.ipp:452
+#: src/emu/inpttype.ipp:486
+#, c-format
 msgctxt "input-name"
-msgid "P1 Select"
+msgid "%p Button 16"
 msgstr ""
 
-#: src/emu/inpttype.ipp:56
+#: src/emu/inpttype.ipp:50 src/emu/inpttype.ipp:168 src/emu/inpttype.ipp:249
+#: src/emu/inpttype.ipp:283 src/emu/inpttype.ipp:317 src/emu/inpttype.ipp:351
+#: src/emu/inpttype.ipp:385 src/emu/inpttype.ipp:419 src/emu/inpttype.ipp:453
+#: src/emu/inpttype.ipp:487
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong A"
+msgid "%p Start"
 msgstr ""
 
-#: src/emu/inpttype.ipp:57
+#: src/emu/inpttype.ipp:51 src/emu/inpttype.ipp:169 src/emu/inpttype.ipp:250
+#: src/emu/inpttype.ipp:284 src/emu/inpttype.ipp:318 src/emu/inpttype.ipp:352
+#: src/emu/inpttype.ipp:386 src/emu/inpttype.ipp:420 src/emu/inpttype.ipp:454
+#: src/emu/inpttype.ipp:488
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong B"
+msgid "%p Select"
 msgstr ""
 
-#: src/emu/inpttype.ipp:58
+#: src/emu/inpttype.ipp:56 src/emu/inpttype.ipp:174
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong C"
+msgid "%p Mahjong A"
 msgstr ""
 
-#: src/emu/inpttype.ipp:59
+#: src/emu/inpttype.ipp:57 src/emu/inpttype.ipp:175
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong D"
+msgid "%p Mahjong B"
 msgstr ""
 
-#: src/emu/inpttype.ipp:60
+#: src/emu/inpttype.ipp:58 src/emu/inpttype.ipp:176
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong E"
+msgid "%p Mahjong C"
 msgstr ""
 
-#: src/emu/inpttype.ipp:61
+#: src/emu/inpttype.ipp:59 src/emu/inpttype.ipp:177
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong F"
+msgid "%p Mahjong D"
 msgstr ""
 
-#: src/emu/inpttype.ipp:62
+#: src/emu/inpttype.ipp:60 src/emu/inpttype.ipp:178
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong G"
+msgid "%p Mahjong E"
 msgstr ""
 
-#: src/emu/inpttype.ipp:63
+#: src/emu/inpttype.ipp:61 src/emu/inpttype.ipp:179
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong H"
+msgid "%p Mahjong F"
 msgstr ""
 
-#: src/emu/inpttype.ipp:64
+#: src/emu/inpttype.ipp:62 src/emu/inpttype.ipp:180
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong I"
+msgid "%p Mahjong G"
 msgstr ""
 
-#: src/emu/inpttype.ipp:65
+#: src/emu/inpttype.ipp:63 src/emu/inpttype.ipp:181
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong J"
+msgid "%p Mahjong H"
 msgstr ""
 
-#: src/emu/inpttype.ipp:66
+#: src/emu/inpttype.ipp:64 src/emu/inpttype.ipp:182
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong K"
+msgid "%p Mahjong I"
 msgstr ""
 
-#: src/emu/inpttype.ipp:67
+#: src/emu/inpttype.ipp:65 src/emu/inpttype.ipp:183
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong L"
+msgid "%p Mahjong J"
 msgstr ""
 
-#: src/emu/inpttype.ipp:68
+#: src/emu/inpttype.ipp:66 src/emu/inpttype.ipp:184
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong M"
+msgid "%p Mahjong K"
 msgstr ""
 
-#: src/emu/inpttype.ipp:69
+#: src/emu/inpttype.ipp:67 src/emu/inpttype.ipp:185
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong N"
+msgid "%p Mahjong L"
 msgstr ""
 
-#: src/emu/inpttype.ipp:70
+#: src/emu/inpttype.ipp:68 src/emu/inpttype.ipp:186
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong O"
+msgid "%p Mahjong M"
 msgstr ""
 
-#: src/emu/inpttype.ipp:71
+#: src/emu/inpttype.ipp:69 src/emu/inpttype.ipp:187
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong P"
+msgid "%p Mahjong N"
 msgstr ""
 
-#: src/emu/inpttype.ipp:72
+#: src/emu/inpttype.ipp:70 src/emu/inpttype.ipp:188
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Q"
+msgid "%p Mahjong O"
 msgstr ""
 
-#: src/emu/inpttype.ipp:73
+#: src/emu/inpttype.ipp:71 src/emu/inpttype.ipp:189
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Kan"
+msgid "%p Mahjong P"
 msgstr ""
 
-#: src/emu/inpttype.ipp:74
+#: src/emu/inpttype.ipp:72 src/emu/inpttype.ipp:190
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Pon"
+msgid "%p Mahjong Q"
 msgstr ""
 
-#: src/emu/inpttype.ipp:75
+#: src/emu/inpttype.ipp:73 src/emu/inpttype.ipp:191
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Chi"
+msgid "%p Mahjong Kan"
 msgstr ""
 
-#: src/emu/inpttype.ipp:76
+#: src/emu/inpttype.ipp:74 src/emu/inpttype.ipp:192
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Reach"
+msgid "%p Mahjong Pon"
 msgstr ""
 
-#: src/emu/inpttype.ipp:77
+#: src/emu/inpttype.ipp:75 src/emu/inpttype.ipp:193
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Ron"
+msgid "%p Mahjong Chi"
 msgstr ""
 
-#: src/emu/inpttype.ipp:78
+#: src/emu/inpttype.ipp:76 src/emu/inpttype.ipp:194
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Flip Flop"
+msgid "%p Mahjong Reach"
 msgstr ""
 
-#: src/emu/inpttype.ipp:79
+#: src/emu/inpttype.ipp:77 src/emu/inpttype.ipp:195
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Bet"
+msgid "%p Mahjong Ron"
 msgstr ""
 
-#: src/emu/inpttype.ipp:80
+#: src/emu/inpttype.ipp:78 src/emu/inpttype.ipp:200
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Take Score"
+msgid "%p Mahjong Flip Flop"
 msgstr ""
 
-#: src/emu/inpttype.ipp:81
+#: src/emu/inpttype.ipp:79 src/emu/inpttype.ipp:196
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Double Up"
+msgid "%p Mahjong Bet"
 msgstr ""
 
-#: src/emu/inpttype.ipp:82
+#: src/emu/inpttype.ipp:80 src/emu/inpttype.ipp:198
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Big"
+msgid "%p Mahjong Take Score"
 msgstr ""
 
-#: src/emu/inpttype.ipp:83
+#: src/emu/inpttype.ipp:81 src/emu/inpttype.ipp:199
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Small"
+msgid "%p Mahjong Double Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:84
+#: src/emu/inpttype.ipp:82 src/emu/inpttype.ipp:201
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Last Chance"
+msgid "%p Mahjong Big"
 msgstr ""
 
-#: src/emu/inpttype.ipp:89
+#: src/emu/inpttype.ipp:83 src/emu/inpttype.ipp:202
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda A/1"
+msgid "%p Mahjong Small"
 msgstr ""
 
-#: src/emu/inpttype.ipp:90
+#: src/emu/inpttype.ipp:84 src/emu/inpttype.ipp:197
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda B/2"
+msgid "%p Mahjong Last Chance"
 msgstr ""
 
-#: src/emu/inpttype.ipp:91
+#: src/emu/inpttype.ipp:89 src/emu/inpttype.ipp:207
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda C/3"
+msgid "%p Hanafuda A/1"
 msgstr ""
 
-#: src/emu/inpttype.ipp:92
+#: src/emu/inpttype.ipp:90 src/emu/inpttype.ipp:208
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda D/4"
+msgid "%p Hanafuda B/2"
 msgstr ""
 
-#: src/emu/inpttype.ipp:93
+#: src/emu/inpttype.ipp:91 src/emu/inpttype.ipp:209
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda E/5"
+msgid "%p Hanafuda C/3"
 msgstr ""
 
-#: src/emu/inpttype.ipp:94
+#: src/emu/inpttype.ipp:92 src/emu/inpttype.ipp:210
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda F/6"
+msgid "%p Hanafuda D/4"
 msgstr ""
 
-#: src/emu/inpttype.ipp:95
+#: src/emu/inpttype.ipp:93 src/emu/inpttype.ipp:211
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda G/7"
+msgid "%p Hanafuda E/5"
 msgstr ""
 
-#: src/emu/inpttype.ipp:96
+#: src/emu/inpttype.ipp:94 src/emu/inpttype.ipp:212
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda H/8"
+msgid "%p Hanafuda F/6"
 msgstr ""
 
-#: src/emu/inpttype.ipp:97
+#: src/emu/inpttype.ipp:95 src/emu/inpttype.ipp:213
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda Yes"
+msgid "%p Hanafuda G/7"
 msgstr ""
 
-#: src/emu/inpttype.ipp:98
+#: src/emu/inpttype.ipp:96 src/emu/inpttype.ipp:214
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda No"
+msgid "%p Hanafuda H/8"
+msgstr ""
+
+#: src/emu/inpttype.ipp:97 src/emu/inpttype.ipp:215
+#, c-format
+msgctxt "input-name"
+msgid "%p Hanafuda Yes"
+msgstr ""
+
+#: src/emu/inpttype.ipp:98 src/emu/inpttype.ipp:216
+#, c-format
+msgctxt "input-name"
+msgid "%p Hanafuda No"
 msgstr ""
 
 #: src/emu/inpttype.ipp:103
@@ -3753,1551 +3927,6 @@ msgctxt "input-name"
 msgid "Stop All Reels"
 msgstr ""
 
-#: src/emu/inpttype.ipp:140
-msgctxt "input-name"
-msgid "P2 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:141
-msgctxt "input-name"
-msgid "P2 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:142
-msgctxt "input-name"
-msgid "P2 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:143
-msgctxt "input-name"
-msgid "P2 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:144
-msgctxt "input-name"
-msgid "P2 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:145
-msgctxt "input-name"
-msgid "P2 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:146
-msgctxt "input-name"
-msgid "P2 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:147
-msgctxt "input-name"
-msgid "P2 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:148
-msgctxt "input-name"
-msgid "P2 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:149
-msgctxt "input-name"
-msgid "P2 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:150
-msgctxt "input-name"
-msgid "P2 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:151
-msgctxt "input-name"
-msgid "P2 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:152
-msgctxt "input-name"
-msgid "P2 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:153
-msgctxt "input-name"
-msgid "P2 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:154
-msgctxt "input-name"
-msgid "P2 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:155
-msgctxt "input-name"
-msgid "P2 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:156
-msgctxt "input-name"
-msgid "P2 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:157
-msgctxt "input-name"
-msgid "P2 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:158
-msgctxt "input-name"
-msgid "P2 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:159
-msgctxt "input-name"
-msgid "P2 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:160
-msgctxt "input-name"
-msgid "P2 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:161
-msgctxt "input-name"
-msgid "P2 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:162
-msgctxt "input-name"
-msgid "P2 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:163
-msgctxt "input-name"
-msgid "P2 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:164
-msgctxt "input-name"
-msgid "P2 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:165
-msgctxt "input-name"
-msgid "P2 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:166
-msgctxt "input-name"
-msgid "P2 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:167
-msgctxt "input-name"
-msgid "P2 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:168
-msgctxt "input-name"
-msgid "P2 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:169
-msgctxt "input-name"
-msgid "P2 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:174
-msgctxt "input-name"
-msgid "P2 Mahjong A"
-msgstr ""
-
-#: src/emu/inpttype.ipp:175
-msgctxt "input-name"
-msgid "P2 Mahjong B"
-msgstr ""
-
-#: src/emu/inpttype.ipp:176
-msgctxt "input-name"
-msgid "P2 Mahjong C"
-msgstr ""
-
-#: src/emu/inpttype.ipp:177
-msgctxt "input-name"
-msgid "P2 Mahjong D"
-msgstr ""
-
-#: src/emu/inpttype.ipp:178
-msgctxt "input-name"
-msgid "P2 Mahjong E"
-msgstr ""
-
-#: src/emu/inpttype.ipp:179
-msgctxt "input-name"
-msgid "P2 Mahjong F"
-msgstr ""
-
-#: src/emu/inpttype.ipp:180
-msgctxt "input-name"
-msgid "P2 Mahjong G"
-msgstr ""
-
-#: src/emu/inpttype.ipp:181
-msgctxt "input-name"
-msgid "P2 Mahjong H"
-msgstr ""
-
-#: src/emu/inpttype.ipp:182
-msgctxt "input-name"
-msgid "P2 Mahjong I"
-msgstr ""
-
-#: src/emu/inpttype.ipp:183
-msgctxt "input-name"
-msgid "P2 Mahjong J"
-msgstr ""
-
-#: src/emu/inpttype.ipp:184
-msgctxt "input-name"
-msgid "P2 Mahjong K"
-msgstr ""
-
-#: src/emu/inpttype.ipp:185
-msgctxt "input-name"
-msgid "P2 Mahjong L"
-msgstr ""
-
-#: src/emu/inpttype.ipp:186
-msgctxt "input-name"
-msgid "P2 Mahjong M"
-msgstr ""
-
-#: src/emu/inpttype.ipp:187
-msgctxt "input-name"
-msgid "P2 Mahjong N"
-msgstr ""
-
-#: src/emu/inpttype.ipp:188
-msgctxt "input-name"
-msgid "P2 Mahjong O"
-msgstr ""
-
-#: src/emu/inpttype.ipp:189
-msgctxt "input-name"
-msgid "P2 Mahjong P"
-msgstr ""
-
-#: src/emu/inpttype.ipp:190
-msgctxt "input-name"
-msgid "P2 Mahjong Q"
-msgstr ""
-
-#: src/emu/inpttype.ipp:191
-msgctxt "input-name"
-msgid "P2 Mahjong Kan"
-msgstr ""
-
-#: src/emu/inpttype.ipp:192
-msgctxt "input-name"
-msgid "P2 Mahjong Pon"
-msgstr ""
-
-#: src/emu/inpttype.ipp:193
-msgctxt "input-name"
-msgid "P2 Mahjong Chi"
-msgstr ""
-
-#: src/emu/inpttype.ipp:194
-msgctxt "input-name"
-msgid "P2 Mahjong Reach"
-msgstr ""
-
-#: src/emu/inpttype.ipp:195
-msgctxt "input-name"
-msgid "P2 Mahjong Ron"
-msgstr ""
-
-#: src/emu/inpttype.ipp:196
-msgctxt "input-name"
-msgid "P2 Mahjong Bet"
-msgstr ""
-
-#: src/emu/inpttype.ipp:197
-msgctxt "input-name"
-msgid "P2 Mahjong Last Chance"
-msgstr ""
-
-#: src/emu/inpttype.ipp:198
-msgctxt "input-name"
-msgid "P2 Mahjong Take Score"
-msgstr ""
-
-#: src/emu/inpttype.ipp:199
-msgctxt "input-name"
-msgid "P2 Mahjong Double Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:200
-msgctxt "input-name"
-msgid "P2 Mahjong Flip Flop"
-msgstr ""
-
-#: src/emu/inpttype.ipp:201
-msgctxt "input-name"
-msgid "P2 Mahjong Big"
-msgstr ""
-
-#: src/emu/inpttype.ipp:202
-msgctxt "input-name"
-msgid "P2 Mahjong Small"
-msgstr ""
-
-#: src/emu/inpttype.ipp:207
-msgctxt "input-name"
-msgid "P2 Hanafuda A/1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:208
-msgctxt "input-name"
-msgid "P2 Hanafuda B/2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:209
-msgctxt "input-name"
-msgid "P2 Hanafuda C/3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:210
-msgctxt "input-name"
-msgid "P2 Hanafuda D/4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:211
-msgctxt "input-name"
-msgid "P2 Hanafuda E/5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:212
-msgctxt "input-name"
-msgid "P2 Hanafuda F/6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:213
-msgctxt "input-name"
-msgid "P2 Hanafuda G/7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:214
-msgctxt "input-name"
-msgid "P2 Hanafuda H/8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:215
-msgctxt "input-name"
-msgid "P2 Hanafuda Yes"
-msgstr ""
-
-#: src/emu/inpttype.ipp:216
-msgctxt "input-name"
-msgid "P2 Hanafuda No"
-msgstr ""
-
-#: src/emu/inpttype.ipp:221
-msgctxt "input-name"
-msgid "P3 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:222
-msgctxt "input-name"
-msgid "P3 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:223
-msgctxt "input-name"
-msgid "P3 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:224
-msgctxt "input-name"
-msgid "P3 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:225
-msgctxt "input-name"
-msgid "P3 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:226
-msgctxt "input-name"
-msgid "P3 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:227
-msgctxt "input-name"
-msgid "P3 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:228
-msgctxt "input-name"
-msgid "P3 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:229
-msgctxt "input-name"
-msgid "P3 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:230
-msgctxt "input-name"
-msgid "P3 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:231
-msgctxt "input-name"
-msgid "P3 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:232
-msgctxt "input-name"
-msgid "P3 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:233
-msgctxt "input-name"
-msgid "P3 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:234
-msgctxt "input-name"
-msgid "P3 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:235
-msgctxt "input-name"
-msgid "P3 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:236
-msgctxt "input-name"
-msgid "P3 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:237
-msgctxt "input-name"
-msgid "P3 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:238
-msgctxt "input-name"
-msgid "P3 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:239
-msgctxt "input-name"
-msgid "P3 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:240
-msgctxt "input-name"
-msgid "P3 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:241
-msgctxt "input-name"
-msgid "P3 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:242
-msgctxt "input-name"
-msgid "P3 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:243
-msgctxt "input-name"
-msgid "P3 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:244
-msgctxt "input-name"
-msgid "P3 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:245
-msgctxt "input-name"
-msgid "P3 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:246
-msgctxt "input-name"
-msgid "P3 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:247
-msgctxt "input-name"
-msgid "P3 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:248
-msgctxt "input-name"
-msgid "P3 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:249
-msgctxt "input-name"
-msgid "P3 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:250
-msgctxt "input-name"
-msgid "P3 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:255
-msgctxt "input-name"
-msgid "P4 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:256
-msgctxt "input-name"
-msgid "P4 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:257
-msgctxt "input-name"
-msgid "P4 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:258
-msgctxt "input-name"
-msgid "P4 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:259
-msgctxt "input-name"
-msgid "P4 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:260
-msgctxt "input-name"
-msgid "P4 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:261
-msgctxt "input-name"
-msgid "P4 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:262
-msgctxt "input-name"
-msgid "P4 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:263
-msgctxt "input-name"
-msgid "P4 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:264
-msgctxt "input-name"
-msgid "P4 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:265
-msgctxt "input-name"
-msgid "P4 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:266
-msgctxt "input-name"
-msgid "P4 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:267
-msgctxt "input-name"
-msgid "P4 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:268
-msgctxt "input-name"
-msgid "P4 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:269
-msgctxt "input-name"
-msgid "P4 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:270
-msgctxt "input-name"
-msgid "P4 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:271
-msgctxt "input-name"
-msgid "P4 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:272
-msgctxt "input-name"
-msgid "P4 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:273
-msgctxt "input-name"
-msgid "P4 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:274
-msgctxt "input-name"
-msgid "P4 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:275
-msgctxt "input-name"
-msgid "P4 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:276
-msgctxt "input-name"
-msgid "P4 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:277
-msgctxt "input-name"
-msgid "P4 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:278
-msgctxt "input-name"
-msgid "P4 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:279
-msgctxt "input-name"
-msgid "P4 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:280
-msgctxt "input-name"
-msgid "P4 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:281
-msgctxt "input-name"
-msgid "P4 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:282
-msgctxt "input-name"
-msgid "P4 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:283
-msgctxt "input-name"
-msgid "P4 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:284
-msgctxt "input-name"
-msgid "P4 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:289
-msgctxt "input-name"
-msgid "P5 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:290
-msgctxt "input-name"
-msgid "P5 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:291
-msgctxt "input-name"
-msgid "P5 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:292
-msgctxt "input-name"
-msgid "P5 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:293
-msgctxt "input-name"
-msgid "P5 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:294
-msgctxt "input-name"
-msgid "P5 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:295
-msgctxt "input-name"
-msgid "P5 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:296
-msgctxt "input-name"
-msgid "P5 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:297
-msgctxt "input-name"
-msgid "P5 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:298
-msgctxt "input-name"
-msgid "P5 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:299
-msgctxt "input-name"
-msgid "P5 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:300
-msgctxt "input-name"
-msgid "P5 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:301
-msgctxt "input-name"
-msgid "P5 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:302
-msgctxt "input-name"
-msgid "P5 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:303
-msgctxt "input-name"
-msgid "P5 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:304
-msgctxt "input-name"
-msgid "P5 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:305
-msgctxt "input-name"
-msgid "P5 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:306
-msgctxt "input-name"
-msgid "P5 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:307
-msgctxt "input-name"
-msgid "P5 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:308
-msgctxt "input-name"
-msgid "P5 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:309
-msgctxt "input-name"
-msgid "P5 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:310
-msgctxt "input-name"
-msgid "P5 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:311
-msgctxt "input-name"
-msgid "P5 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:312
-msgctxt "input-name"
-msgid "P5 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:313
-msgctxt "input-name"
-msgid "P5 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:314
-msgctxt "input-name"
-msgid "P5 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:315
-msgctxt "input-name"
-msgid "P5 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:316
-msgctxt "input-name"
-msgid "P5 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:317
-msgctxt "input-name"
-msgid "P5 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:318
-msgctxt "input-name"
-msgid "P5 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:323
-msgctxt "input-name"
-msgid "P6 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:324
-msgctxt "input-name"
-msgid "P6 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:325
-msgctxt "input-name"
-msgid "P6 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:326
-msgctxt "input-name"
-msgid "P6 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:327
-msgctxt "input-name"
-msgid "P6 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:328
-msgctxt "input-name"
-msgid "P6 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:329
-msgctxt "input-name"
-msgid "P6 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:330
-msgctxt "input-name"
-msgid "P6 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:331
-msgctxt "input-name"
-msgid "P6 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:332
-msgctxt "input-name"
-msgid "P6 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:333
-msgctxt "input-name"
-msgid "P6 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:334
-msgctxt "input-name"
-msgid "P6 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:335
-msgctxt "input-name"
-msgid "P6 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:336
-msgctxt "input-name"
-msgid "P6 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:337
-msgctxt "input-name"
-msgid "P6 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:338
-msgctxt "input-name"
-msgid "P6 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:339
-msgctxt "input-name"
-msgid "P6 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:340
-msgctxt "input-name"
-msgid "P6 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:341
-msgctxt "input-name"
-msgid "P6 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:342
-msgctxt "input-name"
-msgid "P6 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:343
-msgctxt "input-name"
-msgid "P6 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:344
-msgctxt "input-name"
-msgid "P6 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:345
-msgctxt "input-name"
-msgid "P6 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:346
-msgctxt "input-name"
-msgid "P6 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:347
-msgctxt "input-name"
-msgid "P6 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:348
-msgctxt "input-name"
-msgid "P6 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:349
-msgctxt "input-name"
-msgid "P6 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:350
-msgctxt "input-name"
-msgid "P6 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:351
-msgctxt "input-name"
-msgid "P6 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:352
-msgctxt "input-name"
-msgid "P6 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:357
-msgctxt "input-name"
-msgid "P7 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:358
-msgctxt "input-name"
-msgid "P7 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:359
-msgctxt "input-name"
-msgid "P7 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:360
-msgctxt "input-name"
-msgid "P7 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:361
-msgctxt "input-name"
-msgid "P7 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:362
-msgctxt "input-name"
-msgid "P7 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:363
-msgctxt "input-name"
-msgid "P7 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:364
-msgctxt "input-name"
-msgid "P7 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:365
-msgctxt "input-name"
-msgid "P7 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:366
-msgctxt "input-name"
-msgid "P7 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:367
-msgctxt "input-name"
-msgid "P7 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:368
-msgctxt "input-name"
-msgid "P7 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:369
-msgctxt "input-name"
-msgid "P7 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:370
-msgctxt "input-name"
-msgid "P7 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:371
-msgctxt "input-name"
-msgid "P7 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:372
-msgctxt "input-name"
-msgid "P7 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:373
-msgctxt "input-name"
-msgid "P7 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:374
-msgctxt "input-name"
-msgid "P7 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:375
-msgctxt "input-name"
-msgid "P7 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:376
-msgctxt "input-name"
-msgid "P7 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:377
-msgctxt "input-name"
-msgid "P7 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:378
-msgctxt "input-name"
-msgid "P7 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:379
-msgctxt "input-name"
-msgid "P7 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:380
-msgctxt "input-name"
-msgid "P7 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:381
-msgctxt "input-name"
-msgid "P7 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:382
-msgctxt "input-name"
-msgid "P7 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:383
-msgctxt "input-name"
-msgid "P7 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:384
-msgctxt "input-name"
-msgid "P7 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:385
-msgctxt "input-name"
-msgid "P7 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:386
-msgctxt "input-name"
-msgid "P7 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:391
-msgctxt "input-name"
-msgid "P8 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:392
-msgctxt "input-name"
-msgid "P8 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:393
-msgctxt "input-name"
-msgid "P8 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:394
-msgctxt "input-name"
-msgid "P8 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:395
-msgctxt "input-name"
-msgid "P8 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:396
-msgctxt "input-name"
-msgid "P8 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:397
-msgctxt "input-name"
-msgid "P8 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:398
-msgctxt "input-name"
-msgid "P8 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:399
-msgctxt "input-name"
-msgid "P8 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:400
-msgctxt "input-name"
-msgid "P8 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:401
-msgctxt "input-name"
-msgid "P8 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:402
-msgctxt "input-name"
-msgid "P8 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:403
-msgctxt "input-name"
-msgid "P8 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:404
-msgctxt "input-name"
-msgid "P8 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:405
-msgctxt "input-name"
-msgid "P8 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:406
-msgctxt "input-name"
-msgid "P8 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:407
-msgctxt "input-name"
-msgid "P8 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:408
-msgctxt "input-name"
-msgid "P8 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:409
-msgctxt "input-name"
-msgid "P8 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:410
-msgctxt "input-name"
-msgid "P8 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:411
-msgctxt "input-name"
-msgid "P8 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:412
-msgctxt "input-name"
-msgid "P8 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:413
-msgctxt "input-name"
-msgid "P8 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:414
-msgctxt "input-name"
-msgid "P8 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:415
-msgctxt "input-name"
-msgid "P8 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:416
-msgctxt "input-name"
-msgid "P8 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:417
-msgctxt "input-name"
-msgid "P8 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:418
-msgctxt "input-name"
-msgid "P8 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:419
-msgctxt "input-name"
-msgid "P8 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:420
-msgctxt "input-name"
-msgid "P8 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:425
-msgctxt "input-name"
-msgid "P9 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:426
-msgctxt "input-name"
-msgid "P9 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:427
-msgctxt "input-name"
-msgid "P9 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:428
-msgctxt "input-name"
-msgid "P9 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:429
-msgctxt "input-name"
-msgid "P9 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:430
-msgctxt "input-name"
-msgid "P9 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:431
-msgctxt "input-name"
-msgid "P9 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:432
-msgctxt "input-name"
-msgid "P9 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:433
-msgctxt "input-name"
-msgid "P9 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:434
-msgctxt "input-name"
-msgid "P9 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:435
-msgctxt "input-name"
-msgid "P9 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:436
-msgctxt "input-name"
-msgid "P9 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:437
-msgctxt "input-name"
-msgid "P9 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:438
-msgctxt "input-name"
-msgid "P9 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:439
-msgctxt "input-name"
-msgid "P9 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:440
-msgctxt "input-name"
-msgid "P9 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:441
-msgctxt "input-name"
-msgid "P9 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:442
-msgctxt "input-name"
-msgid "P9 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:443
-msgctxt "input-name"
-msgid "P9 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:444
-msgctxt "input-name"
-msgid "P9 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:445
-msgctxt "input-name"
-msgid "P9 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:446
-msgctxt "input-name"
-msgid "P9 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:447
-msgctxt "input-name"
-msgid "P9 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:448
-msgctxt "input-name"
-msgid "P9 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:449
-msgctxt "input-name"
-msgid "P9 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:450
-msgctxt "input-name"
-msgid "P9 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:451
-msgctxt "input-name"
-msgid "P9 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:452
-msgctxt "input-name"
-msgid "P9 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:453
-msgctxt "input-name"
-msgid "P9 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:454
-msgctxt "input-name"
-msgid "P9 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:459
-msgctxt "input-name"
-msgid "P10 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:460
-msgctxt "input-name"
-msgid "P10 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:461
-msgctxt "input-name"
-msgid "P10 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:462
-msgctxt "input-name"
-msgid "P10 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:463
-msgctxt "input-name"
-msgid "P10 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:464
-msgctxt "input-name"
-msgid "P10 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:465
-msgctxt "input-name"
-msgid "P10 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:466
-msgctxt "input-name"
-msgid "P10 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:467
-msgctxt "input-name"
-msgid "P10 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:468
-msgctxt "input-name"
-msgid "P10 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:469
-msgctxt "input-name"
-msgid "P10 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:470
-msgctxt "input-name"
-msgid "P10 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:471
-msgctxt "input-name"
-msgid "P10 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:472
-msgctxt "input-name"
-msgid "P10 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:473
-msgctxt "input-name"
-msgid "P10 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:474
-msgctxt "input-name"
-msgid "P10 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:475
-msgctxt "input-name"
-msgid "P10 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:476
-msgctxt "input-name"
-msgid "P10 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:477
-msgctxt "input-name"
-msgid "P10 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:478
-msgctxt "input-name"
-msgid "P10 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:479
-msgctxt "input-name"
-msgid "P10 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:480
-msgctxt "input-name"
-msgid "P10 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:481
-msgctxt "input-name"
-msgid "P10 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:482
-msgctxt "input-name"
-msgid "P10 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:483
-msgctxt "input-name"
-msgid "P10 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:484
-msgctxt "input-name"
-msgid "P10 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:485
-msgctxt "input-name"
-msgid "P10 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:486
-msgctxt "input-name"
-msgid "P10 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:487
-msgctxt "input-name"
-msgid "P10 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:488
-msgctxt "input-name"
-msgid "P10 Select"
-msgstr ""
-
 #: src/emu/inpttype.ipp:493
 msgctxt "input-name"
 msgid "1 Player Start"
@@ -5478,154 +4107,31 @@ msgctxt "input-name"
 msgid "Volume Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:550
-msgctxt "input-name"
-msgid "P1 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:551
-msgctxt "input-name"
-msgid "P2 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:552
-msgctxt "input-name"
-msgid "P3 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:553
-msgctxt "input-name"
-msgid "P4 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:554
-msgctxt "input-name"
-msgid "P5 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:555
-msgctxt "input-name"
-msgid "P6 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:556
-msgctxt "input-name"
-msgid "P7 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:557
-msgctxt "input-name"
-msgid "P8 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:558
-msgctxt "input-name"
-msgid "P9 Pedal 1"
-msgstr ""
-
+#: src/emu/inpttype.ipp:550 src/emu/inpttype.ipp:551 src/emu/inpttype.ipp:552
+#: src/emu/inpttype.ipp:553 src/emu/inpttype.ipp:554 src/emu/inpttype.ipp:555
+#: src/emu/inpttype.ipp:556 src/emu/inpttype.ipp:557 src/emu/inpttype.ipp:558
 #: src/emu/inpttype.ipp:559
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:564
-msgctxt "input-name"
-msgid "P1 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:565
-msgctxt "input-name"
-msgid "P2 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:566
-msgctxt "input-name"
-msgid "P3 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:567
-msgctxt "input-name"
-msgid "P4 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:568
-msgctxt "input-name"
-msgid "P5 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:569
-msgctxt "input-name"
-msgid "P6 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:570
-msgctxt "input-name"
-msgid "P7 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:571
-msgctxt "input-name"
-msgid "P8 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:572
-msgctxt "input-name"
-msgid "P9 Pedal 2"
+msgid "%p Pedal 1"
 msgstr ""
 
+#: src/emu/inpttype.ipp:564 src/emu/inpttype.ipp:565 src/emu/inpttype.ipp:566
+#: src/emu/inpttype.ipp:567 src/emu/inpttype.ipp:568 src/emu/inpttype.ipp:569
+#: src/emu/inpttype.ipp:570 src/emu/inpttype.ipp:571 src/emu/inpttype.ipp:572
 #: src/emu/inpttype.ipp:573
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:578
-msgctxt "input-name"
-msgid "P1 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:579
-msgctxt "input-name"
-msgid "P2 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:580
-msgctxt "input-name"
-msgid "P3 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:581
-msgctxt "input-name"
-msgid "P4 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:582
-msgctxt "input-name"
-msgid "P5 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:583
-msgctxt "input-name"
-msgid "P6 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:584
-msgctxt "input-name"
-msgid "P7 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:585
-msgctxt "input-name"
-msgid "P8 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:586
-msgctxt "input-name"
-msgid "P9 Pedal 3"
+msgid "%p Pedal 2"
 msgstr ""
 
+#: src/emu/inpttype.ipp:578 src/emu/inpttype.ipp:579 src/emu/inpttype.ipp:580
+#: src/emu/inpttype.ipp:581 src/emu/inpttype.ipp:582 src/emu/inpttype.ipp:583
+#: src/emu/inpttype.ipp:584 src/emu/inpttype.ipp:585 src/emu/inpttype.ipp:586
 #: src/emu/inpttype.ipp:587
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 3"
+msgid "%p Pedal 3"
 msgstr ""
 
 #: src/emu/inpttype.ipp:592
diff --git a/language/Lithuanian/strings.po b/language/Lithuanian/strings.po
index d88e9495efc..2d03f462a1a 100644
--- a/language/Lithuanian/strings.po
+++ b/language/Lithuanian/strings.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-19 02:50+1100\n"
+"POT-Creation-Date: 2021-12-09 04:44+1100\n"
 "PO-Revision-Date: 2016-02-20 18:03+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: MAME Language Team\n"
@@ -261,12 +261,12 @@ msgstr ""
 msgid "Driver: \"%1$s\" software list "
 msgstr ""
 
-#: src/frontend/mame/ui/selsoft.cpp:711 src/frontend/mame/ui/selgame.cpp:1066
+#: src/frontend/mame/ui/selsoft.cpp:711 src/frontend/mame/ui/selgame.cpp:1076
 #, c-format
 msgid "%1$s: %2$s - Search: %3$s_"
 msgstr ""
 
-#: src/frontend/mame/ui/selsoft.cpp:713 src/frontend/mame/ui/selgame.cpp:1068
+#: src/frontend/mame/ui/selsoft.cpp:713 src/frontend/mame/ui/selgame.cpp:1078
 #, c-format
 msgid "Search: %1$s_"
 msgstr ""
@@ -276,7 +276,7 @@ msgstr ""
 msgid "Software list/item: %1$s:%2$s"
 msgstr ""
 
-#: src/frontend/mame/ui/optsmenu.cpp:73 src/frontend/mame/ui/sndmenu.cpp:165
+#: src/frontend/mame/ui/optsmenu.cpp:73 src/frontend/mame/ui/sndmenu.cpp:161
 msgid "Sound Options"
 msgstr ""
 
@@ -371,11 +371,11 @@ msgid "Show mouse pointer"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:39
-msgid "Confirm quit from machines"
+msgid "Confirm quit from emulation"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:40
-msgid "Skip information screen at startup"
+msgid "Skip system information screen"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:41
@@ -391,7 +391,7 @@ msgid "Skip BIOS selection menu"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:44
-msgid "Skip software parts selection menu"
+msgid "Skip software part selection menu"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:45
@@ -543,7 +543,7 @@ msgid "UI active"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:91
-msgid "Offscreen reload"
+msgid "Off-screen reload"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:92
@@ -559,7 +559,7 @@ msgid "Natural keyboard"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:95
-msgid "Simultaneous contradictory"
+msgid "Allow contradictory joystick inputs"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:96
@@ -583,7 +583,7 @@ msgid "Pedal Device Assignment"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:106
-msgid "Adstick Device Assignment"
+msgid "AD Stick Device Assignment"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:107
@@ -670,14 +670,14 @@ msgstr ""
 msgid "Wait Vertical Sync"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:687
+#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:689
 #: src/frontend/mame/ui/videoopt.cpp:191 src/frontend/mame/ui/custui.cpp:490
 #: src/frontend/mame/ui/analogipt.cpp:471 plugins/cheatfind/init.lua:766
 #: plugins/cheatfind/init.lua:777 plugins/cheat/init.lua:668
 msgid "On"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:690
+#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:692
 #: src/frontend/mame/ui/videoopt.cpp:207 src/frontend/mame/ui/custui.cpp:490
 #: src/frontend/mame/ui/analogipt.cpp:471 plugins/cheatfind/init.lua:763
 #: plugins/cheatfind/init.lua:774 plugins/cheat/init.lua:671
@@ -685,11 +685,11 @@ msgstr ""
 msgid "Off"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:693
+#: src/frontend/mame/ui/menu.cpp:695
 msgid "Auto"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:1195
+#: src/frontend/mame/ui/menu.cpp:1197
 #: src/frontend/mame/ui/simpleselgame.cpp:278
 #: src/frontend/mame/ui/selmenu.cpp:1280
 msgid "Return to Previous Menu"
@@ -697,7 +697,7 @@ msgstr ""
 
 #: src/frontend/mame/ui/filemngr.cpp:139
 #: src/frontend/mame/ui/confswitch.cpp:119
-#: src/frontend/mame/ui/inputmap.cpp:559 src/frontend/mame/ui/analogipt.cpp:360
+#: src/frontend/mame/ui/inputmap.cpp:563 src/frontend/mame/ui/analogipt.cpp:360
 #, c-format
 msgid "[root%1$s]"
 msgstr ""
@@ -940,22 +940,22 @@ msgid ""
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "GHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "MHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "kHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "Hz"
 msgstr ""
 
@@ -979,38 +979,38 @@ msgstr ""
 msgid "Vector"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:480
+#: src/frontend/mame/ui/info.cpp:483
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:480
+#: src/frontend/mame/ui/info.cpp:483
 msgid "%2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:497
+#: src/frontend/mame/ui/info.cpp:500
 #, c-format
 msgid "Screen '%1$s'"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:499
+#: src/frontend/mame/ui/info.cpp:502
 msgid "Screen"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:570 src/frontend/mame/ui/info.cpp:581
+#: src/frontend/mame/ui/info.cpp:573 src/frontend/mame/ui/info.cpp:584
 #, c-format
 msgid "%1$s:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:662
+#: src/frontend/mame/ui/info.cpp:665
 msgid "Not supported"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:665
+#: src/frontend/mame/ui/info.cpp:668
 msgid "Partially supported"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:674
+#: src/frontend/mame/ui/info.cpp:677
 msgid "[empty]"
 msgstr ""
 
@@ -1083,7 +1083,7 @@ msgid "Emulated"
 msgstr ""
 
 #: src/frontend/mame/ui/keyboard.cpp:59 src/frontend/mame/ui/confswitch.cpp:117
-#: src/frontend/mame/ui/inputmap.cpp:557 src/frontend/mame/ui/analogipt.cpp:358
+#: src/frontend/mame/ui/inputmap.cpp:561 src/frontend/mame/ui/analogipt.cpp:358
 #, c-format
 msgid "%1$s [root%2$s]"
 msgstr ""
@@ -1443,7 +1443,7 @@ msgctxt "swlist-info"
 msgid "Software list/item"
 msgstr ""
 
-#: src/frontend/mame/ui/datmenu.cpp:88 src/frontend/mame/ui/selmenu.cpp:2698
+#: src/frontend/mame/ui/datmenu.cpp:88 src/frontend/mame/ui/selmenu.cpp:2707
 msgid "Software List Info"
 msgstr ""
 
@@ -1558,7 +1558,7 @@ msgstr ""
 msgid "Configure Machine:"
 msgstr ""
 
-#: src/frontend/mame/ui/miscmenu.cpp:858 src/frontend/mame/ui/selmenu.cpp:2638
+#: src/frontend/mame/ui/miscmenu.cpp:858 src/frontend/mame/ui/selmenu.cpp:2647
 msgid " (default)"
 msgstr ""
 
@@ -1575,7 +1575,7 @@ msgid ""
 "Press %2$s to return to emulation"
 msgstr ""
 
-#: src/frontend/mame/ui/info_pty.cpp:30 src/frontend/mame/ui/mainmenu.cpp:155
+#: src/frontend/mame/ui/info_pty.cpp:30
 msgid "Pseudo terminals"
 msgstr ""
 
@@ -1643,52 +1643,52 @@ msgstr ""
 msgid "Other Controls"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:227
+#: src/frontend/mame/ui/inputmap.cpp:231
 msgid "This machine has no configurable inputs."
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:327
+#: src/frontend/mame/ui/inputmap.cpp:331
 msgid "Pressed"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:397
+#: src/frontend/mame/ui/inputmap.cpp:401
 msgid "Invalid sequence entered"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:542
+#: src/frontend/mame/ui/inputmap.cpp:546
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:543
+#: src/frontend/mame/ui/inputmap.cpp:547
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog Inc"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:544
+#: src/frontend/mame/ui/inputmap.cpp:548
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog Dec"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:586
+#: src/frontend/mame/ui/inputmap.cpp:590
 #, c-format
 msgid "Press %1$s to set\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:587
+#: src/frontend/mame/ui/inputmap.cpp:591
 #, c-format
 msgid "Press %1$s to append\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:588
+#: src/frontend/mame/ui/inputmap.cpp:592
 #, c-format
 msgid "Press %1$s to clear\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:589
+#: src/frontend/mame/ui/inputmap.cpp:593
 #, c-format
 msgid "Press %1$s to restore default\n"
 msgstr ""
@@ -1752,7 +1752,7 @@ msgid ""
 msgstr ""
 
 #: src/frontend/mame/ui/simpleselgame.cpp:273
-#: src/frontend/mame/ui/selgame.cpp:436
+#: src/frontend/mame/ui/selgame.cpp:443
 msgid "Configure Options"
 msgstr ""
 
@@ -2080,16 +2080,16 @@ msgstr ""
 msgid "Expand to fit"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:437
+#: src/frontend/mame/ui/selgame.cpp:444
 msgid "Configure Machine"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:1050
+#: src/frontend/mame/ui/selgame.cpp:1060
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d machines (%5$d BIOS) )"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:1078
+#: src/frontend/mame/ui/selgame.cpp:1088
 #, c-format
 msgid "System: %1$-.100s"
 msgstr ""
@@ -2111,7 +2111,7 @@ msgstr ""
 #: src/frontend/mame/ui/auditmenu.cpp:98
 #, c-format
 msgid ""
-"Auditing ROMs for machine %2$u of %3$u...\n"
+"Auditing media for machine %2$u of %3$u...\n"
 "%1$s"
 msgstr ""
 
@@ -2126,12 +2126,12 @@ msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:136
 #, c-format
-msgid "Audit ROMs for %1$u machines marked unavailable"
+msgid "Audit media for %1$u machines marked unavailable"
 msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:137
 #, c-format
-msgid "Audit ROMs for all %1$u machines"
+msgid "Audit media for all %1$u machines"
 msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:154
@@ -2337,84 +2337,84 @@ msgctxt "color-sample"
 msgid "Clone"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:914
+#: src/frontend/mame/ui/custui.cpp:906
 msgid "ARGB Settings"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:919 src/frontend/mame/ui/custui.cpp:922
+#: src/frontend/mame/ui/custui.cpp:911 src/frontend/mame/ui/custui.cpp:914
 msgctxt "color-channel"
 msgid "Alpha"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:927 src/frontend/mame/ui/custui.cpp:930
+#: src/frontend/mame/ui/custui.cpp:919 src/frontend/mame/ui/custui.cpp:922
 msgctxt "color-channel"
 msgid "Red"
 msgstr ""
 
+#: src/frontend/mame/ui/custui.cpp:927 src/frontend/mame/ui/custui.cpp:930
+msgctxt "color-channel"
+msgid "Green"
+msgstr ""
+
 #: src/frontend/mame/ui/custui.cpp:935 src/frontend/mame/ui/custui.cpp:938
 msgctxt "color-channel"
-msgid "Green"
-msgstr ""
-
-#: src/frontend/mame/ui/custui.cpp:943 src/frontend/mame/ui/custui.cpp:946
-msgctxt "color-channel"
 msgid "Blue"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:949
+#: src/frontend/mame/ui/custui.cpp:941
 msgid "Choose from palette"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:996
+#: src/frontend/mame/ui/custui.cpp:988
 msgid "Color preview:"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1093
+#: src/frontend/mame/ui/custui.cpp:1085
 msgctxt "color-preset"
 msgid "White"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1094
+#: src/frontend/mame/ui/custui.cpp:1086
 msgctxt "color-preset"
 msgid "Silver"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1095
+#: src/frontend/mame/ui/custui.cpp:1087
 msgctxt "color-preset"
 msgid "Gray"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1096
+#: src/frontend/mame/ui/custui.cpp:1088
 msgctxt "color-preset"
 msgid "Black"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1097
+#: src/frontend/mame/ui/custui.cpp:1089
 msgctxt "color-preset"
 msgid "Red"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1098
+#: src/frontend/mame/ui/custui.cpp:1090
 msgctxt "color-preset"
 msgid "Orange"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1099
+#: src/frontend/mame/ui/custui.cpp:1091
 msgctxt "color-preset"
 msgid "Yellow"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1100
+#: src/frontend/mame/ui/custui.cpp:1092
 msgctxt "color-preset"
 msgid "Green"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1101
+#: src/frontend/mame/ui/custui.cpp:1093
 msgctxt "color-preset"
 msgid "Blue"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1102
+#: src/frontend/mame/ui/custui.cpp:1094
 msgctxt "color-preset"
 msgid "Violet"
 msgstr ""
@@ -2479,7 +2479,7 @@ msgid "Input (general)"
 msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:123
-msgid "Input (this Machine)"
+msgid "Input (this machine)"
 msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:126
@@ -2518,6 +2518,10 @@ msgstr ""
 msgid "Tape Control"
 msgstr ""
 
+#: src/frontend/mame/ui/mainmenu.cpp:155
+msgid "Pseudo Terminals"
+msgstr ""
+
 #: src/frontend/mame/ui/mainmenu.cpp:158
 msgid "BIOS Selection"
 msgstr ""
@@ -2556,7 +2560,7 @@ msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:200
 #, c-format
-msgid "About %s"
+msgid "About %1$s"
 msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:212
@@ -2716,373 +2720,373 @@ msgstr ""
 msgid "%1$s %2$s"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2235
+#: src/frontend/mame/ui/selmenu.cpp:2244
 msgid "Images"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2236
+#: src/frontend/mame/ui/selmenu.cpp:2245
 msgid "Infos"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2551
+#: src/frontend/mame/ui/selmenu.cpp:2560
 msgid ""
 "Required ROM/disk images for the selected system are missing or incorrect. "
 "Please acquire the correct files or select a different system.\n"
 "\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2567
+#: src/frontend/mame/ui/selmenu.cpp:2576
 msgid ""
 "Required ROM/disk images for the selected software are missing or incorrect. "
 "Please acquire the correct files or select a different software item.\n"
 "\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2583
+#: src/frontend/mame/ui/selmenu.cpp:2592
 msgid "incorrect checksum"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2586
+#: src/frontend/mame/ui/selmenu.cpp:2595
 msgid "incorrect length"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2589
+#: src/frontend/mame/ui/selmenu.cpp:2598
 msgid "not found"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2600
+#: src/frontend/mame/ui/selmenu.cpp:2609
 #, c-format
 msgid "%1$s (%2$s) - %3$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2602
+#: src/frontend/mame/ui/selmenu.cpp:2611
 #, c-format
 msgid "%1$s - %2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2606
+#: src/frontend/mame/ui/selmenu.cpp:2615
 msgid "Press any key to continue."
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2735
+#: src/frontend/mame/ui/selmenu.cpp:2744
 msgid "General Info"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2887
-#, c-format
-msgid "Romset\t%1$s\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2888
-#, c-format
-msgid "Year\t%1$s\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2889
-#, c-format
-msgid "Manufacturer\t%1$s\n"
-msgstr ""
-
 #: src/frontend/mame/ui/selmenu.cpp:2896
 #, c-format
-msgid "Driver is Clone of\t%1$s\n"
+msgid "Romset\t%1$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2901
-msgid "Driver is Parent\t\n"
+#: src/frontend/mame/ui/selmenu.cpp:2897
+#, c-format
+msgid "Year\t%1$s\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2898
+#, c-format
+msgid "Manufacturer\t%1$s\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2905
-msgid "Analog Controls\tYes\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2907
-msgid "Keyboard Inputs\tYes\n"
+#, c-format
+msgid "Driver is Clone of\t%1$s\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2910
-msgid "Overall\tNOT WORKING\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2912
-msgid "Overall\tUnemulated Protection\n"
+msgid "Driver is Parent\t\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2914
-msgid "Overall\tWorking\n"
+msgid "Analog Controls\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2917
-msgid "Graphics\tUnimplemented\n"
+#: src/frontend/mame/ui/selmenu.cpp:2916
+msgid "Keyboard Inputs\tYes\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2919
-msgid "Graphics\tWrong Colors\n"
+msgid "Overall\tNOT WORKING\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2921
-msgid "Graphics\tImperfect Colors\n"
+msgid "Overall\tUnemulated Protection\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2923
-msgid "Graphics\tImperfect\n"
+msgid "Overall\tWorking\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2925
-msgid "Graphics\tOK\n"
+#: src/frontend/mame/ui/selmenu.cpp:2926
+msgid "Graphics\tUnimplemented\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2928
-msgid "Sound\tNone\n"
+msgid "Graphics\tWrong Colors\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2930
-msgid "Sound\tUnimplemented\n"
+msgid "Graphics\tImperfect Colors\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2932
-msgid "Sound\tImperfect\n"
+msgid "Graphics\tImperfect\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2934
-msgid "Sound\tOK\n"
+msgid "Graphics\tOK\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2937
-msgid "Capture\tUnimplemented\n"
+msgid "Sound\tNone\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2939
+msgid "Sound\tUnimplemented\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2941
+msgid "Sound\tImperfect\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2943
+msgid "Sound\tOK\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2946
+msgid "Capture\tUnimplemented\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2948
 msgid "Capture\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2942
+#: src/frontend/mame/ui/selmenu.cpp:2951
 msgid "Camera\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2944
+#: src/frontend/mame/ui/selmenu.cpp:2953
 msgid "Camera\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2947
+#: src/frontend/mame/ui/selmenu.cpp:2956
 msgid "Microphone\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2949
+#: src/frontend/mame/ui/selmenu.cpp:2958
 msgid "Microphone\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2952
+#: src/frontend/mame/ui/selmenu.cpp:2961
 msgid "Controls\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2954
+#: src/frontend/mame/ui/selmenu.cpp:2963
 msgid "Controls\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2957
+#: src/frontend/mame/ui/selmenu.cpp:2966
 msgid "Keyboard\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2959
+#: src/frontend/mame/ui/selmenu.cpp:2968
 msgid "Keyboard\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2962
+#: src/frontend/mame/ui/selmenu.cpp:2971
 msgid "Mouse\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2964
+#: src/frontend/mame/ui/selmenu.cpp:2973
 msgid "Mouse\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2967
+#: src/frontend/mame/ui/selmenu.cpp:2976
 msgid "Media\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2969
+#: src/frontend/mame/ui/selmenu.cpp:2978
 msgid "Media\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2972
+#: src/frontend/mame/ui/selmenu.cpp:2981
 msgid "Disk\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2974
+#: src/frontend/mame/ui/selmenu.cpp:2983
 msgid "Disk\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2977
+#: src/frontend/mame/ui/selmenu.cpp:2986
 msgid "Printer\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2979
+#: src/frontend/mame/ui/selmenu.cpp:2988
 msgid "Printer\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2982
+#: src/frontend/mame/ui/selmenu.cpp:2991
 msgid "Mag. Tape\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2984
+#: src/frontend/mame/ui/selmenu.cpp:2993
 msgid "Mag. Tape\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2987
+#: src/frontend/mame/ui/selmenu.cpp:2996
 msgid "Punch Tape\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2989
+#: src/frontend/mame/ui/selmenu.cpp:2998
 msgid "Punch Tape\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2992
+#: src/frontend/mame/ui/selmenu.cpp:3001
 msgid "Mag. Drum\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2994
+#: src/frontend/mame/ui/selmenu.cpp:3003
 msgid "Mag. Drum\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2997
+#: src/frontend/mame/ui/selmenu.cpp:3006
 msgid "(EP)ROM\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2999
+#: src/frontend/mame/ui/selmenu.cpp:3008
 msgid "(EP)ROM\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3002
+#: src/frontend/mame/ui/selmenu.cpp:3011
 msgid "Communications\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3004
+#: src/frontend/mame/ui/selmenu.cpp:3013
 msgid "Communications\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3007
+#: src/frontend/mame/ui/selmenu.cpp:3016
 msgid "LAN\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3009
+#: src/frontend/mame/ui/selmenu.cpp:3018
 msgid "LAN\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3012
+#: src/frontend/mame/ui/selmenu.cpp:3021
 msgid "WAN\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3014
+#: src/frontend/mame/ui/selmenu.cpp:3023
 msgid "WAN\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3017
+#: src/frontend/mame/ui/selmenu.cpp:3026
 msgid "Timing\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3019
+#: src/frontend/mame/ui/selmenu.cpp:3028
 msgid "Timing\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3021
+#: src/frontend/mame/ui/selmenu.cpp:3030
 msgid "Mechanical Machine\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3021
+#: src/frontend/mame/ui/selmenu.cpp:3030
 msgid "Mechanical Machine\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3022
+#: src/frontend/mame/ui/selmenu.cpp:3031
 msgid "Requires Artwork\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3022
+#: src/frontend/mame/ui/selmenu.cpp:3031
 msgid "Requires Artwork\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3023
+#: src/frontend/mame/ui/selmenu.cpp:3032
 msgid "Requires Clickable Artwork\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3023
+#: src/frontend/mame/ui/selmenu.cpp:3032
 msgid "Requires Clickable Artwork\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3025
+#: src/frontend/mame/ui/selmenu.cpp:3034
 msgid "Support Cocktail\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3026
+#: src/frontend/mame/ui/selmenu.cpp:3035
 msgid "Driver is BIOS\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3026
+#: src/frontend/mame/ui/selmenu.cpp:3035
 msgid "Driver is BIOS\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3027
+#: src/frontend/mame/ui/selmenu.cpp:3036
 msgid "Support Save\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3027
+#: src/frontend/mame/ui/selmenu.cpp:3036
 msgid "Support Save\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3028
+#: src/frontend/mame/ui/selmenu.cpp:3037
 msgid "Screen Orientation\tVertical\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3028
+#: src/frontend/mame/ui/selmenu.cpp:3037
 msgid "Screen Orientation\tHorizontal\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3038
+#: src/frontend/mame/ui/selmenu.cpp:3047
 msgid "Requires CHD\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3038
+#: src/frontend/mame/ui/selmenu.cpp:3047
 msgid "Requires CHD\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3051
-msgid "ROM Audit Result\tOK\n"
+#: src/frontend/mame/ui/selmenu.cpp:3060
+msgid "Media Audit Result\tOK\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3053
-msgid "ROM Audit Result\tBAD\n"
+#: src/frontend/mame/ui/selmenu.cpp:3062
+msgid "Media Audit Result\tBAD\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3056
+#: src/frontend/mame/ui/selmenu.cpp:3065
 msgid "Samples Audit Result\tNone Needed\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3058
+#: src/frontend/mame/ui/selmenu.cpp:3067
 msgid "Samples Audit Result\tOK\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3060
+#: src/frontend/mame/ui/selmenu.cpp:3069
 msgid "Samples Audit Result\tBAD\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3064
+#: src/frontend/mame/ui/selmenu.cpp:3073
 msgid ""
-"ROM Audit \tDisabled\n"
-"Samples Audit \tDisabled\n"
+"Media Audit\tDisabled\n"
+"Samples Audit\tDisabled\n"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:150
+#: src/frontend/mame/ui/sndmenu.cpp:146
 msgid "Sound"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:151
+#: src/frontend/mame/ui/sndmenu.cpp:147
 msgid "Compressor"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:152
+#: src/frontend/mame/ui/sndmenu.cpp:148
 msgid "Sample Rate"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:153
+#: src/frontend/mame/ui/sndmenu.cpp:149
 msgid "Use External Samples"
 msgstr ""
 
@@ -3121,511 +3125,681 @@ msgstr ""
 msgid "  Screen '%1$s': Vector\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:132
+#: src/frontend/mame/ui/devopt.cpp:135
 #, c-format
 msgid "  Screen '%1$s': %2$d × %3$d (V) %4$s Hz\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:133
+#: src/frontend/mame/ui/devopt.cpp:136
 #, c-format
 msgid "  Screen '%1$s': %2$d × %3$d (H) %4$s Hz\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:147
+#: src/frontend/mame/ui/devopt.cpp:150
 msgid "* Sound:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:211
+#: src/frontend/mame/ui/devopt.cpp:214
 #, c-format
 msgid ""
 "* BIOS settings:\n"
 "  %1$d options    [default: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:255 src/frontend/mame/ui/devopt.cpp:271
-#: src/frontend/mame/ui/devopt.cpp:332
+#: src/frontend/mame/ui/devopt.cpp:258 src/frontend/mame/ui/devopt.cpp:274
+#: src/frontend/mame/ui/devopt.cpp:335
 #, c-format
 msgid "  %1$s    [default: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:260 src/frontend/mame/ui/devopt.cpp:276
+#: src/frontend/mame/ui/devopt.cpp:263 src/frontend/mame/ui/devopt.cpp:279
 #, c-format
 msgid "  %1$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:282
+#: src/frontend/mame/ui/devopt.cpp:285
 msgid "* DIP switch settings:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:287
+#: src/frontend/mame/ui/devopt.cpp:290
 msgid "* Configuration settings:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:291
+#: src/frontend/mame/ui/devopt.cpp:294
 msgid "* Input device(s):\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:293
+#: src/frontend/mame/ui/devopt.cpp:296
 #, c-format
 msgid "  User inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:295
+#: src/frontend/mame/ui/devopt.cpp:298
 #, c-format
 msgid "  Mahjong inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:297
+#: src/frontend/mame/ui/devopt.cpp:300
 #, c-format
 msgid "  Hanafuda inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:299
+#: src/frontend/mame/ui/devopt.cpp:302
 #, c-format
 msgid "  Gambling inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:301
+#: src/frontend/mame/ui/devopt.cpp:304
 #, c-format
 msgid "  Analog inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:303
+#: src/frontend/mame/ui/devopt.cpp:306
 #, c-format
 msgid "  Adjuster inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:305
+#: src/frontend/mame/ui/devopt.cpp:308
 #, c-format
 msgid "  Keypad inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:307
+#: src/frontend/mame/ui/devopt.cpp:310
 #, c-format
 msgid "  Keyboard inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:312
+#: src/frontend/mame/ui/devopt.cpp:315
 msgid "* Media Options:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:317
+#: src/frontend/mame/ui/devopt.cpp:320
 #, c-format
 msgid "  %1$s    [tag: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:327
+#: src/frontend/mame/ui/devopt.cpp:330
 msgid "* Slot Options:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:341
+#: src/frontend/mame/ui/devopt.cpp:344
 msgid "[None]\n"
 msgstr ""
 
-#: src/emu/render.cpp:1847
+#: src/emu/render.cpp:1796
 #, c-format
 msgctxt "view-name"
 msgid "Screen %1$u Standard (%2$u:%3$u)"
 msgstr ""
 
-#: src/emu/render.cpp:1873
+#: src/emu/render.cpp:1822
 #, c-format
 msgctxt "view-name"
 msgid "Screen %1$u Pixel Aspect (%2$u:%3$u)"
 msgstr ""
 
-#: src/emu/render.cpp:1895 src/emu/render.cpp:2030
+#: src/emu/render.cpp:1844 src/emu/render.cpp:1979
 msgctxt "view-name"
 msgid "Cocktail"
 msgstr ""
 
-#: src/emu/render.cpp:2015
+#: src/emu/render.cpp:1964
 msgctxt "view-name"
 msgid "Left-to-Right"
 msgstr ""
 
-#: src/emu/render.cpp:2016
+#: src/emu/render.cpp:1965
 msgctxt "view-name"
 msgid "Left-to-Right (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2017
+#: src/emu/render.cpp:1966
 msgctxt "view-name"
 msgid "Top-to-Bottom"
 msgstr ""
 
-#: src/emu/render.cpp:2018
+#: src/emu/render.cpp:1967
 msgctxt "view-name"
 msgid "Top-to-Bottom (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2069
+#: src/emu/render.cpp:2018
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Left-to-Right, Top-to-Bottom"
 msgstr ""
 
-#: src/emu/render.cpp:2078
+#: src/emu/render.cpp:2027
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Left-to-Right, Top-to-Bottom (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2087
+#: src/emu/render.cpp:2036
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Top-to-Bottom, Left-to-Right"
 msgstr ""
 
-#: src/emu/render.cpp:2096
+#: src/emu/render.cpp:2045
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Top-to-Bottom, Left-to-Right (Gapless)"
 msgstr ""
 
-#: src/emu/inpttype.ipp:22
+#: src/emu/ioport.cpp:332
+#, c-format
 msgctxt "input-name"
-msgid "P1 Up"
+msgid "P%1$u"
 msgstr ""
 
-#: src/emu/inpttype.ipp:23
+#: src/emu/ioport.cpp:1924
 msgctxt "input-name"
-msgid "P1 Down"
+msgid "???"
 msgstr ""
 
-#: src/emu/inpttype.ipp:24
+#: src/emu/inpttype.ipp:22 src/emu/inpttype.ipp:140 src/emu/inpttype.ipp:221
+#: src/emu/inpttype.ipp:255 src/emu/inpttype.ipp:289 src/emu/inpttype.ipp:323
+#: src/emu/inpttype.ipp:357 src/emu/inpttype.ipp:391 src/emu/inpttype.ipp:425
+#: src/emu/inpttype.ipp:459
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left"
+msgid "%p Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:25
+#: src/emu/inpttype.ipp:23 src/emu/inpttype.ipp:141 src/emu/inpttype.ipp:222
+#: src/emu/inpttype.ipp:256 src/emu/inpttype.ipp:290 src/emu/inpttype.ipp:324
+#: src/emu/inpttype.ipp:358 src/emu/inpttype.ipp:392 src/emu/inpttype.ipp:426
+#: src/emu/inpttype.ipp:460
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right"
+msgid "%p Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:26
+#: src/emu/inpttype.ipp:24 src/emu/inpttype.ipp:142 src/emu/inpttype.ipp:223
+#: src/emu/inpttype.ipp:257 src/emu/inpttype.ipp:291 src/emu/inpttype.ipp:325
+#: src/emu/inpttype.ipp:359 src/emu/inpttype.ipp:393 src/emu/inpttype.ipp:427
+#: src/emu/inpttype.ipp:461
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Up"
+msgid "%p Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:27
+#: src/emu/inpttype.ipp:25 src/emu/inpttype.ipp:143 src/emu/inpttype.ipp:224
+#: src/emu/inpttype.ipp:258 src/emu/inpttype.ipp:292 src/emu/inpttype.ipp:326
+#: src/emu/inpttype.ipp:360 src/emu/inpttype.ipp:394 src/emu/inpttype.ipp:428
+#: src/emu/inpttype.ipp:462
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Down"
+msgid "%p Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:28
+#: src/emu/inpttype.ipp:26 src/emu/inpttype.ipp:144 src/emu/inpttype.ipp:225
+#: src/emu/inpttype.ipp:259 src/emu/inpttype.ipp:293 src/emu/inpttype.ipp:327
+#: src/emu/inpttype.ipp:361 src/emu/inpttype.ipp:395 src/emu/inpttype.ipp:429
+#: src/emu/inpttype.ipp:463
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Left"
+msgid "%p Right Stick/Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:29
+#: src/emu/inpttype.ipp:27 src/emu/inpttype.ipp:145 src/emu/inpttype.ipp:226
+#: src/emu/inpttype.ipp:260 src/emu/inpttype.ipp:294 src/emu/inpttype.ipp:328
+#: src/emu/inpttype.ipp:362 src/emu/inpttype.ipp:396 src/emu/inpttype.ipp:430
+#: src/emu/inpttype.ipp:464
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Right"
+msgid "%p Right Stick/Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:30
+#: src/emu/inpttype.ipp:28 src/emu/inpttype.ipp:146 src/emu/inpttype.ipp:227
+#: src/emu/inpttype.ipp:261 src/emu/inpttype.ipp:295 src/emu/inpttype.ipp:329
+#: src/emu/inpttype.ipp:363 src/emu/inpttype.ipp:397 src/emu/inpttype.ipp:431
+#: src/emu/inpttype.ipp:465
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Up"
+msgid "%p Right Stick/Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:31
+#: src/emu/inpttype.ipp:29 src/emu/inpttype.ipp:147 src/emu/inpttype.ipp:228
+#: src/emu/inpttype.ipp:262 src/emu/inpttype.ipp:296 src/emu/inpttype.ipp:330
+#: src/emu/inpttype.ipp:364 src/emu/inpttype.ipp:398 src/emu/inpttype.ipp:432
+#: src/emu/inpttype.ipp:466
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Down"
+msgid "%p Right Stick/Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:32
+#: src/emu/inpttype.ipp:30 src/emu/inpttype.ipp:148 src/emu/inpttype.ipp:229
+#: src/emu/inpttype.ipp:263 src/emu/inpttype.ipp:297 src/emu/inpttype.ipp:331
+#: src/emu/inpttype.ipp:365 src/emu/inpttype.ipp:399 src/emu/inpttype.ipp:433
+#: src/emu/inpttype.ipp:467
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Left"
+msgid "%p Left Stick/Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:33
+#: src/emu/inpttype.ipp:31 src/emu/inpttype.ipp:149 src/emu/inpttype.ipp:230
+#: src/emu/inpttype.ipp:264 src/emu/inpttype.ipp:298 src/emu/inpttype.ipp:332
+#: src/emu/inpttype.ipp:366 src/emu/inpttype.ipp:400 src/emu/inpttype.ipp:434
+#: src/emu/inpttype.ipp:468
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Right"
+msgid "%p Left Stick/Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:34
+#: src/emu/inpttype.ipp:32 src/emu/inpttype.ipp:150 src/emu/inpttype.ipp:231
+#: src/emu/inpttype.ipp:265 src/emu/inpttype.ipp:299 src/emu/inpttype.ipp:333
+#: src/emu/inpttype.ipp:367 src/emu/inpttype.ipp:401 src/emu/inpttype.ipp:435
+#: src/emu/inpttype.ipp:469
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 1"
+msgid "%p Left Stick/Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:35
+#: src/emu/inpttype.ipp:33 src/emu/inpttype.ipp:151 src/emu/inpttype.ipp:232
+#: src/emu/inpttype.ipp:266 src/emu/inpttype.ipp:300 src/emu/inpttype.ipp:334
+#: src/emu/inpttype.ipp:368 src/emu/inpttype.ipp:402 src/emu/inpttype.ipp:436
+#: src/emu/inpttype.ipp:470
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 2"
+msgid "%p Left Stick/Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:36
+#: src/emu/inpttype.ipp:34 src/emu/inpttype.ipp:152 src/emu/inpttype.ipp:233
+#: src/emu/inpttype.ipp:267 src/emu/inpttype.ipp:301 src/emu/inpttype.ipp:335
+#: src/emu/inpttype.ipp:369 src/emu/inpttype.ipp:403 src/emu/inpttype.ipp:437
+#: src/emu/inpttype.ipp:471
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 3"
+msgid "%p Button 1"
 msgstr ""
 
-#: src/emu/inpttype.ipp:37
+#: src/emu/inpttype.ipp:35 src/emu/inpttype.ipp:153 src/emu/inpttype.ipp:234
+#: src/emu/inpttype.ipp:268 src/emu/inpttype.ipp:302 src/emu/inpttype.ipp:336
+#: src/emu/inpttype.ipp:370 src/emu/inpttype.ipp:404 src/emu/inpttype.ipp:438
+#: src/emu/inpttype.ipp:472
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 4"
+msgid "%p Button 2"
 msgstr ""
 
-#: src/emu/inpttype.ipp:38
+#: src/emu/inpttype.ipp:36 src/emu/inpttype.ipp:154 src/emu/inpttype.ipp:235
+#: src/emu/inpttype.ipp:269 src/emu/inpttype.ipp:303 src/emu/inpttype.ipp:337
+#: src/emu/inpttype.ipp:371 src/emu/inpttype.ipp:405 src/emu/inpttype.ipp:439
+#: src/emu/inpttype.ipp:473
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 5"
+msgid "%p Button 3"
 msgstr ""
 
-#: src/emu/inpttype.ipp:39
+#: src/emu/inpttype.ipp:37 src/emu/inpttype.ipp:155 src/emu/inpttype.ipp:236
+#: src/emu/inpttype.ipp:270 src/emu/inpttype.ipp:304 src/emu/inpttype.ipp:338
+#: src/emu/inpttype.ipp:372 src/emu/inpttype.ipp:406 src/emu/inpttype.ipp:440
+#: src/emu/inpttype.ipp:474
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 6"
+msgid "%p Button 4"
 msgstr ""
 
-#: src/emu/inpttype.ipp:40
+#: src/emu/inpttype.ipp:38 src/emu/inpttype.ipp:156 src/emu/inpttype.ipp:237
+#: src/emu/inpttype.ipp:271 src/emu/inpttype.ipp:305 src/emu/inpttype.ipp:339
+#: src/emu/inpttype.ipp:373 src/emu/inpttype.ipp:407 src/emu/inpttype.ipp:441
+#: src/emu/inpttype.ipp:475
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 7"
+msgid "%p Button 5"
 msgstr ""
 
-#: src/emu/inpttype.ipp:41
+#: src/emu/inpttype.ipp:39 src/emu/inpttype.ipp:157 src/emu/inpttype.ipp:238
+#: src/emu/inpttype.ipp:272 src/emu/inpttype.ipp:306 src/emu/inpttype.ipp:340
+#: src/emu/inpttype.ipp:374 src/emu/inpttype.ipp:408 src/emu/inpttype.ipp:442
+#: src/emu/inpttype.ipp:476
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 8"
+msgid "%p Button 6"
 msgstr ""
 
-#: src/emu/inpttype.ipp:42
+#: src/emu/inpttype.ipp:40 src/emu/inpttype.ipp:158 src/emu/inpttype.ipp:239
+#: src/emu/inpttype.ipp:273 src/emu/inpttype.ipp:307 src/emu/inpttype.ipp:341
+#: src/emu/inpttype.ipp:375 src/emu/inpttype.ipp:409 src/emu/inpttype.ipp:443
+#: src/emu/inpttype.ipp:477
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 9"
+msgid "%p Button 7"
 msgstr ""
 
-#: src/emu/inpttype.ipp:43
+#: src/emu/inpttype.ipp:41 src/emu/inpttype.ipp:159 src/emu/inpttype.ipp:240
+#: src/emu/inpttype.ipp:274 src/emu/inpttype.ipp:308 src/emu/inpttype.ipp:342
+#: src/emu/inpttype.ipp:376 src/emu/inpttype.ipp:410 src/emu/inpttype.ipp:444
+#: src/emu/inpttype.ipp:478
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 10"
+msgid "%p Button 8"
 msgstr ""
 
-#: src/emu/inpttype.ipp:44
+#: src/emu/inpttype.ipp:42 src/emu/inpttype.ipp:160 src/emu/inpttype.ipp:241
+#: src/emu/inpttype.ipp:275 src/emu/inpttype.ipp:309 src/emu/inpttype.ipp:343
+#: src/emu/inpttype.ipp:377 src/emu/inpttype.ipp:411 src/emu/inpttype.ipp:445
+#: src/emu/inpttype.ipp:479
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 11"
+msgid "%p Button 9"
 msgstr ""
 
-#: src/emu/inpttype.ipp:45
+#: src/emu/inpttype.ipp:43 src/emu/inpttype.ipp:161 src/emu/inpttype.ipp:242
+#: src/emu/inpttype.ipp:276 src/emu/inpttype.ipp:310 src/emu/inpttype.ipp:344
+#: src/emu/inpttype.ipp:378 src/emu/inpttype.ipp:412 src/emu/inpttype.ipp:446
+#: src/emu/inpttype.ipp:480
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 12"
+msgid "%p Button 10"
 msgstr ""
 
-#: src/emu/inpttype.ipp:46
+#: src/emu/inpttype.ipp:44 src/emu/inpttype.ipp:162 src/emu/inpttype.ipp:243
+#: src/emu/inpttype.ipp:277 src/emu/inpttype.ipp:311 src/emu/inpttype.ipp:345
+#: src/emu/inpttype.ipp:379 src/emu/inpttype.ipp:413 src/emu/inpttype.ipp:447
+#: src/emu/inpttype.ipp:481
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 13"
+msgid "%p Button 11"
 msgstr ""
 
-#: src/emu/inpttype.ipp:47
+#: src/emu/inpttype.ipp:45 src/emu/inpttype.ipp:163 src/emu/inpttype.ipp:244
+#: src/emu/inpttype.ipp:278 src/emu/inpttype.ipp:312 src/emu/inpttype.ipp:346
+#: src/emu/inpttype.ipp:380 src/emu/inpttype.ipp:414 src/emu/inpttype.ipp:448
+#: src/emu/inpttype.ipp:482
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 14"
+msgid "%p Button 12"
 msgstr ""
 
-#: src/emu/inpttype.ipp:48
+#: src/emu/inpttype.ipp:46 src/emu/inpttype.ipp:164 src/emu/inpttype.ipp:245
+#: src/emu/inpttype.ipp:279 src/emu/inpttype.ipp:313 src/emu/inpttype.ipp:347
+#: src/emu/inpttype.ipp:381 src/emu/inpttype.ipp:415 src/emu/inpttype.ipp:449
+#: src/emu/inpttype.ipp:483
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 15"
+msgid "%p Button 13"
 msgstr ""
 
-#: src/emu/inpttype.ipp:49
+#: src/emu/inpttype.ipp:47 src/emu/inpttype.ipp:165 src/emu/inpttype.ipp:246
+#: src/emu/inpttype.ipp:280 src/emu/inpttype.ipp:314 src/emu/inpttype.ipp:348
+#: src/emu/inpttype.ipp:382 src/emu/inpttype.ipp:416 src/emu/inpttype.ipp:450
+#: src/emu/inpttype.ipp:484
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 16"
+msgid "%p Button 14"
 msgstr ""
 
-#: src/emu/inpttype.ipp:50
+#: src/emu/inpttype.ipp:48 src/emu/inpttype.ipp:166 src/emu/inpttype.ipp:247
+#: src/emu/inpttype.ipp:281 src/emu/inpttype.ipp:315 src/emu/inpttype.ipp:349
+#: src/emu/inpttype.ipp:383 src/emu/inpttype.ipp:417 src/emu/inpttype.ipp:451
+#: src/emu/inpttype.ipp:485
+#, c-format
 msgctxt "input-name"
-msgid "P1 Start"
+msgid "%p Button 15"
 msgstr ""
 
-#: src/emu/inpttype.ipp:51
+#: src/emu/inpttype.ipp:49 src/emu/inpttype.ipp:167 src/emu/inpttype.ipp:248
+#: src/emu/inpttype.ipp:282 src/emu/inpttype.ipp:316 src/emu/inpttype.ipp:350
+#: src/emu/inpttype.ipp:384 src/emu/inpttype.ipp:418 src/emu/inpttype.ipp:452
+#: src/emu/inpttype.ipp:486
+#, c-format
 msgctxt "input-name"
-msgid "P1 Select"
+msgid "%p Button 16"
 msgstr ""
 
-#: src/emu/inpttype.ipp:56
+#: src/emu/inpttype.ipp:50 src/emu/inpttype.ipp:168 src/emu/inpttype.ipp:249
+#: src/emu/inpttype.ipp:283 src/emu/inpttype.ipp:317 src/emu/inpttype.ipp:351
+#: src/emu/inpttype.ipp:385 src/emu/inpttype.ipp:419 src/emu/inpttype.ipp:453
+#: src/emu/inpttype.ipp:487
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong A"
+msgid "%p Start"
 msgstr ""
 
-#: src/emu/inpttype.ipp:57
+#: src/emu/inpttype.ipp:51 src/emu/inpttype.ipp:169 src/emu/inpttype.ipp:250
+#: src/emu/inpttype.ipp:284 src/emu/inpttype.ipp:318 src/emu/inpttype.ipp:352
+#: src/emu/inpttype.ipp:386 src/emu/inpttype.ipp:420 src/emu/inpttype.ipp:454
+#: src/emu/inpttype.ipp:488
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong B"
+msgid "%p Select"
 msgstr ""
 
-#: src/emu/inpttype.ipp:58
+#: src/emu/inpttype.ipp:56 src/emu/inpttype.ipp:174
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong C"
+msgid "%p Mahjong A"
 msgstr ""
 
-#: src/emu/inpttype.ipp:59
+#: src/emu/inpttype.ipp:57 src/emu/inpttype.ipp:175
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong D"
+msgid "%p Mahjong B"
 msgstr ""
 
-#: src/emu/inpttype.ipp:60
+#: src/emu/inpttype.ipp:58 src/emu/inpttype.ipp:176
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong E"
+msgid "%p Mahjong C"
 msgstr ""
 
-#: src/emu/inpttype.ipp:61
+#: src/emu/inpttype.ipp:59 src/emu/inpttype.ipp:177
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong F"
+msgid "%p Mahjong D"
 msgstr ""
 
-#: src/emu/inpttype.ipp:62
+#: src/emu/inpttype.ipp:60 src/emu/inpttype.ipp:178
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong G"
+msgid "%p Mahjong E"
 msgstr ""
 
-#: src/emu/inpttype.ipp:63
+#: src/emu/inpttype.ipp:61 src/emu/inpttype.ipp:179
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong H"
+msgid "%p Mahjong F"
 msgstr ""
 
-#: src/emu/inpttype.ipp:64
+#: src/emu/inpttype.ipp:62 src/emu/inpttype.ipp:180
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong I"
+msgid "%p Mahjong G"
 msgstr ""
 
-#: src/emu/inpttype.ipp:65
+#: src/emu/inpttype.ipp:63 src/emu/inpttype.ipp:181
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong J"
+msgid "%p Mahjong H"
 msgstr ""
 
-#: src/emu/inpttype.ipp:66
+#: src/emu/inpttype.ipp:64 src/emu/inpttype.ipp:182
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong K"
+msgid "%p Mahjong I"
 msgstr ""
 
-#: src/emu/inpttype.ipp:67
+#: src/emu/inpttype.ipp:65 src/emu/inpttype.ipp:183
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong L"
+msgid "%p Mahjong J"
 msgstr ""
 
-#: src/emu/inpttype.ipp:68
+#: src/emu/inpttype.ipp:66 src/emu/inpttype.ipp:184
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong M"
+msgid "%p Mahjong K"
 msgstr ""
 
-#: src/emu/inpttype.ipp:69
+#: src/emu/inpttype.ipp:67 src/emu/inpttype.ipp:185
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong N"
+msgid "%p Mahjong L"
 msgstr ""
 
-#: src/emu/inpttype.ipp:70
+#: src/emu/inpttype.ipp:68 src/emu/inpttype.ipp:186
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong O"
+msgid "%p Mahjong M"
 msgstr ""
 
-#: src/emu/inpttype.ipp:71
+#: src/emu/inpttype.ipp:69 src/emu/inpttype.ipp:187
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong P"
+msgid "%p Mahjong N"
 msgstr ""
 
-#: src/emu/inpttype.ipp:72
+#: src/emu/inpttype.ipp:70 src/emu/inpttype.ipp:188
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Q"
+msgid "%p Mahjong O"
 msgstr ""
 
-#: src/emu/inpttype.ipp:73
+#: src/emu/inpttype.ipp:71 src/emu/inpttype.ipp:189
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Kan"
+msgid "%p Mahjong P"
 msgstr ""
 
-#: src/emu/inpttype.ipp:74
+#: src/emu/inpttype.ipp:72 src/emu/inpttype.ipp:190
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Pon"
+msgid "%p Mahjong Q"
 msgstr ""
 
-#: src/emu/inpttype.ipp:75
+#: src/emu/inpttype.ipp:73 src/emu/inpttype.ipp:191
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Chi"
+msgid "%p Mahjong Kan"
 msgstr ""
 
-#: src/emu/inpttype.ipp:76
+#: src/emu/inpttype.ipp:74 src/emu/inpttype.ipp:192
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Reach"
+msgid "%p Mahjong Pon"
 msgstr ""
 
-#: src/emu/inpttype.ipp:77
+#: src/emu/inpttype.ipp:75 src/emu/inpttype.ipp:193
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Ron"
+msgid "%p Mahjong Chi"
 msgstr ""
 
-#: src/emu/inpttype.ipp:78
+#: src/emu/inpttype.ipp:76 src/emu/inpttype.ipp:194
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Flip Flop"
+msgid "%p Mahjong Reach"
 msgstr ""
 
-#: src/emu/inpttype.ipp:79
+#: src/emu/inpttype.ipp:77 src/emu/inpttype.ipp:195
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Bet"
+msgid "%p Mahjong Ron"
 msgstr ""
 
-#: src/emu/inpttype.ipp:80
+#: src/emu/inpttype.ipp:78 src/emu/inpttype.ipp:200
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Take Score"
+msgid "%p Mahjong Flip Flop"
 msgstr ""
 
-#: src/emu/inpttype.ipp:81
+#: src/emu/inpttype.ipp:79 src/emu/inpttype.ipp:196
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Double Up"
+msgid "%p Mahjong Bet"
 msgstr ""
 
-#: src/emu/inpttype.ipp:82
+#: src/emu/inpttype.ipp:80 src/emu/inpttype.ipp:198
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Big"
+msgid "%p Mahjong Take Score"
 msgstr ""
 
-#: src/emu/inpttype.ipp:83
+#: src/emu/inpttype.ipp:81 src/emu/inpttype.ipp:199
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Small"
+msgid "%p Mahjong Double Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:84
+#: src/emu/inpttype.ipp:82 src/emu/inpttype.ipp:201
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Last Chance"
+msgid "%p Mahjong Big"
 msgstr ""
 
-#: src/emu/inpttype.ipp:89
+#: src/emu/inpttype.ipp:83 src/emu/inpttype.ipp:202
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda A/1"
+msgid "%p Mahjong Small"
 msgstr ""
 
-#: src/emu/inpttype.ipp:90
+#: src/emu/inpttype.ipp:84 src/emu/inpttype.ipp:197
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda B/2"
+msgid "%p Mahjong Last Chance"
 msgstr ""
 
-#: src/emu/inpttype.ipp:91
+#: src/emu/inpttype.ipp:89 src/emu/inpttype.ipp:207
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda C/3"
+msgid "%p Hanafuda A/1"
 msgstr ""
 
-#: src/emu/inpttype.ipp:92
+#: src/emu/inpttype.ipp:90 src/emu/inpttype.ipp:208
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda D/4"
+msgid "%p Hanafuda B/2"
 msgstr ""
 
-#: src/emu/inpttype.ipp:93
+#: src/emu/inpttype.ipp:91 src/emu/inpttype.ipp:209
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda E/5"
+msgid "%p Hanafuda C/3"
 msgstr ""
 
-#: src/emu/inpttype.ipp:94
+#: src/emu/inpttype.ipp:92 src/emu/inpttype.ipp:210
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda F/6"
+msgid "%p Hanafuda D/4"
 msgstr ""
 
-#: src/emu/inpttype.ipp:95
+#: src/emu/inpttype.ipp:93 src/emu/inpttype.ipp:211
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda G/7"
+msgid "%p Hanafuda E/5"
 msgstr ""
 
-#: src/emu/inpttype.ipp:96
+#: src/emu/inpttype.ipp:94 src/emu/inpttype.ipp:212
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda H/8"
+msgid "%p Hanafuda F/6"
 msgstr ""
 
-#: src/emu/inpttype.ipp:97
+#: src/emu/inpttype.ipp:95 src/emu/inpttype.ipp:213
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda Yes"
+msgid "%p Hanafuda G/7"
 msgstr ""
 
-#: src/emu/inpttype.ipp:98
+#: src/emu/inpttype.ipp:96 src/emu/inpttype.ipp:214
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda No"
+msgid "%p Hanafuda H/8"
+msgstr ""
+
+#: src/emu/inpttype.ipp:97 src/emu/inpttype.ipp:215
+#, c-format
+msgctxt "input-name"
+msgid "%p Hanafuda Yes"
+msgstr ""
+
+#: src/emu/inpttype.ipp:98 src/emu/inpttype.ipp:216
+#, c-format
+msgctxt "input-name"
+msgid "%p Hanafuda No"
 msgstr ""
 
 #: src/emu/inpttype.ipp:103
@@ -3753,1551 +3927,6 @@ msgctxt "input-name"
 msgid "Stop All Reels"
 msgstr ""
 
-#: src/emu/inpttype.ipp:140
-msgctxt "input-name"
-msgid "P2 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:141
-msgctxt "input-name"
-msgid "P2 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:142
-msgctxt "input-name"
-msgid "P2 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:143
-msgctxt "input-name"
-msgid "P2 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:144
-msgctxt "input-name"
-msgid "P2 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:145
-msgctxt "input-name"
-msgid "P2 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:146
-msgctxt "input-name"
-msgid "P2 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:147
-msgctxt "input-name"
-msgid "P2 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:148
-msgctxt "input-name"
-msgid "P2 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:149
-msgctxt "input-name"
-msgid "P2 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:150
-msgctxt "input-name"
-msgid "P2 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:151
-msgctxt "input-name"
-msgid "P2 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:152
-msgctxt "input-name"
-msgid "P2 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:153
-msgctxt "input-name"
-msgid "P2 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:154
-msgctxt "input-name"
-msgid "P2 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:155
-msgctxt "input-name"
-msgid "P2 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:156
-msgctxt "input-name"
-msgid "P2 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:157
-msgctxt "input-name"
-msgid "P2 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:158
-msgctxt "input-name"
-msgid "P2 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:159
-msgctxt "input-name"
-msgid "P2 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:160
-msgctxt "input-name"
-msgid "P2 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:161
-msgctxt "input-name"
-msgid "P2 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:162
-msgctxt "input-name"
-msgid "P2 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:163
-msgctxt "input-name"
-msgid "P2 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:164
-msgctxt "input-name"
-msgid "P2 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:165
-msgctxt "input-name"
-msgid "P2 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:166
-msgctxt "input-name"
-msgid "P2 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:167
-msgctxt "input-name"
-msgid "P2 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:168
-msgctxt "input-name"
-msgid "P2 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:169
-msgctxt "input-name"
-msgid "P2 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:174
-msgctxt "input-name"
-msgid "P2 Mahjong A"
-msgstr ""
-
-#: src/emu/inpttype.ipp:175
-msgctxt "input-name"
-msgid "P2 Mahjong B"
-msgstr ""
-
-#: src/emu/inpttype.ipp:176
-msgctxt "input-name"
-msgid "P2 Mahjong C"
-msgstr ""
-
-#: src/emu/inpttype.ipp:177
-msgctxt "input-name"
-msgid "P2 Mahjong D"
-msgstr ""
-
-#: src/emu/inpttype.ipp:178
-msgctxt "input-name"
-msgid "P2 Mahjong E"
-msgstr ""
-
-#: src/emu/inpttype.ipp:179
-msgctxt "input-name"
-msgid "P2 Mahjong F"
-msgstr ""
-
-#: src/emu/inpttype.ipp:180
-msgctxt "input-name"
-msgid "P2 Mahjong G"
-msgstr ""
-
-#: src/emu/inpttype.ipp:181
-msgctxt "input-name"
-msgid "P2 Mahjong H"
-msgstr ""
-
-#: src/emu/inpttype.ipp:182
-msgctxt "input-name"
-msgid "P2 Mahjong I"
-msgstr ""
-
-#: src/emu/inpttype.ipp:183
-msgctxt "input-name"
-msgid "P2 Mahjong J"
-msgstr ""
-
-#: src/emu/inpttype.ipp:184
-msgctxt "input-name"
-msgid "P2 Mahjong K"
-msgstr ""
-
-#: src/emu/inpttype.ipp:185
-msgctxt "input-name"
-msgid "P2 Mahjong L"
-msgstr ""
-
-#: src/emu/inpttype.ipp:186
-msgctxt "input-name"
-msgid "P2 Mahjong M"
-msgstr ""
-
-#: src/emu/inpttype.ipp:187
-msgctxt "input-name"
-msgid "P2 Mahjong N"
-msgstr ""
-
-#: src/emu/inpttype.ipp:188
-msgctxt "input-name"
-msgid "P2 Mahjong O"
-msgstr ""
-
-#: src/emu/inpttype.ipp:189
-msgctxt "input-name"
-msgid "P2 Mahjong P"
-msgstr ""
-
-#: src/emu/inpttype.ipp:190
-msgctxt "input-name"
-msgid "P2 Mahjong Q"
-msgstr ""
-
-#: src/emu/inpttype.ipp:191
-msgctxt "input-name"
-msgid "P2 Mahjong Kan"
-msgstr ""
-
-#: src/emu/inpttype.ipp:192
-msgctxt "input-name"
-msgid "P2 Mahjong Pon"
-msgstr ""
-
-#: src/emu/inpttype.ipp:193
-msgctxt "input-name"
-msgid "P2 Mahjong Chi"
-msgstr ""
-
-#: src/emu/inpttype.ipp:194
-msgctxt "input-name"
-msgid "P2 Mahjong Reach"
-msgstr ""
-
-#: src/emu/inpttype.ipp:195
-msgctxt "input-name"
-msgid "P2 Mahjong Ron"
-msgstr ""
-
-#: src/emu/inpttype.ipp:196
-msgctxt "input-name"
-msgid "P2 Mahjong Bet"
-msgstr ""
-
-#: src/emu/inpttype.ipp:197
-msgctxt "input-name"
-msgid "P2 Mahjong Last Chance"
-msgstr ""
-
-#: src/emu/inpttype.ipp:198
-msgctxt "input-name"
-msgid "P2 Mahjong Take Score"
-msgstr ""
-
-#: src/emu/inpttype.ipp:199
-msgctxt "input-name"
-msgid "P2 Mahjong Double Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:200
-msgctxt "input-name"
-msgid "P2 Mahjong Flip Flop"
-msgstr ""
-
-#: src/emu/inpttype.ipp:201
-msgctxt "input-name"
-msgid "P2 Mahjong Big"
-msgstr ""
-
-#: src/emu/inpttype.ipp:202
-msgctxt "input-name"
-msgid "P2 Mahjong Small"
-msgstr ""
-
-#: src/emu/inpttype.ipp:207
-msgctxt "input-name"
-msgid "P2 Hanafuda A/1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:208
-msgctxt "input-name"
-msgid "P2 Hanafuda B/2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:209
-msgctxt "input-name"
-msgid "P2 Hanafuda C/3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:210
-msgctxt "input-name"
-msgid "P2 Hanafuda D/4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:211
-msgctxt "input-name"
-msgid "P2 Hanafuda E/5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:212
-msgctxt "input-name"
-msgid "P2 Hanafuda F/6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:213
-msgctxt "input-name"
-msgid "P2 Hanafuda G/7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:214
-msgctxt "input-name"
-msgid "P2 Hanafuda H/8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:215
-msgctxt "input-name"
-msgid "P2 Hanafuda Yes"
-msgstr ""
-
-#: src/emu/inpttype.ipp:216
-msgctxt "input-name"
-msgid "P2 Hanafuda No"
-msgstr ""
-
-#: src/emu/inpttype.ipp:221
-msgctxt "input-name"
-msgid "P3 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:222
-msgctxt "input-name"
-msgid "P3 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:223
-msgctxt "input-name"
-msgid "P3 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:224
-msgctxt "input-name"
-msgid "P3 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:225
-msgctxt "input-name"
-msgid "P3 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:226
-msgctxt "input-name"
-msgid "P3 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:227
-msgctxt "input-name"
-msgid "P3 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:228
-msgctxt "input-name"
-msgid "P3 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:229
-msgctxt "input-name"
-msgid "P3 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:230
-msgctxt "input-name"
-msgid "P3 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:231
-msgctxt "input-name"
-msgid "P3 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:232
-msgctxt "input-name"
-msgid "P3 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:233
-msgctxt "input-name"
-msgid "P3 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:234
-msgctxt "input-name"
-msgid "P3 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:235
-msgctxt "input-name"
-msgid "P3 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:236
-msgctxt "input-name"
-msgid "P3 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:237
-msgctxt "input-name"
-msgid "P3 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:238
-msgctxt "input-name"
-msgid "P3 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:239
-msgctxt "input-name"
-msgid "P3 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:240
-msgctxt "input-name"
-msgid "P3 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:241
-msgctxt "input-name"
-msgid "P3 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:242
-msgctxt "input-name"
-msgid "P3 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:243
-msgctxt "input-name"
-msgid "P3 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:244
-msgctxt "input-name"
-msgid "P3 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:245
-msgctxt "input-name"
-msgid "P3 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:246
-msgctxt "input-name"
-msgid "P3 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:247
-msgctxt "input-name"
-msgid "P3 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:248
-msgctxt "input-name"
-msgid "P3 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:249
-msgctxt "input-name"
-msgid "P3 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:250
-msgctxt "input-name"
-msgid "P3 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:255
-msgctxt "input-name"
-msgid "P4 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:256
-msgctxt "input-name"
-msgid "P4 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:257
-msgctxt "input-name"
-msgid "P4 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:258
-msgctxt "input-name"
-msgid "P4 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:259
-msgctxt "input-name"
-msgid "P4 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:260
-msgctxt "input-name"
-msgid "P4 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:261
-msgctxt "input-name"
-msgid "P4 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:262
-msgctxt "input-name"
-msgid "P4 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:263
-msgctxt "input-name"
-msgid "P4 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:264
-msgctxt "input-name"
-msgid "P4 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:265
-msgctxt "input-name"
-msgid "P4 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:266
-msgctxt "input-name"
-msgid "P4 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:267
-msgctxt "input-name"
-msgid "P4 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:268
-msgctxt "input-name"
-msgid "P4 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:269
-msgctxt "input-name"
-msgid "P4 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:270
-msgctxt "input-name"
-msgid "P4 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:271
-msgctxt "input-name"
-msgid "P4 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:272
-msgctxt "input-name"
-msgid "P4 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:273
-msgctxt "input-name"
-msgid "P4 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:274
-msgctxt "input-name"
-msgid "P4 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:275
-msgctxt "input-name"
-msgid "P4 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:276
-msgctxt "input-name"
-msgid "P4 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:277
-msgctxt "input-name"
-msgid "P4 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:278
-msgctxt "input-name"
-msgid "P4 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:279
-msgctxt "input-name"
-msgid "P4 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:280
-msgctxt "input-name"
-msgid "P4 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:281
-msgctxt "input-name"
-msgid "P4 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:282
-msgctxt "input-name"
-msgid "P4 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:283
-msgctxt "input-name"
-msgid "P4 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:284
-msgctxt "input-name"
-msgid "P4 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:289
-msgctxt "input-name"
-msgid "P5 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:290
-msgctxt "input-name"
-msgid "P5 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:291
-msgctxt "input-name"
-msgid "P5 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:292
-msgctxt "input-name"
-msgid "P5 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:293
-msgctxt "input-name"
-msgid "P5 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:294
-msgctxt "input-name"
-msgid "P5 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:295
-msgctxt "input-name"
-msgid "P5 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:296
-msgctxt "input-name"
-msgid "P5 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:297
-msgctxt "input-name"
-msgid "P5 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:298
-msgctxt "input-name"
-msgid "P5 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:299
-msgctxt "input-name"
-msgid "P5 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:300
-msgctxt "input-name"
-msgid "P5 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:301
-msgctxt "input-name"
-msgid "P5 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:302
-msgctxt "input-name"
-msgid "P5 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:303
-msgctxt "input-name"
-msgid "P5 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:304
-msgctxt "input-name"
-msgid "P5 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:305
-msgctxt "input-name"
-msgid "P5 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:306
-msgctxt "input-name"
-msgid "P5 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:307
-msgctxt "input-name"
-msgid "P5 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:308
-msgctxt "input-name"
-msgid "P5 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:309
-msgctxt "input-name"
-msgid "P5 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:310
-msgctxt "input-name"
-msgid "P5 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:311
-msgctxt "input-name"
-msgid "P5 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:312
-msgctxt "input-name"
-msgid "P5 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:313
-msgctxt "input-name"
-msgid "P5 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:314
-msgctxt "input-name"
-msgid "P5 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:315
-msgctxt "input-name"
-msgid "P5 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:316
-msgctxt "input-name"
-msgid "P5 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:317
-msgctxt "input-name"
-msgid "P5 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:318
-msgctxt "input-name"
-msgid "P5 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:323
-msgctxt "input-name"
-msgid "P6 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:324
-msgctxt "input-name"
-msgid "P6 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:325
-msgctxt "input-name"
-msgid "P6 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:326
-msgctxt "input-name"
-msgid "P6 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:327
-msgctxt "input-name"
-msgid "P6 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:328
-msgctxt "input-name"
-msgid "P6 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:329
-msgctxt "input-name"
-msgid "P6 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:330
-msgctxt "input-name"
-msgid "P6 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:331
-msgctxt "input-name"
-msgid "P6 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:332
-msgctxt "input-name"
-msgid "P6 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:333
-msgctxt "input-name"
-msgid "P6 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:334
-msgctxt "input-name"
-msgid "P6 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:335
-msgctxt "input-name"
-msgid "P6 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:336
-msgctxt "input-name"
-msgid "P6 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:337
-msgctxt "input-name"
-msgid "P6 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:338
-msgctxt "input-name"
-msgid "P6 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:339
-msgctxt "input-name"
-msgid "P6 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:340
-msgctxt "input-name"
-msgid "P6 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:341
-msgctxt "input-name"
-msgid "P6 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:342
-msgctxt "input-name"
-msgid "P6 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:343
-msgctxt "input-name"
-msgid "P6 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:344
-msgctxt "input-name"
-msgid "P6 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:345
-msgctxt "input-name"
-msgid "P6 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:346
-msgctxt "input-name"
-msgid "P6 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:347
-msgctxt "input-name"
-msgid "P6 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:348
-msgctxt "input-name"
-msgid "P6 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:349
-msgctxt "input-name"
-msgid "P6 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:350
-msgctxt "input-name"
-msgid "P6 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:351
-msgctxt "input-name"
-msgid "P6 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:352
-msgctxt "input-name"
-msgid "P6 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:357
-msgctxt "input-name"
-msgid "P7 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:358
-msgctxt "input-name"
-msgid "P7 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:359
-msgctxt "input-name"
-msgid "P7 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:360
-msgctxt "input-name"
-msgid "P7 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:361
-msgctxt "input-name"
-msgid "P7 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:362
-msgctxt "input-name"
-msgid "P7 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:363
-msgctxt "input-name"
-msgid "P7 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:364
-msgctxt "input-name"
-msgid "P7 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:365
-msgctxt "input-name"
-msgid "P7 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:366
-msgctxt "input-name"
-msgid "P7 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:367
-msgctxt "input-name"
-msgid "P7 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:368
-msgctxt "input-name"
-msgid "P7 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:369
-msgctxt "input-name"
-msgid "P7 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:370
-msgctxt "input-name"
-msgid "P7 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:371
-msgctxt "input-name"
-msgid "P7 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:372
-msgctxt "input-name"
-msgid "P7 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:373
-msgctxt "input-name"
-msgid "P7 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:374
-msgctxt "input-name"
-msgid "P7 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:375
-msgctxt "input-name"
-msgid "P7 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:376
-msgctxt "input-name"
-msgid "P7 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:377
-msgctxt "input-name"
-msgid "P7 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:378
-msgctxt "input-name"
-msgid "P7 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:379
-msgctxt "input-name"
-msgid "P7 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:380
-msgctxt "input-name"
-msgid "P7 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:381
-msgctxt "input-name"
-msgid "P7 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:382
-msgctxt "input-name"
-msgid "P7 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:383
-msgctxt "input-name"
-msgid "P7 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:384
-msgctxt "input-name"
-msgid "P7 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:385
-msgctxt "input-name"
-msgid "P7 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:386
-msgctxt "input-name"
-msgid "P7 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:391
-msgctxt "input-name"
-msgid "P8 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:392
-msgctxt "input-name"
-msgid "P8 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:393
-msgctxt "input-name"
-msgid "P8 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:394
-msgctxt "input-name"
-msgid "P8 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:395
-msgctxt "input-name"
-msgid "P8 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:396
-msgctxt "input-name"
-msgid "P8 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:397
-msgctxt "input-name"
-msgid "P8 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:398
-msgctxt "input-name"
-msgid "P8 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:399
-msgctxt "input-name"
-msgid "P8 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:400
-msgctxt "input-name"
-msgid "P8 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:401
-msgctxt "input-name"
-msgid "P8 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:402
-msgctxt "input-name"
-msgid "P8 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:403
-msgctxt "input-name"
-msgid "P8 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:404
-msgctxt "input-name"
-msgid "P8 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:405
-msgctxt "input-name"
-msgid "P8 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:406
-msgctxt "input-name"
-msgid "P8 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:407
-msgctxt "input-name"
-msgid "P8 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:408
-msgctxt "input-name"
-msgid "P8 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:409
-msgctxt "input-name"
-msgid "P8 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:410
-msgctxt "input-name"
-msgid "P8 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:411
-msgctxt "input-name"
-msgid "P8 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:412
-msgctxt "input-name"
-msgid "P8 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:413
-msgctxt "input-name"
-msgid "P8 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:414
-msgctxt "input-name"
-msgid "P8 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:415
-msgctxt "input-name"
-msgid "P8 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:416
-msgctxt "input-name"
-msgid "P8 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:417
-msgctxt "input-name"
-msgid "P8 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:418
-msgctxt "input-name"
-msgid "P8 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:419
-msgctxt "input-name"
-msgid "P8 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:420
-msgctxt "input-name"
-msgid "P8 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:425
-msgctxt "input-name"
-msgid "P9 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:426
-msgctxt "input-name"
-msgid "P9 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:427
-msgctxt "input-name"
-msgid "P9 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:428
-msgctxt "input-name"
-msgid "P9 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:429
-msgctxt "input-name"
-msgid "P9 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:430
-msgctxt "input-name"
-msgid "P9 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:431
-msgctxt "input-name"
-msgid "P9 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:432
-msgctxt "input-name"
-msgid "P9 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:433
-msgctxt "input-name"
-msgid "P9 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:434
-msgctxt "input-name"
-msgid "P9 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:435
-msgctxt "input-name"
-msgid "P9 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:436
-msgctxt "input-name"
-msgid "P9 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:437
-msgctxt "input-name"
-msgid "P9 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:438
-msgctxt "input-name"
-msgid "P9 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:439
-msgctxt "input-name"
-msgid "P9 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:440
-msgctxt "input-name"
-msgid "P9 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:441
-msgctxt "input-name"
-msgid "P9 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:442
-msgctxt "input-name"
-msgid "P9 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:443
-msgctxt "input-name"
-msgid "P9 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:444
-msgctxt "input-name"
-msgid "P9 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:445
-msgctxt "input-name"
-msgid "P9 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:446
-msgctxt "input-name"
-msgid "P9 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:447
-msgctxt "input-name"
-msgid "P9 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:448
-msgctxt "input-name"
-msgid "P9 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:449
-msgctxt "input-name"
-msgid "P9 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:450
-msgctxt "input-name"
-msgid "P9 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:451
-msgctxt "input-name"
-msgid "P9 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:452
-msgctxt "input-name"
-msgid "P9 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:453
-msgctxt "input-name"
-msgid "P9 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:454
-msgctxt "input-name"
-msgid "P9 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:459
-msgctxt "input-name"
-msgid "P10 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:460
-msgctxt "input-name"
-msgid "P10 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:461
-msgctxt "input-name"
-msgid "P10 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:462
-msgctxt "input-name"
-msgid "P10 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:463
-msgctxt "input-name"
-msgid "P10 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:464
-msgctxt "input-name"
-msgid "P10 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:465
-msgctxt "input-name"
-msgid "P10 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:466
-msgctxt "input-name"
-msgid "P10 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:467
-msgctxt "input-name"
-msgid "P10 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:468
-msgctxt "input-name"
-msgid "P10 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:469
-msgctxt "input-name"
-msgid "P10 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:470
-msgctxt "input-name"
-msgid "P10 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:471
-msgctxt "input-name"
-msgid "P10 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:472
-msgctxt "input-name"
-msgid "P10 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:473
-msgctxt "input-name"
-msgid "P10 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:474
-msgctxt "input-name"
-msgid "P10 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:475
-msgctxt "input-name"
-msgid "P10 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:476
-msgctxt "input-name"
-msgid "P10 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:477
-msgctxt "input-name"
-msgid "P10 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:478
-msgctxt "input-name"
-msgid "P10 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:479
-msgctxt "input-name"
-msgid "P10 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:480
-msgctxt "input-name"
-msgid "P10 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:481
-msgctxt "input-name"
-msgid "P10 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:482
-msgctxt "input-name"
-msgid "P10 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:483
-msgctxt "input-name"
-msgid "P10 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:484
-msgctxt "input-name"
-msgid "P10 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:485
-msgctxt "input-name"
-msgid "P10 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:486
-msgctxt "input-name"
-msgid "P10 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:487
-msgctxt "input-name"
-msgid "P10 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:488
-msgctxt "input-name"
-msgid "P10 Select"
-msgstr ""
-
 #: src/emu/inpttype.ipp:493
 msgctxt "input-name"
 msgid "1 Player Start"
@@ -5478,154 +4107,31 @@ msgctxt "input-name"
 msgid "Volume Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:550
-msgctxt "input-name"
-msgid "P1 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:551
-msgctxt "input-name"
-msgid "P2 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:552
-msgctxt "input-name"
-msgid "P3 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:553
-msgctxt "input-name"
-msgid "P4 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:554
-msgctxt "input-name"
-msgid "P5 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:555
-msgctxt "input-name"
-msgid "P6 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:556
-msgctxt "input-name"
-msgid "P7 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:557
-msgctxt "input-name"
-msgid "P8 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:558
-msgctxt "input-name"
-msgid "P9 Pedal 1"
-msgstr ""
-
+#: src/emu/inpttype.ipp:550 src/emu/inpttype.ipp:551 src/emu/inpttype.ipp:552
+#: src/emu/inpttype.ipp:553 src/emu/inpttype.ipp:554 src/emu/inpttype.ipp:555
+#: src/emu/inpttype.ipp:556 src/emu/inpttype.ipp:557 src/emu/inpttype.ipp:558
 #: src/emu/inpttype.ipp:559
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:564
-msgctxt "input-name"
-msgid "P1 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:565
-msgctxt "input-name"
-msgid "P2 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:566
-msgctxt "input-name"
-msgid "P3 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:567
-msgctxt "input-name"
-msgid "P4 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:568
-msgctxt "input-name"
-msgid "P5 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:569
-msgctxt "input-name"
-msgid "P6 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:570
-msgctxt "input-name"
-msgid "P7 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:571
-msgctxt "input-name"
-msgid "P8 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:572
-msgctxt "input-name"
-msgid "P9 Pedal 2"
+msgid "%p Pedal 1"
 msgstr ""
 
+#: src/emu/inpttype.ipp:564 src/emu/inpttype.ipp:565 src/emu/inpttype.ipp:566
+#: src/emu/inpttype.ipp:567 src/emu/inpttype.ipp:568 src/emu/inpttype.ipp:569
+#: src/emu/inpttype.ipp:570 src/emu/inpttype.ipp:571 src/emu/inpttype.ipp:572
 #: src/emu/inpttype.ipp:573
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:578
-msgctxt "input-name"
-msgid "P1 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:579
-msgctxt "input-name"
-msgid "P2 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:580
-msgctxt "input-name"
-msgid "P3 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:581
-msgctxt "input-name"
-msgid "P4 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:582
-msgctxt "input-name"
-msgid "P5 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:583
-msgctxt "input-name"
-msgid "P6 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:584
-msgctxt "input-name"
-msgid "P7 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:585
-msgctxt "input-name"
-msgid "P8 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:586
-msgctxt "input-name"
-msgid "P9 Pedal 3"
+msgid "%p Pedal 2"
 msgstr ""
 
+#: src/emu/inpttype.ipp:578 src/emu/inpttype.ipp:579 src/emu/inpttype.ipp:580
+#: src/emu/inpttype.ipp:581 src/emu/inpttype.ipp:582 src/emu/inpttype.ipp:583
+#: src/emu/inpttype.ipp:584 src/emu/inpttype.ipp:585 src/emu/inpttype.ipp:586
 #: src/emu/inpttype.ipp:587
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 3"
+msgid "%p Pedal 3"
 msgstr ""
 
 #: src/emu/inpttype.ipp:592
diff --git a/language/Macedonian/strings.po b/language/Macedonian/strings.po
index d49404937b1..273d5779236 100644
--- a/language/Macedonian/strings.po
+++ b/language/Macedonian/strings.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-19 02:50+1100\n"
+"POT-Creation-Date: 2021-12-09 04:44+1100\n"
 "PO-Revision-Date: 2016-02-20 18:03+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: MAME Language Team\n"
@@ -259,12 +259,12 @@ msgstr ""
 msgid "Driver: \"%1$s\" software list "
 msgstr ""
 
-#: src/frontend/mame/ui/selsoft.cpp:711 src/frontend/mame/ui/selgame.cpp:1066
+#: src/frontend/mame/ui/selsoft.cpp:711 src/frontend/mame/ui/selgame.cpp:1076
 #, c-format
 msgid "%1$s: %2$s - Search: %3$s_"
 msgstr ""
 
-#: src/frontend/mame/ui/selsoft.cpp:713 src/frontend/mame/ui/selgame.cpp:1068
+#: src/frontend/mame/ui/selsoft.cpp:713 src/frontend/mame/ui/selgame.cpp:1078
 #, c-format
 msgid "Search: %1$s_"
 msgstr ""
@@ -274,7 +274,7 @@ msgstr ""
 msgid "Software list/item: %1$s:%2$s"
 msgstr ""
 
-#: src/frontend/mame/ui/optsmenu.cpp:73 src/frontend/mame/ui/sndmenu.cpp:165
+#: src/frontend/mame/ui/optsmenu.cpp:73 src/frontend/mame/ui/sndmenu.cpp:161
 msgid "Sound Options"
 msgstr ""
 
@@ -369,11 +369,11 @@ msgid "Show mouse pointer"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:39
-msgid "Confirm quit from machines"
+msgid "Confirm quit from emulation"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:40
-msgid "Skip information screen at startup"
+msgid "Skip system information screen"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:41
@@ -389,7 +389,7 @@ msgid "Skip BIOS selection menu"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:44
-msgid "Skip software parts selection menu"
+msgid "Skip software part selection menu"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:45
@@ -541,7 +541,7 @@ msgid "UI active"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:91
-msgid "Offscreen reload"
+msgid "Off-screen reload"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:92
@@ -557,7 +557,7 @@ msgid "Natural keyboard"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:95
-msgid "Simultaneous contradictory"
+msgid "Allow contradictory joystick inputs"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:96
@@ -581,7 +581,7 @@ msgid "Pedal Device Assignment"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:106
-msgid "Adstick Device Assignment"
+msgid "AD Stick Device Assignment"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:107
@@ -668,14 +668,14 @@ msgstr ""
 msgid "Wait Vertical Sync"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:687
+#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:689
 #: src/frontend/mame/ui/videoopt.cpp:191 src/frontend/mame/ui/custui.cpp:490
 #: src/frontend/mame/ui/analogipt.cpp:471 plugins/cheatfind/init.lua:766
 #: plugins/cheatfind/init.lua:777 plugins/cheat/init.lua:668
 msgid "On"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:690
+#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:692
 #: src/frontend/mame/ui/videoopt.cpp:207 src/frontend/mame/ui/custui.cpp:490
 #: src/frontend/mame/ui/analogipt.cpp:471 plugins/cheatfind/init.lua:763
 #: plugins/cheatfind/init.lua:774 plugins/cheat/init.lua:671
@@ -683,11 +683,11 @@ msgstr ""
 msgid "Off"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:693
+#: src/frontend/mame/ui/menu.cpp:695
 msgid "Auto"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:1195
+#: src/frontend/mame/ui/menu.cpp:1197
 #: src/frontend/mame/ui/simpleselgame.cpp:278
 #: src/frontend/mame/ui/selmenu.cpp:1280
 msgid "Return to Previous Menu"
@@ -695,7 +695,7 @@ msgstr ""
 
 #: src/frontend/mame/ui/filemngr.cpp:139
 #: src/frontend/mame/ui/confswitch.cpp:119
-#: src/frontend/mame/ui/inputmap.cpp:559 src/frontend/mame/ui/analogipt.cpp:360
+#: src/frontend/mame/ui/inputmap.cpp:563 src/frontend/mame/ui/analogipt.cpp:360
 #, c-format
 msgid "[root%1$s]"
 msgstr ""
@@ -938,22 +938,22 @@ msgid ""
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "GHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "MHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "kHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "Hz"
 msgstr ""
 
@@ -977,38 +977,38 @@ msgstr ""
 msgid "Vector"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:480
+#: src/frontend/mame/ui/info.cpp:483
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:480
+#: src/frontend/mame/ui/info.cpp:483
 msgid "%2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:497
+#: src/frontend/mame/ui/info.cpp:500
 #, c-format
 msgid "Screen '%1$s'"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:499
+#: src/frontend/mame/ui/info.cpp:502
 msgid "Screen"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:570 src/frontend/mame/ui/info.cpp:581
+#: src/frontend/mame/ui/info.cpp:573 src/frontend/mame/ui/info.cpp:584
 #, c-format
 msgid "%1$s:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:662
+#: src/frontend/mame/ui/info.cpp:665
 msgid "Not supported"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:665
+#: src/frontend/mame/ui/info.cpp:668
 msgid "Partially supported"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:674
+#: src/frontend/mame/ui/info.cpp:677
 msgid "[empty]"
 msgstr ""
 
@@ -1081,7 +1081,7 @@ msgid "Emulated"
 msgstr ""
 
 #: src/frontend/mame/ui/keyboard.cpp:59 src/frontend/mame/ui/confswitch.cpp:117
-#: src/frontend/mame/ui/inputmap.cpp:557 src/frontend/mame/ui/analogipt.cpp:358
+#: src/frontend/mame/ui/inputmap.cpp:561 src/frontend/mame/ui/analogipt.cpp:358
 #, c-format
 msgid "%1$s [root%2$s]"
 msgstr ""
@@ -1441,7 +1441,7 @@ msgctxt "swlist-info"
 msgid "Software list/item"
 msgstr ""
 
-#: src/frontend/mame/ui/datmenu.cpp:88 src/frontend/mame/ui/selmenu.cpp:2698
+#: src/frontend/mame/ui/datmenu.cpp:88 src/frontend/mame/ui/selmenu.cpp:2707
 msgid "Software List Info"
 msgstr ""
 
@@ -1556,7 +1556,7 @@ msgstr ""
 msgid "Configure Machine:"
 msgstr ""
 
-#: src/frontend/mame/ui/miscmenu.cpp:858 src/frontend/mame/ui/selmenu.cpp:2638
+#: src/frontend/mame/ui/miscmenu.cpp:858 src/frontend/mame/ui/selmenu.cpp:2647
 msgid " (default)"
 msgstr ""
 
@@ -1573,7 +1573,7 @@ msgid ""
 "Press %2$s to return to emulation"
 msgstr ""
 
-#: src/frontend/mame/ui/info_pty.cpp:30 src/frontend/mame/ui/mainmenu.cpp:155
+#: src/frontend/mame/ui/info_pty.cpp:30
 msgid "Pseudo terminals"
 msgstr ""
 
@@ -1641,52 +1641,52 @@ msgstr ""
 msgid "Other Controls"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:227
+#: src/frontend/mame/ui/inputmap.cpp:231
 msgid "This machine has no configurable inputs."
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:327
+#: src/frontend/mame/ui/inputmap.cpp:331
 msgid "Pressed"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:397
+#: src/frontend/mame/ui/inputmap.cpp:401
 msgid "Invalid sequence entered"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:542
+#: src/frontend/mame/ui/inputmap.cpp:546
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:543
+#: src/frontend/mame/ui/inputmap.cpp:547
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog Inc"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:544
+#: src/frontend/mame/ui/inputmap.cpp:548
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog Dec"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:586
+#: src/frontend/mame/ui/inputmap.cpp:590
 #, c-format
 msgid "Press %1$s to set\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:587
+#: src/frontend/mame/ui/inputmap.cpp:591
 #, c-format
 msgid "Press %1$s to append\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:588
+#: src/frontend/mame/ui/inputmap.cpp:592
 #, c-format
 msgid "Press %1$s to clear\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:589
+#: src/frontend/mame/ui/inputmap.cpp:593
 #, c-format
 msgid "Press %1$s to restore default\n"
 msgstr ""
@@ -1750,7 +1750,7 @@ msgid ""
 msgstr ""
 
 #: src/frontend/mame/ui/simpleselgame.cpp:273
-#: src/frontend/mame/ui/selgame.cpp:436
+#: src/frontend/mame/ui/selgame.cpp:443
 msgid "Configure Options"
 msgstr ""
 
@@ -2078,16 +2078,16 @@ msgstr ""
 msgid "Expand to fit"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:437
+#: src/frontend/mame/ui/selgame.cpp:444
 msgid "Configure Machine"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:1050
+#: src/frontend/mame/ui/selgame.cpp:1060
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d machines (%5$d BIOS) )"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:1078
+#: src/frontend/mame/ui/selgame.cpp:1088
 #, c-format
 msgid "System: %1$-.100s"
 msgstr ""
@@ -2109,7 +2109,7 @@ msgstr ""
 #: src/frontend/mame/ui/auditmenu.cpp:98
 #, c-format
 msgid ""
-"Auditing ROMs for machine %2$u of %3$u...\n"
+"Auditing media for machine %2$u of %3$u...\n"
 "%1$s"
 msgstr ""
 
@@ -2124,12 +2124,12 @@ msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:136
 #, c-format
-msgid "Audit ROMs for %1$u machines marked unavailable"
+msgid "Audit media for %1$u machines marked unavailable"
 msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:137
 #, c-format
-msgid "Audit ROMs for all %1$u machines"
+msgid "Audit media for all %1$u machines"
 msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:154
@@ -2335,84 +2335,84 @@ msgctxt "color-sample"
 msgid "Clone"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:914
+#: src/frontend/mame/ui/custui.cpp:906
 msgid "ARGB Settings"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:919 src/frontend/mame/ui/custui.cpp:922
+#: src/frontend/mame/ui/custui.cpp:911 src/frontend/mame/ui/custui.cpp:914
 msgctxt "color-channel"
 msgid "Alpha"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:927 src/frontend/mame/ui/custui.cpp:930
+#: src/frontend/mame/ui/custui.cpp:919 src/frontend/mame/ui/custui.cpp:922
 msgctxt "color-channel"
 msgid "Red"
 msgstr ""
 
+#: src/frontend/mame/ui/custui.cpp:927 src/frontend/mame/ui/custui.cpp:930
+msgctxt "color-channel"
+msgid "Green"
+msgstr ""
+
 #: src/frontend/mame/ui/custui.cpp:935 src/frontend/mame/ui/custui.cpp:938
 msgctxt "color-channel"
-msgid "Green"
-msgstr ""
-
-#: src/frontend/mame/ui/custui.cpp:943 src/frontend/mame/ui/custui.cpp:946
-msgctxt "color-channel"
 msgid "Blue"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:949
+#: src/frontend/mame/ui/custui.cpp:941
 msgid "Choose from palette"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:996
+#: src/frontend/mame/ui/custui.cpp:988
 msgid "Color preview:"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1093
+#: src/frontend/mame/ui/custui.cpp:1085
 msgctxt "color-preset"
 msgid "White"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1094
+#: src/frontend/mame/ui/custui.cpp:1086
 msgctxt "color-preset"
 msgid "Silver"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1095
+#: src/frontend/mame/ui/custui.cpp:1087
 msgctxt "color-preset"
 msgid "Gray"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1096
+#: src/frontend/mame/ui/custui.cpp:1088
 msgctxt "color-preset"
 msgid "Black"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1097
+#: src/frontend/mame/ui/custui.cpp:1089
 msgctxt "color-preset"
 msgid "Red"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1098
+#: src/frontend/mame/ui/custui.cpp:1090
 msgctxt "color-preset"
 msgid "Orange"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1099
+#: src/frontend/mame/ui/custui.cpp:1091
 msgctxt "color-preset"
 msgid "Yellow"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1100
+#: src/frontend/mame/ui/custui.cpp:1092
 msgctxt "color-preset"
 msgid "Green"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1101
+#: src/frontend/mame/ui/custui.cpp:1093
 msgctxt "color-preset"
 msgid "Blue"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1102
+#: src/frontend/mame/ui/custui.cpp:1094
 msgctxt "color-preset"
 msgid "Violet"
 msgstr ""
@@ -2477,7 +2477,7 @@ msgid "Input (general)"
 msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:123
-msgid "Input (this Machine)"
+msgid "Input (this machine)"
 msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:126
@@ -2516,6 +2516,10 @@ msgstr ""
 msgid "Tape Control"
 msgstr ""
 
+#: src/frontend/mame/ui/mainmenu.cpp:155
+msgid "Pseudo Terminals"
+msgstr ""
+
 #: src/frontend/mame/ui/mainmenu.cpp:158
 msgid "BIOS Selection"
 msgstr ""
@@ -2554,7 +2558,7 @@ msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:200
 #, c-format
-msgid "About %s"
+msgid "About %1$s"
 msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:212
@@ -2714,373 +2718,373 @@ msgstr ""
 msgid "%1$s %2$s"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2235
+#: src/frontend/mame/ui/selmenu.cpp:2244
 msgid "Images"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2236
+#: src/frontend/mame/ui/selmenu.cpp:2245
 msgid "Infos"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2551
+#: src/frontend/mame/ui/selmenu.cpp:2560
 msgid ""
 "Required ROM/disk images for the selected system are missing or incorrect. "
 "Please acquire the correct files or select a different system.\n"
 "\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2567
+#: src/frontend/mame/ui/selmenu.cpp:2576
 msgid ""
 "Required ROM/disk images for the selected software are missing or incorrect. "
 "Please acquire the correct files or select a different software item.\n"
 "\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2583
+#: src/frontend/mame/ui/selmenu.cpp:2592
 msgid "incorrect checksum"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2586
+#: src/frontend/mame/ui/selmenu.cpp:2595
 msgid "incorrect length"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2589
+#: src/frontend/mame/ui/selmenu.cpp:2598
 msgid "not found"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2600
+#: src/frontend/mame/ui/selmenu.cpp:2609
 #, c-format
 msgid "%1$s (%2$s) - %3$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2602
+#: src/frontend/mame/ui/selmenu.cpp:2611
 #, c-format
 msgid "%1$s - %2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2606
+#: src/frontend/mame/ui/selmenu.cpp:2615
 msgid "Press any key to continue."
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2735
+#: src/frontend/mame/ui/selmenu.cpp:2744
 msgid "General Info"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2887
-#, c-format
-msgid "Romset\t%1$s\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2888
-#, c-format
-msgid "Year\t%1$s\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2889
-#, c-format
-msgid "Manufacturer\t%1$s\n"
-msgstr ""
-
 #: src/frontend/mame/ui/selmenu.cpp:2896
 #, c-format
-msgid "Driver is Clone of\t%1$s\n"
+msgid "Romset\t%1$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2901
-msgid "Driver is Parent\t\n"
+#: src/frontend/mame/ui/selmenu.cpp:2897
+#, c-format
+msgid "Year\t%1$s\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2898
+#, c-format
+msgid "Manufacturer\t%1$s\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2905
-msgid "Analog Controls\tYes\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2907
-msgid "Keyboard Inputs\tYes\n"
+#, c-format
+msgid "Driver is Clone of\t%1$s\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2910
-msgid "Overall\tNOT WORKING\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2912
-msgid "Overall\tUnemulated Protection\n"
+msgid "Driver is Parent\t\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2914
-msgid "Overall\tWorking\n"
+msgid "Analog Controls\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2917
-msgid "Graphics\tUnimplemented\n"
+#: src/frontend/mame/ui/selmenu.cpp:2916
+msgid "Keyboard Inputs\tYes\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2919
-msgid "Graphics\tWrong Colors\n"
+msgid "Overall\tNOT WORKING\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2921
-msgid "Graphics\tImperfect Colors\n"
+msgid "Overall\tUnemulated Protection\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2923
-msgid "Graphics\tImperfect\n"
+msgid "Overall\tWorking\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2925
-msgid "Graphics\tOK\n"
+#: src/frontend/mame/ui/selmenu.cpp:2926
+msgid "Graphics\tUnimplemented\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2928
-msgid "Sound\tNone\n"
+msgid "Graphics\tWrong Colors\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2930
-msgid "Sound\tUnimplemented\n"
+msgid "Graphics\tImperfect Colors\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2932
-msgid "Sound\tImperfect\n"
+msgid "Graphics\tImperfect\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2934
-msgid "Sound\tOK\n"
+msgid "Graphics\tOK\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2937
-msgid "Capture\tUnimplemented\n"
+msgid "Sound\tNone\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2939
+msgid "Sound\tUnimplemented\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2941
+msgid "Sound\tImperfect\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2943
+msgid "Sound\tOK\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2946
+msgid "Capture\tUnimplemented\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2948
 msgid "Capture\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2942
+#: src/frontend/mame/ui/selmenu.cpp:2951
 msgid "Camera\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2944
+#: src/frontend/mame/ui/selmenu.cpp:2953
 msgid "Camera\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2947
+#: src/frontend/mame/ui/selmenu.cpp:2956
 msgid "Microphone\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2949
+#: src/frontend/mame/ui/selmenu.cpp:2958
 msgid "Microphone\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2952
+#: src/frontend/mame/ui/selmenu.cpp:2961
 msgid "Controls\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2954
+#: src/frontend/mame/ui/selmenu.cpp:2963
 msgid "Controls\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2957
+#: src/frontend/mame/ui/selmenu.cpp:2966
 msgid "Keyboard\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2959
+#: src/frontend/mame/ui/selmenu.cpp:2968
 msgid "Keyboard\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2962
+#: src/frontend/mame/ui/selmenu.cpp:2971
 msgid "Mouse\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2964
+#: src/frontend/mame/ui/selmenu.cpp:2973
 msgid "Mouse\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2967
+#: src/frontend/mame/ui/selmenu.cpp:2976
 msgid "Media\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2969
+#: src/frontend/mame/ui/selmenu.cpp:2978
 msgid "Media\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2972
+#: src/frontend/mame/ui/selmenu.cpp:2981
 msgid "Disk\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2974
+#: src/frontend/mame/ui/selmenu.cpp:2983
 msgid "Disk\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2977
+#: src/frontend/mame/ui/selmenu.cpp:2986
 msgid "Printer\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2979
+#: src/frontend/mame/ui/selmenu.cpp:2988
 msgid "Printer\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2982
+#: src/frontend/mame/ui/selmenu.cpp:2991
 msgid "Mag. Tape\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2984
+#: src/frontend/mame/ui/selmenu.cpp:2993
 msgid "Mag. Tape\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2987
+#: src/frontend/mame/ui/selmenu.cpp:2996
 msgid "Punch Tape\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2989
+#: src/frontend/mame/ui/selmenu.cpp:2998
 msgid "Punch Tape\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2992
+#: src/frontend/mame/ui/selmenu.cpp:3001
 msgid "Mag. Drum\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2994
+#: src/frontend/mame/ui/selmenu.cpp:3003
 msgid "Mag. Drum\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2997
+#: src/frontend/mame/ui/selmenu.cpp:3006
 msgid "(EP)ROM\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2999
+#: src/frontend/mame/ui/selmenu.cpp:3008
 msgid "(EP)ROM\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3002
+#: src/frontend/mame/ui/selmenu.cpp:3011
 msgid "Communications\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3004
+#: src/frontend/mame/ui/selmenu.cpp:3013
 msgid "Communications\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3007
+#: src/frontend/mame/ui/selmenu.cpp:3016
 msgid "LAN\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3009
+#: src/frontend/mame/ui/selmenu.cpp:3018
 msgid "LAN\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3012
+#: src/frontend/mame/ui/selmenu.cpp:3021
 msgid "WAN\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3014
+#: src/frontend/mame/ui/selmenu.cpp:3023
 msgid "WAN\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3017
+#: src/frontend/mame/ui/selmenu.cpp:3026
 msgid "Timing\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3019
+#: src/frontend/mame/ui/selmenu.cpp:3028
 msgid "Timing\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3021
+#: src/frontend/mame/ui/selmenu.cpp:3030
 msgid "Mechanical Machine\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3021
+#: src/frontend/mame/ui/selmenu.cpp:3030
 msgid "Mechanical Machine\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3022
+#: src/frontend/mame/ui/selmenu.cpp:3031
 msgid "Requires Artwork\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3022
+#: src/frontend/mame/ui/selmenu.cpp:3031
 msgid "Requires Artwork\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3023
+#: src/frontend/mame/ui/selmenu.cpp:3032
 msgid "Requires Clickable Artwork\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3023
+#: src/frontend/mame/ui/selmenu.cpp:3032
 msgid "Requires Clickable Artwork\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3025
+#: src/frontend/mame/ui/selmenu.cpp:3034
 msgid "Support Cocktail\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3026
+#: src/frontend/mame/ui/selmenu.cpp:3035
 msgid "Driver is BIOS\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3026
+#: src/frontend/mame/ui/selmenu.cpp:3035
 msgid "Driver is BIOS\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3027
+#: src/frontend/mame/ui/selmenu.cpp:3036
 msgid "Support Save\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3027
+#: src/frontend/mame/ui/selmenu.cpp:3036
 msgid "Support Save\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3028
+#: src/frontend/mame/ui/selmenu.cpp:3037
 msgid "Screen Orientation\tVertical\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3028
+#: src/frontend/mame/ui/selmenu.cpp:3037
 msgid "Screen Orientation\tHorizontal\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3038
+#: src/frontend/mame/ui/selmenu.cpp:3047
 msgid "Requires CHD\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3038
+#: src/frontend/mame/ui/selmenu.cpp:3047
 msgid "Requires CHD\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3051
-msgid "ROM Audit Result\tOK\n"
+#: src/frontend/mame/ui/selmenu.cpp:3060
+msgid "Media Audit Result\tOK\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3053
-msgid "ROM Audit Result\tBAD\n"
+#: src/frontend/mame/ui/selmenu.cpp:3062
+msgid "Media Audit Result\tBAD\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3056
+#: src/frontend/mame/ui/selmenu.cpp:3065
 msgid "Samples Audit Result\tNone Needed\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3058
+#: src/frontend/mame/ui/selmenu.cpp:3067
 msgid "Samples Audit Result\tOK\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3060
+#: src/frontend/mame/ui/selmenu.cpp:3069
 msgid "Samples Audit Result\tBAD\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3064
+#: src/frontend/mame/ui/selmenu.cpp:3073
 msgid ""
-"ROM Audit \tDisabled\n"
-"Samples Audit \tDisabled\n"
+"Media Audit\tDisabled\n"
+"Samples Audit\tDisabled\n"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:150
+#: src/frontend/mame/ui/sndmenu.cpp:146
 msgid "Sound"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:151
+#: src/frontend/mame/ui/sndmenu.cpp:147
 msgid "Compressor"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:152
+#: src/frontend/mame/ui/sndmenu.cpp:148
 msgid "Sample Rate"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:153
+#: src/frontend/mame/ui/sndmenu.cpp:149
 msgid "Use External Samples"
 msgstr ""
 
@@ -3119,511 +3123,681 @@ msgstr ""
 msgid "  Screen '%1$s': Vector\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:132
+#: src/frontend/mame/ui/devopt.cpp:135
 #, c-format
 msgid "  Screen '%1$s': %2$d × %3$d (V) %4$s Hz\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:133
+#: src/frontend/mame/ui/devopt.cpp:136
 #, c-format
 msgid "  Screen '%1$s': %2$d × %3$d (H) %4$s Hz\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:147
+#: src/frontend/mame/ui/devopt.cpp:150
 msgid "* Sound:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:211
+#: src/frontend/mame/ui/devopt.cpp:214
 #, c-format
 msgid ""
 "* BIOS settings:\n"
 "  %1$d options    [default: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:255 src/frontend/mame/ui/devopt.cpp:271
-#: src/frontend/mame/ui/devopt.cpp:332
+#: src/frontend/mame/ui/devopt.cpp:258 src/frontend/mame/ui/devopt.cpp:274
+#: src/frontend/mame/ui/devopt.cpp:335
 #, c-format
 msgid "  %1$s    [default: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:260 src/frontend/mame/ui/devopt.cpp:276
+#: src/frontend/mame/ui/devopt.cpp:263 src/frontend/mame/ui/devopt.cpp:279
 #, c-format
 msgid "  %1$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:282
+#: src/frontend/mame/ui/devopt.cpp:285
 msgid "* DIP switch settings:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:287
+#: src/frontend/mame/ui/devopt.cpp:290
 msgid "* Configuration settings:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:291
+#: src/frontend/mame/ui/devopt.cpp:294
 msgid "* Input device(s):\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:293
+#: src/frontend/mame/ui/devopt.cpp:296
 #, c-format
 msgid "  User inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:295
+#: src/frontend/mame/ui/devopt.cpp:298
 #, c-format
 msgid "  Mahjong inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:297
+#: src/frontend/mame/ui/devopt.cpp:300
 #, c-format
 msgid "  Hanafuda inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:299
+#: src/frontend/mame/ui/devopt.cpp:302
 #, c-format
 msgid "  Gambling inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:301
+#: src/frontend/mame/ui/devopt.cpp:304
 #, c-format
 msgid "  Analog inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:303
+#: src/frontend/mame/ui/devopt.cpp:306
 #, c-format
 msgid "  Adjuster inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:305
+#: src/frontend/mame/ui/devopt.cpp:308
 #, c-format
 msgid "  Keypad inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:307
+#: src/frontend/mame/ui/devopt.cpp:310
 #, c-format
 msgid "  Keyboard inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:312
+#: src/frontend/mame/ui/devopt.cpp:315
 msgid "* Media Options:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:317
+#: src/frontend/mame/ui/devopt.cpp:320
 #, c-format
 msgid "  %1$s    [tag: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:327
+#: src/frontend/mame/ui/devopt.cpp:330
 msgid "* Slot Options:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:341
+#: src/frontend/mame/ui/devopt.cpp:344
 msgid "[None]\n"
 msgstr ""
 
-#: src/emu/render.cpp:1847
+#: src/emu/render.cpp:1796
 #, c-format
 msgctxt "view-name"
 msgid "Screen %1$u Standard (%2$u:%3$u)"
 msgstr ""
 
-#: src/emu/render.cpp:1873
+#: src/emu/render.cpp:1822
 #, c-format
 msgctxt "view-name"
 msgid "Screen %1$u Pixel Aspect (%2$u:%3$u)"
 msgstr ""
 
-#: src/emu/render.cpp:1895 src/emu/render.cpp:2030
+#: src/emu/render.cpp:1844 src/emu/render.cpp:1979
 msgctxt "view-name"
 msgid "Cocktail"
 msgstr ""
 
-#: src/emu/render.cpp:2015
+#: src/emu/render.cpp:1964
 msgctxt "view-name"
 msgid "Left-to-Right"
 msgstr ""
 
-#: src/emu/render.cpp:2016
+#: src/emu/render.cpp:1965
 msgctxt "view-name"
 msgid "Left-to-Right (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2017
+#: src/emu/render.cpp:1966
 msgctxt "view-name"
 msgid "Top-to-Bottom"
 msgstr ""
 
-#: src/emu/render.cpp:2018
+#: src/emu/render.cpp:1967
 msgctxt "view-name"
 msgid "Top-to-Bottom (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2069
+#: src/emu/render.cpp:2018
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Left-to-Right, Top-to-Bottom"
 msgstr ""
 
-#: src/emu/render.cpp:2078
+#: src/emu/render.cpp:2027
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Left-to-Right, Top-to-Bottom (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2087
+#: src/emu/render.cpp:2036
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Top-to-Bottom, Left-to-Right"
 msgstr ""
 
-#: src/emu/render.cpp:2096
+#: src/emu/render.cpp:2045
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Top-to-Bottom, Left-to-Right (Gapless)"
 msgstr ""
 
-#: src/emu/inpttype.ipp:22
+#: src/emu/ioport.cpp:332
+#, c-format
 msgctxt "input-name"
-msgid "P1 Up"
+msgid "P%1$u"
 msgstr ""
 
-#: src/emu/inpttype.ipp:23
+#: src/emu/ioport.cpp:1924
 msgctxt "input-name"
-msgid "P1 Down"
+msgid "???"
 msgstr ""
 
-#: src/emu/inpttype.ipp:24
+#: src/emu/inpttype.ipp:22 src/emu/inpttype.ipp:140 src/emu/inpttype.ipp:221
+#: src/emu/inpttype.ipp:255 src/emu/inpttype.ipp:289 src/emu/inpttype.ipp:323
+#: src/emu/inpttype.ipp:357 src/emu/inpttype.ipp:391 src/emu/inpttype.ipp:425
+#: src/emu/inpttype.ipp:459
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left"
+msgid "%p Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:25
+#: src/emu/inpttype.ipp:23 src/emu/inpttype.ipp:141 src/emu/inpttype.ipp:222
+#: src/emu/inpttype.ipp:256 src/emu/inpttype.ipp:290 src/emu/inpttype.ipp:324
+#: src/emu/inpttype.ipp:358 src/emu/inpttype.ipp:392 src/emu/inpttype.ipp:426
+#: src/emu/inpttype.ipp:460
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right"
+msgid "%p Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:26
+#: src/emu/inpttype.ipp:24 src/emu/inpttype.ipp:142 src/emu/inpttype.ipp:223
+#: src/emu/inpttype.ipp:257 src/emu/inpttype.ipp:291 src/emu/inpttype.ipp:325
+#: src/emu/inpttype.ipp:359 src/emu/inpttype.ipp:393 src/emu/inpttype.ipp:427
+#: src/emu/inpttype.ipp:461
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Up"
+msgid "%p Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:27
+#: src/emu/inpttype.ipp:25 src/emu/inpttype.ipp:143 src/emu/inpttype.ipp:224
+#: src/emu/inpttype.ipp:258 src/emu/inpttype.ipp:292 src/emu/inpttype.ipp:326
+#: src/emu/inpttype.ipp:360 src/emu/inpttype.ipp:394 src/emu/inpttype.ipp:428
+#: src/emu/inpttype.ipp:462
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Down"
+msgid "%p Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:28
+#: src/emu/inpttype.ipp:26 src/emu/inpttype.ipp:144 src/emu/inpttype.ipp:225
+#: src/emu/inpttype.ipp:259 src/emu/inpttype.ipp:293 src/emu/inpttype.ipp:327
+#: src/emu/inpttype.ipp:361 src/emu/inpttype.ipp:395 src/emu/inpttype.ipp:429
+#: src/emu/inpttype.ipp:463
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Left"
+msgid "%p Right Stick/Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:29
+#: src/emu/inpttype.ipp:27 src/emu/inpttype.ipp:145 src/emu/inpttype.ipp:226
+#: src/emu/inpttype.ipp:260 src/emu/inpttype.ipp:294 src/emu/inpttype.ipp:328
+#: src/emu/inpttype.ipp:362 src/emu/inpttype.ipp:396 src/emu/inpttype.ipp:430
+#: src/emu/inpttype.ipp:464
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Right"
+msgid "%p Right Stick/Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:30
+#: src/emu/inpttype.ipp:28 src/emu/inpttype.ipp:146 src/emu/inpttype.ipp:227
+#: src/emu/inpttype.ipp:261 src/emu/inpttype.ipp:295 src/emu/inpttype.ipp:329
+#: src/emu/inpttype.ipp:363 src/emu/inpttype.ipp:397 src/emu/inpttype.ipp:431
+#: src/emu/inpttype.ipp:465
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Up"
+msgid "%p Right Stick/Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:31
+#: src/emu/inpttype.ipp:29 src/emu/inpttype.ipp:147 src/emu/inpttype.ipp:228
+#: src/emu/inpttype.ipp:262 src/emu/inpttype.ipp:296 src/emu/inpttype.ipp:330
+#: src/emu/inpttype.ipp:364 src/emu/inpttype.ipp:398 src/emu/inpttype.ipp:432
+#: src/emu/inpttype.ipp:466
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Down"
+msgid "%p Right Stick/Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:32
+#: src/emu/inpttype.ipp:30 src/emu/inpttype.ipp:148 src/emu/inpttype.ipp:229
+#: src/emu/inpttype.ipp:263 src/emu/inpttype.ipp:297 src/emu/inpttype.ipp:331
+#: src/emu/inpttype.ipp:365 src/emu/inpttype.ipp:399 src/emu/inpttype.ipp:433
+#: src/emu/inpttype.ipp:467
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Left"
+msgid "%p Left Stick/Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:33
+#: src/emu/inpttype.ipp:31 src/emu/inpttype.ipp:149 src/emu/inpttype.ipp:230
+#: src/emu/inpttype.ipp:264 src/emu/inpttype.ipp:298 src/emu/inpttype.ipp:332
+#: src/emu/inpttype.ipp:366 src/emu/inpttype.ipp:400 src/emu/inpttype.ipp:434
+#: src/emu/inpttype.ipp:468
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Right"
+msgid "%p Left Stick/Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:34
+#: src/emu/inpttype.ipp:32 src/emu/inpttype.ipp:150 src/emu/inpttype.ipp:231
+#: src/emu/inpttype.ipp:265 src/emu/inpttype.ipp:299 src/emu/inpttype.ipp:333
+#: src/emu/inpttype.ipp:367 src/emu/inpttype.ipp:401 src/emu/inpttype.ipp:435
+#: src/emu/inpttype.ipp:469
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 1"
+msgid "%p Left Stick/Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:35
+#: src/emu/inpttype.ipp:33 src/emu/inpttype.ipp:151 src/emu/inpttype.ipp:232
+#: src/emu/inpttype.ipp:266 src/emu/inpttype.ipp:300 src/emu/inpttype.ipp:334
+#: src/emu/inpttype.ipp:368 src/emu/inpttype.ipp:402 src/emu/inpttype.ipp:436
+#: src/emu/inpttype.ipp:470
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 2"
+msgid "%p Left Stick/Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:36
+#: src/emu/inpttype.ipp:34 src/emu/inpttype.ipp:152 src/emu/inpttype.ipp:233
+#: src/emu/inpttype.ipp:267 src/emu/inpttype.ipp:301 src/emu/inpttype.ipp:335
+#: src/emu/inpttype.ipp:369 src/emu/inpttype.ipp:403 src/emu/inpttype.ipp:437
+#: src/emu/inpttype.ipp:471
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 3"
+msgid "%p Button 1"
 msgstr ""
 
-#: src/emu/inpttype.ipp:37
+#: src/emu/inpttype.ipp:35 src/emu/inpttype.ipp:153 src/emu/inpttype.ipp:234
+#: src/emu/inpttype.ipp:268 src/emu/inpttype.ipp:302 src/emu/inpttype.ipp:336
+#: src/emu/inpttype.ipp:370 src/emu/inpttype.ipp:404 src/emu/inpttype.ipp:438
+#: src/emu/inpttype.ipp:472
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 4"
+msgid "%p Button 2"
 msgstr ""
 
-#: src/emu/inpttype.ipp:38
+#: src/emu/inpttype.ipp:36 src/emu/inpttype.ipp:154 src/emu/inpttype.ipp:235
+#: src/emu/inpttype.ipp:269 src/emu/inpttype.ipp:303 src/emu/inpttype.ipp:337
+#: src/emu/inpttype.ipp:371 src/emu/inpttype.ipp:405 src/emu/inpttype.ipp:439
+#: src/emu/inpttype.ipp:473
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 5"
+msgid "%p Button 3"
 msgstr ""
 
-#: src/emu/inpttype.ipp:39
+#: src/emu/inpttype.ipp:37 src/emu/inpttype.ipp:155 src/emu/inpttype.ipp:236
+#: src/emu/inpttype.ipp:270 src/emu/inpttype.ipp:304 src/emu/inpttype.ipp:338
+#: src/emu/inpttype.ipp:372 src/emu/inpttype.ipp:406 src/emu/inpttype.ipp:440
+#: src/emu/inpttype.ipp:474
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 6"
+msgid "%p Button 4"
 msgstr ""
 
-#: src/emu/inpttype.ipp:40
+#: src/emu/inpttype.ipp:38 src/emu/inpttype.ipp:156 src/emu/inpttype.ipp:237
+#: src/emu/inpttype.ipp:271 src/emu/inpttype.ipp:305 src/emu/inpttype.ipp:339
+#: src/emu/inpttype.ipp:373 src/emu/inpttype.ipp:407 src/emu/inpttype.ipp:441
+#: src/emu/inpttype.ipp:475
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 7"
+msgid "%p Button 5"
 msgstr ""
 
-#: src/emu/inpttype.ipp:41
+#: src/emu/inpttype.ipp:39 src/emu/inpttype.ipp:157 src/emu/inpttype.ipp:238
+#: src/emu/inpttype.ipp:272 src/emu/inpttype.ipp:306 src/emu/inpttype.ipp:340
+#: src/emu/inpttype.ipp:374 src/emu/inpttype.ipp:408 src/emu/inpttype.ipp:442
+#: src/emu/inpttype.ipp:476
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 8"
+msgid "%p Button 6"
 msgstr ""
 
-#: src/emu/inpttype.ipp:42
+#: src/emu/inpttype.ipp:40 src/emu/inpttype.ipp:158 src/emu/inpttype.ipp:239
+#: src/emu/inpttype.ipp:273 src/emu/inpttype.ipp:307 src/emu/inpttype.ipp:341
+#: src/emu/inpttype.ipp:375 src/emu/inpttype.ipp:409 src/emu/inpttype.ipp:443
+#: src/emu/inpttype.ipp:477
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 9"
+msgid "%p Button 7"
 msgstr ""
 
-#: src/emu/inpttype.ipp:43
+#: src/emu/inpttype.ipp:41 src/emu/inpttype.ipp:159 src/emu/inpttype.ipp:240
+#: src/emu/inpttype.ipp:274 src/emu/inpttype.ipp:308 src/emu/inpttype.ipp:342
+#: src/emu/inpttype.ipp:376 src/emu/inpttype.ipp:410 src/emu/inpttype.ipp:444
+#: src/emu/inpttype.ipp:478
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 10"
+msgid "%p Button 8"
 msgstr ""
 
-#: src/emu/inpttype.ipp:44
+#: src/emu/inpttype.ipp:42 src/emu/inpttype.ipp:160 src/emu/inpttype.ipp:241
+#: src/emu/inpttype.ipp:275 src/emu/inpttype.ipp:309 src/emu/inpttype.ipp:343
+#: src/emu/inpttype.ipp:377 src/emu/inpttype.ipp:411 src/emu/inpttype.ipp:445
+#: src/emu/inpttype.ipp:479
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 11"
+msgid "%p Button 9"
 msgstr ""
 
-#: src/emu/inpttype.ipp:45
+#: src/emu/inpttype.ipp:43 src/emu/inpttype.ipp:161 src/emu/inpttype.ipp:242
+#: src/emu/inpttype.ipp:276 src/emu/inpttype.ipp:310 src/emu/inpttype.ipp:344
+#: src/emu/inpttype.ipp:378 src/emu/inpttype.ipp:412 src/emu/inpttype.ipp:446
+#: src/emu/inpttype.ipp:480
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 12"
+msgid "%p Button 10"
 msgstr ""
 
-#: src/emu/inpttype.ipp:46
+#: src/emu/inpttype.ipp:44 src/emu/inpttype.ipp:162 src/emu/inpttype.ipp:243
+#: src/emu/inpttype.ipp:277 src/emu/inpttype.ipp:311 src/emu/inpttype.ipp:345
+#: src/emu/inpttype.ipp:379 src/emu/inpttype.ipp:413 src/emu/inpttype.ipp:447
+#: src/emu/inpttype.ipp:481
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 13"
+msgid "%p Button 11"
 msgstr ""
 
-#: src/emu/inpttype.ipp:47
+#: src/emu/inpttype.ipp:45 src/emu/inpttype.ipp:163 src/emu/inpttype.ipp:244
+#: src/emu/inpttype.ipp:278 src/emu/inpttype.ipp:312 src/emu/inpttype.ipp:346
+#: src/emu/inpttype.ipp:380 src/emu/inpttype.ipp:414 src/emu/inpttype.ipp:448
+#: src/emu/inpttype.ipp:482
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 14"
+msgid "%p Button 12"
 msgstr ""
 
-#: src/emu/inpttype.ipp:48
+#: src/emu/inpttype.ipp:46 src/emu/inpttype.ipp:164 src/emu/inpttype.ipp:245
+#: src/emu/inpttype.ipp:279 src/emu/inpttype.ipp:313 src/emu/inpttype.ipp:347
+#: src/emu/inpttype.ipp:381 src/emu/inpttype.ipp:415 src/emu/inpttype.ipp:449
+#: src/emu/inpttype.ipp:483
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 15"
+msgid "%p Button 13"
 msgstr ""
 
-#: src/emu/inpttype.ipp:49
+#: src/emu/inpttype.ipp:47 src/emu/inpttype.ipp:165 src/emu/inpttype.ipp:246
+#: src/emu/inpttype.ipp:280 src/emu/inpttype.ipp:314 src/emu/inpttype.ipp:348
+#: src/emu/inpttype.ipp:382 src/emu/inpttype.ipp:416 src/emu/inpttype.ipp:450
+#: src/emu/inpttype.ipp:484
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 16"
+msgid "%p Button 14"
 msgstr ""
 
-#: src/emu/inpttype.ipp:50
+#: src/emu/inpttype.ipp:48 src/emu/inpttype.ipp:166 src/emu/inpttype.ipp:247
+#: src/emu/inpttype.ipp:281 src/emu/inpttype.ipp:315 src/emu/inpttype.ipp:349
+#: src/emu/inpttype.ipp:383 src/emu/inpttype.ipp:417 src/emu/inpttype.ipp:451
+#: src/emu/inpttype.ipp:485
+#, c-format
 msgctxt "input-name"
-msgid "P1 Start"
+msgid "%p Button 15"
 msgstr ""
 
-#: src/emu/inpttype.ipp:51
+#: src/emu/inpttype.ipp:49 src/emu/inpttype.ipp:167 src/emu/inpttype.ipp:248
+#: src/emu/inpttype.ipp:282 src/emu/inpttype.ipp:316 src/emu/inpttype.ipp:350
+#: src/emu/inpttype.ipp:384 src/emu/inpttype.ipp:418 src/emu/inpttype.ipp:452
+#: src/emu/inpttype.ipp:486
+#, c-format
 msgctxt "input-name"
-msgid "P1 Select"
+msgid "%p Button 16"
 msgstr ""
 
-#: src/emu/inpttype.ipp:56
+#: src/emu/inpttype.ipp:50 src/emu/inpttype.ipp:168 src/emu/inpttype.ipp:249
+#: src/emu/inpttype.ipp:283 src/emu/inpttype.ipp:317 src/emu/inpttype.ipp:351
+#: src/emu/inpttype.ipp:385 src/emu/inpttype.ipp:419 src/emu/inpttype.ipp:453
+#: src/emu/inpttype.ipp:487
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong A"
+msgid "%p Start"
 msgstr ""
 
-#: src/emu/inpttype.ipp:57
+#: src/emu/inpttype.ipp:51 src/emu/inpttype.ipp:169 src/emu/inpttype.ipp:250
+#: src/emu/inpttype.ipp:284 src/emu/inpttype.ipp:318 src/emu/inpttype.ipp:352
+#: src/emu/inpttype.ipp:386 src/emu/inpttype.ipp:420 src/emu/inpttype.ipp:454
+#: src/emu/inpttype.ipp:488
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong B"
+msgid "%p Select"
 msgstr ""
 
-#: src/emu/inpttype.ipp:58
+#: src/emu/inpttype.ipp:56 src/emu/inpttype.ipp:174
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong C"
+msgid "%p Mahjong A"
 msgstr ""
 
-#: src/emu/inpttype.ipp:59
+#: src/emu/inpttype.ipp:57 src/emu/inpttype.ipp:175
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong D"
+msgid "%p Mahjong B"
 msgstr ""
 
-#: src/emu/inpttype.ipp:60
+#: src/emu/inpttype.ipp:58 src/emu/inpttype.ipp:176
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong E"
+msgid "%p Mahjong C"
 msgstr ""
 
-#: src/emu/inpttype.ipp:61
+#: src/emu/inpttype.ipp:59 src/emu/inpttype.ipp:177
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong F"
+msgid "%p Mahjong D"
 msgstr ""
 
-#: src/emu/inpttype.ipp:62
+#: src/emu/inpttype.ipp:60 src/emu/inpttype.ipp:178
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong G"
+msgid "%p Mahjong E"
 msgstr ""
 
-#: src/emu/inpttype.ipp:63
+#: src/emu/inpttype.ipp:61 src/emu/inpttype.ipp:179
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong H"
+msgid "%p Mahjong F"
 msgstr ""
 
-#: src/emu/inpttype.ipp:64
+#: src/emu/inpttype.ipp:62 src/emu/inpttype.ipp:180
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong I"
+msgid "%p Mahjong G"
 msgstr ""
 
-#: src/emu/inpttype.ipp:65
+#: src/emu/inpttype.ipp:63 src/emu/inpttype.ipp:181
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong J"
+msgid "%p Mahjong H"
 msgstr ""
 
-#: src/emu/inpttype.ipp:66
+#: src/emu/inpttype.ipp:64 src/emu/inpttype.ipp:182
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong K"
+msgid "%p Mahjong I"
 msgstr ""
 
-#: src/emu/inpttype.ipp:67
+#: src/emu/inpttype.ipp:65 src/emu/inpttype.ipp:183
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong L"
+msgid "%p Mahjong J"
 msgstr ""
 
-#: src/emu/inpttype.ipp:68
+#: src/emu/inpttype.ipp:66 src/emu/inpttype.ipp:184
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong M"
+msgid "%p Mahjong K"
 msgstr ""
 
-#: src/emu/inpttype.ipp:69
+#: src/emu/inpttype.ipp:67 src/emu/inpttype.ipp:185
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong N"
+msgid "%p Mahjong L"
 msgstr ""
 
-#: src/emu/inpttype.ipp:70
+#: src/emu/inpttype.ipp:68 src/emu/inpttype.ipp:186
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong O"
+msgid "%p Mahjong M"
 msgstr ""
 
-#: src/emu/inpttype.ipp:71
+#: src/emu/inpttype.ipp:69 src/emu/inpttype.ipp:187
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong P"
+msgid "%p Mahjong N"
 msgstr ""
 
-#: src/emu/inpttype.ipp:72
+#: src/emu/inpttype.ipp:70 src/emu/inpttype.ipp:188
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Q"
+msgid "%p Mahjong O"
 msgstr ""
 
-#: src/emu/inpttype.ipp:73
+#: src/emu/inpttype.ipp:71 src/emu/inpttype.ipp:189
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Kan"
+msgid "%p Mahjong P"
 msgstr ""
 
-#: src/emu/inpttype.ipp:74
+#: src/emu/inpttype.ipp:72 src/emu/inpttype.ipp:190
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Pon"
+msgid "%p Mahjong Q"
 msgstr ""
 
-#: src/emu/inpttype.ipp:75
+#: src/emu/inpttype.ipp:73 src/emu/inpttype.ipp:191
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Chi"
+msgid "%p Mahjong Kan"
 msgstr ""
 
-#: src/emu/inpttype.ipp:76
+#: src/emu/inpttype.ipp:74 src/emu/inpttype.ipp:192
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Reach"
+msgid "%p Mahjong Pon"
 msgstr ""
 
-#: src/emu/inpttype.ipp:77
+#: src/emu/inpttype.ipp:75 src/emu/inpttype.ipp:193
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Ron"
+msgid "%p Mahjong Chi"
 msgstr ""
 
-#: src/emu/inpttype.ipp:78
+#: src/emu/inpttype.ipp:76 src/emu/inpttype.ipp:194
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Flip Flop"
+msgid "%p Mahjong Reach"
 msgstr ""
 
-#: src/emu/inpttype.ipp:79
+#: src/emu/inpttype.ipp:77 src/emu/inpttype.ipp:195
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Bet"
+msgid "%p Mahjong Ron"
 msgstr ""
 
-#: src/emu/inpttype.ipp:80
+#: src/emu/inpttype.ipp:78 src/emu/inpttype.ipp:200
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Take Score"
+msgid "%p Mahjong Flip Flop"
 msgstr ""
 
-#: src/emu/inpttype.ipp:81
+#: src/emu/inpttype.ipp:79 src/emu/inpttype.ipp:196
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Double Up"
+msgid "%p Mahjong Bet"
 msgstr ""
 
-#: src/emu/inpttype.ipp:82
+#: src/emu/inpttype.ipp:80 src/emu/inpttype.ipp:198
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Big"
+msgid "%p Mahjong Take Score"
 msgstr ""
 
-#: src/emu/inpttype.ipp:83
+#: src/emu/inpttype.ipp:81 src/emu/inpttype.ipp:199
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Small"
+msgid "%p Mahjong Double Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:84
+#: src/emu/inpttype.ipp:82 src/emu/inpttype.ipp:201
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Last Chance"
+msgid "%p Mahjong Big"
 msgstr ""
 
-#: src/emu/inpttype.ipp:89
+#: src/emu/inpttype.ipp:83 src/emu/inpttype.ipp:202
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda A/1"
+msgid "%p Mahjong Small"
 msgstr ""
 
-#: src/emu/inpttype.ipp:90
+#: src/emu/inpttype.ipp:84 src/emu/inpttype.ipp:197
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda B/2"
+msgid "%p Mahjong Last Chance"
 msgstr ""
 
-#: src/emu/inpttype.ipp:91
+#: src/emu/inpttype.ipp:89 src/emu/inpttype.ipp:207
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda C/3"
+msgid "%p Hanafuda A/1"
 msgstr ""
 
-#: src/emu/inpttype.ipp:92
+#: src/emu/inpttype.ipp:90 src/emu/inpttype.ipp:208
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda D/4"
+msgid "%p Hanafuda B/2"
 msgstr ""
 
-#: src/emu/inpttype.ipp:93
+#: src/emu/inpttype.ipp:91 src/emu/inpttype.ipp:209
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda E/5"
+msgid "%p Hanafuda C/3"
 msgstr ""
 
-#: src/emu/inpttype.ipp:94
+#: src/emu/inpttype.ipp:92 src/emu/inpttype.ipp:210
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda F/6"
+msgid "%p Hanafuda D/4"
 msgstr ""
 
-#: src/emu/inpttype.ipp:95
+#: src/emu/inpttype.ipp:93 src/emu/inpttype.ipp:211
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda G/7"
+msgid "%p Hanafuda E/5"
 msgstr ""
 
-#: src/emu/inpttype.ipp:96
+#: src/emu/inpttype.ipp:94 src/emu/inpttype.ipp:212
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda H/8"
+msgid "%p Hanafuda F/6"
 msgstr ""
 
-#: src/emu/inpttype.ipp:97
+#: src/emu/inpttype.ipp:95 src/emu/inpttype.ipp:213
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda Yes"
+msgid "%p Hanafuda G/7"
 msgstr ""
 
-#: src/emu/inpttype.ipp:98
+#: src/emu/inpttype.ipp:96 src/emu/inpttype.ipp:214
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda No"
+msgid "%p Hanafuda H/8"
+msgstr ""
+
+#: src/emu/inpttype.ipp:97 src/emu/inpttype.ipp:215
+#, c-format
+msgctxt "input-name"
+msgid "%p Hanafuda Yes"
+msgstr ""
+
+#: src/emu/inpttype.ipp:98 src/emu/inpttype.ipp:216
+#, c-format
+msgctxt "input-name"
+msgid "%p Hanafuda No"
 msgstr ""
 
 #: src/emu/inpttype.ipp:103
@@ -3751,1551 +3925,6 @@ msgctxt "input-name"
 msgid "Stop All Reels"
 msgstr ""
 
-#: src/emu/inpttype.ipp:140
-msgctxt "input-name"
-msgid "P2 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:141
-msgctxt "input-name"
-msgid "P2 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:142
-msgctxt "input-name"
-msgid "P2 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:143
-msgctxt "input-name"
-msgid "P2 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:144
-msgctxt "input-name"
-msgid "P2 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:145
-msgctxt "input-name"
-msgid "P2 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:146
-msgctxt "input-name"
-msgid "P2 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:147
-msgctxt "input-name"
-msgid "P2 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:148
-msgctxt "input-name"
-msgid "P2 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:149
-msgctxt "input-name"
-msgid "P2 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:150
-msgctxt "input-name"
-msgid "P2 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:151
-msgctxt "input-name"
-msgid "P2 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:152
-msgctxt "input-name"
-msgid "P2 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:153
-msgctxt "input-name"
-msgid "P2 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:154
-msgctxt "input-name"
-msgid "P2 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:155
-msgctxt "input-name"
-msgid "P2 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:156
-msgctxt "input-name"
-msgid "P2 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:157
-msgctxt "input-name"
-msgid "P2 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:158
-msgctxt "input-name"
-msgid "P2 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:159
-msgctxt "input-name"
-msgid "P2 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:160
-msgctxt "input-name"
-msgid "P2 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:161
-msgctxt "input-name"
-msgid "P2 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:162
-msgctxt "input-name"
-msgid "P2 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:163
-msgctxt "input-name"
-msgid "P2 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:164
-msgctxt "input-name"
-msgid "P2 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:165
-msgctxt "input-name"
-msgid "P2 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:166
-msgctxt "input-name"
-msgid "P2 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:167
-msgctxt "input-name"
-msgid "P2 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:168
-msgctxt "input-name"
-msgid "P2 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:169
-msgctxt "input-name"
-msgid "P2 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:174
-msgctxt "input-name"
-msgid "P2 Mahjong A"
-msgstr ""
-
-#: src/emu/inpttype.ipp:175
-msgctxt "input-name"
-msgid "P2 Mahjong B"
-msgstr ""
-
-#: src/emu/inpttype.ipp:176
-msgctxt "input-name"
-msgid "P2 Mahjong C"
-msgstr ""
-
-#: src/emu/inpttype.ipp:177
-msgctxt "input-name"
-msgid "P2 Mahjong D"
-msgstr ""
-
-#: src/emu/inpttype.ipp:178
-msgctxt "input-name"
-msgid "P2 Mahjong E"
-msgstr ""
-
-#: src/emu/inpttype.ipp:179
-msgctxt "input-name"
-msgid "P2 Mahjong F"
-msgstr ""
-
-#: src/emu/inpttype.ipp:180
-msgctxt "input-name"
-msgid "P2 Mahjong G"
-msgstr ""
-
-#: src/emu/inpttype.ipp:181
-msgctxt "input-name"
-msgid "P2 Mahjong H"
-msgstr ""
-
-#: src/emu/inpttype.ipp:182
-msgctxt "input-name"
-msgid "P2 Mahjong I"
-msgstr ""
-
-#: src/emu/inpttype.ipp:183
-msgctxt "input-name"
-msgid "P2 Mahjong J"
-msgstr ""
-
-#: src/emu/inpttype.ipp:184
-msgctxt "input-name"
-msgid "P2 Mahjong K"
-msgstr ""
-
-#: src/emu/inpttype.ipp:185
-msgctxt "input-name"
-msgid "P2 Mahjong L"
-msgstr ""
-
-#: src/emu/inpttype.ipp:186
-msgctxt "input-name"
-msgid "P2 Mahjong M"
-msgstr ""
-
-#: src/emu/inpttype.ipp:187
-msgctxt "input-name"
-msgid "P2 Mahjong N"
-msgstr ""
-
-#: src/emu/inpttype.ipp:188
-msgctxt "input-name"
-msgid "P2 Mahjong O"
-msgstr ""
-
-#: src/emu/inpttype.ipp:189
-msgctxt "input-name"
-msgid "P2 Mahjong P"
-msgstr ""
-
-#: src/emu/inpttype.ipp:190
-msgctxt "input-name"
-msgid "P2 Mahjong Q"
-msgstr ""
-
-#: src/emu/inpttype.ipp:191
-msgctxt "input-name"
-msgid "P2 Mahjong Kan"
-msgstr ""
-
-#: src/emu/inpttype.ipp:192
-msgctxt "input-name"
-msgid "P2 Mahjong Pon"
-msgstr ""
-
-#: src/emu/inpttype.ipp:193
-msgctxt "input-name"
-msgid "P2 Mahjong Chi"
-msgstr ""
-
-#: src/emu/inpttype.ipp:194
-msgctxt "input-name"
-msgid "P2 Mahjong Reach"
-msgstr ""
-
-#: src/emu/inpttype.ipp:195
-msgctxt "input-name"
-msgid "P2 Mahjong Ron"
-msgstr ""
-
-#: src/emu/inpttype.ipp:196
-msgctxt "input-name"
-msgid "P2 Mahjong Bet"
-msgstr ""
-
-#: src/emu/inpttype.ipp:197
-msgctxt "input-name"
-msgid "P2 Mahjong Last Chance"
-msgstr ""
-
-#: src/emu/inpttype.ipp:198
-msgctxt "input-name"
-msgid "P2 Mahjong Take Score"
-msgstr ""
-
-#: src/emu/inpttype.ipp:199
-msgctxt "input-name"
-msgid "P2 Mahjong Double Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:200
-msgctxt "input-name"
-msgid "P2 Mahjong Flip Flop"
-msgstr ""
-
-#: src/emu/inpttype.ipp:201
-msgctxt "input-name"
-msgid "P2 Mahjong Big"
-msgstr ""
-
-#: src/emu/inpttype.ipp:202
-msgctxt "input-name"
-msgid "P2 Mahjong Small"
-msgstr ""
-
-#: src/emu/inpttype.ipp:207
-msgctxt "input-name"
-msgid "P2 Hanafuda A/1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:208
-msgctxt "input-name"
-msgid "P2 Hanafuda B/2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:209
-msgctxt "input-name"
-msgid "P2 Hanafuda C/3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:210
-msgctxt "input-name"
-msgid "P2 Hanafuda D/4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:211
-msgctxt "input-name"
-msgid "P2 Hanafuda E/5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:212
-msgctxt "input-name"
-msgid "P2 Hanafuda F/6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:213
-msgctxt "input-name"
-msgid "P2 Hanafuda G/7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:214
-msgctxt "input-name"
-msgid "P2 Hanafuda H/8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:215
-msgctxt "input-name"
-msgid "P2 Hanafuda Yes"
-msgstr ""
-
-#: src/emu/inpttype.ipp:216
-msgctxt "input-name"
-msgid "P2 Hanafuda No"
-msgstr ""
-
-#: src/emu/inpttype.ipp:221
-msgctxt "input-name"
-msgid "P3 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:222
-msgctxt "input-name"
-msgid "P3 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:223
-msgctxt "input-name"
-msgid "P3 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:224
-msgctxt "input-name"
-msgid "P3 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:225
-msgctxt "input-name"
-msgid "P3 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:226
-msgctxt "input-name"
-msgid "P3 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:227
-msgctxt "input-name"
-msgid "P3 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:228
-msgctxt "input-name"
-msgid "P3 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:229
-msgctxt "input-name"
-msgid "P3 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:230
-msgctxt "input-name"
-msgid "P3 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:231
-msgctxt "input-name"
-msgid "P3 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:232
-msgctxt "input-name"
-msgid "P3 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:233
-msgctxt "input-name"
-msgid "P3 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:234
-msgctxt "input-name"
-msgid "P3 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:235
-msgctxt "input-name"
-msgid "P3 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:236
-msgctxt "input-name"
-msgid "P3 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:237
-msgctxt "input-name"
-msgid "P3 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:238
-msgctxt "input-name"
-msgid "P3 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:239
-msgctxt "input-name"
-msgid "P3 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:240
-msgctxt "input-name"
-msgid "P3 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:241
-msgctxt "input-name"
-msgid "P3 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:242
-msgctxt "input-name"
-msgid "P3 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:243
-msgctxt "input-name"
-msgid "P3 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:244
-msgctxt "input-name"
-msgid "P3 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:245
-msgctxt "input-name"
-msgid "P3 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:246
-msgctxt "input-name"
-msgid "P3 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:247
-msgctxt "input-name"
-msgid "P3 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:248
-msgctxt "input-name"
-msgid "P3 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:249
-msgctxt "input-name"
-msgid "P3 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:250
-msgctxt "input-name"
-msgid "P3 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:255
-msgctxt "input-name"
-msgid "P4 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:256
-msgctxt "input-name"
-msgid "P4 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:257
-msgctxt "input-name"
-msgid "P4 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:258
-msgctxt "input-name"
-msgid "P4 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:259
-msgctxt "input-name"
-msgid "P4 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:260
-msgctxt "input-name"
-msgid "P4 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:261
-msgctxt "input-name"
-msgid "P4 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:262
-msgctxt "input-name"
-msgid "P4 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:263
-msgctxt "input-name"
-msgid "P4 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:264
-msgctxt "input-name"
-msgid "P4 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:265
-msgctxt "input-name"
-msgid "P4 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:266
-msgctxt "input-name"
-msgid "P4 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:267
-msgctxt "input-name"
-msgid "P4 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:268
-msgctxt "input-name"
-msgid "P4 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:269
-msgctxt "input-name"
-msgid "P4 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:270
-msgctxt "input-name"
-msgid "P4 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:271
-msgctxt "input-name"
-msgid "P4 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:272
-msgctxt "input-name"
-msgid "P4 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:273
-msgctxt "input-name"
-msgid "P4 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:274
-msgctxt "input-name"
-msgid "P4 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:275
-msgctxt "input-name"
-msgid "P4 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:276
-msgctxt "input-name"
-msgid "P4 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:277
-msgctxt "input-name"
-msgid "P4 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:278
-msgctxt "input-name"
-msgid "P4 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:279
-msgctxt "input-name"
-msgid "P4 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:280
-msgctxt "input-name"
-msgid "P4 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:281
-msgctxt "input-name"
-msgid "P4 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:282
-msgctxt "input-name"
-msgid "P4 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:283
-msgctxt "input-name"
-msgid "P4 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:284
-msgctxt "input-name"
-msgid "P4 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:289
-msgctxt "input-name"
-msgid "P5 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:290
-msgctxt "input-name"
-msgid "P5 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:291
-msgctxt "input-name"
-msgid "P5 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:292
-msgctxt "input-name"
-msgid "P5 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:293
-msgctxt "input-name"
-msgid "P5 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:294
-msgctxt "input-name"
-msgid "P5 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:295
-msgctxt "input-name"
-msgid "P5 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:296
-msgctxt "input-name"
-msgid "P5 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:297
-msgctxt "input-name"
-msgid "P5 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:298
-msgctxt "input-name"
-msgid "P5 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:299
-msgctxt "input-name"
-msgid "P5 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:300
-msgctxt "input-name"
-msgid "P5 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:301
-msgctxt "input-name"
-msgid "P5 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:302
-msgctxt "input-name"
-msgid "P5 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:303
-msgctxt "input-name"
-msgid "P5 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:304
-msgctxt "input-name"
-msgid "P5 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:305
-msgctxt "input-name"
-msgid "P5 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:306
-msgctxt "input-name"
-msgid "P5 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:307
-msgctxt "input-name"
-msgid "P5 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:308
-msgctxt "input-name"
-msgid "P5 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:309
-msgctxt "input-name"
-msgid "P5 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:310
-msgctxt "input-name"
-msgid "P5 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:311
-msgctxt "input-name"
-msgid "P5 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:312
-msgctxt "input-name"
-msgid "P5 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:313
-msgctxt "input-name"
-msgid "P5 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:314
-msgctxt "input-name"
-msgid "P5 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:315
-msgctxt "input-name"
-msgid "P5 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:316
-msgctxt "input-name"
-msgid "P5 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:317
-msgctxt "input-name"
-msgid "P5 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:318
-msgctxt "input-name"
-msgid "P5 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:323
-msgctxt "input-name"
-msgid "P6 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:324
-msgctxt "input-name"
-msgid "P6 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:325
-msgctxt "input-name"
-msgid "P6 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:326
-msgctxt "input-name"
-msgid "P6 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:327
-msgctxt "input-name"
-msgid "P6 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:328
-msgctxt "input-name"
-msgid "P6 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:329
-msgctxt "input-name"
-msgid "P6 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:330
-msgctxt "input-name"
-msgid "P6 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:331
-msgctxt "input-name"
-msgid "P6 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:332
-msgctxt "input-name"
-msgid "P6 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:333
-msgctxt "input-name"
-msgid "P6 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:334
-msgctxt "input-name"
-msgid "P6 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:335
-msgctxt "input-name"
-msgid "P6 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:336
-msgctxt "input-name"
-msgid "P6 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:337
-msgctxt "input-name"
-msgid "P6 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:338
-msgctxt "input-name"
-msgid "P6 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:339
-msgctxt "input-name"
-msgid "P6 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:340
-msgctxt "input-name"
-msgid "P6 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:341
-msgctxt "input-name"
-msgid "P6 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:342
-msgctxt "input-name"
-msgid "P6 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:343
-msgctxt "input-name"
-msgid "P6 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:344
-msgctxt "input-name"
-msgid "P6 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:345
-msgctxt "input-name"
-msgid "P6 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:346
-msgctxt "input-name"
-msgid "P6 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:347
-msgctxt "input-name"
-msgid "P6 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:348
-msgctxt "input-name"
-msgid "P6 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:349
-msgctxt "input-name"
-msgid "P6 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:350
-msgctxt "input-name"
-msgid "P6 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:351
-msgctxt "input-name"
-msgid "P6 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:352
-msgctxt "input-name"
-msgid "P6 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:357
-msgctxt "input-name"
-msgid "P7 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:358
-msgctxt "input-name"
-msgid "P7 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:359
-msgctxt "input-name"
-msgid "P7 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:360
-msgctxt "input-name"
-msgid "P7 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:361
-msgctxt "input-name"
-msgid "P7 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:362
-msgctxt "input-name"
-msgid "P7 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:363
-msgctxt "input-name"
-msgid "P7 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:364
-msgctxt "input-name"
-msgid "P7 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:365
-msgctxt "input-name"
-msgid "P7 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:366
-msgctxt "input-name"
-msgid "P7 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:367
-msgctxt "input-name"
-msgid "P7 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:368
-msgctxt "input-name"
-msgid "P7 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:369
-msgctxt "input-name"
-msgid "P7 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:370
-msgctxt "input-name"
-msgid "P7 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:371
-msgctxt "input-name"
-msgid "P7 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:372
-msgctxt "input-name"
-msgid "P7 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:373
-msgctxt "input-name"
-msgid "P7 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:374
-msgctxt "input-name"
-msgid "P7 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:375
-msgctxt "input-name"
-msgid "P7 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:376
-msgctxt "input-name"
-msgid "P7 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:377
-msgctxt "input-name"
-msgid "P7 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:378
-msgctxt "input-name"
-msgid "P7 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:379
-msgctxt "input-name"
-msgid "P7 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:380
-msgctxt "input-name"
-msgid "P7 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:381
-msgctxt "input-name"
-msgid "P7 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:382
-msgctxt "input-name"
-msgid "P7 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:383
-msgctxt "input-name"
-msgid "P7 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:384
-msgctxt "input-name"
-msgid "P7 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:385
-msgctxt "input-name"
-msgid "P7 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:386
-msgctxt "input-name"
-msgid "P7 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:391
-msgctxt "input-name"
-msgid "P8 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:392
-msgctxt "input-name"
-msgid "P8 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:393
-msgctxt "input-name"
-msgid "P8 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:394
-msgctxt "input-name"
-msgid "P8 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:395
-msgctxt "input-name"
-msgid "P8 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:396
-msgctxt "input-name"
-msgid "P8 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:397
-msgctxt "input-name"
-msgid "P8 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:398
-msgctxt "input-name"
-msgid "P8 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:399
-msgctxt "input-name"
-msgid "P8 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:400
-msgctxt "input-name"
-msgid "P8 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:401
-msgctxt "input-name"
-msgid "P8 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:402
-msgctxt "input-name"
-msgid "P8 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:403
-msgctxt "input-name"
-msgid "P8 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:404
-msgctxt "input-name"
-msgid "P8 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:405
-msgctxt "input-name"
-msgid "P8 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:406
-msgctxt "input-name"
-msgid "P8 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:407
-msgctxt "input-name"
-msgid "P8 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:408
-msgctxt "input-name"
-msgid "P8 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:409
-msgctxt "input-name"
-msgid "P8 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:410
-msgctxt "input-name"
-msgid "P8 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:411
-msgctxt "input-name"
-msgid "P8 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:412
-msgctxt "input-name"
-msgid "P8 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:413
-msgctxt "input-name"
-msgid "P8 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:414
-msgctxt "input-name"
-msgid "P8 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:415
-msgctxt "input-name"
-msgid "P8 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:416
-msgctxt "input-name"
-msgid "P8 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:417
-msgctxt "input-name"
-msgid "P8 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:418
-msgctxt "input-name"
-msgid "P8 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:419
-msgctxt "input-name"
-msgid "P8 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:420
-msgctxt "input-name"
-msgid "P8 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:425
-msgctxt "input-name"
-msgid "P9 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:426
-msgctxt "input-name"
-msgid "P9 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:427
-msgctxt "input-name"
-msgid "P9 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:428
-msgctxt "input-name"
-msgid "P9 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:429
-msgctxt "input-name"
-msgid "P9 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:430
-msgctxt "input-name"
-msgid "P9 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:431
-msgctxt "input-name"
-msgid "P9 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:432
-msgctxt "input-name"
-msgid "P9 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:433
-msgctxt "input-name"
-msgid "P9 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:434
-msgctxt "input-name"
-msgid "P9 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:435
-msgctxt "input-name"
-msgid "P9 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:436
-msgctxt "input-name"
-msgid "P9 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:437
-msgctxt "input-name"
-msgid "P9 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:438
-msgctxt "input-name"
-msgid "P9 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:439
-msgctxt "input-name"
-msgid "P9 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:440
-msgctxt "input-name"
-msgid "P9 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:441
-msgctxt "input-name"
-msgid "P9 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:442
-msgctxt "input-name"
-msgid "P9 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:443
-msgctxt "input-name"
-msgid "P9 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:444
-msgctxt "input-name"
-msgid "P9 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:445
-msgctxt "input-name"
-msgid "P9 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:446
-msgctxt "input-name"
-msgid "P9 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:447
-msgctxt "input-name"
-msgid "P9 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:448
-msgctxt "input-name"
-msgid "P9 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:449
-msgctxt "input-name"
-msgid "P9 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:450
-msgctxt "input-name"
-msgid "P9 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:451
-msgctxt "input-name"
-msgid "P9 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:452
-msgctxt "input-name"
-msgid "P9 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:453
-msgctxt "input-name"
-msgid "P9 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:454
-msgctxt "input-name"
-msgid "P9 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:459
-msgctxt "input-name"
-msgid "P10 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:460
-msgctxt "input-name"
-msgid "P10 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:461
-msgctxt "input-name"
-msgid "P10 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:462
-msgctxt "input-name"
-msgid "P10 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:463
-msgctxt "input-name"
-msgid "P10 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:464
-msgctxt "input-name"
-msgid "P10 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:465
-msgctxt "input-name"
-msgid "P10 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:466
-msgctxt "input-name"
-msgid "P10 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:467
-msgctxt "input-name"
-msgid "P10 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:468
-msgctxt "input-name"
-msgid "P10 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:469
-msgctxt "input-name"
-msgid "P10 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:470
-msgctxt "input-name"
-msgid "P10 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:471
-msgctxt "input-name"
-msgid "P10 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:472
-msgctxt "input-name"
-msgid "P10 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:473
-msgctxt "input-name"
-msgid "P10 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:474
-msgctxt "input-name"
-msgid "P10 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:475
-msgctxt "input-name"
-msgid "P10 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:476
-msgctxt "input-name"
-msgid "P10 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:477
-msgctxt "input-name"
-msgid "P10 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:478
-msgctxt "input-name"
-msgid "P10 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:479
-msgctxt "input-name"
-msgid "P10 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:480
-msgctxt "input-name"
-msgid "P10 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:481
-msgctxt "input-name"
-msgid "P10 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:482
-msgctxt "input-name"
-msgid "P10 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:483
-msgctxt "input-name"
-msgid "P10 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:484
-msgctxt "input-name"
-msgid "P10 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:485
-msgctxt "input-name"
-msgid "P10 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:486
-msgctxt "input-name"
-msgid "P10 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:487
-msgctxt "input-name"
-msgid "P10 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:488
-msgctxt "input-name"
-msgid "P10 Select"
-msgstr ""
-
 #: src/emu/inpttype.ipp:493
 msgctxt "input-name"
 msgid "1 Player Start"
@@ -5476,154 +4105,31 @@ msgctxt "input-name"
 msgid "Volume Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:550
-msgctxt "input-name"
-msgid "P1 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:551
-msgctxt "input-name"
-msgid "P2 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:552
-msgctxt "input-name"
-msgid "P3 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:553
-msgctxt "input-name"
-msgid "P4 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:554
-msgctxt "input-name"
-msgid "P5 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:555
-msgctxt "input-name"
-msgid "P6 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:556
-msgctxt "input-name"
-msgid "P7 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:557
-msgctxt "input-name"
-msgid "P8 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:558
-msgctxt "input-name"
-msgid "P9 Pedal 1"
-msgstr ""
-
+#: src/emu/inpttype.ipp:550 src/emu/inpttype.ipp:551 src/emu/inpttype.ipp:552
+#: src/emu/inpttype.ipp:553 src/emu/inpttype.ipp:554 src/emu/inpttype.ipp:555
+#: src/emu/inpttype.ipp:556 src/emu/inpttype.ipp:557 src/emu/inpttype.ipp:558
 #: src/emu/inpttype.ipp:559
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:564
-msgctxt "input-name"
-msgid "P1 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:565
-msgctxt "input-name"
-msgid "P2 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:566
-msgctxt "input-name"
-msgid "P3 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:567
-msgctxt "input-name"
-msgid "P4 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:568
-msgctxt "input-name"
-msgid "P5 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:569
-msgctxt "input-name"
-msgid "P6 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:570
-msgctxt "input-name"
-msgid "P7 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:571
-msgctxt "input-name"
-msgid "P8 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:572
-msgctxt "input-name"
-msgid "P9 Pedal 2"
+msgid "%p Pedal 1"
 msgstr ""
 
+#: src/emu/inpttype.ipp:564 src/emu/inpttype.ipp:565 src/emu/inpttype.ipp:566
+#: src/emu/inpttype.ipp:567 src/emu/inpttype.ipp:568 src/emu/inpttype.ipp:569
+#: src/emu/inpttype.ipp:570 src/emu/inpttype.ipp:571 src/emu/inpttype.ipp:572
 #: src/emu/inpttype.ipp:573
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:578
-msgctxt "input-name"
-msgid "P1 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:579
-msgctxt "input-name"
-msgid "P2 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:580
-msgctxt "input-name"
-msgid "P3 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:581
-msgctxt "input-name"
-msgid "P4 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:582
-msgctxt "input-name"
-msgid "P5 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:583
-msgctxt "input-name"
-msgid "P6 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:584
-msgctxt "input-name"
-msgid "P7 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:585
-msgctxt "input-name"
-msgid "P8 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:586
-msgctxt "input-name"
-msgid "P9 Pedal 3"
+msgid "%p Pedal 2"
 msgstr ""
 
+#: src/emu/inpttype.ipp:578 src/emu/inpttype.ipp:579 src/emu/inpttype.ipp:580
+#: src/emu/inpttype.ipp:581 src/emu/inpttype.ipp:582 src/emu/inpttype.ipp:583
+#: src/emu/inpttype.ipp:584 src/emu/inpttype.ipp:585 src/emu/inpttype.ipp:586
 #: src/emu/inpttype.ipp:587
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 3"
+msgid "%p Pedal 3"
 msgstr ""
 
 #: src/emu/inpttype.ipp:592
diff --git a/language/Norwegian/strings.po b/language/Norwegian/strings.po
index 725cffbfa3a..d57b06eea7f 100644
--- a/language/Norwegian/strings.po
+++ b/language/Norwegian/strings.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-19 02:50+1100\n"
+"POT-Creation-Date: 2021-12-09 04:44+1100\n"
 "PO-Revision-Date: 2018-08-05 19:10+0200\n"
 "Last-Translator: Imre Kristoffer Eilertsen <imreeil42@gmail.com>\n"
 "Language-Team: MAME Language Team\n"
@@ -272,12 +272,12 @@ msgstr "%1$s %2$s ( %3$d / %4$d programvarepakker )"
 msgid "Driver: \"%1$s\" software list "
 msgstr "Driver: «%1$s»-programvareliste "
 
-#: src/frontend/mame/ui/selsoft.cpp:711 src/frontend/mame/ui/selgame.cpp:1066
+#: src/frontend/mame/ui/selsoft.cpp:711 src/frontend/mame/ui/selgame.cpp:1076
 #, c-format
 msgid "%1$s: %2$s - Search: %3$s_"
 msgstr "%1$s: %2$s - Søk: %3$s_"
 
-#: src/frontend/mame/ui/selsoft.cpp:713 src/frontend/mame/ui/selgame.cpp:1068
+#: src/frontend/mame/ui/selsoft.cpp:713 src/frontend/mame/ui/selgame.cpp:1078
 #, c-format
 msgid "Search: %1$s_"
 msgstr "Søk: %1$s_"
@@ -287,7 +287,7 @@ msgstr "Søk: %1$s_"
 msgid "Software list/item: %1$s:%2$s"
 msgstr ""
 
-#: src/frontend/mame/ui/optsmenu.cpp:73 src/frontend/mame/ui/sndmenu.cpp:165
+#: src/frontend/mame/ui/optsmenu.cpp:73 src/frontend/mame/ui/sndmenu.cpp:161
 msgid "Sound Options"
 msgstr "Lydinnstillinger"
 
@@ -382,12 +382,12 @@ msgid "Show mouse pointer"
 msgstr "Vis musepekeren"
 
 #: src/frontend/mame/ui/submenu.cpp:39
-msgid "Confirm quit from machines"
-msgstr "Bekreft at maskiner skal lukkes"
+msgid "Confirm quit from emulation"
+msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:40
-msgid "Skip information screen at startup"
-msgstr "Vis informasjonsskjerm ved oppstart"
+msgid "Skip system information screen"
+msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:41
 msgid "Force 4:3 aspect for snapshot display"
@@ -402,8 +402,8 @@ msgid "Skip BIOS selection menu"
 msgstr "Hopp over BIOS-valgmenyen"
 
 #: src/frontend/mame/ui/submenu.cpp:44
-msgid "Skip software parts selection menu"
-msgstr "Hopp over maskinvaredel-valgmenyen"
+msgid "Skip software part selection menu"
+msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:45
 msgid "Info auto audit"
@@ -554,7 +554,7 @@ msgid "UI active"
 msgstr "Grensesnitt aktivt"
 
 #: src/frontend/mame/ui/submenu.cpp:91
-msgid "Offscreen reload"
+msgid "Off-screen reload"
 msgstr "Omlasting utenfor skjermen"
 
 #: src/frontend/mame/ui/submenu.cpp:92
@@ -570,8 +570,8 @@ msgid "Natural keyboard"
 msgstr "Naturlig tastatur"
 
 #: src/frontend/mame/ui/submenu.cpp:95
-msgid "Simultaneous contradictory"
-msgstr "Samtidige selvmotsigende"
+msgid "Allow contradictory joystick inputs"
+msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:96
 msgid "Coin impulse"
@@ -594,7 +594,7 @@ msgid "Pedal Device Assignment"
 msgstr "Pedalenhets-tilegning"
 
 #: src/frontend/mame/ui/submenu.cpp:106
-msgid "Adstick Device Assignment"
+msgid "AD Stick Device Assignment"
 msgstr "Styrepinneenhets-tilegning"
 
 #: src/frontend/mame/ui/submenu.cpp:107
@@ -681,14 +681,14 @@ msgstr "Synkronisert oppfriskning"
 msgid "Wait Vertical Sync"
 msgstr "Avvent V-synkro"
 
-#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:687
+#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:689
 #: src/frontend/mame/ui/videoopt.cpp:191 src/frontend/mame/ui/custui.cpp:490
 #: src/frontend/mame/ui/analogipt.cpp:471 plugins/cheatfind/init.lua:766
 #: plugins/cheatfind/init.lua:777 plugins/cheat/init.lua:668
 msgid "On"
 msgstr "På"
 
-#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:690
+#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:692
 #: src/frontend/mame/ui/videoopt.cpp:207 src/frontend/mame/ui/custui.cpp:490
 #: src/frontend/mame/ui/analogipt.cpp:471 plugins/cheatfind/init.lua:763
 #: plugins/cheatfind/init.lua:774 plugins/cheat/init.lua:671
@@ -696,11 +696,11 @@ msgstr "På"
 msgid "Off"
 msgstr "Av"
 
-#: src/frontend/mame/ui/menu.cpp:693
+#: src/frontend/mame/ui/menu.cpp:695
 msgid "Auto"
 msgstr "Auto"
 
-#: src/frontend/mame/ui/menu.cpp:1195
+#: src/frontend/mame/ui/menu.cpp:1197
 #: src/frontend/mame/ui/simpleselgame.cpp:278
 #: src/frontend/mame/ui/selmenu.cpp:1280
 msgid "Return to Previous Menu"
@@ -708,7 +708,7 @@ msgstr "Gå tilbake til forrige meny"
 
 #: src/frontend/mame/ui/filemngr.cpp:139
 #: src/frontend/mame/ui/confswitch.cpp:119
-#: src/frontend/mame/ui/inputmap.cpp:559 src/frontend/mame/ui/analogipt.cpp:360
+#: src/frontend/mame/ui/inputmap.cpp:563 src/frontend/mame/ui/analogipt.cpp:360
 #, c-format
 msgid "[root%1$s]"
 msgstr ""
@@ -973,22 +973,22 @@ msgstr ""
 "CPU:\n"
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "GHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "MHz"
 msgstr "MHz"
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "kHz"
 msgstr "kHz"
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "Hz"
 msgstr ""
 
@@ -1016,38 +1016,38 @@ msgstr "Ingen\n"
 msgid "Vector"
 msgstr "Vektor"
 
-#: src/frontend/mame/ui/info.cpp:480
+#: src/frontend/mame/ui/info.cpp:483
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr "%1$s: %2$s\n"
 
-#: src/frontend/mame/ui/info.cpp:480
+#: src/frontend/mame/ui/info.cpp:483
 msgid "%2$s\n"
 msgstr "%2$s\n"
 
-#: src/frontend/mame/ui/info.cpp:497
+#: src/frontend/mame/ui/info.cpp:500
 #, c-format
 msgid "Screen '%1$s'"
 msgstr "Skjerm '%1$s'"
 
-#: src/frontend/mame/ui/info.cpp:499
+#: src/frontend/mame/ui/info.cpp:502
 msgid "Screen"
 msgstr "Skjerm"
 
-#: src/frontend/mame/ui/info.cpp:570 src/frontend/mame/ui/info.cpp:581
+#: src/frontend/mame/ui/info.cpp:573 src/frontend/mame/ui/info.cpp:584
 #, c-format
 msgid "%1$s:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:662
+#: src/frontend/mame/ui/info.cpp:665
 msgid "Not supported"
 msgstr "Ikke støttet"
 
-#: src/frontend/mame/ui/info.cpp:665
+#: src/frontend/mame/ui/info.cpp:668
 msgid "Partially supported"
 msgstr "Delvis støttet"
 
-#: src/frontend/mame/ui/info.cpp:674
+#: src/frontend/mame/ui/info.cpp:677
 msgid "[empty]"
 msgstr "[tom]"
 
@@ -1120,7 +1120,7 @@ msgid "Emulated"
 msgstr "Emulert"
 
 #: src/frontend/mame/ui/keyboard.cpp:59 src/frontend/mame/ui/confswitch.cpp:117
-#: src/frontend/mame/ui/inputmap.cpp:557 src/frontend/mame/ui/analogipt.cpp:358
+#: src/frontend/mame/ui/inputmap.cpp:561 src/frontend/mame/ui/analogipt.cpp:358
 #, c-format
 msgid "%1$s [root%2$s]"
 msgstr ""
@@ -1480,7 +1480,7 @@ msgctxt "swlist-info"
 msgid "Software list/item"
 msgstr ""
 
-#: src/frontend/mame/ui/datmenu.cpp:88 src/frontend/mame/ui/selmenu.cpp:2698
+#: src/frontend/mame/ui/datmenu.cpp:88 src/frontend/mame/ui/selmenu.cpp:2707
 msgid "Software List Info"
 msgstr ""
 
@@ -1601,7 +1601,7 @@ msgstr ""
 msgid "Configure Machine:"
 msgstr ""
 
-#: src/frontend/mame/ui/miscmenu.cpp:858 src/frontend/mame/ui/selmenu.cpp:2638
+#: src/frontend/mame/ui/miscmenu.cpp:858 src/frontend/mame/ui/selmenu.cpp:2647
 msgid " (default)"
 msgstr " (standard)"
 
@@ -1622,7 +1622,7 @@ msgstr ""
 "Trykk %1$s for å avslutte\n"
 "Trykk %2$s for å gå tilbake til emuleringen"
 
-#: src/frontend/mame/ui/info_pty.cpp:30 src/frontend/mame/ui/mainmenu.cpp:155
+#: src/frontend/mame/ui/info_pty.cpp:30
 msgid "Pseudo terminals"
 msgstr "Kvasiterminaler"
 
@@ -1690,52 +1690,52 @@ msgstr ""
 msgid "Other Controls"
 msgstr "Andre kontrolleringer"
 
-#: src/frontend/mame/ui/inputmap.cpp:227
+#: src/frontend/mame/ui/inputmap.cpp:231
 msgid "This machine has no configurable inputs."
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:327
+#: src/frontend/mame/ui/inputmap.cpp:331
 msgid "Pressed"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:397
+#: src/frontend/mame/ui/inputmap.cpp:401
 msgid "Invalid sequence entered"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:542
+#: src/frontend/mame/ui/inputmap.cpp:546
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:543
+#: src/frontend/mame/ui/inputmap.cpp:547
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog Inc"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:544
+#: src/frontend/mame/ui/inputmap.cpp:548
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog Dec"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:586
+#: src/frontend/mame/ui/inputmap.cpp:590
 #, c-format
 msgid "Press %1$s to set\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:587
+#: src/frontend/mame/ui/inputmap.cpp:591
 #, c-format
 msgid "Press %1$s to append\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:588
+#: src/frontend/mame/ui/inputmap.cpp:592
 #, c-format
 msgid "Press %1$s to clear\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:589
+#: src/frontend/mame/ui/inputmap.cpp:593
 #, c-format
 msgid "Press %1$s to restore default\n"
 msgstr ""
@@ -1803,7 +1803,7 @@ msgstr ""
 "Trykk på enhver knapp for å fortsette."
 
 #: src/frontend/mame/ui/simpleselgame.cpp:273
-#: src/frontend/mame/ui/selgame.cpp:436
+#: src/frontend/mame/ui/selgame.cpp:443
 msgid "Configure Options"
 msgstr "Sett opp innstillingene"
 
@@ -2138,16 +2138,16 @@ msgstr ""
 msgid "Expand to fit"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:437
+#: src/frontend/mame/ui/selgame.cpp:444
 msgid "Configure Machine"
 msgstr "Sett opp maskinen"
 
-#: src/frontend/mame/ui/selgame.cpp:1050
+#: src/frontend/mame/ui/selgame.cpp:1060
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d machines (%5$d BIOS) )"
 msgstr "%1$s %2$s ( %3$d / %4$d maskiner (%5$d BIOS) )"
 
-#: src/frontend/mame/ui/selgame.cpp:1078
+#: src/frontend/mame/ui/selgame.cpp:1088
 #, c-format
 msgid "System: %1$-.100s"
 msgstr "System: %1$-.100s"
@@ -2169,11 +2169,9 @@ msgstr "Utfallene vil bli lagret til %1$s"
 #: src/frontend/mame/ui/auditmenu.cpp:98
 #, c-format
 msgid ""
-"Auditing ROMs for machine %2$u of %3$u...\n"
+"Auditing media for machine %2$u of %3$u...\n"
 "%1$s"
 msgstr ""
-"Undersøker ROM-filene til maskin nr. %2$u av %3$u...\n"
-"%1$s"
 
 #: src/frontend/mame/ui/auditmenu.cpp:116
 #, c-format
@@ -2186,12 +2184,12 @@ msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:136
 #, c-format
-msgid "Audit ROMs for %1$u machines marked unavailable"
+msgid "Audit media for %1$u machines marked unavailable"
 msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:137
 #, c-format
-msgid "Audit ROMs for all %1$u machines"
+msgid "Audit media for all %1$u machines"
 msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:154
@@ -2397,84 +2395,84 @@ msgctxt "color-sample"
 msgid "Clone"
 msgstr "Klon"
 
-#: src/frontend/mame/ui/custui.cpp:914
+#: src/frontend/mame/ui/custui.cpp:906
 msgid "ARGB Settings"
 msgstr "ARGB-innstillinger"
 
-#: src/frontend/mame/ui/custui.cpp:919 src/frontend/mame/ui/custui.cpp:922
+#: src/frontend/mame/ui/custui.cpp:911 src/frontend/mame/ui/custui.cpp:914
 msgctxt "color-channel"
 msgid "Alpha"
 msgstr "Alfa"
 
-#: src/frontend/mame/ui/custui.cpp:927 src/frontend/mame/ui/custui.cpp:930
+#: src/frontend/mame/ui/custui.cpp:919 src/frontend/mame/ui/custui.cpp:922
 msgctxt "color-channel"
 msgid "Red"
 msgstr "Rød"
 
-#: src/frontend/mame/ui/custui.cpp:935 src/frontend/mame/ui/custui.cpp:938
+#: src/frontend/mame/ui/custui.cpp:927 src/frontend/mame/ui/custui.cpp:930
 msgctxt "color-channel"
 msgid "Green"
 msgstr "Grønn"
 
-#: src/frontend/mame/ui/custui.cpp:943 src/frontend/mame/ui/custui.cpp:946
+#: src/frontend/mame/ui/custui.cpp:935 src/frontend/mame/ui/custui.cpp:938
 msgctxt "color-channel"
 msgid "Blue"
 msgstr "Blå"
 
-#: src/frontend/mame/ui/custui.cpp:949
+#: src/frontend/mame/ui/custui.cpp:941
 msgid "Choose from palette"
 msgstr "Velg fra palett"
 
-#: src/frontend/mame/ui/custui.cpp:996
+#: src/frontend/mame/ui/custui.cpp:988
 msgid "Color preview:"
 msgstr "Fargeforhåndsvisning:"
 
-#: src/frontend/mame/ui/custui.cpp:1093
+#: src/frontend/mame/ui/custui.cpp:1085
 msgctxt "color-preset"
 msgid "White"
 msgstr "Hvit"
 
-#: src/frontend/mame/ui/custui.cpp:1094
+#: src/frontend/mame/ui/custui.cpp:1086
 msgctxt "color-preset"
 msgid "Silver"
 msgstr "Sølv"
 
-#: src/frontend/mame/ui/custui.cpp:1095
+#: src/frontend/mame/ui/custui.cpp:1087
 msgctxt "color-preset"
 msgid "Gray"
 msgstr "Grå"
 
-#: src/frontend/mame/ui/custui.cpp:1096
+#: src/frontend/mame/ui/custui.cpp:1088
 msgctxt "color-preset"
 msgid "Black"
 msgstr "Svart"
 
-#: src/frontend/mame/ui/custui.cpp:1097
+#: src/frontend/mame/ui/custui.cpp:1089
 msgctxt "color-preset"
 msgid "Red"
 msgstr "Rød"
 
-#: src/frontend/mame/ui/custui.cpp:1098
+#: src/frontend/mame/ui/custui.cpp:1090
 msgctxt "color-preset"
 msgid "Orange"
 msgstr "Oransje"
 
-#: src/frontend/mame/ui/custui.cpp:1099
+#: src/frontend/mame/ui/custui.cpp:1091
 msgctxt "color-preset"
 msgid "Yellow"
 msgstr "Gul"
 
-#: src/frontend/mame/ui/custui.cpp:1100
+#: src/frontend/mame/ui/custui.cpp:1092
 msgctxt "color-preset"
 msgid "Green"
 msgstr "Grønn"
 
-#: src/frontend/mame/ui/custui.cpp:1101
+#: src/frontend/mame/ui/custui.cpp:1093
 msgctxt "color-preset"
 msgid "Blue"
 msgstr "Blå"
 
-#: src/frontend/mame/ui/custui.cpp:1102
+#: src/frontend/mame/ui/custui.cpp:1094
 msgctxt "color-preset"
 msgid "Violet"
 msgstr "Fiolett"
@@ -2539,7 +2537,7 @@ msgid "Input (general)"
 msgstr "Kontrollere (Generelt)"
 
 #: src/frontend/mame/ui/mainmenu.cpp:123
-msgid "Input (this Machine)"
+msgid "Input (this machine)"
 msgstr "Kontrollere (Denne maskinen)"
 
 #: src/frontend/mame/ui/mainmenu.cpp:126
@@ -2578,6 +2576,10 @@ msgstr "Filbehandler"
 msgid "Tape Control"
 msgstr "Teipkontroll"
 
+#: src/frontend/mame/ui/mainmenu.cpp:155
+msgid "Pseudo Terminals"
+msgstr ""
+
 #: src/frontend/mame/ui/mainmenu.cpp:158
 msgid "BIOS Selection"
 msgstr "BIOS-valg"
@@ -2616,7 +2618,7 @@ msgstr "Ekstern DAT-visning"
 
 #: src/frontend/mame/ui/mainmenu.cpp:200
 #, c-format
-msgid "About %s"
+msgid "About %1$s"
 msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:212
@@ -2776,377 +2778,375 @@ msgstr "Driveren er en klone av: %1$s"
 msgid "%1$s %2$s"
 msgstr "%1$s %2$s"
 
-#: src/frontend/mame/ui/selmenu.cpp:2235
+#: src/frontend/mame/ui/selmenu.cpp:2244
 msgid "Images"
 msgstr "Bilder"
 
-#: src/frontend/mame/ui/selmenu.cpp:2236
+#: src/frontend/mame/ui/selmenu.cpp:2245
 msgid "Infos"
 msgstr "Info"
 
-#: src/frontend/mame/ui/selmenu.cpp:2551
+#: src/frontend/mame/ui/selmenu.cpp:2560
 msgid ""
 "Required ROM/disk images for the selected system are missing or incorrect. "
 "Please acquire the correct files or select a different system.\n"
 "\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2567
+#: src/frontend/mame/ui/selmenu.cpp:2576
 msgid ""
 "Required ROM/disk images for the selected software are missing or incorrect. "
 "Please acquire the correct files or select a different software item.\n"
 "\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2583
+#: src/frontend/mame/ui/selmenu.cpp:2592
 msgid "incorrect checksum"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2586
+#: src/frontend/mame/ui/selmenu.cpp:2595
 msgid "incorrect length"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2589
+#: src/frontend/mame/ui/selmenu.cpp:2598
 msgid "not found"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2600
+#: src/frontend/mame/ui/selmenu.cpp:2609
 #, c-format
 msgid "%1$s (%2$s) - %3$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2602
+#: src/frontend/mame/ui/selmenu.cpp:2611
 #, c-format
 msgid "%1$s - %2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2606
+#: src/frontend/mame/ui/selmenu.cpp:2615
 msgid "Press any key to continue."
 msgstr "Trykk på enhver knapp for å fortsette."
 
-#: src/frontend/mame/ui/selmenu.cpp:2735
+#: src/frontend/mame/ui/selmenu.cpp:2744
 msgid "General Info"
 msgstr "Generell info"
 
-#: src/frontend/mame/ui/selmenu.cpp:2887
+#: src/frontend/mame/ui/selmenu.cpp:2896
 #, c-format
 msgid "Romset\t%1$s\n"
 msgstr "ROM-sett\t%1$s\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2888
+#: src/frontend/mame/ui/selmenu.cpp:2897
 #, c-format
 msgid "Year\t%1$s\n"
 msgstr "År\t%1$s\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2889
+#: src/frontend/mame/ui/selmenu.cpp:2898
 #, c-format
 msgid "Manufacturer\t%1$s\n"
 msgstr "Produsent\t%1$s\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2896
+#: src/frontend/mame/ui/selmenu.cpp:2905
 #, c-format
 msgid "Driver is Clone of\t%1$s\n"
 msgstr "Driveren er klone av\t%1$s\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2901
+#: src/frontend/mame/ui/selmenu.cpp:2910
 msgid "Driver is Parent\t\n"
 msgstr "Driveren er overordnet\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2905
+#: src/frontend/mame/ui/selmenu.cpp:2914
 msgid "Analog Controls\tYes\n"
 msgstr "Analog styring\tJa\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2907
+#: src/frontend/mame/ui/selmenu.cpp:2916
 msgid "Keyboard Inputs\tYes\n"
 msgstr "Tastaturinndata\tJa\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2910
+#: src/frontend/mame/ui/selmenu.cpp:2919
 msgid "Overall\tNOT WORKING\n"
 msgstr "Alt i alt\tVIRKER IKKE\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2912
+#: src/frontend/mame/ui/selmenu.cpp:2921
 msgid "Overall\tUnemulated Protection\n"
 msgstr "Alt i alt\tUemulert beskyttelse\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2914
+#: src/frontend/mame/ui/selmenu.cpp:2923
 msgid "Overall\tWorking\n"
 msgstr "Alt i alt\tFungerer\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2917
+#: src/frontend/mame/ui/selmenu.cpp:2926
 msgid "Graphics\tUnimplemented\n"
 msgstr "Grafikk\tIkke implementer\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2919
+#: src/frontend/mame/ui/selmenu.cpp:2928
 msgid "Graphics\tWrong Colors\n"
 msgstr "Grafikk\tFeil farger\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2921
+#: src/frontend/mame/ui/selmenu.cpp:2930
 msgid "Graphics\tImperfect Colors\n"
 msgstr "Grafikk\tNoen fargeproblemer\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2923
+#: src/frontend/mame/ui/selmenu.cpp:2932
 msgid "Graphics\tImperfect\n"
 msgstr "Grafikk\tIkke perfekt\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2925
+#: src/frontend/mame/ui/selmenu.cpp:2934
 msgid "Graphics\tOK\n"
 msgstr "Grafikk\tOK\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2928
+#: src/frontend/mame/ui/selmenu.cpp:2937
 msgid "Sound\tNone\n"
 msgstr "Lyd\tIngen\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2930
+#: src/frontend/mame/ui/selmenu.cpp:2939
 msgid "Sound\tUnimplemented\n"
 msgstr "Lyd\tIkke implementer\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2932
+#: src/frontend/mame/ui/selmenu.cpp:2941
 msgid "Sound\tImperfect\n"
 msgstr "Lyd\tIkke perfekt\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2934
+#: src/frontend/mame/ui/selmenu.cpp:2943
 msgid "Sound\tOK\n"
 msgstr "Lyd\tOK\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2937
+#: src/frontend/mame/ui/selmenu.cpp:2946
 msgid "Capture\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2939
+#: src/frontend/mame/ui/selmenu.cpp:2948
 msgid "Capture\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2942
+#: src/frontend/mame/ui/selmenu.cpp:2951
 msgid "Camera\tUnimplemented\n"
 msgstr "Kamera\tIkke implementert\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2944
+#: src/frontend/mame/ui/selmenu.cpp:2953
 msgid "Camera\tImperfect\n"
 msgstr "Kamera\tIkke perfekt\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2947
+#: src/frontend/mame/ui/selmenu.cpp:2956
 msgid "Microphone\tUnimplemented\n"
 msgstr "Mikrofon\tIkke implementert\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2949
+#: src/frontend/mame/ui/selmenu.cpp:2958
 msgid "Microphone\tImperfect\n"
 msgstr "Mikrofon\tIkke perfekt\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2952
+#: src/frontend/mame/ui/selmenu.cpp:2961
 msgid "Controls\tUnimplemented\n"
 msgstr "Kontrollere\tIkke implementert\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2954
+#: src/frontend/mame/ui/selmenu.cpp:2963
 msgid "Controls\tImperfect\n"
 msgstr "Kontrollere\tIkke perfekt\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2957
+#: src/frontend/mame/ui/selmenu.cpp:2966
 msgid "Keyboard\tUnimplemented\n"
 msgstr "Tastatur\tIkke implementert\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2959
+#: src/frontend/mame/ui/selmenu.cpp:2968
 msgid "Keyboard\tImperfect\n"
 msgstr "Tastatur\tIkke perfekt\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2962
+#: src/frontend/mame/ui/selmenu.cpp:2971
 msgid "Mouse\tUnimplemented\n"
 msgstr "Mus\tIkke implementert\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2964
+#: src/frontend/mame/ui/selmenu.cpp:2973
 msgid "Mouse\tImperfect\n"
 msgstr "Mus\tIkke perfekt\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2967
+#: src/frontend/mame/ui/selmenu.cpp:2976
 msgid "Media\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2969
+#: src/frontend/mame/ui/selmenu.cpp:2978
 msgid "Media\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2972
+#: src/frontend/mame/ui/selmenu.cpp:2981
 msgid "Disk\tUnimplemented\n"
 msgstr "Disk\tIkke implementert\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2974
+#: src/frontend/mame/ui/selmenu.cpp:2983
 msgid "Disk\tImperfect\n"
 msgstr "Disk\tIkke perfekt\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2977
+#: src/frontend/mame/ui/selmenu.cpp:2986
 msgid "Printer\tUnimplemented\n"
 msgstr "Skriver\tIkke implementert\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2979
+#: src/frontend/mame/ui/selmenu.cpp:2988
 msgid "Printer\tImperfect\n"
 msgstr "Skriver\tIkke perfekt\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2982
+#: src/frontend/mame/ui/selmenu.cpp:2991
 msgid "Mag. Tape\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2984
+#: src/frontend/mame/ui/selmenu.cpp:2993
 msgid "Mag. Tape\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2987
+#: src/frontend/mame/ui/selmenu.cpp:2996
 msgid "Punch Tape\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2989
+#: src/frontend/mame/ui/selmenu.cpp:2998
 msgid "Punch Tape\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2992
+#: src/frontend/mame/ui/selmenu.cpp:3001
 msgid "Mag. Drum\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2994
+#: src/frontend/mame/ui/selmenu.cpp:3003
 msgid "Mag. Drum\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2997
+#: src/frontend/mame/ui/selmenu.cpp:3006
 msgid "(EP)ROM\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2999
+#: src/frontend/mame/ui/selmenu.cpp:3008
 msgid "(EP)ROM\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3002
+#: src/frontend/mame/ui/selmenu.cpp:3011
 msgid "Communications\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3004
+#: src/frontend/mame/ui/selmenu.cpp:3013
 msgid "Communications\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3007
+#: src/frontend/mame/ui/selmenu.cpp:3016
 msgid "LAN\tUnimplemented\n"
 msgstr "LAN\tIkke implementert\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3009
+#: src/frontend/mame/ui/selmenu.cpp:3018
 msgid "LAN\tImperfect\n"
 msgstr "LAN\tIkke perfekt\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3012
+#: src/frontend/mame/ui/selmenu.cpp:3021
 msgid "WAN\tUnimplemented\n"
 msgstr "WAN\tIkke implementert\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3014
+#: src/frontend/mame/ui/selmenu.cpp:3023
 msgid "WAN\tImperfect\n"
 msgstr "WAN\tIkke perfekt\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3017
+#: src/frontend/mame/ui/selmenu.cpp:3026
 msgid "Timing\tUnimplemented\n"
 msgstr "Timing\tIkke implementert\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3019
+#: src/frontend/mame/ui/selmenu.cpp:3028
 msgid "Timing\tImperfect\n"
 msgstr "Timing\tIkke perfekt\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3021
+#: src/frontend/mame/ui/selmenu.cpp:3030
 msgid "Mechanical Machine\tYes\n"
 msgstr "Mekanisk maskin\tJa\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3021
+#: src/frontend/mame/ui/selmenu.cpp:3030
 msgid "Mechanical Machine\tNo\n"
 msgstr "Mekanisk maskin\tNei\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3022
+#: src/frontend/mame/ui/selmenu.cpp:3031
 msgid "Requires Artwork\tYes\n"
 msgstr "Krever kunstverk\tJa\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3022
+#: src/frontend/mame/ui/selmenu.cpp:3031
 msgid "Requires Artwork\tNo\n"
 msgstr "Krever kunstverk\tNei\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3023
+#: src/frontend/mame/ui/selmenu.cpp:3032
 msgid "Requires Clickable Artwork\tYes\n"
 msgstr "Krever klikkbare kunstverk\tJa\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3023
+#: src/frontend/mame/ui/selmenu.cpp:3032
 msgid "Requires Clickable Artwork\tNo\n"
 msgstr "Krever klikkbare kunstverk\tNei\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3025
+#: src/frontend/mame/ui/selmenu.cpp:3034
 msgid "Support Cocktail\tNo\n"
 msgstr "Støtter Cocktail\tNei\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3026
+#: src/frontend/mame/ui/selmenu.cpp:3035
 msgid "Driver is BIOS\tYes\n"
 msgstr "Driveren er BIOS\tJa\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3026
+#: src/frontend/mame/ui/selmenu.cpp:3035
 msgid "Driver is BIOS\tNo\n"
 msgstr "Driveren er BIOS\tNei\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3027
+#: src/frontend/mame/ui/selmenu.cpp:3036
 msgid "Support Save\tYes\n"
 msgstr "Støtter lagring\tJa\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3027
+#: src/frontend/mame/ui/selmenu.cpp:3036
 msgid "Support Save\tNo\n"
 msgstr "Støtter lagring\tNei\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3028
+#: src/frontend/mame/ui/selmenu.cpp:3037
 msgid "Screen Orientation\tVertical\n"
 msgstr "Skjermposisjonering\tLoddrett\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3028
+#: src/frontend/mame/ui/selmenu.cpp:3037
 msgid "Screen Orientation\tHorizontal\n"
 msgstr "Skjermposisjonering\tVannrett\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3038
+#: src/frontend/mame/ui/selmenu.cpp:3047
 msgid "Requires CHD\tYes\n"
 msgstr "Krever CHD\tJa\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3038
+#: src/frontend/mame/ui/selmenu.cpp:3047
 msgid "Requires CHD\tNo\n"
 msgstr "Krever CHD\tNei\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3051
-msgid "ROM Audit Result\tOK\n"
-msgstr "ROM-undersøkelsesresultat\tOK\n"
+#: src/frontend/mame/ui/selmenu.cpp:3060
+msgid "Media Audit Result\tOK\n"
+msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3053
-msgid "ROM Audit Result\tBAD\n"
-msgstr "ROM-undersøkelsesresultat\tDÅRLIG\n"
+#: src/frontend/mame/ui/selmenu.cpp:3062
+msgid "Media Audit Result\tBAD\n"
+msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3056
+#: src/frontend/mame/ui/selmenu.cpp:3065
 msgid "Samples Audit Result\tNone Needed\n"
 msgstr "Samplingsundersøkelsesresultat\tIkke nødvendig\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3058
+#: src/frontend/mame/ui/selmenu.cpp:3067
 msgid "Samples Audit Result\tOK\n"
 msgstr ""
 "Samplingsundersøkelsesresultat\n"
 "OK\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3060
+#: src/frontend/mame/ui/selmenu.cpp:3069
 msgid "Samples Audit Result\tBAD\n"
 msgstr "Samplingsundersøkelsesresultat\tDÅRLIG\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3064
+#: src/frontend/mame/ui/selmenu.cpp:3073
 msgid ""
-"ROM Audit \tDisabled\n"
-"Samples Audit \tDisabled\n"
+"Media Audit\tDisabled\n"
+"Samples Audit\tDisabled\n"
 msgstr ""
-"ROM-undersøkelse \tSkrudd av\n"
-"Samplingsundersøkelse \tSkrudd av\n"
 
-#: src/frontend/mame/ui/sndmenu.cpp:150
+#: src/frontend/mame/ui/sndmenu.cpp:146
 msgid "Sound"
 msgstr "Lyd"
 
-#: src/frontend/mame/ui/sndmenu.cpp:151
+#: src/frontend/mame/ui/sndmenu.cpp:147
 msgid "Compressor"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:152
+#: src/frontend/mame/ui/sndmenu.cpp:148
 msgid "Sample Rate"
 msgstr "Samplingsfrekvens"
 
-#: src/frontend/mame/ui/sndmenu.cpp:153
+#: src/frontend/mame/ui/sndmenu.cpp:149
 msgid "Use External Samples"
 msgstr "Bruk eksterne samplinger"
 
@@ -3199,21 +3199,21 @@ msgstr "* Video:\n"
 msgid "  Screen '%1$s': Vector\n"
 msgstr "  Skjerm '%1$s': Vektor\n"
 
-#: src/frontend/mame/ui/devopt.cpp:132
+#: src/frontend/mame/ui/devopt.cpp:135
 #, c-format
 msgid "  Screen '%1$s': %2$d × %3$d (V) %4$s Hz\n"
 msgstr "  Skjerm '%1$s': %2$d × %3$d (V) %4$s Hz\n"
 
-#: src/frontend/mame/ui/devopt.cpp:133
+#: src/frontend/mame/ui/devopt.cpp:136
 #, c-format
 msgid "  Screen '%1$s': %2$d × %3$d (H) %4$s Hz\n"
 msgstr "  Skjerm '%1$s': %2$d × %3$d (H) %4$s Hz\n"
 
-#: src/frontend/mame/ui/devopt.cpp:147
+#: src/frontend/mame/ui/devopt.cpp:150
 msgid "* Sound:\n"
 msgstr "* Lyd:\n"
 
-#: src/frontend/mame/ui/devopt.cpp:211
+#: src/frontend/mame/ui/devopt.cpp:214
 #, c-format
 msgid ""
 "* BIOS settings:\n"
@@ -3222,490 +3222,660 @@ msgstr ""
 "* BIOS-innstillinger:\n"
 "  %1$d innstillinger    [forvalg: %2$s]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:255 src/frontend/mame/ui/devopt.cpp:271
-#: src/frontend/mame/ui/devopt.cpp:332
+#: src/frontend/mame/ui/devopt.cpp:258 src/frontend/mame/ui/devopt.cpp:274
+#: src/frontend/mame/ui/devopt.cpp:335
 #, c-format
 msgid "  %1$s    [default: %2$s]\n"
 msgstr "  %1$s    [forvalg: %2$s]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:260 src/frontend/mame/ui/devopt.cpp:276
+#: src/frontend/mame/ui/devopt.cpp:263 src/frontend/mame/ui/devopt.cpp:279
 #, c-format
 msgid "  %1$s\n"
 msgstr "  %1$s\n"
 
-#: src/frontend/mame/ui/devopt.cpp:282
+#: src/frontend/mame/ui/devopt.cpp:285
 msgid "* DIP switch settings:\n"
 msgstr "* DIP-bryterinnstillinger:\n"
 
-#: src/frontend/mame/ui/devopt.cpp:287
+#: src/frontend/mame/ui/devopt.cpp:290
 msgid "* Configuration settings:\n"
 msgstr "* Oppsettsinnstillinger:\n"
 
-#: src/frontend/mame/ui/devopt.cpp:291
+#: src/frontend/mame/ui/devopt.cpp:294
 msgid "* Input device(s):\n"
 msgstr "* Inndatainnstillinger(s):\n"
 
-#: src/frontend/mame/ui/devopt.cpp:293
+#: src/frontend/mame/ui/devopt.cpp:296
 #, c-format
 msgid "  User inputs    [%1$d inputs]\n"
 msgstr "  Brukerinndata    [%1$d inndata]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:295
+#: src/frontend/mame/ui/devopt.cpp:298
 #, c-format
 msgid "  Mahjong inputs    [%1$d inputs]\n"
 msgstr "  Mahjong-inndata    [%1$d inndata]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:297
+#: src/frontend/mame/ui/devopt.cpp:300
 #, c-format
 msgid "  Hanafuda inputs    [%1$d inputs]\n"
 msgstr "  Hanafuda-inndata    [%1$d inndata]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:299
+#: src/frontend/mame/ui/devopt.cpp:302
 #, c-format
 msgid "  Gambling inputs    [%1$d inputs]\n"
 msgstr "  Hasardspill-inndata    [%1$d inndata]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:301
+#: src/frontend/mame/ui/devopt.cpp:304
 #, c-format
 msgid "  Analog inputs    [%1$d inputs]\n"
 msgstr "  Analoge inndata    [%1$d inndata]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:303
+#: src/frontend/mame/ui/devopt.cpp:306
 #, c-format
 msgid "  Adjuster inputs    [%1$d inputs]\n"
 msgstr "  Justerer-inndata    [%1$d inndata]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:305
+#: src/frontend/mame/ui/devopt.cpp:308
 #, c-format
 msgid "  Keypad inputs    [%1$d inputs]\n"
 msgstr "  Tastefelt-inndata    [%1$d inndata]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:307
+#: src/frontend/mame/ui/devopt.cpp:310
 #, c-format
 msgid "  Keyboard inputs    [%1$d inputs]\n"
 msgstr "  Tastaturinndata    [%1$d inndata]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:312
+#: src/frontend/mame/ui/devopt.cpp:315
 msgid "* Media Options:\n"
 msgstr "* Medieinnstillinger:\n"
 
-#: src/frontend/mame/ui/devopt.cpp:317
+#: src/frontend/mame/ui/devopt.cpp:320
 #, c-format
 msgid "  %1$s    [tag: %2$s]\n"
 msgstr "  %1$s    [merking: %2$s]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:327
+#: src/frontend/mame/ui/devopt.cpp:330
 msgid "* Slot Options:\n"
 msgstr "* Feltinnstillinger:\n"
 
-#: src/frontend/mame/ui/devopt.cpp:341
+#: src/frontend/mame/ui/devopt.cpp:344
 msgid "[None]\n"
 msgstr "[Ingen]\n"
 
-#: src/emu/render.cpp:1847
+#: src/emu/render.cpp:1796
 #, c-format
 msgctxt "view-name"
 msgid "Screen %1$u Standard (%2$u:%3$u)"
 msgstr ""
 
-#: src/emu/render.cpp:1873
+#: src/emu/render.cpp:1822
 #, c-format
 msgctxt "view-name"
 msgid "Screen %1$u Pixel Aspect (%2$u:%3$u)"
 msgstr ""
 
-#: src/emu/render.cpp:1895 src/emu/render.cpp:2030
+#: src/emu/render.cpp:1844 src/emu/render.cpp:1979
 msgctxt "view-name"
 msgid "Cocktail"
 msgstr ""
 
-#: src/emu/render.cpp:2015
+#: src/emu/render.cpp:1964
 msgctxt "view-name"
 msgid "Left-to-Right"
 msgstr ""
 
-#: src/emu/render.cpp:2016
+#: src/emu/render.cpp:1965
 msgctxt "view-name"
 msgid "Left-to-Right (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2017
+#: src/emu/render.cpp:1966
 msgctxt "view-name"
 msgid "Top-to-Bottom"
 msgstr ""
 
-#: src/emu/render.cpp:2018
+#: src/emu/render.cpp:1967
 msgctxt "view-name"
 msgid "Top-to-Bottom (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2069
+#: src/emu/render.cpp:2018
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Left-to-Right, Top-to-Bottom"
 msgstr ""
 
-#: src/emu/render.cpp:2078
+#: src/emu/render.cpp:2027
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Left-to-Right, Top-to-Bottom (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2087
+#: src/emu/render.cpp:2036
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Top-to-Bottom, Left-to-Right"
 msgstr ""
 
-#: src/emu/render.cpp:2096
+#: src/emu/render.cpp:2045
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Top-to-Bottom, Left-to-Right (Gapless)"
 msgstr ""
 
-#: src/emu/inpttype.ipp:22
+#: src/emu/ioport.cpp:332
+#, c-format
 msgctxt "input-name"
-msgid "P1 Up"
+msgid "P%1$u"
 msgstr ""
 
-#: src/emu/inpttype.ipp:23
+#: src/emu/ioport.cpp:1924
 msgctxt "input-name"
-msgid "P1 Down"
+msgid "???"
 msgstr ""
 
-#: src/emu/inpttype.ipp:24
+#: src/emu/inpttype.ipp:22 src/emu/inpttype.ipp:140 src/emu/inpttype.ipp:221
+#: src/emu/inpttype.ipp:255 src/emu/inpttype.ipp:289 src/emu/inpttype.ipp:323
+#: src/emu/inpttype.ipp:357 src/emu/inpttype.ipp:391 src/emu/inpttype.ipp:425
+#: src/emu/inpttype.ipp:459
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left"
+msgid "%p Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:25
+#: src/emu/inpttype.ipp:23 src/emu/inpttype.ipp:141 src/emu/inpttype.ipp:222
+#: src/emu/inpttype.ipp:256 src/emu/inpttype.ipp:290 src/emu/inpttype.ipp:324
+#: src/emu/inpttype.ipp:358 src/emu/inpttype.ipp:392 src/emu/inpttype.ipp:426
+#: src/emu/inpttype.ipp:460
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right"
+msgid "%p Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:26
+#: src/emu/inpttype.ipp:24 src/emu/inpttype.ipp:142 src/emu/inpttype.ipp:223
+#: src/emu/inpttype.ipp:257 src/emu/inpttype.ipp:291 src/emu/inpttype.ipp:325
+#: src/emu/inpttype.ipp:359 src/emu/inpttype.ipp:393 src/emu/inpttype.ipp:427
+#: src/emu/inpttype.ipp:461
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Up"
+msgid "%p Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:27
+#: src/emu/inpttype.ipp:25 src/emu/inpttype.ipp:143 src/emu/inpttype.ipp:224
+#: src/emu/inpttype.ipp:258 src/emu/inpttype.ipp:292 src/emu/inpttype.ipp:326
+#: src/emu/inpttype.ipp:360 src/emu/inpttype.ipp:394 src/emu/inpttype.ipp:428
+#: src/emu/inpttype.ipp:462
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Down"
+msgid "%p Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:28
+#: src/emu/inpttype.ipp:26 src/emu/inpttype.ipp:144 src/emu/inpttype.ipp:225
+#: src/emu/inpttype.ipp:259 src/emu/inpttype.ipp:293 src/emu/inpttype.ipp:327
+#: src/emu/inpttype.ipp:361 src/emu/inpttype.ipp:395 src/emu/inpttype.ipp:429
+#: src/emu/inpttype.ipp:463
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Left"
+msgid "%p Right Stick/Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:29
+#: src/emu/inpttype.ipp:27 src/emu/inpttype.ipp:145 src/emu/inpttype.ipp:226
+#: src/emu/inpttype.ipp:260 src/emu/inpttype.ipp:294 src/emu/inpttype.ipp:328
+#: src/emu/inpttype.ipp:362 src/emu/inpttype.ipp:396 src/emu/inpttype.ipp:430
+#: src/emu/inpttype.ipp:464
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Right"
+msgid "%p Right Stick/Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:30
+#: src/emu/inpttype.ipp:28 src/emu/inpttype.ipp:146 src/emu/inpttype.ipp:227
+#: src/emu/inpttype.ipp:261 src/emu/inpttype.ipp:295 src/emu/inpttype.ipp:329
+#: src/emu/inpttype.ipp:363 src/emu/inpttype.ipp:397 src/emu/inpttype.ipp:431
+#: src/emu/inpttype.ipp:465
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Up"
+msgid "%p Right Stick/Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:31
+#: src/emu/inpttype.ipp:29 src/emu/inpttype.ipp:147 src/emu/inpttype.ipp:228
+#: src/emu/inpttype.ipp:262 src/emu/inpttype.ipp:296 src/emu/inpttype.ipp:330
+#: src/emu/inpttype.ipp:364 src/emu/inpttype.ipp:398 src/emu/inpttype.ipp:432
+#: src/emu/inpttype.ipp:466
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Down"
+msgid "%p Right Stick/Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:32
+#: src/emu/inpttype.ipp:30 src/emu/inpttype.ipp:148 src/emu/inpttype.ipp:229
+#: src/emu/inpttype.ipp:263 src/emu/inpttype.ipp:297 src/emu/inpttype.ipp:331
+#: src/emu/inpttype.ipp:365 src/emu/inpttype.ipp:399 src/emu/inpttype.ipp:433
+#: src/emu/inpttype.ipp:467
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Left"
+msgid "%p Left Stick/Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:33
+#: src/emu/inpttype.ipp:31 src/emu/inpttype.ipp:149 src/emu/inpttype.ipp:230
+#: src/emu/inpttype.ipp:264 src/emu/inpttype.ipp:298 src/emu/inpttype.ipp:332
+#: src/emu/inpttype.ipp:366 src/emu/inpttype.ipp:400 src/emu/inpttype.ipp:434
+#: src/emu/inpttype.ipp:468
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Right"
+msgid "%p Left Stick/Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:34
+#: src/emu/inpttype.ipp:32 src/emu/inpttype.ipp:150 src/emu/inpttype.ipp:231
+#: src/emu/inpttype.ipp:265 src/emu/inpttype.ipp:299 src/emu/inpttype.ipp:333
+#: src/emu/inpttype.ipp:367 src/emu/inpttype.ipp:401 src/emu/inpttype.ipp:435
+#: src/emu/inpttype.ipp:469
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 1"
+msgid "%p Left Stick/Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:35
+#: src/emu/inpttype.ipp:33 src/emu/inpttype.ipp:151 src/emu/inpttype.ipp:232
+#: src/emu/inpttype.ipp:266 src/emu/inpttype.ipp:300 src/emu/inpttype.ipp:334
+#: src/emu/inpttype.ipp:368 src/emu/inpttype.ipp:402 src/emu/inpttype.ipp:436
+#: src/emu/inpttype.ipp:470
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 2"
+msgid "%p Left Stick/Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:36
+#: src/emu/inpttype.ipp:34 src/emu/inpttype.ipp:152 src/emu/inpttype.ipp:233
+#: src/emu/inpttype.ipp:267 src/emu/inpttype.ipp:301 src/emu/inpttype.ipp:335
+#: src/emu/inpttype.ipp:369 src/emu/inpttype.ipp:403 src/emu/inpttype.ipp:437
+#: src/emu/inpttype.ipp:471
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 3"
+msgid "%p Button 1"
 msgstr ""
 
-#: src/emu/inpttype.ipp:37
+#: src/emu/inpttype.ipp:35 src/emu/inpttype.ipp:153 src/emu/inpttype.ipp:234
+#: src/emu/inpttype.ipp:268 src/emu/inpttype.ipp:302 src/emu/inpttype.ipp:336
+#: src/emu/inpttype.ipp:370 src/emu/inpttype.ipp:404 src/emu/inpttype.ipp:438
+#: src/emu/inpttype.ipp:472
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 4"
+msgid "%p Button 2"
 msgstr ""
 
-#: src/emu/inpttype.ipp:38
+#: src/emu/inpttype.ipp:36 src/emu/inpttype.ipp:154 src/emu/inpttype.ipp:235
+#: src/emu/inpttype.ipp:269 src/emu/inpttype.ipp:303 src/emu/inpttype.ipp:337
+#: src/emu/inpttype.ipp:371 src/emu/inpttype.ipp:405 src/emu/inpttype.ipp:439
+#: src/emu/inpttype.ipp:473
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 5"
+msgid "%p Button 3"
 msgstr ""
 
-#: src/emu/inpttype.ipp:39
+#: src/emu/inpttype.ipp:37 src/emu/inpttype.ipp:155 src/emu/inpttype.ipp:236
+#: src/emu/inpttype.ipp:270 src/emu/inpttype.ipp:304 src/emu/inpttype.ipp:338
+#: src/emu/inpttype.ipp:372 src/emu/inpttype.ipp:406 src/emu/inpttype.ipp:440
+#: src/emu/inpttype.ipp:474
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 6"
+msgid "%p Button 4"
 msgstr ""
 
-#: src/emu/inpttype.ipp:40
+#: src/emu/inpttype.ipp:38 src/emu/inpttype.ipp:156 src/emu/inpttype.ipp:237
+#: src/emu/inpttype.ipp:271 src/emu/inpttype.ipp:305 src/emu/inpttype.ipp:339
+#: src/emu/inpttype.ipp:373 src/emu/inpttype.ipp:407 src/emu/inpttype.ipp:441
+#: src/emu/inpttype.ipp:475
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 7"
+msgid "%p Button 5"
 msgstr ""
 
-#: src/emu/inpttype.ipp:41
+#: src/emu/inpttype.ipp:39 src/emu/inpttype.ipp:157 src/emu/inpttype.ipp:238
+#: src/emu/inpttype.ipp:272 src/emu/inpttype.ipp:306 src/emu/inpttype.ipp:340
+#: src/emu/inpttype.ipp:374 src/emu/inpttype.ipp:408 src/emu/inpttype.ipp:442
+#: src/emu/inpttype.ipp:476
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 8"
+msgid "%p Button 6"
 msgstr ""
 
-#: src/emu/inpttype.ipp:42
+#: src/emu/inpttype.ipp:40 src/emu/inpttype.ipp:158 src/emu/inpttype.ipp:239
+#: src/emu/inpttype.ipp:273 src/emu/inpttype.ipp:307 src/emu/inpttype.ipp:341
+#: src/emu/inpttype.ipp:375 src/emu/inpttype.ipp:409 src/emu/inpttype.ipp:443
+#: src/emu/inpttype.ipp:477
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 9"
+msgid "%p Button 7"
 msgstr ""
 
-#: src/emu/inpttype.ipp:43
+#: src/emu/inpttype.ipp:41 src/emu/inpttype.ipp:159 src/emu/inpttype.ipp:240
+#: src/emu/inpttype.ipp:274 src/emu/inpttype.ipp:308 src/emu/inpttype.ipp:342
+#: src/emu/inpttype.ipp:376 src/emu/inpttype.ipp:410 src/emu/inpttype.ipp:444
+#: src/emu/inpttype.ipp:478
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 10"
+msgid "%p Button 8"
 msgstr ""
 
-#: src/emu/inpttype.ipp:44
+#: src/emu/inpttype.ipp:42 src/emu/inpttype.ipp:160 src/emu/inpttype.ipp:241
+#: src/emu/inpttype.ipp:275 src/emu/inpttype.ipp:309 src/emu/inpttype.ipp:343
+#: src/emu/inpttype.ipp:377 src/emu/inpttype.ipp:411 src/emu/inpttype.ipp:445
+#: src/emu/inpttype.ipp:479
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 11"
+msgid "%p Button 9"
 msgstr ""
 
-#: src/emu/inpttype.ipp:45
+#: src/emu/inpttype.ipp:43 src/emu/inpttype.ipp:161 src/emu/inpttype.ipp:242
+#: src/emu/inpttype.ipp:276 src/emu/inpttype.ipp:310 src/emu/inpttype.ipp:344
+#: src/emu/inpttype.ipp:378 src/emu/inpttype.ipp:412 src/emu/inpttype.ipp:446
+#: src/emu/inpttype.ipp:480
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 12"
+msgid "%p Button 10"
 msgstr ""
 
-#: src/emu/inpttype.ipp:46
+#: src/emu/inpttype.ipp:44 src/emu/inpttype.ipp:162 src/emu/inpttype.ipp:243
+#: src/emu/inpttype.ipp:277 src/emu/inpttype.ipp:311 src/emu/inpttype.ipp:345
+#: src/emu/inpttype.ipp:379 src/emu/inpttype.ipp:413 src/emu/inpttype.ipp:447
+#: src/emu/inpttype.ipp:481
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 13"
+msgid "%p Button 11"
 msgstr ""
 
-#: src/emu/inpttype.ipp:47
+#: src/emu/inpttype.ipp:45 src/emu/inpttype.ipp:163 src/emu/inpttype.ipp:244
+#: src/emu/inpttype.ipp:278 src/emu/inpttype.ipp:312 src/emu/inpttype.ipp:346
+#: src/emu/inpttype.ipp:380 src/emu/inpttype.ipp:414 src/emu/inpttype.ipp:448
+#: src/emu/inpttype.ipp:482
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 14"
+msgid "%p Button 12"
 msgstr ""
 
-#: src/emu/inpttype.ipp:48
+#: src/emu/inpttype.ipp:46 src/emu/inpttype.ipp:164 src/emu/inpttype.ipp:245
+#: src/emu/inpttype.ipp:279 src/emu/inpttype.ipp:313 src/emu/inpttype.ipp:347
+#: src/emu/inpttype.ipp:381 src/emu/inpttype.ipp:415 src/emu/inpttype.ipp:449
+#: src/emu/inpttype.ipp:483
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 15"
+msgid "%p Button 13"
 msgstr ""
 
-#: src/emu/inpttype.ipp:49
+#: src/emu/inpttype.ipp:47 src/emu/inpttype.ipp:165 src/emu/inpttype.ipp:246
+#: src/emu/inpttype.ipp:280 src/emu/inpttype.ipp:314 src/emu/inpttype.ipp:348
+#: src/emu/inpttype.ipp:382 src/emu/inpttype.ipp:416 src/emu/inpttype.ipp:450
+#: src/emu/inpttype.ipp:484
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 16"
+msgid "%p Button 14"
 msgstr ""
 
-#: src/emu/inpttype.ipp:50
+#: src/emu/inpttype.ipp:48 src/emu/inpttype.ipp:166 src/emu/inpttype.ipp:247
+#: src/emu/inpttype.ipp:281 src/emu/inpttype.ipp:315 src/emu/inpttype.ipp:349
+#: src/emu/inpttype.ipp:383 src/emu/inpttype.ipp:417 src/emu/inpttype.ipp:451
+#: src/emu/inpttype.ipp:485
+#, c-format
 msgctxt "input-name"
-msgid "P1 Start"
+msgid "%p Button 15"
 msgstr ""
 
-#: src/emu/inpttype.ipp:51
+#: src/emu/inpttype.ipp:49 src/emu/inpttype.ipp:167 src/emu/inpttype.ipp:248
+#: src/emu/inpttype.ipp:282 src/emu/inpttype.ipp:316 src/emu/inpttype.ipp:350
+#: src/emu/inpttype.ipp:384 src/emu/inpttype.ipp:418 src/emu/inpttype.ipp:452
+#: src/emu/inpttype.ipp:486
+#, c-format
 msgctxt "input-name"
-msgid "P1 Select"
+msgid "%p Button 16"
 msgstr ""
 
-#: src/emu/inpttype.ipp:56
+#: src/emu/inpttype.ipp:50 src/emu/inpttype.ipp:168 src/emu/inpttype.ipp:249
+#: src/emu/inpttype.ipp:283 src/emu/inpttype.ipp:317 src/emu/inpttype.ipp:351
+#: src/emu/inpttype.ipp:385 src/emu/inpttype.ipp:419 src/emu/inpttype.ipp:453
+#: src/emu/inpttype.ipp:487
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong A"
+msgid "%p Start"
 msgstr ""
 
-#: src/emu/inpttype.ipp:57
+#: src/emu/inpttype.ipp:51 src/emu/inpttype.ipp:169 src/emu/inpttype.ipp:250
+#: src/emu/inpttype.ipp:284 src/emu/inpttype.ipp:318 src/emu/inpttype.ipp:352
+#: src/emu/inpttype.ipp:386 src/emu/inpttype.ipp:420 src/emu/inpttype.ipp:454
+#: src/emu/inpttype.ipp:488
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong B"
+msgid "%p Select"
 msgstr ""
 
-#: src/emu/inpttype.ipp:58
+#: src/emu/inpttype.ipp:56 src/emu/inpttype.ipp:174
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong C"
+msgid "%p Mahjong A"
 msgstr ""
 
-#: src/emu/inpttype.ipp:59
+#: src/emu/inpttype.ipp:57 src/emu/inpttype.ipp:175
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong D"
+msgid "%p Mahjong B"
 msgstr ""
 
-#: src/emu/inpttype.ipp:60
+#: src/emu/inpttype.ipp:58 src/emu/inpttype.ipp:176
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong E"
+msgid "%p Mahjong C"
 msgstr ""
 
-#: src/emu/inpttype.ipp:61
+#: src/emu/inpttype.ipp:59 src/emu/inpttype.ipp:177
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong F"
+msgid "%p Mahjong D"
 msgstr ""
 
-#: src/emu/inpttype.ipp:62
+#: src/emu/inpttype.ipp:60 src/emu/inpttype.ipp:178
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong G"
+msgid "%p Mahjong E"
 msgstr ""
 
-#: src/emu/inpttype.ipp:63
+#: src/emu/inpttype.ipp:61 src/emu/inpttype.ipp:179
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong H"
+msgid "%p Mahjong F"
 msgstr ""
 
-#: src/emu/inpttype.ipp:64
+#: src/emu/inpttype.ipp:62 src/emu/inpttype.ipp:180
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong I"
+msgid "%p Mahjong G"
 msgstr ""
 
-#: src/emu/inpttype.ipp:65
+#: src/emu/inpttype.ipp:63 src/emu/inpttype.ipp:181
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong J"
+msgid "%p Mahjong H"
 msgstr ""
 
-#: src/emu/inpttype.ipp:66
+#: src/emu/inpttype.ipp:64 src/emu/inpttype.ipp:182
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong K"
+msgid "%p Mahjong I"
 msgstr ""
 
-#: src/emu/inpttype.ipp:67
+#: src/emu/inpttype.ipp:65 src/emu/inpttype.ipp:183
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong L"
+msgid "%p Mahjong J"
 msgstr ""
 
-#: src/emu/inpttype.ipp:68
+#: src/emu/inpttype.ipp:66 src/emu/inpttype.ipp:184
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong M"
+msgid "%p Mahjong K"
 msgstr ""
 
-#: src/emu/inpttype.ipp:69
+#: src/emu/inpttype.ipp:67 src/emu/inpttype.ipp:185
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong N"
+msgid "%p Mahjong L"
 msgstr ""
 
-#: src/emu/inpttype.ipp:70
+#: src/emu/inpttype.ipp:68 src/emu/inpttype.ipp:186
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong O"
+msgid "%p Mahjong M"
 msgstr ""
 
-#: src/emu/inpttype.ipp:71
+#: src/emu/inpttype.ipp:69 src/emu/inpttype.ipp:187
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong P"
+msgid "%p Mahjong N"
 msgstr ""
 
-#: src/emu/inpttype.ipp:72
+#: src/emu/inpttype.ipp:70 src/emu/inpttype.ipp:188
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Q"
+msgid "%p Mahjong O"
 msgstr ""
 
-#: src/emu/inpttype.ipp:73
+#: src/emu/inpttype.ipp:71 src/emu/inpttype.ipp:189
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Kan"
+msgid "%p Mahjong P"
 msgstr ""
 
-#: src/emu/inpttype.ipp:74
+#: src/emu/inpttype.ipp:72 src/emu/inpttype.ipp:190
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Pon"
+msgid "%p Mahjong Q"
 msgstr ""
 
-#: src/emu/inpttype.ipp:75
+#: src/emu/inpttype.ipp:73 src/emu/inpttype.ipp:191
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Chi"
+msgid "%p Mahjong Kan"
 msgstr ""
 
-#: src/emu/inpttype.ipp:76
+#: src/emu/inpttype.ipp:74 src/emu/inpttype.ipp:192
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Reach"
+msgid "%p Mahjong Pon"
 msgstr ""
 
-#: src/emu/inpttype.ipp:77
+#: src/emu/inpttype.ipp:75 src/emu/inpttype.ipp:193
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Ron"
+msgid "%p Mahjong Chi"
 msgstr ""
 
-#: src/emu/inpttype.ipp:78
+#: src/emu/inpttype.ipp:76 src/emu/inpttype.ipp:194
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Flip Flop"
+msgid "%p Mahjong Reach"
 msgstr ""
 
-#: src/emu/inpttype.ipp:79
+#: src/emu/inpttype.ipp:77 src/emu/inpttype.ipp:195
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Bet"
+msgid "%p Mahjong Ron"
 msgstr ""
 
-#: src/emu/inpttype.ipp:80
+#: src/emu/inpttype.ipp:78 src/emu/inpttype.ipp:200
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Take Score"
+msgid "%p Mahjong Flip Flop"
 msgstr ""
 
-#: src/emu/inpttype.ipp:81
+#: src/emu/inpttype.ipp:79 src/emu/inpttype.ipp:196
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Double Up"
+msgid "%p Mahjong Bet"
 msgstr ""
 
-#: src/emu/inpttype.ipp:82
+#: src/emu/inpttype.ipp:80 src/emu/inpttype.ipp:198
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Big"
+msgid "%p Mahjong Take Score"
 msgstr ""
 
-#: src/emu/inpttype.ipp:83
+#: src/emu/inpttype.ipp:81 src/emu/inpttype.ipp:199
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Small"
+msgid "%p Mahjong Double Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:84
+#: src/emu/inpttype.ipp:82 src/emu/inpttype.ipp:201
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Last Chance"
+msgid "%p Mahjong Big"
 msgstr ""
 
-#: src/emu/inpttype.ipp:89
+#: src/emu/inpttype.ipp:83 src/emu/inpttype.ipp:202
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda A/1"
+msgid "%p Mahjong Small"
 msgstr ""
 
-#: src/emu/inpttype.ipp:90
+#: src/emu/inpttype.ipp:84 src/emu/inpttype.ipp:197
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda B/2"
+msgid "%p Mahjong Last Chance"
 msgstr ""
 
-#: src/emu/inpttype.ipp:91
+#: src/emu/inpttype.ipp:89 src/emu/inpttype.ipp:207
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda C/3"
+msgid "%p Hanafuda A/1"
 msgstr ""
 
-#: src/emu/inpttype.ipp:92
+#: src/emu/inpttype.ipp:90 src/emu/inpttype.ipp:208
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda D/4"
+msgid "%p Hanafuda B/2"
 msgstr ""
 
-#: src/emu/inpttype.ipp:93
+#: src/emu/inpttype.ipp:91 src/emu/inpttype.ipp:209
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda E/5"
+msgid "%p Hanafuda C/3"
 msgstr ""
 
-#: src/emu/inpttype.ipp:94
+#: src/emu/inpttype.ipp:92 src/emu/inpttype.ipp:210
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda F/6"
+msgid "%p Hanafuda D/4"
 msgstr ""
 
-#: src/emu/inpttype.ipp:95
+#: src/emu/inpttype.ipp:93 src/emu/inpttype.ipp:211
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda G/7"
+msgid "%p Hanafuda E/5"
 msgstr ""
 
-#: src/emu/inpttype.ipp:96
+#: src/emu/inpttype.ipp:94 src/emu/inpttype.ipp:212
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda H/8"
+msgid "%p Hanafuda F/6"
 msgstr ""
 
-#: src/emu/inpttype.ipp:97
+#: src/emu/inpttype.ipp:95 src/emu/inpttype.ipp:213
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda Yes"
+msgid "%p Hanafuda G/7"
 msgstr ""
 
-#: src/emu/inpttype.ipp:98
+#: src/emu/inpttype.ipp:96 src/emu/inpttype.ipp:214
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda No"
+msgid "%p Hanafuda H/8"
+msgstr ""
+
+#: src/emu/inpttype.ipp:97 src/emu/inpttype.ipp:215
+#, c-format
+msgctxt "input-name"
+msgid "%p Hanafuda Yes"
+msgstr ""
+
+#: src/emu/inpttype.ipp:98 src/emu/inpttype.ipp:216
+#, c-format
+msgctxt "input-name"
+msgid "%p Hanafuda No"
 msgstr ""
 
 #: src/emu/inpttype.ipp:103
@@ -3833,1551 +4003,6 @@ msgctxt "input-name"
 msgid "Stop All Reels"
 msgstr ""
 
-#: src/emu/inpttype.ipp:140
-msgctxt "input-name"
-msgid "P2 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:141
-msgctxt "input-name"
-msgid "P2 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:142
-msgctxt "input-name"
-msgid "P2 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:143
-msgctxt "input-name"
-msgid "P2 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:144
-msgctxt "input-name"
-msgid "P2 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:145
-msgctxt "input-name"
-msgid "P2 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:146
-msgctxt "input-name"
-msgid "P2 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:147
-msgctxt "input-name"
-msgid "P2 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:148
-msgctxt "input-name"
-msgid "P2 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:149
-msgctxt "input-name"
-msgid "P2 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:150
-msgctxt "input-name"
-msgid "P2 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:151
-msgctxt "input-name"
-msgid "P2 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:152
-msgctxt "input-name"
-msgid "P2 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:153
-msgctxt "input-name"
-msgid "P2 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:154
-msgctxt "input-name"
-msgid "P2 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:155
-msgctxt "input-name"
-msgid "P2 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:156
-msgctxt "input-name"
-msgid "P2 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:157
-msgctxt "input-name"
-msgid "P2 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:158
-msgctxt "input-name"
-msgid "P2 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:159
-msgctxt "input-name"
-msgid "P2 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:160
-msgctxt "input-name"
-msgid "P2 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:161
-msgctxt "input-name"
-msgid "P2 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:162
-msgctxt "input-name"
-msgid "P2 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:163
-msgctxt "input-name"
-msgid "P2 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:164
-msgctxt "input-name"
-msgid "P2 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:165
-msgctxt "input-name"
-msgid "P2 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:166
-msgctxt "input-name"
-msgid "P2 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:167
-msgctxt "input-name"
-msgid "P2 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:168
-msgctxt "input-name"
-msgid "P2 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:169
-msgctxt "input-name"
-msgid "P2 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:174
-msgctxt "input-name"
-msgid "P2 Mahjong A"
-msgstr ""
-
-#: src/emu/inpttype.ipp:175
-msgctxt "input-name"
-msgid "P2 Mahjong B"
-msgstr ""
-
-#: src/emu/inpttype.ipp:176
-msgctxt "input-name"
-msgid "P2 Mahjong C"
-msgstr ""
-
-#: src/emu/inpttype.ipp:177
-msgctxt "input-name"
-msgid "P2 Mahjong D"
-msgstr ""
-
-#: src/emu/inpttype.ipp:178
-msgctxt "input-name"
-msgid "P2 Mahjong E"
-msgstr ""
-
-#: src/emu/inpttype.ipp:179
-msgctxt "input-name"
-msgid "P2 Mahjong F"
-msgstr ""
-
-#: src/emu/inpttype.ipp:180
-msgctxt "input-name"
-msgid "P2 Mahjong G"
-msgstr ""
-
-#: src/emu/inpttype.ipp:181
-msgctxt "input-name"
-msgid "P2 Mahjong H"
-msgstr ""
-
-#: src/emu/inpttype.ipp:182
-msgctxt "input-name"
-msgid "P2 Mahjong I"
-msgstr ""
-
-#: src/emu/inpttype.ipp:183
-msgctxt "input-name"
-msgid "P2 Mahjong J"
-msgstr ""
-
-#: src/emu/inpttype.ipp:184
-msgctxt "input-name"
-msgid "P2 Mahjong K"
-msgstr ""
-
-#: src/emu/inpttype.ipp:185
-msgctxt "input-name"
-msgid "P2 Mahjong L"
-msgstr ""
-
-#: src/emu/inpttype.ipp:186
-msgctxt "input-name"
-msgid "P2 Mahjong M"
-msgstr ""
-
-#: src/emu/inpttype.ipp:187
-msgctxt "input-name"
-msgid "P2 Mahjong N"
-msgstr ""
-
-#: src/emu/inpttype.ipp:188
-msgctxt "input-name"
-msgid "P2 Mahjong O"
-msgstr ""
-
-#: src/emu/inpttype.ipp:189
-msgctxt "input-name"
-msgid "P2 Mahjong P"
-msgstr ""
-
-#: src/emu/inpttype.ipp:190
-msgctxt "input-name"
-msgid "P2 Mahjong Q"
-msgstr ""
-
-#: src/emu/inpttype.ipp:191
-msgctxt "input-name"
-msgid "P2 Mahjong Kan"
-msgstr ""
-
-#: src/emu/inpttype.ipp:192
-msgctxt "input-name"
-msgid "P2 Mahjong Pon"
-msgstr ""
-
-#: src/emu/inpttype.ipp:193
-msgctxt "input-name"
-msgid "P2 Mahjong Chi"
-msgstr ""
-
-#: src/emu/inpttype.ipp:194
-msgctxt "input-name"
-msgid "P2 Mahjong Reach"
-msgstr ""
-
-#: src/emu/inpttype.ipp:195
-msgctxt "input-name"
-msgid "P2 Mahjong Ron"
-msgstr ""
-
-#: src/emu/inpttype.ipp:196
-msgctxt "input-name"
-msgid "P2 Mahjong Bet"
-msgstr ""
-
-#: src/emu/inpttype.ipp:197
-msgctxt "input-name"
-msgid "P2 Mahjong Last Chance"
-msgstr ""
-
-#: src/emu/inpttype.ipp:198
-msgctxt "input-name"
-msgid "P2 Mahjong Take Score"
-msgstr ""
-
-#: src/emu/inpttype.ipp:199
-msgctxt "input-name"
-msgid "P2 Mahjong Double Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:200
-msgctxt "input-name"
-msgid "P2 Mahjong Flip Flop"
-msgstr ""
-
-#: src/emu/inpttype.ipp:201
-msgctxt "input-name"
-msgid "P2 Mahjong Big"
-msgstr ""
-
-#: src/emu/inpttype.ipp:202
-msgctxt "input-name"
-msgid "P2 Mahjong Small"
-msgstr ""
-
-#: src/emu/inpttype.ipp:207
-msgctxt "input-name"
-msgid "P2 Hanafuda A/1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:208
-msgctxt "input-name"
-msgid "P2 Hanafuda B/2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:209
-msgctxt "input-name"
-msgid "P2 Hanafuda C/3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:210
-msgctxt "input-name"
-msgid "P2 Hanafuda D/4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:211
-msgctxt "input-name"
-msgid "P2 Hanafuda E/5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:212
-msgctxt "input-name"
-msgid "P2 Hanafuda F/6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:213
-msgctxt "input-name"
-msgid "P2 Hanafuda G/7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:214
-msgctxt "input-name"
-msgid "P2 Hanafuda H/8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:215
-msgctxt "input-name"
-msgid "P2 Hanafuda Yes"
-msgstr ""
-
-#: src/emu/inpttype.ipp:216
-msgctxt "input-name"
-msgid "P2 Hanafuda No"
-msgstr ""
-
-#: src/emu/inpttype.ipp:221
-msgctxt "input-name"
-msgid "P3 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:222
-msgctxt "input-name"
-msgid "P3 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:223
-msgctxt "input-name"
-msgid "P3 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:224
-msgctxt "input-name"
-msgid "P3 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:225
-msgctxt "input-name"
-msgid "P3 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:226
-msgctxt "input-name"
-msgid "P3 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:227
-msgctxt "input-name"
-msgid "P3 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:228
-msgctxt "input-name"
-msgid "P3 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:229
-msgctxt "input-name"
-msgid "P3 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:230
-msgctxt "input-name"
-msgid "P3 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:231
-msgctxt "input-name"
-msgid "P3 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:232
-msgctxt "input-name"
-msgid "P3 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:233
-msgctxt "input-name"
-msgid "P3 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:234
-msgctxt "input-name"
-msgid "P3 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:235
-msgctxt "input-name"
-msgid "P3 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:236
-msgctxt "input-name"
-msgid "P3 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:237
-msgctxt "input-name"
-msgid "P3 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:238
-msgctxt "input-name"
-msgid "P3 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:239
-msgctxt "input-name"
-msgid "P3 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:240
-msgctxt "input-name"
-msgid "P3 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:241
-msgctxt "input-name"
-msgid "P3 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:242
-msgctxt "input-name"
-msgid "P3 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:243
-msgctxt "input-name"
-msgid "P3 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:244
-msgctxt "input-name"
-msgid "P3 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:245
-msgctxt "input-name"
-msgid "P3 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:246
-msgctxt "input-name"
-msgid "P3 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:247
-msgctxt "input-name"
-msgid "P3 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:248
-msgctxt "input-name"
-msgid "P3 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:249
-msgctxt "input-name"
-msgid "P3 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:250
-msgctxt "input-name"
-msgid "P3 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:255
-msgctxt "input-name"
-msgid "P4 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:256
-msgctxt "input-name"
-msgid "P4 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:257
-msgctxt "input-name"
-msgid "P4 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:258
-msgctxt "input-name"
-msgid "P4 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:259
-msgctxt "input-name"
-msgid "P4 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:260
-msgctxt "input-name"
-msgid "P4 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:261
-msgctxt "input-name"
-msgid "P4 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:262
-msgctxt "input-name"
-msgid "P4 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:263
-msgctxt "input-name"
-msgid "P4 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:264
-msgctxt "input-name"
-msgid "P4 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:265
-msgctxt "input-name"
-msgid "P4 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:266
-msgctxt "input-name"
-msgid "P4 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:267
-msgctxt "input-name"
-msgid "P4 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:268
-msgctxt "input-name"
-msgid "P4 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:269
-msgctxt "input-name"
-msgid "P4 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:270
-msgctxt "input-name"
-msgid "P4 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:271
-msgctxt "input-name"
-msgid "P4 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:272
-msgctxt "input-name"
-msgid "P4 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:273
-msgctxt "input-name"
-msgid "P4 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:274
-msgctxt "input-name"
-msgid "P4 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:275
-msgctxt "input-name"
-msgid "P4 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:276
-msgctxt "input-name"
-msgid "P4 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:277
-msgctxt "input-name"
-msgid "P4 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:278
-msgctxt "input-name"
-msgid "P4 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:279
-msgctxt "input-name"
-msgid "P4 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:280
-msgctxt "input-name"
-msgid "P4 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:281
-msgctxt "input-name"
-msgid "P4 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:282
-msgctxt "input-name"
-msgid "P4 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:283
-msgctxt "input-name"
-msgid "P4 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:284
-msgctxt "input-name"
-msgid "P4 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:289
-msgctxt "input-name"
-msgid "P5 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:290
-msgctxt "input-name"
-msgid "P5 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:291
-msgctxt "input-name"
-msgid "P5 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:292
-msgctxt "input-name"
-msgid "P5 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:293
-msgctxt "input-name"
-msgid "P5 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:294
-msgctxt "input-name"
-msgid "P5 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:295
-msgctxt "input-name"
-msgid "P5 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:296
-msgctxt "input-name"
-msgid "P5 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:297
-msgctxt "input-name"
-msgid "P5 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:298
-msgctxt "input-name"
-msgid "P5 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:299
-msgctxt "input-name"
-msgid "P5 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:300
-msgctxt "input-name"
-msgid "P5 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:301
-msgctxt "input-name"
-msgid "P5 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:302
-msgctxt "input-name"
-msgid "P5 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:303
-msgctxt "input-name"
-msgid "P5 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:304
-msgctxt "input-name"
-msgid "P5 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:305
-msgctxt "input-name"
-msgid "P5 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:306
-msgctxt "input-name"
-msgid "P5 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:307
-msgctxt "input-name"
-msgid "P5 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:308
-msgctxt "input-name"
-msgid "P5 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:309
-msgctxt "input-name"
-msgid "P5 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:310
-msgctxt "input-name"
-msgid "P5 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:311
-msgctxt "input-name"
-msgid "P5 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:312
-msgctxt "input-name"
-msgid "P5 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:313
-msgctxt "input-name"
-msgid "P5 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:314
-msgctxt "input-name"
-msgid "P5 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:315
-msgctxt "input-name"
-msgid "P5 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:316
-msgctxt "input-name"
-msgid "P5 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:317
-msgctxt "input-name"
-msgid "P5 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:318
-msgctxt "input-name"
-msgid "P5 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:323
-msgctxt "input-name"
-msgid "P6 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:324
-msgctxt "input-name"
-msgid "P6 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:325
-msgctxt "input-name"
-msgid "P6 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:326
-msgctxt "input-name"
-msgid "P6 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:327
-msgctxt "input-name"
-msgid "P6 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:328
-msgctxt "input-name"
-msgid "P6 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:329
-msgctxt "input-name"
-msgid "P6 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:330
-msgctxt "input-name"
-msgid "P6 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:331
-msgctxt "input-name"
-msgid "P6 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:332
-msgctxt "input-name"
-msgid "P6 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:333
-msgctxt "input-name"
-msgid "P6 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:334
-msgctxt "input-name"
-msgid "P6 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:335
-msgctxt "input-name"
-msgid "P6 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:336
-msgctxt "input-name"
-msgid "P6 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:337
-msgctxt "input-name"
-msgid "P6 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:338
-msgctxt "input-name"
-msgid "P6 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:339
-msgctxt "input-name"
-msgid "P6 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:340
-msgctxt "input-name"
-msgid "P6 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:341
-msgctxt "input-name"
-msgid "P6 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:342
-msgctxt "input-name"
-msgid "P6 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:343
-msgctxt "input-name"
-msgid "P6 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:344
-msgctxt "input-name"
-msgid "P6 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:345
-msgctxt "input-name"
-msgid "P6 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:346
-msgctxt "input-name"
-msgid "P6 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:347
-msgctxt "input-name"
-msgid "P6 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:348
-msgctxt "input-name"
-msgid "P6 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:349
-msgctxt "input-name"
-msgid "P6 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:350
-msgctxt "input-name"
-msgid "P6 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:351
-msgctxt "input-name"
-msgid "P6 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:352
-msgctxt "input-name"
-msgid "P6 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:357
-msgctxt "input-name"
-msgid "P7 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:358
-msgctxt "input-name"
-msgid "P7 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:359
-msgctxt "input-name"
-msgid "P7 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:360
-msgctxt "input-name"
-msgid "P7 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:361
-msgctxt "input-name"
-msgid "P7 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:362
-msgctxt "input-name"
-msgid "P7 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:363
-msgctxt "input-name"
-msgid "P7 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:364
-msgctxt "input-name"
-msgid "P7 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:365
-msgctxt "input-name"
-msgid "P7 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:366
-msgctxt "input-name"
-msgid "P7 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:367
-msgctxt "input-name"
-msgid "P7 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:368
-msgctxt "input-name"
-msgid "P7 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:369
-msgctxt "input-name"
-msgid "P7 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:370
-msgctxt "input-name"
-msgid "P7 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:371
-msgctxt "input-name"
-msgid "P7 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:372
-msgctxt "input-name"
-msgid "P7 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:373
-msgctxt "input-name"
-msgid "P7 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:374
-msgctxt "input-name"
-msgid "P7 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:375
-msgctxt "input-name"
-msgid "P7 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:376
-msgctxt "input-name"
-msgid "P7 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:377
-msgctxt "input-name"
-msgid "P7 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:378
-msgctxt "input-name"
-msgid "P7 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:379
-msgctxt "input-name"
-msgid "P7 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:380
-msgctxt "input-name"
-msgid "P7 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:381
-msgctxt "input-name"
-msgid "P7 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:382
-msgctxt "input-name"
-msgid "P7 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:383
-msgctxt "input-name"
-msgid "P7 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:384
-msgctxt "input-name"
-msgid "P7 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:385
-msgctxt "input-name"
-msgid "P7 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:386
-msgctxt "input-name"
-msgid "P7 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:391
-msgctxt "input-name"
-msgid "P8 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:392
-msgctxt "input-name"
-msgid "P8 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:393
-msgctxt "input-name"
-msgid "P8 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:394
-msgctxt "input-name"
-msgid "P8 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:395
-msgctxt "input-name"
-msgid "P8 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:396
-msgctxt "input-name"
-msgid "P8 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:397
-msgctxt "input-name"
-msgid "P8 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:398
-msgctxt "input-name"
-msgid "P8 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:399
-msgctxt "input-name"
-msgid "P8 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:400
-msgctxt "input-name"
-msgid "P8 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:401
-msgctxt "input-name"
-msgid "P8 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:402
-msgctxt "input-name"
-msgid "P8 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:403
-msgctxt "input-name"
-msgid "P8 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:404
-msgctxt "input-name"
-msgid "P8 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:405
-msgctxt "input-name"
-msgid "P8 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:406
-msgctxt "input-name"
-msgid "P8 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:407
-msgctxt "input-name"
-msgid "P8 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:408
-msgctxt "input-name"
-msgid "P8 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:409
-msgctxt "input-name"
-msgid "P8 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:410
-msgctxt "input-name"
-msgid "P8 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:411
-msgctxt "input-name"
-msgid "P8 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:412
-msgctxt "input-name"
-msgid "P8 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:413
-msgctxt "input-name"
-msgid "P8 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:414
-msgctxt "input-name"
-msgid "P8 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:415
-msgctxt "input-name"
-msgid "P8 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:416
-msgctxt "input-name"
-msgid "P8 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:417
-msgctxt "input-name"
-msgid "P8 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:418
-msgctxt "input-name"
-msgid "P8 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:419
-msgctxt "input-name"
-msgid "P8 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:420
-msgctxt "input-name"
-msgid "P8 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:425
-msgctxt "input-name"
-msgid "P9 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:426
-msgctxt "input-name"
-msgid "P9 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:427
-msgctxt "input-name"
-msgid "P9 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:428
-msgctxt "input-name"
-msgid "P9 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:429
-msgctxt "input-name"
-msgid "P9 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:430
-msgctxt "input-name"
-msgid "P9 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:431
-msgctxt "input-name"
-msgid "P9 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:432
-msgctxt "input-name"
-msgid "P9 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:433
-msgctxt "input-name"
-msgid "P9 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:434
-msgctxt "input-name"
-msgid "P9 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:435
-msgctxt "input-name"
-msgid "P9 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:436
-msgctxt "input-name"
-msgid "P9 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:437
-msgctxt "input-name"
-msgid "P9 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:438
-msgctxt "input-name"
-msgid "P9 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:439
-msgctxt "input-name"
-msgid "P9 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:440
-msgctxt "input-name"
-msgid "P9 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:441
-msgctxt "input-name"
-msgid "P9 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:442
-msgctxt "input-name"
-msgid "P9 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:443
-msgctxt "input-name"
-msgid "P9 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:444
-msgctxt "input-name"
-msgid "P9 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:445
-msgctxt "input-name"
-msgid "P9 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:446
-msgctxt "input-name"
-msgid "P9 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:447
-msgctxt "input-name"
-msgid "P9 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:448
-msgctxt "input-name"
-msgid "P9 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:449
-msgctxt "input-name"
-msgid "P9 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:450
-msgctxt "input-name"
-msgid "P9 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:451
-msgctxt "input-name"
-msgid "P9 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:452
-msgctxt "input-name"
-msgid "P9 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:453
-msgctxt "input-name"
-msgid "P9 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:454
-msgctxt "input-name"
-msgid "P9 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:459
-msgctxt "input-name"
-msgid "P10 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:460
-msgctxt "input-name"
-msgid "P10 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:461
-msgctxt "input-name"
-msgid "P10 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:462
-msgctxt "input-name"
-msgid "P10 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:463
-msgctxt "input-name"
-msgid "P10 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:464
-msgctxt "input-name"
-msgid "P10 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:465
-msgctxt "input-name"
-msgid "P10 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:466
-msgctxt "input-name"
-msgid "P10 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:467
-msgctxt "input-name"
-msgid "P10 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:468
-msgctxt "input-name"
-msgid "P10 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:469
-msgctxt "input-name"
-msgid "P10 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:470
-msgctxt "input-name"
-msgid "P10 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:471
-msgctxt "input-name"
-msgid "P10 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:472
-msgctxt "input-name"
-msgid "P10 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:473
-msgctxt "input-name"
-msgid "P10 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:474
-msgctxt "input-name"
-msgid "P10 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:475
-msgctxt "input-name"
-msgid "P10 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:476
-msgctxt "input-name"
-msgid "P10 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:477
-msgctxt "input-name"
-msgid "P10 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:478
-msgctxt "input-name"
-msgid "P10 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:479
-msgctxt "input-name"
-msgid "P10 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:480
-msgctxt "input-name"
-msgid "P10 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:481
-msgctxt "input-name"
-msgid "P10 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:482
-msgctxt "input-name"
-msgid "P10 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:483
-msgctxt "input-name"
-msgid "P10 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:484
-msgctxt "input-name"
-msgid "P10 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:485
-msgctxt "input-name"
-msgid "P10 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:486
-msgctxt "input-name"
-msgid "P10 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:487
-msgctxt "input-name"
-msgid "P10 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:488
-msgctxt "input-name"
-msgid "P10 Select"
-msgstr ""
-
 #: src/emu/inpttype.ipp:493
 msgctxt "input-name"
 msgid "1 Player Start"
@@ -5558,154 +4183,31 @@ msgctxt "input-name"
 msgid "Volume Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:550
-msgctxt "input-name"
-msgid "P1 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:551
-msgctxt "input-name"
-msgid "P2 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:552
-msgctxt "input-name"
-msgid "P3 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:553
-msgctxt "input-name"
-msgid "P4 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:554
-msgctxt "input-name"
-msgid "P5 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:555
-msgctxt "input-name"
-msgid "P6 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:556
-msgctxt "input-name"
-msgid "P7 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:557
-msgctxt "input-name"
-msgid "P8 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:558
-msgctxt "input-name"
-msgid "P9 Pedal 1"
-msgstr ""
-
+#: src/emu/inpttype.ipp:550 src/emu/inpttype.ipp:551 src/emu/inpttype.ipp:552
+#: src/emu/inpttype.ipp:553 src/emu/inpttype.ipp:554 src/emu/inpttype.ipp:555
+#: src/emu/inpttype.ipp:556 src/emu/inpttype.ipp:557 src/emu/inpttype.ipp:558
 #: src/emu/inpttype.ipp:559
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:564
-msgctxt "input-name"
-msgid "P1 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:565
-msgctxt "input-name"
-msgid "P2 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:566
-msgctxt "input-name"
-msgid "P3 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:567
-msgctxt "input-name"
-msgid "P4 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:568
-msgctxt "input-name"
-msgid "P5 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:569
-msgctxt "input-name"
-msgid "P6 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:570
-msgctxt "input-name"
-msgid "P7 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:571
-msgctxt "input-name"
-msgid "P8 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:572
-msgctxt "input-name"
-msgid "P9 Pedal 2"
+msgid "%p Pedal 1"
 msgstr ""
 
+#: src/emu/inpttype.ipp:564 src/emu/inpttype.ipp:565 src/emu/inpttype.ipp:566
+#: src/emu/inpttype.ipp:567 src/emu/inpttype.ipp:568 src/emu/inpttype.ipp:569
+#: src/emu/inpttype.ipp:570 src/emu/inpttype.ipp:571 src/emu/inpttype.ipp:572
 #: src/emu/inpttype.ipp:573
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:578
-msgctxt "input-name"
-msgid "P1 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:579
-msgctxt "input-name"
-msgid "P2 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:580
-msgctxt "input-name"
-msgid "P3 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:581
-msgctxt "input-name"
-msgid "P4 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:582
-msgctxt "input-name"
-msgid "P5 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:583
-msgctxt "input-name"
-msgid "P6 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:584
-msgctxt "input-name"
-msgid "P7 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:585
-msgctxt "input-name"
-msgid "P8 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:586
-msgctxt "input-name"
-msgid "P9 Pedal 3"
+msgid "%p Pedal 2"
 msgstr ""
 
+#: src/emu/inpttype.ipp:578 src/emu/inpttype.ipp:579 src/emu/inpttype.ipp:580
+#: src/emu/inpttype.ipp:581 src/emu/inpttype.ipp:582 src/emu/inpttype.ipp:583
+#: src/emu/inpttype.ipp:584 src/emu/inpttype.ipp:585 src/emu/inpttype.ipp:586
 #: src/emu/inpttype.ipp:587
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 3"
+msgid "%p Pedal 3"
 msgstr ""
 
 #: src/emu/inpttype.ipp:592
@@ -7599,6 +6101,39 @@ msgid ""
 "%s"
 msgstr ""
 
+#~ msgid "Confirm quit from machines"
+#~ msgstr "Bekreft at maskiner skal lukkes"
+
+#~ msgid "Skip information screen at startup"
+#~ msgstr "Vis informasjonsskjerm ved oppstart"
+
+#~ msgid "Skip software parts selection menu"
+#~ msgstr "Hopp over maskinvaredel-valgmenyen"
+
+#~ msgid "Simultaneous contradictory"
+#~ msgstr "Samtidige selvmotsigende"
+
+#, c-format
+#~ msgid ""
+#~ "Auditing ROMs for machine %2$u of %3$u...\n"
+#~ "%1$s"
+#~ msgstr ""
+#~ "Undersøker ROM-filene til maskin nr. %2$u av %3$u...\n"
+#~ "%1$s"
+
+#~ msgid "ROM Audit Result\tOK\n"
+#~ msgstr "ROM-undersøkelsesresultat\tOK\n"
+
+#~ msgid "ROM Audit Result\tBAD\n"
+#~ msgstr "ROM-undersøkelsesresultat\tDÅRLIG\n"
+
+#~ msgid ""
+#~ "ROM Audit \tDisabled\n"
+#~ "Samples Audit \tDisabled\n"
+#~ msgstr ""
+#~ "ROM-undersøkelse \tSkrudd av\n"
+#~ "Samplingsundersøkelse \tSkrudd av\n"
+
 #~ msgid "Device Mapping"
 #~ msgstr "Enhetskontrollvalg"
 
diff --git a/language/Persian/strings.po b/language/Persian/strings.po
index c5007ea4787..f4aba477ab7 100644
--- a/language/Persian/strings.po
+++ b/language/Persian/strings.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-19 02:50+1100\n"
+"POT-Creation-Date: 2021-12-09 04:44+1100\n"
 "PO-Revision-Date: 2016-02-20 18:03+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: MAME Language Team\n"
@@ -259,12 +259,12 @@ msgstr ""
 msgid "Driver: \"%1$s\" software list "
 msgstr ""
 
-#: src/frontend/mame/ui/selsoft.cpp:711 src/frontend/mame/ui/selgame.cpp:1066
+#: src/frontend/mame/ui/selsoft.cpp:711 src/frontend/mame/ui/selgame.cpp:1076
 #, c-format
 msgid "%1$s: %2$s - Search: %3$s_"
 msgstr ""
 
-#: src/frontend/mame/ui/selsoft.cpp:713 src/frontend/mame/ui/selgame.cpp:1068
+#: src/frontend/mame/ui/selsoft.cpp:713 src/frontend/mame/ui/selgame.cpp:1078
 #, c-format
 msgid "Search: %1$s_"
 msgstr ""
@@ -274,7 +274,7 @@ msgstr ""
 msgid "Software list/item: %1$s:%2$s"
 msgstr ""
 
-#: src/frontend/mame/ui/optsmenu.cpp:73 src/frontend/mame/ui/sndmenu.cpp:165
+#: src/frontend/mame/ui/optsmenu.cpp:73 src/frontend/mame/ui/sndmenu.cpp:161
 msgid "Sound Options"
 msgstr ""
 
@@ -369,11 +369,11 @@ msgid "Show mouse pointer"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:39
-msgid "Confirm quit from machines"
+msgid "Confirm quit from emulation"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:40
-msgid "Skip information screen at startup"
+msgid "Skip system information screen"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:41
@@ -389,7 +389,7 @@ msgid "Skip BIOS selection menu"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:44
-msgid "Skip software parts selection menu"
+msgid "Skip software part selection menu"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:45
@@ -541,7 +541,7 @@ msgid "UI active"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:91
-msgid "Offscreen reload"
+msgid "Off-screen reload"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:92
@@ -557,7 +557,7 @@ msgid "Natural keyboard"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:95
-msgid "Simultaneous contradictory"
+msgid "Allow contradictory joystick inputs"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:96
@@ -581,7 +581,7 @@ msgid "Pedal Device Assignment"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:106
-msgid "Adstick Device Assignment"
+msgid "AD Stick Device Assignment"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:107
@@ -668,14 +668,14 @@ msgstr ""
 msgid "Wait Vertical Sync"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:687
+#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:689
 #: src/frontend/mame/ui/videoopt.cpp:191 src/frontend/mame/ui/custui.cpp:490
 #: src/frontend/mame/ui/analogipt.cpp:471 plugins/cheatfind/init.lua:766
 #: plugins/cheatfind/init.lua:777 plugins/cheat/init.lua:668
 msgid "On"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:690
+#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:692
 #: src/frontend/mame/ui/videoopt.cpp:207 src/frontend/mame/ui/custui.cpp:490
 #: src/frontend/mame/ui/analogipt.cpp:471 plugins/cheatfind/init.lua:763
 #: plugins/cheatfind/init.lua:774 plugins/cheat/init.lua:671
@@ -683,11 +683,11 @@ msgstr ""
 msgid "Off"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:693
+#: src/frontend/mame/ui/menu.cpp:695
 msgid "Auto"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:1195
+#: src/frontend/mame/ui/menu.cpp:1197
 #: src/frontend/mame/ui/simpleselgame.cpp:278
 #: src/frontend/mame/ui/selmenu.cpp:1280
 msgid "Return to Previous Menu"
@@ -695,7 +695,7 @@ msgstr ""
 
 #: src/frontend/mame/ui/filemngr.cpp:139
 #: src/frontend/mame/ui/confswitch.cpp:119
-#: src/frontend/mame/ui/inputmap.cpp:559 src/frontend/mame/ui/analogipt.cpp:360
+#: src/frontend/mame/ui/inputmap.cpp:563 src/frontend/mame/ui/analogipt.cpp:360
 #, c-format
 msgid "[root%1$s]"
 msgstr ""
@@ -938,22 +938,22 @@ msgid ""
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "GHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "MHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "kHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "Hz"
 msgstr ""
 
@@ -977,38 +977,38 @@ msgstr ""
 msgid "Vector"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:480
+#: src/frontend/mame/ui/info.cpp:483
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:480
+#: src/frontend/mame/ui/info.cpp:483
 msgid "%2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:497
+#: src/frontend/mame/ui/info.cpp:500
 #, c-format
 msgid "Screen '%1$s'"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:499
+#: src/frontend/mame/ui/info.cpp:502
 msgid "Screen"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:570 src/frontend/mame/ui/info.cpp:581
+#: src/frontend/mame/ui/info.cpp:573 src/frontend/mame/ui/info.cpp:584
 #, c-format
 msgid "%1$s:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:662
+#: src/frontend/mame/ui/info.cpp:665
 msgid "Not supported"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:665
+#: src/frontend/mame/ui/info.cpp:668
 msgid "Partially supported"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:674
+#: src/frontend/mame/ui/info.cpp:677
 msgid "[empty]"
 msgstr ""
 
@@ -1081,7 +1081,7 @@ msgid "Emulated"
 msgstr ""
 
 #: src/frontend/mame/ui/keyboard.cpp:59 src/frontend/mame/ui/confswitch.cpp:117
-#: src/frontend/mame/ui/inputmap.cpp:557 src/frontend/mame/ui/analogipt.cpp:358
+#: src/frontend/mame/ui/inputmap.cpp:561 src/frontend/mame/ui/analogipt.cpp:358
 #, c-format
 msgid "%1$s [root%2$s]"
 msgstr ""
@@ -1441,7 +1441,7 @@ msgctxt "swlist-info"
 msgid "Software list/item"
 msgstr ""
 
-#: src/frontend/mame/ui/datmenu.cpp:88 src/frontend/mame/ui/selmenu.cpp:2698
+#: src/frontend/mame/ui/datmenu.cpp:88 src/frontend/mame/ui/selmenu.cpp:2707
 msgid "Software List Info"
 msgstr ""
 
@@ -1556,7 +1556,7 @@ msgstr ""
 msgid "Configure Machine:"
 msgstr ""
 
-#: src/frontend/mame/ui/miscmenu.cpp:858 src/frontend/mame/ui/selmenu.cpp:2638
+#: src/frontend/mame/ui/miscmenu.cpp:858 src/frontend/mame/ui/selmenu.cpp:2647
 msgid " (default)"
 msgstr ""
 
@@ -1573,7 +1573,7 @@ msgid ""
 "Press %2$s to return to emulation"
 msgstr ""
 
-#: src/frontend/mame/ui/info_pty.cpp:30 src/frontend/mame/ui/mainmenu.cpp:155
+#: src/frontend/mame/ui/info_pty.cpp:30
 msgid "Pseudo terminals"
 msgstr ""
 
@@ -1641,52 +1641,52 @@ msgstr ""
 msgid "Other Controls"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:227
+#: src/frontend/mame/ui/inputmap.cpp:231
 msgid "This machine has no configurable inputs."
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:327
+#: src/frontend/mame/ui/inputmap.cpp:331
 msgid "Pressed"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:397
+#: src/frontend/mame/ui/inputmap.cpp:401
 msgid "Invalid sequence entered"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:542
+#: src/frontend/mame/ui/inputmap.cpp:546
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:543
+#: src/frontend/mame/ui/inputmap.cpp:547
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog Inc"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:544
+#: src/frontend/mame/ui/inputmap.cpp:548
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog Dec"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:586
+#: src/frontend/mame/ui/inputmap.cpp:590
 #, c-format
 msgid "Press %1$s to set\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:587
+#: src/frontend/mame/ui/inputmap.cpp:591
 #, c-format
 msgid "Press %1$s to append\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:588
+#: src/frontend/mame/ui/inputmap.cpp:592
 #, c-format
 msgid "Press %1$s to clear\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:589
+#: src/frontend/mame/ui/inputmap.cpp:593
 #, c-format
 msgid "Press %1$s to restore default\n"
 msgstr ""
@@ -1750,7 +1750,7 @@ msgid ""
 msgstr ""
 
 #: src/frontend/mame/ui/simpleselgame.cpp:273
-#: src/frontend/mame/ui/selgame.cpp:436
+#: src/frontend/mame/ui/selgame.cpp:443
 msgid "Configure Options"
 msgstr ""
 
@@ -2078,16 +2078,16 @@ msgstr ""
 msgid "Expand to fit"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:437
+#: src/frontend/mame/ui/selgame.cpp:444
 msgid "Configure Machine"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:1050
+#: src/frontend/mame/ui/selgame.cpp:1060
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d machines (%5$d BIOS) )"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:1078
+#: src/frontend/mame/ui/selgame.cpp:1088
 #, c-format
 msgid "System: %1$-.100s"
 msgstr ""
@@ -2109,7 +2109,7 @@ msgstr ""
 #: src/frontend/mame/ui/auditmenu.cpp:98
 #, c-format
 msgid ""
-"Auditing ROMs for machine %2$u of %3$u...\n"
+"Auditing media for machine %2$u of %3$u...\n"
 "%1$s"
 msgstr ""
 
@@ -2124,12 +2124,12 @@ msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:136
 #, c-format
-msgid "Audit ROMs for %1$u machines marked unavailable"
+msgid "Audit media for %1$u machines marked unavailable"
 msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:137
 #, c-format
-msgid "Audit ROMs for all %1$u machines"
+msgid "Audit media for all %1$u machines"
 msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:154
@@ -2335,84 +2335,84 @@ msgctxt "color-sample"
 msgid "Clone"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:914
+#: src/frontend/mame/ui/custui.cpp:906
 msgid "ARGB Settings"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:919 src/frontend/mame/ui/custui.cpp:922
+#: src/frontend/mame/ui/custui.cpp:911 src/frontend/mame/ui/custui.cpp:914
 msgctxt "color-channel"
 msgid "Alpha"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:927 src/frontend/mame/ui/custui.cpp:930
+#: src/frontend/mame/ui/custui.cpp:919 src/frontend/mame/ui/custui.cpp:922
 msgctxt "color-channel"
 msgid "Red"
 msgstr ""
 
+#: src/frontend/mame/ui/custui.cpp:927 src/frontend/mame/ui/custui.cpp:930
+msgctxt "color-channel"
+msgid "Green"
+msgstr ""
+
 #: src/frontend/mame/ui/custui.cpp:935 src/frontend/mame/ui/custui.cpp:938
 msgctxt "color-channel"
-msgid "Green"
-msgstr ""
-
-#: src/frontend/mame/ui/custui.cpp:943 src/frontend/mame/ui/custui.cpp:946
-msgctxt "color-channel"
 msgid "Blue"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:949
+#: src/frontend/mame/ui/custui.cpp:941
 msgid "Choose from palette"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:996
+#: src/frontend/mame/ui/custui.cpp:988
 msgid "Color preview:"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1093
+#: src/frontend/mame/ui/custui.cpp:1085
 msgctxt "color-preset"
 msgid "White"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1094
+#: src/frontend/mame/ui/custui.cpp:1086
 msgctxt "color-preset"
 msgid "Silver"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1095
+#: src/frontend/mame/ui/custui.cpp:1087
 msgctxt "color-preset"
 msgid "Gray"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1096
+#: src/frontend/mame/ui/custui.cpp:1088
 msgctxt "color-preset"
 msgid "Black"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1097
+#: src/frontend/mame/ui/custui.cpp:1089
 msgctxt "color-preset"
 msgid "Red"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1098
+#: src/frontend/mame/ui/custui.cpp:1090
 msgctxt "color-preset"
 msgid "Orange"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1099
+#: src/frontend/mame/ui/custui.cpp:1091
 msgctxt "color-preset"
 msgid "Yellow"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1100
+#: src/frontend/mame/ui/custui.cpp:1092
 msgctxt "color-preset"
 msgid "Green"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1101
+#: src/frontend/mame/ui/custui.cpp:1093
 msgctxt "color-preset"
 msgid "Blue"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1102
+#: src/frontend/mame/ui/custui.cpp:1094
 msgctxt "color-preset"
 msgid "Violet"
 msgstr ""
@@ -2477,7 +2477,7 @@ msgid "Input (general)"
 msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:123
-msgid "Input (this Machine)"
+msgid "Input (this machine)"
 msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:126
@@ -2516,6 +2516,10 @@ msgstr ""
 msgid "Tape Control"
 msgstr ""
 
+#: src/frontend/mame/ui/mainmenu.cpp:155
+msgid "Pseudo Terminals"
+msgstr ""
+
 #: src/frontend/mame/ui/mainmenu.cpp:158
 msgid "BIOS Selection"
 msgstr ""
@@ -2554,7 +2558,7 @@ msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:200
 #, c-format
-msgid "About %s"
+msgid "About %1$s"
 msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:212
@@ -2714,373 +2718,373 @@ msgstr ""
 msgid "%1$s %2$s"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2235
+#: src/frontend/mame/ui/selmenu.cpp:2244
 msgid "Images"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2236
+#: src/frontend/mame/ui/selmenu.cpp:2245
 msgid "Infos"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2551
+#: src/frontend/mame/ui/selmenu.cpp:2560
 msgid ""
 "Required ROM/disk images for the selected system are missing or incorrect. "
 "Please acquire the correct files or select a different system.\n"
 "\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2567
+#: src/frontend/mame/ui/selmenu.cpp:2576
 msgid ""
 "Required ROM/disk images for the selected software are missing or incorrect. "
 "Please acquire the correct files or select a different software item.\n"
 "\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2583
+#: src/frontend/mame/ui/selmenu.cpp:2592
 msgid "incorrect checksum"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2586
+#: src/frontend/mame/ui/selmenu.cpp:2595
 msgid "incorrect length"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2589
+#: src/frontend/mame/ui/selmenu.cpp:2598
 msgid "not found"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2600
+#: src/frontend/mame/ui/selmenu.cpp:2609
 #, c-format
 msgid "%1$s (%2$s) - %3$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2602
+#: src/frontend/mame/ui/selmenu.cpp:2611
 #, c-format
 msgid "%1$s - %2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2606
+#: src/frontend/mame/ui/selmenu.cpp:2615
 msgid "Press any key to continue."
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2735
+#: src/frontend/mame/ui/selmenu.cpp:2744
 msgid "General Info"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2887
-#, c-format
-msgid "Romset\t%1$s\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2888
-#, c-format
-msgid "Year\t%1$s\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2889
-#, c-format
-msgid "Manufacturer\t%1$s\n"
-msgstr ""
-
 #: src/frontend/mame/ui/selmenu.cpp:2896
 #, c-format
-msgid "Driver is Clone of\t%1$s\n"
+msgid "Romset\t%1$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2901
-msgid "Driver is Parent\t\n"
+#: src/frontend/mame/ui/selmenu.cpp:2897
+#, c-format
+msgid "Year\t%1$s\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2898
+#, c-format
+msgid "Manufacturer\t%1$s\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2905
-msgid "Analog Controls\tYes\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2907
-msgid "Keyboard Inputs\tYes\n"
+#, c-format
+msgid "Driver is Clone of\t%1$s\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2910
-msgid "Overall\tNOT WORKING\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2912
-msgid "Overall\tUnemulated Protection\n"
+msgid "Driver is Parent\t\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2914
-msgid "Overall\tWorking\n"
+msgid "Analog Controls\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2917
-msgid "Graphics\tUnimplemented\n"
+#: src/frontend/mame/ui/selmenu.cpp:2916
+msgid "Keyboard Inputs\tYes\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2919
-msgid "Graphics\tWrong Colors\n"
+msgid "Overall\tNOT WORKING\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2921
-msgid "Graphics\tImperfect Colors\n"
+msgid "Overall\tUnemulated Protection\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2923
-msgid "Graphics\tImperfect\n"
+msgid "Overall\tWorking\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2925
-msgid "Graphics\tOK\n"
+#: src/frontend/mame/ui/selmenu.cpp:2926
+msgid "Graphics\tUnimplemented\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2928
-msgid "Sound\tNone\n"
+msgid "Graphics\tWrong Colors\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2930
-msgid "Sound\tUnimplemented\n"
+msgid "Graphics\tImperfect Colors\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2932
-msgid "Sound\tImperfect\n"
+msgid "Graphics\tImperfect\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2934
-msgid "Sound\tOK\n"
+msgid "Graphics\tOK\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2937
-msgid "Capture\tUnimplemented\n"
+msgid "Sound\tNone\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2939
+msgid "Sound\tUnimplemented\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2941
+msgid "Sound\tImperfect\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2943
+msgid "Sound\tOK\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2946
+msgid "Capture\tUnimplemented\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2948
 msgid "Capture\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2942
+#: src/frontend/mame/ui/selmenu.cpp:2951
 msgid "Camera\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2944
+#: src/frontend/mame/ui/selmenu.cpp:2953
 msgid "Camera\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2947
+#: src/frontend/mame/ui/selmenu.cpp:2956
 msgid "Microphone\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2949
+#: src/frontend/mame/ui/selmenu.cpp:2958
 msgid "Microphone\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2952
+#: src/frontend/mame/ui/selmenu.cpp:2961
 msgid "Controls\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2954
+#: src/frontend/mame/ui/selmenu.cpp:2963
 msgid "Controls\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2957
+#: src/frontend/mame/ui/selmenu.cpp:2966
 msgid "Keyboard\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2959
+#: src/frontend/mame/ui/selmenu.cpp:2968
 msgid "Keyboard\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2962
+#: src/frontend/mame/ui/selmenu.cpp:2971
 msgid "Mouse\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2964
+#: src/frontend/mame/ui/selmenu.cpp:2973
 msgid "Mouse\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2967
+#: src/frontend/mame/ui/selmenu.cpp:2976
 msgid "Media\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2969
+#: src/frontend/mame/ui/selmenu.cpp:2978
 msgid "Media\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2972
+#: src/frontend/mame/ui/selmenu.cpp:2981
 msgid "Disk\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2974
+#: src/frontend/mame/ui/selmenu.cpp:2983
 msgid "Disk\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2977
+#: src/frontend/mame/ui/selmenu.cpp:2986
 msgid "Printer\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2979
+#: src/frontend/mame/ui/selmenu.cpp:2988
 msgid "Printer\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2982
+#: src/frontend/mame/ui/selmenu.cpp:2991
 msgid "Mag. Tape\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2984
+#: src/frontend/mame/ui/selmenu.cpp:2993
 msgid "Mag. Tape\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2987
+#: src/frontend/mame/ui/selmenu.cpp:2996
 msgid "Punch Tape\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2989
+#: src/frontend/mame/ui/selmenu.cpp:2998
 msgid "Punch Tape\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2992
+#: src/frontend/mame/ui/selmenu.cpp:3001
 msgid "Mag. Drum\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2994
+#: src/frontend/mame/ui/selmenu.cpp:3003
 msgid "Mag. Drum\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2997
+#: src/frontend/mame/ui/selmenu.cpp:3006
 msgid "(EP)ROM\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2999
+#: src/frontend/mame/ui/selmenu.cpp:3008
 msgid "(EP)ROM\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3002
+#: src/frontend/mame/ui/selmenu.cpp:3011
 msgid "Communications\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3004
+#: src/frontend/mame/ui/selmenu.cpp:3013
 msgid "Communications\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3007
+#: src/frontend/mame/ui/selmenu.cpp:3016
 msgid "LAN\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3009
+#: src/frontend/mame/ui/selmenu.cpp:3018
 msgid "LAN\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3012
+#: src/frontend/mame/ui/selmenu.cpp:3021
 msgid "WAN\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3014
+#: src/frontend/mame/ui/selmenu.cpp:3023
 msgid "WAN\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3017
+#: src/frontend/mame/ui/selmenu.cpp:3026
 msgid "Timing\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3019
+#: src/frontend/mame/ui/selmenu.cpp:3028
 msgid "Timing\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3021
+#: src/frontend/mame/ui/selmenu.cpp:3030
 msgid "Mechanical Machine\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3021
+#: src/frontend/mame/ui/selmenu.cpp:3030
 msgid "Mechanical Machine\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3022
+#: src/frontend/mame/ui/selmenu.cpp:3031
 msgid "Requires Artwork\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3022
+#: src/frontend/mame/ui/selmenu.cpp:3031
 msgid "Requires Artwork\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3023
+#: src/frontend/mame/ui/selmenu.cpp:3032
 msgid "Requires Clickable Artwork\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3023
+#: src/frontend/mame/ui/selmenu.cpp:3032
 msgid "Requires Clickable Artwork\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3025
+#: src/frontend/mame/ui/selmenu.cpp:3034
 msgid "Support Cocktail\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3026
+#: src/frontend/mame/ui/selmenu.cpp:3035
 msgid "Driver is BIOS\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3026
+#: src/frontend/mame/ui/selmenu.cpp:3035
 msgid "Driver is BIOS\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3027
+#: src/frontend/mame/ui/selmenu.cpp:3036
 msgid "Support Save\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3027
+#: src/frontend/mame/ui/selmenu.cpp:3036
 msgid "Support Save\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3028
+#: src/frontend/mame/ui/selmenu.cpp:3037
 msgid "Screen Orientation\tVertical\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3028
+#: src/frontend/mame/ui/selmenu.cpp:3037
 msgid "Screen Orientation\tHorizontal\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3038
+#: src/frontend/mame/ui/selmenu.cpp:3047
 msgid "Requires CHD\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3038
+#: src/frontend/mame/ui/selmenu.cpp:3047
 msgid "Requires CHD\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3051
-msgid "ROM Audit Result\tOK\n"
+#: src/frontend/mame/ui/selmenu.cpp:3060
+msgid "Media Audit Result\tOK\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3053
-msgid "ROM Audit Result\tBAD\n"
+#: src/frontend/mame/ui/selmenu.cpp:3062
+msgid "Media Audit Result\tBAD\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3056
+#: src/frontend/mame/ui/selmenu.cpp:3065
 msgid "Samples Audit Result\tNone Needed\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3058
+#: src/frontend/mame/ui/selmenu.cpp:3067
 msgid "Samples Audit Result\tOK\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3060
+#: src/frontend/mame/ui/selmenu.cpp:3069
 msgid "Samples Audit Result\tBAD\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3064
+#: src/frontend/mame/ui/selmenu.cpp:3073
 msgid ""
-"ROM Audit \tDisabled\n"
-"Samples Audit \tDisabled\n"
+"Media Audit\tDisabled\n"
+"Samples Audit\tDisabled\n"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:150
+#: src/frontend/mame/ui/sndmenu.cpp:146
 msgid "Sound"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:151
+#: src/frontend/mame/ui/sndmenu.cpp:147
 msgid "Compressor"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:152
+#: src/frontend/mame/ui/sndmenu.cpp:148
 msgid "Sample Rate"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:153
+#: src/frontend/mame/ui/sndmenu.cpp:149
 msgid "Use External Samples"
 msgstr ""
 
@@ -3119,511 +3123,681 @@ msgstr ""
 msgid "  Screen '%1$s': Vector\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:132
+#: src/frontend/mame/ui/devopt.cpp:135
 #, c-format
 msgid "  Screen '%1$s': %2$d × %3$d (V) %4$s Hz\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:133
+#: src/frontend/mame/ui/devopt.cpp:136
 #, c-format
 msgid "  Screen '%1$s': %2$d × %3$d (H) %4$s Hz\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:147
+#: src/frontend/mame/ui/devopt.cpp:150
 msgid "* Sound:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:211
+#: src/frontend/mame/ui/devopt.cpp:214
 #, c-format
 msgid ""
 "* BIOS settings:\n"
 "  %1$d options    [default: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:255 src/frontend/mame/ui/devopt.cpp:271
-#: src/frontend/mame/ui/devopt.cpp:332
+#: src/frontend/mame/ui/devopt.cpp:258 src/frontend/mame/ui/devopt.cpp:274
+#: src/frontend/mame/ui/devopt.cpp:335
 #, c-format
 msgid "  %1$s    [default: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:260 src/frontend/mame/ui/devopt.cpp:276
+#: src/frontend/mame/ui/devopt.cpp:263 src/frontend/mame/ui/devopt.cpp:279
 #, c-format
 msgid "  %1$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:282
+#: src/frontend/mame/ui/devopt.cpp:285
 msgid "* DIP switch settings:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:287
+#: src/frontend/mame/ui/devopt.cpp:290
 msgid "* Configuration settings:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:291
+#: src/frontend/mame/ui/devopt.cpp:294
 msgid "* Input device(s):\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:293
+#: src/frontend/mame/ui/devopt.cpp:296
 #, c-format
 msgid "  User inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:295
+#: src/frontend/mame/ui/devopt.cpp:298
 #, c-format
 msgid "  Mahjong inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:297
+#: src/frontend/mame/ui/devopt.cpp:300
 #, c-format
 msgid "  Hanafuda inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:299
+#: src/frontend/mame/ui/devopt.cpp:302
 #, c-format
 msgid "  Gambling inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:301
+#: src/frontend/mame/ui/devopt.cpp:304
 #, c-format
 msgid "  Analog inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:303
+#: src/frontend/mame/ui/devopt.cpp:306
 #, c-format
 msgid "  Adjuster inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:305
+#: src/frontend/mame/ui/devopt.cpp:308
 #, c-format
 msgid "  Keypad inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:307
+#: src/frontend/mame/ui/devopt.cpp:310
 #, c-format
 msgid "  Keyboard inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:312
+#: src/frontend/mame/ui/devopt.cpp:315
 msgid "* Media Options:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:317
+#: src/frontend/mame/ui/devopt.cpp:320
 #, c-format
 msgid "  %1$s    [tag: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:327
+#: src/frontend/mame/ui/devopt.cpp:330
 msgid "* Slot Options:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:341
+#: src/frontend/mame/ui/devopt.cpp:344
 msgid "[None]\n"
 msgstr ""
 
-#: src/emu/render.cpp:1847
+#: src/emu/render.cpp:1796
 #, c-format
 msgctxt "view-name"
 msgid "Screen %1$u Standard (%2$u:%3$u)"
 msgstr ""
 
-#: src/emu/render.cpp:1873
+#: src/emu/render.cpp:1822
 #, c-format
 msgctxt "view-name"
 msgid "Screen %1$u Pixel Aspect (%2$u:%3$u)"
 msgstr ""
 
-#: src/emu/render.cpp:1895 src/emu/render.cpp:2030
+#: src/emu/render.cpp:1844 src/emu/render.cpp:1979
 msgctxt "view-name"
 msgid "Cocktail"
 msgstr ""
 
-#: src/emu/render.cpp:2015
+#: src/emu/render.cpp:1964
 msgctxt "view-name"
 msgid "Left-to-Right"
 msgstr ""
 
-#: src/emu/render.cpp:2016
+#: src/emu/render.cpp:1965
 msgctxt "view-name"
 msgid "Left-to-Right (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2017
+#: src/emu/render.cpp:1966
 msgctxt "view-name"
 msgid "Top-to-Bottom"
 msgstr ""
 
-#: src/emu/render.cpp:2018
+#: src/emu/render.cpp:1967
 msgctxt "view-name"
 msgid "Top-to-Bottom (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2069
+#: src/emu/render.cpp:2018
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Left-to-Right, Top-to-Bottom"
 msgstr ""
 
-#: src/emu/render.cpp:2078
+#: src/emu/render.cpp:2027
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Left-to-Right, Top-to-Bottom (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2087
+#: src/emu/render.cpp:2036
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Top-to-Bottom, Left-to-Right"
 msgstr ""
 
-#: src/emu/render.cpp:2096
+#: src/emu/render.cpp:2045
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Top-to-Bottom, Left-to-Right (Gapless)"
 msgstr ""
 
-#: src/emu/inpttype.ipp:22
+#: src/emu/ioport.cpp:332
+#, c-format
 msgctxt "input-name"
-msgid "P1 Up"
+msgid "P%1$u"
 msgstr ""
 
-#: src/emu/inpttype.ipp:23
+#: src/emu/ioport.cpp:1924
 msgctxt "input-name"
-msgid "P1 Down"
+msgid "???"
 msgstr ""
 
-#: src/emu/inpttype.ipp:24
+#: src/emu/inpttype.ipp:22 src/emu/inpttype.ipp:140 src/emu/inpttype.ipp:221
+#: src/emu/inpttype.ipp:255 src/emu/inpttype.ipp:289 src/emu/inpttype.ipp:323
+#: src/emu/inpttype.ipp:357 src/emu/inpttype.ipp:391 src/emu/inpttype.ipp:425
+#: src/emu/inpttype.ipp:459
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left"
+msgid "%p Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:25
+#: src/emu/inpttype.ipp:23 src/emu/inpttype.ipp:141 src/emu/inpttype.ipp:222
+#: src/emu/inpttype.ipp:256 src/emu/inpttype.ipp:290 src/emu/inpttype.ipp:324
+#: src/emu/inpttype.ipp:358 src/emu/inpttype.ipp:392 src/emu/inpttype.ipp:426
+#: src/emu/inpttype.ipp:460
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right"
+msgid "%p Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:26
+#: src/emu/inpttype.ipp:24 src/emu/inpttype.ipp:142 src/emu/inpttype.ipp:223
+#: src/emu/inpttype.ipp:257 src/emu/inpttype.ipp:291 src/emu/inpttype.ipp:325
+#: src/emu/inpttype.ipp:359 src/emu/inpttype.ipp:393 src/emu/inpttype.ipp:427
+#: src/emu/inpttype.ipp:461
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Up"
+msgid "%p Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:27
+#: src/emu/inpttype.ipp:25 src/emu/inpttype.ipp:143 src/emu/inpttype.ipp:224
+#: src/emu/inpttype.ipp:258 src/emu/inpttype.ipp:292 src/emu/inpttype.ipp:326
+#: src/emu/inpttype.ipp:360 src/emu/inpttype.ipp:394 src/emu/inpttype.ipp:428
+#: src/emu/inpttype.ipp:462
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Down"
+msgid "%p Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:28
+#: src/emu/inpttype.ipp:26 src/emu/inpttype.ipp:144 src/emu/inpttype.ipp:225
+#: src/emu/inpttype.ipp:259 src/emu/inpttype.ipp:293 src/emu/inpttype.ipp:327
+#: src/emu/inpttype.ipp:361 src/emu/inpttype.ipp:395 src/emu/inpttype.ipp:429
+#: src/emu/inpttype.ipp:463
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Left"
+msgid "%p Right Stick/Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:29
+#: src/emu/inpttype.ipp:27 src/emu/inpttype.ipp:145 src/emu/inpttype.ipp:226
+#: src/emu/inpttype.ipp:260 src/emu/inpttype.ipp:294 src/emu/inpttype.ipp:328
+#: src/emu/inpttype.ipp:362 src/emu/inpttype.ipp:396 src/emu/inpttype.ipp:430
+#: src/emu/inpttype.ipp:464
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Right"
+msgid "%p Right Stick/Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:30
+#: src/emu/inpttype.ipp:28 src/emu/inpttype.ipp:146 src/emu/inpttype.ipp:227
+#: src/emu/inpttype.ipp:261 src/emu/inpttype.ipp:295 src/emu/inpttype.ipp:329
+#: src/emu/inpttype.ipp:363 src/emu/inpttype.ipp:397 src/emu/inpttype.ipp:431
+#: src/emu/inpttype.ipp:465
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Up"
+msgid "%p Right Stick/Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:31
+#: src/emu/inpttype.ipp:29 src/emu/inpttype.ipp:147 src/emu/inpttype.ipp:228
+#: src/emu/inpttype.ipp:262 src/emu/inpttype.ipp:296 src/emu/inpttype.ipp:330
+#: src/emu/inpttype.ipp:364 src/emu/inpttype.ipp:398 src/emu/inpttype.ipp:432
+#: src/emu/inpttype.ipp:466
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Down"
+msgid "%p Right Stick/Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:32
+#: src/emu/inpttype.ipp:30 src/emu/inpttype.ipp:148 src/emu/inpttype.ipp:229
+#: src/emu/inpttype.ipp:263 src/emu/inpttype.ipp:297 src/emu/inpttype.ipp:331
+#: src/emu/inpttype.ipp:365 src/emu/inpttype.ipp:399 src/emu/inpttype.ipp:433
+#: src/emu/inpttype.ipp:467
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Left"
+msgid "%p Left Stick/Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:33
+#: src/emu/inpttype.ipp:31 src/emu/inpttype.ipp:149 src/emu/inpttype.ipp:230
+#: src/emu/inpttype.ipp:264 src/emu/inpttype.ipp:298 src/emu/inpttype.ipp:332
+#: src/emu/inpttype.ipp:366 src/emu/inpttype.ipp:400 src/emu/inpttype.ipp:434
+#: src/emu/inpttype.ipp:468
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Right"
+msgid "%p Left Stick/Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:34
+#: src/emu/inpttype.ipp:32 src/emu/inpttype.ipp:150 src/emu/inpttype.ipp:231
+#: src/emu/inpttype.ipp:265 src/emu/inpttype.ipp:299 src/emu/inpttype.ipp:333
+#: src/emu/inpttype.ipp:367 src/emu/inpttype.ipp:401 src/emu/inpttype.ipp:435
+#: src/emu/inpttype.ipp:469
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 1"
+msgid "%p Left Stick/Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:35
+#: src/emu/inpttype.ipp:33 src/emu/inpttype.ipp:151 src/emu/inpttype.ipp:232
+#: src/emu/inpttype.ipp:266 src/emu/inpttype.ipp:300 src/emu/inpttype.ipp:334
+#: src/emu/inpttype.ipp:368 src/emu/inpttype.ipp:402 src/emu/inpttype.ipp:436
+#: src/emu/inpttype.ipp:470
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 2"
+msgid "%p Left Stick/Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:36
+#: src/emu/inpttype.ipp:34 src/emu/inpttype.ipp:152 src/emu/inpttype.ipp:233
+#: src/emu/inpttype.ipp:267 src/emu/inpttype.ipp:301 src/emu/inpttype.ipp:335
+#: src/emu/inpttype.ipp:369 src/emu/inpttype.ipp:403 src/emu/inpttype.ipp:437
+#: src/emu/inpttype.ipp:471
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 3"
+msgid "%p Button 1"
 msgstr ""
 
-#: src/emu/inpttype.ipp:37
+#: src/emu/inpttype.ipp:35 src/emu/inpttype.ipp:153 src/emu/inpttype.ipp:234
+#: src/emu/inpttype.ipp:268 src/emu/inpttype.ipp:302 src/emu/inpttype.ipp:336
+#: src/emu/inpttype.ipp:370 src/emu/inpttype.ipp:404 src/emu/inpttype.ipp:438
+#: src/emu/inpttype.ipp:472
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 4"
+msgid "%p Button 2"
 msgstr ""
 
-#: src/emu/inpttype.ipp:38
+#: src/emu/inpttype.ipp:36 src/emu/inpttype.ipp:154 src/emu/inpttype.ipp:235
+#: src/emu/inpttype.ipp:269 src/emu/inpttype.ipp:303 src/emu/inpttype.ipp:337
+#: src/emu/inpttype.ipp:371 src/emu/inpttype.ipp:405 src/emu/inpttype.ipp:439
+#: src/emu/inpttype.ipp:473
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 5"
+msgid "%p Button 3"
 msgstr ""
 
-#: src/emu/inpttype.ipp:39
+#: src/emu/inpttype.ipp:37 src/emu/inpttype.ipp:155 src/emu/inpttype.ipp:236
+#: src/emu/inpttype.ipp:270 src/emu/inpttype.ipp:304 src/emu/inpttype.ipp:338
+#: src/emu/inpttype.ipp:372 src/emu/inpttype.ipp:406 src/emu/inpttype.ipp:440
+#: src/emu/inpttype.ipp:474
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 6"
+msgid "%p Button 4"
 msgstr ""
 
-#: src/emu/inpttype.ipp:40
+#: src/emu/inpttype.ipp:38 src/emu/inpttype.ipp:156 src/emu/inpttype.ipp:237
+#: src/emu/inpttype.ipp:271 src/emu/inpttype.ipp:305 src/emu/inpttype.ipp:339
+#: src/emu/inpttype.ipp:373 src/emu/inpttype.ipp:407 src/emu/inpttype.ipp:441
+#: src/emu/inpttype.ipp:475
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 7"
+msgid "%p Button 5"
 msgstr ""
 
-#: src/emu/inpttype.ipp:41
+#: src/emu/inpttype.ipp:39 src/emu/inpttype.ipp:157 src/emu/inpttype.ipp:238
+#: src/emu/inpttype.ipp:272 src/emu/inpttype.ipp:306 src/emu/inpttype.ipp:340
+#: src/emu/inpttype.ipp:374 src/emu/inpttype.ipp:408 src/emu/inpttype.ipp:442
+#: src/emu/inpttype.ipp:476
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 8"
+msgid "%p Button 6"
 msgstr ""
 
-#: src/emu/inpttype.ipp:42
+#: src/emu/inpttype.ipp:40 src/emu/inpttype.ipp:158 src/emu/inpttype.ipp:239
+#: src/emu/inpttype.ipp:273 src/emu/inpttype.ipp:307 src/emu/inpttype.ipp:341
+#: src/emu/inpttype.ipp:375 src/emu/inpttype.ipp:409 src/emu/inpttype.ipp:443
+#: src/emu/inpttype.ipp:477
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 9"
+msgid "%p Button 7"
 msgstr ""
 
-#: src/emu/inpttype.ipp:43
+#: src/emu/inpttype.ipp:41 src/emu/inpttype.ipp:159 src/emu/inpttype.ipp:240
+#: src/emu/inpttype.ipp:274 src/emu/inpttype.ipp:308 src/emu/inpttype.ipp:342
+#: src/emu/inpttype.ipp:376 src/emu/inpttype.ipp:410 src/emu/inpttype.ipp:444
+#: src/emu/inpttype.ipp:478
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 10"
+msgid "%p Button 8"
 msgstr ""
 
-#: src/emu/inpttype.ipp:44
+#: src/emu/inpttype.ipp:42 src/emu/inpttype.ipp:160 src/emu/inpttype.ipp:241
+#: src/emu/inpttype.ipp:275 src/emu/inpttype.ipp:309 src/emu/inpttype.ipp:343
+#: src/emu/inpttype.ipp:377 src/emu/inpttype.ipp:411 src/emu/inpttype.ipp:445
+#: src/emu/inpttype.ipp:479
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 11"
+msgid "%p Button 9"
 msgstr ""
 
-#: src/emu/inpttype.ipp:45
+#: src/emu/inpttype.ipp:43 src/emu/inpttype.ipp:161 src/emu/inpttype.ipp:242
+#: src/emu/inpttype.ipp:276 src/emu/inpttype.ipp:310 src/emu/inpttype.ipp:344
+#: src/emu/inpttype.ipp:378 src/emu/inpttype.ipp:412 src/emu/inpttype.ipp:446
+#: src/emu/inpttype.ipp:480
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 12"
+msgid "%p Button 10"
 msgstr ""
 
-#: src/emu/inpttype.ipp:46
+#: src/emu/inpttype.ipp:44 src/emu/inpttype.ipp:162 src/emu/inpttype.ipp:243
+#: src/emu/inpttype.ipp:277 src/emu/inpttype.ipp:311 src/emu/inpttype.ipp:345
+#: src/emu/inpttype.ipp:379 src/emu/inpttype.ipp:413 src/emu/inpttype.ipp:447
+#: src/emu/inpttype.ipp:481
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 13"
+msgid "%p Button 11"
 msgstr ""
 
-#: src/emu/inpttype.ipp:47
+#: src/emu/inpttype.ipp:45 src/emu/inpttype.ipp:163 src/emu/inpttype.ipp:244
+#: src/emu/inpttype.ipp:278 src/emu/inpttype.ipp:312 src/emu/inpttype.ipp:346
+#: src/emu/inpttype.ipp:380 src/emu/inpttype.ipp:414 src/emu/inpttype.ipp:448
+#: src/emu/inpttype.ipp:482
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 14"
+msgid "%p Button 12"
 msgstr ""
 
-#: src/emu/inpttype.ipp:48
+#: src/emu/inpttype.ipp:46 src/emu/inpttype.ipp:164 src/emu/inpttype.ipp:245
+#: src/emu/inpttype.ipp:279 src/emu/inpttype.ipp:313 src/emu/inpttype.ipp:347
+#: src/emu/inpttype.ipp:381 src/emu/inpttype.ipp:415 src/emu/inpttype.ipp:449
+#: src/emu/inpttype.ipp:483
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 15"
+msgid "%p Button 13"
 msgstr ""
 
-#: src/emu/inpttype.ipp:49
+#: src/emu/inpttype.ipp:47 src/emu/inpttype.ipp:165 src/emu/inpttype.ipp:246
+#: src/emu/inpttype.ipp:280 src/emu/inpttype.ipp:314 src/emu/inpttype.ipp:348
+#: src/emu/inpttype.ipp:382 src/emu/inpttype.ipp:416 src/emu/inpttype.ipp:450
+#: src/emu/inpttype.ipp:484
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 16"
+msgid "%p Button 14"
 msgstr ""
 
-#: src/emu/inpttype.ipp:50
+#: src/emu/inpttype.ipp:48 src/emu/inpttype.ipp:166 src/emu/inpttype.ipp:247
+#: src/emu/inpttype.ipp:281 src/emu/inpttype.ipp:315 src/emu/inpttype.ipp:349
+#: src/emu/inpttype.ipp:383 src/emu/inpttype.ipp:417 src/emu/inpttype.ipp:451
+#: src/emu/inpttype.ipp:485
+#, c-format
 msgctxt "input-name"
-msgid "P1 Start"
+msgid "%p Button 15"
 msgstr ""
 
-#: src/emu/inpttype.ipp:51
+#: src/emu/inpttype.ipp:49 src/emu/inpttype.ipp:167 src/emu/inpttype.ipp:248
+#: src/emu/inpttype.ipp:282 src/emu/inpttype.ipp:316 src/emu/inpttype.ipp:350
+#: src/emu/inpttype.ipp:384 src/emu/inpttype.ipp:418 src/emu/inpttype.ipp:452
+#: src/emu/inpttype.ipp:486
+#, c-format
 msgctxt "input-name"
-msgid "P1 Select"
+msgid "%p Button 16"
 msgstr ""
 
-#: src/emu/inpttype.ipp:56
+#: src/emu/inpttype.ipp:50 src/emu/inpttype.ipp:168 src/emu/inpttype.ipp:249
+#: src/emu/inpttype.ipp:283 src/emu/inpttype.ipp:317 src/emu/inpttype.ipp:351
+#: src/emu/inpttype.ipp:385 src/emu/inpttype.ipp:419 src/emu/inpttype.ipp:453
+#: src/emu/inpttype.ipp:487
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong A"
+msgid "%p Start"
 msgstr ""
 
-#: src/emu/inpttype.ipp:57
+#: src/emu/inpttype.ipp:51 src/emu/inpttype.ipp:169 src/emu/inpttype.ipp:250
+#: src/emu/inpttype.ipp:284 src/emu/inpttype.ipp:318 src/emu/inpttype.ipp:352
+#: src/emu/inpttype.ipp:386 src/emu/inpttype.ipp:420 src/emu/inpttype.ipp:454
+#: src/emu/inpttype.ipp:488
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong B"
+msgid "%p Select"
 msgstr ""
 
-#: src/emu/inpttype.ipp:58
+#: src/emu/inpttype.ipp:56 src/emu/inpttype.ipp:174
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong C"
+msgid "%p Mahjong A"
 msgstr ""
 
-#: src/emu/inpttype.ipp:59
+#: src/emu/inpttype.ipp:57 src/emu/inpttype.ipp:175
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong D"
+msgid "%p Mahjong B"
 msgstr ""
 
-#: src/emu/inpttype.ipp:60
+#: src/emu/inpttype.ipp:58 src/emu/inpttype.ipp:176
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong E"
+msgid "%p Mahjong C"
 msgstr ""
 
-#: src/emu/inpttype.ipp:61
+#: src/emu/inpttype.ipp:59 src/emu/inpttype.ipp:177
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong F"
+msgid "%p Mahjong D"
 msgstr ""
 
-#: src/emu/inpttype.ipp:62
+#: src/emu/inpttype.ipp:60 src/emu/inpttype.ipp:178
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong G"
+msgid "%p Mahjong E"
 msgstr ""
 
-#: src/emu/inpttype.ipp:63
+#: src/emu/inpttype.ipp:61 src/emu/inpttype.ipp:179
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong H"
+msgid "%p Mahjong F"
 msgstr ""
 
-#: src/emu/inpttype.ipp:64
+#: src/emu/inpttype.ipp:62 src/emu/inpttype.ipp:180
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong I"
+msgid "%p Mahjong G"
 msgstr ""
 
-#: src/emu/inpttype.ipp:65
+#: src/emu/inpttype.ipp:63 src/emu/inpttype.ipp:181
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong J"
+msgid "%p Mahjong H"
 msgstr ""
 
-#: src/emu/inpttype.ipp:66
+#: src/emu/inpttype.ipp:64 src/emu/inpttype.ipp:182
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong K"
+msgid "%p Mahjong I"
 msgstr ""
 
-#: src/emu/inpttype.ipp:67
+#: src/emu/inpttype.ipp:65 src/emu/inpttype.ipp:183
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong L"
+msgid "%p Mahjong J"
 msgstr ""
 
-#: src/emu/inpttype.ipp:68
+#: src/emu/inpttype.ipp:66 src/emu/inpttype.ipp:184
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong M"
+msgid "%p Mahjong K"
 msgstr ""
 
-#: src/emu/inpttype.ipp:69
+#: src/emu/inpttype.ipp:67 src/emu/inpttype.ipp:185
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong N"
+msgid "%p Mahjong L"
 msgstr ""
 
-#: src/emu/inpttype.ipp:70
+#: src/emu/inpttype.ipp:68 src/emu/inpttype.ipp:186
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong O"
+msgid "%p Mahjong M"
 msgstr ""
 
-#: src/emu/inpttype.ipp:71
+#: src/emu/inpttype.ipp:69 src/emu/inpttype.ipp:187
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong P"
+msgid "%p Mahjong N"
 msgstr ""
 
-#: src/emu/inpttype.ipp:72
+#: src/emu/inpttype.ipp:70 src/emu/inpttype.ipp:188
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Q"
+msgid "%p Mahjong O"
 msgstr ""
 
-#: src/emu/inpttype.ipp:73
+#: src/emu/inpttype.ipp:71 src/emu/inpttype.ipp:189
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Kan"
+msgid "%p Mahjong P"
 msgstr ""
 
-#: src/emu/inpttype.ipp:74
+#: src/emu/inpttype.ipp:72 src/emu/inpttype.ipp:190
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Pon"
+msgid "%p Mahjong Q"
 msgstr ""
 
-#: src/emu/inpttype.ipp:75
+#: src/emu/inpttype.ipp:73 src/emu/inpttype.ipp:191
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Chi"
+msgid "%p Mahjong Kan"
 msgstr ""
 
-#: src/emu/inpttype.ipp:76
+#: src/emu/inpttype.ipp:74 src/emu/inpttype.ipp:192
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Reach"
+msgid "%p Mahjong Pon"
 msgstr ""
 
-#: src/emu/inpttype.ipp:77
+#: src/emu/inpttype.ipp:75 src/emu/inpttype.ipp:193
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Ron"
+msgid "%p Mahjong Chi"
 msgstr ""
 
-#: src/emu/inpttype.ipp:78
+#: src/emu/inpttype.ipp:76 src/emu/inpttype.ipp:194
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Flip Flop"
+msgid "%p Mahjong Reach"
 msgstr ""
 
-#: src/emu/inpttype.ipp:79
+#: src/emu/inpttype.ipp:77 src/emu/inpttype.ipp:195
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Bet"
+msgid "%p Mahjong Ron"
 msgstr ""
 
-#: src/emu/inpttype.ipp:80
+#: src/emu/inpttype.ipp:78 src/emu/inpttype.ipp:200
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Take Score"
+msgid "%p Mahjong Flip Flop"
 msgstr ""
 
-#: src/emu/inpttype.ipp:81
+#: src/emu/inpttype.ipp:79 src/emu/inpttype.ipp:196
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Double Up"
+msgid "%p Mahjong Bet"
 msgstr ""
 
-#: src/emu/inpttype.ipp:82
+#: src/emu/inpttype.ipp:80 src/emu/inpttype.ipp:198
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Big"
+msgid "%p Mahjong Take Score"
 msgstr ""
 
-#: src/emu/inpttype.ipp:83
+#: src/emu/inpttype.ipp:81 src/emu/inpttype.ipp:199
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Small"
+msgid "%p Mahjong Double Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:84
+#: src/emu/inpttype.ipp:82 src/emu/inpttype.ipp:201
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Last Chance"
+msgid "%p Mahjong Big"
 msgstr ""
 
-#: src/emu/inpttype.ipp:89
+#: src/emu/inpttype.ipp:83 src/emu/inpttype.ipp:202
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda A/1"
+msgid "%p Mahjong Small"
 msgstr ""
 
-#: src/emu/inpttype.ipp:90
+#: src/emu/inpttype.ipp:84 src/emu/inpttype.ipp:197
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda B/2"
+msgid "%p Mahjong Last Chance"
 msgstr ""
 
-#: src/emu/inpttype.ipp:91
+#: src/emu/inpttype.ipp:89 src/emu/inpttype.ipp:207
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda C/3"
+msgid "%p Hanafuda A/1"
 msgstr ""
 
-#: src/emu/inpttype.ipp:92
+#: src/emu/inpttype.ipp:90 src/emu/inpttype.ipp:208
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda D/4"
+msgid "%p Hanafuda B/2"
 msgstr ""
 
-#: src/emu/inpttype.ipp:93
+#: src/emu/inpttype.ipp:91 src/emu/inpttype.ipp:209
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda E/5"
+msgid "%p Hanafuda C/3"
 msgstr ""
 
-#: src/emu/inpttype.ipp:94
+#: src/emu/inpttype.ipp:92 src/emu/inpttype.ipp:210
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda F/6"
+msgid "%p Hanafuda D/4"
 msgstr ""
 
-#: src/emu/inpttype.ipp:95
+#: src/emu/inpttype.ipp:93 src/emu/inpttype.ipp:211
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda G/7"
+msgid "%p Hanafuda E/5"
 msgstr ""
 
-#: src/emu/inpttype.ipp:96
+#: src/emu/inpttype.ipp:94 src/emu/inpttype.ipp:212
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda H/8"
+msgid "%p Hanafuda F/6"
 msgstr ""
 
-#: src/emu/inpttype.ipp:97
+#: src/emu/inpttype.ipp:95 src/emu/inpttype.ipp:213
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda Yes"
+msgid "%p Hanafuda G/7"
 msgstr ""
 
-#: src/emu/inpttype.ipp:98
+#: src/emu/inpttype.ipp:96 src/emu/inpttype.ipp:214
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda No"
+msgid "%p Hanafuda H/8"
+msgstr ""
+
+#: src/emu/inpttype.ipp:97 src/emu/inpttype.ipp:215
+#, c-format
+msgctxt "input-name"
+msgid "%p Hanafuda Yes"
+msgstr ""
+
+#: src/emu/inpttype.ipp:98 src/emu/inpttype.ipp:216
+#, c-format
+msgctxt "input-name"
+msgid "%p Hanafuda No"
 msgstr ""
 
 #: src/emu/inpttype.ipp:103
@@ -3751,1551 +3925,6 @@ msgctxt "input-name"
 msgid "Stop All Reels"
 msgstr ""
 
-#: src/emu/inpttype.ipp:140
-msgctxt "input-name"
-msgid "P2 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:141
-msgctxt "input-name"
-msgid "P2 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:142
-msgctxt "input-name"
-msgid "P2 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:143
-msgctxt "input-name"
-msgid "P2 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:144
-msgctxt "input-name"
-msgid "P2 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:145
-msgctxt "input-name"
-msgid "P2 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:146
-msgctxt "input-name"
-msgid "P2 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:147
-msgctxt "input-name"
-msgid "P2 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:148
-msgctxt "input-name"
-msgid "P2 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:149
-msgctxt "input-name"
-msgid "P2 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:150
-msgctxt "input-name"
-msgid "P2 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:151
-msgctxt "input-name"
-msgid "P2 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:152
-msgctxt "input-name"
-msgid "P2 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:153
-msgctxt "input-name"
-msgid "P2 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:154
-msgctxt "input-name"
-msgid "P2 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:155
-msgctxt "input-name"
-msgid "P2 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:156
-msgctxt "input-name"
-msgid "P2 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:157
-msgctxt "input-name"
-msgid "P2 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:158
-msgctxt "input-name"
-msgid "P2 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:159
-msgctxt "input-name"
-msgid "P2 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:160
-msgctxt "input-name"
-msgid "P2 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:161
-msgctxt "input-name"
-msgid "P2 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:162
-msgctxt "input-name"
-msgid "P2 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:163
-msgctxt "input-name"
-msgid "P2 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:164
-msgctxt "input-name"
-msgid "P2 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:165
-msgctxt "input-name"
-msgid "P2 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:166
-msgctxt "input-name"
-msgid "P2 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:167
-msgctxt "input-name"
-msgid "P2 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:168
-msgctxt "input-name"
-msgid "P2 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:169
-msgctxt "input-name"
-msgid "P2 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:174
-msgctxt "input-name"
-msgid "P2 Mahjong A"
-msgstr ""
-
-#: src/emu/inpttype.ipp:175
-msgctxt "input-name"
-msgid "P2 Mahjong B"
-msgstr ""
-
-#: src/emu/inpttype.ipp:176
-msgctxt "input-name"
-msgid "P2 Mahjong C"
-msgstr ""
-
-#: src/emu/inpttype.ipp:177
-msgctxt "input-name"
-msgid "P2 Mahjong D"
-msgstr ""
-
-#: src/emu/inpttype.ipp:178
-msgctxt "input-name"
-msgid "P2 Mahjong E"
-msgstr ""
-
-#: src/emu/inpttype.ipp:179
-msgctxt "input-name"
-msgid "P2 Mahjong F"
-msgstr ""
-
-#: src/emu/inpttype.ipp:180
-msgctxt "input-name"
-msgid "P2 Mahjong G"
-msgstr ""
-
-#: src/emu/inpttype.ipp:181
-msgctxt "input-name"
-msgid "P2 Mahjong H"
-msgstr ""
-
-#: src/emu/inpttype.ipp:182
-msgctxt "input-name"
-msgid "P2 Mahjong I"
-msgstr ""
-
-#: src/emu/inpttype.ipp:183
-msgctxt "input-name"
-msgid "P2 Mahjong J"
-msgstr ""
-
-#: src/emu/inpttype.ipp:184
-msgctxt "input-name"
-msgid "P2 Mahjong K"
-msgstr ""
-
-#: src/emu/inpttype.ipp:185
-msgctxt "input-name"
-msgid "P2 Mahjong L"
-msgstr ""
-
-#: src/emu/inpttype.ipp:186
-msgctxt "input-name"
-msgid "P2 Mahjong M"
-msgstr ""
-
-#: src/emu/inpttype.ipp:187
-msgctxt "input-name"
-msgid "P2 Mahjong N"
-msgstr ""
-
-#: src/emu/inpttype.ipp:188
-msgctxt "input-name"
-msgid "P2 Mahjong O"
-msgstr ""
-
-#: src/emu/inpttype.ipp:189
-msgctxt "input-name"
-msgid "P2 Mahjong P"
-msgstr ""
-
-#: src/emu/inpttype.ipp:190
-msgctxt "input-name"
-msgid "P2 Mahjong Q"
-msgstr ""
-
-#: src/emu/inpttype.ipp:191
-msgctxt "input-name"
-msgid "P2 Mahjong Kan"
-msgstr ""
-
-#: src/emu/inpttype.ipp:192
-msgctxt "input-name"
-msgid "P2 Mahjong Pon"
-msgstr ""
-
-#: src/emu/inpttype.ipp:193
-msgctxt "input-name"
-msgid "P2 Mahjong Chi"
-msgstr ""
-
-#: src/emu/inpttype.ipp:194
-msgctxt "input-name"
-msgid "P2 Mahjong Reach"
-msgstr ""
-
-#: src/emu/inpttype.ipp:195
-msgctxt "input-name"
-msgid "P2 Mahjong Ron"
-msgstr ""
-
-#: src/emu/inpttype.ipp:196
-msgctxt "input-name"
-msgid "P2 Mahjong Bet"
-msgstr ""
-
-#: src/emu/inpttype.ipp:197
-msgctxt "input-name"
-msgid "P2 Mahjong Last Chance"
-msgstr ""
-
-#: src/emu/inpttype.ipp:198
-msgctxt "input-name"
-msgid "P2 Mahjong Take Score"
-msgstr ""
-
-#: src/emu/inpttype.ipp:199
-msgctxt "input-name"
-msgid "P2 Mahjong Double Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:200
-msgctxt "input-name"
-msgid "P2 Mahjong Flip Flop"
-msgstr ""
-
-#: src/emu/inpttype.ipp:201
-msgctxt "input-name"
-msgid "P2 Mahjong Big"
-msgstr ""
-
-#: src/emu/inpttype.ipp:202
-msgctxt "input-name"
-msgid "P2 Mahjong Small"
-msgstr ""
-
-#: src/emu/inpttype.ipp:207
-msgctxt "input-name"
-msgid "P2 Hanafuda A/1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:208
-msgctxt "input-name"
-msgid "P2 Hanafuda B/2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:209
-msgctxt "input-name"
-msgid "P2 Hanafuda C/3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:210
-msgctxt "input-name"
-msgid "P2 Hanafuda D/4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:211
-msgctxt "input-name"
-msgid "P2 Hanafuda E/5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:212
-msgctxt "input-name"
-msgid "P2 Hanafuda F/6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:213
-msgctxt "input-name"
-msgid "P2 Hanafuda G/7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:214
-msgctxt "input-name"
-msgid "P2 Hanafuda H/8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:215
-msgctxt "input-name"
-msgid "P2 Hanafuda Yes"
-msgstr ""
-
-#: src/emu/inpttype.ipp:216
-msgctxt "input-name"
-msgid "P2 Hanafuda No"
-msgstr ""
-
-#: src/emu/inpttype.ipp:221
-msgctxt "input-name"
-msgid "P3 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:222
-msgctxt "input-name"
-msgid "P3 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:223
-msgctxt "input-name"
-msgid "P3 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:224
-msgctxt "input-name"
-msgid "P3 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:225
-msgctxt "input-name"
-msgid "P3 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:226
-msgctxt "input-name"
-msgid "P3 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:227
-msgctxt "input-name"
-msgid "P3 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:228
-msgctxt "input-name"
-msgid "P3 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:229
-msgctxt "input-name"
-msgid "P3 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:230
-msgctxt "input-name"
-msgid "P3 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:231
-msgctxt "input-name"
-msgid "P3 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:232
-msgctxt "input-name"
-msgid "P3 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:233
-msgctxt "input-name"
-msgid "P3 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:234
-msgctxt "input-name"
-msgid "P3 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:235
-msgctxt "input-name"
-msgid "P3 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:236
-msgctxt "input-name"
-msgid "P3 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:237
-msgctxt "input-name"
-msgid "P3 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:238
-msgctxt "input-name"
-msgid "P3 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:239
-msgctxt "input-name"
-msgid "P3 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:240
-msgctxt "input-name"
-msgid "P3 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:241
-msgctxt "input-name"
-msgid "P3 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:242
-msgctxt "input-name"
-msgid "P3 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:243
-msgctxt "input-name"
-msgid "P3 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:244
-msgctxt "input-name"
-msgid "P3 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:245
-msgctxt "input-name"
-msgid "P3 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:246
-msgctxt "input-name"
-msgid "P3 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:247
-msgctxt "input-name"
-msgid "P3 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:248
-msgctxt "input-name"
-msgid "P3 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:249
-msgctxt "input-name"
-msgid "P3 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:250
-msgctxt "input-name"
-msgid "P3 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:255
-msgctxt "input-name"
-msgid "P4 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:256
-msgctxt "input-name"
-msgid "P4 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:257
-msgctxt "input-name"
-msgid "P4 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:258
-msgctxt "input-name"
-msgid "P4 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:259
-msgctxt "input-name"
-msgid "P4 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:260
-msgctxt "input-name"
-msgid "P4 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:261
-msgctxt "input-name"
-msgid "P4 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:262
-msgctxt "input-name"
-msgid "P4 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:263
-msgctxt "input-name"
-msgid "P4 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:264
-msgctxt "input-name"
-msgid "P4 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:265
-msgctxt "input-name"
-msgid "P4 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:266
-msgctxt "input-name"
-msgid "P4 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:267
-msgctxt "input-name"
-msgid "P4 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:268
-msgctxt "input-name"
-msgid "P4 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:269
-msgctxt "input-name"
-msgid "P4 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:270
-msgctxt "input-name"
-msgid "P4 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:271
-msgctxt "input-name"
-msgid "P4 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:272
-msgctxt "input-name"
-msgid "P4 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:273
-msgctxt "input-name"
-msgid "P4 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:274
-msgctxt "input-name"
-msgid "P4 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:275
-msgctxt "input-name"
-msgid "P4 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:276
-msgctxt "input-name"
-msgid "P4 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:277
-msgctxt "input-name"
-msgid "P4 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:278
-msgctxt "input-name"
-msgid "P4 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:279
-msgctxt "input-name"
-msgid "P4 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:280
-msgctxt "input-name"
-msgid "P4 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:281
-msgctxt "input-name"
-msgid "P4 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:282
-msgctxt "input-name"
-msgid "P4 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:283
-msgctxt "input-name"
-msgid "P4 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:284
-msgctxt "input-name"
-msgid "P4 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:289
-msgctxt "input-name"
-msgid "P5 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:290
-msgctxt "input-name"
-msgid "P5 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:291
-msgctxt "input-name"
-msgid "P5 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:292
-msgctxt "input-name"
-msgid "P5 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:293
-msgctxt "input-name"
-msgid "P5 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:294
-msgctxt "input-name"
-msgid "P5 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:295
-msgctxt "input-name"
-msgid "P5 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:296
-msgctxt "input-name"
-msgid "P5 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:297
-msgctxt "input-name"
-msgid "P5 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:298
-msgctxt "input-name"
-msgid "P5 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:299
-msgctxt "input-name"
-msgid "P5 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:300
-msgctxt "input-name"
-msgid "P5 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:301
-msgctxt "input-name"
-msgid "P5 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:302
-msgctxt "input-name"
-msgid "P5 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:303
-msgctxt "input-name"
-msgid "P5 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:304
-msgctxt "input-name"
-msgid "P5 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:305
-msgctxt "input-name"
-msgid "P5 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:306
-msgctxt "input-name"
-msgid "P5 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:307
-msgctxt "input-name"
-msgid "P5 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:308
-msgctxt "input-name"
-msgid "P5 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:309
-msgctxt "input-name"
-msgid "P5 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:310
-msgctxt "input-name"
-msgid "P5 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:311
-msgctxt "input-name"
-msgid "P5 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:312
-msgctxt "input-name"
-msgid "P5 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:313
-msgctxt "input-name"
-msgid "P5 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:314
-msgctxt "input-name"
-msgid "P5 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:315
-msgctxt "input-name"
-msgid "P5 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:316
-msgctxt "input-name"
-msgid "P5 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:317
-msgctxt "input-name"
-msgid "P5 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:318
-msgctxt "input-name"
-msgid "P5 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:323
-msgctxt "input-name"
-msgid "P6 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:324
-msgctxt "input-name"
-msgid "P6 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:325
-msgctxt "input-name"
-msgid "P6 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:326
-msgctxt "input-name"
-msgid "P6 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:327
-msgctxt "input-name"
-msgid "P6 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:328
-msgctxt "input-name"
-msgid "P6 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:329
-msgctxt "input-name"
-msgid "P6 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:330
-msgctxt "input-name"
-msgid "P6 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:331
-msgctxt "input-name"
-msgid "P6 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:332
-msgctxt "input-name"
-msgid "P6 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:333
-msgctxt "input-name"
-msgid "P6 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:334
-msgctxt "input-name"
-msgid "P6 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:335
-msgctxt "input-name"
-msgid "P6 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:336
-msgctxt "input-name"
-msgid "P6 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:337
-msgctxt "input-name"
-msgid "P6 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:338
-msgctxt "input-name"
-msgid "P6 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:339
-msgctxt "input-name"
-msgid "P6 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:340
-msgctxt "input-name"
-msgid "P6 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:341
-msgctxt "input-name"
-msgid "P6 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:342
-msgctxt "input-name"
-msgid "P6 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:343
-msgctxt "input-name"
-msgid "P6 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:344
-msgctxt "input-name"
-msgid "P6 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:345
-msgctxt "input-name"
-msgid "P6 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:346
-msgctxt "input-name"
-msgid "P6 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:347
-msgctxt "input-name"
-msgid "P6 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:348
-msgctxt "input-name"
-msgid "P6 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:349
-msgctxt "input-name"
-msgid "P6 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:350
-msgctxt "input-name"
-msgid "P6 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:351
-msgctxt "input-name"
-msgid "P6 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:352
-msgctxt "input-name"
-msgid "P6 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:357
-msgctxt "input-name"
-msgid "P7 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:358
-msgctxt "input-name"
-msgid "P7 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:359
-msgctxt "input-name"
-msgid "P7 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:360
-msgctxt "input-name"
-msgid "P7 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:361
-msgctxt "input-name"
-msgid "P7 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:362
-msgctxt "input-name"
-msgid "P7 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:363
-msgctxt "input-name"
-msgid "P7 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:364
-msgctxt "input-name"
-msgid "P7 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:365
-msgctxt "input-name"
-msgid "P7 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:366
-msgctxt "input-name"
-msgid "P7 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:367
-msgctxt "input-name"
-msgid "P7 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:368
-msgctxt "input-name"
-msgid "P7 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:369
-msgctxt "input-name"
-msgid "P7 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:370
-msgctxt "input-name"
-msgid "P7 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:371
-msgctxt "input-name"
-msgid "P7 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:372
-msgctxt "input-name"
-msgid "P7 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:373
-msgctxt "input-name"
-msgid "P7 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:374
-msgctxt "input-name"
-msgid "P7 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:375
-msgctxt "input-name"
-msgid "P7 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:376
-msgctxt "input-name"
-msgid "P7 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:377
-msgctxt "input-name"
-msgid "P7 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:378
-msgctxt "input-name"
-msgid "P7 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:379
-msgctxt "input-name"
-msgid "P7 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:380
-msgctxt "input-name"
-msgid "P7 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:381
-msgctxt "input-name"
-msgid "P7 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:382
-msgctxt "input-name"
-msgid "P7 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:383
-msgctxt "input-name"
-msgid "P7 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:384
-msgctxt "input-name"
-msgid "P7 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:385
-msgctxt "input-name"
-msgid "P7 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:386
-msgctxt "input-name"
-msgid "P7 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:391
-msgctxt "input-name"
-msgid "P8 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:392
-msgctxt "input-name"
-msgid "P8 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:393
-msgctxt "input-name"
-msgid "P8 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:394
-msgctxt "input-name"
-msgid "P8 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:395
-msgctxt "input-name"
-msgid "P8 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:396
-msgctxt "input-name"
-msgid "P8 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:397
-msgctxt "input-name"
-msgid "P8 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:398
-msgctxt "input-name"
-msgid "P8 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:399
-msgctxt "input-name"
-msgid "P8 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:400
-msgctxt "input-name"
-msgid "P8 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:401
-msgctxt "input-name"
-msgid "P8 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:402
-msgctxt "input-name"
-msgid "P8 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:403
-msgctxt "input-name"
-msgid "P8 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:404
-msgctxt "input-name"
-msgid "P8 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:405
-msgctxt "input-name"
-msgid "P8 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:406
-msgctxt "input-name"
-msgid "P8 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:407
-msgctxt "input-name"
-msgid "P8 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:408
-msgctxt "input-name"
-msgid "P8 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:409
-msgctxt "input-name"
-msgid "P8 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:410
-msgctxt "input-name"
-msgid "P8 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:411
-msgctxt "input-name"
-msgid "P8 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:412
-msgctxt "input-name"
-msgid "P8 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:413
-msgctxt "input-name"
-msgid "P8 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:414
-msgctxt "input-name"
-msgid "P8 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:415
-msgctxt "input-name"
-msgid "P8 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:416
-msgctxt "input-name"
-msgid "P8 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:417
-msgctxt "input-name"
-msgid "P8 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:418
-msgctxt "input-name"
-msgid "P8 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:419
-msgctxt "input-name"
-msgid "P8 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:420
-msgctxt "input-name"
-msgid "P8 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:425
-msgctxt "input-name"
-msgid "P9 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:426
-msgctxt "input-name"
-msgid "P9 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:427
-msgctxt "input-name"
-msgid "P9 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:428
-msgctxt "input-name"
-msgid "P9 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:429
-msgctxt "input-name"
-msgid "P9 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:430
-msgctxt "input-name"
-msgid "P9 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:431
-msgctxt "input-name"
-msgid "P9 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:432
-msgctxt "input-name"
-msgid "P9 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:433
-msgctxt "input-name"
-msgid "P9 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:434
-msgctxt "input-name"
-msgid "P9 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:435
-msgctxt "input-name"
-msgid "P9 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:436
-msgctxt "input-name"
-msgid "P9 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:437
-msgctxt "input-name"
-msgid "P9 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:438
-msgctxt "input-name"
-msgid "P9 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:439
-msgctxt "input-name"
-msgid "P9 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:440
-msgctxt "input-name"
-msgid "P9 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:441
-msgctxt "input-name"
-msgid "P9 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:442
-msgctxt "input-name"
-msgid "P9 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:443
-msgctxt "input-name"
-msgid "P9 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:444
-msgctxt "input-name"
-msgid "P9 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:445
-msgctxt "input-name"
-msgid "P9 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:446
-msgctxt "input-name"
-msgid "P9 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:447
-msgctxt "input-name"
-msgid "P9 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:448
-msgctxt "input-name"
-msgid "P9 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:449
-msgctxt "input-name"
-msgid "P9 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:450
-msgctxt "input-name"
-msgid "P9 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:451
-msgctxt "input-name"
-msgid "P9 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:452
-msgctxt "input-name"
-msgid "P9 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:453
-msgctxt "input-name"
-msgid "P9 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:454
-msgctxt "input-name"
-msgid "P9 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:459
-msgctxt "input-name"
-msgid "P10 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:460
-msgctxt "input-name"
-msgid "P10 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:461
-msgctxt "input-name"
-msgid "P10 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:462
-msgctxt "input-name"
-msgid "P10 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:463
-msgctxt "input-name"
-msgid "P10 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:464
-msgctxt "input-name"
-msgid "P10 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:465
-msgctxt "input-name"
-msgid "P10 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:466
-msgctxt "input-name"
-msgid "P10 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:467
-msgctxt "input-name"
-msgid "P10 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:468
-msgctxt "input-name"
-msgid "P10 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:469
-msgctxt "input-name"
-msgid "P10 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:470
-msgctxt "input-name"
-msgid "P10 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:471
-msgctxt "input-name"
-msgid "P10 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:472
-msgctxt "input-name"
-msgid "P10 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:473
-msgctxt "input-name"
-msgid "P10 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:474
-msgctxt "input-name"
-msgid "P10 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:475
-msgctxt "input-name"
-msgid "P10 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:476
-msgctxt "input-name"
-msgid "P10 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:477
-msgctxt "input-name"
-msgid "P10 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:478
-msgctxt "input-name"
-msgid "P10 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:479
-msgctxt "input-name"
-msgid "P10 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:480
-msgctxt "input-name"
-msgid "P10 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:481
-msgctxt "input-name"
-msgid "P10 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:482
-msgctxt "input-name"
-msgid "P10 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:483
-msgctxt "input-name"
-msgid "P10 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:484
-msgctxt "input-name"
-msgid "P10 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:485
-msgctxt "input-name"
-msgid "P10 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:486
-msgctxt "input-name"
-msgid "P10 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:487
-msgctxt "input-name"
-msgid "P10 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:488
-msgctxt "input-name"
-msgid "P10 Select"
-msgstr ""
-
 #: src/emu/inpttype.ipp:493
 msgctxt "input-name"
 msgid "1 Player Start"
@@ -5476,154 +4105,31 @@ msgctxt "input-name"
 msgid "Volume Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:550
-msgctxt "input-name"
-msgid "P1 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:551
-msgctxt "input-name"
-msgid "P2 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:552
-msgctxt "input-name"
-msgid "P3 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:553
-msgctxt "input-name"
-msgid "P4 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:554
-msgctxt "input-name"
-msgid "P5 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:555
-msgctxt "input-name"
-msgid "P6 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:556
-msgctxt "input-name"
-msgid "P7 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:557
-msgctxt "input-name"
-msgid "P8 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:558
-msgctxt "input-name"
-msgid "P9 Pedal 1"
-msgstr ""
-
+#: src/emu/inpttype.ipp:550 src/emu/inpttype.ipp:551 src/emu/inpttype.ipp:552
+#: src/emu/inpttype.ipp:553 src/emu/inpttype.ipp:554 src/emu/inpttype.ipp:555
+#: src/emu/inpttype.ipp:556 src/emu/inpttype.ipp:557 src/emu/inpttype.ipp:558
 #: src/emu/inpttype.ipp:559
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:564
-msgctxt "input-name"
-msgid "P1 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:565
-msgctxt "input-name"
-msgid "P2 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:566
-msgctxt "input-name"
-msgid "P3 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:567
-msgctxt "input-name"
-msgid "P4 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:568
-msgctxt "input-name"
-msgid "P5 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:569
-msgctxt "input-name"
-msgid "P6 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:570
-msgctxt "input-name"
-msgid "P7 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:571
-msgctxt "input-name"
-msgid "P8 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:572
-msgctxt "input-name"
-msgid "P9 Pedal 2"
+msgid "%p Pedal 1"
 msgstr ""
 
+#: src/emu/inpttype.ipp:564 src/emu/inpttype.ipp:565 src/emu/inpttype.ipp:566
+#: src/emu/inpttype.ipp:567 src/emu/inpttype.ipp:568 src/emu/inpttype.ipp:569
+#: src/emu/inpttype.ipp:570 src/emu/inpttype.ipp:571 src/emu/inpttype.ipp:572
 #: src/emu/inpttype.ipp:573
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:578
-msgctxt "input-name"
-msgid "P1 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:579
-msgctxt "input-name"
-msgid "P2 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:580
-msgctxt "input-name"
-msgid "P3 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:581
-msgctxt "input-name"
-msgid "P4 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:582
-msgctxt "input-name"
-msgid "P5 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:583
-msgctxt "input-name"
-msgid "P6 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:584
-msgctxt "input-name"
-msgid "P7 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:585
-msgctxt "input-name"
-msgid "P8 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:586
-msgctxt "input-name"
-msgid "P9 Pedal 3"
+msgid "%p Pedal 2"
 msgstr ""
 
+#: src/emu/inpttype.ipp:578 src/emu/inpttype.ipp:579 src/emu/inpttype.ipp:580
+#: src/emu/inpttype.ipp:581 src/emu/inpttype.ipp:582 src/emu/inpttype.ipp:583
+#: src/emu/inpttype.ipp:584 src/emu/inpttype.ipp:585 src/emu/inpttype.ipp:586
 #: src/emu/inpttype.ipp:587
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 3"
+msgid "%p Pedal 3"
 msgstr ""
 
 #: src/emu/inpttype.ipp:592
diff --git a/language/Polish/strings.po b/language/Polish/strings.po
index 5bab5398148..ae1a2831a10 100644
--- a/language/Polish/strings.po
+++ b/language/Polish/strings.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-19 02:50+1100\n"
+"POT-Creation-Date: 2021-12-09 04:44+1100\n"
 "PO-Revision-Date: 2016-02-20 18:03+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: MAME Language Team\n"
@@ -262,12 +262,12 @@ msgstr ""
 msgid "Driver: \"%1$s\" software list "
 msgstr ""
 
-#: src/frontend/mame/ui/selsoft.cpp:711 src/frontend/mame/ui/selgame.cpp:1066
+#: src/frontend/mame/ui/selsoft.cpp:711 src/frontend/mame/ui/selgame.cpp:1076
 #, c-format
 msgid "%1$s: %2$s - Search: %3$s_"
 msgstr ""
 
-#: src/frontend/mame/ui/selsoft.cpp:713 src/frontend/mame/ui/selgame.cpp:1068
+#: src/frontend/mame/ui/selsoft.cpp:713 src/frontend/mame/ui/selgame.cpp:1078
 #, c-format
 msgid "Search: %1$s_"
 msgstr ""
@@ -277,7 +277,7 @@ msgstr ""
 msgid "Software list/item: %1$s:%2$s"
 msgstr ""
 
-#: src/frontend/mame/ui/optsmenu.cpp:73 src/frontend/mame/ui/sndmenu.cpp:165
+#: src/frontend/mame/ui/optsmenu.cpp:73 src/frontend/mame/ui/sndmenu.cpp:161
 msgid "Sound Options"
 msgstr ""
 
@@ -372,11 +372,11 @@ msgid "Show mouse pointer"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:39
-msgid "Confirm quit from machines"
+msgid "Confirm quit from emulation"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:40
-msgid "Skip information screen at startup"
+msgid "Skip system information screen"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:41
@@ -392,7 +392,7 @@ msgid "Skip BIOS selection menu"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:44
-msgid "Skip software parts selection menu"
+msgid "Skip software part selection menu"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:45
@@ -544,7 +544,7 @@ msgid "UI active"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:91
-msgid "Offscreen reload"
+msgid "Off-screen reload"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:92
@@ -560,7 +560,7 @@ msgid "Natural keyboard"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:95
-msgid "Simultaneous contradictory"
+msgid "Allow contradictory joystick inputs"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:96
@@ -584,7 +584,7 @@ msgid "Pedal Device Assignment"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:106
-msgid "Adstick Device Assignment"
+msgid "AD Stick Device Assignment"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:107
@@ -671,14 +671,14 @@ msgstr ""
 msgid "Wait Vertical Sync"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:687
+#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:689
 #: src/frontend/mame/ui/videoopt.cpp:191 src/frontend/mame/ui/custui.cpp:490
 #: src/frontend/mame/ui/analogipt.cpp:471 plugins/cheatfind/init.lua:766
 #: plugins/cheatfind/init.lua:777 plugins/cheat/init.lua:668
 msgid "On"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:690
+#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:692
 #: src/frontend/mame/ui/videoopt.cpp:207 src/frontend/mame/ui/custui.cpp:490
 #: src/frontend/mame/ui/analogipt.cpp:471 plugins/cheatfind/init.lua:763
 #: plugins/cheatfind/init.lua:774 plugins/cheat/init.lua:671
@@ -686,11 +686,11 @@ msgstr ""
 msgid "Off"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:693
+#: src/frontend/mame/ui/menu.cpp:695
 msgid "Auto"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:1195
+#: src/frontend/mame/ui/menu.cpp:1197
 #: src/frontend/mame/ui/simpleselgame.cpp:278
 #: src/frontend/mame/ui/selmenu.cpp:1280
 msgid "Return to Previous Menu"
@@ -698,7 +698,7 @@ msgstr ""
 
 #: src/frontend/mame/ui/filemngr.cpp:139
 #: src/frontend/mame/ui/confswitch.cpp:119
-#: src/frontend/mame/ui/inputmap.cpp:559 src/frontend/mame/ui/analogipt.cpp:360
+#: src/frontend/mame/ui/inputmap.cpp:563 src/frontend/mame/ui/analogipt.cpp:360
 #, c-format
 msgid "[root%1$s]"
 msgstr ""
@@ -941,22 +941,22 @@ msgid ""
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "GHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "MHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "kHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "Hz"
 msgstr ""
 
@@ -980,38 +980,38 @@ msgstr ""
 msgid "Vector"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:480
+#: src/frontend/mame/ui/info.cpp:483
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:480
+#: src/frontend/mame/ui/info.cpp:483
 msgid "%2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:497
+#: src/frontend/mame/ui/info.cpp:500
 #, c-format
 msgid "Screen '%1$s'"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:499
+#: src/frontend/mame/ui/info.cpp:502
 msgid "Screen"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:570 src/frontend/mame/ui/info.cpp:581
+#: src/frontend/mame/ui/info.cpp:573 src/frontend/mame/ui/info.cpp:584
 #, c-format
 msgid "%1$s:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:662
+#: src/frontend/mame/ui/info.cpp:665
 msgid "Not supported"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:665
+#: src/frontend/mame/ui/info.cpp:668
 msgid "Partially supported"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:674
+#: src/frontend/mame/ui/info.cpp:677
 msgid "[empty]"
 msgstr ""
 
@@ -1084,7 +1084,7 @@ msgid "Emulated"
 msgstr ""
 
 #: src/frontend/mame/ui/keyboard.cpp:59 src/frontend/mame/ui/confswitch.cpp:117
-#: src/frontend/mame/ui/inputmap.cpp:557 src/frontend/mame/ui/analogipt.cpp:358
+#: src/frontend/mame/ui/inputmap.cpp:561 src/frontend/mame/ui/analogipt.cpp:358
 #, c-format
 msgid "%1$s [root%2$s]"
 msgstr ""
@@ -1444,7 +1444,7 @@ msgctxt "swlist-info"
 msgid "Software list/item"
 msgstr ""
 
-#: src/frontend/mame/ui/datmenu.cpp:88 src/frontend/mame/ui/selmenu.cpp:2698
+#: src/frontend/mame/ui/datmenu.cpp:88 src/frontend/mame/ui/selmenu.cpp:2707
 msgid "Software List Info"
 msgstr ""
 
@@ -1559,7 +1559,7 @@ msgstr ""
 msgid "Configure Machine:"
 msgstr ""
 
-#: src/frontend/mame/ui/miscmenu.cpp:858 src/frontend/mame/ui/selmenu.cpp:2638
+#: src/frontend/mame/ui/miscmenu.cpp:858 src/frontend/mame/ui/selmenu.cpp:2647
 msgid " (default)"
 msgstr ""
 
@@ -1576,7 +1576,7 @@ msgid ""
 "Press %2$s to return to emulation"
 msgstr ""
 
-#: src/frontend/mame/ui/info_pty.cpp:30 src/frontend/mame/ui/mainmenu.cpp:155
+#: src/frontend/mame/ui/info_pty.cpp:30
 msgid "Pseudo terminals"
 msgstr ""
 
@@ -1644,52 +1644,52 @@ msgstr ""
 msgid "Other Controls"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:227
+#: src/frontend/mame/ui/inputmap.cpp:231
 msgid "This machine has no configurable inputs."
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:327
+#: src/frontend/mame/ui/inputmap.cpp:331
 msgid "Pressed"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:397
+#: src/frontend/mame/ui/inputmap.cpp:401
 msgid "Invalid sequence entered"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:542
+#: src/frontend/mame/ui/inputmap.cpp:546
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:543
+#: src/frontend/mame/ui/inputmap.cpp:547
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog Inc"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:544
+#: src/frontend/mame/ui/inputmap.cpp:548
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog Dec"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:586
+#: src/frontend/mame/ui/inputmap.cpp:590
 #, c-format
 msgid "Press %1$s to set\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:587
+#: src/frontend/mame/ui/inputmap.cpp:591
 #, c-format
 msgid "Press %1$s to append\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:588
+#: src/frontend/mame/ui/inputmap.cpp:592
 #, c-format
 msgid "Press %1$s to clear\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:589
+#: src/frontend/mame/ui/inputmap.cpp:593
 #, c-format
 msgid "Press %1$s to restore default\n"
 msgstr ""
@@ -1753,7 +1753,7 @@ msgid ""
 msgstr ""
 
 #: src/frontend/mame/ui/simpleselgame.cpp:273
-#: src/frontend/mame/ui/selgame.cpp:436
+#: src/frontend/mame/ui/selgame.cpp:443
 msgid "Configure Options"
 msgstr ""
 
@@ -2081,16 +2081,16 @@ msgstr ""
 msgid "Expand to fit"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:437
+#: src/frontend/mame/ui/selgame.cpp:444
 msgid "Configure Machine"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:1050
+#: src/frontend/mame/ui/selgame.cpp:1060
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d machines (%5$d BIOS) )"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:1078
+#: src/frontend/mame/ui/selgame.cpp:1088
 #, c-format
 msgid "System: %1$-.100s"
 msgstr ""
@@ -2112,7 +2112,7 @@ msgstr ""
 #: src/frontend/mame/ui/auditmenu.cpp:98
 #, c-format
 msgid ""
-"Auditing ROMs for machine %2$u of %3$u...\n"
+"Auditing media for machine %2$u of %3$u...\n"
 "%1$s"
 msgstr ""
 
@@ -2127,12 +2127,12 @@ msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:136
 #, c-format
-msgid "Audit ROMs for %1$u machines marked unavailable"
+msgid "Audit media for %1$u machines marked unavailable"
 msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:137
 #, c-format
-msgid "Audit ROMs for all %1$u machines"
+msgid "Audit media for all %1$u machines"
 msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:154
@@ -2338,84 +2338,84 @@ msgctxt "color-sample"
 msgid "Clone"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:914
+#: src/frontend/mame/ui/custui.cpp:906
 msgid "ARGB Settings"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:919 src/frontend/mame/ui/custui.cpp:922
+#: src/frontend/mame/ui/custui.cpp:911 src/frontend/mame/ui/custui.cpp:914
 msgctxt "color-channel"
 msgid "Alpha"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:927 src/frontend/mame/ui/custui.cpp:930
+#: src/frontend/mame/ui/custui.cpp:919 src/frontend/mame/ui/custui.cpp:922
 msgctxt "color-channel"
 msgid "Red"
 msgstr ""
 
+#: src/frontend/mame/ui/custui.cpp:927 src/frontend/mame/ui/custui.cpp:930
+msgctxt "color-channel"
+msgid "Green"
+msgstr ""
+
 #: src/frontend/mame/ui/custui.cpp:935 src/frontend/mame/ui/custui.cpp:938
 msgctxt "color-channel"
-msgid "Green"
-msgstr ""
-
-#: src/frontend/mame/ui/custui.cpp:943 src/frontend/mame/ui/custui.cpp:946
-msgctxt "color-channel"
 msgid "Blue"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:949
+#: src/frontend/mame/ui/custui.cpp:941
 msgid "Choose from palette"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:996
+#: src/frontend/mame/ui/custui.cpp:988
 msgid "Color preview:"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1093
+#: src/frontend/mame/ui/custui.cpp:1085
 msgctxt "color-preset"
 msgid "White"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1094
+#: src/frontend/mame/ui/custui.cpp:1086
 msgctxt "color-preset"
 msgid "Silver"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1095
+#: src/frontend/mame/ui/custui.cpp:1087
 msgctxt "color-preset"
 msgid "Gray"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1096
+#: src/frontend/mame/ui/custui.cpp:1088
 msgctxt "color-preset"
 msgid "Black"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1097
+#: src/frontend/mame/ui/custui.cpp:1089
 msgctxt "color-preset"
 msgid "Red"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1098
+#: src/frontend/mame/ui/custui.cpp:1090
 msgctxt "color-preset"
 msgid "Orange"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1099
+#: src/frontend/mame/ui/custui.cpp:1091
 msgctxt "color-preset"
 msgid "Yellow"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1100
+#: src/frontend/mame/ui/custui.cpp:1092
 msgctxt "color-preset"
 msgid "Green"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1101
+#: src/frontend/mame/ui/custui.cpp:1093
 msgctxt "color-preset"
 msgid "Blue"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1102
+#: src/frontend/mame/ui/custui.cpp:1094
 msgctxt "color-preset"
 msgid "Violet"
 msgstr ""
@@ -2480,7 +2480,7 @@ msgid "Input (general)"
 msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:123
-msgid "Input (this Machine)"
+msgid "Input (this machine)"
 msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:126
@@ -2519,6 +2519,10 @@ msgstr ""
 msgid "Tape Control"
 msgstr ""
 
+#: src/frontend/mame/ui/mainmenu.cpp:155
+msgid "Pseudo Terminals"
+msgstr ""
+
 #: src/frontend/mame/ui/mainmenu.cpp:158
 msgid "BIOS Selection"
 msgstr ""
@@ -2557,7 +2561,7 @@ msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:200
 #, c-format
-msgid "About %s"
+msgid "About %1$s"
 msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:212
@@ -2717,373 +2721,373 @@ msgstr ""
 msgid "%1$s %2$s"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2235
+#: src/frontend/mame/ui/selmenu.cpp:2244
 msgid "Images"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2236
+#: src/frontend/mame/ui/selmenu.cpp:2245
 msgid "Infos"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2551
+#: src/frontend/mame/ui/selmenu.cpp:2560
 msgid ""
 "Required ROM/disk images for the selected system are missing or incorrect. "
 "Please acquire the correct files or select a different system.\n"
 "\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2567
+#: src/frontend/mame/ui/selmenu.cpp:2576
 msgid ""
 "Required ROM/disk images for the selected software are missing or incorrect. "
 "Please acquire the correct files or select a different software item.\n"
 "\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2583
+#: src/frontend/mame/ui/selmenu.cpp:2592
 msgid "incorrect checksum"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2586
+#: src/frontend/mame/ui/selmenu.cpp:2595
 msgid "incorrect length"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2589
+#: src/frontend/mame/ui/selmenu.cpp:2598
 msgid "not found"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2600
+#: src/frontend/mame/ui/selmenu.cpp:2609
 #, c-format
 msgid "%1$s (%2$s) - %3$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2602
+#: src/frontend/mame/ui/selmenu.cpp:2611
 #, c-format
 msgid "%1$s - %2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2606
+#: src/frontend/mame/ui/selmenu.cpp:2615
 msgid "Press any key to continue."
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2735
+#: src/frontend/mame/ui/selmenu.cpp:2744
 msgid "General Info"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2887
-#, c-format
-msgid "Romset\t%1$s\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2888
-#, c-format
-msgid "Year\t%1$s\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2889
-#, c-format
-msgid "Manufacturer\t%1$s\n"
-msgstr ""
-
 #: src/frontend/mame/ui/selmenu.cpp:2896
 #, c-format
-msgid "Driver is Clone of\t%1$s\n"
+msgid "Romset\t%1$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2901
-msgid "Driver is Parent\t\n"
+#: src/frontend/mame/ui/selmenu.cpp:2897
+#, c-format
+msgid "Year\t%1$s\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2898
+#, c-format
+msgid "Manufacturer\t%1$s\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2905
-msgid "Analog Controls\tYes\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2907
-msgid "Keyboard Inputs\tYes\n"
+#, c-format
+msgid "Driver is Clone of\t%1$s\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2910
-msgid "Overall\tNOT WORKING\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2912
-msgid "Overall\tUnemulated Protection\n"
+msgid "Driver is Parent\t\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2914
-msgid "Overall\tWorking\n"
+msgid "Analog Controls\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2917
-msgid "Graphics\tUnimplemented\n"
+#: src/frontend/mame/ui/selmenu.cpp:2916
+msgid "Keyboard Inputs\tYes\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2919
-msgid "Graphics\tWrong Colors\n"
+msgid "Overall\tNOT WORKING\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2921
-msgid "Graphics\tImperfect Colors\n"
+msgid "Overall\tUnemulated Protection\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2923
-msgid "Graphics\tImperfect\n"
+msgid "Overall\tWorking\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2925
-msgid "Graphics\tOK\n"
+#: src/frontend/mame/ui/selmenu.cpp:2926
+msgid "Graphics\tUnimplemented\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2928
-msgid "Sound\tNone\n"
+msgid "Graphics\tWrong Colors\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2930
-msgid "Sound\tUnimplemented\n"
+msgid "Graphics\tImperfect Colors\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2932
-msgid "Sound\tImperfect\n"
+msgid "Graphics\tImperfect\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2934
-msgid "Sound\tOK\n"
+msgid "Graphics\tOK\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2937
-msgid "Capture\tUnimplemented\n"
+msgid "Sound\tNone\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2939
+msgid "Sound\tUnimplemented\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2941
+msgid "Sound\tImperfect\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2943
+msgid "Sound\tOK\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2946
+msgid "Capture\tUnimplemented\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2948
 msgid "Capture\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2942
+#: src/frontend/mame/ui/selmenu.cpp:2951
 msgid "Camera\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2944
+#: src/frontend/mame/ui/selmenu.cpp:2953
 msgid "Camera\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2947
+#: src/frontend/mame/ui/selmenu.cpp:2956
 msgid "Microphone\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2949
+#: src/frontend/mame/ui/selmenu.cpp:2958
 msgid "Microphone\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2952
+#: src/frontend/mame/ui/selmenu.cpp:2961
 msgid "Controls\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2954
+#: src/frontend/mame/ui/selmenu.cpp:2963
 msgid "Controls\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2957
+#: src/frontend/mame/ui/selmenu.cpp:2966
 msgid "Keyboard\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2959
+#: src/frontend/mame/ui/selmenu.cpp:2968
 msgid "Keyboard\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2962
+#: src/frontend/mame/ui/selmenu.cpp:2971
 msgid "Mouse\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2964
+#: src/frontend/mame/ui/selmenu.cpp:2973
 msgid "Mouse\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2967
+#: src/frontend/mame/ui/selmenu.cpp:2976
 msgid "Media\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2969
+#: src/frontend/mame/ui/selmenu.cpp:2978
 msgid "Media\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2972
+#: src/frontend/mame/ui/selmenu.cpp:2981
 msgid "Disk\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2974
+#: src/frontend/mame/ui/selmenu.cpp:2983
 msgid "Disk\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2977
+#: src/frontend/mame/ui/selmenu.cpp:2986
 msgid "Printer\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2979
+#: src/frontend/mame/ui/selmenu.cpp:2988
 msgid "Printer\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2982
+#: src/frontend/mame/ui/selmenu.cpp:2991
 msgid "Mag. Tape\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2984
+#: src/frontend/mame/ui/selmenu.cpp:2993
 msgid "Mag. Tape\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2987
+#: src/frontend/mame/ui/selmenu.cpp:2996
 msgid "Punch Tape\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2989
+#: src/frontend/mame/ui/selmenu.cpp:2998
 msgid "Punch Tape\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2992
+#: src/frontend/mame/ui/selmenu.cpp:3001
 msgid "Mag. Drum\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2994
+#: src/frontend/mame/ui/selmenu.cpp:3003
 msgid "Mag. Drum\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2997
+#: src/frontend/mame/ui/selmenu.cpp:3006
 msgid "(EP)ROM\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2999
+#: src/frontend/mame/ui/selmenu.cpp:3008
 msgid "(EP)ROM\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3002
+#: src/frontend/mame/ui/selmenu.cpp:3011
 msgid "Communications\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3004
+#: src/frontend/mame/ui/selmenu.cpp:3013
 msgid "Communications\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3007
+#: src/frontend/mame/ui/selmenu.cpp:3016
 msgid "LAN\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3009
+#: src/frontend/mame/ui/selmenu.cpp:3018
 msgid "LAN\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3012
+#: src/frontend/mame/ui/selmenu.cpp:3021
 msgid "WAN\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3014
+#: src/frontend/mame/ui/selmenu.cpp:3023
 msgid "WAN\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3017
+#: src/frontend/mame/ui/selmenu.cpp:3026
 msgid "Timing\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3019
+#: src/frontend/mame/ui/selmenu.cpp:3028
 msgid "Timing\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3021
+#: src/frontend/mame/ui/selmenu.cpp:3030
 msgid "Mechanical Machine\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3021
+#: src/frontend/mame/ui/selmenu.cpp:3030
 msgid "Mechanical Machine\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3022
+#: src/frontend/mame/ui/selmenu.cpp:3031
 msgid "Requires Artwork\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3022
+#: src/frontend/mame/ui/selmenu.cpp:3031
 msgid "Requires Artwork\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3023
+#: src/frontend/mame/ui/selmenu.cpp:3032
 msgid "Requires Clickable Artwork\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3023
+#: src/frontend/mame/ui/selmenu.cpp:3032
 msgid "Requires Clickable Artwork\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3025
+#: src/frontend/mame/ui/selmenu.cpp:3034
 msgid "Support Cocktail\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3026
+#: src/frontend/mame/ui/selmenu.cpp:3035
 msgid "Driver is BIOS\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3026
+#: src/frontend/mame/ui/selmenu.cpp:3035
 msgid "Driver is BIOS\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3027
+#: src/frontend/mame/ui/selmenu.cpp:3036
 msgid "Support Save\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3027
+#: src/frontend/mame/ui/selmenu.cpp:3036
 msgid "Support Save\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3028
+#: src/frontend/mame/ui/selmenu.cpp:3037
 msgid "Screen Orientation\tVertical\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3028
+#: src/frontend/mame/ui/selmenu.cpp:3037
 msgid "Screen Orientation\tHorizontal\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3038
+#: src/frontend/mame/ui/selmenu.cpp:3047
 msgid "Requires CHD\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3038
+#: src/frontend/mame/ui/selmenu.cpp:3047
 msgid "Requires CHD\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3051
-msgid "ROM Audit Result\tOK\n"
+#: src/frontend/mame/ui/selmenu.cpp:3060
+msgid "Media Audit Result\tOK\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3053
-msgid "ROM Audit Result\tBAD\n"
+#: src/frontend/mame/ui/selmenu.cpp:3062
+msgid "Media Audit Result\tBAD\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3056
+#: src/frontend/mame/ui/selmenu.cpp:3065
 msgid "Samples Audit Result\tNone Needed\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3058
+#: src/frontend/mame/ui/selmenu.cpp:3067
 msgid "Samples Audit Result\tOK\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3060
+#: src/frontend/mame/ui/selmenu.cpp:3069
 msgid "Samples Audit Result\tBAD\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3064
+#: src/frontend/mame/ui/selmenu.cpp:3073
 msgid ""
-"ROM Audit \tDisabled\n"
-"Samples Audit \tDisabled\n"
+"Media Audit\tDisabled\n"
+"Samples Audit\tDisabled\n"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:150
+#: src/frontend/mame/ui/sndmenu.cpp:146
 msgid "Sound"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:151
+#: src/frontend/mame/ui/sndmenu.cpp:147
 msgid "Compressor"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:152
+#: src/frontend/mame/ui/sndmenu.cpp:148
 msgid "Sample Rate"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:153
+#: src/frontend/mame/ui/sndmenu.cpp:149
 msgid "Use External Samples"
 msgstr ""
 
@@ -3122,511 +3126,681 @@ msgstr ""
 msgid "  Screen '%1$s': Vector\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:132
+#: src/frontend/mame/ui/devopt.cpp:135
 #, c-format
 msgid "  Screen '%1$s': %2$d × %3$d (V) %4$s Hz\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:133
+#: src/frontend/mame/ui/devopt.cpp:136
 #, c-format
 msgid "  Screen '%1$s': %2$d × %3$d (H) %4$s Hz\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:147
+#: src/frontend/mame/ui/devopt.cpp:150
 msgid "* Sound:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:211
+#: src/frontend/mame/ui/devopt.cpp:214
 #, c-format
 msgid ""
 "* BIOS settings:\n"
 "  %1$d options    [default: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:255 src/frontend/mame/ui/devopt.cpp:271
-#: src/frontend/mame/ui/devopt.cpp:332
+#: src/frontend/mame/ui/devopt.cpp:258 src/frontend/mame/ui/devopt.cpp:274
+#: src/frontend/mame/ui/devopt.cpp:335
 #, c-format
 msgid "  %1$s    [default: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:260 src/frontend/mame/ui/devopt.cpp:276
+#: src/frontend/mame/ui/devopt.cpp:263 src/frontend/mame/ui/devopt.cpp:279
 #, c-format
 msgid "  %1$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:282
+#: src/frontend/mame/ui/devopt.cpp:285
 msgid "* DIP switch settings:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:287
+#: src/frontend/mame/ui/devopt.cpp:290
 msgid "* Configuration settings:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:291
+#: src/frontend/mame/ui/devopt.cpp:294
 msgid "* Input device(s):\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:293
+#: src/frontend/mame/ui/devopt.cpp:296
 #, c-format
 msgid "  User inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:295
+#: src/frontend/mame/ui/devopt.cpp:298
 #, c-format
 msgid "  Mahjong inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:297
+#: src/frontend/mame/ui/devopt.cpp:300
 #, c-format
 msgid "  Hanafuda inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:299
+#: src/frontend/mame/ui/devopt.cpp:302
 #, c-format
 msgid "  Gambling inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:301
+#: src/frontend/mame/ui/devopt.cpp:304
 #, c-format
 msgid "  Analog inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:303
+#: src/frontend/mame/ui/devopt.cpp:306
 #, c-format
 msgid "  Adjuster inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:305
+#: src/frontend/mame/ui/devopt.cpp:308
 #, c-format
 msgid "  Keypad inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:307
+#: src/frontend/mame/ui/devopt.cpp:310
 #, c-format
 msgid "  Keyboard inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:312
+#: src/frontend/mame/ui/devopt.cpp:315
 msgid "* Media Options:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:317
+#: src/frontend/mame/ui/devopt.cpp:320
 #, c-format
 msgid "  %1$s    [tag: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:327
+#: src/frontend/mame/ui/devopt.cpp:330
 msgid "* Slot Options:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:341
+#: src/frontend/mame/ui/devopt.cpp:344
 msgid "[None]\n"
 msgstr ""
 
-#: src/emu/render.cpp:1847
+#: src/emu/render.cpp:1796
 #, c-format
 msgctxt "view-name"
 msgid "Screen %1$u Standard (%2$u:%3$u)"
 msgstr ""
 
-#: src/emu/render.cpp:1873
+#: src/emu/render.cpp:1822
 #, c-format
 msgctxt "view-name"
 msgid "Screen %1$u Pixel Aspect (%2$u:%3$u)"
 msgstr ""
 
-#: src/emu/render.cpp:1895 src/emu/render.cpp:2030
+#: src/emu/render.cpp:1844 src/emu/render.cpp:1979
 msgctxt "view-name"
 msgid "Cocktail"
 msgstr ""
 
-#: src/emu/render.cpp:2015
+#: src/emu/render.cpp:1964
 msgctxt "view-name"
 msgid "Left-to-Right"
 msgstr ""
 
-#: src/emu/render.cpp:2016
+#: src/emu/render.cpp:1965
 msgctxt "view-name"
 msgid "Left-to-Right (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2017
+#: src/emu/render.cpp:1966
 msgctxt "view-name"
 msgid "Top-to-Bottom"
 msgstr ""
 
-#: src/emu/render.cpp:2018
+#: src/emu/render.cpp:1967
 msgctxt "view-name"
 msgid "Top-to-Bottom (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2069
+#: src/emu/render.cpp:2018
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Left-to-Right, Top-to-Bottom"
 msgstr ""
 
-#: src/emu/render.cpp:2078
+#: src/emu/render.cpp:2027
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Left-to-Right, Top-to-Bottom (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2087
+#: src/emu/render.cpp:2036
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Top-to-Bottom, Left-to-Right"
 msgstr ""
 
-#: src/emu/render.cpp:2096
+#: src/emu/render.cpp:2045
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Top-to-Bottom, Left-to-Right (Gapless)"
 msgstr ""
 
-#: src/emu/inpttype.ipp:22
+#: src/emu/ioport.cpp:332
+#, c-format
 msgctxt "input-name"
-msgid "P1 Up"
+msgid "P%1$u"
 msgstr ""
 
-#: src/emu/inpttype.ipp:23
+#: src/emu/ioport.cpp:1924
 msgctxt "input-name"
-msgid "P1 Down"
+msgid "???"
 msgstr ""
 
-#: src/emu/inpttype.ipp:24
+#: src/emu/inpttype.ipp:22 src/emu/inpttype.ipp:140 src/emu/inpttype.ipp:221
+#: src/emu/inpttype.ipp:255 src/emu/inpttype.ipp:289 src/emu/inpttype.ipp:323
+#: src/emu/inpttype.ipp:357 src/emu/inpttype.ipp:391 src/emu/inpttype.ipp:425
+#: src/emu/inpttype.ipp:459
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left"
+msgid "%p Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:25
+#: src/emu/inpttype.ipp:23 src/emu/inpttype.ipp:141 src/emu/inpttype.ipp:222
+#: src/emu/inpttype.ipp:256 src/emu/inpttype.ipp:290 src/emu/inpttype.ipp:324
+#: src/emu/inpttype.ipp:358 src/emu/inpttype.ipp:392 src/emu/inpttype.ipp:426
+#: src/emu/inpttype.ipp:460
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right"
+msgid "%p Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:26
+#: src/emu/inpttype.ipp:24 src/emu/inpttype.ipp:142 src/emu/inpttype.ipp:223
+#: src/emu/inpttype.ipp:257 src/emu/inpttype.ipp:291 src/emu/inpttype.ipp:325
+#: src/emu/inpttype.ipp:359 src/emu/inpttype.ipp:393 src/emu/inpttype.ipp:427
+#: src/emu/inpttype.ipp:461
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Up"
+msgid "%p Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:27
+#: src/emu/inpttype.ipp:25 src/emu/inpttype.ipp:143 src/emu/inpttype.ipp:224
+#: src/emu/inpttype.ipp:258 src/emu/inpttype.ipp:292 src/emu/inpttype.ipp:326
+#: src/emu/inpttype.ipp:360 src/emu/inpttype.ipp:394 src/emu/inpttype.ipp:428
+#: src/emu/inpttype.ipp:462
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Down"
+msgid "%p Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:28
+#: src/emu/inpttype.ipp:26 src/emu/inpttype.ipp:144 src/emu/inpttype.ipp:225
+#: src/emu/inpttype.ipp:259 src/emu/inpttype.ipp:293 src/emu/inpttype.ipp:327
+#: src/emu/inpttype.ipp:361 src/emu/inpttype.ipp:395 src/emu/inpttype.ipp:429
+#: src/emu/inpttype.ipp:463
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Left"
+msgid "%p Right Stick/Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:29
+#: src/emu/inpttype.ipp:27 src/emu/inpttype.ipp:145 src/emu/inpttype.ipp:226
+#: src/emu/inpttype.ipp:260 src/emu/inpttype.ipp:294 src/emu/inpttype.ipp:328
+#: src/emu/inpttype.ipp:362 src/emu/inpttype.ipp:396 src/emu/inpttype.ipp:430
+#: src/emu/inpttype.ipp:464
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Right"
+msgid "%p Right Stick/Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:30
+#: src/emu/inpttype.ipp:28 src/emu/inpttype.ipp:146 src/emu/inpttype.ipp:227
+#: src/emu/inpttype.ipp:261 src/emu/inpttype.ipp:295 src/emu/inpttype.ipp:329
+#: src/emu/inpttype.ipp:363 src/emu/inpttype.ipp:397 src/emu/inpttype.ipp:431
+#: src/emu/inpttype.ipp:465
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Up"
+msgid "%p Right Stick/Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:31
+#: src/emu/inpttype.ipp:29 src/emu/inpttype.ipp:147 src/emu/inpttype.ipp:228
+#: src/emu/inpttype.ipp:262 src/emu/inpttype.ipp:296 src/emu/inpttype.ipp:330
+#: src/emu/inpttype.ipp:364 src/emu/inpttype.ipp:398 src/emu/inpttype.ipp:432
+#: src/emu/inpttype.ipp:466
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Down"
+msgid "%p Right Stick/Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:32
+#: src/emu/inpttype.ipp:30 src/emu/inpttype.ipp:148 src/emu/inpttype.ipp:229
+#: src/emu/inpttype.ipp:263 src/emu/inpttype.ipp:297 src/emu/inpttype.ipp:331
+#: src/emu/inpttype.ipp:365 src/emu/inpttype.ipp:399 src/emu/inpttype.ipp:433
+#: src/emu/inpttype.ipp:467
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Left"
+msgid "%p Left Stick/Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:33
+#: src/emu/inpttype.ipp:31 src/emu/inpttype.ipp:149 src/emu/inpttype.ipp:230
+#: src/emu/inpttype.ipp:264 src/emu/inpttype.ipp:298 src/emu/inpttype.ipp:332
+#: src/emu/inpttype.ipp:366 src/emu/inpttype.ipp:400 src/emu/inpttype.ipp:434
+#: src/emu/inpttype.ipp:468
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Right"
+msgid "%p Left Stick/Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:34
+#: src/emu/inpttype.ipp:32 src/emu/inpttype.ipp:150 src/emu/inpttype.ipp:231
+#: src/emu/inpttype.ipp:265 src/emu/inpttype.ipp:299 src/emu/inpttype.ipp:333
+#: src/emu/inpttype.ipp:367 src/emu/inpttype.ipp:401 src/emu/inpttype.ipp:435
+#: src/emu/inpttype.ipp:469
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 1"
+msgid "%p Left Stick/Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:35
+#: src/emu/inpttype.ipp:33 src/emu/inpttype.ipp:151 src/emu/inpttype.ipp:232
+#: src/emu/inpttype.ipp:266 src/emu/inpttype.ipp:300 src/emu/inpttype.ipp:334
+#: src/emu/inpttype.ipp:368 src/emu/inpttype.ipp:402 src/emu/inpttype.ipp:436
+#: src/emu/inpttype.ipp:470
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 2"
+msgid "%p Left Stick/Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:36
+#: src/emu/inpttype.ipp:34 src/emu/inpttype.ipp:152 src/emu/inpttype.ipp:233
+#: src/emu/inpttype.ipp:267 src/emu/inpttype.ipp:301 src/emu/inpttype.ipp:335
+#: src/emu/inpttype.ipp:369 src/emu/inpttype.ipp:403 src/emu/inpttype.ipp:437
+#: src/emu/inpttype.ipp:471
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 3"
+msgid "%p Button 1"
 msgstr ""
 
-#: src/emu/inpttype.ipp:37
+#: src/emu/inpttype.ipp:35 src/emu/inpttype.ipp:153 src/emu/inpttype.ipp:234
+#: src/emu/inpttype.ipp:268 src/emu/inpttype.ipp:302 src/emu/inpttype.ipp:336
+#: src/emu/inpttype.ipp:370 src/emu/inpttype.ipp:404 src/emu/inpttype.ipp:438
+#: src/emu/inpttype.ipp:472
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 4"
+msgid "%p Button 2"
 msgstr ""
 
-#: src/emu/inpttype.ipp:38
+#: src/emu/inpttype.ipp:36 src/emu/inpttype.ipp:154 src/emu/inpttype.ipp:235
+#: src/emu/inpttype.ipp:269 src/emu/inpttype.ipp:303 src/emu/inpttype.ipp:337
+#: src/emu/inpttype.ipp:371 src/emu/inpttype.ipp:405 src/emu/inpttype.ipp:439
+#: src/emu/inpttype.ipp:473
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 5"
+msgid "%p Button 3"
 msgstr ""
 
-#: src/emu/inpttype.ipp:39
+#: src/emu/inpttype.ipp:37 src/emu/inpttype.ipp:155 src/emu/inpttype.ipp:236
+#: src/emu/inpttype.ipp:270 src/emu/inpttype.ipp:304 src/emu/inpttype.ipp:338
+#: src/emu/inpttype.ipp:372 src/emu/inpttype.ipp:406 src/emu/inpttype.ipp:440
+#: src/emu/inpttype.ipp:474
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 6"
+msgid "%p Button 4"
 msgstr ""
 
-#: src/emu/inpttype.ipp:40
+#: src/emu/inpttype.ipp:38 src/emu/inpttype.ipp:156 src/emu/inpttype.ipp:237
+#: src/emu/inpttype.ipp:271 src/emu/inpttype.ipp:305 src/emu/inpttype.ipp:339
+#: src/emu/inpttype.ipp:373 src/emu/inpttype.ipp:407 src/emu/inpttype.ipp:441
+#: src/emu/inpttype.ipp:475
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 7"
+msgid "%p Button 5"
 msgstr ""
 
-#: src/emu/inpttype.ipp:41
+#: src/emu/inpttype.ipp:39 src/emu/inpttype.ipp:157 src/emu/inpttype.ipp:238
+#: src/emu/inpttype.ipp:272 src/emu/inpttype.ipp:306 src/emu/inpttype.ipp:340
+#: src/emu/inpttype.ipp:374 src/emu/inpttype.ipp:408 src/emu/inpttype.ipp:442
+#: src/emu/inpttype.ipp:476
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 8"
+msgid "%p Button 6"
 msgstr ""
 
-#: src/emu/inpttype.ipp:42
+#: src/emu/inpttype.ipp:40 src/emu/inpttype.ipp:158 src/emu/inpttype.ipp:239
+#: src/emu/inpttype.ipp:273 src/emu/inpttype.ipp:307 src/emu/inpttype.ipp:341
+#: src/emu/inpttype.ipp:375 src/emu/inpttype.ipp:409 src/emu/inpttype.ipp:443
+#: src/emu/inpttype.ipp:477
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 9"
+msgid "%p Button 7"
 msgstr ""
 
-#: src/emu/inpttype.ipp:43
+#: src/emu/inpttype.ipp:41 src/emu/inpttype.ipp:159 src/emu/inpttype.ipp:240
+#: src/emu/inpttype.ipp:274 src/emu/inpttype.ipp:308 src/emu/inpttype.ipp:342
+#: src/emu/inpttype.ipp:376 src/emu/inpttype.ipp:410 src/emu/inpttype.ipp:444
+#: src/emu/inpttype.ipp:478
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 10"
+msgid "%p Button 8"
 msgstr ""
 
-#: src/emu/inpttype.ipp:44
+#: src/emu/inpttype.ipp:42 src/emu/inpttype.ipp:160 src/emu/inpttype.ipp:241
+#: src/emu/inpttype.ipp:275 src/emu/inpttype.ipp:309 src/emu/inpttype.ipp:343
+#: src/emu/inpttype.ipp:377 src/emu/inpttype.ipp:411 src/emu/inpttype.ipp:445
+#: src/emu/inpttype.ipp:479
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 11"
+msgid "%p Button 9"
 msgstr ""
 
-#: src/emu/inpttype.ipp:45
+#: src/emu/inpttype.ipp:43 src/emu/inpttype.ipp:161 src/emu/inpttype.ipp:242
+#: src/emu/inpttype.ipp:276 src/emu/inpttype.ipp:310 src/emu/inpttype.ipp:344
+#: src/emu/inpttype.ipp:378 src/emu/inpttype.ipp:412 src/emu/inpttype.ipp:446
+#: src/emu/inpttype.ipp:480
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 12"
+msgid "%p Button 10"
 msgstr ""
 
-#: src/emu/inpttype.ipp:46
+#: src/emu/inpttype.ipp:44 src/emu/inpttype.ipp:162 src/emu/inpttype.ipp:243
+#: src/emu/inpttype.ipp:277 src/emu/inpttype.ipp:311 src/emu/inpttype.ipp:345
+#: src/emu/inpttype.ipp:379 src/emu/inpttype.ipp:413 src/emu/inpttype.ipp:447
+#: src/emu/inpttype.ipp:481
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 13"
+msgid "%p Button 11"
 msgstr ""
 
-#: src/emu/inpttype.ipp:47
+#: src/emu/inpttype.ipp:45 src/emu/inpttype.ipp:163 src/emu/inpttype.ipp:244
+#: src/emu/inpttype.ipp:278 src/emu/inpttype.ipp:312 src/emu/inpttype.ipp:346
+#: src/emu/inpttype.ipp:380 src/emu/inpttype.ipp:414 src/emu/inpttype.ipp:448
+#: src/emu/inpttype.ipp:482
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 14"
+msgid "%p Button 12"
 msgstr ""
 
-#: src/emu/inpttype.ipp:48
+#: src/emu/inpttype.ipp:46 src/emu/inpttype.ipp:164 src/emu/inpttype.ipp:245
+#: src/emu/inpttype.ipp:279 src/emu/inpttype.ipp:313 src/emu/inpttype.ipp:347
+#: src/emu/inpttype.ipp:381 src/emu/inpttype.ipp:415 src/emu/inpttype.ipp:449
+#: src/emu/inpttype.ipp:483
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 15"
+msgid "%p Button 13"
 msgstr ""
 
-#: src/emu/inpttype.ipp:49
+#: src/emu/inpttype.ipp:47 src/emu/inpttype.ipp:165 src/emu/inpttype.ipp:246
+#: src/emu/inpttype.ipp:280 src/emu/inpttype.ipp:314 src/emu/inpttype.ipp:348
+#: src/emu/inpttype.ipp:382 src/emu/inpttype.ipp:416 src/emu/inpttype.ipp:450
+#: src/emu/inpttype.ipp:484
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 16"
+msgid "%p Button 14"
 msgstr ""
 
-#: src/emu/inpttype.ipp:50
+#: src/emu/inpttype.ipp:48 src/emu/inpttype.ipp:166 src/emu/inpttype.ipp:247
+#: src/emu/inpttype.ipp:281 src/emu/inpttype.ipp:315 src/emu/inpttype.ipp:349
+#: src/emu/inpttype.ipp:383 src/emu/inpttype.ipp:417 src/emu/inpttype.ipp:451
+#: src/emu/inpttype.ipp:485
+#, c-format
 msgctxt "input-name"
-msgid "P1 Start"
+msgid "%p Button 15"
 msgstr ""
 
-#: src/emu/inpttype.ipp:51
+#: src/emu/inpttype.ipp:49 src/emu/inpttype.ipp:167 src/emu/inpttype.ipp:248
+#: src/emu/inpttype.ipp:282 src/emu/inpttype.ipp:316 src/emu/inpttype.ipp:350
+#: src/emu/inpttype.ipp:384 src/emu/inpttype.ipp:418 src/emu/inpttype.ipp:452
+#: src/emu/inpttype.ipp:486
+#, c-format
 msgctxt "input-name"
-msgid "P1 Select"
+msgid "%p Button 16"
 msgstr ""
 
-#: src/emu/inpttype.ipp:56
+#: src/emu/inpttype.ipp:50 src/emu/inpttype.ipp:168 src/emu/inpttype.ipp:249
+#: src/emu/inpttype.ipp:283 src/emu/inpttype.ipp:317 src/emu/inpttype.ipp:351
+#: src/emu/inpttype.ipp:385 src/emu/inpttype.ipp:419 src/emu/inpttype.ipp:453
+#: src/emu/inpttype.ipp:487
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong A"
+msgid "%p Start"
 msgstr ""
 
-#: src/emu/inpttype.ipp:57
+#: src/emu/inpttype.ipp:51 src/emu/inpttype.ipp:169 src/emu/inpttype.ipp:250
+#: src/emu/inpttype.ipp:284 src/emu/inpttype.ipp:318 src/emu/inpttype.ipp:352
+#: src/emu/inpttype.ipp:386 src/emu/inpttype.ipp:420 src/emu/inpttype.ipp:454
+#: src/emu/inpttype.ipp:488
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong B"
+msgid "%p Select"
 msgstr ""
 
-#: src/emu/inpttype.ipp:58
+#: src/emu/inpttype.ipp:56 src/emu/inpttype.ipp:174
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong C"
+msgid "%p Mahjong A"
 msgstr ""
 
-#: src/emu/inpttype.ipp:59
+#: src/emu/inpttype.ipp:57 src/emu/inpttype.ipp:175
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong D"
+msgid "%p Mahjong B"
 msgstr ""
 
-#: src/emu/inpttype.ipp:60
+#: src/emu/inpttype.ipp:58 src/emu/inpttype.ipp:176
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong E"
+msgid "%p Mahjong C"
 msgstr ""
 
-#: src/emu/inpttype.ipp:61
+#: src/emu/inpttype.ipp:59 src/emu/inpttype.ipp:177
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong F"
+msgid "%p Mahjong D"
 msgstr ""
 
-#: src/emu/inpttype.ipp:62
+#: src/emu/inpttype.ipp:60 src/emu/inpttype.ipp:178
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong G"
+msgid "%p Mahjong E"
 msgstr ""
 
-#: src/emu/inpttype.ipp:63
+#: src/emu/inpttype.ipp:61 src/emu/inpttype.ipp:179
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong H"
+msgid "%p Mahjong F"
 msgstr ""
 
-#: src/emu/inpttype.ipp:64
+#: src/emu/inpttype.ipp:62 src/emu/inpttype.ipp:180
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong I"
+msgid "%p Mahjong G"
 msgstr ""
 
-#: src/emu/inpttype.ipp:65
+#: src/emu/inpttype.ipp:63 src/emu/inpttype.ipp:181
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong J"
+msgid "%p Mahjong H"
 msgstr ""
 
-#: src/emu/inpttype.ipp:66
+#: src/emu/inpttype.ipp:64 src/emu/inpttype.ipp:182
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong K"
+msgid "%p Mahjong I"
 msgstr ""
 
-#: src/emu/inpttype.ipp:67
+#: src/emu/inpttype.ipp:65 src/emu/inpttype.ipp:183
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong L"
+msgid "%p Mahjong J"
 msgstr ""
 
-#: src/emu/inpttype.ipp:68
+#: src/emu/inpttype.ipp:66 src/emu/inpttype.ipp:184
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong M"
+msgid "%p Mahjong K"
 msgstr ""
 
-#: src/emu/inpttype.ipp:69
+#: src/emu/inpttype.ipp:67 src/emu/inpttype.ipp:185
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong N"
+msgid "%p Mahjong L"
 msgstr ""
 
-#: src/emu/inpttype.ipp:70
+#: src/emu/inpttype.ipp:68 src/emu/inpttype.ipp:186
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong O"
+msgid "%p Mahjong M"
 msgstr ""
 
-#: src/emu/inpttype.ipp:71
+#: src/emu/inpttype.ipp:69 src/emu/inpttype.ipp:187
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong P"
+msgid "%p Mahjong N"
 msgstr ""
 
-#: src/emu/inpttype.ipp:72
+#: src/emu/inpttype.ipp:70 src/emu/inpttype.ipp:188
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Q"
+msgid "%p Mahjong O"
 msgstr ""
 
-#: src/emu/inpttype.ipp:73
+#: src/emu/inpttype.ipp:71 src/emu/inpttype.ipp:189
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Kan"
+msgid "%p Mahjong P"
 msgstr ""
 
-#: src/emu/inpttype.ipp:74
+#: src/emu/inpttype.ipp:72 src/emu/inpttype.ipp:190
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Pon"
+msgid "%p Mahjong Q"
 msgstr ""
 
-#: src/emu/inpttype.ipp:75
+#: src/emu/inpttype.ipp:73 src/emu/inpttype.ipp:191
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Chi"
+msgid "%p Mahjong Kan"
 msgstr ""
 
-#: src/emu/inpttype.ipp:76
+#: src/emu/inpttype.ipp:74 src/emu/inpttype.ipp:192
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Reach"
+msgid "%p Mahjong Pon"
 msgstr ""
 
-#: src/emu/inpttype.ipp:77
+#: src/emu/inpttype.ipp:75 src/emu/inpttype.ipp:193
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Ron"
+msgid "%p Mahjong Chi"
 msgstr ""
 
-#: src/emu/inpttype.ipp:78
+#: src/emu/inpttype.ipp:76 src/emu/inpttype.ipp:194
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Flip Flop"
+msgid "%p Mahjong Reach"
 msgstr ""
 
-#: src/emu/inpttype.ipp:79
+#: src/emu/inpttype.ipp:77 src/emu/inpttype.ipp:195
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Bet"
+msgid "%p Mahjong Ron"
 msgstr ""
 
-#: src/emu/inpttype.ipp:80
+#: src/emu/inpttype.ipp:78 src/emu/inpttype.ipp:200
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Take Score"
+msgid "%p Mahjong Flip Flop"
 msgstr ""
 
-#: src/emu/inpttype.ipp:81
+#: src/emu/inpttype.ipp:79 src/emu/inpttype.ipp:196
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Double Up"
+msgid "%p Mahjong Bet"
 msgstr ""
 
-#: src/emu/inpttype.ipp:82
+#: src/emu/inpttype.ipp:80 src/emu/inpttype.ipp:198
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Big"
+msgid "%p Mahjong Take Score"
 msgstr ""
 
-#: src/emu/inpttype.ipp:83
+#: src/emu/inpttype.ipp:81 src/emu/inpttype.ipp:199
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Small"
+msgid "%p Mahjong Double Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:84
+#: src/emu/inpttype.ipp:82 src/emu/inpttype.ipp:201
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Last Chance"
+msgid "%p Mahjong Big"
 msgstr ""
 
-#: src/emu/inpttype.ipp:89
+#: src/emu/inpttype.ipp:83 src/emu/inpttype.ipp:202
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda A/1"
+msgid "%p Mahjong Small"
 msgstr ""
 
-#: src/emu/inpttype.ipp:90
+#: src/emu/inpttype.ipp:84 src/emu/inpttype.ipp:197
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda B/2"
+msgid "%p Mahjong Last Chance"
 msgstr ""
 
-#: src/emu/inpttype.ipp:91
+#: src/emu/inpttype.ipp:89 src/emu/inpttype.ipp:207
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda C/3"
+msgid "%p Hanafuda A/1"
 msgstr ""
 
-#: src/emu/inpttype.ipp:92
+#: src/emu/inpttype.ipp:90 src/emu/inpttype.ipp:208
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda D/4"
+msgid "%p Hanafuda B/2"
 msgstr ""
 
-#: src/emu/inpttype.ipp:93
+#: src/emu/inpttype.ipp:91 src/emu/inpttype.ipp:209
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda E/5"
+msgid "%p Hanafuda C/3"
 msgstr ""
 
-#: src/emu/inpttype.ipp:94
+#: src/emu/inpttype.ipp:92 src/emu/inpttype.ipp:210
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda F/6"
+msgid "%p Hanafuda D/4"
 msgstr ""
 
-#: src/emu/inpttype.ipp:95
+#: src/emu/inpttype.ipp:93 src/emu/inpttype.ipp:211
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda G/7"
+msgid "%p Hanafuda E/5"
 msgstr ""
 
-#: src/emu/inpttype.ipp:96
+#: src/emu/inpttype.ipp:94 src/emu/inpttype.ipp:212
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda H/8"
+msgid "%p Hanafuda F/6"
 msgstr ""
 
-#: src/emu/inpttype.ipp:97
+#: src/emu/inpttype.ipp:95 src/emu/inpttype.ipp:213
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda Yes"
+msgid "%p Hanafuda G/7"
 msgstr ""
 
-#: src/emu/inpttype.ipp:98
+#: src/emu/inpttype.ipp:96 src/emu/inpttype.ipp:214
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda No"
+msgid "%p Hanafuda H/8"
+msgstr ""
+
+#: src/emu/inpttype.ipp:97 src/emu/inpttype.ipp:215
+#, c-format
+msgctxt "input-name"
+msgid "%p Hanafuda Yes"
+msgstr ""
+
+#: src/emu/inpttype.ipp:98 src/emu/inpttype.ipp:216
+#, c-format
+msgctxt "input-name"
+msgid "%p Hanafuda No"
 msgstr ""
 
 #: src/emu/inpttype.ipp:103
@@ -3754,1551 +3928,6 @@ msgctxt "input-name"
 msgid "Stop All Reels"
 msgstr ""
 
-#: src/emu/inpttype.ipp:140
-msgctxt "input-name"
-msgid "P2 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:141
-msgctxt "input-name"
-msgid "P2 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:142
-msgctxt "input-name"
-msgid "P2 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:143
-msgctxt "input-name"
-msgid "P2 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:144
-msgctxt "input-name"
-msgid "P2 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:145
-msgctxt "input-name"
-msgid "P2 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:146
-msgctxt "input-name"
-msgid "P2 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:147
-msgctxt "input-name"
-msgid "P2 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:148
-msgctxt "input-name"
-msgid "P2 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:149
-msgctxt "input-name"
-msgid "P2 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:150
-msgctxt "input-name"
-msgid "P2 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:151
-msgctxt "input-name"
-msgid "P2 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:152
-msgctxt "input-name"
-msgid "P2 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:153
-msgctxt "input-name"
-msgid "P2 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:154
-msgctxt "input-name"
-msgid "P2 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:155
-msgctxt "input-name"
-msgid "P2 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:156
-msgctxt "input-name"
-msgid "P2 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:157
-msgctxt "input-name"
-msgid "P2 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:158
-msgctxt "input-name"
-msgid "P2 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:159
-msgctxt "input-name"
-msgid "P2 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:160
-msgctxt "input-name"
-msgid "P2 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:161
-msgctxt "input-name"
-msgid "P2 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:162
-msgctxt "input-name"
-msgid "P2 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:163
-msgctxt "input-name"
-msgid "P2 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:164
-msgctxt "input-name"
-msgid "P2 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:165
-msgctxt "input-name"
-msgid "P2 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:166
-msgctxt "input-name"
-msgid "P2 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:167
-msgctxt "input-name"
-msgid "P2 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:168
-msgctxt "input-name"
-msgid "P2 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:169
-msgctxt "input-name"
-msgid "P2 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:174
-msgctxt "input-name"
-msgid "P2 Mahjong A"
-msgstr ""
-
-#: src/emu/inpttype.ipp:175
-msgctxt "input-name"
-msgid "P2 Mahjong B"
-msgstr ""
-
-#: src/emu/inpttype.ipp:176
-msgctxt "input-name"
-msgid "P2 Mahjong C"
-msgstr ""
-
-#: src/emu/inpttype.ipp:177
-msgctxt "input-name"
-msgid "P2 Mahjong D"
-msgstr ""
-
-#: src/emu/inpttype.ipp:178
-msgctxt "input-name"
-msgid "P2 Mahjong E"
-msgstr ""
-
-#: src/emu/inpttype.ipp:179
-msgctxt "input-name"
-msgid "P2 Mahjong F"
-msgstr ""
-
-#: src/emu/inpttype.ipp:180
-msgctxt "input-name"
-msgid "P2 Mahjong G"
-msgstr ""
-
-#: src/emu/inpttype.ipp:181
-msgctxt "input-name"
-msgid "P2 Mahjong H"
-msgstr ""
-
-#: src/emu/inpttype.ipp:182
-msgctxt "input-name"
-msgid "P2 Mahjong I"
-msgstr ""
-
-#: src/emu/inpttype.ipp:183
-msgctxt "input-name"
-msgid "P2 Mahjong J"
-msgstr ""
-
-#: src/emu/inpttype.ipp:184
-msgctxt "input-name"
-msgid "P2 Mahjong K"
-msgstr ""
-
-#: src/emu/inpttype.ipp:185
-msgctxt "input-name"
-msgid "P2 Mahjong L"
-msgstr ""
-
-#: src/emu/inpttype.ipp:186
-msgctxt "input-name"
-msgid "P2 Mahjong M"
-msgstr ""
-
-#: src/emu/inpttype.ipp:187
-msgctxt "input-name"
-msgid "P2 Mahjong N"
-msgstr ""
-
-#: src/emu/inpttype.ipp:188
-msgctxt "input-name"
-msgid "P2 Mahjong O"
-msgstr ""
-
-#: src/emu/inpttype.ipp:189
-msgctxt "input-name"
-msgid "P2 Mahjong P"
-msgstr ""
-
-#: src/emu/inpttype.ipp:190
-msgctxt "input-name"
-msgid "P2 Mahjong Q"
-msgstr ""
-
-#: src/emu/inpttype.ipp:191
-msgctxt "input-name"
-msgid "P2 Mahjong Kan"
-msgstr ""
-
-#: src/emu/inpttype.ipp:192
-msgctxt "input-name"
-msgid "P2 Mahjong Pon"
-msgstr ""
-
-#: src/emu/inpttype.ipp:193
-msgctxt "input-name"
-msgid "P2 Mahjong Chi"
-msgstr ""
-
-#: src/emu/inpttype.ipp:194
-msgctxt "input-name"
-msgid "P2 Mahjong Reach"
-msgstr ""
-
-#: src/emu/inpttype.ipp:195
-msgctxt "input-name"
-msgid "P2 Mahjong Ron"
-msgstr ""
-
-#: src/emu/inpttype.ipp:196
-msgctxt "input-name"
-msgid "P2 Mahjong Bet"
-msgstr ""
-
-#: src/emu/inpttype.ipp:197
-msgctxt "input-name"
-msgid "P2 Mahjong Last Chance"
-msgstr ""
-
-#: src/emu/inpttype.ipp:198
-msgctxt "input-name"
-msgid "P2 Mahjong Take Score"
-msgstr ""
-
-#: src/emu/inpttype.ipp:199
-msgctxt "input-name"
-msgid "P2 Mahjong Double Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:200
-msgctxt "input-name"
-msgid "P2 Mahjong Flip Flop"
-msgstr ""
-
-#: src/emu/inpttype.ipp:201
-msgctxt "input-name"
-msgid "P2 Mahjong Big"
-msgstr ""
-
-#: src/emu/inpttype.ipp:202
-msgctxt "input-name"
-msgid "P2 Mahjong Small"
-msgstr ""
-
-#: src/emu/inpttype.ipp:207
-msgctxt "input-name"
-msgid "P2 Hanafuda A/1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:208
-msgctxt "input-name"
-msgid "P2 Hanafuda B/2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:209
-msgctxt "input-name"
-msgid "P2 Hanafuda C/3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:210
-msgctxt "input-name"
-msgid "P2 Hanafuda D/4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:211
-msgctxt "input-name"
-msgid "P2 Hanafuda E/5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:212
-msgctxt "input-name"
-msgid "P2 Hanafuda F/6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:213
-msgctxt "input-name"
-msgid "P2 Hanafuda G/7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:214
-msgctxt "input-name"
-msgid "P2 Hanafuda H/8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:215
-msgctxt "input-name"
-msgid "P2 Hanafuda Yes"
-msgstr ""
-
-#: src/emu/inpttype.ipp:216
-msgctxt "input-name"
-msgid "P2 Hanafuda No"
-msgstr ""
-
-#: src/emu/inpttype.ipp:221
-msgctxt "input-name"
-msgid "P3 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:222
-msgctxt "input-name"
-msgid "P3 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:223
-msgctxt "input-name"
-msgid "P3 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:224
-msgctxt "input-name"
-msgid "P3 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:225
-msgctxt "input-name"
-msgid "P3 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:226
-msgctxt "input-name"
-msgid "P3 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:227
-msgctxt "input-name"
-msgid "P3 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:228
-msgctxt "input-name"
-msgid "P3 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:229
-msgctxt "input-name"
-msgid "P3 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:230
-msgctxt "input-name"
-msgid "P3 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:231
-msgctxt "input-name"
-msgid "P3 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:232
-msgctxt "input-name"
-msgid "P3 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:233
-msgctxt "input-name"
-msgid "P3 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:234
-msgctxt "input-name"
-msgid "P3 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:235
-msgctxt "input-name"
-msgid "P3 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:236
-msgctxt "input-name"
-msgid "P3 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:237
-msgctxt "input-name"
-msgid "P3 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:238
-msgctxt "input-name"
-msgid "P3 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:239
-msgctxt "input-name"
-msgid "P3 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:240
-msgctxt "input-name"
-msgid "P3 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:241
-msgctxt "input-name"
-msgid "P3 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:242
-msgctxt "input-name"
-msgid "P3 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:243
-msgctxt "input-name"
-msgid "P3 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:244
-msgctxt "input-name"
-msgid "P3 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:245
-msgctxt "input-name"
-msgid "P3 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:246
-msgctxt "input-name"
-msgid "P3 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:247
-msgctxt "input-name"
-msgid "P3 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:248
-msgctxt "input-name"
-msgid "P3 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:249
-msgctxt "input-name"
-msgid "P3 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:250
-msgctxt "input-name"
-msgid "P3 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:255
-msgctxt "input-name"
-msgid "P4 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:256
-msgctxt "input-name"
-msgid "P4 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:257
-msgctxt "input-name"
-msgid "P4 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:258
-msgctxt "input-name"
-msgid "P4 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:259
-msgctxt "input-name"
-msgid "P4 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:260
-msgctxt "input-name"
-msgid "P4 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:261
-msgctxt "input-name"
-msgid "P4 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:262
-msgctxt "input-name"
-msgid "P4 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:263
-msgctxt "input-name"
-msgid "P4 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:264
-msgctxt "input-name"
-msgid "P4 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:265
-msgctxt "input-name"
-msgid "P4 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:266
-msgctxt "input-name"
-msgid "P4 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:267
-msgctxt "input-name"
-msgid "P4 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:268
-msgctxt "input-name"
-msgid "P4 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:269
-msgctxt "input-name"
-msgid "P4 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:270
-msgctxt "input-name"
-msgid "P4 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:271
-msgctxt "input-name"
-msgid "P4 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:272
-msgctxt "input-name"
-msgid "P4 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:273
-msgctxt "input-name"
-msgid "P4 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:274
-msgctxt "input-name"
-msgid "P4 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:275
-msgctxt "input-name"
-msgid "P4 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:276
-msgctxt "input-name"
-msgid "P4 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:277
-msgctxt "input-name"
-msgid "P4 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:278
-msgctxt "input-name"
-msgid "P4 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:279
-msgctxt "input-name"
-msgid "P4 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:280
-msgctxt "input-name"
-msgid "P4 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:281
-msgctxt "input-name"
-msgid "P4 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:282
-msgctxt "input-name"
-msgid "P4 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:283
-msgctxt "input-name"
-msgid "P4 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:284
-msgctxt "input-name"
-msgid "P4 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:289
-msgctxt "input-name"
-msgid "P5 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:290
-msgctxt "input-name"
-msgid "P5 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:291
-msgctxt "input-name"
-msgid "P5 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:292
-msgctxt "input-name"
-msgid "P5 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:293
-msgctxt "input-name"
-msgid "P5 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:294
-msgctxt "input-name"
-msgid "P5 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:295
-msgctxt "input-name"
-msgid "P5 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:296
-msgctxt "input-name"
-msgid "P5 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:297
-msgctxt "input-name"
-msgid "P5 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:298
-msgctxt "input-name"
-msgid "P5 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:299
-msgctxt "input-name"
-msgid "P5 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:300
-msgctxt "input-name"
-msgid "P5 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:301
-msgctxt "input-name"
-msgid "P5 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:302
-msgctxt "input-name"
-msgid "P5 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:303
-msgctxt "input-name"
-msgid "P5 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:304
-msgctxt "input-name"
-msgid "P5 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:305
-msgctxt "input-name"
-msgid "P5 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:306
-msgctxt "input-name"
-msgid "P5 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:307
-msgctxt "input-name"
-msgid "P5 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:308
-msgctxt "input-name"
-msgid "P5 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:309
-msgctxt "input-name"
-msgid "P5 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:310
-msgctxt "input-name"
-msgid "P5 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:311
-msgctxt "input-name"
-msgid "P5 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:312
-msgctxt "input-name"
-msgid "P5 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:313
-msgctxt "input-name"
-msgid "P5 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:314
-msgctxt "input-name"
-msgid "P5 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:315
-msgctxt "input-name"
-msgid "P5 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:316
-msgctxt "input-name"
-msgid "P5 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:317
-msgctxt "input-name"
-msgid "P5 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:318
-msgctxt "input-name"
-msgid "P5 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:323
-msgctxt "input-name"
-msgid "P6 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:324
-msgctxt "input-name"
-msgid "P6 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:325
-msgctxt "input-name"
-msgid "P6 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:326
-msgctxt "input-name"
-msgid "P6 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:327
-msgctxt "input-name"
-msgid "P6 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:328
-msgctxt "input-name"
-msgid "P6 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:329
-msgctxt "input-name"
-msgid "P6 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:330
-msgctxt "input-name"
-msgid "P6 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:331
-msgctxt "input-name"
-msgid "P6 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:332
-msgctxt "input-name"
-msgid "P6 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:333
-msgctxt "input-name"
-msgid "P6 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:334
-msgctxt "input-name"
-msgid "P6 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:335
-msgctxt "input-name"
-msgid "P6 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:336
-msgctxt "input-name"
-msgid "P6 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:337
-msgctxt "input-name"
-msgid "P6 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:338
-msgctxt "input-name"
-msgid "P6 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:339
-msgctxt "input-name"
-msgid "P6 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:340
-msgctxt "input-name"
-msgid "P6 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:341
-msgctxt "input-name"
-msgid "P6 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:342
-msgctxt "input-name"
-msgid "P6 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:343
-msgctxt "input-name"
-msgid "P6 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:344
-msgctxt "input-name"
-msgid "P6 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:345
-msgctxt "input-name"
-msgid "P6 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:346
-msgctxt "input-name"
-msgid "P6 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:347
-msgctxt "input-name"
-msgid "P6 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:348
-msgctxt "input-name"
-msgid "P6 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:349
-msgctxt "input-name"
-msgid "P6 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:350
-msgctxt "input-name"
-msgid "P6 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:351
-msgctxt "input-name"
-msgid "P6 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:352
-msgctxt "input-name"
-msgid "P6 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:357
-msgctxt "input-name"
-msgid "P7 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:358
-msgctxt "input-name"
-msgid "P7 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:359
-msgctxt "input-name"
-msgid "P7 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:360
-msgctxt "input-name"
-msgid "P7 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:361
-msgctxt "input-name"
-msgid "P7 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:362
-msgctxt "input-name"
-msgid "P7 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:363
-msgctxt "input-name"
-msgid "P7 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:364
-msgctxt "input-name"
-msgid "P7 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:365
-msgctxt "input-name"
-msgid "P7 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:366
-msgctxt "input-name"
-msgid "P7 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:367
-msgctxt "input-name"
-msgid "P7 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:368
-msgctxt "input-name"
-msgid "P7 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:369
-msgctxt "input-name"
-msgid "P7 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:370
-msgctxt "input-name"
-msgid "P7 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:371
-msgctxt "input-name"
-msgid "P7 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:372
-msgctxt "input-name"
-msgid "P7 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:373
-msgctxt "input-name"
-msgid "P7 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:374
-msgctxt "input-name"
-msgid "P7 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:375
-msgctxt "input-name"
-msgid "P7 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:376
-msgctxt "input-name"
-msgid "P7 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:377
-msgctxt "input-name"
-msgid "P7 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:378
-msgctxt "input-name"
-msgid "P7 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:379
-msgctxt "input-name"
-msgid "P7 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:380
-msgctxt "input-name"
-msgid "P7 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:381
-msgctxt "input-name"
-msgid "P7 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:382
-msgctxt "input-name"
-msgid "P7 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:383
-msgctxt "input-name"
-msgid "P7 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:384
-msgctxt "input-name"
-msgid "P7 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:385
-msgctxt "input-name"
-msgid "P7 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:386
-msgctxt "input-name"
-msgid "P7 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:391
-msgctxt "input-name"
-msgid "P8 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:392
-msgctxt "input-name"
-msgid "P8 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:393
-msgctxt "input-name"
-msgid "P8 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:394
-msgctxt "input-name"
-msgid "P8 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:395
-msgctxt "input-name"
-msgid "P8 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:396
-msgctxt "input-name"
-msgid "P8 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:397
-msgctxt "input-name"
-msgid "P8 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:398
-msgctxt "input-name"
-msgid "P8 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:399
-msgctxt "input-name"
-msgid "P8 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:400
-msgctxt "input-name"
-msgid "P8 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:401
-msgctxt "input-name"
-msgid "P8 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:402
-msgctxt "input-name"
-msgid "P8 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:403
-msgctxt "input-name"
-msgid "P8 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:404
-msgctxt "input-name"
-msgid "P8 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:405
-msgctxt "input-name"
-msgid "P8 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:406
-msgctxt "input-name"
-msgid "P8 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:407
-msgctxt "input-name"
-msgid "P8 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:408
-msgctxt "input-name"
-msgid "P8 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:409
-msgctxt "input-name"
-msgid "P8 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:410
-msgctxt "input-name"
-msgid "P8 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:411
-msgctxt "input-name"
-msgid "P8 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:412
-msgctxt "input-name"
-msgid "P8 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:413
-msgctxt "input-name"
-msgid "P8 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:414
-msgctxt "input-name"
-msgid "P8 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:415
-msgctxt "input-name"
-msgid "P8 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:416
-msgctxt "input-name"
-msgid "P8 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:417
-msgctxt "input-name"
-msgid "P8 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:418
-msgctxt "input-name"
-msgid "P8 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:419
-msgctxt "input-name"
-msgid "P8 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:420
-msgctxt "input-name"
-msgid "P8 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:425
-msgctxt "input-name"
-msgid "P9 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:426
-msgctxt "input-name"
-msgid "P9 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:427
-msgctxt "input-name"
-msgid "P9 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:428
-msgctxt "input-name"
-msgid "P9 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:429
-msgctxt "input-name"
-msgid "P9 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:430
-msgctxt "input-name"
-msgid "P9 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:431
-msgctxt "input-name"
-msgid "P9 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:432
-msgctxt "input-name"
-msgid "P9 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:433
-msgctxt "input-name"
-msgid "P9 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:434
-msgctxt "input-name"
-msgid "P9 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:435
-msgctxt "input-name"
-msgid "P9 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:436
-msgctxt "input-name"
-msgid "P9 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:437
-msgctxt "input-name"
-msgid "P9 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:438
-msgctxt "input-name"
-msgid "P9 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:439
-msgctxt "input-name"
-msgid "P9 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:440
-msgctxt "input-name"
-msgid "P9 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:441
-msgctxt "input-name"
-msgid "P9 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:442
-msgctxt "input-name"
-msgid "P9 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:443
-msgctxt "input-name"
-msgid "P9 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:444
-msgctxt "input-name"
-msgid "P9 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:445
-msgctxt "input-name"
-msgid "P9 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:446
-msgctxt "input-name"
-msgid "P9 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:447
-msgctxt "input-name"
-msgid "P9 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:448
-msgctxt "input-name"
-msgid "P9 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:449
-msgctxt "input-name"
-msgid "P9 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:450
-msgctxt "input-name"
-msgid "P9 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:451
-msgctxt "input-name"
-msgid "P9 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:452
-msgctxt "input-name"
-msgid "P9 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:453
-msgctxt "input-name"
-msgid "P9 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:454
-msgctxt "input-name"
-msgid "P9 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:459
-msgctxt "input-name"
-msgid "P10 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:460
-msgctxt "input-name"
-msgid "P10 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:461
-msgctxt "input-name"
-msgid "P10 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:462
-msgctxt "input-name"
-msgid "P10 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:463
-msgctxt "input-name"
-msgid "P10 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:464
-msgctxt "input-name"
-msgid "P10 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:465
-msgctxt "input-name"
-msgid "P10 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:466
-msgctxt "input-name"
-msgid "P10 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:467
-msgctxt "input-name"
-msgid "P10 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:468
-msgctxt "input-name"
-msgid "P10 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:469
-msgctxt "input-name"
-msgid "P10 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:470
-msgctxt "input-name"
-msgid "P10 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:471
-msgctxt "input-name"
-msgid "P10 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:472
-msgctxt "input-name"
-msgid "P10 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:473
-msgctxt "input-name"
-msgid "P10 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:474
-msgctxt "input-name"
-msgid "P10 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:475
-msgctxt "input-name"
-msgid "P10 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:476
-msgctxt "input-name"
-msgid "P10 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:477
-msgctxt "input-name"
-msgid "P10 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:478
-msgctxt "input-name"
-msgid "P10 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:479
-msgctxt "input-name"
-msgid "P10 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:480
-msgctxt "input-name"
-msgid "P10 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:481
-msgctxt "input-name"
-msgid "P10 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:482
-msgctxt "input-name"
-msgid "P10 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:483
-msgctxt "input-name"
-msgid "P10 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:484
-msgctxt "input-name"
-msgid "P10 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:485
-msgctxt "input-name"
-msgid "P10 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:486
-msgctxt "input-name"
-msgid "P10 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:487
-msgctxt "input-name"
-msgid "P10 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:488
-msgctxt "input-name"
-msgid "P10 Select"
-msgstr ""
-
 #: src/emu/inpttype.ipp:493
 msgctxt "input-name"
 msgid "1 Player Start"
@@ -5479,154 +4108,31 @@ msgctxt "input-name"
 msgid "Volume Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:550
-msgctxt "input-name"
-msgid "P1 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:551
-msgctxt "input-name"
-msgid "P2 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:552
-msgctxt "input-name"
-msgid "P3 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:553
-msgctxt "input-name"
-msgid "P4 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:554
-msgctxt "input-name"
-msgid "P5 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:555
-msgctxt "input-name"
-msgid "P6 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:556
-msgctxt "input-name"
-msgid "P7 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:557
-msgctxt "input-name"
-msgid "P8 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:558
-msgctxt "input-name"
-msgid "P9 Pedal 1"
-msgstr ""
-
+#: src/emu/inpttype.ipp:550 src/emu/inpttype.ipp:551 src/emu/inpttype.ipp:552
+#: src/emu/inpttype.ipp:553 src/emu/inpttype.ipp:554 src/emu/inpttype.ipp:555
+#: src/emu/inpttype.ipp:556 src/emu/inpttype.ipp:557 src/emu/inpttype.ipp:558
 #: src/emu/inpttype.ipp:559
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:564
-msgctxt "input-name"
-msgid "P1 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:565
-msgctxt "input-name"
-msgid "P2 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:566
-msgctxt "input-name"
-msgid "P3 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:567
-msgctxt "input-name"
-msgid "P4 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:568
-msgctxt "input-name"
-msgid "P5 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:569
-msgctxt "input-name"
-msgid "P6 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:570
-msgctxt "input-name"
-msgid "P7 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:571
-msgctxt "input-name"
-msgid "P8 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:572
-msgctxt "input-name"
-msgid "P9 Pedal 2"
+msgid "%p Pedal 1"
 msgstr ""
 
+#: src/emu/inpttype.ipp:564 src/emu/inpttype.ipp:565 src/emu/inpttype.ipp:566
+#: src/emu/inpttype.ipp:567 src/emu/inpttype.ipp:568 src/emu/inpttype.ipp:569
+#: src/emu/inpttype.ipp:570 src/emu/inpttype.ipp:571 src/emu/inpttype.ipp:572
 #: src/emu/inpttype.ipp:573
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:578
-msgctxt "input-name"
-msgid "P1 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:579
-msgctxt "input-name"
-msgid "P2 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:580
-msgctxt "input-name"
-msgid "P3 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:581
-msgctxt "input-name"
-msgid "P4 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:582
-msgctxt "input-name"
-msgid "P5 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:583
-msgctxt "input-name"
-msgid "P6 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:584
-msgctxt "input-name"
-msgid "P7 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:585
-msgctxt "input-name"
-msgid "P8 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:586
-msgctxt "input-name"
-msgid "P9 Pedal 3"
+msgid "%p Pedal 2"
 msgstr ""
 
+#: src/emu/inpttype.ipp:578 src/emu/inpttype.ipp:579 src/emu/inpttype.ipp:580
+#: src/emu/inpttype.ipp:581 src/emu/inpttype.ipp:582 src/emu/inpttype.ipp:583
+#: src/emu/inpttype.ipp:584 src/emu/inpttype.ipp:585 src/emu/inpttype.ipp:586
 #: src/emu/inpttype.ipp:587
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 3"
+msgid "%p Pedal 3"
 msgstr ""
 
 #: src/emu/inpttype.ipp:592
diff --git a/language/Portuguese/strings.po b/language/Portuguese/strings.po
index 30265437500..40dbd018172 100644
--- a/language/Portuguese/strings.po
+++ b/language/Portuguese/strings.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-19 02:50+1100\n"
+"POT-Creation-Date: 2021-12-09 04:44+1100\n"
 "PO-Revision-Date: 2017-10-26 22:51+0100\n"
 "Last-Translator: pmos69\n"
 "Language-Team: MAME Language Team\n"
@@ -272,12 +272,12 @@ msgstr "%1$s %2$s ( %3$d / %4$d pacotes de software )"
 msgid "Driver: \"%1$s\" software list "
 msgstr "Driver: \"%1$s\" lista de software "
 
-#: src/frontend/mame/ui/selsoft.cpp:711 src/frontend/mame/ui/selgame.cpp:1066
+#: src/frontend/mame/ui/selsoft.cpp:711 src/frontend/mame/ui/selgame.cpp:1076
 #, c-format
 msgid "%1$s: %2$s - Search: %3$s_"
 msgstr "%1$s: %2$s - Procura: %3$s_"
 
-#: src/frontend/mame/ui/selsoft.cpp:713 src/frontend/mame/ui/selgame.cpp:1068
+#: src/frontend/mame/ui/selsoft.cpp:713 src/frontend/mame/ui/selgame.cpp:1078
 #, c-format
 msgid "Search: %1$s_"
 msgstr "Procura: %1$s_"
@@ -287,7 +287,7 @@ msgstr "Procura: %1$s_"
 msgid "Software list/item: %1$s:%2$s"
 msgstr ""
 
-#: src/frontend/mame/ui/optsmenu.cpp:73 src/frontend/mame/ui/sndmenu.cpp:165
+#: src/frontend/mame/ui/optsmenu.cpp:73 src/frontend/mame/ui/sndmenu.cpp:161
 msgid "Sound Options"
 msgstr "Opções de Som"
 
@@ -382,12 +382,12 @@ msgid "Show mouse pointer"
 msgstr "Mostrar ponteiro do rato"
 
 #: src/frontend/mame/ui/submenu.cpp:39
-msgid "Confirm quit from machines"
-msgstr "Confirmar saída das máquinas"
+msgid "Confirm quit from emulation"
+msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:40
-msgid "Skip information screen at startup"
-msgstr "Saltar ecrã de informação ao iniciar"
+msgid "Skip system information screen"
+msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:41
 msgid "Force 4:3 aspect for snapshot display"
@@ -402,7 +402,7 @@ msgid "Skip BIOS selection menu"
 msgstr "Saltar menu de selecção de BIOS"
 
 #: src/frontend/mame/ui/submenu.cpp:44
-msgid "Skip software parts selection menu"
+msgid "Skip software part selection menu"
 msgstr "Saltar menu de selecção de item de software"
 
 #: src/frontend/mame/ui/submenu.cpp:45
@@ -554,7 +554,7 @@ msgid "UI active"
 msgstr "Interface activa"
 
 #: src/frontend/mame/ui/submenu.cpp:91
-msgid "Offscreen reload"
+msgid "Off-screen reload"
 msgstr "Recarregar fora de ecrã"
 
 #: src/frontend/mame/ui/submenu.cpp:92
@@ -570,8 +570,8 @@ msgid "Natural keyboard"
 msgstr "Teclado Natural"
 
 #: src/frontend/mame/ui/submenu.cpp:95
-msgid "Simultaneous contradictory"
-msgstr "Contraditório Simultâneo"
+msgid "Allow contradictory joystick inputs"
+msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:96
 msgid "Coin impulse"
@@ -594,7 +594,7 @@ msgid "Pedal Device Assignment"
 msgstr "Atribuição do Dispositivo Pedal"
 
 #: src/frontend/mame/ui/submenu.cpp:106
-msgid "Adstick Device Assignment"
+msgid "AD Stick Device Assignment"
 msgstr "Atribuição do Dispositivo AD Stick"
 
 #: src/frontend/mame/ui/submenu.cpp:107
@@ -681,14 +681,14 @@ msgstr "Refrescamento Sincronizado"
 msgid "Wait Vertical Sync"
 msgstr "Esperar pelo Sync Vertical"
 
-#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:687
+#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:689
 #: src/frontend/mame/ui/videoopt.cpp:191 src/frontend/mame/ui/custui.cpp:490
 #: src/frontend/mame/ui/analogipt.cpp:471 plugins/cheatfind/init.lua:766
 #: plugins/cheatfind/init.lua:777 plugins/cheat/init.lua:668
 msgid "On"
 msgstr "Ligado"
 
-#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:690
+#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:692
 #: src/frontend/mame/ui/videoopt.cpp:207 src/frontend/mame/ui/custui.cpp:490
 #: src/frontend/mame/ui/analogipt.cpp:471 plugins/cheatfind/init.lua:763
 #: plugins/cheatfind/init.lua:774 plugins/cheat/init.lua:671
@@ -696,11 +696,11 @@ msgstr "Ligado"
 msgid "Off"
 msgstr "Desligado"
 
-#: src/frontend/mame/ui/menu.cpp:693
+#: src/frontend/mame/ui/menu.cpp:695
 msgid "Auto"
 msgstr "Automático"
 
-#: src/frontend/mame/ui/menu.cpp:1195
+#: src/frontend/mame/ui/menu.cpp:1197
 #: src/frontend/mame/ui/simpleselgame.cpp:278
 #: src/frontend/mame/ui/selmenu.cpp:1280
 msgid "Return to Previous Menu"
@@ -708,7 +708,7 @@ msgstr "Voltar ao Menu Anterior"
 
 #: src/frontend/mame/ui/filemngr.cpp:139
 #: src/frontend/mame/ui/confswitch.cpp:119
-#: src/frontend/mame/ui/inputmap.cpp:559 src/frontend/mame/ui/analogipt.cpp:360
+#: src/frontend/mame/ui/inputmap.cpp:563 src/frontend/mame/ui/analogipt.cpp:360
 #, c-format
 msgid "[root%1$s]"
 msgstr ""
@@ -972,22 +972,22 @@ msgstr ""
 "CPU:\n"
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "GHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "MHz"
 msgstr "MHz"
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "kHz"
 msgstr "kHz"
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "Hz"
 msgstr ""
 
@@ -1015,38 +1015,38 @@ msgstr "Nenhum\n"
 msgid "Vector"
 msgstr "Vetorial"
 
-#: src/frontend/mame/ui/info.cpp:480
+#: src/frontend/mame/ui/info.cpp:483
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr "%1$s: %2$s\n"
 
-#: src/frontend/mame/ui/info.cpp:480
+#: src/frontend/mame/ui/info.cpp:483
 msgid "%2$s\n"
 msgstr "%2$s\n"
 
-#: src/frontend/mame/ui/info.cpp:497
+#: src/frontend/mame/ui/info.cpp:500
 #, c-format
 msgid "Screen '%1$s'"
 msgstr "Ecrã '%1$s'"
 
-#: src/frontend/mame/ui/info.cpp:499
+#: src/frontend/mame/ui/info.cpp:502
 msgid "Screen"
 msgstr "Ecrã"
 
-#: src/frontend/mame/ui/info.cpp:570 src/frontend/mame/ui/info.cpp:581
+#: src/frontend/mame/ui/info.cpp:573 src/frontend/mame/ui/info.cpp:584
 #, c-format
 msgid "%1$s:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:662
+#: src/frontend/mame/ui/info.cpp:665
 msgid "Not supported"
 msgstr "Não suportado"
 
-#: src/frontend/mame/ui/info.cpp:665
+#: src/frontend/mame/ui/info.cpp:668
 msgid "Partially supported"
 msgstr "Parcialmente suportado"
 
-#: src/frontend/mame/ui/info.cpp:674
+#: src/frontend/mame/ui/info.cpp:677
 msgid "[empty]"
 msgstr "[vazio]"
 
@@ -1119,7 +1119,7 @@ msgid "Emulated"
 msgstr "Emulado"
 
 #: src/frontend/mame/ui/keyboard.cpp:59 src/frontend/mame/ui/confswitch.cpp:117
-#: src/frontend/mame/ui/inputmap.cpp:557 src/frontend/mame/ui/analogipt.cpp:358
+#: src/frontend/mame/ui/inputmap.cpp:561 src/frontend/mame/ui/analogipt.cpp:358
 #, c-format
 msgid "%1$s [root%2$s]"
 msgstr ""
@@ -1479,7 +1479,7 @@ msgctxt "swlist-info"
 msgid "Software list/item"
 msgstr ""
 
-#: src/frontend/mame/ui/datmenu.cpp:88 src/frontend/mame/ui/selmenu.cpp:2698
+#: src/frontend/mame/ui/datmenu.cpp:88 src/frontend/mame/ui/selmenu.cpp:2707
 msgid "Software List Info"
 msgstr ""
 
@@ -1601,7 +1601,7 @@ msgstr ""
 msgid "Configure Machine:"
 msgstr ""
 
-#: src/frontend/mame/ui/miscmenu.cpp:858 src/frontend/mame/ui/selmenu.cpp:2638
+#: src/frontend/mame/ui/miscmenu.cpp:858 src/frontend/mame/ui/selmenu.cpp:2647
 msgid " (default)"
 msgstr "(padrão)"
 
@@ -1622,7 +1622,7 @@ msgstr ""
 "Pressione %1$s para sair\n"
 "Pressione %2$s para voltar à emulação"
 
-#: src/frontend/mame/ui/info_pty.cpp:30 src/frontend/mame/ui/mainmenu.cpp:155
+#: src/frontend/mame/ui/info_pty.cpp:30
 msgid "Pseudo terminals"
 msgstr "Pseudo terminais"
 
@@ -1690,52 +1690,52 @@ msgstr ""
 msgid "Other Controls"
 msgstr "Outros Controlos"
 
-#: src/frontend/mame/ui/inputmap.cpp:227
+#: src/frontend/mame/ui/inputmap.cpp:231
 msgid "This machine has no configurable inputs."
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:327
+#: src/frontend/mame/ui/inputmap.cpp:331
 msgid "Pressed"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:397
+#: src/frontend/mame/ui/inputmap.cpp:401
 msgid "Invalid sequence entered"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:542
+#: src/frontend/mame/ui/inputmap.cpp:546
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:543
+#: src/frontend/mame/ui/inputmap.cpp:547
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog Inc"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:544
+#: src/frontend/mame/ui/inputmap.cpp:548
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog Dec"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:586
+#: src/frontend/mame/ui/inputmap.cpp:590
 #, c-format
 msgid "Press %1$s to set\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:587
+#: src/frontend/mame/ui/inputmap.cpp:591
 #, c-format
 msgid "Press %1$s to append\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:588
+#: src/frontend/mame/ui/inputmap.cpp:592
 #, c-format
 msgid "Press %1$s to clear\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:589
+#: src/frontend/mame/ui/inputmap.cpp:593
 #, c-format
 msgid "Press %1$s to restore default\n"
 msgstr ""
@@ -1803,7 +1803,7 @@ msgstr ""
 "Pressione qualquer tecla para continuar."
 
 #: src/frontend/mame/ui/simpleselgame.cpp:273
-#: src/frontend/mame/ui/selgame.cpp:436
+#: src/frontend/mame/ui/selgame.cpp:443
 msgid "Configure Options"
 msgstr "Configurar Opções"
 
@@ -2138,16 +2138,16 @@ msgstr ""
 msgid "Expand to fit"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:437
+#: src/frontend/mame/ui/selgame.cpp:444
 msgid "Configure Machine"
 msgstr "Configurar Máquina"
 
-#: src/frontend/mame/ui/selgame.cpp:1050
+#: src/frontend/mame/ui/selgame.cpp:1060
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d machines (%5$d BIOS) )"
 msgstr "%1$s %2$s ( %3$d / %4$d máquinas (%5$d BIOS) )"
 
-#: src/frontend/mame/ui/selgame.cpp:1078
+#: src/frontend/mame/ui/selgame.cpp:1088
 #, c-format
 msgid "System: %1$-.100s"
 msgstr "Sistema: %1$-.100s"
@@ -2169,11 +2169,9 @@ msgstr "Os resultados serão gravados em %1$s"
 #: src/frontend/mame/ui/auditmenu.cpp:98
 #, c-format
 msgid ""
-"Auditing ROMs for machine %2$u of %3$u...\n"
+"Auditing media for machine %2$u of %3$u...\n"
 "%1$s"
 msgstr ""
-"Auditando ROMs da máquina %2$u de %3$u...\n"
-"%1$s"
 
 #: src/frontend/mame/ui/auditmenu.cpp:116
 #, c-format
@@ -2186,13 +2184,13 @@ msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:136
 #, c-format
-msgid "Audit ROMs for %1$u machines marked unavailable"
-msgstr "Auditar ROMs de %1$u máquinas marcadas como indisponíveis"
+msgid "Audit media for %1$u machines marked unavailable"
+msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:137
 #, c-format
-msgid "Audit ROMs for all %1$u machines"
-msgstr "Auditar ROMs de todas as %1$u máquinas"
+msgid "Audit media for all %1$u machines"
+msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:154
 #, c-format
@@ -2398,84 +2396,84 @@ msgctxt "color-sample"
 msgid "Clone"
 msgstr "Clone"
 
-#: src/frontend/mame/ui/custui.cpp:914
+#: src/frontend/mame/ui/custui.cpp:906
 msgid "ARGB Settings"
 msgstr "Configurações ARGB"
 
-#: src/frontend/mame/ui/custui.cpp:919 src/frontend/mame/ui/custui.cpp:922
+#: src/frontend/mame/ui/custui.cpp:911 src/frontend/mame/ui/custui.cpp:914
 msgctxt "color-channel"
 msgid "Alpha"
 msgstr "Opacidade"
 
-#: src/frontend/mame/ui/custui.cpp:927 src/frontend/mame/ui/custui.cpp:930
+#: src/frontend/mame/ui/custui.cpp:919 src/frontend/mame/ui/custui.cpp:922
 msgctxt "color-channel"
 msgid "Red"
 msgstr "Vermelho"
 
-#: src/frontend/mame/ui/custui.cpp:935 src/frontend/mame/ui/custui.cpp:938
+#: src/frontend/mame/ui/custui.cpp:927 src/frontend/mame/ui/custui.cpp:930
 msgctxt "color-channel"
 msgid "Green"
 msgstr "Verde"
 
-#: src/frontend/mame/ui/custui.cpp:943 src/frontend/mame/ui/custui.cpp:946
+#: src/frontend/mame/ui/custui.cpp:935 src/frontend/mame/ui/custui.cpp:938
 msgctxt "color-channel"
 msgid "Blue"
 msgstr "Azul"
 
-#: src/frontend/mame/ui/custui.cpp:949
+#: src/frontend/mame/ui/custui.cpp:941
 msgid "Choose from palette"
 msgstr "Escolha da paleta"
 
-#: src/frontend/mame/ui/custui.cpp:996
+#: src/frontend/mame/ui/custui.cpp:988
 msgid "Color preview:"
 msgstr "Pré-Visualização de côr:"
 
-#: src/frontend/mame/ui/custui.cpp:1093
+#: src/frontend/mame/ui/custui.cpp:1085
 msgctxt "color-preset"
 msgid "White"
 msgstr "Branco"
 
-#: src/frontend/mame/ui/custui.cpp:1094
+#: src/frontend/mame/ui/custui.cpp:1086
 msgctxt "color-preset"
 msgid "Silver"
 msgstr "Prateado"
 
-#: src/frontend/mame/ui/custui.cpp:1095
+#: src/frontend/mame/ui/custui.cpp:1087
 msgctxt "color-preset"
 msgid "Gray"
 msgstr "Cinzento"
 
-#: src/frontend/mame/ui/custui.cpp:1096
+#: src/frontend/mame/ui/custui.cpp:1088
 msgctxt "color-preset"
 msgid "Black"
 msgstr "Preto"
 
-#: src/frontend/mame/ui/custui.cpp:1097
+#: src/frontend/mame/ui/custui.cpp:1089
 msgctxt "color-preset"
 msgid "Red"
 msgstr "Vermelho"
 
-#: src/frontend/mame/ui/custui.cpp:1098
+#: src/frontend/mame/ui/custui.cpp:1090
 msgctxt "color-preset"
 msgid "Orange"
 msgstr "Laranja"
 
-#: src/frontend/mame/ui/custui.cpp:1099
+#: src/frontend/mame/ui/custui.cpp:1091
 msgctxt "color-preset"
 msgid "Yellow"
 msgstr "Amarelo"
 
-#: src/frontend/mame/ui/custui.cpp:1100
+#: src/frontend/mame/ui/custui.cpp:1092
 msgctxt "color-preset"
 msgid "Green"
 msgstr "Verde"
 
-#: src/frontend/mame/ui/custui.cpp:1101
+#: src/frontend/mame/ui/custui.cpp:1093
 msgctxt "color-preset"
 msgid "Blue"
 msgstr "Azul"
 
-#: src/frontend/mame/ui/custui.cpp:1102
+#: src/frontend/mame/ui/custui.cpp:1094
 msgctxt "color-preset"
 msgid "Violet"
 msgstr "Violeta"
@@ -2540,8 +2538,8 @@ msgid "Input (general)"
 msgstr "Input (geral)"
 
 #: src/frontend/mame/ui/mainmenu.cpp:123
-msgid "Input (this Machine)"
-msgstr "Input (esta Máquina)"
+msgid "Input (this machine)"
+msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:126
 msgid "Analog Controls"
@@ -2579,6 +2577,10 @@ msgstr "Gestôr de Ficheiros"
 msgid "Tape Control"
 msgstr "Controle da Cassete"
 
+#: src/frontend/mame/ui/mainmenu.cpp:155
+msgid "Pseudo Terminals"
+msgstr ""
+
 #: src/frontend/mame/ui/mainmenu.cpp:158
 msgid "BIOS Selection"
 msgstr "Selecção de BIOS"
@@ -2617,7 +2619,7 @@ msgstr "Visualização de DAT Externa"
 
 #: src/frontend/mame/ui/mainmenu.cpp:200
 #, c-format
-msgid "About %s"
+msgid "About %1$s"
 msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:212
@@ -2777,373 +2779,373 @@ msgstr "O Driver é clone de: %1$s"
 msgid "%1$s %2$s"
 msgstr "%1$s %2$s"
 
-#: src/frontend/mame/ui/selmenu.cpp:2235
+#: src/frontend/mame/ui/selmenu.cpp:2244
 msgid "Images"
 msgstr "Imagens"
 
-#: src/frontend/mame/ui/selmenu.cpp:2236
+#: src/frontend/mame/ui/selmenu.cpp:2245
 msgid "Infos"
 msgstr "Infos"
 
-#: src/frontend/mame/ui/selmenu.cpp:2551
+#: src/frontend/mame/ui/selmenu.cpp:2560
 msgid ""
 "Required ROM/disk images for the selected system are missing or incorrect. "
 "Please acquire the correct files or select a different system.\n"
 "\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2567
+#: src/frontend/mame/ui/selmenu.cpp:2576
 msgid ""
 "Required ROM/disk images for the selected software are missing or incorrect. "
 "Please acquire the correct files or select a different software item.\n"
 "\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2583
+#: src/frontend/mame/ui/selmenu.cpp:2592
 msgid "incorrect checksum"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2586
+#: src/frontend/mame/ui/selmenu.cpp:2595
 msgid "incorrect length"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2589
+#: src/frontend/mame/ui/selmenu.cpp:2598
 msgid "not found"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2600
+#: src/frontend/mame/ui/selmenu.cpp:2609
 #, c-format
 msgid "%1$s (%2$s) - %3$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2602
+#: src/frontend/mame/ui/selmenu.cpp:2611
 #, c-format
 msgid "%1$s - %2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2606
+#: src/frontend/mame/ui/selmenu.cpp:2615
 msgid "Press any key to continue."
 msgstr "Pressione qualquer tecla para continuar"
 
-#: src/frontend/mame/ui/selmenu.cpp:2735
+#: src/frontend/mame/ui/selmenu.cpp:2744
 msgid "General Info"
 msgstr "Info Geral"
 
-#: src/frontend/mame/ui/selmenu.cpp:2887
+#: src/frontend/mame/ui/selmenu.cpp:2896
 #, c-format
 msgid "Romset\t%1$s\n"
 msgstr "Romset\t%1$s\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2888
+#: src/frontend/mame/ui/selmenu.cpp:2897
 #, c-format
 msgid "Year\t%1$s\n"
 msgstr "Ano\t%1$s\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2889
+#: src/frontend/mame/ui/selmenu.cpp:2898
 #, c-format
 msgid "Manufacturer\t%1$s\n"
 msgstr "Fabricante\t%1$-.100s\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2896
+#: src/frontend/mame/ui/selmenu.cpp:2905
 #, c-format
 msgid "Driver is Clone of\t%1$s\n"
 msgstr "Driver é Clone de\t%1$s\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2901
+#: src/frontend/mame/ui/selmenu.cpp:2910
 msgid "Driver is Parent\t\n"
 msgstr "Driver é Principal\t\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2905
+#: src/frontend/mame/ui/selmenu.cpp:2914
 msgid "Analog Controls\tYes\n"
 msgstr "Controlos Analógicos\tSim\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2907
+#: src/frontend/mame/ui/selmenu.cpp:2916
 msgid "Keyboard Inputs\tYes\n"
 msgstr "Entradas de Teclado\tSim\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2910
+#: src/frontend/mame/ui/selmenu.cpp:2919
 msgid "Overall\tNOT WORKING\n"
 msgstr "Global\tNÃO FUNCIONAL\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2912
+#: src/frontend/mame/ui/selmenu.cpp:2921
 msgid "Overall\tUnemulated Protection\n"
 msgstr "Global\tProteção não Emulada\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2914
+#: src/frontend/mame/ui/selmenu.cpp:2923
 msgid "Overall\tWorking\n"
 msgstr "Global\tFuncional\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2917
+#: src/frontend/mame/ui/selmenu.cpp:2926
 msgid "Graphics\tUnimplemented\n"
 msgstr "Gráficos\tNão Implementados\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2919
+#: src/frontend/mame/ui/selmenu.cpp:2928
 msgid "Graphics\tWrong Colors\n"
 msgstr "Gráficos\tCores Erradas\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2921
+#: src/frontend/mame/ui/selmenu.cpp:2930
 msgid "Graphics\tImperfect Colors\n"
 msgstr "Gráficos\tCores Imperfeitas\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2923
+#: src/frontend/mame/ui/selmenu.cpp:2932
 msgid "Graphics\tImperfect\n"
 msgstr "Gráficos\tImperfeitos\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2925
+#: src/frontend/mame/ui/selmenu.cpp:2934
 msgid "Graphics\tOK\n"
 msgstr "Gráficos\tOK\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2928
+#: src/frontend/mame/ui/selmenu.cpp:2937
 msgid "Sound\tNone\n"
 msgstr "Som\tSem Som\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2930
+#: src/frontend/mame/ui/selmenu.cpp:2939
 msgid "Sound\tUnimplemented\n"
 msgstr "Som\tNão Implementado\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2932
+#: src/frontend/mame/ui/selmenu.cpp:2941
 msgid "Sound\tImperfect\n"
 msgstr "Som\tImperfeito\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2934
+#: src/frontend/mame/ui/selmenu.cpp:2943
 msgid "Sound\tOK\n"
 msgstr "Som\tOK\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2937
+#: src/frontend/mame/ui/selmenu.cpp:2946
 msgid "Capture\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2939
+#: src/frontend/mame/ui/selmenu.cpp:2948
 msgid "Capture\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2942
+#: src/frontend/mame/ui/selmenu.cpp:2951
 msgid "Camera\tUnimplemented\n"
 msgstr "Câmara\tNão Implementada\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2944
+#: src/frontend/mame/ui/selmenu.cpp:2953
 msgid "Camera\tImperfect\n"
 msgstr "Câmara\tImperfeita\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2947
+#: src/frontend/mame/ui/selmenu.cpp:2956
 msgid "Microphone\tUnimplemented\n"
 msgstr "Microfone\tNão Implementado\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2949
+#: src/frontend/mame/ui/selmenu.cpp:2958
 msgid "Microphone\tImperfect\n"
 msgstr "Microfone\tImperfeito\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2952
+#: src/frontend/mame/ui/selmenu.cpp:2961
 msgid "Controls\tUnimplemented\n"
 msgstr "Controlos\tNão Implementados\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2954
+#: src/frontend/mame/ui/selmenu.cpp:2963
 msgid "Controls\tImperfect\n"
 msgstr "Controlos\tImperfeitos\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2957
+#: src/frontend/mame/ui/selmenu.cpp:2966
 msgid "Keyboard\tUnimplemented\n"
 msgstr "Teclado\tNão Implementado\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2959
+#: src/frontend/mame/ui/selmenu.cpp:2968
 msgid "Keyboard\tImperfect\n"
 msgstr "Teclado\tImperfeito\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2962
+#: src/frontend/mame/ui/selmenu.cpp:2971
 msgid "Mouse\tUnimplemented\n"
 msgstr "Rato\tNão Implementado\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2964
+#: src/frontend/mame/ui/selmenu.cpp:2973
 msgid "Mouse\tImperfect\n"
 msgstr "Rato\tImperfeito\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2967
+#: src/frontend/mame/ui/selmenu.cpp:2976
 msgid "Media\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2969
+#: src/frontend/mame/ui/selmenu.cpp:2978
 msgid "Media\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2972
+#: src/frontend/mame/ui/selmenu.cpp:2981
 msgid "Disk\tUnimplemented\n"
 msgstr "Disco\tNão Implementado\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2974
+#: src/frontend/mame/ui/selmenu.cpp:2983
 msgid "Disk\tImperfect\n"
 msgstr "Disco\tImperfeito\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2977
+#: src/frontend/mame/ui/selmenu.cpp:2986
 msgid "Printer\tUnimplemented\n"
 msgstr "Impressora\tNão Implementada\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2979
+#: src/frontend/mame/ui/selmenu.cpp:2988
 msgid "Printer\tImperfect\n"
 msgstr "Impressora\tImperfeita\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2982
+#: src/frontend/mame/ui/selmenu.cpp:2991
 msgid "Mag. Tape\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2984
+#: src/frontend/mame/ui/selmenu.cpp:2993
 msgid "Mag. Tape\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2987
+#: src/frontend/mame/ui/selmenu.cpp:2996
 msgid "Punch Tape\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2989
+#: src/frontend/mame/ui/selmenu.cpp:2998
 msgid "Punch Tape\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2992
+#: src/frontend/mame/ui/selmenu.cpp:3001
 msgid "Mag. Drum\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2994
+#: src/frontend/mame/ui/selmenu.cpp:3003
 msgid "Mag. Drum\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2997
+#: src/frontend/mame/ui/selmenu.cpp:3006
 msgid "(EP)ROM\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2999
+#: src/frontend/mame/ui/selmenu.cpp:3008
 msgid "(EP)ROM\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3002
+#: src/frontend/mame/ui/selmenu.cpp:3011
 msgid "Communications\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3004
+#: src/frontend/mame/ui/selmenu.cpp:3013
 msgid "Communications\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3007
+#: src/frontend/mame/ui/selmenu.cpp:3016
 msgid "LAN\tUnimplemented\n"
 msgstr "Rede Local\tNão Implementada\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3009
+#: src/frontend/mame/ui/selmenu.cpp:3018
 msgid "LAN\tImperfect\n"
 msgstr "Rede Local\tImperfeita\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3012
+#: src/frontend/mame/ui/selmenu.cpp:3021
 msgid "WAN\tUnimplemented\n"
 msgstr "WAN\tNão Implementada\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3014
+#: src/frontend/mame/ui/selmenu.cpp:3023
 msgid "WAN\tImperfect\n"
 msgstr "WAN\tImperfeita\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3017
+#: src/frontend/mame/ui/selmenu.cpp:3026
 msgid "Timing\tUnimplemented\n"
 msgstr "Temporização\tNão Implementada\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3019
+#: src/frontend/mame/ui/selmenu.cpp:3028
 msgid "Timing\tImperfect\n"
 msgstr "Temporização\tImperfeita\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3021
+#: src/frontend/mame/ui/selmenu.cpp:3030
 msgid "Mechanical Machine\tYes\n"
 msgstr "Máquina Mecânica\tSim\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3021
+#: src/frontend/mame/ui/selmenu.cpp:3030
 msgid "Mechanical Machine\tNo\n"
 msgstr "Máquina Mecânica\tNão\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3022
+#: src/frontend/mame/ui/selmenu.cpp:3031
 msgid "Requires Artwork\tYes\n"
 msgstr "Requer Artwork\tSim\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3022
+#: src/frontend/mame/ui/selmenu.cpp:3031
 msgid "Requires Artwork\tNo\n"
 msgstr "Requer Artwork\tNão\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3023
+#: src/frontend/mame/ui/selmenu.cpp:3032
 msgid "Requires Clickable Artwork\tYes\n"
 msgstr "Requer Artwork Clicável\tSim\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3023
+#: src/frontend/mame/ui/selmenu.cpp:3032
 msgid "Requires Clickable Artwork\tNo\n"
 msgstr "Requer Artwork Clicável\tNão\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3025
+#: src/frontend/mame/ui/selmenu.cpp:3034
 msgid "Support Cocktail\tNo\n"
 msgstr "Suporta Cocktail\tNão\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3026
+#: src/frontend/mame/ui/selmenu.cpp:3035
 msgid "Driver is BIOS\tYes\n"
 msgstr "Driver é BIOS\tSim\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3026
+#: src/frontend/mame/ui/selmenu.cpp:3035
 msgid "Driver is BIOS\tNo\n"
 msgstr "Driver é BIOS\tNão\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3027
+#: src/frontend/mame/ui/selmenu.cpp:3036
 msgid "Support Save\tYes\n"
 msgstr "Suporta Gravação\tSim\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3027
+#: src/frontend/mame/ui/selmenu.cpp:3036
 msgid "Support Save\tNo\n"
 msgstr "Suporta Gravação\tNão\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3028
+#: src/frontend/mame/ui/selmenu.cpp:3037
 msgid "Screen Orientation\tVertical\n"
 msgstr "Orientação de Ecrã\tVertical\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3028
+#: src/frontend/mame/ui/selmenu.cpp:3037
 msgid "Screen Orientation\tHorizontal\n"
 msgstr "Orientação de Ecrã\tHorizontal\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3038
+#: src/frontend/mame/ui/selmenu.cpp:3047
 msgid "Requires CHD\tYes\n"
 msgstr "Requer CHD\tSim\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3038
+#: src/frontend/mame/ui/selmenu.cpp:3047
 msgid "Requires CHD\tNo\n"
 msgstr "Requer CHD\tNão\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3051
-msgid "ROM Audit Result\tOK\n"
-msgstr "Resultado da Audit à ROM\tOK\n"
+#: src/frontend/mame/ui/selmenu.cpp:3060
+msgid "Media Audit Result\tOK\n"
+msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3053
-msgid "ROM Audit Result\tBAD\n"
-msgstr "Resultado da Audit à ROM\tFALHA\n"
+#: src/frontend/mame/ui/selmenu.cpp:3062
+msgid "Media Audit Result\tBAD\n"
+msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3056
+#: src/frontend/mame/ui/selmenu.cpp:3065
 msgid "Samples Audit Result\tNone Needed\n"
 msgstr "Resultado da Audit às Samples\tNenhuma Necessária\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3058
+#: src/frontend/mame/ui/selmenu.cpp:3067
 msgid "Samples Audit Result\tOK\n"
 msgstr "Resultado da Audit às Samples\tOK\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3060
+#: src/frontend/mame/ui/selmenu.cpp:3069
 msgid "Samples Audit Result\tBAD\n"
 msgstr "Resultado da Audit às Samples\tFALHA\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3064
+#: src/frontend/mame/ui/selmenu.cpp:3073
 msgid ""
-"ROM Audit \tDisabled\n"
-"Samples Audit \tDisabled\n"
+"Media Audit\tDisabled\n"
+"Samples Audit\tDisabled\n"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:150
+#: src/frontend/mame/ui/sndmenu.cpp:146
 msgid "Sound"
 msgstr "Som"
 
-#: src/frontend/mame/ui/sndmenu.cpp:151
+#: src/frontend/mame/ui/sndmenu.cpp:147
 msgid "Compressor"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:152
+#: src/frontend/mame/ui/sndmenu.cpp:148
 msgid "Sample Rate"
 msgstr "Frequência de Amostragem"
 
-#: src/frontend/mame/ui/sndmenu.cpp:153
+#: src/frontend/mame/ui/sndmenu.cpp:149
 msgid "Use External Samples"
 msgstr "Utilizar Samples Externas"
 
@@ -3182,511 +3184,681 @@ msgstr ""
 msgid "  Screen '%1$s': Vector\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:132
+#: src/frontend/mame/ui/devopt.cpp:135
 #, c-format
 msgid "  Screen '%1$s': %2$d × %3$d (V) %4$s Hz\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:133
+#: src/frontend/mame/ui/devopt.cpp:136
 #, c-format
 msgid "  Screen '%1$s': %2$d × %3$d (H) %4$s Hz\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:147
+#: src/frontend/mame/ui/devopt.cpp:150
 msgid "* Sound:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:211
+#: src/frontend/mame/ui/devopt.cpp:214
 #, c-format
 msgid ""
 "* BIOS settings:\n"
 "  %1$d options    [default: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:255 src/frontend/mame/ui/devopt.cpp:271
-#: src/frontend/mame/ui/devopt.cpp:332
+#: src/frontend/mame/ui/devopt.cpp:258 src/frontend/mame/ui/devopt.cpp:274
+#: src/frontend/mame/ui/devopt.cpp:335
 #, c-format
 msgid "  %1$s    [default: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:260 src/frontend/mame/ui/devopt.cpp:276
+#: src/frontend/mame/ui/devopt.cpp:263 src/frontend/mame/ui/devopt.cpp:279
 #, c-format
 msgid "  %1$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:282
+#: src/frontend/mame/ui/devopt.cpp:285
 msgid "* DIP switch settings:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:287
+#: src/frontend/mame/ui/devopt.cpp:290
 msgid "* Configuration settings:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:291
+#: src/frontend/mame/ui/devopt.cpp:294
 msgid "* Input device(s):\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:293
+#: src/frontend/mame/ui/devopt.cpp:296
 #, c-format
 msgid "  User inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:295
+#: src/frontend/mame/ui/devopt.cpp:298
 #, c-format
 msgid "  Mahjong inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:297
+#: src/frontend/mame/ui/devopt.cpp:300
 #, c-format
 msgid "  Hanafuda inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:299
+#: src/frontend/mame/ui/devopt.cpp:302
 #, c-format
 msgid "  Gambling inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:301
+#: src/frontend/mame/ui/devopt.cpp:304
 #, c-format
 msgid "  Analog inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:303
+#: src/frontend/mame/ui/devopt.cpp:306
 #, c-format
 msgid "  Adjuster inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:305
+#: src/frontend/mame/ui/devopt.cpp:308
 #, c-format
 msgid "  Keypad inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:307
+#: src/frontend/mame/ui/devopt.cpp:310
 #, c-format
 msgid "  Keyboard inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:312
+#: src/frontend/mame/ui/devopt.cpp:315
 msgid "* Media Options:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:317
+#: src/frontend/mame/ui/devopt.cpp:320
 #, c-format
 msgid "  %1$s    [tag: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:327
+#: src/frontend/mame/ui/devopt.cpp:330
 msgid "* Slot Options:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:341
+#: src/frontend/mame/ui/devopt.cpp:344
 msgid "[None]\n"
 msgstr ""
 
-#: src/emu/render.cpp:1847
+#: src/emu/render.cpp:1796
 #, c-format
 msgctxt "view-name"
 msgid "Screen %1$u Standard (%2$u:%3$u)"
 msgstr ""
 
-#: src/emu/render.cpp:1873
+#: src/emu/render.cpp:1822
 #, c-format
 msgctxt "view-name"
 msgid "Screen %1$u Pixel Aspect (%2$u:%3$u)"
 msgstr ""
 
-#: src/emu/render.cpp:1895 src/emu/render.cpp:2030
+#: src/emu/render.cpp:1844 src/emu/render.cpp:1979
 msgctxt "view-name"
 msgid "Cocktail"
 msgstr ""
 
-#: src/emu/render.cpp:2015
+#: src/emu/render.cpp:1964
 msgctxt "view-name"
 msgid "Left-to-Right"
 msgstr ""
 
-#: src/emu/render.cpp:2016
+#: src/emu/render.cpp:1965
 msgctxt "view-name"
 msgid "Left-to-Right (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2017
+#: src/emu/render.cpp:1966
 msgctxt "view-name"
 msgid "Top-to-Bottom"
 msgstr ""
 
-#: src/emu/render.cpp:2018
+#: src/emu/render.cpp:1967
 msgctxt "view-name"
 msgid "Top-to-Bottom (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2069
+#: src/emu/render.cpp:2018
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Left-to-Right, Top-to-Bottom"
 msgstr ""
 
-#: src/emu/render.cpp:2078
+#: src/emu/render.cpp:2027
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Left-to-Right, Top-to-Bottom (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2087
+#: src/emu/render.cpp:2036
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Top-to-Bottom, Left-to-Right"
 msgstr ""
 
-#: src/emu/render.cpp:2096
+#: src/emu/render.cpp:2045
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Top-to-Bottom, Left-to-Right (Gapless)"
 msgstr ""
 
-#: src/emu/inpttype.ipp:22
+#: src/emu/ioport.cpp:332
+#, c-format
 msgctxt "input-name"
-msgid "P1 Up"
+msgid "P%1$u"
 msgstr ""
 
-#: src/emu/inpttype.ipp:23
+#: src/emu/ioport.cpp:1924
 msgctxt "input-name"
-msgid "P1 Down"
+msgid "???"
 msgstr ""
 
-#: src/emu/inpttype.ipp:24
+#: src/emu/inpttype.ipp:22 src/emu/inpttype.ipp:140 src/emu/inpttype.ipp:221
+#: src/emu/inpttype.ipp:255 src/emu/inpttype.ipp:289 src/emu/inpttype.ipp:323
+#: src/emu/inpttype.ipp:357 src/emu/inpttype.ipp:391 src/emu/inpttype.ipp:425
+#: src/emu/inpttype.ipp:459
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left"
+msgid "%p Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:25
+#: src/emu/inpttype.ipp:23 src/emu/inpttype.ipp:141 src/emu/inpttype.ipp:222
+#: src/emu/inpttype.ipp:256 src/emu/inpttype.ipp:290 src/emu/inpttype.ipp:324
+#: src/emu/inpttype.ipp:358 src/emu/inpttype.ipp:392 src/emu/inpttype.ipp:426
+#: src/emu/inpttype.ipp:460
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right"
+msgid "%p Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:26
+#: src/emu/inpttype.ipp:24 src/emu/inpttype.ipp:142 src/emu/inpttype.ipp:223
+#: src/emu/inpttype.ipp:257 src/emu/inpttype.ipp:291 src/emu/inpttype.ipp:325
+#: src/emu/inpttype.ipp:359 src/emu/inpttype.ipp:393 src/emu/inpttype.ipp:427
+#: src/emu/inpttype.ipp:461
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Up"
+msgid "%p Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:27
+#: src/emu/inpttype.ipp:25 src/emu/inpttype.ipp:143 src/emu/inpttype.ipp:224
+#: src/emu/inpttype.ipp:258 src/emu/inpttype.ipp:292 src/emu/inpttype.ipp:326
+#: src/emu/inpttype.ipp:360 src/emu/inpttype.ipp:394 src/emu/inpttype.ipp:428
+#: src/emu/inpttype.ipp:462
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Down"
+msgid "%p Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:28
+#: src/emu/inpttype.ipp:26 src/emu/inpttype.ipp:144 src/emu/inpttype.ipp:225
+#: src/emu/inpttype.ipp:259 src/emu/inpttype.ipp:293 src/emu/inpttype.ipp:327
+#: src/emu/inpttype.ipp:361 src/emu/inpttype.ipp:395 src/emu/inpttype.ipp:429
+#: src/emu/inpttype.ipp:463
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Left"
+msgid "%p Right Stick/Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:29
+#: src/emu/inpttype.ipp:27 src/emu/inpttype.ipp:145 src/emu/inpttype.ipp:226
+#: src/emu/inpttype.ipp:260 src/emu/inpttype.ipp:294 src/emu/inpttype.ipp:328
+#: src/emu/inpttype.ipp:362 src/emu/inpttype.ipp:396 src/emu/inpttype.ipp:430
+#: src/emu/inpttype.ipp:464
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Right"
+msgid "%p Right Stick/Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:30
+#: src/emu/inpttype.ipp:28 src/emu/inpttype.ipp:146 src/emu/inpttype.ipp:227
+#: src/emu/inpttype.ipp:261 src/emu/inpttype.ipp:295 src/emu/inpttype.ipp:329
+#: src/emu/inpttype.ipp:363 src/emu/inpttype.ipp:397 src/emu/inpttype.ipp:431
+#: src/emu/inpttype.ipp:465
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Up"
+msgid "%p Right Stick/Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:31
+#: src/emu/inpttype.ipp:29 src/emu/inpttype.ipp:147 src/emu/inpttype.ipp:228
+#: src/emu/inpttype.ipp:262 src/emu/inpttype.ipp:296 src/emu/inpttype.ipp:330
+#: src/emu/inpttype.ipp:364 src/emu/inpttype.ipp:398 src/emu/inpttype.ipp:432
+#: src/emu/inpttype.ipp:466
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Down"
+msgid "%p Right Stick/Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:32
+#: src/emu/inpttype.ipp:30 src/emu/inpttype.ipp:148 src/emu/inpttype.ipp:229
+#: src/emu/inpttype.ipp:263 src/emu/inpttype.ipp:297 src/emu/inpttype.ipp:331
+#: src/emu/inpttype.ipp:365 src/emu/inpttype.ipp:399 src/emu/inpttype.ipp:433
+#: src/emu/inpttype.ipp:467
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Left"
+msgid "%p Left Stick/Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:33
+#: src/emu/inpttype.ipp:31 src/emu/inpttype.ipp:149 src/emu/inpttype.ipp:230
+#: src/emu/inpttype.ipp:264 src/emu/inpttype.ipp:298 src/emu/inpttype.ipp:332
+#: src/emu/inpttype.ipp:366 src/emu/inpttype.ipp:400 src/emu/inpttype.ipp:434
+#: src/emu/inpttype.ipp:468
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Right"
+msgid "%p Left Stick/Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:34
+#: src/emu/inpttype.ipp:32 src/emu/inpttype.ipp:150 src/emu/inpttype.ipp:231
+#: src/emu/inpttype.ipp:265 src/emu/inpttype.ipp:299 src/emu/inpttype.ipp:333
+#: src/emu/inpttype.ipp:367 src/emu/inpttype.ipp:401 src/emu/inpttype.ipp:435
+#: src/emu/inpttype.ipp:469
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 1"
+msgid "%p Left Stick/Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:35
+#: src/emu/inpttype.ipp:33 src/emu/inpttype.ipp:151 src/emu/inpttype.ipp:232
+#: src/emu/inpttype.ipp:266 src/emu/inpttype.ipp:300 src/emu/inpttype.ipp:334
+#: src/emu/inpttype.ipp:368 src/emu/inpttype.ipp:402 src/emu/inpttype.ipp:436
+#: src/emu/inpttype.ipp:470
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 2"
+msgid "%p Left Stick/Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:36
+#: src/emu/inpttype.ipp:34 src/emu/inpttype.ipp:152 src/emu/inpttype.ipp:233
+#: src/emu/inpttype.ipp:267 src/emu/inpttype.ipp:301 src/emu/inpttype.ipp:335
+#: src/emu/inpttype.ipp:369 src/emu/inpttype.ipp:403 src/emu/inpttype.ipp:437
+#: src/emu/inpttype.ipp:471
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 3"
+msgid "%p Button 1"
 msgstr ""
 
-#: src/emu/inpttype.ipp:37
+#: src/emu/inpttype.ipp:35 src/emu/inpttype.ipp:153 src/emu/inpttype.ipp:234
+#: src/emu/inpttype.ipp:268 src/emu/inpttype.ipp:302 src/emu/inpttype.ipp:336
+#: src/emu/inpttype.ipp:370 src/emu/inpttype.ipp:404 src/emu/inpttype.ipp:438
+#: src/emu/inpttype.ipp:472
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 4"
+msgid "%p Button 2"
 msgstr ""
 
-#: src/emu/inpttype.ipp:38
+#: src/emu/inpttype.ipp:36 src/emu/inpttype.ipp:154 src/emu/inpttype.ipp:235
+#: src/emu/inpttype.ipp:269 src/emu/inpttype.ipp:303 src/emu/inpttype.ipp:337
+#: src/emu/inpttype.ipp:371 src/emu/inpttype.ipp:405 src/emu/inpttype.ipp:439
+#: src/emu/inpttype.ipp:473
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 5"
+msgid "%p Button 3"
 msgstr ""
 
-#: src/emu/inpttype.ipp:39
+#: src/emu/inpttype.ipp:37 src/emu/inpttype.ipp:155 src/emu/inpttype.ipp:236
+#: src/emu/inpttype.ipp:270 src/emu/inpttype.ipp:304 src/emu/inpttype.ipp:338
+#: src/emu/inpttype.ipp:372 src/emu/inpttype.ipp:406 src/emu/inpttype.ipp:440
+#: src/emu/inpttype.ipp:474
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 6"
+msgid "%p Button 4"
 msgstr ""
 
-#: src/emu/inpttype.ipp:40
+#: src/emu/inpttype.ipp:38 src/emu/inpttype.ipp:156 src/emu/inpttype.ipp:237
+#: src/emu/inpttype.ipp:271 src/emu/inpttype.ipp:305 src/emu/inpttype.ipp:339
+#: src/emu/inpttype.ipp:373 src/emu/inpttype.ipp:407 src/emu/inpttype.ipp:441
+#: src/emu/inpttype.ipp:475
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 7"
+msgid "%p Button 5"
 msgstr ""
 
-#: src/emu/inpttype.ipp:41
+#: src/emu/inpttype.ipp:39 src/emu/inpttype.ipp:157 src/emu/inpttype.ipp:238
+#: src/emu/inpttype.ipp:272 src/emu/inpttype.ipp:306 src/emu/inpttype.ipp:340
+#: src/emu/inpttype.ipp:374 src/emu/inpttype.ipp:408 src/emu/inpttype.ipp:442
+#: src/emu/inpttype.ipp:476
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 8"
+msgid "%p Button 6"
 msgstr ""
 
-#: src/emu/inpttype.ipp:42
+#: src/emu/inpttype.ipp:40 src/emu/inpttype.ipp:158 src/emu/inpttype.ipp:239
+#: src/emu/inpttype.ipp:273 src/emu/inpttype.ipp:307 src/emu/inpttype.ipp:341
+#: src/emu/inpttype.ipp:375 src/emu/inpttype.ipp:409 src/emu/inpttype.ipp:443
+#: src/emu/inpttype.ipp:477
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 9"
+msgid "%p Button 7"
 msgstr ""
 
-#: src/emu/inpttype.ipp:43
+#: src/emu/inpttype.ipp:41 src/emu/inpttype.ipp:159 src/emu/inpttype.ipp:240
+#: src/emu/inpttype.ipp:274 src/emu/inpttype.ipp:308 src/emu/inpttype.ipp:342
+#: src/emu/inpttype.ipp:376 src/emu/inpttype.ipp:410 src/emu/inpttype.ipp:444
+#: src/emu/inpttype.ipp:478
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 10"
+msgid "%p Button 8"
 msgstr ""
 
-#: src/emu/inpttype.ipp:44
+#: src/emu/inpttype.ipp:42 src/emu/inpttype.ipp:160 src/emu/inpttype.ipp:241
+#: src/emu/inpttype.ipp:275 src/emu/inpttype.ipp:309 src/emu/inpttype.ipp:343
+#: src/emu/inpttype.ipp:377 src/emu/inpttype.ipp:411 src/emu/inpttype.ipp:445
+#: src/emu/inpttype.ipp:479
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 11"
+msgid "%p Button 9"
 msgstr ""
 
-#: src/emu/inpttype.ipp:45
+#: src/emu/inpttype.ipp:43 src/emu/inpttype.ipp:161 src/emu/inpttype.ipp:242
+#: src/emu/inpttype.ipp:276 src/emu/inpttype.ipp:310 src/emu/inpttype.ipp:344
+#: src/emu/inpttype.ipp:378 src/emu/inpttype.ipp:412 src/emu/inpttype.ipp:446
+#: src/emu/inpttype.ipp:480
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 12"
+msgid "%p Button 10"
 msgstr ""
 
-#: src/emu/inpttype.ipp:46
+#: src/emu/inpttype.ipp:44 src/emu/inpttype.ipp:162 src/emu/inpttype.ipp:243
+#: src/emu/inpttype.ipp:277 src/emu/inpttype.ipp:311 src/emu/inpttype.ipp:345
+#: src/emu/inpttype.ipp:379 src/emu/inpttype.ipp:413 src/emu/inpttype.ipp:447
+#: src/emu/inpttype.ipp:481
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 13"
+msgid "%p Button 11"
 msgstr ""
 
-#: src/emu/inpttype.ipp:47
+#: src/emu/inpttype.ipp:45 src/emu/inpttype.ipp:163 src/emu/inpttype.ipp:244
+#: src/emu/inpttype.ipp:278 src/emu/inpttype.ipp:312 src/emu/inpttype.ipp:346
+#: src/emu/inpttype.ipp:380 src/emu/inpttype.ipp:414 src/emu/inpttype.ipp:448
+#: src/emu/inpttype.ipp:482
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 14"
+msgid "%p Button 12"
 msgstr ""
 
-#: src/emu/inpttype.ipp:48
+#: src/emu/inpttype.ipp:46 src/emu/inpttype.ipp:164 src/emu/inpttype.ipp:245
+#: src/emu/inpttype.ipp:279 src/emu/inpttype.ipp:313 src/emu/inpttype.ipp:347
+#: src/emu/inpttype.ipp:381 src/emu/inpttype.ipp:415 src/emu/inpttype.ipp:449
+#: src/emu/inpttype.ipp:483
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 15"
+msgid "%p Button 13"
 msgstr ""
 
-#: src/emu/inpttype.ipp:49
+#: src/emu/inpttype.ipp:47 src/emu/inpttype.ipp:165 src/emu/inpttype.ipp:246
+#: src/emu/inpttype.ipp:280 src/emu/inpttype.ipp:314 src/emu/inpttype.ipp:348
+#: src/emu/inpttype.ipp:382 src/emu/inpttype.ipp:416 src/emu/inpttype.ipp:450
+#: src/emu/inpttype.ipp:484
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 16"
+msgid "%p Button 14"
 msgstr ""
 
-#: src/emu/inpttype.ipp:50
+#: src/emu/inpttype.ipp:48 src/emu/inpttype.ipp:166 src/emu/inpttype.ipp:247
+#: src/emu/inpttype.ipp:281 src/emu/inpttype.ipp:315 src/emu/inpttype.ipp:349
+#: src/emu/inpttype.ipp:383 src/emu/inpttype.ipp:417 src/emu/inpttype.ipp:451
+#: src/emu/inpttype.ipp:485
+#, c-format
 msgctxt "input-name"
-msgid "P1 Start"
+msgid "%p Button 15"
 msgstr ""
 
-#: src/emu/inpttype.ipp:51
+#: src/emu/inpttype.ipp:49 src/emu/inpttype.ipp:167 src/emu/inpttype.ipp:248
+#: src/emu/inpttype.ipp:282 src/emu/inpttype.ipp:316 src/emu/inpttype.ipp:350
+#: src/emu/inpttype.ipp:384 src/emu/inpttype.ipp:418 src/emu/inpttype.ipp:452
+#: src/emu/inpttype.ipp:486
+#, c-format
 msgctxt "input-name"
-msgid "P1 Select"
+msgid "%p Button 16"
 msgstr ""
 
-#: src/emu/inpttype.ipp:56
+#: src/emu/inpttype.ipp:50 src/emu/inpttype.ipp:168 src/emu/inpttype.ipp:249
+#: src/emu/inpttype.ipp:283 src/emu/inpttype.ipp:317 src/emu/inpttype.ipp:351
+#: src/emu/inpttype.ipp:385 src/emu/inpttype.ipp:419 src/emu/inpttype.ipp:453
+#: src/emu/inpttype.ipp:487
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong A"
+msgid "%p Start"
 msgstr ""
 
-#: src/emu/inpttype.ipp:57
+#: src/emu/inpttype.ipp:51 src/emu/inpttype.ipp:169 src/emu/inpttype.ipp:250
+#: src/emu/inpttype.ipp:284 src/emu/inpttype.ipp:318 src/emu/inpttype.ipp:352
+#: src/emu/inpttype.ipp:386 src/emu/inpttype.ipp:420 src/emu/inpttype.ipp:454
+#: src/emu/inpttype.ipp:488
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong B"
+msgid "%p Select"
 msgstr ""
 
-#: src/emu/inpttype.ipp:58
+#: src/emu/inpttype.ipp:56 src/emu/inpttype.ipp:174
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong C"
+msgid "%p Mahjong A"
 msgstr ""
 
-#: src/emu/inpttype.ipp:59
+#: src/emu/inpttype.ipp:57 src/emu/inpttype.ipp:175
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong D"
+msgid "%p Mahjong B"
 msgstr ""
 
-#: src/emu/inpttype.ipp:60
+#: src/emu/inpttype.ipp:58 src/emu/inpttype.ipp:176
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong E"
+msgid "%p Mahjong C"
 msgstr ""
 
-#: src/emu/inpttype.ipp:61
+#: src/emu/inpttype.ipp:59 src/emu/inpttype.ipp:177
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong F"
+msgid "%p Mahjong D"
 msgstr ""
 
-#: src/emu/inpttype.ipp:62
+#: src/emu/inpttype.ipp:60 src/emu/inpttype.ipp:178
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong G"
+msgid "%p Mahjong E"
 msgstr ""
 
-#: src/emu/inpttype.ipp:63
+#: src/emu/inpttype.ipp:61 src/emu/inpttype.ipp:179
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong H"
+msgid "%p Mahjong F"
 msgstr ""
 
-#: src/emu/inpttype.ipp:64
+#: src/emu/inpttype.ipp:62 src/emu/inpttype.ipp:180
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong I"
+msgid "%p Mahjong G"
 msgstr ""
 
-#: src/emu/inpttype.ipp:65
+#: src/emu/inpttype.ipp:63 src/emu/inpttype.ipp:181
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong J"
+msgid "%p Mahjong H"
 msgstr ""
 
-#: src/emu/inpttype.ipp:66
+#: src/emu/inpttype.ipp:64 src/emu/inpttype.ipp:182
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong K"
+msgid "%p Mahjong I"
 msgstr ""
 
-#: src/emu/inpttype.ipp:67
+#: src/emu/inpttype.ipp:65 src/emu/inpttype.ipp:183
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong L"
+msgid "%p Mahjong J"
 msgstr ""
 
-#: src/emu/inpttype.ipp:68
+#: src/emu/inpttype.ipp:66 src/emu/inpttype.ipp:184
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong M"
+msgid "%p Mahjong K"
 msgstr ""
 
-#: src/emu/inpttype.ipp:69
+#: src/emu/inpttype.ipp:67 src/emu/inpttype.ipp:185
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong N"
+msgid "%p Mahjong L"
 msgstr ""
 
-#: src/emu/inpttype.ipp:70
+#: src/emu/inpttype.ipp:68 src/emu/inpttype.ipp:186
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong O"
+msgid "%p Mahjong M"
 msgstr ""
 
-#: src/emu/inpttype.ipp:71
+#: src/emu/inpttype.ipp:69 src/emu/inpttype.ipp:187
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong P"
+msgid "%p Mahjong N"
 msgstr ""
 
-#: src/emu/inpttype.ipp:72
+#: src/emu/inpttype.ipp:70 src/emu/inpttype.ipp:188
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Q"
+msgid "%p Mahjong O"
 msgstr ""
 
-#: src/emu/inpttype.ipp:73
+#: src/emu/inpttype.ipp:71 src/emu/inpttype.ipp:189
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Kan"
+msgid "%p Mahjong P"
 msgstr ""
 
-#: src/emu/inpttype.ipp:74
+#: src/emu/inpttype.ipp:72 src/emu/inpttype.ipp:190
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Pon"
+msgid "%p Mahjong Q"
 msgstr ""
 
-#: src/emu/inpttype.ipp:75
+#: src/emu/inpttype.ipp:73 src/emu/inpttype.ipp:191
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Chi"
+msgid "%p Mahjong Kan"
 msgstr ""
 
-#: src/emu/inpttype.ipp:76
+#: src/emu/inpttype.ipp:74 src/emu/inpttype.ipp:192
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Reach"
+msgid "%p Mahjong Pon"
 msgstr ""
 
-#: src/emu/inpttype.ipp:77
+#: src/emu/inpttype.ipp:75 src/emu/inpttype.ipp:193
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Ron"
+msgid "%p Mahjong Chi"
 msgstr ""
 
-#: src/emu/inpttype.ipp:78
+#: src/emu/inpttype.ipp:76 src/emu/inpttype.ipp:194
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Flip Flop"
+msgid "%p Mahjong Reach"
 msgstr ""
 
-#: src/emu/inpttype.ipp:79
+#: src/emu/inpttype.ipp:77 src/emu/inpttype.ipp:195
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Bet"
+msgid "%p Mahjong Ron"
 msgstr ""
 
-#: src/emu/inpttype.ipp:80
+#: src/emu/inpttype.ipp:78 src/emu/inpttype.ipp:200
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Take Score"
+msgid "%p Mahjong Flip Flop"
 msgstr ""
 
-#: src/emu/inpttype.ipp:81
+#: src/emu/inpttype.ipp:79 src/emu/inpttype.ipp:196
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Double Up"
+msgid "%p Mahjong Bet"
 msgstr ""
 
-#: src/emu/inpttype.ipp:82
+#: src/emu/inpttype.ipp:80 src/emu/inpttype.ipp:198
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Big"
+msgid "%p Mahjong Take Score"
 msgstr ""
 
-#: src/emu/inpttype.ipp:83
+#: src/emu/inpttype.ipp:81 src/emu/inpttype.ipp:199
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Small"
+msgid "%p Mahjong Double Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:84
+#: src/emu/inpttype.ipp:82 src/emu/inpttype.ipp:201
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Last Chance"
+msgid "%p Mahjong Big"
 msgstr ""
 
-#: src/emu/inpttype.ipp:89
+#: src/emu/inpttype.ipp:83 src/emu/inpttype.ipp:202
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda A/1"
+msgid "%p Mahjong Small"
 msgstr ""
 
-#: src/emu/inpttype.ipp:90
+#: src/emu/inpttype.ipp:84 src/emu/inpttype.ipp:197
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda B/2"
+msgid "%p Mahjong Last Chance"
 msgstr ""
 
-#: src/emu/inpttype.ipp:91
+#: src/emu/inpttype.ipp:89 src/emu/inpttype.ipp:207
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda C/3"
+msgid "%p Hanafuda A/1"
 msgstr ""
 
-#: src/emu/inpttype.ipp:92
+#: src/emu/inpttype.ipp:90 src/emu/inpttype.ipp:208
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda D/4"
+msgid "%p Hanafuda B/2"
 msgstr ""
 
-#: src/emu/inpttype.ipp:93
+#: src/emu/inpttype.ipp:91 src/emu/inpttype.ipp:209
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda E/5"
+msgid "%p Hanafuda C/3"
 msgstr ""
 
-#: src/emu/inpttype.ipp:94
+#: src/emu/inpttype.ipp:92 src/emu/inpttype.ipp:210
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda F/6"
+msgid "%p Hanafuda D/4"
 msgstr ""
 
-#: src/emu/inpttype.ipp:95
+#: src/emu/inpttype.ipp:93 src/emu/inpttype.ipp:211
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda G/7"
+msgid "%p Hanafuda E/5"
 msgstr ""
 
-#: src/emu/inpttype.ipp:96
+#: src/emu/inpttype.ipp:94 src/emu/inpttype.ipp:212
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda H/8"
+msgid "%p Hanafuda F/6"
 msgstr ""
 
-#: src/emu/inpttype.ipp:97
+#: src/emu/inpttype.ipp:95 src/emu/inpttype.ipp:213
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda Yes"
+msgid "%p Hanafuda G/7"
 msgstr ""
 
-#: src/emu/inpttype.ipp:98
+#: src/emu/inpttype.ipp:96 src/emu/inpttype.ipp:214
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda No"
+msgid "%p Hanafuda H/8"
+msgstr ""
+
+#: src/emu/inpttype.ipp:97 src/emu/inpttype.ipp:215
+#, c-format
+msgctxt "input-name"
+msgid "%p Hanafuda Yes"
+msgstr ""
+
+#: src/emu/inpttype.ipp:98 src/emu/inpttype.ipp:216
+#, c-format
+msgctxt "input-name"
+msgid "%p Hanafuda No"
 msgstr ""
 
 #: src/emu/inpttype.ipp:103
@@ -3814,1551 +3986,6 @@ msgctxt "input-name"
 msgid "Stop All Reels"
 msgstr ""
 
-#: src/emu/inpttype.ipp:140
-msgctxt "input-name"
-msgid "P2 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:141
-msgctxt "input-name"
-msgid "P2 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:142
-msgctxt "input-name"
-msgid "P2 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:143
-msgctxt "input-name"
-msgid "P2 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:144
-msgctxt "input-name"
-msgid "P2 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:145
-msgctxt "input-name"
-msgid "P2 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:146
-msgctxt "input-name"
-msgid "P2 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:147
-msgctxt "input-name"
-msgid "P2 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:148
-msgctxt "input-name"
-msgid "P2 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:149
-msgctxt "input-name"
-msgid "P2 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:150
-msgctxt "input-name"
-msgid "P2 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:151
-msgctxt "input-name"
-msgid "P2 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:152
-msgctxt "input-name"
-msgid "P2 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:153
-msgctxt "input-name"
-msgid "P2 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:154
-msgctxt "input-name"
-msgid "P2 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:155
-msgctxt "input-name"
-msgid "P2 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:156
-msgctxt "input-name"
-msgid "P2 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:157
-msgctxt "input-name"
-msgid "P2 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:158
-msgctxt "input-name"
-msgid "P2 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:159
-msgctxt "input-name"
-msgid "P2 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:160
-msgctxt "input-name"
-msgid "P2 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:161
-msgctxt "input-name"
-msgid "P2 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:162
-msgctxt "input-name"
-msgid "P2 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:163
-msgctxt "input-name"
-msgid "P2 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:164
-msgctxt "input-name"
-msgid "P2 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:165
-msgctxt "input-name"
-msgid "P2 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:166
-msgctxt "input-name"
-msgid "P2 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:167
-msgctxt "input-name"
-msgid "P2 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:168
-msgctxt "input-name"
-msgid "P2 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:169
-msgctxt "input-name"
-msgid "P2 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:174
-msgctxt "input-name"
-msgid "P2 Mahjong A"
-msgstr ""
-
-#: src/emu/inpttype.ipp:175
-msgctxt "input-name"
-msgid "P2 Mahjong B"
-msgstr ""
-
-#: src/emu/inpttype.ipp:176
-msgctxt "input-name"
-msgid "P2 Mahjong C"
-msgstr ""
-
-#: src/emu/inpttype.ipp:177
-msgctxt "input-name"
-msgid "P2 Mahjong D"
-msgstr ""
-
-#: src/emu/inpttype.ipp:178
-msgctxt "input-name"
-msgid "P2 Mahjong E"
-msgstr ""
-
-#: src/emu/inpttype.ipp:179
-msgctxt "input-name"
-msgid "P2 Mahjong F"
-msgstr ""
-
-#: src/emu/inpttype.ipp:180
-msgctxt "input-name"
-msgid "P2 Mahjong G"
-msgstr ""
-
-#: src/emu/inpttype.ipp:181
-msgctxt "input-name"
-msgid "P2 Mahjong H"
-msgstr ""
-
-#: src/emu/inpttype.ipp:182
-msgctxt "input-name"
-msgid "P2 Mahjong I"
-msgstr ""
-
-#: src/emu/inpttype.ipp:183
-msgctxt "input-name"
-msgid "P2 Mahjong J"
-msgstr ""
-
-#: src/emu/inpttype.ipp:184
-msgctxt "input-name"
-msgid "P2 Mahjong K"
-msgstr ""
-
-#: src/emu/inpttype.ipp:185
-msgctxt "input-name"
-msgid "P2 Mahjong L"
-msgstr ""
-
-#: src/emu/inpttype.ipp:186
-msgctxt "input-name"
-msgid "P2 Mahjong M"
-msgstr ""
-
-#: src/emu/inpttype.ipp:187
-msgctxt "input-name"
-msgid "P2 Mahjong N"
-msgstr ""
-
-#: src/emu/inpttype.ipp:188
-msgctxt "input-name"
-msgid "P2 Mahjong O"
-msgstr ""
-
-#: src/emu/inpttype.ipp:189
-msgctxt "input-name"
-msgid "P2 Mahjong P"
-msgstr ""
-
-#: src/emu/inpttype.ipp:190
-msgctxt "input-name"
-msgid "P2 Mahjong Q"
-msgstr ""
-
-#: src/emu/inpttype.ipp:191
-msgctxt "input-name"
-msgid "P2 Mahjong Kan"
-msgstr ""
-
-#: src/emu/inpttype.ipp:192
-msgctxt "input-name"
-msgid "P2 Mahjong Pon"
-msgstr ""
-
-#: src/emu/inpttype.ipp:193
-msgctxt "input-name"
-msgid "P2 Mahjong Chi"
-msgstr ""
-
-#: src/emu/inpttype.ipp:194
-msgctxt "input-name"
-msgid "P2 Mahjong Reach"
-msgstr ""
-
-#: src/emu/inpttype.ipp:195
-msgctxt "input-name"
-msgid "P2 Mahjong Ron"
-msgstr ""
-
-#: src/emu/inpttype.ipp:196
-msgctxt "input-name"
-msgid "P2 Mahjong Bet"
-msgstr ""
-
-#: src/emu/inpttype.ipp:197
-msgctxt "input-name"
-msgid "P2 Mahjong Last Chance"
-msgstr ""
-
-#: src/emu/inpttype.ipp:198
-msgctxt "input-name"
-msgid "P2 Mahjong Take Score"
-msgstr ""
-
-#: src/emu/inpttype.ipp:199
-msgctxt "input-name"
-msgid "P2 Mahjong Double Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:200
-msgctxt "input-name"
-msgid "P2 Mahjong Flip Flop"
-msgstr ""
-
-#: src/emu/inpttype.ipp:201
-msgctxt "input-name"
-msgid "P2 Mahjong Big"
-msgstr ""
-
-#: src/emu/inpttype.ipp:202
-msgctxt "input-name"
-msgid "P2 Mahjong Small"
-msgstr ""
-
-#: src/emu/inpttype.ipp:207
-msgctxt "input-name"
-msgid "P2 Hanafuda A/1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:208
-msgctxt "input-name"
-msgid "P2 Hanafuda B/2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:209
-msgctxt "input-name"
-msgid "P2 Hanafuda C/3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:210
-msgctxt "input-name"
-msgid "P2 Hanafuda D/4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:211
-msgctxt "input-name"
-msgid "P2 Hanafuda E/5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:212
-msgctxt "input-name"
-msgid "P2 Hanafuda F/6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:213
-msgctxt "input-name"
-msgid "P2 Hanafuda G/7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:214
-msgctxt "input-name"
-msgid "P2 Hanafuda H/8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:215
-msgctxt "input-name"
-msgid "P2 Hanafuda Yes"
-msgstr ""
-
-#: src/emu/inpttype.ipp:216
-msgctxt "input-name"
-msgid "P2 Hanafuda No"
-msgstr ""
-
-#: src/emu/inpttype.ipp:221
-msgctxt "input-name"
-msgid "P3 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:222
-msgctxt "input-name"
-msgid "P3 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:223
-msgctxt "input-name"
-msgid "P3 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:224
-msgctxt "input-name"
-msgid "P3 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:225
-msgctxt "input-name"
-msgid "P3 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:226
-msgctxt "input-name"
-msgid "P3 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:227
-msgctxt "input-name"
-msgid "P3 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:228
-msgctxt "input-name"
-msgid "P3 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:229
-msgctxt "input-name"
-msgid "P3 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:230
-msgctxt "input-name"
-msgid "P3 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:231
-msgctxt "input-name"
-msgid "P3 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:232
-msgctxt "input-name"
-msgid "P3 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:233
-msgctxt "input-name"
-msgid "P3 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:234
-msgctxt "input-name"
-msgid "P3 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:235
-msgctxt "input-name"
-msgid "P3 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:236
-msgctxt "input-name"
-msgid "P3 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:237
-msgctxt "input-name"
-msgid "P3 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:238
-msgctxt "input-name"
-msgid "P3 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:239
-msgctxt "input-name"
-msgid "P3 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:240
-msgctxt "input-name"
-msgid "P3 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:241
-msgctxt "input-name"
-msgid "P3 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:242
-msgctxt "input-name"
-msgid "P3 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:243
-msgctxt "input-name"
-msgid "P3 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:244
-msgctxt "input-name"
-msgid "P3 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:245
-msgctxt "input-name"
-msgid "P3 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:246
-msgctxt "input-name"
-msgid "P3 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:247
-msgctxt "input-name"
-msgid "P3 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:248
-msgctxt "input-name"
-msgid "P3 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:249
-msgctxt "input-name"
-msgid "P3 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:250
-msgctxt "input-name"
-msgid "P3 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:255
-msgctxt "input-name"
-msgid "P4 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:256
-msgctxt "input-name"
-msgid "P4 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:257
-msgctxt "input-name"
-msgid "P4 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:258
-msgctxt "input-name"
-msgid "P4 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:259
-msgctxt "input-name"
-msgid "P4 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:260
-msgctxt "input-name"
-msgid "P4 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:261
-msgctxt "input-name"
-msgid "P4 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:262
-msgctxt "input-name"
-msgid "P4 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:263
-msgctxt "input-name"
-msgid "P4 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:264
-msgctxt "input-name"
-msgid "P4 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:265
-msgctxt "input-name"
-msgid "P4 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:266
-msgctxt "input-name"
-msgid "P4 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:267
-msgctxt "input-name"
-msgid "P4 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:268
-msgctxt "input-name"
-msgid "P4 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:269
-msgctxt "input-name"
-msgid "P4 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:270
-msgctxt "input-name"
-msgid "P4 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:271
-msgctxt "input-name"
-msgid "P4 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:272
-msgctxt "input-name"
-msgid "P4 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:273
-msgctxt "input-name"
-msgid "P4 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:274
-msgctxt "input-name"
-msgid "P4 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:275
-msgctxt "input-name"
-msgid "P4 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:276
-msgctxt "input-name"
-msgid "P4 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:277
-msgctxt "input-name"
-msgid "P4 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:278
-msgctxt "input-name"
-msgid "P4 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:279
-msgctxt "input-name"
-msgid "P4 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:280
-msgctxt "input-name"
-msgid "P4 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:281
-msgctxt "input-name"
-msgid "P4 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:282
-msgctxt "input-name"
-msgid "P4 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:283
-msgctxt "input-name"
-msgid "P4 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:284
-msgctxt "input-name"
-msgid "P4 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:289
-msgctxt "input-name"
-msgid "P5 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:290
-msgctxt "input-name"
-msgid "P5 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:291
-msgctxt "input-name"
-msgid "P5 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:292
-msgctxt "input-name"
-msgid "P5 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:293
-msgctxt "input-name"
-msgid "P5 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:294
-msgctxt "input-name"
-msgid "P5 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:295
-msgctxt "input-name"
-msgid "P5 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:296
-msgctxt "input-name"
-msgid "P5 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:297
-msgctxt "input-name"
-msgid "P5 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:298
-msgctxt "input-name"
-msgid "P5 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:299
-msgctxt "input-name"
-msgid "P5 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:300
-msgctxt "input-name"
-msgid "P5 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:301
-msgctxt "input-name"
-msgid "P5 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:302
-msgctxt "input-name"
-msgid "P5 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:303
-msgctxt "input-name"
-msgid "P5 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:304
-msgctxt "input-name"
-msgid "P5 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:305
-msgctxt "input-name"
-msgid "P5 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:306
-msgctxt "input-name"
-msgid "P5 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:307
-msgctxt "input-name"
-msgid "P5 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:308
-msgctxt "input-name"
-msgid "P5 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:309
-msgctxt "input-name"
-msgid "P5 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:310
-msgctxt "input-name"
-msgid "P5 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:311
-msgctxt "input-name"
-msgid "P5 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:312
-msgctxt "input-name"
-msgid "P5 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:313
-msgctxt "input-name"
-msgid "P5 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:314
-msgctxt "input-name"
-msgid "P5 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:315
-msgctxt "input-name"
-msgid "P5 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:316
-msgctxt "input-name"
-msgid "P5 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:317
-msgctxt "input-name"
-msgid "P5 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:318
-msgctxt "input-name"
-msgid "P5 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:323
-msgctxt "input-name"
-msgid "P6 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:324
-msgctxt "input-name"
-msgid "P6 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:325
-msgctxt "input-name"
-msgid "P6 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:326
-msgctxt "input-name"
-msgid "P6 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:327
-msgctxt "input-name"
-msgid "P6 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:328
-msgctxt "input-name"
-msgid "P6 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:329
-msgctxt "input-name"
-msgid "P6 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:330
-msgctxt "input-name"
-msgid "P6 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:331
-msgctxt "input-name"
-msgid "P6 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:332
-msgctxt "input-name"
-msgid "P6 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:333
-msgctxt "input-name"
-msgid "P6 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:334
-msgctxt "input-name"
-msgid "P6 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:335
-msgctxt "input-name"
-msgid "P6 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:336
-msgctxt "input-name"
-msgid "P6 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:337
-msgctxt "input-name"
-msgid "P6 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:338
-msgctxt "input-name"
-msgid "P6 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:339
-msgctxt "input-name"
-msgid "P6 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:340
-msgctxt "input-name"
-msgid "P6 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:341
-msgctxt "input-name"
-msgid "P6 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:342
-msgctxt "input-name"
-msgid "P6 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:343
-msgctxt "input-name"
-msgid "P6 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:344
-msgctxt "input-name"
-msgid "P6 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:345
-msgctxt "input-name"
-msgid "P6 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:346
-msgctxt "input-name"
-msgid "P6 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:347
-msgctxt "input-name"
-msgid "P6 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:348
-msgctxt "input-name"
-msgid "P6 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:349
-msgctxt "input-name"
-msgid "P6 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:350
-msgctxt "input-name"
-msgid "P6 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:351
-msgctxt "input-name"
-msgid "P6 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:352
-msgctxt "input-name"
-msgid "P6 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:357
-msgctxt "input-name"
-msgid "P7 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:358
-msgctxt "input-name"
-msgid "P7 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:359
-msgctxt "input-name"
-msgid "P7 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:360
-msgctxt "input-name"
-msgid "P7 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:361
-msgctxt "input-name"
-msgid "P7 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:362
-msgctxt "input-name"
-msgid "P7 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:363
-msgctxt "input-name"
-msgid "P7 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:364
-msgctxt "input-name"
-msgid "P7 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:365
-msgctxt "input-name"
-msgid "P7 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:366
-msgctxt "input-name"
-msgid "P7 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:367
-msgctxt "input-name"
-msgid "P7 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:368
-msgctxt "input-name"
-msgid "P7 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:369
-msgctxt "input-name"
-msgid "P7 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:370
-msgctxt "input-name"
-msgid "P7 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:371
-msgctxt "input-name"
-msgid "P7 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:372
-msgctxt "input-name"
-msgid "P7 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:373
-msgctxt "input-name"
-msgid "P7 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:374
-msgctxt "input-name"
-msgid "P7 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:375
-msgctxt "input-name"
-msgid "P7 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:376
-msgctxt "input-name"
-msgid "P7 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:377
-msgctxt "input-name"
-msgid "P7 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:378
-msgctxt "input-name"
-msgid "P7 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:379
-msgctxt "input-name"
-msgid "P7 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:380
-msgctxt "input-name"
-msgid "P7 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:381
-msgctxt "input-name"
-msgid "P7 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:382
-msgctxt "input-name"
-msgid "P7 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:383
-msgctxt "input-name"
-msgid "P7 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:384
-msgctxt "input-name"
-msgid "P7 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:385
-msgctxt "input-name"
-msgid "P7 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:386
-msgctxt "input-name"
-msgid "P7 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:391
-msgctxt "input-name"
-msgid "P8 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:392
-msgctxt "input-name"
-msgid "P8 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:393
-msgctxt "input-name"
-msgid "P8 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:394
-msgctxt "input-name"
-msgid "P8 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:395
-msgctxt "input-name"
-msgid "P8 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:396
-msgctxt "input-name"
-msgid "P8 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:397
-msgctxt "input-name"
-msgid "P8 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:398
-msgctxt "input-name"
-msgid "P8 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:399
-msgctxt "input-name"
-msgid "P8 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:400
-msgctxt "input-name"
-msgid "P8 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:401
-msgctxt "input-name"
-msgid "P8 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:402
-msgctxt "input-name"
-msgid "P8 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:403
-msgctxt "input-name"
-msgid "P8 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:404
-msgctxt "input-name"
-msgid "P8 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:405
-msgctxt "input-name"
-msgid "P8 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:406
-msgctxt "input-name"
-msgid "P8 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:407
-msgctxt "input-name"
-msgid "P8 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:408
-msgctxt "input-name"
-msgid "P8 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:409
-msgctxt "input-name"
-msgid "P8 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:410
-msgctxt "input-name"
-msgid "P8 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:411
-msgctxt "input-name"
-msgid "P8 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:412
-msgctxt "input-name"
-msgid "P8 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:413
-msgctxt "input-name"
-msgid "P8 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:414
-msgctxt "input-name"
-msgid "P8 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:415
-msgctxt "input-name"
-msgid "P8 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:416
-msgctxt "input-name"
-msgid "P8 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:417
-msgctxt "input-name"
-msgid "P8 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:418
-msgctxt "input-name"
-msgid "P8 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:419
-msgctxt "input-name"
-msgid "P8 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:420
-msgctxt "input-name"
-msgid "P8 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:425
-msgctxt "input-name"
-msgid "P9 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:426
-msgctxt "input-name"
-msgid "P9 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:427
-msgctxt "input-name"
-msgid "P9 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:428
-msgctxt "input-name"
-msgid "P9 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:429
-msgctxt "input-name"
-msgid "P9 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:430
-msgctxt "input-name"
-msgid "P9 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:431
-msgctxt "input-name"
-msgid "P9 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:432
-msgctxt "input-name"
-msgid "P9 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:433
-msgctxt "input-name"
-msgid "P9 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:434
-msgctxt "input-name"
-msgid "P9 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:435
-msgctxt "input-name"
-msgid "P9 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:436
-msgctxt "input-name"
-msgid "P9 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:437
-msgctxt "input-name"
-msgid "P9 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:438
-msgctxt "input-name"
-msgid "P9 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:439
-msgctxt "input-name"
-msgid "P9 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:440
-msgctxt "input-name"
-msgid "P9 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:441
-msgctxt "input-name"
-msgid "P9 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:442
-msgctxt "input-name"
-msgid "P9 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:443
-msgctxt "input-name"
-msgid "P9 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:444
-msgctxt "input-name"
-msgid "P9 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:445
-msgctxt "input-name"
-msgid "P9 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:446
-msgctxt "input-name"
-msgid "P9 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:447
-msgctxt "input-name"
-msgid "P9 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:448
-msgctxt "input-name"
-msgid "P9 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:449
-msgctxt "input-name"
-msgid "P9 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:450
-msgctxt "input-name"
-msgid "P9 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:451
-msgctxt "input-name"
-msgid "P9 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:452
-msgctxt "input-name"
-msgid "P9 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:453
-msgctxt "input-name"
-msgid "P9 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:454
-msgctxt "input-name"
-msgid "P9 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:459
-msgctxt "input-name"
-msgid "P10 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:460
-msgctxt "input-name"
-msgid "P10 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:461
-msgctxt "input-name"
-msgid "P10 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:462
-msgctxt "input-name"
-msgid "P10 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:463
-msgctxt "input-name"
-msgid "P10 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:464
-msgctxt "input-name"
-msgid "P10 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:465
-msgctxt "input-name"
-msgid "P10 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:466
-msgctxt "input-name"
-msgid "P10 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:467
-msgctxt "input-name"
-msgid "P10 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:468
-msgctxt "input-name"
-msgid "P10 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:469
-msgctxt "input-name"
-msgid "P10 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:470
-msgctxt "input-name"
-msgid "P10 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:471
-msgctxt "input-name"
-msgid "P10 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:472
-msgctxt "input-name"
-msgid "P10 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:473
-msgctxt "input-name"
-msgid "P10 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:474
-msgctxt "input-name"
-msgid "P10 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:475
-msgctxt "input-name"
-msgid "P10 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:476
-msgctxt "input-name"
-msgid "P10 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:477
-msgctxt "input-name"
-msgid "P10 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:478
-msgctxt "input-name"
-msgid "P10 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:479
-msgctxt "input-name"
-msgid "P10 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:480
-msgctxt "input-name"
-msgid "P10 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:481
-msgctxt "input-name"
-msgid "P10 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:482
-msgctxt "input-name"
-msgid "P10 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:483
-msgctxt "input-name"
-msgid "P10 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:484
-msgctxt "input-name"
-msgid "P10 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:485
-msgctxt "input-name"
-msgid "P10 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:486
-msgctxt "input-name"
-msgid "P10 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:487
-msgctxt "input-name"
-msgid "P10 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:488
-msgctxt "input-name"
-msgid "P10 Select"
-msgstr ""
-
 #: src/emu/inpttype.ipp:493
 msgctxt "input-name"
 msgid "1 Player Start"
@@ -5539,154 +4166,31 @@ msgctxt "input-name"
 msgid "Volume Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:550
-msgctxt "input-name"
-msgid "P1 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:551
-msgctxt "input-name"
-msgid "P2 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:552
-msgctxt "input-name"
-msgid "P3 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:553
-msgctxt "input-name"
-msgid "P4 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:554
-msgctxt "input-name"
-msgid "P5 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:555
-msgctxt "input-name"
-msgid "P6 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:556
-msgctxt "input-name"
-msgid "P7 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:557
-msgctxt "input-name"
-msgid "P8 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:558
-msgctxt "input-name"
-msgid "P9 Pedal 1"
-msgstr ""
-
+#: src/emu/inpttype.ipp:550 src/emu/inpttype.ipp:551 src/emu/inpttype.ipp:552
+#: src/emu/inpttype.ipp:553 src/emu/inpttype.ipp:554 src/emu/inpttype.ipp:555
+#: src/emu/inpttype.ipp:556 src/emu/inpttype.ipp:557 src/emu/inpttype.ipp:558
 #: src/emu/inpttype.ipp:559
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:564
-msgctxt "input-name"
-msgid "P1 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:565
-msgctxt "input-name"
-msgid "P2 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:566
-msgctxt "input-name"
-msgid "P3 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:567
-msgctxt "input-name"
-msgid "P4 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:568
-msgctxt "input-name"
-msgid "P5 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:569
-msgctxt "input-name"
-msgid "P6 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:570
-msgctxt "input-name"
-msgid "P7 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:571
-msgctxt "input-name"
-msgid "P8 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:572
-msgctxt "input-name"
-msgid "P9 Pedal 2"
+msgid "%p Pedal 1"
 msgstr ""
 
+#: src/emu/inpttype.ipp:564 src/emu/inpttype.ipp:565 src/emu/inpttype.ipp:566
+#: src/emu/inpttype.ipp:567 src/emu/inpttype.ipp:568 src/emu/inpttype.ipp:569
+#: src/emu/inpttype.ipp:570 src/emu/inpttype.ipp:571 src/emu/inpttype.ipp:572
 #: src/emu/inpttype.ipp:573
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:578
-msgctxt "input-name"
-msgid "P1 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:579
-msgctxt "input-name"
-msgid "P2 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:580
-msgctxt "input-name"
-msgid "P3 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:581
-msgctxt "input-name"
-msgid "P4 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:582
-msgctxt "input-name"
-msgid "P5 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:583
-msgctxt "input-name"
-msgid "P6 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:584
-msgctxt "input-name"
-msgid "P7 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:585
-msgctxt "input-name"
-msgid "P8 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:586
-msgctxt "input-name"
-msgid "P9 Pedal 3"
+msgid "%p Pedal 2"
 msgstr ""
 
+#: src/emu/inpttype.ipp:578 src/emu/inpttype.ipp:579 src/emu/inpttype.ipp:580
+#: src/emu/inpttype.ipp:581 src/emu/inpttype.ipp:582 src/emu/inpttype.ipp:583
+#: src/emu/inpttype.ipp:584 src/emu/inpttype.ipp:585 src/emu/inpttype.ipp:586
 #: src/emu/inpttype.ipp:587
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 3"
+msgid "%p Pedal 3"
 msgstr ""
 
 #: src/emu/inpttype.ipp:592
@@ -7582,6 +6086,40 @@ msgid ""
 "%s"
 msgstr ""
 
+#~ msgid "Confirm quit from machines"
+#~ msgstr "Confirmar saída das máquinas"
+
+#~ msgid "Skip information screen at startup"
+#~ msgstr "Saltar ecrã de informação ao iniciar"
+
+#~ msgid "Simultaneous contradictory"
+#~ msgstr "Contraditório Simultâneo"
+
+#, c-format
+#~ msgid ""
+#~ "Auditing ROMs for machine %2$u of %3$u...\n"
+#~ "%1$s"
+#~ msgstr ""
+#~ "Auditando ROMs da máquina %2$u de %3$u...\n"
+#~ "%1$s"
+
+#, c-format
+#~ msgid "Audit ROMs for %1$u machines marked unavailable"
+#~ msgstr "Auditar ROMs de %1$u máquinas marcadas como indisponíveis"
+
+#, c-format
+#~ msgid "Audit ROMs for all %1$u machines"
+#~ msgstr "Auditar ROMs de todas as %1$u máquinas"
+
+#~ msgid "Input (this Machine)"
+#~ msgstr "Input (esta Máquina)"
+
+#~ msgid "ROM Audit Result\tOK\n"
+#~ msgstr "Resultado da Audit à ROM\tOK\n"
+
+#~ msgid "ROM Audit Result\tBAD\n"
+#~ msgstr "Resultado da Audit à ROM\tFALHA\n"
+
 #~ msgid "Device Mapping"
 #~ msgstr "Mapeamento de Dispositivos"
 
diff --git a/language/Portuguese_Brazil/strings.po b/language/Portuguese_Brazil/strings.po
index 807a2358668..8751269e2de 100644
--- a/language/Portuguese_Brazil/strings.po
+++ b/language/Portuguese_Brazil/strings.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME 0.237\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-19 02:50+1100\n"
+"POT-Creation-Date: 2021-12-09 04:44+1100\n"
 "PO-Revision-Date: 2021-11-17 12:27-0300\n"
 "Last-Translator: Felipe <felipefplzx@gmail.com>\n"
 "Language-Team: MAME Language Team\n"
@@ -280,12 +280,12 @@ msgstr "%1$s %2$s ( %3$d / %4$d pacotes do software )"
 msgid "Driver: \"%1$s\" software list "
 msgstr "Driver: \"%1$s\" lista dos softwares "
 
-#: src/frontend/mame/ui/selsoft.cpp:711 src/frontend/mame/ui/selgame.cpp:1066
+#: src/frontend/mame/ui/selsoft.cpp:711 src/frontend/mame/ui/selgame.cpp:1076
 #, c-format
 msgid "%1$s: %2$s - Search: %3$s_"
 msgstr "%1$s: %2$s - Busca: %3$s_"
 
-#: src/frontend/mame/ui/selsoft.cpp:713 src/frontend/mame/ui/selgame.cpp:1068
+#: src/frontend/mame/ui/selsoft.cpp:713 src/frontend/mame/ui/selgame.cpp:1078
 #, c-format
 msgid "Search: %1$s_"
 msgstr "Busca: %1$s_"
@@ -295,7 +295,7 @@ msgstr "Busca: %1$s_"
 msgid "Software list/item: %1$s:%2$s"
 msgstr "Lista/item do software: %1$s:%2$s"
 
-#: src/frontend/mame/ui/optsmenu.cpp:73 src/frontend/mame/ui/sndmenu.cpp:165
+#: src/frontend/mame/ui/optsmenu.cpp:73 src/frontend/mame/ui/sndmenu.cpp:161
 msgid "Sound Options"
 msgstr "Opções de Som"
 
@@ -390,12 +390,12 @@ msgid "Show mouse pointer"
 msgstr "Mostrar o ponteiro do mouse"
 
 #: src/frontend/mame/ui/submenu.cpp:39
-msgid "Confirm quit from machines"
-msgstr "Confirmar a saída das máquinas"
+msgid "Confirm quit from emulation"
+msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:40
-msgid "Skip information screen at startup"
-msgstr "Ignorar a tela de informações na inicialização"
+msgid "Skip system information screen"
+msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:41
 msgid "Force 4:3 aspect for snapshot display"
@@ -410,8 +410,8 @@ msgid "Skip BIOS selection menu"
 msgstr "Ignorar a tela de seleção da BIOS"
 
 #: src/frontend/mame/ui/submenu.cpp:44
-msgid "Skip software parts selection menu"
-msgstr "Ignorar o menu da seleção das partes do software"
+msgid "Skip software part selection menu"
+msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:45
 msgid "Info auto audit"
@@ -562,7 +562,7 @@ msgid "UI active"
 msgstr "IU ativa"
 
 #: src/frontend/mame/ui/submenu.cpp:91
-msgid "Offscreen reload"
+msgid "Off-screen reload"
 msgstr "Recarga fora da tela"
 
 #: src/frontend/mame/ui/submenu.cpp:92
@@ -578,8 +578,8 @@ msgid "Natural keyboard"
 msgstr "Teclado natural"
 
 #: src/frontend/mame/ui/submenu.cpp:95
-msgid "Simultaneous contradictory"
-msgstr "Contraditório simultâneo"
+msgid "Allow contradictory joystick inputs"
+msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:96
 msgid "Coin impulse"
@@ -602,8 +602,8 @@ msgid "Pedal Device Assignment"
 msgstr "Atribuição do Dispositivo Pedal"
 
 #: src/frontend/mame/ui/submenu.cpp:106
-msgid "Adstick Device Assignment"
-msgstr "Atribuição do Dispositivo Adstick"
+msgid "AD Stick Device Assignment"
+msgstr "Atribuição do Dispositivo Alavanca AD"
 
 #: src/frontend/mame/ui/submenu.cpp:107
 msgid "Paddle Device Assignment"
@@ -689,14 +689,14 @@ msgstr "Atualização Sincronizada"
 msgid "Wait Vertical Sync"
 msgstr "Aguardar Sincronização Vertical"
 
-#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:687
+#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:689
 #: src/frontend/mame/ui/videoopt.cpp:191 src/frontend/mame/ui/custui.cpp:490
 #: src/frontend/mame/ui/analogipt.cpp:471 plugins/cheatfind/init.lua:766
 #: plugins/cheatfind/init.lua:777 plugins/cheat/init.lua:668
 msgid "On"
 msgstr "Ligado"
 
-#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:690
+#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:692
 #: src/frontend/mame/ui/videoopt.cpp:207 src/frontend/mame/ui/custui.cpp:490
 #: src/frontend/mame/ui/analogipt.cpp:471 plugins/cheatfind/init.lua:763
 #: plugins/cheatfind/init.lua:774 plugins/cheat/init.lua:671
@@ -704,11 +704,11 @@ msgstr "Ligado"
 msgid "Off"
 msgstr "Desligado"
 
-#: src/frontend/mame/ui/menu.cpp:693
+#: src/frontend/mame/ui/menu.cpp:695
 msgid "Auto"
 msgstr "Automático"
 
-#: src/frontend/mame/ui/menu.cpp:1195
+#: src/frontend/mame/ui/menu.cpp:1197
 #: src/frontend/mame/ui/simpleselgame.cpp:278
 #: src/frontend/mame/ui/selmenu.cpp:1280
 msgid "Return to Previous Menu"
@@ -716,7 +716,7 @@ msgstr "Retornar pro Menu Anterior"
 
 #: src/frontend/mame/ui/filemngr.cpp:139
 #: src/frontend/mame/ui/confswitch.cpp:119
-#: src/frontend/mame/ui/inputmap.cpp:559 src/frontend/mame/ui/analogipt.cpp:360
+#: src/frontend/mame/ui/inputmap.cpp:563 src/frontend/mame/ui/analogipt.cpp:360
 #, c-format
 msgid "[root%1$s]"
 msgstr "[root%1$s]"
@@ -984,22 +984,22 @@ msgstr ""
 "CPU:\n"
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "GHz"
 msgstr "GHz"
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "MHz"
 msgstr "MHz"
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "kHz"
 msgstr "kHz"
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "Hz"
 msgstr "Hz"
 
@@ -1027,38 +1027,38 @@ msgstr "Nenhum\n"
 msgid "Vector"
 msgstr "Vetor"
 
-#: src/frontend/mame/ui/info.cpp:480
+#: src/frontend/mame/ui/info.cpp:483
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr "%1$s: %2$s\n"
 
-#: src/frontend/mame/ui/info.cpp:480
+#: src/frontend/mame/ui/info.cpp:483
 msgid "%2$s\n"
 msgstr "%2$s\n"
 
-#: src/frontend/mame/ui/info.cpp:497
+#: src/frontend/mame/ui/info.cpp:500
 #, c-format
 msgid "Screen '%1$s'"
 msgstr "Tela '%1$s'"
 
-#: src/frontend/mame/ui/info.cpp:499
+#: src/frontend/mame/ui/info.cpp:502
 msgid "Screen"
 msgstr "Tela"
 
-#: src/frontend/mame/ui/info.cpp:570 src/frontend/mame/ui/info.cpp:581
+#: src/frontend/mame/ui/info.cpp:573 src/frontend/mame/ui/info.cpp:584
 #, c-format
 msgid "%1$s:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:662
+#: src/frontend/mame/ui/info.cpp:665
 msgid "Not supported"
 msgstr "Não suportado"
 
-#: src/frontend/mame/ui/info.cpp:665
+#: src/frontend/mame/ui/info.cpp:668
 msgid "Partially supported"
 msgstr "Parcialmente suportado"
 
-#: src/frontend/mame/ui/info.cpp:674
+#: src/frontend/mame/ui/info.cpp:677
 msgid "[empty]"
 msgstr "[vazio]"
 
@@ -1131,7 +1131,7 @@ msgid "Emulated"
 msgstr "Emulado"
 
 #: src/frontend/mame/ui/keyboard.cpp:59 src/frontend/mame/ui/confswitch.cpp:117
-#: src/frontend/mame/ui/inputmap.cpp:557 src/frontend/mame/ui/analogipt.cpp:358
+#: src/frontend/mame/ui/inputmap.cpp:561 src/frontend/mame/ui/analogipt.cpp:358
 #, c-format
 msgid "%1$s [root%2$s]"
 msgstr "%1$s [root%2$s]"
@@ -1491,7 +1491,7 @@ msgctxt "swlist-info"
 msgid "Software list/item"
 msgstr "Lista/item do software"
 
-#: src/frontend/mame/ui/datmenu.cpp:88 src/frontend/mame/ui/selmenu.cpp:2698
+#: src/frontend/mame/ui/datmenu.cpp:88 src/frontend/mame/ui/selmenu.cpp:2707
 msgid "Software List Info"
 msgstr "Informações da Lista do Software"
 
@@ -1613,7 +1613,7 @@ msgstr "Salvar a Configuração da Máquina"
 msgid "Configure Machine:"
 msgstr "Configurar Máquina:"
 
-#: src/frontend/mame/ui/miscmenu.cpp:858 src/frontend/mame/ui/selmenu.cpp:2638
+#: src/frontend/mame/ui/miscmenu.cpp:858 src/frontend/mame/ui/selmenu.cpp:2647
 msgid " (default)"
 msgstr " (padrão)"
 
@@ -1634,7 +1634,7 @@ msgstr ""
 "Pressione %1$s pra sair\n"
 "Pressione %2$s pra retornar pra emulação"
 
-#: src/frontend/mame/ui/info_pty.cpp:30 src/frontend/mame/ui/mainmenu.cpp:155
+#: src/frontend/mame/ui/info_pty.cpp:30
 msgid "Pseudo terminals"
 msgstr "Pseudo terminais"
 
@@ -1707,52 +1707,52 @@ msgstr "Controles do Jogador %1$d"
 msgid "Other Controls"
 msgstr "Outros Controles"
 
-#: src/frontend/mame/ui/inputmap.cpp:227
+#: src/frontend/mame/ui/inputmap.cpp:231
 msgid "This machine has no configurable inputs."
 msgstr "Esta máquina não tem entradas configuráveis."
 
-#: src/frontend/mame/ui/inputmap.cpp:327
+#: src/frontend/mame/ui/inputmap.cpp:331
 msgid "Pressed"
 msgstr "Pressionado"
 
-#: src/frontend/mame/ui/inputmap.cpp:397
+#: src/frontend/mame/ui/inputmap.cpp:401
 msgid "Invalid sequence entered"
 msgstr "Sequência inválida inserida"
 
-#: src/frontend/mame/ui/inputmap.cpp:542
+#: src/frontend/mame/ui/inputmap.cpp:546
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog"
 msgstr "Analógico %1$s"
 
-#: src/frontend/mame/ui/inputmap.cpp:543
+#: src/frontend/mame/ui/inputmap.cpp:547
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog Inc"
 msgstr "Aumentar Analógico %1$s"
 
-#: src/frontend/mame/ui/inputmap.cpp:544
+#: src/frontend/mame/ui/inputmap.cpp:548
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog Dec"
 msgstr "Diminuir Analógico %1$s"
 
-#: src/frontend/mame/ui/inputmap.cpp:586
+#: src/frontend/mame/ui/inputmap.cpp:590
 #, c-format
 msgid "Press %1$s to set\n"
 msgstr "Pressione o %1$s pra configurar\n"
 
-#: src/frontend/mame/ui/inputmap.cpp:587
+#: src/frontend/mame/ui/inputmap.cpp:591
 #, c-format
 msgid "Press %1$s to append\n"
 msgstr "Pressione o %1$s pra anexar\n"
 
-#: src/frontend/mame/ui/inputmap.cpp:588
+#: src/frontend/mame/ui/inputmap.cpp:592
 #, c-format
 msgid "Press %1$s to clear\n"
 msgstr "Pressione o %1$s pra limpar\n"
 
-#: src/frontend/mame/ui/inputmap.cpp:589
+#: src/frontend/mame/ui/inputmap.cpp:593
 #, c-format
 msgid "Press %1$s to restore default\n"
 msgstr "Pressione o %1$s pra restaurar o padrão\n"
@@ -1822,7 +1822,7 @@ msgstr ""
 "Pressione qualquer tecla para continuar."
 
 #: src/frontend/mame/ui/simpleselgame.cpp:273
-#: src/frontend/mame/ui/selgame.cpp:436
+#: src/frontend/mame/ui/selgame.cpp:443
 msgid "Configure Options"
 msgstr "Opções da Configuração"
 
@@ -2157,16 +2157,16 @@ msgstr "Zoom = %1$d"
 msgid "Expand to fit"
 msgstr "Expandir pra encaixar"
 
-#: src/frontend/mame/ui/selgame.cpp:437
+#: src/frontend/mame/ui/selgame.cpp:444
 msgid "Configure Machine"
 msgstr "Configurar a Máquina"
 
-#: src/frontend/mame/ui/selgame.cpp:1050
+#: src/frontend/mame/ui/selgame.cpp:1060
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d machines (%5$d BIOS) )"
 msgstr "%1$s %2$s ( %3$d / %4$d máquinas (%5$d BIOS) )"
 
-#: src/frontend/mame/ui/selgame.cpp:1078
+#: src/frontend/mame/ui/selgame.cpp:1088
 #, c-format
 msgid "System: %1$-.100s"
 msgstr "Sistema: %1$-.100s"
@@ -2188,11 +2188,9 @@ msgstr "Os resultados serão salvos em %1$s"
 #: src/frontend/mame/ui/auditmenu.cpp:98
 #, c-format
 msgid ""
-"Auditing ROMs for machine %2$u of %3$u...\n"
+"Auditing media for machine %2$u of %3$u...\n"
 "%1$s"
 msgstr ""
-"Auditando as ROMs para a máquina %2$u de %3$u...\n"
-"%1$s"
 
 #: src/frontend/mame/ui/auditmenu.cpp:116
 #, c-format
@@ -2209,13 +2207,13 @@ msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:136
 #, c-format
-msgid "Audit ROMs for %1$u machines marked unavailable"
-msgstr "Auditar as ROMS pras %1$u máquinas marcadas como indisponíveis"
+msgid "Audit media for %1$u machines marked unavailable"
+msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:137
 #, c-format
-msgid "Audit ROMs for all %1$u machines"
-msgstr "Auditar as ROMs pra todas as %1$u máquinas"
+msgid "Audit media for all %1$u machines"
+msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:154
 #, c-format
@@ -2421,84 +2419,84 @@ msgctxt "color-sample"
 msgid "Clone"
 msgstr "Clone"
 
-#: src/frontend/mame/ui/custui.cpp:914
+#: src/frontend/mame/ui/custui.cpp:906
 msgid "ARGB Settings"
 msgstr "Configurações do ARGB"
 
-#: src/frontend/mame/ui/custui.cpp:919 src/frontend/mame/ui/custui.cpp:922
+#: src/frontend/mame/ui/custui.cpp:911 src/frontend/mame/ui/custui.cpp:914
 msgctxt "color-channel"
 msgid "Alpha"
 msgstr "Alpha"
 
-#: src/frontend/mame/ui/custui.cpp:927 src/frontend/mame/ui/custui.cpp:930
+#: src/frontend/mame/ui/custui.cpp:919 src/frontend/mame/ui/custui.cpp:922
 msgctxt "color-channel"
 msgid "Red"
 msgstr "Vermelho"
 
-#: src/frontend/mame/ui/custui.cpp:935 src/frontend/mame/ui/custui.cpp:938
+#: src/frontend/mame/ui/custui.cpp:927 src/frontend/mame/ui/custui.cpp:930
 msgctxt "color-channel"
 msgid "Green"
 msgstr "Verde"
 
-#: src/frontend/mame/ui/custui.cpp:943 src/frontend/mame/ui/custui.cpp:946
+#: src/frontend/mame/ui/custui.cpp:935 src/frontend/mame/ui/custui.cpp:938
 msgctxt "color-channel"
 msgid "Blue"
 msgstr "Azul"
 
-#: src/frontend/mame/ui/custui.cpp:949
+#: src/frontend/mame/ui/custui.cpp:941
 msgid "Choose from palette"
 msgstr "Escolher da paleta"
 
-#: src/frontend/mame/ui/custui.cpp:996
+#: src/frontend/mame/ui/custui.cpp:988
 msgid "Color preview:"
 msgstr "Pré-visualização da cor:"
 
-#: src/frontend/mame/ui/custui.cpp:1093
+#: src/frontend/mame/ui/custui.cpp:1085
 msgctxt "color-preset"
 msgid "White"
 msgstr "Branco"
 
-#: src/frontend/mame/ui/custui.cpp:1094
+#: src/frontend/mame/ui/custui.cpp:1086
 msgctxt "color-preset"
 msgid "Silver"
 msgstr "Prata"
 
-#: src/frontend/mame/ui/custui.cpp:1095
+#: src/frontend/mame/ui/custui.cpp:1087
 msgctxt "color-preset"
 msgid "Gray"
 msgstr "Cinza"
 
-#: src/frontend/mame/ui/custui.cpp:1096
+#: src/frontend/mame/ui/custui.cpp:1088
 msgctxt "color-preset"
 msgid "Black"
 msgstr "Preto"
 
-#: src/frontend/mame/ui/custui.cpp:1097
+#: src/frontend/mame/ui/custui.cpp:1089
 msgctxt "color-preset"
 msgid "Red"
 msgstr "Vermelho"
 
-#: src/frontend/mame/ui/custui.cpp:1098
+#: src/frontend/mame/ui/custui.cpp:1090
 msgctxt "color-preset"
 msgid "Orange"
 msgstr "Laranja"
 
-#: src/frontend/mame/ui/custui.cpp:1099
+#: src/frontend/mame/ui/custui.cpp:1091
 msgctxt "color-preset"
 msgid "Yellow"
 msgstr "Amarelo"
 
-#: src/frontend/mame/ui/custui.cpp:1100
+#: src/frontend/mame/ui/custui.cpp:1092
 msgctxt "color-preset"
 msgid "Green"
 msgstr "Verde"
 
-#: src/frontend/mame/ui/custui.cpp:1101
+#: src/frontend/mame/ui/custui.cpp:1093
 msgctxt "color-preset"
 msgid "Blue"
 msgstr "Azul"
 
-#: src/frontend/mame/ui/custui.cpp:1102
+#: src/frontend/mame/ui/custui.cpp:1094
 msgctxt "color-preset"
 msgid "Violet"
 msgstr "Violeta"
@@ -2563,7 +2561,7 @@ msgid "Input (general)"
 msgstr "Entrada (geral)"
 
 #: src/frontend/mame/ui/mainmenu.cpp:123
-msgid "Input (this Machine)"
+msgid "Input (this machine)"
 msgstr "Entrada (esta máquina)"
 
 #: src/frontend/mame/ui/mainmenu.cpp:126
@@ -2602,6 +2600,10 @@ msgstr "Gerenciador de Arquivos"
 msgid "Tape Control"
 msgstr "Controle da Fita"
 
+#: src/frontend/mame/ui/mainmenu.cpp:155
+msgid "Pseudo Terminals"
+msgstr ""
+
 #: src/frontend/mame/ui/mainmenu.cpp:158
 msgid "BIOS Selection"
 msgstr "Seleção de BIOS"
@@ -2640,8 +2642,8 @@ msgstr "Visualização Externa do DAT"
 
 #: src/frontend/mame/ui/mainmenu.cpp:200
 #, c-format
-msgid "About %s"
-msgstr "Sobre o %s"
+msgid "About %1$s"
+msgstr "Sobre o %1$s"
 
 #: src/frontend/mame/ui/mainmenu.cpp:212
 msgid "Select New Machine"
@@ -2800,15 +2802,15 @@ msgstr "O Driver é clone do: %1$s"
 msgid "%1$s %2$s"
 msgstr "%1$s %2$s"
 
-#: src/frontend/mame/ui/selmenu.cpp:2235
+#: src/frontend/mame/ui/selmenu.cpp:2244
 msgid "Images"
 msgstr "Imagens"
 
-#: src/frontend/mame/ui/selmenu.cpp:2236
+#: src/frontend/mame/ui/selmenu.cpp:2245
 msgid "Infos"
 msgstr "Informações"
 
-#: src/frontend/mame/ui/selmenu.cpp:2551
+#: src/frontend/mame/ui/selmenu.cpp:2560
 msgid ""
 "Required ROM/disk images for the selected system are missing or incorrect. "
 "Please acquire the correct files or select a different system.\n"
@@ -2819,7 +2821,7 @@ msgstr ""
 "selecione um sistema diferente.\n"
 "\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2567
+#: src/frontend/mame/ui/selmenu.cpp:2576
 msgid ""
 "Required ROM/disk images for the selected software are missing or incorrect. "
 "Please acquire the correct files or select a different software item.\n"
@@ -2830,353 +2832,351 @@ msgstr ""
 "selecione um item de software diferente.\n"
 "\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2583
+#: src/frontend/mame/ui/selmenu.cpp:2592
 msgid "incorrect checksum"
 msgstr "checksum incorreto"
 
-#: src/frontend/mame/ui/selmenu.cpp:2586
+#: src/frontend/mame/ui/selmenu.cpp:2595
 msgid "incorrect length"
 msgstr "tamanho incorreto"
 
-#: src/frontend/mame/ui/selmenu.cpp:2589
+#: src/frontend/mame/ui/selmenu.cpp:2598
 msgid "not found"
 msgstr "não foi achado"
 
-#: src/frontend/mame/ui/selmenu.cpp:2600
+#: src/frontend/mame/ui/selmenu.cpp:2609
 #, c-format
 msgid "%1$s (%2$s) - %3$s\n"
 msgstr "%1$s (%2$s) - %3$s\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2602
+#: src/frontend/mame/ui/selmenu.cpp:2611
 #, c-format
 msgid "%1$s - %2$s\n"
 msgstr "%1$s - %2$s\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2606
+#: src/frontend/mame/ui/selmenu.cpp:2615
 msgid "Press any key to continue."
 msgstr "Pressione qualquer tecla pra continuar."
 
-#: src/frontend/mame/ui/selmenu.cpp:2735
+#: src/frontend/mame/ui/selmenu.cpp:2744
 msgid "General Info"
 msgstr "Informações Gerais"
 
-#: src/frontend/mame/ui/selmenu.cpp:2887
+#: src/frontend/mame/ui/selmenu.cpp:2896
 #, c-format
 msgid "Romset\t%1$s\n"
 msgstr "Romset\t%1$s\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2888
+#: src/frontend/mame/ui/selmenu.cpp:2897
 #, c-format
 msgid "Year\t%1$s\n"
 msgstr "Ano\t%1$s\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2889
+#: src/frontend/mame/ui/selmenu.cpp:2898
 #, c-format
 msgid "Manufacturer\t%1$s\n"
 msgstr "Fabricante\t%1$s\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2896
+#: src/frontend/mame/ui/selmenu.cpp:2905
 #, c-format
 msgid "Driver is Clone of\t%1$s\n"
 msgstr "O Driver é Clone do\t%1$s\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2901
+#: src/frontend/mame/ui/selmenu.cpp:2910
 msgid "Driver is Parent\t\n"
 msgstr "O Driver é Pai\t\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2905
+#: src/frontend/mame/ui/selmenu.cpp:2914
 msgid "Analog Controls\tYes\n"
 msgstr "Controles Analógicos\tSim\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2907
+#: src/frontend/mame/ui/selmenu.cpp:2916
 msgid "Keyboard Inputs\tYes\n"
 msgstr "Entradas do Teclado\tSim\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2910
+#: src/frontend/mame/ui/selmenu.cpp:2919
 msgid "Overall\tNOT WORKING\n"
 msgstr "Geral\tNÃO FUNCIONANDO\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2912
+#: src/frontend/mame/ui/selmenu.cpp:2921
 msgid "Overall\tUnemulated Protection\n"
 msgstr "Geral\tProteção não Emulada\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2914
+#: src/frontend/mame/ui/selmenu.cpp:2923
 msgid "Overall\tWorking\n"
 msgstr "Geral\tFuncionando\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2917
+#: src/frontend/mame/ui/selmenu.cpp:2926
 msgid "Graphics\tUnimplemented\n"
 msgstr "Gráficos\tNão Implementados\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2919
+#: src/frontend/mame/ui/selmenu.cpp:2928
 msgid "Graphics\tWrong Colors\n"
 msgstr "Graficos\tCores Erradas\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2921
+#: src/frontend/mame/ui/selmenu.cpp:2930
 msgid "Graphics\tImperfect Colors\n"
 msgstr "Gráficos\tCores Imperfeitas\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2923
+#: src/frontend/mame/ui/selmenu.cpp:2932
 msgid "Graphics\tImperfect\n"
 msgstr "Gráficos\tImperfeitos\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2925
+#: src/frontend/mame/ui/selmenu.cpp:2934
 msgid "Graphics\tOK\n"
 msgstr "Gráficos\tOK\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2928
+#: src/frontend/mame/ui/selmenu.cpp:2937
 msgid "Sound\tNone\n"
 msgstr "Som\tNenhum\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2930
+#: src/frontend/mame/ui/selmenu.cpp:2939
 msgid "Sound\tUnimplemented\n"
 msgstr "Som\tNão Implementado\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2932
+#: src/frontend/mame/ui/selmenu.cpp:2941
 msgid "Sound\tImperfect\n"
 msgstr "Som\tImperfeito\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2934
+#: src/frontend/mame/ui/selmenu.cpp:2943
 msgid "Sound\tOK\n"
 msgstr "Som\tOK\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2937
+#: src/frontend/mame/ui/selmenu.cpp:2946
 msgid "Capture\tUnimplemented\n"
 msgstr "Captura\tNão Implementada\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2939
+#: src/frontend/mame/ui/selmenu.cpp:2948
 msgid "Capture\tImperfect\n"
 msgstr "Captura\tImperfeita\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2942
+#: src/frontend/mame/ui/selmenu.cpp:2951
 msgid "Camera\tUnimplemented\n"
 msgstr "Câmera\tNão Implementada\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2944
+#: src/frontend/mame/ui/selmenu.cpp:2953
 msgid "Camera\tImperfect\n"
 msgstr "Câmera\tImperfeita\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2947
+#: src/frontend/mame/ui/selmenu.cpp:2956
 msgid "Microphone\tUnimplemented\n"
 msgstr "Microfone\tNão Implementado\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2949
+#: src/frontend/mame/ui/selmenu.cpp:2958
 msgid "Microphone\tImperfect\n"
 msgstr "Microfone\tImperfeito\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2952
+#: src/frontend/mame/ui/selmenu.cpp:2961
 msgid "Controls\tUnimplemented\n"
 msgstr "Controles\tNão Implementados\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2954
+#: src/frontend/mame/ui/selmenu.cpp:2963
 msgid "Controls\tImperfect\n"
 msgstr "Controles\tImperfeitos\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2957
+#: src/frontend/mame/ui/selmenu.cpp:2966
 msgid "Keyboard\tUnimplemented\n"
 msgstr "Teclado\tNão Implementado\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2959
+#: src/frontend/mame/ui/selmenu.cpp:2968
 msgid "Keyboard\tImperfect\n"
 msgstr "Teclado\tImperfeito\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2962
+#: src/frontend/mame/ui/selmenu.cpp:2971
 msgid "Mouse\tUnimplemented\n"
 msgstr "Mouse\tNão Implementado\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2964
+#: src/frontend/mame/ui/selmenu.cpp:2973
 msgid "Mouse\tImperfect\n"
 msgstr "Mouse\tImperfeito\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2967
+#: src/frontend/mame/ui/selmenu.cpp:2976
 msgid "Media\tUnimplemented\n"
 msgstr "Mídia\tNão Implementada\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2969
+#: src/frontend/mame/ui/selmenu.cpp:2978
 msgid "Media\tImperfect\n"
 msgstr "Mídia\tImperfeita\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2972
+#: src/frontend/mame/ui/selmenu.cpp:2981
 msgid "Disk\tUnimplemented\n"
 msgstr "Disco\tNão Implementado\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2974
+#: src/frontend/mame/ui/selmenu.cpp:2983
 msgid "Disk\tImperfect\n"
 msgstr "Disco\tImperfeito\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2977
+#: src/frontend/mame/ui/selmenu.cpp:2986
 msgid "Printer\tUnimplemented\n"
 msgstr "Impressora\tNão Implementada\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2979
+#: src/frontend/mame/ui/selmenu.cpp:2988
 msgid "Printer\tImperfect\n"
 msgstr "Impressora\tImperfeita\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2982
+#: src/frontend/mame/ui/selmenu.cpp:2991
 msgid "Mag. Tape\tUnimplemented\n"
 msgstr "Fita Magnética\tNão Implementada\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2984
+#: src/frontend/mame/ui/selmenu.cpp:2993
 msgid "Mag. Tape\tImperfect\n"
 msgstr "Fita Magnética\tImperfeita\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2987
+#: src/frontend/mame/ui/selmenu.cpp:2996
 msgid "Punch Tape\tUnimplemented\n"
 msgstr "Punch Tape\tNão Implementada\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2989
+#: src/frontend/mame/ui/selmenu.cpp:2998
 msgid "Punch Tape\tImperfect\n"
 msgstr "Punch Tape\tImperfeita\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2992
+#: src/frontend/mame/ui/selmenu.cpp:3001
 msgid "Mag. Drum\tUnimplemented\n"
 msgstr "Bateria Magnética\tNão Implementada\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2994
+#: src/frontend/mame/ui/selmenu.cpp:3003
 msgid "Mag. Drum\tImperfect\n"
 msgstr "Bateria Magnética\tImperfeita\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2997
+#: src/frontend/mame/ui/selmenu.cpp:3006
 msgid "(EP)ROM\tUnimplemented\n"
 msgstr "(EP)ROM\tNão Implementado\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2999
+#: src/frontend/mame/ui/selmenu.cpp:3008
 msgid "(EP)ROM\tImperfect\n"
 msgstr "(EP)ROM\tImperfeito\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3002
+#: src/frontend/mame/ui/selmenu.cpp:3011
 msgid "Communications\tUnimplemented\n"
 msgstr "Comunicações\tNão Implementadas\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3004
+#: src/frontend/mame/ui/selmenu.cpp:3013
 msgid "Communications\tImperfect\n"
 msgstr "Comunicações\tImperfeitas\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3007
+#: src/frontend/mame/ui/selmenu.cpp:3016
 msgid "LAN\tUnimplemented\n"
 msgstr "LAN\tNão Implementada\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3009
+#: src/frontend/mame/ui/selmenu.cpp:3018
 msgid "LAN\tImperfect\n"
 msgstr "LAN\tImperfeita\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3012
+#: src/frontend/mame/ui/selmenu.cpp:3021
 msgid "WAN\tUnimplemented\n"
 msgstr "WAN\tNão Implementada\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3014
+#: src/frontend/mame/ui/selmenu.cpp:3023
 msgid "WAN\tImperfect\n"
 msgstr "WAN\tImperfeita\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3017
+#: src/frontend/mame/ui/selmenu.cpp:3026
 msgid "Timing\tUnimplemented\n"
 msgstr "Cronometragem\tNão Implementada\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3019
+#: src/frontend/mame/ui/selmenu.cpp:3028
 msgid "Timing\tImperfect\n"
 msgstr "Cronometragem\tImperfeita\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3021
+#: src/frontend/mame/ui/selmenu.cpp:3030
 msgid "Mechanical Machine\tYes\n"
 msgstr "Máquina Mecânica\tSim\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3021
+#: src/frontend/mame/ui/selmenu.cpp:3030
 msgid "Mechanical Machine\tNo\n"
 msgstr "Máquina Mecânica\tNão\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3022
+#: src/frontend/mame/ui/selmenu.cpp:3031
 msgid "Requires Artwork\tYes\n"
 msgstr "Requer Trabalho de Arte\tSim\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3022
+#: src/frontend/mame/ui/selmenu.cpp:3031
 msgid "Requires Artwork\tNo\n"
 msgstr "Requer Trabalho de Arte\tNão\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3023
+#: src/frontend/mame/ui/selmenu.cpp:3032
 msgid "Requires Clickable Artwork\tYes\n"
 msgstr "Requer Arte Clicável\tSim\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3023
+#: src/frontend/mame/ui/selmenu.cpp:3032
 msgid "Requires Clickable Artwork\tNo\n"
 msgstr "Requer Arte Clicável\tNão\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3025
+#: src/frontend/mame/ui/selmenu.cpp:3034
 msgid "Support Cocktail\tNo\n"
 msgstr "Suporte ao Coquetel\tNão\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3026
+#: src/frontend/mame/ui/selmenu.cpp:3035
 msgid "Driver is BIOS\tYes\n"
 msgstr "O Driver é BIOS\tSim\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3026
+#: src/frontend/mame/ui/selmenu.cpp:3035
 msgid "Driver is BIOS\tNo\n"
 msgstr "O Driver é BIOS\tNão\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3027
+#: src/frontend/mame/ui/selmenu.cpp:3036
 msgid "Support Save\tYes\n"
 msgstr "Suporte pro Salvamento\tSim\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3027
+#: src/frontend/mame/ui/selmenu.cpp:3036
 msgid "Support Save\tNo\n"
 msgstr "Suporte pro Salvamento\tNão\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3028
+#: src/frontend/mame/ui/selmenu.cpp:3037
 msgid "Screen Orientation\tVertical\n"
 msgstr "Orientação da Tela\tVertical\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3028
+#: src/frontend/mame/ui/selmenu.cpp:3037
 msgid "Screen Orientation\tHorizontal\n"
 msgstr "Orientação da Tela\tHorizontal\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3038
+#: src/frontend/mame/ui/selmenu.cpp:3047
 msgid "Requires CHD\tYes\n"
 msgstr "Requer CHD\tSim\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3038
+#: src/frontend/mame/ui/selmenu.cpp:3047
 msgid "Requires CHD\tNo\n"
 msgstr "Requer CHD\tNão\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3051
-msgid "ROM Audit Result\tOK\n"
-msgstr "Resultado da Auditoria da ROM\tOK\n"
+#: src/frontend/mame/ui/selmenu.cpp:3060
+msgid "Media Audit Result\tOK\n"
+msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3053
-msgid "ROM Audit Result\tBAD\n"
-msgstr "Resultado da Auditoria da ROM\tRUIM\n"
+#: src/frontend/mame/ui/selmenu.cpp:3062
+msgid "Media Audit Result\tBAD\n"
+msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3056
+#: src/frontend/mame/ui/selmenu.cpp:3065
 msgid "Samples Audit Result\tNone Needed\n"
 msgstr "Resultado da Auditoria das Amostras\tNenhuma Necessária\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3058
+#: src/frontend/mame/ui/selmenu.cpp:3067
 msgid "Samples Audit Result\tOK\n"
 msgstr "Resultado da Auditoria das Amostras\tOK\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3060
+#: src/frontend/mame/ui/selmenu.cpp:3069
 msgid "Samples Audit Result\tBAD\n"
 msgstr "Resultado da Auditoria das Amostras\tRUIM\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3064
+#: src/frontend/mame/ui/selmenu.cpp:3073
 msgid ""
-"ROM Audit \tDisabled\n"
-"Samples Audit \tDisabled\n"
+"Media Audit\tDisabled\n"
+"Samples Audit\tDisabled\n"
 msgstr ""
-"Auditoria da ROM \tDesativada\n"
-"Auditoria das Amostras \tDesativada\n"
 
-#: src/frontend/mame/ui/sndmenu.cpp:150
+#: src/frontend/mame/ui/sndmenu.cpp:146
 msgid "Sound"
 msgstr "Som"
 
-#: src/frontend/mame/ui/sndmenu.cpp:151
+#: src/frontend/mame/ui/sndmenu.cpp:147
 msgid "Compressor"
 msgstr "Compressor"
 
-#: src/frontend/mame/ui/sndmenu.cpp:152
+#: src/frontend/mame/ui/sndmenu.cpp:148
 msgid "Sample Rate"
 msgstr "Taxa das Amostras"
 
-#: src/frontend/mame/ui/sndmenu.cpp:153
+#: src/frontend/mame/ui/sndmenu.cpp:149
 msgid "Use External Samples"
 msgstr "Usar Amostras Externas"
 
@@ -3227,21 +3227,21 @@ msgstr "* Vídeo:\n"
 msgid "  Screen '%1$s': Vector\n"
 msgstr "  Tela '%1$s': Vetor\n"
 
-#: src/frontend/mame/ui/devopt.cpp:132
+#: src/frontend/mame/ui/devopt.cpp:135
 #, c-format
 msgid "  Screen '%1$s': %2$d × %3$d (V) %4$s Hz\n"
 msgstr "  Tela '%1$s': %2$d × %3$d (V) %4$s Hz\n"
 
-#: src/frontend/mame/ui/devopt.cpp:133
+#: src/frontend/mame/ui/devopt.cpp:136
 #, c-format
 msgid "  Screen '%1$s': %2$d × %3$d (H) %4$s Hz\n"
 msgstr "  Tela '%1$s': %2$d × %3$d (H) %4$s Hz\n"
 
-#: src/frontend/mame/ui/devopt.cpp:147
+#: src/frontend/mame/ui/devopt.cpp:150
 msgid "* Sound:\n"
 msgstr "* Som:\n"
 
-#: src/frontend/mame/ui/devopt.cpp:211
+#: src/frontend/mame/ui/devopt.cpp:214
 #, c-format
 msgid ""
 "* BIOS settings:\n"
@@ -3250,491 +3250,661 @@ msgstr ""
 "* Configurações da BIOS:\n"
 "  %1$d opções    [padrão: %2$s]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:255 src/frontend/mame/ui/devopt.cpp:271
-#: src/frontend/mame/ui/devopt.cpp:332
+#: src/frontend/mame/ui/devopt.cpp:258 src/frontend/mame/ui/devopt.cpp:274
+#: src/frontend/mame/ui/devopt.cpp:335
 #, c-format
 msgid "  %1$s    [default: %2$s]\n"
 msgstr "  %1$s    [padrão: %2$s]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:260 src/frontend/mame/ui/devopt.cpp:276
+#: src/frontend/mame/ui/devopt.cpp:263 src/frontend/mame/ui/devopt.cpp:279
 #, c-format
 msgid "  %1$s\n"
 msgstr "  %1$s\n"
 
-#: src/frontend/mame/ui/devopt.cpp:282
+#: src/frontend/mame/ui/devopt.cpp:285
 msgid "* DIP switch settings:\n"
 msgstr "* Configurações das chaves do DIP:\n"
 
-#: src/frontend/mame/ui/devopt.cpp:287
+#: src/frontend/mame/ui/devopt.cpp:290
 msgid "* Configuration settings:\n"
 msgstr "* Definição das configurações:\n"
 
-#: src/frontend/mame/ui/devopt.cpp:291
+#: src/frontend/mame/ui/devopt.cpp:294
 msgid "* Input device(s):\n"
 msgstr "* Dispositivo(s) de entrada:\n"
 
-#: src/frontend/mame/ui/devopt.cpp:293
+#: src/frontend/mame/ui/devopt.cpp:296
 #, c-format
 msgid "  User inputs    [%1$d inputs]\n"
 msgstr "  Entradas do usuário    [%1$d entradas]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:295
+#: src/frontend/mame/ui/devopt.cpp:298
 #, c-format
 msgid "  Mahjong inputs    [%1$d inputs]\n"
 msgstr "  Entradas do Mahjong    [%1$d entradas]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:297
+#: src/frontend/mame/ui/devopt.cpp:300
 #, c-format
 msgid "  Hanafuda inputs    [%1$d inputs]\n"
 msgstr "  Entradas hanafuda    [%1$d entradas]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:299
+#: src/frontend/mame/ui/devopt.cpp:302
 #, c-format
 msgid "  Gambling inputs    [%1$d inputs]\n"
 msgstr "  Entradas pra jogos de apostas    [%1$d entradas]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:301
+#: src/frontend/mame/ui/devopt.cpp:304
 #, c-format
 msgid "  Analog inputs    [%1$d inputs]\n"
 msgstr "  Entradas analógicas    [%1$d entradas]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:303
+#: src/frontend/mame/ui/devopt.cpp:306
 #, c-format
 msgid "  Adjuster inputs    [%1$d inputs]\n"
 msgstr "  Entradas reguladoras    [%1$d entradas]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:305
+#: src/frontend/mame/ui/devopt.cpp:308
 #, c-format
 msgid "  Keypad inputs    [%1$d inputs]\n"
 msgstr "  Entradas do teclado numérico   [%1$d entradas]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:307
+#: src/frontend/mame/ui/devopt.cpp:310
 #, c-format
 msgid "  Keyboard inputs    [%1$d inputs]\n"
 msgstr "  Entradas do teclado    [%1$d entradas]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:312
+#: src/frontend/mame/ui/devopt.cpp:315
 msgid "* Media Options:\n"
 msgstr "* Opções da Mídia:\n"
 
-#: src/frontend/mame/ui/devopt.cpp:317
+#: src/frontend/mame/ui/devopt.cpp:320
 #, c-format
 msgid "  %1$s    [tag: %2$s]\n"
 msgstr "  %1$s    [etiqueta: %2$s]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:327
+#: src/frontend/mame/ui/devopt.cpp:330
 msgid "* Slot Options:\n"
 msgstr "* Opções de Slot:\n"
 
-#: src/frontend/mame/ui/devopt.cpp:341
+#: src/frontend/mame/ui/devopt.cpp:344
 msgid "[None]\n"
 msgstr "[Nenhum]\n"
 
-#: src/emu/render.cpp:1847
+#: src/emu/render.cpp:1796
 #, c-format
 msgctxt "view-name"
 msgid "Screen %1$u Standard (%2$u:%3$u)"
 msgstr "Tela %1$u Padrão (%2$u:%3$u)"
 
-#: src/emu/render.cpp:1873
+#: src/emu/render.cpp:1822
 #, c-format
 msgctxt "view-name"
 msgid "Screen %1$u Pixel Aspect (%2$u:%3$u)"
 msgstr "Tela %1$u Aspecto dos Pixeis (%2$u:%3$u)"
 
-#: src/emu/render.cpp:1895 src/emu/render.cpp:2030
+#: src/emu/render.cpp:1844 src/emu/render.cpp:1979
 msgctxt "view-name"
 msgid "Cocktail"
 msgstr "Coquetel"
 
-#: src/emu/render.cpp:2015
+#: src/emu/render.cpp:1964
 msgctxt "view-name"
 msgid "Left-to-Right"
 msgstr "Da-Esquerda-pra-Direita"
 
-#: src/emu/render.cpp:2016
+#: src/emu/render.cpp:1965
 msgctxt "view-name"
 msgid "Left-to-Right (Gapless)"
 msgstr "Da-Esquerda-pra-Direita (Sem Espaços)"
 
-#: src/emu/render.cpp:2017
+#: src/emu/render.cpp:1966
 msgctxt "view-name"
 msgid "Top-to-Bottom"
 msgstr "Do Topo-até-o-Rodapé"
 
-#: src/emu/render.cpp:2018
+#: src/emu/render.cpp:1967
 msgctxt "view-name"
 msgid "Top-to-Bottom (Gapless)"
 msgstr "Do Topo-até-o-Rodapé (Sem Espaço)"
 
-#: src/emu/render.cpp:2069
+#: src/emu/render.cpp:2018
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Left-to-Right, Top-to-Bottom"
 msgstr "%1$u×%2$u Da-Esquerda-pra-Direita, Do Topo-até-o-Rodapé"
 
-#: src/emu/render.cpp:2078
+#: src/emu/render.cpp:2027
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Left-to-Right, Top-to-Bottom (Gapless)"
 msgstr "%1$u×%2$u Da-Esquerda-pra-Direita, Do Topo-até-o-Rodapé (Sem Espaço)"
 
-#: src/emu/render.cpp:2087
+#: src/emu/render.cpp:2036
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Top-to-Bottom, Left-to-Right"
 msgstr "%1$u×%2$u Do Topo-até-o-Rodapé, Da-Esquerda-pra-Direita"
 
-#: src/emu/render.cpp:2096
+#: src/emu/render.cpp:2045
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Top-to-Bottom, Left-to-Right (Gapless)"
 msgstr "%1$u×%2$u Do Topo-até-o-Rodapé, Da-Esquerda-pra-Direita (Sem Espaço)"
 
-#: src/emu/inpttype.ipp:22
+#: src/emu/ioport.cpp:332
+#, c-format
+msgctxt "input-name"
+msgid "P%1$u"
+msgstr "Jogador %1$u"
+
+#: src/emu/ioport.cpp:1924
+msgctxt "input-name"
+msgid "???"
+msgstr ""
+
+#: src/emu/inpttype.ipp:22 src/emu/inpttype.ipp:140 src/emu/inpttype.ipp:221
+#: src/emu/inpttype.ipp:255 src/emu/inpttype.ipp:289 src/emu/inpttype.ipp:323
+#: src/emu/inpttype.ipp:357 src/emu/inpttype.ipp:391 src/emu/inpttype.ipp:425
+#: src/emu/inpttype.ipp:459
+#, c-format
+msgctxt "input-name"
+msgid "%p Up"
+msgstr "%p Pra Cima"
+
+#: src/emu/inpttype.ipp:23 src/emu/inpttype.ipp:141 src/emu/inpttype.ipp:222
+#: src/emu/inpttype.ipp:256 src/emu/inpttype.ipp:290 src/emu/inpttype.ipp:324
+#: src/emu/inpttype.ipp:358 src/emu/inpttype.ipp:392 src/emu/inpttype.ipp:426
+#: src/emu/inpttype.ipp:460
+#, c-format
+msgctxt "input-name"
+msgid "%p Down"
+msgstr "%p Pra Baixo"
+
+#: src/emu/inpttype.ipp:24 src/emu/inpttype.ipp:142 src/emu/inpttype.ipp:223
+#: src/emu/inpttype.ipp:257 src/emu/inpttype.ipp:291 src/emu/inpttype.ipp:325
+#: src/emu/inpttype.ipp:359 src/emu/inpttype.ipp:393 src/emu/inpttype.ipp:427
+#: src/emu/inpttype.ipp:461
+#, c-format
+msgctxt "input-name"
+msgid "%p Left"
+msgstr "%p Esquerdo"
+
+#: src/emu/inpttype.ipp:25 src/emu/inpttype.ipp:143 src/emu/inpttype.ipp:224
+#: src/emu/inpttype.ipp:258 src/emu/inpttype.ipp:292 src/emu/inpttype.ipp:326
+#: src/emu/inpttype.ipp:360 src/emu/inpttype.ipp:394 src/emu/inpttype.ipp:428
+#: src/emu/inpttype.ipp:462
+#, c-format
+msgctxt "input-name"
+msgid "%p Right"
+msgstr "%p Direito"
+
+#: src/emu/inpttype.ipp:26 src/emu/inpttype.ipp:144 src/emu/inpttype.ipp:225
+#: src/emu/inpttype.ipp:259 src/emu/inpttype.ipp:293 src/emu/inpttype.ipp:327
+#: src/emu/inpttype.ipp:361 src/emu/inpttype.ipp:395 src/emu/inpttype.ipp:429
+#: src/emu/inpttype.ipp:463
+#, c-format
+msgctxt "input-name"
+msgid "%p Right Stick/Up"
+msgstr "%p Direcional Direito/Pra Cima"
+
+#: src/emu/inpttype.ipp:27 src/emu/inpttype.ipp:145 src/emu/inpttype.ipp:226
+#: src/emu/inpttype.ipp:260 src/emu/inpttype.ipp:294 src/emu/inpttype.ipp:328
+#: src/emu/inpttype.ipp:362 src/emu/inpttype.ipp:396 src/emu/inpttype.ipp:430
+#: src/emu/inpttype.ipp:464
+#, c-format
+msgctxt "input-name"
+msgid "%p Right Stick/Down"
+msgstr "%p Direcional Direito/Pra Baixo"
+
+#: src/emu/inpttype.ipp:28 src/emu/inpttype.ipp:146 src/emu/inpttype.ipp:227
+#: src/emu/inpttype.ipp:261 src/emu/inpttype.ipp:295 src/emu/inpttype.ipp:329
+#: src/emu/inpttype.ipp:363 src/emu/inpttype.ipp:397 src/emu/inpttype.ipp:431
+#: src/emu/inpttype.ipp:465
+#, c-format
+msgctxt "input-name"
+msgid "%p Right Stick/Left"
+msgstr "%p Direcional Direito/Esquerdo"
+
+#: src/emu/inpttype.ipp:29 src/emu/inpttype.ipp:147 src/emu/inpttype.ipp:228
+#: src/emu/inpttype.ipp:262 src/emu/inpttype.ipp:296 src/emu/inpttype.ipp:330
+#: src/emu/inpttype.ipp:364 src/emu/inpttype.ipp:398 src/emu/inpttype.ipp:432
+#: src/emu/inpttype.ipp:466
+#, c-format
+msgctxt "input-name"
+msgid "%p Right Stick/Right"
+msgstr "%p Direcional Direito/Direito"
+
+#: src/emu/inpttype.ipp:30 src/emu/inpttype.ipp:148 src/emu/inpttype.ipp:229
+#: src/emu/inpttype.ipp:263 src/emu/inpttype.ipp:297 src/emu/inpttype.ipp:331
+#: src/emu/inpttype.ipp:365 src/emu/inpttype.ipp:399 src/emu/inpttype.ipp:433
+#: src/emu/inpttype.ipp:467
+#, c-format
+msgctxt "input-name"
+msgid "%p Left Stick/Up"
+msgstr "%p Direcional Esquerdo/Pra Cima"
+
+#: src/emu/inpttype.ipp:31 src/emu/inpttype.ipp:149 src/emu/inpttype.ipp:230
+#: src/emu/inpttype.ipp:264 src/emu/inpttype.ipp:298 src/emu/inpttype.ipp:332
+#: src/emu/inpttype.ipp:366 src/emu/inpttype.ipp:400 src/emu/inpttype.ipp:434
+#: src/emu/inpttype.ipp:468
+#, c-format
+msgctxt "input-name"
+msgid "%p Left Stick/Down"
+msgstr "%p Direcional Esquerdo/Pra Baixo"
+
+#: src/emu/inpttype.ipp:32 src/emu/inpttype.ipp:150 src/emu/inpttype.ipp:231
+#: src/emu/inpttype.ipp:265 src/emu/inpttype.ipp:299 src/emu/inpttype.ipp:333
+#: src/emu/inpttype.ipp:367 src/emu/inpttype.ipp:401 src/emu/inpttype.ipp:435
+#: src/emu/inpttype.ipp:469
+#, c-format
+msgctxt "input-name"
+msgid "%p Left Stick/Left"
+msgstr "%p Direcional Esquerdo/Esquerdo"
+
+#: src/emu/inpttype.ipp:33 src/emu/inpttype.ipp:151 src/emu/inpttype.ipp:232
+#: src/emu/inpttype.ipp:266 src/emu/inpttype.ipp:300 src/emu/inpttype.ipp:334
+#: src/emu/inpttype.ipp:368 src/emu/inpttype.ipp:402 src/emu/inpttype.ipp:436
+#: src/emu/inpttype.ipp:470
+#, c-format
+msgctxt "input-name"
+msgid "%p Left Stick/Right"
+msgstr "%p Direcional Esquerdo/Direito"
+
+#: src/emu/inpttype.ipp:34 src/emu/inpttype.ipp:152 src/emu/inpttype.ipp:233
+#: src/emu/inpttype.ipp:267 src/emu/inpttype.ipp:301 src/emu/inpttype.ipp:335
+#: src/emu/inpttype.ipp:369 src/emu/inpttype.ipp:403 src/emu/inpttype.ipp:437
+#: src/emu/inpttype.ipp:471
+#, c-format
+msgctxt "input-name"
+msgid "%p Button 1"
+msgstr "%p Botão 1"
+
+#: src/emu/inpttype.ipp:35 src/emu/inpttype.ipp:153 src/emu/inpttype.ipp:234
+#: src/emu/inpttype.ipp:268 src/emu/inpttype.ipp:302 src/emu/inpttype.ipp:336
+#: src/emu/inpttype.ipp:370 src/emu/inpttype.ipp:404 src/emu/inpttype.ipp:438
+#: src/emu/inpttype.ipp:472
+#, c-format
+msgctxt "input-name"
+msgid "%p Button 2"
+msgstr "%p Botão 2"
+
+#: src/emu/inpttype.ipp:36 src/emu/inpttype.ipp:154 src/emu/inpttype.ipp:235
+#: src/emu/inpttype.ipp:269 src/emu/inpttype.ipp:303 src/emu/inpttype.ipp:337
+#: src/emu/inpttype.ipp:371 src/emu/inpttype.ipp:405 src/emu/inpttype.ipp:439
+#: src/emu/inpttype.ipp:473
+#, c-format
+msgctxt "input-name"
+msgid "%p Button 3"
+msgstr "%p Botão 3"
+
+#: src/emu/inpttype.ipp:37 src/emu/inpttype.ipp:155 src/emu/inpttype.ipp:236
+#: src/emu/inpttype.ipp:270 src/emu/inpttype.ipp:304 src/emu/inpttype.ipp:338
+#: src/emu/inpttype.ipp:372 src/emu/inpttype.ipp:406 src/emu/inpttype.ipp:440
+#: src/emu/inpttype.ipp:474
+#, c-format
+msgctxt "input-name"
+msgid "%p Button 4"
+msgstr "%p Botão 4"
+
+#: src/emu/inpttype.ipp:38 src/emu/inpttype.ipp:156 src/emu/inpttype.ipp:237
+#: src/emu/inpttype.ipp:271 src/emu/inpttype.ipp:305 src/emu/inpttype.ipp:339
+#: src/emu/inpttype.ipp:373 src/emu/inpttype.ipp:407 src/emu/inpttype.ipp:441
+#: src/emu/inpttype.ipp:475
+#, c-format
+msgctxt "input-name"
+msgid "%p Button 5"
+msgstr "%p Botão 5"
+
+#: src/emu/inpttype.ipp:39 src/emu/inpttype.ipp:157 src/emu/inpttype.ipp:238
+#: src/emu/inpttype.ipp:272 src/emu/inpttype.ipp:306 src/emu/inpttype.ipp:340
+#: src/emu/inpttype.ipp:374 src/emu/inpttype.ipp:408 src/emu/inpttype.ipp:442
+#: src/emu/inpttype.ipp:476
+#, c-format
+msgctxt "input-name"
+msgid "%p Button 6"
+msgstr "%p Botão 6"
+
+#: src/emu/inpttype.ipp:40 src/emu/inpttype.ipp:158 src/emu/inpttype.ipp:239
+#: src/emu/inpttype.ipp:273 src/emu/inpttype.ipp:307 src/emu/inpttype.ipp:341
+#: src/emu/inpttype.ipp:375 src/emu/inpttype.ipp:409 src/emu/inpttype.ipp:443
+#: src/emu/inpttype.ipp:477
+#, c-format
+msgctxt "input-name"
+msgid "%p Button 7"
+msgstr "%p Botão 7"
+
+#: src/emu/inpttype.ipp:41 src/emu/inpttype.ipp:159 src/emu/inpttype.ipp:240
+#: src/emu/inpttype.ipp:274 src/emu/inpttype.ipp:308 src/emu/inpttype.ipp:342
+#: src/emu/inpttype.ipp:376 src/emu/inpttype.ipp:410 src/emu/inpttype.ipp:444
+#: src/emu/inpttype.ipp:478
+#, c-format
+msgctxt "input-name"
+msgid "%p Button 8"
+msgstr "%p Botão 8"
+
+#: src/emu/inpttype.ipp:42 src/emu/inpttype.ipp:160 src/emu/inpttype.ipp:241
+#: src/emu/inpttype.ipp:275 src/emu/inpttype.ipp:309 src/emu/inpttype.ipp:343
+#: src/emu/inpttype.ipp:377 src/emu/inpttype.ipp:411 src/emu/inpttype.ipp:445
+#: src/emu/inpttype.ipp:479
+#, c-format
+msgctxt "input-name"
+msgid "%p Button 9"
+msgstr "%p Botão 9"
+
+#: src/emu/inpttype.ipp:43 src/emu/inpttype.ipp:161 src/emu/inpttype.ipp:242
+#: src/emu/inpttype.ipp:276 src/emu/inpttype.ipp:310 src/emu/inpttype.ipp:344
+#: src/emu/inpttype.ipp:378 src/emu/inpttype.ipp:412 src/emu/inpttype.ipp:446
+#: src/emu/inpttype.ipp:480
+#, c-format
+msgctxt "input-name"
+msgid "%p Button 10"
+msgstr "%p Botão 10"
+
+#: src/emu/inpttype.ipp:44 src/emu/inpttype.ipp:162 src/emu/inpttype.ipp:243
+#: src/emu/inpttype.ipp:277 src/emu/inpttype.ipp:311 src/emu/inpttype.ipp:345
+#: src/emu/inpttype.ipp:379 src/emu/inpttype.ipp:413 src/emu/inpttype.ipp:447
+#: src/emu/inpttype.ipp:481
+#, c-format
+msgctxt "input-name"
+msgid "%p Button 11"
+msgstr "%p Botão 11"
+
+#: src/emu/inpttype.ipp:45 src/emu/inpttype.ipp:163 src/emu/inpttype.ipp:244
+#: src/emu/inpttype.ipp:278 src/emu/inpttype.ipp:312 src/emu/inpttype.ipp:346
+#: src/emu/inpttype.ipp:380 src/emu/inpttype.ipp:414 src/emu/inpttype.ipp:448
+#: src/emu/inpttype.ipp:482
+#, c-format
 msgctxt "input-name"
-msgid "P1 Up"
-msgstr "Jogador 1 Pra Cima"
+msgid "%p Button 12"
+msgstr "%p Botão 12"
 
-#: src/emu/inpttype.ipp:23
+#: src/emu/inpttype.ipp:46 src/emu/inpttype.ipp:164 src/emu/inpttype.ipp:245
+#: src/emu/inpttype.ipp:279 src/emu/inpttype.ipp:313 src/emu/inpttype.ipp:347
+#: src/emu/inpttype.ipp:381 src/emu/inpttype.ipp:415 src/emu/inpttype.ipp:449
+#: src/emu/inpttype.ipp:483
+#, c-format
 msgctxt "input-name"
-msgid "P1 Down"
-msgstr "Jogador 1 Pra Baixo"
+msgid "%p Button 13"
+msgstr "%p Botão 13"
 
-#: src/emu/inpttype.ipp:24
+#: src/emu/inpttype.ipp:47 src/emu/inpttype.ipp:165 src/emu/inpttype.ipp:246
+#: src/emu/inpttype.ipp:280 src/emu/inpttype.ipp:314 src/emu/inpttype.ipp:348
+#: src/emu/inpttype.ipp:382 src/emu/inpttype.ipp:416 src/emu/inpttype.ipp:450
+#: src/emu/inpttype.ipp:484
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left"
-msgstr "Jogador 1 Esquerdo"
+msgid "%p Button 14"
+msgstr "%p Botão 14"
 
-#: src/emu/inpttype.ipp:25
+#: src/emu/inpttype.ipp:48 src/emu/inpttype.ipp:166 src/emu/inpttype.ipp:247
+#: src/emu/inpttype.ipp:281 src/emu/inpttype.ipp:315 src/emu/inpttype.ipp:349
+#: src/emu/inpttype.ipp:383 src/emu/inpttype.ipp:417 src/emu/inpttype.ipp:451
+#: src/emu/inpttype.ipp:485
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right"
-msgstr "Jogador 1 Direito"
+msgid "%p Button 15"
+msgstr "%p Botão 15"
 
-#: src/emu/inpttype.ipp:26
+#: src/emu/inpttype.ipp:49 src/emu/inpttype.ipp:167 src/emu/inpttype.ipp:248
+#: src/emu/inpttype.ipp:282 src/emu/inpttype.ipp:316 src/emu/inpttype.ipp:350
+#: src/emu/inpttype.ipp:384 src/emu/inpttype.ipp:418 src/emu/inpttype.ipp:452
+#: src/emu/inpttype.ipp:486
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Up"
-msgstr "Jogador 1 Direcional Direito/Pra Cima"
+msgid "%p Button 16"
+msgstr "%p Botão 16"
 
-#: src/emu/inpttype.ipp:27
+#: src/emu/inpttype.ipp:50 src/emu/inpttype.ipp:168 src/emu/inpttype.ipp:249
+#: src/emu/inpttype.ipp:283 src/emu/inpttype.ipp:317 src/emu/inpttype.ipp:351
+#: src/emu/inpttype.ipp:385 src/emu/inpttype.ipp:419 src/emu/inpttype.ipp:453
+#: src/emu/inpttype.ipp:487
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Down"
-msgstr "Jogador 1 Direcional Direito/Pra Baixo"
+msgid "%p Start"
+msgstr "%p Start"
 
-#: src/emu/inpttype.ipp:28
+#: src/emu/inpttype.ipp:51 src/emu/inpttype.ipp:169 src/emu/inpttype.ipp:250
+#: src/emu/inpttype.ipp:284 src/emu/inpttype.ipp:318 src/emu/inpttype.ipp:352
+#: src/emu/inpttype.ipp:386 src/emu/inpttype.ipp:420 src/emu/inpttype.ipp:454
+#: src/emu/inpttype.ipp:488
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Left"
-msgstr "Jogador 1 Direcional Direito/Esquerdo"
+msgid "%p Select"
+msgstr "Selecionar %p"
 
-#: src/emu/inpttype.ipp:29
+#: src/emu/inpttype.ipp:56 src/emu/inpttype.ipp:174
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Right"
-msgstr "Jogador 1 Direcional Direito/Direito"
+msgid "%p Mahjong A"
+msgstr "%p Mahjong A"
 
-#: src/emu/inpttype.ipp:30
+#: src/emu/inpttype.ipp:57 src/emu/inpttype.ipp:175
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Up"
-msgstr "Jogador 1 Direcional Esquerdo/Pra Cima"
+msgid "%p Mahjong B"
+msgstr "%p Mahjong B"
 
-#: src/emu/inpttype.ipp:31
+#: src/emu/inpttype.ipp:58 src/emu/inpttype.ipp:176
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Down"
-msgstr "Jogador 1 Direcional Esquerdo/Pra Baixo"
+msgid "%p Mahjong C"
+msgstr "%p Mahjong C"
 
-#: src/emu/inpttype.ipp:32
+#: src/emu/inpttype.ipp:59 src/emu/inpttype.ipp:177
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Left"
-msgstr "Jogador 1 Direcional Esquerdo/Esquerdo"
+msgid "%p Mahjong D"
+msgstr "%p Mahjong D"
 
-#: src/emu/inpttype.ipp:33
+#: src/emu/inpttype.ipp:60 src/emu/inpttype.ipp:178
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Right"
-msgstr "Jogador 1 Direcional Esquerdo/Direito"
+msgid "%p Mahjong E"
+msgstr "%p Mahjong E"
 
-#: src/emu/inpttype.ipp:34
+#: src/emu/inpttype.ipp:61 src/emu/inpttype.ipp:179
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 1"
-msgstr "Jogador 1 Botão 1"
+msgid "%p Mahjong F"
+msgstr "%p Mahjong F"
 
-#: src/emu/inpttype.ipp:35
+#: src/emu/inpttype.ipp:62 src/emu/inpttype.ipp:180
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 2"
-msgstr "Jogador 1 Botão 2"
+msgid "%p Mahjong G"
+msgstr "%p Mahjong G"
 
-#: src/emu/inpttype.ipp:36
+#: src/emu/inpttype.ipp:63 src/emu/inpttype.ipp:181
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 3"
-msgstr "Jogador 1 Botão 3"
+msgid "%p Mahjong H"
+msgstr "%p Mahjong H"
 
-#: src/emu/inpttype.ipp:37
+#: src/emu/inpttype.ipp:64 src/emu/inpttype.ipp:182
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 4"
-msgstr "Jogador 1 Botão 4"
+msgid "%p Mahjong I"
+msgstr "%p Mahjong I"
 
-#: src/emu/inpttype.ipp:38
+#: src/emu/inpttype.ipp:65 src/emu/inpttype.ipp:183
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 5"
-msgstr "Jogador 1 Botão 5"
+msgid "%p Mahjong J"
+msgstr "%p Mahjong J"
 
-#: src/emu/inpttype.ipp:39
+#: src/emu/inpttype.ipp:66 src/emu/inpttype.ipp:184
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 6"
-msgstr "Jogador 1 Botão 6"
+msgid "%p Mahjong K"
+msgstr "%p Mahjong K"
 
-#: src/emu/inpttype.ipp:40
+#: src/emu/inpttype.ipp:67 src/emu/inpttype.ipp:185
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 7"
-msgstr "Jogador 1 Botão 7"
+msgid "%p Mahjong L"
+msgstr "%p Mahjong L"
 
-#: src/emu/inpttype.ipp:41
+#: src/emu/inpttype.ipp:68 src/emu/inpttype.ipp:186
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 8"
-msgstr "Jogador 1 Botão 8"
+msgid "%p Mahjong M"
+msgstr "%p Mahjong M"
 
-#: src/emu/inpttype.ipp:42
+#: src/emu/inpttype.ipp:69 src/emu/inpttype.ipp:187
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 9"
-msgstr "Jogador 1 Botão 9"
+msgid "%p Mahjong N"
+msgstr "%p Mahjong N"
 
-#: src/emu/inpttype.ipp:43
+#: src/emu/inpttype.ipp:70 src/emu/inpttype.ipp:188
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 10"
-msgstr "Jogador 1 Botão 10"
+msgid "%p Mahjong O"
+msgstr "%p Mahjong O"
 
-#: src/emu/inpttype.ipp:44
+#: src/emu/inpttype.ipp:71 src/emu/inpttype.ipp:189
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 11"
-msgstr "Jogador 1 Botão 11"
+msgid "%p Mahjong P"
+msgstr "%p Mahjong P"
 
-#: src/emu/inpttype.ipp:45
+#: src/emu/inpttype.ipp:72 src/emu/inpttype.ipp:190
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 12"
-msgstr "Jogador 1 Botão 12"
+msgid "%p Mahjong Q"
+msgstr "%p Mahjong Q"
 
-#: src/emu/inpttype.ipp:46
+#: src/emu/inpttype.ipp:73 src/emu/inpttype.ipp:191
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 13"
-msgstr "Jogador 1 Botão 13"
+msgid "%p Mahjong Kan"
+msgstr "%p Mahjong Kan"
 
-#: src/emu/inpttype.ipp:47
+#: src/emu/inpttype.ipp:74 src/emu/inpttype.ipp:192
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 14"
-msgstr "Jogador 1 Botão 14"
+msgid "%p Mahjong Pon"
+msgstr "%p Mahjong Pon"
 
-#: src/emu/inpttype.ipp:48
+#: src/emu/inpttype.ipp:75 src/emu/inpttype.ipp:193
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 15"
-msgstr "Jogador 1 Botão 15"
+msgid "%p Mahjong Chi"
+msgstr "%p Mahjong Chi"
 
-#: src/emu/inpttype.ipp:49
+#: src/emu/inpttype.ipp:76 src/emu/inpttype.ipp:194
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 16"
-msgstr "Jogador 1 Botão 16"
+msgid "%p Mahjong Reach"
+msgstr "%p Mahjong Reach"
 
-#: src/emu/inpttype.ipp:50
+#: src/emu/inpttype.ipp:77 src/emu/inpttype.ipp:195
+#, c-format
 msgctxt "input-name"
-msgid "P1 Start"
-msgstr "Jogador 1 Start"
+msgid "%p Mahjong Ron"
+msgstr "%p Mahjong Ron"
 
-#: src/emu/inpttype.ipp:51
+#: src/emu/inpttype.ipp:78 src/emu/inpttype.ipp:200
+#, c-format
 msgctxt "input-name"
-msgid "P1 Select"
-msgstr "Selecionar Jogador 1"
+msgid "%p Mahjong Flip Flop"
+msgstr "%p Reviravolta do Mahjong"
 
-#: src/emu/inpttype.ipp:56
+#: src/emu/inpttype.ipp:79 src/emu/inpttype.ipp:196
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong A"
-msgstr "Jogador 1 Mahjong A"
+msgid "%p Mahjong Bet"
+msgstr "%p Mahjong Bet"
 
-#: src/emu/inpttype.ipp:57
+#: src/emu/inpttype.ipp:80 src/emu/inpttype.ipp:198
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong B"
-msgstr "Jogador 1 Mahjong B"
+msgid "%p Mahjong Take Score"
+msgstr "%p Mahjong Tirar Pontuação"
 
-#: src/emu/inpttype.ipp:58
+#: src/emu/inpttype.ipp:81 src/emu/inpttype.ipp:199
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong C"
-msgstr "Jogador 1 Mahjong C"
+msgid "%p Mahjong Double Up"
+msgstr "%p Mahjong Duplo Pra Cima"
 
-#: src/emu/inpttype.ipp:59
+#: src/emu/inpttype.ipp:82 src/emu/inpttype.ipp:201
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong D"
-msgstr "Jogador 1 Mahjong D"
+msgid "%p Mahjong Big"
+msgstr "%p Mahjong Grande"
 
-#: src/emu/inpttype.ipp:60
+#: src/emu/inpttype.ipp:83 src/emu/inpttype.ipp:202
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong E"
-msgstr "Jogador 1 Mahjong E"
+msgid "%p Mahjong Small"
+msgstr "%p Mahjong Pequeno"
 
-#: src/emu/inpttype.ipp:61
+#: src/emu/inpttype.ipp:84 src/emu/inpttype.ipp:197
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong F"
-msgstr "Jogador 1 Mahjong F"
+msgid "%p Mahjong Last Chance"
+msgstr "%p Mahjong Última Chance"
 
-#: src/emu/inpttype.ipp:62
+#: src/emu/inpttype.ipp:89 src/emu/inpttype.ipp:207
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong G"
-msgstr "Jogador 1 Mahjong G"
+msgid "%p Hanafuda A/1"
+msgstr "%p Hanafuda A/1"
 
-#: src/emu/inpttype.ipp:63
+#: src/emu/inpttype.ipp:90 src/emu/inpttype.ipp:208
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong H"
-msgstr "Jogador 1 Mahjong H"
+msgid "%p Hanafuda B/2"
+msgstr "%p Hanafuda B/2"
 
-#: src/emu/inpttype.ipp:64
+#: src/emu/inpttype.ipp:91 src/emu/inpttype.ipp:209
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong I"
-msgstr "Jogador 1 Mahjong I"
+msgid "%p Hanafuda C/3"
+msgstr "%p Hanafuda C/3"
 
-#: src/emu/inpttype.ipp:65
+#: src/emu/inpttype.ipp:92 src/emu/inpttype.ipp:210
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong J"
-msgstr "Jogador 1 Mahjong J"
+msgid "%p Hanafuda D/4"
+msgstr "%p Hanafuda D/4"
 
-#: src/emu/inpttype.ipp:66
+#: src/emu/inpttype.ipp:93 src/emu/inpttype.ipp:211
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong K"
-msgstr "Jogador 1 Mahjong K"
+msgid "%p Hanafuda E/5"
+msgstr "%p Hanafuda E/5"
 
-#: src/emu/inpttype.ipp:67
+#: src/emu/inpttype.ipp:94 src/emu/inpttype.ipp:212
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong L"
-msgstr "Jogador 1 Mahjong L"
+msgid "%p Hanafuda F/6"
+msgstr "%p Hanafuda F/6"
 
-#: src/emu/inpttype.ipp:68
+#: src/emu/inpttype.ipp:95 src/emu/inpttype.ipp:213
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong M"
-msgstr "Jogador 1 Mahjong M"
+msgid "%p Hanafuda G/7"
+msgstr "%p Hanafuda G/7"
 
-#: src/emu/inpttype.ipp:69
+#: src/emu/inpttype.ipp:96 src/emu/inpttype.ipp:214
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong N"
-msgstr "Jogador 1 Mahjong N"
+msgid "%p Hanafuda H/8"
+msgstr "%p Hanafuda H/8"
 
-#: src/emu/inpttype.ipp:70
+#: src/emu/inpttype.ipp:97 src/emu/inpttype.ipp:215
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong O"
-msgstr "Jogador 1 Mahjong O"
+msgid "%p Hanafuda Yes"
+msgstr "%p Hanafuda Sim"
 
-#: src/emu/inpttype.ipp:71
+#: src/emu/inpttype.ipp:98 src/emu/inpttype.ipp:216
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong P"
-msgstr "Jogador 1 Mahjong P"
-
-#: src/emu/inpttype.ipp:72
-msgctxt "input-name"
-msgid "P1 Mahjong Q"
-msgstr "Jogador 1 Mahjong Q"
-
-#: src/emu/inpttype.ipp:73
-msgctxt "input-name"
-msgid "P1 Mahjong Kan"
-msgstr "Jogador 1 Mahjong Kan"
-
-#: src/emu/inpttype.ipp:74
-msgctxt "input-name"
-msgid "P1 Mahjong Pon"
-msgstr "Jogador 1 Mahjong Pon"
-
-#: src/emu/inpttype.ipp:75
-msgctxt "input-name"
-msgid "P1 Mahjong Chi"
-msgstr "Jogador 1 Mahjong Chi"
-
-#: src/emu/inpttype.ipp:76
-msgctxt "input-name"
-msgid "P1 Mahjong Reach"
-msgstr "Jogador 1 Mahjong Reach"
-
-#: src/emu/inpttype.ipp:77
-msgctxt "input-name"
-msgid "P1 Mahjong Ron"
-msgstr "Jogador 1 Mahjong Ron"
-
-#: src/emu/inpttype.ipp:78
-msgctxt "input-name"
-msgid "P1 Mahjong Flip Flop"
-msgstr "Jogador 1 Reviravolta do Mahjong"
-
-#: src/emu/inpttype.ipp:79
-msgctxt "input-name"
-msgid "P1 Mahjong Bet"
-msgstr "Jogador 1 Mahjong Bet"
-
-#: src/emu/inpttype.ipp:80
-msgctxt "input-name"
-msgid "P1 Mahjong Take Score"
-msgstr "Jogador 1 Mahjong Tirar Pontuação"
-
-#: src/emu/inpttype.ipp:81
-msgctxt "input-name"
-msgid "P1 Mahjong Double Up"
-msgstr "Jogador 1 Mahjong Duplo Pra Cima"
-
-#: src/emu/inpttype.ipp:82
-msgctxt "input-name"
-msgid "P1 Mahjong Big"
-msgstr "Jogador 1 Mahjong Grande"
-
-#: src/emu/inpttype.ipp:83
-msgctxt "input-name"
-msgid "P1 Mahjong Small"
-msgstr "Jogador 1 Mahjong Pequeno"
-
-#: src/emu/inpttype.ipp:84
-msgctxt "input-name"
-msgid "P1 Mahjong Last Chance"
-msgstr "Jogador 1 Mahjong Última Chance"
-
-#: src/emu/inpttype.ipp:89
-msgctxt "input-name"
-msgid "P1 Hanafuda A/1"
-msgstr "Jogador 1 Hanafuda A/1"
-
-#: src/emu/inpttype.ipp:90
-msgctxt "input-name"
-msgid "P1 Hanafuda B/2"
-msgstr "Jogador 1 Hanafuda B/2"
-
-#: src/emu/inpttype.ipp:91
-msgctxt "input-name"
-msgid "P1 Hanafuda C/3"
-msgstr "Jogador 1 Hanafuda C/3"
-
-#: src/emu/inpttype.ipp:92
-msgctxt "input-name"
-msgid "P1 Hanafuda D/4"
-msgstr "Jogador 1 Hanafuda D/4"
-
-#: src/emu/inpttype.ipp:93
-msgctxt "input-name"
-msgid "P1 Hanafuda E/5"
-msgstr "Jogador 1 Hanafuda E/5"
-
-#: src/emu/inpttype.ipp:94
-msgctxt "input-name"
-msgid "P1 Hanafuda F/6"
-msgstr "Jogador 1 Hanafuda F/6"
-
-#: src/emu/inpttype.ipp:95
-msgctxt "input-name"
-msgid "P1 Hanafuda G/7"
-msgstr "Jogador 1 Hanafuda G/7"
-
-#: src/emu/inpttype.ipp:96
-msgctxt "input-name"
-msgid "P1 Hanafuda H/8"
-msgstr "Jogador 1 Hanafuda H/8"
-
-#: src/emu/inpttype.ipp:97
-msgctxt "input-name"
-msgid "P1 Hanafuda Yes"
-msgstr "Jogador 1 Hanafuda Sim"
-
-#: src/emu/inpttype.ipp:98
-msgctxt "input-name"
-msgid "P1 Hanafuda No"
-msgstr "Jogador 1 Hanafuda Não"
+msgid "%p Hanafuda No"
+msgstr "%p Hanafuda Não"
 
 #: src/emu/inpttype.ipp:103
 msgctxt "input-name"
@@ -3861,1551 +4031,6 @@ msgctxt "input-name"
 msgid "Stop All Reels"
 msgstr "Stop All Reels"
 
-#: src/emu/inpttype.ipp:140
-msgctxt "input-name"
-msgid "P2 Up"
-msgstr "Jogador 2 Pra Cima"
-
-#: src/emu/inpttype.ipp:141
-msgctxt "input-name"
-msgid "P2 Down"
-msgstr "Jogador 2 Pra Baixo"
-
-#: src/emu/inpttype.ipp:142
-msgctxt "input-name"
-msgid "P2 Left"
-msgstr "Jogador 2 Esquerdo"
-
-#: src/emu/inpttype.ipp:143
-msgctxt "input-name"
-msgid "P2 Right"
-msgstr "Jogador 2 Direito"
-
-#: src/emu/inpttype.ipp:144
-msgctxt "input-name"
-msgid "P2 Right Stick/Up"
-msgstr "Jogador 2 Direcional Direito/Pra Cima"
-
-#: src/emu/inpttype.ipp:145
-msgctxt "input-name"
-msgid "P2 Right Stick/Down"
-msgstr "Jogador 2 Direcional Direito/Pra Baixo"
-
-#: src/emu/inpttype.ipp:146
-msgctxt "input-name"
-msgid "P2 Right Stick/Left"
-msgstr "Jogador 2 Direcional Direito/Esquerdo"
-
-#: src/emu/inpttype.ipp:147
-msgctxt "input-name"
-msgid "P2 Right Stick/Right"
-msgstr "Jogador 2 Direcional Direito/Direito"
-
-#: src/emu/inpttype.ipp:148
-msgctxt "input-name"
-msgid "P2 Left Stick/Up"
-msgstr "Jogador 2 Direcional Esquerdo/Pra Cima"
-
-#: src/emu/inpttype.ipp:149
-msgctxt "input-name"
-msgid "P2 Left Stick/Down"
-msgstr "Jogador 2 Direcional Esquerdo/Pra Baixo"
-
-#: src/emu/inpttype.ipp:150
-msgctxt "input-name"
-msgid "P2 Left Stick/Left"
-msgstr "Jogador 2 Direcional Esquerdo/Esquerdo"
-
-#: src/emu/inpttype.ipp:151
-msgctxt "input-name"
-msgid "P2 Left Stick/Right"
-msgstr "Jogador 2 Direcional Esquerdo/Direito"
-
-#: src/emu/inpttype.ipp:152
-msgctxt "input-name"
-msgid "P2 Button 1"
-msgstr "Jogador 2 Botão 1"
-
-#: src/emu/inpttype.ipp:153
-msgctxt "input-name"
-msgid "P2 Button 2"
-msgstr "Jogador 2 Botão 2"
-
-#: src/emu/inpttype.ipp:154
-msgctxt "input-name"
-msgid "P2 Button 3"
-msgstr "Jogador 2 Botão 3"
-
-#: src/emu/inpttype.ipp:155
-msgctxt "input-name"
-msgid "P2 Button 4"
-msgstr "Jogador 2 Botão 4"
-
-#: src/emu/inpttype.ipp:156
-msgctxt "input-name"
-msgid "P2 Button 5"
-msgstr "Jogador 2 Botão 5"
-
-#: src/emu/inpttype.ipp:157
-msgctxt "input-name"
-msgid "P2 Button 6"
-msgstr "Jogador 2 Botão 6"
-
-#: src/emu/inpttype.ipp:158
-msgctxt "input-name"
-msgid "P2 Button 7"
-msgstr "Jogador 2 Botão 7"
-
-#: src/emu/inpttype.ipp:159
-msgctxt "input-name"
-msgid "P2 Button 8"
-msgstr "Jogador 2 Botão 8"
-
-#: src/emu/inpttype.ipp:160
-msgctxt "input-name"
-msgid "P2 Button 9"
-msgstr "Jogador 2 Botão 9"
-
-#: src/emu/inpttype.ipp:161
-msgctxt "input-name"
-msgid "P2 Button 10"
-msgstr "Jogador 2 Botão 10"
-
-#: src/emu/inpttype.ipp:162
-msgctxt "input-name"
-msgid "P2 Button 11"
-msgstr "Jogador 2 Botão 11"
-
-#: src/emu/inpttype.ipp:163
-msgctxt "input-name"
-msgid "P2 Button 12"
-msgstr "Jogador 2 Botão 12"
-
-#: src/emu/inpttype.ipp:164
-msgctxt "input-name"
-msgid "P2 Button 13"
-msgstr "Jogador 2 Botão 13"
-
-#: src/emu/inpttype.ipp:165
-msgctxt "input-name"
-msgid "P2 Button 14"
-msgstr "Jogador 2 Botão 14"
-
-#: src/emu/inpttype.ipp:166
-msgctxt "input-name"
-msgid "P2 Button 15"
-msgstr "Jogador 2 Botão 15"
-
-#: src/emu/inpttype.ipp:167
-msgctxt "input-name"
-msgid "P2 Button 16"
-msgstr "Jogador 2 Botão 16"
-
-#: src/emu/inpttype.ipp:168
-msgctxt "input-name"
-msgid "P2 Start"
-msgstr "Jogador 2 Start"
-
-#: src/emu/inpttype.ipp:169
-msgctxt "input-name"
-msgid "P2 Select"
-msgstr "Selecionar Jogador 2"
-
-#: src/emu/inpttype.ipp:174
-msgctxt "input-name"
-msgid "P2 Mahjong A"
-msgstr "Jogador 2 Mahjong A"
-
-#: src/emu/inpttype.ipp:175
-msgctxt "input-name"
-msgid "P2 Mahjong B"
-msgstr "Jogador 2 Mahjong B"
-
-#: src/emu/inpttype.ipp:176
-msgctxt "input-name"
-msgid "P2 Mahjong C"
-msgstr "Jogador 2 Mahjong C"
-
-#: src/emu/inpttype.ipp:177
-msgctxt "input-name"
-msgid "P2 Mahjong D"
-msgstr "Jogador 2 Mahjong D"
-
-#: src/emu/inpttype.ipp:178
-msgctxt "input-name"
-msgid "P2 Mahjong E"
-msgstr "Jogador 2 Mahjong E"
-
-#: src/emu/inpttype.ipp:179
-msgctxt "input-name"
-msgid "P2 Mahjong F"
-msgstr "Jogador 2 Mahjong F"
-
-#: src/emu/inpttype.ipp:180
-msgctxt "input-name"
-msgid "P2 Mahjong G"
-msgstr "Jogador 2 Mahjong G"
-
-#: src/emu/inpttype.ipp:181
-msgctxt "input-name"
-msgid "P2 Mahjong H"
-msgstr "Jogador 2 Mahjong H"
-
-#: src/emu/inpttype.ipp:182
-msgctxt "input-name"
-msgid "P2 Mahjong I"
-msgstr "Jogador 2 Mahjong I"
-
-#: src/emu/inpttype.ipp:183
-msgctxt "input-name"
-msgid "P2 Mahjong J"
-msgstr "Jogador 2 Mahjong J"
-
-#: src/emu/inpttype.ipp:184
-msgctxt "input-name"
-msgid "P2 Mahjong K"
-msgstr "Jogador 2 Mahjong K"
-
-#: src/emu/inpttype.ipp:185
-msgctxt "input-name"
-msgid "P2 Mahjong L"
-msgstr "Jogador 2 Mahjong L"
-
-#: src/emu/inpttype.ipp:186
-msgctxt "input-name"
-msgid "P2 Mahjong M"
-msgstr "Jogador 2 Mahjong M"
-
-#: src/emu/inpttype.ipp:187
-msgctxt "input-name"
-msgid "P2 Mahjong N"
-msgstr "Jogador 2 Mahjong N"
-
-#: src/emu/inpttype.ipp:188
-msgctxt "input-name"
-msgid "P2 Mahjong O"
-msgstr "Jogador 2 Mahjong O"
-
-#: src/emu/inpttype.ipp:189
-msgctxt "input-name"
-msgid "P2 Mahjong P"
-msgstr "Jogador 2 Mahjong P"
-
-#: src/emu/inpttype.ipp:190
-msgctxt "input-name"
-msgid "P2 Mahjong Q"
-msgstr "Jogador 2 Mahjong Q"
-
-#: src/emu/inpttype.ipp:191
-msgctxt "input-name"
-msgid "P2 Mahjong Kan"
-msgstr "Jogador 2 Mahjong Kan"
-
-#: src/emu/inpttype.ipp:192
-msgctxt "input-name"
-msgid "P2 Mahjong Pon"
-msgstr "Jogador 2 Mahjong Pon"
-
-#: src/emu/inpttype.ipp:193
-msgctxt "input-name"
-msgid "P2 Mahjong Chi"
-msgstr "Jogador 2 Mahjong Chi"
-
-#: src/emu/inpttype.ipp:194
-msgctxt "input-name"
-msgid "P2 Mahjong Reach"
-msgstr "Jogador 2 Mahjong Reach"
-
-#: src/emu/inpttype.ipp:195
-msgctxt "input-name"
-msgid "P2 Mahjong Ron"
-msgstr "Jogador 2 Mahjong Ron"
-
-#: src/emu/inpttype.ipp:196
-msgctxt "input-name"
-msgid "P2 Mahjong Bet"
-msgstr "Jogador 2 Mahjong Bet"
-
-#: src/emu/inpttype.ipp:197
-msgctxt "input-name"
-msgid "P2 Mahjong Last Chance"
-msgstr "Jogador 2 Mahjong Última Chance"
-
-#: src/emu/inpttype.ipp:198
-msgctxt "input-name"
-msgid "P2 Mahjong Take Score"
-msgstr "Jogador 2 Mahjong Tirar Pontuação"
-
-#: src/emu/inpttype.ipp:199
-msgctxt "input-name"
-msgid "P2 Mahjong Double Up"
-msgstr "Jogador 2 Mahjong Duplo Pra Cima"
-
-#: src/emu/inpttype.ipp:200
-msgctxt "input-name"
-msgid "P2 Mahjong Flip Flop"
-msgstr "Jogador 2 Reviravolta do Mahjong"
-
-#: src/emu/inpttype.ipp:201
-msgctxt "input-name"
-msgid "P2 Mahjong Big"
-msgstr "Jogador 2 Mahjong Grande"
-
-#: src/emu/inpttype.ipp:202
-msgctxt "input-name"
-msgid "P2 Mahjong Small"
-msgstr "Jogador 2 Mahjong Pequeno"
-
-#: src/emu/inpttype.ipp:207
-msgctxt "input-name"
-msgid "P2 Hanafuda A/1"
-msgstr "Jogador 2 Hanafuda A/1"
-
-#: src/emu/inpttype.ipp:208
-msgctxt "input-name"
-msgid "P2 Hanafuda B/2"
-msgstr "Jogador 2 Hanafuda B/2"
-
-#: src/emu/inpttype.ipp:209
-msgctxt "input-name"
-msgid "P2 Hanafuda C/3"
-msgstr "Jogador 2 Hanafuda C/3"
-
-#: src/emu/inpttype.ipp:210
-msgctxt "input-name"
-msgid "P2 Hanafuda D/4"
-msgstr "Jogador 2 Hanafuda D/4"
-
-#: src/emu/inpttype.ipp:211
-msgctxt "input-name"
-msgid "P2 Hanafuda E/5"
-msgstr "Jogador 2 Hanafuda E/5"
-
-#: src/emu/inpttype.ipp:212
-msgctxt "input-name"
-msgid "P2 Hanafuda F/6"
-msgstr "Jogador 2 Hanafuda F/6"
-
-#: src/emu/inpttype.ipp:213
-msgctxt "input-name"
-msgid "P2 Hanafuda G/7"
-msgstr "Jogador 2 Hanafuda G/7"
-
-#: src/emu/inpttype.ipp:214
-msgctxt "input-name"
-msgid "P2 Hanafuda H/8"
-msgstr "Jogador 2 Hanafuda H/8"
-
-#: src/emu/inpttype.ipp:215
-msgctxt "input-name"
-msgid "P2 Hanafuda Yes"
-msgstr "Jogador 2 Hanafuda Sim"
-
-#: src/emu/inpttype.ipp:216
-msgctxt "input-name"
-msgid "P2 Hanafuda No"
-msgstr "Jogador 2 Hanafuda Não"
-
-#: src/emu/inpttype.ipp:221
-msgctxt "input-name"
-msgid "P3 Up"
-msgstr "Jogador 3 Pra Cima"
-
-#: src/emu/inpttype.ipp:222
-msgctxt "input-name"
-msgid "P3 Down"
-msgstr "Jogador 3 Pra Baixo"
-
-#: src/emu/inpttype.ipp:223
-msgctxt "input-name"
-msgid "P3 Left"
-msgstr "Jogador 3 Esquerdo"
-
-#: src/emu/inpttype.ipp:224
-msgctxt "input-name"
-msgid "P3 Right"
-msgstr "Jogador 3 Direito"
-
-#: src/emu/inpttype.ipp:225
-msgctxt "input-name"
-msgid "P3 Right Stick/Up"
-msgstr "Jogador 3 Direcional Direito/Pra Cima"
-
-#: src/emu/inpttype.ipp:226
-msgctxt "input-name"
-msgid "P3 Right Stick/Down"
-msgstr "Jogador 3 Direcional Direito/Pra Baixo"
-
-#: src/emu/inpttype.ipp:227
-msgctxt "input-name"
-msgid "P3 Right Stick/Left"
-msgstr "Jogador 3 Direcional Direito/Esquerdo"
-
-#: src/emu/inpttype.ipp:228
-msgctxt "input-name"
-msgid "P3 Right Stick/Right"
-msgstr "Jogador 3 Direcional Direito/Direito"
-
-#: src/emu/inpttype.ipp:229
-msgctxt "input-name"
-msgid "P3 Left Stick/Up"
-msgstr "Jogador 3 Direcional Esquerdo/Pra Cima"
-
-#: src/emu/inpttype.ipp:230
-msgctxt "input-name"
-msgid "P3 Left Stick/Down"
-msgstr "Jogador 3 Direcional Esquerdo/Pra Baixo"
-
-#: src/emu/inpttype.ipp:231
-msgctxt "input-name"
-msgid "P3 Left Stick/Left"
-msgstr "Jogador 3 Direcional Esquerdo/Esquerdo"
-
-#: src/emu/inpttype.ipp:232
-msgctxt "input-name"
-msgid "P3 Left Stick/Right"
-msgstr "Jogador 3 Direcional Esquerdo/Direito"
-
-#: src/emu/inpttype.ipp:233
-msgctxt "input-name"
-msgid "P3 Button 1"
-msgstr "Jogador 3 Botão 1"
-
-#: src/emu/inpttype.ipp:234
-msgctxt "input-name"
-msgid "P3 Button 2"
-msgstr "Jogador 3 Botão 2"
-
-#: src/emu/inpttype.ipp:235
-msgctxt "input-name"
-msgid "P3 Button 3"
-msgstr "Jogador 3 Botão 3"
-
-#: src/emu/inpttype.ipp:236
-msgctxt "input-name"
-msgid "P3 Button 4"
-msgstr "Jogador 3 Botão 4"
-
-#: src/emu/inpttype.ipp:237
-msgctxt "input-name"
-msgid "P3 Button 5"
-msgstr "Jogador 3 Botão 5"
-
-#: src/emu/inpttype.ipp:238
-msgctxt "input-name"
-msgid "P3 Button 6"
-msgstr "Jogador 3 Botão 6"
-
-#: src/emu/inpttype.ipp:239
-msgctxt "input-name"
-msgid "P3 Button 7"
-msgstr "Jogador 3 Botão 7"
-
-#: src/emu/inpttype.ipp:240
-msgctxt "input-name"
-msgid "P3 Button 8"
-msgstr "Jogador 3 Botão 8"
-
-#: src/emu/inpttype.ipp:241
-msgctxt "input-name"
-msgid "P3 Button 9"
-msgstr "Jogador 3 Botão 9"
-
-#: src/emu/inpttype.ipp:242
-msgctxt "input-name"
-msgid "P3 Button 10"
-msgstr "Jogador 3 Botão 10"
-
-#: src/emu/inpttype.ipp:243
-msgctxt "input-name"
-msgid "P3 Button 11"
-msgstr "Jogador 3 Botão 11"
-
-#: src/emu/inpttype.ipp:244
-msgctxt "input-name"
-msgid "P3 Button 12"
-msgstr "Jogador 3 Botão 12"
-
-#: src/emu/inpttype.ipp:245
-msgctxt "input-name"
-msgid "P3 Button 13"
-msgstr "Jogador 3 Botão 13"
-
-#: src/emu/inpttype.ipp:246
-msgctxt "input-name"
-msgid "P3 Button 14"
-msgstr "Jogador 3 Botão 14"
-
-#: src/emu/inpttype.ipp:247
-msgctxt "input-name"
-msgid "P3 Button 15"
-msgstr "Jogador 3 Botão 15"
-
-#: src/emu/inpttype.ipp:248
-msgctxt "input-name"
-msgid "P3 Button 16"
-msgstr "Jogador 3 Botão 16"
-
-#: src/emu/inpttype.ipp:249
-msgctxt "input-name"
-msgid "P3 Start"
-msgstr "Jogador 3 Start"
-
-#: src/emu/inpttype.ipp:250
-msgctxt "input-name"
-msgid "P3 Select"
-msgstr "Selecionar Jogador 3"
-
-#: src/emu/inpttype.ipp:255
-msgctxt "input-name"
-msgid "P4 Up"
-msgstr "Jogador 4 Pra Cima"
-
-#: src/emu/inpttype.ipp:256
-msgctxt "input-name"
-msgid "P4 Down"
-msgstr "Jogador 4 Pra Baixo"
-
-#: src/emu/inpttype.ipp:257
-msgctxt "input-name"
-msgid "P4 Left"
-msgstr "Jogador 4 Esquerdo"
-
-#: src/emu/inpttype.ipp:258
-msgctxt "input-name"
-msgid "P4 Right"
-msgstr "Jogador 4 Direito"
-
-#: src/emu/inpttype.ipp:259
-msgctxt "input-name"
-msgid "P4 Right Stick/Up"
-msgstr "Jogador 4 Direcional Direito/Pra Cima"
-
-#: src/emu/inpttype.ipp:260
-msgctxt "input-name"
-msgid "P4 Right Stick/Down"
-msgstr "Jogador 4 Direcional Direito/Pra Baixo"
-
-#: src/emu/inpttype.ipp:261
-msgctxt "input-name"
-msgid "P4 Right Stick/Left"
-msgstr "Jogador 4 Direcional Direito/Esquerdo"
-
-#: src/emu/inpttype.ipp:262
-msgctxt "input-name"
-msgid "P4 Right Stick/Right"
-msgstr "Jogador 4 Direcional Direito/Direito"
-
-#: src/emu/inpttype.ipp:263
-msgctxt "input-name"
-msgid "P4 Left Stick/Up"
-msgstr "Jogador 4 Direcional Esquerdo/Pra Cima"
-
-#: src/emu/inpttype.ipp:264
-msgctxt "input-name"
-msgid "P4 Left Stick/Down"
-msgstr "Jogador 4 Direcional Esquerdo/Pra Baixo"
-
-#: src/emu/inpttype.ipp:265
-msgctxt "input-name"
-msgid "P4 Left Stick/Left"
-msgstr "Jogador 4 Direcional Esquerdo/Esquerdo"
-
-#: src/emu/inpttype.ipp:266
-msgctxt "input-name"
-msgid "P4 Left Stick/Right"
-msgstr "Jogador 4 Direcional Esquerdo/Direito"
-
-#: src/emu/inpttype.ipp:267
-msgctxt "input-name"
-msgid "P4 Button 1"
-msgstr "Jogador 4 Botão 1"
-
-#: src/emu/inpttype.ipp:268
-msgctxt "input-name"
-msgid "P4 Button 2"
-msgstr "Jogador 4 Botão 2"
-
-#: src/emu/inpttype.ipp:269
-msgctxt "input-name"
-msgid "P4 Button 3"
-msgstr "Jogador 4 Botão 3"
-
-#: src/emu/inpttype.ipp:270
-msgctxt "input-name"
-msgid "P4 Button 4"
-msgstr "Jogador 4 Botão 4"
-
-#: src/emu/inpttype.ipp:271
-msgctxt "input-name"
-msgid "P4 Button 5"
-msgstr "Jogador 4 Botão 5"
-
-#: src/emu/inpttype.ipp:272
-msgctxt "input-name"
-msgid "P4 Button 6"
-msgstr "Jogador 4 Botão 6"
-
-#: src/emu/inpttype.ipp:273
-msgctxt "input-name"
-msgid "P4 Button 7"
-msgstr "Jogador 4 Botão 7"
-
-#: src/emu/inpttype.ipp:274
-msgctxt "input-name"
-msgid "P4 Button 8"
-msgstr "Jogador 4 Botão 8"
-
-#: src/emu/inpttype.ipp:275
-msgctxt "input-name"
-msgid "P4 Button 9"
-msgstr "Jogador 4 Botão 9"
-
-#: src/emu/inpttype.ipp:276
-msgctxt "input-name"
-msgid "P4 Button 10"
-msgstr "Jogador 4 Botão 10"
-
-#: src/emu/inpttype.ipp:277
-msgctxt "input-name"
-msgid "P4 Button 11"
-msgstr "Jogador 4 Botão 11"
-
-#: src/emu/inpttype.ipp:278
-msgctxt "input-name"
-msgid "P4 Button 12"
-msgstr "Jogador 4 Botão 12"
-
-#: src/emu/inpttype.ipp:279
-msgctxt "input-name"
-msgid "P4 Button 13"
-msgstr "Jogador 4 Botão 13"
-
-#: src/emu/inpttype.ipp:280
-msgctxt "input-name"
-msgid "P4 Button 14"
-msgstr "Jogador 4 Botão 14"
-
-#: src/emu/inpttype.ipp:281
-msgctxt "input-name"
-msgid "P4 Button 15"
-msgstr "Jogador 4 Botão 15"
-
-#: src/emu/inpttype.ipp:282
-msgctxt "input-name"
-msgid "P4 Button 16"
-msgstr "Jogador 4 Botão 16"
-
-#: src/emu/inpttype.ipp:283
-msgctxt "input-name"
-msgid "P4 Start"
-msgstr "Jogador 4 Start"
-
-#: src/emu/inpttype.ipp:284
-msgctxt "input-name"
-msgid "P4 Select"
-msgstr "Selecionar Jogador 4"
-
-#: src/emu/inpttype.ipp:289
-msgctxt "input-name"
-msgid "P5 Up"
-msgstr "Jogador 5 Pra Cima"
-
-#: src/emu/inpttype.ipp:290
-msgctxt "input-name"
-msgid "P5 Down"
-msgstr "Jogador 5 Pra Baixo"
-
-#: src/emu/inpttype.ipp:291
-msgctxt "input-name"
-msgid "P5 Left"
-msgstr "Jogador 5 Esquerdo"
-
-#: src/emu/inpttype.ipp:292
-msgctxt "input-name"
-msgid "P5 Right"
-msgstr "Jogador 5 Direito"
-
-#: src/emu/inpttype.ipp:293
-msgctxt "input-name"
-msgid "P5 Right Stick/Up"
-msgstr "Jogador 5 Direcional Direito/Pra Cima"
-
-#: src/emu/inpttype.ipp:294
-msgctxt "input-name"
-msgid "P5 Right Stick/Down"
-msgstr "Jogador 5 Direcional Direito/Pra Baixo"
-
-#: src/emu/inpttype.ipp:295
-msgctxt "input-name"
-msgid "P5 Right Stick/Left"
-msgstr "Jogador 5 Direcional Direito/Esquerdo"
-
-#: src/emu/inpttype.ipp:296
-msgctxt "input-name"
-msgid "P5 Right Stick/Right"
-msgstr "Jogador 5 Direcional Direito/Direito"
-
-#: src/emu/inpttype.ipp:297
-msgctxt "input-name"
-msgid "P5 Left Stick/Up"
-msgstr "Jogador 5 Direcional Esquerdo/Pra Cima"
-
-#: src/emu/inpttype.ipp:298
-msgctxt "input-name"
-msgid "P5 Left Stick/Down"
-msgstr "Jogador 5 Direcional Esquerdo/Pra Baixo"
-
-#: src/emu/inpttype.ipp:299
-msgctxt "input-name"
-msgid "P5 Left Stick/Left"
-msgstr "Jogador 5 Direcional Esquerdo/Esquerdo"
-
-#: src/emu/inpttype.ipp:300
-msgctxt "input-name"
-msgid "P5 Left Stick/Right"
-msgstr "Jogador 5 Direcional Esquerdo/Direito"
-
-#: src/emu/inpttype.ipp:301
-msgctxt "input-name"
-msgid "P5 Button 1"
-msgstr "Jogador 5 Botão 1"
-
-#: src/emu/inpttype.ipp:302
-msgctxt "input-name"
-msgid "P5 Button 2"
-msgstr "Jogador 5 Botão 2"
-
-#: src/emu/inpttype.ipp:303
-msgctxt "input-name"
-msgid "P5 Button 3"
-msgstr "Jogador 5 Botão 3"
-
-#: src/emu/inpttype.ipp:304
-msgctxt "input-name"
-msgid "P5 Button 4"
-msgstr "Jogador 5 Botão 4"
-
-#: src/emu/inpttype.ipp:305
-msgctxt "input-name"
-msgid "P5 Button 5"
-msgstr "Jogador 5 Botão 5"
-
-#: src/emu/inpttype.ipp:306
-msgctxt "input-name"
-msgid "P5 Button 6"
-msgstr "Jogador 5 Botão 6"
-
-#: src/emu/inpttype.ipp:307
-msgctxt "input-name"
-msgid "P5 Button 7"
-msgstr "Jogador 5 Botão 7"
-
-#: src/emu/inpttype.ipp:308
-msgctxt "input-name"
-msgid "P5 Button 8"
-msgstr "Jogador 5 Botão 8"
-
-#: src/emu/inpttype.ipp:309
-msgctxt "input-name"
-msgid "P5 Button 9"
-msgstr "Jogador 5 Botão 9"
-
-#: src/emu/inpttype.ipp:310
-msgctxt "input-name"
-msgid "P5 Button 10"
-msgstr "Jogador 5 Botão 10"
-
-#: src/emu/inpttype.ipp:311
-msgctxt "input-name"
-msgid "P5 Button 11"
-msgstr "Jogador 5 Botão 11"
-
-#: src/emu/inpttype.ipp:312
-msgctxt "input-name"
-msgid "P5 Button 12"
-msgstr "Jogador 5 Botão 12"
-
-#: src/emu/inpttype.ipp:313
-msgctxt "input-name"
-msgid "P5 Button 13"
-msgstr "Jogador 5 Botão 13"
-
-#: src/emu/inpttype.ipp:314
-msgctxt "input-name"
-msgid "P5 Button 14"
-msgstr "Jogador 5 Botão 14"
-
-#: src/emu/inpttype.ipp:315
-msgctxt "input-name"
-msgid "P5 Button 15"
-msgstr "Jogador 5 Botão 15"
-
-#: src/emu/inpttype.ipp:316
-msgctxt "input-name"
-msgid "P5 Button 16"
-msgstr "Jogador 5 Botão 16"
-
-#: src/emu/inpttype.ipp:317
-msgctxt "input-name"
-msgid "P5 Start"
-msgstr "Jogador 5 Start"
-
-#: src/emu/inpttype.ipp:318
-msgctxt "input-name"
-msgid "P5 Select"
-msgstr "Selecionar Jogador 5"
-
-#: src/emu/inpttype.ipp:323
-msgctxt "input-name"
-msgid "P6 Up"
-msgstr "Jogador 6 Pra Cima"
-
-#: src/emu/inpttype.ipp:324
-msgctxt "input-name"
-msgid "P6 Down"
-msgstr "Jogador 6 Pra Baixo"
-
-#: src/emu/inpttype.ipp:325
-msgctxt "input-name"
-msgid "P6 Left"
-msgstr "Jogador 6 Esquerdo"
-
-#: src/emu/inpttype.ipp:326
-msgctxt "input-name"
-msgid "P6 Right"
-msgstr "Jogador 6 Direito"
-
-#: src/emu/inpttype.ipp:327
-msgctxt "input-name"
-msgid "P6 Right Stick/Up"
-msgstr "Jogador 6 Direcional Direito/Pra Cima"
-
-#: src/emu/inpttype.ipp:328
-msgctxt "input-name"
-msgid "P6 Right Stick/Down"
-msgstr "Jogador 6 Direcional Direito/Pra Baixo"
-
-#: src/emu/inpttype.ipp:329
-msgctxt "input-name"
-msgid "P6 Right Stick/Left"
-msgstr "Jogador 6 Direcional Direito/Esquerdo"
-
-#: src/emu/inpttype.ipp:330
-msgctxt "input-name"
-msgid "P6 Right Stick/Right"
-msgstr "Jogador 6 Direcional Direito/Direito"
-
-#: src/emu/inpttype.ipp:331
-msgctxt "input-name"
-msgid "P6 Left Stick/Up"
-msgstr "Jogador 6 Direcional Esquerdo/Pra Cima"
-
-#: src/emu/inpttype.ipp:332
-msgctxt "input-name"
-msgid "P6 Left Stick/Down"
-msgstr "Jogador 6 Direcional Esquerdo/Pra Baixo"
-
-#: src/emu/inpttype.ipp:333
-msgctxt "input-name"
-msgid "P6 Left Stick/Left"
-msgstr "Jogador 6 Direcional Esquerdo/Esquerdo"
-
-#: src/emu/inpttype.ipp:334
-msgctxt "input-name"
-msgid "P6 Left Stick/Right"
-msgstr "Jogador 6 Direcional Esquerdo/Direito"
-
-#: src/emu/inpttype.ipp:335
-msgctxt "input-name"
-msgid "P6 Button 1"
-msgstr "Jogador 6 Botão 1"
-
-#: src/emu/inpttype.ipp:336
-msgctxt "input-name"
-msgid "P6 Button 2"
-msgstr "Jogador 6 Botão 2"
-
-#: src/emu/inpttype.ipp:337
-msgctxt "input-name"
-msgid "P6 Button 3"
-msgstr "Jogador 6 Botão 3"
-
-#: src/emu/inpttype.ipp:338
-msgctxt "input-name"
-msgid "P6 Button 4"
-msgstr "Jogador 6 Botão 4"
-
-#: src/emu/inpttype.ipp:339
-msgctxt "input-name"
-msgid "P6 Button 5"
-msgstr "Jogador 6 Botão 5"
-
-#: src/emu/inpttype.ipp:340
-msgctxt "input-name"
-msgid "P6 Button 6"
-msgstr "Jogador 6 Botão 6"
-
-#: src/emu/inpttype.ipp:341
-msgctxt "input-name"
-msgid "P6 Button 7"
-msgstr "Jogador 6 Botão 7"
-
-#: src/emu/inpttype.ipp:342
-msgctxt "input-name"
-msgid "P6 Button 8"
-msgstr "Jogador 6 Botão 8"
-
-#: src/emu/inpttype.ipp:343
-msgctxt "input-name"
-msgid "P6 Button 9"
-msgstr "Jogador 6 Botão 9"
-
-#: src/emu/inpttype.ipp:344
-msgctxt "input-name"
-msgid "P6 Button 10"
-msgstr "Jogador 6 Botão 10"
-
-#: src/emu/inpttype.ipp:345
-msgctxt "input-name"
-msgid "P6 Button 11"
-msgstr "Jogador 6 Botão 11"
-
-#: src/emu/inpttype.ipp:346
-msgctxt "input-name"
-msgid "P6 Button 12"
-msgstr "Jogador 6 Botão 12"
-
-#: src/emu/inpttype.ipp:347
-msgctxt "input-name"
-msgid "P6 Button 13"
-msgstr "Jogador 6 Botão 13"
-
-#: src/emu/inpttype.ipp:348
-msgctxt "input-name"
-msgid "P6 Button 14"
-msgstr "Jogador 6 Botão 14"
-
-#: src/emu/inpttype.ipp:349
-msgctxt "input-name"
-msgid "P6 Button 15"
-msgstr "Jogador 6 Botão 15"
-
-#: src/emu/inpttype.ipp:350
-msgctxt "input-name"
-msgid "P6 Button 16"
-msgstr "Jogador 6 Botão 16"
-
-#: src/emu/inpttype.ipp:351
-msgctxt "input-name"
-msgid "P6 Start"
-msgstr "Jogador 6 Start"
-
-#: src/emu/inpttype.ipp:352
-msgctxt "input-name"
-msgid "P6 Select"
-msgstr "Selecionar Jogador 6"
-
-#: src/emu/inpttype.ipp:357
-msgctxt "input-name"
-msgid "P7 Up"
-msgstr "Jogador 7 Pra Cima"
-
-#: src/emu/inpttype.ipp:358
-msgctxt "input-name"
-msgid "P7 Down"
-msgstr "Jogador 7 Pra Baixo"
-
-#: src/emu/inpttype.ipp:359
-msgctxt "input-name"
-msgid "P7 Left"
-msgstr "Jogador 7 Esquerdo"
-
-#: src/emu/inpttype.ipp:360
-msgctxt "input-name"
-msgid "P7 Right"
-msgstr "Jogador 7 Direito"
-
-#: src/emu/inpttype.ipp:361
-msgctxt "input-name"
-msgid "P7 Right Stick/Up"
-msgstr "Jogador 7 Direcional Direito/Pra Cima"
-
-#: src/emu/inpttype.ipp:362
-msgctxt "input-name"
-msgid "P7 Right Stick/Down"
-msgstr "Jogador 7 Direcional Direito/Pra Baixo"
-
-#: src/emu/inpttype.ipp:363
-msgctxt "input-name"
-msgid "P7 Right Stick/Left"
-msgstr "Jogador 7 Direcional Direito/Esquerdo"
-
-#: src/emu/inpttype.ipp:364
-msgctxt "input-name"
-msgid "P7 Right Stick/Right"
-msgstr "Jogador 7 Direcional Direito/Direito"
-
-#: src/emu/inpttype.ipp:365
-msgctxt "input-name"
-msgid "P7 Left Stick/Up"
-msgstr "Jogador 7 Direcional Esquerdo/Pra Cima"
-
-#: src/emu/inpttype.ipp:366
-msgctxt "input-name"
-msgid "P7 Left Stick/Down"
-msgstr "Jogador 7 Direcional Esquerdo/Pra Baixo"
-
-#: src/emu/inpttype.ipp:367
-msgctxt "input-name"
-msgid "P7 Left Stick/Left"
-msgstr "Jogador 7 Direcional Esquerdo/Esquerdo"
-
-#: src/emu/inpttype.ipp:368
-msgctxt "input-name"
-msgid "P7 Left Stick/Right"
-msgstr "Jogador 7 Direcional Esquerdo/Direito"
-
-#: src/emu/inpttype.ipp:369
-msgctxt "input-name"
-msgid "P7 Button 1"
-msgstr "Jogador 7 Botão 1"
-
-#: src/emu/inpttype.ipp:370
-msgctxt "input-name"
-msgid "P7 Button 2"
-msgstr "Jogador 7 Botão 2"
-
-#: src/emu/inpttype.ipp:371
-msgctxt "input-name"
-msgid "P7 Button 3"
-msgstr "Jogador 7 Botão 3"
-
-#: src/emu/inpttype.ipp:372
-msgctxt "input-name"
-msgid "P7 Button 4"
-msgstr "Jogador 7 Botão 4"
-
-#: src/emu/inpttype.ipp:373
-msgctxt "input-name"
-msgid "P7 Button 5"
-msgstr "Jogador 7 Botão 5"
-
-#: src/emu/inpttype.ipp:374
-msgctxt "input-name"
-msgid "P7 Button 6"
-msgstr "Jogador 7 Botão 6"
-
-#: src/emu/inpttype.ipp:375
-msgctxt "input-name"
-msgid "P7 Button 7"
-msgstr "Jogador 7 Botão 7"
-
-#: src/emu/inpttype.ipp:376
-msgctxt "input-name"
-msgid "P7 Button 8"
-msgstr "Jogador 7 Botão 8"
-
-#: src/emu/inpttype.ipp:377
-msgctxt "input-name"
-msgid "P7 Button 9"
-msgstr "Jogador 7 Botão 9"
-
-#: src/emu/inpttype.ipp:378
-msgctxt "input-name"
-msgid "P7 Button 10"
-msgstr "Jogador 7 Botão 10"
-
-#: src/emu/inpttype.ipp:379
-msgctxt "input-name"
-msgid "P7 Button 11"
-msgstr "Jogador 7 Botão 11"
-
-#: src/emu/inpttype.ipp:380
-msgctxt "input-name"
-msgid "P7 Button 12"
-msgstr "Jogador 7 Botão 12"
-
-#: src/emu/inpttype.ipp:381
-msgctxt "input-name"
-msgid "P7 Button 13"
-msgstr "Jogador 7 Botão 13"
-
-#: src/emu/inpttype.ipp:382
-msgctxt "input-name"
-msgid "P7 Button 14"
-msgstr "Jogador 7 Botão 14"
-
-#: src/emu/inpttype.ipp:383
-msgctxt "input-name"
-msgid "P7 Button 15"
-msgstr "Jogador 7 Botão 15"
-
-#: src/emu/inpttype.ipp:384
-msgctxt "input-name"
-msgid "P7 Button 16"
-msgstr "Jogador 7 Botão 16"
-
-#: src/emu/inpttype.ipp:385
-msgctxt "input-name"
-msgid "P7 Start"
-msgstr "Jogador 7 Start"
-
-#: src/emu/inpttype.ipp:386
-msgctxt "input-name"
-msgid "P7 Select"
-msgstr "Selecionar Jogador 7"
-
-#: src/emu/inpttype.ipp:391
-msgctxt "input-name"
-msgid "P8 Up"
-msgstr "Jogador 8 Pra Cima"
-
-#: src/emu/inpttype.ipp:392
-msgctxt "input-name"
-msgid "P8 Down"
-msgstr "Jogador 8 Pra Baixo"
-
-#: src/emu/inpttype.ipp:393
-msgctxt "input-name"
-msgid "P8 Left"
-msgstr "Jogador 8 Esquerdo"
-
-#: src/emu/inpttype.ipp:394
-msgctxt "input-name"
-msgid "P8 Right"
-msgstr "Jogador 8 Direito"
-
-#: src/emu/inpttype.ipp:395
-msgctxt "input-name"
-msgid "P8 Right Stick/Up"
-msgstr "Jogador 8 Direcional Direito/Pra Cima"
-
-#: src/emu/inpttype.ipp:396
-msgctxt "input-name"
-msgid "P8 Right Stick/Down"
-msgstr "Jogador 8 Direcional Direito/Pra Baixo"
-
-#: src/emu/inpttype.ipp:397
-msgctxt "input-name"
-msgid "P8 Right Stick/Left"
-msgstr "Jogador 8 Direcional Direito/Esquerdo"
-
-#: src/emu/inpttype.ipp:398
-msgctxt "input-name"
-msgid "P8 Right Stick/Right"
-msgstr "Jogador 8 Direcional Direito/Direito"
-
-#: src/emu/inpttype.ipp:399
-msgctxt "input-name"
-msgid "P8 Left Stick/Up"
-msgstr "Jogador 8 Direcional Esquerdo/Pra Cima"
-
-#: src/emu/inpttype.ipp:400
-msgctxt "input-name"
-msgid "P8 Left Stick/Down"
-msgstr "Jogador 8 Direcional Esquerdo/Pra Baixo"
-
-#: src/emu/inpttype.ipp:401
-msgctxt "input-name"
-msgid "P8 Left Stick/Left"
-msgstr "Jogador 8 Direcional Esquerdo/Esquerdo"
-
-#: src/emu/inpttype.ipp:402
-msgctxt "input-name"
-msgid "P8 Left Stick/Right"
-msgstr "Jogador 8 Direcional Esquerdo/Direito"
-
-#: src/emu/inpttype.ipp:403
-msgctxt "input-name"
-msgid "P8 Button 1"
-msgstr "Jogador 8 Botão 1"
-
-#: src/emu/inpttype.ipp:404
-msgctxt "input-name"
-msgid "P8 Button 2"
-msgstr "Jogador 8 Botão 2"
-
-#: src/emu/inpttype.ipp:405
-msgctxt "input-name"
-msgid "P8 Button 3"
-msgstr "Jogador 8 Botão 3"
-
-#: src/emu/inpttype.ipp:406
-msgctxt "input-name"
-msgid "P8 Button 4"
-msgstr "Jogador 8 Botão 4"
-
-#: src/emu/inpttype.ipp:407
-msgctxt "input-name"
-msgid "P8 Button 5"
-msgstr "Jogador 8 Botão 5"
-
-#: src/emu/inpttype.ipp:408
-msgctxt "input-name"
-msgid "P8 Button 6"
-msgstr "Jogador 8 Botão 6"
-
-#: src/emu/inpttype.ipp:409
-msgctxt "input-name"
-msgid "P8 Button 7"
-msgstr "Jogador 8 Botão 7"
-
-#: src/emu/inpttype.ipp:410
-msgctxt "input-name"
-msgid "P8 Button 8"
-msgstr "Jogador 8 Botão 8"
-
-#: src/emu/inpttype.ipp:411
-msgctxt "input-name"
-msgid "P8 Button 9"
-msgstr "Jogador 8 Botão 9"
-
-#: src/emu/inpttype.ipp:412
-msgctxt "input-name"
-msgid "P8 Button 10"
-msgstr "Jogador 8 Botão 10"
-
-#: src/emu/inpttype.ipp:413
-msgctxt "input-name"
-msgid "P8 Button 11"
-msgstr "Jogador 8 Botão 11"
-
-#: src/emu/inpttype.ipp:414
-msgctxt "input-name"
-msgid "P8 Button 12"
-msgstr "Jogador 8 Botão 12"
-
-#: src/emu/inpttype.ipp:415
-msgctxt "input-name"
-msgid "P8 Button 13"
-msgstr "Jogador 8 Botão 13"
-
-#: src/emu/inpttype.ipp:416
-msgctxt "input-name"
-msgid "P8 Button 14"
-msgstr "Jogador 8 Botão 14"
-
-#: src/emu/inpttype.ipp:417
-msgctxt "input-name"
-msgid "P8 Button 15"
-msgstr "Jogador 8 Botão 15"
-
-#: src/emu/inpttype.ipp:418
-msgctxt "input-name"
-msgid "P8 Button 16"
-msgstr "Jogador 8 Botão 16"
-
-#: src/emu/inpttype.ipp:419
-msgctxt "input-name"
-msgid "P8 Start"
-msgstr "Jogador 8 Start"
-
-#: src/emu/inpttype.ipp:420
-msgctxt "input-name"
-msgid "P8 Select"
-msgstr "Selecionar Jogador 8"
-
-#: src/emu/inpttype.ipp:425
-msgctxt "input-name"
-msgid "P9 Up"
-msgstr "Jogador 9 Pra Cima"
-
-#: src/emu/inpttype.ipp:426
-msgctxt "input-name"
-msgid "P9 Down"
-msgstr "Jogador 9 Pra Baixo"
-
-#: src/emu/inpttype.ipp:427
-msgctxt "input-name"
-msgid "P9 Left"
-msgstr "Jogador 9 Esquerdo"
-
-#: src/emu/inpttype.ipp:428
-msgctxt "input-name"
-msgid "P9 Right"
-msgstr "Jogador 9 Direito"
-
-#: src/emu/inpttype.ipp:429
-msgctxt "input-name"
-msgid "P9 Right Stick/Up"
-msgstr "Jogador 9 Direcional Direito/Pra Cima"
-
-#: src/emu/inpttype.ipp:430
-msgctxt "input-name"
-msgid "P9 Right Stick/Down"
-msgstr "Jogador 9 Direcional Direito/Pra Baixo"
-
-#: src/emu/inpttype.ipp:431
-msgctxt "input-name"
-msgid "P9 Right Stick/Left"
-msgstr "Jogador 9 Direcional Direito/Esquerdo"
-
-#: src/emu/inpttype.ipp:432
-msgctxt "input-name"
-msgid "P9 Right Stick/Right"
-msgstr "Jogador 9 Direcional Direito/Direito"
-
-#: src/emu/inpttype.ipp:433
-msgctxt "input-name"
-msgid "P9 Left Stick/Up"
-msgstr "Jogador 9 Direcional Esquerdo/Pra Cima"
-
-#: src/emu/inpttype.ipp:434
-msgctxt "input-name"
-msgid "P9 Left Stick/Down"
-msgstr "Jogador 9 Direcional Esquerdo/Pra Baixo"
-
-#: src/emu/inpttype.ipp:435
-msgctxt "input-name"
-msgid "P9 Left Stick/Left"
-msgstr "Jogador 9 Direcional Esquerdo/Esquerdo"
-
-#: src/emu/inpttype.ipp:436
-msgctxt "input-name"
-msgid "P9 Left Stick/Right"
-msgstr "Jogador 9 Direcional Esquerdo/Direito"
-
-#: src/emu/inpttype.ipp:437
-msgctxt "input-name"
-msgid "P9 Button 1"
-msgstr "Jogador 9 Botão 1"
-
-#: src/emu/inpttype.ipp:438
-msgctxt "input-name"
-msgid "P9 Button 2"
-msgstr "Jogador 9 Botão 2"
-
-#: src/emu/inpttype.ipp:439
-msgctxt "input-name"
-msgid "P9 Button 3"
-msgstr "Jogador 9 Botão 3"
-
-#: src/emu/inpttype.ipp:440
-msgctxt "input-name"
-msgid "P9 Button 4"
-msgstr "Jogador 9 Botão 4"
-
-#: src/emu/inpttype.ipp:441
-msgctxt "input-name"
-msgid "P9 Button 5"
-msgstr "Jogador 9 Botão 5"
-
-#: src/emu/inpttype.ipp:442
-msgctxt "input-name"
-msgid "P9 Button 6"
-msgstr "Jogador 9 Botão 6"
-
-#: src/emu/inpttype.ipp:443
-msgctxt "input-name"
-msgid "P9 Button 7"
-msgstr "Jogador 9 Botão 7"
-
-#: src/emu/inpttype.ipp:444
-msgctxt "input-name"
-msgid "P9 Button 8"
-msgstr "Jogador 9 Botão 8"
-
-#: src/emu/inpttype.ipp:445
-msgctxt "input-name"
-msgid "P9 Button 9"
-msgstr "Jogador 9 Botão 9"
-
-#: src/emu/inpttype.ipp:446
-msgctxt "input-name"
-msgid "P9 Button 10"
-msgstr "Jogador 9 Botão 10"
-
-#: src/emu/inpttype.ipp:447
-msgctxt "input-name"
-msgid "P9 Button 11"
-msgstr "Jogador 9 Botão 11"
-
-#: src/emu/inpttype.ipp:448
-msgctxt "input-name"
-msgid "P9 Button 12"
-msgstr "Jogador 9 Botão 12"
-
-#: src/emu/inpttype.ipp:449
-msgctxt "input-name"
-msgid "P9 Button 13"
-msgstr "Jogador 9 Botão 13"
-
-#: src/emu/inpttype.ipp:450
-msgctxt "input-name"
-msgid "P9 Button 14"
-msgstr "Jogador 9 Botão 14"
-
-#: src/emu/inpttype.ipp:451
-msgctxt "input-name"
-msgid "P9 Button 15"
-msgstr "Jogador 9 Botão 15"
-
-#: src/emu/inpttype.ipp:452
-msgctxt "input-name"
-msgid "P9 Button 16"
-msgstr "Jogador 9 Botão 16"
-
-#: src/emu/inpttype.ipp:453
-msgctxt "input-name"
-msgid "P9 Start"
-msgstr "Jogador 9 Start"
-
-#: src/emu/inpttype.ipp:454
-msgctxt "input-name"
-msgid "P9 Select"
-msgstr "Selecionar Jogador 9"
-
-#: src/emu/inpttype.ipp:459
-msgctxt "input-name"
-msgid "P10 Up"
-msgstr "Jogador 10 Pra Cima"
-
-#: src/emu/inpttype.ipp:460
-msgctxt "input-name"
-msgid "P10 Down"
-msgstr "Jogador 10 Pra Baixo"
-
-#: src/emu/inpttype.ipp:461
-msgctxt "input-name"
-msgid "P10 Left"
-msgstr "Jogador 10 Esquerdo"
-
-#: src/emu/inpttype.ipp:462
-msgctxt "input-name"
-msgid "P10 Right"
-msgstr "Jogador 10 Direito"
-
-#: src/emu/inpttype.ipp:463
-msgctxt "input-name"
-msgid "P10 Right Stick/Up"
-msgstr "Jogador 10 Direcional Direito/Pra Cima"
-
-#: src/emu/inpttype.ipp:464
-msgctxt "input-name"
-msgid "P10 Right Stick/Down"
-msgstr "Jogador 10 Direcional Direito/Pra Baixo"
-
-#: src/emu/inpttype.ipp:465
-msgctxt "input-name"
-msgid "P10 Right Stick/Left"
-msgstr "Jogador 10 Direcional Direito/Esquerdo"
-
-#: src/emu/inpttype.ipp:466
-msgctxt "input-name"
-msgid "P10 Right Stick/Right"
-msgstr "Jogador 10 Direcional Direito/Direito"
-
-#: src/emu/inpttype.ipp:467
-msgctxt "input-name"
-msgid "P10 Left Stick/Up"
-msgstr "Jogador 10 Direcional Esquerdo/Pra Cima"
-
-#: src/emu/inpttype.ipp:468
-msgctxt "input-name"
-msgid "P10 Left Stick/Down"
-msgstr "Jogador 10 Direcional Esquerdo/Pra Baixo"
-
-#: src/emu/inpttype.ipp:469
-msgctxt "input-name"
-msgid "P10 Left Stick/Left"
-msgstr "Jogador 10 Direcional Esquerdo/Esquerdo"
-
-#: src/emu/inpttype.ipp:470
-msgctxt "input-name"
-msgid "P10 Left Stick/Right"
-msgstr "Jogador 10 Direcional Esquerdo/Direito"
-
-#: src/emu/inpttype.ipp:471
-msgctxt "input-name"
-msgid "P10 Button 1"
-msgstr "Jogador 10 Botão 1"
-
-#: src/emu/inpttype.ipp:472
-msgctxt "input-name"
-msgid "P10 Button 2"
-msgstr "Jogador 10 Botão 2"
-
-#: src/emu/inpttype.ipp:473
-msgctxt "input-name"
-msgid "P10 Button 3"
-msgstr "Jogador 10 Botão 3"
-
-#: src/emu/inpttype.ipp:474
-msgctxt "input-name"
-msgid "P10 Button 4"
-msgstr "Jogador 10 Botão 4"
-
-#: src/emu/inpttype.ipp:475
-msgctxt "input-name"
-msgid "P10 Button 5"
-msgstr "Jogador 10 Botão 5"
-
-#: src/emu/inpttype.ipp:476
-msgctxt "input-name"
-msgid "P10 Button 6"
-msgstr "Jogador 10 Botão 6"
-
-#: src/emu/inpttype.ipp:477
-msgctxt "input-name"
-msgid "P10 Button 7"
-msgstr "Jogador 10 Botão 7"
-
-#: src/emu/inpttype.ipp:478
-msgctxt "input-name"
-msgid "P10 Button 8"
-msgstr "Jogador 10 Botão 8"
-
-#: src/emu/inpttype.ipp:479
-msgctxt "input-name"
-msgid "P10 Button 9"
-msgstr "Jogador 10 Botão 9"
-
-#: src/emu/inpttype.ipp:480
-msgctxt "input-name"
-msgid "P10 Button 10"
-msgstr "Jogador 10 Botão 10"
-
-#: src/emu/inpttype.ipp:481
-msgctxt "input-name"
-msgid "P10 Button 11"
-msgstr "Jogador 10 Botão 11"
-
-#: src/emu/inpttype.ipp:482
-msgctxt "input-name"
-msgid "P10 Button 12"
-msgstr "Jogador 10 Botão 12"
-
-#: src/emu/inpttype.ipp:483
-msgctxt "input-name"
-msgid "P10 Button 13"
-msgstr "Jogador 10 Botão 13"
-
-#: src/emu/inpttype.ipp:484
-msgctxt "input-name"
-msgid "P10 Button 14"
-msgstr "Jogador 10 Botão 14"
-
-#: src/emu/inpttype.ipp:485
-msgctxt "input-name"
-msgid "P10 Button 15"
-msgstr "Jogador 10 Botão 15"
-
-#: src/emu/inpttype.ipp:486
-msgctxt "input-name"
-msgid "P10 Button 16"
-msgstr "Jogador 10 Botão 16"
-
-#: src/emu/inpttype.ipp:487
-msgctxt "input-name"
-msgid "P10 Start"
-msgstr "Jogador 10 Start"
-
-#: src/emu/inpttype.ipp:488
-msgctxt "input-name"
-msgid "P10 Select"
-msgstr "Selecionar Jogador 10"
-
 #: src/emu/inpttype.ipp:493
 msgctxt "input-name"
 msgid "1 Player Start"
@@ -5586,155 +4211,32 @@ msgctxt "input-name"
 msgid "Volume Up"
 msgstr "Aumentar Volume"
 
-#: src/emu/inpttype.ipp:550
-msgctxt "input-name"
-msgid "P1 Pedal 1"
-msgstr "Jogador 1 Pedal 1"
-
-#: src/emu/inpttype.ipp:551
-msgctxt "input-name"
-msgid "P2 Pedal 1"
-msgstr "Jogador 2 Pedal 1"
-
-#: src/emu/inpttype.ipp:552
-msgctxt "input-name"
-msgid "P3 Pedal 1"
-msgstr "Jogador 3 Pedal 1"
-
-#: src/emu/inpttype.ipp:553
-msgctxt "input-name"
-msgid "P4 Pedal 1"
-msgstr "Jogador 4 Pedal 1"
-
-#: src/emu/inpttype.ipp:554
-msgctxt "input-name"
-msgid "P5 Pedal 1"
-msgstr "Jogador 5 Pedal 1"
-
-#: src/emu/inpttype.ipp:555
-msgctxt "input-name"
-msgid "P6 Pedal 1"
-msgstr "Jogador 6 Pedal 1"
-
-#: src/emu/inpttype.ipp:556
-msgctxt "input-name"
-msgid "P7 Pedal 1"
-msgstr "Jogador 7 Pedal 1"
-
-#: src/emu/inpttype.ipp:557
-msgctxt "input-name"
-msgid "P8 Pedal 1"
-msgstr "Jogador 8 Pedal 1"
-
-#: src/emu/inpttype.ipp:558
-msgctxt "input-name"
-msgid "P9 Pedal 1"
-msgstr "Jogador 9 Pedal 1"
-
+#: src/emu/inpttype.ipp:550 src/emu/inpttype.ipp:551 src/emu/inpttype.ipp:552
+#: src/emu/inpttype.ipp:553 src/emu/inpttype.ipp:554 src/emu/inpttype.ipp:555
+#: src/emu/inpttype.ipp:556 src/emu/inpttype.ipp:557 src/emu/inpttype.ipp:558
 #: src/emu/inpttype.ipp:559
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 1"
-msgstr "Jogador 10 Pedal 1"
-
-#: src/emu/inpttype.ipp:564
-msgctxt "input-name"
-msgid "P1 Pedal 2"
-msgstr "Jogador 1 Pedal 2"
-
-#: src/emu/inpttype.ipp:565
-msgctxt "input-name"
-msgid "P2 Pedal 2"
-msgstr "Jogador 2 Pedal 2"
-
-#: src/emu/inpttype.ipp:566
-msgctxt "input-name"
-msgid "P3 Pedal 2"
-msgstr "Jogador 3 Pedal 2"
-
-#: src/emu/inpttype.ipp:567
-msgctxt "input-name"
-msgid "P4 Pedal 2"
-msgstr "Jogador 4 Pedal 2"
-
-#: src/emu/inpttype.ipp:568
-msgctxt "input-name"
-msgid "P5 Pedal 2"
-msgstr "Jogador 5 Pedal 2"
-
-#: src/emu/inpttype.ipp:569
-msgctxt "input-name"
-msgid "P6 Pedal 2"
-msgstr "Jogador 6 Pedal 2"
-
-#: src/emu/inpttype.ipp:570
-msgctxt "input-name"
-msgid "P7 Pedal 2"
-msgstr "Jogador 7 Pedal 2"
-
-#: src/emu/inpttype.ipp:571
-msgctxt "input-name"
-msgid "P8 Pedal 2"
-msgstr "Jogador 8 Pedal 2"
-
-#: src/emu/inpttype.ipp:572
-msgctxt "input-name"
-msgid "P9 Pedal 2"
-msgstr "Jogador 9 Pedal 2"
+msgid "%p Pedal 1"
+msgstr "%p Pedal 1"
 
+#: src/emu/inpttype.ipp:564 src/emu/inpttype.ipp:565 src/emu/inpttype.ipp:566
+#: src/emu/inpttype.ipp:567 src/emu/inpttype.ipp:568 src/emu/inpttype.ipp:569
+#: src/emu/inpttype.ipp:570 src/emu/inpttype.ipp:571 src/emu/inpttype.ipp:572
 #: src/emu/inpttype.ipp:573
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 2"
-msgstr "Jogador 10 Pedal 2"
-
-#: src/emu/inpttype.ipp:578
-msgctxt "input-name"
-msgid "P1 Pedal 3"
-msgstr "Jogador 1 Pedal 3"
-
-#: src/emu/inpttype.ipp:579
-msgctxt "input-name"
-msgid "P2 Pedal 3"
-msgstr "Jogador 2 Pedal 3"
-
-#: src/emu/inpttype.ipp:580
-msgctxt "input-name"
-msgid "P3 Pedal 3"
-msgstr "Jogador 3 Pedal 3"
-
-#: src/emu/inpttype.ipp:581
-msgctxt "input-name"
-msgid "P4 Pedal 3"
-msgstr "Jogador 4 Pedal 3"
-
-#: src/emu/inpttype.ipp:582
-msgctxt "input-name"
-msgid "P5 Pedal 3"
-msgstr "Jogador 5 Pedal 3"
-
-#: src/emu/inpttype.ipp:583
-msgctxt "input-name"
-msgid "P6 Pedal 3"
-msgstr "Jogador 6 Pedal 3"
-
-#: src/emu/inpttype.ipp:584
-msgctxt "input-name"
-msgid "P7 Pedal 3"
-msgstr "Jogador 7 Pedal 3"
-
-#: src/emu/inpttype.ipp:585
-msgctxt "input-name"
-msgid "P8 Pedal 3"
-msgstr "Jogador 8 Pedal 3"
-
-#: src/emu/inpttype.ipp:586
-msgctxt "input-name"
-msgid "P9 Pedal 3"
-msgstr "Jogador 9 Pedal 3"
+msgid "%p Pedal 2"
+msgstr "%p Pedal 2"
 
+#: src/emu/inpttype.ipp:578 src/emu/inpttype.ipp:579 src/emu/inpttype.ipp:580
+#: src/emu/inpttype.ipp:581 src/emu/inpttype.ipp:582 src/emu/inpttype.ipp:583
+#: src/emu/inpttype.ipp:584 src/emu/inpttype.ipp:585 src/emu/inpttype.ipp:586
 #: src/emu/inpttype.ipp:587
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 3"
-msgstr "Jogador 10 Pedal 3"
+msgid "%p Pedal 3"
+msgstr "%p Pedal 3"
 
 #: src/emu/inpttype.ipp:592
 msgctxt "input-name"
@@ -7634,6 +6136,47 @@ msgstr ""
 "Insira a sequência ou pressione %s pra cancelar\n"
 "%s"
 
+#~ msgid "Confirm quit from machines"
+#~ msgstr "Confirmar a saída das máquinas"
+
+#~ msgid "Skip information screen at startup"
+#~ msgstr "Ignorar a tela de informações na inicialização"
+
+#~ msgid "Skip software parts selection menu"
+#~ msgstr "Ignorar o menu da seleção das partes do software"
+
+#~ msgid "Simultaneous contradictory"
+#~ msgstr "Contraditório simultâneo"
+
+#, c-format
+#~ msgid ""
+#~ "Auditing ROMs for machine %2$u of %3$u...\n"
+#~ "%1$s"
+#~ msgstr ""
+#~ "Auditando as ROMs para a máquina %2$u de %3$u...\n"
+#~ "%1$s"
+
+#, c-format
+#~ msgid "Audit ROMs for %1$u machines marked unavailable"
+#~ msgstr "Auditar as ROMS pras %1$u máquinas marcadas como indisponíveis"
+
+#, c-format
+#~ msgid "Audit ROMs for all %1$u machines"
+#~ msgstr "Auditar as ROMs pra todas as %1$u máquinas"
+
+#~ msgid "ROM Audit Result\tOK\n"
+#~ msgstr "Resultado da Auditoria da ROM\tOK\n"
+
+#~ msgid "ROM Audit Result\tBAD\n"
+#~ msgstr "Resultado da Auditoria da ROM\tRUIM\n"
+
+#~ msgid ""
+#~ "ROM Audit \tDisabled\n"
+#~ "Samples Audit \tDisabled\n"
+#~ msgstr ""
+#~ "Auditoria da ROM \tDesativada\n"
+#~ "Auditoria das Amostras \tDesativada\n"
+
 #~ msgid "Device Mapping"
 #~ msgstr "Mapeamento do dispositivo"
 
diff --git a/language/Romanian/strings.po b/language/Romanian/strings.po
index 2571cd5e859..a40f0c27369 100644
--- a/language/Romanian/strings.po
+++ b/language/Romanian/strings.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-19 02:50+1100\n"
+"POT-Creation-Date: 2021-12-09 04:44+1100\n"
 "PO-Revision-Date: 2016-02-20 18:03+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: MAME Language Team\n"
@@ -262,12 +262,12 @@ msgstr ""
 msgid "Driver: \"%1$s\" software list "
 msgstr ""
 
-#: src/frontend/mame/ui/selsoft.cpp:711 src/frontend/mame/ui/selgame.cpp:1066
+#: src/frontend/mame/ui/selsoft.cpp:711 src/frontend/mame/ui/selgame.cpp:1076
 #, c-format
 msgid "%1$s: %2$s - Search: %3$s_"
 msgstr ""
 
-#: src/frontend/mame/ui/selsoft.cpp:713 src/frontend/mame/ui/selgame.cpp:1068
+#: src/frontend/mame/ui/selsoft.cpp:713 src/frontend/mame/ui/selgame.cpp:1078
 #, c-format
 msgid "Search: %1$s_"
 msgstr ""
@@ -277,7 +277,7 @@ msgstr ""
 msgid "Software list/item: %1$s:%2$s"
 msgstr ""
 
-#: src/frontend/mame/ui/optsmenu.cpp:73 src/frontend/mame/ui/sndmenu.cpp:165
+#: src/frontend/mame/ui/optsmenu.cpp:73 src/frontend/mame/ui/sndmenu.cpp:161
 msgid "Sound Options"
 msgstr ""
 
@@ -372,11 +372,11 @@ msgid "Show mouse pointer"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:39
-msgid "Confirm quit from machines"
+msgid "Confirm quit from emulation"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:40
-msgid "Skip information screen at startup"
+msgid "Skip system information screen"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:41
@@ -392,7 +392,7 @@ msgid "Skip BIOS selection menu"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:44
-msgid "Skip software parts selection menu"
+msgid "Skip software part selection menu"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:45
@@ -544,7 +544,7 @@ msgid "UI active"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:91
-msgid "Offscreen reload"
+msgid "Off-screen reload"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:92
@@ -560,7 +560,7 @@ msgid "Natural keyboard"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:95
-msgid "Simultaneous contradictory"
+msgid "Allow contradictory joystick inputs"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:96
@@ -584,7 +584,7 @@ msgid "Pedal Device Assignment"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:106
-msgid "Adstick Device Assignment"
+msgid "AD Stick Device Assignment"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:107
@@ -671,14 +671,14 @@ msgstr ""
 msgid "Wait Vertical Sync"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:687
+#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:689
 #: src/frontend/mame/ui/videoopt.cpp:191 src/frontend/mame/ui/custui.cpp:490
 #: src/frontend/mame/ui/analogipt.cpp:471 plugins/cheatfind/init.lua:766
 #: plugins/cheatfind/init.lua:777 plugins/cheat/init.lua:668
 msgid "On"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:690
+#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:692
 #: src/frontend/mame/ui/videoopt.cpp:207 src/frontend/mame/ui/custui.cpp:490
 #: src/frontend/mame/ui/analogipt.cpp:471 plugins/cheatfind/init.lua:763
 #: plugins/cheatfind/init.lua:774 plugins/cheat/init.lua:671
@@ -686,11 +686,11 @@ msgstr ""
 msgid "Off"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:693
+#: src/frontend/mame/ui/menu.cpp:695
 msgid "Auto"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:1195
+#: src/frontend/mame/ui/menu.cpp:1197
 #: src/frontend/mame/ui/simpleselgame.cpp:278
 #: src/frontend/mame/ui/selmenu.cpp:1280
 msgid "Return to Previous Menu"
@@ -698,7 +698,7 @@ msgstr ""
 
 #: src/frontend/mame/ui/filemngr.cpp:139
 #: src/frontend/mame/ui/confswitch.cpp:119
-#: src/frontend/mame/ui/inputmap.cpp:559 src/frontend/mame/ui/analogipt.cpp:360
+#: src/frontend/mame/ui/inputmap.cpp:563 src/frontend/mame/ui/analogipt.cpp:360
 #, c-format
 msgid "[root%1$s]"
 msgstr ""
@@ -941,22 +941,22 @@ msgid ""
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "GHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "MHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "kHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "Hz"
 msgstr ""
 
@@ -980,38 +980,38 @@ msgstr ""
 msgid "Vector"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:480
+#: src/frontend/mame/ui/info.cpp:483
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:480
+#: src/frontend/mame/ui/info.cpp:483
 msgid "%2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:497
+#: src/frontend/mame/ui/info.cpp:500
 #, c-format
 msgid "Screen '%1$s'"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:499
+#: src/frontend/mame/ui/info.cpp:502
 msgid "Screen"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:570 src/frontend/mame/ui/info.cpp:581
+#: src/frontend/mame/ui/info.cpp:573 src/frontend/mame/ui/info.cpp:584
 #, c-format
 msgid "%1$s:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:662
+#: src/frontend/mame/ui/info.cpp:665
 msgid "Not supported"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:665
+#: src/frontend/mame/ui/info.cpp:668
 msgid "Partially supported"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:674
+#: src/frontend/mame/ui/info.cpp:677
 msgid "[empty]"
 msgstr ""
 
@@ -1084,7 +1084,7 @@ msgid "Emulated"
 msgstr ""
 
 #: src/frontend/mame/ui/keyboard.cpp:59 src/frontend/mame/ui/confswitch.cpp:117
-#: src/frontend/mame/ui/inputmap.cpp:557 src/frontend/mame/ui/analogipt.cpp:358
+#: src/frontend/mame/ui/inputmap.cpp:561 src/frontend/mame/ui/analogipt.cpp:358
 #, c-format
 msgid "%1$s [root%2$s]"
 msgstr ""
@@ -1444,7 +1444,7 @@ msgctxt "swlist-info"
 msgid "Software list/item"
 msgstr ""
 
-#: src/frontend/mame/ui/datmenu.cpp:88 src/frontend/mame/ui/selmenu.cpp:2698
+#: src/frontend/mame/ui/datmenu.cpp:88 src/frontend/mame/ui/selmenu.cpp:2707
 msgid "Software List Info"
 msgstr ""
 
@@ -1559,7 +1559,7 @@ msgstr ""
 msgid "Configure Machine:"
 msgstr ""
 
-#: src/frontend/mame/ui/miscmenu.cpp:858 src/frontend/mame/ui/selmenu.cpp:2638
+#: src/frontend/mame/ui/miscmenu.cpp:858 src/frontend/mame/ui/selmenu.cpp:2647
 msgid " (default)"
 msgstr ""
 
@@ -1576,7 +1576,7 @@ msgid ""
 "Press %2$s to return to emulation"
 msgstr ""
 
-#: src/frontend/mame/ui/info_pty.cpp:30 src/frontend/mame/ui/mainmenu.cpp:155
+#: src/frontend/mame/ui/info_pty.cpp:30
 msgid "Pseudo terminals"
 msgstr ""
 
@@ -1644,52 +1644,52 @@ msgstr ""
 msgid "Other Controls"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:227
+#: src/frontend/mame/ui/inputmap.cpp:231
 msgid "This machine has no configurable inputs."
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:327
+#: src/frontend/mame/ui/inputmap.cpp:331
 msgid "Pressed"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:397
+#: src/frontend/mame/ui/inputmap.cpp:401
 msgid "Invalid sequence entered"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:542
+#: src/frontend/mame/ui/inputmap.cpp:546
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:543
+#: src/frontend/mame/ui/inputmap.cpp:547
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog Inc"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:544
+#: src/frontend/mame/ui/inputmap.cpp:548
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog Dec"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:586
+#: src/frontend/mame/ui/inputmap.cpp:590
 #, c-format
 msgid "Press %1$s to set\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:587
+#: src/frontend/mame/ui/inputmap.cpp:591
 #, c-format
 msgid "Press %1$s to append\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:588
+#: src/frontend/mame/ui/inputmap.cpp:592
 #, c-format
 msgid "Press %1$s to clear\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:589
+#: src/frontend/mame/ui/inputmap.cpp:593
 #, c-format
 msgid "Press %1$s to restore default\n"
 msgstr ""
@@ -1753,7 +1753,7 @@ msgid ""
 msgstr ""
 
 #: src/frontend/mame/ui/simpleselgame.cpp:273
-#: src/frontend/mame/ui/selgame.cpp:436
+#: src/frontend/mame/ui/selgame.cpp:443
 msgid "Configure Options"
 msgstr ""
 
@@ -2081,16 +2081,16 @@ msgstr ""
 msgid "Expand to fit"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:437
+#: src/frontend/mame/ui/selgame.cpp:444
 msgid "Configure Machine"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:1050
+#: src/frontend/mame/ui/selgame.cpp:1060
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d machines (%5$d BIOS) )"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:1078
+#: src/frontend/mame/ui/selgame.cpp:1088
 #, c-format
 msgid "System: %1$-.100s"
 msgstr ""
@@ -2112,7 +2112,7 @@ msgstr ""
 #: src/frontend/mame/ui/auditmenu.cpp:98
 #, c-format
 msgid ""
-"Auditing ROMs for machine %2$u of %3$u...\n"
+"Auditing media for machine %2$u of %3$u...\n"
 "%1$s"
 msgstr ""
 
@@ -2127,12 +2127,12 @@ msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:136
 #, c-format
-msgid "Audit ROMs for %1$u machines marked unavailable"
+msgid "Audit media for %1$u machines marked unavailable"
 msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:137
 #, c-format
-msgid "Audit ROMs for all %1$u machines"
+msgid "Audit media for all %1$u machines"
 msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:154
@@ -2338,84 +2338,84 @@ msgctxt "color-sample"
 msgid "Clone"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:914
+#: src/frontend/mame/ui/custui.cpp:906
 msgid "ARGB Settings"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:919 src/frontend/mame/ui/custui.cpp:922
+#: src/frontend/mame/ui/custui.cpp:911 src/frontend/mame/ui/custui.cpp:914
 msgctxt "color-channel"
 msgid "Alpha"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:927 src/frontend/mame/ui/custui.cpp:930
+#: src/frontend/mame/ui/custui.cpp:919 src/frontend/mame/ui/custui.cpp:922
 msgctxt "color-channel"
 msgid "Red"
 msgstr ""
 
+#: src/frontend/mame/ui/custui.cpp:927 src/frontend/mame/ui/custui.cpp:930
+msgctxt "color-channel"
+msgid "Green"
+msgstr ""
+
 #: src/frontend/mame/ui/custui.cpp:935 src/frontend/mame/ui/custui.cpp:938
 msgctxt "color-channel"
-msgid "Green"
-msgstr ""
-
-#: src/frontend/mame/ui/custui.cpp:943 src/frontend/mame/ui/custui.cpp:946
-msgctxt "color-channel"
 msgid "Blue"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:949
+#: src/frontend/mame/ui/custui.cpp:941
 msgid "Choose from palette"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:996
+#: src/frontend/mame/ui/custui.cpp:988
 msgid "Color preview:"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1093
+#: src/frontend/mame/ui/custui.cpp:1085
 msgctxt "color-preset"
 msgid "White"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1094
+#: src/frontend/mame/ui/custui.cpp:1086
 msgctxt "color-preset"
 msgid "Silver"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1095
+#: src/frontend/mame/ui/custui.cpp:1087
 msgctxt "color-preset"
 msgid "Gray"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1096
+#: src/frontend/mame/ui/custui.cpp:1088
 msgctxt "color-preset"
 msgid "Black"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1097
+#: src/frontend/mame/ui/custui.cpp:1089
 msgctxt "color-preset"
 msgid "Red"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1098
+#: src/frontend/mame/ui/custui.cpp:1090
 msgctxt "color-preset"
 msgid "Orange"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1099
+#: src/frontend/mame/ui/custui.cpp:1091
 msgctxt "color-preset"
 msgid "Yellow"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1100
+#: src/frontend/mame/ui/custui.cpp:1092
 msgctxt "color-preset"
 msgid "Green"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1101
+#: src/frontend/mame/ui/custui.cpp:1093
 msgctxt "color-preset"
 msgid "Blue"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1102
+#: src/frontend/mame/ui/custui.cpp:1094
 msgctxt "color-preset"
 msgid "Violet"
 msgstr ""
@@ -2480,7 +2480,7 @@ msgid "Input (general)"
 msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:123
-msgid "Input (this Machine)"
+msgid "Input (this machine)"
 msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:126
@@ -2519,6 +2519,10 @@ msgstr ""
 msgid "Tape Control"
 msgstr ""
 
+#: src/frontend/mame/ui/mainmenu.cpp:155
+msgid "Pseudo Terminals"
+msgstr ""
+
 #: src/frontend/mame/ui/mainmenu.cpp:158
 msgid "BIOS Selection"
 msgstr ""
@@ -2557,7 +2561,7 @@ msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:200
 #, c-format
-msgid "About %s"
+msgid "About %1$s"
 msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:212
@@ -2717,373 +2721,373 @@ msgstr ""
 msgid "%1$s %2$s"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2235
+#: src/frontend/mame/ui/selmenu.cpp:2244
 msgid "Images"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2236
+#: src/frontend/mame/ui/selmenu.cpp:2245
 msgid "Infos"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2551
+#: src/frontend/mame/ui/selmenu.cpp:2560
 msgid ""
 "Required ROM/disk images for the selected system are missing or incorrect. "
 "Please acquire the correct files or select a different system.\n"
 "\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2567
+#: src/frontend/mame/ui/selmenu.cpp:2576
 msgid ""
 "Required ROM/disk images for the selected software are missing or incorrect. "
 "Please acquire the correct files or select a different software item.\n"
 "\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2583
+#: src/frontend/mame/ui/selmenu.cpp:2592
 msgid "incorrect checksum"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2586
+#: src/frontend/mame/ui/selmenu.cpp:2595
 msgid "incorrect length"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2589
+#: src/frontend/mame/ui/selmenu.cpp:2598
 msgid "not found"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2600
+#: src/frontend/mame/ui/selmenu.cpp:2609
 #, c-format
 msgid "%1$s (%2$s) - %3$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2602
+#: src/frontend/mame/ui/selmenu.cpp:2611
 #, c-format
 msgid "%1$s - %2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2606
+#: src/frontend/mame/ui/selmenu.cpp:2615
 msgid "Press any key to continue."
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2735
+#: src/frontend/mame/ui/selmenu.cpp:2744
 msgid "General Info"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2887
-#, c-format
-msgid "Romset\t%1$s\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2888
-#, c-format
-msgid "Year\t%1$s\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2889
-#, c-format
-msgid "Manufacturer\t%1$s\n"
-msgstr ""
-
 #: src/frontend/mame/ui/selmenu.cpp:2896
 #, c-format
-msgid "Driver is Clone of\t%1$s\n"
+msgid "Romset\t%1$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2901
-msgid "Driver is Parent\t\n"
+#: src/frontend/mame/ui/selmenu.cpp:2897
+#, c-format
+msgid "Year\t%1$s\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2898
+#, c-format
+msgid "Manufacturer\t%1$s\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2905
-msgid "Analog Controls\tYes\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2907
-msgid "Keyboard Inputs\tYes\n"
+#, c-format
+msgid "Driver is Clone of\t%1$s\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2910
-msgid "Overall\tNOT WORKING\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2912
-msgid "Overall\tUnemulated Protection\n"
+msgid "Driver is Parent\t\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2914
-msgid "Overall\tWorking\n"
+msgid "Analog Controls\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2917
-msgid "Graphics\tUnimplemented\n"
+#: src/frontend/mame/ui/selmenu.cpp:2916
+msgid "Keyboard Inputs\tYes\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2919
-msgid "Graphics\tWrong Colors\n"
+msgid "Overall\tNOT WORKING\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2921
-msgid "Graphics\tImperfect Colors\n"
+msgid "Overall\tUnemulated Protection\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2923
-msgid "Graphics\tImperfect\n"
+msgid "Overall\tWorking\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2925
-msgid "Graphics\tOK\n"
+#: src/frontend/mame/ui/selmenu.cpp:2926
+msgid "Graphics\tUnimplemented\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2928
-msgid "Sound\tNone\n"
+msgid "Graphics\tWrong Colors\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2930
-msgid "Sound\tUnimplemented\n"
+msgid "Graphics\tImperfect Colors\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2932
-msgid "Sound\tImperfect\n"
+msgid "Graphics\tImperfect\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2934
-msgid "Sound\tOK\n"
+msgid "Graphics\tOK\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2937
-msgid "Capture\tUnimplemented\n"
+msgid "Sound\tNone\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2939
+msgid "Sound\tUnimplemented\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2941
+msgid "Sound\tImperfect\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2943
+msgid "Sound\tOK\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2946
+msgid "Capture\tUnimplemented\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2948
 msgid "Capture\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2942
+#: src/frontend/mame/ui/selmenu.cpp:2951
 msgid "Camera\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2944
+#: src/frontend/mame/ui/selmenu.cpp:2953
 msgid "Camera\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2947
+#: src/frontend/mame/ui/selmenu.cpp:2956
 msgid "Microphone\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2949
+#: src/frontend/mame/ui/selmenu.cpp:2958
 msgid "Microphone\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2952
+#: src/frontend/mame/ui/selmenu.cpp:2961
 msgid "Controls\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2954
+#: src/frontend/mame/ui/selmenu.cpp:2963
 msgid "Controls\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2957
+#: src/frontend/mame/ui/selmenu.cpp:2966
 msgid "Keyboard\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2959
+#: src/frontend/mame/ui/selmenu.cpp:2968
 msgid "Keyboard\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2962
+#: src/frontend/mame/ui/selmenu.cpp:2971
 msgid "Mouse\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2964
+#: src/frontend/mame/ui/selmenu.cpp:2973
 msgid "Mouse\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2967
+#: src/frontend/mame/ui/selmenu.cpp:2976
 msgid "Media\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2969
+#: src/frontend/mame/ui/selmenu.cpp:2978
 msgid "Media\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2972
+#: src/frontend/mame/ui/selmenu.cpp:2981
 msgid "Disk\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2974
+#: src/frontend/mame/ui/selmenu.cpp:2983
 msgid "Disk\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2977
+#: src/frontend/mame/ui/selmenu.cpp:2986
 msgid "Printer\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2979
+#: src/frontend/mame/ui/selmenu.cpp:2988
 msgid "Printer\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2982
+#: src/frontend/mame/ui/selmenu.cpp:2991
 msgid "Mag. Tape\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2984
+#: src/frontend/mame/ui/selmenu.cpp:2993
 msgid "Mag. Tape\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2987
+#: src/frontend/mame/ui/selmenu.cpp:2996
 msgid "Punch Tape\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2989
+#: src/frontend/mame/ui/selmenu.cpp:2998
 msgid "Punch Tape\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2992
+#: src/frontend/mame/ui/selmenu.cpp:3001
 msgid "Mag. Drum\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2994
+#: src/frontend/mame/ui/selmenu.cpp:3003
 msgid "Mag. Drum\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2997
+#: src/frontend/mame/ui/selmenu.cpp:3006
 msgid "(EP)ROM\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2999
+#: src/frontend/mame/ui/selmenu.cpp:3008
 msgid "(EP)ROM\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3002
+#: src/frontend/mame/ui/selmenu.cpp:3011
 msgid "Communications\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3004
+#: src/frontend/mame/ui/selmenu.cpp:3013
 msgid "Communications\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3007
+#: src/frontend/mame/ui/selmenu.cpp:3016
 msgid "LAN\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3009
+#: src/frontend/mame/ui/selmenu.cpp:3018
 msgid "LAN\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3012
+#: src/frontend/mame/ui/selmenu.cpp:3021
 msgid "WAN\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3014
+#: src/frontend/mame/ui/selmenu.cpp:3023
 msgid "WAN\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3017
+#: src/frontend/mame/ui/selmenu.cpp:3026
 msgid "Timing\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3019
+#: src/frontend/mame/ui/selmenu.cpp:3028
 msgid "Timing\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3021
+#: src/frontend/mame/ui/selmenu.cpp:3030
 msgid "Mechanical Machine\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3021
+#: src/frontend/mame/ui/selmenu.cpp:3030
 msgid "Mechanical Machine\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3022
+#: src/frontend/mame/ui/selmenu.cpp:3031
 msgid "Requires Artwork\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3022
+#: src/frontend/mame/ui/selmenu.cpp:3031
 msgid "Requires Artwork\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3023
+#: src/frontend/mame/ui/selmenu.cpp:3032
 msgid "Requires Clickable Artwork\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3023
+#: src/frontend/mame/ui/selmenu.cpp:3032
 msgid "Requires Clickable Artwork\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3025
+#: src/frontend/mame/ui/selmenu.cpp:3034
 msgid "Support Cocktail\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3026
+#: src/frontend/mame/ui/selmenu.cpp:3035
 msgid "Driver is BIOS\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3026
+#: src/frontend/mame/ui/selmenu.cpp:3035
 msgid "Driver is BIOS\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3027
+#: src/frontend/mame/ui/selmenu.cpp:3036
 msgid "Support Save\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3027
+#: src/frontend/mame/ui/selmenu.cpp:3036
 msgid "Support Save\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3028
+#: src/frontend/mame/ui/selmenu.cpp:3037
 msgid "Screen Orientation\tVertical\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3028
+#: src/frontend/mame/ui/selmenu.cpp:3037
 msgid "Screen Orientation\tHorizontal\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3038
+#: src/frontend/mame/ui/selmenu.cpp:3047
 msgid "Requires CHD\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3038
+#: src/frontend/mame/ui/selmenu.cpp:3047
 msgid "Requires CHD\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3051
-msgid "ROM Audit Result\tOK\n"
+#: src/frontend/mame/ui/selmenu.cpp:3060
+msgid "Media Audit Result\tOK\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3053
-msgid "ROM Audit Result\tBAD\n"
+#: src/frontend/mame/ui/selmenu.cpp:3062
+msgid "Media Audit Result\tBAD\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3056
+#: src/frontend/mame/ui/selmenu.cpp:3065
 msgid "Samples Audit Result\tNone Needed\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3058
+#: src/frontend/mame/ui/selmenu.cpp:3067
 msgid "Samples Audit Result\tOK\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3060
+#: src/frontend/mame/ui/selmenu.cpp:3069
 msgid "Samples Audit Result\tBAD\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3064
+#: src/frontend/mame/ui/selmenu.cpp:3073
 msgid ""
-"ROM Audit \tDisabled\n"
-"Samples Audit \tDisabled\n"
+"Media Audit\tDisabled\n"
+"Samples Audit\tDisabled\n"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:150
+#: src/frontend/mame/ui/sndmenu.cpp:146
 msgid "Sound"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:151
+#: src/frontend/mame/ui/sndmenu.cpp:147
 msgid "Compressor"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:152
+#: src/frontend/mame/ui/sndmenu.cpp:148
 msgid "Sample Rate"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:153
+#: src/frontend/mame/ui/sndmenu.cpp:149
 msgid "Use External Samples"
 msgstr ""
 
@@ -3122,511 +3126,681 @@ msgstr ""
 msgid "  Screen '%1$s': Vector\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:132
+#: src/frontend/mame/ui/devopt.cpp:135
 #, c-format
 msgid "  Screen '%1$s': %2$d × %3$d (V) %4$s Hz\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:133
+#: src/frontend/mame/ui/devopt.cpp:136
 #, c-format
 msgid "  Screen '%1$s': %2$d × %3$d (H) %4$s Hz\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:147
+#: src/frontend/mame/ui/devopt.cpp:150
 msgid "* Sound:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:211
+#: src/frontend/mame/ui/devopt.cpp:214
 #, c-format
 msgid ""
 "* BIOS settings:\n"
 "  %1$d options    [default: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:255 src/frontend/mame/ui/devopt.cpp:271
-#: src/frontend/mame/ui/devopt.cpp:332
+#: src/frontend/mame/ui/devopt.cpp:258 src/frontend/mame/ui/devopt.cpp:274
+#: src/frontend/mame/ui/devopt.cpp:335
 #, c-format
 msgid "  %1$s    [default: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:260 src/frontend/mame/ui/devopt.cpp:276
+#: src/frontend/mame/ui/devopt.cpp:263 src/frontend/mame/ui/devopt.cpp:279
 #, c-format
 msgid "  %1$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:282
+#: src/frontend/mame/ui/devopt.cpp:285
 msgid "* DIP switch settings:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:287
+#: src/frontend/mame/ui/devopt.cpp:290
 msgid "* Configuration settings:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:291
+#: src/frontend/mame/ui/devopt.cpp:294
 msgid "* Input device(s):\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:293
+#: src/frontend/mame/ui/devopt.cpp:296
 #, c-format
 msgid "  User inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:295
+#: src/frontend/mame/ui/devopt.cpp:298
 #, c-format
 msgid "  Mahjong inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:297
+#: src/frontend/mame/ui/devopt.cpp:300
 #, c-format
 msgid "  Hanafuda inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:299
+#: src/frontend/mame/ui/devopt.cpp:302
 #, c-format
 msgid "  Gambling inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:301
+#: src/frontend/mame/ui/devopt.cpp:304
 #, c-format
 msgid "  Analog inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:303
+#: src/frontend/mame/ui/devopt.cpp:306
 #, c-format
 msgid "  Adjuster inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:305
+#: src/frontend/mame/ui/devopt.cpp:308
 #, c-format
 msgid "  Keypad inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:307
+#: src/frontend/mame/ui/devopt.cpp:310
 #, c-format
 msgid "  Keyboard inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:312
+#: src/frontend/mame/ui/devopt.cpp:315
 msgid "* Media Options:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:317
+#: src/frontend/mame/ui/devopt.cpp:320
 #, c-format
 msgid "  %1$s    [tag: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:327
+#: src/frontend/mame/ui/devopt.cpp:330
 msgid "* Slot Options:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:341
+#: src/frontend/mame/ui/devopt.cpp:344
 msgid "[None]\n"
 msgstr ""
 
-#: src/emu/render.cpp:1847
+#: src/emu/render.cpp:1796
 #, c-format
 msgctxt "view-name"
 msgid "Screen %1$u Standard (%2$u:%3$u)"
 msgstr ""
 
-#: src/emu/render.cpp:1873
+#: src/emu/render.cpp:1822
 #, c-format
 msgctxt "view-name"
 msgid "Screen %1$u Pixel Aspect (%2$u:%3$u)"
 msgstr ""
 
-#: src/emu/render.cpp:1895 src/emu/render.cpp:2030
+#: src/emu/render.cpp:1844 src/emu/render.cpp:1979
 msgctxt "view-name"
 msgid "Cocktail"
 msgstr ""
 
-#: src/emu/render.cpp:2015
+#: src/emu/render.cpp:1964
 msgctxt "view-name"
 msgid "Left-to-Right"
 msgstr ""
 
-#: src/emu/render.cpp:2016
+#: src/emu/render.cpp:1965
 msgctxt "view-name"
 msgid "Left-to-Right (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2017
+#: src/emu/render.cpp:1966
 msgctxt "view-name"
 msgid "Top-to-Bottom"
 msgstr ""
 
-#: src/emu/render.cpp:2018
+#: src/emu/render.cpp:1967
 msgctxt "view-name"
 msgid "Top-to-Bottom (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2069
+#: src/emu/render.cpp:2018
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Left-to-Right, Top-to-Bottom"
 msgstr ""
 
-#: src/emu/render.cpp:2078
+#: src/emu/render.cpp:2027
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Left-to-Right, Top-to-Bottom (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2087
+#: src/emu/render.cpp:2036
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Top-to-Bottom, Left-to-Right"
 msgstr ""
 
-#: src/emu/render.cpp:2096
+#: src/emu/render.cpp:2045
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Top-to-Bottom, Left-to-Right (Gapless)"
 msgstr ""
 
-#: src/emu/inpttype.ipp:22
+#: src/emu/ioport.cpp:332
+#, c-format
 msgctxt "input-name"
-msgid "P1 Up"
+msgid "P%1$u"
 msgstr ""
 
-#: src/emu/inpttype.ipp:23
+#: src/emu/ioport.cpp:1924
 msgctxt "input-name"
-msgid "P1 Down"
+msgid "???"
 msgstr ""
 
-#: src/emu/inpttype.ipp:24
+#: src/emu/inpttype.ipp:22 src/emu/inpttype.ipp:140 src/emu/inpttype.ipp:221
+#: src/emu/inpttype.ipp:255 src/emu/inpttype.ipp:289 src/emu/inpttype.ipp:323
+#: src/emu/inpttype.ipp:357 src/emu/inpttype.ipp:391 src/emu/inpttype.ipp:425
+#: src/emu/inpttype.ipp:459
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left"
+msgid "%p Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:25
+#: src/emu/inpttype.ipp:23 src/emu/inpttype.ipp:141 src/emu/inpttype.ipp:222
+#: src/emu/inpttype.ipp:256 src/emu/inpttype.ipp:290 src/emu/inpttype.ipp:324
+#: src/emu/inpttype.ipp:358 src/emu/inpttype.ipp:392 src/emu/inpttype.ipp:426
+#: src/emu/inpttype.ipp:460
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right"
+msgid "%p Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:26
+#: src/emu/inpttype.ipp:24 src/emu/inpttype.ipp:142 src/emu/inpttype.ipp:223
+#: src/emu/inpttype.ipp:257 src/emu/inpttype.ipp:291 src/emu/inpttype.ipp:325
+#: src/emu/inpttype.ipp:359 src/emu/inpttype.ipp:393 src/emu/inpttype.ipp:427
+#: src/emu/inpttype.ipp:461
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Up"
+msgid "%p Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:27
+#: src/emu/inpttype.ipp:25 src/emu/inpttype.ipp:143 src/emu/inpttype.ipp:224
+#: src/emu/inpttype.ipp:258 src/emu/inpttype.ipp:292 src/emu/inpttype.ipp:326
+#: src/emu/inpttype.ipp:360 src/emu/inpttype.ipp:394 src/emu/inpttype.ipp:428
+#: src/emu/inpttype.ipp:462
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Down"
+msgid "%p Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:28
+#: src/emu/inpttype.ipp:26 src/emu/inpttype.ipp:144 src/emu/inpttype.ipp:225
+#: src/emu/inpttype.ipp:259 src/emu/inpttype.ipp:293 src/emu/inpttype.ipp:327
+#: src/emu/inpttype.ipp:361 src/emu/inpttype.ipp:395 src/emu/inpttype.ipp:429
+#: src/emu/inpttype.ipp:463
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Left"
+msgid "%p Right Stick/Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:29
+#: src/emu/inpttype.ipp:27 src/emu/inpttype.ipp:145 src/emu/inpttype.ipp:226
+#: src/emu/inpttype.ipp:260 src/emu/inpttype.ipp:294 src/emu/inpttype.ipp:328
+#: src/emu/inpttype.ipp:362 src/emu/inpttype.ipp:396 src/emu/inpttype.ipp:430
+#: src/emu/inpttype.ipp:464
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Right"
+msgid "%p Right Stick/Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:30
+#: src/emu/inpttype.ipp:28 src/emu/inpttype.ipp:146 src/emu/inpttype.ipp:227
+#: src/emu/inpttype.ipp:261 src/emu/inpttype.ipp:295 src/emu/inpttype.ipp:329
+#: src/emu/inpttype.ipp:363 src/emu/inpttype.ipp:397 src/emu/inpttype.ipp:431
+#: src/emu/inpttype.ipp:465
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Up"
+msgid "%p Right Stick/Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:31
+#: src/emu/inpttype.ipp:29 src/emu/inpttype.ipp:147 src/emu/inpttype.ipp:228
+#: src/emu/inpttype.ipp:262 src/emu/inpttype.ipp:296 src/emu/inpttype.ipp:330
+#: src/emu/inpttype.ipp:364 src/emu/inpttype.ipp:398 src/emu/inpttype.ipp:432
+#: src/emu/inpttype.ipp:466
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Down"
+msgid "%p Right Stick/Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:32
+#: src/emu/inpttype.ipp:30 src/emu/inpttype.ipp:148 src/emu/inpttype.ipp:229
+#: src/emu/inpttype.ipp:263 src/emu/inpttype.ipp:297 src/emu/inpttype.ipp:331
+#: src/emu/inpttype.ipp:365 src/emu/inpttype.ipp:399 src/emu/inpttype.ipp:433
+#: src/emu/inpttype.ipp:467
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Left"
+msgid "%p Left Stick/Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:33
+#: src/emu/inpttype.ipp:31 src/emu/inpttype.ipp:149 src/emu/inpttype.ipp:230
+#: src/emu/inpttype.ipp:264 src/emu/inpttype.ipp:298 src/emu/inpttype.ipp:332
+#: src/emu/inpttype.ipp:366 src/emu/inpttype.ipp:400 src/emu/inpttype.ipp:434
+#: src/emu/inpttype.ipp:468
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Right"
+msgid "%p Left Stick/Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:34
+#: src/emu/inpttype.ipp:32 src/emu/inpttype.ipp:150 src/emu/inpttype.ipp:231
+#: src/emu/inpttype.ipp:265 src/emu/inpttype.ipp:299 src/emu/inpttype.ipp:333
+#: src/emu/inpttype.ipp:367 src/emu/inpttype.ipp:401 src/emu/inpttype.ipp:435
+#: src/emu/inpttype.ipp:469
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 1"
+msgid "%p Left Stick/Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:35
+#: src/emu/inpttype.ipp:33 src/emu/inpttype.ipp:151 src/emu/inpttype.ipp:232
+#: src/emu/inpttype.ipp:266 src/emu/inpttype.ipp:300 src/emu/inpttype.ipp:334
+#: src/emu/inpttype.ipp:368 src/emu/inpttype.ipp:402 src/emu/inpttype.ipp:436
+#: src/emu/inpttype.ipp:470
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 2"
+msgid "%p Left Stick/Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:36
+#: src/emu/inpttype.ipp:34 src/emu/inpttype.ipp:152 src/emu/inpttype.ipp:233
+#: src/emu/inpttype.ipp:267 src/emu/inpttype.ipp:301 src/emu/inpttype.ipp:335
+#: src/emu/inpttype.ipp:369 src/emu/inpttype.ipp:403 src/emu/inpttype.ipp:437
+#: src/emu/inpttype.ipp:471
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 3"
+msgid "%p Button 1"
 msgstr ""
 
-#: src/emu/inpttype.ipp:37
+#: src/emu/inpttype.ipp:35 src/emu/inpttype.ipp:153 src/emu/inpttype.ipp:234
+#: src/emu/inpttype.ipp:268 src/emu/inpttype.ipp:302 src/emu/inpttype.ipp:336
+#: src/emu/inpttype.ipp:370 src/emu/inpttype.ipp:404 src/emu/inpttype.ipp:438
+#: src/emu/inpttype.ipp:472
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 4"
+msgid "%p Button 2"
 msgstr ""
 
-#: src/emu/inpttype.ipp:38
+#: src/emu/inpttype.ipp:36 src/emu/inpttype.ipp:154 src/emu/inpttype.ipp:235
+#: src/emu/inpttype.ipp:269 src/emu/inpttype.ipp:303 src/emu/inpttype.ipp:337
+#: src/emu/inpttype.ipp:371 src/emu/inpttype.ipp:405 src/emu/inpttype.ipp:439
+#: src/emu/inpttype.ipp:473
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 5"
+msgid "%p Button 3"
 msgstr ""
 
-#: src/emu/inpttype.ipp:39
+#: src/emu/inpttype.ipp:37 src/emu/inpttype.ipp:155 src/emu/inpttype.ipp:236
+#: src/emu/inpttype.ipp:270 src/emu/inpttype.ipp:304 src/emu/inpttype.ipp:338
+#: src/emu/inpttype.ipp:372 src/emu/inpttype.ipp:406 src/emu/inpttype.ipp:440
+#: src/emu/inpttype.ipp:474
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 6"
+msgid "%p Button 4"
 msgstr ""
 
-#: src/emu/inpttype.ipp:40
+#: src/emu/inpttype.ipp:38 src/emu/inpttype.ipp:156 src/emu/inpttype.ipp:237
+#: src/emu/inpttype.ipp:271 src/emu/inpttype.ipp:305 src/emu/inpttype.ipp:339
+#: src/emu/inpttype.ipp:373 src/emu/inpttype.ipp:407 src/emu/inpttype.ipp:441
+#: src/emu/inpttype.ipp:475
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 7"
+msgid "%p Button 5"
 msgstr ""
 
-#: src/emu/inpttype.ipp:41
+#: src/emu/inpttype.ipp:39 src/emu/inpttype.ipp:157 src/emu/inpttype.ipp:238
+#: src/emu/inpttype.ipp:272 src/emu/inpttype.ipp:306 src/emu/inpttype.ipp:340
+#: src/emu/inpttype.ipp:374 src/emu/inpttype.ipp:408 src/emu/inpttype.ipp:442
+#: src/emu/inpttype.ipp:476
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 8"
+msgid "%p Button 6"
 msgstr ""
 
-#: src/emu/inpttype.ipp:42
+#: src/emu/inpttype.ipp:40 src/emu/inpttype.ipp:158 src/emu/inpttype.ipp:239
+#: src/emu/inpttype.ipp:273 src/emu/inpttype.ipp:307 src/emu/inpttype.ipp:341
+#: src/emu/inpttype.ipp:375 src/emu/inpttype.ipp:409 src/emu/inpttype.ipp:443
+#: src/emu/inpttype.ipp:477
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 9"
+msgid "%p Button 7"
 msgstr ""
 
-#: src/emu/inpttype.ipp:43
+#: src/emu/inpttype.ipp:41 src/emu/inpttype.ipp:159 src/emu/inpttype.ipp:240
+#: src/emu/inpttype.ipp:274 src/emu/inpttype.ipp:308 src/emu/inpttype.ipp:342
+#: src/emu/inpttype.ipp:376 src/emu/inpttype.ipp:410 src/emu/inpttype.ipp:444
+#: src/emu/inpttype.ipp:478
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 10"
+msgid "%p Button 8"
 msgstr ""
 
-#: src/emu/inpttype.ipp:44
+#: src/emu/inpttype.ipp:42 src/emu/inpttype.ipp:160 src/emu/inpttype.ipp:241
+#: src/emu/inpttype.ipp:275 src/emu/inpttype.ipp:309 src/emu/inpttype.ipp:343
+#: src/emu/inpttype.ipp:377 src/emu/inpttype.ipp:411 src/emu/inpttype.ipp:445
+#: src/emu/inpttype.ipp:479
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 11"
+msgid "%p Button 9"
 msgstr ""
 
-#: src/emu/inpttype.ipp:45
+#: src/emu/inpttype.ipp:43 src/emu/inpttype.ipp:161 src/emu/inpttype.ipp:242
+#: src/emu/inpttype.ipp:276 src/emu/inpttype.ipp:310 src/emu/inpttype.ipp:344
+#: src/emu/inpttype.ipp:378 src/emu/inpttype.ipp:412 src/emu/inpttype.ipp:446
+#: src/emu/inpttype.ipp:480
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 12"
+msgid "%p Button 10"
 msgstr ""
 
-#: src/emu/inpttype.ipp:46
+#: src/emu/inpttype.ipp:44 src/emu/inpttype.ipp:162 src/emu/inpttype.ipp:243
+#: src/emu/inpttype.ipp:277 src/emu/inpttype.ipp:311 src/emu/inpttype.ipp:345
+#: src/emu/inpttype.ipp:379 src/emu/inpttype.ipp:413 src/emu/inpttype.ipp:447
+#: src/emu/inpttype.ipp:481
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 13"
+msgid "%p Button 11"
 msgstr ""
 
-#: src/emu/inpttype.ipp:47
+#: src/emu/inpttype.ipp:45 src/emu/inpttype.ipp:163 src/emu/inpttype.ipp:244
+#: src/emu/inpttype.ipp:278 src/emu/inpttype.ipp:312 src/emu/inpttype.ipp:346
+#: src/emu/inpttype.ipp:380 src/emu/inpttype.ipp:414 src/emu/inpttype.ipp:448
+#: src/emu/inpttype.ipp:482
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 14"
+msgid "%p Button 12"
 msgstr ""
 
-#: src/emu/inpttype.ipp:48
+#: src/emu/inpttype.ipp:46 src/emu/inpttype.ipp:164 src/emu/inpttype.ipp:245
+#: src/emu/inpttype.ipp:279 src/emu/inpttype.ipp:313 src/emu/inpttype.ipp:347
+#: src/emu/inpttype.ipp:381 src/emu/inpttype.ipp:415 src/emu/inpttype.ipp:449
+#: src/emu/inpttype.ipp:483
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 15"
+msgid "%p Button 13"
 msgstr ""
 
-#: src/emu/inpttype.ipp:49
+#: src/emu/inpttype.ipp:47 src/emu/inpttype.ipp:165 src/emu/inpttype.ipp:246
+#: src/emu/inpttype.ipp:280 src/emu/inpttype.ipp:314 src/emu/inpttype.ipp:348
+#: src/emu/inpttype.ipp:382 src/emu/inpttype.ipp:416 src/emu/inpttype.ipp:450
+#: src/emu/inpttype.ipp:484
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 16"
+msgid "%p Button 14"
 msgstr ""
 
-#: src/emu/inpttype.ipp:50
+#: src/emu/inpttype.ipp:48 src/emu/inpttype.ipp:166 src/emu/inpttype.ipp:247
+#: src/emu/inpttype.ipp:281 src/emu/inpttype.ipp:315 src/emu/inpttype.ipp:349
+#: src/emu/inpttype.ipp:383 src/emu/inpttype.ipp:417 src/emu/inpttype.ipp:451
+#: src/emu/inpttype.ipp:485
+#, c-format
 msgctxt "input-name"
-msgid "P1 Start"
+msgid "%p Button 15"
 msgstr ""
 
-#: src/emu/inpttype.ipp:51
+#: src/emu/inpttype.ipp:49 src/emu/inpttype.ipp:167 src/emu/inpttype.ipp:248
+#: src/emu/inpttype.ipp:282 src/emu/inpttype.ipp:316 src/emu/inpttype.ipp:350
+#: src/emu/inpttype.ipp:384 src/emu/inpttype.ipp:418 src/emu/inpttype.ipp:452
+#: src/emu/inpttype.ipp:486
+#, c-format
 msgctxt "input-name"
-msgid "P1 Select"
+msgid "%p Button 16"
 msgstr ""
 
-#: src/emu/inpttype.ipp:56
+#: src/emu/inpttype.ipp:50 src/emu/inpttype.ipp:168 src/emu/inpttype.ipp:249
+#: src/emu/inpttype.ipp:283 src/emu/inpttype.ipp:317 src/emu/inpttype.ipp:351
+#: src/emu/inpttype.ipp:385 src/emu/inpttype.ipp:419 src/emu/inpttype.ipp:453
+#: src/emu/inpttype.ipp:487
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong A"
+msgid "%p Start"
 msgstr ""
 
-#: src/emu/inpttype.ipp:57
+#: src/emu/inpttype.ipp:51 src/emu/inpttype.ipp:169 src/emu/inpttype.ipp:250
+#: src/emu/inpttype.ipp:284 src/emu/inpttype.ipp:318 src/emu/inpttype.ipp:352
+#: src/emu/inpttype.ipp:386 src/emu/inpttype.ipp:420 src/emu/inpttype.ipp:454
+#: src/emu/inpttype.ipp:488
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong B"
+msgid "%p Select"
 msgstr ""
 
-#: src/emu/inpttype.ipp:58
+#: src/emu/inpttype.ipp:56 src/emu/inpttype.ipp:174
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong C"
+msgid "%p Mahjong A"
 msgstr ""
 
-#: src/emu/inpttype.ipp:59
+#: src/emu/inpttype.ipp:57 src/emu/inpttype.ipp:175
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong D"
+msgid "%p Mahjong B"
 msgstr ""
 
-#: src/emu/inpttype.ipp:60
+#: src/emu/inpttype.ipp:58 src/emu/inpttype.ipp:176
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong E"
+msgid "%p Mahjong C"
 msgstr ""
 
-#: src/emu/inpttype.ipp:61
+#: src/emu/inpttype.ipp:59 src/emu/inpttype.ipp:177
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong F"
+msgid "%p Mahjong D"
 msgstr ""
 
-#: src/emu/inpttype.ipp:62
+#: src/emu/inpttype.ipp:60 src/emu/inpttype.ipp:178
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong G"
+msgid "%p Mahjong E"
 msgstr ""
 
-#: src/emu/inpttype.ipp:63
+#: src/emu/inpttype.ipp:61 src/emu/inpttype.ipp:179
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong H"
+msgid "%p Mahjong F"
 msgstr ""
 
-#: src/emu/inpttype.ipp:64
+#: src/emu/inpttype.ipp:62 src/emu/inpttype.ipp:180
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong I"
+msgid "%p Mahjong G"
 msgstr ""
 
-#: src/emu/inpttype.ipp:65
+#: src/emu/inpttype.ipp:63 src/emu/inpttype.ipp:181
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong J"
+msgid "%p Mahjong H"
 msgstr ""
 
-#: src/emu/inpttype.ipp:66
+#: src/emu/inpttype.ipp:64 src/emu/inpttype.ipp:182
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong K"
+msgid "%p Mahjong I"
 msgstr ""
 
-#: src/emu/inpttype.ipp:67
+#: src/emu/inpttype.ipp:65 src/emu/inpttype.ipp:183
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong L"
+msgid "%p Mahjong J"
 msgstr ""
 
-#: src/emu/inpttype.ipp:68
+#: src/emu/inpttype.ipp:66 src/emu/inpttype.ipp:184
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong M"
+msgid "%p Mahjong K"
 msgstr ""
 
-#: src/emu/inpttype.ipp:69
+#: src/emu/inpttype.ipp:67 src/emu/inpttype.ipp:185
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong N"
+msgid "%p Mahjong L"
 msgstr ""
 
-#: src/emu/inpttype.ipp:70
+#: src/emu/inpttype.ipp:68 src/emu/inpttype.ipp:186
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong O"
+msgid "%p Mahjong M"
 msgstr ""
 
-#: src/emu/inpttype.ipp:71
+#: src/emu/inpttype.ipp:69 src/emu/inpttype.ipp:187
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong P"
+msgid "%p Mahjong N"
 msgstr ""
 
-#: src/emu/inpttype.ipp:72
+#: src/emu/inpttype.ipp:70 src/emu/inpttype.ipp:188
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Q"
+msgid "%p Mahjong O"
 msgstr ""
 
-#: src/emu/inpttype.ipp:73
+#: src/emu/inpttype.ipp:71 src/emu/inpttype.ipp:189
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Kan"
+msgid "%p Mahjong P"
 msgstr ""
 
-#: src/emu/inpttype.ipp:74
+#: src/emu/inpttype.ipp:72 src/emu/inpttype.ipp:190
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Pon"
+msgid "%p Mahjong Q"
 msgstr ""
 
-#: src/emu/inpttype.ipp:75
+#: src/emu/inpttype.ipp:73 src/emu/inpttype.ipp:191
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Chi"
+msgid "%p Mahjong Kan"
 msgstr ""
 
-#: src/emu/inpttype.ipp:76
+#: src/emu/inpttype.ipp:74 src/emu/inpttype.ipp:192
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Reach"
+msgid "%p Mahjong Pon"
 msgstr ""
 
-#: src/emu/inpttype.ipp:77
+#: src/emu/inpttype.ipp:75 src/emu/inpttype.ipp:193
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Ron"
+msgid "%p Mahjong Chi"
 msgstr ""
 
-#: src/emu/inpttype.ipp:78
+#: src/emu/inpttype.ipp:76 src/emu/inpttype.ipp:194
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Flip Flop"
+msgid "%p Mahjong Reach"
 msgstr ""
 
-#: src/emu/inpttype.ipp:79
+#: src/emu/inpttype.ipp:77 src/emu/inpttype.ipp:195
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Bet"
+msgid "%p Mahjong Ron"
 msgstr ""
 
-#: src/emu/inpttype.ipp:80
+#: src/emu/inpttype.ipp:78 src/emu/inpttype.ipp:200
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Take Score"
+msgid "%p Mahjong Flip Flop"
 msgstr ""
 
-#: src/emu/inpttype.ipp:81
+#: src/emu/inpttype.ipp:79 src/emu/inpttype.ipp:196
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Double Up"
+msgid "%p Mahjong Bet"
 msgstr ""
 
-#: src/emu/inpttype.ipp:82
+#: src/emu/inpttype.ipp:80 src/emu/inpttype.ipp:198
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Big"
+msgid "%p Mahjong Take Score"
 msgstr ""
 
-#: src/emu/inpttype.ipp:83
+#: src/emu/inpttype.ipp:81 src/emu/inpttype.ipp:199
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Small"
+msgid "%p Mahjong Double Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:84
+#: src/emu/inpttype.ipp:82 src/emu/inpttype.ipp:201
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Last Chance"
+msgid "%p Mahjong Big"
 msgstr ""
 
-#: src/emu/inpttype.ipp:89
+#: src/emu/inpttype.ipp:83 src/emu/inpttype.ipp:202
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda A/1"
+msgid "%p Mahjong Small"
 msgstr ""
 
-#: src/emu/inpttype.ipp:90
+#: src/emu/inpttype.ipp:84 src/emu/inpttype.ipp:197
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda B/2"
+msgid "%p Mahjong Last Chance"
 msgstr ""
 
-#: src/emu/inpttype.ipp:91
+#: src/emu/inpttype.ipp:89 src/emu/inpttype.ipp:207
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda C/3"
+msgid "%p Hanafuda A/1"
 msgstr ""
 
-#: src/emu/inpttype.ipp:92
+#: src/emu/inpttype.ipp:90 src/emu/inpttype.ipp:208
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda D/4"
+msgid "%p Hanafuda B/2"
 msgstr ""
 
-#: src/emu/inpttype.ipp:93
+#: src/emu/inpttype.ipp:91 src/emu/inpttype.ipp:209
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda E/5"
+msgid "%p Hanafuda C/3"
 msgstr ""
 
-#: src/emu/inpttype.ipp:94
+#: src/emu/inpttype.ipp:92 src/emu/inpttype.ipp:210
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda F/6"
+msgid "%p Hanafuda D/4"
 msgstr ""
 
-#: src/emu/inpttype.ipp:95
+#: src/emu/inpttype.ipp:93 src/emu/inpttype.ipp:211
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda G/7"
+msgid "%p Hanafuda E/5"
 msgstr ""
 
-#: src/emu/inpttype.ipp:96
+#: src/emu/inpttype.ipp:94 src/emu/inpttype.ipp:212
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda H/8"
+msgid "%p Hanafuda F/6"
 msgstr ""
 
-#: src/emu/inpttype.ipp:97
+#: src/emu/inpttype.ipp:95 src/emu/inpttype.ipp:213
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda Yes"
+msgid "%p Hanafuda G/7"
 msgstr ""
 
-#: src/emu/inpttype.ipp:98
+#: src/emu/inpttype.ipp:96 src/emu/inpttype.ipp:214
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda No"
+msgid "%p Hanafuda H/8"
+msgstr ""
+
+#: src/emu/inpttype.ipp:97 src/emu/inpttype.ipp:215
+#, c-format
+msgctxt "input-name"
+msgid "%p Hanafuda Yes"
+msgstr ""
+
+#: src/emu/inpttype.ipp:98 src/emu/inpttype.ipp:216
+#, c-format
+msgctxt "input-name"
+msgid "%p Hanafuda No"
 msgstr ""
 
 #: src/emu/inpttype.ipp:103
@@ -3754,1551 +3928,6 @@ msgctxt "input-name"
 msgid "Stop All Reels"
 msgstr ""
 
-#: src/emu/inpttype.ipp:140
-msgctxt "input-name"
-msgid "P2 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:141
-msgctxt "input-name"
-msgid "P2 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:142
-msgctxt "input-name"
-msgid "P2 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:143
-msgctxt "input-name"
-msgid "P2 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:144
-msgctxt "input-name"
-msgid "P2 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:145
-msgctxt "input-name"
-msgid "P2 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:146
-msgctxt "input-name"
-msgid "P2 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:147
-msgctxt "input-name"
-msgid "P2 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:148
-msgctxt "input-name"
-msgid "P2 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:149
-msgctxt "input-name"
-msgid "P2 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:150
-msgctxt "input-name"
-msgid "P2 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:151
-msgctxt "input-name"
-msgid "P2 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:152
-msgctxt "input-name"
-msgid "P2 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:153
-msgctxt "input-name"
-msgid "P2 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:154
-msgctxt "input-name"
-msgid "P2 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:155
-msgctxt "input-name"
-msgid "P2 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:156
-msgctxt "input-name"
-msgid "P2 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:157
-msgctxt "input-name"
-msgid "P2 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:158
-msgctxt "input-name"
-msgid "P2 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:159
-msgctxt "input-name"
-msgid "P2 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:160
-msgctxt "input-name"
-msgid "P2 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:161
-msgctxt "input-name"
-msgid "P2 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:162
-msgctxt "input-name"
-msgid "P2 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:163
-msgctxt "input-name"
-msgid "P2 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:164
-msgctxt "input-name"
-msgid "P2 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:165
-msgctxt "input-name"
-msgid "P2 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:166
-msgctxt "input-name"
-msgid "P2 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:167
-msgctxt "input-name"
-msgid "P2 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:168
-msgctxt "input-name"
-msgid "P2 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:169
-msgctxt "input-name"
-msgid "P2 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:174
-msgctxt "input-name"
-msgid "P2 Mahjong A"
-msgstr ""
-
-#: src/emu/inpttype.ipp:175
-msgctxt "input-name"
-msgid "P2 Mahjong B"
-msgstr ""
-
-#: src/emu/inpttype.ipp:176
-msgctxt "input-name"
-msgid "P2 Mahjong C"
-msgstr ""
-
-#: src/emu/inpttype.ipp:177
-msgctxt "input-name"
-msgid "P2 Mahjong D"
-msgstr ""
-
-#: src/emu/inpttype.ipp:178
-msgctxt "input-name"
-msgid "P2 Mahjong E"
-msgstr ""
-
-#: src/emu/inpttype.ipp:179
-msgctxt "input-name"
-msgid "P2 Mahjong F"
-msgstr ""
-
-#: src/emu/inpttype.ipp:180
-msgctxt "input-name"
-msgid "P2 Mahjong G"
-msgstr ""
-
-#: src/emu/inpttype.ipp:181
-msgctxt "input-name"
-msgid "P2 Mahjong H"
-msgstr ""
-
-#: src/emu/inpttype.ipp:182
-msgctxt "input-name"
-msgid "P2 Mahjong I"
-msgstr ""
-
-#: src/emu/inpttype.ipp:183
-msgctxt "input-name"
-msgid "P2 Mahjong J"
-msgstr ""
-
-#: src/emu/inpttype.ipp:184
-msgctxt "input-name"
-msgid "P2 Mahjong K"
-msgstr ""
-
-#: src/emu/inpttype.ipp:185
-msgctxt "input-name"
-msgid "P2 Mahjong L"
-msgstr ""
-
-#: src/emu/inpttype.ipp:186
-msgctxt "input-name"
-msgid "P2 Mahjong M"
-msgstr ""
-
-#: src/emu/inpttype.ipp:187
-msgctxt "input-name"
-msgid "P2 Mahjong N"
-msgstr ""
-
-#: src/emu/inpttype.ipp:188
-msgctxt "input-name"
-msgid "P2 Mahjong O"
-msgstr ""
-
-#: src/emu/inpttype.ipp:189
-msgctxt "input-name"
-msgid "P2 Mahjong P"
-msgstr ""
-
-#: src/emu/inpttype.ipp:190
-msgctxt "input-name"
-msgid "P2 Mahjong Q"
-msgstr ""
-
-#: src/emu/inpttype.ipp:191
-msgctxt "input-name"
-msgid "P2 Mahjong Kan"
-msgstr ""
-
-#: src/emu/inpttype.ipp:192
-msgctxt "input-name"
-msgid "P2 Mahjong Pon"
-msgstr ""
-
-#: src/emu/inpttype.ipp:193
-msgctxt "input-name"
-msgid "P2 Mahjong Chi"
-msgstr ""
-
-#: src/emu/inpttype.ipp:194
-msgctxt "input-name"
-msgid "P2 Mahjong Reach"
-msgstr ""
-
-#: src/emu/inpttype.ipp:195
-msgctxt "input-name"
-msgid "P2 Mahjong Ron"
-msgstr ""
-
-#: src/emu/inpttype.ipp:196
-msgctxt "input-name"
-msgid "P2 Mahjong Bet"
-msgstr ""
-
-#: src/emu/inpttype.ipp:197
-msgctxt "input-name"
-msgid "P2 Mahjong Last Chance"
-msgstr ""
-
-#: src/emu/inpttype.ipp:198
-msgctxt "input-name"
-msgid "P2 Mahjong Take Score"
-msgstr ""
-
-#: src/emu/inpttype.ipp:199
-msgctxt "input-name"
-msgid "P2 Mahjong Double Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:200
-msgctxt "input-name"
-msgid "P2 Mahjong Flip Flop"
-msgstr ""
-
-#: src/emu/inpttype.ipp:201
-msgctxt "input-name"
-msgid "P2 Mahjong Big"
-msgstr ""
-
-#: src/emu/inpttype.ipp:202
-msgctxt "input-name"
-msgid "P2 Mahjong Small"
-msgstr ""
-
-#: src/emu/inpttype.ipp:207
-msgctxt "input-name"
-msgid "P2 Hanafuda A/1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:208
-msgctxt "input-name"
-msgid "P2 Hanafuda B/2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:209
-msgctxt "input-name"
-msgid "P2 Hanafuda C/3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:210
-msgctxt "input-name"
-msgid "P2 Hanafuda D/4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:211
-msgctxt "input-name"
-msgid "P2 Hanafuda E/5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:212
-msgctxt "input-name"
-msgid "P2 Hanafuda F/6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:213
-msgctxt "input-name"
-msgid "P2 Hanafuda G/7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:214
-msgctxt "input-name"
-msgid "P2 Hanafuda H/8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:215
-msgctxt "input-name"
-msgid "P2 Hanafuda Yes"
-msgstr ""
-
-#: src/emu/inpttype.ipp:216
-msgctxt "input-name"
-msgid "P2 Hanafuda No"
-msgstr ""
-
-#: src/emu/inpttype.ipp:221
-msgctxt "input-name"
-msgid "P3 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:222
-msgctxt "input-name"
-msgid "P3 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:223
-msgctxt "input-name"
-msgid "P3 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:224
-msgctxt "input-name"
-msgid "P3 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:225
-msgctxt "input-name"
-msgid "P3 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:226
-msgctxt "input-name"
-msgid "P3 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:227
-msgctxt "input-name"
-msgid "P3 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:228
-msgctxt "input-name"
-msgid "P3 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:229
-msgctxt "input-name"
-msgid "P3 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:230
-msgctxt "input-name"
-msgid "P3 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:231
-msgctxt "input-name"
-msgid "P3 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:232
-msgctxt "input-name"
-msgid "P3 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:233
-msgctxt "input-name"
-msgid "P3 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:234
-msgctxt "input-name"
-msgid "P3 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:235
-msgctxt "input-name"
-msgid "P3 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:236
-msgctxt "input-name"
-msgid "P3 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:237
-msgctxt "input-name"
-msgid "P3 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:238
-msgctxt "input-name"
-msgid "P3 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:239
-msgctxt "input-name"
-msgid "P3 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:240
-msgctxt "input-name"
-msgid "P3 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:241
-msgctxt "input-name"
-msgid "P3 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:242
-msgctxt "input-name"
-msgid "P3 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:243
-msgctxt "input-name"
-msgid "P3 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:244
-msgctxt "input-name"
-msgid "P3 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:245
-msgctxt "input-name"
-msgid "P3 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:246
-msgctxt "input-name"
-msgid "P3 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:247
-msgctxt "input-name"
-msgid "P3 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:248
-msgctxt "input-name"
-msgid "P3 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:249
-msgctxt "input-name"
-msgid "P3 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:250
-msgctxt "input-name"
-msgid "P3 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:255
-msgctxt "input-name"
-msgid "P4 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:256
-msgctxt "input-name"
-msgid "P4 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:257
-msgctxt "input-name"
-msgid "P4 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:258
-msgctxt "input-name"
-msgid "P4 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:259
-msgctxt "input-name"
-msgid "P4 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:260
-msgctxt "input-name"
-msgid "P4 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:261
-msgctxt "input-name"
-msgid "P4 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:262
-msgctxt "input-name"
-msgid "P4 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:263
-msgctxt "input-name"
-msgid "P4 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:264
-msgctxt "input-name"
-msgid "P4 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:265
-msgctxt "input-name"
-msgid "P4 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:266
-msgctxt "input-name"
-msgid "P4 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:267
-msgctxt "input-name"
-msgid "P4 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:268
-msgctxt "input-name"
-msgid "P4 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:269
-msgctxt "input-name"
-msgid "P4 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:270
-msgctxt "input-name"
-msgid "P4 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:271
-msgctxt "input-name"
-msgid "P4 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:272
-msgctxt "input-name"
-msgid "P4 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:273
-msgctxt "input-name"
-msgid "P4 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:274
-msgctxt "input-name"
-msgid "P4 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:275
-msgctxt "input-name"
-msgid "P4 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:276
-msgctxt "input-name"
-msgid "P4 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:277
-msgctxt "input-name"
-msgid "P4 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:278
-msgctxt "input-name"
-msgid "P4 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:279
-msgctxt "input-name"
-msgid "P4 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:280
-msgctxt "input-name"
-msgid "P4 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:281
-msgctxt "input-name"
-msgid "P4 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:282
-msgctxt "input-name"
-msgid "P4 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:283
-msgctxt "input-name"
-msgid "P4 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:284
-msgctxt "input-name"
-msgid "P4 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:289
-msgctxt "input-name"
-msgid "P5 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:290
-msgctxt "input-name"
-msgid "P5 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:291
-msgctxt "input-name"
-msgid "P5 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:292
-msgctxt "input-name"
-msgid "P5 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:293
-msgctxt "input-name"
-msgid "P5 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:294
-msgctxt "input-name"
-msgid "P5 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:295
-msgctxt "input-name"
-msgid "P5 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:296
-msgctxt "input-name"
-msgid "P5 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:297
-msgctxt "input-name"
-msgid "P5 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:298
-msgctxt "input-name"
-msgid "P5 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:299
-msgctxt "input-name"
-msgid "P5 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:300
-msgctxt "input-name"
-msgid "P5 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:301
-msgctxt "input-name"
-msgid "P5 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:302
-msgctxt "input-name"
-msgid "P5 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:303
-msgctxt "input-name"
-msgid "P5 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:304
-msgctxt "input-name"
-msgid "P5 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:305
-msgctxt "input-name"
-msgid "P5 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:306
-msgctxt "input-name"
-msgid "P5 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:307
-msgctxt "input-name"
-msgid "P5 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:308
-msgctxt "input-name"
-msgid "P5 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:309
-msgctxt "input-name"
-msgid "P5 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:310
-msgctxt "input-name"
-msgid "P5 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:311
-msgctxt "input-name"
-msgid "P5 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:312
-msgctxt "input-name"
-msgid "P5 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:313
-msgctxt "input-name"
-msgid "P5 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:314
-msgctxt "input-name"
-msgid "P5 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:315
-msgctxt "input-name"
-msgid "P5 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:316
-msgctxt "input-name"
-msgid "P5 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:317
-msgctxt "input-name"
-msgid "P5 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:318
-msgctxt "input-name"
-msgid "P5 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:323
-msgctxt "input-name"
-msgid "P6 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:324
-msgctxt "input-name"
-msgid "P6 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:325
-msgctxt "input-name"
-msgid "P6 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:326
-msgctxt "input-name"
-msgid "P6 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:327
-msgctxt "input-name"
-msgid "P6 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:328
-msgctxt "input-name"
-msgid "P6 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:329
-msgctxt "input-name"
-msgid "P6 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:330
-msgctxt "input-name"
-msgid "P6 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:331
-msgctxt "input-name"
-msgid "P6 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:332
-msgctxt "input-name"
-msgid "P6 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:333
-msgctxt "input-name"
-msgid "P6 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:334
-msgctxt "input-name"
-msgid "P6 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:335
-msgctxt "input-name"
-msgid "P6 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:336
-msgctxt "input-name"
-msgid "P6 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:337
-msgctxt "input-name"
-msgid "P6 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:338
-msgctxt "input-name"
-msgid "P6 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:339
-msgctxt "input-name"
-msgid "P6 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:340
-msgctxt "input-name"
-msgid "P6 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:341
-msgctxt "input-name"
-msgid "P6 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:342
-msgctxt "input-name"
-msgid "P6 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:343
-msgctxt "input-name"
-msgid "P6 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:344
-msgctxt "input-name"
-msgid "P6 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:345
-msgctxt "input-name"
-msgid "P6 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:346
-msgctxt "input-name"
-msgid "P6 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:347
-msgctxt "input-name"
-msgid "P6 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:348
-msgctxt "input-name"
-msgid "P6 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:349
-msgctxt "input-name"
-msgid "P6 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:350
-msgctxt "input-name"
-msgid "P6 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:351
-msgctxt "input-name"
-msgid "P6 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:352
-msgctxt "input-name"
-msgid "P6 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:357
-msgctxt "input-name"
-msgid "P7 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:358
-msgctxt "input-name"
-msgid "P7 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:359
-msgctxt "input-name"
-msgid "P7 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:360
-msgctxt "input-name"
-msgid "P7 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:361
-msgctxt "input-name"
-msgid "P7 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:362
-msgctxt "input-name"
-msgid "P7 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:363
-msgctxt "input-name"
-msgid "P7 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:364
-msgctxt "input-name"
-msgid "P7 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:365
-msgctxt "input-name"
-msgid "P7 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:366
-msgctxt "input-name"
-msgid "P7 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:367
-msgctxt "input-name"
-msgid "P7 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:368
-msgctxt "input-name"
-msgid "P7 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:369
-msgctxt "input-name"
-msgid "P7 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:370
-msgctxt "input-name"
-msgid "P7 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:371
-msgctxt "input-name"
-msgid "P7 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:372
-msgctxt "input-name"
-msgid "P7 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:373
-msgctxt "input-name"
-msgid "P7 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:374
-msgctxt "input-name"
-msgid "P7 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:375
-msgctxt "input-name"
-msgid "P7 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:376
-msgctxt "input-name"
-msgid "P7 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:377
-msgctxt "input-name"
-msgid "P7 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:378
-msgctxt "input-name"
-msgid "P7 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:379
-msgctxt "input-name"
-msgid "P7 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:380
-msgctxt "input-name"
-msgid "P7 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:381
-msgctxt "input-name"
-msgid "P7 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:382
-msgctxt "input-name"
-msgid "P7 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:383
-msgctxt "input-name"
-msgid "P7 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:384
-msgctxt "input-name"
-msgid "P7 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:385
-msgctxt "input-name"
-msgid "P7 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:386
-msgctxt "input-name"
-msgid "P7 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:391
-msgctxt "input-name"
-msgid "P8 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:392
-msgctxt "input-name"
-msgid "P8 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:393
-msgctxt "input-name"
-msgid "P8 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:394
-msgctxt "input-name"
-msgid "P8 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:395
-msgctxt "input-name"
-msgid "P8 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:396
-msgctxt "input-name"
-msgid "P8 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:397
-msgctxt "input-name"
-msgid "P8 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:398
-msgctxt "input-name"
-msgid "P8 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:399
-msgctxt "input-name"
-msgid "P8 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:400
-msgctxt "input-name"
-msgid "P8 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:401
-msgctxt "input-name"
-msgid "P8 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:402
-msgctxt "input-name"
-msgid "P8 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:403
-msgctxt "input-name"
-msgid "P8 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:404
-msgctxt "input-name"
-msgid "P8 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:405
-msgctxt "input-name"
-msgid "P8 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:406
-msgctxt "input-name"
-msgid "P8 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:407
-msgctxt "input-name"
-msgid "P8 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:408
-msgctxt "input-name"
-msgid "P8 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:409
-msgctxt "input-name"
-msgid "P8 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:410
-msgctxt "input-name"
-msgid "P8 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:411
-msgctxt "input-name"
-msgid "P8 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:412
-msgctxt "input-name"
-msgid "P8 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:413
-msgctxt "input-name"
-msgid "P8 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:414
-msgctxt "input-name"
-msgid "P8 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:415
-msgctxt "input-name"
-msgid "P8 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:416
-msgctxt "input-name"
-msgid "P8 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:417
-msgctxt "input-name"
-msgid "P8 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:418
-msgctxt "input-name"
-msgid "P8 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:419
-msgctxt "input-name"
-msgid "P8 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:420
-msgctxt "input-name"
-msgid "P8 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:425
-msgctxt "input-name"
-msgid "P9 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:426
-msgctxt "input-name"
-msgid "P9 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:427
-msgctxt "input-name"
-msgid "P9 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:428
-msgctxt "input-name"
-msgid "P9 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:429
-msgctxt "input-name"
-msgid "P9 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:430
-msgctxt "input-name"
-msgid "P9 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:431
-msgctxt "input-name"
-msgid "P9 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:432
-msgctxt "input-name"
-msgid "P9 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:433
-msgctxt "input-name"
-msgid "P9 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:434
-msgctxt "input-name"
-msgid "P9 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:435
-msgctxt "input-name"
-msgid "P9 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:436
-msgctxt "input-name"
-msgid "P9 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:437
-msgctxt "input-name"
-msgid "P9 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:438
-msgctxt "input-name"
-msgid "P9 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:439
-msgctxt "input-name"
-msgid "P9 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:440
-msgctxt "input-name"
-msgid "P9 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:441
-msgctxt "input-name"
-msgid "P9 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:442
-msgctxt "input-name"
-msgid "P9 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:443
-msgctxt "input-name"
-msgid "P9 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:444
-msgctxt "input-name"
-msgid "P9 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:445
-msgctxt "input-name"
-msgid "P9 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:446
-msgctxt "input-name"
-msgid "P9 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:447
-msgctxt "input-name"
-msgid "P9 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:448
-msgctxt "input-name"
-msgid "P9 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:449
-msgctxt "input-name"
-msgid "P9 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:450
-msgctxt "input-name"
-msgid "P9 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:451
-msgctxt "input-name"
-msgid "P9 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:452
-msgctxt "input-name"
-msgid "P9 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:453
-msgctxt "input-name"
-msgid "P9 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:454
-msgctxt "input-name"
-msgid "P9 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:459
-msgctxt "input-name"
-msgid "P10 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:460
-msgctxt "input-name"
-msgid "P10 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:461
-msgctxt "input-name"
-msgid "P10 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:462
-msgctxt "input-name"
-msgid "P10 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:463
-msgctxt "input-name"
-msgid "P10 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:464
-msgctxt "input-name"
-msgid "P10 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:465
-msgctxt "input-name"
-msgid "P10 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:466
-msgctxt "input-name"
-msgid "P10 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:467
-msgctxt "input-name"
-msgid "P10 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:468
-msgctxt "input-name"
-msgid "P10 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:469
-msgctxt "input-name"
-msgid "P10 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:470
-msgctxt "input-name"
-msgid "P10 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:471
-msgctxt "input-name"
-msgid "P10 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:472
-msgctxt "input-name"
-msgid "P10 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:473
-msgctxt "input-name"
-msgid "P10 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:474
-msgctxt "input-name"
-msgid "P10 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:475
-msgctxt "input-name"
-msgid "P10 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:476
-msgctxt "input-name"
-msgid "P10 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:477
-msgctxt "input-name"
-msgid "P10 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:478
-msgctxt "input-name"
-msgid "P10 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:479
-msgctxt "input-name"
-msgid "P10 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:480
-msgctxt "input-name"
-msgid "P10 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:481
-msgctxt "input-name"
-msgid "P10 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:482
-msgctxt "input-name"
-msgid "P10 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:483
-msgctxt "input-name"
-msgid "P10 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:484
-msgctxt "input-name"
-msgid "P10 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:485
-msgctxt "input-name"
-msgid "P10 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:486
-msgctxt "input-name"
-msgid "P10 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:487
-msgctxt "input-name"
-msgid "P10 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:488
-msgctxt "input-name"
-msgid "P10 Select"
-msgstr ""
-
 #: src/emu/inpttype.ipp:493
 msgctxt "input-name"
 msgid "1 Player Start"
@@ -5479,154 +4108,31 @@ msgctxt "input-name"
 msgid "Volume Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:550
-msgctxt "input-name"
-msgid "P1 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:551
-msgctxt "input-name"
-msgid "P2 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:552
-msgctxt "input-name"
-msgid "P3 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:553
-msgctxt "input-name"
-msgid "P4 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:554
-msgctxt "input-name"
-msgid "P5 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:555
-msgctxt "input-name"
-msgid "P6 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:556
-msgctxt "input-name"
-msgid "P7 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:557
-msgctxt "input-name"
-msgid "P8 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:558
-msgctxt "input-name"
-msgid "P9 Pedal 1"
-msgstr ""
-
+#: src/emu/inpttype.ipp:550 src/emu/inpttype.ipp:551 src/emu/inpttype.ipp:552
+#: src/emu/inpttype.ipp:553 src/emu/inpttype.ipp:554 src/emu/inpttype.ipp:555
+#: src/emu/inpttype.ipp:556 src/emu/inpttype.ipp:557 src/emu/inpttype.ipp:558
 #: src/emu/inpttype.ipp:559
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:564
-msgctxt "input-name"
-msgid "P1 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:565
-msgctxt "input-name"
-msgid "P2 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:566
-msgctxt "input-name"
-msgid "P3 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:567
-msgctxt "input-name"
-msgid "P4 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:568
-msgctxt "input-name"
-msgid "P5 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:569
-msgctxt "input-name"
-msgid "P6 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:570
-msgctxt "input-name"
-msgid "P7 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:571
-msgctxt "input-name"
-msgid "P8 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:572
-msgctxt "input-name"
-msgid "P9 Pedal 2"
+msgid "%p Pedal 1"
 msgstr ""
 
+#: src/emu/inpttype.ipp:564 src/emu/inpttype.ipp:565 src/emu/inpttype.ipp:566
+#: src/emu/inpttype.ipp:567 src/emu/inpttype.ipp:568 src/emu/inpttype.ipp:569
+#: src/emu/inpttype.ipp:570 src/emu/inpttype.ipp:571 src/emu/inpttype.ipp:572
 #: src/emu/inpttype.ipp:573
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:578
-msgctxt "input-name"
-msgid "P1 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:579
-msgctxt "input-name"
-msgid "P2 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:580
-msgctxt "input-name"
-msgid "P3 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:581
-msgctxt "input-name"
-msgid "P4 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:582
-msgctxt "input-name"
-msgid "P5 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:583
-msgctxt "input-name"
-msgid "P6 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:584
-msgctxt "input-name"
-msgid "P7 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:585
-msgctxt "input-name"
-msgid "P8 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:586
-msgctxt "input-name"
-msgid "P9 Pedal 3"
+msgid "%p Pedal 2"
 msgstr ""
 
+#: src/emu/inpttype.ipp:578 src/emu/inpttype.ipp:579 src/emu/inpttype.ipp:580
+#: src/emu/inpttype.ipp:581 src/emu/inpttype.ipp:582 src/emu/inpttype.ipp:583
+#: src/emu/inpttype.ipp:584 src/emu/inpttype.ipp:585 src/emu/inpttype.ipp:586
 #: src/emu/inpttype.ipp:587
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 3"
+msgid "%p Pedal 3"
 msgstr ""
 
 #: src/emu/inpttype.ipp:592
diff --git a/language/Russian/strings.po b/language/Russian/strings.po
index 677e21c8b75..bbb4e1b7134 100644
--- a/language/Russian/strings.po
+++ b/language/Russian/strings.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-19 02:50+1100\n"
+"POT-Creation-Date: 2021-12-09 04:44+1100\n"
 "PO-Revision-Date: 2017-10-23 16:22+0300\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: MAME Language Team\n"
@@ -272,12 +272,12 @@ msgstr "%1$s %2$s ( %3$d / %4$d пакетов программ )"
 msgid "Driver: \"%1$s\" software list "
 msgstr "Драйвер: \"%1$s\" списков программ "
 
-#: src/frontend/mame/ui/selsoft.cpp:711 src/frontend/mame/ui/selgame.cpp:1066
+#: src/frontend/mame/ui/selsoft.cpp:711 src/frontend/mame/ui/selgame.cpp:1076
 #, c-format
 msgid "%1$s: %2$s - Search: %3$s_"
 msgstr "%1$s: %2$s - Поиск: %3$s_"
 
-#: src/frontend/mame/ui/selsoft.cpp:713 src/frontend/mame/ui/selgame.cpp:1068
+#: src/frontend/mame/ui/selsoft.cpp:713 src/frontend/mame/ui/selgame.cpp:1078
 #, c-format
 msgid "Search: %1$s_"
 msgstr "Поиск: %1$s_"
@@ -287,7 +287,7 @@ msgstr "Поиск: %1$s_"
 msgid "Software list/item: %1$s:%2$s"
 msgstr ""
 
-#: src/frontend/mame/ui/optsmenu.cpp:73 src/frontend/mame/ui/sndmenu.cpp:165
+#: src/frontend/mame/ui/optsmenu.cpp:73 src/frontend/mame/ui/sndmenu.cpp:161
 msgid "Sound Options"
 msgstr "Настройки звука"
 
@@ -382,12 +382,12 @@ msgid "Show mouse pointer"
 msgstr "Отображать указатель мыши"
 
 #: src/frontend/mame/ui/submenu.cpp:39
-msgid "Confirm quit from machines"
-msgstr "Подтверждать выход из эмуляции"
+msgid "Confirm quit from emulation"
+msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:40
-msgid "Skip information screen at startup"
-msgstr "Пропустить сведения о системе при запуске"
+msgid "Skip system information screen"
+msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:41
 msgid "Force 4:3 aspect for snapshot display"
@@ -402,8 +402,8 @@ msgid "Skip BIOS selection menu"
 msgstr "Пропускать меню выбора BIOS"
 
 #: src/frontend/mame/ui/submenu.cpp:44
-msgid "Skip software parts selection menu"
-msgstr "Пропускать меню выбора частей ПО"
+msgid "Skip software part selection menu"
+msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:45
 msgid "Info auto audit"
@@ -554,8 +554,8 @@ msgid "UI active"
 msgstr "Активный интерфейс пользователя"
 
 #: src/frontend/mame/ui/submenu.cpp:91
-msgid "Offscreen reload"
-msgstr "Закадровая перезарядка"
+msgid "Off-screen reload"
+msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:92
 msgid "Joystick deadzone"
@@ -570,8 +570,8 @@ msgid "Natural keyboard"
 msgstr "Обычная клавиатура"
 
 #: src/frontend/mame/ui/submenu.cpp:95
-msgid "Simultaneous contradictory"
-msgstr "Одновременно противоположные направления"
+msgid "Allow contradictory joystick inputs"
+msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:96
 msgid "Coin impulse"
@@ -594,7 +594,7 @@ msgid "Pedal Device Assignment"
 msgstr "Назначение устройства педали"
 
 #: src/frontend/mame/ui/submenu.cpp:106
-msgid "Adstick Device Assignment"
+msgid "AD Stick Device Assignment"
 msgstr "Назначение устройства AD-стика"
 
 #: src/frontend/mame/ui/submenu.cpp:107
@@ -681,14 +681,14 @@ msgstr "Синхронизированное обновление"
 msgid "Wait Vertical Sync"
 msgstr "Ожидать вертикальную синхронизацию"
 
-#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:687
+#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:689
 #: src/frontend/mame/ui/videoopt.cpp:191 src/frontend/mame/ui/custui.cpp:490
 #: src/frontend/mame/ui/analogipt.cpp:471 plugins/cheatfind/init.lua:766
 #: plugins/cheatfind/init.lua:777 plugins/cheat/init.lua:668
 msgid "On"
 msgstr "Вкл"
 
-#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:690
+#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:692
 #: src/frontend/mame/ui/videoopt.cpp:207 src/frontend/mame/ui/custui.cpp:490
 #: src/frontend/mame/ui/analogipt.cpp:471 plugins/cheatfind/init.lua:763
 #: plugins/cheatfind/init.lua:774 plugins/cheat/init.lua:671
@@ -696,11 +696,11 @@ msgstr "Вкл"
 msgid "Off"
 msgstr "Выкл"
 
-#: src/frontend/mame/ui/menu.cpp:693
+#: src/frontend/mame/ui/menu.cpp:695
 msgid "Auto"
 msgstr "Авто"
 
-#: src/frontend/mame/ui/menu.cpp:1195
+#: src/frontend/mame/ui/menu.cpp:1197
 #: src/frontend/mame/ui/simpleselgame.cpp:278
 #: src/frontend/mame/ui/selmenu.cpp:1280
 msgid "Return to Previous Menu"
@@ -708,7 +708,7 @@ msgstr "Возврат в предыдущее меню"
 
 #: src/frontend/mame/ui/filemngr.cpp:139
 #: src/frontend/mame/ui/confswitch.cpp:119
-#: src/frontend/mame/ui/inputmap.cpp:559 src/frontend/mame/ui/analogipt.cpp:360
+#: src/frontend/mame/ui/inputmap.cpp:563 src/frontend/mame/ui/analogipt.cpp:360
 #, c-format
 msgid "[root%1$s]"
 msgstr ""
@@ -972,22 +972,22 @@ msgstr ""
 "Процессор:\n"
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "GHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "MHz"
 msgstr "МГц"
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "kHz"
 msgstr "кГц"
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "Hz"
 msgstr ""
 
@@ -1015,38 +1015,38 @@ msgstr "Нет\n"
 msgid "Vector"
 msgstr "Векторный"
 
-#: src/frontend/mame/ui/info.cpp:480
+#: src/frontend/mame/ui/info.cpp:483
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:480
+#: src/frontend/mame/ui/info.cpp:483
 msgid "%2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:497
+#: src/frontend/mame/ui/info.cpp:500
 #, c-format
 msgid "Screen '%1$s'"
 msgstr "Экран '%1$s'"
 
-#: src/frontend/mame/ui/info.cpp:499
+#: src/frontend/mame/ui/info.cpp:502
 msgid "Screen"
 msgstr "Экран"
 
-#: src/frontend/mame/ui/info.cpp:570 src/frontend/mame/ui/info.cpp:581
+#: src/frontend/mame/ui/info.cpp:573 src/frontend/mame/ui/info.cpp:584
 #, c-format
 msgid "%1$s:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:662
+#: src/frontend/mame/ui/info.cpp:665
 msgid "Not supported"
 msgstr "Не поддерживается"
 
-#: src/frontend/mame/ui/info.cpp:665
+#: src/frontend/mame/ui/info.cpp:668
 msgid "Partially supported"
 msgstr "Частично поддерживается"
 
-#: src/frontend/mame/ui/info.cpp:674
+#: src/frontend/mame/ui/info.cpp:677
 msgid "[empty]"
 msgstr "[пусто]"
 
@@ -1119,7 +1119,7 @@ msgid "Emulated"
 msgstr "Эмулируется"
 
 #: src/frontend/mame/ui/keyboard.cpp:59 src/frontend/mame/ui/confswitch.cpp:117
-#: src/frontend/mame/ui/inputmap.cpp:557 src/frontend/mame/ui/analogipt.cpp:358
+#: src/frontend/mame/ui/inputmap.cpp:561 src/frontend/mame/ui/analogipt.cpp:358
 #, c-format
 msgid "%1$s [root%2$s]"
 msgstr ""
@@ -1479,7 +1479,7 @@ msgctxt "swlist-info"
 msgid "Software list/item"
 msgstr ""
 
-#: src/frontend/mame/ui/datmenu.cpp:88 src/frontend/mame/ui/selmenu.cpp:2698
+#: src/frontend/mame/ui/datmenu.cpp:88 src/frontend/mame/ui/selmenu.cpp:2707
 msgid "Software List Info"
 msgstr ""
 
@@ -1601,7 +1601,7 @@ msgstr ""
 msgid "Configure Machine:"
 msgstr ""
 
-#: src/frontend/mame/ui/miscmenu.cpp:858 src/frontend/mame/ui/selmenu.cpp:2638
+#: src/frontend/mame/ui/miscmenu.cpp:858 src/frontend/mame/ui/selmenu.cpp:2647
 msgid " (default)"
 msgstr " (по-умолчанию)"
 
@@ -1622,7 +1622,7 @@ msgstr ""
 "Нажмите %1$s для выхода\n"
 "Нажмите %2$s для возврата к эмуляции"
 
-#: src/frontend/mame/ui/info_pty.cpp:30 src/frontend/mame/ui/mainmenu.cpp:155
+#: src/frontend/mame/ui/info_pty.cpp:30
 msgid "Pseudo terminals"
 msgstr "Псевдо-терминалы"
 
@@ -1690,52 +1690,52 @@ msgstr ""
 msgid "Other Controls"
 msgstr "Дополнительное управление"
 
-#: src/frontend/mame/ui/inputmap.cpp:227
+#: src/frontend/mame/ui/inputmap.cpp:231
 msgid "This machine has no configurable inputs."
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:327
+#: src/frontend/mame/ui/inputmap.cpp:331
 msgid "Pressed"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:397
+#: src/frontend/mame/ui/inputmap.cpp:401
 msgid "Invalid sequence entered"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:542
+#: src/frontend/mame/ui/inputmap.cpp:546
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:543
+#: src/frontend/mame/ui/inputmap.cpp:547
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog Inc"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:544
+#: src/frontend/mame/ui/inputmap.cpp:548
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog Dec"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:586
+#: src/frontend/mame/ui/inputmap.cpp:590
 #, c-format
 msgid "Press %1$s to set\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:587
+#: src/frontend/mame/ui/inputmap.cpp:591
 #, c-format
 msgid "Press %1$s to append\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:588
+#: src/frontend/mame/ui/inputmap.cpp:592
 #, c-format
 msgid "Press %1$s to clear\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:589
+#: src/frontend/mame/ui/inputmap.cpp:593
 #, c-format
 msgid "Press %1$s to restore default\n"
 msgstr ""
@@ -1803,7 +1803,7 @@ msgstr ""
 "Нажмите любую клавишу для продолжения."
 
 #: src/frontend/mame/ui/simpleselgame.cpp:273
-#: src/frontend/mame/ui/selgame.cpp:436
+#: src/frontend/mame/ui/selgame.cpp:443
 msgid "Configure Options"
 msgstr "Изменение настроек"
 
@@ -2138,16 +2138,16 @@ msgstr ""
 msgid "Expand to fit"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:437
+#: src/frontend/mame/ui/selgame.cpp:444
 msgid "Configure Machine"
 msgstr "Настройки системы"
 
-#: src/frontend/mame/ui/selgame.cpp:1050
+#: src/frontend/mame/ui/selgame.cpp:1060
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d machines (%5$d BIOS) )"
 msgstr "%1$s %2$s ( %3$d / %4$d систем (%5$d BIOS) )"
 
-#: src/frontend/mame/ui/selgame.cpp:1078
+#: src/frontend/mame/ui/selgame.cpp:1088
 #, c-format
 msgid "System: %1$-.100s"
 msgstr "Система: %1$-.100s"
@@ -2169,9 +2169,9 @@ msgstr "Результаты будут сохранены в %1$s"
 #: src/frontend/mame/ui/auditmenu.cpp:98
 #, c-format
 msgid ""
-"Auditing ROMs for machine %2$u of %3$u...\n"
+"Auditing media for machine %2$u of %3$u...\n"
 "%1$s"
-msgstr "Проверяем ROMы для системы %2$u из %3$u...%1$s"
+msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:116
 #, c-format
@@ -2184,13 +2184,13 @@ msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:136
 #, c-format
-msgid "Audit ROMs for %1$u machines marked unavailable"
-msgstr "Проверить ROMы для %1$u систем, помеченных как недоступные"
+msgid "Audit media for %1$u machines marked unavailable"
+msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:137
 #, c-format
-msgid "Audit ROMs for all %1$u machines"
-msgstr "Проверить ROMы для всех %1$u систем"
+msgid "Audit media for all %1$u machines"
+msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:154
 #, c-format
@@ -2395,84 +2395,84 @@ msgctxt "color-sample"
 msgid "Clone"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:914
+#: src/frontend/mame/ui/custui.cpp:906
 msgid "ARGB Settings"
 msgstr "Настройки ARGB"
 
-#: src/frontend/mame/ui/custui.cpp:919 src/frontend/mame/ui/custui.cpp:922
+#: src/frontend/mame/ui/custui.cpp:911 src/frontend/mame/ui/custui.cpp:914
 msgctxt "color-channel"
 msgid "Alpha"
 msgstr "Альфа"
 
-#: src/frontend/mame/ui/custui.cpp:927 src/frontend/mame/ui/custui.cpp:930
+#: src/frontend/mame/ui/custui.cpp:919 src/frontend/mame/ui/custui.cpp:922
 msgctxt "color-channel"
 msgid "Red"
 msgstr "Красный"
 
-#: src/frontend/mame/ui/custui.cpp:935 src/frontend/mame/ui/custui.cpp:938
+#: src/frontend/mame/ui/custui.cpp:927 src/frontend/mame/ui/custui.cpp:930
 msgctxt "color-channel"
 msgid "Green"
 msgstr "Зеленый"
 
-#: src/frontend/mame/ui/custui.cpp:943 src/frontend/mame/ui/custui.cpp:946
+#: src/frontend/mame/ui/custui.cpp:935 src/frontend/mame/ui/custui.cpp:938
 msgctxt "color-channel"
 msgid "Blue"
 msgstr "Синий"
 
-#: src/frontend/mame/ui/custui.cpp:949
+#: src/frontend/mame/ui/custui.cpp:941
 msgid "Choose from palette"
 msgstr "Выберите из палитры"
 
-#: src/frontend/mame/ui/custui.cpp:996
+#: src/frontend/mame/ui/custui.cpp:988
 msgid "Color preview:"
 msgstr "Предпросмотр цвета:"
 
-#: src/frontend/mame/ui/custui.cpp:1093
+#: src/frontend/mame/ui/custui.cpp:1085
 msgctxt "color-preset"
 msgid "White"
 msgstr "Белый"
 
-#: src/frontend/mame/ui/custui.cpp:1094
+#: src/frontend/mame/ui/custui.cpp:1086
 msgctxt "color-preset"
 msgid "Silver"
 msgstr "Серебристый"
 
-#: src/frontend/mame/ui/custui.cpp:1095
+#: src/frontend/mame/ui/custui.cpp:1087
 msgctxt "color-preset"
 msgid "Gray"
 msgstr "Серый"
 
-#: src/frontend/mame/ui/custui.cpp:1096
+#: src/frontend/mame/ui/custui.cpp:1088
 msgctxt "color-preset"
 msgid "Black"
 msgstr "Черный"
 
-#: src/frontend/mame/ui/custui.cpp:1097
+#: src/frontend/mame/ui/custui.cpp:1089
 msgctxt "color-preset"
 msgid "Red"
 msgstr "Красный"
 
-#: src/frontend/mame/ui/custui.cpp:1098
+#: src/frontend/mame/ui/custui.cpp:1090
 msgctxt "color-preset"
 msgid "Orange"
 msgstr "Оранжевый"
 
-#: src/frontend/mame/ui/custui.cpp:1099
+#: src/frontend/mame/ui/custui.cpp:1091
 msgctxt "color-preset"
 msgid "Yellow"
 msgstr "Желтый"
 
-#: src/frontend/mame/ui/custui.cpp:1100
+#: src/frontend/mame/ui/custui.cpp:1092
 msgctxt "color-preset"
 msgid "Green"
 msgstr "Зеленый"
 
-#: src/frontend/mame/ui/custui.cpp:1101
+#: src/frontend/mame/ui/custui.cpp:1093
 msgctxt "color-preset"
 msgid "Blue"
 msgstr "Синий"
 
-#: src/frontend/mame/ui/custui.cpp:1102
+#: src/frontend/mame/ui/custui.cpp:1094
 msgctxt "color-preset"
 msgid "Violet"
 msgstr "Фиолетовый"
@@ -2537,7 +2537,7 @@ msgid "Input (general)"
 msgstr "Управление (общее)"
 
 #: src/frontend/mame/ui/mainmenu.cpp:123
-msgid "Input (this Machine)"
+msgid "Input (this machine)"
 msgstr "Управление (эта система)"
 
 #: src/frontend/mame/ui/mainmenu.cpp:126
@@ -2576,6 +2576,10 @@ msgstr "Файловый менеджер"
 msgid "Tape Control"
 msgstr "Управление лентой"
 
+#: src/frontend/mame/ui/mainmenu.cpp:155
+msgid "Pseudo Terminals"
+msgstr ""
+
 #: src/frontend/mame/ui/mainmenu.cpp:158
 msgid "BIOS Selection"
 msgstr "Выбор BIOS"
@@ -2614,7 +2618,7 @@ msgstr "Просмотр DAT-файлов"
 
 #: src/frontend/mame/ui/mainmenu.cpp:200
 #, c-format
-msgid "About %s"
+msgid "About %1$s"
 msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:212
@@ -2774,373 +2778,373 @@ msgstr "Драйвер - clone от: %1$s"
 msgid "%1$s %2$s"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2235
+#: src/frontend/mame/ui/selmenu.cpp:2244
 msgid "Images"
 msgstr "Изображения"
 
-#: src/frontend/mame/ui/selmenu.cpp:2236
+#: src/frontend/mame/ui/selmenu.cpp:2245
 msgid "Infos"
 msgstr "Информация"
 
-#: src/frontend/mame/ui/selmenu.cpp:2551
+#: src/frontend/mame/ui/selmenu.cpp:2560
 msgid ""
 "Required ROM/disk images for the selected system are missing or incorrect. "
 "Please acquire the correct files or select a different system.\n"
 "\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2567
+#: src/frontend/mame/ui/selmenu.cpp:2576
 msgid ""
 "Required ROM/disk images for the selected software are missing or incorrect. "
 "Please acquire the correct files or select a different software item.\n"
 "\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2583
+#: src/frontend/mame/ui/selmenu.cpp:2592
 msgid "incorrect checksum"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2586
+#: src/frontend/mame/ui/selmenu.cpp:2595
 msgid "incorrect length"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2589
+#: src/frontend/mame/ui/selmenu.cpp:2598
 msgid "not found"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2600
+#: src/frontend/mame/ui/selmenu.cpp:2609
 #, c-format
 msgid "%1$s (%2$s) - %3$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2602
+#: src/frontend/mame/ui/selmenu.cpp:2611
 #, c-format
 msgid "%1$s - %2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2606
+#: src/frontend/mame/ui/selmenu.cpp:2615
 msgid "Press any key to continue."
 msgstr "Нажмите любую клавишу для продолжения."
 
-#: src/frontend/mame/ui/selmenu.cpp:2735
+#: src/frontend/mame/ui/selmenu.cpp:2744
 msgid "General Info"
 msgstr "Общая информация"
 
-#: src/frontend/mame/ui/selmenu.cpp:2887
+#: src/frontend/mame/ui/selmenu.cpp:2896
 #, c-format
 msgid "Romset\t%1$s\n"
 msgstr "ROM-набор\t%1$s\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2888
+#: src/frontend/mame/ui/selmenu.cpp:2897
 #, c-format
 msgid "Year\t%1$s\n"
 msgstr "Год\t%1$s\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2889
+#: src/frontend/mame/ui/selmenu.cpp:2898
 #, c-format
 msgid "Manufacturer\t%1$s\n"
 msgstr "Производитель\t%1$s\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2896
+#: src/frontend/mame/ui/selmenu.cpp:2905
 #, c-format
 msgid "Driver is Clone of\t%1$s\n"
 msgstr "Драйвер - Clone от\t%1$s\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2901
+#: src/frontend/mame/ui/selmenu.cpp:2910
 msgid "Driver is Parent\t\n"
 msgstr "Драйвер - Parent\t\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2905
+#: src/frontend/mame/ui/selmenu.cpp:2914
 msgid "Analog Controls\tYes\n"
 msgstr "Аналоговое управление\tДа\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2907
+#: src/frontend/mame/ui/selmenu.cpp:2916
 msgid "Keyboard Inputs\tYes\n"
 msgstr "Ввод с клавиатуры\tДа\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2910
+#: src/frontend/mame/ui/selmenu.cpp:2919
 msgid "Overall\tNOT WORKING\n"
 msgstr "В целом\tНЕ РАБОТАЕТ\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2912
+#: src/frontend/mame/ui/selmenu.cpp:2921
 msgid "Overall\tUnemulated Protection\n"
 msgstr "В целом\tНе эмулируется защита\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2914
+#: src/frontend/mame/ui/selmenu.cpp:2923
 msgid "Overall\tWorking\n"
 msgstr "В целом\tРаботает\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2917
+#: src/frontend/mame/ui/selmenu.cpp:2926
 msgid "Graphics\tUnimplemented\n"
 msgstr "Графика\tНе эмуируется\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2919
+#: src/frontend/mame/ui/selmenu.cpp:2928
 msgid "Graphics\tWrong Colors\n"
 msgstr "Графика\tНе верные цвета\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2921
+#: src/frontend/mame/ui/selmenu.cpp:2930
 msgid "Graphics\tImperfect Colors\n"
 msgstr "Графика\tНе точные цвета\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2923
+#: src/frontend/mame/ui/selmenu.cpp:2932
 msgid "Graphics\tImperfect\n"
 msgstr "Графика\tНе идеально\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2925
+#: src/frontend/mame/ui/selmenu.cpp:2934
 msgid "Graphics\tOK\n"
 msgstr "Графика\tOK\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2928
+#: src/frontend/mame/ui/selmenu.cpp:2937
 msgid "Sound\tNone\n"
 msgstr "Звук\tОтсутствует\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2930
+#: src/frontend/mame/ui/selmenu.cpp:2939
 msgid "Sound\tUnimplemented\n"
 msgstr "Звук\tНе эмулируется\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2932
+#: src/frontend/mame/ui/selmenu.cpp:2941
 msgid "Sound\tImperfect\n"
 msgstr "Звук\tНе идеально\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2934
+#: src/frontend/mame/ui/selmenu.cpp:2943
 msgid "Sound\tOK\n"
 msgstr "Звук\tOK\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2937
+#: src/frontend/mame/ui/selmenu.cpp:2946
 msgid "Capture\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2939
+#: src/frontend/mame/ui/selmenu.cpp:2948
 msgid "Capture\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2942
+#: src/frontend/mame/ui/selmenu.cpp:2951
 msgid "Camera\tUnimplemented\n"
 msgstr "Камера\tНе эмулируется\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2944
+#: src/frontend/mame/ui/selmenu.cpp:2953
 msgid "Camera\tImperfect\n"
 msgstr "Камера\tНе идеально\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2947
+#: src/frontend/mame/ui/selmenu.cpp:2956
 msgid "Microphone\tUnimplemented\n"
 msgstr "Микрофон\tНе эмулируется\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2949
+#: src/frontend/mame/ui/selmenu.cpp:2958
 msgid "Microphone\tImperfect\n"
 msgstr "Микрофон\tНе идеально\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2952
+#: src/frontend/mame/ui/selmenu.cpp:2961
 msgid "Controls\tUnimplemented\n"
 msgstr "Управление\tНе эмулируется\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2954
+#: src/frontend/mame/ui/selmenu.cpp:2963
 msgid "Controls\tImperfect\n"
 msgstr "Управление\tНе идеально\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2957
+#: src/frontend/mame/ui/selmenu.cpp:2966
 msgid "Keyboard\tUnimplemented\n"
 msgstr "Клавиатура\tНе эмулируется\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2959
+#: src/frontend/mame/ui/selmenu.cpp:2968
 msgid "Keyboard\tImperfect\n"
 msgstr "Клавиатура\tНе идеально\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2962
+#: src/frontend/mame/ui/selmenu.cpp:2971
 msgid "Mouse\tUnimplemented\n"
 msgstr "Мышь\tНе эмулируется\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2964
+#: src/frontend/mame/ui/selmenu.cpp:2973
 msgid "Mouse\tImperfect\n"
 msgstr "Мышь\tНе идеально\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2967
+#: src/frontend/mame/ui/selmenu.cpp:2976
 msgid "Media\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2969
+#: src/frontend/mame/ui/selmenu.cpp:2978
 msgid "Media\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2972
+#: src/frontend/mame/ui/selmenu.cpp:2981
 msgid "Disk\tUnimplemented\n"
 msgstr "Диск\tНе эмулируется\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2974
+#: src/frontend/mame/ui/selmenu.cpp:2983
 msgid "Disk\tImperfect\n"
 msgstr "Диск\tНе идеально\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2977
+#: src/frontend/mame/ui/selmenu.cpp:2986
 msgid "Printer\tUnimplemented\n"
 msgstr "Принтер\tНе эмулируется\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2979
+#: src/frontend/mame/ui/selmenu.cpp:2988
 msgid "Printer\tImperfect\n"
 msgstr "Принтер\tНе идеально\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2982
+#: src/frontend/mame/ui/selmenu.cpp:2991
 msgid "Mag. Tape\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2984
+#: src/frontend/mame/ui/selmenu.cpp:2993
 msgid "Mag. Tape\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2987
+#: src/frontend/mame/ui/selmenu.cpp:2996
 msgid "Punch Tape\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2989
+#: src/frontend/mame/ui/selmenu.cpp:2998
 msgid "Punch Tape\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2992
+#: src/frontend/mame/ui/selmenu.cpp:3001
 msgid "Mag. Drum\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2994
+#: src/frontend/mame/ui/selmenu.cpp:3003
 msgid "Mag. Drum\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2997
+#: src/frontend/mame/ui/selmenu.cpp:3006
 msgid "(EP)ROM\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2999
+#: src/frontend/mame/ui/selmenu.cpp:3008
 msgid "(EP)ROM\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3002
+#: src/frontend/mame/ui/selmenu.cpp:3011
 msgid "Communications\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3004
+#: src/frontend/mame/ui/selmenu.cpp:3013
 msgid "Communications\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3007
+#: src/frontend/mame/ui/selmenu.cpp:3016
 msgid "LAN\tUnimplemented\n"
 msgstr "Локальная сеть\tНе эмулируется\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3009
+#: src/frontend/mame/ui/selmenu.cpp:3018
 msgid "LAN\tImperfect\n"
 msgstr "Локальная сеть\tНе идеально\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3012
+#: src/frontend/mame/ui/selmenu.cpp:3021
 msgid "WAN\tUnimplemented\n"
 msgstr "Удаленная сеть\tНе эмулируется\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3014
+#: src/frontend/mame/ui/selmenu.cpp:3023
 msgid "WAN\tImperfect\n"
 msgstr "Удаленная сеть\tНе идеально\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3017
+#: src/frontend/mame/ui/selmenu.cpp:3026
 msgid "Timing\tUnimplemented\n"
 msgstr "Скорость\tНе эмулируется\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3019
+#: src/frontend/mame/ui/selmenu.cpp:3028
 msgid "Timing\tImperfect\n"
 msgstr "Скорость\tНе идеально\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3021
+#: src/frontend/mame/ui/selmenu.cpp:3030
 msgid "Mechanical Machine\tYes\n"
 msgstr "Механическая система\tДа\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3021
+#: src/frontend/mame/ui/selmenu.cpp:3030
 msgid "Mechanical Machine\tNo\n"
 msgstr "Механическая система\tНет\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3022
+#: src/frontend/mame/ui/selmenu.cpp:3031
 msgid "Requires Artwork\tYes\n"
 msgstr "Требует элементы оформления\tДа\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3022
+#: src/frontend/mame/ui/selmenu.cpp:3031
 msgid "Requires Artwork\tNo\n"
 msgstr "Требует элементы оформления\tНет\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3023
+#: src/frontend/mame/ui/selmenu.cpp:3032
 msgid "Requires Clickable Artwork\tYes\n"
 msgstr "Требует кликабельное оформление\tДа\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3023
+#: src/frontend/mame/ui/selmenu.cpp:3032
 msgid "Requires Clickable Artwork\tNo\n"
 msgstr "Требует кликабельное оформление\tНет\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3025
+#: src/frontend/mame/ui/selmenu.cpp:3034
 msgid "Support Cocktail\tNo\n"
 msgstr "Поддерживает режим коктейль-стола\tНет\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3026
+#: src/frontend/mame/ui/selmenu.cpp:3035
 msgid "Driver is BIOS\tYes\n"
 msgstr "Драйвер - BIOS\tДа\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3026
+#: src/frontend/mame/ui/selmenu.cpp:3035
 msgid "Driver is BIOS\tNo\n"
 msgstr "Драйвер - BIOS\tНет\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3027
+#: src/frontend/mame/ui/selmenu.cpp:3036
 msgid "Support Save\tYes\n"
 msgstr "Поддерживает сохранение\tДа\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3027
+#: src/frontend/mame/ui/selmenu.cpp:3036
 msgid "Support Save\tNo\n"
 msgstr "Поддерживает сохранение\tНет\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3028
+#: src/frontend/mame/ui/selmenu.cpp:3037
 msgid "Screen Orientation\tVertical\n"
 msgstr "Ориентация экрана\tВертикальная\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3028
+#: src/frontend/mame/ui/selmenu.cpp:3037
 msgid "Screen Orientation\tHorizontal\n"
 msgstr "Ориентация экрана\tГоризонтальная\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3038
+#: src/frontend/mame/ui/selmenu.cpp:3047
 msgid "Requires CHD\tYes\n"
 msgstr "Требует CHD\tДа\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3038
+#: src/frontend/mame/ui/selmenu.cpp:3047
 msgid "Requires CHD\tNo\n"
 msgstr "Требует CHD\tНет\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3051
-msgid "ROM Audit Result\tOK\n"
-msgstr "Результат проверки ROM\tOK\n"
+#: src/frontend/mame/ui/selmenu.cpp:3060
+msgid "Media Audit Result\tOK\n"
+msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3053
-msgid "ROM Audit Result\tBAD\n"
-msgstr "Результат проверки ROM\tНЕУДАЧНО\n"
+#: src/frontend/mame/ui/selmenu.cpp:3062
+msgid "Media Audit Result\tBAD\n"
+msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3056
+#: src/frontend/mame/ui/selmenu.cpp:3065
 msgid "Samples Audit Result\tNone Needed\n"
 msgstr "Результат проверки сэмплов\tНе требуется\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3058
+#: src/frontend/mame/ui/selmenu.cpp:3067
 msgid "Samples Audit Result\tOK\n"
 msgstr "Результат проверки сэмплов\tOK\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3060
+#: src/frontend/mame/ui/selmenu.cpp:3069
 msgid "Samples Audit Result\tBAD\n"
 msgstr "Результат проверки сэмплов\tНЕУДАЧНО\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3064
+#: src/frontend/mame/ui/selmenu.cpp:3073
 msgid ""
-"ROM Audit \tDisabled\n"
-"Samples Audit \tDisabled\n"
+"Media Audit\tDisabled\n"
+"Samples Audit\tDisabled\n"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:150
+#: src/frontend/mame/ui/sndmenu.cpp:146
 msgid "Sound"
 msgstr "Звук"
 
-#: src/frontend/mame/ui/sndmenu.cpp:151
+#: src/frontend/mame/ui/sndmenu.cpp:147
 msgid "Compressor"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:152
+#: src/frontend/mame/ui/sndmenu.cpp:148
 msgid "Sample Rate"
 msgstr "Частота звука"
 
-#: src/frontend/mame/ui/sndmenu.cpp:153
+#: src/frontend/mame/ui/sndmenu.cpp:149
 msgid "Use External Samples"
 msgstr "Использовать внешние сэмплы"
 
@@ -3179,511 +3183,681 @@ msgstr ""
 msgid "  Screen '%1$s': Vector\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:132
+#: src/frontend/mame/ui/devopt.cpp:135
 #, c-format
 msgid "  Screen '%1$s': %2$d × %3$d (V) %4$s Hz\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:133
+#: src/frontend/mame/ui/devopt.cpp:136
 #, c-format
 msgid "  Screen '%1$s': %2$d × %3$d (H) %4$s Hz\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:147
+#: src/frontend/mame/ui/devopt.cpp:150
 msgid "* Sound:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:211
+#: src/frontend/mame/ui/devopt.cpp:214
 #, c-format
 msgid ""
 "* BIOS settings:\n"
 "  %1$d options    [default: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:255 src/frontend/mame/ui/devopt.cpp:271
-#: src/frontend/mame/ui/devopt.cpp:332
+#: src/frontend/mame/ui/devopt.cpp:258 src/frontend/mame/ui/devopt.cpp:274
+#: src/frontend/mame/ui/devopt.cpp:335
 #, c-format
 msgid "  %1$s    [default: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:260 src/frontend/mame/ui/devopt.cpp:276
+#: src/frontend/mame/ui/devopt.cpp:263 src/frontend/mame/ui/devopt.cpp:279
 #, c-format
 msgid "  %1$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:282
+#: src/frontend/mame/ui/devopt.cpp:285
 msgid "* DIP switch settings:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:287
+#: src/frontend/mame/ui/devopt.cpp:290
 msgid "* Configuration settings:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:291
+#: src/frontend/mame/ui/devopt.cpp:294
 msgid "* Input device(s):\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:293
+#: src/frontend/mame/ui/devopt.cpp:296
 #, c-format
 msgid "  User inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:295
+#: src/frontend/mame/ui/devopt.cpp:298
 #, c-format
 msgid "  Mahjong inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:297
+#: src/frontend/mame/ui/devopt.cpp:300
 #, c-format
 msgid "  Hanafuda inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:299
+#: src/frontend/mame/ui/devopt.cpp:302
 #, c-format
 msgid "  Gambling inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:301
+#: src/frontend/mame/ui/devopt.cpp:304
 #, c-format
 msgid "  Analog inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:303
+#: src/frontend/mame/ui/devopt.cpp:306
 #, c-format
 msgid "  Adjuster inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:305
+#: src/frontend/mame/ui/devopt.cpp:308
 #, c-format
 msgid "  Keypad inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:307
+#: src/frontend/mame/ui/devopt.cpp:310
 #, c-format
 msgid "  Keyboard inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:312
+#: src/frontend/mame/ui/devopt.cpp:315
 msgid "* Media Options:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:317
+#: src/frontend/mame/ui/devopt.cpp:320
 #, c-format
 msgid "  %1$s    [tag: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:327
+#: src/frontend/mame/ui/devopt.cpp:330
 msgid "* Slot Options:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:341
+#: src/frontend/mame/ui/devopt.cpp:344
 msgid "[None]\n"
 msgstr ""
 
-#: src/emu/render.cpp:1847
+#: src/emu/render.cpp:1796
 #, c-format
 msgctxt "view-name"
 msgid "Screen %1$u Standard (%2$u:%3$u)"
 msgstr ""
 
-#: src/emu/render.cpp:1873
+#: src/emu/render.cpp:1822
 #, c-format
 msgctxt "view-name"
 msgid "Screen %1$u Pixel Aspect (%2$u:%3$u)"
 msgstr ""
 
-#: src/emu/render.cpp:1895 src/emu/render.cpp:2030
+#: src/emu/render.cpp:1844 src/emu/render.cpp:1979
 msgctxt "view-name"
 msgid "Cocktail"
 msgstr ""
 
-#: src/emu/render.cpp:2015
+#: src/emu/render.cpp:1964
 msgctxt "view-name"
 msgid "Left-to-Right"
 msgstr ""
 
-#: src/emu/render.cpp:2016
+#: src/emu/render.cpp:1965
 msgctxt "view-name"
 msgid "Left-to-Right (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2017
+#: src/emu/render.cpp:1966
 msgctxt "view-name"
 msgid "Top-to-Bottom"
 msgstr ""
 
-#: src/emu/render.cpp:2018
+#: src/emu/render.cpp:1967
 msgctxt "view-name"
 msgid "Top-to-Bottom (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2069
+#: src/emu/render.cpp:2018
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Left-to-Right, Top-to-Bottom"
 msgstr ""
 
-#: src/emu/render.cpp:2078
+#: src/emu/render.cpp:2027
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Left-to-Right, Top-to-Bottom (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2087
+#: src/emu/render.cpp:2036
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Top-to-Bottom, Left-to-Right"
 msgstr ""
 
-#: src/emu/render.cpp:2096
+#: src/emu/render.cpp:2045
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Top-to-Bottom, Left-to-Right (Gapless)"
 msgstr ""
 
-#: src/emu/inpttype.ipp:22
+#: src/emu/ioport.cpp:332
+#, c-format
 msgctxt "input-name"
-msgid "P1 Up"
+msgid "P%1$u"
 msgstr ""
 
-#: src/emu/inpttype.ipp:23
+#: src/emu/ioport.cpp:1924
 msgctxt "input-name"
-msgid "P1 Down"
+msgid "???"
 msgstr ""
 
-#: src/emu/inpttype.ipp:24
+#: src/emu/inpttype.ipp:22 src/emu/inpttype.ipp:140 src/emu/inpttype.ipp:221
+#: src/emu/inpttype.ipp:255 src/emu/inpttype.ipp:289 src/emu/inpttype.ipp:323
+#: src/emu/inpttype.ipp:357 src/emu/inpttype.ipp:391 src/emu/inpttype.ipp:425
+#: src/emu/inpttype.ipp:459
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left"
+msgid "%p Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:25
+#: src/emu/inpttype.ipp:23 src/emu/inpttype.ipp:141 src/emu/inpttype.ipp:222
+#: src/emu/inpttype.ipp:256 src/emu/inpttype.ipp:290 src/emu/inpttype.ipp:324
+#: src/emu/inpttype.ipp:358 src/emu/inpttype.ipp:392 src/emu/inpttype.ipp:426
+#: src/emu/inpttype.ipp:460
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right"
+msgid "%p Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:26
+#: src/emu/inpttype.ipp:24 src/emu/inpttype.ipp:142 src/emu/inpttype.ipp:223
+#: src/emu/inpttype.ipp:257 src/emu/inpttype.ipp:291 src/emu/inpttype.ipp:325
+#: src/emu/inpttype.ipp:359 src/emu/inpttype.ipp:393 src/emu/inpttype.ipp:427
+#: src/emu/inpttype.ipp:461
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Up"
+msgid "%p Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:27
+#: src/emu/inpttype.ipp:25 src/emu/inpttype.ipp:143 src/emu/inpttype.ipp:224
+#: src/emu/inpttype.ipp:258 src/emu/inpttype.ipp:292 src/emu/inpttype.ipp:326
+#: src/emu/inpttype.ipp:360 src/emu/inpttype.ipp:394 src/emu/inpttype.ipp:428
+#: src/emu/inpttype.ipp:462
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Down"
+msgid "%p Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:28
+#: src/emu/inpttype.ipp:26 src/emu/inpttype.ipp:144 src/emu/inpttype.ipp:225
+#: src/emu/inpttype.ipp:259 src/emu/inpttype.ipp:293 src/emu/inpttype.ipp:327
+#: src/emu/inpttype.ipp:361 src/emu/inpttype.ipp:395 src/emu/inpttype.ipp:429
+#: src/emu/inpttype.ipp:463
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Left"
+msgid "%p Right Stick/Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:29
+#: src/emu/inpttype.ipp:27 src/emu/inpttype.ipp:145 src/emu/inpttype.ipp:226
+#: src/emu/inpttype.ipp:260 src/emu/inpttype.ipp:294 src/emu/inpttype.ipp:328
+#: src/emu/inpttype.ipp:362 src/emu/inpttype.ipp:396 src/emu/inpttype.ipp:430
+#: src/emu/inpttype.ipp:464
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Right"
+msgid "%p Right Stick/Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:30
+#: src/emu/inpttype.ipp:28 src/emu/inpttype.ipp:146 src/emu/inpttype.ipp:227
+#: src/emu/inpttype.ipp:261 src/emu/inpttype.ipp:295 src/emu/inpttype.ipp:329
+#: src/emu/inpttype.ipp:363 src/emu/inpttype.ipp:397 src/emu/inpttype.ipp:431
+#: src/emu/inpttype.ipp:465
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Up"
+msgid "%p Right Stick/Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:31
+#: src/emu/inpttype.ipp:29 src/emu/inpttype.ipp:147 src/emu/inpttype.ipp:228
+#: src/emu/inpttype.ipp:262 src/emu/inpttype.ipp:296 src/emu/inpttype.ipp:330
+#: src/emu/inpttype.ipp:364 src/emu/inpttype.ipp:398 src/emu/inpttype.ipp:432
+#: src/emu/inpttype.ipp:466
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Down"
+msgid "%p Right Stick/Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:32
+#: src/emu/inpttype.ipp:30 src/emu/inpttype.ipp:148 src/emu/inpttype.ipp:229
+#: src/emu/inpttype.ipp:263 src/emu/inpttype.ipp:297 src/emu/inpttype.ipp:331
+#: src/emu/inpttype.ipp:365 src/emu/inpttype.ipp:399 src/emu/inpttype.ipp:433
+#: src/emu/inpttype.ipp:467
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Left"
+msgid "%p Left Stick/Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:33
+#: src/emu/inpttype.ipp:31 src/emu/inpttype.ipp:149 src/emu/inpttype.ipp:230
+#: src/emu/inpttype.ipp:264 src/emu/inpttype.ipp:298 src/emu/inpttype.ipp:332
+#: src/emu/inpttype.ipp:366 src/emu/inpttype.ipp:400 src/emu/inpttype.ipp:434
+#: src/emu/inpttype.ipp:468
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Right"
+msgid "%p Left Stick/Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:34
+#: src/emu/inpttype.ipp:32 src/emu/inpttype.ipp:150 src/emu/inpttype.ipp:231
+#: src/emu/inpttype.ipp:265 src/emu/inpttype.ipp:299 src/emu/inpttype.ipp:333
+#: src/emu/inpttype.ipp:367 src/emu/inpttype.ipp:401 src/emu/inpttype.ipp:435
+#: src/emu/inpttype.ipp:469
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 1"
+msgid "%p Left Stick/Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:35
+#: src/emu/inpttype.ipp:33 src/emu/inpttype.ipp:151 src/emu/inpttype.ipp:232
+#: src/emu/inpttype.ipp:266 src/emu/inpttype.ipp:300 src/emu/inpttype.ipp:334
+#: src/emu/inpttype.ipp:368 src/emu/inpttype.ipp:402 src/emu/inpttype.ipp:436
+#: src/emu/inpttype.ipp:470
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 2"
+msgid "%p Left Stick/Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:36
+#: src/emu/inpttype.ipp:34 src/emu/inpttype.ipp:152 src/emu/inpttype.ipp:233
+#: src/emu/inpttype.ipp:267 src/emu/inpttype.ipp:301 src/emu/inpttype.ipp:335
+#: src/emu/inpttype.ipp:369 src/emu/inpttype.ipp:403 src/emu/inpttype.ipp:437
+#: src/emu/inpttype.ipp:471
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 3"
+msgid "%p Button 1"
 msgstr ""
 
-#: src/emu/inpttype.ipp:37
+#: src/emu/inpttype.ipp:35 src/emu/inpttype.ipp:153 src/emu/inpttype.ipp:234
+#: src/emu/inpttype.ipp:268 src/emu/inpttype.ipp:302 src/emu/inpttype.ipp:336
+#: src/emu/inpttype.ipp:370 src/emu/inpttype.ipp:404 src/emu/inpttype.ipp:438
+#: src/emu/inpttype.ipp:472
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 4"
+msgid "%p Button 2"
 msgstr ""
 
-#: src/emu/inpttype.ipp:38
+#: src/emu/inpttype.ipp:36 src/emu/inpttype.ipp:154 src/emu/inpttype.ipp:235
+#: src/emu/inpttype.ipp:269 src/emu/inpttype.ipp:303 src/emu/inpttype.ipp:337
+#: src/emu/inpttype.ipp:371 src/emu/inpttype.ipp:405 src/emu/inpttype.ipp:439
+#: src/emu/inpttype.ipp:473
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 5"
+msgid "%p Button 3"
 msgstr ""
 
-#: src/emu/inpttype.ipp:39
+#: src/emu/inpttype.ipp:37 src/emu/inpttype.ipp:155 src/emu/inpttype.ipp:236
+#: src/emu/inpttype.ipp:270 src/emu/inpttype.ipp:304 src/emu/inpttype.ipp:338
+#: src/emu/inpttype.ipp:372 src/emu/inpttype.ipp:406 src/emu/inpttype.ipp:440
+#: src/emu/inpttype.ipp:474
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 6"
+msgid "%p Button 4"
 msgstr ""
 
-#: src/emu/inpttype.ipp:40
+#: src/emu/inpttype.ipp:38 src/emu/inpttype.ipp:156 src/emu/inpttype.ipp:237
+#: src/emu/inpttype.ipp:271 src/emu/inpttype.ipp:305 src/emu/inpttype.ipp:339
+#: src/emu/inpttype.ipp:373 src/emu/inpttype.ipp:407 src/emu/inpttype.ipp:441
+#: src/emu/inpttype.ipp:475
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 7"
+msgid "%p Button 5"
 msgstr ""
 
-#: src/emu/inpttype.ipp:41
+#: src/emu/inpttype.ipp:39 src/emu/inpttype.ipp:157 src/emu/inpttype.ipp:238
+#: src/emu/inpttype.ipp:272 src/emu/inpttype.ipp:306 src/emu/inpttype.ipp:340
+#: src/emu/inpttype.ipp:374 src/emu/inpttype.ipp:408 src/emu/inpttype.ipp:442
+#: src/emu/inpttype.ipp:476
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 8"
+msgid "%p Button 6"
 msgstr ""
 
-#: src/emu/inpttype.ipp:42
+#: src/emu/inpttype.ipp:40 src/emu/inpttype.ipp:158 src/emu/inpttype.ipp:239
+#: src/emu/inpttype.ipp:273 src/emu/inpttype.ipp:307 src/emu/inpttype.ipp:341
+#: src/emu/inpttype.ipp:375 src/emu/inpttype.ipp:409 src/emu/inpttype.ipp:443
+#: src/emu/inpttype.ipp:477
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 9"
+msgid "%p Button 7"
 msgstr ""
 
-#: src/emu/inpttype.ipp:43
+#: src/emu/inpttype.ipp:41 src/emu/inpttype.ipp:159 src/emu/inpttype.ipp:240
+#: src/emu/inpttype.ipp:274 src/emu/inpttype.ipp:308 src/emu/inpttype.ipp:342
+#: src/emu/inpttype.ipp:376 src/emu/inpttype.ipp:410 src/emu/inpttype.ipp:444
+#: src/emu/inpttype.ipp:478
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 10"
+msgid "%p Button 8"
 msgstr ""
 
-#: src/emu/inpttype.ipp:44
+#: src/emu/inpttype.ipp:42 src/emu/inpttype.ipp:160 src/emu/inpttype.ipp:241
+#: src/emu/inpttype.ipp:275 src/emu/inpttype.ipp:309 src/emu/inpttype.ipp:343
+#: src/emu/inpttype.ipp:377 src/emu/inpttype.ipp:411 src/emu/inpttype.ipp:445
+#: src/emu/inpttype.ipp:479
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 11"
+msgid "%p Button 9"
 msgstr ""
 
-#: src/emu/inpttype.ipp:45
+#: src/emu/inpttype.ipp:43 src/emu/inpttype.ipp:161 src/emu/inpttype.ipp:242
+#: src/emu/inpttype.ipp:276 src/emu/inpttype.ipp:310 src/emu/inpttype.ipp:344
+#: src/emu/inpttype.ipp:378 src/emu/inpttype.ipp:412 src/emu/inpttype.ipp:446
+#: src/emu/inpttype.ipp:480
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 12"
+msgid "%p Button 10"
 msgstr ""
 
-#: src/emu/inpttype.ipp:46
+#: src/emu/inpttype.ipp:44 src/emu/inpttype.ipp:162 src/emu/inpttype.ipp:243
+#: src/emu/inpttype.ipp:277 src/emu/inpttype.ipp:311 src/emu/inpttype.ipp:345
+#: src/emu/inpttype.ipp:379 src/emu/inpttype.ipp:413 src/emu/inpttype.ipp:447
+#: src/emu/inpttype.ipp:481
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 13"
+msgid "%p Button 11"
 msgstr ""
 
-#: src/emu/inpttype.ipp:47
+#: src/emu/inpttype.ipp:45 src/emu/inpttype.ipp:163 src/emu/inpttype.ipp:244
+#: src/emu/inpttype.ipp:278 src/emu/inpttype.ipp:312 src/emu/inpttype.ipp:346
+#: src/emu/inpttype.ipp:380 src/emu/inpttype.ipp:414 src/emu/inpttype.ipp:448
+#: src/emu/inpttype.ipp:482
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 14"
+msgid "%p Button 12"
 msgstr ""
 
-#: src/emu/inpttype.ipp:48
+#: src/emu/inpttype.ipp:46 src/emu/inpttype.ipp:164 src/emu/inpttype.ipp:245
+#: src/emu/inpttype.ipp:279 src/emu/inpttype.ipp:313 src/emu/inpttype.ipp:347
+#: src/emu/inpttype.ipp:381 src/emu/inpttype.ipp:415 src/emu/inpttype.ipp:449
+#: src/emu/inpttype.ipp:483
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 15"
+msgid "%p Button 13"
 msgstr ""
 
-#: src/emu/inpttype.ipp:49
+#: src/emu/inpttype.ipp:47 src/emu/inpttype.ipp:165 src/emu/inpttype.ipp:246
+#: src/emu/inpttype.ipp:280 src/emu/inpttype.ipp:314 src/emu/inpttype.ipp:348
+#: src/emu/inpttype.ipp:382 src/emu/inpttype.ipp:416 src/emu/inpttype.ipp:450
+#: src/emu/inpttype.ipp:484
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 16"
+msgid "%p Button 14"
 msgstr ""
 
-#: src/emu/inpttype.ipp:50
+#: src/emu/inpttype.ipp:48 src/emu/inpttype.ipp:166 src/emu/inpttype.ipp:247
+#: src/emu/inpttype.ipp:281 src/emu/inpttype.ipp:315 src/emu/inpttype.ipp:349
+#: src/emu/inpttype.ipp:383 src/emu/inpttype.ipp:417 src/emu/inpttype.ipp:451
+#: src/emu/inpttype.ipp:485
+#, c-format
 msgctxt "input-name"
-msgid "P1 Start"
+msgid "%p Button 15"
 msgstr ""
 
-#: src/emu/inpttype.ipp:51
+#: src/emu/inpttype.ipp:49 src/emu/inpttype.ipp:167 src/emu/inpttype.ipp:248
+#: src/emu/inpttype.ipp:282 src/emu/inpttype.ipp:316 src/emu/inpttype.ipp:350
+#: src/emu/inpttype.ipp:384 src/emu/inpttype.ipp:418 src/emu/inpttype.ipp:452
+#: src/emu/inpttype.ipp:486
+#, c-format
 msgctxt "input-name"
-msgid "P1 Select"
+msgid "%p Button 16"
 msgstr ""
 
-#: src/emu/inpttype.ipp:56
+#: src/emu/inpttype.ipp:50 src/emu/inpttype.ipp:168 src/emu/inpttype.ipp:249
+#: src/emu/inpttype.ipp:283 src/emu/inpttype.ipp:317 src/emu/inpttype.ipp:351
+#: src/emu/inpttype.ipp:385 src/emu/inpttype.ipp:419 src/emu/inpttype.ipp:453
+#: src/emu/inpttype.ipp:487
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong A"
+msgid "%p Start"
 msgstr ""
 
-#: src/emu/inpttype.ipp:57
+#: src/emu/inpttype.ipp:51 src/emu/inpttype.ipp:169 src/emu/inpttype.ipp:250
+#: src/emu/inpttype.ipp:284 src/emu/inpttype.ipp:318 src/emu/inpttype.ipp:352
+#: src/emu/inpttype.ipp:386 src/emu/inpttype.ipp:420 src/emu/inpttype.ipp:454
+#: src/emu/inpttype.ipp:488
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong B"
+msgid "%p Select"
 msgstr ""
 
-#: src/emu/inpttype.ipp:58
+#: src/emu/inpttype.ipp:56 src/emu/inpttype.ipp:174
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong C"
+msgid "%p Mahjong A"
 msgstr ""
 
-#: src/emu/inpttype.ipp:59
+#: src/emu/inpttype.ipp:57 src/emu/inpttype.ipp:175
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong D"
+msgid "%p Mahjong B"
 msgstr ""
 
-#: src/emu/inpttype.ipp:60
+#: src/emu/inpttype.ipp:58 src/emu/inpttype.ipp:176
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong E"
+msgid "%p Mahjong C"
 msgstr ""
 
-#: src/emu/inpttype.ipp:61
+#: src/emu/inpttype.ipp:59 src/emu/inpttype.ipp:177
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong F"
+msgid "%p Mahjong D"
 msgstr ""
 
-#: src/emu/inpttype.ipp:62
+#: src/emu/inpttype.ipp:60 src/emu/inpttype.ipp:178
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong G"
+msgid "%p Mahjong E"
 msgstr ""
 
-#: src/emu/inpttype.ipp:63
+#: src/emu/inpttype.ipp:61 src/emu/inpttype.ipp:179
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong H"
+msgid "%p Mahjong F"
 msgstr ""
 
-#: src/emu/inpttype.ipp:64
+#: src/emu/inpttype.ipp:62 src/emu/inpttype.ipp:180
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong I"
+msgid "%p Mahjong G"
 msgstr ""
 
-#: src/emu/inpttype.ipp:65
+#: src/emu/inpttype.ipp:63 src/emu/inpttype.ipp:181
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong J"
+msgid "%p Mahjong H"
 msgstr ""
 
-#: src/emu/inpttype.ipp:66
+#: src/emu/inpttype.ipp:64 src/emu/inpttype.ipp:182
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong K"
+msgid "%p Mahjong I"
 msgstr ""
 
-#: src/emu/inpttype.ipp:67
+#: src/emu/inpttype.ipp:65 src/emu/inpttype.ipp:183
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong L"
+msgid "%p Mahjong J"
 msgstr ""
 
-#: src/emu/inpttype.ipp:68
+#: src/emu/inpttype.ipp:66 src/emu/inpttype.ipp:184
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong M"
+msgid "%p Mahjong K"
 msgstr ""
 
-#: src/emu/inpttype.ipp:69
+#: src/emu/inpttype.ipp:67 src/emu/inpttype.ipp:185
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong N"
+msgid "%p Mahjong L"
 msgstr ""
 
-#: src/emu/inpttype.ipp:70
+#: src/emu/inpttype.ipp:68 src/emu/inpttype.ipp:186
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong O"
+msgid "%p Mahjong M"
 msgstr ""
 
-#: src/emu/inpttype.ipp:71
+#: src/emu/inpttype.ipp:69 src/emu/inpttype.ipp:187
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong P"
+msgid "%p Mahjong N"
 msgstr ""
 
-#: src/emu/inpttype.ipp:72
+#: src/emu/inpttype.ipp:70 src/emu/inpttype.ipp:188
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Q"
+msgid "%p Mahjong O"
 msgstr ""
 
-#: src/emu/inpttype.ipp:73
+#: src/emu/inpttype.ipp:71 src/emu/inpttype.ipp:189
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Kan"
+msgid "%p Mahjong P"
 msgstr ""
 
-#: src/emu/inpttype.ipp:74
+#: src/emu/inpttype.ipp:72 src/emu/inpttype.ipp:190
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Pon"
+msgid "%p Mahjong Q"
 msgstr ""
 
-#: src/emu/inpttype.ipp:75
+#: src/emu/inpttype.ipp:73 src/emu/inpttype.ipp:191
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Chi"
+msgid "%p Mahjong Kan"
 msgstr ""
 
-#: src/emu/inpttype.ipp:76
+#: src/emu/inpttype.ipp:74 src/emu/inpttype.ipp:192
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Reach"
+msgid "%p Mahjong Pon"
 msgstr ""
 
-#: src/emu/inpttype.ipp:77
+#: src/emu/inpttype.ipp:75 src/emu/inpttype.ipp:193
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Ron"
+msgid "%p Mahjong Chi"
 msgstr ""
 
-#: src/emu/inpttype.ipp:78
+#: src/emu/inpttype.ipp:76 src/emu/inpttype.ipp:194
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Flip Flop"
+msgid "%p Mahjong Reach"
 msgstr ""
 
-#: src/emu/inpttype.ipp:79
+#: src/emu/inpttype.ipp:77 src/emu/inpttype.ipp:195
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Bet"
+msgid "%p Mahjong Ron"
 msgstr ""
 
-#: src/emu/inpttype.ipp:80
+#: src/emu/inpttype.ipp:78 src/emu/inpttype.ipp:200
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Take Score"
+msgid "%p Mahjong Flip Flop"
 msgstr ""
 
-#: src/emu/inpttype.ipp:81
+#: src/emu/inpttype.ipp:79 src/emu/inpttype.ipp:196
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Double Up"
+msgid "%p Mahjong Bet"
 msgstr ""
 
-#: src/emu/inpttype.ipp:82
+#: src/emu/inpttype.ipp:80 src/emu/inpttype.ipp:198
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Big"
+msgid "%p Mahjong Take Score"
 msgstr ""
 
-#: src/emu/inpttype.ipp:83
+#: src/emu/inpttype.ipp:81 src/emu/inpttype.ipp:199
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Small"
+msgid "%p Mahjong Double Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:84
+#: src/emu/inpttype.ipp:82 src/emu/inpttype.ipp:201
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Last Chance"
+msgid "%p Mahjong Big"
 msgstr ""
 
-#: src/emu/inpttype.ipp:89
+#: src/emu/inpttype.ipp:83 src/emu/inpttype.ipp:202
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda A/1"
+msgid "%p Mahjong Small"
 msgstr ""
 
-#: src/emu/inpttype.ipp:90
+#: src/emu/inpttype.ipp:84 src/emu/inpttype.ipp:197
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda B/2"
+msgid "%p Mahjong Last Chance"
 msgstr ""
 
-#: src/emu/inpttype.ipp:91
+#: src/emu/inpttype.ipp:89 src/emu/inpttype.ipp:207
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda C/3"
+msgid "%p Hanafuda A/1"
 msgstr ""
 
-#: src/emu/inpttype.ipp:92
+#: src/emu/inpttype.ipp:90 src/emu/inpttype.ipp:208
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda D/4"
+msgid "%p Hanafuda B/2"
 msgstr ""
 
-#: src/emu/inpttype.ipp:93
+#: src/emu/inpttype.ipp:91 src/emu/inpttype.ipp:209
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda E/5"
+msgid "%p Hanafuda C/3"
 msgstr ""
 
-#: src/emu/inpttype.ipp:94
+#: src/emu/inpttype.ipp:92 src/emu/inpttype.ipp:210
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda F/6"
+msgid "%p Hanafuda D/4"
 msgstr ""
 
-#: src/emu/inpttype.ipp:95
+#: src/emu/inpttype.ipp:93 src/emu/inpttype.ipp:211
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda G/7"
+msgid "%p Hanafuda E/5"
 msgstr ""
 
-#: src/emu/inpttype.ipp:96
+#: src/emu/inpttype.ipp:94 src/emu/inpttype.ipp:212
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda H/8"
+msgid "%p Hanafuda F/6"
 msgstr ""
 
-#: src/emu/inpttype.ipp:97
+#: src/emu/inpttype.ipp:95 src/emu/inpttype.ipp:213
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda Yes"
+msgid "%p Hanafuda G/7"
 msgstr ""
 
-#: src/emu/inpttype.ipp:98
+#: src/emu/inpttype.ipp:96 src/emu/inpttype.ipp:214
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda No"
+msgid "%p Hanafuda H/8"
+msgstr ""
+
+#: src/emu/inpttype.ipp:97 src/emu/inpttype.ipp:215
+#, c-format
+msgctxt "input-name"
+msgid "%p Hanafuda Yes"
+msgstr ""
+
+#: src/emu/inpttype.ipp:98 src/emu/inpttype.ipp:216
+#, c-format
+msgctxt "input-name"
+msgid "%p Hanafuda No"
 msgstr ""
 
 #: src/emu/inpttype.ipp:103
@@ -3811,1551 +3985,6 @@ msgctxt "input-name"
 msgid "Stop All Reels"
 msgstr ""
 
-#: src/emu/inpttype.ipp:140
-msgctxt "input-name"
-msgid "P2 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:141
-msgctxt "input-name"
-msgid "P2 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:142
-msgctxt "input-name"
-msgid "P2 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:143
-msgctxt "input-name"
-msgid "P2 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:144
-msgctxt "input-name"
-msgid "P2 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:145
-msgctxt "input-name"
-msgid "P2 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:146
-msgctxt "input-name"
-msgid "P2 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:147
-msgctxt "input-name"
-msgid "P2 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:148
-msgctxt "input-name"
-msgid "P2 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:149
-msgctxt "input-name"
-msgid "P2 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:150
-msgctxt "input-name"
-msgid "P2 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:151
-msgctxt "input-name"
-msgid "P2 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:152
-msgctxt "input-name"
-msgid "P2 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:153
-msgctxt "input-name"
-msgid "P2 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:154
-msgctxt "input-name"
-msgid "P2 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:155
-msgctxt "input-name"
-msgid "P2 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:156
-msgctxt "input-name"
-msgid "P2 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:157
-msgctxt "input-name"
-msgid "P2 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:158
-msgctxt "input-name"
-msgid "P2 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:159
-msgctxt "input-name"
-msgid "P2 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:160
-msgctxt "input-name"
-msgid "P2 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:161
-msgctxt "input-name"
-msgid "P2 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:162
-msgctxt "input-name"
-msgid "P2 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:163
-msgctxt "input-name"
-msgid "P2 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:164
-msgctxt "input-name"
-msgid "P2 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:165
-msgctxt "input-name"
-msgid "P2 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:166
-msgctxt "input-name"
-msgid "P2 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:167
-msgctxt "input-name"
-msgid "P2 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:168
-msgctxt "input-name"
-msgid "P2 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:169
-msgctxt "input-name"
-msgid "P2 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:174
-msgctxt "input-name"
-msgid "P2 Mahjong A"
-msgstr ""
-
-#: src/emu/inpttype.ipp:175
-msgctxt "input-name"
-msgid "P2 Mahjong B"
-msgstr ""
-
-#: src/emu/inpttype.ipp:176
-msgctxt "input-name"
-msgid "P2 Mahjong C"
-msgstr ""
-
-#: src/emu/inpttype.ipp:177
-msgctxt "input-name"
-msgid "P2 Mahjong D"
-msgstr ""
-
-#: src/emu/inpttype.ipp:178
-msgctxt "input-name"
-msgid "P2 Mahjong E"
-msgstr ""
-
-#: src/emu/inpttype.ipp:179
-msgctxt "input-name"
-msgid "P2 Mahjong F"
-msgstr ""
-
-#: src/emu/inpttype.ipp:180
-msgctxt "input-name"
-msgid "P2 Mahjong G"
-msgstr ""
-
-#: src/emu/inpttype.ipp:181
-msgctxt "input-name"
-msgid "P2 Mahjong H"
-msgstr ""
-
-#: src/emu/inpttype.ipp:182
-msgctxt "input-name"
-msgid "P2 Mahjong I"
-msgstr ""
-
-#: src/emu/inpttype.ipp:183
-msgctxt "input-name"
-msgid "P2 Mahjong J"
-msgstr ""
-
-#: src/emu/inpttype.ipp:184
-msgctxt "input-name"
-msgid "P2 Mahjong K"
-msgstr ""
-
-#: src/emu/inpttype.ipp:185
-msgctxt "input-name"
-msgid "P2 Mahjong L"
-msgstr ""
-
-#: src/emu/inpttype.ipp:186
-msgctxt "input-name"
-msgid "P2 Mahjong M"
-msgstr ""
-
-#: src/emu/inpttype.ipp:187
-msgctxt "input-name"
-msgid "P2 Mahjong N"
-msgstr ""
-
-#: src/emu/inpttype.ipp:188
-msgctxt "input-name"
-msgid "P2 Mahjong O"
-msgstr ""
-
-#: src/emu/inpttype.ipp:189
-msgctxt "input-name"
-msgid "P2 Mahjong P"
-msgstr ""
-
-#: src/emu/inpttype.ipp:190
-msgctxt "input-name"
-msgid "P2 Mahjong Q"
-msgstr ""
-
-#: src/emu/inpttype.ipp:191
-msgctxt "input-name"
-msgid "P2 Mahjong Kan"
-msgstr ""
-
-#: src/emu/inpttype.ipp:192
-msgctxt "input-name"
-msgid "P2 Mahjong Pon"
-msgstr ""
-
-#: src/emu/inpttype.ipp:193
-msgctxt "input-name"
-msgid "P2 Mahjong Chi"
-msgstr ""
-
-#: src/emu/inpttype.ipp:194
-msgctxt "input-name"
-msgid "P2 Mahjong Reach"
-msgstr ""
-
-#: src/emu/inpttype.ipp:195
-msgctxt "input-name"
-msgid "P2 Mahjong Ron"
-msgstr ""
-
-#: src/emu/inpttype.ipp:196
-msgctxt "input-name"
-msgid "P2 Mahjong Bet"
-msgstr ""
-
-#: src/emu/inpttype.ipp:197
-msgctxt "input-name"
-msgid "P2 Mahjong Last Chance"
-msgstr ""
-
-#: src/emu/inpttype.ipp:198
-msgctxt "input-name"
-msgid "P2 Mahjong Take Score"
-msgstr ""
-
-#: src/emu/inpttype.ipp:199
-msgctxt "input-name"
-msgid "P2 Mahjong Double Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:200
-msgctxt "input-name"
-msgid "P2 Mahjong Flip Flop"
-msgstr ""
-
-#: src/emu/inpttype.ipp:201
-msgctxt "input-name"
-msgid "P2 Mahjong Big"
-msgstr ""
-
-#: src/emu/inpttype.ipp:202
-msgctxt "input-name"
-msgid "P2 Mahjong Small"
-msgstr ""
-
-#: src/emu/inpttype.ipp:207
-msgctxt "input-name"
-msgid "P2 Hanafuda A/1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:208
-msgctxt "input-name"
-msgid "P2 Hanafuda B/2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:209
-msgctxt "input-name"
-msgid "P2 Hanafuda C/3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:210
-msgctxt "input-name"
-msgid "P2 Hanafuda D/4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:211
-msgctxt "input-name"
-msgid "P2 Hanafuda E/5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:212
-msgctxt "input-name"
-msgid "P2 Hanafuda F/6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:213
-msgctxt "input-name"
-msgid "P2 Hanafuda G/7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:214
-msgctxt "input-name"
-msgid "P2 Hanafuda H/8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:215
-msgctxt "input-name"
-msgid "P2 Hanafuda Yes"
-msgstr ""
-
-#: src/emu/inpttype.ipp:216
-msgctxt "input-name"
-msgid "P2 Hanafuda No"
-msgstr ""
-
-#: src/emu/inpttype.ipp:221
-msgctxt "input-name"
-msgid "P3 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:222
-msgctxt "input-name"
-msgid "P3 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:223
-msgctxt "input-name"
-msgid "P3 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:224
-msgctxt "input-name"
-msgid "P3 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:225
-msgctxt "input-name"
-msgid "P3 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:226
-msgctxt "input-name"
-msgid "P3 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:227
-msgctxt "input-name"
-msgid "P3 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:228
-msgctxt "input-name"
-msgid "P3 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:229
-msgctxt "input-name"
-msgid "P3 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:230
-msgctxt "input-name"
-msgid "P3 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:231
-msgctxt "input-name"
-msgid "P3 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:232
-msgctxt "input-name"
-msgid "P3 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:233
-msgctxt "input-name"
-msgid "P3 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:234
-msgctxt "input-name"
-msgid "P3 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:235
-msgctxt "input-name"
-msgid "P3 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:236
-msgctxt "input-name"
-msgid "P3 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:237
-msgctxt "input-name"
-msgid "P3 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:238
-msgctxt "input-name"
-msgid "P3 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:239
-msgctxt "input-name"
-msgid "P3 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:240
-msgctxt "input-name"
-msgid "P3 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:241
-msgctxt "input-name"
-msgid "P3 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:242
-msgctxt "input-name"
-msgid "P3 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:243
-msgctxt "input-name"
-msgid "P3 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:244
-msgctxt "input-name"
-msgid "P3 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:245
-msgctxt "input-name"
-msgid "P3 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:246
-msgctxt "input-name"
-msgid "P3 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:247
-msgctxt "input-name"
-msgid "P3 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:248
-msgctxt "input-name"
-msgid "P3 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:249
-msgctxt "input-name"
-msgid "P3 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:250
-msgctxt "input-name"
-msgid "P3 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:255
-msgctxt "input-name"
-msgid "P4 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:256
-msgctxt "input-name"
-msgid "P4 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:257
-msgctxt "input-name"
-msgid "P4 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:258
-msgctxt "input-name"
-msgid "P4 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:259
-msgctxt "input-name"
-msgid "P4 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:260
-msgctxt "input-name"
-msgid "P4 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:261
-msgctxt "input-name"
-msgid "P4 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:262
-msgctxt "input-name"
-msgid "P4 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:263
-msgctxt "input-name"
-msgid "P4 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:264
-msgctxt "input-name"
-msgid "P4 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:265
-msgctxt "input-name"
-msgid "P4 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:266
-msgctxt "input-name"
-msgid "P4 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:267
-msgctxt "input-name"
-msgid "P4 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:268
-msgctxt "input-name"
-msgid "P4 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:269
-msgctxt "input-name"
-msgid "P4 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:270
-msgctxt "input-name"
-msgid "P4 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:271
-msgctxt "input-name"
-msgid "P4 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:272
-msgctxt "input-name"
-msgid "P4 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:273
-msgctxt "input-name"
-msgid "P4 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:274
-msgctxt "input-name"
-msgid "P4 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:275
-msgctxt "input-name"
-msgid "P4 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:276
-msgctxt "input-name"
-msgid "P4 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:277
-msgctxt "input-name"
-msgid "P4 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:278
-msgctxt "input-name"
-msgid "P4 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:279
-msgctxt "input-name"
-msgid "P4 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:280
-msgctxt "input-name"
-msgid "P4 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:281
-msgctxt "input-name"
-msgid "P4 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:282
-msgctxt "input-name"
-msgid "P4 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:283
-msgctxt "input-name"
-msgid "P4 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:284
-msgctxt "input-name"
-msgid "P4 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:289
-msgctxt "input-name"
-msgid "P5 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:290
-msgctxt "input-name"
-msgid "P5 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:291
-msgctxt "input-name"
-msgid "P5 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:292
-msgctxt "input-name"
-msgid "P5 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:293
-msgctxt "input-name"
-msgid "P5 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:294
-msgctxt "input-name"
-msgid "P5 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:295
-msgctxt "input-name"
-msgid "P5 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:296
-msgctxt "input-name"
-msgid "P5 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:297
-msgctxt "input-name"
-msgid "P5 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:298
-msgctxt "input-name"
-msgid "P5 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:299
-msgctxt "input-name"
-msgid "P5 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:300
-msgctxt "input-name"
-msgid "P5 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:301
-msgctxt "input-name"
-msgid "P5 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:302
-msgctxt "input-name"
-msgid "P5 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:303
-msgctxt "input-name"
-msgid "P5 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:304
-msgctxt "input-name"
-msgid "P5 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:305
-msgctxt "input-name"
-msgid "P5 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:306
-msgctxt "input-name"
-msgid "P5 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:307
-msgctxt "input-name"
-msgid "P5 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:308
-msgctxt "input-name"
-msgid "P5 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:309
-msgctxt "input-name"
-msgid "P5 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:310
-msgctxt "input-name"
-msgid "P5 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:311
-msgctxt "input-name"
-msgid "P5 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:312
-msgctxt "input-name"
-msgid "P5 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:313
-msgctxt "input-name"
-msgid "P5 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:314
-msgctxt "input-name"
-msgid "P5 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:315
-msgctxt "input-name"
-msgid "P5 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:316
-msgctxt "input-name"
-msgid "P5 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:317
-msgctxt "input-name"
-msgid "P5 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:318
-msgctxt "input-name"
-msgid "P5 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:323
-msgctxt "input-name"
-msgid "P6 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:324
-msgctxt "input-name"
-msgid "P6 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:325
-msgctxt "input-name"
-msgid "P6 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:326
-msgctxt "input-name"
-msgid "P6 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:327
-msgctxt "input-name"
-msgid "P6 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:328
-msgctxt "input-name"
-msgid "P6 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:329
-msgctxt "input-name"
-msgid "P6 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:330
-msgctxt "input-name"
-msgid "P6 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:331
-msgctxt "input-name"
-msgid "P6 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:332
-msgctxt "input-name"
-msgid "P6 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:333
-msgctxt "input-name"
-msgid "P6 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:334
-msgctxt "input-name"
-msgid "P6 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:335
-msgctxt "input-name"
-msgid "P6 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:336
-msgctxt "input-name"
-msgid "P6 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:337
-msgctxt "input-name"
-msgid "P6 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:338
-msgctxt "input-name"
-msgid "P6 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:339
-msgctxt "input-name"
-msgid "P6 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:340
-msgctxt "input-name"
-msgid "P6 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:341
-msgctxt "input-name"
-msgid "P6 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:342
-msgctxt "input-name"
-msgid "P6 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:343
-msgctxt "input-name"
-msgid "P6 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:344
-msgctxt "input-name"
-msgid "P6 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:345
-msgctxt "input-name"
-msgid "P6 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:346
-msgctxt "input-name"
-msgid "P6 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:347
-msgctxt "input-name"
-msgid "P6 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:348
-msgctxt "input-name"
-msgid "P6 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:349
-msgctxt "input-name"
-msgid "P6 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:350
-msgctxt "input-name"
-msgid "P6 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:351
-msgctxt "input-name"
-msgid "P6 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:352
-msgctxt "input-name"
-msgid "P6 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:357
-msgctxt "input-name"
-msgid "P7 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:358
-msgctxt "input-name"
-msgid "P7 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:359
-msgctxt "input-name"
-msgid "P7 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:360
-msgctxt "input-name"
-msgid "P7 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:361
-msgctxt "input-name"
-msgid "P7 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:362
-msgctxt "input-name"
-msgid "P7 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:363
-msgctxt "input-name"
-msgid "P7 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:364
-msgctxt "input-name"
-msgid "P7 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:365
-msgctxt "input-name"
-msgid "P7 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:366
-msgctxt "input-name"
-msgid "P7 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:367
-msgctxt "input-name"
-msgid "P7 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:368
-msgctxt "input-name"
-msgid "P7 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:369
-msgctxt "input-name"
-msgid "P7 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:370
-msgctxt "input-name"
-msgid "P7 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:371
-msgctxt "input-name"
-msgid "P7 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:372
-msgctxt "input-name"
-msgid "P7 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:373
-msgctxt "input-name"
-msgid "P7 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:374
-msgctxt "input-name"
-msgid "P7 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:375
-msgctxt "input-name"
-msgid "P7 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:376
-msgctxt "input-name"
-msgid "P7 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:377
-msgctxt "input-name"
-msgid "P7 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:378
-msgctxt "input-name"
-msgid "P7 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:379
-msgctxt "input-name"
-msgid "P7 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:380
-msgctxt "input-name"
-msgid "P7 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:381
-msgctxt "input-name"
-msgid "P7 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:382
-msgctxt "input-name"
-msgid "P7 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:383
-msgctxt "input-name"
-msgid "P7 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:384
-msgctxt "input-name"
-msgid "P7 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:385
-msgctxt "input-name"
-msgid "P7 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:386
-msgctxt "input-name"
-msgid "P7 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:391
-msgctxt "input-name"
-msgid "P8 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:392
-msgctxt "input-name"
-msgid "P8 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:393
-msgctxt "input-name"
-msgid "P8 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:394
-msgctxt "input-name"
-msgid "P8 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:395
-msgctxt "input-name"
-msgid "P8 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:396
-msgctxt "input-name"
-msgid "P8 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:397
-msgctxt "input-name"
-msgid "P8 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:398
-msgctxt "input-name"
-msgid "P8 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:399
-msgctxt "input-name"
-msgid "P8 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:400
-msgctxt "input-name"
-msgid "P8 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:401
-msgctxt "input-name"
-msgid "P8 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:402
-msgctxt "input-name"
-msgid "P8 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:403
-msgctxt "input-name"
-msgid "P8 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:404
-msgctxt "input-name"
-msgid "P8 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:405
-msgctxt "input-name"
-msgid "P8 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:406
-msgctxt "input-name"
-msgid "P8 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:407
-msgctxt "input-name"
-msgid "P8 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:408
-msgctxt "input-name"
-msgid "P8 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:409
-msgctxt "input-name"
-msgid "P8 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:410
-msgctxt "input-name"
-msgid "P8 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:411
-msgctxt "input-name"
-msgid "P8 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:412
-msgctxt "input-name"
-msgid "P8 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:413
-msgctxt "input-name"
-msgid "P8 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:414
-msgctxt "input-name"
-msgid "P8 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:415
-msgctxt "input-name"
-msgid "P8 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:416
-msgctxt "input-name"
-msgid "P8 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:417
-msgctxt "input-name"
-msgid "P8 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:418
-msgctxt "input-name"
-msgid "P8 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:419
-msgctxt "input-name"
-msgid "P8 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:420
-msgctxt "input-name"
-msgid "P8 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:425
-msgctxt "input-name"
-msgid "P9 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:426
-msgctxt "input-name"
-msgid "P9 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:427
-msgctxt "input-name"
-msgid "P9 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:428
-msgctxt "input-name"
-msgid "P9 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:429
-msgctxt "input-name"
-msgid "P9 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:430
-msgctxt "input-name"
-msgid "P9 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:431
-msgctxt "input-name"
-msgid "P9 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:432
-msgctxt "input-name"
-msgid "P9 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:433
-msgctxt "input-name"
-msgid "P9 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:434
-msgctxt "input-name"
-msgid "P9 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:435
-msgctxt "input-name"
-msgid "P9 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:436
-msgctxt "input-name"
-msgid "P9 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:437
-msgctxt "input-name"
-msgid "P9 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:438
-msgctxt "input-name"
-msgid "P9 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:439
-msgctxt "input-name"
-msgid "P9 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:440
-msgctxt "input-name"
-msgid "P9 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:441
-msgctxt "input-name"
-msgid "P9 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:442
-msgctxt "input-name"
-msgid "P9 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:443
-msgctxt "input-name"
-msgid "P9 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:444
-msgctxt "input-name"
-msgid "P9 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:445
-msgctxt "input-name"
-msgid "P9 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:446
-msgctxt "input-name"
-msgid "P9 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:447
-msgctxt "input-name"
-msgid "P9 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:448
-msgctxt "input-name"
-msgid "P9 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:449
-msgctxt "input-name"
-msgid "P9 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:450
-msgctxt "input-name"
-msgid "P9 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:451
-msgctxt "input-name"
-msgid "P9 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:452
-msgctxt "input-name"
-msgid "P9 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:453
-msgctxt "input-name"
-msgid "P9 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:454
-msgctxt "input-name"
-msgid "P9 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:459
-msgctxt "input-name"
-msgid "P10 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:460
-msgctxt "input-name"
-msgid "P10 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:461
-msgctxt "input-name"
-msgid "P10 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:462
-msgctxt "input-name"
-msgid "P10 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:463
-msgctxt "input-name"
-msgid "P10 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:464
-msgctxt "input-name"
-msgid "P10 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:465
-msgctxt "input-name"
-msgid "P10 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:466
-msgctxt "input-name"
-msgid "P10 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:467
-msgctxt "input-name"
-msgid "P10 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:468
-msgctxt "input-name"
-msgid "P10 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:469
-msgctxt "input-name"
-msgid "P10 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:470
-msgctxt "input-name"
-msgid "P10 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:471
-msgctxt "input-name"
-msgid "P10 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:472
-msgctxt "input-name"
-msgid "P10 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:473
-msgctxt "input-name"
-msgid "P10 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:474
-msgctxt "input-name"
-msgid "P10 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:475
-msgctxt "input-name"
-msgid "P10 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:476
-msgctxt "input-name"
-msgid "P10 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:477
-msgctxt "input-name"
-msgid "P10 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:478
-msgctxt "input-name"
-msgid "P10 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:479
-msgctxt "input-name"
-msgid "P10 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:480
-msgctxt "input-name"
-msgid "P10 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:481
-msgctxt "input-name"
-msgid "P10 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:482
-msgctxt "input-name"
-msgid "P10 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:483
-msgctxt "input-name"
-msgid "P10 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:484
-msgctxt "input-name"
-msgid "P10 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:485
-msgctxt "input-name"
-msgid "P10 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:486
-msgctxt "input-name"
-msgid "P10 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:487
-msgctxt "input-name"
-msgid "P10 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:488
-msgctxt "input-name"
-msgid "P10 Select"
-msgstr ""
-
 #: src/emu/inpttype.ipp:493
 msgctxt "input-name"
 msgid "1 Player Start"
@@ -5536,154 +4165,31 @@ msgctxt "input-name"
 msgid "Volume Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:550
-msgctxt "input-name"
-msgid "P1 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:551
-msgctxt "input-name"
-msgid "P2 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:552
-msgctxt "input-name"
-msgid "P3 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:553
-msgctxt "input-name"
-msgid "P4 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:554
-msgctxt "input-name"
-msgid "P5 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:555
-msgctxt "input-name"
-msgid "P6 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:556
-msgctxt "input-name"
-msgid "P7 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:557
-msgctxt "input-name"
-msgid "P8 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:558
-msgctxt "input-name"
-msgid "P9 Pedal 1"
-msgstr ""
-
+#: src/emu/inpttype.ipp:550 src/emu/inpttype.ipp:551 src/emu/inpttype.ipp:552
+#: src/emu/inpttype.ipp:553 src/emu/inpttype.ipp:554 src/emu/inpttype.ipp:555
+#: src/emu/inpttype.ipp:556 src/emu/inpttype.ipp:557 src/emu/inpttype.ipp:558
 #: src/emu/inpttype.ipp:559
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:564
-msgctxt "input-name"
-msgid "P1 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:565
-msgctxt "input-name"
-msgid "P2 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:566
-msgctxt "input-name"
-msgid "P3 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:567
-msgctxt "input-name"
-msgid "P4 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:568
-msgctxt "input-name"
-msgid "P5 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:569
-msgctxt "input-name"
-msgid "P6 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:570
-msgctxt "input-name"
-msgid "P7 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:571
-msgctxt "input-name"
-msgid "P8 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:572
-msgctxt "input-name"
-msgid "P9 Pedal 2"
+msgid "%p Pedal 1"
 msgstr ""
 
+#: src/emu/inpttype.ipp:564 src/emu/inpttype.ipp:565 src/emu/inpttype.ipp:566
+#: src/emu/inpttype.ipp:567 src/emu/inpttype.ipp:568 src/emu/inpttype.ipp:569
+#: src/emu/inpttype.ipp:570 src/emu/inpttype.ipp:571 src/emu/inpttype.ipp:572
 #: src/emu/inpttype.ipp:573
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:578
-msgctxt "input-name"
-msgid "P1 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:579
-msgctxt "input-name"
-msgid "P2 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:580
-msgctxt "input-name"
-msgid "P3 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:581
-msgctxt "input-name"
-msgid "P4 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:582
-msgctxt "input-name"
-msgid "P5 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:583
-msgctxt "input-name"
-msgid "P6 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:584
-msgctxt "input-name"
-msgid "P7 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:585
-msgctxt "input-name"
-msgid "P8 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:586
-msgctxt "input-name"
-msgid "P9 Pedal 3"
+msgid "%p Pedal 2"
 msgstr ""
 
+#: src/emu/inpttype.ipp:578 src/emu/inpttype.ipp:579 src/emu/inpttype.ipp:580
+#: src/emu/inpttype.ipp:581 src/emu/inpttype.ipp:582 src/emu/inpttype.ipp:583
+#: src/emu/inpttype.ipp:584 src/emu/inpttype.ipp:585 src/emu/inpttype.ipp:586
 #: src/emu/inpttype.ipp:587
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 3"
+msgid "%p Pedal 3"
 msgstr ""
 
 #: src/emu/inpttype.ipp:592
@@ -7578,6 +6084,41 @@ msgid ""
 "%s"
 msgstr ""
 
+#~ msgid "Confirm quit from machines"
+#~ msgstr "Подтверждать выход из эмуляции"
+
+#~ msgid "Skip information screen at startup"
+#~ msgstr "Пропустить сведения о системе при запуске"
+
+#~ msgid "Skip software parts selection menu"
+#~ msgstr "Пропускать меню выбора частей ПО"
+
+#~ msgid "Offscreen reload"
+#~ msgstr "Закадровая перезарядка"
+
+#~ msgid "Simultaneous contradictory"
+#~ msgstr "Одновременно противоположные направления"
+
+#, c-format
+#~ msgid ""
+#~ "Auditing ROMs for machine %2$u of %3$u...\n"
+#~ "%1$s"
+#~ msgstr "Проверяем ROMы для системы %2$u из %3$u...%1$s"
+
+#, c-format
+#~ msgid "Audit ROMs for %1$u machines marked unavailable"
+#~ msgstr "Проверить ROMы для %1$u систем, помеченных как недоступные"
+
+#, c-format
+#~ msgid "Audit ROMs for all %1$u machines"
+#~ msgstr "Проверить ROMы для всех %1$u систем"
+
+#~ msgid "ROM Audit Result\tOK\n"
+#~ msgstr "Результат проверки ROM\tOK\n"
+
+#~ msgid "ROM Audit Result\tBAD\n"
+#~ msgstr "Результат проверки ROM\tНЕУДАЧНО\n"
+
 #~ msgid "Device Mapping"
 #~ msgstr "Устройства управления"
 
diff --git a/language/Serbian/strings.po b/language/Serbian/strings.po
index d655be695db..e7c5cd8e729 100644
--- a/language/Serbian/strings.po
+++ b/language/Serbian/strings.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-19 02:50+1100\n"
+"POT-Creation-Date: 2021-12-09 04:44+1100\n"
 "PO-Revision-Date: 2016-03-02 21:46+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: MAME Language Team\n"
@@ -272,12 +272,12 @@ msgstr "%1$s %2$s ( %3$d / %4$d programskih paketa )"
 msgid "Driver: \"%1$s\" software list "
 msgstr "Drajver: \"%1$s\" lista programa "
 
-#: src/frontend/mame/ui/selsoft.cpp:711 src/frontend/mame/ui/selgame.cpp:1066
+#: src/frontend/mame/ui/selsoft.cpp:711 src/frontend/mame/ui/selgame.cpp:1076
 #, c-format
 msgid "%1$s: %2$s - Search: %3$s_"
 msgstr "%1$s: %2$s - Pretraga: %3$s_"
 
-#: src/frontend/mame/ui/selsoft.cpp:713 src/frontend/mame/ui/selgame.cpp:1068
+#: src/frontend/mame/ui/selsoft.cpp:713 src/frontend/mame/ui/selgame.cpp:1078
 #, c-format
 msgid "Search: %1$s_"
 msgstr "Pretraga: %1$s_"
@@ -287,7 +287,7 @@ msgstr "Pretraga: %1$s_"
 msgid "Software list/item: %1$s:%2$s"
 msgstr ""
 
-#: src/frontend/mame/ui/optsmenu.cpp:73 src/frontend/mame/ui/sndmenu.cpp:165
+#: src/frontend/mame/ui/optsmenu.cpp:73 src/frontend/mame/ui/sndmenu.cpp:161
 msgid "Sound Options"
 msgstr "Opcije za zvuk"
 
@@ -382,11 +382,11 @@ msgid "Show mouse pointer"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:39
-msgid "Confirm quit from machines"
+msgid "Confirm quit from emulation"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:40
-msgid "Skip information screen at startup"
+msgid "Skip system information screen"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:41
@@ -402,7 +402,7 @@ msgid "Skip BIOS selection menu"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:44
-msgid "Skip software parts selection menu"
+msgid "Skip software part selection menu"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:45
@@ -554,7 +554,7 @@ msgid "UI active"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:91
-msgid "Offscreen reload"
+msgid "Off-screen reload"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:92
@@ -570,7 +570,7 @@ msgid "Natural keyboard"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:95
-msgid "Simultaneous contradictory"
+msgid "Allow contradictory joystick inputs"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:96
@@ -594,7 +594,7 @@ msgid "Pedal Device Assignment"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:106
-msgid "Adstick Device Assignment"
+msgid "AD Stick Device Assignment"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:107
@@ -681,14 +681,14 @@ msgstr ""
 msgid "Wait Vertical Sync"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:687
+#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:689
 #: src/frontend/mame/ui/videoopt.cpp:191 src/frontend/mame/ui/custui.cpp:490
 #: src/frontend/mame/ui/analogipt.cpp:471 plugins/cheatfind/init.lua:766
 #: plugins/cheatfind/init.lua:777 plugins/cheat/init.lua:668
 msgid "On"
 msgstr "Uključeno"
 
-#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:690
+#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:692
 #: src/frontend/mame/ui/videoopt.cpp:207 src/frontend/mame/ui/custui.cpp:490
 #: src/frontend/mame/ui/analogipt.cpp:471 plugins/cheatfind/init.lua:763
 #: plugins/cheatfind/init.lua:774 plugins/cheat/init.lua:671
@@ -696,11 +696,11 @@ msgstr "Uključeno"
 msgid "Off"
 msgstr "Isključeno"
 
-#: src/frontend/mame/ui/menu.cpp:693
+#: src/frontend/mame/ui/menu.cpp:695
 msgid "Auto"
 msgstr "Automatski"
 
-#: src/frontend/mame/ui/menu.cpp:1195
+#: src/frontend/mame/ui/menu.cpp:1197
 #: src/frontend/mame/ui/simpleselgame.cpp:278
 #: src/frontend/mame/ui/selmenu.cpp:1280
 msgid "Return to Previous Menu"
@@ -708,7 +708,7 @@ msgstr "Povratak u prethodni meni"
 
 #: src/frontend/mame/ui/filemngr.cpp:139
 #: src/frontend/mame/ui/confswitch.cpp:119
-#: src/frontend/mame/ui/inputmap.cpp:559 src/frontend/mame/ui/analogipt.cpp:360
+#: src/frontend/mame/ui/inputmap.cpp:563 src/frontend/mame/ui/analogipt.cpp:360
 #, c-format
 msgid "[root%1$s]"
 msgstr ""
@@ -971,22 +971,22 @@ msgstr ""
 "CPU:\n"
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "GHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "MHz"
 msgstr "MHz"
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "kHz"
 msgstr "kHz"
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "Hz"
 msgstr ""
 
@@ -1014,38 +1014,38 @@ msgstr "Nijedan\n"
 msgid "Vector"
 msgstr "Vektor"
 
-#: src/frontend/mame/ui/info.cpp:480
+#: src/frontend/mame/ui/info.cpp:483
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr "%1$s: %2$s\n"
 
-#: src/frontend/mame/ui/info.cpp:480
+#: src/frontend/mame/ui/info.cpp:483
 msgid "%2$s\n"
 msgstr "%2$s\n"
 
-#: src/frontend/mame/ui/info.cpp:497
+#: src/frontend/mame/ui/info.cpp:500
 #, c-format
 msgid "Screen '%1$s'"
 msgstr "Ekran '%1$s'"
 
-#: src/frontend/mame/ui/info.cpp:499
+#: src/frontend/mame/ui/info.cpp:502
 msgid "Screen"
 msgstr "Ekran"
 
-#: src/frontend/mame/ui/info.cpp:570 src/frontend/mame/ui/info.cpp:581
+#: src/frontend/mame/ui/info.cpp:573 src/frontend/mame/ui/info.cpp:584
 #, c-format
 msgid "%1$s:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:662
+#: src/frontend/mame/ui/info.cpp:665
 msgid "Not supported"
 msgstr "Nije podržano"
 
-#: src/frontend/mame/ui/info.cpp:665
+#: src/frontend/mame/ui/info.cpp:668
 msgid "Partially supported"
 msgstr "Delimično podržano"
 
-#: src/frontend/mame/ui/info.cpp:674
+#: src/frontend/mame/ui/info.cpp:677
 msgid "[empty]"
 msgstr "[prazno]"
 
@@ -1118,7 +1118,7 @@ msgid "Emulated"
 msgstr "Emulirani"
 
 #: src/frontend/mame/ui/keyboard.cpp:59 src/frontend/mame/ui/confswitch.cpp:117
-#: src/frontend/mame/ui/inputmap.cpp:557 src/frontend/mame/ui/analogipt.cpp:358
+#: src/frontend/mame/ui/inputmap.cpp:561 src/frontend/mame/ui/analogipt.cpp:358
 #, c-format
 msgid "%1$s [root%2$s]"
 msgstr ""
@@ -1478,7 +1478,7 @@ msgctxt "swlist-info"
 msgid "Software list/item"
 msgstr ""
 
-#: src/frontend/mame/ui/datmenu.cpp:88 src/frontend/mame/ui/selmenu.cpp:2698
+#: src/frontend/mame/ui/datmenu.cpp:88 src/frontend/mame/ui/selmenu.cpp:2707
 msgid "Software List Info"
 msgstr ""
 
@@ -1599,7 +1599,7 @@ msgstr ""
 msgid "Configure Machine:"
 msgstr ""
 
-#: src/frontend/mame/ui/miscmenu.cpp:858 src/frontend/mame/ui/selmenu.cpp:2638
+#: src/frontend/mame/ui/miscmenu.cpp:858 src/frontend/mame/ui/selmenu.cpp:2647
 msgid " (default)"
 msgstr " (uobičajeno)"
 
@@ -1620,7 +1620,7 @@ msgstr ""
 "Pritisnite %1$s za napuštanje programa\n"
 "Pritisnite %2$s za nastavak emulacije"
 
-#: src/frontend/mame/ui/info_pty.cpp:30 src/frontend/mame/ui/mainmenu.cpp:155
+#: src/frontend/mame/ui/info_pty.cpp:30
 msgid "Pseudo terminals"
 msgstr "Pseudo terminali"
 
@@ -1688,52 +1688,52 @@ msgstr ""
 msgid "Other Controls"
 msgstr "Ostale kontrole"
 
-#: src/frontend/mame/ui/inputmap.cpp:227
+#: src/frontend/mame/ui/inputmap.cpp:231
 msgid "This machine has no configurable inputs."
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:327
+#: src/frontend/mame/ui/inputmap.cpp:331
 msgid "Pressed"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:397
+#: src/frontend/mame/ui/inputmap.cpp:401
 msgid "Invalid sequence entered"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:542
+#: src/frontend/mame/ui/inputmap.cpp:546
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:543
+#: src/frontend/mame/ui/inputmap.cpp:547
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog Inc"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:544
+#: src/frontend/mame/ui/inputmap.cpp:548
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog Dec"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:586
+#: src/frontend/mame/ui/inputmap.cpp:590
 #, c-format
 msgid "Press %1$s to set\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:587
+#: src/frontend/mame/ui/inputmap.cpp:591
 #, c-format
 msgid "Press %1$s to append\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:588
+#: src/frontend/mame/ui/inputmap.cpp:592
 #, c-format
 msgid "Press %1$s to clear\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:589
+#: src/frontend/mame/ui/inputmap.cpp:593
 #, c-format
 msgid "Press %1$s to restore default\n"
 msgstr ""
@@ -1797,7 +1797,7 @@ msgid ""
 msgstr ""
 
 #: src/frontend/mame/ui/simpleselgame.cpp:273
-#: src/frontend/mame/ui/selgame.cpp:436
+#: src/frontend/mame/ui/selgame.cpp:443
 msgid "Configure Options"
 msgstr "Konfiguracija opcija"
 
@@ -2132,16 +2132,16 @@ msgstr ""
 msgid "Expand to fit"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:437
+#: src/frontend/mame/ui/selgame.cpp:444
 msgid "Configure Machine"
 msgstr "Konfiguracija mašine"
 
-#: src/frontend/mame/ui/selgame.cpp:1050
+#: src/frontend/mame/ui/selgame.cpp:1060
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d machines (%5$d BIOS) )"
 msgstr "%1$s %2$s ( %3$d / %4$d mašine (%5$d BIOS) )"
 
-#: src/frontend/mame/ui/selgame.cpp:1078
+#: src/frontend/mame/ui/selgame.cpp:1088
 #, c-format
 msgid "System: %1$-.100s"
 msgstr "Sistem: %1$-.100s"
@@ -2163,7 +2163,7 @@ msgstr ""
 #: src/frontend/mame/ui/auditmenu.cpp:98
 #, c-format
 msgid ""
-"Auditing ROMs for machine %2$u of %3$u...\n"
+"Auditing media for machine %2$u of %3$u...\n"
 "%1$s"
 msgstr ""
 
@@ -2178,12 +2178,12 @@ msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:136
 #, c-format
-msgid "Audit ROMs for %1$u machines marked unavailable"
+msgid "Audit media for %1$u machines marked unavailable"
 msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:137
 #, c-format
-msgid "Audit ROMs for all %1$u machines"
+msgid "Audit media for all %1$u machines"
 msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:154
@@ -2390,84 +2390,84 @@ msgctxt "color-sample"
 msgid "Clone"
 msgstr "Kloniraj"
 
-#: src/frontend/mame/ui/custui.cpp:914
+#: src/frontend/mame/ui/custui.cpp:906
 msgid "ARGB Settings"
 msgstr "ARGB podešavanja"
 
-#: src/frontend/mame/ui/custui.cpp:919 src/frontend/mame/ui/custui.cpp:922
+#: src/frontend/mame/ui/custui.cpp:911 src/frontend/mame/ui/custui.cpp:914
 msgctxt "color-channel"
 msgid "Alpha"
 msgstr "Alfa"
 
-#: src/frontend/mame/ui/custui.cpp:927 src/frontend/mame/ui/custui.cpp:930
+#: src/frontend/mame/ui/custui.cpp:919 src/frontend/mame/ui/custui.cpp:922
 msgctxt "color-channel"
 msgid "Red"
 msgstr "Crvenа"
 
-#: src/frontend/mame/ui/custui.cpp:935 src/frontend/mame/ui/custui.cpp:938
+#: src/frontend/mame/ui/custui.cpp:927 src/frontend/mame/ui/custui.cpp:930
 msgctxt "color-channel"
 msgid "Green"
 msgstr "Zelenа"
 
-#: src/frontend/mame/ui/custui.cpp:943 src/frontend/mame/ui/custui.cpp:946
+#: src/frontend/mame/ui/custui.cpp:935 src/frontend/mame/ui/custui.cpp:938
 msgctxt "color-channel"
 msgid "Blue"
 msgstr "Plavа"
 
-#: src/frontend/mame/ui/custui.cpp:949
+#: src/frontend/mame/ui/custui.cpp:941
 msgid "Choose from palette"
 msgstr "Izabrati iz palete"
 
-#: src/frontend/mame/ui/custui.cpp:996
+#: src/frontend/mame/ui/custui.cpp:988
 msgid "Color preview:"
 msgstr "Prikaz boja:"
 
-#: src/frontend/mame/ui/custui.cpp:1093
+#: src/frontend/mame/ui/custui.cpp:1085
 msgctxt "color-preset"
 msgid "White"
 msgstr "Bela"
 
-#: src/frontend/mame/ui/custui.cpp:1094
+#: src/frontend/mame/ui/custui.cpp:1086
 msgctxt "color-preset"
 msgid "Silver"
 msgstr "Srebrna"
 
-#: src/frontend/mame/ui/custui.cpp:1095
+#: src/frontend/mame/ui/custui.cpp:1087
 msgctxt "color-preset"
 msgid "Gray"
 msgstr "Siva"
 
-#: src/frontend/mame/ui/custui.cpp:1096
+#: src/frontend/mame/ui/custui.cpp:1088
 msgctxt "color-preset"
 msgid "Black"
 msgstr "Crna"
 
-#: src/frontend/mame/ui/custui.cpp:1097
+#: src/frontend/mame/ui/custui.cpp:1089
 msgctxt "color-preset"
 msgid "Red"
 msgstr "Crvenа"
 
-#: src/frontend/mame/ui/custui.cpp:1098
+#: src/frontend/mame/ui/custui.cpp:1090
 msgctxt "color-preset"
 msgid "Orange"
 msgstr "Narandžasta"
 
-#: src/frontend/mame/ui/custui.cpp:1099
+#: src/frontend/mame/ui/custui.cpp:1091
 msgctxt "color-preset"
 msgid "Yellow"
 msgstr "Žuta"
 
-#: src/frontend/mame/ui/custui.cpp:1100
+#: src/frontend/mame/ui/custui.cpp:1092
 msgctxt "color-preset"
 msgid "Green"
 msgstr "Zelenа"
 
-#: src/frontend/mame/ui/custui.cpp:1101
+#: src/frontend/mame/ui/custui.cpp:1093
 msgctxt "color-preset"
 msgid "Blue"
 msgstr "Plavа"
 
-#: src/frontend/mame/ui/custui.cpp:1102
+#: src/frontend/mame/ui/custui.cpp:1094
 msgctxt "color-preset"
 msgid "Violet"
 msgstr "Ljubičasta"
@@ -2532,7 +2532,7 @@ msgid "Input (general)"
 msgstr "Podešavanje kontrola (globalno)"
 
 #: src/frontend/mame/ui/mainmenu.cpp:123
-msgid "Input (this Machine)"
+msgid "Input (this machine)"
 msgstr "Podešavanje kontrola (ova mašina)"
 
 #: src/frontend/mame/ui/mainmenu.cpp:126
@@ -2571,6 +2571,10 @@ msgstr "Upravljanje fajlovima"
 msgid "Tape Control"
 msgstr "Kontrola trake"
 
+#: src/frontend/mame/ui/mainmenu.cpp:155
+msgid "Pseudo Terminals"
+msgstr ""
+
 #: src/frontend/mame/ui/mainmenu.cpp:158
 msgid "BIOS Selection"
 msgstr "Izbor BIOS-a"
@@ -2609,7 +2613,7 @@ msgstr "Prikaz spoljašnjeg DAT"
 
 #: src/frontend/mame/ui/mainmenu.cpp:200
 #, c-format
-msgid "About %s"
+msgid "About %1$s"
 msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:212
@@ -2769,373 +2773,373 @@ msgstr "Drajver je klon od: %1$s"
 msgid "%1$s %2$s"
 msgstr "%1$s %2$s"
 
-#: src/frontend/mame/ui/selmenu.cpp:2235
+#: src/frontend/mame/ui/selmenu.cpp:2244
 msgid "Images"
 msgstr "Programi"
 
-#: src/frontend/mame/ui/selmenu.cpp:2236
+#: src/frontend/mame/ui/selmenu.cpp:2245
 msgid "Infos"
 msgstr "Informacije"
 
-#: src/frontend/mame/ui/selmenu.cpp:2551
+#: src/frontend/mame/ui/selmenu.cpp:2560
 msgid ""
 "Required ROM/disk images for the selected system are missing or incorrect. "
 "Please acquire the correct files or select a different system.\n"
 "\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2567
+#: src/frontend/mame/ui/selmenu.cpp:2576
 msgid ""
 "Required ROM/disk images for the selected software are missing or incorrect. "
 "Please acquire the correct files or select a different software item.\n"
 "\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2583
+#: src/frontend/mame/ui/selmenu.cpp:2592
 msgid "incorrect checksum"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2586
+#: src/frontend/mame/ui/selmenu.cpp:2595
 msgid "incorrect length"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2589
+#: src/frontend/mame/ui/selmenu.cpp:2598
 msgid "not found"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2600
+#: src/frontend/mame/ui/selmenu.cpp:2609
 #, c-format
 msgid "%1$s (%2$s) - %3$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2602
+#: src/frontend/mame/ui/selmenu.cpp:2611
 #, c-format
 msgid "%1$s - %2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2606
+#: src/frontend/mame/ui/selmenu.cpp:2615
 msgid "Press any key to continue."
 msgstr "Pritisnite bilo koji taster za nastavak."
 
-#: src/frontend/mame/ui/selmenu.cpp:2735
+#: src/frontend/mame/ui/selmenu.cpp:2744
 msgid "General Info"
 msgstr "Opšte informacije"
 
-#: src/frontend/mame/ui/selmenu.cpp:2887
+#: src/frontend/mame/ui/selmenu.cpp:2896
 #, c-format
 msgid "Romset\t%1$s\n"
 msgstr "ROM skup\t%1$s\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2888
+#: src/frontend/mame/ui/selmenu.cpp:2897
 #, c-format
 msgid "Year\t%1$s\n"
 msgstr "Godina\t%1$s\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2889
+#: src/frontend/mame/ui/selmenu.cpp:2898
 #, c-format
 msgid "Manufacturer\t%1$s\n"
 msgstr "Proizvođač\t%1$s\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2896
+#: src/frontend/mame/ui/selmenu.cpp:2905
 #, c-format
 msgid "Driver is Clone of\t%1$s\n"
 msgstr "Drajver je klon od\t%1$s\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2901
+#: src/frontend/mame/ui/selmenu.cpp:2910
 msgid "Driver is Parent\t\n"
 msgstr "Drajver je predak\t\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2905
+#: src/frontend/mame/ui/selmenu.cpp:2914
 msgid "Analog Controls\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2907
+#: src/frontend/mame/ui/selmenu.cpp:2916
 msgid "Keyboard Inputs\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2910
+#: src/frontend/mame/ui/selmenu.cpp:2919
 msgid "Overall\tNOT WORKING\n"
 msgstr "Uopšteno\tNE RADI\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2912
+#: src/frontend/mame/ui/selmenu.cpp:2921
 msgid "Overall\tUnemulated Protection\n"
 msgstr "Uopšteno\tZaštita nije emulirana\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2914
+#: src/frontend/mame/ui/selmenu.cpp:2923
 msgid "Overall\tWorking\n"
 msgstr "Uopšteno\tradi\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2917
+#: src/frontend/mame/ui/selmenu.cpp:2926
 msgid "Graphics\tUnimplemented\n"
 msgstr "Grafika\tnije implementirana\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2919
+#: src/frontend/mame/ui/selmenu.cpp:2928
 msgid "Graphics\tWrong Colors\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2921
+#: src/frontend/mame/ui/selmenu.cpp:2930
 msgid "Graphics\tImperfect Colors\n"
 msgstr "Grafika\tnesavršene boje\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2923
+#: src/frontend/mame/ui/selmenu.cpp:2932
 msgid "Graphics\tImperfect\n"
 msgstr "Grafika\tnesavršena\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2925
+#: src/frontend/mame/ui/selmenu.cpp:2934
 msgid "Graphics\tOK\n"
 msgstr "Grafika\tOK\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2928
+#: src/frontend/mame/ui/selmenu.cpp:2937
 msgid "Sound\tNone\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2930
+#: src/frontend/mame/ui/selmenu.cpp:2939
 msgid "Sound\tUnimplemented\n"
 msgstr "Zvuk\tnije implementiran\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2932
+#: src/frontend/mame/ui/selmenu.cpp:2941
 msgid "Sound\tImperfect\n"
 msgstr "Zvuk\tnesavršen\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2934
+#: src/frontend/mame/ui/selmenu.cpp:2943
 msgid "Sound\tOK\n"
 msgstr "Zvuk\tOK\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2937
+#: src/frontend/mame/ui/selmenu.cpp:2946
 msgid "Capture\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2939
+#: src/frontend/mame/ui/selmenu.cpp:2948
 msgid "Capture\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2942
+#: src/frontend/mame/ui/selmenu.cpp:2951
 msgid "Camera\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2944
+#: src/frontend/mame/ui/selmenu.cpp:2953
 msgid "Camera\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2947
+#: src/frontend/mame/ui/selmenu.cpp:2956
 msgid "Microphone\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2949
+#: src/frontend/mame/ui/selmenu.cpp:2958
 msgid "Microphone\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2952
+#: src/frontend/mame/ui/selmenu.cpp:2961
 msgid "Controls\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2954
+#: src/frontend/mame/ui/selmenu.cpp:2963
 msgid "Controls\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2957
+#: src/frontend/mame/ui/selmenu.cpp:2966
 msgid "Keyboard\tUnimplemented\n"
 msgstr "Tastatura\tnije implementirana\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2959
+#: src/frontend/mame/ui/selmenu.cpp:2968
 msgid "Keyboard\tImperfect\n"
 msgstr "Tastatura\tnesavršena\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2962
+#: src/frontend/mame/ui/selmenu.cpp:2971
 msgid "Mouse\tUnimplemented\n"
 msgstr "Miš\tnije implementiran\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2964
+#: src/frontend/mame/ui/selmenu.cpp:2973
 msgid "Mouse\tImperfect\n"
 msgstr "Miš\tnesavršen\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2967
+#: src/frontend/mame/ui/selmenu.cpp:2976
 msgid "Media\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2969
+#: src/frontend/mame/ui/selmenu.cpp:2978
 msgid "Media\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2972
+#: src/frontend/mame/ui/selmenu.cpp:2981
 msgid "Disk\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2974
+#: src/frontend/mame/ui/selmenu.cpp:2983
 msgid "Disk\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2977
+#: src/frontend/mame/ui/selmenu.cpp:2986
 msgid "Printer\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2979
+#: src/frontend/mame/ui/selmenu.cpp:2988
 msgid "Printer\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2982
+#: src/frontend/mame/ui/selmenu.cpp:2991
 msgid "Mag. Tape\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2984
+#: src/frontend/mame/ui/selmenu.cpp:2993
 msgid "Mag. Tape\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2987
+#: src/frontend/mame/ui/selmenu.cpp:2996
 msgid "Punch Tape\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2989
+#: src/frontend/mame/ui/selmenu.cpp:2998
 msgid "Punch Tape\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2992
+#: src/frontend/mame/ui/selmenu.cpp:3001
 msgid "Mag. Drum\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2994
+#: src/frontend/mame/ui/selmenu.cpp:3003
 msgid "Mag. Drum\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2997
+#: src/frontend/mame/ui/selmenu.cpp:3006
 msgid "(EP)ROM\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2999
+#: src/frontend/mame/ui/selmenu.cpp:3008
 msgid "(EP)ROM\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3002
+#: src/frontend/mame/ui/selmenu.cpp:3011
 msgid "Communications\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3004
+#: src/frontend/mame/ui/selmenu.cpp:3013
 msgid "Communications\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3007
+#: src/frontend/mame/ui/selmenu.cpp:3016
 msgid "LAN\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3009
+#: src/frontend/mame/ui/selmenu.cpp:3018
 msgid "LAN\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3012
+#: src/frontend/mame/ui/selmenu.cpp:3021
 msgid "WAN\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3014
+#: src/frontend/mame/ui/selmenu.cpp:3023
 msgid "WAN\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3017
+#: src/frontend/mame/ui/selmenu.cpp:3026
 msgid "Timing\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3019
+#: src/frontend/mame/ui/selmenu.cpp:3028
 msgid "Timing\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3021
+#: src/frontend/mame/ui/selmenu.cpp:3030
 msgid "Mechanical Machine\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3021
+#: src/frontend/mame/ui/selmenu.cpp:3030
 msgid "Mechanical Machine\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3022
+#: src/frontend/mame/ui/selmenu.cpp:3031
 msgid "Requires Artwork\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3022
+#: src/frontend/mame/ui/selmenu.cpp:3031
 msgid "Requires Artwork\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3023
+#: src/frontend/mame/ui/selmenu.cpp:3032
 msgid "Requires Clickable Artwork\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3023
+#: src/frontend/mame/ui/selmenu.cpp:3032
 msgid "Requires Clickable Artwork\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3025
+#: src/frontend/mame/ui/selmenu.cpp:3034
 msgid "Support Cocktail\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3026
+#: src/frontend/mame/ui/selmenu.cpp:3035
 msgid "Driver is BIOS\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3026
+#: src/frontend/mame/ui/selmenu.cpp:3035
 msgid "Driver is BIOS\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3027
+#: src/frontend/mame/ui/selmenu.cpp:3036
 msgid "Support Save\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3027
+#: src/frontend/mame/ui/selmenu.cpp:3036
 msgid "Support Save\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3028
+#: src/frontend/mame/ui/selmenu.cpp:3037
 msgid "Screen Orientation\tVertical\n"
 msgstr "Orijentacija ekrana\tVertikalno\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3028
+#: src/frontend/mame/ui/selmenu.cpp:3037
 msgid "Screen Orientation\tHorizontal\n"
 msgstr "Orijentacija ekrana\tHorizontalno\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3038
+#: src/frontend/mame/ui/selmenu.cpp:3047
 msgid "Requires CHD\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3038
+#: src/frontend/mame/ui/selmenu.cpp:3047
 msgid "Requires CHD\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3051
-msgid "ROM Audit Result\tOK\n"
+#: src/frontend/mame/ui/selmenu.cpp:3060
+msgid "Media Audit Result\tOK\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3053
-msgid "ROM Audit Result\tBAD\n"
+#: src/frontend/mame/ui/selmenu.cpp:3062
+msgid "Media Audit Result\tBAD\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3056
+#: src/frontend/mame/ui/selmenu.cpp:3065
 msgid "Samples Audit Result\tNone Needed\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3058
+#: src/frontend/mame/ui/selmenu.cpp:3067
 msgid "Samples Audit Result\tOK\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3060
+#: src/frontend/mame/ui/selmenu.cpp:3069
 msgid "Samples Audit Result\tBAD\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3064
+#: src/frontend/mame/ui/selmenu.cpp:3073
 msgid ""
-"ROM Audit \tDisabled\n"
-"Samples Audit \tDisabled\n"
+"Media Audit\tDisabled\n"
+"Samples Audit\tDisabled\n"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:150
+#: src/frontend/mame/ui/sndmenu.cpp:146
 msgid "Sound"
 msgstr "Zvuk"
 
-#: src/frontend/mame/ui/sndmenu.cpp:151
+#: src/frontend/mame/ui/sndmenu.cpp:147
 msgid "Compressor"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:152
+#: src/frontend/mame/ui/sndmenu.cpp:148
 msgid "Sample Rate"
 msgstr "Učestalost uzorkovanja"
 
-#: src/frontend/mame/ui/sndmenu.cpp:153
+#: src/frontend/mame/ui/sndmenu.cpp:149
 msgid "Use External Samples"
 msgstr "Koristi dodatne semplove"
 
@@ -3174,511 +3178,681 @@ msgstr ""
 msgid "  Screen '%1$s': Vector\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:132
+#: src/frontend/mame/ui/devopt.cpp:135
 #, c-format
 msgid "  Screen '%1$s': %2$d × %3$d (V) %4$s Hz\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:133
+#: src/frontend/mame/ui/devopt.cpp:136
 #, c-format
 msgid "  Screen '%1$s': %2$d × %3$d (H) %4$s Hz\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:147
+#: src/frontend/mame/ui/devopt.cpp:150
 msgid "* Sound:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:211
+#: src/frontend/mame/ui/devopt.cpp:214
 #, c-format
 msgid ""
 "* BIOS settings:\n"
 "  %1$d options    [default: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:255 src/frontend/mame/ui/devopt.cpp:271
-#: src/frontend/mame/ui/devopt.cpp:332
+#: src/frontend/mame/ui/devopt.cpp:258 src/frontend/mame/ui/devopt.cpp:274
+#: src/frontend/mame/ui/devopt.cpp:335
 #, c-format
 msgid "  %1$s    [default: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:260 src/frontend/mame/ui/devopt.cpp:276
+#: src/frontend/mame/ui/devopt.cpp:263 src/frontend/mame/ui/devopt.cpp:279
 #, c-format
 msgid "  %1$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:282
+#: src/frontend/mame/ui/devopt.cpp:285
 msgid "* DIP switch settings:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:287
+#: src/frontend/mame/ui/devopt.cpp:290
 msgid "* Configuration settings:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:291
+#: src/frontend/mame/ui/devopt.cpp:294
 msgid "* Input device(s):\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:293
+#: src/frontend/mame/ui/devopt.cpp:296
 #, c-format
 msgid "  User inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:295
+#: src/frontend/mame/ui/devopt.cpp:298
 #, c-format
 msgid "  Mahjong inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:297
+#: src/frontend/mame/ui/devopt.cpp:300
 #, c-format
 msgid "  Hanafuda inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:299
+#: src/frontend/mame/ui/devopt.cpp:302
 #, c-format
 msgid "  Gambling inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:301
+#: src/frontend/mame/ui/devopt.cpp:304
 #, c-format
 msgid "  Analog inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:303
+#: src/frontend/mame/ui/devopt.cpp:306
 #, c-format
 msgid "  Adjuster inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:305
+#: src/frontend/mame/ui/devopt.cpp:308
 #, c-format
 msgid "  Keypad inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:307
+#: src/frontend/mame/ui/devopt.cpp:310
 #, c-format
 msgid "  Keyboard inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:312
+#: src/frontend/mame/ui/devopt.cpp:315
 msgid "* Media Options:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:317
+#: src/frontend/mame/ui/devopt.cpp:320
 #, c-format
 msgid "  %1$s    [tag: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:327
+#: src/frontend/mame/ui/devopt.cpp:330
 msgid "* Slot Options:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:341
+#: src/frontend/mame/ui/devopt.cpp:344
 msgid "[None]\n"
 msgstr ""
 
-#: src/emu/render.cpp:1847
+#: src/emu/render.cpp:1796
 #, c-format
 msgctxt "view-name"
 msgid "Screen %1$u Standard (%2$u:%3$u)"
 msgstr ""
 
-#: src/emu/render.cpp:1873
+#: src/emu/render.cpp:1822
 #, c-format
 msgctxt "view-name"
 msgid "Screen %1$u Pixel Aspect (%2$u:%3$u)"
 msgstr ""
 
-#: src/emu/render.cpp:1895 src/emu/render.cpp:2030
+#: src/emu/render.cpp:1844 src/emu/render.cpp:1979
 msgctxt "view-name"
 msgid "Cocktail"
 msgstr ""
 
-#: src/emu/render.cpp:2015
+#: src/emu/render.cpp:1964
 msgctxt "view-name"
 msgid "Left-to-Right"
 msgstr ""
 
-#: src/emu/render.cpp:2016
+#: src/emu/render.cpp:1965
 msgctxt "view-name"
 msgid "Left-to-Right (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2017
+#: src/emu/render.cpp:1966
 msgctxt "view-name"
 msgid "Top-to-Bottom"
 msgstr ""
 
-#: src/emu/render.cpp:2018
+#: src/emu/render.cpp:1967
 msgctxt "view-name"
 msgid "Top-to-Bottom (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2069
+#: src/emu/render.cpp:2018
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Left-to-Right, Top-to-Bottom"
 msgstr ""
 
-#: src/emu/render.cpp:2078
+#: src/emu/render.cpp:2027
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Left-to-Right, Top-to-Bottom (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2087
+#: src/emu/render.cpp:2036
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Top-to-Bottom, Left-to-Right"
 msgstr ""
 
-#: src/emu/render.cpp:2096
+#: src/emu/render.cpp:2045
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Top-to-Bottom, Left-to-Right (Gapless)"
 msgstr ""
 
-#: src/emu/inpttype.ipp:22
+#: src/emu/ioport.cpp:332
+#, c-format
 msgctxt "input-name"
-msgid "P1 Up"
+msgid "P%1$u"
 msgstr ""
 
-#: src/emu/inpttype.ipp:23
+#: src/emu/ioport.cpp:1924
 msgctxt "input-name"
-msgid "P1 Down"
+msgid "???"
 msgstr ""
 
-#: src/emu/inpttype.ipp:24
+#: src/emu/inpttype.ipp:22 src/emu/inpttype.ipp:140 src/emu/inpttype.ipp:221
+#: src/emu/inpttype.ipp:255 src/emu/inpttype.ipp:289 src/emu/inpttype.ipp:323
+#: src/emu/inpttype.ipp:357 src/emu/inpttype.ipp:391 src/emu/inpttype.ipp:425
+#: src/emu/inpttype.ipp:459
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left"
+msgid "%p Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:25
+#: src/emu/inpttype.ipp:23 src/emu/inpttype.ipp:141 src/emu/inpttype.ipp:222
+#: src/emu/inpttype.ipp:256 src/emu/inpttype.ipp:290 src/emu/inpttype.ipp:324
+#: src/emu/inpttype.ipp:358 src/emu/inpttype.ipp:392 src/emu/inpttype.ipp:426
+#: src/emu/inpttype.ipp:460
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right"
+msgid "%p Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:26
+#: src/emu/inpttype.ipp:24 src/emu/inpttype.ipp:142 src/emu/inpttype.ipp:223
+#: src/emu/inpttype.ipp:257 src/emu/inpttype.ipp:291 src/emu/inpttype.ipp:325
+#: src/emu/inpttype.ipp:359 src/emu/inpttype.ipp:393 src/emu/inpttype.ipp:427
+#: src/emu/inpttype.ipp:461
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Up"
+msgid "%p Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:27
+#: src/emu/inpttype.ipp:25 src/emu/inpttype.ipp:143 src/emu/inpttype.ipp:224
+#: src/emu/inpttype.ipp:258 src/emu/inpttype.ipp:292 src/emu/inpttype.ipp:326
+#: src/emu/inpttype.ipp:360 src/emu/inpttype.ipp:394 src/emu/inpttype.ipp:428
+#: src/emu/inpttype.ipp:462
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Down"
+msgid "%p Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:28
+#: src/emu/inpttype.ipp:26 src/emu/inpttype.ipp:144 src/emu/inpttype.ipp:225
+#: src/emu/inpttype.ipp:259 src/emu/inpttype.ipp:293 src/emu/inpttype.ipp:327
+#: src/emu/inpttype.ipp:361 src/emu/inpttype.ipp:395 src/emu/inpttype.ipp:429
+#: src/emu/inpttype.ipp:463
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Left"
+msgid "%p Right Stick/Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:29
+#: src/emu/inpttype.ipp:27 src/emu/inpttype.ipp:145 src/emu/inpttype.ipp:226
+#: src/emu/inpttype.ipp:260 src/emu/inpttype.ipp:294 src/emu/inpttype.ipp:328
+#: src/emu/inpttype.ipp:362 src/emu/inpttype.ipp:396 src/emu/inpttype.ipp:430
+#: src/emu/inpttype.ipp:464
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Right"
+msgid "%p Right Stick/Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:30
+#: src/emu/inpttype.ipp:28 src/emu/inpttype.ipp:146 src/emu/inpttype.ipp:227
+#: src/emu/inpttype.ipp:261 src/emu/inpttype.ipp:295 src/emu/inpttype.ipp:329
+#: src/emu/inpttype.ipp:363 src/emu/inpttype.ipp:397 src/emu/inpttype.ipp:431
+#: src/emu/inpttype.ipp:465
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Up"
+msgid "%p Right Stick/Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:31
+#: src/emu/inpttype.ipp:29 src/emu/inpttype.ipp:147 src/emu/inpttype.ipp:228
+#: src/emu/inpttype.ipp:262 src/emu/inpttype.ipp:296 src/emu/inpttype.ipp:330
+#: src/emu/inpttype.ipp:364 src/emu/inpttype.ipp:398 src/emu/inpttype.ipp:432
+#: src/emu/inpttype.ipp:466
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Down"
+msgid "%p Right Stick/Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:32
+#: src/emu/inpttype.ipp:30 src/emu/inpttype.ipp:148 src/emu/inpttype.ipp:229
+#: src/emu/inpttype.ipp:263 src/emu/inpttype.ipp:297 src/emu/inpttype.ipp:331
+#: src/emu/inpttype.ipp:365 src/emu/inpttype.ipp:399 src/emu/inpttype.ipp:433
+#: src/emu/inpttype.ipp:467
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Left"
+msgid "%p Left Stick/Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:33
+#: src/emu/inpttype.ipp:31 src/emu/inpttype.ipp:149 src/emu/inpttype.ipp:230
+#: src/emu/inpttype.ipp:264 src/emu/inpttype.ipp:298 src/emu/inpttype.ipp:332
+#: src/emu/inpttype.ipp:366 src/emu/inpttype.ipp:400 src/emu/inpttype.ipp:434
+#: src/emu/inpttype.ipp:468
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Right"
+msgid "%p Left Stick/Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:34
+#: src/emu/inpttype.ipp:32 src/emu/inpttype.ipp:150 src/emu/inpttype.ipp:231
+#: src/emu/inpttype.ipp:265 src/emu/inpttype.ipp:299 src/emu/inpttype.ipp:333
+#: src/emu/inpttype.ipp:367 src/emu/inpttype.ipp:401 src/emu/inpttype.ipp:435
+#: src/emu/inpttype.ipp:469
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 1"
+msgid "%p Left Stick/Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:35
+#: src/emu/inpttype.ipp:33 src/emu/inpttype.ipp:151 src/emu/inpttype.ipp:232
+#: src/emu/inpttype.ipp:266 src/emu/inpttype.ipp:300 src/emu/inpttype.ipp:334
+#: src/emu/inpttype.ipp:368 src/emu/inpttype.ipp:402 src/emu/inpttype.ipp:436
+#: src/emu/inpttype.ipp:470
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 2"
+msgid "%p Left Stick/Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:36
+#: src/emu/inpttype.ipp:34 src/emu/inpttype.ipp:152 src/emu/inpttype.ipp:233
+#: src/emu/inpttype.ipp:267 src/emu/inpttype.ipp:301 src/emu/inpttype.ipp:335
+#: src/emu/inpttype.ipp:369 src/emu/inpttype.ipp:403 src/emu/inpttype.ipp:437
+#: src/emu/inpttype.ipp:471
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 3"
+msgid "%p Button 1"
 msgstr ""
 
-#: src/emu/inpttype.ipp:37
+#: src/emu/inpttype.ipp:35 src/emu/inpttype.ipp:153 src/emu/inpttype.ipp:234
+#: src/emu/inpttype.ipp:268 src/emu/inpttype.ipp:302 src/emu/inpttype.ipp:336
+#: src/emu/inpttype.ipp:370 src/emu/inpttype.ipp:404 src/emu/inpttype.ipp:438
+#: src/emu/inpttype.ipp:472
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 4"
+msgid "%p Button 2"
 msgstr ""
 
-#: src/emu/inpttype.ipp:38
+#: src/emu/inpttype.ipp:36 src/emu/inpttype.ipp:154 src/emu/inpttype.ipp:235
+#: src/emu/inpttype.ipp:269 src/emu/inpttype.ipp:303 src/emu/inpttype.ipp:337
+#: src/emu/inpttype.ipp:371 src/emu/inpttype.ipp:405 src/emu/inpttype.ipp:439
+#: src/emu/inpttype.ipp:473
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 5"
+msgid "%p Button 3"
 msgstr ""
 
-#: src/emu/inpttype.ipp:39
+#: src/emu/inpttype.ipp:37 src/emu/inpttype.ipp:155 src/emu/inpttype.ipp:236
+#: src/emu/inpttype.ipp:270 src/emu/inpttype.ipp:304 src/emu/inpttype.ipp:338
+#: src/emu/inpttype.ipp:372 src/emu/inpttype.ipp:406 src/emu/inpttype.ipp:440
+#: src/emu/inpttype.ipp:474
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 6"
+msgid "%p Button 4"
 msgstr ""
 
-#: src/emu/inpttype.ipp:40
+#: src/emu/inpttype.ipp:38 src/emu/inpttype.ipp:156 src/emu/inpttype.ipp:237
+#: src/emu/inpttype.ipp:271 src/emu/inpttype.ipp:305 src/emu/inpttype.ipp:339
+#: src/emu/inpttype.ipp:373 src/emu/inpttype.ipp:407 src/emu/inpttype.ipp:441
+#: src/emu/inpttype.ipp:475
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 7"
+msgid "%p Button 5"
 msgstr ""
 
-#: src/emu/inpttype.ipp:41
+#: src/emu/inpttype.ipp:39 src/emu/inpttype.ipp:157 src/emu/inpttype.ipp:238
+#: src/emu/inpttype.ipp:272 src/emu/inpttype.ipp:306 src/emu/inpttype.ipp:340
+#: src/emu/inpttype.ipp:374 src/emu/inpttype.ipp:408 src/emu/inpttype.ipp:442
+#: src/emu/inpttype.ipp:476
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 8"
+msgid "%p Button 6"
 msgstr ""
 
-#: src/emu/inpttype.ipp:42
+#: src/emu/inpttype.ipp:40 src/emu/inpttype.ipp:158 src/emu/inpttype.ipp:239
+#: src/emu/inpttype.ipp:273 src/emu/inpttype.ipp:307 src/emu/inpttype.ipp:341
+#: src/emu/inpttype.ipp:375 src/emu/inpttype.ipp:409 src/emu/inpttype.ipp:443
+#: src/emu/inpttype.ipp:477
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 9"
+msgid "%p Button 7"
 msgstr ""
 
-#: src/emu/inpttype.ipp:43
+#: src/emu/inpttype.ipp:41 src/emu/inpttype.ipp:159 src/emu/inpttype.ipp:240
+#: src/emu/inpttype.ipp:274 src/emu/inpttype.ipp:308 src/emu/inpttype.ipp:342
+#: src/emu/inpttype.ipp:376 src/emu/inpttype.ipp:410 src/emu/inpttype.ipp:444
+#: src/emu/inpttype.ipp:478
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 10"
+msgid "%p Button 8"
 msgstr ""
 
-#: src/emu/inpttype.ipp:44
+#: src/emu/inpttype.ipp:42 src/emu/inpttype.ipp:160 src/emu/inpttype.ipp:241
+#: src/emu/inpttype.ipp:275 src/emu/inpttype.ipp:309 src/emu/inpttype.ipp:343
+#: src/emu/inpttype.ipp:377 src/emu/inpttype.ipp:411 src/emu/inpttype.ipp:445
+#: src/emu/inpttype.ipp:479
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 11"
+msgid "%p Button 9"
 msgstr ""
 
-#: src/emu/inpttype.ipp:45
+#: src/emu/inpttype.ipp:43 src/emu/inpttype.ipp:161 src/emu/inpttype.ipp:242
+#: src/emu/inpttype.ipp:276 src/emu/inpttype.ipp:310 src/emu/inpttype.ipp:344
+#: src/emu/inpttype.ipp:378 src/emu/inpttype.ipp:412 src/emu/inpttype.ipp:446
+#: src/emu/inpttype.ipp:480
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 12"
+msgid "%p Button 10"
 msgstr ""
 
-#: src/emu/inpttype.ipp:46
+#: src/emu/inpttype.ipp:44 src/emu/inpttype.ipp:162 src/emu/inpttype.ipp:243
+#: src/emu/inpttype.ipp:277 src/emu/inpttype.ipp:311 src/emu/inpttype.ipp:345
+#: src/emu/inpttype.ipp:379 src/emu/inpttype.ipp:413 src/emu/inpttype.ipp:447
+#: src/emu/inpttype.ipp:481
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 13"
+msgid "%p Button 11"
 msgstr ""
 
-#: src/emu/inpttype.ipp:47
+#: src/emu/inpttype.ipp:45 src/emu/inpttype.ipp:163 src/emu/inpttype.ipp:244
+#: src/emu/inpttype.ipp:278 src/emu/inpttype.ipp:312 src/emu/inpttype.ipp:346
+#: src/emu/inpttype.ipp:380 src/emu/inpttype.ipp:414 src/emu/inpttype.ipp:448
+#: src/emu/inpttype.ipp:482
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 14"
+msgid "%p Button 12"
 msgstr ""
 
-#: src/emu/inpttype.ipp:48
+#: src/emu/inpttype.ipp:46 src/emu/inpttype.ipp:164 src/emu/inpttype.ipp:245
+#: src/emu/inpttype.ipp:279 src/emu/inpttype.ipp:313 src/emu/inpttype.ipp:347
+#: src/emu/inpttype.ipp:381 src/emu/inpttype.ipp:415 src/emu/inpttype.ipp:449
+#: src/emu/inpttype.ipp:483
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 15"
+msgid "%p Button 13"
 msgstr ""
 
-#: src/emu/inpttype.ipp:49
+#: src/emu/inpttype.ipp:47 src/emu/inpttype.ipp:165 src/emu/inpttype.ipp:246
+#: src/emu/inpttype.ipp:280 src/emu/inpttype.ipp:314 src/emu/inpttype.ipp:348
+#: src/emu/inpttype.ipp:382 src/emu/inpttype.ipp:416 src/emu/inpttype.ipp:450
+#: src/emu/inpttype.ipp:484
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 16"
+msgid "%p Button 14"
 msgstr ""
 
-#: src/emu/inpttype.ipp:50
+#: src/emu/inpttype.ipp:48 src/emu/inpttype.ipp:166 src/emu/inpttype.ipp:247
+#: src/emu/inpttype.ipp:281 src/emu/inpttype.ipp:315 src/emu/inpttype.ipp:349
+#: src/emu/inpttype.ipp:383 src/emu/inpttype.ipp:417 src/emu/inpttype.ipp:451
+#: src/emu/inpttype.ipp:485
+#, c-format
 msgctxt "input-name"
-msgid "P1 Start"
+msgid "%p Button 15"
 msgstr ""
 
-#: src/emu/inpttype.ipp:51
+#: src/emu/inpttype.ipp:49 src/emu/inpttype.ipp:167 src/emu/inpttype.ipp:248
+#: src/emu/inpttype.ipp:282 src/emu/inpttype.ipp:316 src/emu/inpttype.ipp:350
+#: src/emu/inpttype.ipp:384 src/emu/inpttype.ipp:418 src/emu/inpttype.ipp:452
+#: src/emu/inpttype.ipp:486
+#, c-format
 msgctxt "input-name"
-msgid "P1 Select"
+msgid "%p Button 16"
 msgstr ""
 
-#: src/emu/inpttype.ipp:56
+#: src/emu/inpttype.ipp:50 src/emu/inpttype.ipp:168 src/emu/inpttype.ipp:249
+#: src/emu/inpttype.ipp:283 src/emu/inpttype.ipp:317 src/emu/inpttype.ipp:351
+#: src/emu/inpttype.ipp:385 src/emu/inpttype.ipp:419 src/emu/inpttype.ipp:453
+#: src/emu/inpttype.ipp:487
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong A"
+msgid "%p Start"
 msgstr ""
 
-#: src/emu/inpttype.ipp:57
+#: src/emu/inpttype.ipp:51 src/emu/inpttype.ipp:169 src/emu/inpttype.ipp:250
+#: src/emu/inpttype.ipp:284 src/emu/inpttype.ipp:318 src/emu/inpttype.ipp:352
+#: src/emu/inpttype.ipp:386 src/emu/inpttype.ipp:420 src/emu/inpttype.ipp:454
+#: src/emu/inpttype.ipp:488
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong B"
+msgid "%p Select"
 msgstr ""
 
-#: src/emu/inpttype.ipp:58
+#: src/emu/inpttype.ipp:56 src/emu/inpttype.ipp:174
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong C"
+msgid "%p Mahjong A"
 msgstr ""
 
-#: src/emu/inpttype.ipp:59
+#: src/emu/inpttype.ipp:57 src/emu/inpttype.ipp:175
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong D"
+msgid "%p Mahjong B"
 msgstr ""
 
-#: src/emu/inpttype.ipp:60
+#: src/emu/inpttype.ipp:58 src/emu/inpttype.ipp:176
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong E"
+msgid "%p Mahjong C"
 msgstr ""
 
-#: src/emu/inpttype.ipp:61
+#: src/emu/inpttype.ipp:59 src/emu/inpttype.ipp:177
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong F"
+msgid "%p Mahjong D"
 msgstr ""
 
-#: src/emu/inpttype.ipp:62
+#: src/emu/inpttype.ipp:60 src/emu/inpttype.ipp:178
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong G"
+msgid "%p Mahjong E"
 msgstr ""
 
-#: src/emu/inpttype.ipp:63
+#: src/emu/inpttype.ipp:61 src/emu/inpttype.ipp:179
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong H"
+msgid "%p Mahjong F"
 msgstr ""
 
-#: src/emu/inpttype.ipp:64
+#: src/emu/inpttype.ipp:62 src/emu/inpttype.ipp:180
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong I"
+msgid "%p Mahjong G"
 msgstr ""
 
-#: src/emu/inpttype.ipp:65
+#: src/emu/inpttype.ipp:63 src/emu/inpttype.ipp:181
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong J"
+msgid "%p Mahjong H"
 msgstr ""
 
-#: src/emu/inpttype.ipp:66
+#: src/emu/inpttype.ipp:64 src/emu/inpttype.ipp:182
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong K"
+msgid "%p Mahjong I"
 msgstr ""
 
-#: src/emu/inpttype.ipp:67
+#: src/emu/inpttype.ipp:65 src/emu/inpttype.ipp:183
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong L"
+msgid "%p Mahjong J"
 msgstr ""
 
-#: src/emu/inpttype.ipp:68
+#: src/emu/inpttype.ipp:66 src/emu/inpttype.ipp:184
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong M"
+msgid "%p Mahjong K"
 msgstr ""
 
-#: src/emu/inpttype.ipp:69
+#: src/emu/inpttype.ipp:67 src/emu/inpttype.ipp:185
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong N"
+msgid "%p Mahjong L"
 msgstr ""
 
-#: src/emu/inpttype.ipp:70
+#: src/emu/inpttype.ipp:68 src/emu/inpttype.ipp:186
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong O"
+msgid "%p Mahjong M"
 msgstr ""
 
-#: src/emu/inpttype.ipp:71
+#: src/emu/inpttype.ipp:69 src/emu/inpttype.ipp:187
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong P"
+msgid "%p Mahjong N"
 msgstr ""
 
-#: src/emu/inpttype.ipp:72
+#: src/emu/inpttype.ipp:70 src/emu/inpttype.ipp:188
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Q"
+msgid "%p Mahjong O"
 msgstr ""
 
-#: src/emu/inpttype.ipp:73
+#: src/emu/inpttype.ipp:71 src/emu/inpttype.ipp:189
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Kan"
+msgid "%p Mahjong P"
 msgstr ""
 
-#: src/emu/inpttype.ipp:74
+#: src/emu/inpttype.ipp:72 src/emu/inpttype.ipp:190
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Pon"
+msgid "%p Mahjong Q"
 msgstr ""
 
-#: src/emu/inpttype.ipp:75
+#: src/emu/inpttype.ipp:73 src/emu/inpttype.ipp:191
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Chi"
+msgid "%p Mahjong Kan"
 msgstr ""
 
-#: src/emu/inpttype.ipp:76
+#: src/emu/inpttype.ipp:74 src/emu/inpttype.ipp:192
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Reach"
+msgid "%p Mahjong Pon"
 msgstr ""
 
-#: src/emu/inpttype.ipp:77
+#: src/emu/inpttype.ipp:75 src/emu/inpttype.ipp:193
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Ron"
+msgid "%p Mahjong Chi"
 msgstr ""
 
-#: src/emu/inpttype.ipp:78
+#: src/emu/inpttype.ipp:76 src/emu/inpttype.ipp:194
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Flip Flop"
+msgid "%p Mahjong Reach"
 msgstr ""
 
-#: src/emu/inpttype.ipp:79
+#: src/emu/inpttype.ipp:77 src/emu/inpttype.ipp:195
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Bet"
+msgid "%p Mahjong Ron"
 msgstr ""
 
-#: src/emu/inpttype.ipp:80
+#: src/emu/inpttype.ipp:78 src/emu/inpttype.ipp:200
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Take Score"
+msgid "%p Mahjong Flip Flop"
 msgstr ""
 
-#: src/emu/inpttype.ipp:81
+#: src/emu/inpttype.ipp:79 src/emu/inpttype.ipp:196
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Double Up"
+msgid "%p Mahjong Bet"
 msgstr ""
 
-#: src/emu/inpttype.ipp:82
+#: src/emu/inpttype.ipp:80 src/emu/inpttype.ipp:198
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Big"
+msgid "%p Mahjong Take Score"
 msgstr ""
 
-#: src/emu/inpttype.ipp:83
+#: src/emu/inpttype.ipp:81 src/emu/inpttype.ipp:199
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Small"
+msgid "%p Mahjong Double Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:84
+#: src/emu/inpttype.ipp:82 src/emu/inpttype.ipp:201
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Last Chance"
+msgid "%p Mahjong Big"
 msgstr ""
 
-#: src/emu/inpttype.ipp:89
+#: src/emu/inpttype.ipp:83 src/emu/inpttype.ipp:202
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda A/1"
+msgid "%p Mahjong Small"
 msgstr ""
 
-#: src/emu/inpttype.ipp:90
+#: src/emu/inpttype.ipp:84 src/emu/inpttype.ipp:197
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda B/2"
+msgid "%p Mahjong Last Chance"
 msgstr ""
 
-#: src/emu/inpttype.ipp:91
+#: src/emu/inpttype.ipp:89 src/emu/inpttype.ipp:207
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda C/3"
+msgid "%p Hanafuda A/1"
 msgstr ""
 
-#: src/emu/inpttype.ipp:92
+#: src/emu/inpttype.ipp:90 src/emu/inpttype.ipp:208
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda D/4"
+msgid "%p Hanafuda B/2"
 msgstr ""
 
-#: src/emu/inpttype.ipp:93
+#: src/emu/inpttype.ipp:91 src/emu/inpttype.ipp:209
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda E/5"
+msgid "%p Hanafuda C/3"
 msgstr ""
 
-#: src/emu/inpttype.ipp:94
+#: src/emu/inpttype.ipp:92 src/emu/inpttype.ipp:210
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda F/6"
+msgid "%p Hanafuda D/4"
 msgstr ""
 
-#: src/emu/inpttype.ipp:95
+#: src/emu/inpttype.ipp:93 src/emu/inpttype.ipp:211
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda G/7"
+msgid "%p Hanafuda E/5"
 msgstr ""
 
-#: src/emu/inpttype.ipp:96
+#: src/emu/inpttype.ipp:94 src/emu/inpttype.ipp:212
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda H/8"
+msgid "%p Hanafuda F/6"
 msgstr ""
 
-#: src/emu/inpttype.ipp:97
+#: src/emu/inpttype.ipp:95 src/emu/inpttype.ipp:213
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda Yes"
+msgid "%p Hanafuda G/7"
 msgstr ""
 
-#: src/emu/inpttype.ipp:98
+#: src/emu/inpttype.ipp:96 src/emu/inpttype.ipp:214
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda No"
+msgid "%p Hanafuda H/8"
+msgstr ""
+
+#: src/emu/inpttype.ipp:97 src/emu/inpttype.ipp:215
+#, c-format
+msgctxt "input-name"
+msgid "%p Hanafuda Yes"
+msgstr ""
+
+#: src/emu/inpttype.ipp:98 src/emu/inpttype.ipp:216
+#, c-format
+msgctxt "input-name"
+msgid "%p Hanafuda No"
 msgstr ""
 
 #: src/emu/inpttype.ipp:103
@@ -3806,1551 +3980,6 @@ msgctxt "input-name"
 msgid "Stop All Reels"
 msgstr ""
 
-#: src/emu/inpttype.ipp:140
-msgctxt "input-name"
-msgid "P2 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:141
-msgctxt "input-name"
-msgid "P2 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:142
-msgctxt "input-name"
-msgid "P2 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:143
-msgctxt "input-name"
-msgid "P2 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:144
-msgctxt "input-name"
-msgid "P2 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:145
-msgctxt "input-name"
-msgid "P2 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:146
-msgctxt "input-name"
-msgid "P2 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:147
-msgctxt "input-name"
-msgid "P2 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:148
-msgctxt "input-name"
-msgid "P2 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:149
-msgctxt "input-name"
-msgid "P2 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:150
-msgctxt "input-name"
-msgid "P2 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:151
-msgctxt "input-name"
-msgid "P2 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:152
-msgctxt "input-name"
-msgid "P2 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:153
-msgctxt "input-name"
-msgid "P2 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:154
-msgctxt "input-name"
-msgid "P2 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:155
-msgctxt "input-name"
-msgid "P2 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:156
-msgctxt "input-name"
-msgid "P2 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:157
-msgctxt "input-name"
-msgid "P2 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:158
-msgctxt "input-name"
-msgid "P2 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:159
-msgctxt "input-name"
-msgid "P2 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:160
-msgctxt "input-name"
-msgid "P2 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:161
-msgctxt "input-name"
-msgid "P2 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:162
-msgctxt "input-name"
-msgid "P2 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:163
-msgctxt "input-name"
-msgid "P2 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:164
-msgctxt "input-name"
-msgid "P2 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:165
-msgctxt "input-name"
-msgid "P2 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:166
-msgctxt "input-name"
-msgid "P2 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:167
-msgctxt "input-name"
-msgid "P2 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:168
-msgctxt "input-name"
-msgid "P2 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:169
-msgctxt "input-name"
-msgid "P2 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:174
-msgctxt "input-name"
-msgid "P2 Mahjong A"
-msgstr ""
-
-#: src/emu/inpttype.ipp:175
-msgctxt "input-name"
-msgid "P2 Mahjong B"
-msgstr ""
-
-#: src/emu/inpttype.ipp:176
-msgctxt "input-name"
-msgid "P2 Mahjong C"
-msgstr ""
-
-#: src/emu/inpttype.ipp:177
-msgctxt "input-name"
-msgid "P2 Mahjong D"
-msgstr ""
-
-#: src/emu/inpttype.ipp:178
-msgctxt "input-name"
-msgid "P2 Mahjong E"
-msgstr ""
-
-#: src/emu/inpttype.ipp:179
-msgctxt "input-name"
-msgid "P2 Mahjong F"
-msgstr ""
-
-#: src/emu/inpttype.ipp:180
-msgctxt "input-name"
-msgid "P2 Mahjong G"
-msgstr ""
-
-#: src/emu/inpttype.ipp:181
-msgctxt "input-name"
-msgid "P2 Mahjong H"
-msgstr ""
-
-#: src/emu/inpttype.ipp:182
-msgctxt "input-name"
-msgid "P2 Mahjong I"
-msgstr ""
-
-#: src/emu/inpttype.ipp:183
-msgctxt "input-name"
-msgid "P2 Mahjong J"
-msgstr ""
-
-#: src/emu/inpttype.ipp:184
-msgctxt "input-name"
-msgid "P2 Mahjong K"
-msgstr ""
-
-#: src/emu/inpttype.ipp:185
-msgctxt "input-name"
-msgid "P2 Mahjong L"
-msgstr ""
-
-#: src/emu/inpttype.ipp:186
-msgctxt "input-name"
-msgid "P2 Mahjong M"
-msgstr ""
-
-#: src/emu/inpttype.ipp:187
-msgctxt "input-name"
-msgid "P2 Mahjong N"
-msgstr ""
-
-#: src/emu/inpttype.ipp:188
-msgctxt "input-name"
-msgid "P2 Mahjong O"
-msgstr ""
-
-#: src/emu/inpttype.ipp:189
-msgctxt "input-name"
-msgid "P2 Mahjong P"
-msgstr ""
-
-#: src/emu/inpttype.ipp:190
-msgctxt "input-name"
-msgid "P2 Mahjong Q"
-msgstr ""
-
-#: src/emu/inpttype.ipp:191
-msgctxt "input-name"
-msgid "P2 Mahjong Kan"
-msgstr ""
-
-#: src/emu/inpttype.ipp:192
-msgctxt "input-name"
-msgid "P2 Mahjong Pon"
-msgstr ""
-
-#: src/emu/inpttype.ipp:193
-msgctxt "input-name"
-msgid "P2 Mahjong Chi"
-msgstr ""
-
-#: src/emu/inpttype.ipp:194
-msgctxt "input-name"
-msgid "P2 Mahjong Reach"
-msgstr ""
-
-#: src/emu/inpttype.ipp:195
-msgctxt "input-name"
-msgid "P2 Mahjong Ron"
-msgstr ""
-
-#: src/emu/inpttype.ipp:196
-msgctxt "input-name"
-msgid "P2 Mahjong Bet"
-msgstr ""
-
-#: src/emu/inpttype.ipp:197
-msgctxt "input-name"
-msgid "P2 Mahjong Last Chance"
-msgstr ""
-
-#: src/emu/inpttype.ipp:198
-msgctxt "input-name"
-msgid "P2 Mahjong Take Score"
-msgstr ""
-
-#: src/emu/inpttype.ipp:199
-msgctxt "input-name"
-msgid "P2 Mahjong Double Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:200
-msgctxt "input-name"
-msgid "P2 Mahjong Flip Flop"
-msgstr ""
-
-#: src/emu/inpttype.ipp:201
-msgctxt "input-name"
-msgid "P2 Mahjong Big"
-msgstr ""
-
-#: src/emu/inpttype.ipp:202
-msgctxt "input-name"
-msgid "P2 Mahjong Small"
-msgstr ""
-
-#: src/emu/inpttype.ipp:207
-msgctxt "input-name"
-msgid "P2 Hanafuda A/1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:208
-msgctxt "input-name"
-msgid "P2 Hanafuda B/2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:209
-msgctxt "input-name"
-msgid "P2 Hanafuda C/3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:210
-msgctxt "input-name"
-msgid "P2 Hanafuda D/4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:211
-msgctxt "input-name"
-msgid "P2 Hanafuda E/5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:212
-msgctxt "input-name"
-msgid "P2 Hanafuda F/6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:213
-msgctxt "input-name"
-msgid "P2 Hanafuda G/7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:214
-msgctxt "input-name"
-msgid "P2 Hanafuda H/8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:215
-msgctxt "input-name"
-msgid "P2 Hanafuda Yes"
-msgstr ""
-
-#: src/emu/inpttype.ipp:216
-msgctxt "input-name"
-msgid "P2 Hanafuda No"
-msgstr ""
-
-#: src/emu/inpttype.ipp:221
-msgctxt "input-name"
-msgid "P3 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:222
-msgctxt "input-name"
-msgid "P3 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:223
-msgctxt "input-name"
-msgid "P3 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:224
-msgctxt "input-name"
-msgid "P3 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:225
-msgctxt "input-name"
-msgid "P3 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:226
-msgctxt "input-name"
-msgid "P3 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:227
-msgctxt "input-name"
-msgid "P3 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:228
-msgctxt "input-name"
-msgid "P3 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:229
-msgctxt "input-name"
-msgid "P3 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:230
-msgctxt "input-name"
-msgid "P3 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:231
-msgctxt "input-name"
-msgid "P3 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:232
-msgctxt "input-name"
-msgid "P3 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:233
-msgctxt "input-name"
-msgid "P3 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:234
-msgctxt "input-name"
-msgid "P3 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:235
-msgctxt "input-name"
-msgid "P3 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:236
-msgctxt "input-name"
-msgid "P3 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:237
-msgctxt "input-name"
-msgid "P3 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:238
-msgctxt "input-name"
-msgid "P3 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:239
-msgctxt "input-name"
-msgid "P3 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:240
-msgctxt "input-name"
-msgid "P3 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:241
-msgctxt "input-name"
-msgid "P3 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:242
-msgctxt "input-name"
-msgid "P3 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:243
-msgctxt "input-name"
-msgid "P3 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:244
-msgctxt "input-name"
-msgid "P3 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:245
-msgctxt "input-name"
-msgid "P3 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:246
-msgctxt "input-name"
-msgid "P3 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:247
-msgctxt "input-name"
-msgid "P3 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:248
-msgctxt "input-name"
-msgid "P3 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:249
-msgctxt "input-name"
-msgid "P3 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:250
-msgctxt "input-name"
-msgid "P3 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:255
-msgctxt "input-name"
-msgid "P4 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:256
-msgctxt "input-name"
-msgid "P4 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:257
-msgctxt "input-name"
-msgid "P4 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:258
-msgctxt "input-name"
-msgid "P4 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:259
-msgctxt "input-name"
-msgid "P4 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:260
-msgctxt "input-name"
-msgid "P4 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:261
-msgctxt "input-name"
-msgid "P4 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:262
-msgctxt "input-name"
-msgid "P4 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:263
-msgctxt "input-name"
-msgid "P4 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:264
-msgctxt "input-name"
-msgid "P4 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:265
-msgctxt "input-name"
-msgid "P4 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:266
-msgctxt "input-name"
-msgid "P4 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:267
-msgctxt "input-name"
-msgid "P4 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:268
-msgctxt "input-name"
-msgid "P4 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:269
-msgctxt "input-name"
-msgid "P4 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:270
-msgctxt "input-name"
-msgid "P4 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:271
-msgctxt "input-name"
-msgid "P4 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:272
-msgctxt "input-name"
-msgid "P4 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:273
-msgctxt "input-name"
-msgid "P4 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:274
-msgctxt "input-name"
-msgid "P4 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:275
-msgctxt "input-name"
-msgid "P4 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:276
-msgctxt "input-name"
-msgid "P4 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:277
-msgctxt "input-name"
-msgid "P4 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:278
-msgctxt "input-name"
-msgid "P4 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:279
-msgctxt "input-name"
-msgid "P4 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:280
-msgctxt "input-name"
-msgid "P4 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:281
-msgctxt "input-name"
-msgid "P4 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:282
-msgctxt "input-name"
-msgid "P4 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:283
-msgctxt "input-name"
-msgid "P4 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:284
-msgctxt "input-name"
-msgid "P4 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:289
-msgctxt "input-name"
-msgid "P5 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:290
-msgctxt "input-name"
-msgid "P5 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:291
-msgctxt "input-name"
-msgid "P5 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:292
-msgctxt "input-name"
-msgid "P5 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:293
-msgctxt "input-name"
-msgid "P5 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:294
-msgctxt "input-name"
-msgid "P5 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:295
-msgctxt "input-name"
-msgid "P5 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:296
-msgctxt "input-name"
-msgid "P5 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:297
-msgctxt "input-name"
-msgid "P5 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:298
-msgctxt "input-name"
-msgid "P5 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:299
-msgctxt "input-name"
-msgid "P5 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:300
-msgctxt "input-name"
-msgid "P5 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:301
-msgctxt "input-name"
-msgid "P5 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:302
-msgctxt "input-name"
-msgid "P5 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:303
-msgctxt "input-name"
-msgid "P5 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:304
-msgctxt "input-name"
-msgid "P5 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:305
-msgctxt "input-name"
-msgid "P5 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:306
-msgctxt "input-name"
-msgid "P5 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:307
-msgctxt "input-name"
-msgid "P5 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:308
-msgctxt "input-name"
-msgid "P5 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:309
-msgctxt "input-name"
-msgid "P5 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:310
-msgctxt "input-name"
-msgid "P5 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:311
-msgctxt "input-name"
-msgid "P5 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:312
-msgctxt "input-name"
-msgid "P5 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:313
-msgctxt "input-name"
-msgid "P5 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:314
-msgctxt "input-name"
-msgid "P5 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:315
-msgctxt "input-name"
-msgid "P5 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:316
-msgctxt "input-name"
-msgid "P5 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:317
-msgctxt "input-name"
-msgid "P5 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:318
-msgctxt "input-name"
-msgid "P5 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:323
-msgctxt "input-name"
-msgid "P6 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:324
-msgctxt "input-name"
-msgid "P6 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:325
-msgctxt "input-name"
-msgid "P6 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:326
-msgctxt "input-name"
-msgid "P6 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:327
-msgctxt "input-name"
-msgid "P6 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:328
-msgctxt "input-name"
-msgid "P6 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:329
-msgctxt "input-name"
-msgid "P6 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:330
-msgctxt "input-name"
-msgid "P6 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:331
-msgctxt "input-name"
-msgid "P6 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:332
-msgctxt "input-name"
-msgid "P6 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:333
-msgctxt "input-name"
-msgid "P6 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:334
-msgctxt "input-name"
-msgid "P6 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:335
-msgctxt "input-name"
-msgid "P6 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:336
-msgctxt "input-name"
-msgid "P6 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:337
-msgctxt "input-name"
-msgid "P6 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:338
-msgctxt "input-name"
-msgid "P6 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:339
-msgctxt "input-name"
-msgid "P6 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:340
-msgctxt "input-name"
-msgid "P6 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:341
-msgctxt "input-name"
-msgid "P6 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:342
-msgctxt "input-name"
-msgid "P6 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:343
-msgctxt "input-name"
-msgid "P6 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:344
-msgctxt "input-name"
-msgid "P6 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:345
-msgctxt "input-name"
-msgid "P6 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:346
-msgctxt "input-name"
-msgid "P6 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:347
-msgctxt "input-name"
-msgid "P6 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:348
-msgctxt "input-name"
-msgid "P6 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:349
-msgctxt "input-name"
-msgid "P6 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:350
-msgctxt "input-name"
-msgid "P6 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:351
-msgctxt "input-name"
-msgid "P6 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:352
-msgctxt "input-name"
-msgid "P6 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:357
-msgctxt "input-name"
-msgid "P7 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:358
-msgctxt "input-name"
-msgid "P7 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:359
-msgctxt "input-name"
-msgid "P7 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:360
-msgctxt "input-name"
-msgid "P7 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:361
-msgctxt "input-name"
-msgid "P7 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:362
-msgctxt "input-name"
-msgid "P7 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:363
-msgctxt "input-name"
-msgid "P7 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:364
-msgctxt "input-name"
-msgid "P7 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:365
-msgctxt "input-name"
-msgid "P7 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:366
-msgctxt "input-name"
-msgid "P7 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:367
-msgctxt "input-name"
-msgid "P7 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:368
-msgctxt "input-name"
-msgid "P7 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:369
-msgctxt "input-name"
-msgid "P7 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:370
-msgctxt "input-name"
-msgid "P7 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:371
-msgctxt "input-name"
-msgid "P7 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:372
-msgctxt "input-name"
-msgid "P7 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:373
-msgctxt "input-name"
-msgid "P7 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:374
-msgctxt "input-name"
-msgid "P7 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:375
-msgctxt "input-name"
-msgid "P7 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:376
-msgctxt "input-name"
-msgid "P7 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:377
-msgctxt "input-name"
-msgid "P7 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:378
-msgctxt "input-name"
-msgid "P7 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:379
-msgctxt "input-name"
-msgid "P7 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:380
-msgctxt "input-name"
-msgid "P7 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:381
-msgctxt "input-name"
-msgid "P7 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:382
-msgctxt "input-name"
-msgid "P7 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:383
-msgctxt "input-name"
-msgid "P7 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:384
-msgctxt "input-name"
-msgid "P7 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:385
-msgctxt "input-name"
-msgid "P7 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:386
-msgctxt "input-name"
-msgid "P7 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:391
-msgctxt "input-name"
-msgid "P8 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:392
-msgctxt "input-name"
-msgid "P8 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:393
-msgctxt "input-name"
-msgid "P8 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:394
-msgctxt "input-name"
-msgid "P8 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:395
-msgctxt "input-name"
-msgid "P8 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:396
-msgctxt "input-name"
-msgid "P8 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:397
-msgctxt "input-name"
-msgid "P8 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:398
-msgctxt "input-name"
-msgid "P8 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:399
-msgctxt "input-name"
-msgid "P8 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:400
-msgctxt "input-name"
-msgid "P8 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:401
-msgctxt "input-name"
-msgid "P8 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:402
-msgctxt "input-name"
-msgid "P8 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:403
-msgctxt "input-name"
-msgid "P8 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:404
-msgctxt "input-name"
-msgid "P8 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:405
-msgctxt "input-name"
-msgid "P8 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:406
-msgctxt "input-name"
-msgid "P8 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:407
-msgctxt "input-name"
-msgid "P8 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:408
-msgctxt "input-name"
-msgid "P8 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:409
-msgctxt "input-name"
-msgid "P8 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:410
-msgctxt "input-name"
-msgid "P8 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:411
-msgctxt "input-name"
-msgid "P8 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:412
-msgctxt "input-name"
-msgid "P8 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:413
-msgctxt "input-name"
-msgid "P8 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:414
-msgctxt "input-name"
-msgid "P8 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:415
-msgctxt "input-name"
-msgid "P8 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:416
-msgctxt "input-name"
-msgid "P8 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:417
-msgctxt "input-name"
-msgid "P8 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:418
-msgctxt "input-name"
-msgid "P8 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:419
-msgctxt "input-name"
-msgid "P8 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:420
-msgctxt "input-name"
-msgid "P8 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:425
-msgctxt "input-name"
-msgid "P9 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:426
-msgctxt "input-name"
-msgid "P9 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:427
-msgctxt "input-name"
-msgid "P9 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:428
-msgctxt "input-name"
-msgid "P9 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:429
-msgctxt "input-name"
-msgid "P9 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:430
-msgctxt "input-name"
-msgid "P9 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:431
-msgctxt "input-name"
-msgid "P9 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:432
-msgctxt "input-name"
-msgid "P9 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:433
-msgctxt "input-name"
-msgid "P9 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:434
-msgctxt "input-name"
-msgid "P9 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:435
-msgctxt "input-name"
-msgid "P9 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:436
-msgctxt "input-name"
-msgid "P9 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:437
-msgctxt "input-name"
-msgid "P9 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:438
-msgctxt "input-name"
-msgid "P9 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:439
-msgctxt "input-name"
-msgid "P9 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:440
-msgctxt "input-name"
-msgid "P9 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:441
-msgctxt "input-name"
-msgid "P9 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:442
-msgctxt "input-name"
-msgid "P9 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:443
-msgctxt "input-name"
-msgid "P9 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:444
-msgctxt "input-name"
-msgid "P9 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:445
-msgctxt "input-name"
-msgid "P9 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:446
-msgctxt "input-name"
-msgid "P9 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:447
-msgctxt "input-name"
-msgid "P9 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:448
-msgctxt "input-name"
-msgid "P9 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:449
-msgctxt "input-name"
-msgid "P9 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:450
-msgctxt "input-name"
-msgid "P9 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:451
-msgctxt "input-name"
-msgid "P9 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:452
-msgctxt "input-name"
-msgid "P9 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:453
-msgctxt "input-name"
-msgid "P9 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:454
-msgctxt "input-name"
-msgid "P9 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:459
-msgctxt "input-name"
-msgid "P10 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:460
-msgctxt "input-name"
-msgid "P10 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:461
-msgctxt "input-name"
-msgid "P10 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:462
-msgctxt "input-name"
-msgid "P10 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:463
-msgctxt "input-name"
-msgid "P10 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:464
-msgctxt "input-name"
-msgid "P10 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:465
-msgctxt "input-name"
-msgid "P10 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:466
-msgctxt "input-name"
-msgid "P10 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:467
-msgctxt "input-name"
-msgid "P10 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:468
-msgctxt "input-name"
-msgid "P10 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:469
-msgctxt "input-name"
-msgid "P10 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:470
-msgctxt "input-name"
-msgid "P10 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:471
-msgctxt "input-name"
-msgid "P10 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:472
-msgctxt "input-name"
-msgid "P10 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:473
-msgctxt "input-name"
-msgid "P10 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:474
-msgctxt "input-name"
-msgid "P10 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:475
-msgctxt "input-name"
-msgid "P10 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:476
-msgctxt "input-name"
-msgid "P10 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:477
-msgctxt "input-name"
-msgid "P10 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:478
-msgctxt "input-name"
-msgid "P10 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:479
-msgctxt "input-name"
-msgid "P10 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:480
-msgctxt "input-name"
-msgid "P10 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:481
-msgctxt "input-name"
-msgid "P10 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:482
-msgctxt "input-name"
-msgid "P10 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:483
-msgctxt "input-name"
-msgid "P10 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:484
-msgctxt "input-name"
-msgid "P10 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:485
-msgctxt "input-name"
-msgid "P10 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:486
-msgctxt "input-name"
-msgid "P10 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:487
-msgctxt "input-name"
-msgid "P10 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:488
-msgctxt "input-name"
-msgid "P10 Select"
-msgstr ""
-
 #: src/emu/inpttype.ipp:493
 msgctxt "input-name"
 msgid "1 Player Start"
@@ -5531,154 +4160,31 @@ msgctxt "input-name"
 msgid "Volume Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:550
-msgctxt "input-name"
-msgid "P1 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:551
-msgctxt "input-name"
-msgid "P2 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:552
-msgctxt "input-name"
-msgid "P3 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:553
-msgctxt "input-name"
-msgid "P4 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:554
-msgctxt "input-name"
-msgid "P5 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:555
-msgctxt "input-name"
-msgid "P6 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:556
-msgctxt "input-name"
-msgid "P7 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:557
-msgctxt "input-name"
-msgid "P8 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:558
-msgctxt "input-name"
-msgid "P9 Pedal 1"
-msgstr ""
-
+#: src/emu/inpttype.ipp:550 src/emu/inpttype.ipp:551 src/emu/inpttype.ipp:552
+#: src/emu/inpttype.ipp:553 src/emu/inpttype.ipp:554 src/emu/inpttype.ipp:555
+#: src/emu/inpttype.ipp:556 src/emu/inpttype.ipp:557 src/emu/inpttype.ipp:558
 #: src/emu/inpttype.ipp:559
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:564
-msgctxt "input-name"
-msgid "P1 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:565
-msgctxt "input-name"
-msgid "P2 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:566
-msgctxt "input-name"
-msgid "P3 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:567
-msgctxt "input-name"
-msgid "P4 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:568
-msgctxt "input-name"
-msgid "P5 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:569
-msgctxt "input-name"
-msgid "P6 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:570
-msgctxt "input-name"
-msgid "P7 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:571
-msgctxt "input-name"
-msgid "P8 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:572
-msgctxt "input-name"
-msgid "P9 Pedal 2"
+msgid "%p Pedal 1"
 msgstr ""
 
+#: src/emu/inpttype.ipp:564 src/emu/inpttype.ipp:565 src/emu/inpttype.ipp:566
+#: src/emu/inpttype.ipp:567 src/emu/inpttype.ipp:568 src/emu/inpttype.ipp:569
+#: src/emu/inpttype.ipp:570 src/emu/inpttype.ipp:571 src/emu/inpttype.ipp:572
 #: src/emu/inpttype.ipp:573
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:578
-msgctxt "input-name"
-msgid "P1 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:579
-msgctxt "input-name"
-msgid "P2 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:580
-msgctxt "input-name"
-msgid "P3 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:581
-msgctxt "input-name"
-msgid "P4 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:582
-msgctxt "input-name"
-msgid "P5 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:583
-msgctxt "input-name"
-msgid "P6 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:584
-msgctxt "input-name"
-msgid "P7 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:585
-msgctxt "input-name"
-msgid "P8 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:586
-msgctxt "input-name"
-msgid "P9 Pedal 3"
+msgid "%p Pedal 2"
 msgstr ""
 
+#: src/emu/inpttype.ipp:578 src/emu/inpttype.ipp:579 src/emu/inpttype.ipp:580
+#: src/emu/inpttype.ipp:581 src/emu/inpttype.ipp:582 src/emu/inpttype.ipp:583
+#: src/emu/inpttype.ipp:584 src/emu/inpttype.ipp:585 src/emu/inpttype.ipp:586
 #: src/emu/inpttype.ipp:587
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 3"
+msgid "%p Pedal 3"
 msgstr ""
 
 #: src/emu/inpttype.ipp:592
diff --git a/language/Serbian_Cyrillic/strings.po b/language/Serbian_Cyrillic/strings.po
index 4c0477fdd88..2794a4afe27 100644
--- a/language/Serbian_Cyrillic/strings.po
+++ b/language/Serbian_Cyrillic/strings.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-19 02:50+1100\n"
+"POT-Creation-Date: 2021-12-09 04:44+1100\n"
 "PO-Revision-Date: 2016-02-23 12:43+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: MAME Language Team\n"
@@ -272,12 +272,12 @@ msgstr "%1$s %2$s ( %3$d / %4$d програмских пакета )"
 msgid "Driver: \"%1$s\" software list "
 msgstr "Драjвeр: \"%1$s\" листа програма "
 
-#: src/frontend/mame/ui/selsoft.cpp:711 src/frontend/mame/ui/selgame.cpp:1066
+#: src/frontend/mame/ui/selsoft.cpp:711 src/frontend/mame/ui/selgame.cpp:1076
 #, c-format
 msgid "%1$s: %2$s - Search: %3$s_"
 msgstr "%1$s: %2$s - Претрага: %3$s_"
 
-#: src/frontend/mame/ui/selsoft.cpp:713 src/frontend/mame/ui/selgame.cpp:1068
+#: src/frontend/mame/ui/selsoft.cpp:713 src/frontend/mame/ui/selgame.cpp:1078
 #, c-format
 msgid "Search: %1$s_"
 msgstr "Претрага: %1$s_"
@@ -287,7 +287,7 @@ msgstr "Претрага: %1$s_"
 msgid "Software list/item: %1$s:%2$s"
 msgstr ""
 
-#: src/frontend/mame/ui/optsmenu.cpp:73 src/frontend/mame/ui/sndmenu.cpp:165
+#: src/frontend/mame/ui/optsmenu.cpp:73 src/frontend/mame/ui/sndmenu.cpp:161
 msgid "Sound Options"
 msgstr "Опције за звук"
 
@@ -382,11 +382,11 @@ msgid "Show mouse pointer"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:39
-msgid "Confirm quit from machines"
+msgid "Confirm quit from emulation"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:40
-msgid "Skip information screen at startup"
+msgid "Skip system information screen"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:41
@@ -402,7 +402,7 @@ msgid "Skip BIOS selection menu"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:44
-msgid "Skip software parts selection menu"
+msgid "Skip software part selection menu"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:45
@@ -554,7 +554,7 @@ msgid "UI active"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:91
-msgid "Offscreen reload"
+msgid "Off-screen reload"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:92
@@ -570,7 +570,7 @@ msgid "Natural keyboard"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:95
-msgid "Simultaneous contradictory"
+msgid "Allow contradictory joystick inputs"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:96
@@ -594,7 +594,7 @@ msgid "Pedal Device Assignment"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:106
-msgid "Adstick Device Assignment"
+msgid "AD Stick Device Assignment"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:107
@@ -681,14 +681,14 @@ msgstr ""
 msgid "Wait Vertical Sync"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:687
+#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:689
 #: src/frontend/mame/ui/videoopt.cpp:191 src/frontend/mame/ui/custui.cpp:490
 #: src/frontend/mame/ui/analogipt.cpp:471 plugins/cheatfind/init.lua:766
 #: plugins/cheatfind/init.lua:777 plugins/cheat/init.lua:668
 msgid "On"
 msgstr "Укључено"
 
-#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:690
+#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:692
 #: src/frontend/mame/ui/videoopt.cpp:207 src/frontend/mame/ui/custui.cpp:490
 #: src/frontend/mame/ui/analogipt.cpp:471 plugins/cheatfind/init.lua:763
 #: plugins/cheatfind/init.lua:774 plugins/cheat/init.lua:671
@@ -696,11 +696,11 @@ msgstr "Укључено"
 msgid "Off"
 msgstr "Искључено"
 
-#: src/frontend/mame/ui/menu.cpp:693
+#: src/frontend/mame/ui/menu.cpp:695
 msgid "Auto"
 msgstr "Аутоматски"
 
-#: src/frontend/mame/ui/menu.cpp:1195
+#: src/frontend/mame/ui/menu.cpp:1197
 #: src/frontend/mame/ui/simpleselgame.cpp:278
 #: src/frontend/mame/ui/selmenu.cpp:1280
 msgid "Return to Previous Menu"
@@ -708,7 +708,7 @@ msgstr "Повратак у претходни мени"
 
 #: src/frontend/mame/ui/filemngr.cpp:139
 #: src/frontend/mame/ui/confswitch.cpp:119
-#: src/frontend/mame/ui/inputmap.cpp:559 src/frontend/mame/ui/analogipt.cpp:360
+#: src/frontend/mame/ui/inputmap.cpp:563 src/frontend/mame/ui/analogipt.cpp:360
 #, c-format
 msgid "[root%1$s]"
 msgstr ""
@@ -971,22 +971,22 @@ msgstr ""
 "CPU:\n"
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "GHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "MHz"
 msgstr "MHz"
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "kHz"
 msgstr "kHz"
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "Hz"
 msgstr ""
 
@@ -1014,38 +1014,38 @@ msgstr "Ниједан\n"
 msgid "Vector"
 msgstr "Вектор"
 
-#: src/frontend/mame/ui/info.cpp:480
+#: src/frontend/mame/ui/info.cpp:483
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr "%1$s: %2$s\n"
 
-#: src/frontend/mame/ui/info.cpp:480
+#: src/frontend/mame/ui/info.cpp:483
 msgid "%2$s\n"
 msgstr "%2$s\n"
 
-#: src/frontend/mame/ui/info.cpp:497
+#: src/frontend/mame/ui/info.cpp:500
 #, c-format
 msgid "Screen '%1$s'"
 msgstr "Екран '%1$s'"
 
-#: src/frontend/mame/ui/info.cpp:499
+#: src/frontend/mame/ui/info.cpp:502
 msgid "Screen"
 msgstr "Екран"
 
-#: src/frontend/mame/ui/info.cpp:570 src/frontend/mame/ui/info.cpp:581
+#: src/frontend/mame/ui/info.cpp:573 src/frontend/mame/ui/info.cpp:584
 #, c-format
 msgid "%1$s:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:662
+#: src/frontend/mame/ui/info.cpp:665
 msgid "Not supported"
 msgstr "Није подржано"
 
-#: src/frontend/mame/ui/info.cpp:665
+#: src/frontend/mame/ui/info.cpp:668
 msgid "Partially supported"
 msgstr "Делимично подржано"
 
-#: src/frontend/mame/ui/info.cpp:674
+#: src/frontend/mame/ui/info.cpp:677
 msgid "[empty]"
 msgstr "[празно]"
 
@@ -1118,7 +1118,7 @@ msgid "Emulated"
 msgstr "Емулирани"
 
 #: src/frontend/mame/ui/keyboard.cpp:59 src/frontend/mame/ui/confswitch.cpp:117
-#: src/frontend/mame/ui/inputmap.cpp:557 src/frontend/mame/ui/analogipt.cpp:358
+#: src/frontend/mame/ui/inputmap.cpp:561 src/frontend/mame/ui/analogipt.cpp:358
 #, c-format
 msgid "%1$s [root%2$s]"
 msgstr ""
@@ -1478,7 +1478,7 @@ msgctxt "swlist-info"
 msgid "Software list/item"
 msgstr ""
 
-#: src/frontend/mame/ui/datmenu.cpp:88 src/frontend/mame/ui/selmenu.cpp:2698
+#: src/frontend/mame/ui/datmenu.cpp:88 src/frontend/mame/ui/selmenu.cpp:2707
 msgid "Software List Info"
 msgstr ""
 
@@ -1599,7 +1599,7 @@ msgstr ""
 msgid "Configure Machine:"
 msgstr ""
 
-#: src/frontend/mame/ui/miscmenu.cpp:858 src/frontend/mame/ui/selmenu.cpp:2638
+#: src/frontend/mame/ui/miscmenu.cpp:858 src/frontend/mame/ui/selmenu.cpp:2647
 msgid " (default)"
 msgstr " (уобичајено)"
 
@@ -1620,7 +1620,7 @@ msgstr ""
 "Притисните %1$s за напуштање програма\n"
 "Притисните %2$s за наставак емулације"
 
-#: src/frontend/mame/ui/info_pty.cpp:30 src/frontend/mame/ui/mainmenu.cpp:155
+#: src/frontend/mame/ui/info_pty.cpp:30
 msgid "Pseudo terminals"
 msgstr "Псеудо терминали"
 
@@ -1688,52 +1688,52 @@ msgstr ""
 msgid "Other Controls"
 msgstr "Остале контроле"
 
-#: src/frontend/mame/ui/inputmap.cpp:227
+#: src/frontend/mame/ui/inputmap.cpp:231
 msgid "This machine has no configurable inputs."
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:327
+#: src/frontend/mame/ui/inputmap.cpp:331
 msgid "Pressed"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:397
+#: src/frontend/mame/ui/inputmap.cpp:401
 msgid "Invalid sequence entered"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:542
+#: src/frontend/mame/ui/inputmap.cpp:546
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:543
+#: src/frontend/mame/ui/inputmap.cpp:547
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog Inc"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:544
+#: src/frontend/mame/ui/inputmap.cpp:548
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog Dec"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:586
+#: src/frontend/mame/ui/inputmap.cpp:590
 #, c-format
 msgid "Press %1$s to set\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:587
+#: src/frontend/mame/ui/inputmap.cpp:591
 #, c-format
 msgid "Press %1$s to append\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:588
+#: src/frontend/mame/ui/inputmap.cpp:592
 #, c-format
 msgid "Press %1$s to clear\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:589
+#: src/frontend/mame/ui/inputmap.cpp:593
 #, c-format
 msgid "Press %1$s to restore default\n"
 msgstr ""
@@ -1797,7 +1797,7 @@ msgid ""
 msgstr ""
 
 #: src/frontend/mame/ui/simpleselgame.cpp:273
-#: src/frontend/mame/ui/selgame.cpp:436
+#: src/frontend/mame/ui/selgame.cpp:443
 msgid "Configure Options"
 msgstr "Конфигурација опција"
 
@@ -2132,16 +2132,16 @@ msgstr ""
 msgid "Expand to fit"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:437
+#: src/frontend/mame/ui/selgame.cpp:444
 msgid "Configure Machine"
 msgstr "Конфигурација машине"
 
-#: src/frontend/mame/ui/selgame.cpp:1050
+#: src/frontend/mame/ui/selgame.cpp:1060
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d machines (%5$d BIOS) )"
 msgstr "%1$s %2$s ( %3$d / %4$d машине (%5$d BIOS) )"
 
-#: src/frontend/mame/ui/selgame.cpp:1078
+#: src/frontend/mame/ui/selgame.cpp:1088
 #, c-format
 msgid "System: %1$-.100s"
 msgstr "Систем: %1$-.100s"
@@ -2163,7 +2163,7 @@ msgstr "Нормални текст"
 #: src/frontend/mame/ui/auditmenu.cpp:98
 #, c-format
 msgid ""
-"Auditing ROMs for machine %2$u of %3$u...\n"
+"Auditing media for machine %2$u of %3$u...\n"
 "%1$s"
 msgstr ""
 
@@ -2178,12 +2178,12 @@ msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:136
 #, c-format
-msgid "Audit ROMs for %1$u machines marked unavailable"
+msgid "Audit media for %1$u machines marked unavailable"
 msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:137
 #, c-format
-msgid "Audit ROMs for all %1$u machines"
+msgid "Audit media for all %1$u machines"
 msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:154
@@ -2390,84 +2390,84 @@ msgctxt "color-sample"
 msgid "Clone"
 msgstr "Клонирај"
 
-#: src/frontend/mame/ui/custui.cpp:914
+#: src/frontend/mame/ui/custui.cpp:906
 msgid "ARGB Settings"
 msgstr "ARGB подешавања"
 
-#: src/frontend/mame/ui/custui.cpp:919 src/frontend/mame/ui/custui.cpp:922
+#: src/frontend/mame/ui/custui.cpp:911 src/frontend/mame/ui/custui.cpp:914
 msgctxt "color-channel"
 msgid "Alpha"
 msgstr "Алфа"
 
-#: src/frontend/mame/ui/custui.cpp:927 src/frontend/mame/ui/custui.cpp:930
+#: src/frontend/mame/ui/custui.cpp:919 src/frontend/mame/ui/custui.cpp:922
 msgctxt "color-channel"
 msgid "Red"
 msgstr "Црвена"
 
-#: src/frontend/mame/ui/custui.cpp:935 src/frontend/mame/ui/custui.cpp:938
+#: src/frontend/mame/ui/custui.cpp:927 src/frontend/mame/ui/custui.cpp:930
 msgctxt "color-channel"
 msgid "Green"
 msgstr "Зелена"
 
-#: src/frontend/mame/ui/custui.cpp:943 src/frontend/mame/ui/custui.cpp:946
+#: src/frontend/mame/ui/custui.cpp:935 src/frontend/mame/ui/custui.cpp:938
 msgctxt "color-channel"
 msgid "Blue"
 msgstr "Плава"
 
-#: src/frontend/mame/ui/custui.cpp:949
+#: src/frontend/mame/ui/custui.cpp:941
 msgid "Choose from palette"
 msgstr "Изабрати из палете"
 
-#: src/frontend/mame/ui/custui.cpp:996
+#: src/frontend/mame/ui/custui.cpp:988
 msgid "Color preview:"
 msgstr "Пробни приказ боја:"
 
-#: src/frontend/mame/ui/custui.cpp:1093
+#: src/frontend/mame/ui/custui.cpp:1085
 msgctxt "color-preset"
 msgid "White"
 msgstr "Бела"
 
-#: src/frontend/mame/ui/custui.cpp:1094
+#: src/frontend/mame/ui/custui.cpp:1086
 msgctxt "color-preset"
 msgid "Silver"
 msgstr "Сребрна"
 
-#: src/frontend/mame/ui/custui.cpp:1095
+#: src/frontend/mame/ui/custui.cpp:1087
 msgctxt "color-preset"
 msgid "Gray"
 msgstr "Сива"
 
-#: src/frontend/mame/ui/custui.cpp:1096
+#: src/frontend/mame/ui/custui.cpp:1088
 msgctxt "color-preset"
 msgid "Black"
 msgstr "Црна"
 
-#: src/frontend/mame/ui/custui.cpp:1097
+#: src/frontend/mame/ui/custui.cpp:1089
 msgctxt "color-preset"
 msgid "Red"
 msgstr "Црвена"
 
-#: src/frontend/mame/ui/custui.cpp:1098
+#: src/frontend/mame/ui/custui.cpp:1090
 msgctxt "color-preset"
 msgid "Orange"
 msgstr "Наранџаста"
 
-#: src/frontend/mame/ui/custui.cpp:1099
+#: src/frontend/mame/ui/custui.cpp:1091
 msgctxt "color-preset"
 msgid "Yellow"
 msgstr "Жута"
 
-#: src/frontend/mame/ui/custui.cpp:1100
+#: src/frontend/mame/ui/custui.cpp:1092
 msgctxt "color-preset"
 msgid "Green"
 msgstr "Зелена"
 
-#: src/frontend/mame/ui/custui.cpp:1101
+#: src/frontend/mame/ui/custui.cpp:1093
 msgctxt "color-preset"
 msgid "Blue"
 msgstr "Плава"
 
-#: src/frontend/mame/ui/custui.cpp:1102
+#: src/frontend/mame/ui/custui.cpp:1094
 msgctxt "color-preset"
 msgid "Violet"
 msgstr "Љубичаста"
@@ -2532,7 +2532,7 @@ msgid "Input (general)"
 msgstr "Подешавање контрола (глобално)"
 
 #: src/frontend/mame/ui/mainmenu.cpp:123
-msgid "Input (this Machine)"
+msgid "Input (this machine)"
 msgstr "Подешавање контрола (ова машина)"
 
 #: src/frontend/mame/ui/mainmenu.cpp:126
@@ -2571,6 +2571,10 @@ msgstr "Управљање фајловима"
 msgid "Tape Control"
 msgstr "Контрола траке"
 
+#: src/frontend/mame/ui/mainmenu.cpp:155
+msgid "Pseudo Terminals"
+msgstr ""
+
 #: src/frontend/mame/ui/mainmenu.cpp:158
 msgid "BIOS Selection"
 msgstr "Избор BIOS-а"
@@ -2609,7 +2613,7 @@ msgstr "Приказ спољашњег DAT"
 
 #: src/frontend/mame/ui/mainmenu.cpp:200
 #, c-format
-msgid "About %s"
+msgid "About %1$s"
 msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:212
@@ -2769,373 +2773,373 @@ msgstr "Драјвер је клон од: %1$s"
 msgid "%1$s %2$s"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2235
+#: src/frontend/mame/ui/selmenu.cpp:2244
 msgid "Images"
 msgstr "Програми"
 
-#: src/frontend/mame/ui/selmenu.cpp:2236
+#: src/frontend/mame/ui/selmenu.cpp:2245
 msgid "Infos"
 msgstr "Информације"
 
-#: src/frontend/mame/ui/selmenu.cpp:2551
+#: src/frontend/mame/ui/selmenu.cpp:2560
 msgid ""
 "Required ROM/disk images for the selected system are missing or incorrect. "
 "Please acquire the correct files or select a different system.\n"
 "\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2567
+#: src/frontend/mame/ui/selmenu.cpp:2576
 msgid ""
 "Required ROM/disk images for the selected software are missing or incorrect. "
 "Please acquire the correct files or select a different software item.\n"
 "\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2583
+#: src/frontend/mame/ui/selmenu.cpp:2592
 msgid "incorrect checksum"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2586
+#: src/frontend/mame/ui/selmenu.cpp:2595
 msgid "incorrect length"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2589
+#: src/frontend/mame/ui/selmenu.cpp:2598
 msgid "not found"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2600
+#: src/frontend/mame/ui/selmenu.cpp:2609
 #, c-format
 msgid "%1$s (%2$s) - %3$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2602
+#: src/frontend/mame/ui/selmenu.cpp:2611
 #, c-format
 msgid "%1$s - %2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2606
+#: src/frontend/mame/ui/selmenu.cpp:2615
 msgid "Press any key to continue."
 msgstr "Притисните било који тастер за наставак."
 
-#: src/frontend/mame/ui/selmenu.cpp:2735
+#: src/frontend/mame/ui/selmenu.cpp:2744
 msgid "General Info"
 msgstr "Опште информације"
 
-#: src/frontend/mame/ui/selmenu.cpp:2887
+#: src/frontend/mame/ui/selmenu.cpp:2896
 #, c-format
 msgid "Romset\t%1$s\n"
 msgstr "РОМ скуп\t%1$s\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2888
+#: src/frontend/mame/ui/selmenu.cpp:2897
 #, c-format
 msgid "Year\t%1$s\n"
 msgstr "Година\t%1$s\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2889
+#: src/frontend/mame/ui/selmenu.cpp:2898
 #, c-format
 msgid "Manufacturer\t%1$s\n"
 msgstr "Произвођач\t%1$s\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2896
+#: src/frontend/mame/ui/selmenu.cpp:2905
 #, c-format
 msgid "Driver is Clone of\t%1$s\n"
 msgstr "Драјвер је клон од\t%1$s\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2901
+#: src/frontend/mame/ui/selmenu.cpp:2910
 msgid "Driver is Parent\t\n"
 msgstr "Драјвер је предак\t\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2905
+#: src/frontend/mame/ui/selmenu.cpp:2914
 msgid "Analog Controls\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2907
+#: src/frontend/mame/ui/selmenu.cpp:2916
 msgid "Keyboard Inputs\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2910
+#: src/frontend/mame/ui/selmenu.cpp:2919
 msgid "Overall\tNOT WORKING\n"
 msgstr "Уопштено\tНЕ РАДИ\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2912
+#: src/frontend/mame/ui/selmenu.cpp:2921
 msgid "Overall\tUnemulated Protection\n"
 msgstr "Уопштено\tЗаштита није емулирана"
 
-#: src/frontend/mame/ui/selmenu.cpp:2914
+#: src/frontend/mame/ui/selmenu.cpp:2923
 msgid "Overall\tWorking\n"
 msgstr "Уопштено\tради\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2917
+#: src/frontend/mame/ui/selmenu.cpp:2926
 msgid "Graphics\tUnimplemented\n"
 msgstr "Графика\tније имплементирана\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2919
+#: src/frontend/mame/ui/selmenu.cpp:2928
 msgid "Graphics\tWrong Colors\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2921
+#: src/frontend/mame/ui/selmenu.cpp:2930
 msgid "Graphics\tImperfect Colors\n"
 msgstr "Графика\tнесавршене боје\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2923
+#: src/frontend/mame/ui/selmenu.cpp:2932
 msgid "Graphics\tImperfect\n"
 msgstr "Графика\tнесавршена\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2925
+#: src/frontend/mame/ui/selmenu.cpp:2934
 msgid "Graphics\tOK\n"
 msgstr "Графика\tОК\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2928
+#: src/frontend/mame/ui/selmenu.cpp:2937
 msgid "Sound\tNone\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2930
+#: src/frontend/mame/ui/selmenu.cpp:2939
 msgid "Sound\tUnimplemented\n"
 msgstr "Звук\tније имплементиран\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2932
+#: src/frontend/mame/ui/selmenu.cpp:2941
 msgid "Sound\tImperfect\n"
 msgstr "Звук\tнесавршен\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2934
+#: src/frontend/mame/ui/selmenu.cpp:2943
 msgid "Sound\tOK\n"
 msgstr "Звук\tOK\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2937
+#: src/frontend/mame/ui/selmenu.cpp:2946
 msgid "Capture\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2939
+#: src/frontend/mame/ui/selmenu.cpp:2948
 msgid "Capture\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2942
+#: src/frontend/mame/ui/selmenu.cpp:2951
 msgid "Camera\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2944
+#: src/frontend/mame/ui/selmenu.cpp:2953
 msgid "Camera\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2947
+#: src/frontend/mame/ui/selmenu.cpp:2956
 msgid "Microphone\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2949
+#: src/frontend/mame/ui/selmenu.cpp:2958
 msgid "Microphone\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2952
+#: src/frontend/mame/ui/selmenu.cpp:2961
 msgid "Controls\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2954
+#: src/frontend/mame/ui/selmenu.cpp:2963
 msgid "Controls\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2957
+#: src/frontend/mame/ui/selmenu.cpp:2966
 msgid "Keyboard\tUnimplemented\n"
 msgstr "Тастатура\tније имплементирана\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2959
+#: src/frontend/mame/ui/selmenu.cpp:2968
 msgid "Keyboard\tImperfect\n"
 msgstr "Тастатура\tнесавршена\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2962
+#: src/frontend/mame/ui/selmenu.cpp:2971
 msgid "Mouse\tUnimplemented\n"
 msgstr "Миш\tније имплементиран\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2964
+#: src/frontend/mame/ui/selmenu.cpp:2973
 msgid "Mouse\tImperfect\n"
 msgstr "Миш\tнесавршен\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2967
+#: src/frontend/mame/ui/selmenu.cpp:2976
 msgid "Media\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2969
+#: src/frontend/mame/ui/selmenu.cpp:2978
 msgid "Media\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2972
+#: src/frontend/mame/ui/selmenu.cpp:2981
 msgid "Disk\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2974
+#: src/frontend/mame/ui/selmenu.cpp:2983
 msgid "Disk\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2977
+#: src/frontend/mame/ui/selmenu.cpp:2986
 msgid "Printer\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2979
+#: src/frontend/mame/ui/selmenu.cpp:2988
 msgid "Printer\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2982
+#: src/frontend/mame/ui/selmenu.cpp:2991
 msgid "Mag. Tape\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2984
+#: src/frontend/mame/ui/selmenu.cpp:2993
 msgid "Mag. Tape\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2987
+#: src/frontend/mame/ui/selmenu.cpp:2996
 msgid "Punch Tape\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2989
+#: src/frontend/mame/ui/selmenu.cpp:2998
 msgid "Punch Tape\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2992
+#: src/frontend/mame/ui/selmenu.cpp:3001
 msgid "Mag. Drum\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2994
+#: src/frontend/mame/ui/selmenu.cpp:3003
 msgid "Mag. Drum\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2997
+#: src/frontend/mame/ui/selmenu.cpp:3006
 msgid "(EP)ROM\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2999
+#: src/frontend/mame/ui/selmenu.cpp:3008
 msgid "(EP)ROM\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3002
+#: src/frontend/mame/ui/selmenu.cpp:3011
 msgid "Communications\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3004
+#: src/frontend/mame/ui/selmenu.cpp:3013
 msgid "Communications\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3007
+#: src/frontend/mame/ui/selmenu.cpp:3016
 msgid "LAN\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3009
+#: src/frontend/mame/ui/selmenu.cpp:3018
 msgid "LAN\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3012
+#: src/frontend/mame/ui/selmenu.cpp:3021
 msgid "WAN\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3014
+#: src/frontend/mame/ui/selmenu.cpp:3023
 msgid "WAN\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3017
+#: src/frontend/mame/ui/selmenu.cpp:3026
 msgid "Timing\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3019
+#: src/frontend/mame/ui/selmenu.cpp:3028
 msgid "Timing\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3021
+#: src/frontend/mame/ui/selmenu.cpp:3030
 msgid "Mechanical Machine\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3021
+#: src/frontend/mame/ui/selmenu.cpp:3030
 msgid "Mechanical Machine\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3022
+#: src/frontend/mame/ui/selmenu.cpp:3031
 msgid "Requires Artwork\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3022
+#: src/frontend/mame/ui/selmenu.cpp:3031
 msgid "Requires Artwork\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3023
+#: src/frontend/mame/ui/selmenu.cpp:3032
 msgid "Requires Clickable Artwork\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3023
+#: src/frontend/mame/ui/selmenu.cpp:3032
 msgid "Requires Clickable Artwork\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3025
+#: src/frontend/mame/ui/selmenu.cpp:3034
 msgid "Support Cocktail\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3026
+#: src/frontend/mame/ui/selmenu.cpp:3035
 msgid "Driver is BIOS\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3026
+#: src/frontend/mame/ui/selmenu.cpp:3035
 msgid "Driver is BIOS\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3027
+#: src/frontend/mame/ui/selmenu.cpp:3036
 msgid "Support Save\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3027
+#: src/frontend/mame/ui/selmenu.cpp:3036
 msgid "Support Save\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3028
+#: src/frontend/mame/ui/selmenu.cpp:3037
 msgid "Screen Orientation\tVertical\n"
 msgstr "Оријентација екрана\tВертикално\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3028
+#: src/frontend/mame/ui/selmenu.cpp:3037
 msgid "Screen Orientation\tHorizontal\n"
 msgstr "Оријентација екрана\tХоризонтално\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3038
+#: src/frontend/mame/ui/selmenu.cpp:3047
 msgid "Requires CHD\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3038
+#: src/frontend/mame/ui/selmenu.cpp:3047
 msgid "Requires CHD\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3051
-msgid "ROM Audit Result\tOK\n"
+#: src/frontend/mame/ui/selmenu.cpp:3060
+msgid "Media Audit Result\tOK\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3053
-msgid "ROM Audit Result\tBAD\n"
+#: src/frontend/mame/ui/selmenu.cpp:3062
+msgid "Media Audit Result\tBAD\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3056
+#: src/frontend/mame/ui/selmenu.cpp:3065
 msgid "Samples Audit Result\tNone Needed\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3058
+#: src/frontend/mame/ui/selmenu.cpp:3067
 msgid "Samples Audit Result\tOK\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3060
+#: src/frontend/mame/ui/selmenu.cpp:3069
 msgid "Samples Audit Result\tBAD\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3064
+#: src/frontend/mame/ui/selmenu.cpp:3073
 msgid ""
-"ROM Audit \tDisabled\n"
-"Samples Audit \tDisabled\n"
+"Media Audit\tDisabled\n"
+"Samples Audit\tDisabled\n"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:150
+#: src/frontend/mame/ui/sndmenu.cpp:146
 msgid "Sound"
 msgstr "Звук"
 
-#: src/frontend/mame/ui/sndmenu.cpp:151
+#: src/frontend/mame/ui/sndmenu.cpp:147
 msgid "Compressor"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:152
+#: src/frontend/mame/ui/sndmenu.cpp:148
 msgid "Sample Rate"
 msgstr "Учесталост узорковања"
 
-#: src/frontend/mame/ui/sndmenu.cpp:153
+#: src/frontend/mame/ui/sndmenu.cpp:149
 msgid "Use External Samples"
 msgstr "Користи додатне семплове"
 
@@ -3174,511 +3178,681 @@ msgstr ""
 msgid "  Screen '%1$s': Vector\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:132
+#: src/frontend/mame/ui/devopt.cpp:135
 #, c-format
 msgid "  Screen '%1$s': %2$d × %3$d (V) %4$s Hz\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:133
+#: src/frontend/mame/ui/devopt.cpp:136
 #, c-format
 msgid "  Screen '%1$s': %2$d × %3$d (H) %4$s Hz\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:147
+#: src/frontend/mame/ui/devopt.cpp:150
 msgid "* Sound:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:211
+#: src/frontend/mame/ui/devopt.cpp:214
 #, c-format
 msgid ""
 "* BIOS settings:\n"
 "  %1$d options    [default: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:255 src/frontend/mame/ui/devopt.cpp:271
-#: src/frontend/mame/ui/devopt.cpp:332
+#: src/frontend/mame/ui/devopt.cpp:258 src/frontend/mame/ui/devopt.cpp:274
+#: src/frontend/mame/ui/devopt.cpp:335
 #, c-format
 msgid "  %1$s    [default: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:260 src/frontend/mame/ui/devopt.cpp:276
+#: src/frontend/mame/ui/devopt.cpp:263 src/frontend/mame/ui/devopt.cpp:279
 #, c-format
 msgid "  %1$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:282
+#: src/frontend/mame/ui/devopt.cpp:285
 msgid "* DIP switch settings:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:287
+#: src/frontend/mame/ui/devopt.cpp:290
 msgid "* Configuration settings:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:291
+#: src/frontend/mame/ui/devopt.cpp:294
 msgid "* Input device(s):\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:293
+#: src/frontend/mame/ui/devopt.cpp:296
 #, c-format
 msgid "  User inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:295
+#: src/frontend/mame/ui/devopt.cpp:298
 #, c-format
 msgid "  Mahjong inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:297
+#: src/frontend/mame/ui/devopt.cpp:300
 #, c-format
 msgid "  Hanafuda inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:299
+#: src/frontend/mame/ui/devopt.cpp:302
 #, c-format
 msgid "  Gambling inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:301
+#: src/frontend/mame/ui/devopt.cpp:304
 #, c-format
 msgid "  Analog inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:303
+#: src/frontend/mame/ui/devopt.cpp:306
 #, c-format
 msgid "  Adjuster inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:305
+#: src/frontend/mame/ui/devopt.cpp:308
 #, c-format
 msgid "  Keypad inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:307
+#: src/frontend/mame/ui/devopt.cpp:310
 #, c-format
 msgid "  Keyboard inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:312
+#: src/frontend/mame/ui/devopt.cpp:315
 msgid "* Media Options:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:317
+#: src/frontend/mame/ui/devopt.cpp:320
 #, c-format
 msgid "  %1$s    [tag: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:327
+#: src/frontend/mame/ui/devopt.cpp:330
 msgid "* Slot Options:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:341
+#: src/frontend/mame/ui/devopt.cpp:344
 msgid "[None]\n"
 msgstr ""
 
-#: src/emu/render.cpp:1847
+#: src/emu/render.cpp:1796
 #, c-format
 msgctxt "view-name"
 msgid "Screen %1$u Standard (%2$u:%3$u)"
 msgstr ""
 
-#: src/emu/render.cpp:1873
+#: src/emu/render.cpp:1822
 #, c-format
 msgctxt "view-name"
 msgid "Screen %1$u Pixel Aspect (%2$u:%3$u)"
 msgstr ""
 
-#: src/emu/render.cpp:1895 src/emu/render.cpp:2030
+#: src/emu/render.cpp:1844 src/emu/render.cpp:1979
 msgctxt "view-name"
 msgid "Cocktail"
 msgstr ""
 
-#: src/emu/render.cpp:2015
+#: src/emu/render.cpp:1964
 msgctxt "view-name"
 msgid "Left-to-Right"
 msgstr ""
 
-#: src/emu/render.cpp:2016
+#: src/emu/render.cpp:1965
 msgctxt "view-name"
 msgid "Left-to-Right (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2017
+#: src/emu/render.cpp:1966
 msgctxt "view-name"
 msgid "Top-to-Bottom"
 msgstr ""
 
-#: src/emu/render.cpp:2018
+#: src/emu/render.cpp:1967
 msgctxt "view-name"
 msgid "Top-to-Bottom (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2069
+#: src/emu/render.cpp:2018
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Left-to-Right, Top-to-Bottom"
 msgstr ""
 
-#: src/emu/render.cpp:2078
+#: src/emu/render.cpp:2027
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Left-to-Right, Top-to-Bottom (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2087
+#: src/emu/render.cpp:2036
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Top-to-Bottom, Left-to-Right"
 msgstr ""
 
-#: src/emu/render.cpp:2096
+#: src/emu/render.cpp:2045
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Top-to-Bottom, Left-to-Right (Gapless)"
 msgstr ""
 
-#: src/emu/inpttype.ipp:22
+#: src/emu/ioport.cpp:332
+#, c-format
 msgctxt "input-name"
-msgid "P1 Up"
+msgid "P%1$u"
 msgstr ""
 
-#: src/emu/inpttype.ipp:23
+#: src/emu/ioport.cpp:1924
 msgctxt "input-name"
-msgid "P1 Down"
+msgid "???"
 msgstr ""
 
-#: src/emu/inpttype.ipp:24
+#: src/emu/inpttype.ipp:22 src/emu/inpttype.ipp:140 src/emu/inpttype.ipp:221
+#: src/emu/inpttype.ipp:255 src/emu/inpttype.ipp:289 src/emu/inpttype.ipp:323
+#: src/emu/inpttype.ipp:357 src/emu/inpttype.ipp:391 src/emu/inpttype.ipp:425
+#: src/emu/inpttype.ipp:459
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left"
+msgid "%p Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:25
+#: src/emu/inpttype.ipp:23 src/emu/inpttype.ipp:141 src/emu/inpttype.ipp:222
+#: src/emu/inpttype.ipp:256 src/emu/inpttype.ipp:290 src/emu/inpttype.ipp:324
+#: src/emu/inpttype.ipp:358 src/emu/inpttype.ipp:392 src/emu/inpttype.ipp:426
+#: src/emu/inpttype.ipp:460
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right"
+msgid "%p Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:26
+#: src/emu/inpttype.ipp:24 src/emu/inpttype.ipp:142 src/emu/inpttype.ipp:223
+#: src/emu/inpttype.ipp:257 src/emu/inpttype.ipp:291 src/emu/inpttype.ipp:325
+#: src/emu/inpttype.ipp:359 src/emu/inpttype.ipp:393 src/emu/inpttype.ipp:427
+#: src/emu/inpttype.ipp:461
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Up"
+msgid "%p Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:27
+#: src/emu/inpttype.ipp:25 src/emu/inpttype.ipp:143 src/emu/inpttype.ipp:224
+#: src/emu/inpttype.ipp:258 src/emu/inpttype.ipp:292 src/emu/inpttype.ipp:326
+#: src/emu/inpttype.ipp:360 src/emu/inpttype.ipp:394 src/emu/inpttype.ipp:428
+#: src/emu/inpttype.ipp:462
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Down"
+msgid "%p Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:28
+#: src/emu/inpttype.ipp:26 src/emu/inpttype.ipp:144 src/emu/inpttype.ipp:225
+#: src/emu/inpttype.ipp:259 src/emu/inpttype.ipp:293 src/emu/inpttype.ipp:327
+#: src/emu/inpttype.ipp:361 src/emu/inpttype.ipp:395 src/emu/inpttype.ipp:429
+#: src/emu/inpttype.ipp:463
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Left"
+msgid "%p Right Stick/Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:29
+#: src/emu/inpttype.ipp:27 src/emu/inpttype.ipp:145 src/emu/inpttype.ipp:226
+#: src/emu/inpttype.ipp:260 src/emu/inpttype.ipp:294 src/emu/inpttype.ipp:328
+#: src/emu/inpttype.ipp:362 src/emu/inpttype.ipp:396 src/emu/inpttype.ipp:430
+#: src/emu/inpttype.ipp:464
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Right"
+msgid "%p Right Stick/Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:30
+#: src/emu/inpttype.ipp:28 src/emu/inpttype.ipp:146 src/emu/inpttype.ipp:227
+#: src/emu/inpttype.ipp:261 src/emu/inpttype.ipp:295 src/emu/inpttype.ipp:329
+#: src/emu/inpttype.ipp:363 src/emu/inpttype.ipp:397 src/emu/inpttype.ipp:431
+#: src/emu/inpttype.ipp:465
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Up"
+msgid "%p Right Stick/Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:31
+#: src/emu/inpttype.ipp:29 src/emu/inpttype.ipp:147 src/emu/inpttype.ipp:228
+#: src/emu/inpttype.ipp:262 src/emu/inpttype.ipp:296 src/emu/inpttype.ipp:330
+#: src/emu/inpttype.ipp:364 src/emu/inpttype.ipp:398 src/emu/inpttype.ipp:432
+#: src/emu/inpttype.ipp:466
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Down"
+msgid "%p Right Stick/Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:32
+#: src/emu/inpttype.ipp:30 src/emu/inpttype.ipp:148 src/emu/inpttype.ipp:229
+#: src/emu/inpttype.ipp:263 src/emu/inpttype.ipp:297 src/emu/inpttype.ipp:331
+#: src/emu/inpttype.ipp:365 src/emu/inpttype.ipp:399 src/emu/inpttype.ipp:433
+#: src/emu/inpttype.ipp:467
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Left"
+msgid "%p Left Stick/Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:33
+#: src/emu/inpttype.ipp:31 src/emu/inpttype.ipp:149 src/emu/inpttype.ipp:230
+#: src/emu/inpttype.ipp:264 src/emu/inpttype.ipp:298 src/emu/inpttype.ipp:332
+#: src/emu/inpttype.ipp:366 src/emu/inpttype.ipp:400 src/emu/inpttype.ipp:434
+#: src/emu/inpttype.ipp:468
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Right"
+msgid "%p Left Stick/Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:34
+#: src/emu/inpttype.ipp:32 src/emu/inpttype.ipp:150 src/emu/inpttype.ipp:231
+#: src/emu/inpttype.ipp:265 src/emu/inpttype.ipp:299 src/emu/inpttype.ipp:333
+#: src/emu/inpttype.ipp:367 src/emu/inpttype.ipp:401 src/emu/inpttype.ipp:435
+#: src/emu/inpttype.ipp:469
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 1"
+msgid "%p Left Stick/Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:35
+#: src/emu/inpttype.ipp:33 src/emu/inpttype.ipp:151 src/emu/inpttype.ipp:232
+#: src/emu/inpttype.ipp:266 src/emu/inpttype.ipp:300 src/emu/inpttype.ipp:334
+#: src/emu/inpttype.ipp:368 src/emu/inpttype.ipp:402 src/emu/inpttype.ipp:436
+#: src/emu/inpttype.ipp:470
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 2"
+msgid "%p Left Stick/Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:36
+#: src/emu/inpttype.ipp:34 src/emu/inpttype.ipp:152 src/emu/inpttype.ipp:233
+#: src/emu/inpttype.ipp:267 src/emu/inpttype.ipp:301 src/emu/inpttype.ipp:335
+#: src/emu/inpttype.ipp:369 src/emu/inpttype.ipp:403 src/emu/inpttype.ipp:437
+#: src/emu/inpttype.ipp:471
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 3"
+msgid "%p Button 1"
 msgstr ""
 
-#: src/emu/inpttype.ipp:37
+#: src/emu/inpttype.ipp:35 src/emu/inpttype.ipp:153 src/emu/inpttype.ipp:234
+#: src/emu/inpttype.ipp:268 src/emu/inpttype.ipp:302 src/emu/inpttype.ipp:336
+#: src/emu/inpttype.ipp:370 src/emu/inpttype.ipp:404 src/emu/inpttype.ipp:438
+#: src/emu/inpttype.ipp:472
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 4"
+msgid "%p Button 2"
 msgstr ""
 
-#: src/emu/inpttype.ipp:38
+#: src/emu/inpttype.ipp:36 src/emu/inpttype.ipp:154 src/emu/inpttype.ipp:235
+#: src/emu/inpttype.ipp:269 src/emu/inpttype.ipp:303 src/emu/inpttype.ipp:337
+#: src/emu/inpttype.ipp:371 src/emu/inpttype.ipp:405 src/emu/inpttype.ipp:439
+#: src/emu/inpttype.ipp:473
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 5"
+msgid "%p Button 3"
 msgstr ""
 
-#: src/emu/inpttype.ipp:39
+#: src/emu/inpttype.ipp:37 src/emu/inpttype.ipp:155 src/emu/inpttype.ipp:236
+#: src/emu/inpttype.ipp:270 src/emu/inpttype.ipp:304 src/emu/inpttype.ipp:338
+#: src/emu/inpttype.ipp:372 src/emu/inpttype.ipp:406 src/emu/inpttype.ipp:440
+#: src/emu/inpttype.ipp:474
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 6"
+msgid "%p Button 4"
 msgstr ""
 
-#: src/emu/inpttype.ipp:40
+#: src/emu/inpttype.ipp:38 src/emu/inpttype.ipp:156 src/emu/inpttype.ipp:237
+#: src/emu/inpttype.ipp:271 src/emu/inpttype.ipp:305 src/emu/inpttype.ipp:339
+#: src/emu/inpttype.ipp:373 src/emu/inpttype.ipp:407 src/emu/inpttype.ipp:441
+#: src/emu/inpttype.ipp:475
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 7"
+msgid "%p Button 5"
 msgstr ""
 
-#: src/emu/inpttype.ipp:41
+#: src/emu/inpttype.ipp:39 src/emu/inpttype.ipp:157 src/emu/inpttype.ipp:238
+#: src/emu/inpttype.ipp:272 src/emu/inpttype.ipp:306 src/emu/inpttype.ipp:340
+#: src/emu/inpttype.ipp:374 src/emu/inpttype.ipp:408 src/emu/inpttype.ipp:442
+#: src/emu/inpttype.ipp:476
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 8"
+msgid "%p Button 6"
 msgstr ""
 
-#: src/emu/inpttype.ipp:42
+#: src/emu/inpttype.ipp:40 src/emu/inpttype.ipp:158 src/emu/inpttype.ipp:239
+#: src/emu/inpttype.ipp:273 src/emu/inpttype.ipp:307 src/emu/inpttype.ipp:341
+#: src/emu/inpttype.ipp:375 src/emu/inpttype.ipp:409 src/emu/inpttype.ipp:443
+#: src/emu/inpttype.ipp:477
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 9"
+msgid "%p Button 7"
 msgstr ""
 
-#: src/emu/inpttype.ipp:43
+#: src/emu/inpttype.ipp:41 src/emu/inpttype.ipp:159 src/emu/inpttype.ipp:240
+#: src/emu/inpttype.ipp:274 src/emu/inpttype.ipp:308 src/emu/inpttype.ipp:342
+#: src/emu/inpttype.ipp:376 src/emu/inpttype.ipp:410 src/emu/inpttype.ipp:444
+#: src/emu/inpttype.ipp:478
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 10"
+msgid "%p Button 8"
 msgstr ""
 
-#: src/emu/inpttype.ipp:44
+#: src/emu/inpttype.ipp:42 src/emu/inpttype.ipp:160 src/emu/inpttype.ipp:241
+#: src/emu/inpttype.ipp:275 src/emu/inpttype.ipp:309 src/emu/inpttype.ipp:343
+#: src/emu/inpttype.ipp:377 src/emu/inpttype.ipp:411 src/emu/inpttype.ipp:445
+#: src/emu/inpttype.ipp:479
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 11"
+msgid "%p Button 9"
 msgstr ""
 
-#: src/emu/inpttype.ipp:45
+#: src/emu/inpttype.ipp:43 src/emu/inpttype.ipp:161 src/emu/inpttype.ipp:242
+#: src/emu/inpttype.ipp:276 src/emu/inpttype.ipp:310 src/emu/inpttype.ipp:344
+#: src/emu/inpttype.ipp:378 src/emu/inpttype.ipp:412 src/emu/inpttype.ipp:446
+#: src/emu/inpttype.ipp:480
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 12"
+msgid "%p Button 10"
 msgstr ""
 
-#: src/emu/inpttype.ipp:46
+#: src/emu/inpttype.ipp:44 src/emu/inpttype.ipp:162 src/emu/inpttype.ipp:243
+#: src/emu/inpttype.ipp:277 src/emu/inpttype.ipp:311 src/emu/inpttype.ipp:345
+#: src/emu/inpttype.ipp:379 src/emu/inpttype.ipp:413 src/emu/inpttype.ipp:447
+#: src/emu/inpttype.ipp:481
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 13"
+msgid "%p Button 11"
 msgstr ""
 
-#: src/emu/inpttype.ipp:47
+#: src/emu/inpttype.ipp:45 src/emu/inpttype.ipp:163 src/emu/inpttype.ipp:244
+#: src/emu/inpttype.ipp:278 src/emu/inpttype.ipp:312 src/emu/inpttype.ipp:346
+#: src/emu/inpttype.ipp:380 src/emu/inpttype.ipp:414 src/emu/inpttype.ipp:448
+#: src/emu/inpttype.ipp:482
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 14"
+msgid "%p Button 12"
 msgstr ""
 
-#: src/emu/inpttype.ipp:48
+#: src/emu/inpttype.ipp:46 src/emu/inpttype.ipp:164 src/emu/inpttype.ipp:245
+#: src/emu/inpttype.ipp:279 src/emu/inpttype.ipp:313 src/emu/inpttype.ipp:347
+#: src/emu/inpttype.ipp:381 src/emu/inpttype.ipp:415 src/emu/inpttype.ipp:449
+#: src/emu/inpttype.ipp:483
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 15"
+msgid "%p Button 13"
 msgstr ""
 
-#: src/emu/inpttype.ipp:49
+#: src/emu/inpttype.ipp:47 src/emu/inpttype.ipp:165 src/emu/inpttype.ipp:246
+#: src/emu/inpttype.ipp:280 src/emu/inpttype.ipp:314 src/emu/inpttype.ipp:348
+#: src/emu/inpttype.ipp:382 src/emu/inpttype.ipp:416 src/emu/inpttype.ipp:450
+#: src/emu/inpttype.ipp:484
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 16"
+msgid "%p Button 14"
 msgstr ""
 
-#: src/emu/inpttype.ipp:50
+#: src/emu/inpttype.ipp:48 src/emu/inpttype.ipp:166 src/emu/inpttype.ipp:247
+#: src/emu/inpttype.ipp:281 src/emu/inpttype.ipp:315 src/emu/inpttype.ipp:349
+#: src/emu/inpttype.ipp:383 src/emu/inpttype.ipp:417 src/emu/inpttype.ipp:451
+#: src/emu/inpttype.ipp:485
+#, c-format
 msgctxt "input-name"
-msgid "P1 Start"
+msgid "%p Button 15"
 msgstr ""
 
-#: src/emu/inpttype.ipp:51
+#: src/emu/inpttype.ipp:49 src/emu/inpttype.ipp:167 src/emu/inpttype.ipp:248
+#: src/emu/inpttype.ipp:282 src/emu/inpttype.ipp:316 src/emu/inpttype.ipp:350
+#: src/emu/inpttype.ipp:384 src/emu/inpttype.ipp:418 src/emu/inpttype.ipp:452
+#: src/emu/inpttype.ipp:486
+#, c-format
 msgctxt "input-name"
-msgid "P1 Select"
+msgid "%p Button 16"
 msgstr ""
 
-#: src/emu/inpttype.ipp:56
+#: src/emu/inpttype.ipp:50 src/emu/inpttype.ipp:168 src/emu/inpttype.ipp:249
+#: src/emu/inpttype.ipp:283 src/emu/inpttype.ipp:317 src/emu/inpttype.ipp:351
+#: src/emu/inpttype.ipp:385 src/emu/inpttype.ipp:419 src/emu/inpttype.ipp:453
+#: src/emu/inpttype.ipp:487
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong A"
+msgid "%p Start"
 msgstr ""
 
-#: src/emu/inpttype.ipp:57
+#: src/emu/inpttype.ipp:51 src/emu/inpttype.ipp:169 src/emu/inpttype.ipp:250
+#: src/emu/inpttype.ipp:284 src/emu/inpttype.ipp:318 src/emu/inpttype.ipp:352
+#: src/emu/inpttype.ipp:386 src/emu/inpttype.ipp:420 src/emu/inpttype.ipp:454
+#: src/emu/inpttype.ipp:488
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong B"
+msgid "%p Select"
 msgstr ""
 
-#: src/emu/inpttype.ipp:58
+#: src/emu/inpttype.ipp:56 src/emu/inpttype.ipp:174
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong C"
+msgid "%p Mahjong A"
 msgstr ""
 
-#: src/emu/inpttype.ipp:59
+#: src/emu/inpttype.ipp:57 src/emu/inpttype.ipp:175
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong D"
+msgid "%p Mahjong B"
 msgstr ""
 
-#: src/emu/inpttype.ipp:60
+#: src/emu/inpttype.ipp:58 src/emu/inpttype.ipp:176
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong E"
+msgid "%p Mahjong C"
 msgstr ""
 
-#: src/emu/inpttype.ipp:61
+#: src/emu/inpttype.ipp:59 src/emu/inpttype.ipp:177
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong F"
+msgid "%p Mahjong D"
 msgstr ""
 
-#: src/emu/inpttype.ipp:62
+#: src/emu/inpttype.ipp:60 src/emu/inpttype.ipp:178
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong G"
+msgid "%p Mahjong E"
 msgstr ""
 
-#: src/emu/inpttype.ipp:63
+#: src/emu/inpttype.ipp:61 src/emu/inpttype.ipp:179
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong H"
+msgid "%p Mahjong F"
 msgstr ""
 
-#: src/emu/inpttype.ipp:64
+#: src/emu/inpttype.ipp:62 src/emu/inpttype.ipp:180
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong I"
+msgid "%p Mahjong G"
 msgstr ""
 
-#: src/emu/inpttype.ipp:65
+#: src/emu/inpttype.ipp:63 src/emu/inpttype.ipp:181
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong J"
+msgid "%p Mahjong H"
 msgstr ""
 
-#: src/emu/inpttype.ipp:66
+#: src/emu/inpttype.ipp:64 src/emu/inpttype.ipp:182
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong K"
+msgid "%p Mahjong I"
 msgstr ""
 
-#: src/emu/inpttype.ipp:67
+#: src/emu/inpttype.ipp:65 src/emu/inpttype.ipp:183
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong L"
+msgid "%p Mahjong J"
 msgstr ""
 
-#: src/emu/inpttype.ipp:68
+#: src/emu/inpttype.ipp:66 src/emu/inpttype.ipp:184
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong M"
+msgid "%p Mahjong K"
 msgstr ""
 
-#: src/emu/inpttype.ipp:69
+#: src/emu/inpttype.ipp:67 src/emu/inpttype.ipp:185
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong N"
+msgid "%p Mahjong L"
 msgstr ""
 
-#: src/emu/inpttype.ipp:70
+#: src/emu/inpttype.ipp:68 src/emu/inpttype.ipp:186
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong O"
+msgid "%p Mahjong M"
 msgstr ""
 
-#: src/emu/inpttype.ipp:71
+#: src/emu/inpttype.ipp:69 src/emu/inpttype.ipp:187
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong P"
+msgid "%p Mahjong N"
 msgstr ""
 
-#: src/emu/inpttype.ipp:72
+#: src/emu/inpttype.ipp:70 src/emu/inpttype.ipp:188
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Q"
+msgid "%p Mahjong O"
 msgstr ""
 
-#: src/emu/inpttype.ipp:73
+#: src/emu/inpttype.ipp:71 src/emu/inpttype.ipp:189
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Kan"
+msgid "%p Mahjong P"
 msgstr ""
 
-#: src/emu/inpttype.ipp:74
+#: src/emu/inpttype.ipp:72 src/emu/inpttype.ipp:190
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Pon"
+msgid "%p Mahjong Q"
 msgstr ""
 
-#: src/emu/inpttype.ipp:75
+#: src/emu/inpttype.ipp:73 src/emu/inpttype.ipp:191
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Chi"
+msgid "%p Mahjong Kan"
 msgstr ""
 
-#: src/emu/inpttype.ipp:76
+#: src/emu/inpttype.ipp:74 src/emu/inpttype.ipp:192
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Reach"
+msgid "%p Mahjong Pon"
 msgstr ""
 
-#: src/emu/inpttype.ipp:77
+#: src/emu/inpttype.ipp:75 src/emu/inpttype.ipp:193
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Ron"
+msgid "%p Mahjong Chi"
 msgstr ""
 
-#: src/emu/inpttype.ipp:78
+#: src/emu/inpttype.ipp:76 src/emu/inpttype.ipp:194
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Flip Flop"
+msgid "%p Mahjong Reach"
 msgstr ""
 
-#: src/emu/inpttype.ipp:79
+#: src/emu/inpttype.ipp:77 src/emu/inpttype.ipp:195
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Bet"
+msgid "%p Mahjong Ron"
 msgstr ""
 
-#: src/emu/inpttype.ipp:80
+#: src/emu/inpttype.ipp:78 src/emu/inpttype.ipp:200
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Take Score"
+msgid "%p Mahjong Flip Flop"
 msgstr ""
 
-#: src/emu/inpttype.ipp:81
+#: src/emu/inpttype.ipp:79 src/emu/inpttype.ipp:196
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Double Up"
+msgid "%p Mahjong Bet"
 msgstr ""
 
-#: src/emu/inpttype.ipp:82
+#: src/emu/inpttype.ipp:80 src/emu/inpttype.ipp:198
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Big"
+msgid "%p Mahjong Take Score"
 msgstr ""
 
-#: src/emu/inpttype.ipp:83
+#: src/emu/inpttype.ipp:81 src/emu/inpttype.ipp:199
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Small"
+msgid "%p Mahjong Double Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:84
+#: src/emu/inpttype.ipp:82 src/emu/inpttype.ipp:201
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Last Chance"
+msgid "%p Mahjong Big"
 msgstr ""
 
-#: src/emu/inpttype.ipp:89
+#: src/emu/inpttype.ipp:83 src/emu/inpttype.ipp:202
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda A/1"
+msgid "%p Mahjong Small"
 msgstr ""
 
-#: src/emu/inpttype.ipp:90
+#: src/emu/inpttype.ipp:84 src/emu/inpttype.ipp:197
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda B/2"
+msgid "%p Mahjong Last Chance"
 msgstr ""
 
-#: src/emu/inpttype.ipp:91
+#: src/emu/inpttype.ipp:89 src/emu/inpttype.ipp:207
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda C/3"
+msgid "%p Hanafuda A/1"
 msgstr ""
 
-#: src/emu/inpttype.ipp:92
+#: src/emu/inpttype.ipp:90 src/emu/inpttype.ipp:208
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda D/4"
+msgid "%p Hanafuda B/2"
 msgstr ""
 
-#: src/emu/inpttype.ipp:93
+#: src/emu/inpttype.ipp:91 src/emu/inpttype.ipp:209
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda E/5"
+msgid "%p Hanafuda C/3"
 msgstr ""
 
-#: src/emu/inpttype.ipp:94
+#: src/emu/inpttype.ipp:92 src/emu/inpttype.ipp:210
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda F/6"
+msgid "%p Hanafuda D/4"
 msgstr ""
 
-#: src/emu/inpttype.ipp:95
+#: src/emu/inpttype.ipp:93 src/emu/inpttype.ipp:211
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda G/7"
+msgid "%p Hanafuda E/5"
 msgstr ""
 
-#: src/emu/inpttype.ipp:96
+#: src/emu/inpttype.ipp:94 src/emu/inpttype.ipp:212
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda H/8"
+msgid "%p Hanafuda F/6"
 msgstr ""
 
-#: src/emu/inpttype.ipp:97
+#: src/emu/inpttype.ipp:95 src/emu/inpttype.ipp:213
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda Yes"
+msgid "%p Hanafuda G/7"
 msgstr ""
 
-#: src/emu/inpttype.ipp:98
+#: src/emu/inpttype.ipp:96 src/emu/inpttype.ipp:214
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda No"
+msgid "%p Hanafuda H/8"
+msgstr ""
+
+#: src/emu/inpttype.ipp:97 src/emu/inpttype.ipp:215
+#, c-format
+msgctxt "input-name"
+msgid "%p Hanafuda Yes"
+msgstr ""
+
+#: src/emu/inpttype.ipp:98 src/emu/inpttype.ipp:216
+#, c-format
+msgctxt "input-name"
+msgid "%p Hanafuda No"
 msgstr ""
 
 #: src/emu/inpttype.ipp:103
@@ -3806,1551 +3980,6 @@ msgctxt "input-name"
 msgid "Stop All Reels"
 msgstr ""
 
-#: src/emu/inpttype.ipp:140
-msgctxt "input-name"
-msgid "P2 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:141
-msgctxt "input-name"
-msgid "P2 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:142
-msgctxt "input-name"
-msgid "P2 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:143
-msgctxt "input-name"
-msgid "P2 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:144
-msgctxt "input-name"
-msgid "P2 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:145
-msgctxt "input-name"
-msgid "P2 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:146
-msgctxt "input-name"
-msgid "P2 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:147
-msgctxt "input-name"
-msgid "P2 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:148
-msgctxt "input-name"
-msgid "P2 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:149
-msgctxt "input-name"
-msgid "P2 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:150
-msgctxt "input-name"
-msgid "P2 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:151
-msgctxt "input-name"
-msgid "P2 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:152
-msgctxt "input-name"
-msgid "P2 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:153
-msgctxt "input-name"
-msgid "P2 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:154
-msgctxt "input-name"
-msgid "P2 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:155
-msgctxt "input-name"
-msgid "P2 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:156
-msgctxt "input-name"
-msgid "P2 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:157
-msgctxt "input-name"
-msgid "P2 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:158
-msgctxt "input-name"
-msgid "P2 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:159
-msgctxt "input-name"
-msgid "P2 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:160
-msgctxt "input-name"
-msgid "P2 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:161
-msgctxt "input-name"
-msgid "P2 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:162
-msgctxt "input-name"
-msgid "P2 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:163
-msgctxt "input-name"
-msgid "P2 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:164
-msgctxt "input-name"
-msgid "P2 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:165
-msgctxt "input-name"
-msgid "P2 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:166
-msgctxt "input-name"
-msgid "P2 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:167
-msgctxt "input-name"
-msgid "P2 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:168
-msgctxt "input-name"
-msgid "P2 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:169
-msgctxt "input-name"
-msgid "P2 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:174
-msgctxt "input-name"
-msgid "P2 Mahjong A"
-msgstr ""
-
-#: src/emu/inpttype.ipp:175
-msgctxt "input-name"
-msgid "P2 Mahjong B"
-msgstr ""
-
-#: src/emu/inpttype.ipp:176
-msgctxt "input-name"
-msgid "P2 Mahjong C"
-msgstr ""
-
-#: src/emu/inpttype.ipp:177
-msgctxt "input-name"
-msgid "P2 Mahjong D"
-msgstr ""
-
-#: src/emu/inpttype.ipp:178
-msgctxt "input-name"
-msgid "P2 Mahjong E"
-msgstr ""
-
-#: src/emu/inpttype.ipp:179
-msgctxt "input-name"
-msgid "P2 Mahjong F"
-msgstr ""
-
-#: src/emu/inpttype.ipp:180
-msgctxt "input-name"
-msgid "P2 Mahjong G"
-msgstr ""
-
-#: src/emu/inpttype.ipp:181
-msgctxt "input-name"
-msgid "P2 Mahjong H"
-msgstr ""
-
-#: src/emu/inpttype.ipp:182
-msgctxt "input-name"
-msgid "P2 Mahjong I"
-msgstr ""
-
-#: src/emu/inpttype.ipp:183
-msgctxt "input-name"
-msgid "P2 Mahjong J"
-msgstr ""
-
-#: src/emu/inpttype.ipp:184
-msgctxt "input-name"
-msgid "P2 Mahjong K"
-msgstr ""
-
-#: src/emu/inpttype.ipp:185
-msgctxt "input-name"
-msgid "P2 Mahjong L"
-msgstr ""
-
-#: src/emu/inpttype.ipp:186
-msgctxt "input-name"
-msgid "P2 Mahjong M"
-msgstr ""
-
-#: src/emu/inpttype.ipp:187
-msgctxt "input-name"
-msgid "P2 Mahjong N"
-msgstr ""
-
-#: src/emu/inpttype.ipp:188
-msgctxt "input-name"
-msgid "P2 Mahjong O"
-msgstr ""
-
-#: src/emu/inpttype.ipp:189
-msgctxt "input-name"
-msgid "P2 Mahjong P"
-msgstr ""
-
-#: src/emu/inpttype.ipp:190
-msgctxt "input-name"
-msgid "P2 Mahjong Q"
-msgstr ""
-
-#: src/emu/inpttype.ipp:191
-msgctxt "input-name"
-msgid "P2 Mahjong Kan"
-msgstr ""
-
-#: src/emu/inpttype.ipp:192
-msgctxt "input-name"
-msgid "P2 Mahjong Pon"
-msgstr ""
-
-#: src/emu/inpttype.ipp:193
-msgctxt "input-name"
-msgid "P2 Mahjong Chi"
-msgstr ""
-
-#: src/emu/inpttype.ipp:194
-msgctxt "input-name"
-msgid "P2 Mahjong Reach"
-msgstr ""
-
-#: src/emu/inpttype.ipp:195
-msgctxt "input-name"
-msgid "P2 Mahjong Ron"
-msgstr ""
-
-#: src/emu/inpttype.ipp:196
-msgctxt "input-name"
-msgid "P2 Mahjong Bet"
-msgstr ""
-
-#: src/emu/inpttype.ipp:197
-msgctxt "input-name"
-msgid "P2 Mahjong Last Chance"
-msgstr ""
-
-#: src/emu/inpttype.ipp:198
-msgctxt "input-name"
-msgid "P2 Mahjong Take Score"
-msgstr ""
-
-#: src/emu/inpttype.ipp:199
-msgctxt "input-name"
-msgid "P2 Mahjong Double Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:200
-msgctxt "input-name"
-msgid "P2 Mahjong Flip Flop"
-msgstr ""
-
-#: src/emu/inpttype.ipp:201
-msgctxt "input-name"
-msgid "P2 Mahjong Big"
-msgstr ""
-
-#: src/emu/inpttype.ipp:202
-msgctxt "input-name"
-msgid "P2 Mahjong Small"
-msgstr ""
-
-#: src/emu/inpttype.ipp:207
-msgctxt "input-name"
-msgid "P2 Hanafuda A/1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:208
-msgctxt "input-name"
-msgid "P2 Hanafuda B/2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:209
-msgctxt "input-name"
-msgid "P2 Hanafuda C/3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:210
-msgctxt "input-name"
-msgid "P2 Hanafuda D/4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:211
-msgctxt "input-name"
-msgid "P2 Hanafuda E/5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:212
-msgctxt "input-name"
-msgid "P2 Hanafuda F/6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:213
-msgctxt "input-name"
-msgid "P2 Hanafuda G/7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:214
-msgctxt "input-name"
-msgid "P2 Hanafuda H/8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:215
-msgctxt "input-name"
-msgid "P2 Hanafuda Yes"
-msgstr ""
-
-#: src/emu/inpttype.ipp:216
-msgctxt "input-name"
-msgid "P2 Hanafuda No"
-msgstr ""
-
-#: src/emu/inpttype.ipp:221
-msgctxt "input-name"
-msgid "P3 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:222
-msgctxt "input-name"
-msgid "P3 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:223
-msgctxt "input-name"
-msgid "P3 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:224
-msgctxt "input-name"
-msgid "P3 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:225
-msgctxt "input-name"
-msgid "P3 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:226
-msgctxt "input-name"
-msgid "P3 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:227
-msgctxt "input-name"
-msgid "P3 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:228
-msgctxt "input-name"
-msgid "P3 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:229
-msgctxt "input-name"
-msgid "P3 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:230
-msgctxt "input-name"
-msgid "P3 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:231
-msgctxt "input-name"
-msgid "P3 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:232
-msgctxt "input-name"
-msgid "P3 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:233
-msgctxt "input-name"
-msgid "P3 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:234
-msgctxt "input-name"
-msgid "P3 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:235
-msgctxt "input-name"
-msgid "P3 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:236
-msgctxt "input-name"
-msgid "P3 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:237
-msgctxt "input-name"
-msgid "P3 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:238
-msgctxt "input-name"
-msgid "P3 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:239
-msgctxt "input-name"
-msgid "P3 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:240
-msgctxt "input-name"
-msgid "P3 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:241
-msgctxt "input-name"
-msgid "P3 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:242
-msgctxt "input-name"
-msgid "P3 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:243
-msgctxt "input-name"
-msgid "P3 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:244
-msgctxt "input-name"
-msgid "P3 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:245
-msgctxt "input-name"
-msgid "P3 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:246
-msgctxt "input-name"
-msgid "P3 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:247
-msgctxt "input-name"
-msgid "P3 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:248
-msgctxt "input-name"
-msgid "P3 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:249
-msgctxt "input-name"
-msgid "P3 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:250
-msgctxt "input-name"
-msgid "P3 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:255
-msgctxt "input-name"
-msgid "P4 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:256
-msgctxt "input-name"
-msgid "P4 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:257
-msgctxt "input-name"
-msgid "P4 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:258
-msgctxt "input-name"
-msgid "P4 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:259
-msgctxt "input-name"
-msgid "P4 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:260
-msgctxt "input-name"
-msgid "P4 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:261
-msgctxt "input-name"
-msgid "P4 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:262
-msgctxt "input-name"
-msgid "P4 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:263
-msgctxt "input-name"
-msgid "P4 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:264
-msgctxt "input-name"
-msgid "P4 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:265
-msgctxt "input-name"
-msgid "P4 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:266
-msgctxt "input-name"
-msgid "P4 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:267
-msgctxt "input-name"
-msgid "P4 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:268
-msgctxt "input-name"
-msgid "P4 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:269
-msgctxt "input-name"
-msgid "P4 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:270
-msgctxt "input-name"
-msgid "P4 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:271
-msgctxt "input-name"
-msgid "P4 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:272
-msgctxt "input-name"
-msgid "P4 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:273
-msgctxt "input-name"
-msgid "P4 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:274
-msgctxt "input-name"
-msgid "P4 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:275
-msgctxt "input-name"
-msgid "P4 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:276
-msgctxt "input-name"
-msgid "P4 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:277
-msgctxt "input-name"
-msgid "P4 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:278
-msgctxt "input-name"
-msgid "P4 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:279
-msgctxt "input-name"
-msgid "P4 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:280
-msgctxt "input-name"
-msgid "P4 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:281
-msgctxt "input-name"
-msgid "P4 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:282
-msgctxt "input-name"
-msgid "P4 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:283
-msgctxt "input-name"
-msgid "P4 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:284
-msgctxt "input-name"
-msgid "P4 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:289
-msgctxt "input-name"
-msgid "P5 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:290
-msgctxt "input-name"
-msgid "P5 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:291
-msgctxt "input-name"
-msgid "P5 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:292
-msgctxt "input-name"
-msgid "P5 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:293
-msgctxt "input-name"
-msgid "P5 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:294
-msgctxt "input-name"
-msgid "P5 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:295
-msgctxt "input-name"
-msgid "P5 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:296
-msgctxt "input-name"
-msgid "P5 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:297
-msgctxt "input-name"
-msgid "P5 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:298
-msgctxt "input-name"
-msgid "P5 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:299
-msgctxt "input-name"
-msgid "P5 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:300
-msgctxt "input-name"
-msgid "P5 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:301
-msgctxt "input-name"
-msgid "P5 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:302
-msgctxt "input-name"
-msgid "P5 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:303
-msgctxt "input-name"
-msgid "P5 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:304
-msgctxt "input-name"
-msgid "P5 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:305
-msgctxt "input-name"
-msgid "P5 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:306
-msgctxt "input-name"
-msgid "P5 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:307
-msgctxt "input-name"
-msgid "P5 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:308
-msgctxt "input-name"
-msgid "P5 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:309
-msgctxt "input-name"
-msgid "P5 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:310
-msgctxt "input-name"
-msgid "P5 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:311
-msgctxt "input-name"
-msgid "P5 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:312
-msgctxt "input-name"
-msgid "P5 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:313
-msgctxt "input-name"
-msgid "P5 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:314
-msgctxt "input-name"
-msgid "P5 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:315
-msgctxt "input-name"
-msgid "P5 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:316
-msgctxt "input-name"
-msgid "P5 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:317
-msgctxt "input-name"
-msgid "P5 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:318
-msgctxt "input-name"
-msgid "P5 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:323
-msgctxt "input-name"
-msgid "P6 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:324
-msgctxt "input-name"
-msgid "P6 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:325
-msgctxt "input-name"
-msgid "P6 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:326
-msgctxt "input-name"
-msgid "P6 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:327
-msgctxt "input-name"
-msgid "P6 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:328
-msgctxt "input-name"
-msgid "P6 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:329
-msgctxt "input-name"
-msgid "P6 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:330
-msgctxt "input-name"
-msgid "P6 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:331
-msgctxt "input-name"
-msgid "P6 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:332
-msgctxt "input-name"
-msgid "P6 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:333
-msgctxt "input-name"
-msgid "P6 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:334
-msgctxt "input-name"
-msgid "P6 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:335
-msgctxt "input-name"
-msgid "P6 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:336
-msgctxt "input-name"
-msgid "P6 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:337
-msgctxt "input-name"
-msgid "P6 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:338
-msgctxt "input-name"
-msgid "P6 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:339
-msgctxt "input-name"
-msgid "P6 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:340
-msgctxt "input-name"
-msgid "P6 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:341
-msgctxt "input-name"
-msgid "P6 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:342
-msgctxt "input-name"
-msgid "P6 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:343
-msgctxt "input-name"
-msgid "P6 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:344
-msgctxt "input-name"
-msgid "P6 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:345
-msgctxt "input-name"
-msgid "P6 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:346
-msgctxt "input-name"
-msgid "P6 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:347
-msgctxt "input-name"
-msgid "P6 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:348
-msgctxt "input-name"
-msgid "P6 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:349
-msgctxt "input-name"
-msgid "P6 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:350
-msgctxt "input-name"
-msgid "P6 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:351
-msgctxt "input-name"
-msgid "P6 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:352
-msgctxt "input-name"
-msgid "P6 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:357
-msgctxt "input-name"
-msgid "P7 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:358
-msgctxt "input-name"
-msgid "P7 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:359
-msgctxt "input-name"
-msgid "P7 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:360
-msgctxt "input-name"
-msgid "P7 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:361
-msgctxt "input-name"
-msgid "P7 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:362
-msgctxt "input-name"
-msgid "P7 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:363
-msgctxt "input-name"
-msgid "P7 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:364
-msgctxt "input-name"
-msgid "P7 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:365
-msgctxt "input-name"
-msgid "P7 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:366
-msgctxt "input-name"
-msgid "P7 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:367
-msgctxt "input-name"
-msgid "P7 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:368
-msgctxt "input-name"
-msgid "P7 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:369
-msgctxt "input-name"
-msgid "P7 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:370
-msgctxt "input-name"
-msgid "P7 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:371
-msgctxt "input-name"
-msgid "P7 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:372
-msgctxt "input-name"
-msgid "P7 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:373
-msgctxt "input-name"
-msgid "P7 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:374
-msgctxt "input-name"
-msgid "P7 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:375
-msgctxt "input-name"
-msgid "P7 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:376
-msgctxt "input-name"
-msgid "P7 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:377
-msgctxt "input-name"
-msgid "P7 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:378
-msgctxt "input-name"
-msgid "P7 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:379
-msgctxt "input-name"
-msgid "P7 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:380
-msgctxt "input-name"
-msgid "P7 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:381
-msgctxt "input-name"
-msgid "P7 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:382
-msgctxt "input-name"
-msgid "P7 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:383
-msgctxt "input-name"
-msgid "P7 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:384
-msgctxt "input-name"
-msgid "P7 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:385
-msgctxt "input-name"
-msgid "P7 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:386
-msgctxt "input-name"
-msgid "P7 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:391
-msgctxt "input-name"
-msgid "P8 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:392
-msgctxt "input-name"
-msgid "P8 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:393
-msgctxt "input-name"
-msgid "P8 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:394
-msgctxt "input-name"
-msgid "P8 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:395
-msgctxt "input-name"
-msgid "P8 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:396
-msgctxt "input-name"
-msgid "P8 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:397
-msgctxt "input-name"
-msgid "P8 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:398
-msgctxt "input-name"
-msgid "P8 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:399
-msgctxt "input-name"
-msgid "P8 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:400
-msgctxt "input-name"
-msgid "P8 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:401
-msgctxt "input-name"
-msgid "P8 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:402
-msgctxt "input-name"
-msgid "P8 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:403
-msgctxt "input-name"
-msgid "P8 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:404
-msgctxt "input-name"
-msgid "P8 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:405
-msgctxt "input-name"
-msgid "P8 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:406
-msgctxt "input-name"
-msgid "P8 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:407
-msgctxt "input-name"
-msgid "P8 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:408
-msgctxt "input-name"
-msgid "P8 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:409
-msgctxt "input-name"
-msgid "P8 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:410
-msgctxt "input-name"
-msgid "P8 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:411
-msgctxt "input-name"
-msgid "P8 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:412
-msgctxt "input-name"
-msgid "P8 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:413
-msgctxt "input-name"
-msgid "P8 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:414
-msgctxt "input-name"
-msgid "P8 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:415
-msgctxt "input-name"
-msgid "P8 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:416
-msgctxt "input-name"
-msgid "P8 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:417
-msgctxt "input-name"
-msgid "P8 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:418
-msgctxt "input-name"
-msgid "P8 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:419
-msgctxt "input-name"
-msgid "P8 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:420
-msgctxt "input-name"
-msgid "P8 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:425
-msgctxt "input-name"
-msgid "P9 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:426
-msgctxt "input-name"
-msgid "P9 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:427
-msgctxt "input-name"
-msgid "P9 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:428
-msgctxt "input-name"
-msgid "P9 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:429
-msgctxt "input-name"
-msgid "P9 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:430
-msgctxt "input-name"
-msgid "P9 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:431
-msgctxt "input-name"
-msgid "P9 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:432
-msgctxt "input-name"
-msgid "P9 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:433
-msgctxt "input-name"
-msgid "P9 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:434
-msgctxt "input-name"
-msgid "P9 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:435
-msgctxt "input-name"
-msgid "P9 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:436
-msgctxt "input-name"
-msgid "P9 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:437
-msgctxt "input-name"
-msgid "P9 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:438
-msgctxt "input-name"
-msgid "P9 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:439
-msgctxt "input-name"
-msgid "P9 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:440
-msgctxt "input-name"
-msgid "P9 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:441
-msgctxt "input-name"
-msgid "P9 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:442
-msgctxt "input-name"
-msgid "P9 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:443
-msgctxt "input-name"
-msgid "P9 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:444
-msgctxt "input-name"
-msgid "P9 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:445
-msgctxt "input-name"
-msgid "P9 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:446
-msgctxt "input-name"
-msgid "P9 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:447
-msgctxt "input-name"
-msgid "P9 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:448
-msgctxt "input-name"
-msgid "P9 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:449
-msgctxt "input-name"
-msgid "P9 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:450
-msgctxt "input-name"
-msgid "P9 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:451
-msgctxt "input-name"
-msgid "P9 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:452
-msgctxt "input-name"
-msgid "P9 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:453
-msgctxt "input-name"
-msgid "P9 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:454
-msgctxt "input-name"
-msgid "P9 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:459
-msgctxt "input-name"
-msgid "P10 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:460
-msgctxt "input-name"
-msgid "P10 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:461
-msgctxt "input-name"
-msgid "P10 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:462
-msgctxt "input-name"
-msgid "P10 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:463
-msgctxt "input-name"
-msgid "P10 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:464
-msgctxt "input-name"
-msgid "P10 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:465
-msgctxt "input-name"
-msgid "P10 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:466
-msgctxt "input-name"
-msgid "P10 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:467
-msgctxt "input-name"
-msgid "P10 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:468
-msgctxt "input-name"
-msgid "P10 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:469
-msgctxt "input-name"
-msgid "P10 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:470
-msgctxt "input-name"
-msgid "P10 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:471
-msgctxt "input-name"
-msgid "P10 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:472
-msgctxt "input-name"
-msgid "P10 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:473
-msgctxt "input-name"
-msgid "P10 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:474
-msgctxt "input-name"
-msgid "P10 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:475
-msgctxt "input-name"
-msgid "P10 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:476
-msgctxt "input-name"
-msgid "P10 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:477
-msgctxt "input-name"
-msgid "P10 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:478
-msgctxt "input-name"
-msgid "P10 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:479
-msgctxt "input-name"
-msgid "P10 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:480
-msgctxt "input-name"
-msgid "P10 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:481
-msgctxt "input-name"
-msgid "P10 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:482
-msgctxt "input-name"
-msgid "P10 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:483
-msgctxt "input-name"
-msgid "P10 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:484
-msgctxt "input-name"
-msgid "P10 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:485
-msgctxt "input-name"
-msgid "P10 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:486
-msgctxt "input-name"
-msgid "P10 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:487
-msgctxt "input-name"
-msgid "P10 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:488
-msgctxt "input-name"
-msgid "P10 Select"
-msgstr ""
-
 #: src/emu/inpttype.ipp:493
 msgctxt "input-name"
 msgid "1 Player Start"
@@ -5531,154 +4160,31 @@ msgctxt "input-name"
 msgid "Volume Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:550
-msgctxt "input-name"
-msgid "P1 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:551
-msgctxt "input-name"
-msgid "P2 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:552
-msgctxt "input-name"
-msgid "P3 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:553
-msgctxt "input-name"
-msgid "P4 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:554
-msgctxt "input-name"
-msgid "P5 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:555
-msgctxt "input-name"
-msgid "P6 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:556
-msgctxt "input-name"
-msgid "P7 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:557
-msgctxt "input-name"
-msgid "P8 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:558
-msgctxt "input-name"
-msgid "P9 Pedal 1"
-msgstr ""
-
+#: src/emu/inpttype.ipp:550 src/emu/inpttype.ipp:551 src/emu/inpttype.ipp:552
+#: src/emu/inpttype.ipp:553 src/emu/inpttype.ipp:554 src/emu/inpttype.ipp:555
+#: src/emu/inpttype.ipp:556 src/emu/inpttype.ipp:557 src/emu/inpttype.ipp:558
 #: src/emu/inpttype.ipp:559
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:564
-msgctxt "input-name"
-msgid "P1 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:565
-msgctxt "input-name"
-msgid "P2 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:566
-msgctxt "input-name"
-msgid "P3 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:567
-msgctxt "input-name"
-msgid "P4 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:568
-msgctxt "input-name"
-msgid "P5 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:569
-msgctxt "input-name"
-msgid "P6 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:570
-msgctxt "input-name"
-msgid "P7 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:571
-msgctxt "input-name"
-msgid "P8 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:572
-msgctxt "input-name"
-msgid "P9 Pedal 2"
+msgid "%p Pedal 1"
 msgstr ""
 
+#: src/emu/inpttype.ipp:564 src/emu/inpttype.ipp:565 src/emu/inpttype.ipp:566
+#: src/emu/inpttype.ipp:567 src/emu/inpttype.ipp:568 src/emu/inpttype.ipp:569
+#: src/emu/inpttype.ipp:570 src/emu/inpttype.ipp:571 src/emu/inpttype.ipp:572
 #: src/emu/inpttype.ipp:573
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:578
-msgctxt "input-name"
-msgid "P1 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:579
-msgctxt "input-name"
-msgid "P2 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:580
-msgctxt "input-name"
-msgid "P3 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:581
-msgctxt "input-name"
-msgid "P4 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:582
-msgctxt "input-name"
-msgid "P5 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:583
-msgctxt "input-name"
-msgid "P6 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:584
-msgctxt "input-name"
-msgid "P7 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:585
-msgctxt "input-name"
-msgid "P8 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:586
-msgctxt "input-name"
-msgid "P9 Pedal 3"
+msgid "%p Pedal 2"
 msgstr ""
 
+#: src/emu/inpttype.ipp:578 src/emu/inpttype.ipp:579 src/emu/inpttype.ipp:580
+#: src/emu/inpttype.ipp:581 src/emu/inpttype.ipp:582 src/emu/inpttype.ipp:583
+#: src/emu/inpttype.ipp:584 src/emu/inpttype.ipp:585 src/emu/inpttype.ipp:586
 #: src/emu/inpttype.ipp:587
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 3"
+msgid "%p Pedal 3"
 msgstr ""
 
 #: src/emu/inpttype.ipp:592
diff --git a/language/Slovak/strings.po b/language/Slovak/strings.po
index 4d0d80e953d..f9da7e68db0 100644
--- a/language/Slovak/strings.po
+++ b/language/Slovak/strings.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-19 02:50+1100\n"
+"POT-Creation-Date: 2021-12-09 04:44+1100\n"
 "PO-Revision-Date: 2021-12-06 13:24+0100\n"
 "Last-Translator: Milan Galcik <milan.galcik@gmail.com>\n"
 "Language-Team: MAME Language Team\n"
@@ -278,12 +278,12 @@ msgstr "%1$s %2$s (%3$d z %4$d softvérových balíkov)"
 msgid "Driver: \"%1$s\" software list "
 msgstr "Ovládač: \"%1$s\" zoznam softvéru "
 
-#: src/frontend/mame/ui/selsoft.cpp:711 src/frontend/mame/ui/selgame.cpp:1066
+#: src/frontend/mame/ui/selsoft.cpp:711 src/frontend/mame/ui/selgame.cpp:1076
 #, c-format
 msgid "%1$s: %2$s - Search: %3$s_"
 msgstr "%1$s: %2$s - Vyhľadať: %3$s_"
 
-#: src/frontend/mame/ui/selsoft.cpp:713 src/frontend/mame/ui/selgame.cpp:1068
+#: src/frontend/mame/ui/selsoft.cpp:713 src/frontend/mame/ui/selgame.cpp:1078
 #, c-format
 msgid "Search: %1$s_"
 msgstr "Vyhľadať: %1$s_"
@@ -293,7 +293,7 @@ msgstr "Vyhľadať: %1$s_"
 msgid "Software list/item: %1$s:%2$s"
 msgstr "Zoznam softvéru/položka: %1$s:%2$s"
 
-#: src/frontend/mame/ui/optsmenu.cpp:73 src/frontend/mame/ui/sndmenu.cpp:165
+#: src/frontend/mame/ui/optsmenu.cpp:73 src/frontend/mame/ui/sndmenu.cpp:161
 msgid "Sound Options"
 msgstr "Nastavenia zvuku"
 
@@ -388,12 +388,12 @@ msgid "Show mouse pointer"
 msgstr "Zobraziť ukazovateľ myši"
 
 #: src/frontend/mame/ui/submenu.cpp:39
-msgid "Confirm quit from machines"
-msgstr "Potvrdiť ukončenie emulácie zariadenia"
+msgid "Confirm quit from emulation"
+msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:40
-msgid "Skip information screen at startup"
-msgstr "Preskočiť úvodnú informačnú obrazovku"
+msgid "Skip system information screen"
+msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:41
 msgid "Force 4:3 aspect for snapshot display"
@@ -408,8 +408,8 @@ msgid "Skip BIOS selection menu"
 msgstr "Preskočiť menu s výberom BIOSu"
 
 #: src/frontend/mame/ui/submenu.cpp:44
-msgid "Skip software parts selection menu"
-msgstr "Preskočiť menu s výberom súčastí softvéru"
+msgid "Skip software part selection menu"
+msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:45
 msgid "Info auto audit"
@@ -560,8 +560,8 @@ msgid "UI active"
 msgstr "Používateľské rozhranie nad emulovanou klávesnicou"
 
 #: src/frontend/mame/ui/submenu.cpp:91
-msgid "Offscreen reload"
-msgstr "Konvertovať tlačidlo 2 svetelnej pištole na offscreen reload"
+msgid "Off-screen reload"
+msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:92
 msgid "Joystick deadzone"
@@ -576,7 +576,7 @@ msgid "Natural keyboard"
 msgstr "Prirodzená klávesnica"
 
 #: src/frontend/mame/ui/submenu.cpp:95
-msgid "Simultaneous contradictory"
+msgid "Allow contradictory joystick inputs"
 msgstr "Súbežná aktivácia protichodných vstupov joysticku"
 
 #: src/frontend/mame/ui/submenu.cpp:96
@@ -600,7 +600,7 @@ msgid "Pedal Device Assignment"
 msgstr "Zariadenie ovládajúce pedál"
 
 #: src/frontend/mame/ui/submenu.cpp:106
-msgid "Adstick Device Assignment"
+msgid "AD Stick Device Assignment"
 msgstr "Zariadenie ovládajúce analógový joystick"
 
 #: src/frontend/mame/ui/submenu.cpp:107
@@ -687,14 +687,14 @@ msgstr "Synchronizovaný refresh"
 msgid "Wait Vertical Sync"
 msgstr "Čakať na V-Sync"
 
-#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:687
+#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:689
 #: src/frontend/mame/ui/videoopt.cpp:191 src/frontend/mame/ui/custui.cpp:490
 #: src/frontend/mame/ui/analogipt.cpp:471 plugins/cheatfind/init.lua:766
 #: plugins/cheatfind/init.lua:777 plugins/cheat/init.lua:668
 msgid "On"
 msgstr "Zapnuté"
 
-#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:690
+#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:692
 #: src/frontend/mame/ui/videoopt.cpp:207 src/frontend/mame/ui/custui.cpp:490
 #: src/frontend/mame/ui/analogipt.cpp:471 plugins/cheatfind/init.lua:763
 #: plugins/cheatfind/init.lua:774 plugins/cheat/init.lua:671
@@ -702,11 +702,11 @@ msgstr "Zapnuté"
 msgid "Off"
 msgstr "Vypnuté"
 
-#: src/frontend/mame/ui/menu.cpp:693
+#: src/frontend/mame/ui/menu.cpp:695
 msgid "Auto"
 msgstr "Automaticky"
 
-#: src/frontend/mame/ui/menu.cpp:1195
+#: src/frontend/mame/ui/menu.cpp:1197
 #: src/frontend/mame/ui/simpleselgame.cpp:278
 #: src/frontend/mame/ui/selmenu.cpp:1280
 msgid "Return to Previous Menu"
@@ -714,7 +714,7 @@ msgstr "Späť na predchádzajúce menu"
 
 #: src/frontend/mame/ui/filemngr.cpp:139
 #: src/frontend/mame/ui/confswitch.cpp:119
-#: src/frontend/mame/ui/inputmap.cpp:559 src/frontend/mame/ui/analogipt.cpp:360
+#: src/frontend/mame/ui/inputmap.cpp:563 src/frontend/mame/ui/analogipt.cpp:360
 #, c-format
 msgid "[root%1$s]"
 msgstr ""
@@ -981,22 +981,22 @@ msgstr ""
 "CPU:\n"
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "GHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "MHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "kHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "Hz"
 msgstr ""
 
@@ -1024,38 +1024,38 @@ msgstr "Žiadny\n"
 msgid "Vector"
 msgstr "Vektorový"
 
-#: src/frontend/mame/ui/info.cpp:480
+#: src/frontend/mame/ui/info.cpp:483
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:480
+#: src/frontend/mame/ui/info.cpp:483
 msgid "%2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:497
+#: src/frontend/mame/ui/info.cpp:500
 #, c-format
 msgid "Screen '%1$s'"
 msgstr "Obrazovka '%1$s'"
 
-#: src/frontend/mame/ui/info.cpp:499
+#: src/frontend/mame/ui/info.cpp:502
 msgid "Screen"
 msgstr "Obrazovka"
 
-#: src/frontend/mame/ui/info.cpp:570 src/frontend/mame/ui/info.cpp:581
+#: src/frontend/mame/ui/info.cpp:573 src/frontend/mame/ui/info.cpp:584
 #, c-format
 msgid "%1$s:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:662
+#: src/frontend/mame/ui/info.cpp:665
 msgid "Not supported"
 msgstr "Nepodporované"
 
-#: src/frontend/mame/ui/info.cpp:665
+#: src/frontend/mame/ui/info.cpp:668
 msgid "Partially supported"
 msgstr "Čiastočne podporované"
 
-#: src/frontend/mame/ui/info.cpp:674
+#: src/frontend/mame/ui/info.cpp:677
 msgid "[empty]"
 msgstr "[prázdny]"
 
@@ -1128,7 +1128,7 @@ msgid "Emulated"
 msgstr "Emulovaná"
 
 #: src/frontend/mame/ui/keyboard.cpp:59 src/frontend/mame/ui/confswitch.cpp:117
-#: src/frontend/mame/ui/inputmap.cpp:557 src/frontend/mame/ui/analogipt.cpp:358
+#: src/frontend/mame/ui/inputmap.cpp:561 src/frontend/mame/ui/analogipt.cpp:358
 #, c-format
 msgid "%1$s [root%2$s]"
 msgstr ""
@@ -1488,7 +1488,7 @@ msgctxt "swlist-info"
 msgid "Software list/item"
 msgstr "Položka/zoznam softvéru"
 
-#: src/frontend/mame/ui/datmenu.cpp:88 src/frontend/mame/ui/selmenu.cpp:2698
+#: src/frontend/mame/ui/datmenu.cpp:88 src/frontend/mame/ui/selmenu.cpp:2707
 msgid "Software List Info"
 msgstr "Informácia o zozname softvéru"
 
@@ -1609,7 +1609,7 @@ msgstr "Uložiť konfiguráciu zariadenia"
 msgid "Configure Machine:"
 msgstr "Konfigurovať zariadenie:"
 
-#: src/frontend/mame/ui/miscmenu.cpp:858 src/frontend/mame/ui/selmenu.cpp:2638
+#: src/frontend/mame/ui/miscmenu.cpp:858 src/frontend/mame/ui/selmenu.cpp:2647
 msgid " (default)"
 msgstr " (pôvodné)"
 
@@ -1630,7 +1630,7 @@ msgstr ""
 "Stlačte %1$s pre ukončenie\n"
 "Alebo %2$s pre návrat do emulácie"
 
-#: src/frontend/mame/ui/info_pty.cpp:30 src/frontend/mame/ui/mainmenu.cpp:155
+#: src/frontend/mame/ui/info_pty.cpp:30
 msgid "Pseudo terminals"
 msgstr "Pseudoterminály"
 
@@ -1702,52 +1702,52 @@ msgstr "Ovládanie Hráč %1$d"
 msgid "Other Controls"
 msgstr "Ďalšie ovládanie"
 
-#: src/frontend/mame/ui/inputmap.cpp:227
+#: src/frontend/mame/ui/inputmap.cpp:231
 msgid "This machine has no configurable inputs."
 msgstr "Zariadenie nemá konfigurovateľné vstupy."
 
-#: src/frontend/mame/ui/inputmap.cpp:327
+#: src/frontend/mame/ui/inputmap.cpp:331
 msgid "Pressed"
 msgstr "Stlačené"
 
-#: src/frontend/mame/ui/inputmap.cpp:397
+#: src/frontend/mame/ui/inputmap.cpp:401
 msgid "Invalid sequence entered"
 msgstr "Vložená neplatná sekvencia"
 
-#: src/frontend/mame/ui/inputmap.cpp:542
+#: src/frontend/mame/ui/inputmap.cpp:546
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:543
+#: src/frontend/mame/ui/inputmap.cpp:547
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog Inc"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:544
+#: src/frontend/mame/ui/inputmap.cpp:548
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog Dec"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:586
+#: src/frontend/mame/ui/inputmap.cpp:590
 #, c-format
 msgid "Press %1$s to set\n"
 msgstr "Pre nastavenie stlačte %1$s\n"
 
-#: src/frontend/mame/ui/inputmap.cpp:587
+#: src/frontend/mame/ui/inputmap.cpp:591
 #, c-format
 msgid "Press %1$s to append\n"
 msgstr "Pre pridanie stlačte %1$s\n"
 
-#: src/frontend/mame/ui/inputmap.cpp:588
+#: src/frontend/mame/ui/inputmap.cpp:592
 #, c-format
 msgid "Press %1$s to clear\n"
 msgstr "Pre vymazanie stlačte %1$s\n"
 
-#: src/frontend/mame/ui/inputmap.cpp:589
+#: src/frontend/mame/ui/inputmap.cpp:593
 #, c-format
 msgid "Press %1$s to restore default\n"
 msgstr "Pre nastavenie pôvodnej hodnoty stlačte %1$s\n"
@@ -1817,7 +1817,7 @@ msgstr ""
 "Pokračujte stlačením ľubovoľného klávesu."
 
 #: src/frontend/mame/ui/simpleselgame.cpp:273
-#: src/frontend/mame/ui/selgame.cpp:436
+#: src/frontend/mame/ui/selgame.cpp:443
 msgid "Configure Options"
 msgstr "Konfigurovať všeobecné nastavenia"
 
@@ -2151,16 +2151,16 @@ msgstr "Zväčšenie = %1$d"
 msgid "Expand to fit"
 msgstr "Prispôsobiť veľkosti"
 
-#: src/frontend/mame/ui/selgame.cpp:437
+#: src/frontend/mame/ui/selgame.cpp:444
 msgid "Configure Machine"
 msgstr "Konfigurovať vybraté zariadenie"
 
-#: src/frontend/mame/ui/selgame.cpp:1050
+#: src/frontend/mame/ui/selgame.cpp:1060
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d machines (%5$d BIOS) )"
 msgstr "%1$s %2$s (zobrazených %3$d z %4$d zariadení (%5$d s BIOSom))"
 
-#: src/frontend/mame/ui/selgame.cpp:1078
+#: src/frontend/mame/ui/selgame.cpp:1088
 #, c-format
 msgid "System: %1$-.100s"
 msgstr "Systém: %1$-.100s"
@@ -2182,7 +2182,7 @@ msgstr "Výsledky auditu budú uložené do súboru %1$s"
 #: src/frontend/mame/ui/auditmenu.cpp:98
 #, c-format
 msgid ""
-"Auditing ROMs for machine %2$u of %3$u...\n"
+"Auditing media for machine %2$u of %3$u...\n"
 "%1$s"
 msgstr ""
 "Prebieha audit médií... (%2$u z %3$u)\n"
@@ -2203,12 +2203,12 @@ msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:136
 #, c-format
-msgid "Audit ROMs for %1$u machines marked unavailable"
+msgid "Audit media for %1$u machines marked unavailable"
 msgstr "Vykonať audit médií pre %1$u zariadení označených ako Nedostupné"
 
 #: src/frontend/mame/ui/auditmenu.cpp:137
 #, c-format
-msgid "Audit ROMs for all %1$u machines"
+msgid "Audit media for all %1$u machines"
 msgstr "Vykonať audit médií pre všetkých %1$u zariadení"
 
 #: src/frontend/mame/ui/auditmenu.cpp:154
@@ -2415,84 +2415,84 @@ msgctxt "color-sample"
 msgid "Clone"
 msgstr "Klon"
 
-#: src/frontend/mame/ui/custui.cpp:914
+#: src/frontend/mame/ui/custui.cpp:906
 msgid "ARGB Settings"
 msgstr "Zložky farby"
 
-#: src/frontend/mame/ui/custui.cpp:919 src/frontend/mame/ui/custui.cpp:922
+#: src/frontend/mame/ui/custui.cpp:911 src/frontend/mame/ui/custui.cpp:914
 msgctxt "color-channel"
 msgid "Alpha"
 msgstr "Priehľadnosť (A)"
 
-#: src/frontend/mame/ui/custui.cpp:927 src/frontend/mame/ui/custui.cpp:930
+#: src/frontend/mame/ui/custui.cpp:919 src/frontend/mame/ui/custui.cpp:922
 msgctxt "color-channel"
 msgid "Red"
 msgstr "Červená (R)"
 
-#: src/frontend/mame/ui/custui.cpp:935 src/frontend/mame/ui/custui.cpp:938
+#: src/frontend/mame/ui/custui.cpp:927 src/frontend/mame/ui/custui.cpp:930
 msgctxt "color-channel"
 msgid "Green"
 msgstr "Zelená (G)"
 
-#: src/frontend/mame/ui/custui.cpp:943 src/frontend/mame/ui/custui.cpp:946
+#: src/frontend/mame/ui/custui.cpp:935 src/frontend/mame/ui/custui.cpp:938
 msgctxt "color-channel"
 msgid "Blue"
 msgstr "Modrá (B)"
 
-#: src/frontend/mame/ui/custui.cpp:949
+#: src/frontend/mame/ui/custui.cpp:941
 msgid "Choose from palette"
 msgstr "Vybrať z palety"
 
-#: src/frontend/mame/ui/custui.cpp:996
+#: src/frontend/mame/ui/custui.cpp:988
 msgid "Color preview:"
 msgstr "Náhľad farby:"
 
-#: src/frontend/mame/ui/custui.cpp:1093
+#: src/frontend/mame/ui/custui.cpp:1085
 msgctxt "color-preset"
 msgid "White"
 msgstr "Biela"
 
-#: src/frontend/mame/ui/custui.cpp:1094
+#: src/frontend/mame/ui/custui.cpp:1086
 msgctxt "color-preset"
 msgid "Silver"
 msgstr "Strieborná"
 
-#: src/frontend/mame/ui/custui.cpp:1095
+#: src/frontend/mame/ui/custui.cpp:1087
 msgctxt "color-preset"
 msgid "Gray"
 msgstr "Šedá"
 
-#: src/frontend/mame/ui/custui.cpp:1096
+#: src/frontend/mame/ui/custui.cpp:1088
 msgctxt "color-preset"
 msgid "Black"
 msgstr "Čierna"
 
-#: src/frontend/mame/ui/custui.cpp:1097
+#: src/frontend/mame/ui/custui.cpp:1089
 msgctxt "color-preset"
 msgid "Red"
 msgstr "Červená"
 
-#: src/frontend/mame/ui/custui.cpp:1098
+#: src/frontend/mame/ui/custui.cpp:1090
 msgctxt "color-preset"
 msgid "Orange"
 msgstr "Oranžová"
 
-#: src/frontend/mame/ui/custui.cpp:1099
+#: src/frontend/mame/ui/custui.cpp:1091
 msgctxt "color-preset"
 msgid "Yellow"
 msgstr "Žltá"
 
-#: src/frontend/mame/ui/custui.cpp:1100
+#: src/frontend/mame/ui/custui.cpp:1092
 msgctxt "color-preset"
 msgid "Green"
 msgstr "Zelená"
 
-#: src/frontend/mame/ui/custui.cpp:1101
+#: src/frontend/mame/ui/custui.cpp:1093
 msgctxt "color-preset"
 msgid "Blue"
 msgstr "Modrá"
 
-#: src/frontend/mame/ui/custui.cpp:1102
+#: src/frontend/mame/ui/custui.cpp:1094
 msgctxt "color-preset"
 msgid "Violet"
 msgstr "Fialová"
@@ -2557,7 +2557,7 @@ msgid "Input (general)"
 msgstr "Vstup (všeobecný)"
 
 #: src/frontend/mame/ui/mainmenu.cpp:123
-msgid "Input (this Machine)"
+msgid "Input (this machine)"
 msgstr "Vstup (pre toto zariadenie)"
 
 #: src/frontend/mame/ui/mainmenu.cpp:126
@@ -2596,6 +2596,10 @@ msgstr "Súborový manažér"
 msgid "Tape Control"
 msgstr "Ovládanie kazetového prehrávača"
 
+#: src/frontend/mame/ui/mainmenu.cpp:155
+msgid "Pseudo Terminals"
+msgstr ""
+
 #: src/frontend/mame/ui/mainmenu.cpp:158
 msgid "BIOS Selection"
 msgstr "Výber BIOSu"
@@ -2634,8 +2638,8 @@ msgstr "Zobrazenie externého DAT"
 
 #: src/frontend/mame/ui/mainmenu.cpp:200
 #, c-format
-msgid "About %s"
-msgstr "O %s"
+msgid "About %1$s"
+msgstr "O %1$s"
 
 #: src/frontend/mame/ui/mainmenu.cpp:212
 msgid "Select New Machine"
@@ -2794,15 +2798,15 @@ msgstr "Ovládač je klonom %1$s"
 msgid "%1$s %2$s"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2235
+#: src/frontend/mame/ui/selmenu.cpp:2244
 msgid "Images"
 msgstr "Obrázky"
 
-#: src/frontend/mame/ui/selmenu.cpp:2236
+#: src/frontend/mame/ui/selmenu.cpp:2245
 msgid "Infos"
 msgstr "Informácie"
 
-#: src/frontend/mame/ui/selmenu.cpp:2551
+#: src/frontend/mame/ui/selmenu.cpp:2560
 msgid ""
 "Required ROM/disk images for the selected system are missing or incorrect. "
 "Please acquire the correct files or select a different system.\n"
@@ -2813,7 +2817,7 @@ msgstr ""
 "zariadenie.\n"
 "\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2567
+#: src/frontend/mame/ui/selmenu.cpp:2576
 msgid ""
 "Required ROM/disk images for the selected software are missing or incorrect. "
 "Please acquire the correct files or select a different software item.\n"
@@ -2824,353 +2828,353 @@ msgstr ""
 "softvér.\n"
 "\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2583
+#: src/frontend/mame/ui/selmenu.cpp:2592
 msgid "incorrect checksum"
 msgstr "nesprávny súčet"
 
-#: src/frontend/mame/ui/selmenu.cpp:2586
+#: src/frontend/mame/ui/selmenu.cpp:2595
 msgid "incorrect length"
 msgstr "nesprávna dĺžka"
 
-#: src/frontend/mame/ui/selmenu.cpp:2589
+#: src/frontend/mame/ui/selmenu.cpp:2598
 msgid "not found"
 msgstr "nenájdený"
 
-#: src/frontend/mame/ui/selmenu.cpp:2600
+#: src/frontend/mame/ui/selmenu.cpp:2609
 #, c-format
 msgid "%1$s (%2$s) - %3$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2602
+#: src/frontend/mame/ui/selmenu.cpp:2611
 #, c-format
 msgid "%1$s - %2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2606
+#: src/frontend/mame/ui/selmenu.cpp:2615
 msgid "Press any key to continue."
 msgstr "Pokračujte stlačením ľubovoľného klávesu."
 
-#: src/frontend/mame/ui/selmenu.cpp:2735
+#: src/frontend/mame/ui/selmenu.cpp:2744
 msgid "General Info"
 msgstr "Technické informácie"
 
-#: src/frontend/mame/ui/selmenu.cpp:2887
+#: src/frontend/mame/ui/selmenu.cpp:2896
 #, c-format
 msgid "Romset\t%1$s\n"
 msgstr "Názov ROM súboru\t%1$s\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2888
+#: src/frontend/mame/ui/selmenu.cpp:2897
 #, c-format
 msgid "Year\t%1$s\n"
 msgstr "Rok výroby\t%1$s\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2889
+#: src/frontend/mame/ui/selmenu.cpp:2898
 #, c-format
 msgid "Manufacturer\t%1$s\n"
 msgstr "Výrobca\t%1$s\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2896
+#: src/frontend/mame/ui/selmenu.cpp:2905
 #, c-format
 msgid "Driver is Clone of\t%1$s\n"
 msgstr "Ovládač je klonom\t%1$s\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2901
+#: src/frontend/mame/ui/selmenu.cpp:2910
 msgid "Driver is Parent\t\n"
 msgstr "Ovládač je pôvodný\t\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2905
+#: src/frontend/mame/ui/selmenu.cpp:2914
 msgid "Analog Controls\tYes\n"
 msgstr "Analógové ovládanie\táno\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2907
+#: src/frontend/mame/ui/selmenu.cpp:2916
 msgid "Keyboard Inputs\tYes\n"
 msgstr "Klávesnicový vstup\táno\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2910
+#: src/frontend/mame/ui/selmenu.cpp:2919
 msgid "Overall\tNOT WORKING\n"
 msgstr "Emulácia\tNEFUNKČNÁ\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2912
+#: src/frontend/mame/ui/selmenu.cpp:2921
 msgid "Overall\tUnemulated Protection\n"
 msgstr "Emulácia\tneemulovaná ochrana\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2914
+#: src/frontend/mame/ui/selmenu.cpp:2923
 msgid "Overall\tWorking\n"
 msgstr "Emulácia\tfunkčná\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2917
+#: src/frontend/mame/ui/selmenu.cpp:2926
 msgid "Graphics\tUnimplemented\n"
 msgstr "Grafika\tneimplementovaná\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2919
+#: src/frontend/mame/ui/selmenu.cpp:2928
 msgid "Graphics\tWrong Colors\n"
 msgstr "Grafika\tnesprávne farby\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2921
+#: src/frontend/mame/ui/selmenu.cpp:2930
 msgid "Graphics\tImperfect Colors\n"
 msgstr "Grafika\tnevierohodné farby\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2923
+#: src/frontend/mame/ui/selmenu.cpp:2932
 msgid "Graphics\tImperfect\n"
 msgstr "Grafika\tnedostatočná\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2925
+#: src/frontend/mame/ui/selmenu.cpp:2934
 msgid "Graphics\tOK\n"
 msgstr "Grafika\tfunkčná\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2928
+#: src/frontend/mame/ui/selmenu.cpp:2937
 msgid "Sound\tNone\n"
 msgstr "Zvuk\tžiadny\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2930
+#: src/frontend/mame/ui/selmenu.cpp:2939
 msgid "Sound\tUnimplemented\n"
 msgstr "Zvuk\tneimplementovaný\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2932
+#: src/frontend/mame/ui/selmenu.cpp:2941
 msgid "Sound\tImperfect\n"
 msgstr "Zvuk\tnedostatočný\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2934
+#: src/frontend/mame/ui/selmenu.cpp:2943
 msgid "Sound\tOK\n"
 msgstr "Zvuk\tfunkčný\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2937
+#: src/frontend/mame/ui/selmenu.cpp:2946
 msgid "Capture\tUnimplemented\n"
 msgstr "Capture\tneimplementované\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2939
+#: src/frontend/mame/ui/selmenu.cpp:2948
 msgid "Capture\tImperfect\n"
 msgstr "Capture\tnedostatočné\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2942
+#: src/frontend/mame/ui/selmenu.cpp:2951
 msgid "Camera\tUnimplemented\n"
 msgstr "Kamera\tneimplementovaná\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2944
+#: src/frontend/mame/ui/selmenu.cpp:2953
 msgid "Camera\tImperfect\n"
 msgstr "Kamera\tnedostatočná\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2947
+#: src/frontend/mame/ui/selmenu.cpp:2956
 msgid "Microphone\tUnimplemented\n"
 msgstr "Mikrofón\tneimplementovaný\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2949
+#: src/frontend/mame/ui/selmenu.cpp:2958
 msgid "Microphone\tImperfect\n"
 msgstr "Mikrofón\tnedostatočný\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2952
+#: src/frontend/mame/ui/selmenu.cpp:2961
 msgid "Controls\tUnimplemented\n"
 msgstr "Ovládanie\tneimplementované\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2954
+#: src/frontend/mame/ui/selmenu.cpp:2963
 msgid "Controls\tImperfect\n"
 msgstr "Ovládanie\tnedostatočné\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2957
+#: src/frontend/mame/ui/selmenu.cpp:2966
 msgid "Keyboard\tUnimplemented\n"
 msgstr "Klávesnica\tneimplementovaná\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2959
+#: src/frontend/mame/ui/selmenu.cpp:2968
 msgid "Keyboard\tImperfect\n"
 msgstr "Klávesnica\tnedostatočná\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2962
+#: src/frontend/mame/ui/selmenu.cpp:2971
 msgid "Mouse\tUnimplemented\n"
 msgstr "Myš\tneimplementovaná\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2964
+#: src/frontend/mame/ui/selmenu.cpp:2973
 msgid "Mouse\tImperfect\n"
 msgstr "Myš\tnedostatočná\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2967
+#: src/frontend/mame/ui/selmenu.cpp:2976
 msgid "Media\tUnimplemented\n"
 msgstr "Médiá\tneimplementované\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2969
+#: src/frontend/mame/ui/selmenu.cpp:2978
 msgid "Media\tImperfect\n"
 msgstr "Médiá\tnedostatočné\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2972
+#: src/frontend/mame/ui/selmenu.cpp:2981
 msgid "Disk\tUnimplemented\n"
 msgstr "Disk\tneimplementovaný\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2974
+#: src/frontend/mame/ui/selmenu.cpp:2983
 msgid "Disk\tImperfect\n"
 msgstr "Disk\tnedostatočný\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2977
+#: src/frontend/mame/ui/selmenu.cpp:2986
 msgid "Printer\tUnimplemented\n"
 msgstr "Tlačiareň\tneimplementovaná\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2979
+#: src/frontend/mame/ui/selmenu.cpp:2988
 msgid "Printer\tImperfect\n"
 msgstr "Tlačiareň\tnedostatočná\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2982
+#: src/frontend/mame/ui/selmenu.cpp:2991
 msgid "Mag. Tape\tUnimplemented\n"
 msgstr "Magnetická páska\tneimplementovaná\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2984
+#: src/frontend/mame/ui/selmenu.cpp:2993
 msgid "Mag. Tape\tImperfect\n"
 msgstr "Magnetická páska\tnedostatočná\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2987
+#: src/frontend/mame/ui/selmenu.cpp:2996
 msgid "Punch Tape\tUnimplemented\n"
 msgstr "Dierny štítok\tneimplementovaný\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2989
+#: src/frontend/mame/ui/selmenu.cpp:2998
 msgid "Punch Tape\tImperfect\n"
 msgstr "Dierny štítok\tnedostatočný\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2992
+#: src/frontend/mame/ui/selmenu.cpp:3001
 msgid "Mag. Drum\tUnimplemented\n"
 msgstr "Magnetický bubon\tneimplementovaný\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2994
+#: src/frontend/mame/ui/selmenu.cpp:3003
 msgid "Mag. Drum\tImperfect\n"
 msgstr "Magnetický bubon\tnedostatočný\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2997
+#: src/frontend/mame/ui/selmenu.cpp:3006
 msgid "(EP)ROM\tUnimplemented\n"
 msgstr "(EP)ROM\tneimplementovaná\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2999
+#: src/frontend/mame/ui/selmenu.cpp:3008
 msgid "(EP)ROM\tImperfect\n"
 msgstr "(EP)ROM\tnedostatočná\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3002
+#: src/frontend/mame/ui/selmenu.cpp:3011
 msgid "Communications\tUnimplemented\n"
 msgstr "Komunikačné zariadenie\tneimplementované\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3004
+#: src/frontend/mame/ui/selmenu.cpp:3013
 msgid "Communications\tImperfect\n"
 msgstr "Komunikačné zariadenie\tnedostatočné\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3007
+#: src/frontend/mame/ui/selmenu.cpp:3016
 msgid "LAN\tUnimplemented\n"
 msgstr "LAN\tneimplementovaná\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3009
+#: src/frontend/mame/ui/selmenu.cpp:3018
 msgid "LAN\tImperfect\n"
 msgstr "LAN\tnedostatočná\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3012
+#: src/frontend/mame/ui/selmenu.cpp:3021
 msgid "WAN\tUnimplemented\n"
 msgstr "WAN\tneimplementovaná\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3014
+#: src/frontend/mame/ui/selmenu.cpp:3023
 msgid "WAN\tImperfect\n"
 msgstr "WAN\tnedostatočná\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3017
+#: src/frontend/mame/ui/selmenu.cpp:3026
 msgid "Timing\tUnimplemented\n"
 msgstr "Časovanie\tneimplementované\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3019
+#: src/frontend/mame/ui/selmenu.cpp:3028
 msgid "Timing\tImperfect\n"
 msgstr "Časovanie\tnedostatočné\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3021
+#: src/frontend/mame/ui/selmenu.cpp:3030
 msgid "Mechanical Machine\tYes\n"
 msgstr "Mechanické zariadenie\táno\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3021
+#: src/frontend/mame/ui/selmenu.cpp:3030
 msgid "Mechanical Machine\tNo\n"
 msgstr "Mechanické zariadenie\tnie\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3022
+#: src/frontend/mame/ui/selmenu.cpp:3031
 msgid "Requires Artwork\tYes\n"
 msgstr "Vyžaduje artwork\táno\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3022
+#: src/frontend/mame/ui/selmenu.cpp:3031
 msgid "Requires Artwork\tNo\n"
 msgstr "Vyžaduje artwork\tnie\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3023
+#: src/frontend/mame/ui/selmenu.cpp:3032
 msgid "Requires Clickable Artwork\tYes\n"
 msgstr "Vyžaduje klikateľný artwork\táno\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3023
+#: src/frontend/mame/ui/selmenu.cpp:3032
 msgid "Requires Clickable Artwork\tNo\n"
 msgstr "Vyžaduje klikateľný artwork\tnie\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3025
+#: src/frontend/mame/ui/selmenu.cpp:3034
 msgid "Support Cocktail\tNo\n"
 msgstr "Podporuje režim Cocktail\tnie\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3026
+#: src/frontend/mame/ui/selmenu.cpp:3035
 msgid "Driver is BIOS\tYes\n"
 msgstr "Ovládač je BIOS\táno\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3026
+#: src/frontend/mame/ui/selmenu.cpp:3035
 msgid "Driver is BIOS\tNo\n"
 msgstr "Ovládač je BIOS\tnie\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3027
+#: src/frontend/mame/ui/selmenu.cpp:3036
 msgid "Support Save\tYes\n"
 msgstr "Ukladanie stavu do súboru\táno\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3027
+#: src/frontend/mame/ui/selmenu.cpp:3036
 msgid "Support Save\tNo\n"
 msgstr "Ukladanie stavu do súboru\tnie\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3028
+#: src/frontend/mame/ui/selmenu.cpp:3037
 msgid "Screen Orientation\tVertical\n"
 msgstr "Orientácia obrazovky\tzvislá\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3028
+#: src/frontend/mame/ui/selmenu.cpp:3037
 msgid "Screen Orientation\tHorizontal\n"
 msgstr "Orientácia obrazovky\tvodorovná\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3038
+#: src/frontend/mame/ui/selmenu.cpp:3047
 msgid "Requires CHD\tYes\n"
 msgstr "Vyžaduje CHD\táno\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3038
+#: src/frontend/mame/ui/selmenu.cpp:3047
 msgid "Requires CHD\tNo\n"
 msgstr "Vyžaduje CHD\tnie\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3051
-msgid "ROM Audit Result\tOK\n"
+#: src/frontend/mame/ui/selmenu.cpp:3060
+msgid "Media Audit Result\tOK\n"
 msgstr "Výsledok auditu médií\tplatné\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3053
-msgid "ROM Audit Result\tBAD\n"
+#: src/frontend/mame/ui/selmenu.cpp:3062
+msgid "Media Audit Result\tBAD\n"
 msgstr "Výsledok auditu médií\tNEPLATNÉ\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3056
+#: src/frontend/mame/ui/selmenu.cpp:3065
 msgid "Samples Audit Result\tNone Needed\n"
 msgstr "Výsledok auditu samplov\tnie sú vyžadované\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3058
+#: src/frontend/mame/ui/selmenu.cpp:3067
 msgid "Samples Audit Result\tOK\n"
 msgstr "Výsledok auditu samplov\tplatné\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3060
+#: src/frontend/mame/ui/selmenu.cpp:3069
 msgid "Samples Audit Result\tBAD\n"
 msgstr "Výsledok auditu samplov\tNEPLATNÉ\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3064
+#: src/frontend/mame/ui/selmenu.cpp:3073
 msgid ""
-"ROM Audit \tDisabled\n"
-"Samples Audit \tDisabled\n"
+"Media Audit\tDisabled\n"
+"Samples Audit\tDisabled\n"
 msgstr ""
 "Audit médií\tvypnutý\n"
 "Audit samplov\tvypnutý\n"
 
-#: src/frontend/mame/ui/sndmenu.cpp:150
+#: src/frontend/mame/ui/sndmenu.cpp:146
 msgid "Sound"
 msgstr "Zvuk"
 
-#: src/frontend/mame/ui/sndmenu.cpp:151
+#: src/frontend/mame/ui/sndmenu.cpp:147
 msgid "Compressor"
 msgstr "Kompresia"
 
-#: src/frontend/mame/ui/sndmenu.cpp:152
+#: src/frontend/mame/ui/sndmenu.cpp:148
 msgid "Sample Rate"
 msgstr "Vzorkovacia frekvencia"
 
-#: src/frontend/mame/ui/sndmenu.cpp:153
+#: src/frontend/mame/ui/sndmenu.cpp:149
 msgid "Use External Samples"
 msgstr "Použiť externé sample"
 
@@ -3221,21 +3225,21 @@ msgstr ""
 msgid "  Screen '%1$s': Vector\n"
 msgstr "  Obrazovka '%1$s': Vektorová\n"
 
-#: src/frontend/mame/ui/devopt.cpp:132
+#: src/frontend/mame/ui/devopt.cpp:135
 #, c-format
 msgid "  Screen '%1$s': %2$d × %3$d (V) %4$s Hz\n"
 msgstr "  Obrazovka '%1$s': %2$d × %3$d (V) %4$s Hz\n"
 
-#: src/frontend/mame/ui/devopt.cpp:133
+#: src/frontend/mame/ui/devopt.cpp:136
 #, c-format
 msgid "  Screen '%1$s': %2$d × %3$d (H) %4$s Hz\n"
 msgstr "  Obrazovka '%1$s': %2$d × %3$d (H) %4$s Hz\n"
 
-#: src/frontend/mame/ui/devopt.cpp:147
+#: src/frontend/mame/ui/devopt.cpp:150
 msgid "* Sound:\n"
 msgstr "* Zvuk:\n"
 
-#: src/frontend/mame/ui/devopt.cpp:211
+#: src/frontend/mame/ui/devopt.cpp:214
 #, c-format
 msgid ""
 "* BIOS settings:\n"
@@ -3244,491 +3248,661 @@ msgstr ""
 "* Nastavenia BIOSu:\n"
 "  %1$d voľby    [pôvodná: %2$s]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:255 src/frontend/mame/ui/devopt.cpp:271
-#: src/frontend/mame/ui/devopt.cpp:332
+#: src/frontend/mame/ui/devopt.cpp:258 src/frontend/mame/ui/devopt.cpp:274
+#: src/frontend/mame/ui/devopt.cpp:335
 #, c-format
 msgid "  %1$s    [default: %2$s]\n"
 msgstr "  %1$s    [pôvodné: %2$s]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:260 src/frontend/mame/ui/devopt.cpp:276
+#: src/frontend/mame/ui/devopt.cpp:263 src/frontend/mame/ui/devopt.cpp:279
 #, c-format
 msgid "  %1$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:282
+#: src/frontend/mame/ui/devopt.cpp:285
 msgid "* DIP switch settings:\n"
 msgstr "* Nastavenia DIP prepínača:\n"
 
-#: src/frontend/mame/ui/devopt.cpp:287
+#: src/frontend/mame/ui/devopt.cpp:290
 msgid "* Configuration settings:\n"
 msgstr "* Nastavenia konfigurácie:\n"
 
-#: src/frontend/mame/ui/devopt.cpp:291
+#: src/frontend/mame/ui/devopt.cpp:294
 msgid "* Input device(s):\n"
 msgstr "* Vstupné zariadenie(-a):\n"
 
-#: src/frontend/mame/ui/devopt.cpp:293
+#: src/frontend/mame/ui/devopt.cpp:296
 #, c-format
 msgid "  User inputs    [%1$d inputs]\n"
 msgstr "  Používateľské vstupy    [%1$d vstupov]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:295
+#: src/frontend/mame/ui/devopt.cpp:298
 #, c-format
 msgid "  Mahjong inputs    [%1$d inputs]\n"
 msgstr "  Mahjong vstupy    [%1$d vstupov]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:297
+#: src/frontend/mame/ui/devopt.cpp:300
 #, c-format
 msgid "  Hanafuda inputs    [%1$d inputs]\n"
 msgstr "  Hanafuda vstupy    [%1$d vstupov]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:299
+#: src/frontend/mame/ui/devopt.cpp:302
 #, c-format
 msgid "  Gambling inputs    [%1$d inputs]\n"
 msgstr "  Gambling vstupy    [%1$d vstupov]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:301
+#: src/frontend/mame/ui/devopt.cpp:304
 #, c-format
 msgid "  Analog inputs    [%1$d inputs]\n"
 msgstr "  Analógové vstupy    [%1$d vstupov]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:303
+#: src/frontend/mame/ui/devopt.cpp:306
 #, c-format
 msgid "  Adjuster inputs    [%1$d inputs]\n"
 msgstr "  Dolaďovacie vstupy    [%1$d vstupov]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:305
+#: src/frontend/mame/ui/devopt.cpp:308
 #, c-format
 msgid "  Keypad inputs    [%1$d inputs]\n"
 msgstr "  Keypad vstupy    [%1$d vstupov]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:307
+#: src/frontend/mame/ui/devopt.cpp:310
 #, c-format
 msgid "  Keyboard inputs    [%1$d inputs]\n"
 msgstr "  Klavesnicové vstupy    [%1$d vstupov]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:312
+#: src/frontend/mame/ui/devopt.cpp:315
 msgid "* Media Options:\n"
 msgstr "* Nastavenia médií:\n"
 
-#: src/frontend/mame/ui/devopt.cpp:317
+#: src/frontend/mame/ui/devopt.cpp:320
 #, c-format
 msgid "  %1$s    [tag: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:327
+#: src/frontend/mame/ui/devopt.cpp:330
 msgid "* Slot Options:\n"
 msgstr "* Nastavenia slotov:\n"
 
-#: src/frontend/mame/ui/devopt.cpp:341
+#: src/frontend/mame/ui/devopt.cpp:344
 msgid "[None]\n"
 msgstr "[Žiadne]\n"
 
-#: src/emu/render.cpp:1847
+#: src/emu/render.cpp:1796
 #, c-format
 msgctxt "view-name"
 msgid "Screen %1$u Standard (%2$u:%3$u)"
 msgstr "Obrazovka č. %1$u - štandard (%2$u:%3$u)"
 
-#: src/emu/render.cpp:1873
+#: src/emu/render.cpp:1822
 #, c-format
 msgctxt "view-name"
 msgid "Screen %1$u Pixel Aspect (%2$u:%3$u)"
 msgstr "Obrazovka č. %1$u - Pixel Aspect (%2$u:%3$u)"
 
-#: src/emu/render.cpp:1895 src/emu/render.cpp:2030
+#: src/emu/render.cpp:1844 src/emu/render.cpp:1979
 msgctxt "view-name"
 msgid "Cocktail"
 msgstr "Režim Cocktail"
 
-#: src/emu/render.cpp:2015
+#: src/emu/render.cpp:1964
 msgctxt "view-name"
 msgid "Left-to-Right"
 msgstr "Zľava doprava"
 
-#: src/emu/render.cpp:2016
+#: src/emu/render.cpp:1965
 msgctxt "view-name"
 msgid "Left-to-Right (Gapless)"
 msgstr "Zľava doprava (gapless)"
 
-#: src/emu/render.cpp:2017
+#: src/emu/render.cpp:1966
 msgctxt "view-name"
 msgid "Top-to-Bottom"
 msgstr "Zhora nadol"
 
-#: src/emu/render.cpp:2018
+#: src/emu/render.cpp:1967
 msgctxt "view-name"
 msgid "Top-to-Bottom (Gapless)"
 msgstr "Zhora nadol (gapless)"
 
-#: src/emu/render.cpp:2069
+#: src/emu/render.cpp:2018
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Left-to-Right, Top-to-Bottom"
 msgstr "%1$u×%2$u Zľava doprava, zhora nadol"
 
-#: src/emu/render.cpp:2078
+#: src/emu/render.cpp:2027
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Left-to-Right, Top-to-Bottom (Gapless)"
 msgstr "%1$u×%2$u Zľava doprava, zhora nadol (gapless)"
 
-#: src/emu/render.cpp:2087
+#: src/emu/render.cpp:2036
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Top-to-Bottom, Left-to-Right"
 msgstr "%1$u×%2$u Zhora nadol, zľava doprava"
 
-#: src/emu/render.cpp:2096
+#: src/emu/render.cpp:2045
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Top-to-Bottom, Left-to-Right (Gapless)"
 msgstr "%1$u×%2$u Zhora nadol, zľava doprava (gapless)"
 
-#: src/emu/inpttype.ipp:22
+#: src/emu/ioport.cpp:332
+#, c-format
+msgctxt "input-name"
+msgid "P%1$u"
+msgstr "Hráč %1$u"
+
+#: src/emu/ioport.cpp:1924
+msgctxt "input-name"
+msgid "???"
+msgstr ""
+
+#: src/emu/inpttype.ipp:22 src/emu/inpttype.ipp:140 src/emu/inpttype.ipp:221
+#: src/emu/inpttype.ipp:255 src/emu/inpttype.ipp:289 src/emu/inpttype.ipp:323
+#: src/emu/inpttype.ipp:357 src/emu/inpttype.ipp:391 src/emu/inpttype.ipp:425
+#: src/emu/inpttype.ipp:459
+#, c-format
+msgctxt "input-name"
+msgid "%p Up"
+msgstr "%p Hore"
+
+#: src/emu/inpttype.ipp:23 src/emu/inpttype.ipp:141 src/emu/inpttype.ipp:222
+#: src/emu/inpttype.ipp:256 src/emu/inpttype.ipp:290 src/emu/inpttype.ipp:324
+#: src/emu/inpttype.ipp:358 src/emu/inpttype.ipp:392 src/emu/inpttype.ipp:426
+#: src/emu/inpttype.ipp:460
+#, c-format
+msgctxt "input-name"
+msgid "%p Down"
+msgstr "%p Dolu"
+
+#: src/emu/inpttype.ipp:24 src/emu/inpttype.ipp:142 src/emu/inpttype.ipp:223
+#: src/emu/inpttype.ipp:257 src/emu/inpttype.ipp:291 src/emu/inpttype.ipp:325
+#: src/emu/inpttype.ipp:359 src/emu/inpttype.ipp:393 src/emu/inpttype.ipp:427
+#: src/emu/inpttype.ipp:461
+#, c-format
+msgctxt "input-name"
+msgid "%p Left"
+msgstr "%p Vľavo"
+
+#: src/emu/inpttype.ipp:25 src/emu/inpttype.ipp:143 src/emu/inpttype.ipp:224
+#: src/emu/inpttype.ipp:258 src/emu/inpttype.ipp:292 src/emu/inpttype.ipp:326
+#: src/emu/inpttype.ipp:360 src/emu/inpttype.ipp:394 src/emu/inpttype.ipp:428
+#: src/emu/inpttype.ipp:462
+#, c-format
+msgctxt "input-name"
+msgid "%p Right"
+msgstr "%p Vpravo"
+
+#: src/emu/inpttype.ipp:26 src/emu/inpttype.ipp:144 src/emu/inpttype.ipp:225
+#: src/emu/inpttype.ipp:259 src/emu/inpttype.ipp:293 src/emu/inpttype.ipp:327
+#: src/emu/inpttype.ipp:361 src/emu/inpttype.ipp:395 src/emu/inpttype.ipp:429
+#: src/emu/inpttype.ipp:463
+#, c-format
+msgctxt "input-name"
+msgid "%p Right Stick/Up"
+msgstr "%p Pravá páka/Hore"
+
+#: src/emu/inpttype.ipp:27 src/emu/inpttype.ipp:145 src/emu/inpttype.ipp:226
+#: src/emu/inpttype.ipp:260 src/emu/inpttype.ipp:294 src/emu/inpttype.ipp:328
+#: src/emu/inpttype.ipp:362 src/emu/inpttype.ipp:396 src/emu/inpttype.ipp:430
+#: src/emu/inpttype.ipp:464
+#, c-format
+msgctxt "input-name"
+msgid "%p Right Stick/Down"
+msgstr "%p Pravá páka/Dolu"
+
+#: src/emu/inpttype.ipp:28 src/emu/inpttype.ipp:146 src/emu/inpttype.ipp:227
+#: src/emu/inpttype.ipp:261 src/emu/inpttype.ipp:295 src/emu/inpttype.ipp:329
+#: src/emu/inpttype.ipp:363 src/emu/inpttype.ipp:397 src/emu/inpttype.ipp:431
+#: src/emu/inpttype.ipp:465
+#, c-format
+msgctxt "input-name"
+msgid "%p Right Stick/Left"
+msgstr "%p Pravá páka/Vľavo"
+
+#: src/emu/inpttype.ipp:29 src/emu/inpttype.ipp:147 src/emu/inpttype.ipp:228
+#: src/emu/inpttype.ipp:262 src/emu/inpttype.ipp:296 src/emu/inpttype.ipp:330
+#: src/emu/inpttype.ipp:364 src/emu/inpttype.ipp:398 src/emu/inpttype.ipp:432
+#: src/emu/inpttype.ipp:466
+#, c-format
+msgctxt "input-name"
+msgid "%p Right Stick/Right"
+msgstr "%p Pravá páka/Vpravo"
+
+#: src/emu/inpttype.ipp:30 src/emu/inpttype.ipp:148 src/emu/inpttype.ipp:229
+#: src/emu/inpttype.ipp:263 src/emu/inpttype.ipp:297 src/emu/inpttype.ipp:331
+#: src/emu/inpttype.ipp:365 src/emu/inpttype.ipp:399 src/emu/inpttype.ipp:433
+#: src/emu/inpttype.ipp:467
+#, c-format
+msgctxt "input-name"
+msgid "%p Left Stick/Up"
+msgstr "%p Ľavá páka/Hore"
+
+#: src/emu/inpttype.ipp:31 src/emu/inpttype.ipp:149 src/emu/inpttype.ipp:230
+#: src/emu/inpttype.ipp:264 src/emu/inpttype.ipp:298 src/emu/inpttype.ipp:332
+#: src/emu/inpttype.ipp:366 src/emu/inpttype.ipp:400 src/emu/inpttype.ipp:434
+#: src/emu/inpttype.ipp:468
+#, c-format
+msgctxt "input-name"
+msgid "%p Left Stick/Down"
+msgstr "%p Ľavá páka/Dolu"
+
+#: src/emu/inpttype.ipp:32 src/emu/inpttype.ipp:150 src/emu/inpttype.ipp:231
+#: src/emu/inpttype.ipp:265 src/emu/inpttype.ipp:299 src/emu/inpttype.ipp:333
+#: src/emu/inpttype.ipp:367 src/emu/inpttype.ipp:401 src/emu/inpttype.ipp:435
+#: src/emu/inpttype.ipp:469
+#, c-format
+msgctxt "input-name"
+msgid "%p Left Stick/Left"
+msgstr "%p Ľavá páka/Vľavo"
+
+#: src/emu/inpttype.ipp:33 src/emu/inpttype.ipp:151 src/emu/inpttype.ipp:232
+#: src/emu/inpttype.ipp:266 src/emu/inpttype.ipp:300 src/emu/inpttype.ipp:334
+#: src/emu/inpttype.ipp:368 src/emu/inpttype.ipp:402 src/emu/inpttype.ipp:436
+#: src/emu/inpttype.ipp:470
+#, c-format
+msgctxt "input-name"
+msgid "%p Left Stick/Right"
+msgstr "%p Ľavá páka/Vpravo"
+
+#: src/emu/inpttype.ipp:34 src/emu/inpttype.ipp:152 src/emu/inpttype.ipp:233
+#: src/emu/inpttype.ipp:267 src/emu/inpttype.ipp:301 src/emu/inpttype.ipp:335
+#: src/emu/inpttype.ipp:369 src/emu/inpttype.ipp:403 src/emu/inpttype.ipp:437
+#: src/emu/inpttype.ipp:471
+#, c-format
+msgctxt "input-name"
+msgid "%p Button 1"
+msgstr "%p Tlačidlo 1"
+
+#: src/emu/inpttype.ipp:35 src/emu/inpttype.ipp:153 src/emu/inpttype.ipp:234
+#: src/emu/inpttype.ipp:268 src/emu/inpttype.ipp:302 src/emu/inpttype.ipp:336
+#: src/emu/inpttype.ipp:370 src/emu/inpttype.ipp:404 src/emu/inpttype.ipp:438
+#: src/emu/inpttype.ipp:472
+#, c-format
+msgctxt "input-name"
+msgid "%p Button 2"
+msgstr "%p Tlačidlo 2"
+
+#: src/emu/inpttype.ipp:36 src/emu/inpttype.ipp:154 src/emu/inpttype.ipp:235
+#: src/emu/inpttype.ipp:269 src/emu/inpttype.ipp:303 src/emu/inpttype.ipp:337
+#: src/emu/inpttype.ipp:371 src/emu/inpttype.ipp:405 src/emu/inpttype.ipp:439
+#: src/emu/inpttype.ipp:473
+#, c-format
+msgctxt "input-name"
+msgid "%p Button 3"
+msgstr "%p Tlačidlo 3"
+
+#: src/emu/inpttype.ipp:37 src/emu/inpttype.ipp:155 src/emu/inpttype.ipp:236
+#: src/emu/inpttype.ipp:270 src/emu/inpttype.ipp:304 src/emu/inpttype.ipp:338
+#: src/emu/inpttype.ipp:372 src/emu/inpttype.ipp:406 src/emu/inpttype.ipp:440
+#: src/emu/inpttype.ipp:474
+#, c-format
+msgctxt "input-name"
+msgid "%p Button 4"
+msgstr "%p Tlačidlo 4"
+
+#: src/emu/inpttype.ipp:38 src/emu/inpttype.ipp:156 src/emu/inpttype.ipp:237
+#: src/emu/inpttype.ipp:271 src/emu/inpttype.ipp:305 src/emu/inpttype.ipp:339
+#: src/emu/inpttype.ipp:373 src/emu/inpttype.ipp:407 src/emu/inpttype.ipp:441
+#: src/emu/inpttype.ipp:475
+#, c-format
+msgctxt "input-name"
+msgid "%p Button 5"
+msgstr "%p Tlačidlo 5"
+
+#: src/emu/inpttype.ipp:39 src/emu/inpttype.ipp:157 src/emu/inpttype.ipp:238
+#: src/emu/inpttype.ipp:272 src/emu/inpttype.ipp:306 src/emu/inpttype.ipp:340
+#: src/emu/inpttype.ipp:374 src/emu/inpttype.ipp:408 src/emu/inpttype.ipp:442
+#: src/emu/inpttype.ipp:476
+#, c-format
+msgctxt "input-name"
+msgid "%p Button 6"
+msgstr "%p Tlačidlo 6"
+
+#: src/emu/inpttype.ipp:40 src/emu/inpttype.ipp:158 src/emu/inpttype.ipp:239
+#: src/emu/inpttype.ipp:273 src/emu/inpttype.ipp:307 src/emu/inpttype.ipp:341
+#: src/emu/inpttype.ipp:375 src/emu/inpttype.ipp:409 src/emu/inpttype.ipp:443
+#: src/emu/inpttype.ipp:477
+#, c-format
+msgctxt "input-name"
+msgid "%p Button 7"
+msgstr "%p Tlačidlo 7"
+
+#: src/emu/inpttype.ipp:41 src/emu/inpttype.ipp:159 src/emu/inpttype.ipp:240
+#: src/emu/inpttype.ipp:274 src/emu/inpttype.ipp:308 src/emu/inpttype.ipp:342
+#: src/emu/inpttype.ipp:376 src/emu/inpttype.ipp:410 src/emu/inpttype.ipp:444
+#: src/emu/inpttype.ipp:478
+#, c-format
+msgctxt "input-name"
+msgid "%p Button 8"
+msgstr "%p Tlačidlo 8"
+
+#: src/emu/inpttype.ipp:42 src/emu/inpttype.ipp:160 src/emu/inpttype.ipp:241
+#: src/emu/inpttype.ipp:275 src/emu/inpttype.ipp:309 src/emu/inpttype.ipp:343
+#: src/emu/inpttype.ipp:377 src/emu/inpttype.ipp:411 src/emu/inpttype.ipp:445
+#: src/emu/inpttype.ipp:479
+#, c-format
+msgctxt "input-name"
+msgid "%p Button 9"
+msgstr "%p Tlačidlo 9"
+
+#: src/emu/inpttype.ipp:43 src/emu/inpttype.ipp:161 src/emu/inpttype.ipp:242
+#: src/emu/inpttype.ipp:276 src/emu/inpttype.ipp:310 src/emu/inpttype.ipp:344
+#: src/emu/inpttype.ipp:378 src/emu/inpttype.ipp:412 src/emu/inpttype.ipp:446
+#: src/emu/inpttype.ipp:480
+#, c-format
+msgctxt "input-name"
+msgid "%p Button 10"
+msgstr "%p Tlačidlo 10"
+
+#: src/emu/inpttype.ipp:44 src/emu/inpttype.ipp:162 src/emu/inpttype.ipp:243
+#: src/emu/inpttype.ipp:277 src/emu/inpttype.ipp:311 src/emu/inpttype.ipp:345
+#: src/emu/inpttype.ipp:379 src/emu/inpttype.ipp:413 src/emu/inpttype.ipp:447
+#: src/emu/inpttype.ipp:481
+#, c-format
+msgctxt "input-name"
+msgid "%p Button 11"
+msgstr "%p Tlačidlo 11"
+
+#: src/emu/inpttype.ipp:45 src/emu/inpttype.ipp:163 src/emu/inpttype.ipp:244
+#: src/emu/inpttype.ipp:278 src/emu/inpttype.ipp:312 src/emu/inpttype.ipp:346
+#: src/emu/inpttype.ipp:380 src/emu/inpttype.ipp:414 src/emu/inpttype.ipp:448
+#: src/emu/inpttype.ipp:482
+#, c-format
 msgctxt "input-name"
-msgid "P1 Up"
-msgstr "Hráč 1 Hore"
+msgid "%p Button 12"
+msgstr "%p Tlačidlo 12"
 
-#: src/emu/inpttype.ipp:23
+#: src/emu/inpttype.ipp:46 src/emu/inpttype.ipp:164 src/emu/inpttype.ipp:245
+#: src/emu/inpttype.ipp:279 src/emu/inpttype.ipp:313 src/emu/inpttype.ipp:347
+#: src/emu/inpttype.ipp:381 src/emu/inpttype.ipp:415 src/emu/inpttype.ipp:449
+#: src/emu/inpttype.ipp:483
+#, c-format
 msgctxt "input-name"
-msgid "P1 Down"
-msgstr "Hráč 1 Dolu"
+msgid "%p Button 13"
+msgstr "%p Tlačidlo 13"
 
-#: src/emu/inpttype.ipp:24
+#: src/emu/inpttype.ipp:47 src/emu/inpttype.ipp:165 src/emu/inpttype.ipp:246
+#: src/emu/inpttype.ipp:280 src/emu/inpttype.ipp:314 src/emu/inpttype.ipp:348
+#: src/emu/inpttype.ipp:382 src/emu/inpttype.ipp:416 src/emu/inpttype.ipp:450
+#: src/emu/inpttype.ipp:484
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left"
-msgstr "Hráč 1 Vľavo"
+msgid "%p Button 14"
+msgstr "%p Tlačidlo 14"
 
-#: src/emu/inpttype.ipp:25
+#: src/emu/inpttype.ipp:48 src/emu/inpttype.ipp:166 src/emu/inpttype.ipp:247
+#: src/emu/inpttype.ipp:281 src/emu/inpttype.ipp:315 src/emu/inpttype.ipp:349
+#: src/emu/inpttype.ipp:383 src/emu/inpttype.ipp:417 src/emu/inpttype.ipp:451
+#: src/emu/inpttype.ipp:485
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right"
-msgstr "Hráč 1 Vpravo"
+msgid "%p Button 15"
+msgstr "%p Tlačidlo 15"
 
-#: src/emu/inpttype.ipp:26
+#: src/emu/inpttype.ipp:49 src/emu/inpttype.ipp:167 src/emu/inpttype.ipp:248
+#: src/emu/inpttype.ipp:282 src/emu/inpttype.ipp:316 src/emu/inpttype.ipp:350
+#: src/emu/inpttype.ipp:384 src/emu/inpttype.ipp:418 src/emu/inpttype.ipp:452
+#: src/emu/inpttype.ipp:486
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Up"
-msgstr "Hráč 1 Pravá páka/Hore"
+msgid "%p Button 16"
+msgstr "%p Tlačidlo 16"
 
-#: src/emu/inpttype.ipp:27
+#: src/emu/inpttype.ipp:50 src/emu/inpttype.ipp:168 src/emu/inpttype.ipp:249
+#: src/emu/inpttype.ipp:283 src/emu/inpttype.ipp:317 src/emu/inpttype.ipp:351
+#: src/emu/inpttype.ipp:385 src/emu/inpttype.ipp:419 src/emu/inpttype.ipp:453
+#: src/emu/inpttype.ipp:487
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Down"
-msgstr "Hráč 1 Pravá páka/Dolu"
+msgid "%p Start"
+msgstr "%p Štart"
 
-#: src/emu/inpttype.ipp:28
+#: src/emu/inpttype.ipp:51 src/emu/inpttype.ipp:169 src/emu/inpttype.ipp:250
+#: src/emu/inpttype.ipp:284 src/emu/inpttype.ipp:318 src/emu/inpttype.ipp:352
+#: src/emu/inpttype.ipp:386 src/emu/inpttype.ipp:420 src/emu/inpttype.ipp:454
+#: src/emu/inpttype.ipp:488
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Left"
-msgstr "Hráč 1 Pravá páka/Vľavo"
+msgid "%p Select"
+msgstr ""
 
-#: src/emu/inpttype.ipp:29
+#: src/emu/inpttype.ipp:56 src/emu/inpttype.ipp:174
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Right"
-msgstr "Hráč 1 Pravá páka/Vpravo"
+msgid "%p Mahjong A"
+msgstr ""
 
-#: src/emu/inpttype.ipp:30
+#: src/emu/inpttype.ipp:57 src/emu/inpttype.ipp:175
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Up"
-msgstr "Hráč 1 Ľavá páka/Hore"
+msgid "%p Mahjong B"
+msgstr ""
 
-#: src/emu/inpttype.ipp:31
+#: src/emu/inpttype.ipp:58 src/emu/inpttype.ipp:176
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Down"
-msgstr "Hráč 1 Ľavá páka/Dolu"
+msgid "%p Mahjong C"
+msgstr ""
 
-#: src/emu/inpttype.ipp:32
+#: src/emu/inpttype.ipp:59 src/emu/inpttype.ipp:177
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Left"
-msgstr "Hráč 1 Ľavá páka/Vľavo"
+msgid "%p Mahjong D"
+msgstr ""
 
-#: src/emu/inpttype.ipp:33
+#: src/emu/inpttype.ipp:60 src/emu/inpttype.ipp:178
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Right"
-msgstr "Hráč 1 Ľavá páka/Vpravo"
+msgid "%p Mahjong E"
+msgstr ""
 
-#: src/emu/inpttype.ipp:34
+#: src/emu/inpttype.ipp:61 src/emu/inpttype.ipp:179
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 1"
-msgstr "Hráč 1 Tlačidlo 1"
+msgid "%p Mahjong F"
+msgstr ""
 
-#: src/emu/inpttype.ipp:35
+#: src/emu/inpttype.ipp:62 src/emu/inpttype.ipp:180
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 2"
-msgstr "Hráč 1 Tlačidlo 2"
+msgid "%p Mahjong G"
+msgstr ""
 
-#: src/emu/inpttype.ipp:36
+#: src/emu/inpttype.ipp:63 src/emu/inpttype.ipp:181
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 3"
-msgstr "Hráč 1 Tlačidlo 3"
+msgid "%p Mahjong H"
+msgstr ""
 
-#: src/emu/inpttype.ipp:37
+#: src/emu/inpttype.ipp:64 src/emu/inpttype.ipp:182
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 4"
-msgstr "Hráč 1 Tlačidlo 4"
+msgid "%p Mahjong I"
+msgstr ""
 
-#: src/emu/inpttype.ipp:38
+#: src/emu/inpttype.ipp:65 src/emu/inpttype.ipp:183
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 5"
-msgstr "Hráč 1 Tlačidlo 5"
+msgid "%p Mahjong J"
+msgstr ""
 
-#: src/emu/inpttype.ipp:39
+#: src/emu/inpttype.ipp:66 src/emu/inpttype.ipp:184
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 6"
-msgstr "Hráč 1 Tlačidlo 6"
+msgid "%p Mahjong K"
+msgstr ""
 
-#: src/emu/inpttype.ipp:40
+#: src/emu/inpttype.ipp:67 src/emu/inpttype.ipp:185
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 7"
-msgstr "Hráč 1 Tlačidlo 7"
+msgid "%p Mahjong L"
+msgstr ""
 
-#: src/emu/inpttype.ipp:41
+#: src/emu/inpttype.ipp:68 src/emu/inpttype.ipp:186
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 8"
-msgstr "Hráč 1 Tlačidlo 8"
+msgid "%p Mahjong M"
+msgstr ""
 
-#: src/emu/inpttype.ipp:42
+#: src/emu/inpttype.ipp:69 src/emu/inpttype.ipp:187
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 9"
-msgstr "Hráč 1 Tlačidlo 9"
+msgid "%p Mahjong N"
+msgstr ""
 
-#: src/emu/inpttype.ipp:43
+#: src/emu/inpttype.ipp:70 src/emu/inpttype.ipp:188
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 10"
-msgstr "Hráč 1 Tlačidlo 10"
+msgid "%p Mahjong O"
+msgstr ""
 
-#: src/emu/inpttype.ipp:44
+#: src/emu/inpttype.ipp:71 src/emu/inpttype.ipp:189
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 11"
-msgstr "Hráč 1 Tlačidlo 11"
+msgid "%p Mahjong P"
+msgstr ""
 
-#: src/emu/inpttype.ipp:45
+#: src/emu/inpttype.ipp:72 src/emu/inpttype.ipp:190
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 12"
-msgstr "Hráč 1 Tlačidlo 12"
+msgid "%p Mahjong Q"
+msgstr ""
 
-#: src/emu/inpttype.ipp:46
+#: src/emu/inpttype.ipp:73 src/emu/inpttype.ipp:191
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 13"
-msgstr "Hráč 1 Tlačidlo 13"
+msgid "%p Mahjong Kan"
+msgstr ""
 
-#: src/emu/inpttype.ipp:47
+#: src/emu/inpttype.ipp:74 src/emu/inpttype.ipp:192
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 14"
-msgstr "Hráč 1 Tlačidlo 14"
+msgid "%p Mahjong Pon"
+msgstr ""
 
-#: src/emu/inpttype.ipp:48
+#: src/emu/inpttype.ipp:75 src/emu/inpttype.ipp:193
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 15"
-msgstr "Hráč 1 Tlačidlo 15"
+msgid "%p Mahjong Chi"
+msgstr ""
 
-#: src/emu/inpttype.ipp:49
+#: src/emu/inpttype.ipp:76 src/emu/inpttype.ipp:194
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 16"
-msgstr "Hráč 1 Tlačidlo 16"
+msgid "%p Mahjong Reach"
+msgstr ""
 
-#: src/emu/inpttype.ipp:50
+#: src/emu/inpttype.ipp:77 src/emu/inpttype.ipp:195
+#, c-format
 msgctxt "input-name"
-msgid "P1 Start"
-msgstr "Hráč 1 Štart"
+msgid "%p Mahjong Ron"
+msgstr ""
 
-#: src/emu/inpttype.ipp:51
+#: src/emu/inpttype.ipp:78 src/emu/inpttype.ipp:200
+#, c-format
 msgctxt "input-name"
-msgid "P1 Select"
-msgstr "Hráč 1 Select"
+msgid "%p Mahjong Flip Flop"
+msgstr ""
 
-#: src/emu/inpttype.ipp:56
+#: src/emu/inpttype.ipp:79 src/emu/inpttype.ipp:196
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong A"
-msgstr "Hráč 1 Mahjong A"
+msgid "%p Mahjong Bet"
+msgstr ""
 
-#: src/emu/inpttype.ipp:57
+#: src/emu/inpttype.ipp:80 src/emu/inpttype.ipp:198
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong B"
-msgstr "Hráč 1 Mahjong B"
+msgid "%p Mahjong Take Score"
+msgstr ""
 
-#: src/emu/inpttype.ipp:58
+#: src/emu/inpttype.ipp:81 src/emu/inpttype.ipp:199
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong C"
-msgstr "Hráč 1 Mahjong C"
+msgid "%p Mahjong Double Up"
+msgstr ""
 
-#: src/emu/inpttype.ipp:59
+#: src/emu/inpttype.ipp:82 src/emu/inpttype.ipp:201
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong D"
-msgstr "Hráč 1 Mahjong D"
+msgid "%p Mahjong Big"
+msgstr ""
 
-#: src/emu/inpttype.ipp:60
+#: src/emu/inpttype.ipp:83 src/emu/inpttype.ipp:202
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong E"
-msgstr "Hráč 1 Mahjong E"
+msgid "%p Mahjong Small"
+msgstr ""
 
-#: src/emu/inpttype.ipp:61
+#: src/emu/inpttype.ipp:84 src/emu/inpttype.ipp:197
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong F"
-msgstr "Hráč 1 Mahjong F"
+msgid "%p Mahjong Last Chance"
+msgstr ""
 
-#: src/emu/inpttype.ipp:62
+#: src/emu/inpttype.ipp:89 src/emu/inpttype.ipp:207
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong G"
-msgstr "Hráč 1 Mahjong G"
+msgid "%p Hanafuda A/1"
+msgstr ""
 
-#: src/emu/inpttype.ipp:63
+#: src/emu/inpttype.ipp:90 src/emu/inpttype.ipp:208
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong H"
-msgstr "Hráč 1 Mahjong H"
+msgid "%p Hanafuda B/2"
+msgstr ""
 
-#: src/emu/inpttype.ipp:64
+#: src/emu/inpttype.ipp:91 src/emu/inpttype.ipp:209
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong I"
-msgstr "Hráč 1 Mahjong I"
+msgid "%p Hanafuda C/3"
+msgstr ""
 
-#: src/emu/inpttype.ipp:65
+#: src/emu/inpttype.ipp:92 src/emu/inpttype.ipp:210
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong J"
-msgstr "Hráč 1 Mahjong J"
+msgid "%p Hanafuda D/4"
+msgstr ""
 
-#: src/emu/inpttype.ipp:66
+#: src/emu/inpttype.ipp:93 src/emu/inpttype.ipp:211
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong K"
-msgstr "Hráč 1 Mahjong K"
+msgid "%p Hanafuda E/5"
+msgstr ""
 
-#: src/emu/inpttype.ipp:67
+#: src/emu/inpttype.ipp:94 src/emu/inpttype.ipp:212
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong L"
-msgstr "Hráč 1 Mahjong L"
+msgid "%p Hanafuda F/6"
+msgstr ""
 
-#: src/emu/inpttype.ipp:68
+#: src/emu/inpttype.ipp:95 src/emu/inpttype.ipp:213
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong M"
-msgstr "Hráč 1 Mahjong M"
+msgid "%p Hanafuda G/7"
+msgstr ""
 
-#: src/emu/inpttype.ipp:69
+#: src/emu/inpttype.ipp:96 src/emu/inpttype.ipp:214
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong N"
-msgstr "Hráč 1 Mahjong N"
+msgid "%p Hanafuda H/8"
+msgstr ""
 
-#: src/emu/inpttype.ipp:70
+#: src/emu/inpttype.ipp:97 src/emu/inpttype.ipp:215
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong O"
-msgstr "Hráč 1 Mahjong O"
+msgid "%p Hanafuda Yes"
+msgstr ""
 
-#: src/emu/inpttype.ipp:71
+#: src/emu/inpttype.ipp:98 src/emu/inpttype.ipp:216
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong P"
-msgstr "Hráč 1 Mahjong P"
-
-#: src/emu/inpttype.ipp:72
-msgctxt "input-name"
-msgid "P1 Mahjong Q"
-msgstr "Hráč 1 Mahjong Q"
-
-#: src/emu/inpttype.ipp:73
-msgctxt "input-name"
-msgid "P1 Mahjong Kan"
-msgstr "Hráč 1 Mahjong Kan"
-
-#: src/emu/inpttype.ipp:74
-msgctxt "input-name"
-msgid "P1 Mahjong Pon"
-msgstr "Hráč 1 Mahjong Pon"
-
-#: src/emu/inpttype.ipp:75
-msgctxt "input-name"
-msgid "P1 Mahjong Chi"
-msgstr "Hráč 1 Mahjong Chi"
-
-#: src/emu/inpttype.ipp:76
-msgctxt "input-name"
-msgid "P1 Mahjong Reach"
-msgstr "Hráč 1 Mahjong Reach"
-
-#: src/emu/inpttype.ipp:77
-msgctxt "input-name"
-msgid "P1 Mahjong Ron"
-msgstr "Hráč 1 Mahjong Ron"
-
-#: src/emu/inpttype.ipp:78
-msgctxt "input-name"
-msgid "P1 Mahjong Flip Flop"
-msgstr "Hráč 1 Mahjong Flip Flop"
-
-#: src/emu/inpttype.ipp:79
-msgctxt "input-name"
-msgid "P1 Mahjong Bet"
-msgstr "Hráč 1 Mahjong Bet"
-
-#: src/emu/inpttype.ipp:80
-msgctxt "input-name"
-msgid "P1 Mahjong Take Score"
-msgstr "Hráč 1 Mahjong Take Score"
-
-#: src/emu/inpttype.ipp:81
-msgctxt "input-name"
-msgid "P1 Mahjong Double Up"
-msgstr "Hráč 1 Mahjong Double Up"
-
-#: src/emu/inpttype.ipp:82
-msgctxt "input-name"
-msgid "P1 Mahjong Big"
-msgstr "Hráč 1 Mahjong Big"
-
-#: src/emu/inpttype.ipp:83
-msgctxt "input-name"
-msgid "P1 Mahjong Small"
-msgstr "Hráč 1 Mahjong Small"
-
-#: src/emu/inpttype.ipp:84
-msgctxt "input-name"
-msgid "P1 Mahjong Last Chance"
-msgstr "Hráč 1 Mahjong Last Chance"
-
-#: src/emu/inpttype.ipp:89
-msgctxt "input-name"
-msgid "P1 Hanafuda A/1"
-msgstr "Hráč 1 Hanafuda A/1"
-
-#: src/emu/inpttype.ipp:90
-msgctxt "input-name"
-msgid "P1 Hanafuda B/2"
-msgstr "Hráč 1 Hanafuda B/2"
-
-#: src/emu/inpttype.ipp:91
-msgctxt "input-name"
-msgid "P1 Hanafuda C/3"
-msgstr "Hráč 1 Hanafuda C/3"
-
-#: src/emu/inpttype.ipp:92
-msgctxt "input-name"
-msgid "P1 Hanafuda D/4"
-msgstr "Hráč 1 Hanafuda D/4"
-
-#: src/emu/inpttype.ipp:93
-msgctxt "input-name"
-msgid "P1 Hanafuda E/5"
-msgstr "Hráč 1 Hanafuda E/5"
-
-#: src/emu/inpttype.ipp:94
-msgctxt "input-name"
-msgid "P1 Hanafuda F/6"
-msgstr "Hráč 1 Hanafuda F/6"
-
-#: src/emu/inpttype.ipp:95
-msgctxt "input-name"
-msgid "P1 Hanafuda G/7"
-msgstr "Hráč 1 Hanafuda G/7"
-
-#: src/emu/inpttype.ipp:96
-msgctxt "input-name"
-msgid "P1 Hanafuda H/8"
-msgstr "Hráč 1 Hanafuda H/8"
-
-#: src/emu/inpttype.ipp:97
-msgctxt "input-name"
-msgid "P1 Hanafuda Yes"
-msgstr "Hráč 1 Hanafuda Yes"
-
-#: src/emu/inpttype.ipp:98
-msgctxt "input-name"
-msgid "P1 Hanafuda No"
-msgstr "Hráč 1 Hanafuda No"
+msgid "%p Hanafuda No"
+msgstr ""
 
 #: src/emu/inpttype.ipp:103
 msgctxt "input-name"
@@ -3855,1551 +4029,6 @@ msgctxt "input-name"
 msgid "Stop All Reels"
 msgstr ""
 
-#: src/emu/inpttype.ipp:140
-msgctxt "input-name"
-msgid "P2 Up"
-msgstr "Hráč 2 Hore"
-
-#: src/emu/inpttype.ipp:141
-msgctxt "input-name"
-msgid "P2 Down"
-msgstr "Hráč 2 Dolu"
-
-#: src/emu/inpttype.ipp:142
-msgctxt "input-name"
-msgid "P2 Left"
-msgstr "Hráč 2 Vľavo"
-
-#: src/emu/inpttype.ipp:143
-msgctxt "input-name"
-msgid "P2 Right"
-msgstr "Hráč 2 Vpravo"
-
-#: src/emu/inpttype.ipp:144
-msgctxt "input-name"
-msgid "P2 Right Stick/Up"
-msgstr "Hráč 2 Pravá páka/Hore"
-
-#: src/emu/inpttype.ipp:145
-msgctxt "input-name"
-msgid "P2 Right Stick/Down"
-msgstr "Hráč 2 Pravá páka/Dolu"
-
-#: src/emu/inpttype.ipp:146
-msgctxt "input-name"
-msgid "P2 Right Stick/Left"
-msgstr "Hráč 2 Pravá páka/Vľavo"
-
-#: src/emu/inpttype.ipp:147
-msgctxt "input-name"
-msgid "P2 Right Stick/Right"
-msgstr "Hráč 2 Pravá páka/Vpravo"
-
-#: src/emu/inpttype.ipp:148
-msgctxt "input-name"
-msgid "P2 Left Stick/Up"
-msgstr "Hráč 2 Ľavá páka/Hore"
-
-#: src/emu/inpttype.ipp:149
-msgctxt "input-name"
-msgid "P2 Left Stick/Down"
-msgstr "Hráč 2 Ľavá páka/Dolu"
-
-#: src/emu/inpttype.ipp:150
-msgctxt "input-name"
-msgid "P2 Left Stick/Left"
-msgstr "Hráč 2 Ľavá páka/Vľavo"
-
-#: src/emu/inpttype.ipp:151
-msgctxt "input-name"
-msgid "P2 Left Stick/Right"
-msgstr "Hráč 2 Ľavá páka/Vpravo"
-
-#: src/emu/inpttype.ipp:152
-msgctxt "input-name"
-msgid "P2 Button 1"
-msgstr "Hráč 2 Tlačidlo 1"
-
-#: src/emu/inpttype.ipp:153
-msgctxt "input-name"
-msgid "P2 Button 2"
-msgstr "Hráč 2 Tlačidlo 2"
-
-#: src/emu/inpttype.ipp:154
-msgctxt "input-name"
-msgid "P2 Button 3"
-msgstr "Hráč 2 Tlačidlo 3"
-
-#: src/emu/inpttype.ipp:155
-msgctxt "input-name"
-msgid "P2 Button 4"
-msgstr "Hráč 2 Tlačidlo 4"
-
-#: src/emu/inpttype.ipp:156
-msgctxt "input-name"
-msgid "P2 Button 5"
-msgstr "Hráč 2 Tlačidlo 5"
-
-#: src/emu/inpttype.ipp:157
-msgctxt "input-name"
-msgid "P2 Button 6"
-msgstr "Hráč 2 Tlačidlo 6"
-
-#: src/emu/inpttype.ipp:158
-msgctxt "input-name"
-msgid "P2 Button 7"
-msgstr "Hráč 2 Tlačidlo 7"
-
-#: src/emu/inpttype.ipp:159
-msgctxt "input-name"
-msgid "P2 Button 8"
-msgstr "Hráč 2 Tlačidlo 8"
-
-#: src/emu/inpttype.ipp:160
-msgctxt "input-name"
-msgid "P2 Button 9"
-msgstr "Hráč 2 Tlačidlo 9"
-
-#: src/emu/inpttype.ipp:161
-msgctxt "input-name"
-msgid "P2 Button 10"
-msgstr "Hráč 2 Tlačidlo 10"
-
-#: src/emu/inpttype.ipp:162
-msgctxt "input-name"
-msgid "P2 Button 11"
-msgstr "Hráč 2 Tlačidlo 11"
-
-#: src/emu/inpttype.ipp:163
-msgctxt "input-name"
-msgid "P2 Button 12"
-msgstr "Hráč 2 Tlačidlo 12"
-
-#: src/emu/inpttype.ipp:164
-msgctxt "input-name"
-msgid "P2 Button 13"
-msgstr "Hráč 2 Tlačidlo 13"
-
-#: src/emu/inpttype.ipp:165
-msgctxt "input-name"
-msgid "P2 Button 14"
-msgstr "Hráč 2 Tlačidlo 14"
-
-#: src/emu/inpttype.ipp:166
-msgctxt "input-name"
-msgid "P2 Button 15"
-msgstr "Hráč 2 Tlačidlo 15"
-
-#: src/emu/inpttype.ipp:167
-msgctxt "input-name"
-msgid "P2 Button 16"
-msgstr "Hráč 2 Tlačidlo 16"
-
-#: src/emu/inpttype.ipp:168
-msgctxt "input-name"
-msgid "P2 Start"
-msgstr "Hráč 2 Štart"
-
-#: src/emu/inpttype.ipp:169
-msgctxt "input-name"
-msgid "P2 Select"
-msgstr "Hráč 2 Select"
-
-#: src/emu/inpttype.ipp:174
-msgctxt "input-name"
-msgid "P2 Mahjong A"
-msgstr "Hráč 2 Mahjong A"
-
-#: src/emu/inpttype.ipp:175
-msgctxt "input-name"
-msgid "P2 Mahjong B"
-msgstr "Hráč 2 Mahjong B"
-
-#: src/emu/inpttype.ipp:176
-msgctxt "input-name"
-msgid "P2 Mahjong C"
-msgstr "Hráč 2 Mahjong C"
-
-#: src/emu/inpttype.ipp:177
-msgctxt "input-name"
-msgid "P2 Mahjong D"
-msgstr "Hráč 2 Mahjong D"
-
-#: src/emu/inpttype.ipp:178
-msgctxt "input-name"
-msgid "P2 Mahjong E"
-msgstr "Hráč 2 Mahjong E"
-
-#: src/emu/inpttype.ipp:179
-msgctxt "input-name"
-msgid "P2 Mahjong F"
-msgstr "Hráč 2 Mahjong F"
-
-#: src/emu/inpttype.ipp:180
-msgctxt "input-name"
-msgid "P2 Mahjong G"
-msgstr "Hráč 2 Mahjong G"
-
-#: src/emu/inpttype.ipp:181
-msgctxt "input-name"
-msgid "P2 Mahjong H"
-msgstr "Hráč 2 Mahjong H"
-
-#: src/emu/inpttype.ipp:182
-msgctxt "input-name"
-msgid "P2 Mahjong I"
-msgstr "Hráč 2 Mahjong I"
-
-#: src/emu/inpttype.ipp:183
-msgctxt "input-name"
-msgid "P2 Mahjong J"
-msgstr "Hráč 2 Mahjong J"
-
-#: src/emu/inpttype.ipp:184
-msgctxt "input-name"
-msgid "P2 Mahjong K"
-msgstr "Hráč 2 Mahjong K"
-
-#: src/emu/inpttype.ipp:185
-msgctxt "input-name"
-msgid "P2 Mahjong L"
-msgstr "Hráč 2 Mahjong L"
-
-#: src/emu/inpttype.ipp:186
-msgctxt "input-name"
-msgid "P2 Mahjong M"
-msgstr "Hráč 2 Mahjong M"
-
-#: src/emu/inpttype.ipp:187
-msgctxt "input-name"
-msgid "P2 Mahjong N"
-msgstr "Hráč 2 Mahjong N"
-
-#: src/emu/inpttype.ipp:188
-msgctxt "input-name"
-msgid "P2 Mahjong O"
-msgstr "Hráč 2 Mahjong O"
-
-#: src/emu/inpttype.ipp:189
-msgctxt "input-name"
-msgid "P2 Mahjong P"
-msgstr "Hráč 2 Mahjong P"
-
-#: src/emu/inpttype.ipp:190
-msgctxt "input-name"
-msgid "P2 Mahjong Q"
-msgstr "Hráč 2 Mahjong Q"
-
-#: src/emu/inpttype.ipp:191
-msgctxt "input-name"
-msgid "P2 Mahjong Kan"
-msgstr "Hráč 2 Mahjong Kan"
-
-#: src/emu/inpttype.ipp:192
-msgctxt "input-name"
-msgid "P2 Mahjong Pon"
-msgstr "Hráč 2 Mahjong Pon"
-
-#: src/emu/inpttype.ipp:193
-msgctxt "input-name"
-msgid "P2 Mahjong Chi"
-msgstr "Hráč 2 Mahjong Chi"
-
-#: src/emu/inpttype.ipp:194
-msgctxt "input-name"
-msgid "P2 Mahjong Reach"
-msgstr "Hráč 2 Mahjong Reach"
-
-#: src/emu/inpttype.ipp:195
-msgctxt "input-name"
-msgid "P2 Mahjong Ron"
-msgstr "Hráč 2 Mahjong Ron"
-
-#: src/emu/inpttype.ipp:196
-msgctxt "input-name"
-msgid "P2 Mahjong Bet"
-msgstr "Hráč 2 Mahjong Bet"
-
-#: src/emu/inpttype.ipp:197
-msgctxt "input-name"
-msgid "P2 Mahjong Last Chance"
-msgstr "Hráč 2 Mahjong Last Chance"
-
-#: src/emu/inpttype.ipp:198
-msgctxt "input-name"
-msgid "P2 Mahjong Take Score"
-msgstr "Hráč 2 Mahjong Take Score"
-
-#: src/emu/inpttype.ipp:199
-msgctxt "input-name"
-msgid "P2 Mahjong Double Up"
-msgstr "Hráč 2 Mahjong Double Up"
-
-#: src/emu/inpttype.ipp:200
-msgctxt "input-name"
-msgid "P2 Mahjong Flip Flop"
-msgstr "Hráč 2 Mahjong Flip Flop"
-
-#: src/emu/inpttype.ipp:201
-msgctxt "input-name"
-msgid "P2 Mahjong Big"
-msgstr "Hráč 2 Mahjong Big"
-
-#: src/emu/inpttype.ipp:202
-msgctxt "input-name"
-msgid "P2 Mahjong Small"
-msgstr "Hráč 2 Mahjong Small"
-
-#: src/emu/inpttype.ipp:207
-msgctxt "input-name"
-msgid "P2 Hanafuda A/1"
-msgstr "Hráč 2 Hanafuda A/1"
-
-#: src/emu/inpttype.ipp:208
-msgctxt "input-name"
-msgid "P2 Hanafuda B/2"
-msgstr "Hráč 2 Hanafuda B/2"
-
-#: src/emu/inpttype.ipp:209
-msgctxt "input-name"
-msgid "P2 Hanafuda C/3"
-msgstr "Hráč 2 Hanafuda C/3"
-
-#: src/emu/inpttype.ipp:210
-msgctxt "input-name"
-msgid "P2 Hanafuda D/4"
-msgstr "Hráč 2 Hanafuda D/4"
-
-#: src/emu/inpttype.ipp:211
-msgctxt "input-name"
-msgid "P2 Hanafuda E/5"
-msgstr "Hráč 2 Hanafuda E/5"
-
-#: src/emu/inpttype.ipp:212
-msgctxt "input-name"
-msgid "P2 Hanafuda F/6"
-msgstr "Hráč 2 Hanafuda F/6"
-
-#: src/emu/inpttype.ipp:213
-msgctxt "input-name"
-msgid "P2 Hanafuda G/7"
-msgstr "Hráč 2 Hanafuda G/7"
-
-#: src/emu/inpttype.ipp:214
-msgctxt "input-name"
-msgid "P2 Hanafuda H/8"
-msgstr "Hráč 2 Hanafuda H/8"
-
-#: src/emu/inpttype.ipp:215
-msgctxt "input-name"
-msgid "P2 Hanafuda Yes"
-msgstr "Hráč 2 Hanafuda Yes"
-
-#: src/emu/inpttype.ipp:216
-msgctxt "input-name"
-msgid "P2 Hanafuda No"
-msgstr "Hráč 2 Hanafuda No"
-
-#: src/emu/inpttype.ipp:221
-msgctxt "input-name"
-msgid "P3 Up"
-msgstr "Hráč 3 Hore"
-
-#: src/emu/inpttype.ipp:222
-msgctxt "input-name"
-msgid "P3 Down"
-msgstr "Hráč 3 Dolu"
-
-#: src/emu/inpttype.ipp:223
-msgctxt "input-name"
-msgid "P3 Left"
-msgstr "Hráč 3 Vľavo"
-
-#: src/emu/inpttype.ipp:224
-msgctxt "input-name"
-msgid "P3 Right"
-msgstr "Hráč 3 Vpravo"
-
-#: src/emu/inpttype.ipp:225
-msgctxt "input-name"
-msgid "P3 Right Stick/Up"
-msgstr "Hráč 3 Pravá páka/Hore"
-
-#: src/emu/inpttype.ipp:226
-msgctxt "input-name"
-msgid "P3 Right Stick/Down"
-msgstr "Hráč 3 Pravá páka/Dolu"
-
-#: src/emu/inpttype.ipp:227
-msgctxt "input-name"
-msgid "P3 Right Stick/Left"
-msgstr "Hráč 3 Pravá páka/Vľavo"
-
-#: src/emu/inpttype.ipp:228
-msgctxt "input-name"
-msgid "P3 Right Stick/Right"
-msgstr "Hráč 3 Pravá páka/Vpravo"
-
-#: src/emu/inpttype.ipp:229
-msgctxt "input-name"
-msgid "P3 Left Stick/Up"
-msgstr "Hráč 3 Ľavá páka/Hore"
-
-#: src/emu/inpttype.ipp:230
-msgctxt "input-name"
-msgid "P3 Left Stick/Down"
-msgstr "Hráč 3 Ľavá páka/Dolu"
-
-#: src/emu/inpttype.ipp:231
-msgctxt "input-name"
-msgid "P3 Left Stick/Left"
-msgstr "Hráč 3 Ľavá páka/Vľavo"
-
-#: src/emu/inpttype.ipp:232
-msgctxt "input-name"
-msgid "P3 Left Stick/Right"
-msgstr "Hráč 3 Ľavá páka/Vpravo"
-
-#: src/emu/inpttype.ipp:233
-msgctxt "input-name"
-msgid "P3 Button 1"
-msgstr "Hráč 3 Tlačidlo 1"
-
-#: src/emu/inpttype.ipp:234
-msgctxt "input-name"
-msgid "P3 Button 2"
-msgstr "Hráč 3 Tlačidlo 2"
-
-#: src/emu/inpttype.ipp:235
-msgctxt "input-name"
-msgid "P3 Button 3"
-msgstr "Hráč 3 Tlačidlo 3"
-
-#: src/emu/inpttype.ipp:236
-msgctxt "input-name"
-msgid "P3 Button 4"
-msgstr "Hráč 3 Tlačidlo 4"
-
-#: src/emu/inpttype.ipp:237
-msgctxt "input-name"
-msgid "P3 Button 5"
-msgstr "Hráč 3 Tlačidlo 5"
-
-#: src/emu/inpttype.ipp:238
-msgctxt "input-name"
-msgid "P3 Button 6"
-msgstr "Hráč 3 Tlačidlo 6"
-
-#: src/emu/inpttype.ipp:239
-msgctxt "input-name"
-msgid "P3 Button 7"
-msgstr "Hráč 3 Tlačidlo 7"
-
-#: src/emu/inpttype.ipp:240
-msgctxt "input-name"
-msgid "P3 Button 8"
-msgstr "Hráč 3 Tlačidlo 8"
-
-#: src/emu/inpttype.ipp:241
-msgctxt "input-name"
-msgid "P3 Button 9"
-msgstr "Hráč 3 Tlačidlo 9"
-
-#: src/emu/inpttype.ipp:242
-msgctxt "input-name"
-msgid "P3 Button 10"
-msgstr "Hráč 3 Tlačidlo 10"
-
-#: src/emu/inpttype.ipp:243
-msgctxt "input-name"
-msgid "P3 Button 11"
-msgstr "Hráč 3 Tlačidlo 11"
-
-#: src/emu/inpttype.ipp:244
-msgctxt "input-name"
-msgid "P3 Button 12"
-msgstr "Hráč 3 Tlačidlo 12"
-
-#: src/emu/inpttype.ipp:245
-msgctxt "input-name"
-msgid "P3 Button 13"
-msgstr "Hráč 3 Tlačidlo 13"
-
-#: src/emu/inpttype.ipp:246
-msgctxt "input-name"
-msgid "P3 Button 14"
-msgstr "Hráč 3 Tlačidlo 14"
-
-#: src/emu/inpttype.ipp:247
-msgctxt "input-name"
-msgid "P3 Button 15"
-msgstr "Hráč 3 Tlačidlo 15"
-
-#: src/emu/inpttype.ipp:248
-msgctxt "input-name"
-msgid "P3 Button 16"
-msgstr "Hráč 3 Tlačidlo 16"
-
-#: src/emu/inpttype.ipp:249
-msgctxt "input-name"
-msgid "P3 Start"
-msgstr "Hráč 3 Štart"
-
-#: src/emu/inpttype.ipp:250
-msgctxt "input-name"
-msgid "P3 Select"
-msgstr "Hráč 3 Select"
-
-#: src/emu/inpttype.ipp:255
-msgctxt "input-name"
-msgid "P4 Up"
-msgstr "Hráč 4 Hore"
-
-#: src/emu/inpttype.ipp:256
-msgctxt "input-name"
-msgid "P4 Down"
-msgstr "Hráč 4 Dolu"
-
-#: src/emu/inpttype.ipp:257
-msgctxt "input-name"
-msgid "P4 Left"
-msgstr "Hráč 4 Vľavo"
-
-#: src/emu/inpttype.ipp:258
-msgctxt "input-name"
-msgid "P4 Right"
-msgstr "Hráč 4 Vpravo"
-
-#: src/emu/inpttype.ipp:259
-msgctxt "input-name"
-msgid "P4 Right Stick/Up"
-msgstr "Hráč 4 Pravá páka/Hore"
-
-#: src/emu/inpttype.ipp:260
-msgctxt "input-name"
-msgid "P4 Right Stick/Down"
-msgstr "Hráč 4 Pravá páka/Dolu"
-
-#: src/emu/inpttype.ipp:261
-msgctxt "input-name"
-msgid "P4 Right Stick/Left"
-msgstr "Hráč 4 Pravá páka/Vľavo"
-
-#: src/emu/inpttype.ipp:262
-msgctxt "input-name"
-msgid "P4 Right Stick/Right"
-msgstr "Hráč 4 Pravá páka/Vpravo"
-
-#: src/emu/inpttype.ipp:263
-msgctxt "input-name"
-msgid "P4 Left Stick/Up"
-msgstr "Hráč 4 Ľavá páka/Hore"
-
-#: src/emu/inpttype.ipp:264
-msgctxt "input-name"
-msgid "P4 Left Stick/Down"
-msgstr "Hráč 4 Ľavá páka/Dolu"
-
-#: src/emu/inpttype.ipp:265
-msgctxt "input-name"
-msgid "P4 Left Stick/Left"
-msgstr "Hráč 4 Ľavá páka/Vľavo"
-
-#: src/emu/inpttype.ipp:266
-msgctxt "input-name"
-msgid "P4 Left Stick/Right"
-msgstr "Hráč 4 Ľavá páka/Vpravo"
-
-#: src/emu/inpttype.ipp:267
-msgctxt "input-name"
-msgid "P4 Button 1"
-msgstr "Hráč 4 Tlačidlo 1"
-
-#: src/emu/inpttype.ipp:268
-msgctxt "input-name"
-msgid "P4 Button 2"
-msgstr "Hráč 4 Tlačidlo 2"
-
-#: src/emu/inpttype.ipp:269
-msgctxt "input-name"
-msgid "P4 Button 3"
-msgstr "Hráč 4 Tlačidlo 3"
-
-#: src/emu/inpttype.ipp:270
-msgctxt "input-name"
-msgid "P4 Button 4"
-msgstr "Hráč 4 Tlačidlo 4"
-
-#: src/emu/inpttype.ipp:271
-msgctxt "input-name"
-msgid "P4 Button 5"
-msgstr "Hráč 4 Tlačidlo 5"
-
-#: src/emu/inpttype.ipp:272
-msgctxt "input-name"
-msgid "P4 Button 6"
-msgstr "Hráč 4 Tlačidlo 6"
-
-#: src/emu/inpttype.ipp:273
-msgctxt "input-name"
-msgid "P4 Button 7"
-msgstr "Hráč 4 Tlačidlo 7"
-
-#: src/emu/inpttype.ipp:274
-msgctxt "input-name"
-msgid "P4 Button 8"
-msgstr "Hráč 4 Tlačidlo 8"
-
-#: src/emu/inpttype.ipp:275
-msgctxt "input-name"
-msgid "P4 Button 9"
-msgstr "Hráč 4 Tlačidlo 9"
-
-#: src/emu/inpttype.ipp:276
-msgctxt "input-name"
-msgid "P4 Button 10"
-msgstr "Hráč 4 Tlačidlo 10"
-
-#: src/emu/inpttype.ipp:277
-msgctxt "input-name"
-msgid "P4 Button 11"
-msgstr "Hráč 4 Tlačidlo 11"
-
-#: src/emu/inpttype.ipp:278
-msgctxt "input-name"
-msgid "P4 Button 12"
-msgstr "Hráč 4 Tlačidlo 12"
-
-#: src/emu/inpttype.ipp:279
-msgctxt "input-name"
-msgid "P4 Button 13"
-msgstr "Hráč 4 Tlačidlo 13"
-
-#: src/emu/inpttype.ipp:280
-msgctxt "input-name"
-msgid "P4 Button 14"
-msgstr "Hráč 4 Tlačidlo 14"
-
-#: src/emu/inpttype.ipp:281
-msgctxt "input-name"
-msgid "P4 Button 15"
-msgstr "Hráč 4 Tlačidlo 15"
-
-#: src/emu/inpttype.ipp:282
-msgctxt "input-name"
-msgid "P4 Button 16"
-msgstr "Hráč 4 Tlačidlo 16"
-
-#: src/emu/inpttype.ipp:283
-msgctxt "input-name"
-msgid "P4 Start"
-msgstr "Hráč 4 Štart"
-
-#: src/emu/inpttype.ipp:284
-msgctxt "input-name"
-msgid "P4 Select"
-msgstr "Hráč 4 Select"
-
-#: src/emu/inpttype.ipp:289
-msgctxt "input-name"
-msgid "P5 Up"
-msgstr "Hráč 5 Hore"
-
-#: src/emu/inpttype.ipp:290
-msgctxt "input-name"
-msgid "P5 Down"
-msgstr "Hráč 5 Dolu"
-
-#: src/emu/inpttype.ipp:291
-msgctxt "input-name"
-msgid "P5 Left"
-msgstr "Hráč 5 Vľavo"
-
-#: src/emu/inpttype.ipp:292
-msgctxt "input-name"
-msgid "P5 Right"
-msgstr "Hráč 5 Vpravo"
-
-#: src/emu/inpttype.ipp:293
-msgctxt "input-name"
-msgid "P5 Right Stick/Up"
-msgstr "Hráč 5 Pravá páka/Hore"
-
-#: src/emu/inpttype.ipp:294
-msgctxt "input-name"
-msgid "P5 Right Stick/Down"
-msgstr "Hráč 5 Pravá páka/Dolu"
-
-#: src/emu/inpttype.ipp:295
-msgctxt "input-name"
-msgid "P5 Right Stick/Left"
-msgstr "Hráč 5 Pravá páka/Vľavo"
-
-#: src/emu/inpttype.ipp:296
-msgctxt "input-name"
-msgid "P5 Right Stick/Right"
-msgstr "Hráč 5 Pravá páka/Vpravo"
-
-#: src/emu/inpttype.ipp:297
-msgctxt "input-name"
-msgid "P5 Left Stick/Up"
-msgstr "Hráč 5 Ľavá páka/Hore"
-
-#: src/emu/inpttype.ipp:298
-msgctxt "input-name"
-msgid "P5 Left Stick/Down"
-msgstr "Hráč 5 Ľavá páka/Dolu"
-
-#: src/emu/inpttype.ipp:299
-msgctxt "input-name"
-msgid "P5 Left Stick/Left"
-msgstr "Hráč 5 Ľavá páka/Vľavo"
-
-#: src/emu/inpttype.ipp:300
-msgctxt "input-name"
-msgid "P5 Left Stick/Right"
-msgstr "Hráč 5 Ľavá páka/Vpravo"
-
-#: src/emu/inpttype.ipp:301
-msgctxt "input-name"
-msgid "P5 Button 1"
-msgstr "Hráč 5 Tlačidlo 1"
-
-#: src/emu/inpttype.ipp:302
-msgctxt "input-name"
-msgid "P5 Button 2"
-msgstr "Hráč 5 Tlačidlo 2"
-
-#: src/emu/inpttype.ipp:303
-msgctxt "input-name"
-msgid "P5 Button 3"
-msgstr "Hráč 5 Tlačidlo 3"
-
-#: src/emu/inpttype.ipp:304
-msgctxt "input-name"
-msgid "P5 Button 4"
-msgstr "Hráč 5 Tlačidlo 4"
-
-#: src/emu/inpttype.ipp:305
-msgctxt "input-name"
-msgid "P5 Button 5"
-msgstr "Hráč 5 Tlačidlo 5"
-
-#: src/emu/inpttype.ipp:306
-msgctxt "input-name"
-msgid "P5 Button 6"
-msgstr "Hráč 5 Tlačidlo 6"
-
-#: src/emu/inpttype.ipp:307
-msgctxt "input-name"
-msgid "P5 Button 7"
-msgstr "Hráč 5 Tlačidlo 7"
-
-#: src/emu/inpttype.ipp:308
-msgctxt "input-name"
-msgid "P5 Button 8"
-msgstr "Hráč 5 Tlačidlo 8"
-
-#: src/emu/inpttype.ipp:309
-msgctxt "input-name"
-msgid "P5 Button 9"
-msgstr "Hráč 5 Tlačidlo 9"
-
-#: src/emu/inpttype.ipp:310
-msgctxt "input-name"
-msgid "P5 Button 10"
-msgstr "Hráč 5 Tlačidlo 10"
-
-#: src/emu/inpttype.ipp:311
-msgctxt "input-name"
-msgid "P5 Button 11"
-msgstr "Hráč 5 Tlačidlo 11"
-
-#: src/emu/inpttype.ipp:312
-msgctxt "input-name"
-msgid "P5 Button 12"
-msgstr "Hráč 5 Tlačidlo 12"
-
-#: src/emu/inpttype.ipp:313
-msgctxt "input-name"
-msgid "P5 Button 13"
-msgstr "Hráč 5 Tlačidlo 13"
-
-#: src/emu/inpttype.ipp:314
-msgctxt "input-name"
-msgid "P5 Button 14"
-msgstr "Hráč 5 Tlačidlo 14"
-
-#: src/emu/inpttype.ipp:315
-msgctxt "input-name"
-msgid "P5 Button 15"
-msgstr "Hráč 5 Tlačidlo 15"
-
-#: src/emu/inpttype.ipp:316
-msgctxt "input-name"
-msgid "P5 Button 16"
-msgstr "Hráč 5 Tlačidlo 16"
-
-#: src/emu/inpttype.ipp:317
-msgctxt "input-name"
-msgid "P5 Start"
-msgstr "Hráč 5 Štart"
-
-#: src/emu/inpttype.ipp:318
-msgctxt "input-name"
-msgid "P5 Select"
-msgstr "Hráč 5 Select"
-
-#: src/emu/inpttype.ipp:323
-msgctxt "input-name"
-msgid "P6 Up"
-msgstr "Hráč 6 Hore"
-
-#: src/emu/inpttype.ipp:324
-msgctxt "input-name"
-msgid "P6 Down"
-msgstr "Hráč 6 Dolu"
-
-#: src/emu/inpttype.ipp:325
-msgctxt "input-name"
-msgid "P6 Left"
-msgstr "Hráč 6 Vľavo"
-
-#: src/emu/inpttype.ipp:326
-msgctxt "input-name"
-msgid "P6 Right"
-msgstr "Hráč 6 Vpravo"
-
-#: src/emu/inpttype.ipp:327
-msgctxt "input-name"
-msgid "P6 Right Stick/Up"
-msgstr "Hráč 6 Pravá páka/Hore"
-
-#: src/emu/inpttype.ipp:328
-msgctxt "input-name"
-msgid "P6 Right Stick/Down"
-msgstr "Hráč 6 Pravá páka/Dolu"
-
-#: src/emu/inpttype.ipp:329
-msgctxt "input-name"
-msgid "P6 Right Stick/Left"
-msgstr "Hráč 6 Pravá páka/Vľavo"
-
-#: src/emu/inpttype.ipp:330
-msgctxt "input-name"
-msgid "P6 Right Stick/Right"
-msgstr "Hráč 6 Pravá páka/Vpravo"
-
-#: src/emu/inpttype.ipp:331
-msgctxt "input-name"
-msgid "P6 Left Stick/Up"
-msgstr "Hráč 6 Ľavá páka/Hore"
-
-#: src/emu/inpttype.ipp:332
-msgctxt "input-name"
-msgid "P6 Left Stick/Down"
-msgstr "Hráč 6 Ľavá páka/Dolu"
-
-#: src/emu/inpttype.ipp:333
-msgctxt "input-name"
-msgid "P6 Left Stick/Left"
-msgstr "Hráč 6 Ľavá páka/Vľavo"
-
-#: src/emu/inpttype.ipp:334
-msgctxt "input-name"
-msgid "P6 Left Stick/Right"
-msgstr "Hráč 6 Ľavá páka/Vpravo"
-
-#: src/emu/inpttype.ipp:335
-msgctxt "input-name"
-msgid "P6 Button 1"
-msgstr "Hráč 6 Tlačidlo 1"
-
-#: src/emu/inpttype.ipp:336
-msgctxt "input-name"
-msgid "P6 Button 2"
-msgstr "Hráč 6 Tlačidlo 2"
-
-#: src/emu/inpttype.ipp:337
-msgctxt "input-name"
-msgid "P6 Button 3"
-msgstr "Hráč 6 Tlačidlo 3"
-
-#: src/emu/inpttype.ipp:338
-msgctxt "input-name"
-msgid "P6 Button 4"
-msgstr "Hráč 6 Tlačidlo 4"
-
-#: src/emu/inpttype.ipp:339
-msgctxt "input-name"
-msgid "P6 Button 5"
-msgstr "Hráč 6 Tlačidlo 5"
-
-#: src/emu/inpttype.ipp:340
-msgctxt "input-name"
-msgid "P6 Button 6"
-msgstr "Hráč 6 Tlačidlo 6"
-
-#: src/emu/inpttype.ipp:341
-msgctxt "input-name"
-msgid "P6 Button 7"
-msgstr "Hráč 6 Tlačidlo 7"
-
-#: src/emu/inpttype.ipp:342
-msgctxt "input-name"
-msgid "P6 Button 8"
-msgstr "Hráč 6 Tlačidlo 8"
-
-#: src/emu/inpttype.ipp:343
-msgctxt "input-name"
-msgid "P6 Button 9"
-msgstr "Hráč 6 Tlačidlo 9"
-
-#: src/emu/inpttype.ipp:344
-msgctxt "input-name"
-msgid "P6 Button 10"
-msgstr "Hráč 6 Tlačidlo 10"
-
-#: src/emu/inpttype.ipp:345
-msgctxt "input-name"
-msgid "P6 Button 11"
-msgstr "Hráč 6 Tlačidlo 11"
-
-#: src/emu/inpttype.ipp:346
-msgctxt "input-name"
-msgid "P6 Button 12"
-msgstr "Hráč 6 Tlačidlo 12"
-
-#: src/emu/inpttype.ipp:347
-msgctxt "input-name"
-msgid "P6 Button 13"
-msgstr "Hráč 6 Tlačidlo 13"
-
-#: src/emu/inpttype.ipp:348
-msgctxt "input-name"
-msgid "P6 Button 14"
-msgstr "Hráč 6 Tlačidlo 14"
-
-#: src/emu/inpttype.ipp:349
-msgctxt "input-name"
-msgid "P6 Button 15"
-msgstr "Hráč 6 Tlačidlo 15"
-
-#: src/emu/inpttype.ipp:350
-msgctxt "input-name"
-msgid "P6 Button 16"
-msgstr "Hráč 6 Tlačidlo 16"
-
-#: src/emu/inpttype.ipp:351
-msgctxt "input-name"
-msgid "P6 Start"
-msgstr "Hráč 6 Štart"
-
-#: src/emu/inpttype.ipp:352
-msgctxt "input-name"
-msgid "P6 Select"
-msgstr "Hráč 6 Select"
-
-#: src/emu/inpttype.ipp:357
-msgctxt "input-name"
-msgid "P7 Up"
-msgstr "Hráč 7 Hore"
-
-#: src/emu/inpttype.ipp:358
-msgctxt "input-name"
-msgid "P7 Down"
-msgstr "Hráč 7 Dolu"
-
-#: src/emu/inpttype.ipp:359
-msgctxt "input-name"
-msgid "P7 Left"
-msgstr "Hráč 7 Vľavo"
-
-#: src/emu/inpttype.ipp:360
-msgctxt "input-name"
-msgid "P7 Right"
-msgstr "Hráč 7 Vpravo"
-
-#: src/emu/inpttype.ipp:361
-msgctxt "input-name"
-msgid "P7 Right Stick/Up"
-msgstr "Hráč 7 Pravá páka/Hore"
-
-#: src/emu/inpttype.ipp:362
-msgctxt "input-name"
-msgid "P7 Right Stick/Down"
-msgstr "Hráč 7 Pravá páka/Dolu"
-
-#: src/emu/inpttype.ipp:363
-msgctxt "input-name"
-msgid "P7 Right Stick/Left"
-msgstr "Hráč 7 Pravá páka/Vľavo"
-
-#: src/emu/inpttype.ipp:364
-msgctxt "input-name"
-msgid "P7 Right Stick/Right"
-msgstr "Hráč 7 Pravá páka/Vpravo"
-
-#: src/emu/inpttype.ipp:365
-msgctxt "input-name"
-msgid "P7 Left Stick/Up"
-msgstr "Hráč 7 Ľavá páka/Hore"
-
-#: src/emu/inpttype.ipp:366
-msgctxt "input-name"
-msgid "P7 Left Stick/Down"
-msgstr "Hráč 7 Ľavá páka/Dolu"
-
-#: src/emu/inpttype.ipp:367
-msgctxt "input-name"
-msgid "P7 Left Stick/Left"
-msgstr "Hráč 7 Ľavá páka/Vľavo"
-
-#: src/emu/inpttype.ipp:368
-msgctxt "input-name"
-msgid "P7 Left Stick/Right"
-msgstr "Hráč 7 Ľavá páka/Vpravo"
-
-#: src/emu/inpttype.ipp:369
-msgctxt "input-name"
-msgid "P7 Button 1"
-msgstr "Hráč 7 Tlačidlo 1"
-
-#: src/emu/inpttype.ipp:370
-msgctxt "input-name"
-msgid "P7 Button 2"
-msgstr "Hráč 7 Tlačidlo 2"
-
-#: src/emu/inpttype.ipp:371
-msgctxt "input-name"
-msgid "P7 Button 3"
-msgstr "Hráč 7 Tlačidlo 3"
-
-#: src/emu/inpttype.ipp:372
-msgctxt "input-name"
-msgid "P7 Button 4"
-msgstr "Hráč 7 Tlačidlo 4"
-
-#: src/emu/inpttype.ipp:373
-msgctxt "input-name"
-msgid "P7 Button 5"
-msgstr "Hráč 7 Tlačidlo 5"
-
-#: src/emu/inpttype.ipp:374
-msgctxt "input-name"
-msgid "P7 Button 6"
-msgstr "Hráč 7 Tlačidlo 6"
-
-#: src/emu/inpttype.ipp:375
-msgctxt "input-name"
-msgid "P7 Button 7"
-msgstr "Hráč 7 Tlačidlo 7"
-
-#: src/emu/inpttype.ipp:376
-msgctxt "input-name"
-msgid "P7 Button 8"
-msgstr "Hráč 7 Tlačidlo 8"
-
-#: src/emu/inpttype.ipp:377
-msgctxt "input-name"
-msgid "P7 Button 9"
-msgstr "Hráč 7 Tlačidlo 9"
-
-#: src/emu/inpttype.ipp:378
-msgctxt "input-name"
-msgid "P7 Button 10"
-msgstr "Hráč 7 Tlačidlo 10"
-
-#: src/emu/inpttype.ipp:379
-msgctxt "input-name"
-msgid "P7 Button 11"
-msgstr "Hráč 7 Tlačidlo 11"
-
-#: src/emu/inpttype.ipp:380
-msgctxt "input-name"
-msgid "P7 Button 12"
-msgstr "Hráč 7 Tlačidlo 12"
-
-#: src/emu/inpttype.ipp:381
-msgctxt "input-name"
-msgid "P7 Button 13"
-msgstr "Hráč 7 Tlačidlo 13"
-
-#: src/emu/inpttype.ipp:382
-msgctxt "input-name"
-msgid "P7 Button 14"
-msgstr "Hráč 7 Tlačidlo 14"
-
-#: src/emu/inpttype.ipp:383
-msgctxt "input-name"
-msgid "P7 Button 15"
-msgstr "Hráč 7 Tlačidlo 15"
-
-#: src/emu/inpttype.ipp:384
-msgctxt "input-name"
-msgid "P7 Button 16"
-msgstr "Hráč 7 Tlačidlo 16"
-
-#: src/emu/inpttype.ipp:385
-msgctxt "input-name"
-msgid "P7 Start"
-msgstr "Hráč 7 Štart"
-
-#: src/emu/inpttype.ipp:386
-msgctxt "input-name"
-msgid "P7 Select"
-msgstr "Hráč 7 Select"
-
-#: src/emu/inpttype.ipp:391
-msgctxt "input-name"
-msgid "P8 Up"
-msgstr "Hráč 8 Hore"
-
-#: src/emu/inpttype.ipp:392
-msgctxt "input-name"
-msgid "P8 Down"
-msgstr "Hráč 8 Dolu"
-
-#: src/emu/inpttype.ipp:393
-msgctxt "input-name"
-msgid "P8 Left"
-msgstr "Hráč 8 Vľavo"
-
-#: src/emu/inpttype.ipp:394
-msgctxt "input-name"
-msgid "P8 Right"
-msgstr "Hráč 8 Vpravo"
-
-#: src/emu/inpttype.ipp:395
-msgctxt "input-name"
-msgid "P8 Right Stick/Up"
-msgstr "Hráč 8 Pravá páka/Hore"
-
-#: src/emu/inpttype.ipp:396
-msgctxt "input-name"
-msgid "P8 Right Stick/Down"
-msgstr "Hráč 8 Pravá páka/Dolu"
-
-#: src/emu/inpttype.ipp:397
-msgctxt "input-name"
-msgid "P8 Right Stick/Left"
-msgstr "Hráč 8 Pravá páka/Vľavo"
-
-#: src/emu/inpttype.ipp:398
-msgctxt "input-name"
-msgid "P8 Right Stick/Right"
-msgstr "Hráč 8 Pravá páka/Vpravo"
-
-#: src/emu/inpttype.ipp:399
-msgctxt "input-name"
-msgid "P8 Left Stick/Up"
-msgstr "Hráč 8 Ľavá páka/Hore"
-
-#: src/emu/inpttype.ipp:400
-msgctxt "input-name"
-msgid "P8 Left Stick/Down"
-msgstr "Hráč 8 Ľavá páka/Dolu"
-
-#: src/emu/inpttype.ipp:401
-msgctxt "input-name"
-msgid "P8 Left Stick/Left"
-msgstr "Hráč 8 Ľavá páka/Vľavo"
-
-#: src/emu/inpttype.ipp:402
-msgctxt "input-name"
-msgid "P8 Left Stick/Right"
-msgstr "Hráč 8 Ľavá páka/Vpravo"
-
-#: src/emu/inpttype.ipp:403
-msgctxt "input-name"
-msgid "P8 Button 1"
-msgstr "Hráč 8 Tlačidlo 1"
-
-#: src/emu/inpttype.ipp:404
-msgctxt "input-name"
-msgid "P8 Button 2"
-msgstr "Hráč 8 Tlačidlo 2"
-
-#: src/emu/inpttype.ipp:405
-msgctxt "input-name"
-msgid "P8 Button 3"
-msgstr "Hráč 8 Tlačidlo 3"
-
-#: src/emu/inpttype.ipp:406
-msgctxt "input-name"
-msgid "P8 Button 4"
-msgstr "Hráč 8 Tlačidlo 4"
-
-#: src/emu/inpttype.ipp:407
-msgctxt "input-name"
-msgid "P8 Button 5"
-msgstr "Hráč 8 Tlačidlo 5"
-
-#: src/emu/inpttype.ipp:408
-msgctxt "input-name"
-msgid "P8 Button 6"
-msgstr "Hráč 8 Tlačidlo 6"
-
-#: src/emu/inpttype.ipp:409
-msgctxt "input-name"
-msgid "P8 Button 7"
-msgstr "Hráč 8 Tlačidlo 7"
-
-#: src/emu/inpttype.ipp:410
-msgctxt "input-name"
-msgid "P8 Button 8"
-msgstr "Hráč 8 Tlačidlo 8"
-
-#: src/emu/inpttype.ipp:411
-msgctxt "input-name"
-msgid "P8 Button 9"
-msgstr "Hráč 8 Tlačidlo 9"
-
-#: src/emu/inpttype.ipp:412
-msgctxt "input-name"
-msgid "P8 Button 10"
-msgstr "Hráč 8 Tlačidlo 10"
-
-#: src/emu/inpttype.ipp:413
-msgctxt "input-name"
-msgid "P8 Button 11"
-msgstr "Hráč 8 Tlačidlo 11"
-
-#: src/emu/inpttype.ipp:414
-msgctxt "input-name"
-msgid "P8 Button 12"
-msgstr "Hráč 8 Tlačidlo 12"
-
-#: src/emu/inpttype.ipp:415
-msgctxt "input-name"
-msgid "P8 Button 13"
-msgstr "Hráč 8 Tlačidlo 13"
-
-#: src/emu/inpttype.ipp:416
-msgctxt "input-name"
-msgid "P8 Button 14"
-msgstr "Hráč 8 Tlačidlo 14"
-
-#: src/emu/inpttype.ipp:417
-msgctxt "input-name"
-msgid "P8 Button 15"
-msgstr "Hráč 8 Tlačidlo 15"
-
-#: src/emu/inpttype.ipp:418
-msgctxt "input-name"
-msgid "P8 Button 16"
-msgstr "Hráč 8 Tlačidlo 16"
-
-#: src/emu/inpttype.ipp:419
-msgctxt "input-name"
-msgid "P8 Start"
-msgstr "Hráč 8 Štart"
-
-#: src/emu/inpttype.ipp:420
-msgctxt "input-name"
-msgid "P8 Select"
-msgstr "Hráč 8 Select"
-
-#: src/emu/inpttype.ipp:425
-msgctxt "input-name"
-msgid "P9 Up"
-msgstr "Hráč 9 Hore"
-
-#: src/emu/inpttype.ipp:426
-msgctxt "input-name"
-msgid "P9 Down"
-msgstr "Hráč 9 Dolu"
-
-#: src/emu/inpttype.ipp:427
-msgctxt "input-name"
-msgid "P9 Left"
-msgstr "Hráč 9 Vľavo"
-
-#: src/emu/inpttype.ipp:428
-msgctxt "input-name"
-msgid "P9 Right"
-msgstr "Hráč 9 Vpravo"
-
-#: src/emu/inpttype.ipp:429
-msgctxt "input-name"
-msgid "P9 Right Stick/Up"
-msgstr "Hráč 9 Pravá páka/Hore"
-
-#: src/emu/inpttype.ipp:430
-msgctxt "input-name"
-msgid "P9 Right Stick/Down"
-msgstr "Hráč 9 Pravá páka/Dolu"
-
-#: src/emu/inpttype.ipp:431
-msgctxt "input-name"
-msgid "P9 Right Stick/Left"
-msgstr "Hráč 9 Pravá páka/Vľavo"
-
-#: src/emu/inpttype.ipp:432
-msgctxt "input-name"
-msgid "P9 Right Stick/Right"
-msgstr "Hráč 9 Pravá páka/Vpravo"
-
-#: src/emu/inpttype.ipp:433
-msgctxt "input-name"
-msgid "P9 Left Stick/Up"
-msgstr "Hráč 9 Ľavá páka/Hore"
-
-#: src/emu/inpttype.ipp:434
-msgctxt "input-name"
-msgid "P9 Left Stick/Down"
-msgstr "Hráč 9 Ľavá páka/Dolu"
-
-#: src/emu/inpttype.ipp:435
-msgctxt "input-name"
-msgid "P9 Left Stick/Left"
-msgstr "Hráč 9 Ľavá páka/Vľavo"
-
-#: src/emu/inpttype.ipp:436
-msgctxt "input-name"
-msgid "P9 Left Stick/Right"
-msgstr "Hráč 9 Ľavá páka/Vpravo"
-
-#: src/emu/inpttype.ipp:437
-msgctxt "input-name"
-msgid "P9 Button 1"
-msgstr "Hráč 9 Tlačidlo 1"
-
-#: src/emu/inpttype.ipp:438
-msgctxt "input-name"
-msgid "P9 Button 2"
-msgstr "Hráč 9 Tlačidlo 2"
-
-#: src/emu/inpttype.ipp:439
-msgctxt "input-name"
-msgid "P9 Button 3"
-msgstr "Hráč 9 Tlačidlo 3"
-
-#: src/emu/inpttype.ipp:440
-msgctxt "input-name"
-msgid "P9 Button 4"
-msgstr "Hráč 9 Tlačidlo 4"
-
-#: src/emu/inpttype.ipp:441
-msgctxt "input-name"
-msgid "P9 Button 5"
-msgstr "Hráč 9 Tlačidlo 5"
-
-#: src/emu/inpttype.ipp:442
-msgctxt "input-name"
-msgid "P9 Button 6"
-msgstr "Hráč 9 Tlačidlo 6"
-
-#: src/emu/inpttype.ipp:443
-msgctxt "input-name"
-msgid "P9 Button 7"
-msgstr "Hráč 9 Tlačidlo 7"
-
-#: src/emu/inpttype.ipp:444
-msgctxt "input-name"
-msgid "P9 Button 8"
-msgstr "Hráč 9 Tlačidlo 8"
-
-#: src/emu/inpttype.ipp:445
-msgctxt "input-name"
-msgid "P9 Button 9"
-msgstr "Hráč 9 Tlačidlo 9"
-
-#: src/emu/inpttype.ipp:446
-msgctxt "input-name"
-msgid "P9 Button 10"
-msgstr "Hráč 9 Tlačidlo 10"
-
-#: src/emu/inpttype.ipp:447
-msgctxt "input-name"
-msgid "P9 Button 11"
-msgstr "Hráč 9 Tlačidlo 11"
-
-#: src/emu/inpttype.ipp:448
-msgctxt "input-name"
-msgid "P9 Button 12"
-msgstr "Hráč 9 Tlačidlo 12"
-
-#: src/emu/inpttype.ipp:449
-msgctxt "input-name"
-msgid "P9 Button 13"
-msgstr "Hráč 9 Tlačidlo 13"
-
-#: src/emu/inpttype.ipp:450
-msgctxt "input-name"
-msgid "P9 Button 14"
-msgstr "Hráč 9 Tlačidlo 14"
-
-#: src/emu/inpttype.ipp:451
-msgctxt "input-name"
-msgid "P9 Button 15"
-msgstr "Hráč 9 Tlačidlo 15"
-
-#: src/emu/inpttype.ipp:452
-msgctxt "input-name"
-msgid "P9 Button 16"
-msgstr "Hráč 9 Tlačidlo 16"
-
-#: src/emu/inpttype.ipp:453
-msgctxt "input-name"
-msgid "P9 Start"
-msgstr "Hráč 9 Štart"
-
-#: src/emu/inpttype.ipp:454
-msgctxt "input-name"
-msgid "P9 Select"
-msgstr "Hráč 9 Select"
-
-#: src/emu/inpttype.ipp:459
-msgctxt "input-name"
-msgid "P10 Up"
-msgstr "Hráč 10 Hore"
-
-#: src/emu/inpttype.ipp:460
-msgctxt "input-name"
-msgid "P10 Down"
-msgstr "Hráč 10 Dolu"
-
-#: src/emu/inpttype.ipp:461
-msgctxt "input-name"
-msgid "P10 Left"
-msgstr "Hráč 10 Vľavo"
-
-#: src/emu/inpttype.ipp:462
-msgctxt "input-name"
-msgid "P10 Right"
-msgstr "Hráč 10 Vpravo"
-
-#: src/emu/inpttype.ipp:463
-msgctxt "input-name"
-msgid "P10 Right Stick/Up"
-msgstr "Hráč 10 Pravá páka/Hore"
-
-#: src/emu/inpttype.ipp:464
-msgctxt "input-name"
-msgid "P10 Right Stick/Down"
-msgstr "Hráč 10 Pravá páka/Dolu"
-
-#: src/emu/inpttype.ipp:465
-msgctxt "input-name"
-msgid "P10 Right Stick/Left"
-msgstr "Hráč 10 Pravá páka/Vľavo"
-
-#: src/emu/inpttype.ipp:466
-msgctxt "input-name"
-msgid "P10 Right Stick/Right"
-msgstr "Hráč 10 Pravá páka/Vpravo"
-
-#: src/emu/inpttype.ipp:467
-msgctxt "input-name"
-msgid "P10 Left Stick/Up"
-msgstr "Hráč 10 Ľavá páka/Hore"
-
-#: src/emu/inpttype.ipp:468
-msgctxt "input-name"
-msgid "P10 Left Stick/Down"
-msgstr "Hráč 10 Ľavá páka/Dolu"
-
-#: src/emu/inpttype.ipp:469
-msgctxt "input-name"
-msgid "P10 Left Stick/Left"
-msgstr "Hráč 10 Ľavá páka/Vľavo"
-
-#: src/emu/inpttype.ipp:470
-msgctxt "input-name"
-msgid "P10 Left Stick/Right"
-msgstr "Hráč 10 Ľavá páka/Vpravo"
-
-#: src/emu/inpttype.ipp:471
-msgctxt "input-name"
-msgid "P10 Button 1"
-msgstr "Hráč 10 Tlačidlo 1"
-
-#: src/emu/inpttype.ipp:472
-msgctxt "input-name"
-msgid "P10 Button 2"
-msgstr "Hráč 10 Tlačidlo 2"
-
-#: src/emu/inpttype.ipp:473
-msgctxt "input-name"
-msgid "P10 Button 3"
-msgstr "Hráč 10 Tlačidlo 3"
-
-#: src/emu/inpttype.ipp:474
-msgctxt "input-name"
-msgid "P10 Button 4"
-msgstr "Hráč 10 Tlačidlo 4"
-
-#: src/emu/inpttype.ipp:475
-msgctxt "input-name"
-msgid "P10 Button 5"
-msgstr "Hráč 10 Tlačidlo 5"
-
-#: src/emu/inpttype.ipp:476
-msgctxt "input-name"
-msgid "P10 Button 6"
-msgstr "Hráč 10 Tlačidlo 6"
-
-#: src/emu/inpttype.ipp:477
-msgctxt "input-name"
-msgid "P10 Button 7"
-msgstr "Hráč 10 Tlačidlo 7"
-
-#: src/emu/inpttype.ipp:478
-msgctxt "input-name"
-msgid "P10 Button 8"
-msgstr "Hráč 10 Tlačidlo 8"
-
-#: src/emu/inpttype.ipp:479
-msgctxt "input-name"
-msgid "P10 Button 9"
-msgstr "Hráč 10 Tlačidlo 9"
-
-#: src/emu/inpttype.ipp:480
-msgctxt "input-name"
-msgid "P10 Button 10"
-msgstr "Hráč 10 Tlačidlo 10"
-
-#: src/emu/inpttype.ipp:481
-msgctxt "input-name"
-msgid "P10 Button 11"
-msgstr "Hráč 10 Tlačidlo 11"
-
-#: src/emu/inpttype.ipp:482
-msgctxt "input-name"
-msgid "P10 Button 12"
-msgstr "Hráč 10 Tlačidlo 12"
-
-#: src/emu/inpttype.ipp:483
-msgctxt "input-name"
-msgid "P10 Button 13"
-msgstr "Hráč 10 Tlačidlo 13"
-
-#: src/emu/inpttype.ipp:484
-msgctxt "input-name"
-msgid "P10 Button 14"
-msgstr "Hráč 10 Tlačidlo 14"
-
-#: src/emu/inpttype.ipp:485
-msgctxt "input-name"
-msgid "P10 Button 15"
-msgstr "Hráč 10 Tlačidlo 15"
-
-#: src/emu/inpttype.ipp:486
-msgctxt "input-name"
-msgid "P10 Button 16"
-msgstr "Hráč 10 Tlačidlo 16"
-
-#: src/emu/inpttype.ipp:487
-msgctxt "input-name"
-msgid "P10 Start"
-msgstr "Hráč 10 Štart"
-
-#: src/emu/inpttype.ipp:488
-msgctxt "input-name"
-msgid "P10 Select"
-msgstr "Hráč 10 Select"
-
 #: src/emu/inpttype.ipp:493
 msgctxt "input-name"
 msgid "1 Player Start"
@@ -5580,155 +4209,32 @@ msgctxt "input-name"
 msgid "Volume Up"
 msgstr "Zvýšiť hlasitosť"
 
-#: src/emu/inpttype.ipp:550
-msgctxt "input-name"
-msgid "P1 Pedal 1"
-msgstr "Hráč 1 Pedál 1"
-
-#: src/emu/inpttype.ipp:551
-msgctxt "input-name"
-msgid "P2 Pedal 1"
-msgstr "Hráč 2 Pedál 1"
-
-#: src/emu/inpttype.ipp:552
-msgctxt "input-name"
-msgid "P3 Pedal 1"
-msgstr "Hráč 3 Pedál 1"
-
-#: src/emu/inpttype.ipp:553
-msgctxt "input-name"
-msgid "P4 Pedal 1"
-msgstr "Hráč 4 Pedál 1"
-
-#: src/emu/inpttype.ipp:554
-msgctxt "input-name"
-msgid "P5 Pedal 1"
-msgstr "Hráč 5 Pedál 1"
-
-#: src/emu/inpttype.ipp:555
-msgctxt "input-name"
-msgid "P6 Pedal 1"
-msgstr "Hráč 6 Pedál 1"
-
-#: src/emu/inpttype.ipp:556
-msgctxt "input-name"
-msgid "P7 Pedal 1"
-msgstr "Hráč 7 Pedál 1"
-
-#: src/emu/inpttype.ipp:557
-msgctxt "input-name"
-msgid "P8 Pedal 1"
-msgstr "Hráč 8 Pedál 1"
-
-#: src/emu/inpttype.ipp:558
-msgctxt "input-name"
-msgid "P9 Pedal 1"
-msgstr "Hráč 9 Pedál 1"
-
+#: src/emu/inpttype.ipp:550 src/emu/inpttype.ipp:551 src/emu/inpttype.ipp:552
+#: src/emu/inpttype.ipp:553 src/emu/inpttype.ipp:554 src/emu/inpttype.ipp:555
+#: src/emu/inpttype.ipp:556 src/emu/inpttype.ipp:557 src/emu/inpttype.ipp:558
 #: src/emu/inpttype.ipp:559
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 1"
-msgstr "Hráč 10 Pedál 1"
-
-#: src/emu/inpttype.ipp:564
-msgctxt "input-name"
-msgid "P1 Pedal 2"
-msgstr "Hráč 1 Pedál 2"
-
-#: src/emu/inpttype.ipp:565
-msgctxt "input-name"
-msgid "P2 Pedal 2"
-msgstr "Hráč 2 Pedál 2"
-
-#: src/emu/inpttype.ipp:566
-msgctxt "input-name"
-msgid "P3 Pedal 2"
-msgstr "Hráč 3 Pedál 2"
-
-#: src/emu/inpttype.ipp:567
-msgctxt "input-name"
-msgid "P4 Pedal 2"
-msgstr "Hráč 4 Pedál 2"
-
-#: src/emu/inpttype.ipp:568
-msgctxt "input-name"
-msgid "P5 Pedal 2"
-msgstr "Hráč 5 Pedál 2"
-
-#: src/emu/inpttype.ipp:569
-msgctxt "input-name"
-msgid "P6 Pedal 2"
-msgstr "Hráč 6 Pedál 2"
-
-#: src/emu/inpttype.ipp:570
-msgctxt "input-name"
-msgid "P7 Pedal 2"
-msgstr "Hráč 7 Pedál 2"
-
-#: src/emu/inpttype.ipp:571
-msgctxt "input-name"
-msgid "P8 Pedal 2"
-msgstr "Hráč 8 Pedál 2"
-
-#: src/emu/inpttype.ipp:572
-msgctxt "input-name"
-msgid "P9 Pedal 2"
-msgstr "Hráč 9 Pedál 2"
+msgid "%p Pedal 1"
+msgstr "%p Pedál 1"
 
+#: src/emu/inpttype.ipp:564 src/emu/inpttype.ipp:565 src/emu/inpttype.ipp:566
+#: src/emu/inpttype.ipp:567 src/emu/inpttype.ipp:568 src/emu/inpttype.ipp:569
+#: src/emu/inpttype.ipp:570 src/emu/inpttype.ipp:571 src/emu/inpttype.ipp:572
 #: src/emu/inpttype.ipp:573
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 2"
-msgstr "Hráč 10 Pedál 2"
-
-#: src/emu/inpttype.ipp:578
-msgctxt "input-name"
-msgid "P1 Pedal 3"
-msgstr "Hráč 1 Pedál 3"
-
-#: src/emu/inpttype.ipp:579
-msgctxt "input-name"
-msgid "P2 Pedal 3"
-msgstr "Hráč 2 Pedál 3"
-
-#: src/emu/inpttype.ipp:580
-msgctxt "input-name"
-msgid "P3 Pedal 3"
-msgstr "Hráč 3 Pedál 3"
-
-#: src/emu/inpttype.ipp:581
-msgctxt "input-name"
-msgid "P4 Pedal 3"
-msgstr "Hráč 4 Pedál 3"
-
-#: src/emu/inpttype.ipp:582
-msgctxt "input-name"
-msgid "P5 Pedal 3"
-msgstr "Hráč 5 Pedál 3"
-
-#: src/emu/inpttype.ipp:583
-msgctxt "input-name"
-msgid "P6 Pedal 3"
-msgstr "Hráč 6 Pedál 3"
-
-#: src/emu/inpttype.ipp:584
-msgctxt "input-name"
-msgid "P7 Pedal 3"
-msgstr "Hráč 7 Pedál 3"
-
-#: src/emu/inpttype.ipp:585
-msgctxt "input-name"
-msgid "P8 Pedal 3"
-msgstr "Hráč 8 Pedál 3"
-
-#: src/emu/inpttype.ipp:586
-msgctxt "input-name"
-msgid "P9 Pedal 3"
-msgstr "Hráč 9 Pedál 3"
+msgid "%p Pedal 2"
+msgstr "%p Pedál 2"
 
+#: src/emu/inpttype.ipp:578 src/emu/inpttype.ipp:579 src/emu/inpttype.ipp:580
+#: src/emu/inpttype.ipp:581 src/emu/inpttype.ipp:582 src/emu/inpttype.ipp:583
+#: src/emu/inpttype.ipp:584 src/emu/inpttype.ipp:585 src/emu/inpttype.ipp:586
 #: src/emu/inpttype.ipp:587
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 3"
-msgstr "Hráč 10 Pedál 3"
+msgid "%p Pedal 3"
+msgstr "%p Pedál 3"
 
 #: src/emu/inpttype.ipp:592
 msgctxt "input-name"
@@ -7628,3 +6134,15 @@ msgid ""
 msgstr ""
 "Vložte sekvenciu alebo stlačte %s pre storno\n"
 "%s"
+
+#~ msgid "Confirm quit from machines"
+#~ msgstr "Potvrdiť ukončenie emulácie zariadenia"
+
+#~ msgid "Skip information screen at startup"
+#~ msgstr "Preskočiť úvodnú informačnú obrazovku"
+
+#~ msgid "Skip software parts selection menu"
+#~ msgstr "Preskočiť menu s výberom súčastí softvéru"
+
+#~ msgid "Offscreen reload"
+#~ msgstr "Konvertovať tlačidlo 2 svetelnej pištole na offscreen reload"
diff --git a/language/Slovenian/strings.po b/language/Slovenian/strings.po
index f2191d9e82a..be83071add3 100644
--- a/language/Slovenian/strings.po
+++ b/language/Slovenian/strings.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-19 02:50+1100\n"
+"POT-Creation-Date: 2021-12-09 04:44+1100\n"
 "PO-Revision-Date: 2016-02-20 18:03+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: MAME Language Team\n"
@@ -262,12 +262,12 @@ msgstr ""
 msgid "Driver: \"%1$s\" software list "
 msgstr ""
 
-#: src/frontend/mame/ui/selsoft.cpp:711 src/frontend/mame/ui/selgame.cpp:1066
+#: src/frontend/mame/ui/selsoft.cpp:711 src/frontend/mame/ui/selgame.cpp:1076
 #, c-format
 msgid "%1$s: %2$s - Search: %3$s_"
 msgstr ""
 
-#: src/frontend/mame/ui/selsoft.cpp:713 src/frontend/mame/ui/selgame.cpp:1068
+#: src/frontend/mame/ui/selsoft.cpp:713 src/frontend/mame/ui/selgame.cpp:1078
 #, c-format
 msgid "Search: %1$s_"
 msgstr ""
@@ -277,7 +277,7 @@ msgstr ""
 msgid "Software list/item: %1$s:%2$s"
 msgstr ""
 
-#: src/frontend/mame/ui/optsmenu.cpp:73 src/frontend/mame/ui/sndmenu.cpp:165
+#: src/frontend/mame/ui/optsmenu.cpp:73 src/frontend/mame/ui/sndmenu.cpp:161
 msgid "Sound Options"
 msgstr ""
 
@@ -372,11 +372,11 @@ msgid "Show mouse pointer"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:39
-msgid "Confirm quit from machines"
+msgid "Confirm quit from emulation"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:40
-msgid "Skip information screen at startup"
+msgid "Skip system information screen"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:41
@@ -392,7 +392,7 @@ msgid "Skip BIOS selection menu"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:44
-msgid "Skip software parts selection menu"
+msgid "Skip software part selection menu"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:45
@@ -544,7 +544,7 @@ msgid "UI active"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:91
-msgid "Offscreen reload"
+msgid "Off-screen reload"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:92
@@ -560,7 +560,7 @@ msgid "Natural keyboard"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:95
-msgid "Simultaneous contradictory"
+msgid "Allow contradictory joystick inputs"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:96
@@ -584,7 +584,7 @@ msgid "Pedal Device Assignment"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:106
-msgid "Adstick Device Assignment"
+msgid "AD Stick Device Assignment"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:107
@@ -671,14 +671,14 @@ msgstr ""
 msgid "Wait Vertical Sync"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:687
+#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:689
 #: src/frontend/mame/ui/videoopt.cpp:191 src/frontend/mame/ui/custui.cpp:490
 #: src/frontend/mame/ui/analogipt.cpp:471 plugins/cheatfind/init.lua:766
 #: plugins/cheatfind/init.lua:777 plugins/cheat/init.lua:668
 msgid "On"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:690
+#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:692
 #: src/frontend/mame/ui/videoopt.cpp:207 src/frontend/mame/ui/custui.cpp:490
 #: src/frontend/mame/ui/analogipt.cpp:471 plugins/cheatfind/init.lua:763
 #: plugins/cheatfind/init.lua:774 plugins/cheat/init.lua:671
@@ -686,11 +686,11 @@ msgstr ""
 msgid "Off"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:693
+#: src/frontend/mame/ui/menu.cpp:695
 msgid "Auto"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:1195
+#: src/frontend/mame/ui/menu.cpp:1197
 #: src/frontend/mame/ui/simpleselgame.cpp:278
 #: src/frontend/mame/ui/selmenu.cpp:1280
 msgid "Return to Previous Menu"
@@ -698,7 +698,7 @@ msgstr ""
 
 #: src/frontend/mame/ui/filemngr.cpp:139
 #: src/frontend/mame/ui/confswitch.cpp:119
-#: src/frontend/mame/ui/inputmap.cpp:559 src/frontend/mame/ui/analogipt.cpp:360
+#: src/frontend/mame/ui/inputmap.cpp:563 src/frontend/mame/ui/analogipt.cpp:360
 #, c-format
 msgid "[root%1$s]"
 msgstr ""
@@ -941,22 +941,22 @@ msgid ""
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "GHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "MHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "kHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "Hz"
 msgstr ""
 
@@ -980,38 +980,38 @@ msgstr ""
 msgid "Vector"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:480
+#: src/frontend/mame/ui/info.cpp:483
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:480
+#: src/frontend/mame/ui/info.cpp:483
 msgid "%2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:497
+#: src/frontend/mame/ui/info.cpp:500
 #, c-format
 msgid "Screen '%1$s'"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:499
+#: src/frontend/mame/ui/info.cpp:502
 msgid "Screen"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:570 src/frontend/mame/ui/info.cpp:581
+#: src/frontend/mame/ui/info.cpp:573 src/frontend/mame/ui/info.cpp:584
 #, c-format
 msgid "%1$s:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:662
+#: src/frontend/mame/ui/info.cpp:665
 msgid "Not supported"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:665
+#: src/frontend/mame/ui/info.cpp:668
 msgid "Partially supported"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:674
+#: src/frontend/mame/ui/info.cpp:677
 msgid "[empty]"
 msgstr ""
 
@@ -1084,7 +1084,7 @@ msgid "Emulated"
 msgstr ""
 
 #: src/frontend/mame/ui/keyboard.cpp:59 src/frontend/mame/ui/confswitch.cpp:117
-#: src/frontend/mame/ui/inputmap.cpp:557 src/frontend/mame/ui/analogipt.cpp:358
+#: src/frontend/mame/ui/inputmap.cpp:561 src/frontend/mame/ui/analogipt.cpp:358
 #, c-format
 msgid "%1$s [root%2$s]"
 msgstr ""
@@ -1444,7 +1444,7 @@ msgctxt "swlist-info"
 msgid "Software list/item"
 msgstr ""
 
-#: src/frontend/mame/ui/datmenu.cpp:88 src/frontend/mame/ui/selmenu.cpp:2698
+#: src/frontend/mame/ui/datmenu.cpp:88 src/frontend/mame/ui/selmenu.cpp:2707
 msgid "Software List Info"
 msgstr ""
 
@@ -1559,7 +1559,7 @@ msgstr ""
 msgid "Configure Machine:"
 msgstr ""
 
-#: src/frontend/mame/ui/miscmenu.cpp:858 src/frontend/mame/ui/selmenu.cpp:2638
+#: src/frontend/mame/ui/miscmenu.cpp:858 src/frontend/mame/ui/selmenu.cpp:2647
 msgid " (default)"
 msgstr ""
 
@@ -1576,7 +1576,7 @@ msgid ""
 "Press %2$s to return to emulation"
 msgstr ""
 
-#: src/frontend/mame/ui/info_pty.cpp:30 src/frontend/mame/ui/mainmenu.cpp:155
+#: src/frontend/mame/ui/info_pty.cpp:30
 msgid "Pseudo terminals"
 msgstr ""
 
@@ -1644,52 +1644,52 @@ msgstr ""
 msgid "Other Controls"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:227
+#: src/frontend/mame/ui/inputmap.cpp:231
 msgid "This machine has no configurable inputs."
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:327
+#: src/frontend/mame/ui/inputmap.cpp:331
 msgid "Pressed"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:397
+#: src/frontend/mame/ui/inputmap.cpp:401
 msgid "Invalid sequence entered"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:542
+#: src/frontend/mame/ui/inputmap.cpp:546
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:543
+#: src/frontend/mame/ui/inputmap.cpp:547
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog Inc"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:544
+#: src/frontend/mame/ui/inputmap.cpp:548
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog Dec"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:586
+#: src/frontend/mame/ui/inputmap.cpp:590
 #, c-format
 msgid "Press %1$s to set\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:587
+#: src/frontend/mame/ui/inputmap.cpp:591
 #, c-format
 msgid "Press %1$s to append\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:588
+#: src/frontend/mame/ui/inputmap.cpp:592
 #, c-format
 msgid "Press %1$s to clear\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:589
+#: src/frontend/mame/ui/inputmap.cpp:593
 #, c-format
 msgid "Press %1$s to restore default\n"
 msgstr ""
@@ -1753,7 +1753,7 @@ msgid ""
 msgstr ""
 
 #: src/frontend/mame/ui/simpleselgame.cpp:273
-#: src/frontend/mame/ui/selgame.cpp:436
+#: src/frontend/mame/ui/selgame.cpp:443
 msgid "Configure Options"
 msgstr ""
 
@@ -2081,16 +2081,16 @@ msgstr ""
 msgid "Expand to fit"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:437
+#: src/frontend/mame/ui/selgame.cpp:444
 msgid "Configure Machine"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:1050
+#: src/frontend/mame/ui/selgame.cpp:1060
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d machines (%5$d BIOS) )"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:1078
+#: src/frontend/mame/ui/selgame.cpp:1088
 #, c-format
 msgid "System: %1$-.100s"
 msgstr ""
@@ -2112,7 +2112,7 @@ msgstr ""
 #: src/frontend/mame/ui/auditmenu.cpp:98
 #, c-format
 msgid ""
-"Auditing ROMs for machine %2$u of %3$u...\n"
+"Auditing media for machine %2$u of %3$u...\n"
 "%1$s"
 msgstr ""
 
@@ -2127,12 +2127,12 @@ msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:136
 #, c-format
-msgid "Audit ROMs for %1$u machines marked unavailable"
+msgid "Audit media for %1$u machines marked unavailable"
 msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:137
 #, c-format
-msgid "Audit ROMs for all %1$u machines"
+msgid "Audit media for all %1$u machines"
 msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:154
@@ -2338,84 +2338,84 @@ msgctxt "color-sample"
 msgid "Clone"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:914
+#: src/frontend/mame/ui/custui.cpp:906
 msgid "ARGB Settings"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:919 src/frontend/mame/ui/custui.cpp:922
+#: src/frontend/mame/ui/custui.cpp:911 src/frontend/mame/ui/custui.cpp:914
 msgctxt "color-channel"
 msgid "Alpha"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:927 src/frontend/mame/ui/custui.cpp:930
+#: src/frontend/mame/ui/custui.cpp:919 src/frontend/mame/ui/custui.cpp:922
 msgctxt "color-channel"
 msgid "Red"
 msgstr ""
 
+#: src/frontend/mame/ui/custui.cpp:927 src/frontend/mame/ui/custui.cpp:930
+msgctxt "color-channel"
+msgid "Green"
+msgstr ""
+
 #: src/frontend/mame/ui/custui.cpp:935 src/frontend/mame/ui/custui.cpp:938
 msgctxt "color-channel"
-msgid "Green"
-msgstr ""
-
-#: src/frontend/mame/ui/custui.cpp:943 src/frontend/mame/ui/custui.cpp:946
-msgctxt "color-channel"
 msgid "Blue"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:949
+#: src/frontend/mame/ui/custui.cpp:941
 msgid "Choose from palette"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:996
+#: src/frontend/mame/ui/custui.cpp:988
 msgid "Color preview:"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1093
+#: src/frontend/mame/ui/custui.cpp:1085
 msgctxt "color-preset"
 msgid "White"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1094
+#: src/frontend/mame/ui/custui.cpp:1086
 msgctxt "color-preset"
 msgid "Silver"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1095
+#: src/frontend/mame/ui/custui.cpp:1087
 msgctxt "color-preset"
 msgid "Gray"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1096
+#: src/frontend/mame/ui/custui.cpp:1088
 msgctxt "color-preset"
 msgid "Black"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1097
+#: src/frontend/mame/ui/custui.cpp:1089
 msgctxt "color-preset"
 msgid "Red"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1098
+#: src/frontend/mame/ui/custui.cpp:1090
 msgctxt "color-preset"
 msgid "Orange"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1099
+#: src/frontend/mame/ui/custui.cpp:1091
 msgctxt "color-preset"
 msgid "Yellow"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1100
+#: src/frontend/mame/ui/custui.cpp:1092
 msgctxt "color-preset"
 msgid "Green"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1101
+#: src/frontend/mame/ui/custui.cpp:1093
 msgctxt "color-preset"
 msgid "Blue"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1102
+#: src/frontend/mame/ui/custui.cpp:1094
 msgctxt "color-preset"
 msgid "Violet"
 msgstr ""
@@ -2480,7 +2480,7 @@ msgid "Input (general)"
 msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:123
-msgid "Input (this Machine)"
+msgid "Input (this machine)"
 msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:126
@@ -2519,6 +2519,10 @@ msgstr ""
 msgid "Tape Control"
 msgstr ""
 
+#: src/frontend/mame/ui/mainmenu.cpp:155
+msgid "Pseudo Terminals"
+msgstr ""
+
 #: src/frontend/mame/ui/mainmenu.cpp:158
 msgid "BIOS Selection"
 msgstr ""
@@ -2557,7 +2561,7 @@ msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:200
 #, c-format
-msgid "About %s"
+msgid "About %1$s"
 msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:212
@@ -2717,373 +2721,373 @@ msgstr ""
 msgid "%1$s %2$s"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2235
+#: src/frontend/mame/ui/selmenu.cpp:2244
 msgid "Images"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2236
+#: src/frontend/mame/ui/selmenu.cpp:2245
 msgid "Infos"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2551
+#: src/frontend/mame/ui/selmenu.cpp:2560
 msgid ""
 "Required ROM/disk images for the selected system are missing or incorrect. "
 "Please acquire the correct files or select a different system.\n"
 "\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2567
+#: src/frontend/mame/ui/selmenu.cpp:2576
 msgid ""
 "Required ROM/disk images for the selected software are missing or incorrect. "
 "Please acquire the correct files or select a different software item.\n"
 "\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2583
+#: src/frontend/mame/ui/selmenu.cpp:2592
 msgid "incorrect checksum"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2586
+#: src/frontend/mame/ui/selmenu.cpp:2595
 msgid "incorrect length"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2589
+#: src/frontend/mame/ui/selmenu.cpp:2598
 msgid "not found"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2600
+#: src/frontend/mame/ui/selmenu.cpp:2609
 #, c-format
 msgid "%1$s (%2$s) - %3$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2602
+#: src/frontend/mame/ui/selmenu.cpp:2611
 #, c-format
 msgid "%1$s - %2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2606
+#: src/frontend/mame/ui/selmenu.cpp:2615
 msgid "Press any key to continue."
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2735
+#: src/frontend/mame/ui/selmenu.cpp:2744
 msgid "General Info"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2887
-#, c-format
-msgid "Romset\t%1$s\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2888
-#, c-format
-msgid "Year\t%1$s\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2889
-#, c-format
-msgid "Manufacturer\t%1$s\n"
-msgstr ""
-
 #: src/frontend/mame/ui/selmenu.cpp:2896
 #, c-format
-msgid "Driver is Clone of\t%1$s\n"
+msgid "Romset\t%1$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2901
-msgid "Driver is Parent\t\n"
+#: src/frontend/mame/ui/selmenu.cpp:2897
+#, c-format
+msgid "Year\t%1$s\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2898
+#, c-format
+msgid "Manufacturer\t%1$s\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2905
-msgid "Analog Controls\tYes\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2907
-msgid "Keyboard Inputs\tYes\n"
+#, c-format
+msgid "Driver is Clone of\t%1$s\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2910
-msgid "Overall\tNOT WORKING\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2912
-msgid "Overall\tUnemulated Protection\n"
+msgid "Driver is Parent\t\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2914
-msgid "Overall\tWorking\n"
+msgid "Analog Controls\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2917
-msgid "Graphics\tUnimplemented\n"
+#: src/frontend/mame/ui/selmenu.cpp:2916
+msgid "Keyboard Inputs\tYes\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2919
-msgid "Graphics\tWrong Colors\n"
+msgid "Overall\tNOT WORKING\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2921
-msgid "Graphics\tImperfect Colors\n"
+msgid "Overall\tUnemulated Protection\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2923
-msgid "Graphics\tImperfect\n"
+msgid "Overall\tWorking\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2925
-msgid "Graphics\tOK\n"
+#: src/frontend/mame/ui/selmenu.cpp:2926
+msgid "Graphics\tUnimplemented\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2928
-msgid "Sound\tNone\n"
+msgid "Graphics\tWrong Colors\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2930
-msgid "Sound\tUnimplemented\n"
+msgid "Graphics\tImperfect Colors\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2932
-msgid "Sound\tImperfect\n"
+msgid "Graphics\tImperfect\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2934
-msgid "Sound\tOK\n"
+msgid "Graphics\tOK\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2937
-msgid "Capture\tUnimplemented\n"
+msgid "Sound\tNone\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2939
+msgid "Sound\tUnimplemented\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2941
+msgid "Sound\tImperfect\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2943
+msgid "Sound\tOK\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2946
+msgid "Capture\tUnimplemented\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2948
 msgid "Capture\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2942
+#: src/frontend/mame/ui/selmenu.cpp:2951
 msgid "Camera\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2944
+#: src/frontend/mame/ui/selmenu.cpp:2953
 msgid "Camera\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2947
+#: src/frontend/mame/ui/selmenu.cpp:2956
 msgid "Microphone\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2949
+#: src/frontend/mame/ui/selmenu.cpp:2958
 msgid "Microphone\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2952
+#: src/frontend/mame/ui/selmenu.cpp:2961
 msgid "Controls\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2954
+#: src/frontend/mame/ui/selmenu.cpp:2963
 msgid "Controls\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2957
+#: src/frontend/mame/ui/selmenu.cpp:2966
 msgid "Keyboard\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2959
+#: src/frontend/mame/ui/selmenu.cpp:2968
 msgid "Keyboard\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2962
+#: src/frontend/mame/ui/selmenu.cpp:2971
 msgid "Mouse\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2964
+#: src/frontend/mame/ui/selmenu.cpp:2973
 msgid "Mouse\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2967
+#: src/frontend/mame/ui/selmenu.cpp:2976
 msgid "Media\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2969
+#: src/frontend/mame/ui/selmenu.cpp:2978
 msgid "Media\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2972
+#: src/frontend/mame/ui/selmenu.cpp:2981
 msgid "Disk\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2974
+#: src/frontend/mame/ui/selmenu.cpp:2983
 msgid "Disk\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2977
+#: src/frontend/mame/ui/selmenu.cpp:2986
 msgid "Printer\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2979
+#: src/frontend/mame/ui/selmenu.cpp:2988
 msgid "Printer\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2982
+#: src/frontend/mame/ui/selmenu.cpp:2991
 msgid "Mag. Tape\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2984
+#: src/frontend/mame/ui/selmenu.cpp:2993
 msgid "Mag. Tape\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2987
+#: src/frontend/mame/ui/selmenu.cpp:2996
 msgid "Punch Tape\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2989
+#: src/frontend/mame/ui/selmenu.cpp:2998
 msgid "Punch Tape\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2992
+#: src/frontend/mame/ui/selmenu.cpp:3001
 msgid "Mag. Drum\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2994
+#: src/frontend/mame/ui/selmenu.cpp:3003
 msgid "Mag. Drum\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2997
+#: src/frontend/mame/ui/selmenu.cpp:3006
 msgid "(EP)ROM\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2999
+#: src/frontend/mame/ui/selmenu.cpp:3008
 msgid "(EP)ROM\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3002
+#: src/frontend/mame/ui/selmenu.cpp:3011
 msgid "Communications\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3004
+#: src/frontend/mame/ui/selmenu.cpp:3013
 msgid "Communications\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3007
+#: src/frontend/mame/ui/selmenu.cpp:3016
 msgid "LAN\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3009
+#: src/frontend/mame/ui/selmenu.cpp:3018
 msgid "LAN\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3012
+#: src/frontend/mame/ui/selmenu.cpp:3021
 msgid "WAN\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3014
+#: src/frontend/mame/ui/selmenu.cpp:3023
 msgid "WAN\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3017
+#: src/frontend/mame/ui/selmenu.cpp:3026
 msgid "Timing\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3019
+#: src/frontend/mame/ui/selmenu.cpp:3028
 msgid "Timing\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3021
+#: src/frontend/mame/ui/selmenu.cpp:3030
 msgid "Mechanical Machine\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3021
+#: src/frontend/mame/ui/selmenu.cpp:3030
 msgid "Mechanical Machine\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3022
+#: src/frontend/mame/ui/selmenu.cpp:3031
 msgid "Requires Artwork\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3022
+#: src/frontend/mame/ui/selmenu.cpp:3031
 msgid "Requires Artwork\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3023
+#: src/frontend/mame/ui/selmenu.cpp:3032
 msgid "Requires Clickable Artwork\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3023
+#: src/frontend/mame/ui/selmenu.cpp:3032
 msgid "Requires Clickable Artwork\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3025
+#: src/frontend/mame/ui/selmenu.cpp:3034
 msgid "Support Cocktail\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3026
+#: src/frontend/mame/ui/selmenu.cpp:3035
 msgid "Driver is BIOS\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3026
+#: src/frontend/mame/ui/selmenu.cpp:3035
 msgid "Driver is BIOS\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3027
+#: src/frontend/mame/ui/selmenu.cpp:3036
 msgid "Support Save\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3027
+#: src/frontend/mame/ui/selmenu.cpp:3036
 msgid "Support Save\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3028
+#: src/frontend/mame/ui/selmenu.cpp:3037
 msgid "Screen Orientation\tVertical\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3028
+#: src/frontend/mame/ui/selmenu.cpp:3037
 msgid "Screen Orientation\tHorizontal\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3038
+#: src/frontend/mame/ui/selmenu.cpp:3047
 msgid "Requires CHD\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3038
+#: src/frontend/mame/ui/selmenu.cpp:3047
 msgid "Requires CHD\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3051
-msgid "ROM Audit Result\tOK\n"
+#: src/frontend/mame/ui/selmenu.cpp:3060
+msgid "Media Audit Result\tOK\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3053
-msgid "ROM Audit Result\tBAD\n"
+#: src/frontend/mame/ui/selmenu.cpp:3062
+msgid "Media Audit Result\tBAD\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3056
+#: src/frontend/mame/ui/selmenu.cpp:3065
 msgid "Samples Audit Result\tNone Needed\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3058
+#: src/frontend/mame/ui/selmenu.cpp:3067
 msgid "Samples Audit Result\tOK\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3060
+#: src/frontend/mame/ui/selmenu.cpp:3069
 msgid "Samples Audit Result\tBAD\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3064
+#: src/frontend/mame/ui/selmenu.cpp:3073
 msgid ""
-"ROM Audit \tDisabled\n"
-"Samples Audit \tDisabled\n"
+"Media Audit\tDisabled\n"
+"Samples Audit\tDisabled\n"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:150
+#: src/frontend/mame/ui/sndmenu.cpp:146
 msgid "Sound"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:151
+#: src/frontend/mame/ui/sndmenu.cpp:147
 msgid "Compressor"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:152
+#: src/frontend/mame/ui/sndmenu.cpp:148
 msgid "Sample Rate"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:153
+#: src/frontend/mame/ui/sndmenu.cpp:149
 msgid "Use External Samples"
 msgstr ""
 
@@ -3122,511 +3126,681 @@ msgstr ""
 msgid "  Screen '%1$s': Vector\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:132
+#: src/frontend/mame/ui/devopt.cpp:135
 #, c-format
 msgid "  Screen '%1$s': %2$d × %3$d (V) %4$s Hz\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:133
+#: src/frontend/mame/ui/devopt.cpp:136
 #, c-format
 msgid "  Screen '%1$s': %2$d × %3$d (H) %4$s Hz\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:147
+#: src/frontend/mame/ui/devopt.cpp:150
 msgid "* Sound:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:211
+#: src/frontend/mame/ui/devopt.cpp:214
 #, c-format
 msgid ""
 "* BIOS settings:\n"
 "  %1$d options    [default: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:255 src/frontend/mame/ui/devopt.cpp:271
-#: src/frontend/mame/ui/devopt.cpp:332
+#: src/frontend/mame/ui/devopt.cpp:258 src/frontend/mame/ui/devopt.cpp:274
+#: src/frontend/mame/ui/devopt.cpp:335
 #, c-format
 msgid "  %1$s    [default: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:260 src/frontend/mame/ui/devopt.cpp:276
+#: src/frontend/mame/ui/devopt.cpp:263 src/frontend/mame/ui/devopt.cpp:279
 #, c-format
 msgid "  %1$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:282
+#: src/frontend/mame/ui/devopt.cpp:285
 msgid "* DIP switch settings:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:287
+#: src/frontend/mame/ui/devopt.cpp:290
 msgid "* Configuration settings:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:291
+#: src/frontend/mame/ui/devopt.cpp:294
 msgid "* Input device(s):\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:293
+#: src/frontend/mame/ui/devopt.cpp:296
 #, c-format
 msgid "  User inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:295
+#: src/frontend/mame/ui/devopt.cpp:298
 #, c-format
 msgid "  Mahjong inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:297
+#: src/frontend/mame/ui/devopt.cpp:300
 #, c-format
 msgid "  Hanafuda inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:299
+#: src/frontend/mame/ui/devopt.cpp:302
 #, c-format
 msgid "  Gambling inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:301
+#: src/frontend/mame/ui/devopt.cpp:304
 #, c-format
 msgid "  Analog inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:303
+#: src/frontend/mame/ui/devopt.cpp:306
 #, c-format
 msgid "  Adjuster inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:305
+#: src/frontend/mame/ui/devopt.cpp:308
 #, c-format
 msgid "  Keypad inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:307
+#: src/frontend/mame/ui/devopt.cpp:310
 #, c-format
 msgid "  Keyboard inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:312
+#: src/frontend/mame/ui/devopt.cpp:315
 msgid "* Media Options:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:317
+#: src/frontend/mame/ui/devopt.cpp:320
 #, c-format
 msgid "  %1$s    [tag: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:327
+#: src/frontend/mame/ui/devopt.cpp:330
 msgid "* Slot Options:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:341
+#: src/frontend/mame/ui/devopt.cpp:344
 msgid "[None]\n"
 msgstr ""
 
-#: src/emu/render.cpp:1847
+#: src/emu/render.cpp:1796
 #, c-format
 msgctxt "view-name"
 msgid "Screen %1$u Standard (%2$u:%3$u)"
 msgstr ""
 
-#: src/emu/render.cpp:1873
+#: src/emu/render.cpp:1822
 #, c-format
 msgctxt "view-name"
 msgid "Screen %1$u Pixel Aspect (%2$u:%3$u)"
 msgstr ""
 
-#: src/emu/render.cpp:1895 src/emu/render.cpp:2030
+#: src/emu/render.cpp:1844 src/emu/render.cpp:1979
 msgctxt "view-name"
 msgid "Cocktail"
 msgstr ""
 
-#: src/emu/render.cpp:2015
+#: src/emu/render.cpp:1964
 msgctxt "view-name"
 msgid "Left-to-Right"
 msgstr ""
 
-#: src/emu/render.cpp:2016
+#: src/emu/render.cpp:1965
 msgctxt "view-name"
 msgid "Left-to-Right (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2017
+#: src/emu/render.cpp:1966
 msgctxt "view-name"
 msgid "Top-to-Bottom"
 msgstr ""
 
-#: src/emu/render.cpp:2018
+#: src/emu/render.cpp:1967
 msgctxt "view-name"
 msgid "Top-to-Bottom (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2069
+#: src/emu/render.cpp:2018
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Left-to-Right, Top-to-Bottom"
 msgstr ""
 
-#: src/emu/render.cpp:2078
+#: src/emu/render.cpp:2027
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Left-to-Right, Top-to-Bottom (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2087
+#: src/emu/render.cpp:2036
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Top-to-Bottom, Left-to-Right"
 msgstr ""
 
-#: src/emu/render.cpp:2096
+#: src/emu/render.cpp:2045
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Top-to-Bottom, Left-to-Right (Gapless)"
 msgstr ""
 
-#: src/emu/inpttype.ipp:22
+#: src/emu/ioport.cpp:332
+#, c-format
 msgctxt "input-name"
-msgid "P1 Up"
+msgid "P%1$u"
 msgstr ""
 
-#: src/emu/inpttype.ipp:23
+#: src/emu/ioport.cpp:1924
 msgctxt "input-name"
-msgid "P1 Down"
+msgid "???"
 msgstr ""
 
-#: src/emu/inpttype.ipp:24
+#: src/emu/inpttype.ipp:22 src/emu/inpttype.ipp:140 src/emu/inpttype.ipp:221
+#: src/emu/inpttype.ipp:255 src/emu/inpttype.ipp:289 src/emu/inpttype.ipp:323
+#: src/emu/inpttype.ipp:357 src/emu/inpttype.ipp:391 src/emu/inpttype.ipp:425
+#: src/emu/inpttype.ipp:459
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left"
+msgid "%p Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:25
+#: src/emu/inpttype.ipp:23 src/emu/inpttype.ipp:141 src/emu/inpttype.ipp:222
+#: src/emu/inpttype.ipp:256 src/emu/inpttype.ipp:290 src/emu/inpttype.ipp:324
+#: src/emu/inpttype.ipp:358 src/emu/inpttype.ipp:392 src/emu/inpttype.ipp:426
+#: src/emu/inpttype.ipp:460
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right"
+msgid "%p Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:26
+#: src/emu/inpttype.ipp:24 src/emu/inpttype.ipp:142 src/emu/inpttype.ipp:223
+#: src/emu/inpttype.ipp:257 src/emu/inpttype.ipp:291 src/emu/inpttype.ipp:325
+#: src/emu/inpttype.ipp:359 src/emu/inpttype.ipp:393 src/emu/inpttype.ipp:427
+#: src/emu/inpttype.ipp:461
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Up"
+msgid "%p Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:27
+#: src/emu/inpttype.ipp:25 src/emu/inpttype.ipp:143 src/emu/inpttype.ipp:224
+#: src/emu/inpttype.ipp:258 src/emu/inpttype.ipp:292 src/emu/inpttype.ipp:326
+#: src/emu/inpttype.ipp:360 src/emu/inpttype.ipp:394 src/emu/inpttype.ipp:428
+#: src/emu/inpttype.ipp:462
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Down"
+msgid "%p Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:28
+#: src/emu/inpttype.ipp:26 src/emu/inpttype.ipp:144 src/emu/inpttype.ipp:225
+#: src/emu/inpttype.ipp:259 src/emu/inpttype.ipp:293 src/emu/inpttype.ipp:327
+#: src/emu/inpttype.ipp:361 src/emu/inpttype.ipp:395 src/emu/inpttype.ipp:429
+#: src/emu/inpttype.ipp:463
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Left"
+msgid "%p Right Stick/Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:29
+#: src/emu/inpttype.ipp:27 src/emu/inpttype.ipp:145 src/emu/inpttype.ipp:226
+#: src/emu/inpttype.ipp:260 src/emu/inpttype.ipp:294 src/emu/inpttype.ipp:328
+#: src/emu/inpttype.ipp:362 src/emu/inpttype.ipp:396 src/emu/inpttype.ipp:430
+#: src/emu/inpttype.ipp:464
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Right"
+msgid "%p Right Stick/Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:30
+#: src/emu/inpttype.ipp:28 src/emu/inpttype.ipp:146 src/emu/inpttype.ipp:227
+#: src/emu/inpttype.ipp:261 src/emu/inpttype.ipp:295 src/emu/inpttype.ipp:329
+#: src/emu/inpttype.ipp:363 src/emu/inpttype.ipp:397 src/emu/inpttype.ipp:431
+#: src/emu/inpttype.ipp:465
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Up"
+msgid "%p Right Stick/Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:31
+#: src/emu/inpttype.ipp:29 src/emu/inpttype.ipp:147 src/emu/inpttype.ipp:228
+#: src/emu/inpttype.ipp:262 src/emu/inpttype.ipp:296 src/emu/inpttype.ipp:330
+#: src/emu/inpttype.ipp:364 src/emu/inpttype.ipp:398 src/emu/inpttype.ipp:432
+#: src/emu/inpttype.ipp:466
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Down"
+msgid "%p Right Stick/Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:32
+#: src/emu/inpttype.ipp:30 src/emu/inpttype.ipp:148 src/emu/inpttype.ipp:229
+#: src/emu/inpttype.ipp:263 src/emu/inpttype.ipp:297 src/emu/inpttype.ipp:331
+#: src/emu/inpttype.ipp:365 src/emu/inpttype.ipp:399 src/emu/inpttype.ipp:433
+#: src/emu/inpttype.ipp:467
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Left"
+msgid "%p Left Stick/Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:33
+#: src/emu/inpttype.ipp:31 src/emu/inpttype.ipp:149 src/emu/inpttype.ipp:230
+#: src/emu/inpttype.ipp:264 src/emu/inpttype.ipp:298 src/emu/inpttype.ipp:332
+#: src/emu/inpttype.ipp:366 src/emu/inpttype.ipp:400 src/emu/inpttype.ipp:434
+#: src/emu/inpttype.ipp:468
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Right"
+msgid "%p Left Stick/Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:34
+#: src/emu/inpttype.ipp:32 src/emu/inpttype.ipp:150 src/emu/inpttype.ipp:231
+#: src/emu/inpttype.ipp:265 src/emu/inpttype.ipp:299 src/emu/inpttype.ipp:333
+#: src/emu/inpttype.ipp:367 src/emu/inpttype.ipp:401 src/emu/inpttype.ipp:435
+#: src/emu/inpttype.ipp:469
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 1"
+msgid "%p Left Stick/Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:35
+#: src/emu/inpttype.ipp:33 src/emu/inpttype.ipp:151 src/emu/inpttype.ipp:232
+#: src/emu/inpttype.ipp:266 src/emu/inpttype.ipp:300 src/emu/inpttype.ipp:334
+#: src/emu/inpttype.ipp:368 src/emu/inpttype.ipp:402 src/emu/inpttype.ipp:436
+#: src/emu/inpttype.ipp:470
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 2"
+msgid "%p Left Stick/Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:36
+#: src/emu/inpttype.ipp:34 src/emu/inpttype.ipp:152 src/emu/inpttype.ipp:233
+#: src/emu/inpttype.ipp:267 src/emu/inpttype.ipp:301 src/emu/inpttype.ipp:335
+#: src/emu/inpttype.ipp:369 src/emu/inpttype.ipp:403 src/emu/inpttype.ipp:437
+#: src/emu/inpttype.ipp:471
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 3"
+msgid "%p Button 1"
 msgstr ""
 
-#: src/emu/inpttype.ipp:37
+#: src/emu/inpttype.ipp:35 src/emu/inpttype.ipp:153 src/emu/inpttype.ipp:234
+#: src/emu/inpttype.ipp:268 src/emu/inpttype.ipp:302 src/emu/inpttype.ipp:336
+#: src/emu/inpttype.ipp:370 src/emu/inpttype.ipp:404 src/emu/inpttype.ipp:438
+#: src/emu/inpttype.ipp:472
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 4"
+msgid "%p Button 2"
 msgstr ""
 
-#: src/emu/inpttype.ipp:38
+#: src/emu/inpttype.ipp:36 src/emu/inpttype.ipp:154 src/emu/inpttype.ipp:235
+#: src/emu/inpttype.ipp:269 src/emu/inpttype.ipp:303 src/emu/inpttype.ipp:337
+#: src/emu/inpttype.ipp:371 src/emu/inpttype.ipp:405 src/emu/inpttype.ipp:439
+#: src/emu/inpttype.ipp:473
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 5"
+msgid "%p Button 3"
 msgstr ""
 
-#: src/emu/inpttype.ipp:39
+#: src/emu/inpttype.ipp:37 src/emu/inpttype.ipp:155 src/emu/inpttype.ipp:236
+#: src/emu/inpttype.ipp:270 src/emu/inpttype.ipp:304 src/emu/inpttype.ipp:338
+#: src/emu/inpttype.ipp:372 src/emu/inpttype.ipp:406 src/emu/inpttype.ipp:440
+#: src/emu/inpttype.ipp:474
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 6"
+msgid "%p Button 4"
 msgstr ""
 
-#: src/emu/inpttype.ipp:40
+#: src/emu/inpttype.ipp:38 src/emu/inpttype.ipp:156 src/emu/inpttype.ipp:237
+#: src/emu/inpttype.ipp:271 src/emu/inpttype.ipp:305 src/emu/inpttype.ipp:339
+#: src/emu/inpttype.ipp:373 src/emu/inpttype.ipp:407 src/emu/inpttype.ipp:441
+#: src/emu/inpttype.ipp:475
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 7"
+msgid "%p Button 5"
 msgstr ""
 
-#: src/emu/inpttype.ipp:41
+#: src/emu/inpttype.ipp:39 src/emu/inpttype.ipp:157 src/emu/inpttype.ipp:238
+#: src/emu/inpttype.ipp:272 src/emu/inpttype.ipp:306 src/emu/inpttype.ipp:340
+#: src/emu/inpttype.ipp:374 src/emu/inpttype.ipp:408 src/emu/inpttype.ipp:442
+#: src/emu/inpttype.ipp:476
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 8"
+msgid "%p Button 6"
 msgstr ""
 
-#: src/emu/inpttype.ipp:42
+#: src/emu/inpttype.ipp:40 src/emu/inpttype.ipp:158 src/emu/inpttype.ipp:239
+#: src/emu/inpttype.ipp:273 src/emu/inpttype.ipp:307 src/emu/inpttype.ipp:341
+#: src/emu/inpttype.ipp:375 src/emu/inpttype.ipp:409 src/emu/inpttype.ipp:443
+#: src/emu/inpttype.ipp:477
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 9"
+msgid "%p Button 7"
 msgstr ""
 
-#: src/emu/inpttype.ipp:43
+#: src/emu/inpttype.ipp:41 src/emu/inpttype.ipp:159 src/emu/inpttype.ipp:240
+#: src/emu/inpttype.ipp:274 src/emu/inpttype.ipp:308 src/emu/inpttype.ipp:342
+#: src/emu/inpttype.ipp:376 src/emu/inpttype.ipp:410 src/emu/inpttype.ipp:444
+#: src/emu/inpttype.ipp:478
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 10"
+msgid "%p Button 8"
 msgstr ""
 
-#: src/emu/inpttype.ipp:44
+#: src/emu/inpttype.ipp:42 src/emu/inpttype.ipp:160 src/emu/inpttype.ipp:241
+#: src/emu/inpttype.ipp:275 src/emu/inpttype.ipp:309 src/emu/inpttype.ipp:343
+#: src/emu/inpttype.ipp:377 src/emu/inpttype.ipp:411 src/emu/inpttype.ipp:445
+#: src/emu/inpttype.ipp:479
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 11"
+msgid "%p Button 9"
 msgstr ""
 
-#: src/emu/inpttype.ipp:45
+#: src/emu/inpttype.ipp:43 src/emu/inpttype.ipp:161 src/emu/inpttype.ipp:242
+#: src/emu/inpttype.ipp:276 src/emu/inpttype.ipp:310 src/emu/inpttype.ipp:344
+#: src/emu/inpttype.ipp:378 src/emu/inpttype.ipp:412 src/emu/inpttype.ipp:446
+#: src/emu/inpttype.ipp:480
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 12"
+msgid "%p Button 10"
 msgstr ""
 
-#: src/emu/inpttype.ipp:46
+#: src/emu/inpttype.ipp:44 src/emu/inpttype.ipp:162 src/emu/inpttype.ipp:243
+#: src/emu/inpttype.ipp:277 src/emu/inpttype.ipp:311 src/emu/inpttype.ipp:345
+#: src/emu/inpttype.ipp:379 src/emu/inpttype.ipp:413 src/emu/inpttype.ipp:447
+#: src/emu/inpttype.ipp:481
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 13"
+msgid "%p Button 11"
 msgstr ""
 
-#: src/emu/inpttype.ipp:47
+#: src/emu/inpttype.ipp:45 src/emu/inpttype.ipp:163 src/emu/inpttype.ipp:244
+#: src/emu/inpttype.ipp:278 src/emu/inpttype.ipp:312 src/emu/inpttype.ipp:346
+#: src/emu/inpttype.ipp:380 src/emu/inpttype.ipp:414 src/emu/inpttype.ipp:448
+#: src/emu/inpttype.ipp:482
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 14"
+msgid "%p Button 12"
 msgstr ""
 
-#: src/emu/inpttype.ipp:48
+#: src/emu/inpttype.ipp:46 src/emu/inpttype.ipp:164 src/emu/inpttype.ipp:245
+#: src/emu/inpttype.ipp:279 src/emu/inpttype.ipp:313 src/emu/inpttype.ipp:347
+#: src/emu/inpttype.ipp:381 src/emu/inpttype.ipp:415 src/emu/inpttype.ipp:449
+#: src/emu/inpttype.ipp:483
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 15"
+msgid "%p Button 13"
 msgstr ""
 
-#: src/emu/inpttype.ipp:49
+#: src/emu/inpttype.ipp:47 src/emu/inpttype.ipp:165 src/emu/inpttype.ipp:246
+#: src/emu/inpttype.ipp:280 src/emu/inpttype.ipp:314 src/emu/inpttype.ipp:348
+#: src/emu/inpttype.ipp:382 src/emu/inpttype.ipp:416 src/emu/inpttype.ipp:450
+#: src/emu/inpttype.ipp:484
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 16"
+msgid "%p Button 14"
 msgstr ""
 
-#: src/emu/inpttype.ipp:50
+#: src/emu/inpttype.ipp:48 src/emu/inpttype.ipp:166 src/emu/inpttype.ipp:247
+#: src/emu/inpttype.ipp:281 src/emu/inpttype.ipp:315 src/emu/inpttype.ipp:349
+#: src/emu/inpttype.ipp:383 src/emu/inpttype.ipp:417 src/emu/inpttype.ipp:451
+#: src/emu/inpttype.ipp:485
+#, c-format
 msgctxt "input-name"
-msgid "P1 Start"
+msgid "%p Button 15"
 msgstr ""
 
-#: src/emu/inpttype.ipp:51
+#: src/emu/inpttype.ipp:49 src/emu/inpttype.ipp:167 src/emu/inpttype.ipp:248
+#: src/emu/inpttype.ipp:282 src/emu/inpttype.ipp:316 src/emu/inpttype.ipp:350
+#: src/emu/inpttype.ipp:384 src/emu/inpttype.ipp:418 src/emu/inpttype.ipp:452
+#: src/emu/inpttype.ipp:486
+#, c-format
 msgctxt "input-name"
-msgid "P1 Select"
+msgid "%p Button 16"
 msgstr ""
 
-#: src/emu/inpttype.ipp:56
+#: src/emu/inpttype.ipp:50 src/emu/inpttype.ipp:168 src/emu/inpttype.ipp:249
+#: src/emu/inpttype.ipp:283 src/emu/inpttype.ipp:317 src/emu/inpttype.ipp:351
+#: src/emu/inpttype.ipp:385 src/emu/inpttype.ipp:419 src/emu/inpttype.ipp:453
+#: src/emu/inpttype.ipp:487
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong A"
+msgid "%p Start"
 msgstr ""
 
-#: src/emu/inpttype.ipp:57
+#: src/emu/inpttype.ipp:51 src/emu/inpttype.ipp:169 src/emu/inpttype.ipp:250
+#: src/emu/inpttype.ipp:284 src/emu/inpttype.ipp:318 src/emu/inpttype.ipp:352
+#: src/emu/inpttype.ipp:386 src/emu/inpttype.ipp:420 src/emu/inpttype.ipp:454
+#: src/emu/inpttype.ipp:488
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong B"
+msgid "%p Select"
 msgstr ""
 
-#: src/emu/inpttype.ipp:58
+#: src/emu/inpttype.ipp:56 src/emu/inpttype.ipp:174
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong C"
+msgid "%p Mahjong A"
 msgstr ""
 
-#: src/emu/inpttype.ipp:59
+#: src/emu/inpttype.ipp:57 src/emu/inpttype.ipp:175
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong D"
+msgid "%p Mahjong B"
 msgstr ""
 
-#: src/emu/inpttype.ipp:60
+#: src/emu/inpttype.ipp:58 src/emu/inpttype.ipp:176
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong E"
+msgid "%p Mahjong C"
 msgstr ""
 
-#: src/emu/inpttype.ipp:61
+#: src/emu/inpttype.ipp:59 src/emu/inpttype.ipp:177
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong F"
+msgid "%p Mahjong D"
 msgstr ""
 
-#: src/emu/inpttype.ipp:62
+#: src/emu/inpttype.ipp:60 src/emu/inpttype.ipp:178
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong G"
+msgid "%p Mahjong E"
 msgstr ""
 
-#: src/emu/inpttype.ipp:63
+#: src/emu/inpttype.ipp:61 src/emu/inpttype.ipp:179
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong H"
+msgid "%p Mahjong F"
 msgstr ""
 
-#: src/emu/inpttype.ipp:64
+#: src/emu/inpttype.ipp:62 src/emu/inpttype.ipp:180
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong I"
+msgid "%p Mahjong G"
 msgstr ""
 
-#: src/emu/inpttype.ipp:65
+#: src/emu/inpttype.ipp:63 src/emu/inpttype.ipp:181
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong J"
+msgid "%p Mahjong H"
 msgstr ""
 
-#: src/emu/inpttype.ipp:66
+#: src/emu/inpttype.ipp:64 src/emu/inpttype.ipp:182
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong K"
+msgid "%p Mahjong I"
 msgstr ""
 
-#: src/emu/inpttype.ipp:67
+#: src/emu/inpttype.ipp:65 src/emu/inpttype.ipp:183
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong L"
+msgid "%p Mahjong J"
 msgstr ""
 
-#: src/emu/inpttype.ipp:68
+#: src/emu/inpttype.ipp:66 src/emu/inpttype.ipp:184
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong M"
+msgid "%p Mahjong K"
 msgstr ""
 
-#: src/emu/inpttype.ipp:69
+#: src/emu/inpttype.ipp:67 src/emu/inpttype.ipp:185
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong N"
+msgid "%p Mahjong L"
 msgstr ""
 
-#: src/emu/inpttype.ipp:70
+#: src/emu/inpttype.ipp:68 src/emu/inpttype.ipp:186
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong O"
+msgid "%p Mahjong M"
 msgstr ""
 
-#: src/emu/inpttype.ipp:71
+#: src/emu/inpttype.ipp:69 src/emu/inpttype.ipp:187
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong P"
+msgid "%p Mahjong N"
 msgstr ""
 
-#: src/emu/inpttype.ipp:72
+#: src/emu/inpttype.ipp:70 src/emu/inpttype.ipp:188
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Q"
+msgid "%p Mahjong O"
 msgstr ""
 
-#: src/emu/inpttype.ipp:73
+#: src/emu/inpttype.ipp:71 src/emu/inpttype.ipp:189
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Kan"
+msgid "%p Mahjong P"
 msgstr ""
 
-#: src/emu/inpttype.ipp:74
+#: src/emu/inpttype.ipp:72 src/emu/inpttype.ipp:190
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Pon"
+msgid "%p Mahjong Q"
 msgstr ""
 
-#: src/emu/inpttype.ipp:75
+#: src/emu/inpttype.ipp:73 src/emu/inpttype.ipp:191
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Chi"
+msgid "%p Mahjong Kan"
 msgstr ""
 
-#: src/emu/inpttype.ipp:76
+#: src/emu/inpttype.ipp:74 src/emu/inpttype.ipp:192
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Reach"
+msgid "%p Mahjong Pon"
 msgstr ""
 
-#: src/emu/inpttype.ipp:77
+#: src/emu/inpttype.ipp:75 src/emu/inpttype.ipp:193
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Ron"
+msgid "%p Mahjong Chi"
 msgstr ""
 
-#: src/emu/inpttype.ipp:78
+#: src/emu/inpttype.ipp:76 src/emu/inpttype.ipp:194
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Flip Flop"
+msgid "%p Mahjong Reach"
 msgstr ""
 
-#: src/emu/inpttype.ipp:79
+#: src/emu/inpttype.ipp:77 src/emu/inpttype.ipp:195
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Bet"
+msgid "%p Mahjong Ron"
 msgstr ""
 
-#: src/emu/inpttype.ipp:80
+#: src/emu/inpttype.ipp:78 src/emu/inpttype.ipp:200
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Take Score"
+msgid "%p Mahjong Flip Flop"
 msgstr ""
 
-#: src/emu/inpttype.ipp:81
+#: src/emu/inpttype.ipp:79 src/emu/inpttype.ipp:196
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Double Up"
+msgid "%p Mahjong Bet"
 msgstr ""
 
-#: src/emu/inpttype.ipp:82
+#: src/emu/inpttype.ipp:80 src/emu/inpttype.ipp:198
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Big"
+msgid "%p Mahjong Take Score"
 msgstr ""
 
-#: src/emu/inpttype.ipp:83
+#: src/emu/inpttype.ipp:81 src/emu/inpttype.ipp:199
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Small"
+msgid "%p Mahjong Double Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:84
+#: src/emu/inpttype.ipp:82 src/emu/inpttype.ipp:201
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Last Chance"
+msgid "%p Mahjong Big"
 msgstr ""
 
-#: src/emu/inpttype.ipp:89
+#: src/emu/inpttype.ipp:83 src/emu/inpttype.ipp:202
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda A/1"
+msgid "%p Mahjong Small"
 msgstr ""
 
-#: src/emu/inpttype.ipp:90
+#: src/emu/inpttype.ipp:84 src/emu/inpttype.ipp:197
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda B/2"
+msgid "%p Mahjong Last Chance"
 msgstr ""
 
-#: src/emu/inpttype.ipp:91
+#: src/emu/inpttype.ipp:89 src/emu/inpttype.ipp:207
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda C/3"
+msgid "%p Hanafuda A/1"
 msgstr ""
 
-#: src/emu/inpttype.ipp:92
+#: src/emu/inpttype.ipp:90 src/emu/inpttype.ipp:208
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda D/4"
+msgid "%p Hanafuda B/2"
 msgstr ""
 
-#: src/emu/inpttype.ipp:93
+#: src/emu/inpttype.ipp:91 src/emu/inpttype.ipp:209
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda E/5"
+msgid "%p Hanafuda C/3"
 msgstr ""
 
-#: src/emu/inpttype.ipp:94
+#: src/emu/inpttype.ipp:92 src/emu/inpttype.ipp:210
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda F/6"
+msgid "%p Hanafuda D/4"
 msgstr ""
 
-#: src/emu/inpttype.ipp:95
+#: src/emu/inpttype.ipp:93 src/emu/inpttype.ipp:211
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda G/7"
+msgid "%p Hanafuda E/5"
 msgstr ""
 
-#: src/emu/inpttype.ipp:96
+#: src/emu/inpttype.ipp:94 src/emu/inpttype.ipp:212
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda H/8"
+msgid "%p Hanafuda F/6"
 msgstr ""
 
-#: src/emu/inpttype.ipp:97
+#: src/emu/inpttype.ipp:95 src/emu/inpttype.ipp:213
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda Yes"
+msgid "%p Hanafuda G/7"
 msgstr ""
 
-#: src/emu/inpttype.ipp:98
+#: src/emu/inpttype.ipp:96 src/emu/inpttype.ipp:214
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda No"
+msgid "%p Hanafuda H/8"
+msgstr ""
+
+#: src/emu/inpttype.ipp:97 src/emu/inpttype.ipp:215
+#, c-format
+msgctxt "input-name"
+msgid "%p Hanafuda Yes"
+msgstr ""
+
+#: src/emu/inpttype.ipp:98 src/emu/inpttype.ipp:216
+#, c-format
+msgctxt "input-name"
+msgid "%p Hanafuda No"
 msgstr ""
 
 #: src/emu/inpttype.ipp:103
@@ -3754,1551 +3928,6 @@ msgctxt "input-name"
 msgid "Stop All Reels"
 msgstr ""
 
-#: src/emu/inpttype.ipp:140
-msgctxt "input-name"
-msgid "P2 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:141
-msgctxt "input-name"
-msgid "P2 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:142
-msgctxt "input-name"
-msgid "P2 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:143
-msgctxt "input-name"
-msgid "P2 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:144
-msgctxt "input-name"
-msgid "P2 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:145
-msgctxt "input-name"
-msgid "P2 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:146
-msgctxt "input-name"
-msgid "P2 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:147
-msgctxt "input-name"
-msgid "P2 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:148
-msgctxt "input-name"
-msgid "P2 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:149
-msgctxt "input-name"
-msgid "P2 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:150
-msgctxt "input-name"
-msgid "P2 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:151
-msgctxt "input-name"
-msgid "P2 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:152
-msgctxt "input-name"
-msgid "P2 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:153
-msgctxt "input-name"
-msgid "P2 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:154
-msgctxt "input-name"
-msgid "P2 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:155
-msgctxt "input-name"
-msgid "P2 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:156
-msgctxt "input-name"
-msgid "P2 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:157
-msgctxt "input-name"
-msgid "P2 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:158
-msgctxt "input-name"
-msgid "P2 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:159
-msgctxt "input-name"
-msgid "P2 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:160
-msgctxt "input-name"
-msgid "P2 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:161
-msgctxt "input-name"
-msgid "P2 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:162
-msgctxt "input-name"
-msgid "P2 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:163
-msgctxt "input-name"
-msgid "P2 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:164
-msgctxt "input-name"
-msgid "P2 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:165
-msgctxt "input-name"
-msgid "P2 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:166
-msgctxt "input-name"
-msgid "P2 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:167
-msgctxt "input-name"
-msgid "P2 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:168
-msgctxt "input-name"
-msgid "P2 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:169
-msgctxt "input-name"
-msgid "P2 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:174
-msgctxt "input-name"
-msgid "P2 Mahjong A"
-msgstr ""
-
-#: src/emu/inpttype.ipp:175
-msgctxt "input-name"
-msgid "P2 Mahjong B"
-msgstr ""
-
-#: src/emu/inpttype.ipp:176
-msgctxt "input-name"
-msgid "P2 Mahjong C"
-msgstr ""
-
-#: src/emu/inpttype.ipp:177
-msgctxt "input-name"
-msgid "P2 Mahjong D"
-msgstr ""
-
-#: src/emu/inpttype.ipp:178
-msgctxt "input-name"
-msgid "P2 Mahjong E"
-msgstr ""
-
-#: src/emu/inpttype.ipp:179
-msgctxt "input-name"
-msgid "P2 Mahjong F"
-msgstr ""
-
-#: src/emu/inpttype.ipp:180
-msgctxt "input-name"
-msgid "P2 Mahjong G"
-msgstr ""
-
-#: src/emu/inpttype.ipp:181
-msgctxt "input-name"
-msgid "P2 Mahjong H"
-msgstr ""
-
-#: src/emu/inpttype.ipp:182
-msgctxt "input-name"
-msgid "P2 Mahjong I"
-msgstr ""
-
-#: src/emu/inpttype.ipp:183
-msgctxt "input-name"
-msgid "P2 Mahjong J"
-msgstr ""
-
-#: src/emu/inpttype.ipp:184
-msgctxt "input-name"
-msgid "P2 Mahjong K"
-msgstr ""
-
-#: src/emu/inpttype.ipp:185
-msgctxt "input-name"
-msgid "P2 Mahjong L"
-msgstr ""
-
-#: src/emu/inpttype.ipp:186
-msgctxt "input-name"
-msgid "P2 Mahjong M"
-msgstr ""
-
-#: src/emu/inpttype.ipp:187
-msgctxt "input-name"
-msgid "P2 Mahjong N"
-msgstr ""
-
-#: src/emu/inpttype.ipp:188
-msgctxt "input-name"
-msgid "P2 Mahjong O"
-msgstr ""
-
-#: src/emu/inpttype.ipp:189
-msgctxt "input-name"
-msgid "P2 Mahjong P"
-msgstr ""
-
-#: src/emu/inpttype.ipp:190
-msgctxt "input-name"
-msgid "P2 Mahjong Q"
-msgstr ""
-
-#: src/emu/inpttype.ipp:191
-msgctxt "input-name"
-msgid "P2 Mahjong Kan"
-msgstr ""
-
-#: src/emu/inpttype.ipp:192
-msgctxt "input-name"
-msgid "P2 Mahjong Pon"
-msgstr ""
-
-#: src/emu/inpttype.ipp:193
-msgctxt "input-name"
-msgid "P2 Mahjong Chi"
-msgstr ""
-
-#: src/emu/inpttype.ipp:194
-msgctxt "input-name"
-msgid "P2 Mahjong Reach"
-msgstr ""
-
-#: src/emu/inpttype.ipp:195
-msgctxt "input-name"
-msgid "P2 Mahjong Ron"
-msgstr ""
-
-#: src/emu/inpttype.ipp:196
-msgctxt "input-name"
-msgid "P2 Mahjong Bet"
-msgstr ""
-
-#: src/emu/inpttype.ipp:197
-msgctxt "input-name"
-msgid "P2 Mahjong Last Chance"
-msgstr ""
-
-#: src/emu/inpttype.ipp:198
-msgctxt "input-name"
-msgid "P2 Mahjong Take Score"
-msgstr ""
-
-#: src/emu/inpttype.ipp:199
-msgctxt "input-name"
-msgid "P2 Mahjong Double Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:200
-msgctxt "input-name"
-msgid "P2 Mahjong Flip Flop"
-msgstr ""
-
-#: src/emu/inpttype.ipp:201
-msgctxt "input-name"
-msgid "P2 Mahjong Big"
-msgstr ""
-
-#: src/emu/inpttype.ipp:202
-msgctxt "input-name"
-msgid "P2 Mahjong Small"
-msgstr ""
-
-#: src/emu/inpttype.ipp:207
-msgctxt "input-name"
-msgid "P2 Hanafuda A/1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:208
-msgctxt "input-name"
-msgid "P2 Hanafuda B/2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:209
-msgctxt "input-name"
-msgid "P2 Hanafuda C/3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:210
-msgctxt "input-name"
-msgid "P2 Hanafuda D/4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:211
-msgctxt "input-name"
-msgid "P2 Hanafuda E/5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:212
-msgctxt "input-name"
-msgid "P2 Hanafuda F/6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:213
-msgctxt "input-name"
-msgid "P2 Hanafuda G/7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:214
-msgctxt "input-name"
-msgid "P2 Hanafuda H/8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:215
-msgctxt "input-name"
-msgid "P2 Hanafuda Yes"
-msgstr ""
-
-#: src/emu/inpttype.ipp:216
-msgctxt "input-name"
-msgid "P2 Hanafuda No"
-msgstr ""
-
-#: src/emu/inpttype.ipp:221
-msgctxt "input-name"
-msgid "P3 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:222
-msgctxt "input-name"
-msgid "P3 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:223
-msgctxt "input-name"
-msgid "P3 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:224
-msgctxt "input-name"
-msgid "P3 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:225
-msgctxt "input-name"
-msgid "P3 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:226
-msgctxt "input-name"
-msgid "P3 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:227
-msgctxt "input-name"
-msgid "P3 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:228
-msgctxt "input-name"
-msgid "P3 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:229
-msgctxt "input-name"
-msgid "P3 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:230
-msgctxt "input-name"
-msgid "P3 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:231
-msgctxt "input-name"
-msgid "P3 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:232
-msgctxt "input-name"
-msgid "P3 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:233
-msgctxt "input-name"
-msgid "P3 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:234
-msgctxt "input-name"
-msgid "P3 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:235
-msgctxt "input-name"
-msgid "P3 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:236
-msgctxt "input-name"
-msgid "P3 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:237
-msgctxt "input-name"
-msgid "P3 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:238
-msgctxt "input-name"
-msgid "P3 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:239
-msgctxt "input-name"
-msgid "P3 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:240
-msgctxt "input-name"
-msgid "P3 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:241
-msgctxt "input-name"
-msgid "P3 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:242
-msgctxt "input-name"
-msgid "P3 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:243
-msgctxt "input-name"
-msgid "P3 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:244
-msgctxt "input-name"
-msgid "P3 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:245
-msgctxt "input-name"
-msgid "P3 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:246
-msgctxt "input-name"
-msgid "P3 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:247
-msgctxt "input-name"
-msgid "P3 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:248
-msgctxt "input-name"
-msgid "P3 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:249
-msgctxt "input-name"
-msgid "P3 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:250
-msgctxt "input-name"
-msgid "P3 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:255
-msgctxt "input-name"
-msgid "P4 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:256
-msgctxt "input-name"
-msgid "P4 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:257
-msgctxt "input-name"
-msgid "P4 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:258
-msgctxt "input-name"
-msgid "P4 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:259
-msgctxt "input-name"
-msgid "P4 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:260
-msgctxt "input-name"
-msgid "P4 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:261
-msgctxt "input-name"
-msgid "P4 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:262
-msgctxt "input-name"
-msgid "P4 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:263
-msgctxt "input-name"
-msgid "P4 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:264
-msgctxt "input-name"
-msgid "P4 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:265
-msgctxt "input-name"
-msgid "P4 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:266
-msgctxt "input-name"
-msgid "P4 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:267
-msgctxt "input-name"
-msgid "P4 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:268
-msgctxt "input-name"
-msgid "P4 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:269
-msgctxt "input-name"
-msgid "P4 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:270
-msgctxt "input-name"
-msgid "P4 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:271
-msgctxt "input-name"
-msgid "P4 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:272
-msgctxt "input-name"
-msgid "P4 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:273
-msgctxt "input-name"
-msgid "P4 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:274
-msgctxt "input-name"
-msgid "P4 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:275
-msgctxt "input-name"
-msgid "P4 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:276
-msgctxt "input-name"
-msgid "P4 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:277
-msgctxt "input-name"
-msgid "P4 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:278
-msgctxt "input-name"
-msgid "P4 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:279
-msgctxt "input-name"
-msgid "P4 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:280
-msgctxt "input-name"
-msgid "P4 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:281
-msgctxt "input-name"
-msgid "P4 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:282
-msgctxt "input-name"
-msgid "P4 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:283
-msgctxt "input-name"
-msgid "P4 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:284
-msgctxt "input-name"
-msgid "P4 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:289
-msgctxt "input-name"
-msgid "P5 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:290
-msgctxt "input-name"
-msgid "P5 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:291
-msgctxt "input-name"
-msgid "P5 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:292
-msgctxt "input-name"
-msgid "P5 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:293
-msgctxt "input-name"
-msgid "P5 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:294
-msgctxt "input-name"
-msgid "P5 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:295
-msgctxt "input-name"
-msgid "P5 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:296
-msgctxt "input-name"
-msgid "P5 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:297
-msgctxt "input-name"
-msgid "P5 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:298
-msgctxt "input-name"
-msgid "P5 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:299
-msgctxt "input-name"
-msgid "P5 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:300
-msgctxt "input-name"
-msgid "P5 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:301
-msgctxt "input-name"
-msgid "P5 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:302
-msgctxt "input-name"
-msgid "P5 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:303
-msgctxt "input-name"
-msgid "P5 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:304
-msgctxt "input-name"
-msgid "P5 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:305
-msgctxt "input-name"
-msgid "P5 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:306
-msgctxt "input-name"
-msgid "P5 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:307
-msgctxt "input-name"
-msgid "P5 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:308
-msgctxt "input-name"
-msgid "P5 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:309
-msgctxt "input-name"
-msgid "P5 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:310
-msgctxt "input-name"
-msgid "P5 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:311
-msgctxt "input-name"
-msgid "P5 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:312
-msgctxt "input-name"
-msgid "P5 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:313
-msgctxt "input-name"
-msgid "P5 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:314
-msgctxt "input-name"
-msgid "P5 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:315
-msgctxt "input-name"
-msgid "P5 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:316
-msgctxt "input-name"
-msgid "P5 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:317
-msgctxt "input-name"
-msgid "P5 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:318
-msgctxt "input-name"
-msgid "P5 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:323
-msgctxt "input-name"
-msgid "P6 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:324
-msgctxt "input-name"
-msgid "P6 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:325
-msgctxt "input-name"
-msgid "P6 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:326
-msgctxt "input-name"
-msgid "P6 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:327
-msgctxt "input-name"
-msgid "P6 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:328
-msgctxt "input-name"
-msgid "P6 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:329
-msgctxt "input-name"
-msgid "P6 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:330
-msgctxt "input-name"
-msgid "P6 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:331
-msgctxt "input-name"
-msgid "P6 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:332
-msgctxt "input-name"
-msgid "P6 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:333
-msgctxt "input-name"
-msgid "P6 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:334
-msgctxt "input-name"
-msgid "P6 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:335
-msgctxt "input-name"
-msgid "P6 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:336
-msgctxt "input-name"
-msgid "P6 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:337
-msgctxt "input-name"
-msgid "P6 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:338
-msgctxt "input-name"
-msgid "P6 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:339
-msgctxt "input-name"
-msgid "P6 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:340
-msgctxt "input-name"
-msgid "P6 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:341
-msgctxt "input-name"
-msgid "P6 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:342
-msgctxt "input-name"
-msgid "P6 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:343
-msgctxt "input-name"
-msgid "P6 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:344
-msgctxt "input-name"
-msgid "P6 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:345
-msgctxt "input-name"
-msgid "P6 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:346
-msgctxt "input-name"
-msgid "P6 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:347
-msgctxt "input-name"
-msgid "P6 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:348
-msgctxt "input-name"
-msgid "P6 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:349
-msgctxt "input-name"
-msgid "P6 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:350
-msgctxt "input-name"
-msgid "P6 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:351
-msgctxt "input-name"
-msgid "P6 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:352
-msgctxt "input-name"
-msgid "P6 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:357
-msgctxt "input-name"
-msgid "P7 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:358
-msgctxt "input-name"
-msgid "P7 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:359
-msgctxt "input-name"
-msgid "P7 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:360
-msgctxt "input-name"
-msgid "P7 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:361
-msgctxt "input-name"
-msgid "P7 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:362
-msgctxt "input-name"
-msgid "P7 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:363
-msgctxt "input-name"
-msgid "P7 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:364
-msgctxt "input-name"
-msgid "P7 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:365
-msgctxt "input-name"
-msgid "P7 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:366
-msgctxt "input-name"
-msgid "P7 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:367
-msgctxt "input-name"
-msgid "P7 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:368
-msgctxt "input-name"
-msgid "P7 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:369
-msgctxt "input-name"
-msgid "P7 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:370
-msgctxt "input-name"
-msgid "P7 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:371
-msgctxt "input-name"
-msgid "P7 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:372
-msgctxt "input-name"
-msgid "P7 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:373
-msgctxt "input-name"
-msgid "P7 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:374
-msgctxt "input-name"
-msgid "P7 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:375
-msgctxt "input-name"
-msgid "P7 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:376
-msgctxt "input-name"
-msgid "P7 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:377
-msgctxt "input-name"
-msgid "P7 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:378
-msgctxt "input-name"
-msgid "P7 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:379
-msgctxt "input-name"
-msgid "P7 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:380
-msgctxt "input-name"
-msgid "P7 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:381
-msgctxt "input-name"
-msgid "P7 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:382
-msgctxt "input-name"
-msgid "P7 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:383
-msgctxt "input-name"
-msgid "P7 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:384
-msgctxt "input-name"
-msgid "P7 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:385
-msgctxt "input-name"
-msgid "P7 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:386
-msgctxt "input-name"
-msgid "P7 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:391
-msgctxt "input-name"
-msgid "P8 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:392
-msgctxt "input-name"
-msgid "P8 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:393
-msgctxt "input-name"
-msgid "P8 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:394
-msgctxt "input-name"
-msgid "P8 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:395
-msgctxt "input-name"
-msgid "P8 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:396
-msgctxt "input-name"
-msgid "P8 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:397
-msgctxt "input-name"
-msgid "P8 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:398
-msgctxt "input-name"
-msgid "P8 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:399
-msgctxt "input-name"
-msgid "P8 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:400
-msgctxt "input-name"
-msgid "P8 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:401
-msgctxt "input-name"
-msgid "P8 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:402
-msgctxt "input-name"
-msgid "P8 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:403
-msgctxt "input-name"
-msgid "P8 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:404
-msgctxt "input-name"
-msgid "P8 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:405
-msgctxt "input-name"
-msgid "P8 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:406
-msgctxt "input-name"
-msgid "P8 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:407
-msgctxt "input-name"
-msgid "P8 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:408
-msgctxt "input-name"
-msgid "P8 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:409
-msgctxt "input-name"
-msgid "P8 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:410
-msgctxt "input-name"
-msgid "P8 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:411
-msgctxt "input-name"
-msgid "P8 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:412
-msgctxt "input-name"
-msgid "P8 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:413
-msgctxt "input-name"
-msgid "P8 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:414
-msgctxt "input-name"
-msgid "P8 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:415
-msgctxt "input-name"
-msgid "P8 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:416
-msgctxt "input-name"
-msgid "P8 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:417
-msgctxt "input-name"
-msgid "P8 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:418
-msgctxt "input-name"
-msgid "P8 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:419
-msgctxt "input-name"
-msgid "P8 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:420
-msgctxt "input-name"
-msgid "P8 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:425
-msgctxt "input-name"
-msgid "P9 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:426
-msgctxt "input-name"
-msgid "P9 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:427
-msgctxt "input-name"
-msgid "P9 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:428
-msgctxt "input-name"
-msgid "P9 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:429
-msgctxt "input-name"
-msgid "P9 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:430
-msgctxt "input-name"
-msgid "P9 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:431
-msgctxt "input-name"
-msgid "P9 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:432
-msgctxt "input-name"
-msgid "P9 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:433
-msgctxt "input-name"
-msgid "P9 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:434
-msgctxt "input-name"
-msgid "P9 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:435
-msgctxt "input-name"
-msgid "P9 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:436
-msgctxt "input-name"
-msgid "P9 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:437
-msgctxt "input-name"
-msgid "P9 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:438
-msgctxt "input-name"
-msgid "P9 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:439
-msgctxt "input-name"
-msgid "P9 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:440
-msgctxt "input-name"
-msgid "P9 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:441
-msgctxt "input-name"
-msgid "P9 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:442
-msgctxt "input-name"
-msgid "P9 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:443
-msgctxt "input-name"
-msgid "P9 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:444
-msgctxt "input-name"
-msgid "P9 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:445
-msgctxt "input-name"
-msgid "P9 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:446
-msgctxt "input-name"
-msgid "P9 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:447
-msgctxt "input-name"
-msgid "P9 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:448
-msgctxt "input-name"
-msgid "P9 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:449
-msgctxt "input-name"
-msgid "P9 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:450
-msgctxt "input-name"
-msgid "P9 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:451
-msgctxt "input-name"
-msgid "P9 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:452
-msgctxt "input-name"
-msgid "P9 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:453
-msgctxt "input-name"
-msgid "P9 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:454
-msgctxt "input-name"
-msgid "P9 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:459
-msgctxt "input-name"
-msgid "P10 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:460
-msgctxt "input-name"
-msgid "P10 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:461
-msgctxt "input-name"
-msgid "P10 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:462
-msgctxt "input-name"
-msgid "P10 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:463
-msgctxt "input-name"
-msgid "P10 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:464
-msgctxt "input-name"
-msgid "P10 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:465
-msgctxt "input-name"
-msgid "P10 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:466
-msgctxt "input-name"
-msgid "P10 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:467
-msgctxt "input-name"
-msgid "P10 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:468
-msgctxt "input-name"
-msgid "P10 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:469
-msgctxt "input-name"
-msgid "P10 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:470
-msgctxt "input-name"
-msgid "P10 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:471
-msgctxt "input-name"
-msgid "P10 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:472
-msgctxt "input-name"
-msgid "P10 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:473
-msgctxt "input-name"
-msgid "P10 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:474
-msgctxt "input-name"
-msgid "P10 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:475
-msgctxt "input-name"
-msgid "P10 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:476
-msgctxt "input-name"
-msgid "P10 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:477
-msgctxt "input-name"
-msgid "P10 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:478
-msgctxt "input-name"
-msgid "P10 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:479
-msgctxt "input-name"
-msgid "P10 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:480
-msgctxt "input-name"
-msgid "P10 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:481
-msgctxt "input-name"
-msgid "P10 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:482
-msgctxt "input-name"
-msgid "P10 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:483
-msgctxt "input-name"
-msgid "P10 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:484
-msgctxt "input-name"
-msgid "P10 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:485
-msgctxt "input-name"
-msgid "P10 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:486
-msgctxt "input-name"
-msgid "P10 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:487
-msgctxt "input-name"
-msgid "P10 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:488
-msgctxt "input-name"
-msgid "P10 Select"
-msgstr ""
-
 #: src/emu/inpttype.ipp:493
 msgctxt "input-name"
 msgid "1 Player Start"
@@ -5479,154 +4108,31 @@ msgctxt "input-name"
 msgid "Volume Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:550
-msgctxt "input-name"
-msgid "P1 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:551
-msgctxt "input-name"
-msgid "P2 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:552
-msgctxt "input-name"
-msgid "P3 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:553
-msgctxt "input-name"
-msgid "P4 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:554
-msgctxt "input-name"
-msgid "P5 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:555
-msgctxt "input-name"
-msgid "P6 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:556
-msgctxt "input-name"
-msgid "P7 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:557
-msgctxt "input-name"
-msgid "P8 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:558
-msgctxt "input-name"
-msgid "P9 Pedal 1"
-msgstr ""
-
+#: src/emu/inpttype.ipp:550 src/emu/inpttype.ipp:551 src/emu/inpttype.ipp:552
+#: src/emu/inpttype.ipp:553 src/emu/inpttype.ipp:554 src/emu/inpttype.ipp:555
+#: src/emu/inpttype.ipp:556 src/emu/inpttype.ipp:557 src/emu/inpttype.ipp:558
 #: src/emu/inpttype.ipp:559
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:564
-msgctxt "input-name"
-msgid "P1 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:565
-msgctxt "input-name"
-msgid "P2 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:566
-msgctxt "input-name"
-msgid "P3 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:567
-msgctxt "input-name"
-msgid "P4 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:568
-msgctxt "input-name"
-msgid "P5 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:569
-msgctxt "input-name"
-msgid "P6 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:570
-msgctxt "input-name"
-msgid "P7 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:571
-msgctxt "input-name"
-msgid "P8 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:572
-msgctxt "input-name"
-msgid "P9 Pedal 2"
+msgid "%p Pedal 1"
 msgstr ""
 
+#: src/emu/inpttype.ipp:564 src/emu/inpttype.ipp:565 src/emu/inpttype.ipp:566
+#: src/emu/inpttype.ipp:567 src/emu/inpttype.ipp:568 src/emu/inpttype.ipp:569
+#: src/emu/inpttype.ipp:570 src/emu/inpttype.ipp:571 src/emu/inpttype.ipp:572
 #: src/emu/inpttype.ipp:573
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:578
-msgctxt "input-name"
-msgid "P1 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:579
-msgctxt "input-name"
-msgid "P2 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:580
-msgctxt "input-name"
-msgid "P3 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:581
-msgctxt "input-name"
-msgid "P4 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:582
-msgctxt "input-name"
-msgid "P5 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:583
-msgctxt "input-name"
-msgid "P6 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:584
-msgctxt "input-name"
-msgid "P7 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:585
-msgctxt "input-name"
-msgid "P8 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:586
-msgctxt "input-name"
-msgid "P9 Pedal 3"
+msgid "%p Pedal 2"
 msgstr ""
 
+#: src/emu/inpttype.ipp:578 src/emu/inpttype.ipp:579 src/emu/inpttype.ipp:580
+#: src/emu/inpttype.ipp:581 src/emu/inpttype.ipp:582 src/emu/inpttype.ipp:583
+#: src/emu/inpttype.ipp:584 src/emu/inpttype.ipp:585 src/emu/inpttype.ipp:586
 #: src/emu/inpttype.ipp:587
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 3"
+msgid "%p Pedal 3"
 msgstr ""
 
 #: src/emu/inpttype.ipp:592
diff --git a/language/Spanish/strings.po b/language/Spanish/strings.po
index 7b52aa95f4d..41042714aff 100644
--- a/language/Spanish/strings.po
+++ b/language/Spanish/strings.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-19 02:50+1100\n"
+"POT-Creation-Date: 2021-12-09 04:44+1100\n"
 "PO-Revision-Date: 2016-03-05 13:02+0100\n"
 "Last-Translator: aviloria\n"
 "Language-Team: Español; Castellano <>\n"
@@ -276,12 +276,12 @@ msgstr "%1$s %2$s ( %3$d / %4$d paquetes de software )"
 msgid "Driver: \"%1$s\" software list "
 msgstr "Controlador: \"%1$s\" lista de software "
 
-#: src/frontend/mame/ui/selsoft.cpp:711 src/frontend/mame/ui/selgame.cpp:1066
+#: src/frontend/mame/ui/selsoft.cpp:711 src/frontend/mame/ui/selgame.cpp:1076
 #, c-format
 msgid "%1$s: %2$s - Search: %3$s_"
 msgstr "%1$s: %2$s - Buscar: %3$s_"
 
-#: src/frontend/mame/ui/selsoft.cpp:713 src/frontend/mame/ui/selgame.cpp:1068
+#: src/frontend/mame/ui/selsoft.cpp:713 src/frontend/mame/ui/selgame.cpp:1078
 #, c-format
 msgid "Search: %1$s_"
 msgstr "Buscar: %1$s_"
@@ -291,7 +291,7 @@ msgstr "Buscar: %1$s_"
 msgid "Software list/item: %1$s:%2$s"
 msgstr ""
 
-#: src/frontend/mame/ui/optsmenu.cpp:73 src/frontend/mame/ui/sndmenu.cpp:165
+#: src/frontend/mame/ui/optsmenu.cpp:73 src/frontend/mame/ui/sndmenu.cpp:161
 msgid "Sound Options"
 msgstr "Opciones de sonido"
 
@@ -386,12 +386,12 @@ msgid "Show mouse pointer"
 msgstr "Mostrar puntero del ratón"
 
 #: src/frontend/mame/ui/submenu.cpp:39
-msgid "Confirm quit from machines"
-msgstr "Confirmar salida de máquina"
+msgid "Confirm quit from emulation"
+msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:40
-msgid "Skip information screen at startup"
-msgstr "Evitar la pantalla de información al inicio"
+msgid "Skip system information screen"
+msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:41
 msgid "Force 4:3 aspect for snapshot display"
@@ -406,8 +406,8 @@ msgid "Skip BIOS selection menu"
 msgstr "Saltar el menú de selección de BIOS"
 
 #: src/frontend/mame/ui/submenu.cpp:44
-msgid "Skip software parts selection menu"
-msgstr "Saltar el menú de selección de software"
+msgid "Skip software part selection menu"
+msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:45
 msgid "Info auto audit"
@@ -558,8 +558,8 @@ msgid "UI active"
 msgstr "Interfaz de usuario activa"
 
 #: src/frontend/mame/ui/submenu.cpp:91
-msgid "Offscreen reload"
-msgstr "Recarga no visible"
+msgid "Off-screen reload"
+msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:92
 msgid "Joystick deadzone"
@@ -574,8 +574,8 @@ msgid "Natural keyboard"
 msgstr "Teclado natural"
 
 #: src/frontend/mame/ui/submenu.cpp:95
-msgid "Simultaneous contradictory"
-msgstr "Entradas contradictorias simultáneas"
+msgid "Allow contradictory joystick inputs"
+msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:96
 msgid "Coin impulse"
@@ -598,7 +598,7 @@ msgid "Pedal Device Assignment"
 msgstr "Asignación de pedales"
 
 #: src/frontend/mame/ui/submenu.cpp:106
-msgid "Adstick Device Assignment"
+msgid "AD Stick Device Assignment"
 msgstr "Asignación de palancas"
 
 #: src/frontend/mame/ui/submenu.cpp:107
@@ -685,14 +685,14 @@ msgstr "Actualización síncrona"
 msgid "Wait Vertical Sync"
 msgstr "Esperar a la sincronización vertical"
 
-#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:687
+#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:689
 #: src/frontend/mame/ui/videoopt.cpp:191 src/frontend/mame/ui/custui.cpp:490
 #: src/frontend/mame/ui/analogipt.cpp:471 plugins/cheatfind/init.lua:766
 #: plugins/cheatfind/init.lua:777 plugins/cheat/init.lua:668
 msgid "On"
 msgstr "Sí"
 
-#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:690
+#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:692
 #: src/frontend/mame/ui/videoopt.cpp:207 src/frontend/mame/ui/custui.cpp:490
 #: src/frontend/mame/ui/analogipt.cpp:471 plugins/cheatfind/init.lua:763
 #: plugins/cheatfind/init.lua:774 plugins/cheat/init.lua:671
@@ -700,11 +700,11 @@ msgstr "Sí"
 msgid "Off"
 msgstr "No"
 
-#: src/frontend/mame/ui/menu.cpp:693
+#: src/frontend/mame/ui/menu.cpp:695
 msgid "Auto"
 msgstr "Automát."
 
-#: src/frontend/mame/ui/menu.cpp:1195
+#: src/frontend/mame/ui/menu.cpp:1197
 #: src/frontend/mame/ui/simpleselgame.cpp:278
 #: src/frontend/mame/ui/selmenu.cpp:1280
 msgid "Return to Previous Menu"
@@ -712,7 +712,7 @@ msgstr "Volver al menú anterior"
 
 #: src/frontend/mame/ui/filemngr.cpp:139
 #: src/frontend/mame/ui/confswitch.cpp:119
-#: src/frontend/mame/ui/inputmap.cpp:559 src/frontend/mame/ui/analogipt.cpp:360
+#: src/frontend/mame/ui/inputmap.cpp:563 src/frontend/mame/ui/analogipt.cpp:360
 #, c-format
 msgid "[root%1$s]"
 msgstr ""
@@ -975,22 +975,22 @@ msgstr ""
 "Procesador:\n"
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "GHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "MHz"
 msgstr "MHz"
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "kHz"
 msgstr "kHz"
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "Hz"
 msgstr ""
 
@@ -1018,38 +1018,38 @@ msgstr "Ninguno\n"
 msgid "Vector"
 msgstr "Vector"
 
-#: src/frontend/mame/ui/info.cpp:480
+#: src/frontend/mame/ui/info.cpp:483
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr "%1$s: %2$s\n"
 
-#: src/frontend/mame/ui/info.cpp:480
+#: src/frontend/mame/ui/info.cpp:483
 msgid "%2$s\n"
 msgstr "%2$s\n"
 
-#: src/frontend/mame/ui/info.cpp:497
+#: src/frontend/mame/ui/info.cpp:500
 #, c-format
 msgid "Screen '%1$s'"
 msgstr "Pantalla «%1$s»"
 
-#: src/frontend/mame/ui/info.cpp:499
+#: src/frontend/mame/ui/info.cpp:502
 msgid "Screen"
 msgstr "Pantalla"
 
-#: src/frontend/mame/ui/info.cpp:570 src/frontend/mame/ui/info.cpp:581
+#: src/frontend/mame/ui/info.cpp:573 src/frontend/mame/ui/info.cpp:584
 #, c-format
 msgid "%1$s:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:662
+#: src/frontend/mame/ui/info.cpp:665
 msgid "Not supported"
 msgstr "No está soportado"
 
-#: src/frontend/mame/ui/info.cpp:665
+#: src/frontend/mame/ui/info.cpp:668
 msgid "Partially supported"
 msgstr "Soportado parcialmente"
 
-#: src/frontend/mame/ui/info.cpp:674
+#: src/frontend/mame/ui/info.cpp:677
 msgid "[empty]"
 msgstr "[vacío]"
 
@@ -1122,7 +1122,7 @@ msgid "Emulated"
 msgstr "Emulado"
 
 #: src/frontend/mame/ui/keyboard.cpp:59 src/frontend/mame/ui/confswitch.cpp:117
-#: src/frontend/mame/ui/inputmap.cpp:557 src/frontend/mame/ui/analogipt.cpp:358
+#: src/frontend/mame/ui/inputmap.cpp:561 src/frontend/mame/ui/analogipt.cpp:358
 #, c-format
 msgid "%1$s [root%2$s]"
 msgstr ""
@@ -1482,7 +1482,7 @@ msgctxt "swlist-info"
 msgid "Software list/item"
 msgstr ""
 
-#: src/frontend/mame/ui/datmenu.cpp:88 src/frontend/mame/ui/selmenu.cpp:2698
+#: src/frontend/mame/ui/datmenu.cpp:88 src/frontend/mame/ui/selmenu.cpp:2707
 msgid "Software List Info"
 msgstr ""
 
@@ -1605,7 +1605,7 @@ msgstr ""
 msgid "Configure Machine:"
 msgstr ""
 
-#: src/frontend/mame/ui/miscmenu.cpp:858 src/frontend/mame/ui/selmenu.cpp:2638
+#: src/frontend/mame/ui/miscmenu.cpp:858 src/frontend/mame/ui/selmenu.cpp:2647
 msgid " (default)"
 msgstr " (predeterminado)"
 
@@ -1626,7 +1626,7 @@ msgstr ""
 "Presiona %1$s para salir\n"
 "Presiona %2$s para volver al emulador"
 
-#: src/frontend/mame/ui/info_pty.cpp:30 src/frontend/mame/ui/mainmenu.cpp:155
+#: src/frontend/mame/ui/info_pty.cpp:30
 msgid "Pseudo terminals"
 msgstr "Pseudo-terminales"
 
@@ -1694,52 +1694,52 @@ msgstr ""
 msgid "Other Controls"
 msgstr "Otros controles"
 
-#: src/frontend/mame/ui/inputmap.cpp:227
+#: src/frontend/mame/ui/inputmap.cpp:231
 msgid "This machine has no configurable inputs."
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:327
+#: src/frontend/mame/ui/inputmap.cpp:331
 msgid "Pressed"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:397
+#: src/frontend/mame/ui/inputmap.cpp:401
 msgid "Invalid sequence entered"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:542
+#: src/frontend/mame/ui/inputmap.cpp:546
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:543
+#: src/frontend/mame/ui/inputmap.cpp:547
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog Inc"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:544
+#: src/frontend/mame/ui/inputmap.cpp:548
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog Dec"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:586
+#: src/frontend/mame/ui/inputmap.cpp:590
 #, c-format
 msgid "Press %1$s to set\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:587
+#: src/frontend/mame/ui/inputmap.cpp:591
 #, c-format
 msgid "Press %1$s to append\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:588
+#: src/frontend/mame/ui/inputmap.cpp:592
 #, c-format
 msgid "Press %1$s to clear\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:589
+#: src/frontend/mame/ui/inputmap.cpp:593
 #, c-format
 msgid "Press %1$s to restore default\n"
 msgstr ""
@@ -1806,7 +1806,7 @@ msgstr ""
 "Pulsa cualquier tecla para continuar."
 
 #: src/frontend/mame/ui/simpleselgame.cpp:273
-#: src/frontend/mame/ui/selgame.cpp:436
+#: src/frontend/mame/ui/selgame.cpp:443
 msgid "Configure Options"
 msgstr "Configurar opciones"
 
@@ -2142,16 +2142,16 @@ msgstr ""
 msgid "Expand to fit"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:437
+#: src/frontend/mame/ui/selgame.cpp:444
 msgid "Configure Machine"
 msgstr "Configurar máquina"
 
-#: src/frontend/mame/ui/selgame.cpp:1050
+#: src/frontend/mame/ui/selgame.cpp:1060
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d machines (%5$d BIOS) )"
 msgstr "%1$s %2$s ( %3$d / %4$d máquinas (%5$d BIOS) )"
 
-#: src/frontend/mame/ui/selgame.cpp:1078
+#: src/frontend/mame/ui/selgame.cpp:1088
 #, c-format
 msgid "System: %1$-.100s"
 msgstr "Sistema: %1$-.100s"
@@ -2173,11 +2173,9 @@ msgstr "Los resultados serán guardados en %1$s"
 #: src/frontend/mame/ui/auditmenu.cpp:98
 #, c-format
 msgid ""
-"Auditing ROMs for machine %2$u of %3$u...\n"
+"Auditing media for machine %2$u of %3$u...\n"
 "%1$s"
 msgstr ""
-"Auditando ROMs para la máquina %2$u de %3$u...\n"
-"%1$s"
 
 #: src/frontend/mame/ui/auditmenu.cpp:116
 #, c-format
@@ -2190,13 +2188,13 @@ msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:136
 #, c-format
-msgid "Audit ROMs for %1$u machines marked unavailable"
-msgstr "Auditar ROMs para las %1$u máquinas marcadas como no-disponibles"
+msgid "Audit media for %1$u machines marked unavailable"
+msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:137
 #, c-format
-msgid "Audit ROMs for all %1$u machines"
-msgstr "Auditar ROMs para todas las %1$u máquinas"
+msgid "Audit media for all %1$u machines"
+msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:154
 #, c-format
@@ -2402,84 +2400,84 @@ msgctxt "color-sample"
 msgid "Clone"
 msgstr "Copiar"
 
-#: src/frontend/mame/ui/custui.cpp:914
+#: src/frontend/mame/ui/custui.cpp:906
 msgid "ARGB Settings"
 msgstr "Ajustes ARGB"
 
-#: src/frontend/mame/ui/custui.cpp:919 src/frontend/mame/ui/custui.cpp:922
+#: src/frontend/mame/ui/custui.cpp:911 src/frontend/mame/ui/custui.cpp:914
 msgctxt "color-channel"
 msgid "Alpha"
 msgstr "Transparencia"
 
-#: src/frontend/mame/ui/custui.cpp:927 src/frontend/mame/ui/custui.cpp:930
+#: src/frontend/mame/ui/custui.cpp:919 src/frontend/mame/ui/custui.cpp:922
 msgctxt "color-channel"
 msgid "Red"
 msgstr "Rojo"
 
-#: src/frontend/mame/ui/custui.cpp:935 src/frontend/mame/ui/custui.cpp:938
+#: src/frontend/mame/ui/custui.cpp:927 src/frontend/mame/ui/custui.cpp:930
 msgctxt "color-channel"
 msgid "Green"
 msgstr "Verde"
 
-#: src/frontend/mame/ui/custui.cpp:943 src/frontend/mame/ui/custui.cpp:946
+#: src/frontend/mame/ui/custui.cpp:935 src/frontend/mame/ui/custui.cpp:938
 msgctxt "color-channel"
 msgid "Blue"
 msgstr "Azul"
 
-#: src/frontend/mame/ui/custui.cpp:949
+#: src/frontend/mame/ui/custui.cpp:941
 msgid "Choose from palette"
 msgstr "Elegir colores más básicos"
 
-#: src/frontend/mame/ui/custui.cpp:996
+#: src/frontend/mame/ui/custui.cpp:988
 msgid "Color preview:"
 msgstr "Vista previa:"
 
-#: src/frontend/mame/ui/custui.cpp:1093
+#: src/frontend/mame/ui/custui.cpp:1085
 msgctxt "color-preset"
 msgid "White"
 msgstr "Blanco"
 
-#: src/frontend/mame/ui/custui.cpp:1094
+#: src/frontend/mame/ui/custui.cpp:1086
 msgctxt "color-preset"
 msgid "Silver"
 msgstr "Plateado"
 
-#: src/frontend/mame/ui/custui.cpp:1095
+#: src/frontend/mame/ui/custui.cpp:1087
 msgctxt "color-preset"
 msgid "Gray"
 msgstr "Gris"
 
-#: src/frontend/mame/ui/custui.cpp:1096
+#: src/frontend/mame/ui/custui.cpp:1088
 msgctxt "color-preset"
 msgid "Black"
 msgstr "Negro"
 
-#: src/frontend/mame/ui/custui.cpp:1097
+#: src/frontend/mame/ui/custui.cpp:1089
 msgctxt "color-preset"
 msgid "Red"
 msgstr "Rojo"
 
-#: src/frontend/mame/ui/custui.cpp:1098
+#: src/frontend/mame/ui/custui.cpp:1090
 msgctxt "color-preset"
 msgid "Orange"
 msgstr "Naranja"
 
-#: src/frontend/mame/ui/custui.cpp:1099
+#: src/frontend/mame/ui/custui.cpp:1091
 msgctxt "color-preset"
 msgid "Yellow"
 msgstr "Amarillo"
 
-#: src/frontend/mame/ui/custui.cpp:1100
+#: src/frontend/mame/ui/custui.cpp:1092
 msgctxt "color-preset"
 msgid "Green"
 msgstr "Verde"
 
-#: src/frontend/mame/ui/custui.cpp:1101
+#: src/frontend/mame/ui/custui.cpp:1093
 msgctxt "color-preset"
 msgid "Blue"
 msgstr "Azul"
 
-#: src/frontend/mame/ui/custui.cpp:1102
+#: src/frontend/mame/ui/custui.cpp:1094
 msgctxt "color-preset"
 msgid "Violet"
 msgstr "Violeta"
@@ -2544,8 +2542,8 @@ msgid "Input (general)"
 msgstr "Entrada (general)"
 
 #: src/frontend/mame/ui/mainmenu.cpp:123
-msgid "Input (this Machine)"
-msgstr "Entrada (esta máquina)"
+msgid "Input (this machine)"
+msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:126
 msgid "Analog Controls"
@@ -2583,6 +2581,10 @@ msgstr "Administrador de archivos"
 msgid "Tape Control"
 msgstr "Control de cinta"
 
+#: src/frontend/mame/ui/mainmenu.cpp:155
+msgid "Pseudo Terminals"
+msgstr ""
+
 #: src/frontend/mame/ui/mainmenu.cpp:158
 msgid "BIOS Selection"
 msgstr "Selección de BIOS"
@@ -2621,7 +2623,7 @@ msgstr "Vista DAT externa"
 
 #: src/frontend/mame/ui/mainmenu.cpp:200
 #, c-format
-msgid "About %s"
+msgid "About %1$s"
 msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:212
@@ -2781,375 +2783,373 @@ msgstr "El controlador es un clon de: %1$s"
 msgid "%1$s %2$s"
 msgstr "%1$s %2$s"
 
-#: src/frontend/mame/ui/selmenu.cpp:2235
+#: src/frontend/mame/ui/selmenu.cpp:2244
 msgid "Images"
 msgstr "Imágenes"
 
-#: src/frontend/mame/ui/selmenu.cpp:2236
+#: src/frontend/mame/ui/selmenu.cpp:2245
 msgid "Infos"
 msgstr "Informaciones"
 
-#: src/frontend/mame/ui/selmenu.cpp:2551
+#: src/frontend/mame/ui/selmenu.cpp:2560
 msgid ""
 "Required ROM/disk images for the selected system are missing or incorrect. "
 "Please acquire the correct files or select a different system.\n"
 "\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2567
+#: src/frontend/mame/ui/selmenu.cpp:2576
 msgid ""
 "Required ROM/disk images for the selected software are missing or incorrect. "
 "Please acquire the correct files or select a different software item.\n"
 "\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2583
+#: src/frontend/mame/ui/selmenu.cpp:2592
 msgid "incorrect checksum"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2586
+#: src/frontend/mame/ui/selmenu.cpp:2595
 msgid "incorrect length"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2589
+#: src/frontend/mame/ui/selmenu.cpp:2598
 msgid "not found"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2600
+#: src/frontend/mame/ui/selmenu.cpp:2609
 #, c-format
 msgid "%1$s (%2$s) - %3$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2602
+#: src/frontend/mame/ui/selmenu.cpp:2611
 #, c-format
 msgid "%1$s - %2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2606
+#: src/frontend/mame/ui/selmenu.cpp:2615
 msgid "Press any key to continue."
 msgstr "Pulsa cualquier tecla para continuar."
 
-#: src/frontend/mame/ui/selmenu.cpp:2735
+#: src/frontend/mame/ui/selmenu.cpp:2744
 msgid "General Info"
 msgstr "Información general"
 
-#: src/frontend/mame/ui/selmenu.cpp:2887
+#: src/frontend/mame/ui/selmenu.cpp:2896
 #, c-format
 msgid "Romset\t%1$s\n"
 msgstr "Conjunto de roms\t%1$s\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2888
+#: src/frontend/mame/ui/selmenu.cpp:2897
 #, c-format
 msgid "Year\t%1$s\n"
 msgstr "Año\t%1$s\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2889
+#: src/frontend/mame/ui/selmenu.cpp:2898
 #, c-format
 msgid "Manufacturer\t%1$s\n"
 msgstr "Fabricante\t%1$s\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2896
+#: src/frontend/mame/ui/selmenu.cpp:2905
 #, c-format
 msgid "Driver is Clone of\t%1$s\n"
 msgstr "El controlador es un clon de\t%1$s\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2901
+#: src/frontend/mame/ui/selmenu.cpp:2910
 msgid "Driver is Parent\t\n"
 msgstr "Es un controlador padre\t\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2905
+#: src/frontend/mame/ui/selmenu.cpp:2914
 msgid "Analog Controls\tYes\n"
 msgstr "Controles analógicos\tSi\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2907
+#: src/frontend/mame/ui/selmenu.cpp:2916
 msgid "Keyboard Inputs\tYes\n"
 msgstr "Entradas de teclado\tSi\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2910
+#: src/frontend/mame/ui/selmenu.cpp:2919
 msgid "Overall\tNOT WORKING\n"
 msgstr "En General\tNO FUNCIONA\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2912
+#: src/frontend/mame/ui/selmenu.cpp:2921
 msgid "Overall\tUnemulated Protection\n"
 msgstr "En General\tProtección no emulada\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2914
+#: src/frontend/mame/ui/selmenu.cpp:2923
 msgid "Overall\tWorking\n"
 msgstr "En General\tFunciona\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2917
+#: src/frontend/mame/ui/selmenu.cpp:2926
 msgid "Graphics\tUnimplemented\n"
 msgstr "Gráficos\tNo implementados\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2919
+#: src/frontend/mame/ui/selmenu.cpp:2928
 msgid "Graphics\tWrong Colors\n"
 msgstr "Gráficos\tColores erróneos\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2921
+#: src/frontend/mame/ui/selmenu.cpp:2930
 msgid "Graphics\tImperfect Colors\n"
 msgstr "Gráficos\tColores imperfectos\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2923
+#: src/frontend/mame/ui/selmenu.cpp:2932
 msgid "Graphics\tImperfect\n"
 msgstr "Gráficos\tImperfectos\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2925
+#: src/frontend/mame/ui/selmenu.cpp:2934
 msgid "Graphics\tOK\n"
 msgstr "Gráficos\tAceptables"
 
-#: src/frontend/mame/ui/selmenu.cpp:2928
+#: src/frontend/mame/ui/selmenu.cpp:2937
 msgid "Sound\tNone\n"
 msgstr "Sonido\tNo\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2930
+#: src/frontend/mame/ui/selmenu.cpp:2939
 msgid "Sound\tUnimplemented\n"
 msgstr "Sonido\tNo implementado\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2932
+#: src/frontend/mame/ui/selmenu.cpp:2941
 msgid "Sound\tImperfect\n"
 msgstr "Sonido\tImperfecto\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2934
+#: src/frontend/mame/ui/selmenu.cpp:2943
 msgid "Sound\tOK\n"
 msgstr "Sonido\tAceptable\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2937
+#: src/frontend/mame/ui/selmenu.cpp:2946
 msgid "Capture\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2939
+#: src/frontend/mame/ui/selmenu.cpp:2948
 msgid "Capture\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2942
+#: src/frontend/mame/ui/selmenu.cpp:2951
 msgid "Camera\tUnimplemented\n"
 msgstr "Cámara\tNo implementada\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2944
+#: src/frontend/mame/ui/selmenu.cpp:2953
 msgid "Camera\tImperfect\n"
 msgstr "Cámara\tImperfecta\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2947
+#: src/frontend/mame/ui/selmenu.cpp:2956
 msgid "Microphone\tUnimplemented\n"
 msgstr "Micrófono\tNo implementado\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2949
+#: src/frontend/mame/ui/selmenu.cpp:2958
 msgid "Microphone\tImperfect\n"
 msgstr "Micrófono\tImperfecto\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2952
+#: src/frontend/mame/ui/selmenu.cpp:2961
 msgid "Controls\tUnimplemented\n"
 msgstr "Controles\tNo implementados\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2954
+#: src/frontend/mame/ui/selmenu.cpp:2963
 msgid "Controls\tImperfect\n"
 msgstr "Controles\tImperfectos\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2957
+#: src/frontend/mame/ui/selmenu.cpp:2966
 msgid "Keyboard\tUnimplemented\n"
 msgstr "Teclado\tNo implementado\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2959
+#: src/frontend/mame/ui/selmenu.cpp:2968
 msgid "Keyboard\tImperfect\n"
 msgstr "Teclado\tImperfecto\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2962
+#: src/frontend/mame/ui/selmenu.cpp:2971
 msgid "Mouse\tUnimplemented\n"
 msgstr "Ratón\tNo implementado\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2964
+#: src/frontend/mame/ui/selmenu.cpp:2973
 msgid "Mouse\tImperfect\n"
 msgstr "Ratón\tImperfecto\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2967
+#: src/frontend/mame/ui/selmenu.cpp:2976
 msgid "Media\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2969
+#: src/frontend/mame/ui/selmenu.cpp:2978
 msgid "Media\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2972
+#: src/frontend/mame/ui/selmenu.cpp:2981
 msgid "Disk\tUnimplemented\n"
 msgstr "Disco\tNo implementado\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2974
+#: src/frontend/mame/ui/selmenu.cpp:2983
 msgid "Disk\tImperfect\n"
 msgstr "Disco\tImperfecto\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2977
+#: src/frontend/mame/ui/selmenu.cpp:2986
 msgid "Printer\tUnimplemented\n"
 msgstr "Impresora\tNo implementada\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2979
+#: src/frontend/mame/ui/selmenu.cpp:2988
 msgid "Printer\tImperfect\n"
 msgstr "Impresora\tImperfecta\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2982
+#: src/frontend/mame/ui/selmenu.cpp:2991
 msgid "Mag. Tape\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2984
+#: src/frontend/mame/ui/selmenu.cpp:2993
 msgid "Mag. Tape\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2987
+#: src/frontend/mame/ui/selmenu.cpp:2996
 msgid "Punch Tape\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2989
+#: src/frontend/mame/ui/selmenu.cpp:2998
 msgid "Punch Tape\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2992
+#: src/frontend/mame/ui/selmenu.cpp:3001
 msgid "Mag. Drum\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2994
+#: src/frontend/mame/ui/selmenu.cpp:3003
 msgid "Mag. Drum\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2997
+#: src/frontend/mame/ui/selmenu.cpp:3006
 msgid "(EP)ROM\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2999
+#: src/frontend/mame/ui/selmenu.cpp:3008
 msgid "(EP)ROM\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3002
+#: src/frontend/mame/ui/selmenu.cpp:3011
 msgid "Communications\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3004
+#: src/frontend/mame/ui/selmenu.cpp:3013
 msgid "Communications\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3007
+#: src/frontend/mame/ui/selmenu.cpp:3016
 msgid "LAN\tUnimplemented\n"
 msgstr "Red local\tNo implementada\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3009
+#: src/frontend/mame/ui/selmenu.cpp:3018
 msgid "LAN\tImperfect\n"
 msgstr "Red local\tImperfecta"
 
-#: src/frontend/mame/ui/selmenu.cpp:3012
+#: src/frontend/mame/ui/selmenu.cpp:3021
 msgid "WAN\tUnimplemented\n"
 msgstr "Red global\tNo implementada\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3014
+#: src/frontend/mame/ui/selmenu.cpp:3023
 msgid "WAN\tImperfect\n"
 msgstr "Red global\tImperfecta\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3017
+#: src/frontend/mame/ui/selmenu.cpp:3026
 msgid "Timing\tUnimplemented\n"
 msgstr "Cronometraje\tNo implementado\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3019
+#: src/frontend/mame/ui/selmenu.cpp:3028
 msgid "Timing\tImperfect\n"
 msgstr "Cronometraje\tImperfecto\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3021
+#: src/frontend/mame/ui/selmenu.cpp:3030
 msgid "Mechanical Machine\tYes\n"
 msgstr "Máquina mecánica\tSi\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3021
+#: src/frontend/mame/ui/selmenu.cpp:3030
 msgid "Mechanical Machine\tNo\n"
 msgstr "Máquina mecánica\tNo\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3022
+#: src/frontend/mame/ui/selmenu.cpp:3031
 msgid "Requires Artwork\tYes\n"
 msgstr "Requiere arte\tSi\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3022
+#: src/frontend/mame/ui/selmenu.cpp:3031
 msgid "Requires Artwork\tNo\n"
 msgstr "Requiere arte\tNo\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3023
+#: src/frontend/mame/ui/selmenu.cpp:3032
 msgid "Requires Clickable Artwork\tYes\n"
 msgstr "Requiere arte clicable\tSi\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3023
+#: src/frontend/mame/ui/selmenu.cpp:3032
 msgid "Requires Clickable Artwork\tNo\n"
 msgstr "Requiere arte clicable\tNo\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3025
+#: src/frontend/mame/ui/selmenu.cpp:3034
 msgid "Support Cocktail\tNo\n"
 msgstr "Soporta modo cocktail\tNo\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3026
+#: src/frontend/mame/ui/selmenu.cpp:3035
 msgid "Driver is BIOS\tYes\n"
 msgstr "El controlador es una BIOS\tSi\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3026
+#: src/frontend/mame/ui/selmenu.cpp:3035
 msgid "Driver is BIOS\tNo\n"
 msgstr "El controlador es una BIOS\tNo\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3027
+#: src/frontend/mame/ui/selmenu.cpp:3036
 msgid "Support Save\tYes\n"
 msgstr "Soporta guardado\tSi\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3027
+#: src/frontend/mame/ui/selmenu.cpp:3036
 msgid "Support Save\tNo\n"
 msgstr "Soporta guardado\tNo\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3028
+#: src/frontend/mame/ui/selmenu.cpp:3037
 msgid "Screen Orientation\tVertical\n"
 msgstr "Orientación de la pantalla\tVertical\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3028
+#: src/frontend/mame/ui/selmenu.cpp:3037
 msgid "Screen Orientation\tHorizontal\n"
 msgstr "Orientación de la pantalla\tHorizontal\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3038
+#: src/frontend/mame/ui/selmenu.cpp:3047
 msgid "Requires CHD\tYes\n"
 msgstr "Requiere CHD\tSi\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3038
+#: src/frontend/mame/ui/selmenu.cpp:3047
 msgid "Requires CHD\tNo\n"
 msgstr "Requiere CHD\tNo\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3051
-msgid "ROM Audit Result\tOK\n"
-msgstr "Resultado de la auditoría de ROMs\tCORRECTA\n"
+#: src/frontend/mame/ui/selmenu.cpp:3060
+msgid "Media Audit Result\tOK\n"
+msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3053
-msgid "ROM Audit Result\tBAD\n"
-msgstr "Resultado de la auditoría de ROMs\tINCORRECTA\n"
+#: src/frontend/mame/ui/selmenu.cpp:3062
+msgid "Media Audit Result\tBAD\n"
+msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3056
+#: src/frontend/mame/ui/selmenu.cpp:3065
 msgid "Samples Audit Result\tNone Needed\n"
 msgstr "Resultado de la auditoría de muestras\tNo necesaria\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3058
+#: src/frontend/mame/ui/selmenu.cpp:3067
 msgid "Samples Audit Result\tOK\n"
 msgstr "Resultado de la auditoría de muestras\tCORRECTA\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3060
+#: src/frontend/mame/ui/selmenu.cpp:3069
 msgid "Samples Audit Result\tBAD\n"
 msgstr "Resultado de la auditoría de muestras\tINCORRECTA\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3064
+#: src/frontend/mame/ui/selmenu.cpp:3073
 msgid ""
-"ROM Audit \tDisabled\n"
-"Samples Audit \tDisabled\n"
+"Media Audit\tDisabled\n"
+"Samples Audit\tDisabled\n"
 msgstr ""
-"Auditoría de ROMs \tDesactivada\n"
-"Auditoría de muestras \tDesactivada\n"
 
-#: src/frontend/mame/ui/sndmenu.cpp:150
+#: src/frontend/mame/ui/sndmenu.cpp:146
 msgid "Sound"
 msgstr "Sonido"
 
-#: src/frontend/mame/ui/sndmenu.cpp:151
+#: src/frontend/mame/ui/sndmenu.cpp:147
 msgid "Compressor"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:152
+#: src/frontend/mame/ui/sndmenu.cpp:148
 msgid "Sample Rate"
 msgstr "Tasa de muestreo"
 
-#: src/frontend/mame/ui/sndmenu.cpp:153
+#: src/frontend/mame/ui/sndmenu.cpp:149
 msgid "Use External Samples"
 msgstr "Utilizar muestras externas"
 
@@ -3200,21 +3200,21 @@ msgstr "* Vídeo:\n"
 msgid "  Screen '%1$s': Vector\n"
 msgstr "  Pantalla '%1$s': Vectorial\n"
 
-#: src/frontend/mame/ui/devopt.cpp:132
+#: src/frontend/mame/ui/devopt.cpp:135
 #, c-format
 msgid "  Screen '%1$s': %2$d × %3$d (V) %4$s Hz\n"
 msgstr "  Pantalla '%1$s': %2$d × %3$d (V) %4$s Hz\n"
 
-#: src/frontend/mame/ui/devopt.cpp:133
+#: src/frontend/mame/ui/devopt.cpp:136
 #, c-format
 msgid "  Screen '%1$s': %2$d × %3$d (H) %4$s Hz\n"
 msgstr "  Pantalla '%1$s': %2$d × %3$d (H) %4$s Hz\n"
 
-#: src/frontend/mame/ui/devopt.cpp:147
+#: src/frontend/mame/ui/devopt.cpp:150
 msgid "* Sound:\n"
 msgstr "* Sonido:\n"
 
-#: src/frontend/mame/ui/devopt.cpp:211
+#: src/frontend/mame/ui/devopt.cpp:214
 #, c-format
 msgid ""
 "* BIOS settings:\n"
@@ -3223,490 +3223,660 @@ msgstr ""
 "* Configuración de la BIOS:\n"
 "  %1$d opciones    [por defecto: %2$s]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:255 src/frontend/mame/ui/devopt.cpp:271
-#: src/frontend/mame/ui/devopt.cpp:332
+#: src/frontend/mame/ui/devopt.cpp:258 src/frontend/mame/ui/devopt.cpp:274
+#: src/frontend/mame/ui/devopt.cpp:335
 #, c-format
 msgid "  %1$s    [default: %2$s]\n"
 msgstr "  %1$s    [por defecto: %2$s]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:260 src/frontend/mame/ui/devopt.cpp:276
+#: src/frontend/mame/ui/devopt.cpp:263 src/frontend/mame/ui/devopt.cpp:279
 #, c-format
 msgid "  %1$s\n"
 msgstr "  %1$s\n"
 
-#: src/frontend/mame/ui/devopt.cpp:282
+#: src/frontend/mame/ui/devopt.cpp:285
 msgid "* DIP switch settings:\n"
 msgstr "* Configuración de los interruptores DIP:\n"
 
-#: src/frontend/mame/ui/devopt.cpp:287
+#: src/frontend/mame/ui/devopt.cpp:290
 msgid "* Configuration settings:\n"
 msgstr "* Configuración:\n"
 
-#: src/frontend/mame/ui/devopt.cpp:291
+#: src/frontend/mame/ui/devopt.cpp:294
 msgid "* Input device(s):\n"
 msgstr "* Dispositivo(s) de entrada:\n"
 
-#: src/frontend/mame/ui/devopt.cpp:293
+#: src/frontend/mame/ui/devopt.cpp:296
 #, c-format
 msgid "  User inputs    [%1$d inputs]\n"
 msgstr "  Entradas de usuario    [%1$d entradas]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:295
+#: src/frontend/mame/ui/devopt.cpp:298
 #, c-format
 msgid "  Mahjong inputs    [%1$d inputs]\n"
 msgstr "  Entradas de Mahjong    [%1$d entradas]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:297
+#: src/frontend/mame/ui/devopt.cpp:300
 #, c-format
 msgid "  Hanafuda inputs    [%1$d inputs]\n"
 msgstr "  Entradas de Hanafuda    [%1$d entradas]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:299
+#: src/frontend/mame/ui/devopt.cpp:302
 #, c-format
 msgid "  Gambling inputs    [%1$d inputs]\n"
 msgstr "  Entradas de Gambling    [%1$d entradas]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:301
+#: src/frontend/mame/ui/devopt.cpp:304
 #, c-format
 msgid "  Analog inputs    [%1$d inputs]\n"
 msgstr "  Entradas analógicas    [%1$d entradas]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:303
+#: src/frontend/mame/ui/devopt.cpp:306
 #, c-format
 msgid "  Adjuster inputs    [%1$d inputs]\n"
 msgstr "  Entradas del regulador    [%1$d entradas]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:305
+#: src/frontend/mame/ui/devopt.cpp:308
 #, c-format
 msgid "  Keypad inputs    [%1$d inputs]\n"
 msgstr "  Entradas del Keypoad    [%1$d entradas]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:307
+#: src/frontend/mame/ui/devopt.cpp:310
 #, c-format
 msgid "  Keyboard inputs    [%1$d inputs]\n"
 msgstr "  Entradas del teclado    [%1$d entradas]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:312
+#: src/frontend/mame/ui/devopt.cpp:315
 msgid "* Media Options:\n"
 msgstr "* Opciones de medios:\n"
 
-#: src/frontend/mame/ui/devopt.cpp:317
+#: src/frontend/mame/ui/devopt.cpp:320
 #, c-format
 msgid "  %1$s    [tag: %2$s]\n"
 msgstr "  %1$s    [reseña: %2$s]\n"
 
-#: src/frontend/mame/ui/devopt.cpp:327
+#: src/frontend/mame/ui/devopt.cpp:330
 msgid "* Slot Options:\n"
 msgstr "* Opciones de ranuras:\n"
 
-#: src/frontend/mame/ui/devopt.cpp:341
+#: src/frontend/mame/ui/devopt.cpp:344
 msgid "[None]\n"
 msgstr "[Ninguna]\n"
 
-#: src/emu/render.cpp:1847
+#: src/emu/render.cpp:1796
 #, c-format
 msgctxt "view-name"
 msgid "Screen %1$u Standard (%2$u:%3$u)"
 msgstr ""
 
-#: src/emu/render.cpp:1873
+#: src/emu/render.cpp:1822
 #, c-format
 msgctxt "view-name"
 msgid "Screen %1$u Pixel Aspect (%2$u:%3$u)"
 msgstr ""
 
-#: src/emu/render.cpp:1895 src/emu/render.cpp:2030
+#: src/emu/render.cpp:1844 src/emu/render.cpp:1979
 msgctxt "view-name"
 msgid "Cocktail"
 msgstr ""
 
-#: src/emu/render.cpp:2015
+#: src/emu/render.cpp:1964
 msgctxt "view-name"
 msgid "Left-to-Right"
 msgstr ""
 
-#: src/emu/render.cpp:2016
+#: src/emu/render.cpp:1965
 msgctxt "view-name"
 msgid "Left-to-Right (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2017
+#: src/emu/render.cpp:1966
 msgctxt "view-name"
 msgid "Top-to-Bottom"
 msgstr ""
 
-#: src/emu/render.cpp:2018
+#: src/emu/render.cpp:1967
 msgctxt "view-name"
 msgid "Top-to-Bottom (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2069
+#: src/emu/render.cpp:2018
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Left-to-Right, Top-to-Bottom"
 msgstr ""
 
-#: src/emu/render.cpp:2078
+#: src/emu/render.cpp:2027
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Left-to-Right, Top-to-Bottom (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2087
+#: src/emu/render.cpp:2036
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Top-to-Bottom, Left-to-Right"
 msgstr ""
 
-#: src/emu/render.cpp:2096
+#: src/emu/render.cpp:2045
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Top-to-Bottom, Left-to-Right (Gapless)"
 msgstr ""
 
-#: src/emu/inpttype.ipp:22
+#: src/emu/ioport.cpp:332
+#, c-format
 msgctxt "input-name"
-msgid "P1 Up"
+msgid "P%1$u"
 msgstr ""
 
-#: src/emu/inpttype.ipp:23
+#: src/emu/ioport.cpp:1924
 msgctxt "input-name"
-msgid "P1 Down"
+msgid "???"
 msgstr ""
 
-#: src/emu/inpttype.ipp:24
+#: src/emu/inpttype.ipp:22 src/emu/inpttype.ipp:140 src/emu/inpttype.ipp:221
+#: src/emu/inpttype.ipp:255 src/emu/inpttype.ipp:289 src/emu/inpttype.ipp:323
+#: src/emu/inpttype.ipp:357 src/emu/inpttype.ipp:391 src/emu/inpttype.ipp:425
+#: src/emu/inpttype.ipp:459
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left"
+msgid "%p Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:25
+#: src/emu/inpttype.ipp:23 src/emu/inpttype.ipp:141 src/emu/inpttype.ipp:222
+#: src/emu/inpttype.ipp:256 src/emu/inpttype.ipp:290 src/emu/inpttype.ipp:324
+#: src/emu/inpttype.ipp:358 src/emu/inpttype.ipp:392 src/emu/inpttype.ipp:426
+#: src/emu/inpttype.ipp:460
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right"
+msgid "%p Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:26
+#: src/emu/inpttype.ipp:24 src/emu/inpttype.ipp:142 src/emu/inpttype.ipp:223
+#: src/emu/inpttype.ipp:257 src/emu/inpttype.ipp:291 src/emu/inpttype.ipp:325
+#: src/emu/inpttype.ipp:359 src/emu/inpttype.ipp:393 src/emu/inpttype.ipp:427
+#: src/emu/inpttype.ipp:461
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Up"
+msgid "%p Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:27
+#: src/emu/inpttype.ipp:25 src/emu/inpttype.ipp:143 src/emu/inpttype.ipp:224
+#: src/emu/inpttype.ipp:258 src/emu/inpttype.ipp:292 src/emu/inpttype.ipp:326
+#: src/emu/inpttype.ipp:360 src/emu/inpttype.ipp:394 src/emu/inpttype.ipp:428
+#: src/emu/inpttype.ipp:462
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Down"
+msgid "%p Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:28
+#: src/emu/inpttype.ipp:26 src/emu/inpttype.ipp:144 src/emu/inpttype.ipp:225
+#: src/emu/inpttype.ipp:259 src/emu/inpttype.ipp:293 src/emu/inpttype.ipp:327
+#: src/emu/inpttype.ipp:361 src/emu/inpttype.ipp:395 src/emu/inpttype.ipp:429
+#: src/emu/inpttype.ipp:463
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Left"
+msgid "%p Right Stick/Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:29
+#: src/emu/inpttype.ipp:27 src/emu/inpttype.ipp:145 src/emu/inpttype.ipp:226
+#: src/emu/inpttype.ipp:260 src/emu/inpttype.ipp:294 src/emu/inpttype.ipp:328
+#: src/emu/inpttype.ipp:362 src/emu/inpttype.ipp:396 src/emu/inpttype.ipp:430
+#: src/emu/inpttype.ipp:464
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Right"
+msgid "%p Right Stick/Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:30
+#: src/emu/inpttype.ipp:28 src/emu/inpttype.ipp:146 src/emu/inpttype.ipp:227
+#: src/emu/inpttype.ipp:261 src/emu/inpttype.ipp:295 src/emu/inpttype.ipp:329
+#: src/emu/inpttype.ipp:363 src/emu/inpttype.ipp:397 src/emu/inpttype.ipp:431
+#: src/emu/inpttype.ipp:465
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Up"
+msgid "%p Right Stick/Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:31
+#: src/emu/inpttype.ipp:29 src/emu/inpttype.ipp:147 src/emu/inpttype.ipp:228
+#: src/emu/inpttype.ipp:262 src/emu/inpttype.ipp:296 src/emu/inpttype.ipp:330
+#: src/emu/inpttype.ipp:364 src/emu/inpttype.ipp:398 src/emu/inpttype.ipp:432
+#: src/emu/inpttype.ipp:466
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Down"
+msgid "%p Right Stick/Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:32
+#: src/emu/inpttype.ipp:30 src/emu/inpttype.ipp:148 src/emu/inpttype.ipp:229
+#: src/emu/inpttype.ipp:263 src/emu/inpttype.ipp:297 src/emu/inpttype.ipp:331
+#: src/emu/inpttype.ipp:365 src/emu/inpttype.ipp:399 src/emu/inpttype.ipp:433
+#: src/emu/inpttype.ipp:467
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Left"
+msgid "%p Left Stick/Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:33
+#: src/emu/inpttype.ipp:31 src/emu/inpttype.ipp:149 src/emu/inpttype.ipp:230
+#: src/emu/inpttype.ipp:264 src/emu/inpttype.ipp:298 src/emu/inpttype.ipp:332
+#: src/emu/inpttype.ipp:366 src/emu/inpttype.ipp:400 src/emu/inpttype.ipp:434
+#: src/emu/inpttype.ipp:468
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Right"
+msgid "%p Left Stick/Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:34
+#: src/emu/inpttype.ipp:32 src/emu/inpttype.ipp:150 src/emu/inpttype.ipp:231
+#: src/emu/inpttype.ipp:265 src/emu/inpttype.ipp:299 src/emu/inpttype.ipp:333
+#: src/emu/inpttype.ipp:367 src/emu/inpttype.ipp:401 src/emu/inpttype.ipp:435
+#: src/emu/inpttype.ipp:469
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 1"
+msgid "%p Left Stick/Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:35
+#: src/emu/inpttype.ipp:33 src/emu/inpttype.ipp:151 src/emu/inpttype.ipp:232
+#: src/emu/inpttype.ipp:266 src/emu/inpttype.ipp:300 src/emu/inpttype.ipp:334
+#: src/emu/inpttype.ipp:368 src/emu/inpttype.ipp:402 src/emu/inpttype.ipp:436
+#: src/emu/inpttype.ipp:470
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 2"
+msgid "%p Left Stick/Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:36
+#: src/emu/inpttype.ipp:34 src/emu/inpttype.ipp:152 src/emu/inpttype.ipp:233
+#: src/emu/inpttype.ipp:267 src/emu/inpttype.ipp:301 src/emu/inpttype.ipp:335
+#: src/emu/inpttype.ipp:369 src/emu/inpttype.ipp:403 src/emu/inpttype.ipp:437
+#: src/emu/inpttype.ipp:471
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 3"
+msgid "%p Button 1"
 msgstr ""
 
-#: src/emu/inpttype.ipp:37
+#: src/emu/inpttype.ipp:35 src/emu/inpttype.ipp:153 src/emu/inpttype.ipp:234
+#: src/emu/inpttype.ipp:268 src/emu/inpttype.ipp:302 src/emu/inpttype.ipp:336
+#: src/emu/inpttype.ipp:370 src/emu/inpttype.ipp:404 src/emu/inpttype.ipp:438
+#: src/emu/inpttype.ipp:472
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 4"
+msgid "%p Button 2"
 msgstr ""
 
-#: src/emu/inpttype.ipp:38
+#: src/emu/inpttype.ipp:36 src/emu/inpttype.ipp:154 src/emu/inpttype.ipp:235
+#: src/emu/inpttype.ipp:269 src/emu/inpttype.ipp:303 src/emu/inpttype.ipp:337
+#: src/emu/inpttype.ipp:371 src/emu/inpttype.ipp:405 src/emu/inpttype.ipp:439
+#: src/emu/inpttype.ipp:473
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 5"
+msgid "%p Button 3"
 msgstr ""
 
-#: src/emu/inpttype.ipp:39
+#: src/emu/inpttype.ipp:37 src/emu/inpttype.ipp:155 src/emu/inpttype.ipp:236
+#: src/emu/inpttype.ipp:270 src/emu/inpttype.ipp:304 src/emu/inpttype.ipp:338
+#: src/emu/inpttype.ipp:372 src/emu/inpttype.ipp:406 src/emu/inpttype.ipp:440
+#: src/emu/inpttype.ipp:474
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 6"
+msgid "%p Button 4"
 msgstr ""
 
-#: src/emu/inpttype.ipp:40
+#: src/emu/inpttype.ipp:38 src/emu/inpttype.ipp:156 src/emu/inpttype.ipp:237
+#: src/emu/inpttype.ipp:271 src/emu/inpttype.ipp:305 src/emu/inpttype.ipp:339
+#: src/emu/inpttype.ipp:373 src/emu/inpttype.ipp:407 src/emu/inpttype.ipp:441
+#: src/emu/inpttype.ipp:475
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 7"
+msgid "%p Button 5"
 msgstr ""
 
-#: src/emu/inpttype.ipp:41
+#: src/emu/inpttype.ipp:39 src/emu/inpttype.ipp:157 src/emu/inpttype.ipp:238
+#: src/emu/inpttype.ipp:272 src/emu/inpttype.ipp:306 src/emu/inpttype.ipp:340
+#: src/emu/inpttype.ipp:374 src/emu/inpttype.ipp:408 src/emu/inpttype.ipp:442
+#: src/emu/inpttype.ipp:476
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 8"
+msgid "%p Button 6"
 msgstr ""
 
-#: src/emu/inpttype.ipp:42
+#: src/emu/inpttype.ipp:40 src/emu/inpttype.ipp:158 src/emu/inpttype.ipp:239
+#: src/emu/inpttype.ipp:273 src/emu/inpttype.ipp:307 src/emu/inpttype.ipp:341
+#: src/emu/inpttype.ipp:375 src/emu/inpttype.ipp:409 src/emu/inpttype.ipp:443
+#: src/emu/inpttype.ipp:477
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 9"
+msgid "%p Button 7"
 msgstr ""
 
-#: src/emu/inpttype.ipp:43
+#: src/emu/inpttype.ipp:41 src/emu/inpttype.ipp:159 src/emu/inpttype.ipp:240
+#: src/emu/inpttype.ipp:274 src/emu/inpttype.ipp:308 src/emu/inpttype.ipp:342
+#: src/emu/inpttype.ipp:376 src/emu/inpttype.ipp:410 src/emu/inpttype.ipp:444
+#: src/emu/inpttype.ipp:478
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 10"
+msgid "%p Button 8"
 msgstr ""
 
-#: src/emu/inpttype.ipp:44
+#: src/emu/inpttype.ipp:42 src/emu/inpttype.ipp:160 src/emu/inpttype.ipp:241
+#: src/emu/inpttype.ipp:275 src/emu/inpttype.ipp:309 src/emu/inpttype.ipp:343
+#: src/emu/inpttype.ipp:377 src/emu/inpttype.ipp:411 src/emu/inpttype.ipp:445
+#: src/emu/inpttype.ipp:479
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 11"
+msgid "%p Button 9"
 msgstr ""
 
-#: src/emu/inpttype.ipp:45
+#: src/emu/inpttype.ipp:43 src/emu/inpttype.ipp:161 src/emu/inpttype.ipp:242
+#: src/emu/inpttype.ipp:276 src/emu/inpttype.ipp:310 src/emu/inpttype.ipp:344
+#: src/emu/inpttype.ipp:378 src/emu/inpttype.ipp:412 src/emu/inpttype.ipp:446
+#: src/emu/inpttype.ipp:480
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 12"
+msgid "%p Button 10"
 msgstr ""
 
-#: src/emu/inpttype.ipp:46
+#: src/emu/inpttype.ipp:44 src/emu/inpttype.ipp:162 src/emu/inpttype.ipp:243
+#: src/emu/inpttype.ipp:277 src/emu/inpttype.ipp:311 src/emu/inpttype.ipp:345
+#: src/emu/inpttype.ipp:379 src/emu/inpttype.ipp:413 src/emu/inpttype.ipp:447
+#: src/emu/inpttype.ipp:481
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 13"
+msgid "%p Button 11"
 msgstr ""
 
-#: src/emu/inpttype.ipp:47
+#: src/emu/inpttype.ipp:45 src/emu/inpttype.ipp:163 src/emu/inpttype.ipp:244
+#: src/emu/inpttype.ipp:278 src/emu/inpttype.ipp:312 src/emu/inpttype.ipp:346
+#: src/emu/inpttype.ipp:380 src/emu/inpttype.ipp:414 src/emu/inpttype.ipp:448
+#: src/emu/inpttype.ipp:482
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 14"
+msgid "%p Button 12"
 msgstr ""
 
-#: src/emu/inpttype.ipp:48
+#: src/emu/inpttype.ipp:46 src/emu/inpttype.ipp:164 src/emu/inpttype.ipp:245
+#: src/emu/inpttype.ipp:279 src/emu/inpttype.ipp:313 src/emu/inpttype.ipp:347
+#: src/emu/inpttype.ipp:381 src/emu/inpttype.ipp:415 src/emu/inpttype.ipp:449
+#: src/emu/inpttype.ipp:483
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 15"
+msgid "%p Button 13"
 msgstr ""
 
-#: src/emu/inpttype.ipp:49
+#: src/emu/inpttype.ipp:47 src/emu/inpttype.ipp:165 src/emu/inpttype.ipp:246
+#: src/emu/inpttype.ipp:280 src/emu/inpttype.ipp:314 src/emu/inpttype.ipp:348
+#: src/emu/inpttype.ipp:382 src/emu/inpttype.ipp:416 src/emu/inpttype.ipp:450
+#: src/emu/inpttype.ipp:484
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 16"
+msgid "%p Button 14"
 msgstr ""
 
-#: src/emu/inpttype.ipp:50
+#: src/emu/inpttype.ipp:48 src/emu/inpttype.ipp:166 src/emu/inpttype.ipp:247
+#: src/emu/inpttype.ipp:281 src/emu/inpttype.ipp:315 src/emu/inpttype.ipp:349
+#: src/emu/inpttype.ipp:383 src/emu/inpttype.ipp:417 src/emu/inpttype.ipp:451
+#: src/emu/inpttype.ipp:485
+#, c-format
 msgctxt "input-name"
-msgid "P1 Start"
+msgid "%p Button 15"
 msgstr ""
 
-#: src/emu/inpttype.ipp:51
+#: src/emu/inpttype.ipp:49 src/emu/inpttype.ipp:167 src/emu/inpttype.ipp:248
+#: src/emu/inpttype.ipp:282 src/emu/inpttype.ipp:316 src/emu/inpttype.ipp:350
+#: src/emu/inpttype.ipp:384 src/emu/inpttype.ipp:418 src/emu/inpttype.ipp:452
+#: src/emu/inpttype.ipp:486
+#, c-format
 msgctxt "input-name"
-msgid "P1 Select"
+msgid "%p Button 16"
 msgstr ""
 
-#: src/emu/inpttype.ipp:56
+#: src/emu/inpttype.ipp:50 src/emu/inpttype.ipp:168 src/emu/inpttype.ipp:249
+#: src/emu/inpttype.ipp:283 src/emu/inpttype.ipp:317 src/emu/inpttype.ipp:351
+#: src/emu/inpttype.ipp:385 src/emu/inpttype.ipp:419 src/emu/inpttype.ipp:453
+#: src/emu/inpttype.ipp:487
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong A"
+msgid "%p Start"
 msgstr ""
 
-#: src/emu/inpttype.ipp:57
+#: src/emu/inpttype.ipp:51 src/emu/inpttype.ipp:169 src/emu/inpttype.ipp:250
+#: src/emu/inpttype.ipp:284 src/emu/inpttype.ipp:318 src/emu/inpttype.ipp:352
+#: src/emu/inpttype.ipp:386 src/emu/inpttype.ipp:420 src/emu/inpttype.ipp:454
+#: src/emu/inpttype.ipp:488
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong B"
+msgid "%p Select"
 msgstr ""
 
-#: src/emu/inpttype.ipp:58
+#: src/emu/inpttype.ipp:56 src/emu/inpttype.ipp:174
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong C"
+msgid "%p Mahjong A"
 msgstr ""
 
-#: src/emu/inpttype.ipp:59
+#: src/emu/inpttype.ipp:57 src/emu/inpttype.ipp:175
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong D"
+msgid "%p Mahjong B"
 msgstr ""
 
-#: src/emu/inpttype.ipp:60
+#: src/emu/inpttype.ipp:58 src/emu/inpttype.ipp:176
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong E"
+msgid "%p Mahjong C"
 msgstr ""
 
-#: src/emu/inpttype.ipp:61
+#: src/emu/inpttype.ipp:59 src/emu/inpttype.ipp:177
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong F"
+msgid "%p Mahjong D"
 msgstr ""
 
-#: src/emu/inpttype.ipp:62
+#: src/emu/inpttype.ipp:60 src/emu/inpttype.ipp:178
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong G"
+msgid "%p Mahjong E"
 msgstr ""
 
-#: src/emu/inpttype.ipp:63
+#: src/emu/inpttype.ipp:61 src/emu/inpttype.ipp:179
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong H"
+msgid "%p Mahjong F"
 msgstr ""
 
-#: src/emu/inpttype.ipp:64
+#: src/emu/inpttype.ipp:62 src/emu/inpttype.ipp:180
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong I"
+msgid "%p Mahjong G"
 msgstr ""
 
-#: src/emu/inpttype.ipp:65
+#: src/emu/inpttype.ipp:63 src/emu/inpttype.ipp:181
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong J"
+msgid "%p Mahjong H"
 msgstr ""
 
-#: src/emu/inpttype.ipp:66
+#: src/emu/inpttype.ipp:64 src/emu/inpttype.ipp:182
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong K"
+msgid "%p Mahjong I"
 msgstr ""
 
-#: src/emu/inpttype.ipp:67
+#: src/emu/inpttype.ipp:65 src/emu/inpttype.ipp:183
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong L"
+msgid "%p Mahjong J"
 msgstr ""
 
-#: src/emu/inpttype.ipp:68
+#: src/emu/inpttype.ipp:66 src/emu/inpttype.ipp:184
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong M"
+msgid "%p Mahjong K"
 msgstr ""
 
-#: src/emu/inpttype.ipp:69
+#: src/emu/inpttype.ipp:67 src/emu/inpttype.ipp:185
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong N"
+msgid "%p Mahjong L"
 msgstr ""
 
-#: src/emu/inpttype.ipp:70
+#: src/emu/inpttype.ipp:68 src/emu/inpttype.ipp:186
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong O"
+msgid "%p Mahjong M"
 msgstr ""
 
-#: src/emu/inpttype.ipp:71
+#: src/emu/inpttype.ipp:69 src/emu/inpttype.ipp:187
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong P"
+msgid "%p Mahjong N"
 msgstr ""
 
-#: src/emu/inpttype.ipp:72
+#: src/emu/inpttype.ipp:70 src/emu/inpttype.ipp:188
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Q"
+msgid "%p Mahjong O"
 msgstr ""
 
-#: src/emu/inpttype.ipp:73
+#: src/emu/inpttype.ipp:71 src/emu/inpttype.ipp:189
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Kan"
+msgid "%p Mahjong P"
 msgstr ""
 
-#: src/emu/inpttype.ipp:74
+#: src/emu/inpttype.ipp:72 src/emu/inpttype.ipp:190
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Pon"
+msgid "%p Mahjong Q"
 msgstr ""
 
-#: src/emu/inpttype.ipp:75
+#: src/emu/inpttype.ipp:73 src/emu/inpttype.ipp:191
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Chi"
+msgid "%p Mahjong Kan"
 msgstr ""
 
-#: src/emu/inpttype.ipp:76
+#: src/emu/inpttype.ipp:74 src/emu/inpttype.ipp:192
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Reach"
+msgid "%p Mahjong Pon"
 msgstr ""
 
-#: src/emu/inpttype.ipp:77
+#: src/emu/inpttype.ipp:75 src/emu/inpttype.ipp:193
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Ron"
+msgid "%p Mahjong Chi"
 msgstr ""
 
-#: src/emu/inpttype.ipp:78
+#: src/emu/inpttype.ipp:76 src/emu/inpttype.ipp:194
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Flip Flop"
+msgid "%p Mahjong Reach"
 msgstr ""
 
-#: src/emu/inpttype.ipp:79
+#: src/emu/inpttype.ipp:77 src/emu/inpttype.ipp:195
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Bet"
+msgid "%p Mahjong Ron"
 msgstr ""
 
-#: src/emu/inpttype.ipp:80
+#: src/emu/inpttype.ipp:78 src/emu/inpttype.ipp:200
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Take Score"
+msgid "%p Mahjong Flip Flop"
 msgstr ""
 
-#: src/emu/inpttype.ipp:81
+#: src/emu/inpttype.ipp:79 src/emu/inpttype.ipp:196
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Double Up"
+msgid "%p Mahjong Bet"
 msgstr ""
 
-#: src/emu/inpttype.ipp:82
+#: src/emu/inpttype.ipp:80 src/emu/inpttype.ipp:198
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Big"
+msgid "%p Mahjong Take Score"
 msgstr ""
 
-#: src/emu/inpttype.ipp:83
+#: src/emu/inpttype.ipp:81 src/emu/inpttype.ipp:199
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Small"
+msgid "%p Mahjong Double Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:84
+#: src/emu/inpttype.ipp:82 src/emu/inpttype.ipp:201
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Last Chance"
+msgid "%p Mahjong Big"
 msgstr ""
 
-#: src/emu/inpttype.ipp:89
+#: src/emu/inpttype.ipp:83 src/emu/inpttype.ipp:202
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda A/1"
+msgid "%p Mahjong Small"
 msgstr ""
 
-#: src/emu/inpttype.ipp:90
+#: src/emu/inpttype.ipp:84 src/emu/inpttype.ipp:197
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda B/2"
+msgid "%p Mahjong Last Chance"
 msgstr ""
 
-#: src/emu/inpttype.ipp:91
+#: src/emu/inpttype.ipp:89 src/emu/inpttype.ipp:207
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda C/3"
+msgid "%p Hanafuda A/1"
 msgstr ""
 
-#: src/emu/inpttype.ipp:92
+#: src/emu/inpttype.ipp:90 src/emu/inpttype.ipp:208
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda D/4"
+msgid "%p Hanafuda B/2"
 msgstr ""
 
-#: src/emu/inpttype.ipp:93
+#: src/emu/inpttype.ipp:91 src/emu/inpttype.ipp:209
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda E/5"
+msgid "%p Hanafuda C/3"
 msgstr ""
 
-#: src/emu/inpttype.ipp:94
+#: src/emu/inpttype.ipp:92 src/emu/inpttype.ipp:210
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda F/6"
+msgid "%p Hanafuda D/4"
 msgstr ""
 
-#: src/emu/inpttype.ipp:95
+#: src/emu/inpttype.ipp:93 src/emu/inpttype.ipp:211
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda G/7"
+msgid "%p Hanafuda E/5"
 msgstr ""
 
-#: src/emu/inpttype.ipp:96
+#: src/emu/inpttype.ipp:94 src/emu/inpttype.ipp:212
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda H/8"
+msgid "%p Hanafuda F/6"
 msgstr ""
 
-#: src/emu/inpttype.ipp:97
+#: src/emu/inpttype.ipp:95 src/emu/inpttype.ipp:213
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda Yes"
+msgid "%p Hanafuda G/7"
 msgstr ""
 
-#: src/emu/inpttype.ipp:98
+#: src/emu/inpttype.ipp:96 src/emu/inpttype.ipp:214
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda No"
+msgid "%p Hanafuda H/8"
+msgstr ""
+
+#: src/emu/inpttype.ipp:97 src/emu/inpttype.ipp:215
+#, c-format
+msgctxt "input-name"
+msgid "%p Hanafuda Yes"
+msgstr ""
+
+#: src/emu/inpttype.ipp:98 src/emu/inpttype.ipp:216
+#, c-format
+msgctxt "input-name"
+msgid "%p Hanafuda No"
 msgstr ""
 
 #: src/emu/inpttype.ipp:103
@@ -3834,1551 +4004,6 @@ msgctxt "input-name"
 msgid "Stop All Reels"
 msgstr ""
 
-#: src/emu/inpttype.ipp:140
-msgctxt "input-name"
-msgid "P2 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:141
-msgctxt "input-name"
-msgid "P2 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:142
-msgctxt "input-name"
-msgid "P2 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:143
-msgctxt "input-name"
-msgid "P2 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:144
-msgctxt "input-name"
-msgid "P2 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:145
-msgctxt "input-name"
-msgid "P2 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:146
-msgctxt "input-name"
-msgid "P2 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:147
-msgctxt "input-name"
-msgid "P2 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:148
-msgctxt "input-name"
-msgid "P2 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:149
-msgctxt "input-name"
-msgid "P2 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:150
-msgctxt "input-name"
-msgid "P2 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:151
-msgctxt "input-name"
-msgid "P2 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:152
-msgctxt "input-name"
-msgid "P2 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:153
-msgctxt "input-name"
-msgid "P2 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:154
-msgctxt "input-name"
-msgid "P2 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:155
-msgctxt "input-name"
-msgid "P2 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:156
-msgctxt "input-name"
-msgid "P2 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:157
-msgctxt "input-name"
-msgid "P2 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:158
-msgctxt "input-name"
-msgid "P2 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:159
-msgctxt "input-name"
-msgid "P2 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:160
-msgctxt "input-name"
-msgid "P2 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:161
-msgctxt "input-name"
-msgid "P2 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:162
-msgctxt "input-name"
-msgid "P2 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:163
-msgctxt "input-name"
-msgid "P2 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:164
-msgctxt "input-name"
-msgid "P2 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:165
-msgctxt "input-name"
-msgid "P2 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:166
-msgctxt "input-name"
-msgid "P2 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:167
-msgctxt "input-name"
-msgid "P2 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:168
-msgctxt "input-name"
-msgid "P2 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:169
-msgctxt "input-name"
-msgid "P2 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:174
-msgctxt "input-name"
-msgid "P2 Mahjong A"
-msgstr ""
-
-#: src/emu/inpttype.ipp:175
-msgctxt "input-name"
-msgid "P2 Mahjong B"
-msgstr ""
-
-#: src/emu/inpttype.ipp:176
-msgctxt "input-name"
-msgid "P2 Mahjong C"
-msgstr ""
-
-#: src/emu/inpttype.ipp:177
-msgctxt "input-name"
-msgid "P2 Mahjong D"
-msgstr ""
-
-#: src/emu/inpttype.ipp:178
-msgctxt "input-name"
-msgid "P2 Mahjong E"
-msgstr ""
-
-#: src/emu/inpttype.ipp:179
-msgctxt "input-name"
-msgid "P2 Mahjong F"
-msgstr ""
-
-#: src/emu/inpttype.ipp:180
-msgctxt "input-name"
-msgid "P2 Mahjong G"
-msgstr ""
-
-#: src/emu/inpttype.ipp:181
-msgctxt "input-name"
-msgid "P2 Mahjong H"
-msgstr ""
-
-#: src/emu/inpttype.ipp:182
-msgctxt "input-name"
-msgid "P2 Mahjong I"
-msgstr ""
-
-#: src/emu/inpttype.ipp:183
-msgctxt "input-name"
-msgid "P2 Mahjong J"
-msgstr ""
-
-#: src/emu/inpttype.ipp:184
-msgctxt "input-name"
-msgid "P2 Mahjong K"
-msgstr ""
-
-#: src/emu/inpttype.ipp:185
-msgctxt "input-name"
-msgid "P2 Mahjong L"
-msgstr ""
-
-#: src/emu/inpttype.ipp:186
-msgctxt "input-name"
-msgid "P2 Mahjong M"
-msgstr ""
-
-#: src/emu/inpttype.ipp:187
-msgctxt "input-name"
-msgid "P2 Mahjong N"
-msgstr ""
-
-#: src/emu/inpttype.ipp:188
-msgctxt "input-name"
-msgid "P2 Mahjong O"
-msgstr ""
-
-#: src/emu/inpttype.ipp:189
-msgctxt "input-name"
-msgid "P2 Mahjong P"
-msgstr ""
-
-#: src/emu/inpttype.ipp:190
-msgctxt "input-name"
-msgid "P2 Mahjong Q"
-msgstr ""
-
-#: src/emu/inpttype.ipp:191
-msgctxt "input-name"
-msgid "P2 Mahjong Kan"
-msgstr ""
-
-#: src/emu/inpttype.ipp:192
-msgctxt "input-name"
-msgid "P2 Mahjong Pon"
-msgstr ""
-
-#: src/emu/inpttype.ipp:193
-msgctxt "input-name"
-msgid "P2 Mahjong Chi"
-msgstr ""
-
-#: src/emu/inpttype.ipp:194
-msgctxt "input-name"
-msgid "P2 Mahjong Reach"
-msgstr ""
-
-#: src/emu/inpttype.ipp:195
-msgctxt "input-name"
-msgid "P2 Mahjong Ron"
-msgstr ""
-
-#: src/emu/inpttype.ipp:196
-msgctxt "input-name"
-msgid "P2 Mahjong Bet"
-msgstr ""
-
-#: src/emu/inpttype.ipp:197
-msgctxt "input-name"
-msgid "P2 Mahjong Last Chance"
-msgstr ""
-
-#: src/emu/inpttype.ipp:198
-msgctxt "input-name"
-msgid "P2 Mahjong Take Score"
-msgstr ""
-
-#: src/emu/inpttype.ipp:199
-msgctxt "input-name"
-msgid "P2 Mahjong Double Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:200
-msgctxt "input-name"
-msgid "P2 Mahjong Flip Flop"
-msgstr ""
-
-#: src/emu/inpttype.ipp:201
-msgctxt "input-name"
-msgid "P2 Mahjong Big"
-msgstr ""
-
-#: src/emu/inpttype.ipp:202
-msgctxt "input-name"
-msgid "P2 Mahjong Small"
-msgstr ""
-
-#: src/emu/inpttype.ipp:207
-msgctxt "input-name"
-msgid "P2 Hanafuda A/1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:208
-msgctxt "input-name"
-msgid "P2 Hanafuda B/2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:209
-msgctxt "input-name"
-msgid "P2 Hanafuda C/3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:210
-msgctxt "input-name"
-msgid "P2 Hanafuda D/4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:211
-msgctxt "input-name"
-msgid "P2 Hanafuda E/5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:212
-msgctxt "input-name"
-msgid "P2 Hanafuda F/6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:213
-msgctxt "input-name"
-msgid "P2 Hanafuda G/7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:214
-msgctxt "input-name"
-msgid "P2 Hanafuda H/8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:215
-msgctxt "input-name"
-msgid "P2 Hanafuda Yes"
-msgstr ""
-
-#: src/emu/inpttype.ipp:216
-msgctxt "input-name"
-msgid "P2 Hanafuda No"
-msgstr ""
-
-#: src/emu/inpttype.ipp:221
-msgctxt "input-name"
-msgid "P3 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:222
-msgctxt "input-name"
-msgid "P3 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:223
-msgctxt "input-name"
-msgid "P3 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:224
-msgctxt "input-name"
-msgid "P3 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:225
-msgctxt "input-name"
-msgid "P3 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:226
-msgctxt "input-name"
-msgid "P3 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:227
-msgctxt "input-name"
-msgid "P3 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:228
-msgctxt "input-name"
-msgid "P3 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:229
-msgctxt "input-name"
-msgid "P3 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:230
-msgctxt "input-name"
-msgid "P3 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:231
-msgctxt "input-name"
-msgid "P3 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:232
-msgctxt "input-name"
-msgid "P3 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:233
-msgctxt "input-name"
-msgid "P3 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:234
-msgctxt "input-name"
-msgid "P3 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:235
-msgctxt "input-name"
-msgid "P3 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:236
-msgctxt "input-name"
-msgid "P3 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:237
-msgctxt "input-name"
-msgid "P3 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:238
-msgctxt "input-name"
-msgid "P3 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:239
-msgctxt "input-name"
-msgid "P3 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:240
-msgctxt "input-name"
-msgid "P3 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:241
-msgctxt "input-name"
-msgid "P3 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:242
-msgctxt "input-name"
-msgid "P3 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:243
-msgctxt "input-name"
-msgid "P3 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:244
-msgctxt "input-name"
-msgid "P3 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:245
-msgctxt "input-name"
-msgid "P3 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:246
-msgctxt "input-name"
-msgid "P3 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:247
-msgctxt "input-name"
-msgid "P3 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:248
-msgctxt "input-name"
-msgid "P3 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:249
-msgctxt "input-name"
-msgid "P3 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:250
-msgctxt "input-name"
-msgid "P3 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:255
-msgctxt "input-name"
-msgid "P4 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:256
-msgctxt "input-name"
-msgid "P4 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:257
-msgctxt "input-name"
-msgid "P4 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:258
-msgctxt "input-name"
-msgid "P4 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:259
-msgctxt "input-name"
-msgid "P4 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:260
-msgctxt "input-name"
-msgid "P4 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:261
-msgctxt "input-name"
-msgid "P4 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:262
-msgctxt "input-name"
-msgid "P4 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:263
-msgctxt "input-name"
-msgid "P4 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:264
-msgctxt "input-name"
-msgid "P4 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:265
-msgctxt "input-name"
-msgid "P4 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:266
-msgctxt "input-name"
-msgid "P4 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:267
-msgctxt "input-name"
-msgid "P4 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:268
-msgctxt "input-name"
-msgid "P4 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:269
-msgctxt "input-name"
-msgid "P4 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:270
-msgctxt "input-name"
-msgid "P4 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:271
-msgctxt "input-name"
-msgid "P4 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:272
-msgctxt "input-name"
-msgid "P4 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:273
-msgctxt "input-name"
-msgid "P4 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:274
-msgctxt "input-name"
-msgid "P4 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:275
-msgctxt "input-name"
-msgid "P4 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:276
-msgctxt "input-name"
-msgid "P4 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:277
-msgctxt "input-name"
-msgid "P4 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:278
-msgctxt "input-name"
-msgid "P4 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:279
-msgctxt "input-name"
-msgid "P4 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:280
-msgctxt "input-name"
-msgid "P4 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:281
-msgctxt "input-name"
-msgid "P4 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:282
-msgctxt "input-name"
-msgid "P4 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:283
-msgctxt "input-name"
-msgid "P4 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:284
-msgctxt "input-name"
-msgid "P4 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:289
-msgctxt "input-name"
-msgid "P5 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:290
-msgctxt "input-name"
-msgid "P5 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:291
-msgctxt "input-name"
-msgid "P5 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:292
-msgctxt "input-name"
-msgid "P5 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:293
-msgctxt "input-name"
-msgid "P5 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:294
-msgctxt "input-name"
-msgid "P5 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:295
-msgctxt "input-name"
-msgid "P5 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:296
-msgctxt "input-name"
-msgid "P5 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:297
-msgctxt "input-name"
-msgid "P5 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:298
-msgctxt "input-name"
-msgid "P5 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:299
-msgctxt "input-name"
-msgid "P5 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:300
-msgctxt "input-name"
-msgid "P5 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:301
-msgctxt "input-name"
-msgid "P5 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:302
-msgctxt "input-name"
-msgid "P5 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:303
-msgctxt "input-name"
-msgid "P5 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:304
-msgctxt "input-name"
-msgid "P5 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:305
-msgctxt "input-name"
-msgid "P5 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:306
-msgctxt "input-name"
-msgid "P5 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:307
-msgctxt "input-name"
-msgid "P5 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:308
-msgctxt "input-name"
-msgid "P5 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:309
-msgctxt "input-name"
-msgid "P5 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:310
-msgctxt "input-name"
-msgid "P5 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:311
-msgctxt "input-name"
-msgid "P5 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:312
-msgctxt "input-name"
-msgid "P5 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:313
-msgctxt "input-name"
-msgid "P5 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:314
-msgctxt "input-name"
-msgid "P5 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:315
-msgctxt "input-name"
-msgid "P5 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:316
-msgctxt "input-name"
-msgid "P5 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:317
-msgctxt "input-name"
-msgid "P5 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:318
-msgctxt "input-name"
-msgid "P5 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:323
-msgctxt "input-name"
-msgid "P6 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:324
-msgctxt "input-name"
-msgid "P6 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:325
-msgctxt "input-name"
-msgid "P6 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:326
-msgctxt "input-name"
-msgid "P6 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:327
-msgctxt "input-name"
-msgid "P6 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:328
-msgctxt "input-name"
-msgid "P6 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:329
-msgctxt "input-name"
-msgid "P6 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:330
-msgctxt "input-name"
-msgid "P6 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:331
-msgctxt "input-name"
-msgid "P6 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:332
-msgctxt "input-name"
-msgid "P6 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:333
-msgctxt "input-name"
-msgid "P6 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:334
-msgctxt "input-name"
-msgid "P6 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:335
-msgctxt "input-name"
-msgid "P6 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:336
-msgctxt "input-name"
-msgid "P6 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:337
-msgctxt "input-name"
-msgid "P6 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:338
-msgctxt "input-name"
-msgid "P6 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:339
-msgctxt "input-name"
-msgid "P6 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:340
-msgctxt "input-name"
-msgid "P6 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:341
-msgctxt "input-name"
-msgid "P6 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:342
-msgctxt "input-name"
-msgid "P6 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:343
-msgctxt "input-name"
-msgid "P6 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:344
-msgctxt "input-name"
-msgid "P6 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:345
-msgctxt "input-name"
-msgid "P6 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:346
-msgctxt "input-name"
-msgid "P6 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:347
-msgctxt "input-name"
-msgid "P6 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:348
-msgctxt "input-name"
-msgid "P6 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:349
-msgctxt "input-name"
-msgid "P6 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:350
-msgctxt "input-name"
-msgid "P6 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:351
-msgctxt "input-name"
-msgid "P6 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:352
-msgctxt "input-name"
-msgid "P6 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:357
-msgctxt "input-name"
-msgid "P7 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:358
-msgctxt "input-name"
-msgid "P7 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:359
-msgctxt "input-name"
-msgid "P7 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:360
-msgctxt "input-name"
-msgid "P7 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:361
-msgctxt "input-name"
-msgid "P7 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:362
-msgctxt "input-name"
-msgid "P7 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:363
-msgctxt "input-name"
-msgid "P7 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:364
-msgctxt "input-name"
-msgid "P7 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:365
-msgctxt "input-name"
-msgid "P7 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:366
-msgctxt "input-name"
-msgid "P7 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:367
-msgctxt "input-name"
-msgid "P7 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:368
-msgctxt "input-name"
-msgid "P7 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:369
-msgctxt "input-name"
-msgid "P7 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:370
-msgctxt "input-name"
-msgid "P7 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:371
-msgctxt "input-name"
-msgid "P7 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:372
-msgctxt "input-name"
-msgid "P7 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:373
-msgctxt "input-name"
-msgid "P7 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:374
-msgctxt "input-name"
-msgid "P7 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:375
-msgctxt "input-name"
-msgid "P7 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:376
-msgctxt "input-name"
-msgid "P7 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:377
-msgctxt "input-name"
-msgid "P7 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:378
-msgctxt "input-name"
-msgid "P7 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:379
-msgctxt "input-name"
-msgid "P7 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:380
-msgctxt "input-name"
-msgid "P7 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:381
-msgctxt "input-name"
-msgid "P7 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:382
-msgctxt "input-name"
-msgid "P7 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:383
-msgctxt "input-name"
-msgid "P7 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:384
-msgctxt "input-name"
-msgid "P7 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:385
-msgctxt "input-name"
-msgid "P7 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:386
-msgctxt "input-name"
-msgid "P7 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:391
-msgctxt "input-name"
-msgid "P8 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:392
-msgctxt "input-name"
-msgid "P8 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:393
-msgctxt "input-name"
-msgid "P8 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:394
-msgctxt "input-name"
-msgid "P8 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:395
-msgctxt "input-name"
-msgid "P8 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:396
-msgctxt "input-name"
-msgid "P8 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:397
-msgctxt "input-name"
-msgid "P8 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:398
-msgctxt "input-name"
-msgid "P8 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:399
-msgctxt "input-name"
-msgid "P8 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:400
-msgctxt "input-name"
-msgid "P8 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:401
-msgctxt "input-name"
-msgid "P8 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:402
-msgctxt "input-name"
-msgid "P8 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:403
-msgctxt "input-name"
-msgid "P8 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:404
-msgctxt "input-name"
-msgid "P8 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:405
-msgctxt "input-name"
-msgid "P8 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:406
-msgctxt "input-name"
-msgid "P8 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:407
-msgctxt "input-name"
-msgid "P8 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:408
-msgctxt "input-name"
-msgid "P8 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:409
-msgctxt "input-name"
-msgid "P8 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:410
-msgctxt "input-name"
-msgid "P8 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:411
-msgctxt "input-name"
-msgid "P8 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:412
-msgctxt "input-name"
-msgid "P8 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:413
-msgctxt "input-name"
-msgid "P8 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:414
-msgctxt "input-name"
-msgid "P8 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:415
-msgctxt "input-name"
-msgid "P8 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:416
-msgctxt "input-name"
-msgid "P8 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:417
-msgctxt "input-name"
-msgid "P8 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:418
-msgctxt "input-name"
-msgid "P8 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:419
-msgctxt "input-name"
-msgid "P8 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:420
-msgctxt "input-name"
-msgid "P8 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:425
-msgctxt "input-name"
-msgid "P9 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:426
-msgctxt "input-name"
-msgid "P9 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:427
-msgctxt "input-name"
-msgid "P9 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:428
-msgctxt "input-name"
-msgid "P9 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:429
-msgctxt "input-name"
-msgid "P9 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:430
-msgctxt "input-name"
-msgid "P9 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:431
-msgctxt "input-name"
-msgid "P9 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:432
-msgctxt "input-name"
-msgid "P9 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:433
-msgctxt "input-name"
-msgid "P9 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:434
-msgctxt "input-name"
-msgid "P9 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:435
-msgctxt "input-name"
-msgid "P9 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:436
-msgctxt "input-name"
-msgid "P9 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:437
-msgctxt "input-name"
-msgid "P9 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:438
-msgctxt "input-name"
-msgid "P9 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:439
-msgctxt "input-name"
-msgid "P9 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:440
-msgctxt "input-name"
-msgid "P9 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:441
-msgctxt "input-name"
-msgid "P9 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:442
-msgctxt "input-name"
-msgid "P9 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:443
-msgctxt "input-name"
-msgid "P9 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:444
-msgctxt "input-name"
-msgid "P9 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:445
-msgctxt "input-name"
-msgid "P9 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:446
-msgctxt "input-name"
-msgid "P9 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:447
-msgctxt "input-name"
-msgid "P9 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:448
-msgctxt "input-name"
-msgid "P9 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:449
-msgctxt "input-name"
-msgid "P9 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:450
-msgctxt "input-name"
-msgid "P9 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:451
-msgctxt "input-name"
-msgid "P9 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:452
-msgctxt "input-name"
-msgid "P9 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:453
-msgctxt "input-name"
-msgid "P9 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:454
-msgctxt "input-name"
-msgid "P9 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:459
-msgctxt "input-name"
-msgid "P10 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:460
-msgctxt "input-name"
-msgid "P10 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:461
-msgctxt "input-name"
-msgid "P10 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:462
-msgctxt "input-name"
-msgid "P10 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:463
-msgctxt "input-name"
-msgid "P10 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:464
-msgctxt "input-name"
-msgid "P10 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:465
-msgctxt "input-name"
-msgid "P10 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:466
-msgctxt "input-name"
-msgid "P10 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:467
-msgctxt "input-name"
-msgid "P10 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:468
-msgctxt "input-name"
-msgid "P10 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:469
-msgctxt "input-name"
-msgid "P10 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:470
-msgctxt "input-name"
-msgid "P10 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:471
-msgctxt "input-name"
-msgid "P10 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:472
-msgctxt "input-name"
-msgid "P10 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:473
-msgctxt "input-name"
-msgid "P10 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:474
-msgctxt "input-name"
-msgid "P10 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:475
-msgctxt "input-name"
-msgid "P10 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:476
-msgctxt "input-name"
-msgid "P10 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:477
-msgctxt "input-name"
-msgid "P10 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:478
-msgctxt "input-name"
-msgid "P10 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:479
-msgctxt "input-name"
-msgid "P10 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:480
-msgctxt "input-name"
-msgid "P10 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:481
-msgctxt "input-name"
-msgid "P10 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:482
-msgctxt "input-name"
-msgid "P10 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:483
-msgctxt "input-name"
-msgid "P10 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:484
-msgctxt "input-name"
-msgid "P10 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:485
-msgctxt "input-name"
-msgid "P10 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:486
-msgctxt "input-name"
-msgid "P10 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:487
-msgctxt "input-name"
-msgid "P10 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:488
-msgctxt "input-name"
-msgid "P10 Select"
-msgstr ""
-
 #: src/emu/inpttype.ipp:493
 msgctxt "input-name"
 msgid "1 Player Start"
@@ -5559,154 +4184,31 @@ msgctxt "input-name"
 msgid "Volume Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:550
-msgctxt "input-name"
-msgid "P1 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:551
-msgctxt "input-name"
-msgid "P2 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:552
-msgctxt "input-name"
-msgid "P3 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:553
-msgctxt "input-name"
-msgid "P4 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:554
-msgctxt "input-name"
-msgid "P5 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:555
-msgctxt "input-name"
-msgid "P6 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:556
-msgctxt "input-name"
-msgid "P7 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:557
-msgctxt "input-name"
-msgid "P8 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:558
-msgctxt "input-name"
-msgid "P9 Pedal 1"
-msgstr ""
-
+#: src/emu/inpttype.ipp:550 src/emu/inpttype.ipp:551 src/emu/inpttype.ipp:552
+#: src/emu/inpttype.ipp:553 src/emu/inpttype.ipp:554 src/emu/inpttype.ipp:555
+#: src/emu/inpttype.ipp:556 src/emu/inpttype.ipp:557 src/emu/inpttype.ipp:558
 #: src/emu/inpttype.ipp:559
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:564
-msgctxt "input-name"
-msgid "P1 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:565
-msgctxt "input-name"
-msgid "P2 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:566
-msgctxt "input-name"
-msgid "P3 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:567
-msgctxt "input-name"
-msgid "P4 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:568
-msgctxt "input-name"
-msgid "P5 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:569
-msgctxt "input-name"
-msgid "P6 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:570
-msgctxt "input-name"
-msgid "P7 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:571
-msgctxt "input-name"
-msgid "P8 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:572
-msgctxt "input-name"
-msgid "P9 Pedal 2"
+msgid "%p Pedal 1"
 msgstr ""
 
+#: src/emu/inpttype.ipp:564 src/emu/inpttype.ipp:565 src/emu/inpttype.ipp:566
+#: src/emu/inpttype.ipp:567 src/emu/inpttype.ipp:568 src/emu/inpttype.ipp:569
+#: src/emu/inpttype.ipp:570 src/emu/inpttype.ipp:571 src/emu/inpttype.ipp:572
 #: src/emu/inpttype.ipp:573
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:578
-msgctxt "input-name"
-msgid "P1 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:579
-msgctxt "input-name"
-msgid "P2 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:580
-msgctxt "input-name"
-msgid "P3 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:581
-msgctxt "input-name"
-msgid "P4 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:582
-msgctxt "input-name"
-msgid "P5 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:583
-msgctxt "input-name"
-msgid "P6 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:584
-msgctxt "input-name"
-msgid "P7 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:585
-msgctxt "input-name"
-msgid "P8 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:586
-msgctxt "input-name"
-msgid "P9 Pedal 3"
+msgid "%p Pedal 2"
 msgstr ""
 
+#: src/emu/inpttype.ipp:578 src/emu/inpttype.ipp:579 src/emu/inpttype.ipp:580
+#: src/emu/inpttype.ipp:581 src/emu/inpttype.ipp:582 src/emu/inpttype.ipp:583
+#: src/emu/inpttype.ipp:584 src/emu/inpttype.ipp:585 src/emu/inpttype.ipp:586
 #: src/emu/inpttype.ipp:587
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 3"
+msgid "%p Pedal 3"
 msgstr ""
 
 #: src/emu/inpttype.ipp:592
@@ -7602,6 +6104,53 @@ msgid ""
 "%s"
 msgstr ""
 
+#~ msgid "Confirm quit from machines"
+#~ msgstr "Confirmar salida de máquina"
+
+#~ msgid "Skip information screen at startup"
+#~ msgstr "Evitar la pantalla de información al inicio"
+
+#~ msgid "Skip software parts selection menu"
+#~ msgstr "Saltar el menú de selección de software"
+
+#~ msgid "Offscreen reload"
+#~ msgstr "Recarga no visible"
+
+#~ msgid "Simultaneous contradictory"
+#~ msgstr "Entradas contradictorias simultáneas"
+
+#, c-format
+#~ msgid ""
+#~ "Auditing ROMs for machine %2$u of %3$u...\n"
+#~ "%1$s"
+#~ msgstr ""
+#~ "Auditando ROMs para la máquina %2$u de %3$u...\n"
+#~ "%1$s"
+
+#, c-format
+#~ msgid "Audit ROMs for %1$u machines marked unavailable"
+#~ msgstr "Auditar ROMs para las %1$u máquinas marcadas como no-disponibles"
+
+#, c-format
+#~ msgid "Audit ROMs for all %1$u machines"
+#~ msgstr "Auditar ROMs para todas las %1$u máquinas"
+
+#~ msgid "Input (this Machine)"
+#~ msgstr "Entrada (esta máquina)"
+
+#~ msgid "ROM Audit Result\tOK\n"
+#~ msgstr "Resultado de la auditoría de ROMs\tCORRECTA\n"
+
+#~ msgid "ROM Audit Result\tBAD\n"
+#~ msgstr "Resultado de la auditoría de ROMs\tINCORRECTA\n"
+
+#~ msgid ""
+#~ "ROM Audit \tDisabled\n"
+#~ "Samples Audit \tDisabled\n"
+#~ msgstr ""
+#~ "Auditoría de ROMs \tDesactivada\n"
+#~ "Auditoría de muestras \tDesactivada\n"
+
 #~ msgid "Device Mapping"
 #~ msgstr "Mapeado de mandos"
 
diff --git a/language/Spanish_Mexico/strings.po b/language/Spanish_Mexico/strings.po
index f3fc1252627..e81407fd63d 100644
--- a/language/Spanish_Mexico/strings.po
+++ b/language/Spanish_Mexico/strings.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-19 02:50+1100\n"
+"POT-Creation-Date: 2021-12-09 04:44+1100\n"
 "PO-Revision-Date: 2016-02-20 18:03+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: MAME Language Team\n"
@@ -261,12 +261,12 @@ msgstr ""
 msgid "Driver: \"%1$s\" software list "
 msgstr ""
 
-#: src/frontend/mame/ui/selsoft.cpp:711 src/frontend/mame/ui/selgame.cpp:1066
+#: src/frontend/mame/ui/selsoft.cpp:711 src/frontend/mame/ui/selgame.cpp:1076
 #, c-format
 msgid "%1$s: %2$s - Search: %3$s_"
 msgstr ""
 
-#: src/frontend/mame/ui/selsoft.cpp:713 src/frontend/mame/ui/selgame.cpp:1068
+#: src/frontend/mame/ui/selsoft.cpp:713 src/frontend/mame/ui/selgame.cpp:1078
 #, c-format
 msgid "Search: %1$s_"
 msgstr ""
@@ -276,7 +276,7 @@ msgstr ""
 msgid "Software list/item: %1$s:%2$s"
 msgstr ""
 
-#: src/frontend/mame/ui/optsmenu.cpp:73 src/frontend/mame/ui/sndmenu.cpp:165
+#: src/frontend/mame/ui/optsmenu.cpp:73 src/frontend/mame/ui/sndmenu.cpp:161
 msgid "Sound Options"
 msgstr ""
 
@@ -371,11 +371,11 @@ msgid "Show mouse pointer"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:39
-msgid "Confirm quit from machines"
+msgid "Confirm quit from emulation"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:40
-msgid "Skip information screen at startup"
+msgid "Skip system information screen"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:41
@@ -391,7 +391,7 @@ msgid "Skip BIOS selection menu"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:44
-msgid "Skip software parts selection menu"
+msgid "Skip software part selection menu"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:45
@@ -543,7 +543,7 @@ msgid "UI active"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:91
-msgid "Offscreen reload"
+msgid "Off-screen reload"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:92
@@ -559,7 +559,7 @@ msgid "Natural keyboard"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:95
-msgid "Simultaneous contradictory"
+msgid "Allow contradictory joystick inputs"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:96
@@ -583,7 +583,7 @@ msgid "Pedal Device Assignment"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:106
-msgid "Adstick Device Assignment"
+msgid "AD Stick Device Assignment"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:107
@@ -670,14 +670,14 @@ msgstr ""
 msgid "Wait Vertical Sync"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:687
+#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:689
 #: src/frontend/mame/ui/videoopt.cpp:191 src/frontend/mame/ui/custui.cpp:490
 #: src/frontend/mame/ui/analogipt.cpp:471 plugins/cheatfind/init.lua:766
 #: plugins/cheatfind/init.lua:777 plugins/cheat/init.lua:668
 msgid "On"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:690
+#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:692
 #: src/frontend/mame/ui/videoopt.cpp:207 src/frontend/mame/ui/custui.cpp:490
 #: src/frontend/mame/ui/analogipt.cpp:471 plugins/cheatfind/init.lua:763
 #: plugins/cheatfind/init.lua:774 plugins/cheat/init.lua:671
@@ -685,11 +685,11 @@ msgstr ""
 msgid "Off"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:693
+#: src/frontend/mame/ui/menu.cpp:695
 msgid "Auto"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:1195
+#: src/frontend/mame/ui/menu.cpp:1197
 #: src/frontend/mame/ui/simpleselgame.cpp:278
 #: src/frontend/mame/ui/selmenu.cpp:1280
 msgid "Return to Previous Menu"
@@ -697,7 +697,7 @@ msgstr ""
 
 #: src/frontend/mame/ui/filemngr.cpp:139
 #: src/frontend/mame/ui/confswitch.cpp:119
-#: src/frontend/mame/ui/inputmap.cpp:559 src/frontend/mame/ui/analogipt.cpp:360
+#: src/frontend/mame/ui/inputmap.cpp:563 src/frontend/mame/ui/analogipt.cpp:360
 #, c-format
 msgid "[root%1$s]"
 msgstr ""
@@ -940,22 +940,22 @@ msgid ""
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "GHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "MHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "kHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "Hz"
 msgstr ""
 
@@ -979,38 +979,38 @@ msgstr ""
 msgid "Vector"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:480
+#: src/frontend/mame/ui/info.cpp:483
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:480
+#: src/frontend/mame/ui/info.cpp:483
 msgid "%2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:497
+#: src/frontend/mame/ui/info.cpp:500
 #, c-format
 msgid "Screen '%1$s'"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:499
+#: src/frontend/mame/ui/info.cpp:502
 msgid "Screen"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:570 src/frontend/mame/ui/info.cpp:581
+#: src/frontend/mame/ui/info.cpp:573 src/frontend/mame/ui/info.cpp:584
 #, c-format
 msgid "%1$s:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:662
+#: src/frontend/mame/ui/info.cpp:665
 msgid "Not supported"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:665
+#: src/frontend/mame/ui/info.cpp:668
 msgid "Partially supported"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:674
+#: src/frontend/mame/ui/info.cpp:677
 msgid "[empty]"
 msgstr ""
 
@@ -1083,7 +1083,7 @@ msgid "Emulated"
 msgstr ""
 
 #: src/frontend/mame/ui/keyboard.cpp:59 src/frontend/mame/ui/confswitch.cpp:117
-#: src/frontend/mame/ui/inputmap.cpp:557 src/frontend/mame/ui/analogipt.cpp:358
+#: src/frontend/mame/ui/inputmap.cpp:561 src/frontend/mame/ui/analogipt.cpp:358
 #, c-format
 msgid "%1$s [root%2$s]"
 msgstr ""
@@ -1443,7 +1443,7 @@ msgctxt "swlist-info"
 msgid "Software list/item"
 msgstr ""
 
-#: src/frontend/mame/ui/datmenu.cpp:88 src/frontend/mame/ui/selmenu.cpp:2698
+#: src/frontend/mame/ui/datmenu.cpp:88 src/frontend/mame/ui/selmenu.cpp:2707
 msgid "Software List Info"
 msgstr ""
 
@@ -1558,7 +1558,7 @@ msgstr ""
 msgid "Configure Machine:"
 msgstr ""
 
-#: src/frontend/mame/ui/miscmenu.cpp:858 src/frontend/mame/ui/selmenu.cpp:2638
+#: src/frontend/mame/ui/miscmenu.cpp:858 src/frontend/mame/ui/selmenu.cpp:2647
 msgid " (default)"
 msgstr ""
 
@@ -1575,7 +1575,7 @@ msgid ""
 "Press %2$s to return to emulation"
 msgstr ""
 
-#: src/frontend/mame/ui/info_pty.cpp:30 src/frontend/mame/ui/mainmenu.cpp:155
+#: src/frontend/mame/ui/info_pty.cpp:30
 msgid "Pseudo terminals"
 msgstr ""
 
@@ -1643,52 +1643,52 @@ msgstr ""
 msgid "Other Controls"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:227
+#: src/frontend/mame/ui/inputmap.cpp:231
 msgid "This machine has no configurable inputs."
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:327
+#: src/frontend/mame/ui/inputmap.cpp:331
 msgid "Pressed"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:397
+#: src/frontend/mame/ui/inputmap.cpp:401
 msgid "Invalid sequence entered"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:542
+#: src/frontend/mame/ui/inputmap.cpp:546
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:543
+#: src/frontend/mame/ui/inputmap.cpp:547
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog Inc"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:544
+#: src/frontend/mame/ui/inputmap.cpp:548
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog Dec"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:586
+#: src/frontend/mame/ui/inputmap.cpp:590
 #, c-format
 msgid "Press %1$s to set\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:587
+#: src/frontend/mame/ui/inputmap.cpp:591
 #, c-format
 msgid "Press %1$s to append\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:588
+#: src/frontend/mame/ui/inputmap.cpp:592
 #, c-format
 msgid "Press %1$s to clear\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:589
+#: src/frontend/mame/ui/inputmap.cpp:593
 #, c-format
 msgid "Press %1$s to restore default\n"
 msgstr ""
@@ -1752,7 +1752,7 @@ msgid ""
 msgstr ""
 
 #: src/frontend/mame/ui/simpleselgame.cpp:273
-#: src/frontend/mame/ui/selgame.cpp:436
+#: src/frontend/mame/ui/selgame.cpp:443
 msgid "Configure Options"
 msgstr ""
 
@@ -2080,16 +2080,16 @@ msgstr ""
 msgid "Expand to fit"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:437
+#: src/frontend/mame/ui/selgame.cpp:444
 msgid "Configure Machine"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:1050
+#: src/frontend/mame/ui/selgame.cpp:1060
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d machines (%5$d BIOS) )"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:1078
+#: src/frontend/mame/ui/selgame.cpp:1088
 #, c-format
 msgid "System: %1$-.100s"
 msgstr ""
@@ -2111,7 +2111,7 @@ msgstr ""
 #: src/frontend/mame/ui/auditmenu.cpp:98
 #, c-format
 msgid ""
-"Auditing ROMs for machine %2$u of %3$u...\n"
+"Auditing media for machine %2$u of %3$u...\n"
 "%1$s"
 msgstr ""
 
@@ -2126,12 +2126,12 @@ msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:136
 #, c-format
-msgid "Audit ROMs for %1$u machines marked unavailable"
+msgid "Audit media for %1$u machines marked unavailable"
 msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:137
 #, c-format
-msgid "Audit ROMs for all %1$u machines"
+msgid "Audit media for all %1$u machines"
 msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:154
@@ -2337,84 +2337,84 @@ msgctxt "color-sample"
 msgid "Clone"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:914
+#: src/frontend/mame/ui/custui.cpp:906
 msgid "ARGB Settings"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:919 src/frontend/mame/ui/custui.cpp:922
+#: src/frontend/mame/ui/custui.cpp:911 src/frontend/mame/ui/custui.cpp:914
 msgctxt "color-channel"
 msgid "Alpha"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:927 src/frontend/mame/ui/custui.cpp:930
+#: src/frontend/mame/ui/custui.cpp:919 src/frontend/mame/ui/custui.cpp:922
 msgctxt "color-channel"
 msgid "Red"
 msgstr ""
 
+#: src/frontend/mame/ui/custui.cpp:927 src/frontend/mame/ui/custui.cpp:930
+msgctxt "color-channel"
+msgid "Green"
+msgstr ""
+
 #: src/frontend/mame/ui/custui.cpp:935 src/frontend/mame/ui/custui.cpp:938
 msgctxt "color-channel"
-msgid "Green"
-msgstr ""
-
-#: src/frontend/mame/ui/custui.cpp:943 src/frontend/mame/ui/custui.cpp:946
-msgctxt "color-channel"
 msgid "Blue"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:949
+#: src/frontend/mame/ui/custui.cpp:941
 msgid "Choose from palette"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:996
+#: src/frontend/mame/ui/custui.cpp:988
 msgid "Color preview:"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1093
+#: src/frontend/mame/ui/custui.cpp:1085
 msgctxt "color-preset"
 msgid "White"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1094
+#: src/frontend/mame/ui/custui.cpp:1086
 msgctxt "color-preset"
 msgid "Silver"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1095
+#: src/frontend/mame/ui/custui.cpp:1087
 msgctxt "color-preset"
 msgid "Gray"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1096
+#: src/frontend/mame/ui/custui.cpp:1088
 msgctxt "color-preset"
 msgid "Black"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1097
+#: src/frontend/mame/ui/custui.cpp:1089
 msgctxt "color-preset"
 msgid "Red"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1098
+#: src/frontend/mame/ui/custui.cpp:1090
 msgctxt "color-preset"
 msgid "Orange"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1099
+#: src/frontend/mame/ui/custui.cpp:1091
 msgctxt "color-preset"
 msgid "Yellow"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1100
+#: src/frontend/mame/ui/custui.cpp:1092
 msgctxt "color-preset"
 msgid "Green"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1101
+#: src/frontend/mame/ui/custui.cpp:1093
 msgctxt "color-preset"
 msgid "Blue"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1102
+#: src/frontend/mame/ui/custui.cpp:1094
 msgctxt "color-preset"
 msgid "Violet"
 msgstr ""
@@ -2479,7 +2479,7 @@ msgid "Input (general)"
 msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:123
-msgid "Input (this Machine)"
+msgid "Input (this machine)"
 msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:126
@@ -2518,6 +2518,10 @@ msgstr ""
 msgid "Tape Control"
 msgstr ""
 
+#: src/frontend/mame/ui/mainmenu.cpp:155
+msgid "Pseudo Terminals"
+msgstr ""
+
 #: src/frontend/mame/ui/mainmenu.cpp:158
 msgid "BIOS Selection"
 msgstr ""
@@ -2556,7 +2560,7 @@ msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:200
 #, c-format
-msgid "About %s"
+msgid "About %1$s"
 msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:212
@@ -2716,373 +2720,373 @@ msgstr ""
 msgid "%1$s %2$s"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2235
+#: src/frontend/mame/ui/selmenu.cpp:2244
 msgid "Images"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2236
+#: src/frontend/mame/ui/selmenu.cpp:2245
 msgid "Infos"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2551
+#: src/frontend/mame/ui/selmenu.cpp:2560
 msgid ""
 "Required ROM/disk images for the selected system are missing or incorrect. "
 "Please acquire the correct files or select a different system.\n"
 "\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2567
+#: src/frontend/mame/ui/selmenu.cpp:2576
 msgid ""
 "Required ROM/disk images for the selected software are missing or incorrect. "
 "Please acquire the correct files or select a different software item.\n"
 "\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2583
+#: src/frontend/mame/ui/selmenu.cpp:2592
 msgid "incorrect checksum"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2586
+#: src/frontend/mame/ui/selmenu.cpp:2595
 msgid "incorrect length"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2589
+#: src/frontend/mame/ui/selmenu.cpp:2598
 msgid "not found"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2600
+#: src/frontend/mame/ui/selmenu.cpp:2609
 #, c-format
 msgid "%1$s (%2$s) - %3$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2602
+#: src/frontend/mame/ui/selmenu.cpp:2611
 #, c-format
 msgid "%1$s - %2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2606
+#: src/frontend/mame/ui/selmenu.cpp:2615
 msgid "Press any key to continue."
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2735
+#: src/frontend/mame/ui/selmenu.cpp:2744
 msgid "General Info"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2887
-#, c-format
-msgid "Romset\t%1$s\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2888
-#, c-format
-msgid "Year\t%1$s\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2889
-#, c-format
-msgid "Manufacturer\t%1$s\n"
-msgstr ""
-
 #: src/frontend/mame/ui/selmenu.cpp:2896
 #, c-format
-msgid "Driver is Clone of\t%1$s\n"
+msgid "Romset\t%1$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2901
-msgid "Driver is Parent\t\n"
+#: src/frontend/mame/ui/selmenu.cpp:2897
+#, c-format
+msgid "Year\t%1$s\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2898
+#, c-format
+msgid "Manufacturer\t%1$s\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2905
-msgid "Analog Controls\tYes\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2907
-msgid "Keyboard Inputs\tYes\n"
+#, c-format
+msgid "Driver is Clone of\t%1$s\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2910
-msgid "Overall\tNOT WORKING\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2912
-msgid "Overall\tUnemulated Protection\n"
+msgid "Driver is Parent\t\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2914
-msgid "Overall\tWorking\n"
+msgid "Analog Controls\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2917
-msgid "Graphics\tUnimplemented\n"
+#: src/frontend/mame/ui/selmenu.cpp:2916
+msgid "Keyboard Inputs\tYes\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2919
-msgid "Graphics\tWrong Colors\n"
+msgid "Overall\tNOT WORKING\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2921
-msgid "Graphics\tImperfect Colors\n"
+msgid "Overall\tUnemulated Protection\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2923
-msgid "Graphics\tImperfect\n"
+msgid "Overall\tWorking\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2925
-msgid "Graphics\tOK\n"
+#: src/frontend/mame/ui/selmenu.cpp:2926
+msgid "Graphics\tUnimplemented\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2928
-msgid "Sound\tNone\n"
+msgid "Graphics\tWrong Colors\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2930
-msgid "Sound\tUnimplemented\n"
+msgid "Graphics\tImperfect Colors\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2932
-msgid "Sound\tImperfect\n"
+msgid "Graphics\tImperfect\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2934
-msgid "Sound\tOK\n"
+msgid "Graphics\tOK\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2937
-msgid "Capture\tUnimplemented\n"
+msgid "Sound\tNone\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2939
+msgid "Sound\tUnimplemented\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2941
+msgid "Sound\tImperfect\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2943
+msgid "Sound\tOK\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2946
+msgid "Capture\tUnimplemented\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2948
 msgid "Capture\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2942
+#: src/frontend/mame/ui/selmenu.cpp:2951
 msgid "Camera\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2944
+#: src/frontend/mame/ui/selmenu.cpp:2953
 msgid "Camera\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2947
+#: src/frontend/mame/ui/selmenu.cpp:2956
 msgid "Microphone\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2949
+#: src/frontend/mame/ui/selmenu.cpp:2958
 msgid "Microphone\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2952
+#: src/frontend/mame/ui/selmenu.cpp:2961
 msgid "Controls\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2954
+#: src/frontend/mame/ui/selmenu.cpp:2963
 msgid "Controls\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2957
+#: src/frontend/mame/ui/selmenu.cpp:2966
 msgid "Keyboard\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2959
+#: src/frontend/mame/ui/selmenu.cpp:2968
 msgid "Keyboard\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2962
+#: src/frontend/mame/ui/selmenu.cpp:2971
 msgid "Mouse\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2964
+#: src/frontend/mame/ui/selmenu.cpp:2973
 msgid "Mouse\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2967
+#: src/frontend/mame/ui/selmenu.cpp:2976
 msgid "Media\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2969
+#: src/frontend/mame/ui/selmenu.cpp:2978
 msgid "Media\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2972
+#: src/frontend/mame/ui/selmenu.cpp:2981
 msgid "Disk\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2974
+#: src/frontend/mame/ui/selmenu.cpp:2983
 msgid "Disk\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2977
+#: src/frontend/mame/ui/selmenu.cpp:2986
 msgid "Printer\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2979
+#: src/frontend/mame/ui/selmenu.cpp:2988
 msgid "Printer\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2982
+#: src/frontend/mame/ui/selmenu.cpp:2991
 msgid "Mag. Tape\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2984
+#: src/frontend/mame/ui/selmenu.cpp:2993
 msgid "Mag. Tape\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2987
+#: src/frontend/mame/ui/selmenu.cpp:2996
 msgid "Punch Tape\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2989
+#: src/frontend/mame/ui/selmenu.cpp:2998
 msgid "Punch Tape\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2992
+#: src/frontend/mame/ui/selmenu.cpp:3001
 msgid "Mag. Drum\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2994
+#: src/frontend/mame/ui/selmenu.cpp:3003
 msgid "Mag. Drum\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2997
+#: src/frontend/mame/ui/selmenu.cpp:3006
 msgid "(EP)ROM\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2999
+#: src/frontend/mame/ui/selmenu.cpp:3008
 msgid "(EP)ROM\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3002
+#: src/frontend/mame/ui/selmenu.cpp:3011
 msgid "Communications\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3004
+#: src/frontend/mame/ui/selmenu.cpp:3013
 msgid "Communications\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3007
+#: src/frontend/mame/ui/selmenu.cpp:3016
 msgid "LAN\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3009
+#: src/frontend/mame/ui/selmenu.cpp:3018
 msgid "LAN\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3012
+#: src/frontend/mame/ui/selmenu.cpp:3021
 msgid "WAN\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3014
+#: src/frontend/mame/ui/selmenu.cpp:3023
 msgid "WAN\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3017
+#: src/frontend/mame/ui/selmenu.cpp:3026
 msgid "Timing\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3019
+#: src/frontend/mame/ui/selmenu.cpp:3028
 msgid "Timing\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3021
+#: src/frontend/mame/ui/selmenu.cpp:3030
 msgid "Mechanical Machine\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3021
+#: src/frontend/mame/ui/selmenu.cpp:3030
 msgid "Mechanical Machine\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3022
+#: src/frontend/mame/ui/selmenu.cpp:3031
 msgid "Requires Artwork\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3022
+#: src/frontend/mame/ui/selmenu.cpp:3031
 msgid "Requires Artwork\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3023
+#: src/frontend/mame/ui/selmenu.cpp:3032
 msgid "Requires Clickable Artwork\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3023
+#: src/frontend/mame/ui/selmenu.cpp:3032
 msgid "Requires Clickable Artwork\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3025
+#: src/frontend/mame/ui/selmenu.cpp:3034
 msgid "Support Cocktail\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3026
+#: src/frontend/mame/ui/selmenu.cpp:3035
 msgid "Driver is BIOS\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3026
+#: src/frontend/mame/ui/selmenu.cpp:3035
 msgid "Driver is BIOS\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3027
+#: src/frontend/mame/ui/selmenu.cpp:3036
 msgid "Support Save\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3027
+#: src/frontend/mame/ui/selmenu.cpp:3036
 msgid "Support Save\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3028
+#: src/frontend/mame/ui/selmenu.cpp:3037
 msgid "Screen Orientation\tVertical\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3028
+#: src/frontend/mame/ui/selmenu.cpp:3037
 msgid "Screen Orientation\tHorizontal\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3038
+#: src/frontend/mame/ui/selmenu.cpp:3047
 msgid "Requires CHD\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3038
+#: src/frontend/mame/ui/selmenu.cpp:3047
 msgid "Requires CHD\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3051
-msgid "ROM Audit Result\tOK\n"
+#: src/frontend/mame/ui/selmenu.cpp:3060
+msgid "Media Audit Result\tOK\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3053
-msgid "ROM Audit Result\tBAD\n"
+#: src/frontend/mame/ui/selmenu.cpp:3062
+msgid "Media Audit Result\tBAD\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3056
+#: src/frontend/mame/ui/selmenu.cpp:3065
 msgid "Samples Audit Result\tNone Needed\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3058
+#: src/frontend/mame/ui/selmenu.cpp:3067
 msgid "Samples Audit Result\tOK\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3060
+#: src/frontend/mame/ui/selmenu.cpp:3069
 msgid "Samples Audit Result\tBAD\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3064
+#: src/frontend/mame/ui/selmenu.cpp:3073
 msgid ""
-"ROM Audit \tDisabled\n"
-"Samples Audit \tDisabled\n"
+"Media Audit\tDisabled\n"
+"Samples Audit\tDisabled\n"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:150
+#: src/frontend/mame/ui/sndmenu.cpp:146
 msgid "Sound"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:151
+#: src/frontend/mame/ui/sndmenu.cpp:147
 msgid "Compressor"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:152
+#: src/frontend/mame/ui/sndmenu.cpp:148
 msgid "Sample Rate"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:153
+#: src/frontend/mame/ui/sndmenu.cpp:149
 msgid "Use External Samples"
 msgstr ""
 
@@ -3121,511 +3125,681 @@ msgstr ""
 msgid "  Screen '%1$s': Vector\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:132
+#: src/frontend/mame/ui/devopt.cpp:135
 #, c-format
 msgid "  Screen '%1$s': %2$d × %3$d (V) %4$s Hz\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:133
+#: src/frontend/mame/ui/devopt.cpp:136
 #, c-format
 msgid "  Screen '%1$s': %2$d × %3$d (H) %4$s Hz\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:147
+#: src/frontend/mame/ui/devopt.cpp:150
 msgid "* Sound:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:211
+#: src/frontend/mame/ui/devopt.cpp:214
 #, c-format
 msgid ""
 "* BIOS settings:\n"
 "  %1$d options    [default: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:255 src/frontend/mame/ui/devopt.cpp:271
-#: src/frontend/mame/ui/devopt.cpp:332
+#: src/frontend/mame/ui/devopt.cpp:258 src/frontend/mame/ui/devopt.cpp:274
+#: src/frontend/mame/ui/devopt.cpp:335
 #, c-format
 msgid "  %1$s    [default: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:260 src/frontend/mame/ui/devopt.cpp:276
+#: src/frontend/mame/ui/devopt.cpp:263 src/frontend/mame/ui/devopt.cpp:279
 #, c-format
 msgid "  %1$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:282
+#: src/frontend/mame/ui/devopt.cpp:285
 msgid "* DIP switch settings:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:287
+#: src/frontend/mame/ui/devopt.cpp:290
 msgid "* Configuration settings:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:291
+#: src/frontend/mame/ui/devopt.cpp:294
 msgid "* Input device(s):\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:293
+#: src/frontend/mame/ui/devopt.cpp:296
 #, c-format
 msgid "  User inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:295
+#: src/frontend/mame/ui/devopt.cpp:298
 #, c-format
 msgid "  Mahjong inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:297
+#: src/frontend/mame/ui/devopt.cpp:300
 #, c-format
 msgid "  Hanafuda inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:299
+#: src/frontend/mame/ui/devopt.cpp:302
 #, c-format
 msgid "  Gambling inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:301
+#: src/frontend/mame/ui/devopt.cpp:304
 #, c-format
 msgid "  Analog inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:303
+#: src/frontend/mame/ui/devopt.cpp:306
 #, c-format
 msgid "  Adjuster inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:305
+#: src/frontend/mame/ui/devopt.cpp:308
 #, c-format
 msgid "  Keypad inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:307
+#: src/frontend/mame/ui/devopt.cpp:310
 #, c-format
 msgid "  Keyboard inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:312
+#: src/frontend/mame/ui/devopt.cpp:315
 msgid "* Media Options:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:317
+#: src/frontend/mame/ui/devopt.cpp:320
 #, c-format
 msgid "  %1$s    [tag: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:327
+#: src/frontend/mame/ui/devopt.cpp:330
 msgid "* Slot Options:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:341
+#: src/frontend/mame/ui/devopt.cpp:344
 msgid "[None]\n"
 msgstr ""
 
-#: src/emu/render.cpp:1847
+#: src/emu/render.cpp:1796
 #, c-format
 msgctxt "view-name"
 msgid "Screen %1$u Standard (%2$u:%3$u)"
 msgstr ""
 
-#: src/emu/render.cpp:1873
+#: src/emu/render.cpp:1822
 #, c-format
 msgctxt "view-name"
 msgid "Screen %1$u Pixel Aspect (%2$u:%3$u)"
 msgstr ""
 
-#: src/emu/render.cpp:1895 src/emu/render.cpp:2030
+#: src/emu/render.cpp:1844 src/emu/render.cpp:1979
 msgctxt "view-name"
 msgid "Cocktail"
 msgstr ""
 
-#: src/emu/render.cpp:2015
+#: src/emu/render.cpp:1964
 msgctxt "view-name"
 msgid "Left-to-Right"
 msgstr ""
 
-#: src/emu/render.cpp:2016
+#: src/emu/render.cpp:1965
 msgctxt "view-name"
 msgid "Left-to-Right (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2017
+#: src/emu/render.cpp:1966
 msgctxt "view-name"
 msgid "Top-to-Bottom"
 msgstr ""
 
-#: src/emu/render.cpp:2018
+#: src/emu/render.cpp:1967
 msgctxt "view-name"
 msgid "Top-to-Bottom (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2069
+#: src/emu/render.cpp:2018
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Left-to-Right, Top-to-Bottom"
 msgstr ""
 
-#: src/emu/render.cpp:2078
+#: src/emu/render.cpp:2027
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Left-to-Right, Top-to-Bottom (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2087
+#: src/emu/render.cpp:2036
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Top-to-Bottom, Left-to-Right"
 msgstr ""
 
-#: src/emu/render.cpp:2096
+#: src/emu/render.cpp:2045
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Top-to-Bottom, Left-to-Right (Gapless)"
 msgstr ""
 
-#: src/emu/inpttype.ipp:22
+#: src/emu/ioport.cpp:332
+#, c-format
 msgctxt "input-name"
-msgid "P1 Up"
+msgid "P%1$u"
 msgstr ""
 
-#: src/emu/inpttype.ipp:23
+#: src/emu/ioport.cpp:1924
 msgctxt "input-name"
-msgid "P1 Down"
+msgid "???"
 msgstr ""
 
-#: src/emu/inpttype.ipp:24
+#: src/emu/inpttype.ipp:22 src/emu/inpttype.ipp:140 src/emu/inpttype.ipp:221
+#: src/emu/inpttype.ipp:255 src/emu/inpttype.ipp:289 src/emu/inpttype.ipp:323
+#: src/emu/inpttype.ipp:357 src/emu/inpttype.ipp:391 src/emu/inpttype.ipp:425
+#: src/emu/inpttype.ipp:459
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left"
+msgid "%p Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:25
+#: src/emu/inpttype.ipp:23 src/emu/inpttype.ipp:141 src/emu/inpttype.ipp:222
+#: src/emu/inpttype.ipp:256 src/emu/inpttype.ipp:290 src/emu/inpttype.ipp:324
+#: src/emu/inpttype.ipp:358 src/emu/inpttype.ipp:392 src/emu/inpttype.ipp:426
+#: src/emu/inpttype.ipp:460
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right"
+msgid "%p Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:26
+#: src/emu/inpttype.ipp:24 src/emu/inpttype.ipp:142 src/emu/inpttype.ipp:223
+#: src/emu/inpttype.ipp:257 src/emu/inpttype.ipp:291 src/emu/inpttype.ipp:325
+#: src/emu/inpttype.ipp:359 src/emu/inpttype.ipp:393 src/emu/inpttype.ipp:427
+#: src/emu/inpttype.ipp:461
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Up"
+msgid "%p Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:27
+#: src/emu/inpttype.ipp:25 src/emu/inpttype.ipp:143 src/emu/inpttype.ipp:224
+#: src/emu/inpttype.ipp:258 src/emu/inpttype.ipp:292 src/emu/inpttype.ipp:326
+#: src/emu/inpttype.ipp:360 src/emu/inpttype.ipp:394 src/emu/inpttype.ipp:428
+#: src/emu/inpttype.ipp:462
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Down"
+msgid "%p Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:28
+#: src/emu/inpttype.ipp:26 src/emu/inpttype.ipp:144 src/emu/inpttype.ipp:225
+#: src/emu/inpttype.ipp:259 src/emu/inpttype.ipp:293 src/emu/inpttype.ipp:327
+#: src/emu/inpttype.ipp:361 src/emu/inpttype.ipp:395 src/emu/inpttype.ipp:429
+#: src/emu/inpttype.ipp:463
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Left"
+msgid "%p Right Stick/Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:29
+#: src/emu/inpttype.ipp:27 src/emu/inpttype.ipp:145 src/emu/inpttype.ipp:226
+#: src/emu/inpttype.ipp:260 src/emu/inpttype.ipp:294 src/emu/inpttype.ipp:328
+#: src/emu/inpttype.ipp:362 src/emu/inpttype.ipp:396 src/emu/inpttype.ipp:430
+#: src/emu/inpttype.ipp:464
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Right"
+msgid "%p Right Stick/Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:30
+#: src/emu/inpttype.ipp:28 src/emu/inpttype.ipp:146 src/emu/inpttype.ipp:227
+#: src/emu/inpttype.ipp:261 src/emu/inpttype.ipp:295 src/emu/inpttype.ipp:329
+#: src/emu/inpttype.ipp:363 src/emu/inpttype.ipp:397 src/emu/inpttype.ipp:431
+#: src/emu/inpttype.ipp:465
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Up"
+msgid "%p Right Stick/Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:31
+#: src/emu/inpttype.ipp:29 src/emu/inpttype.ipp:147 src/emu/inpttype.ipp:228
+#: src/emu/inpttype.ipp:262 src/emu/inpttype.ipp:296 src/emu/inpttype.ipp:330
+#: src/emu/inpttype.ipp:364 src/emu/inpttype.ipp:398 src/emu/inpttype.ipp:432
+#: src/emu/inpttype.ipp:466
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Down"
+msgid "%p Right Stick/Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:32
+#: src/emu/inpttype.ipp:30 src/emu/inpttype.ipp:148 src/emu/inpttype.ipp:229
+#: src/emu/inpttype.ipp:263 src/emu/inpttype.ipp:297 src/emu/inpttype.ipp:331
+#: src/emu/inpttype.ipp:365 src/emu/inpttype.ipp:399 src/emu/inpttype.ipp:433
+#: src/emu/inpttype.ipp:467
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Left"
+msgid "%p Left Stick/Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:33
+#: src/emu/inpttype.ipp:31 src/emu/inpttype.ipp:149 src/emu/inpttype.ipp:230
+#: src/emu/inpttype.ipp:264 src/emu/inpttype.ipp:298 src/emu/inpttype.ipp:332
+#: src/emu/inpttype.ipp:366 src/emu/inpttype.ipp:400 src/emu/inpttype.ipp:434
+#: src/emu/inpttype.ipp:468
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Right"
+msgid "%p Left Stick/Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:34
+#: src/emu/inpttype.ipp:32 src/emu/inpttype.ipp:150 src/emu/inpttype.ipp:231
+#: src/emu/inpttype.ipp:265 src/emu/inpttype.ipp:299 src/emu/inpttype.ipp:333
+#: src/emu/inpttype.ipp:367 src/emu/inpttype.ipp:401 src/emu/inpttype.ipp:435
+#: src/emu/inpttype.ipp:469
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 1"
+msgid "%p Left Stick/Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:35
+#: src/emu/inpttype.ipp:33 src/emu/inpttype.ipp:151 src/emu/inpttype.ipp:232
+#: src/emu/inpttype.ipp:266 src/emu/inpttype.ipp:300 src/emu/inpttype.ipp:334
+#: src/emu/inpttype.ipp:368 src/emu/inpttype.ipp:402 src/emu/inpttype.ipp:436
+#: src/emu/inpttype.ipp:470
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 2"
+msgid "%p Left Stick/Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:36
+#: src/emu/inpttype.ipp:34 src/emu/inpttype.ipp:152 src/emu/inpttype.ipp:233
+#: src/emu/inpttype.ipp:267 src/emu/inpttype.ipp:301 src/emu/inpttype.ipp:335
+#: src/emu/inpttype.ipp:369 src/emu/inpttype.ipp:403 src/emu/inpttype.ipp:437
+#: src/emu/inpttype.ipp:471
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 3"
+msgid "%p Button 1"
 msgstr ""
 
-#: src/emu/inpttype.ipp:37
+#: src/emu/inpttype.ipp:35 src/emu/inpttype.ipp:153 src/emu/inpttype.ipp:234
+#: src/emu/inpttype.ipp:268 src/emu/inpttype.ipp:302 src/emu/inpttype.ipp:336
+#: src/emu/inpttype.ipp:370 src/emu/inpttype.ipp:404 src/emu/inpttype.ipp:438
+#: src/emu/inpttype.ipp:472
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 4"
+msgid "%p Button 2"
 msgstr ""
 
-#: src/emu/inpttype.ipp:38
+#: src/emu/inpttype.ipp:36 src/emu/inpttype.ipp:154 src/emu/inpttype.ipp:235
+#: src/emu/inpttype.ipp:269 src/emu/inpttype.ipp:303 src/emu/inpttype.ipp:337
+#: src/emu/inpttype.ipp:371 src/emu/inpttype.ipp:405 src/emu/inpttype.ipp:439
+#: src/emu/inpttype.ipp:473
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 5"
+msgid "%p Button 3"
 msgstr ""
 
-#: src/emu/inpttype.ipp:39
+#: src/emu/inpttype.ipp:37 src/emu/inpttype.ipp:155 src/emu/inpttype.ipp:236
+#: src/emu/inpttype.ipp:270 src/emu/inpttype.ipp:304 src/emu/inpttype.ipp:338
+#: src/emu/inpttype.ipp:372 src/emu/inpttype.ipp:406 src/emu/inpttype.ipp:440
+#: src/emu/inpttype.ipp:474
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 6"
+msgid "%p Button 4"
 msgstr ""
 
-#: src/emu/inpttype.ipp:40
+#: src/emu/inpttype.ipp:38 src/emu/inpttype.ipp:156 src/emu/inpttype.ipp:237
+#: src/emu/inpttype.ipp:271 src/emu/inpttype.ipp:305 src/emu/inpttype.ipp:339
+#: src/emu/inpttype.ipp:373 src/emu/inpttype.ipp:407 src/emu/inpttype.ipp:441
+#: src/emu/inpttype.ipp:475
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 7"
+msgid "%p Button 5"
 msgstr ""
 
-#: src/emu/inpttype.ipp:41
+#: src/emu/inpttype.ipp:39 src/emu/inpttype.ipp:157 src/emu/inpttype.ipp:238
+#: src/emu/inpttype.ipp:272 src/emu/inpttype.ipp:306 src/emu/inpttype.ipp:340
+#: src/emu/inpttype.ipp:374 src/emu/inpttype.ipp:408 src/emu/inpttype.ipp:442
+#: src/emu/inpttype.ipp:476
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 8"
+msgid "%p Button 6"
 msgstr ""
 
-#: src/emu/inpttype.ipp:42
+#: src/emu/inpttype.ipp:40 src/emu/inpttype.ipp:158 src/emu/inpttype.ipp:239
+#: src/emu/inpttype.ipp:273 src/emu/inpttype.ipp:307 src/emu/inpttype.ipp:341
+#: src/emu/inpttype.ipp:375 src/emu/inpttype.ipp:409 src/emu/inpttype.ipp:443
+#: src/emu/inpttype.ipp:477
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 9"
+msgid "%p Button 7"
 msgstr ""
 
-#: src/emu/inpttype.ipp:43
+#: src/emu/inpttype.ipp:41 src/emu/inpttype.ipp:159 src/emu/inpttype.ipp:240
+#: src/emu/inpttype.ipp:274 src/emu/inpttype.ipp:308 src/emu/inpttype.ipp:342
+#: src/emu/inpttype.ipp:376 src/emu/inpttype.ipp:410 src/emu/inpttype.ipp:444
+#: src/emu/inpttype.ipp:478
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 10"
+msgid "%p Button 8"
 msgstr ""
 
-#: src/emu/inpttype.ipp:44
+#: src/emu/inpttype.ipp:42 src/emu/inpttype.ipp:160 src/emu/inpttype.ipp:241
+#: src/emu/inpttype.ipp:275 src/emu/inpttype.ipp:309 src/emu/inpttype.ipp:343
+#: src/emu/inpttype.ipp:377 src/emu/inpttype.ipp:411 src/emu/inpttype.ipp:445
+#: src/emu/inpttype.ipp:479
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 11"
+msgid "%p Button 9"
 msgstr ""
 
-#: src/emu/inpttype.ipp:45
+#: src/emu/inpttype.ipp:43 src/emu/inpttype.ipp:161 src/emu/inpttype.ipp:242
+#: src/emu/inpttype.ipp:276 src/emu/inpttype.ipp:310 src/emu/inpttype.ipp:344
+#: src/emu/inpttype.ipp:378 src/emu/inpttype.ipp:412 src/emu/inpttype.ipp:446
+#: src/emu/inpttype.ipp:480
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 12"
+msgid "%p Button 10"
 msgstr ""
 
-#: src/emu/inpttype.ipp:46
+#: src/emu/inpttype.ipp:44 src/emu/inpttype.ipp:162 src/emu/inpttype.ipp:243
+#: src/emu/inpttype.ipp:277 src/emu/inpttype.ipp:311 src/emu/inpttype.ipp:345
+#: src/emu/inpttype.ipp:379 src/emu/inpttype.ipp:413 src/emu/inpttype.ipp:447
+#: src/emu/inpttype.ipp:481
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 13"
+msgid "%p Button 11"
 msgstr ""
 
-#: src/emu/inpttype.ipp:47
+#: src/emu/inpttype.ipp:45 src/emu/inpttype.ipp:163 src/emu/inpttype.ipp:244
+#: src/emu/inpttype.ipp:278 src/emu/inpttype.ipp:312 src/emu/inpttype.ipp:346
+#: src/emu/inpttype.ipp:380 src/emu/inpttype.ipp:414 src/emu/inpttype.ipp:448
+#: src/emu/inpttype.ipp:482
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 14"
+msgid "%p Button 12"
 msgstr ""
 
-#: src/emu/inpttype.ipp:48
+#: src/emu/inpttype.ipp:46 src/emu/inpttype.ipp:164 src/emu/inpttype.ipp:245
+#: src/emu/inpttype.ipp:279 src/emu/inpttype.ipp:313 src/emu/inpttype.ipp:347
+#: src/emu/inpttype.ipp:381 src/emu/inpttype.ipp:415 src/emu/inpttype.ipp:449
+#: src/emu/inpttype.ipp:483
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 15"
+msgid "%p Button 13"
 msgstr ""
 
-#: src/emu/inpttype.ipp:49
+#: src/emu/inpttype.ipp:47 src/emu/inpttype.ipp:165 src/emu/inpttype.ipp:246
+#: src/emu/inpttype.ipp:280 src/emu/inpttype.ipp:314 src/emu/inpttype.ipp:348
+#: src/emu/inpttype.ipp:382 src/emu/inpttype.ipp:416 src/emu/inpttype.ipp:450
+#: src/emu/inpttype.ipp:484
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 16"
+msgid "%p Button 14"
 msgstr ""
 
-#: src/emu/inpttype.ipp:50
+#: src/emu/inpttype.ipp:48 src/emu/inpttype.ipp:166 src/emu/inpttype.ipp:247
+#: src/emu/inpttype.ipp:281 src/emu/inpttype.ipp:315 src/emu/inpttype.ipp:349
+#: src/emu/inpttype.ipp:383 src/emu/inpttype.ipp:417 src/emu/inpttype.ipp:451
+#: src/emu/inpttype.ipp:485
+#, c-format
 msgctxt "input-name"
-msgid "P1 Start"
+msgid "%p Button 15"
 msgstr ""
 
-#: src/emu/inpttype.ipp:51
+#: src/emu/inpttype.ipp:49 src/emu/inpttype.ipp:167 src/emu/inpttype.ipp:248
+#: src/emu/inpttype.ipp:282 src/emu/inpttype.ipp:316 src/emu/inpttype.ipp:350
+#: src/emu/inpttype.ipp:384 src/emu/inpttype.ipp:418 src/emu/inpttype.ipp:452
+#: src/emu/inpttype.ipp:486
+#, c-format
 msgctxt "input-name"
-msgid "P1 Select"
+msgid "%p Button 16"
 msgstr ""
 
-#: src/emu/inpttype.ipp:56
+#: src/emu/inpttype.ipp:50 src/emu/inpttype.ipp:168 src/emu/inpttype.ipp:249
+#: src/emu/inpttype.ipp:283 src/emu/inpttype.ipp:317 src/emu/inpttype.ipp:351
+#: src/emu/inpttype.ipp:385 src/emu/inpttype.ipp:419 src/emu/inpttype.ipp:453
+#: src/emu/inpttype.ipp:487
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong A"
+msgid "%p Start"
 msgstr ""
 
-#: src/emu/inpttype.ipp:57
+#: src/emu/inpttype.ipp:51 src/emu/inpttype.ipp:169 src/emu/inpttype.ipp:250
+#: src/emu/inpttype.ipp:284 src/emu/inpttype.ipp:318 src/emu/inpttype.ipp:352
+#: src/emu/inpttype.ipp:386 src/emu/inpttype.ipp:420 src/emu/inpttype.ipp:454
+#: src/emu/inpttype.ipp:488
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong B"
+msgid "%p Select"
 msgstr ""
 
-#: src/emu/inpttype.ipp:58
+#: src/emu/inpttype.ipp:56 src/emu/inpttype.ipp:174
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong C"
+msgid "%p Mahjong A"
 msgstr ""
 
-#: src/emu/inpttype.ipp:59
+#: src/emu/inpttype.ipp:57 src/emu/inpttype.ipp:175
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong D"
+msgid "%p Mahjong B"
 msgstr ""
 
-#: src/emu/inpttype.ipp:60
+#: src/emu/inpttype.ipp:58 src/emu/inpttype.ipp:176
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong E"
+msgid "%p Mahjong C"
 msgstr ""
 
-#: src/emu/inpttype.ipp:61
+#: src/emu/inpttype.ipp:59 src/emu/inpttype.ipp:177
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong F"
+msgid "%p Mahjong D"
 msgstr ""
 
-#: src/emu/inpttype.ipp:62
+#: src/emu/inpttype.ipp:60 src/emu/inpttype.ipp:178
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong G"
+msgid "%p Mahjong E"
 msgstr ""
 
-#: src/emu/inpttype.ipp:63
+#: src/emu/inpttype.ipp:61 src/emu/inpttype.ipp:179
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong H"
+msgid "%p Mahjong F"
 msgstr ""
 
-#: src/emu/inpttype.ipp:64
+#: src/emu/inpttype.ipp:62 src/emu/inpttype.ipp:180
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong I"
+msgid "%p Mahjong G"
 msgstr ""
 
-#: src/emu/inpttype.ipp:65
+#: src/emu/inpttype.ipp:63 src/emu/inpttype.ipp:181
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong J"
+msgid "%p Mahjong H"
 msgstr ""
 
-#: src/emu/inpttype.ipp:66
+#: src/emu/inpttype.ipp:64 src/emu/inpttype.ipp:182
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong K"
+msgid "%p Mahjong I"
 msgstr ""
 
-#: src/emu/inpttype.ipp:67
+#: src/emu/inpttype.ipp:65 src/emu/inpttype.ipp:183
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong L"
+msgid "%p Mahjong J"
 msgstr ""
 
-#: src/emu/inpttype.ipp:68
+#: src/emu/inpttype.ipp:66 src/emu/inpttype.ipp:184
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong M"
+msgid "%p Mahjong K"
 msgstr ""
 
-#: src/emu/inpttype.ipp:69
+#: src/emu/inpttype.ipp:67 src/emu/inpttype.ipp:185
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong N"
+msgid "%p Mahjong L"
 msgstr ""
 
-#: src/emu/inpttype.ipp:70
+#: src/emu/inpttype.ipp:68 src/emu/inpttype.ipp:186
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong O"
+msgid "%p Mahjong M"
 msgstr ""
 
-#: src/emu/inpttype.ipp:71
+#: src/emu/inpttype.ipp:69 src/emu/inpttype.ipp:187
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong P"
+msgid "%p Mahjong N"
 msgstr ""
 
-#: src/emu/inpttype.ipp:72
+#: src/emu/inpttype.ipp:70 src/emu/inpttype.ipp:188
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Q"
+msgid "%p Mahjong O"
 msgstr ""
 
-#: src/emu/inpttype.ipp:73
+#: src/emu/inpttype.ipp:71 src/emu/inpttype.ipp:189
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Kan"
+msgid "%p Mahjong P"
 msgstr ""
 
-#: src/emu/inpttype.ipp:74
+#: src/emu/inpttype.ipp:72 src/emu/inpttype.ipp:190
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Pon"
+msgid "%p Mahjong Q"
 msgstr ""
 
-#: src/emu/inpttype.ipp:75
+#: src/emu/inpttype.ipp:73 src/emu/inpttype.ipp:191
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Chi"
+msgid "%p Mahjong Kan"
 msgstr ""
 
-#: src/emu/inpttype.ipp:76
+#: src/emu/inpttype.ipp:74 src/emu/inpttype.ipp:192
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Reach"
+msgid "%p Mahjong Pon"
 msgstr ""
 
-#: src/emu/inpttype.ipp:77
+#: src/emu/inpttype.ipp:75 src/emu/inpttype.ipp:193
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Ron"
+msgid "%p Mahjong Chi"
 msgstr ""
 
-#: src/emu/inpttype.ipp:78
+#: src/emu/inpttype.ipp:76 src/emu/inpttype.ipp:194
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Flip Flop"
+msgid "%p Mahjong Reach"
 msgstr ""
 
-#: src/emu/inpttype.ipp:79
+#: src/emu/inpttype.ipp:77 src/emu/inpttype.ipp:195
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Bet"
+msgid "%p Mahjong Ron"
 msgstr ""
 
-#: src/emu/inpttype.ipp:80
+#: src/emu/inpttype.ipp:78 src/emu/inpttype.ipp:200
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Take Score"
+msgid "%p Mahjong Flip Flop"
 msgstr ""
 
-#: src/emu/inpttype.ipp:81
+#: src/emu/inpttype.ipp:79 src/emu/inpttype.ipp:196
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Double Up"
+msgid "%p Mahjong Bet"
 msgstr ""
 
-#: src/emu/inpttype.ipp:82
+#: src/emu/inpttype.ipp:80 src/emu/inpttype.ipp:198
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Big"
+msgid "%p Mahjong Take Score"
 msgstr ""
 
-#: src/emu/inpttype.ipp:83
+#: src/emu/inpttype.ipp:81 src/emu/inpttype.ipp:199
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Small"
+msgid "%p Mahjong Double Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:84
+#: src/emu/inpttype.ipp:82 src/emu/inpttype.ipp:201
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Last Chance"
+msgid "%p Mahjong Big"
 msgstr ""
 
-#: src/emu/inpttype.ipp:89
+#: src/emu/inpttype.ipp:83 src/emu/inpttype.ipp:202
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda A/1"
+msgid "%p Mahjong Small"
 msgstr ""
 
-#: src/emu/inpttype.ipp:90
+#: src/emu/inpttype.ipp:84 src/emu/inpttype.ipp:197
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda B/2"
+msgid "%p Mahjong Last Chance"
 msgstr ""
 
-#: src/emu/inpttype.ipp:91
+#: src/emu/inpttype.ipp:89 src/emu/inpttype.ipp:207
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda C/3"
+msgid "%p Hanafuda A/1"
 msgstr ""
 
-#: src/emu/inpttype.ipp:92
+#: src/emu/inpttype.ipp:90 src/emu/inpttype.ipp:208
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda D/4"
+msgid "%p Hanafuda B/2"
 msgstr ""
 
-#: src/emu/inpttype.ipp:93
+#: src/emu/inpttype.ipp:91 src/emu/inpttype.ipp:209
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda E/5"
+msgid "%p Hanafuda C/3"
 msgstr ""
 
-#: src/emu/inpttype.ipp:94
+#: src/emu/inpttype.ipp:92 src/emu/inpttype.ipp:210
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda F/6"
+msgid "%p Hanafuda D/4"
 msgstr ""
 
-#: src/emu/inpttype.ipp:95
+#: src/emu/inpttype.ipp:93 src/emu/inpttype.ipp:211
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda G/7"
+msgid "%p Hanafuda E/5"
 msgstr ""
 
-#: src/emu/inpttype.ipp:96
+#: src/emu/inpttype.ipp:94 src/emu/inpttype.ipp:212
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda H/8"
+msgid "%p Hanafuda F/6"
 msgstr ""
 
-#: src/emu/inpttype.ipp:97
+#: src/emu/inpttype.ipp:95 src/emu/inpttype.ipp:213
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda Yes"
+msgid "%p Hanafuda G/7"
 msgstr ""
 
-#: src/emu/inpttype.ipp:98
+#: src/emu/inpttype.ipp:96 src/emu/inpttype.ipp:214
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda No"
+msgid "%p Hanafuda H/8"
+msgstr ""
+
+#: src/emu/inpttype.ipp:97 src/emu/inpttype.ipp:215
+#, c-format
+msgctxt "input-name"
+msgid "%p Hanafuda Yes"
+msgstr ""
+
+#: src/emu/inpttype.ipp:98 src/emu/inpttype.ipp:216
+#, c-format
+msgctxt "input-name"
+msgid "%p Hanafuda No"
 msgstr ""
 
 #: src/emu/inpttype.ipp:103
@@ -3753,1551 +3927,6 @@ msgctxt "input-name"
 msgid "Stop All Reels"
 msgstr ""
 
-#: src/emu/inpttype.ipp:140
-msgctxt "input-name"
-msgid "P2 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:141
-msgctxt "input-name"
-msgid "P2 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:142
-msgctxt "input-name"
-msgid "P2 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:143
-msgctxt "input-name"
-msgid "P2 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:144
-msgctxt "input-name"
-msgid "P2 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:145
-msgctxt "input-name"
-msgid "P2 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:146
-msgctxt "input-name"
-msgid "P2 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:147
-msgctxt "input-name"
-msgid "P2 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:148
-msgctxt "input-name"
-msgid "P2 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:149
-msgctxt "input-name"
-msgid "P2 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:150
-msgctxt "input-name"
-msgid "P2 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:151
-msgctxt "input-name"
-msgid "P2 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:152
-msgctxt "input-name"
-msgid "P2 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:153
-msgctxt "input-name"
-msgid "P2 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:154
-msgctxt "input-name"
-msgid "P2 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:155
-msgctxt "input-name"
-msgid "P2 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:156
-msgctxt "input-name"
-msgid "P2 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:157
-msgctxt "input-name"
-msgid "P2 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:158
-msgctxt "input-name"
-msgid "P2 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:159
-msgctxt "input-name"
-msgid "P2 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:160
-msgctxt "input-name"
-msgid "P2 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:161
-msgctxt "input-name"
-msgid "P2 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:162
-msgctxt "input-name"
-msgid "P2 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:163
-msgctxt "input-name"
-msgid "P2 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:164
-msgctxt "input-name"
-msgid "P2 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:165
-msgctxt "input-name"
-msgid "P2 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:166
-msgctxt "input-name"
-msgid "P2 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:167
-msgctxt "input-name"
-msgid "P2 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:168
-msgctxt "input-name"
-msgid "P2 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:169
-msgctxt "input-name"
-msgid "P2 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:174
-msgctxt "input-name"
-msgid "P2 Mahjong A"
-msgstr ""
-
-#: src/emu/inpttype.ipp:175
-msgctxt "input-name"
-msgid "P2 Mahjong B"
-msgstr ""
-
-#: src/emu/inpttype.ipp:176
-msgctxt "input-name"
-msgid "P2 Mahjong C"
-msgstr ""
-
-#: src/emu/inpttype.ipp:177
-msgctxt "input-name"
-msgid "P2 Mahjong D"
-msgstr ""
-
-#: src/emu/inpttype.ipp:178
-msgctxt "input-name"
-msgid "P2 Mahjong E"
-msgstr ""
-
-#: src/emu/inpttype.ipp:179
-msgctxt "input-name"
-msgid "P2 Mahjong F"
-msgstr ""
-
-#: src/emu/inpttype.ipp:180
-msgctxt "input-name"
-msgid "P2 Mahjong G"
-msgstr ""
-
-#: src/emu/inpttype.ipp:181
-msgctxt "input-name"
-msgid "P2 Mahjong H"
-msgstr ""
-
-#: src/emu/inpttype.ipp:182
-msgctxt "input-name"
-msgid "P2 Mahjong I"
-msgstr ""
-
-#: src/emu/inpttype.ipp:183
-msgctxt "input-name"
-msgid "P2 Mahjong J"
-msgstr ""
-
-#: src/emu/inpttype.ipp:184
-msgctxt "input-name"
-msgid "P2 Mahjong K"
-msgstr ""
-
-#: src/emu/inpttype.ipp:185
-msgctxt "input-name"
-msgid "P2 Mahjong L"
-msgstr ""
-
-#: src/emu/inpttype.ipp:186
-msgctxt "input-name"
-msgid "P2 Mahjong M"
-msgstr ""
-
-#: src/emu/inpttype.ipp:187
-msgctxt "input-name"
-msgid "P2 Mahjong N"
-msgstr ""
-
-#: src/emu/inpttype.ipp:188
-msgctxt "input-name"
-msgid "P2 Mahjong O"
-msgstr ""
-
-#: src/emu/inpttype.ipp:189
-msgctxt "input-name"
-msgid "P2 Mahjong P"
-msgstr ""
-
-#: src/emu/inpttype.ipp:190
-msgctxt "input-name"
-msgid "P2 Mahjong Q"
-msgstr ""
-
-#: src/emu/inpttype.ipp:191
-msgctxt "input-name"
-msgid "P2 Mahjong Kan"
-msgstr ""
-
-#: src/emu/inpttype.ipp:192
-msgctxt "input-name"
-msgid "P2 Mahjong Pon"
-msgstr ""
-
-#: src/emu/inpttype.ipp:193
-msgctxt "input-name"
-msgid "P2 Mahjong Chi"
-msgstr ""
-
-#: src/emu/inpttype.ipp:194
-msgctxt "input-name"
-msgid "P2 Mahjong Reach"
-msgstr ""
-
-#: src/emu/inpttype.ipp:195
-msgctxt "input-name"
-msgid "P2 Mahjong Ron"
-msgstr ""
-
-#: src/emu/inpttype.ipp:196
-msgctxt "input-name"
-msgid "P2 Mahjong Bet"
-msgstr ""
-
-#: src/emu/inpttype.ipp:197
-msgctxt "input-name"
-msgid "P2 Mahjong Last Chance"
-msgstr ""
-
-#: src/emu/inpttype.ipp:198
-msgctxt "input-name"
-msgid "P2 Mahjong Take Score"
-msgstr ""
-
-#: src/emu/inpttype.ipp:199
-msgctxt "input-name"
-msgid "P2 Mahjong Double Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:200
-msgctxt "input-name"
-msgid "P2 Mahjong Flip Flop"
-msgstr ""
-
-#: src/emu/inpttype.ipp:201
-msgctxt "input-name"
-msgid "P2 Mahjong Big"
-msgstr ""
-
-#: src/emu/inpttype.ipp:202
-msgctxt "input-name"
-msgid "P2 Mahjong Small"
-msgstr ""
-
-#: src/emu/inpttype.ipp:207
-msgctxt "input-name"
-msgid "P2 Hanafuda A/1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:208
-msgctxt "input-name"
-msgid "P2 Hanafuda B/2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:209
-msgctxt "input-name"
-msgid "P2 Hanafuda C/3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:210
-msgctxt "input-name"
-msgid "P2 Hanafuda D/4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:211
-msgctxt "input-name"
-msgid "P2 Hanafuda E/5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:212
-msgctxt "input-name"
-msgid "P2 Hanafuda F/6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:213
-msgctxt "input-name"
-msgid "P2 Hanafuda G/7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:214
-msgctxt "input-name"
-msgid "P2 Hanafuda H/8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:215
-msgctxt "input-name"
-msgid "P2 Hanafuda Yes"
-msgstr ""
-
-#: src/emu/inpttype.ipp:216
-msgctxt "input-name"
-msgid "P2 Hanafuda No"
-msgstr ""
-
-#: src/emu/inpttype.ipp:221
-msgctxt "input-name"
-msgid "P3 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:222
-msgctxt "input-name"
-msgid "P3 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:223
-msgctxt "input-name"
-msgid "P3 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:224
-msgctxt "input-name"
-msgid "P3 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:225
-msgctxt "input-name"
-msgid "P3 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:226
-msgctxt "input-name"
-msgid "P3 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:227
-msgctxt "input-name"
-msgid "P3 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:228
-msgctxt "input-name"
-msgid "P3 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:229
-msgctxt "input-name"
-msgid "P3 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:230
-msgctxt "input-name"
-msgid "P3 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:231
-msgctxt "input-name"
-msgid "P3 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:232
-msgctxt "input-name"
-msgid "P3 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:233
-msgctxt "input-name"
-msgid "P3 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:234
-msgctxt "input-name"
-msgid "P3 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:235
-msgctxt "input-name"
-msgid "P3 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:236
-msgctxt "input-name"
-msgid "P3 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:237
-msgctxt "input-name"
-msgid "P3 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:238
-msgctxt "input-name"
-msgid "P3 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:239
-msgctxt "input-name"
-msgid "P3 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:240
-msgctxt "input-name"
-msgid "P3 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:241
-msgctxt "input-name"
-msgid "P3 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:242
-msgctxt "input-name"
-msgid "P3 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:243
-msgctxt "input-name"
-msgid "P3 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:244
-msgctxt "input-name"
-msgid "P3 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:245
-msgctxt "input-name"
-msgid "P3 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:246
-msgctxt "input-name"
-msgid "P3 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:247
-msgctxt "input-name"
-msgid "P3 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:248
-msgctxt "input-name"
-msgid "P3 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:249
-msgctxt "input-name"
-msgid "P3 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:250
-msgctxt "input-name"
-msgid "P3 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:255
-msgctxt "input-name"
-msgid "P4 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:256
-msgctxt "input-name"
-msgid "P4 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:257
-msgctxt "input-name"
-msgid "P4 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:258
-msgctxt "input-name"
-msgid "P4 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:259
-msgctxt "input-name"
-msgid "P4 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:260
-msgctxt "input-name"
-msgid "P4 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:261
-msgctxt "input-name"
-msgid "P4 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:262
-msgctxt "input-name"
-msgid "P4 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:263
-msgctxt "input-name"
-msgid "P4 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:264
-msgctxt "input-name"
-msgid "P4 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:265
-msgctxt "input-name"
-msgid "P4 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:266
-msgctxt "input-name"
-msgid "P4 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:267
-msgctxt "input-name"
-msgid "P4 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:268
-msgctxt "input-name"
-msgid "P4 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:269
-msgctxt "input-name"
-msgid "P4 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:270
-msgctxt "input-name"
-msgid "P4 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:271
-msgctxt "input-name"
-msgid "P4 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:272
-msgctxt "input-name"
-msgid "P4 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:273
-msgctxt "input-name"
-msgid "P4 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:274
-msgctxt "input-name"
-msgid "P4 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:275
-msgctxt "input-name"
-msgid "P4 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:276
-msgctxt "input-name"
-msgid "P4 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:277
-msgctxt "input-name"
-msgid "P4 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:278
-msgctxt "input-name"
-msgid "P4 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:279
-msgctxt "input-name"
-msgid "P4 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:280
-msgctxt "input-name"
-msgid "P4 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:281
-msgctxt "input-name"
-msgid "P4 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:282
-msgctxt "input-name"
-msgid "P4 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:283
-msgctxt "input-name"
-msgid "P4 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:284
-msgctxt "input-name"
-msgid "P4 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:289
-msgctxt "input-name"
-msgid "P5 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:290
-msgctxt "input-name"
-msgid "P5 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:291
-msgctxt "input-name"
-msgid "P5 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:292
-msgctxt "input-name"
-msgid "P5 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:293
-msgctxt "input-name"
-msgid "P5 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:294
-msgctxt "input-name"
-msgid "P5 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:295
-msgctxt "input-name"
-msgid "P5 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:296
-msgctxt "input-name"
-msgid "P5 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:297
-msgctxt "input-name"
-msgid "P5 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:298
-msgctxt "input-name"
-msgid "P5 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:299
-msgctxt "input-name"
-msgid "P5 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:300
-msgctxt "input-name"
-msgid "P5 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:301
-msgctxt "input-name"
-msgid "P5 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:302
-msgctxt "input-name"
-msgid "P5 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:303
-msgctxt "input-name"
-msgid "P5 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:304
-msgctxt "input-name"
-msgid "P5 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:305
-msgctxt "input-name"
-msgid "P5 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:306
-msgctxt "input-name"
-msgid "P5 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:307
-msgctxt "input-name"
-msgid "P5 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:308
-msgctxt "input-name"
-msgid "P5 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:309
-msgctxt "input-name"
-msgid "P5 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:310
-msgctxt "input-name"
-msgid "P5 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:311
-msgctxt "input-name"
-msgid "P5 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:312
-msgctxt "input-name"
-msgid "P5 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:313
-msgctxt "input-name"
-msgid "P5 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:314
-msgctxt "input-name"
-msgid "P5 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:315
-msgctxt "input-name"
-msgid "P5 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:316
-msgctxt "input-name"
-msgid "P5 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:317
-msgctxt "input-name"
-msgid "P5 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:318
-msgctxt "input-name"
-msgid "P5 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:323
-msgctxt "input-name"
-msgid "P6 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:324
-msgctxt "input-name"
-msgid "P6 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:325
-msgctxt "input-name"
-msgid "P6 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:326
-msgctxt "input-name"
-msgid "P6 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:327
-msgctxt "input-name"
-msgid "P6 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:328
-msgctxt "input-name"
-msgid "P6 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:329
-msgctxt "input-name"
-msgid "P6 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:330
-msgctxt "input-name"
-msgid "P6 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:331
-msgctxt "input-name"
-msgid "P6 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:332
-msgctxt "input-name"
-msgid "P6 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:333
-msgctxt "input-name"
-msgid "P6 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:334
-msgctxt "input-name"
-msgid "P6 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:335
-msgctxt "input-name"
-msgid "P6 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:336
-msgctxt "input-name"
-msgid "P6 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:337
-msgctxt "input-name"
-msgid "P6 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:338
-msgctxt "input-name"
-msgid "P6 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:339
-msgctxt "input-name"
-msgid "P6 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:340
-msgctxt "input-name"
-msgid "P6 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:341
-msgctxt "input-name"
-msgid "P6 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:342
-msgctxt "input-name"
-msgid "P6 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:343
-msgctxt "input-name"
-msgid "P6 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:344
-msgctxt "input-name"
-msgid "P6 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:345
-msgctxt "input-name"
-msgid "P6 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:346
-msgctxt "input-name"
-msgid "P6 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:347
-msgctxt "input-name"
-msgid "P6 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:348
-msgctxt "input-name"
-msgid "P6 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:349
-msgctxt "input-name"
-msgid "P6 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:350
-msgctxt "input-name"
-msgid "P6 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:351
-msgctxt "input-name"
-msgid "P6 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:352
-msgctxt "input-name"
-msgid "P6 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:357
-msgctxt "input-name"
-msgid "P7 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:358
-msgctxt "input-name"
-msgid "P7 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:359
-msgctxt "input-name"
-msgid "P7 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:360
-msgctxt "input-name"
-msgid "P7 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:361
-msgctxt "input-name"
-msgid "P7 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:362
-msgctxt "input-name"
-msgid "P7 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:363
-msgctxt "input-name"
-msgid "P7 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:364
-msgctxt "input-name"
-msgid "P7 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:365
-msgctxt "input-name"
-msgid "P7 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:366
-msgctxt "input-name"
-msgid "P7 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:367
-msgctxt "input-name"
-msgid "P7 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:368
-msgctxt "input-name"
-msgid "P7 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:369
-msgctxt "input-name"
-msgid "P7 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:370
-msgctxt "input-name"
-msgid "P7 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:371
-msgctxt "input-name"
-msgid "P7 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:372
-msgctxt "input-name"
-msgid "P7 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:373
-msgctxt "input-name"
-msgid "P7 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:374
-msgctxt "input-name"
-msgid "P7 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:375
-msgctxt "input-name"
-msgid "P7 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:376
-msgctxt "input-name"
-msgid "P7 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:377
-msgctxt "input-name"
-msgid "P7 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:378
-msgctxt "input-name"
-msgid "P7 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:379
-msgctxt "input-name"
-msgid "P7 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:380
-msgctxt "input-name"
-msgid "P7 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:381
-msgctxt "input-name"
-msgid "P7 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:382
-msgctxt "input-name"
-msgid "P7 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:383
-msgctxt "input-name"
-msgid "P7 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:384
-msgctxt "input-name"
-msgid "P7 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:385
-msgctxt "input-name"
-msgid "P7 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:386
-msgctxt "input-name"
-msgid "P7 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:391
-msgctxt "input-name"
-msgid "P8 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:392
-msgctxt "input-name"
-msgid "P8 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:393
-msgctxt "input-name"
-msgid "P8 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:394
-msgctxt "input-name"
-msgid "P8 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:395
-msgctxt "input-name"
-msgid "P8 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:396
-msgctxt "input-name"
-msgid "P8 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:397
-msgctxt "input-name"
-msgid "P8 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:398
-msgctxt "input-name"
-msgid "P8 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:399
-msgctxt "input-name"
-msgid "P8 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:400
-msgctxt "input-name"
-msgid "P8 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:401
-msgctxt "input-name"
-msgid "P8 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:402
-msgctxt "input-name"
-msgid "P8 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:403
-msgctxt "input-name"
-msgid "P8 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:404
-msgctxt "input-name"
-msgid "P8 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:405
-msgctxt "input-name"
-msgid "P8 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:406
-msgctxt "input-name"
-msgid "P8 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:407
-msgctxt "input-name"
-msgid "P8 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:408
-msgctxt "input-name"
-msgid "P8 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:409
-msgctxt "input-name"
-msgid "P8 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:410
-msgctxt "input-name"
-msgid "P8 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:411
-msgctxt "input-name"
-msgid "P8 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:412
-msgctxt "input-name"
-msgid "P8 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:413
-msgctxt "input-name"
-msgid "P8 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:414
-msgctxt "input-name"
-msgid "P8 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:415
-msgctxt "input-name"
-msgid "P8 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:416
-msgctxt "input-name"
-msgid "P8 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:417
-msgctxt "input-name"
-msgid "P8 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:418
-msgctxt "input-name"
-msgid "P8 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:419
-msgctxt "input-name"
-msgid "P8 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:420
-msgctxt "input-name"
-msgid "P8 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:425
-msgctxt "input-name"
-msgid "P9 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:426
-msgctxt "input-name"
-msgid "P9 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:427
-msgctxt "input-name"
-msgid "P9 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:428
-msgctxt "input-name"
-msgid "P9 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:429
-msgctxt "input-name"
-msgid "P9 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:430
-msgctxt "input-name"
-msgid "P9 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:431
-msgctxt "input-name"
-msgid "P9 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:432
-msgctxt "input-name"
-msgid "P9 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:433
-msgctxt "input-name"
-msgid "P9 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:434
-msgctxt "input-name"
-msgid "P9 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:435
-msgctxt "input-name"
-msgid "P9 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:436
-msgctxt "input-name"
-msgid "P9 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:437
-msgctxt "input-name"
-msgid "P9 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:438
-msgctxt "input-name"
-msgid "P9 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:439
-msgctxt "input-name"
-msgid "P9 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:440
-msgctxt "input-name"
-msgid "P9 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:441
-msgctxt "input-name"
-msgid "P9 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:442
-msgctxt "input-name"
-msgid "P9 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:443
-msgctxt "input-name"
-msgid "P9 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:444
-msgctxt "input-name"
-msgid "P9 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:445
-msgctxt "input-name"
-msgid "P9 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:446
-msgctxt "input-name"
-msgid "P9 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:447
-msgctxt "input-name"
-msgid "P9 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:448
-msgctxt "input-name"
-msgid "P9 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:449
-msgctxt "input-name"
-msgid "P9 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:450
-msgctxt "input-name"
-msgid "P9 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:451
-msgctxt "input-name"
-msgid "P9 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:452
-msgctxt "input-name"
-msgid "P9 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:453
-msgctxt "input-name"
-msgid "P9 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:454
-msgctxt "input-name"
-msgid "P9 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:459
-msgctxt "input-name"
-msgid "P10 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:460
-msgctxt "input-name"
-msgid "P10 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:461
-msgctxt "input-name"
-msgid "P10 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:462
-msgctxt "input-name"
-msgid "P10 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:463
-msgctxt "input-name"
-msgid "P10 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:464
-msgctxt "input-name"
-msgid "P10 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:465
-msgctxt "input-name"
-msgid "P10 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:466
-msgctxt "input-name"
-msgid "P10 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:467
-msgctxt "input-name"
-msgid "P10 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:468
-msgctxt "input-name"
-msgid "P10 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:469
-msgctxt "input-name"
-msgid "P10 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:470
-msgctxt "input-name"
-msgid "P10 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:471
-msgctxt "input-name"
-msgid "P10 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:472
-msgctxt "input-name"
-msgid "P10 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:473
-msgctxt "input-name"
-msgid "P10 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:474
-msgctxt "input-name"
-msgid "P10 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:475
-msgctxt "input-name"
-msgid "P10 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:476
-msgctxt "input-name"
-msgid "P10 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:477
-msgctxt "input-name"
-msgid "P10 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:478
-msgctxt "input-name"
-msgid "P10 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:479
-msgctxt "input-name"
-msgid "P10 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:480
-msgctxt "input-name"
-msgid "P10 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:481
-msgctxt "input-name"
-msgid "P10 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:482
-msgctxt "input-name"
-msgid "P10 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:483
-msgctxt "input-name"
-msgid "P10 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:484
-msgctxt "input-name"
-msgid "P10 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:485
-msgctxt "input-name"
-msgid "P10 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:486
-msgctxt "input-name"
-msgid "P10 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:487
-msgctxt "input-name"
-msgid "P10 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:488
-msgctxt "input-name"
-msgid "P10 Select"
-msgstr ""
-
 #: src/emu/inpttype.ipp:493
 msgctxt "input-name"
 msgid "1 Player Start"
@@ -5478,154 +4107,31 @@ msgctxt "input-name"
 msgid "Volume Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:550
-msgctxt "input-name"
-msgid "P1 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:551
-msgctxt "input-name"
-msgid "P2 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:552
-msgctxt "input-name"
-msgid "P3 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:553
-msgctxt "input-name"
-msgid "P4 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:554
-msgctxt "input-name"
-msgid "P5 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:555
-msgctxt "input-name"
-msgid "P6 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:556
-msgctxt "input-name"
-msgid "P7 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:557
-msgctxt "input-name"
-msgid "P8 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:558
-msgctxt "input-name"
-msgid "P9 Pedal 1"
-msgstr ""
-
+#: src/emu/inpttype.ipp:550 src/emu/inpttype.ipp:551 src/emu/inpttype.ipp:552
+#: src/emu/inpttype.ipp:553 src/emu/inpttype.ipp:554 src/emu/inpttype.ipp:555
+#: src/emu/inpttype.ipp:556 src/emu/inpttype.ipp:557 src/emu/inpttype.ipp:558
 #: src/emu/inpttype.ipp:559
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:564
-msgctxt "input-name"
-msgid "P1 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:565
-msgctxt "input-name"
-msgid "P2 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:566
-msgctxt "input-name"
-msgid "P3 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:567
-msgctxt "input-name"
-msgid "P4 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:568
-msgctxt "input-name"
-msgid "P5 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:569
-msgctxt "input-name"
-msgid "P6 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:570
-msgctxt "input-name"
-msgid "P7 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:571
-msgctxt "input-name"
-msgid "P8 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:572
-msgctxt "input-name"
-msgid "P9 Pedal 2"
+msgid "%p Pedal 1"
 msgstr ""
 
+#: src/emu/inpttype.ipp:564 src/emu/inpttype.ipp:565 src/emu/inpttype.ipp:566
+#: src/emu/inpttype.ipp:567 src/emu/inpttype.ipp:568 src/emu/inpttype.ipp:569
+#: src/emu/inpttype.ipp:570 src/emu/inpttype.ipp:571 src/emu/inpttype.ipp:572
 #: src/emu/inpttype.ipp:573
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:578
-msgctxt "input-name"
-msgid "P1 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:579
-msgctxt "input-name"
-msgid "P2 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:580
-msgctxt "input-name"
-msgid "P3 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:581
-msgctxt "input-name"
-msgid "P4 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:582
-msgctxt "input-name"
-msgid "P5 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:583
-msgctxt "input-name"
-msgid "P6 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:584
-msgctxt "input-name"
-msgid "P7 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:585
-msgctxt "input-name"
-msgid "P8 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:586
-msgctxt "input-name"
-msgid "P9 Pedal 3"
+msgid "%p Pedal 2"
 msgstr ""
 
+#: src/emu/inpttype.ipp:578 src/emu/inpttype.ipp:579 src/emu/inpttype.ipp:580
+#: src/emu/inpttype.ipp:581 src/emu/inpttype.ipp:582 src/emu/inpttype.ipp:583
+#: src/emu/inpttype.ipp:584 src/emu/inpttype.ipp:585 src/emu/inpttype.ipp:586
 #: src/emu/inpttype.ipp:587
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 3"
+msgid "%p Pedal 3"
 msgstr ""
 
 #: src/emu/inpttype.ipp:592
diff --git a/language/Swedish/strings.po b/language/Swedish/strings.po
index f01ad70327f..38a658dade1 100644
--- a/language/Swedish/strings.po
+++ b/language/Swedish/strings.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-19 02:50+1100\n"
+"POT-Creation-Date: 2021-12-09 04:44+1100\n"
 "PO-Revision-Date: 2016-02-20 18:03+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: MAME Language Team\n"
@@ -271,12 +271,12 @@ msgstr "%1$s %2$s ( %3$d / %4$d mjukvarupaket )"
 msgid "Driver: \"%1$s\" software list "
 msgstr "Drivrutin: \"%1$s\" mjukvarulista "
 
-#: src/frontend/mame/ui/selsoft.cpp:711 src/frontend/mame/ui/selgame.cpp:1066
+#: src/frontend/mame/ui/selsoft.cpp:711 src/frontend/mame/ui/selgame.cpp:1076
 #, c-format
 msgid "%1$s: %2$s - Search: %3$s_"
 msgstr "%1$s: %2$s - Sök: %3$s_"
 
-#: src/frontend/mame/ui/selsoft.cpp:713 src/frontend/mame/ui/selgame.cpp:1068
+#: src/frontend/mame/ui/selsoft.cpp:713 src/frontend/mame/ui/selgame.cpp:1078
 #, c-format
 msgid "Search: %1$s_"
 msgstr "Sök: %1$s_"
@@ -286,7 +286,7 @@ msgstr "Sök: %1$s_"
 msgid "Software list/item: %1$s:%2$s"
 msgstr ""
 
-#: src/frontend/mame/ui/optsmenu.cpp:73 src/frontend/mame/ui/sndmenu.cpp:165
+#: src/frontend/mame/ui/optsmenu.cpp:73 src/frontend/mame/ui/sndmenu.cpp:161
 msgid "Sound Options"
 msgstr "Ljudalternativ"
 
@@ -381,12 +381,12 @@ msgid "Show mouse pointer"
 msgstr "Visa muspekare"
 
 #: src/frontend/mame/ui/submenu.cpp:39
-msgid "Confirm quit from machines"
-msgstr "Konfirmera avsluta maskinhantering"
+msgid "Confirm quit from emulation"
+msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:40
-msgid "Skip information screen at startup"
-msgstr "Hoppa över informationsdialog vid uppstart"
+msgid "Skip system information screen"
+msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:41
 msgid "Force 4:3 aspect for snapshot display"
@@ -401,8 +401,8 @@ msgid "Skip BIOS selection menu"
 msgstr "Hoppa över BIOS menyn"
 
 #: src/frontend/mame/ui/submenu.cpp:44
-msgid "Skip software parts selection menu"
-msgstr "Hoppa över mjukvaru menyn"
+msgid "Skip software part selection menu"
+msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:45
 msgid "Info auto audit"
@@ -553,8 +553,8 @@ msgid "UI active"
 msgstr "Aktivt UI"
 
 #: src/frontend/mame/ui/submenu.cpp:91
-msgid "Offscreen reload"
-msgstr "Skärmlös omladdning"
+msgid "Off-screen reload"
+msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:92
 msgid "Joystick deadzone"
@@ -569,8 +569,8 @@ msgid "Natural keyboard"
 msgstr "Naturligt tangentbord"
 
 #: src/frontend/mame/ui/submenu.cpp:95
-msgid "Simultaneous contradictory"
-msgstr "Motsägelsefullt"
+msgid "Allow contradictory joystick inputs"
+msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:96
 msgid "Coin impulse"
@@ -593,8 +593,8 @@ msgid "Pedal Device Assignment"
 msgstr "Pedalanordningstilldelning"
 
 #: src/frontend/mame/ui/submenu.cpp:106
-msgid "Adstick Device Assignment"
-msgstr "Reklamlappenhetstilldelning"
+msgid "AD Stick Device Assignment"
+msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:107
 msgid "Paddle Device Assignment"
@@ -680,14 +680,14 @@ msgstr "Synkroniserad Uppdatering"
 msgid "Wait Vertical Sync"
 msgstr "Vänta på Vertikal Synkronisering"
 
-#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:687
+#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:689
 #: src/frontend/mame/ui/videoopt.cpp:191 src/frontend/mame/ui/custui.cpp:490
 #: src/frontend/mame/ui/analogipt.cpp:471 plugins/cheatfind/init.lua:766
 #: plugins/cheatfind/init.lua:777 plugins/cheat/init.lua:668
 msgid "On"
 msgstr "På"
 
-#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:690
+#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:692
 #: src/frontend/mame/ui/videoopt.cpp:207 src/frontend/mame/ui/custui.cpp:490
 #: src/frontend/mame/ui/analogipt.cpp:471 plugins/cheatfind/init.lua:763
 #: plugins/cheatfind/init.lua:774 plugins/cheat/init.lua:671
@@ -695,11 +695,11 @@ msgstr "På"
 msgid "Off"
 msgstr "Av"
 
-#: src/frontend/mame/ui/menu.cpp:693
+#: src/frontend/mame/ui/menu.cpp:695
 msgid "Auto"
 msgstr "Automatisk"
 
-#: src/frontend/mame/ui/menu.cpp:1195
+#: src/frontend/mame/ui/menu.cpp:1197
 #: src/frontend/mame/ui/simpleselgame.cpp:278
 #: src/frontend/mame/ui/selmenu.cpp:1280
 msgid "Return to Previous Menu"
@@ -707,7 +707,7 @@ msgstr "Tillbaka till Föregående Meny"
 
 #: src/frontend/mame/ui/filemngr.cpp:139
 #: src/frontend/mame/ui/confswitch.cpp:119
-#: src/frontend/mame/ui/inputmap.cpp:559 src/frontend/mame/ui/analogipt.cpp:360
+#: src/frontend/mame/ui/inputmap.cpp:563 src/frontend/mame/ui/analogipt.cpp:360
 #, c-format
 msgid "[root%1$s]"
 msgstr ""
@@ -973,22 +973,22 @@ msgstr ""
 "CPU:\n"
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "GHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "MHz"
 msgstr "MHz"
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "kHz"
 msgstr "kHz"
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "Hz"
 msgstr ""
 
@@ -1016,38 +1016,38 @@ msgstr "None\n"
 msgid "Vector"
 msgstr "Vektor"
 
-#: src/frontend/mame/ui/info.cpp:480
+#: src/frontend/mame/ui/info.cpp:483
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr "%1$s: %2$s\n"
 
-#: src/frontend/mame/ui/info.cpp:480
+#: src/frontend/mame/ui/info.cpp:483
 msgid "%2$s\n"
 msgstr "%2$s\n"
 
-#: src/frontend/mame/ui/info.cpp:497
+#: src/frontend/mame/ui/info.cpp:500
 #, c-format
 msgid "Screen '%1$s'"
 msgstr "Skärm '%1$s'"
 
-#: src/frontend/mame/ui/info.cpp:499
+#: src/frontend/mame/ui/info.cpp:502
 msgid "Screen"
 msgstr "Skärm"
 
-#: src/frontend/mame/ui/info.cpp:570 src/frontend/mame/ui/info.cpp:581
+#: src/frontend/mame/ui/info.cpp:573 src/frontend/mame/ui/info.cpp:584
 #, c-format
 msgid "%1$s:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:662
+#: src/frontend/mame/ui/info.cpp:665
 msgid "Not supported"
 msgstr "Stöds Ej"
 
-#: src/frontend/mame/ui/info.cpp:665
+#: src/frontend/mame/ui/info.cpp:668
 msgid "Partially supported"
 msgstr "Stöds Delvis"
 
-#: src/frontend/mame/ui/info.cpp:674
+#: src/frontend/mame/ui/info.cpp:677
 msgid "[empty]"
 msgstr "[tom]"
 
@@ -1120,7 +1120,7 @@ msgid "Emulated"
 msgstr "Emulerat"
 
 #: src/frontend/mame/ui/keyboard.cpp:59 src/frontend/mame/ui/confswitch.cpp:117
-#: src/frontend/mame/ui/inputmap.cpp:557 src/frontend/mame/ui/analogipt.cpp:358
+#: src/frontend/mame/ui/inputmap.cpp:561 src/frontend/mame/ui/analogipt.cpp:358
 #, c-format
 msgid "%1$s [root%2$s]"
 msgstr ""
@@ -1480,7 +1480,7 @@ msgctxt "swlist-info"
 msgid "Software list/item"
 msgstr ""
 
-#: src/frontend/mame/ui/datmenu.cpp:88 src/frontend/mame/ui/selmenu.cpp:2698
+#: src/frontend/mame/ui/datmenu.cpp:88 src/frontend/mame/ui/selmenu.cpp:2707
 msgid "Software List Info"
 msgstr ""
 
@@ -1601,7 +1601,7 @@ msgstr ""
 msgid "Configure Machine:"
 msgstr ""
 
-#: src/frontend/mame/ui/miscmenu.cpp:858 src/frontend/mame/ui/selmenu.cpp:2638
+#: src/frontend/mame/ui/miscmenu.cpp:858 src/frontend/mame/ui/selmenu.cpp:2647
 msgid " (default)"
 msgstr " (standard)"
 
@@ -1622,7 +1622,7 @@ msgstr ""
 "Tryck %1$s för att avsluta\n"
 "Tryck %2$s för att återgå till emuleringen"
 
-#: src/frontend/mame/ui/info_pty.cpp:30 src/frontend/mame/ui/mainmenu.cpp:155
+#: src/frontend/mame/ui/info_pty.cpp:30
 msgid "Pseudo terminals"
 msgstr "Låtsasterminaler"
 
@@ -1690,52 +1690,52 @@ msgstr ""
 msgid "Other Controls"
 msgstr "Andra kontroller"
 
-#: src/frontend/mame/ui/inputmap.cpp:227
+#: src/frontend/mame/ui/inputmap.cpp:231
 msgid "This machine has no configurable inputs."
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:327
+#: src/frontend/mame/ui/inputmap.cpp:331
 msgid "Pressed"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:397
+#: src/frontend/mame/ui/inputmap.cpp:401
 msgid "Invalid sequence entered"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:542
+#: src/frontend/mame/ui/inputmap.cpp:546
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:543
+#: src/frontend/mame/ui/inputmap.cpp:547
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog Inc"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:544
+#: src/frontend/mame/ui/inputmap.cpp:548
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog Dec"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:586
+#: src/frontend/mame/ui/inputmap.cpp:590
 #, c-format
 msgid "Press %1$s to set\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:587
+#: src/frontend/mame/ui/inputmap.cpp:591
 #, c-format
 msgid "Press %1$s to append\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:588
+#: src/frontend/mame/ui/inputmap.cpp:592
 #, c-format
 msgid "Press %1$s to clear\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:589
+#: src/frontend/mame/ui/inputmap.cpp:593
 #, c-format
 msgid "Press %1$s to restore default\n"
 msgstr ""
@@ -1803,7 +1803,7 @@ msgstr ""
 "Tryck på valfri tangent för att fortsätta."
 
 #: src/frontend/mame/ui/simpleselgame.cpp:273
-#: src/frontend/mame/ui/selgame.cpp:436
+#: src/frontend/mame/ui/selgame.cpp:443
 msgid "Configure Options"
 msgstr "Konfigurationsalternativ"
 
@@ -2137,16 +2137,16 @@ msgstr ""
 msgid "Expand to fit"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:437
+#: src/frontend/mame/ui/selgame.cpp:444
 msgid "Configure Machine"
 msgstr "Maskinkonfiguration"
 
-#: src/frontend/mame/ui/selgame.cpp:1050
+#: src/frontend/mame/ui/selgame.cpp:1060
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d machines (%5$d BIOS) )"
 msgstr "%1$s %2$s ( %3$d / %4$d maskiner (%5$d BIOS) )"
 
-#: src/frontend/mame/ui/selgame.cpp:1078
+#: src/frontend/mame/ui/selgame.cpp:1088
 #, c-format
 msgid "System: %1$-.100s"
 msgstr "System: %1$-.100s"
@@ -2168,11 +2168,9 @@ msgstr "Resultat kommer att sparas som %1$s"
 #: src/frontend/mame/ui/auditmenu.cpp:98
 #, c-format
 msgid ""
-"Auditing ROMs for machine %2$u of %3$u...\n"
+"Auditing media for machine %2$u of %3$u...\n"
 "%1$s"
 msgstr ""
-"Granskning av ROMs för maskin %2$u av %3$u...\n"
-"%1$s"
 
 #: src/frontend/mame/ui/auditmenu.cpp:116
 #, c-format
@@ -2185,12 +2183,12 @@ msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:136
 #, c-format
-msgid "Audit ROMs for %1$u machines marked unavailable"
+msgid "Audit media for %1$u machines marked unavailable"
 msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:137
 #, c-format
-msgid "Audit ROMs for all %1$u machines"
+msgid "Audit media for all %1$u machines"
 msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:154
@@ -2396,84 +2394,84 @@ msgctxt "color-sample"
 msgid "Clone"
 msgstr "Klon"
 
-#: src/frontend/mame/ui/custui.cpp:914
+#: src/frontend/mame/ui/custui.cpp:906
 msgid "ARGB Settings"
 msgstr "ARGB inställningar"
 
-#: src/frontend/mame/ui/custui.cpp:919 src/frontend/mame/ui/custui.cpp:922
+#: src/frontend/mame/ui/custui.cpp:911 src/frontend/mame/ui/custui.cpp:914
 msgctxt "color-channel"
 msgid "Alpha"
 msgstr "Alfa"
 
-#: src/frontend/mame/ui/custui.cpp:927 src/frontend/mame/ui/custui.cpp:930
+#: src/frontend/mame/ui/custui.cpp:919 src/frontend/mame/ui/custui.cpp:922
 msgctxt "color-channel"
 msgid "Red"
 msgstr "Röd"
 
-#: src/frontend/mame/ui/custui.cpp:935 src/frontend/mame/ui/custui.cpp:938
+#: src/frontend/mame/ui/custui.cpp:927 src/frontend/mame/ui/custui.cpp:930
 msgctxt "color-channel"
 msgid "Green"
 msgstr "Grön"
 
-#: src/frontend/mame/ui/custui.cpp:943 src/frontend/mame/ui/custui.cpp:946
+#: src/frontend/mame/ui/custui.cpp:935 src/frontend/mame/ui/custui.cpp:938
 msgctxt "color-channel"
 msgid "Blue"
 msgstr "Blå"
 
-#: src/frontend/mame/ui/custui.cpp:949
+#: src/frontend/mame/ui/custui.cpp:941
 msgid "Choose from palette"
 msgstr "Välj från palette"
 
-#: src/frontend/mame/ui/custui.cpp:996
+#: src/frontend/mame/ui/custui.cpp:988
 msgid "Color preview:"
 msgstr "Förhandsvisning Färg:"
 
-#: src/frontend/mame/ui/custui.cpp:1093
+#: src/frontend/mame/ui/custui.cpp:1085
 msgctxt "color-preset"
 msgid "White"
 msgstr "Vit"
 
-#: src/frontend/mame/ui/custui.cpp:1094
+#: src/frontend/mame/ui/custui.cpp:1086
 msgctxt "color-preset"
 msgid "Silver"
 msgstr "Silver"
 
-#: src/frontend/mame/ui/custui.cpp:1095
+#: src/frontend/mame/ui/custui.cpp:1087
 msgctxt "color-preset"
 msgid "Gray"
 msgstr "Grå"
 
-#: src/frontend/mame/ui/custui.cpp:1096
+#: src/frontend/mame/ui/custui.cpp:1088
 msgctxt "color-preset"
 msgid "Black"
 msgstr "Svart"
 
-#: src/frontend/mame/ui/custui.cpp:1097
+#: src/frontend/mame/ui/custui.cpp:1089
 msgctxt "color-preset"
 msgid "Red"
 msgstr "Röd"
 
-#: src/frontend/mame/ui/custui.cpp:1098
+#: src/frontend/mame/ui/custui.cpp:1090
 msgctxt "color-preset"
 msgid "Orange"
 msgstr "Orange"
 
-#: src/frontend/mame/ui/custui.cpp:1099
+#: src/frontend/mame/ui/custui.cpp:1091
 msgctxt "color-preset"
 msgid "Yellow"
 msgstr "Gul"
 
-#: src/frontend/mame/ui/custui.cpp:1100
+#: src/frontend/mame/ui/custui.cpp:1092
 msgctxt "color-preset"
 msgid "Green"
 msgstr "Grön"
 
-#: src/frontend/mame/ui/custui.cpp:1101
+#: src/frontend/mame/ui/custui.cpp:1093
 msgctxt "color-preset"
 msgid "Blue"
 msgstr "Blå"
 
-#: src/frontend/mame/ui/custui.cpp:1102
+#: src/frontend/mame/ui/custui.cpp:1094
 msgctxt "color-preset"
 msgid "Violet"
 msgstr "Lila"
@@ -2538,8 +2536,8 @@ msgid "Input (general)"
 msgstr "Input (generell)"
 
 #: src/frontend/mame/ui/mainmenu.cpp:123
-msgid "Input (this Machine)"
-msgstr "Input (denna Maskin)"
+msgid "Input (this machine)"
+msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:126
 msgid "Analog Controls"
@@ -2577,6 +2575,10 @@ msgstr "Filhanterare"
 msgid "Tape Control"
 msgstr "Bandkontroll"
 
+#: src/frontend/mame/ui/mainmenu.cpp:155
+msgid "Pseudo Terminals"
+msgstr ""
+
 #: src/frontend/mame/ui/mainmenu.cpp:158
 msgid "BIOS Selection"
 msgstr "BIOS val"
@@ -2615,7 +2617,7 @@ msgstr "Extern DAT vy"
 
 #: src/frontend/mame/ui/mainmenu.cpp:200
 #, c-format
-msgid "About %s"
+msgid "About %1$s"
 msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:212
@@ -2775,373 +2777,373 @@ msgstr "Drivrutinen är klon av: %1$s"
 msgid "%1$s %2$s"
 msgstr "%1$s %2$s"
 
-#: src/frontend/mame/ui/selmenu.cpp:2235
+#: src/frontend/mame/ui/selmenu.cpp:2244
 msgid "Images"
 msgstr "Bilder"
 
-#: src/frontend/mame/ui/selmenu.cpp:2236
+#: src/frontend/mame/ui/selmenu.cpp:2245
 msgid "Infos"
 msgstr "Information"
 
-#: src/frontend/mame/ui/selmenu.cpp:2551
+#: src/frontend/mame/ui/selmenu.cpp:2560
 msgid ""
 "Required ROM/disk images for the selected system are missing or incorrect. "
 "Please acquire the correct files or select a different system.\n"
 "\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2567
+#: src/frontend/mame/ui/selmenu.cpp:2576
 msgid ""
 "Required ROM/disk images for the selected software are missing or incorrect. "
 "Please acquire the correct files or select a different software item.\n"
 "\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2583
+#: src/frontend/mame/ui/selmenu.cpp:2592
 msgid "incorrect checksum"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2586
+#: src/frontend/mame/ui/selmenu.cpp:2595
 msgid "incorrect length"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2589
+#: src/frontend/mame/ui/selmenu.cpp:2598
 msgid "not found"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2600
+#: src/frontend/mame/ui/selmenu.cpp:2609
 #, c-format
 msgid "%1$s (%2$s) - %3$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2602
+#: src/frontend/mame/ui/selmenu.cpp:2611
 #, c-format
 msgid "%1$s - %2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2606
+#: src/frontend/mame/ui/selmenu.cpp:2615
 msgid "Press any key to continue."
 msgstr "Tryck på valfri tangent för att fortsätta."
 
-#: src/frontend/mame/ui/selmenu.cpp:2735
+#: src/frontend/mame/ui/selmenu.cpp:2744
 msgid "General Info"
 msgstr "Generell Information"
 
-#: src/frontend/mame/ui/selmenu.cpp:2887
+#: src/frontend/mame/ui/selmenu.cpp:2896
 #, c-format
 msgid "Romset\t%1$s\n"
 msgstr "Romdistribution\t%1$s\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2888
+#: src/frontend/mame/ui/selmenu.cpp:2897
 #, c-format
 msgid "Year\t%1$s\n"
 msgstr "År\t%1$s\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2889
+#: src/frontend/mame/ui/selmenu.cpp:2898
 #, c-format
 msgid "Manufacturer\t%1$s\n"
 msgstr "Tillverkare\t%1$s\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2896
+#: src/frontend/mame/ui/selmenu.cpp:2905
 #, c-format
 msgid "Driver is Clone of\t%1$s\n"
 msgstr "Drivrutinen är klon av\t%1$s\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2901
+#: src/frontend/mame/ui/selmenu.cpp:2910
 msgid "Driver is Parent\t\n"
 msgstr "Drivrutinen är oberoende\t\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2905
+#: src/frontend/mame/ui/selmenu.cpp:2914
 msgid "Analog Controls\tYes\n"
 msgstr "Analoga kontroller\tJa\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2907
+#: src/frontend/mame/ui/selmenu.cpp:2916
 msgid "Keyboard Inputs\tYes\n"
 msgstr "Tangentbord\tJa\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2910
+#: src/frontend/mame/ui/selmenu.cpp:2919
 msgid "Overall\tNOT WORKING\n"
 msgstr "Status\tFUNGERAR EJ\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2912
+#: src/frontend/mame/ui/selmenu.cpp:2921
 msgid "Overall\tUnemulated Protection\n"
 msgstr "Status\tOemulerad skyddsmekanism\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2914
+#: src/frontend/mame/ui/selmenu.cpp:2923
 msgid "Overall\tWorking\n"
 msgstr "Status\tFungerar\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2917
+#: src/frontend/mame/ui/selmenu.cpp:2926
 msgid "Graphics\tUnimplemented\n"
 msgstr "Grafik\tEj implementerad\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2919
+#: src/frontend/mame/ui/selmenu.cpp:2928
 msgid "Graphics\tWrong Colors\n"
 msgstr "Grafik\tFel Färger\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2921
+#: src/frontend/mame/ui/selmenu.cpp:2930
 msgid "Graphics\tImperfect Colors\n"
 msgstr "Grafik\tBristfälliga färger\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2923
+#: src/frontend/mame/ui/selmenu.cpp:2932
 msgid "Graphics\tImperfect\n"
 msgstr "Grafik\tBristfällig\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2925
+#: src/frontend/mame/ui/selmenu.cpp:2934
 msgid "Graphics\tOK\n"
 msgstr "Grafik\tOK\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2928
+#: src/frontend/mame/ui/selmenu.cpp:2937
 msgid "Sound\tNone\n"
 msgstr "Ljud\tInget\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2930
+#: src/frontend/mame/ui/selmenu.cpp:2939
 msgid "Sound\tUnimplemented\n"
 msgstr "Ljud\tEj implementerat\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2932
+#: src/frontend/mame/ui/selmenu.cpp:2941
 msgid "Sound\tImperfect\n"
 msgstr "Ljud\tBristfälligt\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2934
+#: src/frontend/mame/ui/selmenu.cpp:2943
 msgid "Sound\tOK\n"
 msgstr "Ljud\tOK\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2937
+#: src/frontend/mame/ui/selmenu.cpp:2946
 msgid "Capture\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2939
+#: src/frontend/mame/ui/selmenu.cpp:2948
 msgid "Capture\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2942
+#: src/frontend/mame/ui/selmenu.cpp:2951
 msgid "Camera\tUnimplemented\n"
 msgstr "Kamera\tEj implementerad\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2944
+#: src/frontend/mame/ui/selmenu.cpp:2953
 msgid "Camera\tImperfect\n"
 msgstr "Kamera\tBristfällig\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2947
+#: src/frontend/mame/ui/selmenu.cpp:2956
 msgid "Microphone\tUnimplemented\n"
 msgstr "Mikrofon\tEj implememterad\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2949
+#: src/frontend/mame/ui/selmenu.cpp:2958
 msgid "Microphone\tImperfect\n"
 msgstr "Mikrofon\tBristfällig\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2952
+#: src/frontend/mame/ui/selmenu.cpp:2961
 msgid "Controls\tUnimplemented\n"
 msgstr "Kontroller\tEj implementerad\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2954
+#: src/frontend/mame/ui/selmenu.cpp:2963
 msgid "Controls\tImperfect\n"
 msgstr "Kontroller\tBristfällig\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2957
+#: src/frontend/mame/ui/selmenu.cpp:2966
 msgid "Keyboard\tUnimplemented\n"
 msgstr "Tangentbord\tEj implementerat\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2959
+#: src/frontend/mame/ui/selmenu.cpp:2968
 msgid "Keyboard\tImperfect\n"
 msgstr "Tangentbord\tBristfälligt\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2962
+#: src/frontend/mame/ui/selmenu.cpp:2971
 msgid "Mouse\tUnimplemented\n"
 msgstr "Mus\tEj implementerad\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2964
+#: src/frontend/mame/ui/selmenu.cpp:2973
 msgid "Mouse\tImperfect\n"
 msgstr "Mus\tBristfällig\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2967
+#: src/frontend/mame/ui/selmenu.cpp:2976
 msgid "Media\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2969
+#: src/frontend/mame/ui/selmenu.cpp:2978
 msgid "Media\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2972
+#: src/frontend/mame/ui/selmenu.cpp:2981
 msgid "Disk\tUnimplemented\n"
 msgstr "Disk\tEj implementerad\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2974
+#: src/frontend/mame/ui/selmenu.cpp:2983
 msgid "Disk\tImperfect\n"
 msgstr "Disk\tBristfällig\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2977
+#: src/frontend/mame/ui/selmenu.cpp:2986
 msgid "Printer\tUnimplemented\n"
 msgstr "Printer\tEj implementerad\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2979
+#: src/frontend/mame/ui/selmenu.cpp:2988
 msgid "Printer\tImperfect\n"
 msgstr "Printer\tBristfällig\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2982
+#: src/frontend/mame/ui/selmenu.cpp:2991
 msgid "Mag. Tape\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2984
+#: src/frontend/mame/ui/selmenu.cpp:2993
 msgid "Mag. Tape\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2987
+#: src/frontend/mame/ui/selmenu.cpp:2996
 msgid "Punch Tape\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2989
+#: src/frontend/mame/ui/selmenu.cpp:2998
 msgid "Punch Tape\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2992
+#: src/frontend/mame/ui/selmenu.cpp:3001
 msgid "Mag. Drum\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2994
+#: src/frontend/mame/ui/selmenu.cpp:3003
 msgid "Mag. Drum\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2997
+#: src/frontend/mame/ui/selmenu.cpp:3006
 msgid "(EP)ROM\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2999
+#: src/frontend/mame/ui/selmenu.cpp:3008
 msgid "(EP)ROM\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3002
+#: src/frontend/mame/ui/selmenu.cpp:3011
 msgid "Communications\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3004
+#: src/frontend/mame/ui/selmenu.cpp:3013
 msgid "Communications\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3007
+#: src/frontend/mame/ui/selmenu.cpp:3016
 msgid "LAN\tUnimplemented\n"
 msgstr "LAN\tEj implementerad\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3009
+#: src/frontend/mame/ui/selmenu.cpp:3018
 msgid "LAN\tImperfect\n"
 msgstr "LAN\tBristfällig\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3012
+#: src/frontend/mame/ui/selmenu.cpp:3021
 msgid "WAN\tUnimplemented\n"
 msgstr "WAN\tEj implementerad\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3014
+#: src/frontend/mame/ui/selmenu.cpp:3023
 msgid "WAN\tImperfect\n"
 msgstr "WAN\tBristfälligt\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3017
+#: src/frontend/mame/ui/selmenu.cpp:3026
 msgid "Timing\tUnimplemented\n"
 msgstr "Timing\tEj implementerad\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3019
+#: src/frontend/mame/ui/selmenu.cpp:3028
 msgid "Timing\tImperfect\n"
 msgstr "Timing\tBristfällig\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3021
+#: src/frontend/mame/ui/selmenu.cpp:3030
 msgid "Mechanical Machine\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3021
+#: src/frontend/mame/ui/selmenu.cpp:3030
 msgid "Mechanical Machine\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3022
+#: src/frontend/mame/ui/selmenu.cpp:3031
 msgid "Requires Artwork\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3022
+#: src/frontend/mame/ui/selmenu.cpp:3031
 msgid "Requires Artwork\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3023
+#: src/frontend/mame/ui/selmenu.cpp:3032
 msgid "Requires Clickable Artwork\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3023
+#: src/frontend/mame/ui/selmenu.cpp:3032
 msgid "Requires Clickable Artwork\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3025
+#: src/frontend/mame/ui/selmenu.cpp:3034
 msgid "Support Cocktail\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3026
+#: src/frontend/mame/ui/selmenu.cpp:3035
 msgid "Driver is BIOS\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3026
+#: src/frontend/mame/ui/selmenu.cpp:3035
 msgid "Driver is BIOS\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3027
+#: src/frontend/mame/ui/selmenu.cpp:3036
 msgid "Support Save\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3027
+#: src/frontend/mame/ui/selmenu.cpp:3036
 msgid "Support Save\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3028
+#: src/frontend/mame/ui/selmenu.cpp:3037
 msgid "Screen Orientation\tVertical\n"
 msgstr "Skärm Orientering\tVertikal\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3028
+#: src/frontend/mame/ui/selmenu.cpp:3037
 msgid "Screen Orientation\tHorizontal\n"
 msgstr "Skärm Orientering\tHorisontal\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:3038
+#: src/frontend/mame/ui/selmenu.cpp:3047
 msgid "Requires CHD\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3038
+#: src/frontend/mame/ui/selmenu.cpp:3047
 msgid "Requires CHD\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3051
-msgid "ROM Audit Result\tOK\n"
+#: src/frontend/mame/ui/selmenu.cpp:3060
+msgid "Media Audit Result\tOK\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3053
-msgid "ROM Audit Result\tBAD\n"
+#: src/frontend/mame/ui/selmenu.cpp:3062
+msgid "Media Audit Result\tBAD\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3056
+#: src/frontend/mame/ui/selmenu.cpp:3065
 msgid "Samples Audit Result\tNone Needed\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3058
+#: src/frontend/mame/ui/selmenu.cpp:3067
 msgid "Samples Audit Result\tOK\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3060
+#: src/frontend/mame/ui/selmenu.cpp:3069
 msgid "Samples Audit Result\tBAD\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3064
+#: src/frontend/mame/ui/selmenu.cpp:3073
 msgid ""
-"ROM Audit \tDisabled\n"
-"Samples Audit \tDisabled\n"
+"Media Audit\tDisabled\n"
+"Samples Audit\tDisabled\n"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:150
+#: src/frontend/mame/ui/sndmenu.cpp:146
 msgid "Sound"
 msgstr "Ljud"
 
-#: src/frontend/mame/ui/sndmenu.cpp:151
+#: src/frontend/mame/ui/sndmenu.cpp:147
 msgid "Compressor"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:152
+#: src/frontend/mame/ui/sndmenu.cpp:148
 msgid "Sample Rate"
 msgstr "Samplingshastighet"
 
-#: src/frontend/mame/ui/sndmenu.cpp:153
+#: src/frontend/mame/ui/sndmenu.cpp:149
 msgid "Use External Samples"
 msgstr "Använd Externa Samplingar"
 
@@ -3180,511 +3182,681 @@ msgstr ""
 msgid "  Screen '%1$s': Vector\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:132
+#: src/frontend/mame/ui/devopt.cpp:135
 #, c-format
 msgid "  Screen '%1$s': %2$d × %3$d (V) %4$s Hz\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:133
+#: src/frontend/mame/ui/devopt.cpp:136
 #, c-format
 msgid "  Screen '%1$s': %2$d × %3$d (H) %4$s Hz\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:147
+#: src/frontend/mame/ui/devopt.cpp:150
 msgid "* Sound:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:211
+#: src/frontend/mame/ui/devopt.cpp:214
 #, c-format
 msgid ""
 "* BIOS settings:\n"
 "  %1$d options    [default: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:255 src/frontend/mame/ui/devopt.cpp:271
-#: src/frontend/mame/ui/devopt.cpp:332
+#: src/frontend/mame/ui/devopt.cpp:258 src/frontend/mame/ui/devopt.cpp:274
+#: src/frontend/mame/ui/devopt.cpp:335
 #, c-format
 msgid "  %1$s    [default: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:260 src/frontend/mame/ui/devopt.cpp:276
+#: src/frontend/mame/ui/devopt.cpp:263 src/frontend/mame/ui/devopt.cpp:279
 #, c-format
 msgid "  %1$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:282
+#: src/frontend/mame/ui/devopt.cpp:285
 msgid "* DIP switch settings:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:287
+#: src/frontend/mame/ui/devopt.cpp:290
 msgid "* Configuration settings:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:291
+#: src/frontend/mame/ui/devopt.cpp:294
 msgid "* Input device(s):\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:293
+#: src/frontend/mame/ui/devopt.cpp:296
 #, c-format
 msgid "  User inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:295
+#: src/frontend/mame/ui/devopt.cpp:298
 #, c-format
 msgid "  Mahjong inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:297
+#: src/frontend/mame/ui/devopt.cpp:300
 #, c-format
 msgid "  Hanafuda inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:299
+#: src/frontend/mame/ui/devopt.cpp:302
 #, c-format
 msgid "  Gambling inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:301
+#: src/frontend/mame/ui/devopt.cpp:304
 #, c-format
 msgid "  Analog inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:303
+#: src/frontend/mame/ui/devopt.cpp:306
 #, c-format
 msgid "  Adjuster inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:305
+#: src/frontend/mame/ui/devopt.cpp:308
 #, c-format
 msgid "  Keypad inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:307
+#: src/frontend/mame/ui/devopt.cpp:310
 #, c-format
 msgid "  Keyboard inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:312
+#: src/frontend/mame/ui/devopt.cpp:315
 msgid "* Media Options:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:317
+#: src/frontend/mame/ui/devopt.cpp:320
 #, c-format
 msgid "  %1$s    [tag: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:327
+#: src/frontend/mame/ui/devopt.cpp:330
 msgid "* Slot Options:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:341
+#: src/frontend/mame/ui/devopt.cpp:344
 msgid "[None]\n"
 msgstr ""
 
-#: src/emu/render.cpp:1847
+#: src/emu/render.cpp:1796
 #, c-format
 msgctxt "view-name"
 msgid "Screen %1$u Standard (%2$u:%3$u)"
 msgstr ""
 
-#: src/emu/render.cpp:1873
+#: src/emu/render.cpp:1822
 #, c-format
 msgctxt "view-name"
 msgid "Screen %1$u Pixel Aspect (%2$u:%3$u)"
 msgstr ""
 
-#: src/emu/render.cpp:1895 src/emu/render.cpp:2030
+#: src/emu/render.cpp:1844 src/emu/render.cpp:1979
 msgctxt "view-name"
 msgid "Cocktail"
 msgstr ""
 
-#: src/emu/render.cpp:2015
+#: src/emu/render.cpp:1964
 msgctxt "view-name"
 msgid "Left-to-Right"
 msgstr ""
 
-#: src/emu/render.cpp:2016
+#: src/emu/render.cpp:1965
 msgctxt "view-name"
 msgid "Left-to-Right (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2017
+#: src/emu/render.cpp:1966
 msgctxt "view-name"
 msgid "Top-to-Bottom"
 msgstr ""
 
-#: src/emu/render.cpp:2018
+#: src/emu/render.cpp:1967
 msgctxt "view-name"
 msgid "Top-to-Bottom (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2069
+#: src/emu/render.cpp:2018
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Left-to-Right, Top-to-Bottom"
 msgstr ""
 
-#: src/emu/render.cpp:2078
+#: src/emu/render.cpp:2027
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Left-to-Right, Top-to-Bottom (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2087
+#: src/emu/render.cpp:2036
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Top-to-Bottom, Left-to-Right"
 msgstr ""
 
-#: src/emu/render.cpp:2096
+#: src/emu/render.cpp:2045
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Top-to-Bottom, Left-to-Right (Gapless)"
 msgstr ""
 
-#: src/emu/inpttype.ipp:22
+#: src/emu/ioport.cpp:332
+#, c-format
 msgctxt "input-name"
-msgid "P1 Up"
+msgid "P%1$u"
 msgstr ""
 
-#: src/emu/inpttype.ipp:23
+#: src/emu/ioport.cpp:1924
 msgctxt "input-name"
-msgid "P1 Down"
+msgid "???"
 msgstr ""
 
-#: src/emu/inpttype.ipp:24
+#: src/emu/inpttype.ipp:22 src/emu/inpttype.ipp:140 src/emu/inpttype.ipp:221
+#: src/emu/inpttype.ipp:255 src/emu/inpttype.ipp:289 src/emu/inpttype.ipp:323
+#: src/emu/inpttype.ipp:357 src/emu/inpttype.ipp:391 src/emu/inpttype.ipp:425
+#: src/emu/inpttype.ipp:459
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left"
+msgid "%p Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:25
+#: src/emu/inpttype.ipp:23 src/emu/inpttype.ipp:141 src/emu/inpttype.ipp:222
+#: src/emu/inpttype.ipp:256 src/emu/inpttype.ipp:290 src/emu/inpttype.ipp:324
+#: src/emu/inpttype.ipp:358 src/emu/inpttype.ipp:392 src/emu/inpttype.ipp:426
+#: src/emu/inpttype.ipp:460
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right"
+msgid "%p Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:26
+#: src/emu/inpttype.ipp:24 src/emu/inpttype.ipp:142 src/emu/inpttype.ipp:223
+#: src/emu/inpttype.ipp:257 src/emu/inpttype.ipp:291 src/emu/inpttype.ipp:325
+#: src/emu/inpttype.ipp:359 src/emu/inpttype.ipp:393 src/emu/inpttype.ipp:427
+#: src/emu/inpttype.ipp:461
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Up"
+msgid "%p Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:27
+#: src/emu/inpttype.ipp:25 src/emu/inpttype.ipp:143 src/emu/inpttype.ipp:224
+#: src/emu/inpttype.ipp:258 src/emu/inpttype.ipp:292 src/emu/inpttype.ipp:326
+#: src/emu/inpttype.ipp:360 src/emu/inpttype.ipp:394 src/emu/inpttype.ipp:428
+#: src/emu/inpttype.ipp:462
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Down"
+msgid "%p Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:28
+#: src/emu/inpttype.ipp:26 src/emu/inpttype.ipp:144 src/emu/inpttype.ipp:225
+#: src/emu/inpttype.ipp:259 src/emu/inpttype.ipp:293 src/emu/inpttype.ipp:327
+#: src/emu/inpttype.ipp:361 src/emu/inpttype.ipp:395 src/emu/inpttype.ipp:429
+#: src/emu/inpttype.ipp:463
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Left"
+msgid "%p Right Stick/Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:29
+#: src/emu/inpttype.ipp:27 src/emu/inpttype.ipp:145 src/emu/inpttype.ipp:226
+#: src/emu/inpttype.ipp:260 src/emu/inpttype.ipp:294 src/emu/inpttype.ipp:328
+#: src/emu/inpttype.ipp:362 src/emu/inpttype.ipp:396 src/emu/inpttype.ipp:430
+#: src/emu/inpttype.ipp:464
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Right"
+msgid "%p Right Stick/Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:30
+#: src/emu/inpttype.ipp:28 src/emu/inpttype.ipp:146 src/emu/inpttype.ipp:227
+#: src/emu/inpttype.ipp:261 src/emu/inpttype.ipp:295 src/emu/inpttype.ipp:329
+#: src/emu/inpttype.ipp:363 src/emu/inpttype.ipp:397 src/emu/inpttype.ipp:431
+#: src/emu/inpttype.ipp:465
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Up"
+msgid "%p Right Stick/Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:31
+#: src/emu/inpttype.ipp:29 src/emu/inpttype.ipp:147 src/emu/inpttype.ipp:228
+#: src/emu/inpttype.ipp:262 src/emu/inpttype.ipp:296 src/emu/inpttype.ipp:330
+#: src/emu/inpttype.ipp:364 src/emu/inpttype.ipp:398 src/emu/inpttype.ipp:432
+#: src/emu/inpttype.ipp:466
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Down"
+msgid "%p Right Stick/Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:32
+#: src/emu/inpttype.ipp:30 src/emu/inpttype.ipp:148 src/emu/inpttype.ipp:229
+#: src/emu/inpttype.ipp:263 src/emu/inpttype.ipp:297 src/emu/inpttype.ipp:331
+#: src/emu/inpttype.ipp:365 src/emu/inpttype.ipp:399 src/emu/inpttype.ipp:433
+#: src/emu/inpttype.ipp:467
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Left"
+msgid "%p Left Stick/Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:33
+#: src/emu/inpttype.ipp:31 src/emu/inpttype.ipp:149 src/emu/inpttype.ipp:230
+#: src/emu/inpttype.ipp:264 src/emu/inpttype.ipp:298 src/emu/inpttype.ipp:332
+#: src/emu/inpttype.ipp:366 src/emu/inpttype.ipp:400 src/emu/inpttype.ipp:434
+#: src/emu/inpttype.ipp:468
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Right"
+msgid "%p Left Stick/Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:34
+#: src/emu/inpttype.ipp:32 src/emu/inpttype.ipp:150 src/emu/inpttype.ipp:231
+#: src/emu/inpttype.ipp:265 src/emu/inpttype.ipp:299 src/emu/inpttype.ipp:333
+#: src/emu/inpttype.ipp:367 src/emu/inpttype.ipp:401 src/emu/inpttype.ipp:435
+#: src/emu/inpttype.ipp:469
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 1"
+msgid "%p Left Stick/Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:35
+#: src/emu/inpttype.ipp:33 src/emu/inpttype.ipp:151 src/emu/inpttype.ipp:232
+#: src/emu/inpttype.ipp:266 src/emu/inpttype.ipp:300 src/emu/inpttype.ipp:334
+#: src/emu/inpttype.ipp:368 src/emu/inpttype.ipp:402 src/emu/inpttype.ipp:436
+#: src/emu/inpttype.ipp:470
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 2"
+msgid "%p Left Stick/Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:36
+#: src/emu/inpttype.ipp:34 src/emu/inpttype.ipp:152 src/emu/inpttype.ipp:233
+#: src/emu/inpttype.ipp:267 src/emu/inpttype.ipp:301 src/emu/inpttype.ipp:335
+#: src/emu/inpttype.ipp:369 src/emu/inpttype.ipp:403 src/emu/inpttype.ipp:437
+#: src/emu/inpttype.ipp:471
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 3"
+msgid "%p Button 1"
 msgstr ""
 
-#: src/emu/inpttype.ipp:37
+#: src/emu/inpttype.ipp:35 src/emu/inpttype.ipp:153 src/emu/inpttype.ipp:234
+#: src/emu/inpttype.ipp:268 src/emu/inpttype.ipp:302 src/emu/inpttype.ipp:336
+#: src/emu/inpttype.ipp:370 src/emu/inpttype.ipp:404 src/emu/inpttype.ipp:438
+#: src/emu/inpttype.ipp:472
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 4"
+msgid "%p Button 2"
 msgstr ""
 
-#: src/emu/inpttype.ipp:38
+#: src/emu/inpttype.ipp:36 src/emu/inpttype.ipp:154 src/emu/inpttype.ipp:235
+#: src/emu/inpttype.ipp:269 src/emu/inpttype.ipp:303 src/emu/inpttype.ipp:337
+#: src/emu/inpttype.ipp:371 src/emu/inpttype.ipp:405 src/emu/inpttype.ipp:439
+#: src/emu/inpttype.ipp:473
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 5"
+msgid "%p Button 3"
 msgstr ""
 
-#: src/emu/inpttype.ipp:39
+#: src/emu/inpttype.ipp:37 src/emu/inpttype.ipp:155 src/emu/inpttype.ipp:236
+#: src/emu/inpttype.ipp:270 src/emu/inpttype.ipp:304 src/emu/inpttype.ipp:338
+#: src/emu/inpttype.ipp:372 src/emu/inpttype.ipp:406 src/emu/inpttype.ipp:440
+#: src/emu/inpttype.ipp:474
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 6"
+msgid "%p Button 4"
 msgstr ""
 
-#: src/emu/inpttype.ipp:40
+#: src/emu/inpttype.ipp:38 src/emu/inpttype.ipp:156 src/emu/inpttype.ipp:237
+#: src/emu/inpttype.ipp:271 src/emu/inpttype.ipp:305 src/emu/inpttype.ipp:339
+#: src/emu/inpttype.ipp:373 src/emu/inpttype.ipp:407 src/emu/inpttype.ipp:441
+#: src/emu/inpttype.ipp:475
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 7"
+msgid "%p Button 5"
 msgstr ""
 
-#: src/emu/inpttype.ipp:41
+#: src/emu/inpttype.ipp:39 src/emu/inpttype.ipp:157 src/emu/inpttype.ipp:238
+#: src/emu/inpttype.ipp:272 src/emu/inpttype.ipp:306 src/emu/inpttype.ipp:340
+#: src/emu/inpttype.ipp:374 src/emu/inpttype.ipp:408 src/emu/inpttype.ipp:442
+#: src/emu/inpttype.ipp:476
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 8"
+msgid "%p Button 6"
 msgstr ""
 
-#: src/emu/inpttype.ipp:42
+#: src/emu/inpttype.ipp:40 src/emu/inpttype.ipp:158 src/emu/inpttype.ipp:239
+#: src/emu/inpttype.ipp:273 src/emu/inpttype.ipp:307 src/emu/inpttype.ipp:341
+#: src/emu/inpttype.ipp:375 src/emu/inpttype.ipp:409 src/emu/inpttype.ipp:443
+#: src/emu/inpttype.ipp:477
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 9"
+msgid "%p Button 7"
 msgstr ""
 
-#: src/emu/inpttype.ipp:43
+#: src/emu/inpttype.ipp:41 src/emu/inpttype.ipp:159 src/emu/inpttype.ipp:240
+#: src/emu/inpttype.ipp:274 src/emu/inpttype.ipp:308 src/emu/inpttype.ipp:342
+#: src/emu/inpttype.ipp:376 src/emu/inpttype.ipp:410 src/emu/inpttype.ipp:444
+#: src/emu/inpttype.ipp:478
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 10"
+msgid "%p Button 8"
 msgstr ""
 
-#: src/emu/inpttype.ipp:44
+#: src/emu/inpttype.ipp:42 src/emu/inpttype.ipp:160 src/emu/inpttype.ipp:241
+#: src/emu/inpttype.ipp:275 src/emu/inpttype.ipp:309 src/emu/inpttype.ipp:343
+#: src/emu/inpttype.ipp:377 src/emu/inpttype.ipp:411 src/emu/inpttype.ipp:445
+#: src/emu/inpttype.ipp:479
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 11"
+msgid "%p Button 9"
 msgstr ""
 
-#: src/emu/inpttype.ipp:45
+#: src/emu/inpttype.ipp:43 src/emu/inpttype.ipp:161 src/emu/inpttype.ipp:242
+#: src/emu/inpttype.ipp:276 src/emu/inpttype.ipp:310 src/emu/inpttype.ipp:344
+#: src/emu/inpttype.ipp:378 src/emu/inpttype.ipp:412 src/emu/inpttype.ipp:446
+#: src/emu/inpttype.ipp:480
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 12"
+msgid "%p Button 10"
 msgstr ""
 
-#: src/emu/inpttype.ipp:46
+#: src/emu/inpttype.ipp:44 src/emu/inpttype.ipp:162 src/emu/inpttype.ipp:243
+#: src/emu/inpttype.ipp:277 src/emu/inpttype.ipp:311 src/emu/inpttype.ipp:345
+#: src/emu/inpttype.ipp:379 src/emu/inpttype.ipp:413 src/emu/inpttype.ipp:447
+#: src/emu/inpttype.ipp:481
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 13"
+msgid "%p Button 11"
 msgstr ""
 
-#: src/emu/inpttype.ipp:47
+#: src/emu/inpttype.ipp:45 src/emu/inpttype.ipp:163 src/emu/inpttype.ipp:244
+#: src/emu/inpttype.ipp:278 src/emu/inpttype.ipp:312 src/emu/inpttype.ipp:346
+#: src/emu/inpttype.ipp:380 src/emu/inpttype.ipp:414 src/emu/inpttype.ipp:448
+#: src/emu/inpttype.ipp:482
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 14"
+msgid "%p Button 12"
 msgstr ""
 
-#: src/emu/inpttype.ipp:48
+#: src/emu/inpttype.ipp:46 src/emu/inpttype.ipp:164 src/emu/inpttype.ipp:245
+#: src/emu/inpttype.ipp:279 src/emu/inpttype.ipp:313 src/emu/inpttype.ipp:347
+#: src/emu/inpttype.ipp:381 src/emu/inpttype.ipp:415 src/emu/inpttype.ipp:449
+#: src/emu/inpttype.ipp:483
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 15"
+msgid "%p Button 13"
 msgstr ""
 
-#: src/emu/inpttype.ipp:49
+#: src/emu/inpttype.ipp:47 src/emu/inpttype.ipp:165 src/emu/inpttype.ipp:246
+#: src/emu/inpttype.ipp:280 src/emu/inpttype.ipp:314 src/emu/inpttype.ipp:348
+#: src/emu/inpttype.ipp:382 src/emu/inpttype.ipp:416 src/emu/inpttype.ipp:450
+#: src/emu/inpttype.ipp:484
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 16"
+msgid "%p Button 14"
 msgstr ""
 
-#: src/emu/inpttype.ipp:50
+#: src/emu/inpttype.ipp:48 src/emu/inpttype.ipp:166 src/emu/inpttype.ipp:247
+#: src/emu/inpttype.ipp:281 src/emu/inpttype.ipp:315 src/emu/inpttype.ipp:349
+#: src/emu/inpttype.ipp:383 src/emu/inpttype.ipp:417 src/emu/inpttype.ipp:451
+#: src/emu/inpttype.ipp:485
+#, c-format
 msgctxt "input-name"
-msgid "P1 Start"
+msgid "%p Button 15"
 msgstr ""
 
-#: src/emu/inpttype.ipp:51
+#: src/emu/inpttype.ipp:49 src/emu/inpttype.ipp:167 src/emu/inpttype.ipp:248
+#: src/emu/inpttype.ipp:282 src/emu/inpttype.ipp:316 src/emu/inpttype.ipp:350
+#: src/emu/inpttype.ipp:384 src/emu/inpttype.ipp:418 src/emu/inpttype.ipp:452
+#: src/emu/inpttype.ipp:486
+#, c-format
 msgctxt "input-name"
-msgid "P1 Select"
+msgid "%p Button 16"
 msgstr ""
 
-#: src/emu/inpttype.ipp:56
+#: src/emu/inpttype.ipp:50 src/emu/inpttype.ipp:168 src/emu/inpttype.ipp:249
+#: src/emu/inpttype.ipp:283 src/emu/inpttype.ipp:317 src/emu/inpttype.ipp:351
+#: src/emu/inpttype.ipp:385 src/emu/inpttype.ipp:419 src/emu/inpttype.ipp:453
+#: src/emu/inpttype.ipp:487
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong A"
+msgid "%p Start"
 msgstr ""
 
-#: src/emu/inpttype.ipp:57
+#: src/emu/inpttype.ipp:51 src/emu/inpttype.ipp:169 src/emu/inpttype.ipp:250
+#: src/emu/inpttype.ipp:284 src/emu/inpttype.ipp:318 src/emu/inpttype.ipp:352
+#: src/emu/inpttype.ipp:386 src/emu/inpttype.ipp:420 src/emu/inpttype.ipp:454
+#: src/emu/inpttype.ipp:488
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong B"
+msgid "%p Select"
 msgstr ""
 
-#: src/emu/inpttype.ipp:58
+#: src/emu/inpttype.ipp:56 src/emu/inpttype.ipp:174
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong C"
+msgid "%p Mahjong A"
 msgstr ""
 
-#: src/emu/inpttype.ipp:59
+#: src/emu/inpttype.ipp:57 src/emu/inpttype.ipp:175
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong D"
+msgid "%p Mahjong B"
 msgstr ""
 
-#: src/emu/inpttype.ipp:60
+#: src/emu/inpttype.ipp:58 src/emu/inpttype.ipp:176
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong E"
+msgid "%p Mahjong C"
 msgstr ""
 
-#: src/emu/inpttype.ipp:61
+#: src/emu/inpttype.ipp:59 src/emu/inpttype.ipp:177
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong F"
+msgid "%p Mahjong D"
 msgstr ""
 
-#: src/emu/inpttype.ipp:62
+#: src/emu/inpttype.ipp:60 src/emu/inpttype.ipp:178
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong G"
+msgid "%p Mahjong E"
 msgstr ""
 
-#: src/emu/inpttype.ipp:63
+#: src/emu/inpttype.ipp:61 src/emu/inpttype.ipp:179
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong H"
+msgid "%p Mahjong F"
 msgstr ""
 
-#: src/emu/inpttype.ipp:64
+#: src/emu/inpttype.ipp:62 src/emu/inpttype.ipp:180
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong I"
+msgid "%p Mahjong G"
 msgstr ""
 
-#: src/emu/inpttype.ipp:65
+#: src/emu/inpttype.ipp:63 src/emu/inpttype.ipp:181
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong J"
+msgid "%p Mahjong H"
 msgstr ""
 
-#: src/emu/inpttype.ipp:66
+#: src/emu/inpttype.ipp:64 src/emu/inpttype.ipp:182
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong K"
+msgid "%p Mahjong I"
 msgstr ""
 
-#: src/emu/inpttype.ipp:67
+#: src/emu/inpttype.ipp:65 src/emu/inpttype.ipp:183
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong L"
+msgid "%p Mahjong J"
 msgstr ""
 
-#: src/emu/inpttype.ipp:68
+#: src/emu/inpttype.ipp:66 src/emu/inpttype.ipp:184
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong M"
+msgid "%p Mahjong K"
 msgstr ""
 
-#: src/emu/inpttype.ipp:69
+#: src/emu/inpttype.ipp:67 src/emu/inpttype.ipp:185
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong N"
+msgid "%p Mahjong L"
 msgstr ""
 
-#: src/emu/inpttype.ipp:70
+#: src/emu/inpttype.ipp:68 src/emu/inpttype.ipp:186
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong O"
+msgid "%p Mahjong M"
 msgstr ""
 
-#: src/emu/inpttype.ipp:71
+#: src/emu/inpttype.ipp:69 src/emu/inpttype.ipp:187
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong P"
+msgid "%p Mahjong N"
 msgstr ""
 
-#: src/emu/inpttype.ipp:72
+#: src/emu/inpttype.ipp:70 src/emu/inpttype.ipp:188
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Q"
+msgid "%p Mahjong O"
 msgstr ""
 
-#: src/emu/inpttype.ipp:73
+#: src/emu/inpttype.ipp:71 src/emu/inpttype.ipp:189
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Kan"
+msgid "%p Mahjong P"
 msgstr ""
 
-#: src/emu/inpttype.ipp:74
+#: src/emu/inpttype.ipp:72 src/emu/inpttype.ipp:190
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Pon"
+msgid "%p Mahjong Q"
 msgstr ""
 
-#: src/emu/inpttype.ipp:75
+#: src/emu/inpttype.ipp:73 src/emu/inpttype.ipp:191
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Chi"
+msgid "%p Mahjong Kan"
 msgstr ""
 
-#: src/emu/inpttype.ipp:76
+#: src/emu/inpttype.ipp:74 src/emu/inpttype.ipp:192
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Reach"
+msgid "%p Mahjong Pon"
 msgstr ""
 
-#: src/emu/inpttype.ipp:77
+#: src/emu/inpttype.ipp:75 src/emu/inpttype.ipp:193
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Ron"
+msgid "%p Mahjong Chi"
 msgstr ""
 
-#: src/emu/inpttype.ipp:78
+#: src/emu/inpttype.ipp:76 src/emu/inpttype.ipp:194
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Flip Flop"
+msgid "%p Mahjong Reach"
 msgstr ""
 
-#: src/emu/inpttype.ipp:79
+#: src/emu/inpttype.ipp:77 src/emu/inpttype.ipp:195
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Bet"
+msgid "%p Mahjong Ron"
 msgstr ""
 
-#: src/emu/inpttype.ipp:80
+#: src/emu/inpttype.ipp:78 src/emu/inpttype.ipp:200
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Take Score"
+msgid "%p Mahjong Flip Flop"
 msgstr ""
 
-#: src/emu/inpttype.ipp:81
+#: src/emu/inpttype.ipp:79 src/emu/inpttype.ipp:196
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Double Up"
+msgid "%p Mahjong Bet"
 msgstr ""
 
-#: src/emu/inpttype.ipp:82
+#: src/emu/inpttype.ipp:80 src/emu/inpttype.ipp:198
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Big"
+msgid "%p Mahjong Take Score"
 msgstr ""
 
-#: src/emu/inpttype.ipp:83
+#: src/emu/inpttype.ipp:81 src/emu/inpttype.ipp:199
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Small"
+msgid "%p Mahjong Double Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:84
+#: src/emu/inpttype.ipp:82 src/emu/inpttype.ipp:201
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Last Chance"
+msgid "%p Mahjong Big"
 msgstr ""
 
-#: src/emu/inpttype.ipp:89
+#: src/emu/inpttype.ipp:83 src/emu/inpttype.ipp:202
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda A/1"
+msgid "%p Mahjong Small"
 msgstr ""
 
-#: src/emu/inpttype.ipp:90
+#: src/emu/inpttype.ipp:84 src/emu/inpttype.ipp:197
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda B/2"
+msgid "%p Mahjong Last Chance"
 msgstr ""
 
-#: src/emu/inpttype.ipp:91
+#: src/emu/inpttype.ipp:89 src/emu/inpttype.ipp:207
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda C/3"
+msgid "%p Hanafuda A/1"
 msgstr ""
 
-#: src/emu/inpttype.ipp:92
+#: src/emu/inpttype.ipp:90 src/emu/inpttype.ipp:208
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda D/4"
+msgid "%p Hanafuda B/2"
 msgstr ""
 
-#: src/emu/inpttype.ipp:93
+#: src/emu/inpttype.ipp:91 src/emu/inpttype.ipp:209
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda E/5"
+msgid "%p Hanafuda C/3"
 msgstr ""
 
-#: src/emu/inpttype.ipp:94
+#: src/emu/inpttype.ipp:92 src/emu/inpttype.ipp:210
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda F/6"
+msgid "%p Hanafuda D/4"
 msgstr ""
 
-#: src/emu/inpttype.ipp:95
+#: src/emu/inpttype.ipp:93 src/emu/inpttype.ipp:211
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda G/7"
+msgid "%p Hanafuda E/5"
 msgstr ""
 
-#: src/emu/inpttype.ipp:96
+#: src/emu/inpttype.ipp:94 src/emu/inpttype.ipp:212
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda H/8"
+msgid "%p Hanafuda F/6"
 msgstr ""
 
-#: src/emu/inpttype.ipp:97
+#: src/emu/inpttype.ipp:95 src/emu/inpttype.ipp:213
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda Yes"
+msgid "%p Hanafuda G/7"
 msgstr ""
 
-#: src/emu/inpttype.ipp:98
+#: src/emu/inpttype.ipp:96 src/emu/inpttype.ipp:214
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda No"
+msgid "%p Hanafuda H/8"
+msgstr ""
+
+#: src/emu/inpttype.ipp:97 src/emu/inpttype.ipp:215
+#, c-format
+msgctxt "input-name"
+msgid "%p Hanafuda Yes"
+msgstr ""
+
+#: src/emu/inpttype.ipp:98 src/emu/inpttype.ipp:216
+#, c-format
+msgctxt "input-name"
+msgid "%p Hanafuda No"
 msgstr ""
 
 #: src/emu/inpttype.ipp:103
@@ -3812,1551 +3984,6 @@ msgctxt "input-name"
 msgid "Stop All Reels"
 msgstr ""
 
-#: src/emu/inpttype.ipp:140
-msgctxt "input-name"
-msgid "P2 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:141
-msgctxt "input-name"
-msgid "P2 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:142
-msgctxt "input-name"
-msgid "P2 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:143
-msgctxt "input-name"
-msgid "P2 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:144
-msgctxt "input-name"
-msgid "P2 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:145
-msgctxt "input-name"
-msgid "P2 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:146
-msgctxt "input-name"
-msgid "P2 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:147
-msgctxt "input-name"
-msgid "P2 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:148
-msgctxt "input-name"
-msgid "P2 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:149
-msgctxt "input-name"
-msgid "P2 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:150
-msgctxt "input-name"
-msgid "P2 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:151
-msgctxt "input-name"
-msgid "P2 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:152
-msgctxt "input-name"
-msgid "P2 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:153
-msgctxt "input-name"
-msgid "P2 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:154
-msgctxt "input-name"
-msgid "P2 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:155
-msgctxt "input-name"
-msgid "P2 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:156
-msgctxt "input-name"
-msgid "P2 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:157
-msgctxt "input-name"
-msgid "P2 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:158
-msgctxt "input-name"
-msgid "P2 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:159
-msgctxt "input-name"
-msgid "P2 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:160
-msgctxt "input-name"
-msgid "P2 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:161
-msgctxt "input-name"
-msgid "P2 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:162
-msgctxt "input-name"
-msgid "P2 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:163
-msgctxt "input-name"
-msgid "P2 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:164
-msgctxt "input-name"
-msgid "P2 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:165
-msgctxt "input-name"
-msgid "P2 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:166
-msgctxt "input-name"
-msgid "P2 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:167
-msgctxt "input-name"
-msgid "P2 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:168
-msgctxt "input-name"
-msgid "P2 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:169
-msgctxt "input-name"
-msgid "P2 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:174
-msgctxt "input-name"
-msgid "P2 Mahjong A"
-msgstr ""
-
-#: src/emu/inpttype.ipp:175
-msgctxt "input-name"
-msgid "P2 Mahjong B"
-msgstr ""
-
-#: src/emu/inpttype.ipp:176
-msgctxt "input-name"
-msgid "P2 Mahjong C"
-msgstr ""
-
-#: src/emu/inpttype.ipp:177
-msgctxt "input-name"
-msgid "P2 Mahjong D"
-msgstr ""
-
-#: src/emu/inpttype.ipp:178
-msgctxt "input-name"
-msgid "P2 Mahjong E"
-msgstr ""
-
-#: src/emu/inpttype.ipp:179
-msgctxt "input-name"
-msgid "P2 Mahjong F"
-msgstr ""
-
-#: src/emu/inpttype.ipp:180
-msgctxt "input-name"
-msgid "P2 Mahjong G"
-msgstr ""
-
-#: src/emu/inpttype.ipp:181
-msgctxt "input-name"
-msgid "P2 Mahjong H"
-msgstr ""
-
-#: src/emu/inpttype.ipp:182
-msgctxt "input-name"
-msgid "P2 Mahjong I"
-msgstr ""
-
-#: src/emu/inpttype.ipp:183
-msgctxt "input-name"
-msgid "P2 Mahjong J"
-msgstr ""
-
-#: src/emu/inpttype.ipp:184
-msgctxt "input-name"
-msgid "P2 Mahjong K"
-msgstr ""
-
-#: src/emu/inpttype.ipp:185
-msgctxt "input-name"
-msgid "P2 Mahjong L"
-msgstr ""
-
-#: src/emu/inpttype.ipp:186
-msgctxt "input-name"
-msgid "P2 Mahjong M"
-msgstr ""
-
-#: src/emu/inpttype.ipp:187
-msgctxt "input-name"
-msgid "P2 Mahjong N"
-msgstr ""
-
-#: src/emu/inpttype.ipp:188
-msgctxt "input-name"
-msgid "P2 Mahjong O"
-msgstr ""
-
-#: src/emu/inpttype.ipp:189
-msgctxt "input-name"
-msgid "P2 Mahjong P"
-msgstr ""
-
-#: src/emu/inpttype.ipp:190
-msgctxt "input-name"
-msgid "P2 Mahjong Q"
-msgstr ""
-
-#: src/emu/inpttype.ipp:191
-msgctxt "input-name"
-msgid "P2 Mahjong Kan"
-msgstr ""
-
-#: src/emu/inpttype.ipp:192
-msgctxt "input-name"
-msgid "P2 Mahjong Pon"
-msgstr ""
-
-#: src/emu/inpttype.ipp:193
-msgctxt "input-name"
-msgid "P2 Mahjong Chi"
-msgstr ""
-
-#: src/emu/inpttype.ipp:194
-msgctxt "input-name"
-msgid "P2 Mahjong Reach"
-msgstr ""
-
-#: src/emu/inpttype.ipp:195
-msgctxt "input-name"
-msgid "P2 Mahjong Ron"
-msgstr ""
-
-#: src/emu/inpttype.ipp:196
-msgctxt "input-name"
-msgid "P2 Mahjong Bet"
-msgstr ""
-
-#: src/emu/inpttype.ipp:197
-msgctxt "input-name"
-msgid "P2 Mahjong Last Chance"
-msgstr ""
-
-#: src/emu/inpttype.ipp:198
-msgctxt "input-name"
-msgid "P2 Mahjong Take Score"
-msgstr ""
-
-#: src/emu/inpttype.ipp:199
-msgctxt "input-name"
-msgid "P2 Mahjong Double Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:200
-msgctxt "input-name"
-msgid "P2 Mahjong Flip Flop"
-msgstr ""
-
-#: src/emu/inpttype.ipp:201
-msgctxt "input-name"
-msgid "P2 Mahjong Big"
-msgstr ""
-
-#: src/emu/inpttype.ipp:202
-msgctxt "input-name"
-msgid "P2 Mahjong Small"
-msgstr ""
-
-#: src/emu/inpttype.ipp:207
-msgctxt "input-name"
-msgid "P2 Hanafuda A/1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:208
-msgctxt "input-name"
-msgid "P2 Hanafuda B/2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:209
-msgctxt "input-name"
-msgid "P2 Hanafuda C/3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:210
-msgctxt "input-name"
-msgid "P2 Hanafuda D/4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:211
-msgctxt "input-name"
-msgid "P2 Hanafuda E/5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:212
-msgctxt "input-name"
-msgid "P2 Hanafuda F/6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:213
-msgctxt "input-name"
-msgid "P2 Hanafuda G/7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:214
-msgctxt "input-name"
-msgid "P2 Hanafuda H/8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:215
-msgctxt "input-name"
-msgid "P2 Hanafuda Yes"
-msgstr ""
-
-#: src/emu/inpttype.ipp:216
-msgctxt "input-name"
-msgid "P2 Hanafuda No"
-msgstr ""
-
-#: src/emu/inpttype.ipp:221
-msgctxt "input-name"
-msgid "P3 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:222
-msgctxt "input-name"
-msgid "P3 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:223
-msgctxt "input-name"
-msgid "P3 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:224
-msgctxt "input-name"
-msgid "P3 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:225
-msgctxt "input-name"
-msgid "P3 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:226
-msgctxt "input-name"
-msgid "P3 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:227
-msgctxt "input-name"
-msgid "P3 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:228
-msgctxt "input-name"
-msgid "P3 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:229
-msgctxt "input-name"
-msgid "P3 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:230
-msgctxt "input-name"
-msgid "P3 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:231
-msgctxt "input-name"
-msgid "P3 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:232
-msgctxt "input-name"
-msgid "P3 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:233
-msgctxt "input-name"
-msgid "P3 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:234
-msgctxt "input-name"
-msgid "P3 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:235
-msgctxt "input-name"
-msgid "P3 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:236
-msgctxt "input-name"
-msgid "P3 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:237
-msgctxt "input-name"
-msgid "P3 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:238
-msgctxt "input-name"
-msgid "P3 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:239
-msgctxt "input-name"
-msgid "P3 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:240
-msgctxt "input-name"
-msgid "P3 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:241
-msgctxt "input-name"
-msgid "P3 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:242
-msgctxt "input-name"
-msgid "P3 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:243
-msgctxt "input-name"
-msgid "P3 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:244
-msgctxt "input-name"
-msgid "P3 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:245
-msgctxt "input-name"
-msgid "P3 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:246
-msgctxt "input-name"
-msgid "P3 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:247
-msgctxt "input-name"
-msgid "P3 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:248
-msgctxt "input-name"
-msgid "P3 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:249
-msgctxt "input-name"
-msgid "P3 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:250
-msgctxt "input-name"
-msgid "P3 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:255
-msgctxt "input-name"
-msgid "P4 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:256
-msgctxt "input-name"
-msgid "P4 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:257
-msgctxt "input-name"
-msgid "P4 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:258
-msgctxt "input-name"
-msgid "P4 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:259
-msgctxt "input-name"
-msgid "P4 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:260
-msgctxt "input-name"
-msgid "P4 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:261
-msgctxt "input-name"
-msgid "P4 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:262
-msgctxt "input-name"
-msgid "P4 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:263
-msgctxt "input-name"
-msgid "P4 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:264
-msgctxt "input-name"
-msgid "P4 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:265
-msgctxt "input-name"
-msgid "P4 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:266
-msgctxt "input-name"
-msgid "P4 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:267
-msgctxt "input-name"
-msgid "P4 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:268
-msgctxt "input-name"
-msgid "P4 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:269
-msgctxt "input-name"
-msgid "P4 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:270
-msgctxt "input-name"
-msgid "P4 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:271
-msgctxt "input-name"
-msgid "P4 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:272
-msgctxt "input-name"
-msgid "P4 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:273
-msgctxt "input-name"
-msgid "P4 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:274
-msgctxt "input-name"
-msgid "P4 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:275
-msgctxt "input-name"
-msgid "P4 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:276
-msgctxt "input-name"
-msgid "P4 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:277
-msgctxt "input-name"
-msgid "P4 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:278
-msgctxt "input-name"
-msgid "P4 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:279
-msgctxt "input-name"
-msgid "P4 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:280
-msgctxt "input-name"
-msgid "P4 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:281
-msgctxt "input-name"
-msgid "P4 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:282
-msgctxt "input-name"
-msgid "P4 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:283
-msgctxt "input-name"
-msgid "P4 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:284
-msgctxt "input-name"
-msgid "P4 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:289
-msgctxt "input-name"
-msgid "P5 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:290
-msgctxt "input-name"
-msgid "P5 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:291
-msgctxt "input-name"
-msgid "P5 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:292
-msgctxt "input-name"
-msgid "P5 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:293
-msgctxt "input-name"
-msgid "P5 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:294
-msgctxt "input-name"
-msgid "P5 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:295
-msgctxt "input-name"
-msgid "P5 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:296
-msgctxt "input-name"
-msgid "P5 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:297
-msgctxt "input-name"
-msgid "P5 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:298
-msgctxt "input-name"
-msgid "P5 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:299
-msgctxt "input-name"
-msgid "P5 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:300
-msgctxt "input-name"
-msgid "P5 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:301
-msgctxt "input-name"
-msgid "P5 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:302
-msgctxt "input-name"
-msgid "P5 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:303
-msgctxt "input-name"
-msgid "P5 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:304
-msgctxt "input-name"
-msgid "P5 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:305
-msgctxt "input-name"
-msgid "P5 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:306
-msgctxt "input-name"
-msgid "P5 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:307
-msgctxt "input-name"
-msgid "P5 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:308
-msgctxt "input-name"
-msgid "P5 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:309
-msgctxt "input-name"
-msgid "P5 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:310
-msgctxt "input-name"
-msgid "P5 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:311
-msgctxt "input-name"
-msgid "P5 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:312
-msgctxt "input-name"
-msgid "P5 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:313
-msgctxt "input-name"
-msgid "P5 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:314
-msgctxt "input-name"
-msgid "P5 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:315
-msgctxt "input-name"
-msgid "P5 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:316
-msgctxt "input-name"
-msgid "P5 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:317
-msgctxt "input-name"
-msgid "P5 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:318
-msgctxt "input-name"
-msgid "P5 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:323
-msgctxt "input-name"
-msgid "P6 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:324
-msgctxt "input-name"
-msgid "P6 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:325
-msgctxt "input-name"
-msgid "P6 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:326
-msgctxt "input-name"
-msgid "P6 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:327
-msgctxt "input-name"
-msgid "P6 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:328
-msgctxt "input-name"
-msgid "P6 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:329
-msgctxt "input-name"
-msgid "P6 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:330
-msgctxt "input-name"
-msgid "P6 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:331
-msgctxt "input-name"
-msgid "P6 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:332
-msgctxt "input-name"
-msgid "P6 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:333
-msgctxt "input-name"
-msgid "P6 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:334
-msgctxt "input-name"
-msgid "P6 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:335
-msgctxt "input-name"
-msgid "P6 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:336
-msgctxt "input-name"
-msgid "P6 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:337
-msgctxt "input-name"
-msgid "P6 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:338
-msgctxt "input-name"
-msgid "P6 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:339
-msgctxt "input-name"
-msgid "P6 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:340
-msgctxt "input-name"
-msgid "P6 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:341
-msgctxt "input-name"
-msgid "P6 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:342
-msgctxt "input-name"
-msgid "P6 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:343
-msgctxt "input-name"
-msgid "P6 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:344
-msgctxt "input-name"
-msgid "P6 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:345
-msgctxt "input-name"
-msgid "P6 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:346
-msgctxt "input-name"
-msgid "P6 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:347
-msgctxt "input-name"
-msgid "P6 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:348
-msgctxt "input-name"
-msgid "P6 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:349
-msgctxt "input-name"
-msgid "P6 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:350
-msgctxt "input-name"
-msgid "P6 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:351
-msgctxt "input-name"
-msgid "P6 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:352
-msgctxt "input-name"
-msgid "P6 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:357
-msgctxt "input-name"
-msgid "P7 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:358
-msgctxt "input-name"
-msgid "P7 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:359
-msgctxt "input-name"
-msgid "P7 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:360
-msgctxt "input-name"
-msgid "P7 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:361
-msgctxt "input-name"
-msgid "P7 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:362
-msgctxt "input-name"
-msgid "P7 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:363
-msgctxt "input-name"
-msgid "P7 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:364
-msgctxt "input-name"
-msgid "P7 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:365
-msgctxt "input-name"
-msgid "P7 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:366
-msgctxt "input-name"
-msgid "P7 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:367
-msgctxt "input-name"
-msgid "P7 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:368
-msgctxt "input-name"
-msgid "P7 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:369
-msgctxt "input-name"
-msgid "P7 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:370
-msgctxt "input-name"
-msgid "P7 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:371
-msgctxt "input-name"
-msgid "P7 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:372
-msgctxt "input-name"
-msgid "P7 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:373
-msgctxt "input-name"
-msgid "P7 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:374
-msgctxt "input-name"
-msgid "P7 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:375
-msgctxt "input-name"
-msgid "P7 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:376
-msgctxt "input-name"
-msgid "P7 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:377
-msgctxt "input-name"
-msgid "P7 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:378
-msgctxt "input-name"
-msgid "P7 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:379
-msgctxt "input-name"
-msgid "P7 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:380
-msgctxt "input-name"
-msgid "P7 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:381
-msgctxt "input-name"
-msgid "P7 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:382
-msgctxt "input-name"
-msgid "P7 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:383
-msgctxt "input-name"
-msgid "P7 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:384
-msgctxt "input-name"
-msgid "P7 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:385
-msgctxt "input-name"
-msgid "P7 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:386
-msgctxt "input-name"
-msgid "P7 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:391
-msgctxt "input-name"
-msgid "P8 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:392
-msgctxt "input-name"
-msgid "P8 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:393
-msgctxt "input-name"
-msgid "P8 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:394
-msgctxt "input-name"
-msgid "P8 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:395
-msgctxt "input-name"
-msgid "P8 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:396
-msgctxt "input-name"
-msgid "P8 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:397
-msgctxt "input-name"
-msgid "P8 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:398
-msgctxt "input-name"
-msgid "P8 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:399
-msgctxt "input-name"
-msgid "P8 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:400
-msgctxt "input-name"
-msgid "P8 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:401
-msgctxt "input-name"
-msgid "P8 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:402
-msgctxt "input-name"
-msgid "P8 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:403
-msgctxt "input-name"
-msgid "P8 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:404
-msgctxt "input-name"
-msgid "P8 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:405
-msgctxt "input-name"
-msgid "P8 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:406
-msgctxt "input-name"
-msgid "P8 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:407
-msgctxt "input-name"
-msgid "P8 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:408
-msgctxt "input-name"
-msgid "P8 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:409
-msgctxt "input-name"
-msgid "P8 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:410
-msgctxt "input-name"
-msgid "P8 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:411
-msgctxt "input-name"
-msgid "P8 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:412
-msgctxt "input-name"
-msgid "P8 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:413
-msgctxt "input-name"
-msgid "P8 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:414
-msgctxt "input-name"
-msgid "P8 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:415
-msgctxt "input-name"
-msgid "P8 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:416
-msgctxt "input-name"
-msgid "P8 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:417
-msgctxt "input-name"
-msgid "P8 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:418
-msgctxt "input-name"
-msgid "P8 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:419
-msgctxt "input-name"
-msgid "P8 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:420
-msgctxt "input-name"
-msgid "P8 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:425
-msgctxt "input-name"
-msgid "P9 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:426
-msgctxt "input-name"
-msgid "P9 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:427
-msgctxt "input-name"
-msgid "P9 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:428
-msgctxt "input-name"
-msgid "P9 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:429
-msgctxt "input-name"
-msgid "P9 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:430
-msgctxt "input-name"
-msgid "P9 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:431
-msgctxt "input-name"
-msgid "P9 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:432
-msgctxt "input-name"
-msgid "P9 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:433
-msgctxt "input-name"
-msgid "P9 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:434
-msgctxt "input-name"
-msgid "P9 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:435
-msgctxt "input-name"
-msgid "P9 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:436
-msgctxt "input-name"
-msgid "P9 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:437
-msgctxt "input-name"
-msgid "P9 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:438
-msgctxt "input-name"
-msgid "P9 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:439
-msgctxt "input-name"
-msgid "P9 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:440
-msgctxt "input-name"
-msgid "P9 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:441
-msgctxt "input-name"
-msgid "P9 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:442
-msgctxt "input-name"
-msgid "P9 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:443
-msgctxt "input-name"
-msgid "P9 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:444
-msgctxt "input-name"
-msgid "P9 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:445
-msgctxt "input-name"
-msgid "P9 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:446
-msgctxt "input-name"
-msgid "P9 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:447
-msgctxt "input-name"
-msgid "P9 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:448
-msgctxt "input-name"
-msgid "P9 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:449
-msgctxt "input-name"
-msgid "P9 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:450
-msgctxt "input-name"
-msgid "P9 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:451
-msgctxt "input-name"
-msgid "P9 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:452
-msgctxt "input-name"
-msgid "P9 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:453
-msgctxt "input-name"
-msgid "P9 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:454
-msgctxt "input-name"
-msgid "P9 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:459
-msgctxt "input-name"
-msgid "P10 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:460
-msgctxt "input-name"
-msgid "P10 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:461
-msgctxt "input-name"
-msgid "P10 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:462
-msgctxt "input-name"
-msgid "P10 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:463
-msgctxt "input-name"
-msgid "P10 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:464
-msgctxt "input-name"
-msgid "P10 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:465
-msgctxt "input-name"
-msgid "P10 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:466
-msgctxt "input-name"
-msgid "P10 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:467
-msgctxt "input-name"
-msgid "P10 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:468
-msgctxt "input-name"
-msgid "P10 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:469
-msgctxt "input-name"
-msgid "P10 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:470
-msgctxt "input-name"
-msgid "P10 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:471
-msgctxt "input-name"
-msgid "P10 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:472
-msgctxt "input-name"
-msgid "P10 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:473
-msgctxt "input-name"
-msgid "P10 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:474
-msgctxt "input-name"
-msgid "P10 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:475
-msgctxt "input-name"
-msgid "P10 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:476
-msgctxt "input-name"
-msgid "P10 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:477
-msgctxt "input-name"
-msgid "P10 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:478
-msgctxt "input-name"
-msgid "P10 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:479
-msgctxt "input-name"
-msgid "P10 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:480
-msgctxt "input-name"
-msgid "P10 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:481
-msgctxt "input-name"
-msgid "P10 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:482
-msgctxt "input-name"
-msgid "P10 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:483
-msgctxt "input-name"
-msgid "P10 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:484
-msgctxt "input-name"
-msgid "P10 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:485
-msgctxt "input-name"
-msgid "P10 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:486
-msgctxt "input-name"
-msgid "P10 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:487
-msgctxt "input-name"
-msgid "P10 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:488
-msgctxt "input-name"
-msgid "P10 Select"
-msgstr ""
-
 #: src/emu/inpttype.ipp:493
 msgctxt "input-name"
 msgid "1 Player Start"
@@ -5537,154 +4164,31 @@ msgctxt "input-name"
 msgid "Volume Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:550
-msgctxt "input-name"
-msgid "P1 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:551
-msgctxt "input-name"
-msgid "P2 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:552
-msgctxt "input-name"
-msgid "P3 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:553
-msgctxt "input-name"
-msgid "P4 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:554
-msgctxt "input-name"
-msgid "P5 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:555
-msgctxt "input-name"
-msgid "P6 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:556
-msgctxt "input-name"
-msgid "P7 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:557
-msgctxt "input-name"
-msgid "P8 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:558
-msgctxt "input-name"
-msgid "P9 Pedal 1"
-msgstr ""
-
+#: src/emu/inpttype.ipp:550 src/emu/inpttype.ipp:551 src/emu/inpttype.ipp:552
+#: src/emu/inpttype.ipp:553 src/emu/inpttype.ipp:554 src/emu/inpttype.ipp:555
+#: src/emu/inpttype.ipp:556 src/emu/inpttype.ipp:557 src/emu/inpttype.ipp:558
 #: src/emu/inpttype.ipp:559
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:564
-msgctxt "input-name"
-msgid "P1 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:565
-msgctxt "input-name"
-msgid "P2 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:566
-msgctxt "input-name"
-msgid "P3 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:567
-msgctxt "input-name"
-msgid "P4 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:568
-msgctxt "input-name"
-msgid "P5 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:569
-msgctxt "input-name"
-msgid "P6 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:570
-msgctxt "input-name"
-msgid "P7 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:571
-msgctxt "input-name"
-msgid "P8 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:572
-msgctxt "input-name"
-msgid "P9 Pedal 2"
+msgid "%p Pedal 1"
 msgstr ""
 
+#: src/emu/inpttype.ipp:564 src/emu/inpttype.ipp:565 src/emu/inpttype.ipp:566
+#: src/emu/inpttype.ipp:567 src/emu/inpttype.ipp:568 src/emu/inpttype.ipp:569
+#: src/emu/inpttype.ipp:570 src/emu/inpttype.ipp:571 src/emu/inpttype.ipp:572
 #: src/emu/inpttype.ipp:573
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:578
-msgctxt "input-name"
-msgid "P1 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:579
-msgctxt "input-name"
-msgid "P2 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:580
-msgctxt "input-name"
-msgid "P3 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:581
-msgctxt "input-name"
-msgid "P4 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:582
-msgctxt "input-name"
-msgid "P5 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:583
-msgctxt "input-name"
-msgid "P6 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:584
-msgctxt "input-name"
-msgid "P7 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:585
-msgctxt "input-name"
-msgid "P8 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:586
-msgctxt "input-name"
-msgid "P9 Pedal 3"
+msgid "%p Pedal 2"
 msgstr ""
 
+#: src/emu/inpttype.ipp:578 src/emu/inpttype.ipp:579 src/emu/inpttype.ipp:580
+#: src/emu/inpttype.ipp:581 src/emu/inpttype.ipp:582 src/emu/inpttype.ipp:583
+#: src/emu/inpttype.ipp:584 src/emu/inpttype.ipp:585 src/emu/inpttype.ipp:586
 #: src/emu/inpttype.ipp:587
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 3"
+msgid "%p Pedal 3"
 msgstr ""
 
 #: src/emu/inpttype.ipp:592
@@ -7572,6 +6076,35 @@ msgid ""
 "%s"
 msgstr ""
 
+#~ msgid "Confirm quit from machines"
+#~ msgstr "Konfirmera avsluta maskinhantering"
+
+#~ msgid "Skip information screen at startup"
+#~ msgstr "Hoppa över informationsdialog vid uppstart"
+
+#~ msgid "Skip software parts selection menu"
+#~ msgstr "Hoppa över mjukvaru menyn"
+
+#~ msgid "Offscreen reload"
+#~ msgstr "Skärmlös omladdning"
+
+#~ msgid "Simultaneous contradictory"
+#~ msgstr "Motsägelsefullt"
+
+#~ msgid "Adstick Device Assignment"
+#~ msgstr "Reklamlappenhetstilldelning"
+
+#, c-format
+#~ msgid ""
+#~ "Auditing ROMs for machine %2$u of %3$u...\n"
+#~ "%1$s"
+#~ msgstr ""
+#~ "Granskning av ROMs för maskin %2$u av %3$u...\n"
+#~ "%1$s"
+
+#~ msgid "Input (this Machine)"
+#~ msgstr "Input (denna Maskin)"
+
 #~ msgid "Device Mapping"
 #~ msgstr "Enhetsmappning"
 
diff --git a/language/Thai/strings.po b/language/Thai/strings.po
index 61aea1d8dfe..668d6bb6468 100644
--- a/language/Thai/strings.po
+++ b/language/Thai/strings.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-19 02:50+1100\n"
+"POT-Creation-Date: 2021-12-09 04:44+1100\n"
 "PO-Revision-Date: 2016-02-20 18:03+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: MAME Language Team\n"
@@ -259,12 +259,12 @@ msgstr ""
 msgid "Driver: \"%1$s\" software list "
 msgstr ""
 
-#: src/frontend/mame/ui/selsoft.cpp:711 src/frontend/mame/ui/selgame.cpp:1066
+#: src/frontend/mame/ui/selsoft.cpp:711 src/frontend/mame/ui/selgame.cpp:1076
 #, c-format
 msgid "%1$s: %2$s - Search: %3$s_"
 msgstr ""
 
-#: src/frontend/mame/ui/selsoft.cpp:713 src/frontend/mame/ui/selgame.cpp:1068
+#: src/frontend/mame/ui/selsoft.cpp:713 src/frontend/mame/ui/selgame.cpp:1078
 #, c-format
 msgid "Search: %1$s_"
 msgstr ""
@@ -274,7 +274,7 @@ msgstr ""
 msgid "Software list/item: %1$s:%2$s"
 msgstr ""
 
-#: src/frontend/mame/ui/optsmenu.cpp:73 src/frontend/mame/ui/sndmenu.cpp:165
+#: src/frontend/mame/ui/optsmenu.cpp:73 src/frontend/mame/ui/sndmenu.cpp:161
 msgid "Sound Options"
 msgstr ""
 
@@ -369,11 +369,11 @@ msgid "Show mouse pointer"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:39
-msgid "Confirm quit from machines"
+msgid "Confirm quit from emulation"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:40
-msgid "Skip information screen at startup"
+msgid "Skip system information screen"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:41
@@ -389,7 +389,7 @@ msgid "Skip BIOS selection menu"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:44
-msgid "Skip software parts selection menu"
+msgid "Skip software part selection menu"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:45
@@ -541,7 +541,7 @@ msgid "UI active"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:91
-msgid "Offscreen reload"
+msgid "Off-screen reload"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:92
@@ -557,7 +557,7 @@ msgid "Natural keyboard"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:95
-msgid "Simultaneous contradictory"
+msgid "Allow contradictory joystick inputs"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:96
@@ -581,7 +581,7 @@ msgid "Pedal Device Assignment"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:106
-msgid "Adstick Device Assignment"
+msgid "AD Stick Device Assignment"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:107
@@ -668,14 +668,14 @@ msgstr ""
 msgid "Wait Vertical Sync"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:687
+#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:689
 #: src/frontend/mame/ui/videoopt.cpp:191 src/frontend/mame/ui/custui.cpp:490
 #: src/frontend/mame/ui/analogipt.cpp:471 plugins/cheatfind/init.lua:766
 #: plugins/cheatfind/init.lua:777 plugins/cheat/init.lua:668
 msgid "On"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:690
+#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:692
 #: src/frontend/mame/ui/videoopt.cpp:207 src/frontend/mame/ui/custui.cpp:490
 #: src/frontend/mame/ui/analogipt.cpp:471 plugins/cheatfind/init.lua:763
 #: plugins/cheatfind/init.lua:774 plugins/cheat/init.lua:671
@@ -683,11 +683,11 @@ msgstr ""
 msgid "Off"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:693
+#: src/frontend/mame/ui/menu.cpp:695
 msgid "Auto"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:1195
+#: src/frontend/mame/ui/menu.cpp:1197
 #: src/frontend/mame/ui/simpleselgame.cpp:278
 #: src/frontend/mame/ui/selmenu.cpp:1280
 msgid "Return to Previous Menu"
@@ -695,7 +695,7 @@ msgstr ""
 
 #: src/frontend/mame/ui/filemngr.cpp:139
 #: src/frontend/mame/ui/confswitch.cpp:119
-#: src/frontend/mame/ui/inputmap.cpp:559 src/frontend/mame/ui/analogipt.cpp:360
+#: src/frontend/mame/ui/inputmap.cpp:563 src/frontend/mame/ui/analogipt.cpp:360
 #, c-format
 msgid "[root%1$s]"
 msgstr ""
@@ -938,22 +938,22 @@ msgid ""
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "GHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "MHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "kHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "Hz"
 msgstr ""
 
@@ -977,38 +977,38 @@ msgstr ""
 msgid "Vector"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:480
+#: src/frontend/mame/ui/info.cpp:483
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:480
+#: src/frontend/mame/ui/info.cpp:483
 msgid "%2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:497
+#: src/frontend/mame/ui/info.cpp:500
 #, c-format
 msgid "Screen '%1$s'"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:499
+#: src/frontend/mame/ui/info.cpp:502
 msgid "Screen"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:570 src/frontend/mame/ui/info.cpp:581
+#: src/frontend/mame/ui/info.cpp:573 src/frontend/mame/ui/info.cpp:584
 #, c-format
 msgid "%1$s:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:662
+#: src/frontend/mame/ui/info.cpp:665
 msgid "Not supported"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:665
+#: src/frontend/mame/ui/info.cpp:668
 msgid "Partially supported"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:674
+#: src/frontend/mame/ui/info.cpp:677
 msgid "[empty]"
 msgstr ""
 
@@ -1081,7 +1081,7 @@ msgid "Emulated"
 msgstr ""
 
 #: src/frontend/mame/ui/keyboard.cpp:59 src/frontend/mame/ui/confswitch.cpp:117
-#: src/frontend/mame/ui/inputmap.cpp:557 src/frontend/mame/ui/analogipt.cpp:358
+#: src/frontend/mame/ui/inputmap.cpp:561 src/frontend/mame/ui/analogipt.cpp:358
 #, c-format
 msgid "%1$s [root%2$s]"
 msgstr ""
@@ -1441,7 +1441,7 @@ msgctxt "swlist-info"
 msgid "Software list/item"
 msgstr ""
 
-#: src/frontend/mame/ui/datmenu.cpp:88 src/frontend/mame/ui/selmenu.cpp:2698
+#: src/frontend/mame/ui/datmenu.cpp:88 src/frontend/mame/ui/selmenu.cpp:2707
 msgid "Software List Info"
 msgstr ""
 
@@ -1556,7 +1556,7 @@ msgstr ""
 msgid "Configure Machine:"
 msgstr ""
 
-#: src/frontend/mame/ui/miscmenu.cpp:858 src/frontend/mame/ui/selmenu.cpp:2638
+#: src/frontend/mame/ui/miscmenu.cpp:858 src/frontend/mame/ui/selmenu.cpp:2647
 msgid " (default)"
 msgstr ""
 
@@ -1573,7 +1573,7 @@ msgid ""
 "Press %2$s to return to emulation"
 msgstr ""
 
-#: src/frontend/mame/ui/info_pty.cpp:30 src/frontend/mame/ui/mainmenu.cpp:155
+#: src/frontend/mame/ui/info_pty.cpp:30
 msgid "Pseudo terminals"
 msgstr ""
 
@@ -1641,52 +1641,52 @@ msgstr ""
 msgid "Other Controls"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:227
+#: src/frontend/mame/ui/inputmap.cpp:231
 msgid "This machine has no configurable inputs."
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:327
+#: src/frontend/mame/ui/inputmap.cpp:331
 msgid "Pressed"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:397
+#: src/frontend/mame/ui/inputmap.cpp:401
 msgid "Invalid sequence entered"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:542
+#: src/frontend/mame/ui/inputmap.cpp:546
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:543
+#: src/frontend/mame/ui/inputmap.cpp:547
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog Inc"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:544
+#: src/frontend/mame/ui/inputmap.cpp:548
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog Dec"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:586
+#: src/frontend/mame/ui/inputmap.cpp:590
 #, c-format
 msgid "Press %1$s to set\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:587
+#: src/frontend/mame/ui/inputmap.cpp:591
 #, c-format
 msgid "Press %1$s to append\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:588
+#: src/frontend/mame/ui/inputmap.cpp:592
 #, c-format
 msgid "Press %1$s to clear\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:589
+#: src/frontend/mame/ui/inputmap.cpp:593
 #, c-format
 msgid "Press %1$s to restore default\n"
 msgstr ""
@@ -1750,7 +1750,7 @@ msgid ""
 msgstr ""
 
 #: src/frontend/mame/ui/simpleselgame.cpp:273
-#: src/frontend/mame/ui/selgame.cpp:436
+#: src/frontend/mame/ui/selgame.cpp:443
 msgid "Configure Options"
 msgstr ""
 
@@ -2078,16 +2078,16 @@ msgstr ""
 msgid "Expand to fit"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:437
+#: src/frontend/mame/ui/selgame.cpp:444
 msgid "Configure Machine"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:1050
+#: src/frontend/mame/ui/selgame.cpp:1060
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d machines (%5$d BIOS) )"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:1078
+#: src/frontend/mame/ui/selgame.cpp:1088
 #, c-format
 msgid "System: %1$-.100s"
 msgstr ""
@@ -2109,7 +2109,7 @@ msgstr ""
 #: src/frontend/mame/ui/auditmenu.cpp:98
 #, c-format
 msgid ""
-"Auditing ROMs for machine %2$u of %3$u...\n"
+"Auditing media for machine %2$u of %3$u...\n"
 "%1$s"
 msgstr ""
 
@@ -2124,12 +2124,12 @@ msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:136
 #, c-format
-msgid "Audit ROMs for %1$u machines marked unavailable"
+msgid "Audit media for %1$u machines marked unavailable"
 msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:137
 #, c-format
-msgid "Audit ROMs for all %1$u machines"
+msgid "Audit media for all %1$u machines"
 msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:154
@@ -2335,84 +2335,84 @@ msgctxt "color-sample"
 msgid "Clone"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:914
+#: src/frontend/mame/ui/custui.cpp:906
 msgid "ARGB Settings"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:919 src/frontend/mame/ui/custui.cpp:922
+#: src/frontend/mame/ui/custui.cpp:911 src/frontend/mame/ui/custui.cpp:914
 msgctxt "color-channel"
 msgid "Alpha"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:927 src/frontend/mame/ui/custui.cpp:930
+#: src/frontend/mame/ui/custui.cpp:919 src/frontend/mame/ui/custui.cpp:922
 msgctxt "color-channel"
 msgid "Red"
 msgstr ""
 
+#: src/frontend/mame/ui/custui.cpp:927 src/frontend/mame/ui/custui.cpp:930
+msgctxt "color-channel"
+msgid "Green"
+msgstr ""
+
 #: src/frontend/mame/ui/custui.cpp:935 src/frontend/mame/ui/custui.cpp:938
 msgctxt "color-channel"
-msgid "Green"
-msgstr ""
-
-#: src/frontend/mame/ui/custui.cpp:943 src/frontend/mame/ui/custui.cpp:946
-msgctxt "color-channel"
 msgid "Blue"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:949
+#: src/frontend/mame/ui/custui.cpp:941
 msgid "Choose from palette"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:996
+#: src/frontend/mame/ui/custui.cpp:988
 msgid "Color preview:"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1093
+#: src/frontend/mame/ui/custui.cpp:1085
 msgctxt "color-preset"
 msgid "White"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1094
+#: src/frontend/mame/ui/custui.cpp:1086
 msgctxt "color-preset"
 msgid "Silver"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1095
+#: src/frontend/mame/ui/custui.cpp:1087
 msgctxt "color-preset"
 msgid "Gray"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1096
+#: src/frontend/mame/ui/custui.cpp:1088
 msgctxt "color-preset"
 msgid "Black"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1097
+#: src/frontend/mame/ui/custui.cpp:1089
 msgctxt "color-preset"
 msgid "Red"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1098
+#: src/frontend/mame/ui/custui.cpp:1090
 msgctxt "color-preset"
 msgid "Orange"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1099
+#: src/frontend/mame/ui/custui.cpp:1091
 msgctxt "color-preset"
 msgid "Yellow"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1100
+#: src/frontend/mame/ui/custui.cpp:1092
 msgctxt "color-preset"
 msgid "Green"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1101
+#: src/frontend/mame/ui/custui.cpp:1093
 msgctxt "color-preset"
 msgid "Blue"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1102
+#: src/frontend/mame/ui/custui.cpp:1094
 msgctxt "color-preset"
 msgid "Violet"
 msgstr ""
@@ -2477,7 +2477,7 @@ msgid "Input (general)"
 msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:123
-msgid "Input (this Machine)"
+msgid "Input (this machine)"
 msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:126
@@ -2516,6 +2516,10 @@ msgstr ""
 msgid "Tape Control"
 msgstr ""
 
+#: src/frontend/mame/ui/mainmenu.cpp:155
+msgid "Pseudo Terminals"
+msgstr ""
+
 #: src/frontend/mame/ui/mainmenu.cpp:158
 msgid "BIOS Selection"
 msgstr ""
@@ -2554,7 +2558,7 @@ msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:200
 #, c-format
-msgid "About %s"
+msgid "About %1$s"
 msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:212
@@ -2714,373 +2718,373 @@ msgstr ""
 msgid "%1$s %2$s"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2235
+#: src/frontend/mame/ui/selmenu.cpp:2244
 msgid "Images"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2236
+#: src/frontend/mame/ui/selmenu.cpp:2245
 msgid "Infos"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2551
+#: src/frontend/mame/ui/selmenu.cpp:2560
 msgid ""
 "Required ROM/disk images for the selected system are missing or incorrect. "
 "Please acquire the correct files or select a different system.\n"
 "\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2567
+#: src/frontend/mame/ui/selmenu.cpp:2576
 msgid ""
 "Required ROM/disk images for the selected software are missing or incorrect. "
 "Please acquire the correct files or select a different software item.\n"
 "\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2583
+#: src/frontend/mame/ui/selmenu.cpp:2592
 msgid "incorrect checksum"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2586
+#: src/frontend/mame/ui/selmenu.cpp:2595
 msgid "incorrect length"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2589
+#: src/frontend/mame/ui/selmenu.cpp:2598
 msgid "not found"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2600
+#: src/frontend/mame/ui/selmenu.cpp:2609
 #, c-format
 msgid "%1$s (%2$s) - %3$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2602
+#: src/frontend/mame/ui/selmenu.cpp:2611
 #, c-format
 msgid "%1$s - %2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2606
+#: src/frontend/mame/ui/selmenu.cpp:2615
 msgid "Press any key to continue."
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2735
+#: src/frontend/mame/ui/selmenu.cpp:2744
 msgid "General Info"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2887
-#, c-format
-msgid "Romset\t%1$s\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2888
-#, c-format
-msgid "Year\t%1$s\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2889
-#, c-format
-msgid "Manufacturer\t%1$s\n"
-msgstr ""
-
 #: src/frontend/mame/ui/selmenu.cpp:2896
 #, c-format
-msgid "Driver is Clone of\t%1$s\n"
+msgid "Romset\t%1$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2901
-msgid "Driver is Parent\t\n"
+#: src/frontend/mame/ui/selmenu.cpp:2897
+#, c-format
+msgid "Year\t%1$s\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2898
+#, c-format
+msgid "Manufacturer\t%1$s\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2905
-msgid "Analog Controls\tYes\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2907
-msgid "Keyboard Inputs\tYes\n"
+#, c-format
+msgid "Driver is Clone of\t%1$s\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2910
-msgid "Overall\tNOT WORKING\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2912
-msgid "Overall\tUnemulated Protection\n"
+msgid "Driver is Parent\t\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2914
-msgid "Overall\tWorking\n"
+msgid "Analog Controls\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2917
-msgid "Graphics\tUnimplemented\n"
+#: src/frontend/mame/ui/selmenu.cpp:2916
+msgid "Keyboard Inputs\tYes\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2919
-msgid "Graphics\tWrong Colors\n"
+msgid "Overall\tNOT WORKING\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2921
-msgid "Graphics\tImperfect Colors\n"
+msgid "Overall\tUnemulated Protection\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2923
-msgid "Graphics\tImperfect\n"
+msgid "Overall\tWorking\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2925
-msgid "Graphics\tOK\n"
+#: src/frontend/mame/ui/selmenu.cpp:2926
+msgid "Graphics\tUnimplemented\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2928
-msgid "Sound\tNone\n"
+msgid "Graphics\tWrong Colors\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2930
-msgid "Sound\tUnimplemented\n"
+msgid "Graphics\tImperfect Colors\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2932
-msgid "Sound\tImperfect\n"
+msgid "Graphics\tImperfect\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2934
-msgid "Sound\tOK\n"
+msgid "Graphics\tOK\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2937
-msgid "Capture\tUnimplemented\n"
+msgid "Sound\tNone\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2939
+msgid "Sound\tUnimplemented\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2941
+msgid "Sound\tImperfect\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2943
+msgid "Sound\tOK\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2946
+msgid "Capture\tUnimplemented\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2948
 msgid "Capture\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2942
+#: src/frontend/mame/ui/selmenu.cpp:2951
 msgid "Camera\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2944
+#: src/frontend/mame/ui/selmenu.cpp:2953
 msgid "Camera\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2947
+#: src/frontend/mame/ui/selmenu.cpp:2956
 msgid "Microphone\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2949
+#: src/frontend/mame/ui/selmenu.cpp:2958
 msgid "Microphone\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2952
+#: src/frontend/mame/ui/selmenu.cpp:2961
 msgid "Controls\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2954
+#: src/frontend/mame/ui/selmenu.cpp:2963
 msgid "Controls\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2957
+#: src/frontend/mame/ui/selmenu.cpp:2966
 msgid "Keyboard\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2959
+#: src/frontend/mame/ui/selmenu.cpp:2968
 msgid "Keyboard\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2962
+#: src/frontend/mame/ui/selmenu.cpp:2971
 msgid "Mouse\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2964
+#: src/frontend/mame/ui/selmenu.cpp:2973
 msgid "Mouse\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2967
+#: src/frontend/mame/ui/selmenu.cpp:2976
 msgid "Media\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2969
+#: src/frontend/mame/ui/selmenu.cpp:2978
 msgid "Media\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2972
+#: src/frontend/mame/ui/selmenu.cpp:2981
 msgid "Disk\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2974
+#: src/frontend/mame/ui/selmenu.cpp:2983
 msgid "Disk\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2977
+#: src/frontend/mame/ui/selmenu.cpp:2986
 msgid "Printer\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2979
+#: src/frontend/mame/ui/selmenu.cpp:2988
 msgid "Printer\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2982
+#: src/frontend/mame/ui/selmenu.cpp:2991
 msgid "Mag. Tape\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2984
+#: src/frontend/mame/ui/selmenu.cpp:2993
 msgid "Mag. Tape\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2987
+#: src/frontend/mame/ui/selmenu.cpp:2996
 msgid "Punch Tape\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2989
+#: src/frontend/mame/ui/selmenu.cpp:2998
 msgid "Punch Tape\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2992
+#: src/frontend/mame/ui/selmenu.cpp:3001
 msgid "Mag. Drum\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2994
+#: src/frontend/mame/ui/selmenu.cpp:3003
 msgid "Mag. Drum\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2997
+#: src/frontend/mame/ui/selmenu.cpp:3006
 msgid "(EP)ROM\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2999
+#: src/frontend/mame/ui/selmenu.cpp:3008
 msgid "(EP)ROM\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3002
+#: src/frontend/mame/ui/selmenu.cpp:3011
 msgid "Communications\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3004
+#: src/frontend/mame/ui/selmenu.cpp:3013
 msgid "Communications\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3007
+#: src/frontend/mame/ui/selmenu.cpp:3016
 msgid "LAN\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3009
+#: src/frontend/mame/ui/selmenu.cpp:3018
 msgid "LAN\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3012
+#: src/frontend/mame/ui/selmenu.cpp:3021
 msgid "WAN\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3014
+#: src/frontend/mame/ui/selmenu.cpp:3023
 msgid "WAN\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3017
+#: src/frontend/mame/ui/selmenu.cpp:3026
 msgid "Timing\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3019
+#: src/frontend/mame/ui/selmenu.cpp:3028
 msgid "Timing\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3021
+#: src/frontend/mame/ui/selmenu.cpp:3030
 msgid "Mechanical Machine\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3021
+#: src/frontend/mame/ui/selmenu.cpp:3030
 msgid "Mechanical Machine\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3022
+#: src/frontend/mame/ui/selmenu.cpp:3031
 msgid "Requires Artwork\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3022
+#: src/frontend/mame/ui/selmenu.cpp:3031
 msgid "Requires Artwork\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3023
+#: src/frontend/mame/ui/selmenu.cpp:3032
 msgid "Requires Clickable Artwork\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3023
+#: src/frontend/mame/ui/selmenu.cpp:3032
 msgid "Requires Clickable Artwork\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3025
+#: src/frontend/mame/ui/selmenu.cpp:3034
 msgid "Support Cocktail\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3026
+#: src/frontend/mame/ui/selmenu.cpp:3035
 msgid "Driver is BIOS\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3026
+#: src/frontend/mame/ui/selmenu.cpp:3035
 msgid "Driver is BIOS\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3027
+#: src/frontend/mame/ui/selmenu.cpp:3036
 msgid "Support Save\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3027
+#: src/frontend/mame/ui/selmenu.cpp:3036
 msgid "Support Save\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3028
+#: src/frontend/mame/ui/selmenu.cpp:3037
 msgid "Screen Orientation\tVertical\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3028
+#: src/frontend/mame/ui/selmenu.cpp:3037
 msgid "Screen Orientation\tHorizontal\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3038
+#: src/frontend/mame/ui/selmenu.cpp:3047
 msgid "Requires CHD\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3038
+#: src/frontend/mame/ui/selmenu.cpp:3047
 msgid "Requires CHD\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3051
-msgid "ROM Audit Result\tOK\n"
+#: src/frontend/mame/ui/selmenu.cpp:3060
+msgid "Media Audit Result\tOK\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3053
-msgid "ROM Audit Result\tBAD\n"
+#: src/frontend/mame/ui/selmenu.cpp:3062
+msgid "Media Audit Result\tBAD\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3056
+#: src/frontend/mame/ui/selmenu.cpp:3065
 msgid "Samples Audit Result\tNone Needed\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3058
+#: src/frontend/mame/ui/selmenu.cpp:3067
 msgid "Samples Audit Result\tOK\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3060
+#: src/frontend/mame/ui/selmenu.cpp:3069
 msgid "Samples Audit Result\tBAD\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3064
+#: src/frontend/mame/ui/selmenu.cpp:3073
 msgid ""
-"ROM Audit \tDisabled\n"
-"Samples Audit \tDisabled\n"
+"Media Audit\tDisabled\n"
+"Samples Audit\tDisabled\n"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:150
+#: src/frontend/mame/ui/sndmenu.cpp:146
 msgid "Sound"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:151
+#: src/frontend/mame/ui/sndmenu.cpp:147
 msgid "Compressor"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:152
+#: src/frontend/mame/ui/sndmenu.cpp:148
 msgid "Sample Rate"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:153
+#: src/frontend/mame/ui/sndmenu.cpp:149
 msgid "Use External Samples"
 msgstr ""
 
@@ -3119,511 +3123,681 @@ msgstr ""
 msgid "  Screen '%1$s': Vector\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:132
+#: src/frontend/mame/ui/devopt.cpp:135
 #, c-format
 msgid "  Screen '%1$s': %2$d × %3$d (V) %4$s Hz\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:133
+#: src/frontend/mame/ui/devopt.cpp:136
 #, c-format
 msgid "  Screen '%1$s': %2$d × %3$d (H) %4$s Hz\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:147
+#: src/frontend/mame/ui/devopt.cpp:150
 msgid "* Sound:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:211
+#: src/frontend/mame/ui/devopt.cpp:214
 #, c-format
 msgid ""
 "* BIOS settings:\n"
 "  %1$d options    [default: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:255 src/frontend/mame/ui/devopt.cpp:271
-#: src/frontend/mame/ui/devopt.cpp:332
+#: src/frontend/mame/ui/devopt.cpp:258 src/frontend/mame/ui/devopt.cpp:274
+#: src/frontend/mame/ui/devopt.cpp:335
 #, c-format
 msgid "  %1$s    [default: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:260 src/frontend/mame/ui/devopt.cpp:276
+#: src/frontend/mame/ui/devopt.cpp:263 src/frontend/mame/ui/devopt.cpp:279
 #, c-format
 msgid "  %1$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:282
+#: src/frontend/mame/ui/devopt.cpp:285
 msgid "* DIP switch settings:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:287
+#: src/frontend/mame/ui/devopt.cpp:290
 msgid "* Configuration settings:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:291
+#: src/frontend/mame/ui/devopt.cpp:294
 msgid "* Input device(s):\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:293
+#: src/frontend/mame/ui/devopt.cpp:296
 #, c-format
 msgid "  User inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:295
+#: src/frontend/mame/ui/devopt.cpp:298
 #, c-format
 msgid "  Mahjong inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:297
+#: src/frontend/mame/ui/devopt.cpp:300
 #, c-format
 msgid "  Hanafuda inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:299
+#: src/frontend/mame/ui/devopt.cpp:302
 #, c-format
 msgid "  Gambling inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:301
+#: src/frontend/mame/ui/devopt.cpp:304
 #, c-format
 msgid "  Analog inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:303
+#: src/frontend/mame/ui/devopt.cpp:306
 #, c-format
 msgid "  Adjuster inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:305
+#: src/frontend/mame/ui/devopt.cpp:308
 #, c-format
 msgid "  Keypad inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:307
+#: src/frontend/mame/ui/devopt.cpp:310
 #, c-format
 msgid "  Keyboard inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:312
+#: src/frontend/mame/ui/devopt.cpp:315
 msgid "* Media Options:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:317
+#: src/frontend/mame/ui/devopt.cpp:320
 #, c-format
 msgid "  %1$s    [tag: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:327
+#: src/frontend/mame/ui/devopt.cpp:330
 msgid "* Slot Options:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:341
+#: src/frontend/mame/ui/devopt.cpp:344
 msgid "[None]\n"
 msgstr ""
 
-#: src/emu/render.cpp:1847
+#: src/emu/render.cpp:1796
 #, c-format
 msgctxt "view-name"
 msgid "Screen %1$u Standard (%2$u:%3$u)"
 msgstr ""
 
-#: src/emu/render.cpp:1873
+#: src/emu/render.cpp:1822
 #, c-format
 msgctxt "view-name"
 msgid "Screen %1$u Pixel Aspect (%2$u:%3$u)"
 msgstr ""
 
-#: src/emu/render.cpp:1895 src/emu/render.cpp:2030
+#: src/emu/render.cpp:1844 src/emu/render.cpp:1979
 msgctxt "view-name"
 msgid "Cocktail"
 msgstr ""
 
-#: src/emu/render.cpp:2015
+#: src/emu/render.cpp:1964
 msgctxt "view-name"
 msgid "Left-to-Right"
 msgstr ""
 
-#: src/emu/render.cpp:2016
+#: src/emu/render.cpp:1965
 msgctxt "view-name"
 msgid "Left-to-Right (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2017
+#: src/emu/render.cpp:1966
 msgctxt "view-name"
 msgid "Top-to-Bottom"
 msgstr ""
 
-#: src/emu/render.cpp:2018
+#: src/emu/render.cpp:1967
 msgctxt "view-name"
 msgid "Top-to-Bottom (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2069
+#: src/emu/render.cpp:2018
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Left-to-Right, Top-to-Bottom"
 msgstr ""
 
-#: src/emu/render.cpp:2078
+#: src/emu/render.cpp:2027
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Left-to-Right, Top-to-Bottom (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2087
+#: src/emu/render.cpp:2036
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Top-to-Bottom, Left-to-Right"
 msgstr ""
 
-#: src/emu/render.cpp:2096
+#: src/emu/render.cpp:2045
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Top-to-Bottom, Left-to-Right (Gapless)"
 msgstr ""
 
-#: src/emu/inpttype.ipp:22
+#: src/emu/ioport.cpp:332
+#, c-format
 msgctxt "input-name"
-msgid "P1 Up"
+msgid "P%1$u"
 msgstr ""
 
-#: src/emu/inpttype.ipp:23
+#: src/emu/ioport.cpp:1924
 msgctxt "input-name"
-msgid "P1 Down"
+msgid "???"
 msgstr ""
 
-#: src/emu/inpttype.ipp:24
+#: src/emu/inpttype.ipp:22 src/emu/inpttype.ipp:140 src/emu/inpttype.ipp:221
+#: src/emu/inpttype.ipp:255 src/emu/inpttype.ipp:289 src/emu/inpttype.ipp:323
+#: src/emu/inpttype.ipp:357 src/emu/inpttype.ipp:391 src/emu/inpttype.ipp:425
+#: src/emu/inpttype.ipp:459
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left"
+msgid "%p Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:25
+#: src/emu/inpttype.ipp:23 src/emu/inpttype.ipp:141 src/emu/inpttype.ipp:222
+#: src/emu/inpttype.ipp:256 src/emu/inpttype.ipp:290 src/emu/inpttype.ipp:324
+#: src/emu/inpttype.ipp:358 src/emu/inpttype.ipp:392 src/emu/inpttype.ipp:426
+#: src/emu/inpttype.ipp:460
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right"
+msgid "%p Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:26
+#: src/emu/inpttype.ipp:24 src/emu/inpttype.ipp:142 src/emu/inpttype.ipp:223
+#: src/emu/inpttype.ipp:257 src/emu/inpttype.ipp:291 src/emu/inpttype.ipp:325
+#: src/emu/inpttype.ipp:359 src/emu/inpttype.ipp:393 src/emu/inpttype.ipp:427
+#: src/emu/inpttype.ipp:461
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Up"
+msgid "%p Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:27
+#: src/emu/inpttype.ipp:25 src/emu/inpttype.ipp:143 src/emu/inpttype.ipp:224
+#: src/emu/inpttype.ipp:258 src/emu/inpttype.ipp:292 src/emu/inpttype.ipp:326
+#: src/emu/inpttype.ipp:360 src/emu/inpttype.ipp:394 src/emu/inpttype.ipp:428
+#: src/emu/inpttype.ipp:462
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Down"
+msgid "%p Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:28
+#: src/emu/inpttype.ipp:26 src/emu/inpttype.ipp:144 src/emu/inpttype.ipp:225
+#: src/emu/inpttype.ipp:259 src/emu/inpttype.ipp:293 src/emu/inpttype.ipp:327
+#: src/emu/inpttype.ipp:361 src/emu/inpttype.ipp:395 src/emu/inpttype.ipp:429
+#: src/emu/inpttype.ipp:463
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Left"
+msgid "%p Right Stick/Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:29
+#: src/emu/inpttype.ipp:27 src/emu/inpttype.ipp:145 src/emu/inpttype.ipp:226
+#: src/emu/inpttype.ipp:260 src/emu/inpttype.ipp:294 src/emu/inpttype.ipp:328
+#: src/emu/inpttype.ipp:362 src/emu/inpttype.ipp:396 src/emu/inpttype.ipp:430
+#: src/emu/inpttype.ipp:464
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Right"
+msgid "%p Right Stick/Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:30
+#: src/emu/inpttype.ipp:28 src/emu/inpttype.ipp:146 src/emu/inpttype.ipp:227
+#: src/emu/inpttype.ipp:261 src/emu/inpttype.ipp:295 src/emu/inpttype.ipp:329
+#: src/emu/inpttype.ipp:363 src/emu/inpttype.ipp:397 src/emu/inpttype.ipp:431
+#: src/emu/inpttype.ipp:465
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Up"
+msgid "%p Right Stick/Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:31
+#: src/emu/inpttype.ipp:29 src/emu/inpttype.ipp:147 src/emu/inpttype.ipp:228
+#: src/emu/inpttype.ipp:262 src/emu/inpttype.ipp:296 src/emu/inpttype.ipp:330
+#: src/emu/inpttype.ipp:364 src/emu/inpttype.ipp:398 src/emu/inpttype.ipp:432
+#: src/emu/inpttype.ipp:466
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Down"
+msgid "%p Right Stick/Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:32
+#: src/emu/inpttype.ipp:30 src/emu/inpttype.ipp:148 src/emu/inpttype.ipp:229
+#: src/emu/inpttype.ipp:263 src/emu/inpttype.ipp:297 src/emu/inpttype.ipp:331
+#: src/emu/inpttype.ipp:365 src/emu/inpttype.ipp:399 src/emu/inpttype.ipp:433
+#: src/emu/inpttype.ipp:467
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Left"
+msgid "%p Left Stick/Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:33
+#: src/emu/inpttype.ipp:31 src/emu/inpttype.ipp:149 src/emu/inpttype.ipp:230
+#: src/emu/inpttype.ipp:264 src/emu/inpttype.ipp:298 src/emu/inpttype.ipp:332
+#: src/emu/inpttype.ipp:366 src/emu/inpttype.ipp:400 src/emu/inpttype.ipp:434
+#: src/emu/inpttype.ipp:468
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Right"
+msgid "%p Left Stick/Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:34
+#: src/emu/inpttype.ipp:32 src/emu/inpttype.ipp:150 src/emu/inpttype.ipp:231
+#: src/emu/inpttype.ipp:265 src/emu/inpttype.ipp:299 src/emu/inpttype.ipp:333
+#: src/emu/inpttype.ipp:367 src/emu/inpttype.ipp:401 src/emu/inpttype.ipp:435
+#: src/emu/inpttype.ipp:469
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 1"
+msgid "%p Left Stick/Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:35
+#: src/emu/inpttype.ipp:33 src/emu/inpttype.ipp:151 src/emu/inpttype.ipp:232
+#: src/emu/inpttype.ipp:266 src/emu/inpttype.ipp:300 src/emu/inpttype.ipp:334
+#: src/emu/inpttype.ipp:368 src/emu/inpttype.ipp:402 src/emu/inpttype.ipp:436
+#: src/emu/inpttype.ipp:470
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 2"
+msgid "%p Left Stick/Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:36
+#: src/emu/inpttype.ipp:34 src/emu/inpttype.ipp:152 src/emu/inpttype.ipp:233
+#: src/emu/inpttype.ipp:267 src/emu/inpttype.ipp:301 src/emu/inpttype.ipp:335
+#: src/emu/inpttype.ipp:369 src/emu/inpttype.ipp:403 src/emu/inpttype.ipp:437
+#: src/emu/inpttype.ipp:471
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 3"
+msgid "%p Button 1"
 msgstr ""
 
-#: src/emu/inpttype.ipp:37
+#: src/emu/inpttype.ipp:35 src/emu/inpttype.ipp:153 src/emu/inpttype.ipp:234
+#: src/emu/inpttype.ipp:268 src/emu/inpttype.ipp:302 src/emu/inpttype.ipp:336
+#: src/emu/inpttype.ipp:370 src/emu/inpttype.ipp:404 src/emu/inpttype.ipp:438
+#: src/emu/inpttype.ipp:472
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 4"
+msgid "%p Button 2"
 msgstr ""
 
-#: src/emu/inpttype.ipp:38
+#: src/emu/inpttype.ipp:36 src/emu/inpttype.ipp:154 src/emu/inpttype.ipp:235
+#: src/emu/inpttype.ipp:269 src/emu/inpttype.ipp:303 src/emu/inpttype.ipp:337
+#: src/emu/inpttype.ipp:371 src/emu/inpttype.ipp:405 src/emu/inpttype.ipp:439
+#: src/emu/inpttype.ipp:473
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 5"
+msgid "%p Button 3"
 msgstr ""
 
-#: src/emu/inpttype.ipp:39
+#: src/emu/inpttype.ipp:37 src/emu/inpttype.ipp:155 src/emu/inpttype.ipp:236
+#: src/emu/inpttype.ipp:270 src/emu/inpttype.ipp:304 src/emu/inpttype.ipp:338
+#: src/emu/inpttype.ipp:372 src/emu/inpttype.ipp:406 src/emu/inpttype.ipp:440
+#: src/emu/inpttype.ipp:474
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 6"
+msgid "%p Button 4"
 msgstr ""
 
-#: src/emu/inpttype.ipp:40
+#: src/emu/inpttype.ipp:38 src/emu/inpttype.ipp:156 src/emu/inpttype.ipp:237
+#: src/emu/inpttype.ipp:271 src/emu/inpttype.ipp:305 src/emu/inpttype.ipp:339
+#: src/emu/inpttype.ipp:373 src/emu/inpttype.ipp:407 src/emu/inpttype.ipp:441
+#: src/emu/inpttype.ipp:475
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 7"
+msgid "%p Button 5"
 msgstr ""
 
-#: src/emu/inpttype.ipp:41
+#: src/emu/inpttype.ipp:39 src/emu/inpttype.ipp:157 src/emu/inpttype.ipp:238
+#: src/emu/inpttype.ipp:272 src/emu/inpttype.ipp:306 src/emu/inpttype.ipp:340
+#: src/emu/inpttype.ipp:374 src/emu/inpttype.ipp:408 src/emu/inpttype.ipp:442
+#: src/emu/inpttype.ipp:476
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 8"
+msgid "%p Button 6"
 msgstr ""
 
-#: src/emu/inpttype.ipp:42
+#: src/emu/inpttype.ipp:40 src/emu/inpttype.ipp:158 src/emu/inpttype.ipp:239
+#: src/emu/inpttype.ipp:273 src/emu/inpttype.ipp:307 src/emu/inpttype.ipp:341
+#: src/emu/inpttype.ipp:375 src/emu/inpttype.ipp:409 src/emu/inpttype.ipp:443
+#: src/emu/inpttype.ipp:477
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 9"
+msgid "%p Button 7"
 msgstr ""
 
-#: src/emu/inpttype.ipp:43
+#: src/emu/inpttype.ipp:41 src/emu/inpttype.ipp:159 src/emu/inpttype.ipp:240
+#: src/emu/inpttype.ipp:274 src/emu/inpttype.ipp:308 src/emu/inpttype.ipp:342
+#: src/emu/inpttype.ipp:376 src/emu/inpttype.ipp:410 src/emu/inpttype.ipp:444
+#: src/emu/inpttype.ipp:478
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 10"
+msgid "%p Button 8"
 msgstr ""
 
-#: src/emu/inpttype.ipp:44
+#: src/emu/inpttype.ipp:42 src/emu/inpttype.ipp:160 src/emu/inpttype.ipp:241
+#: src/emu/inpttype.ipp:275 src/emu/inpttype.ipp:309 src/emu/inpttype.ipp:343
+#: src/emu/inpttype.ipp:377 src/emu/inpttype.ipp:411 src/emu/inpttype.ipp:445
+#: src/emu/inpttype.ipp:479
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 11"
+msgid "%p Button 9"
 msgstr ""
 
-#: src/emu/inpttype.ipp:45
+#: src/emu/inpttype.ipp:43 src/emu/inpttype.ipp:161 src/emu/inpttype.ipp:242
+#: src/emu/inpttype.ipp:276 src/emu/inpttype.ipp:310 src/emu/inpttype.ipp:344
+#: src/emu/inpttype.ipp:378 src/emu/inpttype.ipp:412 src/emu/inpttype.ipp:446
+#: src/emu/inpttype.ipp:480
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 12"
+msgid "%p Button 10"
 msgstr ""
 
-#: src/emu/inpttype.ipp:46
+#: src/emu/inpttype.ipp:44 src/emu/inpttype.ipp:162 src/emu/inpttype.ipp:243
+#: src/emu/inpttype.ipp:277 src/emu/inpttype.ipp:311 src/emu/inpttype.ipp:345
+#: src/emu/inpttype.ipp:379 src/emu/inpttype.ipp:413 src/emu/inpttype.ipp:447
+#: src/emu/inpttype.ipp:481
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 13"
+msgid "%p Button 11"
 msgstr ""
 
-#: src/emu/inpttype.ipp:47
+#: src/emu/inpttype.ipp:45 src/emu/inpttype.ipp:163 src/emu/inpttype.ipp:244
+#: src/emu/inpttype.ipp:278 src/emu/inpttype.ipp:312 src/emu/inpttype.ipp:346
+#: src/emu/inpttype.ipp:380 src/emu/inpttype.ipp:414 src/emu/inpttype.ipp:448
+#: src/emu/inpttype.ipp:482
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 14"
+msgid "%p Button 12"
 msgstr ""
 
-#: src/emu/inpttype.ipp:48
+#: src/emu/inpttype.ipp:46 src/emu/inpttype.ipp:164 src/emu/inpttype.ipp:245
+#: src/emu/inpttype.ipp:279 src/emu/inpttype.ipp:313 src/emu/inpttype.ipp:347
+#: src/emu/inpttype.ipp:381 src/emu/inpttype.ipp:415 src/emu/inpttype.ipp:449
+#: src/emu/inpttype.ipp:483
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 15"
+msgid "%p Button 13"
 msgstr ""
 
-#: src/emu/inpttype.ipp:49
+#: src/emu/inpttype.ipp:47 src/emu/inpttype.ipp:165 src/emu/inpttype.ipp:246
+#: src/emu/inpttype.ipp:280 src/emu/inpttype.ipp:314 src/emu/inpttype.ipp:348
+#: src/emu/inpttype.ipp:382 src/emu/inpttype.ipp:416 src/emu/inpttype.ipp:450
+#: src/emu/inpttype.ipp:484
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 16"
+msgid "%p Button 14"
 msgstr ""
 
-#: src/emu/inpttype.ipp:50
+#: src/emu/inpttype.ipp:48 src/emu/inpttype.ipp:166 src/emu/inpttype.ipp:247
+#: src/emu/inpttype.ipp:281 src/emu/inpttype.ipp:315 src/emu/inpttype.ipp:349
+#: src/emu/inpttype.ipp:383 src/emu/inpttype.ipp:417 src/emu/inpttype.ipp:451
+#: src/emu/inpttype.ipp:485
+#, c-format
 msgctxt "input-name"
-msgid "P1 Start"
+msgid "%p Button 15"
 msgstr ""
 
-#: src/emu/inpttype.ipp:51
+#: src/emu/inpttype.ipp:49 src/emu/inpttype.ipp:167 src/emu/inpttype.ipp:248
+#: src/emu/inpttype.ipp:282 src/emu/inpttype.ipp:316 src/emu/inpttype.ipp:350
+#: src/emu/inpttype.ipp:384 src/emu/inpttype.ipp:418 src/emu/inpttype.ipp:452
+#: src/emu/inpttype.ipp:486
+#, c-format
 msgctxt "input-name"
-msgid "P1 Select"
+msgid "%p Button 16"
 msgstr ""
 
-#: src/emu/inpttype.ipp:56
+#: src/emu/inpttype.ipp:50 src/emu/inpttype.ipp:168 src/emu/inpttype.ipp:249
+#: src/emu/inpttype.ipp:283 src/emu/inpttype.ipp:317 src/emu/inpttype.ipp:351
+#: src/emu/inpttype.ipp:385 src/emu/inpttype.ipp:419 src/emu/inpttype.ipp:453
+#: src/emu/inpttype.ipp:487
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong A"
+msgid "%p Start"
 msgstr ""
 
-#: src/emu/inpttype.ipp:57
+#: src/emu/inpttype.ipp:51 src/emu/inpttype.ipp:169 src/emu/inpttype.ipp:250
+#: src/emu/inpttype.ipp:284 src/emu/inpttype.ipp:318 src/emu/inpttype.ipp:352
+#: src/emu/inpttype.ipp:386 src/emu/inpttype.ipp:420 src/emu/inpttype.ipp:454
+#: src/emu/inpttype.ipp:488
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong B"
+msgid "%p Select"
 msgstr ""
 
-#: src/emu/inpttype.ipp:58
+#: src/emu/inpttype.ipp:56 src/emu/inpttype.ipp:174
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong C"
+msgid "%p Mahjong A"
 msgstr ""
 
-#: src/emu/inpttype.ipp:59
+#: src/emu/inpttype.ipp:57 src/emu/inpttype.ipp:175
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong D"
+msgid "%p Mahjong B"
 msgstr ""
 
-#: src/emu/inpttype.ipp:60
+#: src/emu/inpttype.ipp:58 src/emu/inpttype.ipp:176
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong E"
+msgid "%p Mahjong C"
 msgstr ""
 
-#: src/emu/inpttype.ipp:61
+#: src/emu/inpttype.ipp:59 src/emu/inpttype.ipp:177
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong F"
+msgid "%p Mahjong D"
 msgstr ""
 
-#: src/emu/inpttype.ipp:62
+#: src/emu/inpttype.ipp:60 src/emu/inpttype.ipp:178
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong G"
+msgid "%p Mahjong E"
 msgstr ""
 
-#: src/emu/inpttype.ipp:63
+#: src/emu/inpttype.ipp:61 src/emu/inpttype.ipp:179
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong H"
+msgid "%p Mahjong F"
 msgstr ""
 
-#: src/emu/inpttype.ipp:64
+#: src/emu/inpttype.ipp:62 src/emu/inpttype.ipp:180
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong I"
+msgid "%p Mahjong G"
 msgstr ""
 
-#: src/emu/inpttype.ipp:65
+#: src/emu/inpttype.ipp:63 src/emu/inpttype.ipp:181
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong J"
+msgid "%p Mahjong H"
 msgstr ""
 
-#: src/emu/inpttype.ipp:66
+#: src/emu/inpttype.ipp:64 src/emu/inpttype.ipp:182
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong K"
+msgid "%p Mahjong I"
 msgstr ""
 
-#: src/emu/inpttype.ipp:67
+#: src/emu/inpttype.ipp:65 src/emu/inpttype.ipp:183
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong L"
+msgid "%p Mahjong J"
 msgstr ""
 
-#: src/emu/inpttype.ipp:68
+#: src/emu/inpttype.ipp:66 src/emu/inpttype.ipp:184
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong M"
+msgid "%p Mahjong K"
 msgstr ""
 
-#: src/emu/inpttype.ipp:69
+#: src/emu/inpttype.ipp:67 src/emu/inpttype.ipp:185
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong N"
+msgid "%p Mahjong L"
 msgstr ""
 
-#: src/emu/inpttype.ipp:70
+#: src/emu/inpttype.ipp:68 src/emu/inpttype.ipp:186
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong O"
+msgid "%p Mahjong M"
 msgstr ""
 
-#: src/emu/inpttype.ipp:71
+#: src/emu/inpttype.ipp:69 src/emu/inpttype.ipp:187
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong P"
+msgid "%p Mahjong N"
 msgstr ""
 
-#: src/emu/inpttype.ipp:72
+#: src/emu/inpttype.ipp:70 src/emu/inpttype.ipp:188
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Q"
+msgid "%p Mahjong O"
 msgstr ""
 
-#: src/emu/inpttype.ipp:73
+#: src/emu/inpttype.ipp:71 src/emu/inpttype.ipp:189
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Kan"
+msgid "%p Mahjong P"
 msgstr ""
 
-#: src/emu/inpttype.ipp:74
+#: src/emu/inpttype.ipp:72 src/emu/inpttype.ipp:190
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Pon"
+msgid "%p Mahjong Q"
 msgstr ""
 
-#: src/emu/inpttype.ipp:75
+#: src/emu/inpttype.ipp:73 src/emu/inpttype.ipp:191
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Chi"
+msgid "%p Mahjong Kan"
 msgstr ""
 
-#: src/emu/inpttype.ipp:76
+#: src/emu/inpttype.ipp:74 src/emu/inpttype.ipp:192
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Reach"
+msgid "%p Mahjong Pon"
 msgstr ""
 
-#: src/emu/inpttype.ipp:77
+#: src/emu/inpttype.ipp:75 src/emu/inpttype.ipp:193
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Ron"
+msgid "%p Mahjong Chi"
 msgstr ""
 
-#: src/emu/inpttype.ipp:78
+#: src/emu/inpttype.ipp:76 src/emu/inpttype.ipp:194
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Flip Flop"
+msgid "%p Mahjong Reach"
 msgstr ""
 
-#: src/emu/inpttype.ipp:79
+#: src/emu/inpttype.ipp:77 src/emu/inpttype.ipp:195
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Bet"
+msgid "%p Mahjong Ron"
 msgstr ""
 
-#: src/emu/inpttype.ipp:80
+#: src/emu/inpttype.ipp:78 src/emu/inpttype.ipp:200
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Take Score"
+msgid "%p Mahjong Flip Flop"
 msgstr ""
 
-#: src/emu/inpttype.ipp:81
+#: src/emu/inpttype.ipp:79 src/emu/inpttype.ipp:196
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Double Up"
+msgid "%p Mahjong Bet"
 msgstr ""
 
-#: src/emu/inpttype.ipp:82
+#: src/emu/inpttype.ipp:80 src/emu/inpttype.ipp:198
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Big"
+msgid "%p Mahjong Take Score"
 msgstr ""
 
-#: src/emu/inpttype.ipp:83
+#: src/emu/inpttype.ipp:81 src/emu/inpttype.ipp:199
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Small"
+msgid "%p Mahjong Double Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:84
+#: src/emu/inpttype.ipp:82 src/emu/inpttype.ipp:201
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Last Chance"
+msgid "%p Mahjong Big"
 msgstr ""
 
-#: src/emu/inpttype.ipp:89
+#: src/emu/inpttype.ipp:83 src/emu/inpttype.ipp:202
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda A/1"
+msgid "%p Mahjong Small"
 msgstr ""
 
-#: src/emu/inpttype.ipp:90
+#: src/emu/inpttype.ipp:84 src/emu/inpttype.ipp:197
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda B/2"
+msgid "%p Mahjong Last Chance"
 msgstr ""
 
-#: src/emu/inpttype.ipp:91
+#: src/emu/inpttype.ipp:89 src/emu/inpttype.ipp:207
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda C/3"
+msgid "%p Hanafuda A/1"
 msgstr ""
 
-#: src/emu/inpttype.ipp:92
+#: src/emu/inpttype.ipp:90 src/emu/inpttype.ipp:208
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda D/4"
+msgid "%p Hanafuda B/2"
 msgstr ""
 
-#: src/emu/inpttype.ipp:93
+#: src/emu/inpttype.ipp:91 src/emu/inpttype.ipp:209
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda E/5"
+msgid "%p Hanafuda C/3"
 msgstr ""
 
-#: src/emu/inpttype.ipp:94
+#: src/emu/inpttype.ipp:92 src/emu/inpttype.ipp:210
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda F/6"
+msgid "%p Hanafuda D/4"
 msgstr ""
 
-#: src/emu/inpttype.ipp:95
+#: src/emu/inpttype.ipp:93 src/emu/inpttype.ipp:211
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda G/7"
+msgid "%p Hanafuda E/5"
 msgstr ""
 
-#: src/emu/inpttype.ipp:96
+#: src/emu/inpttype.ipp:94 src/emu/inpttype.ipp:212
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda H/8"
+msgid "%p Hanafuda F/6"
 msgstr ""
 
-#: src/emu/inpttype.ipp:97
+#: src/emu/inpttype.ipp:95 src/emu/inpttype.ipp:213
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda Yes"
+msgid "%p Hanafuda G/7"
 msgstr ""
 
-#: src/emu/inpttype.ipp:98
+#: src/emu/inpttype.ipp:96 src/emu/inpttype.ipp:214
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda No"
+msgid "%p Hanafuda H/8"
+msgstr ""
+
+#: src/emu/inpttype.ipp:97 src/emu/inpttype.ipp:215
+#, c-format
+msgctxt "input-name"
+msgid "%p Hanafuda Yes"
+msgstr ""
+
+#: src/emu/inpttype.ipp:98 src/emu/inpttype.ipp:216
+#, c-format
+msgctxt "input-name"
+msgid "%p Hanafuda No"
 msgstr ""
 
 #: src/emu/inpttype.ipp:103
@@ -3751,1551 +3925,6 @@ msgctxt "input-name"
 msgid "Stop All Reels"
 msgstr ""
 
-#: src/emu/inpttype.ipp:140
-msgctxt "input-name"
-msgid "P2 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:141
-msgctxt "input-name"
-msgid "P2 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:142
-msgctxt "input-name"
-msgid "P2 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:143
-msgctxt "input-name"
-msgid "P2 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:144
-msgctxt "input-name"
-msgid "P2 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:145
-msgctxt "input-name"
-msgid "P2 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:146
-msgctxt "input-name"
-msgid "P2 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:147
-msgctxt "input-name"
-msgid "P2 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:148
-msgctxt "input-name"
-msgid "P2 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:149
-msgctxt "input-name"
-msgid "P2 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:150
-msgctxt "input-name"
-msgid "P2 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:151
-msgctxt "input-name"
-msgid "P2 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:152
-msgctxt "input-name"
-msgid "P2 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:153
-msgctxt "input-name"
-msgid "P2 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:154
-msgctxt "input-name"
-msgid "P2 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:155
-msgctxt "input-name"
-msgid "P2 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:156
-msgctxt "input-name"
-msgid "P2 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:157
-msgctxt "input-name"
-msgid "P2 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:158
-msgctxt "input-name"
-msgid "P2 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:159
-msgctxt "input-name"
-msgid "P2 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:160
-msgctxt "input-name"
-msgid "P2 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:161
-msgctxt "input-name"
-msgid "P2 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:162
-msgctxt "input-name"
-msgid "P2 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:163
-msgctxt "input-name"
-msgid "P2 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:164
-msgctxt "input-name"
-msgid "P2 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:165
-msgctxt "input-name"
-msgid "P2 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:166
-msgctxt "input-name"
-msgid "P2 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:167
-msgctxt "input-name"
-msgid "P2 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:168
-msgctxt "input-name"
-msgid "P2 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:169
-msgctxt "input-name"
-msgid "P2 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:174
-msgctxt "input-name"
-msgid "P2 Mahjong A"
-msgstr ""
-
-#: src/emu/inpttype.ipp:175
-msgctxt "input-name"
-msgid "P2 Mahjong B"
-msgstr ""
-
-#: src/emu/inpttype.ipp:176
-msgctxt "input-name"
-msgid "P2 Mahjong C"
-msgstr ""
-
-#: src/emu/inpttype.ipp:177
-msgctxt "input-name"
-msgid "P2 Mahjong D"
-msgstr ""
-
-#: src/emu/inpttype.ipp:178
-msgctxt "input-name"
-msgid "P2 Mahjong E"
-msgstr ""
-
-#: src/emu/inpttype.ipp:179
-msgctxt "input-name"
-msgid "P2 Mahjong F"
-msgstr ""
-
-#: src/emu/inpttype.ipp:180
-msgctxt "input-name"
-msgid "P2 Mahjong G"
-msgstr ""
-
-#: src/emu/inpttype.ipp:181
-msgctxt "input-name"
-msgid "P2 Mahjong H"
-msgstr ""
-
-#: src/emu/inpttype.ipp:182
-msgctxt "input-name"
-msgid "P2 Mahjong I"
-msgstr ""
-
-#: src/emu/inpttype.ipp:183
-msgctxt "input-name"
-msgid "P2 Mahjong J"
-msgstr ""
-
-#: src/emu/inpttype.ipp:184
-msgctxt "input-name"
-msgid "P2 Mahjong K"
-msgstr ""
-
-#: src/emu/inpttype.ipp:185
-msgctxt "input-name"
-msgid "P2 Mahjong L"
-msgstr ""
-
-#: src/emu/inpttype.ipp:186
-msgctxt "input-name"
-msgid "P2 Mahjong M"
-msgstr ""
-
-#: src/emu/inpttype.ipp:187
-msgctxt "input-name"
-msgid "P2 Mahjong N"
-msgstr ""
-
-#: src/emu/inpttype.ipp:188
-msgctxt "input-name"
-msgid "P2 Mahjong O"
-msgstr ""
-
-#: src/emu/inpttype.ipp:189
-msgctxt "input-name"
-msgid "P2 Mahjong P"
-msgstr ""
-
-#: src/emu/inpttype.ipp:190
-msgctxt "input-name"
-msgid "P2 Mahjong Q"
-msgstr ""
-
-#: src/emu/inpttype.ipp:191
-msgctxt "input-name"
-msgid "P2 Mahjong Kan"
-msgstr ""
-
-#: src/emu/inpttype.ipp:192
-msgctxt "input-name"
-msgid "P2 Mahjong Pon"
-msgstr ""
-
-#: src/emu/inpttype.ipp:193
-msgctxt "input-name"
-msgid "P2 Mahjong Chi"
-msgstr ""
-
-#: src/emu/inpttype.ipp:194
-msgctxt "input-name"
-msgid "P2 Mahjong Reach"
-msgstr ""
-
-#: src/emu/inpttype.ipp:195
-msgctxt "input-name"
-msgid "P2 Mahjong Ron"
-msgstr ""
-
-#: src/emu/inpttype.ipp:196
-msgctxt "input-name"
-msgid "P2 Mahjong Bet"
-msgstr ""
-
-#: src/emu/inpttype.ipp:197
-msgctxt "input-name"
-msgid "P2 Mahjong Last Chance"
-msgstr ""
-
-#: src/emu/inpttype.ipp:198
-msgctxt "input-name"
-msgid "P2 Mahjong Take Score"
-msgstr ""
-
-#: src/emu/inpttype.ipp:199
-msgctxt "input-name"
-msgid "P2 Mahjong Double Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:200
-msgctxt "input-name"
-msgid "P2 Mahjong Flip Flop"
-msgstr ""
-
-#: src/emu/inpttype.ipp:201
-msgctxt "input-name"
-msgid "P2 Mahjong Big"
-msgstr ""
-
-#: src/emu/inpttype.ipp:202
-msgctxt "input-name"
-msgid "P2 Mahjong Small"
-msgstr ""
-
-#: src/emu/inpttype.ipp:207
-msgctxt "input-name"
-msgid "P2 Hanafuda A/1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:208
-msgctxt "input-name"
-msgid "P2 Hanafuda B/2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:209
-msgctxt "input-name"
-msgid "P2 Hanafuda C/3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:210
-msgctxt "input-name"
-msgid "P2 Hanafuda D/4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:211
-msgctxt "input-name"
-msgid "P2 Hanafuda E/5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:212
-msgctxt "input-name"
-msgid "P2 Hanafuda F/6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:213
-msgctxt "input-name"
-msgid "P2 Hanafuda G/7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:214
-msgctxt "input-name"
-msgid "P2 Hanafuda H/8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:215
-msgctxt "input-name"
-msgid "P2 Hanafuda Yes"
-msgstr ""
-
-#: src/emu/inpttype.ipp:216
-msgctxt "input-name"
-msgid "P2 Hanafuda No"
-msgstr ""
-
-#: src/emu/inpttype.ipp:221
-msgctxt "input-name"
-msgid "P3 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:222
-msgctxt "input-name"
-msgid "P3 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:223
-msgctxt "input-name"
-msgid "P3 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:224
-msgctxt "input-name"
-msgid "P3 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:225
-msgctxt "input-name"
-msgid "P3 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:226
-msgctxt "input-name"
-msgid "P3 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:227
-msgctxt "input-name"
-msgid "P3 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:228
-msgctxt "input-name"
-msgid "P3 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:229
-msgctxt "input-name"
-msgid "P3 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:230
-msgctxt "input-name"
-msgid "P3 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:231
-msgctxt "input-name"
-msgid "P3 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:232
-msgctxt "input-name"
-msgid "P3 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:233
-msgctxt "input-name"
-msgid "P3 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:234
-msgctxt "input-name"
-msgid "P3 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:235
-msgctxt "input-name"
-msgid "P3 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:236
-msgctxt "input-name"
-msgid "P3 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:237
-msgctxt "input-name"
-msgid "P3 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:238
-msgctxt "input-name"
-msgid "P3 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:239
-msgctxt "input-name"
-msgid "P3 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:240
-msgctxt "input-name"
-msgid "P3 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:241
-msgctxt "input-name"
-msgid "P3 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:242
-msgctxt "input-name"
-msgid "P3 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:243
-msgctxt "input-name"
-msgid "P3 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:244
-msgctxt "input-name"
-msgid "P3 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:245
-msgctxt "input-name"
-msgid "P3 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:246
-msgctxt "input-name"
-msgid "P3 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:247
-msgctxt "input-name"
-msgid "P3 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:248
-msgctxt "input-name"
-msgid "P3 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:249
-msgctxt "input-name"
-msgid "P3 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:250
-msgctxt "input-name"
-msgid "P3 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:255
-msgctxt "input-name"
-msgid "P4 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:256
-msgctxt "input-name"
-msgid "P4 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:257
-msgctxt "input-name"
-msgid "P4 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:258
-msgctxt "input-name"
-msgid "P4 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:259
-msgctxt "input-name"
-msgid "P4 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:260
-msgctxt "input-name"
-msgid "P4 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:261
-msgctxt "input-name"
-msgid "P4 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:262
-msgctxt "input-name"
-msgid "P4 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:263
-msgctxt "input-name"
-msgid "P4 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:264
-msgctxt "input-name"
-msgid "P4 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:265
-msgctxt "input-name"
-msgid "P4 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:266
-msgctxt "input-name"
-msgid "P4 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:267
-msgctxt "input-name"
-msgid "P4 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:268
-msgctxt "input-name"
-msgid "P4 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:269
-msgctxt "input-name"
-msgid "P4 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:270
-msgctxt "input-name"
-msgid "P4 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:271
-msgctxt "input-name"
-msgid "P4 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:272
-msgctxt "input-name"
-msgid "P4 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:273
-msgctxt "input-name"
-msgid "P4 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:274
-msgctxt "input-name"
-msgid "P4 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:275
-msgctxt "input-name"
-msgid "P4 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:276
-msgctxt "input-name"
-msgid "P4 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:277
-msgctxt "input-name"
-msgid "P4 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:278
-msgctxt "input-name"
-msgid "P4 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:279
-msgctxt "input-name"
-msgid "P4 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:280
-msgctxt "input-name"
-msgid "P4 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:281
-msgctxt "input-name"
-msgid "P4 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:282
-msgctxt "input-name"
-msgid "P4 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:283
-msgctxt "input-name"
-msgid "P4 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:284
-msgctxt "input-name"
-msgid "P4 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:289
-msgctxt "input-name"
-msgid "P5 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:290
-msgctxt "input-name"
-msgid "P5 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:291
-msgctxt "input-name"
-msgid "P5 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:292
-msgctxt "input-name"
-msgid "P5 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:293
-msgctxt "input-name"
-msgid "P5 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:294
-msgctxt "input-name"
-msgid "P5 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:295
-msgctxt "input-name"
-msgid "P5 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:296
-msgctxt "input-name"
-msgid "P5 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:297
-msgctxt "input-name"
-msgid "P5 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:298
-msgctxt "input-name"
-msgid "P5 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:299
-msgctxt "input-name"
-msgid "P5 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:300
-msgctxt "input-name"
-msgid "P5 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:301
-msgctxt "input-name"
-msgid "P5 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:302
-msgctxt "input-name"
-msgid "P5 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:303
-msgctxt "input-name"
-msgid "P5 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:304
-msgctxt "input-name"
-msgid "P5 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:305
-msgctxt "input-name"
-msgid "P5 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:306
-msgctxt "input-name"
-msgid "P5 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:307
-msgctxt "input-name"
-msgid "P5 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:308
-msgctxt "input-name"
-msgid "P5 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:309
-msgctxt "input-name"
-msgid "P5 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:310
-msgctxt "input-name"
-msgid "P5 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:311
-msgctxt "input-name"
-msgid "P5 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:312
-msgctxt "input-name"
-msgid "P5 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:313
-msgctxt "input-name"
-msgid "P5 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:314
-msgctxt "input-name"
-msgid "P5 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:315
-msgctxt "input-name"
-msgid "P5 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:316
-msgctxt "input-name"
-msgid "P5 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:317
-msgctxt "input-name"
-msgid "P5 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:318
-msgctxt "input-name"
-msgid "P5 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:323
-msgctxt "input-name"
-msgid "P6 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:324
-msgctxt "input-name"
-msgid "P6 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:325
-msgctxt "input-name"
-msgid "P6 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:326
-msgctxt "input-name"
-msgid "P6 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:327
-msgctxt "input-name"
-msgid "P6 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:328
-msgctxt "input-name"
-msgid "P6 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:329
-msgctxt "input-name"
-msgid "P6 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:330
-msgctxt "input-name"
-msgid "P6 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:331
-msgctxt "input-name"
-msgid "P6 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:332
-msgctxt "input-name"
-msgid "P6 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:333
-msgctxt "input-name"
-msgid "P6 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:334
-msgctxt "input-name"
-msgid "P6 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:335
-msgctxt "input-name"
-msgid "P6 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:336
-msgctxt "input-name"
-msgid "P6 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:337
-msgctxt "input-name"
-msgid "P6 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:338
-msgctxt "input-name"
-msgid "P6 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:339
-msgctxt "input-name"
-msgid "P6 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:340
-msgctxt "input-name"
-msgid "P6 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:341
-msgctxt "input-name"
-msgid "P6 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:342
-msgctxt "input-name"
-msgid "P6 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:343
-msgctxt "input-name"
-msgid "P6 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:344
-msgctxt "input-name"
-msgid "P6 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:345
-msgctxt "input-name"
-msgid "P6 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:346
-msgctxt "input-name"
-msgid "P6 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:347
-msgctxt "input-name"
-msgid "P6 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:348
-msgctxt "input-name"
-msgid "P6 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:349
-msgctxt "input-name"
-msgid "P6 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:350
-msgctxt "input-name"
-msgid "P6 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:351
-msgctxt "input-name"
-msgid "P6 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:352
-msgctxt "input-name"
-msgid "P6 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:357
-msgctxt "input-name"
-msgid "P7 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:358
-msgctxt "input-name"
-msgid "P7 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:359
-msgctxt "input-name"
-msgid "P7 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:360
-msgctxt "input-name"
-msgid "P7 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:361
-msgctxt "input-name"
-msgid "P7 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:362
-msgctxt "input-name"
-msgid "P7 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:363
-msgctxt "input-name"
-msgid "P7 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:364
-msgctxt "input-name"
-msgid "P7 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:365
-msgctxt "input-name"
-msgid "P7 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:366
-msgctxt "input-name"
-msgid "P7 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:367
-msgctxt "input-name"
-msgid "P7 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:368
-msgctxt "input-name"
-msgid "P7 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:369
-msgctxt "input-name"
-msgid "P7 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:370
-msgctxt "input-name"
-msgid "P7 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:371
-msgctxt "input-name"
-msgid "P7 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:372
-msgctxt "input-name"
-msgid "P7 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:373
-msgctxt "input-name"
-msgid "P7 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:374
-msgctxt "input-name"
-msgid "P7 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:375
-msgctxt "input-name"
-msgid "P7 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:376
-msgctxt "input-name"
-msgid "P7 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:377
-msgctxt "input-name"
-msgid "P7 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:378
-msgctxt "input-name"
-msgid "P7 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:379
-msgctxt "input-name"
-msgid "P7 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:380
-msgctxt "input-name"
-msgid "P7 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:381
-msgctxt "input-name"
-msgid "P7 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:382
-msgctxt "input-name"
-msgid "P7 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:383
-msgctxt "input-name"
-msgid "P7 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:384
-msgctxt "input-name"
-msgid "P7 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:385
-msgctxt "input-name"
-msgid "P7 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:386
-msgctxt "input-name"
-msgid "P7 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:391
-msgctxt "input-name"
-msgid "P8 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:392
-msgctxt "input-name"
-msgid "P8 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:393
-msgctxt "input-name"
-msgid "P8 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:394
-msgctxt "input-name"
-msgid "P8 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:395
-msgctxt "input-name"
-msgid "P8 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:396
-msgctxt "input-name"
-msgid "P8 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:397
-msgctxt "input-name"
-msgid "P8 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:398
-msgctxt "input-name"
-msgid "P8 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:399
-msgctxt "input-name"
-msgid "P8 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:400
-msgctxt "input-name"
-msgid "P8 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:401
-msgctxt "input-name"
-msgid "P8 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:402
-msgctxt "input-name"
-msgid "P8 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:403
-msgctxt "input-name"
-msgid "P8 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:404
-msgctxt "input-name"
-msgid "P8 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:405
-msgctxt "input-name"
-msgid "P8 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:406
-msgctxt "input-name"
-msgid "P8 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:407
-msgctxt "input-name"
-msgid "P8 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:408
-msgctxt "input-name"
-msgid "P8 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:409
-msgctxt "input-name"
-msgid "P8 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:410
-msgctxt "input-name"
-msgid "P8 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:411
-msgctxt "input-name"
-msgid "P8 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:412
-msgctxt "input-name"
-msgid "P8 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:413
-msgctxt "input-name"
-msgid "P8 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:414
-msgctxt "input-name"
-msgid "P8 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:415
-msgctxt "input-name"
-msgid "P8 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:416
-msgctxt "input-name"
-msgid "P8 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:417
-msgctxt "input-name"
-msgid "P8 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:418
-msgctxt "input-name"
-msgid "P8 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:419
-msgctxt "input-name"
-msgid "P8 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:420
-msgctxt "input-name"
-msgid "P8 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:425
-msgctxt "input-name"
-msgid "P9 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:426
-msgctxt "input-name"
-msgid "P9 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:427
-msgctxt "input-name"
-msgid "P9 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:428
-msgctxt "input-name"
-msgid "P9 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:429
-msgctxt "input-name"
-msgid "P9 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:430
-msgctxt "input-name"
-msgid "P9 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:431
-msgctxt "input-name"
-msgid "P9 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:432
-msgctxt "input-name"
-msgid "P9 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:433
-msgctxt "input-name"
-msgid "P9 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:434
-msgctxt "input-name"
-msgid "P9 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:435
-msgctxt "input-name"
-msgid "P9 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:436
-msgctxt "input-name"
-msgid "P9 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:437
-msgctxt "input-name"
-msgid "P9 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:438
-msgctxt "input-name"
-msgid "P9 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:439
-msgctxt "input-name"
-msgid "P9 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:440
-msgctxt "input-name"
-msgid "P9 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:441
-msgctxt "input-name"
-msgid "P9 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:442
-msgctxt "input-name"
-msgid "P9 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:443
-msgctxt "input-name"
-msgid "P9 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:444
-msgctxt "input-name"
-msgid "P9 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:445
-msgctxt "input-name"
-msgid "P9 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:446
-msgctxt "input-name"
-msgid "P9 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:447
-msgctxt "input-name"
-msgid "P9 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:448
-msgctxt "input-name"
-msgid "P9 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:449
-msgctxt "input-name"
-msgid "P9 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:450
-msgctxt "input-name"
-msgid "P9 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:451
-msgctxt "input-name"
-msgid "P9 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:452
-msgctxt "input-name"
-msgid "P9 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:453
-msgctxt "input-name"
-msgid "P9 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:454
-msgctxt "input-name"
-msgid "P9 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:459
-msgctxt "input-name"
-msgid "P10 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:460
-msgctxt "input-name"
-msgid "P10 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:461
-msgctxt "input-name"
-msgid "P10 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:462
-msgctxt "input-name"
-msgid "P10 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:463
-msgctxt "input-name"
-msgid "P10 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:464
-msgctxt "input-name"
-msgid "P10 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:465
-msgctxt "input-name"
-msgid "P10 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:466
-msgctxt "input-name"
-msgid "P10 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:467
-msgctxt "input-name"
-msgid "P10 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:468
-msgctxt "input-name"
-msgid "P10 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:469
-msgctxt "input-name"
-msgid "P10 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:470
-msgctxt "input-name"
-msgid "P10 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:471
-msgctxt "input-name"
-msgid "P10 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:472
-msgctxt "input-name"
-msgid "P10 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:473
-msgctxt "input-name"
-msgid "P10 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:474
-msgctxt "input-name"
-msgid "P10 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:475
-msgctxt "input-name"
-msgid "P10 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:476
-msgctxt "input-name"
-msgid "P10 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:477
-msgctxt "input-name"
-msgid "P10 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:478
-msgctxt "input-name"
-msgid "P10 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:479
-msgctxt "input-name"
-msgid "P10 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:480
-msgctxt "input-name"
-msgid "P10 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:481
-msgctxt "input-name"
-msgid "P10 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:482
-msgctxt "input-name"
-msgid "P10 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:483
-msgctxt "input-name"
-msgid "P10 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:484
-msgctxt "input-name"
-msgid "P10 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:485
-msgctxt "input-name"
-msgid "P10 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:486
-msgctxt "input-name"
-msgid "P10 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:487
-msgctxt "input-name"
-msgid "P10 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:488
-msgctxt "input-name"
-msgid "P10 Select"
-msgstr ""
-
 #: src/emu/inpttype.ipp:493
 msgctxt "input-name"
 msgid "1 Player Start"
@@ -5476,154 +4105,31 @@ msgctxt "input-name"
 msgid "Volume Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:550
-msgctxt "input-name"
-msgid "P1 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:551
-msgctxt "input-name"
-msgid "P2 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:552
-msgctxt "input-name"
-msgid "P3 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:553
-msgctxt "input-name"
-msgid "P4 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:554
-msgctxt "input-name"
-msgid "P5 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:555
-msgctxt "input-name"
-msgid "P6 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:556
-msgctxt "input-name"
-msgid "P7 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:557
-msgctxt "input-name"
-msgid "P8 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:558
-msgctxt "input-name"
-msgid "P9 Pedal 1"
-msgstr ""
-
+#: src/emu/inpttype.ipp:550 src/emu/inpttype.ipp:551 src/emu/inpttype.ipp:552
+#: src/emu/inpttype.ipp:553 src/emu/inpttype.ipp:554 src/emu/inpttype.ipp:555
+#: src/emu/inpttype.ipp:556 src/emu/inpttype.ipp:557 src/emu/inpttype.ipp:558
 #: src/emu/inpttype.ipp:559
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:564
-msgctxt "input-name"
-msgid "P1 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:565
-msgctxt "input-name"
-msgid "P2 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:566
-msgctxt "input-name"
-msgid "P3 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:567
-msgctxt "input-name"
-msgid "P4 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:568
-msgctxt "input-name"
-msgid "P5 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:569
-msgctxt "input-name"
-msgid "P6 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:570
-msgctxt "input-name"
-msgid "P7 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:571
-msgctxt "input-name"
-msgid "P8 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:572
-msgctxt "input-name"
-msgid "P9 Pedal 2"
+msgid "%p Pedal 1"
 msgstr ""
 
+#: src/emu/inpttype.ipp:564 src/emu/inpttype.ipp:565 src/emu/inpttype.ipp:566
+#: src/emu/inpttype.ipp:567 src/emu/inpttype.ipp:568 src/emu/inpttype.ipp:569
+#: src/emu/inpttype.ipp:570 src/emu/inpttype.ipp:571 src/emu/inpttype.ipp:572
 #: src/emu/inpttype.ipp:573
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:578
-msgctxt "input-name"
-msgid "P1 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:579
-msgctxt "input-name"
-msgid "P2 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:580
-msgctxt "input-name"
-msgid "P3 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:581
-msgctxt "input-name"
-msgid "P4 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:582
-msgctxt "input-name"
-msgid "P5 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:583
-msgctxt "input-name"
-msgid "P6 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:584
-msgctxt "input-name"
-msgid "P7 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:585
-msgctxt "input-name"
-msgid "P8 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:586
-msgctxt "input-name"
-msgid "P9 Pedal 3"
+msgid "%p Pedal 2"
 msgstr ""
 
+#: src/emu/inpttype.ipp:578 src/emu/inpttype.ipp:579 src/emu/inpttype.ipp:580
+#: src/emu/inpttype.ipp:581 src/emu/inpttype.ipp:582 src/emu/inpttype.ipp:583
+#: src/emu/inpttype.ipp:584 src/emu/inpttype.ipp:585 src/emu/inpttype.ipp:586
 #: src/emu/inpttype.ipp:587
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 3"
+msgid "%p Pedal 3"
 msgstr ""
 
 #: src/emu/inpttype.ipp:592
diff --git a/language/Turkish/strings.po b/language/Turkish/strings.po
index f97168f2395..040bea484d5 100644
--- a/language/Turkish/strings.po
+++ b/language/Turkish/strings.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-19 02:50+1100\n"
+"POT-Creation-Date: 2021-12-09 04:44+1100\n"
 "PO-Revision-Date: 2016-02-20 18:03+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: MAME Language Team\n"
@@ -261,12 +261,12 @@ msgstr ""
 msgid "Driver: \"%1$s\" software list "
 msgstr ""
 
-#: src/frontend/mame/ui/selsoft.cpp:711 src/frontend/mame/ui/selgame.cpp:1066
+#: src/frontend/mame/ui/selsoft.cpp:711 src/frontend/mame/ui/selgame.cpp:1076
 #, c-format
 msgid "%1$s: %2$s - Search: %3$s_"
 msgstr ""
 
-#: src/frontend/mame/ui/selsoft.cpp:713 src/frontend/mame/ui/selgame.cpp:1068
+#: src/frontend/mame/ui/selsoft.cpp:713 src/frontend/mame/ui/selgame.cpp:1078
 #, c-format
 msgid "Search: %1$s_"
 msgstr ""
@@ -276,7 +276,7 @@ msgstr ""
 msgid "Software list/item: %1$s:%2$s"
 msgstr ""
 
-#: src/frontend/mame/ui/optsmenu.cpp:73 src/frontend/mame/ui/sndmenu.cpp:165
+#: src/frontend/mame/ui/optsmenu.cpp:73 src/frontend/mame/ui/sndmenu.cpp:161
 msgid "Sound Options"
 msgstr "Ses Seçenekleri"
 
@@ -371,12 +371,12 @@ msgid "Show mouse pointer"
 msgstr "Fare işaretçisini göster"
 
 #: src/frontend/mame/ui/submenu.cpp:39
-msgid "Confirm quit from machines"
-msgstr "Makinelerden çıkarken onayla"
+msgid "Confirm quit from emulation"
+msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:40
-msgid "Skip information screen at startup"
-msgstr "Başlangıçta bilgi ekranını atla"
+msgid "Skip system information screen"
+msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:41
 msgid "Force 4:3 aspect for snapshot display"
@@ -391,7 +391,7 @@ msgid "Skip BIOS selection menu"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:44
-msgid "Skip software parts selection menu"
+msgid "Skip software part selection menu"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:45
@@ -543,7 +543,7 @@ msgid "UI active"
 msgstr "Kullanıcı arayüzü aktif"
 
 #: src/frontend/mame/ui/submenu.cpp:91
-msgid "Offscreen reload"
+msgid "Off-screen reload"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:92
@@ -559,7 +559,7 @@ msgid "Natural keyboard"
 msgstr "Doğal Klavye"
 
 #: src/frontend/mame/ui/submenu.cpp:95
-msgid "Simultaneous contradictory"
+msgid "Allow contradictory joystick inputs"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:96
@@ -583,7 +583,7 @@ msgid "Pedal Device Assignment"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:106
-msgid "Adstick Device Assignment"
+msgid "AD Stick Device Assignment"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:107
@@ -670,14 +670,14 @@ msgstr "Eşitlenmiş Yenileme"
 msgid "Wait Vertical Sync"
 msgstr "Dikey eşitlemeyi bekle"
 
-#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:687
+#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:689
 #: src/frontend/mame/ui/videoopt.cpp:191 src/frontend/mame/ui/custui.cpp:490
 #: src/frontend/mame/ui/analogipt.cpp:471 plugins/cheatfind/init.lua:766
 #: plugins/cheatfind/init.lua:777 plugins/cheat/init.lua:668
 msgid "On"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:690
+#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:692
 #: src/frontend/mame/ui/videoopt.cpp:207 src/frontend/mame/ui/custui.cpp:490
 #: src/frontend/mame/ui/analogipt.cpp:471 plugins/cheatfind/init.lua:763
 #: plugins/cheatfind/init.lua:774 plugins/cheat/init.lua:671
@@ -685,11 +685,11 @@ msgstr ""
 msgid "Off"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:693
+#: src/frontend/mame/ui/menu.cpp:695
 msgid "Auto"
 msgstr "Oto"
 
-#: src/frontend/mame/ui/menu.cpp:1195
+#: src/frontend/mame/ui/menu.cpp:1197
 #: src/frontend/mame/ui/simpleselgame.cpp:278
 #: src/frontend/mame/ui/selmenu.cpp:1280
 msgid "Return to Previous Menu"
@@ -697,7 +697,7 @@ msgstr "Önceki Menüye Dön"
 
 #: src/frontend/mame/ui/filemngr.cpp:139
 #: src/frontend/mame/ui/confswitch.cpp:119
-#: src/frontend/mame/ui/inputmap.cpp:559 src/frontend/mame/ui/analogipt.cpp:360
+#: src/frontend/mame/ui/inputmap.cpp:563 src/frontend/mame/ui/analogipt.cpp:360
 #, c-format
 msgid "[root%1$s]"
 msgstr ""
@@ -944,22 +944,22 @@ msgid ""
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "GHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "MHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "kHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "Hz"
 msgstr ""
 
@@ -983,38 +983,38 @@ msgstr ""
 msgid "Vector"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:480
+#: src/frontend/mame/ui/info.cpp:483
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:480
+#: src/frontend/mame/ui/info.cpp:483
 msgid "%2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:497
+#: src/frontend/mame/ui/info.cpp:500
 #, c-format
 msgid "Screen '%1$s'"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:499
+#: src/frontend/mame/ui/info.cpp:502
 msgid "Screen"
 msgstr "Ekran"
 
-#: src/frontend/mame/ui/info.cpp:570 src/frontend/mame/ui/info.cpp:581
+#: src/frontend/mame/ui/info.cpp:573 src/frontend/mame/ui/info.cpp:584
 #, c-format
 msgid "%1$s:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:662
+#: src/frontend/mame/ui/info.cpp:665
 msgid "Not supported"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:665
+#: src/frontend/mame/ui/info.cpp:668
 msgid "Partially supported"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:674
+#: src/frontend/mame/ui/info.cpp:677
 msgid "[empty]"
 msgstr ""
 
@@ -1087,7 +1087,7 @@ msgid "Emulated"
 msgstr "Emule edilmiş"
 
 #: src/frontend/mame/ui/keyboard.cpp:59 src/frontend/mame/ui/confswitch.cpp:117
-#: src/frontend/mame/ui/inputmap.cpp:557 src/frontend/mame/ui/analogipt.cpp:358
+#: src/frontend/mame/ui/inputmap.cpp:561 src/frontend/mame/ui/analogipt.cpp:358
 #, c-format
 msgid "%1$s [root%2$s]"
 msgstr ""
@@ -1447,7 +1447,7 @@ msgctxt "swlist-info"
 msgid "Software list/item"
 msgstr ""
 
-#: src/frontend/mame/ui/datmenu.cpp:88 src/frontend/mame/ui/selmenu.cpp:2698
+#: src/frontend/mame/ui/datmenu.cpp:88 src/frontend/mame/ui/selmenu.cpp:2707
 msgid "Software List Info"
 msgstr ""
 
@@ -1562,7 +1562,7 @@ msgstr ""
 msgid "Configure Machine:"
 msgstr ""
 
-#: src/frontend/mame/ui/miscmenu.cpp:858 src/frontend/mame/ui/selmenu.cpp:2638
+#: src/frontend/mame/ui/miscmenu.cpp:858 src/frontend/mame/ui/selmenu.cpp:2647
 msgid " (default)"
 msgstr " (varsayılan)"
 
@@ -1583,7 +1583,7 @@ msgstr ""
 "Çıkmak için %1$s'e basın\n"
 "Dönmek için %2$s'e basın"
 
-#: src/frontend/mame/ui/info_pty.cpp:30 src/frontend/mame/ui/mainmenu.cpp:155
+#: src/frontend/mame/ui/info_pty.cpp:30
 msgid "Pseudo terminals"
 msgstr ""
 
@@ -1651,52 +1651,52 @@ msgstr ""
 msgid "Other Controls"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:227
+#: src/frontend/mame/ui/inputmap.cpp:231
 msgid "This machine has no configurable inputs."
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:327
+#: src/frontend/mame/ui/inputmap.cpp:331
 msgid "Pressed"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:397
+#: src/frontend/mame/ui/inputmap.cpp:401
 msgid "Invalid sequence entered"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:542
+#: src/frontend/mame/ui/inputmap.cpp:546
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:543
+#: src/frontend/mame/ui/inputmap.cpp:547
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog Inc"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:544
+#: src/frontend/mame/ui/inputmap.cpp:548
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog Dec"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:586
+#: src/frontend/mame/ui/inputmap.cpp:590
 #, c-format
 msgid "Press %1$s to set\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:587
+#: src/frontend/mame/ui/inputmap.cpp:591
 #, c-format
 msgid "Press %1$s to append\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:588
+#: src/frontend/mame/ui/inputmap.cpp:592
 #, c-format
 msgid "Press %1$s to clear\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:589
+#: src/frontend/mame/ui/inputmap.cpp:593
 #, c-format
 msgid "Press %1$s to restore default\n"
 msgstr ""
@@ -1764,7 +1764,7 @@ msgstr ""
 "Devam etmek için herhangi bir tuşa basın."
 
 #: src/frontend/mame/ui/simpleselgame.cpp:273
-#: src/frontend/mame/ui/selgame.cpp:436
+#: src/frontend/mame/ui/selgame.cpp:443
 msgid "Configure Options"
 msgstr "Seçenekleri Düzenle"
 
@@ -2097,16 +2097,16 @@ msgstr ""
 msgid "Expand to fit"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:437
+#: src/frontend/mame/ui/selgame.cpp:444
 msgid "Configure Machine"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:1050
+#: src/frontend/mame/ui/selgame.cpp:1060
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d machines (%5$d BIOS) )"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:1078
+#: src/frontend/mame/ui/selgame.cpp:1088
 #, c-format
 msgid "System: %1$-.100s"
 msgstr ""
@@ -2128,7 +2128,7 @@ msgstr "Sonuçlar %1$s 'a kaydedilecek"
 #: src/frontend/mame/ui/auditmenu.cpp:98
 #, c-format
 msgid ""
-"Auditing ROMs for machine %2$u of %3$u...\n"
+"Auditing media for machine %2$u of %3$u...\n"
 "%1$s"
 msgstr ""
 
@@ -2143,12 +2143,12 @@ msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:136
 #, c-format
-msgid "Audit ROMs for %1$u machines marked unavailable"
+msgid "Audit media for %1$u machines marked unavailable"
 msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:137
 #, c-format
-msgid "Audit ROMs for all %1$u machines"
+msgid "Audit media for all %1$u machines"
 msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:154
@@ -2354,84 +2354,84 @@ msgctxt "color-sample"
 msgid "Clone"
 msgstr "Klon"
 
-#: src/frontend/mame/ui/custui.cpp:914
+#: src/frontend/mame/ui/custui.cpp:906
 msgid "ARGB Settings"
 msgstr "ARGB Ayarları"
 
-#: src/frontend/mame/ui/custui.cpp:919 src/frontend/mame/ui/custui.cpp:922
+#: src/frontend/mame/ui/custui.cpp:911 src/frontend/mame/ui/custui.cpp:914
 msgctxt "color-channel"
 msgid "Alpha"
 msgstr "Alfa"
 
-#: src/frontend/mame/ui/custui.cpp:927 src/frontend/mame/ui/custui.cpp:930
+#: src/frontend/mame/ui/custui.cpp:919 src/frontend/mame/ui/custui.cpp:922
 msgctxt "color-channel"
 msgid "Red"
 msgstr "Kırmızı"
 
-#: src/frontend/mame/ui/custui.cpp:935 src/frontend/mame/ui/custui.cpp:938
+#: src/frontend/mame/ui/custui.cpp:927 src/frontend/mame/ui/custui.cpp:930
 msgctxt "color-channel"
 msgid "Green"
 msgstr "Yeşil"
 
-#: src/frontend/mame/ui/custui.cpp:943 src/frontend/mame/ui/custui.cpp:946
+#: src/frontend/mame/ui/custui.cpp:935 src/frontend/mame/ui/custui.cpp:938
 msgctxt "color-channel"
 msgid "Blue"
 msgstr "Mavi"
 
-#: src/frontend/mame/ui/custui.cpp:949
+#: src/frontend/mame/ui/custui.cpp:941
 msgid "Choose from palette"
 msgstr "Paletten seç"
 
-#: src/frontend/mame/ui/custui.cpp:996
+#: src/frontend/mame/ui/custui.cpp:988
 msgid "Color preview:"
 msgstr "Renk önizleme:"
 
-#: src/frontend/mame/ui/custui.cpp:1093
+#: src/frontend/mame/ui/custui.cpp:1085
 msgctxt "color-preset"
 msgid "White"
 msgstr "Beyaz"
 
-#: src/frontend/mame/ui/custui.cpp:1094
+#: src/frontend/mame/ui/custui.cpp:1086
 msgctxt "color-preset"
 msgid "Silver"
 msgstr "Gümüş"
 
-#: src/frontend/mame/ui/custui.cpp:1095
+#: src/frontend/mame/ui/custui.cpp:1087
 msgctxt "color-preset"
 msgid "Gray"
 msgstr "Gri"
 
-#: src/frontend/mame/ui/custui.cpp:1096
+#: src/frontend/mame/ui/custui.cpp:1088
 msgctxt "color-preset"
 msgid "Black"
 msgstr "Siyah"
 
-#: src/frontend/mame/ui/custui.cpp:1097
+#: src/frontend/mame/ui/custui.cpp:1089
 msgctxt "color-preset"
 msgid "Red"
 msgstr "Kırmızı"
 
-#: src/frontend/mame/ui/custui.cpp:1098
+#: src/frontend/mame/ui/custui.cpp:1090
 msgctxt "color-preset"
 msgid "Orange"
 msgstr "Turuncu"
 
-#: src/frontend/mame/ui/custui.cpp:1099
+#: src/frontend/mame/ui/custui.cpp:1091
 msgctxt "color-preset"
 msgid "Yellow"
 msgstr "Sarı"
 
-#: src/frontend/mame/ui/custui.cpp:1100
+#: src/frontend/mame/ui/custui.cpp:1092
 msgctxt "color-preset"
 msgid "Green"
 msgstr "Yeşil"
 
-#: src/frontend/mame/ui/custui.cpp:1101
+#: src/frontend/mame/ui/custui.cpp:1093
 msgctxt "color-preset"
 msgid "Blue"
 msgstr "Mavi"
 
-#: src/frontend/mame/ui/custui.cpp:1102
+#: src/frontend/mame/ui/custui.cpp:1094
 msgctxt "color-preset"
 msgid "Violet"
 msgstr "Mor"
@@ -2496,8 +2496,8 @@ msgid "Input (general)"
 msgstr "Girdi (genel)"
 
 #: src/frontend/mame/ui/mainmenu.cpp:123
-msgid "Input (this Machine)"
-msgstr "Girdi (bu Makine)"
+msgid "Input (this machine)"
+msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:126
 msgid "Analog Controls"
@@ -2535,6 +2535,10 @@ msgstr "Dosya Yöneticisi"
 msgid "Tape Control"
 msgstr "Teyp Kontrolü"
 
+#: src/frontend/mame/ui/mainmenu.cpp:155
+msgid "Pseudo Terminals"
+msgstr ""
+
 #: src/frontend/mame/ui/mainmenu.cpp:158
 msgid "BIOS Selection"
 msgstr "BIOS Seçimi"
@@ -2573,7 +2577,7 @@ msgstr "Harici DAT Görünümü"
 
 #: src/frontend/mame/ui/mainmenu.cpp:200
 #, c-format
-msgid "About %s"
+msgid "About %1$s"
 msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:212
@@ -2733,373 +2737,373 @@ msgstr "Sürücü şunun kopyasıdır: %1$s"
 msgid "%1$s %2$s"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2235
+#: src/frontend/mame/ui/selmenu.cpp:2244
 msgid "Images"
 msgstr "Görüntüler"
 
-#: src/frontend/mame/ui/selmenu.cpp:2236
+#: src/frontend/mame/ui/selmenu.cpp:2245
 msgid "Infos"
 msgstr "Bilgiler"
 
-#: src/frontend/mame/ui/selmenu.cpp:2551
+#: src/frontend/mame/ui/selmenu.cpp:2560
 msgid ""
 "Required ROM/disk images for the selected system are missing or incorrect. "
 "Please acquire the correct files or select a different system.\n"
 "\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2567
+#: src/frontend/mame/ui/selmenu.cpp:2576
 msgid ""
 "Required ROM/disk images for the selected software are missing or incorrect. "
 "Please acquire the correct files or select a different software item.\n"
 "\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2583
+#: src/frontend/mame/ui/selmenu.cpp:2592
 msgid "incorrect checksum"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2586
+#: src/frontend/mame/ui/selmenu.cpp:2595
 msgid "incorrect length"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2589
+#: src/frontend/mame/ui/selmenu.cpp:2598
 msgid "not found"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2600
+#: src/frontend/mame/ui/selmenu.cpp:2609
 #, c-format
 msgid "%1$s (%2$s) - %3$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2602
+#: src/frontend/mame/ui/selmenu.cpp:2611
 #, c-format
 msgid "%1$s - %2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2606
+#: src/frontend/mame/ui/selmenu.cpp:2615
 msgid "Press any key to continue."
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2735
+#: src/frontend/mame/ui/selmenu.cpp:2744
 msgid "General Info"
 msgstr "Genel Bilgi"
 
-#: src/frontend/mame/ui/selmenu.cpp:2887
+#: src/frontend/mame/ui/selmenu.cpp:2896
 #, c-format
 msgid "Romset\t%1$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2888
+#: src/frontend/mame/ui/selmenu.cpp:2897
 #, c-format
 msgid "Year\t%1$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2889
+#: src/frontend/mame/ui/selmenu.cpp:2898
 #, c-format
 msgid "Manufacturer\t%1$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2896
+#: src/frontend/mame/ui/selmenu.cpp:2905
 #, c-format
 msgid "Driver is Clone of\t%1$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2901
+#: src/frontend/mame/ui/selmenu.cpp:2910
 msgid "Driver is Parent\t\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2905
+#: src/frontend/mame/ui/selmenu.cpp:2914
 msgid "Analog Controls\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2907
+#: src/frontend/mame/ui/selmenu.cpp:2916
 msgid "Keyboard Inputs\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2910
+#: src/frontend/mame/ui/selmenu.cpp:2919
 msgid "Overall\tNOT WORKING\n"
 msgstr "Genel olarak\tÇALIŞMIYOR\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2912
+#: src/frontend/mame/ui/selmenu.cpp:2921
 msgid "Overall\tUnemulated Protection\n"
 msgstr "Genel olarak\tUygulanmamış Koruma\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2914
+#: src/frontend/mame/ui/selmenu.cpp:2923
 msgid "Overall\tWorking\n"
 msgstr "Genel olarak\tÇalışıyor\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2917
+#: src/frontend/mame/ui/selmenu.cpp:2926
 msgid "Graphics\tUnimplemented\n"
 msgstr "Grafik\tUygulanmamış\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2919
+#: src/frontend/mame/ui/selmenu.cpp:2928
 msgid "Graphics\tWrong Colors\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2921
+#: src/frontend/mame/ui/selmenu.cpp:2930
 msgid "Graphics\tImperfect Colors\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2923
+#: src/frontend/mame/ui/selmenu.cpp:2932
 msgid "Graphics\tImperfect\n"
 msgstr "Grafik\tKusurlu\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2925
+#: src/frontend/mame/ui/selmenu.cpp:2934
 msgid "Graphics\tOK\n"
 msgstr "Grafik\tTamam\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2928
+#: src/frontend/mame/ui/selmenu.cpp:2937
 msgid "Sound\tNone\n"
 msgstr "Ses\tYok\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2930
+#: src/frontend/mame/ui/selmenu.cpp:2939
 msgid "Sound\tUnimplemented\n"
 msgstr "Ses\tUygulanmamış\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2932
+#: src/frontend/mame/ui/selmenu.cpp:2941
 msgid "Sound\tImperfect\n"
 msgstr "Ses\tKusurlu\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2934
+#: src/frontend/mame/ui/selmenu.cpp:2943
 msgid "Sound\tOK\n"
 msgstr "Ses\tTamam\n"
 
-#: src/frontend/mame/ui/selmenu.cpp:2937
+#: src/frontend/mame/ui/selmenu.cpp:2946
 msgid "Capture\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2939
+#: src/frontend/mame/ui/selmenu.cpp:2948
 msgid "Capture\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2942
+#: src/frontend/mame/ui/selmenu.cpp:2951
 msgid "Camera\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2944
+#: src/frontend/mame/ui/selmenu.cpp:2953
 msgid "Camera\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2947
+#: src/frontend/mame/ui/selmenu.cpp:2956
 msgid "Microphone\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2949
+#: src/frontend/mame/ui/selmenu.cpp:2958
 msgid "Microphone\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2952
+#: src/frontend/mame/ui/selmenu.cpp:2961
 msgid "Controls\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2954
+#: src/frontend/mame/ui/selmenu.cpp:2963
 msgid "Controls\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2957
+#: src/frontend/mame/ui/selmenu.cpp:2966
 msgid "Keyboard\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2959
+#: src/frontend/mame/ui/selmenu.cpp:2968
 msgid "Keyboard\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2962
+#: src/frontend/mame/ui/selmenu.cpp:2971
 msgid "Mouse\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2964
+#: src/frontend/mame/ui/selmenu.cpp:2973
 msgid "Mouse\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2967
+#: src/frontend/mame/ui/selmenu.cpp:2976
 msgid "Media\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2969
+#: src/frontend/mame/ui/selmenu.cpp:2978
 msgid "Media\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2972
+#: src/frontend/mame/ui/selmenu.cpp:2981
 msgid "Disk\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2974
+#: src/frontend/mame/ui/selmenu.cpp:2983
 msgid "Disk\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2977
+#: src/frontend/mame/ui/selmenu.cpp:2986
 msgid "Printer\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2979
+#: src/frontend/mame/ui/selmenu.cpp:2988
 msgid "Printer\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2982
+#: src/frontend/mame/ui/selmenu.cpp:2991
 msgid "Mag. Tape\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2984
+#: src/frontend/mame/ui/selmenu.cpp:2993
 msgid "Mag. Tape\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2987
+#: src/frontend/mame/ui/selmenu.cpp:2996
 msgid "Punch Tape\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2989
+#: src/frontend/mame/ui/selmenu.cpp:2998
 msgid "Punch Tape\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2992
+#: src/frontend/mame/ui/selmenu.cpp:3001
 msgid "Mag. Drum\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2994
+#: src/frontend/mame/ui/selmenu.cpp:3003
 msgid "Mag. Drum\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2997
+#: src/frontend/mame/ui/selmenu.cpp:3006
 msgid "(EP)ROM\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2999
+#: src/frontend/mame/ui/selmenu.cpp:3008
 msgid "(EP)ROM\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3002
+#: src/frontend/mame/ui/selmenu.cpp:3011
 msgid "Communications\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3004
+#: src/frontend/mame/ui/selmenu.cpp:3013
 msgid "Communications\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3007
+#: src/frontend/mame/ui/selmenu.cpp:3016
 msgid "LAN\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3009
+#: src/frontend/mame/ui/selmenu.cpp:3018
 msgid "LAN\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3012
+#: src/frontend/mame/ui/selmenu.cpp:3021
 msgid "WAN\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3014
+#: src/frontend/mame/ui/selmenu.cpp:3023
 msgid "WAN\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3017
+#: src/frontend/mame/ui/selmenu.cpp:3026
 msgid "Timing\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3019
+#: src/frontend/mame/ui/selmenu.cpp:3028
 msgid "Timing\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3021
+#: src/frontend/mame/ui/selmenu.cpp:3030
 msgid "Mechanical Machine\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3021
+#: src/frontend/mame/ui/selmenu.cpp:3030
 msgid "Mechanical Machine\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3022
+#: src/frontend/mame/ui/selmenu.cpp:3031
 msgid "Requires Artwork\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3022
+#: src/frontend/mame/ui/selmenu.cpp:3031
 msgid "Requires Artwork\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3023
+#: src/frontend/mame/ui/selmenu.cpp:3032
 msgid "Requires Clickable Artwork\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3023
+#: src/frontend/mame/ui/selmenu.cpp:3032
 msgid "Requires Clickable Artwork\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3025
+#: src/frontend/mame/ui/selmenu.cpp:3034
 msgid "Support Cocktail\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3026
+#: src/frontend/mame/ui/selmenu.cpp:3035
 msgid "Driver is BIOS\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3026
+#: src/frontend/mame/ui/selmenu.cpp:3035
 msgid "Driver is BIOS\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3027
+#: src/frontend/mame/ui/selmenu.cpp:3036
 msgid "Support Save\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3027
+#: src/frontend/mame/ui/selmenu.cpp:3036
 msgid "Support Save\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3028
+#: src/frontend/mame/ui/selmenu.cpp:3037
 msgid "Screen Orientation\tVertical\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3028
+#: src/frontend/mame/ui/selmenu.cpp:3037
 msgid "Screen Orientation\tHorizontal\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3038
+#: src/frontend/mame/ui/selmenu.cpp:3047
 msgid "Requires CHD\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3038
+#: src/frontend/mame/ui/selmenu.cpp:3047
 msgid "Requires CHD\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3051
-msgid "ROM Audit Result\tOK\n"
+#: src/frontend/mame/ui/selmenu.cpp:3060
+msgid "Media Audit Result\tOK\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3053
-msgid "ROM Audit Result\tBAD\n"
+#: src/frontend/mame/ui/selmenu.cpp:3062
+msgid "Media Audit Result\tBAD\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3056
+#: src/frontend/mame/ui/selmenu.cpp:3065
 msgid "Samples Audit Result\tNone Needed\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3058
+#: src/frontend/mame/ui/selmenu.cpp:3067
 msgid "Samples Audit Result\tOK\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3060
+#: src/frontend/mame/ui/selmenu.cpp:3069
 msgid "Samples Audit Result\tBAD\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3064
+#: src/frontend/mame/ui/selmenu.cpp:3073
 msgid ""
-"ROM Audit \tDisabled\n"
-"Samples Audit \tDisabled\n"
+"Media Audit\tDisabled\n"
+"Samples Audit\tDisabled\n"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:150
+#: src/frontend/mame/ui/sndmenu.cpp:146
 msgid "Sound"
 msgstr "Ses"
 
-#: src/frontend/mame/ui/sndmenu.cpp:151
+#: src/frontend/mame/ui/sndmenu.cpp:147
 msgid "Compressor"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:152
+#: src/frontend/mame/ui/sndmenu.cpp:148
 msgid "Sample Rate"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:153
+#: src/frontend/mame/ui/sndmenu.cpp:149
 msgid "Use External Samples"
 msgstr ""
 
@@ -3138,511 +3142,681 @@ msgstr ""
 msgid "  Screen '%1$s': Vector\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:132
+#: src/frontend/mame/ui/devopt.cpp:135
 #, c-format
 msgid "  Screen '%1$s': %2$d × %3$d (V) %4$s Hz\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:133
+#: src/frontend/mame/ui/devopt.cpp:136
 #, c-format
 msgid "  Screen '%1$s': %2$d × %3$d (H) %4$s Hz\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:147
+#: src/frontend/mame/ui/devopt.cpp:150
 msgid "* Sound:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:211
+#: src/frontend/mame/ui/devopt.cpp:214
 #, c-format
 msgid ""
 "* BIOS settings:\n"
 "  %1$d options    [default: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:255 src/frontend/mame/ui/devopt.cpp:271
-#: src/frontend/mame/ui/devopt.cpp:332
+#: src/frontend/mame/ui/devopt.cpp:258 src/frontend/mame/ui/devopt.cpp:274
+#: src/frontend/mame/ui/devopt.cpp:335
 #, c-format
 msgid "  %1$s    [default: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:260 src/frontend/mame/ui/devopt.cpp:276
+#: src/frontend/mame/ui/devopt.cpp:263 src/frontend/mame/ui/devopt.cpp:279
 #, c-format
 msgid "  %1$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:282
+#: src/frontend/mame/ui/devopt.cpp:285
 msgid "* DIP switch settings:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:287
+#: src/frontend/mame/ui/devopt.cpp:290
 msgid "* Configuration settings:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:291
+#: src/frontend/mame/ui/devopt.cpp:294
 msgid "* Input device(s):\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:293
+#: src/frontend/mame/ui/devopt.cpp:296
 #, c-format
 msgid "  User inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:295
+#: src/frontend/mame/ui/devopt.cpp:298
 #, c-format
 msgid "  Mahjong inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:297
+#: src/frontend/mame/ui/devopt.cpp:300
 #, c-format
 msgid "  Hanafuda inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:299
+#: src/frontend/mame/ui/devopt.cpp:302
 #, c-format
 msgid "  Gambling inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:301
+#: src/frontend/mame/ui/devopt.cpp:304
 #, c-format
 msgid "  Analog inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:303
+#: src/frontend/mame/ui/devopt.cpp:306
 #, c-format
 msgid "  Adjuster inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:305
+#: src/frontend/mame/ui/devopt.cpp:308
 #, c-format
 msgid "  Keypad inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:307
+#: src/frontend/mame/ui/devopt.cpp:310
 #, c-format
 msgid "  Keyboard inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:312
+#: src/frontend/mame/ui/devopt.cpp:315
 msgid "* Media Options:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:317
+#: src/frontend/mame/ui/devopt.cpp:320
 #, c-format
 msgid "  %1$s    [tag: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:327
+#: src/frontend/mame/ui/devopt.cpp:330
 msgid "* Slot Options:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:341
+#: src/frontend/mame/ui/devopt.cpp:344
 msgid "[None]\n"
 msgstr ""
 
-#: src/emu/render.cpp:1847
+#: src/emu/render.cpp:1796
 #, c-format
 msgctxt "view-name"
 msgid "Screen %1$u Standard (%2$u:%3$u)"
 msgstr ""
 
-#: src/emu/render.cpp:1873
+#: src/emu/render.cpp:1822
 #, c-format
 msgctxt "view-name"
 msgid "Screen %1$u Pixel Aspect (%2$u:%3$u)"
 msgstr ""
 
-#: src/emu/render.cpp:1895 src/emu/render.cpp:2030
+#: src/emu/render.cpp:1844 src/emu/render.cpp:1979
 msgctxt "view-name"
 msgid "Cocktail"
 msgstr ""
 
-#: src/emu/render.cpp:2015
+#: src/emu/render.cpp:1964
 msgctxt "view-name"
 msgid "Left-to-Right"
 msgstr ""
 
-#: src/emu/render.cpp:2016
+#: src/emu/render.cpp:1965
 msgctxt "view-name"
 msgid "Left-to-Right (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2017
+#: src/emu/render.cpp:1966
 msgctxt "view-name"
 msgid "Top-to-Bottom"
 msgstr ""
 
-#: src/emu/render.cpp:2018
+#: src/emu/render.cpp:1967
 msgctxt "view-name"
 msgid "Top-to-Bottom (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2069
+#: src/emu/render.cpp:2018
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Left-to-Right, Top-to-Bottom"
 msgstr ""
 
-#: src/emu/render.cpp:2078
+#: src/emu/render.cpp:2027
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Left-to-Right, Top-to-Bottom (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2087
+#: src/emu/render.cpp:2036
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Top-to-Bottom, Left-to-Right"
 msgstr ""
 
-#: src/emu/render.cpp:2096
+#: src/emu/render.cpp:2045
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Top-to-Bottom, Left-to-Right (Gapless)"
 msgstr ""
 
-#: src/emu/inpttype.ipp:22
+#: src/emu/ioport.cpp:332
+#, c-format
 msgctxt "input-name"
-msgid "P1 Up"
+msgid "P%1$u"
 msgstr ""
 
-#: src/emu/inpttype.ipp:23
+#: src/emu/ioport.cpp:1924
 msgctxt "input-name"
-msgid "P1 Down"
+msgid "???"
 msgstr ""
 
-#: src/emu/inpttype.ipp:24
+#: src/emu/inpttype.ipp:22 src/emu/inpttype.ipp:140 src/emu/inpttype.ipp:221
+#: src/emu/inpttype.ipp:255 src/emu/inpttype.ipp:289 src/emu/inpttype.ipp:323
+#: src/emu/inpttype.ipp:357 src/emu/inpttype.ipp:391 src/emu/inpttype.ipp:425
+#: src/emu/inpttype.ipp:459
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left"
+msgid "%p Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:25
+#: src/emu/inpttype.ipp:23 src/emu/inpttype.ipp:141 src/emu/inpttype.ipp:222
+#: src/emu/inpttype.ipp:256 src/emu/inpttype.ipp:290 src/emu/inpttype.ipp:324
+#: src/emu/inpttype.ipp:358 src/emu/inpttype.ipp:392 src/emu/inpttype.ipp:426
+#: src/emu/inpttype.ipp:460
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right"
+msgid "%p Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:26
+#: src/emu/inpttype.ipp:24 src/emu/inpttype.ipp:142 src/emu/inpttype.ipp:223
+#: src/emu/inpttype.ipp:257 src/emu/inpttype.ipp:291 src/emu/inpttype.ipp:325
+#: src/emu/inpttype.ipp:359 src/emu/inpttype.ipp:393 src/emu/inpttype.ipp:427
+#: src/emu/inpttype.ipp:461
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Up"
+msgid "%p Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:27
+#: src/emu/inpttype.ipp:25 src/emu/inpttype.ipp:143 src/emu/inpttype.ipp:224
+#: src/emu/inpttype.ipp:258 src/emu/inpttype.ipp:292 src/emu/inpttype.ipp:326
+#: src/emu/inpttype.ipp:360 src/emu/inpttype.ipp:394 src/emu/inpttype.ipp:428
+#: src/emu/inpttype.ipp:462
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Down"
+msgid "%p Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:28
+#: src/emu/inpttype.ipp:26 src/emu/inpttype.ipp:144 src/emu/inpttype.ipp:225
+#: src/emu/inpttype.ipp:259 src/emu/inpttype.ipp:293 src/emu/inpttype.ipp:327
+#: src/emu/inpttype.ipp:361 src/emu/inpttype.ipp:395 src/emu/inpttype.ipp:429
+#: src/emu/inpttype.ipp:463
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Left"
+msgid "%p Right Stick/Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:29
+#: src/emu/inpttype.ipp:27 src/emu/inpttype.ipp:145 src/emu/inpttype.ipp:226
+#: src/emu/inpttype.ipp:260 src/emu/inpttype.ipp:294 src/emu/inpttype.ipp:328
+#: src/emu/inpttype.ipp:362 src/emu/inpttype.ipp:396 src/emu/inpttype.ipp:430
+#: src/emu/inpttype.ipp:464
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Right"
+msgid "%p Right Stick/Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:30
+#: src/emu/inpttype.ipp:28 src/emu/inpttype.ipp:146 src/emu/inpttype.ipp:227
+#: src/emu/inpttype.ipp:261 src/emu/inpttype.ipp:295 src/emu/inpttype.ipp:329
+#: src/emu/inpttype.ipp:363 src/emu/inpttype.ipp:397 src/emu/inpttype.ipp:431
+#: src/emu/inpttype.ipp:465
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Up"
+msgid "%p Right Stick/Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:31
+#: src/emu/inpttype.ipp:29 src/emu/inpttype.ipp:147 src/emu/inpttype.ipp:228
+#: src/emu/inpttype.ipp:262 src/emu/inpttype.ipp:296 src/emu/inpttype.ipp:330
+#: src/emu/inpttype.ipp:364 src/emu/inpttype.ipp:398 src/emu/inpttype.ipp:432
+#: src/emu/inpttype.ipp:466
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Down"
+msgid "%p Right Stick/Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:32
+#: src/emu/inpttype.ipp:30 src/emu/inpttype.ipp:148 src/emu/inpttype.ipp:229
+#: src/emu/inpttype.ipp:263 src/emu/inpttype.ipp:297 src/emu/inpttype.ipp:331
+#: src/emu/inpttype.ipp:365 src/emu/inpttype.ipp:399 src/emu/inpttype.ipp:433
+#: src/emu/inpttype.ipp:467
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Left"
+msgid "%p Left Stick/Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:33
+#: src/emu/inpttype.ipp:31 src/emu/inpttype.ipp:149 src/emu/inpttype.ipp:230
+#: src/emu/inpttype.ipp:264 src/emu/inpttype.ipp:298 src/emu/inpttype.ipp:332
+#: src/emu/inpttype.ipp:366 src/emu/inpttype.ipp:400 src/emu/inpttype.ipp:434
+#: src/emu/inpttype.ipp:468
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Right"
+msgid "%p Left Stick/Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:34
+#: src/emu/inpttype.ipp:32 src/emu/inpttype.ipp:150 src/emu/inpttype.ipp:231
+#: src/emu/inpttype.ipp:265 src/emu/inpttype.ipp:299 src/emu/inpttype.ipp:333
+#: src/emu/inpttype.ipp:367 src/emu/inpttype.ipp:401 src/emu/inpttype.ipp:435
+#: src/emu/inpttype.ipp:469
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 1"
+msgid "%p Left Stick/Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:35
+#: src/emu/inpttype.ipp:33 src/emu/inpttype.ipp:151 src/emu/inpttype.ipp:232
+#: src/emu/inpttype.ipp:266 src/emu/inpttype.ipp:300 src/emu/inpttype.ipp:334
+#: src/emu/inpttype.ipp:368 src/emu/inpttype.ipp:402 src/emu/inpttype.ipp:436
+#: src/emu/inpttype.ipp:470
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 2"
+msgid "%p Left Stick/Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:36
+#: src/emu/inpttype.ipp:34 src/emu/inpttype.ipp:152 src/emu/inpttype.ipp:233
+#: src/emu/inpttype.ipp:267 src/emu/inpttype.ipp:301 src/emu/inpttype.ipp:335
+#: src/emu/inpttype.ipp:369 src/emu/inpttype.ipp:403 src/emu/inpttype.ipp:437
+#: src/emu/inpttype.ipp:471
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 3"
+msgid "%p Button 1"
 msgstr ""
 
-#: src/emu/inpttype.ipp:37
+#: src/emu/inpttype.ipp:35 src/emu/inpttype.ipp:153 src/emu/inpttype.ipp:234
+#: src/emu/inpttype.ipp:268 src/emu/inpttype.ipp:302 src/emu/inpttype.ipp:336
+#: src/emu/inpttype.ipp:370 src/emu/inpttype.ipp:404 src/emu/inpttype.ipp:438
+#: src/emu/inpttype.ipp:472
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 4"
+msgid "%p Button 2"
 msgstr ""
 
-#: src/emu/inpttype.ipp:38
+#: src/emu/inpttype.ipp:36 src/emu/inpttype.ipp:154 src/emu/inpttype.ipp:235
+#: src/emu/inpttype.ipp:269 src/emu/inpttype.ipp:303 src/emu/inpttype.ipp:337
+#: src/emu/inpttype.ipp:371 src/emu/inpttype.ipp:405 src/emu/inpttype.ipp:439
+#: src/emu/inpttype.ipp:473
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 5"
+msgid "%p Button 3"
 msgstr ""
 
-#: src/emu/inpttype.ipp:39
+#: src/emu/inpttype.ipp:37 src/emu/inpttype.ipp:155 src/emu/inpttype.ipp:236
+#: src/emu/inpttype.ipp:270 src/emu/inpttype.ipp:304 src/emu/inpttype.ipp:338
+#: src/emu/inpttype.ipp:372 src/emu/inpttype.ipp:406 src/emu/inpttype.ipp:440
+#: src/emu/inpttype.ipp:474
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 6"
+msgid "%p Button 4"
 msgstr ""
 
-#: src/emu/inpttype.ipp:40
+#: src/emu/inpttype.ipp:38 src/emu/inpttype.ipp:156 src/emu/inpttype.ipp:237
+#: src/emu/inpttype.ipp:271 src/emu/inpttype.ipp:305 src/emu/inpttype.ipp:339
+#: src/emu/inpttype.ipp:373 src/emu/inpttype.ipp:407 src/emu/inpttype.ipp:441
+#: src/emu/inpttype.ipp:475
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 7"
+msgid "%p Button 5"
 msgstr ""
 
-#: src/emu/inpttype.ipp:41
+#: src/emu/inpttype.ipp:39 src/emu/inpttype.ipp:157 src/emu/inpttype.ipp:238
+#: src/emu/inpttype.ipp:272 src/emu/inpttype.ipp:306 src/emu/inpttype.ipp:340
+#: src/emu/inpttype.ipp:374 src/emu/inpttype.ipp:408 src/emu/inpttype.ipp:442
+#: src/emu/inpttype.ipp:476
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 8"
+msgid "%p Button 6"
 msgstr ""
 
-#: src/emu/inpttype.ipp:42
+#: src/emu/inpttype.ipp:40 src/emu/inpttype.ipp:158 src/emu/inpttype.ipp:239
+#: src/emu/inpttype.ipp:273 src/emu/inpttype.ipp:307 src/emu/inpttype.ipp:341
+#: src/emu/inpttype.ipp:375 src/emu/inpttype.ipp:409 src/emu/inpttype.ipp:443
+#: src/emu/inpttype.ipp:477
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 9"
+msgid "%p Button 7"
 msgstr ""
 
-#: src/emu/inpttype.ipp:43
+#: src/emu/inpttype.ipp:41 src/emu/inpttype.ipp:159 src/emu/inpttype.ipp:240
+#: src/emu/inpttype.ipp:274 src/emu/inpttype.ipp:308 src/emu/inpttype.ipp:342
+#: src/emu/inpttype.ipp:376 src/emu/inpttype.ipp:410 src/emu/inpttype.ipp:444
+#: src/emu/inpttype.ipp:478
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 10"
+msgid "%p Button 8"
 msgstr ""
 
-#: src/emu/inpttype.ipp:44
+#: src/emu/inpttype.ipp:42 src/emu/inpttype.ipp:160 src/emu/inpttype.ipp:241
+#: src/emu/inpttype.ipp:275 src/emu/inpttype.ipp:309 src/emu/inpttype.ipp:343
+#: src/emu/inpttype.ipp:377 src/emu/inpttype.ipp:411 src/emu/inpttype.ipp:445
+#: src/emu/inpttype.ipp:479
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 11"
+msgid "%p Button 9"
 msgstr ""
 
-#: src/emu/inpttype.ipp:45
+#: src/emu/inpttype.ipp:43 src/emu/inpttype.ipp:161 src/emu/inpttype.ipp:242
+#: src/emu/inpttype.ipp:276 src/emu/inpttype.ipp:310 src/emu/inpttype.ipp:344
+#: src/emu/inpttype.ipp:378 src/emu/inpttype.ipp:412 src/emu/inpttype.ipp:446
+#: src/emu/inpttype.ipp:480
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 12"
+msgid "%p Button 10"
 msgstr ""
 
-#: src/emu/inpttype.ipp:46
+#: src/emu/inpttype.ipp:44 src/emu/inpttype.ipp:162 src/emu/inpttype.ipp:243
+#: src/emu/inpttype.ipp:277 src/emu/inpttype.ipp:311 src/emu/inpttype.ipp:345
+#: src/emu/inpttype.ipp:379 src/emu/inpttype.ipp:413 src/emu/inpttype.ipp:447
+#: src/emu/inpttype.ipp:481
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 13"
+msgid "%p Button 11"
 msgstr ""
 
-#: src/emu/inpttype.ipp:47
+#: src/emu/inpttype.ipp:45 src/emu/inpttype.ipp:163 src/emu/inpttype.ipp:244
+#: src/emu/inpttype.ipp:278 src/emu/inpttype.ipp:312 src/emu/inpttype.ipp:346
+#: src/emu/inpttype.ipp:380 src/emu/inpttype.ipp:414 src/emu/inpttype.ipp:448
+#: src/emu/inpttype.ipp:482
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 14"
+msgid "%p Button 12"
 msgstr ""
 
-#: src/emu/inpttype.ipp:48
+#: src/emu/inpttype.ipp:46 src/emu/inpttype.ipp:164 src/emu/inpttype.ipp:245
+#: src/emu/inpttype.ipp:279 src/emu/inpttype.ipp:313 src/emu/inpttype.ipp:347
+#: src/emu/inpttype.ipp:381 src/emu/inpttype.ipp:415 src/emu/inpttype.ipp:449
+#: src/emu/inpttype.ipp:483
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 15"
+msgid "%p Button 13"
 msgstr ""
 
-#: src/emu/inpttype.ipp:49
+#: src/emu/inpttype.ipp:47 src/emu/inpttype.ipp:165 src/emu/inpttype.ipp:246
+#: src/emu/inpttype.ipp:280 src/emu/inpttype.ipp:314 src/emu/inpttype.ipp:348
+#: src/emu/inpttype.ipp:382 src/emu/inpttype.ipp:416 src/emu/inpttype.ipp:450
+#: src/emu/inpttype.ipp:484
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 16"
+msgid "%p Button 14"
 msgstr ""
 
-#: src/emu/inpttype.ipp:50
+#: src/emu/inpttype.ipp:48 src/emu/inpttype.ipp:166 src/emu/inpttype.ipp:247
+#: src/emu/inpttype.ipp:281 src/emu/inpttype.ipp:315 src/emu/inpttype.ipp:349
+#: src/emu/inpttype.ipp:383 src/emu/inpttype.ipp:417 src/emu/inpttype.ipp:451
+#: src/emu/inpttype.ipp:485
+#, c-format
 msgctxt "input-name"
-msgid "P1 Start"
+msgid "%p Button 15"
 msgstr ""
 
-#: src/emu/inpttype.ipp:51
+#: src/emu/inpttype.ipp:49 src/emu/inpttype.ipp:167 src/emu/inpttype.ipp:248
+#: src/emu/inpttype.ipp:282 src/emu/inpttype.ipp:316 src/emu/inpttype.ipp:350
+#: src/emu/inpttype.ipp:384 src/emu/inpttype.ipp:418 src/emu/inpttype.ipp:452
+#: src/emu/inpttype.ipp:486
+#, c-format
 msgctxt "input-name"
-msgid "P1 Select"
+msgid "%p Button 16"
 msgstr ""
 
-#: src/emu/inpttype.ipp:56
+#: src/emu/inpttype.ipp:50 src/emu/inpttype.ipp:168 src/emu/inpttype.ipp:249
+#: src/emu/inpttype.ipp:283 src/emu/inpttype.ipp:317 src/emu/inpttype.ipp:351
+#: src/emu/inpttype.ipp:385 src/emu/inpttype.ipp:419 src/emu/inpttype.ipp:453
+#: src/emu/inpttype.ipp:487
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong A"
+msgid "%p Start"
 msgstr ""
 
-#: src/emu/inpttype.ipp:57
+#: src/emu/inpttype.ipp:51 src/emu/inpttype.ipp:169 src/emu/inpttype.ipp:250
+#: src/emu/inpttype.ipp:284 src/emu/inpttype.ipp:318 src/emu/inpttype.ipp:352
+#: src/emu/inpttype.ipp:386 src/emu/inpttype.ipp:420 src/emu/inpttype.ipp:454
+#: src/emu/inpttype.ipp:488
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong B"
+msgid "%p Select"
 msgstr ""
 
-#: src/emu/inpttype.ipp:58
+#: src/emu/inpttype.ipp:56 src/emu/inpttype.ipp:174
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong C"
+msgid "%p Mahjong A"
 msgstr ""
 
-#: src/emu/inpttype.ipp:59
+#: src/emu/inpttype.ipp:57 src/emu/inpttype.ipp:175
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong D"
+msgid "%p Mahjong B"
 msgstr ""
 
-#: src/emu/inpttype.ipp:60
+#: src/emu/inpttype.ipp:58 src/emu/inpttype.ipp:176
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong E"
+msgid "%p Mahjong C"
 msgstr ""
 
-#: src/emu/inpttype.ipp:61
+#: src/emu/inpttype.ipp:59 src/emu/inpttype.ipp:177
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong F"
+msgid "%p Mahjong D"
 msgstr ""
 
-#: src/emu/inpttype.ipp:62
+#: src/emu/inpttype.ipp:60 src/emu/inpttype.ipp:178
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong G"
+msgid "%p Mahjong E"
 msgstr ""
 
-#: src/emu/inpttype.ipp:63
+#: src/emu/inpttype.ipp:61 src/emu/inpttype.ipp:179
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong H"
+msgid "%p Mahjong F"
 msgstr ""
 
-#: src/emu/inpttype.ipp:64
+#: src/emu/inpttype.ipp:62 src/emu/inpttype.ipp:180
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong I"
+msgid "%p Mahjong G"
 msgstr ""
 
-#: src/emu/inpttype.ipp:65
+#: src/emu/inpttype.ipp:63 src/emu/inpttype.ipp:181
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong J"
+msgid "%p Mahjong H"
 msgstr ""
 
-#: src/emu/inpttype.ipp:66
+#: src/emu/inpttype.ipp:64 src/emu/inpttype.ipp:182
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong K"
+msgid "%p Mahjong I"
 msgstr ""
 
-#: src/emu/inpttype.ipp:67
+#: src/emu/inpttype.ipp:65 src/emu/inpttype.ipp:183
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong L"
+msgid "%p Mahjong J"
 msgstr ""
 
-#: src/emu/inpttype.ipp:68
+#: src/emu/inpttype.ipp:66 src/emu/inpttype.ipp:184
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong M"
+msgid "%p Mahjong K"
 msgstr ""
 
-#: src/emu/inpttype.ipp:69
+#: src/emu/inpttype.ipp:67 src/emu/inpttype.ipp:185
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong N"
+msgid "%p Mahjong L"
 msgstr ""
 
-#: src/emu/inpttype.ipp:70
+#: src/emu/inpttype.ipp:68 src/emu/inpttype.ipp:186
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong O"
+msgid "%p Mahjong M"
 msgstr ""
 
-#: src/emu/inpttype.ipp:71
+#: src/emu/inpttype.ipp:69 src/emu/inpttype.ipp:187
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong P"
+msgid "%p Mahjong N"
 msgstr ""
 
-#: src/emu/inpttype.ipp:72
+#: src/emu/inpttype.ipp:70 src/emu/inpttype.ipp:188
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Q"
+msgid "%p Mahjong O"
 msgstr ""
 
-#: src/emu/inpttype.ipp:73
+#: src/emu/inpttype.ipp:71 src/emu/inpttype.ipp:189
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Kan"
+msgid "%p Mahjong P"
 msgstr ""
 
-#: src/emu/inpttype.ipp:74
+#: src/emu/inpttype.ipp:72 src/emu/inpttype.ipp:190
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Pon"
+msgid "%p Mahjong Q"
 msgstr ""
 
-#: src/emu/inpttype.ipp:75
+#: src/emu/inpttype.ipp:73 src/emu/inpttype.ipp:191
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Chi"
+msgid "%p Mahjong Kan"
 msgstr ""
 
-#: src/emu/inpttype.ipp:76
+#: src/emu/inpttype.ipp:74 src/emu/inpttype.ipp:192
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Reach"
+msgid "%p Mahjong Pon"
 msgstr ""
 
-#: src/emu/inpttype.ipp:77
+#: src/emu/inpttype.ipp:75 src/emu/inpttype.ipp:193
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Ron"
+msgid "%p Mahjong Chi"
 msgstr ""
 
-#: src/emu/inpttype.ipp:78
+#: src/emu/inpttype.ipp:76 src/emu/inpttype.ipp:194
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Flip Flop"
+msgid "%p Mahjong Reach"
 msgstr ""
 
-#: src/emu/inpttype.ipp:79
+#: src/emu/inpttype.ipp:77 src/emu/inpttype.ipp:195
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Bet"
+msgid "%p Mahjong Ron"
 msgstr ""
 
-#: src/emu/inpttype.ipp:80
+#: src/emu/inpttype.ipp:78 src/emu/inpttype.ipp:200
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Take Score"
+msgid "%p Mahjong Flip Flop"
 msgstr ""
 
-#: src/emu/inpttype.ipp:81
+#: src/emu/inpttype.ipp:79 src/emu/inpttype.ipp:196
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Double Up"
+msgid "%p Mahjong Bet"
 msgstr ""
 
-#: src/emu/inpttype.ipp:82
+#: src/emu/inpttype.ipp:80 src/emu/inpttype.ipp:198
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Big"
+msgid "%p Mahjong Take Score"
 msgstr ""
 
-#: src/emu/inpttype.ipp:83
+#: src/emu/inpttype.ipp:81 src/emu/inpttype.ipp:199
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Small"
+msgid "%p Mahjong Double Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:84
+#: src/emu/inpttype.ipp:82 src/emu/inpttype.ipp:201
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Last Chance"
+msgid "%p Mahjong Big"
 msgstr ""
 
-#: src/emu/inpttype.ipp:89
+#: src/emu/inpttype.ipp:83 src/emu/inpttype.ipp:202
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda A/1"
+msgid "%p Mahjong Small"
 msgstr ""
 
-#: src/emu/inpttype.ipp:90
+#: src/emu/inpttype.ipp:84 src/emu/inpttype.ipp:197
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda B/2"
+msgid "%p Mahjong Last Chance"
 msgstr ""
 
-#: src/emu/inpttype.ipp:91
+#: src/emu/inpttype.ipp:89 src/emu/inpttype.ipp:207
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda C/3"
+msgid "%p Hanafuda A/1"
 msgstr ""
 
-#: src/emu/inpttype.ipp:92
+#: src/emu/inpttype.ipp:90 src/emu/inpttype.ipp:208
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda D/4"
+msgid "%p Hanafuda B/2"
 msgstr ""
 
-#: src/emu/inpttype.ipp:93
+#: src/emu/inpttype.ipp:91 src/emu/inpttype.ipp:209
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda E/5"
+msgid "%p Hanafuda C/3"
 msgstr ""
 
-#: src/emu/inpttype.ipp:94
+#: src/emu/inpttype.ipp:92 src/emu/inpttype.ipp:210
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda F/6"
+msgid "%p Hanafuda D/4"
 msgstr ""
 
-#: src/emu/inpttype.ipp:95
+#: src/emu/inpttype.ipp:93 src/emu/inpttype.ipp:211
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda G/7"
+msgid "%p Hanafuda E/5"
 msgstr ""
 
-#: src/emu/inpttype.ipp:96
+#: src/emu/inpttype.ipp:94 src/emu/inpttype.ipp:212
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda H/8"
+msgid "%p Hanafuda F/6"
 msgstr ""
 
-#: src/emu/inpttype.ipp:97
+#: src/emu/inpttype.ipp:95 src/emu/inpttype.ipp:213
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda Yes"
+msgid "%p Hanafuda G/7"
 msgstr ""
 
-#: src/emu/inpttype.ipp:98
+#: src/emu/inpttype.ipp:96 src/emu/inpttype.ipp:214
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda No"
+msgid "%p Hanafuda H/8"
+msgstr ""
+
+#: src/emu/inpttype.ipp:97 src/emu/inpttype.ipp:215
+#, c-format
+msgctxt "input-name"
+msgid "%p Hanafuda Yes"
+msgstr ""
+
+#: src/emu/inpttype.ipp:98 src/emu/inpttype.ipp:216
+#, c-format
+msgctxt "input-name"
+msgid "%p Hanafuda No"
 msgstr ""
 
 #: src/emu/inpttype.ipp:103
@@ -3770,1551 +3944,6 @@ msgctxt "input-name"
 msgid "Stop All Reels"
 msgstr ""
 
-#: src/emu/inpttype.ipp:140
-msgctxt "input-name"
-msgid "P2 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:141
-msgctxt "input-name"
-msgid "P2 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:142
-msgctxt "input-name"
-msgid "P2 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:143
-msgctxt "input-name"
-msgid "P2 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:144
-msgctxt "input-name"
-msgid "P2 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:145
-msgctxt "input-name"
-msgid "P2 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:146
-msgctxt "input-name"
-msgid "P2 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:147
-msgctxt "input-name"
-msgid "P2 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:148
-msgctxt "input-name"
-msgid "P2 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:149
-msgctxt "input-name"
-msgid "P2 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:150
-msgctxt "input-name"
-msgid "P2 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:151
-msgctxt "input-name"
-msgid "P2 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:152
-msgctxt "input-name"
-msgid "P2 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:153
-msgctxt "input-name"
-msgid "P2 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:154
-msgctxt "input-name"
-msgid "P2 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:155
-msgctxt "input-name"
-msgid "P2 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:156
-msgctxt "input-name"
-msgid "P2 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:157
-msgctxt "input-name"
-msgid "P2 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:158
-msgctxt "input-name"
-msgid "P2 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:159
-msgctxt "input-name"
-msgid "P2 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:160
-msgctxt "input-name"
-msgid "P2 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:161
-msgctxt "input-name"
-msgid "P2 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:162
-msgctxt "input-name"
-msgid "P2 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:163
-msgctxt "input-name"
-msgid "P2 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:164
-msgctxt "input-name"
-msgid "P2 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:165
-msgctxt "input-name"
-msgid "P2 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:166
-msgctxt "input-name"
-msgid "P2 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:167
-msgctxt "input-name"
-msgid "P2 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:168
-msgctxt "input-name"
-msgid "P2 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:169
-msgctxt "input-name"
-msgid "P2 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:174
-msgctxt "input-name"
-msgid "P2 Mahjong A"
-msgstr ""
-
-#: src/emu/inpttype.ipp:175
-msgctxt "input-name"
-msgid "P2 Mahjong B"
-msgstr ""
-
-#: src/emu/inpttype.ipp:176
-msgctxt "input-name"
-msgid "P2 Mahjong C"
-msgstr ""
-
-#: src/emu/inpttype.ipp:177
-msgctxt "input-name"
-msgid "P2 Mahjong D"
-msgstr ""
-
-#: src/emu/inpttype.ipp:178
-msgctxt "input-name"
-msgid "P2 Mahjong E"
-msgstr ""
-
-#: src/emu/inpttype.ipp:179
-msgctxt "input-name"
-msgid "P2 Mahjong F"
-msgstr ""
-
-#: src/emu/inpttype.ipp:180
-msgctxt "input-name"
-msgid "P2 Mahjong G"
-msgstr ""
-
-#: src/emu/inpttype.ipp:181
-msgctxt "input-name"
-msgid "P2 Mahjong H"
-msgstr ""
-
-#: src/emu/inpttype.ipp:182
-msgctxt "input-name"
-msgid "P2 Mahjong I"
-msgstr ""
-
-#: src/emu/inpttype.ipp:183
-msgctxt "input-name"
-msgid "P2 Mahjong J"
-msgstr ""
-
-#: src/emu/inpttype.ipp:184
-msgctxt "input-name"
-msgid "P2 Mahjong K"
-msgstr ""
-
-#: src/emu/inpttype.ipp:185
-msgctxt "input-name"
-msgid "P2 Mahjong L"
-msgstr ""
-
-#: src/emu/inpttype.ipp:186
-msgctxt "input-name"
-msgid "P2 Mahjong M"
-msgstr ""
-
-#: src/emu/inpttype.ipp:187
-msgctxt "input-name"
-msgid "P2 Mahjong N"
-msgstr ""
-
-#: src/emu/inpttype.ipp:188
-msgctxt "input-name"
-msgid "P2 Mahjong O"
-msgstr ""
-
-#: src/emu/inpttype.ipp:189
-msgctxt "input-name"
-msgid "P2 Mahjong P"
-msgstr ""
-
-#: src/emu/inpttype.ipp:190
-msgctxt "input-name"
-msgid "P2 Mahjong Q"
-msgstr ""
-
-#: src/emu/inpttype.ipp:191
-msgctxt "input-name"
-msgid "P2 Mahjong Kan"
-msgstr ""
-
-#: src/emu/inpttype.ipp:192
-msgctxt "input-name"
-msgid "P2 Mahjong Pon"
-msgstr ""
-
-#: src/emu/inpttype.ipp:193
-msgctxt "input-name"
-msgid "P2 Mahjong Chi"
-msgstr ""
-
-#: src/emu/inpttype.ipp:194
-msgctxt "input-name"
-msgid "P2 Mahjong Reach"
-msgstr ""
-
-#: src/emu/inpttype.ipp:195
-msgctxt "input-name"
-msgid "P2 Mahjong Ron"
-msgstr ""
-
-#: src/emu/inpttype.ipp:196
-msgctxt "input-name"
-msgid "P2 Mahjong Bet"
-msgstr ""
-
-#: src/emu/inpttype.ipp:197
-msgctxt "input-name"
-msgid "P2 Mahjong Last Chance"
-msgstr ""
-
-#: src/emu/inpttype.ipp:198
-msgctxt "input-name"
-msgid "P2 Mahjong Take Score"
-msgstr ""
-
-#: src/emu/inpttype.ipp:199
-msgctxt "input-name"
-msgid "P2 Mahjong Double Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:200
-msgctxt "input-name"
-msgid "P2 Mahjong Flip Flop"
-msgstr ""
-
-#: src/emu/inpttype.ipp:201
-msgctxt "input-name"
-msgid "P2 Mahjong Big"
-msgstr ""
-
-#: src/emu/inpttype.ipp:202
-msgctxt "input-name"
-msgid "P2 Mahjong Small"
-msgstr ""
-
-#: src/emu/inpttype.ipp:207
-msgctxt "input-name"
-msgid "P2 Hanafuda A/1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:208
-msgctxt "input-name"
-msgid "P2 Hanafuda B/2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:209
-msgctxt "input-name"
-msgid "P2 Hanafuda C/3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:210
-msgctxt "input-name"
-msgid "P2 Hanafuda D/4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:211
-msgctxt "input-name"
-msgid "P2 Hanafuda E/5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:212
-msgctxt "input-name"
-msgid "P2 Hanafuda F/6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:213
-msgctxt "input-name"
-msgid "P2 Hanafuda G/7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:214
-msgctxt "input-name"
-msgid "P2 Hanafuda H/8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:215
-msgctxt "input-name"
-msgid "P2 Hanafuda Yes"
-msgstr ""
-
-#: src/emu/inpttype.ipp:216
-msgctxt "input-name"
-msgid "P2 Hanafuda No"
-msgstr ""
-
-#: src/emu/inpttype.ipp:221
-msgctxt "input-name"
-msgid "P3 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:222
-msgctxt "input-name"
-msgid "P3 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:223
-msgctxt "input-name"
-msgid "P3 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:224
-msgctxt "input-name"
-msgid "P3 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:225
-msgctxt "input-name"
-msgid "P3 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:226
-msgctxt "input-name"
-msgid "P3 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:227
-msgctxt "input-name"
-msgid "P3 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:228
-msgctxt "input-name"
-msgid "P3 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:229
-msgctxt "input-name"
-msgid "P3 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:230
-msgctxt "input-name"
-msgid "P3 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:231
-msgctxt "input-name"
-msgid "P3 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:232
-msgctxt "input-name"
-msgid "P3 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:233
-msgctxt "input-name"
-msgid "P3 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:234
-msgctxt "input-name"
-msgid "P3 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:235
-msgctxt "input-name"
-msgid "P3 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:236
-msgctxt "input-name"
-msgid "P3 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:237
-msgctxt "input-name"
-msgid "P3 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:238
-msgctxt "input-name"
-msgid "P3 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:239
-msgctxt "input-name"
-msgid "P3 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:240
-msgctxt "input-name"
-msgid "P3 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:241
-msgctxt "input-name"
-msgid "P3 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:242
-msgctxt "input-name"
-msgid "P3 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:243
-msgctxt "input-name"
-msgid "P3 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:244
-msgctxt "input-name"
-msgid "P3 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:245
-msgctxt "input-name"
-msgid "P3 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:246
-msgctxt "input-name"
-msgid "P3 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:247
-msgctxt "input-name"
-msgid "P3 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:248
-msgctxt "input-name"
-msgid "P3 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:249
-msgctxt "input-name"
-msgid "P3 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:250
-msgctxt "input-name"
-msgid "P3 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:255
-msgctxt "input-name"
-msgid "P4 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:256
-msgctxt "input-name"
-msgid "P4 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:257
-msgctxt "input-name"
-msgid "P4 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:258
-msgctxt "input-name"
-msgid "P4 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:259
-msgctxt "input-name"
-msgid "P4 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:260
-msgctxt "input-name"
-msgid "P4 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:261
-msgctxt "input-name"
-msgid "P4 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:262
-msgctxt "input-name"
-msgid "P4 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:263
-msgctxt "input-name"
-msgid "P4 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:264
-msgctxt "input-name"
-msgid "P4 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:265
-msgctxt "input-name"
-msgid "P4 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:266
-msgctxt "input-name"
-msgid "P4 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:267
-msgctxt "input-name"
-msgid "P4 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:268
-msgctxt "input-name"
-msgid "P4 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:269
-msgctxt "input-name"
-msgid "P4 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:270
-msgctxt "input-name"
-msgid "P4 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:271
-msgctxt "input-name"
-msgid "P4 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:272
-msgctxt "input-name"
-msgid "P4 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:273
-msgctxt "input-name"
-msgid "P4 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:274
-msgctxt "input-name"
-msgid "P4 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:275
-msgctxt "input-name"
-msgid "P4 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:276
-msgctxt "input-name"
-msgid "P4 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:277
-msgctxt "input-name"
-msgid "P4 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:278
-msgctxt "input-name"
-msgid "P4 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:279
-msgctxt "input-name"
-msgid "P4 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:280
-msgctxt "input-name"
-msgid "P4 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:281
-msgctxt "input-name"
-msgid "P4 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:282
-msgctxt "input-name"
-msgid "P4 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:283
-msgctxt "input-name"
-msgid "P4 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:284
-msgctxt "input-name"
-msgid "P4 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:289
-msgctxt "input-name"
-msgid "P5 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:290
-msgctxt "input-name"
-msgid "P5 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:291
-msgctxt "input-name"
-msgid "P5 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:292
-msgctxt "input-name"
-msgid "P5 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:293
-msgctxt "input-name"
-msgid "P5 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:294
-msgctxt "input-name"
-msgid "P5 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:295
-msgctxt "input-name"
-msgid "P5 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:296
-msgctxt "input-name"
-msgid "P5 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:297
-msgctxt "input-name"
-msgid "P5 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:298
-msgctxt "input-name"
-msgid "P5 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:299
-msgctxt "input-name"
-msgid "P5 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:300
-msgctxt "input-name"
-msgid "P5 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:301
-msgctxt "input-name"
-msgid "P5 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:302
-msgctxt "input-name"
-msgid "P5 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:303
-msgctxt "input-name"
-msgid "P5 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:304
-msgctxt "input-name"
-msgid "P5 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:305
-msgctxt "input-name"
-msgid "P5 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:306
-msgctxt "input-name"
-msgid "P5 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:307
-msgctxt "input-name"
-msgid "P5 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:308
-msgctxt "input-name"
-msgid "P5 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:309
-msgctxt "input-name"
-msgid "P5 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:310
-msgctxt "input-name"
-msgid "P5 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:311
-msgctxt "input-name"
-msgid "P5 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:312
-msgctxt "input-name"
-msgid "P5 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:313
-msgctxt "input-name"
-msgid "P5 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:314
-msgctxt "input-name"
-msgid "P5 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:315
-msgctxt "input-name"
-msgid "P5 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:316
-msgctxt "input-name"
-msgid "P5 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:317
-msgctxt "input-name"
-msgid "P5 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:318
-msgctxt "input-name"
-msgid "P5 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:323
-msgctxt "input-name"
-msgid "P6 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:324
-msgctxt "input-name"
-msgid "P6 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:325
-msgctxt "input-name"
-msgid "P6 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:326
-msgctxt "input-name"
-msgid "P6 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:327
-msgctxt "input-name"
-msgid "P6 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:328
-msgctxt "input-name"
-msgid "P6 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:329
-msgctxt "input-name"
-msgid "P6 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:330
-msgctxt "input-name"
-msgid "P6 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:331
-msgctxt "input-name"
-msgid "P6 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:332
-msgctxt "input-name"
-msgid "P6 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:333
-msgctxt "input-name"
-msgid "P6 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:334
-msgctxt "input-name"
-msgid "P6 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:335
-msgctxt "input-name"
-msgid "P6 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:336
-msgctxt "input-name"
-msgid "P6 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:337
-msgctxt "input-name"
-msgid "P6 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:338
-msgctxt "input-name"
-msgid "P6 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:339
-msgctxt "input-name"
-msgid "P6 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:340
-msgctxt "input-name"
-msgid "P6 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:341
-msgctxt "input-name"
-msgid "P6 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:342
-msgctxt "input-name"
-msgid "P6 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:343
-msgctxt "input-name"
-msgid "P6 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:344
-msgctxt "input-name"
-msgid "P6 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:345
-msgctxt "input-name"
-msgid "P6 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:346
-msgctxt "input-name"
-msgid "P6 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:347
-msgctxt "input-name"
-msgid "P6 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:348
-msgctxt "input-name"
-msgid "P6 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:349
-msgctxt "input-name"
-msgid "P6 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:350
-msgctxt "input-name"
-msgid "P6 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:351
-msgctxt "input-name"
-msgid "P6 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:352
-msgctxt "input-name"
-msgid "P6 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:357
-msgctxt "input-name"
-msgid "P7 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:358
-msgctxt "input-name"
-msgid "P7 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:359
-msgctxt "input-name"
-msgid "P7 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:360
-msgctxt "input-name"
-msgid "P7 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:361
-msgctxt "input-name"
-msgid "P7 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:362
-msgctxt "input-name"
-msgid "P7 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:363
-msgctxt "input-name"
-msgid "P7 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:364
-msgctxt "input-name"
-msgid "P7 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:365
-msgctxt "input-name"
-msgid "P7 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:366
-msgctxt "input-name"
-msgid "P7 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:367
-msgctxt "input-name"
-msgid "P7 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:368
-msgctxt "input-name"
-msgid "P7 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:369
-msgctxt "input-name"
-msgid "P7 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:370
-msgctxt "input-name"
-msgid "P7 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:371
-msgctxt "input-name"
-msgid "P7 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:372
-msgctxt "input-name"
-msgid "P7 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:373
-msgctxt "input-name"
-msgid "P7 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:374
-msgctxt "input-name"
-msgid "P7 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:375
-msgctxt "input-name"
-msgid "P7 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:376
-msgctxt "input-name"
-msgid "P7 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:377
-msgctxt "input-name"
-msgid "P7 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:378
-msgctxt "input-name"
-msgid "P7 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:379
-msgctxt "input-name"
-msgid "P7 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:380
-msgctxt "input-name"
-msgid "P7 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:381
-msgctxt "input-name"
-msgid "P7 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:382
-msgctxt "input-name"
-msgid "P7 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:383
-msgctxt "input-name"
-msgid "P7 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:384
-msgctxt "input-name"
-msgid "P7 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:385
-msgctxt "input-name"
-msgid "P7 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:386
-msgctxt "input-name"
-msgid "P7 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:391
-msgctxt "input-name"
-msgid "P8 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:392
-msgctxt "input-name"
-msgid "P8 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:393
-msgctxt "input-name"
-msgid "P8 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:394
-msgctxt "input-name"
-msgid "P8 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:395
-msgctxt "input-name"
-msgid "P8 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:396
-msgctxt "input-name"
-msgid "P8 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:397
-msgctxt "input-name"
-msgid "P8 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:398
-msgctxt "input-name"
-msgid "P8 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:399
-msgctxt "input-name"
-msgid "P8 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:400
-msgctxt "input-name"
-msgid "P8 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:401
-msgctxt "input-name"
-msgid "P8 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:402
-msgctxt "input-name"
-msgid "P8 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:403
-msgctxt "input-name"
-msgid "P8 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:404
-msgctxt "input-name"
-msgid "P8 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:405
-msgctxt "input-name"
-msgid "P8 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:406
-msgctxt "input-name"
-msgid "P8 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:407
-msgctxt "input-name"
-msgid "P8 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:408
-msgctxt "input-name"
-msgid "P8 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:409
-msgctxt "input-name"
-msgid "P8 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:410
-msgctxt "input-name"
-msgid "P8 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:411
-msgctxt "input-name"
-msgid "P8 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:412
-msgctxt "input-name"
-msgid "P8 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:413
-msgctxt "input-name"
-msgid "P8 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:414
-msgctxt "input-name"
-msgid "P8 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:415
-msgctxt "input-name"
-msgid "P8 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:416
-msgctxt "input-name"
-msgid "P8 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:417
-msgctxt "input-name"
-msgid "P8 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:418
-msgctxt "input-name"
-msgid "P8 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:419
-msgctxt "input-name"
-msgid "P8 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:420
-msgctxt "input-name"
-msgid "P8 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:425
-msgctxt "input-name"
-msgid "P9 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:426
-msgctxt "input-name"
-msgid "P9 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:427
-msgctxt "input-name"
-msgid "P9 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:428
-msgctxt "input-name"
-msgid "P9 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:429
-msgctxt "input-name"
-msgid "P9 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:430
-msgctxt "input-name"
-msgid "P9 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:431
-msgctxt "input-name"
-msgid "P9 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:432
-msgctxt "input-name"
-msgid "P9 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:433
-msgctxt "input-name"
-msgid "P9 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:434
-msgctxt "input-name"
-msgid "P9 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:435
-msgctxt "input-name"
-msgid "P9 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:436
-msgctxt "input-name"
-msgid "P9 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:437
-msgctxt "input-name"
-msgid "P9 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:438
-msgctxt "input-name"
-msgid "P9 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:439
-msgctxt "input-name"
-msgid "P9 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:440
-msgctxt "input-name"
-msgid "P9 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:441
-msgctxt "input-name"
-msgid "P9 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:442
-msgctxt "input-name"
-msgid "P9 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:443
-msgctxt "input-name"
-msgid "P9 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:444
-msgctxt "input-name"
-msgid "P9 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:445
-msgctxt "input-name"
-msgid "P9 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:446
-msgctxt "input-name"
-msgid "P9 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:447
-msgctxt "input-name"
-msgid "P9 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:448
-msgctxt "input-name"
-msgid "P9 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:449
-msgctxt "input-name"
-msgid "P9 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:450
-msgctxt "input-name"
-msgid "P9 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:451
-msgctxt "input-name"
-msgid "P9 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:452
-msgctxt "input-name"
-msgid "P9 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:453
-msgctxt "input-name"
-msgid "P9 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:454
-msgctxt "input-name"
-msgid "P9 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:459
-msgctxt "input-name"
-msgid "P10 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:460
-msgctxt "input-name"
-msgid "P10 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:461
-msgctxt "input-name"
-msgid "P10 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:462
-msgctxt "input-name"
-msgid "P10 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:463
-msgctxt "input-name"
-msgid "P10 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:464
-msgctxt "input-name"
-msgid "P10 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:465
-msgctxt "input-name"
-msgid "P10 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:466
-msgctxt "input-name"
-msgid "P10 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:467
-msgctxt "input-name"
-msgid "P10 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:468
-msgctxt "input-name"
-msgid "P10 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:469
-msgctxt "input-name"
-msgid "P10 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:470
-msgctxt "input-name"
-msgid "P10 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:471
-msgctxt "input-name"
-msgid "P10 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:472
-msgctxt "input-name"
-msgid "P10 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:473
-msgctxt "input-name"
-msgid "P10 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:474
-msgctxt "input-name"
-msgid "P10 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:475
-msgctxt "input-name"
-msgid "P10 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:476
-msgctxt "input-name"
-msgid "P10 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:477
-msgctxt "input-name"
-msgid "P10 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:478
-msgctxt "input-name"
-msgid "P10 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:479
-msgctxt "input-name"
-msgid "P10 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:480
-msgctxt "input-name"
-msgid "P10 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:481
-msgctxt "input-name"
-msgid "P10 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:482
-msgctxt "input-name"
-msgid "P10 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:483
-msgctxt "input-name"
-msgid "P10 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:484
-msgctxt "input-name"
-msgid "P10 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:485
-msgctxt "input-name"
-msgid "P10 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:486
-msgctxt "input-name"
-msgid "P10 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:487
-msgctxt "input-name"
-msgid "P10 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:488
-msgctxt "input-name"
-msgid "P10 Select"
-msgstr ""
-
 #: src/emu/inpttype.ipp:493
 msgctxt "input-name"
 msgid "1 Player Start"
@@ -5495,154 +4124,31 @@ msgctxt "input-name"
 msgid "Volume Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:550
-msgctxt "input-name"
-msgid "P1 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:551
-msgctxt "input-name"
-msgid "P2 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:552
-msgctxt "input-name"
-msgid "P3 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:553
-msgctxt "input-name"
-msgid "P4 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:554
-msgctxt "input-name"
-msgid "P5 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:555
-msgctxt "input-name"
-msgid "P6 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:556
-msgctxt "input-name"
-msgid "P7 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:557
-msgctxt "input-name"
-msgid "P8 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:558
-msgctxt "input-name"
-msgid "P9 Pedal 1"
-msgstr ""
-
+#: src/emu/inpttype.ipp:550 src/emu/inpttype.ipp:551 src/emu/inpttype.ipp:552
+#: src/emu/inpttype.ipp:553 src/emu/inpttype.ipp:554 src/emu/inpttype.ipp:555
+#: src/emu/inpttype.ipp:556 src/emu/inpttype.ipp:557 src/emu/inpttype.ipp:558
 #: src/emu/inpttype.ipp:559
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:564
-msgctxt "input-name"
-msgid "P1 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:565
-msgctxt "input-name"
-msgid "P2 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:566
-msgctxt "input-name"
-msgid "P3 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:567
-msgctxt "input-name"
-msgid "P4 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:568
-msgctxt "input-name"
-msgid "P5 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:569
-msgctxt "input-name"
-msgid "P6 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:570
-msgctxt "input-name"
-msgid "P7 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:571
-msgctxt "input-name"
-msgid "P8 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:572
-msgctxt "input-name"
-msgid "P9 Pedal 2"
+msgid "%p Pedal 1"
 msgstr ""
 
+#: src/emu/inpttype.ipp:564 src/emu/inpttype.ipp:565 src/emu/inpttype.ipp:566
+#: src/emu/inpttype.ipp:567 src/emu/inpttype.ipp:568 src/emu/inpttype.ipp:569
+#: src/emu/inpttype.ipp:570 src/emu/inpttype.ipp:571 src/emu/inpttype.ipp:572
 #: src/emu/inpttype.ipp:573
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:578
-msgctxt "input-name"
-msgid "P1 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:579
-msgctxt "input-name"
-msgid "P2 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:580
-msgctxt "input-name"
-msgid "P3 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:581
-msgctxt "input-name"
-msgid "P4 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:582
-msgctxt "input-name"
-msgid "P5 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:583
-msgctxt "input-name"
-msgid "P6 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:584
-msgctxt "input-name"
-msgid "P7 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:585
-msgctxt "input-name"
-msgid "P8 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:586
-msgctxt "input-name"
-msgid "P9 Pedal 3"
+msgid "%p Pedal 2"
 msgstr ""
 
+#: src/emu/inpttype.ipp:578 src/emu/inpttype.ipp:579 src/emu/inpttype.ipp:580
+#: src/emu/inpttype.ipp:581 src/emu/inpttype.ipp:582 src/emu/inpttype.ipp:583
+#: src/emu/inpttype.ipp:584 src/emu/inpttype.ipp:585 src/emu/inpttype.ipp:586
 #: src/emu/inpttype.ipp:587
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 3"
+msgid "%p Pedal 3"
 msgstr ""
 
 #: src/emu/inpttype.ipp:592
@@ -7530,6 +6036,15 @@ msgid ""
 "%s"
 msgstr ""
 
+#~ msgid "Confirm quit from machines"
+#~ msgstr "Makinelerden çıkarken onayla"
+
+#~ msgid "Skip information screen at startup"
+#~ msgstr "Başlangıçta bilgi ekranını atla"
+
+#~ msgid "Input (this Machine)"
+#~ msgstr "Girdi (bu Makine)"
+
 #~ msgid "Restore originals colors"
 #~ msgstr "Orijinal renkleri geri yükle"
 
diff --git a/language/Ukrainian/strings.po b/language/Ukrainian/strings.po
index 76aaf307bf0..563f0f9864a 100644
--- a/language/Ukrainian/strings.po
+++ b/language/Ukrainian/strings.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-19 02:50+1100\n"
+"POT-Creation-Date: 2021-12-09 04:44+1100\n"
 "PO-Revision-Date: 2016-02-20 18:03+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: MAME Language Team\n"
@@ -261,12 +261,12 @@ msgstr ""
 msgid "Driver: \"%1$s\" software list "
 msgstr ""
 
-#: src/frontend/mame/ui/selsoft.cpp:711 src/frontend/mame/ui/selgame.cpp:1066
+#: src/frontend/mame/ui/selsoft.cpp:711 src/frontend/mame/ui/selgame.cpp:1076
 #, c-format
 msgid "%1$s: %2$s - Search: %3$s_"
 msgstr ""
 
-#: src/frontend/mame/ui/selsoft.cpp:713 src/frontend/mame/ui/selgame.cpp:1068
+#: src/frontend/mame/ui/selsoft.cpp:713 src/frontend/mame/ui/selgame.cpp:1078
 #, c-format
 msgid "Search: %1$s_"
 msgstr ""
@@ -276,7 +276,7 @@ msgstr ""
 msgid "Software list/item: %1$s:%2$s"
 msgstr ""
 
-#: src/frontend/mame/ui/optsmenu.cpp:73 src/frontend/mame/ui/sndmenu.cpp:165
+#: src/frontend/mame/ui/optsmenu.cpp:73 src/frontend/mame/ui/sndmenu.cpp:161
 msgid "Sound Options"
 msgstr ""
 
@@ -371,11 +371,11 @@ msgid "Show mouse pointer"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:39
-msgid "Confirm quit from machines"
+msgid "Confirm quit from emulation"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:40
-msgid "Skip information screen at startup"
+msgid "Skip system information screen"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:41
@@ -391,7 +391,7 @@ msgid "Skip BIOS selection menu"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:44
-msgid "Skip software parts selection menu"
+msgid "Skip software part selection menu"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:45
@@ -543,7 +543,7 @@ msgid "UI active"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:91
-msgid "Offscreen reload"
+msgid "Off-screen reload"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:92
@@ -559,7 +559,7 @@ msgid "Natural keyboard"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:95
-msgid "Simultaneous contradictory"
+msgid "Allow contradictory joystick inputs"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:96
@@ -583,7 +583,7 @@ msgid "Pedal Device Assignment"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:106
-msgid "Adstick Device Assignment"
+msgid "AD Stick Device Assignment"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:107
@@ -670,14 +670,14 @@ msgstr ""
 msgid "Wait Vertical Sync"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:687
+#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:689
 #: src/frontend/mame/ui/videoopt.cpp:191 src/frontend/mame/ui/custui.cpp:490
 #: src/frontend/mame/ui/analogipt.cpp:471 plugins/cheatfind/init.lua:766
 #: plugins/cheatfind/init.lua:777 plugins/cheat/init.lua:668
 msgid "On"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:690
+#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:692
 #: src/frontend/mame/ui/videoopt.cpp:207 src/frontend/mame/ui/custui.cpp:490
 #: src/frontend/mame/ui/analogipt.cpp:471 plugins/cheatfind/init.lua:763
 #: plugins/cheatfind/init.lua:774 plugins/cheat/init.lua:671
@@ -685,11 +685,11 @@ msgstr ""
 msgid "Off"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:693
+#: src/frontend/mame/ui/menu.cpp:695
 msgid "Auto"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:1195
+#: src/frontend/mame/ui/menu.cpp:1197
 #: src/frontend/mame/ui/simpleselgame.cpp:278
 #: src/frontend/mame/ui/selmenu.cpp:1280
 msgid "Return to Previous Menu"
@@ -697,7 +697,7 @@ msgstr ""
 
 #: src/frontend/mame/ui/filemngr.cpp:139
 #: src/frontend/mame/ui/confswitch.cpp:119
-#: src/frontend/mame/ui/inputmap.cpp:559 src/frontend/mame/ui/analogipt.cpp:360
+#: src/frontend/mame/ui/inputmap.cpp:563 src/frontend/mame/ui/analogipt.cpp:360
 #, c-format
 msgid "[root%1$s]"
 msgstr ""
@@ -940,22 +940,22 @@ msgid ""
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "GHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "MHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "kHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "Hz"
 msgstr ""
 
@@ -979,38 +979,38 @@ msgstr ""
 msgid "Vector"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:480
+#: src/frontend/mame/ui/info.cpp:483
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:480
+#: src/frontend/mame/ui/info.cpp:483
 msgid "%2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:497
+#: src/frontend/mame/ui/info.cpp:500
 #, c-format
 msgid "Screen '%1$s'"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:499
+#: src/frontend/mame/ui/info.cpp:502
 msgid "Screen"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:570 src/frontend/mame/ui/info.cpp:581
+#: src/frontend/mame/ui/info.cpp:573 src/frontend/mame/ui/info.cpp:584
 #, c-format
 msgid "%1$s:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:662
+#: src/frontend/mame/ui/info.cpp:665
 msgid "Not supported"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:665
+#: src/frontend/mame/ui/info.cpp:668
 msgid "Partially supported"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:674
+#: src/frontend/mame/ui/info.cpp:677
 msgid "[empty]"
 msgstr ""
 
@@ -1083,7 +1083,7 @@ msgid "Emulated"
 msgstr ""
 
 #: src/frontend/mame/ui/keyboard.cpp:59 src/frontend/mame/ui/confswitch.cpp:117
-#: src/frontend/mame/ui/inputmap.cpp:557 src/frontend/mame/ui/analogipt.cpp:358
+#: src/frontend/mame/ui/inputmap.cpp:561 src/frontend/mame/ui/analogipt.cpp:358
 #, c-format
 msgid "%1$s [root%2$s]"
 msgstr ""
@@ -1443,7 +1443,7 @@ msgctxt "swlist-info"
 msgid "Software list/item"
 msgstr ""
 
-#: src/frontend/mame/ui/datmenu.cpp:88 src/frontend/mame/ui/selmenu.cpp:2698
+#: src/frontend/mame/ui/datmenu.cpp:88 src/frontend/mame/ui/selmenu.cpp:2707
 msgid "Software List Info"
 msgstr ""
 
@@ -1558,7 +1558,7 @@ msgstr ""
 msgid "Configure Machine:"
 msgstr ""
 
-#: src/frontend/mame/ui/miscmenu.cpp:858 src/frontend/mame/ui/selmenu.cpp:2638
+#: src/frontend/mame/ui/miscmenu.cpp:858 src/frontend/mame/ui/selmenu.cpp:2647
 msgid " (default)"
 msgstr ""
 
@@ -1575,7 +1575,7 @@ msgid ""
 "Press %2$s to return to emulation"
 msgstr ""
 
-#: src/frontend/mame/ui/info_pty.cpp:30 src/frontend/mame/ui/mainmenu.cpp:155
+#: src/frontend/mame/ui/info_pty.cpp:30
 msgid "Pseudo terminals"
 msgstr ""
 
@@ -1643,52 +1643,52 @@ msgstr ""
 msgid "Other Controls"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:227
+#: src/frontend/mame/ui/inputmap.cpp:231
 msgid "This machine has no configurable inputs."
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:327
+#: src/frontend/mame/ui/inputmap.cpp:331
 msgid "Pressed"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:397
+#: src/frontend/mame/ui/inputmap.cpp:401
 msgid "Invalid sequence entered"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:542
+#: src/frontend/mame/ui/inputmap.cpp:546
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:543
+#: src/frontend/mame/ui/inputmap.cpp:547
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog Inc"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:544
+#: src/frontend/mame/ui/inputmap.cpp:548
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog Dec"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:586
+#: src/frontend/mame/ui/inputmap.cpp:590
 #, c-format
 msgid "Press %1$s to set\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:587
+#: src/frontend/mame/ui/inputmap.cpp:591
 #, c-format
 msgid "Press %1$s to append\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:588
+#: src/frontend/mame/ui/inputmap.cpp:592
 #, c-format
 msgid "Press %1$s to clear\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:589
+#: src/frontend/mame/ui/inputmap.cpp:593
 #, c-format
 msgid "Press %1$s to restore default\n"
 msgstr ""
@@ -1752,7 +1752,7 @@ msgid ""
 msgstr ""
 
 #: src/frontend/mame/ui/simpleselgame.cpp:273
-#: src/frontend/mame/ui/selgame.cpp:436
+#: src/frontend/mame/ui/selgame.cpp:443
 msgid "Configure Options"
 msgstr ""
 
@@ -2080,16 +2080,16 @@ msgstr ""
 msgid "Expand to fit"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:437
+#: src/frontend/mame/ui/selgame.cpp:444
 msgid "Configure Machine"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:1050
+#: src/frontend/mame/ui/selgame.cpp:1060
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d machines (%5$d BIOS) )"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:1078
+#: src/frontend/mame/ui/selgame.cpp:1088
 #, c-format
 msgid "System: %1$-.100s"
 msgstr ""
@@ -2111,7 +2111,7 @@ msgstr ""
 #: src/frontend/mame/ui/auditmenu.cpp:98
 #, c-format
 msgid ""
-"Auditing ROMs for machine %2$u of %3$u...\n"
+"Auditing media for machine %2$u of %3$u...\n"
 "%1$s"
 msgstr ""
 
@@ -2126,12 +2126,12 @@ msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:136
 #, c-format
-msgid "Audit ROMs for %1$u machines marked unavailable"
+msgid "Audit media for %1$u machines marked unavailable"
 msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:137
 #, c-format
-msgid "Audit ROMs for all %1$u machines"
+msgid "Audit media for all %1$u machines"
 msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:154
@@ -2337,84 +2337,84 @@ msgctxt "color-sample"
 msgid "Clone"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:914
+#: src/frontend/mame/ui/custui.cpp:906
 msgid "ARGB Settings"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:919 src/frontend/mame/ui/custui.cpp:922
+#: src/frontend/mame/ui/custui.cpp:911 src/frontend/mame/ui/custui.cpp:914
 msgctxt "color-channel"
 msgid "Alpha"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:927 src/frontend/mame/ui/custui.cpp:930
+#: src/frontend/mame/ui/custui.cpp:919 src/frontend/mame/ui/custui.cpp:922
 msgctxt "color-channel"
 msgid "Red"
 msgstr ""
 
+#: src/frontend/mame/ui/custui.cpp:927 src/frontend/mame/ui/custui.cpp:930
+msgctxt "color-channel"
+msgid "Green"
+msgstr ""
+
 #: src/frontend/mame/ui/custui.cpp:935 src/frontend/mame/ui/custui.cpp:938
 msgctxt "color-channel"
-msgid "Green"
-msgstr ""
-
-#: src/frontend/mame/ui/custui.cpp:943 src/frontend/mame/ui/custui.cpp:946
-msgctxt "color-channel"
 msgid "Blue"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:949
+#: src/frontend/mame/ui/custui.cpp:941
 msgid "Choose from palette"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:996
+#: src/frontend/mame/ui/custui.cpp:988
 msgid "Color preview:"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1093
+#: src/frontend/mame/ui/custui.cpp:1085
 msgctxt "color-preset"
 msgid "White"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1094
+#: src/frontend/mame/ui/custui.cpp:1086
 msgctxt "color-preset"
 msgid "Silver"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1095
+#: src/frontend/mame/ui/custui.cpp:1087
 msgctxt "color-preset"
 msgid "Gray"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1096
+#: src/frontend/mame/ui/custui.cpp:1088
 msgctxt "color-preset"
 msgid "Black"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1097
+#: src/frontend/mame/ui/custui.cpp:1089
 msgctxt "color-preset"
 msgid "Red"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1098
+#: src/frontend/mame/ui/custui.cpp:1090
 msgctxt "color-preset"
 msgid "Orange"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1099
+#: src/frontend/mame/ui/custui.cpp:1091
 msgctxt "color-preset"
 msgid "Yellow"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1100
+#: src/frontend/mame/ui/custui.cpp:1092
 msgctxt "color-preset"
 msgid "Green"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1101
+#: src/frontend/mame/ui/custui.cpp:1093
 msgctxt "color-preset"
 msgid "Blue"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1102
+#: src/frontend/mame/ui/custui.cpp:1094
 msgctxt "color-preset"
 msgid "Violet"
 msgstr ""
@@ -2479,7 +2479,7 @@ msgid "Input (general)"
 msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:123
-msgid "Input (this Machine)"
+msgid "Input (this machine)"
 msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:126
@@ -2518,6 +2518,10 @@ msgstr ""
 msgid "Tape Control"
 msgstr ""
 
+#: src/frontend/mame/ui/mainmenu.cpp:155
+msgid "Pseudo Terminals"
+msgstr ""
+
 #: src/frontend/mame/ui/mainmenu.cpp:158
 msgid "BIOS Selection"
 msgstr ""
@@ -2556,7 +2560,7 @@ msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:200
 #, c-format
-msgid "About %s"
+msgid "About %1$s"
 msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:212
@@ -2716,373 +2720,373 @@ msgstr ""
 msgid "%1$s %2$s"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2235
+#: src/frontend/mame/ui/selmenu.cpp:2244
 msgid "Images"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2236
+#: src/frontend/mame/ui/selmenu.cpp:2245
 msgid "Infos"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2551
+#: src/frontend/mame/ui/selmenu.cpp:2560
 msgid ""
 "Required ROM/disk images for the selected system are missing or incorrect. "
 "Please acquire the correct files or select a different system.\n"
 "\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2567
+#: src/frontend/mame/ui/selmenu.cpp:2576
 msgid ""
 "Required ROM/disk images for the selected software are missing or incorrect. "
 "Please acquire the correct files or select a different software item.\n"
 "\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2583
+#: src/frontend/mame/ui/selmenu.cpp:2592
 msgid "incorrect checksum"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2586
+#: src/frontend/mame/ui/selmenu.cpp:2595
 msgid "incorrect length"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2589
+#: src/frontend/mame/ui/selmenu.cpp:2598
 msgid "not found"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2600
+#: src/frontend/mame/ui/selmenu.cpp:2609
 #, c-format
 msgid "%1$s (%2$s) - %3$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2602
+#: src/frontend/mame/ui/selmenu.cpp:2611
 #, c-format
 msgid "%1$s - %2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2606
+#: src/frontend/mame/ui/selmenu.cpp:2615
 msgid "Press any key to continue."
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2735
+#: src/frontend/mame/ui/selmenu.cpp:2744
 msgid "General Info"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2887
-#, c-format
-msgid "Romset\t%1$s\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2888
-#, c-format
-msgid "Year\t%1$s\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2889
-#, c-format
-msgid "Manufacturer\t%1$s\n"
-msgstr ""
-
 #: src/frontend/mame/ui/selmenu.cpp:2896
 #, c-format
-msgid "Driver is Clone of\t%1$s\n"
+msgid "Romset\t%1$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2901
-msgid "Driver is Parent\t\n"
+#: src/frontend/mame/ui/selmenu.cpp:2897
+#, c-format
+msgid "Year\t%1$s\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2898
+#, c-format
+msgid "Manufacturer\t%1$s\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2905
-msgid "Analog Controls\tYes\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2907
-msgid "Keyboard Inputs\tYes\n"
+#, c-format
+msgid "Driver is Clone of\t%1$s\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2910
-msgid "Overall\tNOT WORKING\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2912
-msgid "Overall\tUnemulated Protection\n"
+msgid "Driver is Parent\t\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2914
-msgid "Overall\tWorking\n"
+msgid "Analog Controls\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2917
-msgid "Graphics\tUnimplemented\n"
+#: src/frontend/mame/ui/selmenu.cpp:2916
+msgid "Keyboard Inputs\tYes\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2919
-msgid "Graphics\tWrong Colors\n"
+msgid "Overall\tNOT WORKING\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2921
-msgid "Graphics\tImperfect Colors\n"
+msgid "Overall\tUnemulated Protection\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2923
-msgid "Graphics\tImperfect\n"
+msgid "Overall\tWorking\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2925
-msgid "Graphics\tOK\n"
+#: src/frontend/mame/ui/selmenu.cpp:2926
+msgid "Graphics\tUnimplemented\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2928
-msgid "Sound\tNone\n"
+msgid "Graphics\tWrong Colors\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2930
-msgid "Sound\tUnimplemented\n"
+msgid "Graphics\tImperfect Colors\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2932
-msgid "Sound\tImperfect\n"
+msgid "Graphics\tImperfect\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2934
-msgid "Sound\tOK\n"
+msgid "Graphics\tOK\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2937
-msgid "Capture\tUnimplemented\n"
+msgid "Sound\tNone\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2939
+msgid "Sound\tUnimplemented\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2941
+msgid "Sound\tImperfect\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2943
+msgid "Sound\tOK\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2946
+msgid "Capture\tUnimplemented\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2948
 msgid "Capture\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2942
+#: src/frontend/mame/ui/selmenu.cpp:2951
 msgid "Camera\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2944
+#: src/frontend/mame/ui/selmenu.cpp:2953
 msgid "Camera\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2947
+#: src/frontend/mame/ui/selmenu.cpp:2956
 msgid "Microphone\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2949
+#: src/frontend/mame/ui/selmenu.cpp:2958
 msgid "Microphone\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2952
+#: src/frontend/mame/ui/selmenu.cpp:2961
 msgid "Controls\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2954
+#: src/frontend/mame/ui/selmenu.cpp:2963
 msgid "Controls\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2957
+#: src/frontend/mame/ui/selmenu.cpp:2966
 msgid "Keyboard\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2959
+#: src/frontend/mame/ui/selmenu.cpp:2968
 msgid "Keyboard\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2962
+#: src/frontend/mame/ui/selmenu.cpp:2971
 msgid "Mouse\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2964
+#: src/frontend/mame/ui/selmenu.cpp:2973
 msgid "Mouse\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2967
+#: src/frontend/mame/ui/selmenu.cpp:2976
 msgid "Media\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2969
+#: src/frontend/mame/ui/selmenu.cpp:2978
 msgid "Media\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2972
+#: src/frontend/mame/ui/selmenu.cpp:2981
 msgid "Disk\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2974
+#: src/frontend/mame/ui/selmenu.cpp:2983
 msgid "Disk\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2977
+#: src/frontend/mame/ui/selmenu.cpp:2986
 msgid "Printer\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2979
+#: src/frontend/mame/ui/selmenu.cpp:2988
 msgid "Printer\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2982
+#: src/frontend/mame/ui/selmenu.cpp:2991
 msgid "Mag. Tape\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2984
+#: src/frontend/mame/ui/selmenu.cpp:2993
 msgid "Mag. Tape\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2987
+#: src/frontend/mame/ui/selmenu.cpp:2996
 msgid "Punch Tape\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2989
+#: src/frontend/mame/ui/selmenu.cpp:2998
 msgid "Punch Tape\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2992
+#: src/frontend/mame/ui/selmenu.cpp:3001
 msgid "Mag. Drum\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2994
+#: src/frontend/mame/ui/selmenu.cpp:3003
 msgid "Mag. Drum\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2997
+#: src/frontend/mame/ui/selmenu.cpp:3006
 msgid "(EP)ROM\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2999
+#: src/frontend/mame/ui/selmenu.cpp:3008
 msgid "(EP)ROM\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3002
+#: src/frontend/mame/ui/selmenu.cpp:3011
 msgid "Communications\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3004
+#: src/frontend/mame/ui/selmenu.cpp:3013
 msgid "Communications\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3007
+#: src/frontend/mame/ui/selmenu.cpp:3016
 msgid "LAN\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3009
+#: src/frontend/mame/ui/selmenu.cpp:3018
 msgid "LAN\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3012
+#: src/frontend/mame/ui/selmenu.cpp:3021
 msgid "WAN\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3014
+#: src/frontend/mame/ui/selmenu.cpp:3023
 msgid "WAN\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3017
+#: src/frontend/mame/ui/selmenu.cpp:3026
 msgid "Timing\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3019
+#: src/frontend/mame/ui/selmenu.cpp:3028
 msgid "Timing\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3021
+#: src/frontend/mame/ui/selmenu.cpp:3030
 msgid "Mechanical Machine\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3021
+#: src/frontend/mame/ui/selmenu.cpp:3030
 msgid "Mechanical Machine\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3022
+#: src/frontend/mame/ui/selmenu.cpp:3031
 msgid "Requires Artwork\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3022
+#: src/frontend/mame/ui/selmenu.cpp:3031
 msgid "Requires Artwork\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3023
+#: src/frontend/mame/ui/selmenu.cpp:3032
 msgid "Requires Clickable Artwork\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3023
+#: src/frontend/mame/ui/selmenu.cpp:3032
 msgid "Requires Clickable Artwork\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3025
+#: src/frontend/mame/ui/selmenu.cpp:3034
 msgid "Support Cocktail\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3026
+#: src/frontend/mame/ui/selmenu.cpp:3035
 msgid "Driver is BIOS\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3026
+#: src/frontend/mame/ui/selmenu.cpp:3035
 msgid "Driver is BIOS\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3027
+#: src/frontend/mame/ui/selmenu.cpp:3036
 msgid "Support Save\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3027
+#: src/frontend/mame/ui/selmenu.cpp:3036
 msgid "Support Save\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3028
+#: src/frontend/mame/ui/selmenu.cpp:3037
 msgid "Screen Orientation\tVertical\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3028
+#: src/frontend/mame/ui/selmenu.cpp:3037
 msgid "Screen Orientation\tHorizontal\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3038
+#: src/frontend/mame/ui/selmenu.cpp:3047
 msgid "Requires CHD\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3038
+#: src/frontend/mame/ui/selmenu.cpp:3047
 msgid "Requires CHD\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3051
-msgid "ROM Audit Result\tOK\n"
+#: src/frontend/mame/ui/selmenu.cpp:3060
+msgid "Media Audit Result\tOK\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3053
-msgid "ROM Audit Result\tBAD\n"
+#: src/frontend/mame/ui/selmenu.cpp:3062
+msgid "Media Audit Result\tBAD\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3056
+#: src/frontend/mame/ui/selmenu.cpp:3065
 msgid "Samples Audit Result\tNone Needed\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3058
+#: src/frontend/mame/ui/selmenu.cpp:3067
 msgid "Samples Audit Result\tOK\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3060
+#: src/frontend/mame/ui/selmenu.cpp:3069
 msgid "Samples Audit Result\tBAD\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3064
+#: src/frontend/mame/ui/selmenu.cpp:3073
 msgid ""
-"ROM Audit \tDisabled\n"
-"Samples Audit \tDisabled\n"
+"Media Audit\tDisabled\n"
+"Samples Audit\tDisabled\n"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:150
+#: src/frontend/mame/ui/sndmenu.cpp:146
 msgid "Sound"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:151
+#: src/frontend/mame/ui/sndmenu.cpp:147
 msgid "Compressor"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:152
+#: src/frontend/mame/ui/sndmenu.cpp:148
 msgid "Sample Rate"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:153
+#: src/frontend/mame/ui/sndmenu.cpp:149
 msgid "Use External Samples"
 msgstr ""
 
@@ -3121,511 +3125,681 @@ msgstr ""
 msgid "  Screen '%1$s': Vector\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:132
+#: src/frontend/mame/ui/devopt.cpp:135
 #, c-format
 msgid "  Screen '%1$s': %2$d × %3$d (V) %4$s Hz\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:133
+#: src/frontend/mame/ui/devopt.cpp:136
 #, c-format
 msgid "  Screen '%1$s': %2$d × %3$d (H) %4$s Hz\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:147
+#: src/frontend/mame/ui/devopt.cpp:150
 msgid "* Sound:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:211
+#: src/frontend/mame/ui/devopt.cpp:214
 #, c-format
 msgid ""
 "* BIOS settings:\n"
 "  %1$d options    [default: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:255 src/frontend/mame/ui/devopt.cpp:271
-#: src/frontend/mame/ui/devopt.cpp:332
+#: src/frontend/mame/ui/devopt.cpp:258 src/frontend/mame/ui/devopt.cpp:274
+#: src/frontend/mame/ui/devopt.cpp:335
 #, c-format
 msgid "  %1$s    [default: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:260 src/frontend/mame/ui/devopt.cpp:276
+#: src/frontend/mame/ui/devopt.cpp:263 src/frontend/mame/ui/devopt.cpp:279
 #, c-format
 msgid "  %1$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:282
+#: src/frontend/mame/ui/devopt.cpp:285
 msgid "* DIP switch settings:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:287
+#: src/frontend/mame/ui/devopt.cpp:290
 msgid "* Configuration settings:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:291
+#: src/frontend/mame/ui/devopt.cpp:294
 msgid "* Input device(s):\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:293
+#: src/frontend/mame/ui/devopt.cpp:296
 #, c-format
 msgid "  User inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:295
+#: src/frontend/mame/ui/devopt.cpp:298
 #, c-format
 msgid "  Mahjong inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:297
+#: src/frontend/mame/ui/devopt.cpp:300
 #, c-format
 msgid "  Hanafuda inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:299
+#: src/frontend/mame/ui/devopt.cpp:302
 #, c-format
 msgid "  Gambling inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:301
+#: src/frontend/mame/ui/devopt.cpp:304
 #, c-format
 msgid "  Analog inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:303
+#: src/frontend/mame/ui/devopt.cpp:306
 #, c-format
 msgid "  Adjuster inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:305
+#: src/frontend/mame/ui/devopt.cpp:308
 #, c-format
 msgid "  Keypad inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:307
+#: src/frontend/mame/ui/devopt.cpp:310
 #, c-format
 msgid "  Keyboard inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:312
+#: src/frontend/mame/ui/devopt.cpp:315
 msgid "* Media Options:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:317
+#: src/frontend/mame/ui/devopt.cpp:320
 #, c-format
 msgid "  %1$s    [tag: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:327
+#: src/frontend/mame/ui/devopt.cpp:330
 msgid "* Slot Options:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:341
+#: src/frontend/mame/ui/devopt.cpp:344
 msgid "[None]\n"
 msgstr ""
 
-#: src/emu/render.cpp:1847
+#: src/emu/render.cpp:1796
 #, c-format
 msgctxt "view-name"
 msgid "Screen %1$u Standard (%2$u:%3$u)"
 msgstr ""
 
-#: src/emu/render.cpp:1873
+#: src/emu/render.cpp:1822
 #, c-format
 msgctxt "view-name"
 msgid "Screen %1$u Pixel Aspect (%2$u:%3$u)"
 msgstr ""
 
-#: src/emu/render.cpp:1895 src/emu/render.cpp:2030
+#: src/emu/render.cpp:1844 src/emu/render.cpp:1979
 msgctxt "view-name"
 msgid "Cocktail"
 msgstr ""
 
-#: src/emu/render.cpp:2015
+#: src/emu/render.cpp:1964
 msgctxt "view-name"
 msgid "Left-to-Right"
 msgstr ""
 
-#: src/emu/render.cpp:2016
+#: src/emu/render.cpp:1965
 msgctxt "view-name"
 msgid "Left-to-Right (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2017
+#: src/emu/render.cpp:1966
 msgctxt "view-name"
 msgid "Top-to-Bottom"
 msgstr ""
 
-#: src/emu/render.cpp:2018
+#: src/emu/render.cpp:1967
 msgctxt "view-name"
 msgid "Top-to-Bottom (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2069
+#: src/emu/render.cpp:2018
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Left-to-Right, Top-to-Bottom"
 msgstr ""
 
-#: src/emu/render.cpp:2078
+#: src/emu/render.cpp:2027
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Left-to-Right, Top-to-Bottom (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2087
+#: src/emu/render.cpp:2036
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Top-to-Bottom, Left-to-Right"
 msgstr ""
 
-#: src/emu/render.cpp:2096
+#: src/emu/render.cpp:2045
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Top-to-Bottom, Left-to-Right (Gapless)"
 msgstr ""
 
-#: src/emu/inpttype.ipp:22
+#: src/emu/ioport.cpp:332
+#, c-format
 msgctxt "input-name"
-msgid "P1 Up"
+msgid "P%1$u"
 msgstr ""
 
-#: src/emu/inpttype.ipp:23
+#: src/emu/ioport.cpp:1924
 msgctxt "input-name"
-msgid "P1 Down"
+msgid "???"
 msgstr ""
 
-#: src/emu/inpttype.ipp:24
+#: src/emu/inpttype.ipp:22 src/emu/inpttype.ipp:140 src/emu/inpttype.ipp:221
+#: src/emu/inpttype.ipp:255 src/emu/inpttype.ipp:289 src/emu/inpttype.ipp:323
+#: src/emu/inpttype.ipp:357 src/emu/inpttype.ipp:391 src/emu/inpttype.ipp:425
+#: src/emu/inpttype.ipp:459
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left"
+msgid "%p Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:25
+#: src/emu/inpttype.ipp:23 src/emu/inpttype.ipp:141 src/emu/inpttype.ipp:222
+#: src/emu/inpttype.ipp:256 src/emu/inpttype.ipp:290 src/emu/inpttype.ipp:324
+#: src/emu/inpttype.ipp:358 src/emu/inpttype.ipp:392 src/emu/inpttype.ipp:426
+#: src/emu/inpttype.ipp:460
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right"
+msgid "%p Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:26
+#: src/emu/inpttype.ipp:24 src/emu/inpttype.ipp:142 src/emu/inpttype.ipp:223
+#: src/emu/inpttype.ipp:257 src/emu/inpttype.ipp:291 src/emu/inpttype.ipp:325
+#: src/emu/inpttype.ipp:359 src/emu/inpttype.ipp:393 src/emu/inpttype.ipp:427
+#: src/emu/inpttype.ipp:461
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Up"
+msgid "%p Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:27
+#: src/emu/inpttype.ipp:25 src/emu/inpttype.ipp:143 src/emu/inpttype.ipp:224
+#: src/emu/inpttype.ipp:258 src/emu/inpttype.ipp:292 src/emu/inpttype.ipp:326
+#: src/emu/inpttype.ipp:360 src/emu/inpttype.ipp:394 src/emu/inpttype.ipp:428
+#: src/emu/inpttype.ipp:462
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Down"
+msgid "%p Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:28
+#: src/emu/inpttype.ipp:26 src/emu/inpttype.ipp:144 src/emu/inpttype.ipp:225
+#: src/emu/inpttype.ipp:259 src/emu/inpttype.ipp:293 src/emu/inpttype.ipp:327
+#: src/emu/inpttype.ipp:361 src/emu/inpttype.ipp:395 src/emu/inpttype.ipp:429
+#: src/emu/inpttype.ipp:463
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Left"
+msgid "%p Right Stick/Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:29
+#: src/emu/inpttype.ipp:27 src/emu/inpttype.ipp:145 src/emu/inpttype.ipp:226
+#: src/emu/inpttype.ipp:260 src/emu/inpttype.ipp:294 src/emu/inpttype.ipp:328
+#: src/emu/inpttype.ipp:362 src/emu/inpttype.ipp:396 src/emu/inpttype.ipp:430
+#: src/emu/inpttype.ipp:464
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Right"
+msgid "%p Right Stick/Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:30
+#: src/emu/inpttype.ipp:28 src/emu/inpttype.ipp:146 src/emu/inpttype.ipp:227
+#: src/emu/inpttype.ipp:261 src/emu/inpttype.ipp:295 src/emu/inpttype.ipp:329
+#: src/emu/inpttype.ipp:363 src/emu/inpttype.ipp:397 src/emu/inpttype.ipp:431
+#: src/emu/inpttype.ipp:465
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Up"
+msgid "%p Right Stick/Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:31
+#: src/emu/inpttype.ipp:29 src/emu/inpttype.ipp:147 src/emu/inpttype.ipp:228
+#: src/emu/inpttype.ipp:262 src/emu/inpttype.ipp:296 src/emu/inpttype.ipp:330
+#: src/emu/inpttype.ipp:364 src/emu/inpttype.ipp:398 src/emu/inpttype.ipp:432
+#: src/emu/inpttype.ipp:466
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Down"
+msgid "%p Right Stick/Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:32
+#: src/emu/inpttype.ipp:30 src/emu/inpttype.ipp:148 src/emu/inpttype.ipp:229
+#: src/emu/inpttype.ipp:263 src/emu/inpttype.ipp:297 src/emu/inpttype.ipp:331
+#: src/emu/inpttype.ipp:365 src/emu/inpttype.ipp:399 src/emu/inpttype.ipp:433
+#: src/emu/inpttype.ipp:467
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Left"
+msgid "%p Left Stick/Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:33
+#: src/emu/inpttype.ipp:31 src/emu/inpttype.ipp:149 src/emu/inpttype.ipp:230
+#: src/emu/inpttype.ipp:264 src/emu/inpttype.ipp:298 src/emu/inpttype.ipp:332
+#: src/emu/inpttype.ipp:366 src/emu/inpttype.ipp:400 src/emu/inpttype.ipp:434
+#: src/emu/inpttype.ipp:468
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Right"
+msgid "%p Left Stick/Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:34
+#: src/emu/inpttype.ipp:32 src/emu/inpttype.ipp:150 src/emu/inpttype.ipp:231
+#: src/emu/inpttype.ipp:265 src/emu/inpttype.ipp:299 src/emu/inpttype.ipp:333
+#: src/emu/inpttype.ipp:367 src/emu/inpttype.ipp:401 src/emu/inpttype.ipp:435
+#: src/emu/inpttype.ipp:469
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 1"
+msgid "%p Left Stick/Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:35
+#: src/emu/inpttype.ipp:33 src/emu/inpttype.ipp:151 src/emu/inpttype.ipp:232
+#: src/emu/inpttype.ipp:266 src/emu/inpttype.ipp:300 src/emu/inpttype.ipp:334
+#: src/emu/inpttype.ipp:368 src/emu/inpttype.ipp:402 src/emu/inpttype.ipp:436
+#: src/emu/inpttype.ipp:470
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 2"
+msgid "%p Left Stick/Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:36
+#: src/emu/inpttype.ipp:34 src/emu/inpttype.ipp:152 src/emu/inpttype.ipp:233
+#: src/emu/inpttype.ipp:267 src/emu/inpttype.ipp:301 src/emu/inpttype.ipp:335
+#: src/emu/inpttype.ipp:369 src/emu/inpttype.ipp:403 src/emu/inpttype.ipp:437
+#: src/emu/inpttype.ipp:471
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 3"
+msgid "%p Button 1"
 msgstr ""
 
-#: src/emu/inpttype.ipp:37
+#: src/emu/inpttype.ipp:35 src/emu/inpttype.ipp:153 src/emu/inpttype.ipp:234
+#: src/emu/inpttype.ipp:268 src/emu/inpttype.ipp:302 src/emu/inpttype.ipp:336
+#: src/emu/inpttype.ipp:370 src/emu/inpttype.ipp:404 src/emu/inpttype.ipp:438
+#: src/emu/inpttype.ipp:472
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 4"
+msgid "%p Button 2"
 msgstr ""
 
-#: src/emu/inpttype.ipp:38
+#: src/emu/inpttype.ipp:36 src/emu/inpttype.ipp:154 src/emu/inpttype.ipp:235
+#: src/emu/inpttype.ipp:269 src/emu/inpttype.ipp:303 src/emu/inpttype.ipp:337
+#: src/emu/inpttype.ipp:371 src/emu/inpttype.ipp:405 src/emu/inpttype.ipp:439
+#: src/emu/inpttype.ipp:473
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 5"
+msgid "%p Button 3"
 msgstr ""
 
-#: src/emu/inpttype.ipp:39
+#: src/emu/inpttype.ipp:37 src/emu/inpttype.ipp:155 src/emu/inpttype.ipp:236
+#: src/emu/inpttype.ipp:270 src/emu/inpttype.ipp:304 src/emu/inpttype.ipp:338
+#: src/emu/inpttype.ipp:372 src/emu/inpttype.ipp:406 src/emu/inpttype.ipp:440
+#: src/emu/inpttype.ipp:474
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 6"
+msgid "%p Button 4"
 msgstr ""
 
-#: src/emu/inpttype.ipp:40
+#: src/emu/inpttype.ipp:38 src/emu/inpttype.ipp:156 src/emu/inpttype.ipp:237
+#: src/emu/inpttype.ipp:271 src/emu/inpttype.ipp:305 src/emu/inpttype.ipp:339
+#: src/emu/inpttype.ipp:373 src/emu/inpttype.ipp:407 src/emu/inpttype.ipp:441
+#: src/emu/inpttype.ipp:475
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 7"
+msgid "%p Button 5"
 msgstr ""
 
-#: src/emu/inpttype.ipp:41
+#: src/emu/inpttype.ipp:39 src/emu/inpttype.ipp:157 src/emu/inpttype.ipp:238
+#: src/emu/inpttype.ipp:272 src/emu/inpttype.ipp:306 src/emu/inpttype.ipp:340
+#: src/emu/inpttype.ipp:374 src/emu/inpttype.ipp:408 src/emu/inpttype.ipp:442
+#: src/emu/inpttype.ipp:476
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 8"
+msgid "%p Button 6"
 msgstr ""
 
-#: src/emu/inpttype.ipp:42
+#: src/emu/inpttype.ipp:40 src/emu/inpttype.ipp:158 src/emu/inpttype.ipp:239
+#: src/emu/inpttype.ipp:273 src/emu/inpttype.ipp:307 src/emu/inpttype.ipp:341
+#: src/emu/inpttype.ipp:375 src/emu/inpttype.ipp:409 src/emu/inpttype.ipp:443
+#: src/emu/inpttype.ipp:477
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 9"
+msgid "%p Button 7"
 msgstr ""
 
-#: src/emu/inpttype.ipp:43
+#: src/emu/inpttype.ipp:41 src/emu/inpttype.ipp:159 src/emu/inpttype.ipp:240
+#: src/emu/inpttype.ipp:274 src/emu/inpttype.ipp:308 src/emu/inpttype.ipp:342
+#: src/emu/inpttype.ipp:376 src/emu/inpttype.ipp:410 src/emu/inpttype.ipp:444
+#: src/emu/inpttype.ipp:478
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 10"
+msgid "%p Button 8"
 msgstr ""
 
-#: src/emu/inpttype.ipp:44
+#: src/emu/inpttype.ipp:42 src/emu/inpttype.ipp:160 src/emu/inpttype.ipp:241
+#: src/emu/inpttype.ipp:275 src/emu/inpttype.ipp:309 src/emu/inpttype.ipp:343
+#: src/emu/inpttype.ipp:377 src/emu/inpttype.ipp:411 src/emu/inpttype.ipp:445
+#: src/emu/inpttype.ipp:479
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 11"
+msgid "%p Button 9"
 msgstr ""
 
-#: src/emu/inpttype.ipp:45
+#: src/emu/inpttype.ipp:43 src/emu/inpttype.ipp:161 src/emu/inpttype.ipp:242
+#: src/emu/inpttype.ipp:276 src/emu/inpttype.ipp:310 src/emu/inpttype.ipp:344
+#: src/emu/inpttype.ipp:378 src/emu/inpttype.ipp:412 src/emu/inpttype.ipp:446
+#: src/emu/inpttype.ipp:480
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 12"
+msgid "%p Button 10"
 msgstr ""
 
-#: src/emu/inpttype.ipp:46
+#: src/emu/inpttype.ipp:44 src/emu/inpttype.ipp:162 src/emu/inpttype.ipp:243
+#: src/emu/inpttype.ipp:277 src/emu/inpttype.ipp:311 src/emu/inpttype.ipp:345
+#: src/emu/inpttype.ipp:379 src/emu/inpttype.ipp:413 src/emu/inpttype.ipp:447
+#: src/emu/inpttype.ipp:481
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 13"
+msgid "%p Button 11"
 msgstr ""
 
-#: src/emu/inpttype.ipp:47
+#: src/emu/inpttype.ipp:45 src/emu/inpttype.ipp:163 src/emu/inpttype.ipp:244
+#: src/emu/inpttype.ipp:278 src/emu/inpttype.ipp:312 src/emu/inpttype.ipp:346
+#: src/emu/inpttype.ipp:380 src/emu/inpttype.ipp:414 src/emu/inpttype.ipp:448
+#: src/emu/inpttype.ipp:482
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 14"
+msgid "%p Button 12"
 msgstr ""
 
-#: src/emu/inpttype.ipp:48
+#: src/emu/inpttype.ipp:46 src/emu/inpttype.ipp:164 src/emu/inpttype.ipp:245
+#: src/emu/inpttype.ipp:279 src/emu/inpttype.ipp:313 src/emu/inpttype.ipp:347
+#: src/emu/inpttype.ipp:381 src/emu/inpttype.ipp:415 src/emu/inpttype.ipp:449
+#: src/emu/inpttype.ipp:483
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 15"
+msgid "%p Button 13"
 msgstr ""
 
-#: src/emu/inpttype.ipp:49
+#: src/emu/inpttype.ipp:47 src/emu/inpttype.ipp:165 src/emu/inpttype.ipp:246
+#: src/emu/inpttype.ipp:280 src/emu/inpttype.ipp:314 src/emu/inpttype.ipp:348
+#: src/emu/inpttype.ipp:382 src/emu/inpttype.ipp:416 src/emu/inpttype.ipp:450
+#: src/emu/inpttype.ipp:484
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 16"
+msgid "%p Button 14"
 msgstr ""
 
-#: src/emu/inpttype.ipp:50
+#: src/emu/inpttype.ipp:48 src/emu/inpttype.ipp:166 src/emu/inpttype.ipp:247
+#: src/emu/inpttype.ipp:281 src/emu/inpttype.ipp:315 src/emu/inpttype.ipp:349
+#: src/emu/inpttype.ipp:383 src/emu/inpttype.ipp:417 src/emu/inpttype.ipp:451
+#: src/emu/inpttype.ipp:485
+#, c-format
 msgctxt "input-name"
-msgid "P1 Start"
+msgid "%p Button 15"
 msgstr ""
 
-#: src/emu/inpttype.ipp:51
+#: src/emu/inpttype.ipp:49 src/emu/inpttype.ipp:167 src/emu/inpttype.ipp:248
+#: src/emu/inpttype.ipp:282 src/emu/inpttype.ipp:316 src/emu/inpttype.ipp:350
+#: src/emu/inpttype.ipp:384 src/emu/inpttype.ipp:418 src/emu/inpttype.ipp:452
+#: src/emu/inpttype.ipp:486
+#, c-format
 msgctxt "input-name"
-msgid "P1 Select"
+msgid "%p Button 16"
 msgstr ""
 
-#: src/emu/inpttype.ipp:56
+#: src/emu/inpttype.ipp:50 src/emu/inpttype.ipp:168 src/emu/inpttype.ipp:249
+#: src/emu/inpttype.ipp:283 src/emu/inpttype.ipp:317 src/emu/inpttype.ipp:351
+#: src/emu/inpttype.ipp:385 src/emu/inpttype.ipp:419 src/emu/inpttype.ipp:453
+#: src/emu/inpttype.ipp:487
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong A"
+msgid "%p Start"
 msgstr ""
 
-#: src/emu/inpttype.ipp:57
+#: src/emu/inpttype.ipp:51 src/emu/inpttype.ipp:169 src/emu/inpttype.ipp:250
+#: src/emu/inpttype.ipp:284 src/emu/inpttype.ipp:318 src/emu/inpttype.ipp:352
+#: src/emu/inpttype.ipp:386 src/emu/inpttype.ipp:420 src/emu/inpttype.ipp:454
+#: src/emu/inpttype.ipp:488
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong B"
+msgid "%p Select"
 msgstr ""
 
-#: src/emu/inpttype.ipp:58
+#: src/emu/inpttype.ipp:56 src/emu/inpttype.ipp:174
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong C"
+msgid "%p Mahjong A"
 msgstr ""
 
-#: src/emu/inpttype.ipp:59
+#: src/emu/inpttype.ipp:57 src/emu/inpttype.ipp:175
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong D"
+msgid "%p Mahjong B"
 msgstr ""
 
-#: src/emu/inpttype.ipp:60
+#: src/emu/inpttype.ipp:58 src/emu/inpttype.ipp:176
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong E"
+msgid "%p Mahjong C"
 msgstr ""
 
-#: src/emu/inpttype.ipp:61
+#: src/emu/inpttype.ipp:59 src/emu/inpttype.ipp:177
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong F"
+msgid "%p Mahjong D"
 msgstr ""
 
-#: src/emu/inpttype.ipp:62
+#: src/emu/inpttype.ipp:60 src/emu/inpttype.ipp:178
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong G"
+msgid "%p Mahjong E"
 msgstr ""
 
-#: src/emu/inpttype.ipp:63
+#: src/emu/inpttype.ipp:61 src/emu/inpttype.ipp:179
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong H"
+msgid "%p Mahjong F"
 msgstr ""
 
-#: src/emu/inpttype.ipp:64
+#: src/emu/inpttype.ipp:62 src/emu/inpttype.ipp:180
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong I"
+msgid "%p Mahjong G"
 msgstr ""
 
-#: src/emu/inpttype.ipp:65
+#: src/emu/inpttype.ipp:63 src/emu/inpttype.ipp:181
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong J"
+msgid "%p Mahjong H"
 msgstr ""
 
-#: src/emu/inpttype.ipp:66
+#: src/emu/inpttype.ipp:64 src/emu/inpttype.ipp:182
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong K"
+msgid "%p Mahjong I"
 msgstr ""
 
-#: src/emu/inpttype.ipp:67
+#: src/emu/inpttype.ipp:65 src/emu/inpttype.ipp:183
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong L"
+msgid "%p Mahjong J"
 msgstr ""
 
-#: src/emu/inpttype.ipp:68
+#: src/emu/inpttype.ipp:66 src/emu/inpttype.ipp:184
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong M"
+msgid "%p Mahjong K"
 msgstr ""
 
-#: src/emu/inpttype.ipp:69
+#: src/emu/inpttype.ipp:67 src/emu/inpttype.ipp:185
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong N"
+msgid "%p Mahjong L"
 msgstr ""
 
-#: src/emu/inpttype.ipp:70
+#: src/emu/inpttype.ipp:68 src/emu/inpttype.ipp:186
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong O"
+msgid "%p Mahjong M"
 msgstr ""
 
-#: src/emu/inpttype.ipp:71
+#: src/emu/inpttype.ipp:69 src/emu/inpttype.ipp:187
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong P"
+msgid "%p Mahjong N"
 msgstr ""
 
-#: src/emu/inpttype.ipp:72
+#: src/emu/inpttype.ipp:70 src/emu/inpttype.ipp:188
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Q"
+msgid "%p Mahjong O"
 msgstr ""
 
-#: src/emu/inpttype.ipp:73
+#: src/emu/inpttype.ipp:71 src/emu/inpttype.ipp:189
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Kan"
+msgid "%p Mahjong P"
 msgstr ""
 
-#: src/emu/inpttype.ipp:74
+#: src/emu/inpttype.ipp:72 src/emu/inpttype.ipp:190
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Pon"
+msgid "%p Mahjong Q"
 msgstr ""
 
-#: src/emu/inpttype.ipp:75
+#: src/emu/inpttype.ipp:73 src/emu/inpttype.ipp:191
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Chi"
+msgid "%p Mahjong Kan"
 msgstr ""
 
-#: src/emu/inpttype.ipp:76
+#: src/emu/inpttype.ipp:74 src/emu/inpttype.ipp:192
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Reach"
+msgid "%p Mahjong Pon"
 msgstr ""
 
-#: src/emu/inpttype.ipp:77
+#: src/emu/inpttype.ipp:75 src/emu/inpttype.ipp:193
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Ron"
+msgid "%p Mahjong Chi"
 msgstr ""
 
-#: src/emu/inpttype.ipp:78
+#: src/emu/inpttype.ipp:76 src/emu/inpttype.ipp:194
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Flip Flop"
+msgid "%p Mahjong Reach"
 msgstr ""
 
-#: src/emu/inpttype.ipp:79
+#: src/emu/inpttype.ipp:77 src/emu/inpttype.ipp:195
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Bet"
+msgid "%p Mahjong Ron"
 msgstr ""
 
-#: src/emu/inpttype.ipp:80
+#: src/emu/inpttype.ipp:78 src/emu/inpttype.ipp:200
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Take Score"
+msgid "%p Mahjong Flip Flop"
 msgstr ""
 
-#: src/emu/inpttype.ipp:81
+#: src/emu/inpttype.ipp:79 src/emu/inpttype.ipp:196
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Double Up"
+msgid "%p Mahjong Bet"
 msgstr ""
 
-#: src/emu/inpttype.ipp:82
+#: src/emu/inpttype.ipp:80 src/emu/inpttype.ipp:198
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Big"
+msgid "%p Mahjong Take Score"
 msgstr ""
 
-#: src/emu/inpttype.ipp:83
+#: src/emu/inpttype.ipp:81 src/emu/inpttype.ipp:199
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Small"
+msgid "%p Mahjong Double Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:84
+#: src/emu/inpttype.ipp:82 src/emu/inpttype.ipp:201
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Last Chance"
+msgid "%p Mahjong Big"
 msgstr ""
 
-#: src/emu/inpttype.ipp:89
+#: src/emu/inpttype.ipp:83 src/emu/inpttype.ipp:202
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda A/1"
+msgid "%p Mahjong Small"
 msgstr ""
 
-#: src/emu/inpttype.ipp:90
+#: src/emu/inpttype.ipp:84 src/emu/inpttype.ipp:197
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda B/2"
+msgid "%p Mahjong Last Chance"
 msgstr ""
 
-#: src/emu/inpttype.ipp:91
+#: src/emu/inpttype.ipp:89 src/emu/inpttype.ipp:207
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda C/3"
+msgid "%p Hanafuda A/1"
 msgstr ""
 
-#: src/emu/inpttype.ipp:92
+#: src/emu/inpttype.ipp:90 src/emu/inpttype.ipp:208
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda D/4"
+msgid "%p Hanafuda B/2"
 msgstr ""
 
-#: src/emu/inpttype.ipp:93
+#: src/emu/inpttype.ipp:91 src/emu/inpttype.ipp:209
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda E/5"
+msgid "%p Hanafuda C/3"
 msgstr ""
 
-#: src/emu/inpttype.ipp:94
+#: src/emu/inpttype.ipp:92 src/emu/inpttype.ipp:210
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda F/6"
+msgid "%p Hanafuda D/4"
 msgstr ""
 
-#: src/emu/inpttype.ipp:95
+#: src/emu/inpttype.ipp:93 src/emu/inpttype.ipp:211
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda G/7"
+msgid "%p Hanafuda E/5"
 msgstr ""
 
-#: src/emu/inpttype.ipp:96
+#: src/emu/inpttype.ipp:94 src/emu/inpttype.ipp:212
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda H/8"
+msgid "%p Hanafuda F/6"
 msgstr ""
 
-#: src/emu/inpttype.ipp:97
+#: src/emu/inpttype.ipp:95 src/emu/inpttype.ipp:213
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda Yes"
+msgid "%p Hanafuda G/7"
 msgstr ""
 
-#: src/emu/inpttype.ipp:98
+#: src/emu/inpttype.ipp:96 src/emu/inpttype.ipp:214
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda No"
+msgid "%p Hanafuda H/8"
+msgstr ""
+
+#: src/emu/inpttype.ipp:97 src/emu/inpttype.ipp:215
+#, c-format
+msgctxt "input-name"
+msgid "%p Hanafuda Yes"
+msgstr ""
+
+#: src/emu/inpttype.ipp:98 src/emu/inpttype.ipp:216
+#, c-format
+msgctxt "input-name"
+msgid "%p Hanafuda No"
 msgstr ""
 
 #: src/emu/inpttype.ipp:103
@@ -3753,1551 +3927,6 @@ msgctxt "input-name"
 msgid "Stop All Reels"
 msgstr ""
 
-#: src/emu/inpttype.ipp:140
-msgctxt "input-name"
-msgid "P2 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:141
-msgctxt "input-name"
-msgid "P2 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:142
-msgctxt "input-name"
-msgid "P2 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:143
-msgctxt "input-name"
-msgid "P2 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:144
-msgctxt "input-name"
-msgid "P2 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:145
-msgctxt "input-name"
-msgid "P2 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:146
-msgctxt "input-name"
-msgid "P2 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:147
-msgctxt "input-name"
-msgid "P2 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:148
-msgctxt "input-name"
-msgid "P2 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:149
-msgctxt "input-name"
-msgid "P2 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:150
-msgctxt "input-name"
-msgid "P2 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:151
-msgctxt "input-name"
-msgid "P2 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:152
-msgctxt "input-name"
-msgid "P2 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:153
-msgctxt "input-name"
-msgid "P2 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:154
-msgctxt "input-name"
-msgid "P2 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:155
-msgctxt "input-name"
-msgid "P2 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:156
-msgctxt "input-name"
-msgid "P2 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:157
-msgctxt "input-name"
-msgid "P2 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:158
-msgctxt "input-name"
-msgid "P2 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:159
-msgctxt "input-name"
-msgid "P2 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:160
-msgctxt "input-name"
-msgid "P2 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:161
-msgctxt "input-name"
-msgid "P2 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:162
-msgctxt "input-name"
-msgid "P2 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:163
-msgctxt "input-name"
-msgid "P2 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:164
-msgctxt "input-name"
-msgid "P2 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:165
-msgctxt "input-name"
-msgid "P2 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:166
-msgctxt "input-name"
-msgid "P2 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:167
-msgctxt "input-name"
-msgid "P2 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:168
-msgctxt "input-name"
-msgid "P2 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:169
-msgctxt "input-name"
-msgid "P2 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:174
-msgctxt "input-name"
-msgid "P2 Mahjong A"
-msgstr ""
-
-#: src/emu/inpttype.ipp:175
-msgctxt "input-name"
-msgid "P2 Mahjong B"
-msgstr ""
-
-#: src/emu/inpttype.ipp:176
-msgctxt "input-name"
-msgid "P2 Mahjong C"
-msgstr ""
-
-#: src/emu/inpttype.ipp:177
-msgctxt "input-name"
-msgid "P2 Mahjong D"
-msgstr ""
-
-#: src/emu/inpttype.ipp:178
-msgctxt "input-name"
-msgid "P2 Mahjong E"
-msgstr ""
-
-#: src/emu/inpttype.ipp:179
-msgctxt "input-name"
-msgid "P2 Mahjong F"
-msgstr ""
-
-#: src/emu/inpttype.ipp:180
-msgctxt "input-name"
-msgid "P2 Mahjong G"
-msgstr ""
-
-#: src/emu/inpttype.ipp:181
-msgctxt "input-name"
-msgid "P2 Mahjong H"
-msgstr ""
-
-#: src/emu/inpttype.ipp:182
-msgctxt "input-name"
-msgid "P2 Mahjong I"
-msgstr ""
-
-#: src/emu/inpttype.ipp:183
-msgctxt "input-name"
-msgid "P2 Mahjong J"
-msgstr ""
-
-#: src/emu/inpttype.ipp:184
-msgctxt "input-name"
-msgid "P2 Mahjong K"
-msgstr ""
-
-#: src/emu/inpttype.ipp:185
-msgctxt "input-name"
-msgid "P2 Mahjong L"
-msgstr ""
-
-#: src/emu/inpttype.ipp:186
-msgctxt "input-name"
-msgid "P2 Mahjong M"
-msgstr ""
-
-#: src/emu/inpttype.ipp:187
-msgctxt "input-name"
-msgid "P2 Mahjong N"
-msgstr ""
-
-#: src/emu/inpttype.ipp:188
-msgctxt "input-name"
-msgid "P2 Mahjong O"
-msgstr ""
-
-#: src/emu/inpttype.ipp:189
-msgctxt "input-name"
-msgid "P2 Mahjong P"
-msgstr ""
-
-#: src/emu/inpttype.ipp:190
-msgctxt "input-name"
-msgid "P2 Mahjong Q"
-msgstr ""
-
-#: src/emu/inpttype.ipp:191
-msgctxt "input-name"
-msgid "P2 Mahjong Kan"
-msgstr ""
-
-#: src/emu/inpttype.ipp:192
-msgctxt "input-name"
-msgid "P2 Mahjong Pon"
-msgstr ""
-
-#: src/emu/inpttype.ipp:193
-msgctxt "input-name"
-msgid "P2 Mahjong Chi"
-msgstr ""
-
-#: src/emu/inpttype.ipp:194
-msgctxt "input-name"
-msgid "P2 Mahjong Reach"
-msgstr ""
-
-#: src/emu/inpttype.ipp:195
-msgctxt "input-name"
-msgid "P2 Mahjong Ron"
-msgstr ""
-
-#: src/emu/inpttype.ipp:196
-msgctxt "input-name"
-msgid "P2 Mahjong Bet"
-msgstr ""
-
-#: src/emu/inpttype.ipp:197
-msgctxt "input-name"
-msgid "P2 Mahjong Last Chance"
-msgstr ""
-
-#: src/emu/inpttype.ipp:198
-msgctxt "input-name"
-msgid "P2 Mahjong Take Score"
-msgstr ""
-
-#: src/emu/inpttype.ipp:199
-msgctxt "input-name"
-msgid "P2 Mahjong Double Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:200
-msgctxt "input-name"
-msgid "P2 Mahjong Flip Flop"
-msgstr ""
-
-#: src/emu/inpttype.ipp:201
-msgctxt "input-name"
-msgid "P2 Mahjong Big"
-msgstr ""
-
-#: src/emu/inpttype.ipp:202
-msgctxt "input-name"
-msgid "P2 Mahjong Small"
-msgstr ""
-
-#: src/emu/inpttype.ipp:207
-msgctxt "input-name"
-msgid "P2 Hanafuda A/1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:208
-msgctxt "input-name"
-msgid "P2 Hanafuda B/2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:209
-msgctxt "input-name"
-msgid "P2 Hanafuda C/3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:210
-msgctxt "input-name"
-msgid "P2 Hanafuda D/4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:211
-msgctxt "input-name"
-msgid "P2 Hanafuda E/5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:212
-msgctxt "input-name"
-msgid "P2 Hanafuda F/6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:213
-msgctxt "input-name"
-msgid "P2 Hanafuda G/7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:214
-msgctxt "input-name"
-msgid "P2 Hanafuda H/8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:215
-msgctxt "input-name"
-msgid "P2 Hanafuda Yes"
-msgstr ""
-
-#: src/emu/inpttype.ipp:216
-msgctxt "input-name"
-msgid "P2 Hanafuda No"
-msgstr ""
-
-#: src/emu/inpttype.ipp:221
-msgctxt "input-name"
-msgid "P3 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:222
-msgctxt "input-name"
-msgid "P3 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:223
-msgctxt "input-name"
-msgid "P3 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:224
-msgctxt "input-name"
-msgid "P3 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:225
-msgctxt "input-name"
-msgid "P3 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:226
-msgctxt "input-name"
-msgid "P3 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:227
-msgctxt "input-name"
-msgid "P3 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:228
-msgctxt "input-name"
-msgid "P3 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:229
-msgctxt "input-name"
-msgid "P3 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:230
-msgctxt "input-name"
-msgid "P3 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:231
-msgctxt "input-name"
-msgid "P3 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:232
-msgctxt "input-name"
-msgid "P3 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:233
-msgctxt "input-name"
-msgid "P3 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:234
-msgctxt "input-name"
-msgid "P3 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:235
-msgctxt "input-name"
-msgid "P3 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:236
-msgctxt "input-name"
-msgid "P3 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:237
-msgctxt "input-name"
-msgid "P3 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:238
-msgctxt "input-name"
-msgid "P3 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:239
-msgctxt "input-name"
-msgid "P3 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:240
-msgctxt "input-name"
-msgid "P3 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:241
-msgctxt "input-name"
-msgid "P3 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:242
-msgctxt "input-name"
-msgid "P3 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:243
-msgctxt "input-name"
-msgid "P3 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:244
-msgctxt "input-name"
-msgid "P3 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:245
-msgctxt "input-name"
-msgid "P3 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:246
-msgctxt "input-name"
-msgid "P3 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:247
-msgctxt "input-name"
-msgid "P3 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:248
-msgctxt "input-name"
-msgid "P3 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:249
-msgctxt "input-name"
-msgid "P3 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:250
-msgctxt "input-name"
-msgid "P3 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:255
-msgctxt "input-name"
-msgid "P4 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:256
-msgctxt "input-name"
-msgid "P4 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:257
-msgctxt "input-name"
-msgid "P4 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:258
-msgctxt "input-name"
-msgid "P4 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:259
-msgctxt "input-name"
-msgid "P4 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:260
-msgctxt "input-name"
-msgid "P4 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:261
-msgctxt "input-name"
-msgid "P4 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:262
-msgctxt "input-name"
-msgid "P4 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:263
-msgctxt "input-name"
-msgid "P4 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:264
-msgctxt "input-name"
-msgid "P4 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:265
-msgctxt "input-name"
-msgid "P4 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:266
-msgctxt "input-name"
-msgid "P4 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:267
-msgctxt "input-name"
-msgid "P4 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:268
-msgctxt "input-name"
-msgid "P4 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:269
-msgctxt "input-name"
-msgid "P4 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:270
-msgctxt "input-name"
-msgid "P4 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:271
-msgctxt "input-name"
-msgid "P4 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:272
-msgctxt "input-name"
-msgid "P4 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:273
-msgctxt "input-name"
-msgid "P4 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:274
-msgctxt "input-name"
-msgid "P4 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:275
-msgctxt "input-name"
-msgid "P4 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:276
-msgctxt "input-name"
-msgid "P4 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:277
-msgctxt "input-name"
-msgid "P4 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:278
-msgctxt "input-name"
-msgid "P4 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:279
-msgctxt "input-name"
-msgid "P4 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:280
-msgctxt "input-name"
-msgid "P4 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:281
-msgctxt "input-name"
-msgid "P4 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:282
-msgctxt "input-name"
-msgid "P4 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:283
-msgctxt "input-name"
-msgid "P4 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:284
-msgctxt "input-name"
-msgid "P4 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:289
-msgctxt "input-name"
-msgid "P5 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:290
-msgctxt "input-name"
-msgid "P5 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:291
-msgctxt "input-name"
-msgid "P5 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:292
-msgctxt "input-name"
-msgid "P5 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:293
-msgctxt "input-name"
-msgid "P5 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:294
-msgctxt "input-name"
-msgid "P5 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:295
-msgctxt "input-name"
-msgid "P5 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:296
-msgctxt "input-name"
-msgid "P5 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:297
-msgctxt "input-name"
-msgid "P5 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:298
-msgctxt "input-name"
-msgid "P5 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:299
-msgctxt "input-name"
-msgid "P5 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:300
-msgctxt "input-name"
-msgid "P5 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:301
-msgctxt "input-name"
-msgid "P5 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:302
-msgctxt "input-name"
-msgid "P5 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:303
-msgctxt "input-name"
-msgid "P5 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:304
-msgctxt "input-name"
-msgid "P5 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:305
-msgctxt "input-name"
-msgid "P5 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:306
-msgctxt "input-name"
-msgid "P5 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:307
-msgctxt "input-name"
-msgid "P5 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:308
-msgctxt "input-name"
-msgid "P5 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:309
-msgctxt "input-name"
-msgid "P5 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:310
-msgctxt "input-name"
-msgid "P5 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:311
-msgctxt "input-name"
-msgid "P5 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:312
-msgctxt "input-name"
-msgid "P5 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:313
-msgctxt "input-name"
-msgid "P5 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:314
-msgctxt "input-name"
-msgid "P5 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:315
-msgctxt "input-name"
-msgid "P5 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:316
-msgctxt "input-name"
-msgid "P5 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:317
-msgctxt "input-name"
-msgid "P5 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:318
-msgctxt "input-name"
-msgid "P5 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:323
-msgctxt "input-name"
-msgid "P6 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:324
-msgctxt "input-name"
-msgid "P6 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:325
-msgctxt "input-name"
-msgid "P6 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:326
-msgctxt "input-name"
-msgid "P6 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:327
-msgctxt "input-name"
-msgid "P6 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:328
-msgctxt "input-name"
-msgid "P6 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:329
-msgctxt "input-name"
-msgid "P6 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:330
-msgctxt "input-name"
-msgid "P6 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:331
-msgctxt "input-name"
-msgid "P6 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:332
-msgctxt "input-name"
-msgid "P6 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:333
-msgctxt "input-name"
-msgid "P6 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:334
-msgctxt "input-name"
-msgid "P6 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:335
-msgctxt "input-name"
-msgid "P6 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:336
-msgctxt "input-name"
-msgid "P6 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:337
-msgctxt "input-name"
-msgid "P6 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:338
-msgctxt "input-name"
-msgid "P6 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:339
-msgctxt "input-name"
-msgid "P6 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:340
-msgctxt "input-name"
-msgid "P6 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:341
-msgctxt "input-name"
-msgid "P6 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:342
-msgctxt "input-name"
-msgid "P6 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:343
-msgctxt "input-name"
-msgid "P6 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:344
-msgctxt "input-name"
-msgid "P6 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:345
-msgctxt "input-name"
-msgid "P6 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:346
-msgctxt "input-name"
-msgid "P6 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:347
-msgctxt "input-name"
-msgid "P6 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:348
-msgctxt "input-name"
-msgid "P6 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:349
-msgctxt "input-name"
-msgid "P6 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:350
-msgctxt "input-name"
-msgid "P6 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:351
-msgctxt "input-name"
-msgid "P6 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:352
-msgctxt "input-name"
-msgid "P6 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:357
-msgctxt "input-name"
-msgid "P7 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:358
-msgctxt "input-name"
-msgid "P7 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:359
-msgctxt "input-name"
-msgid "P7 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:360
-msgctxt "input-name"
-msgid "P7 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:361
-msgctxt "input-name"
-msgid "P7 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:362
-msgctxt "input-name"
-msgid "P7 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:363
-msgctxt "input-name"
-msgid "P7 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:364
-msgctxt "input-name"
-msgid "P7 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:365
-msgctxt "input-name"
-msgid "P7 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:366
-msgctxt "input-name"
-msgid "P7 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:367
-msgctxt "input-name"
-msgid "P7 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:368
-msgctxt "input-name"
-msgid "P7 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:369
-msgctxt "input-name"
-msgid "P7 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:370
-msgctxt "input-name"
-msgid "P7 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:371
-msgctxt "input-name"
-msgid "P7 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:372
-msgctxt "input-name"
-msgid "P7 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:373
-msgctxt "input-name"
-msgid "P7 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:374
-msgctxt "input-name"
-msgid "P7 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:375
-msgctxt "input-name"
-msgid "P7 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:376
-msgctxt "input-name"
-msgid "P7 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:377
-msgctxt "input-name"
-msgid "P7 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:378
-msgctxt "input-name"
-msgid "P7 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:379
-msgctxt "input-name"
-msgid "P7 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:380
-msgctxt "input-name"
-msgid "P7 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:381
-msgctxt "input-name"
-msgid "P7 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:382
-msgctxt "input-name"
-msgid "P7 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:383
-msgctxt "input-name"
-msgid "P7 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:384
-msgctxt "input-name"
-msgid "P7 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:385
-msgctxt "input-name"
-msgid "P7 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:386
-msgctxt "input-name"
-msgid "P7 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:391
-msgctxt "input-name"
-msgid "P8 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:392
-msgctxt "input-name"
-msgid "P8 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:393
-msgctxt "input-name"
-msgid "P8 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:394
-msgctxt "input-name"
-msgid "P8 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:395
-msgctxt "input-name"
-msgid "P8 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:396
-msgctxt "input-name"
-msgid "P8 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:397
-msgctxt "input-name"
-msgid "P8 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:398
-msgctxt "input-name"
-msgid "P8 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:399
-msgctxt "input-name"
-msgid "P8 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:400
-msgctxt "input-name"
-msgid "P8 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:401
-msgctxt "input-name"
-msgid "P8 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:402
-msgctxt "input-name"
-msgid "P8 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:403
-msgctxt "input-name"
-msgid "P8 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:404
-msgctxt "input-name"
-msgid "P8 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:405
-msgctxt "input-name"
-msgid "P8 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:406
-msgctxt "input-name"
-msgid "P8 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:407
-msgctxt "input-name"
-msgid "P8 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:408
-msgctxt "input-name"
-msgid "P8 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:409
-msgctxt "input-name"
-msgid "P8 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:410
-msgctxt "input-name"
-msgid "P8 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:411
-msgctxt "input-name"
-msgid "P8 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:412
-msgctxt "input-name"
-msgid "P8 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:413
-msgctxt "input-name"
-msgid "P8 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:414
-msgctxt "input-name"
-msgid "P8 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:415
-msgctxt "input-name"
-msgid "P8 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:416
-msgctxt "input-name"
-msgid "P8 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:417
-msgctxt "input-name"
-msgid "P8 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:418
-msgctxt "input-name"
-msgid "P8 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:419
-msgctxt "input-name"
-msgid "P8 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:420
-msgctxt "input-name"
-msgid "P8 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:425
-msgctxt "input-name"
-msgid "P9 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:426
-msgctxt "input-name"
-msgid "P9 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:427
-msgctxt "input-name"
-msgid "P9 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:428
-msgctxt "input-name"
-msgid "P9 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:429
-msgctxt "input-name"
-msgid "P9 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:430
-msgctxt "input-name"
-msgid "P9 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:431
-msgctxt "input-name"
-msgid "P9 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:432
-msgctxt "input-name"
-msgid "P9 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:433
-msgctxt "input-name"
-msgid "P9 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:434
-msgctxt "input-name"
-msgid "P9 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:435
-msgctxt "input-name"
-msgid "P9 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:436
-msgctxt "input-name"
-msgid "P9 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:437
-msgctxt "input-name"
-msgid "P9 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:438
-msgctxt "input-name"
-msgid "P9 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:439
-msgctxt "input-name"
-msgid "P9 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:440
-msgctxt "input-name"
-msgid "P9 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:441
-msgctxt "input-name"
-msgid "P9 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:442
-msgctxt "input-name"
-msgid "P9 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:443
-msgctxt "input-name"
-msgid "P9 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:444
-msgctxt "input-name"
-msgid "P9 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:445
-msgctxt "input-name"
-msgid "P9 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:446
-msgctxt "input-name"
-msgid "P9 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:447
-msgctxt "input-name"
-msgid "P9 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:448
-msgctxt "input-name"
-msgid "P9 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:449
-msgctxt "input-name"
-msgid "P9 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:450
-msgctxt "input-name"
-msgid "P9 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:451
-msgctxt "input-name"
-msgid "P9 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:452
-msgctxt "input-name"
-msgid "P9 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:453
-msgctxt "input-name"
-msgid "P9 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:454
-msgctxt "input-name"
-msgid "P9 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:459
-msgctxt "input-name"
-msgid "P10 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:460
-msgctxt "input-name"
-msgid "P10 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:461
-msgctxt "input-name"
-msgid "P10 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:462
-msgctxt "input-name"
-msgid "P10 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:463
-msgctxt "input-name"
-msgid "P10 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:464
-msgctxt "input-name"
-msgid "P10 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:465
-msgctxt "input-name"
-msgid "P10 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:466
-msgctxt "input-name"
-msgid "P10 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:467
-msgctxt "input-name"
-msgid "P10 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:468
-msgctxt "input-name"
-msgid "P10 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:469
-msgctxt "input-name"
-msgid "P10 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:470
-msgctxt "input-name"
-msgid "P10 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:471
-msgctxt "input-name"
-msgid "P10 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:472
-msgctxt "input-name"
-msgid "P10 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:473
-msgctxt "input-name"
-msgid "P10 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:474
-msgctxt "input-name"
-msgid "P10 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:475
-msgctxt "input-name"
-msgid "P10 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:476
-msgctxt "input-name"
-msgid "P10 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:477
-msgctxt "input-name"
-msgid "P10 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:478
-msgctxt "input-name"
-msgid "P10 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:479
-msgctxt "input-name"
-msgid "P10 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:480
-msgctxt "input-name"
-msgid "P10 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:481
-msgctxt "input-name"
-msgid "P10 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:482
-msgctxt "input-name"
-msgid "P10 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:483
-msgctxt "input-name"
-msgid "P10 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:484
-msgctxt "input-name"
-msgid "P10 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:485
-msgctxt "input-name"
-msgid "P10 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:486
-msgctxt "input-name"
-msgid "P10 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:487
-msgctxt "input-name"
-msgid "P10 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:488
-msgctxt "input-name"
-msgid "P10 Select"
-msgstr ""
-
 #: src/emu/inpttype.ipp:493
 msgctxt "input-name"
 msgid "1 Player Start"
@@ -5478,154 +4107,31 @@ msgctxt "input-name"
 msgid "Volume Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:550
-msgctxt "input-name"
-msgid "P1 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:551
-msgctxt "input-name"
-msgid "P2 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:552
-msgctxt "input-name"
-msgid "P3 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:553
-msgctxt "input-name"
-msgid "P4 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:554
-msgctxt "input-name"
-msgid "P5 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:555
-msgctxt "input-name"
-msgid "P6 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:556
-msgctxt "input-name"
-msgid "P7 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:557
-msgctxt "input-name"
-msgid "P8 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:558
-msgctxt "input-name"
-msgid "P9 Pedal 1"
-msgstr ""
-
+#: src/emu/inpttype.ipp:550 src/emu/inpttype.ipp:551 src/emu/inpttype.ipp:552
+#: src/emu/inpttype.ipp:553 src/emu/inpttype.ipp:554 src/emu/inpttype.ipp:555
+#: src/emu/inpttype.ipp:556 src/emu/inpttype.ipp:557 src/emu/inpttype.ipp:558
 #: src/emu/inpttype.ipp:559
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:564
-msgctxt "input-name"
-msgid "P1 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:565
-msgctxt "input-name"
-msgid "P2 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:566
-msgctxt "input-name"
-msgid "P3 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:567
-msgctxt "input-name"
-msgid "P4 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:568
-msgctxt "input-name"
-msgid "P5 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:569
-msgctxt "input-name"
-msgid "P6 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:570
-msgctxt "input-name"
-msgid "P7 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:571
-msgctxt "input-name"
-msgid "P8 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:572
-msgctxt "input-name"
-msgid "P9 Pedal 2"
+msgid "%p Pedal 1"
 msgstr ""
 
+#: src/emu/inpttype.ipp:564 src/emu/inpttype.ipp:565 src/emu/inpttype.ipp:566
+#: src/emu/inpttype.ipp:567 src/emu/inpttype.ipp:568 src/emu/inpttype.ipp:569
+#: src/emu/inpttype.ipp:570 src/emu/inpttype.ipp:571 src/emu/inpttype.ipp:572
 #: src/emu/inpttype.ipp:573
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:578
-msgctxt "input-name"
-msgid "P1 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:579
-msgctxt "input-name"
-msgid "P2 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:580
-msgctxt "input-name"
-msgid "P3 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:581
-msgctxt "input-name"
-msgid "P4 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:582
-msgctxt "input-name"
-msgid "P5 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:583
-msgctxt "input-name"
-msgid "P6 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:584
-msgctxt "input-name"
-msgid "P7 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:585
-msgctxt "input-name"
-msgid "P8 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:586
-msgctxt "input-name"
-msgid "P9 Pedal 3"
+msgid "%p Pedal 2"
 msgstr ""
 
+#: src/emu/inpttype.ipp:578 src/emu/inpttype.ipp:579 src/emu/inpttype.ipp:580
+#: src/emu/inpttype.ipp:581 src/emu/inpttype.ipp:582 src/emu/inpttype.ipp:583
+#: src/emu/inpttype.ipp:584 src/emu/inpttype.ipp:585 src/emu/inpttype.ipp:586
 #: src/emu/inpttype.ipp:587
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 3"
+msgid "%p Pedal 3"
 msgstr ""
 
 #: src/emu/inpttype.ipp:592
diff --git a/language/Vietnamese/strings.po b/language/Vietnamese/strings.po
index d650f30982e..7ddb7cd0e3c 100644
--- a/language/Vietnamese/strings.po
+++ b/language/Vietnamese/strings.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: MAME\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-19 02:50+1100\n"
+"POT-Creation-Date: 2021-12-09 04:44+1100\n"
 "PO-Revision-Date: 2016-02-20 18:03+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: MAME Language Team\n"
@@ -260,12 +260,12 @@ msgstr ""
 msgid "Driver: \"%1$s\" software list "
 msgstr ""
 
-#: src/frontend/mame/ui/selsoft.cpp:711 src/frontend/mame/ui/selgame.cpp:1066
+#: src/frontend/mame/ui/selsoft.cpp:711 src/frontend/mame/ui/selgame.cpp:1076
 #, c-format
 msgid "%1$s: %2$s - Search: %3$s_"
 msgstr ""
 
-#: src/frontend/mame/ui/selsoft.cpp:713 src/frontend/mame/ui/selgame.cpp:1068
+#: src/frontend/mame/ui/selsoft.cpp:713 src/frontend/mame/ui/selgame.cpp:1078
 #, c-format
 msgid "Search: %1$s_"
 msgstr ""
@@ -275,7 +275,7 @@ msgstr ""
 msgid "Software list/item: %1$s:%2$s"
 msgstr ""
 
-#: src/frontend/mame/ui/optsmenu.cpp:73 src/frontend/mame/ui/sndmenu.cpp:165
+#: src/frontend/mame/ui/optsmenu.cpp:73 src/frontend/mame/ui/sndmenu.cpp:161
 msgid "Sound Options"
 msgstr ""
 
@@ -370,11 +370,11 @@ msgid "Show mouse pointer"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:39
-msgid "Confirm quit from machines"
+msgid "Confirm quit from emulation"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:40
-msgid "Skip information screen at startup"
+msgid "Skip system information screen"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:41
@@ -390,7 +390,7 @@ msgid "Skip BIOS selection menu"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:44
-msgid "Skip software parts selection menu"
+msgid "Skip software part selection menu"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:45
@@ -542,7 +542,7 @@ msgid "UI active"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:91
-msgid "Offscreen reload"
+msgid "Off-screen reload"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:92
@@ -558,7 +558,7 @@ msgid "Natural keyboard"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:95
-msgid "Simultaneous contradictory"
+msgid "Allow contradictory joystick inputs"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:96
@@ -582,7 +582,7 @@ msgid "Pedal Device Assignment"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:106
-msgid "Adstick Device Assignment"
+msgid "AD Stick Device Assignment"
 msgstr ""
 
 #: src/frontend/mame/ui/submenu.cpp:107
@@ -669,14 +669,14 @@ msgstr ""
 msgid "Wait Vertical Sync"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:687
+#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:689
 #: src/frontend/mame/ui/videoopt.cpp:191 src/frontend/mame/ui/custui.cpp:490
 #: src/frontend/mame/ui/analogipt.cpp:471 plugins/cheatfind/init.lua:766
 #: plugins/cheatfind/init.lua:777 plugins/cheat/init.lua:668
 msgid "On"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:690
+#: src/frontend/mame/ui/menu.cpp:360 src/frontend/mame/ui/menu.cpp:692
 #: src/frontend/mame/ui/videoopt.cpp:207 src/frontend/mame/ui/custui.cpp:490
 #: src/frontend/mame/ui/analogipt.cpp:471 plugins/cheatfind/init.lua:763
 #: plugins/cheatfind/init.lua:774 plugins/cheat/init.lua:671
@@ -684,11 +684,11 @@ msgstr ""
 msgid "Off"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:693
+#: src/frontend/mame/ui/menu.cpp:695
 msgid "Auto"
 msgstr ""
 
-#: src/frontend/mame/ui/menu.cpp:1195
+#: src/frontend/mame/ui/menu.cpp:1197
 #: src/frontend/mame/ui/simpleselgame.cpp:278
 #: src/frontend/mame/ui/selmenu.cpp:1280
 msgid "Return to Previous Menu"
@@ -696,7 +696,7 @@ msgstr ""
 
 #: src/frontend/mame/ui/filemngr.cpp:139
 #: src/frontend/mame/ui/confswitch.cpp:119
-#: src/frontend/mame/ui/inputmap.cpp:559 src/frontend/mame/ui/analogipt.cpp:360
+#: src/frontend/mame/ui/inputmap.cpp:563 src/frontend/mame/ui/analogipt.cpp:360
 #, c-format
 msgid "[root%1$s]"
 msgstr ""
@@ -939,22 +939,22 @@ msgid ""
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "GHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "MHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "kHz"
 msgstr ""
 
 #: src/frontend/mame/ui/info.cpp:406 src/frontend/mame/ui/info.cpp:449
-#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:181
+#: src/frontend/mame/ui/devopt.cpp:105 src/frontend/mame/ui/devopt.cpp:184
 msgid "Hz"
 msgstr ""
 
@@ -978,38 +978,38 @@ msgstr ""
 msgid "Vector"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:480
+#: src/frontend/mame/ui/info.cpp:483
 #, c-format
 msgid "%1$s: %2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:480
+#: src/frontend/mame/ui/info.cpp:483
 msgid "%2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:497
+#: src/frontend/mame/ui/info.cpp:500
 #, c-format
 msgid "Screen '%1$s'"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:499
+#: src/frontend/mame/ui/info.cpp:502
 msgid "Screen"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:570 src/frontend/mame/ui/info.cpp:581
+#: src/frontend/mame/ui/info.cpp:573 src/frontend/mame/ui/info.cpp:584
 #, c-format
 msgid "%1$s:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:662
+#: src/frontend/mame/ui/info.cpp:665
 msgid "Not supported"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:665
+#: src/frontend/mame/ui/info.cpp:668
 msgid "Partially supported"
 msgstr ""
 
-#: src/frontend/mame/ui/info.cpp:674
+#: src/frontend/mame/ui/info.cpp:677
 msgid "[empty]"
 msgstr ""
 
@@ -1082,7 +1082,7 @@ msgid "Emulated"
 msgstr ""
 
 #: src/frontend/mame/ui/keyboard.cpp:59 src/frontend/mame/ui/confswitch.cpp:117
-#: src/frontend/mame/ui/inputmap.cpp:557 src/frontend/mame/ui/analogipt.cpp:358
+#: src/frontend/mame/ui/inputmap.cpp:561 src/frontend/mame/ui/analogipt.cpp:358
 #, c-format
 msgid "%1$s [root%2$s]"
 msgstr ""
@@ -1442,7 +1442,7 @@ msgctxt "swlist-info"
 msgid "Software list/item"
 msgstr ""
 
-#: src/frontend/mame/ui/datmenu.cpp:88 src/frontend/mame/ui/selmenu.cpp:2698
+#: src/frontend/mame/ui/datmenu.cpp:88 src/frontend/mame/ui/selmenu.cpp:2707
 msgid "Software List Info"
 msgstr ""
 
@@ -1557,7 +1557,7 @@ msgstr ""
 msgid "Configure Machine:"
 msgstr ""
 
-#: src/frontend/mame/ui/miscmenu.cpp:858 src/frontend/mame/ui/selmenu.cpp:2638
+#: src/frontend/mame/ui/miscmenu.cpp:858 src/frontend/mame/ui/selmenu.cpp:2647
 msgid " (default)"
 msgstr ""
 
@@ -1574,7 +1574,7 @@ msgid ""
 "Press %2$s to return to emulation"
 msgstr ""
 
-#: src/frontend/mame/ui/info_pty.cpp:30 src/frontend/mame/ui/mainmenu.cpp:155
+#: src/frontend/mame/ui/info_pty.cpp:30
 msgid "Pseudo terminals"
 msgstr ""
 
@@ -1642,52 +1642,52 @@ msgstr ""
 msgid "Other Controls"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:227
+#: src/frontend/mame/ui/inputmap.cpp:231
 msgid "This machine has no configurable inputs."
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:327
+#: src/frontend/mame/ui/inputmap.cpp:331
 msgid "Pressed"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:397
+#: src/frontend/mame/ui/inputmap.cpp:401
 msgid "Invalid sequence entered"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:542
+#: src/frontend/mame/ui/inputmap.cpp:546
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:543
+#: src/frontend/mame/ui/inputmap.cpp:547
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog Inc"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:544
+#: src/frontend/mame/ui/inputmap.cpp:548
 #, c-format
 msgctxt "input-name"
 msgid "%1$s Analog Dec"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:586
+#: src/frontend/mame/ui/inputmap.cpp:590
 #, c-format
 msgid "Press %1$s to set\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:587
+#: src/frontend/mame/ui/inputmap.cpp:591
 #, c-format
 msgid "Press %1$s to append\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:588
+#: src/frontend/mame/ui/inputmap.cpp:592
 #, c-format
 msgid "Press %1$s to clear\n"
 msgstr ""
 
-#: src/frontend/mame/ui/inputmap.cpp:589
+#: src/frontend/mame/ui/inputmap.cpp:593
 #, c-format
 msgid "Press %1$s to restore default\n"
 msgstr ""
@@ -1751,7 +1751,7 @@ msgid ""
 msgstr ""
 
 #: src/frontend/mame/ui/simpleselgame.cpp:273
-#: src/frontend/mame/ui/selgame.cpp:436
+#: src/frontend/mame/ui/selgame.cpp:443
 msgid "Configure Options"
 msgstr ""
 
@@ -2079,16 +2079,16 @@ msgstr ""
 msgid "Expand to fit"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:437
+#: src/frontend/mame/ui/selgame.cpp:444
 msgid "Configure Machine"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:1050
+#: src/frontend/mame/ui/selgame.cpp:1060
 #, c-format
 msgid "%1$s %2$s ( %3$d / %4$d machines (%5$d BIOS) )"
 msgstr ""
 
-#: src/frontend/mame/ui/selgame.cpp:1078
+#: src/frontend/mame/ui/selgame.cpp:1088
 #, c-format
 msgid "System: %1$-.100s"
 msgstr ""
@@ -2110,7 +2110,7 @@ msgstr ""
 #: src/frontend/mame/ui/auditmenu.cpp:98
 #, c-format
 msgid ""
-"Auditing ROMs for machine %2$u of %3$u...\n"
+"Auditing media for machine %2$u of %3$u...\n"
 "%1$s"
 msgstr ""
 
@@ -2125,12 +2125,12 @@ msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:136
 #, c-format
-msgid "Audit ROMs for %1$u machines marked unavailable"
+msgid "Audit media for %1$u machines marked unavailable"
 msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:137
 #, c-format
-msgid "Audit ROMs for all %1$u machines"
+msgid "Audit media for all %1$u machines"
 msgstr ""
 
 #: src/frontend/mame/ui/auditmenu.cpp:154
@@ -2336,84 +2336,84 @@ msgctxt "color-sample"
 msgid "Clone"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:914
+#: src/frontend/mame/ui/custui.cpp:906
 msgid "ARGB Settings"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:919 src/frontend/mame/ui/custui.cpp:922
+#: src/frontend/mame/ui/custui.cpp:911 src/frontend/mame/ui/custui.cpp:914
 msgctxt "color-channel"
 msgid "Alpha"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:927 src/frontend/mame/ui/custui.cpp:930
+#: src/frontend/mame/ui/custui.cpp:919 src/frontend/mame/ui/custui.cpp:922
 msgctxt "color-channel"
 msgid "Red"
 msgstr ""
 
+#: src/frontend/mame/ui/custui.cpp:927 src/frontend/mame/ui/custui.cpp:930
+msgctxt "color-channel"
+msgid "Green"
+msgstr ""
+
 #: src/frontend/mame/ui/custui.cpp:935 src/frontend/mame/ui/custui.cpp:938
 msgctxt "color-channel"
-msgid "Green"
-msgstr ""
-
-#: src/frontend/mame/ui/custui.cpp:943 src/frontend/mame/ui/custui.cpp:946
-msgctxt "color-channel"
 msgid "Blue"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:949
+#: src/frontend/mame/ui/custui.cpp:941
 msgid "Choose from palette"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:996
+#: src/frontend/mame/ui/custui.cpp:988
 msgid "Color preview:"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1093
+#: src/frontend/mame/ui/custui.cpp:1085
 msgctxt "color-preset"
 msgid "White"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1094
+#: src/frontend/mame/ui/custui.cpp:1086
 msgctxt "color-preset"
 msgid "Silver"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1095
+#: src/frontend/mame/ui/custui.cpp:1087
 msgctxt "color-preset"
 msgid "Gray"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1096
+#: src/frontend/mame/ui/custui.cpp:1088
 msgctxt "color-preset"
 msgid "Black"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1097
+#: src/frontend/mame/ui/custui.cpp:1089
 msgctxt "color-preset"
 msgid "Red"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1098
+#: src/frontend/mame/ui/custui.cpp:1090
 msgctxt "color-preset"
 msgid "Orange"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1099
+#: src/frontend/mame/ui/custui.cpp:1091
 msgctxt "color-preset"
 msgid "Yellow"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1100
+#: src/frontend/mame/ui/custui.cpp:1092
 msgctxt "color-preset"
 msgid "Green"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1101
+#: src/frontend/mame/ui/custui.cpp:1093
 msgctxt "color-preset"
 msgid "Blue"
 msgstr ""
 
-#: src/frontend/mame/ui/custui.cpp:1102
+#: src/frontend/mame/ui/custui.cpp:1094
 msgctxt "color-preset"
 msgid "Violet"
 msgstr ""
@@ -2478,7 +2478,7 @@ msgid "Input (general)"
 msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:123
-msgid "Input (this Machine)"
+msgid "Input (this machine)"
 msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:126
@@ -2517,6 +2517,10 @@ msgstr ""
 msgid "Tape Control"
 msgstr ""
 
+#: src/frontend/mame/ui/mainmenu.cpp:155
+msgid "Pseudo Terminals"
+msgstr ""
+
 #: src/frontend/mame/ui/mainmenu.cpp:158
 msgid "BIOS Selection"
 msgstr ""
@@ -2555,7 +2559,7 @@ msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:200
 #, c-format
-msgid "About %s"
+msgid "About %1$s"
 msgstr ""
 
 #: src/frontend/mame/ui/mainmenu.cpp:212
@@ -2715,373 +2719,373 @@ msgstr ""
 msgid "%1$s %2$s"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2235
+#: src/frontend/mame/ui/selmenu.cpp:2244
 msgid "Images"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2236
+#: src/frontend/mame/ui/selmenu.cpp:2245
 msgid "Infos"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2551
+#: src/frontend/mame/ui/selmenu.cpp:2560
 msgid ""
 "Required ROM/disk images for the selected system are missing or incorrect. "
 "Please acquire the correct files or select a different system.\n"
 "\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2567
+#: src/frontend/mame/ui/selmenu.cpp:2576
 msgid ""
 "Required ROM/disk images for the selected software are missing or incorrect. "
 "Please acquire the correct files or select a different software item.\n"
 "\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2583
+#: src/frontend/mame/ui/selmenu.cpp:2592
 msgid "incorrect checksum"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2586
+#: src/frontend/mame/ui/selmenu.cpp:2595
 msgid "incorrect length"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2589
+#: src/frontend/mame/ui/selmenu.cpp:2598
 msgid "not found"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2600
+#: src/frontend/mame/ui/selmenu.cpp:2609
 #, c-format
 msgid "%1$s (%2$s) - %3$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2602
+#: src/frontend/mame/ui/selmenu.cpp:2611
 #, c-format
 msgid "%1$s - %2$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2606
+#: src/frontend/mame/ui/selmenu.cpp:2615
 msgid "Press any key to continue."
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2735
+#: src/frontend/mame/ui/selmenu.cpp:2744
 msgid "General Info"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2887
-#, c-format
-msgid "Romset\t%1$s\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2888
-#, c-format
-msgid "Year\t%1$s\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2889
-#, c-format
-msgid "Manufacturer\t%1$s\n"
-msgstr ""
-
 #: src/frontend/mame/ui/selmenu.cpp:2896
 #, c-format
-msgid "Driver is Clone of\t%1$s\n"
+msgid "Romset\t%1$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2901
-msgid "Driver is Parent\t\n"
+#: src/frontend/mame/ui/selmenu.cpp:2897
+#, c-format
+msgid "Year\t%1$s\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2898
+#, c-format
+msgid "Manufacturer\t%1$s\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2905
-msgid "Analog Controls\tYes\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2907
-msgid "Keyboard Inputs\tYes\n"
+#, c-format
+msgid "Driver is Clone of\t%1$s\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2910
-msgid "Overall\tNOT WORKING\n"
-msgstr ""
-
-#: src/frontend/mame/ui/selmenu.cpp:2912
-msgid "Overall\tUnemulated Protection\n"
+msgid "Driver is Parent\t\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2914
-msgid "Overall\tWorking\n"
+msgid "Analog Controls\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2917
-msgid "Graphics\tUnimplemented\n"
+#: src/frontend/mame/ui/selmenu.cpp:2916
+msgid "Keyboard Inputs\tYes\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2919
-msgid "Graphics\tWrong Colors\n"
+msgid "Overall\tNOT WORKING\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2921
-msgid "Graphics\tImperfect Colors\n"
+msgid "Overall\tUnemulated Protection\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2923
-msgid "Graphics\tImperfect\n"
+msgid "Overall\tWorking\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2925
-msgid "Graphics\tOK\n"
+#: src/frontend/mame/ui/selmenu.cpp:2926
+msgid "Graphics\tUnimplemented\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2928
-msgid "Sound\tNone\n"
+msgid "Graphics\tWrong Colors\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2930
-msgid "Sound\tUnimplemented\n"
+msgid "Graphics\tImperfect Colors\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2932
-msgid "Sound\tImperfect\n"
+msgid "Graphics\tImperfect\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2934
-msgid "Sound\tOK\n"
+msgid "Graphics\tOK\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2937
-msgid "Capture\tUnimplemented\n"
+msgid "Sound\tNone\n"
 msgstr ""
 
 #: src/frontend/mame/ui/selmenu.cpp:2939
+msgid "Sound\tUnimplemented\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2941
+msgid "Sound\tImperfect\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2943
+msgid "Sound\tOK\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2946
+msgid "Capture\tUnimplemented\n"
+msgstr ""
+
+#: src/frontend/mame/ui/selmenu.cpp:2948
 msgid "Capture\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2942
+#: src/frontend/mame/ui/selmenu.cpp:2951
 msgid "Camera\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2944
+#: src/frontend/mame/ui/selmenu.cpp:2953
 msgid "Camera\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2947
+#: src/frontend/mame/ui/selmenu.cpp:2956
 msgid "Microphone\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2949
+#: src/frontend/mame/ui/selmenu.cpp:2958
 msgid "Microphone\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2952
+#: src/frontend/mame/ui/selmenu.cpp:2961
 msgid "Controls\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2954
+#: src/frontend/mame/ui/selmenu.cpp:2963
 msgid "Controls\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2957
+#: src/frontend/mame/ui/selmenu.cpp:2966
 msgid "Keyboard\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2959
+#: src/frontend/mame/ui/selmenu.cpp:2968
 msgid "Keyboard\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2962
+#: src/frontend/mame/ui/selmenu.cpp:2971
 msgid "Mouse\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2964
+#: src/frontend/mame/ui/selmenu.cpp:2973
 msgid "Mouse\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2967
+#: src/frontend/mame/ui/selmenu.cpp:2976
 msgid "Media\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2969
+#: src/frontend/mame/ui/selmenu.cpp:2978
 msgid "Media\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2972
+#: src/frontend/mame/ui/selmenu.cpp:2981
 msgid "Disk\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2974
+#: src/frontend/mame/ui/selmenu.cpp:2983
 msgid "Disk\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2977
+#: src/frontend/mame/ui/selmenu.cpp:2986
 msgid "Printer\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2979
+#: src/frontend/mame/ui/selmenu.cpp:2988
 msgid "Printer\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2982
+#: src/frontend/mame/ui/selmenu.cpp:2991
 msgid "Mag. Tape\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2984
+#: src/frontend/mame/ui/selmenu.cpp:2993
 msgid "Mag. Tape\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2987
+#: src/frontend/mame/ui/selmenu.cpp:2996
 msgid "Punch Tape\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2989
+#: src/frontend/mame/ui/selmenu.cpp:2998
 msgid "Punch Tape\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2992
+#: src/frontend/mame/ui/selmenu.cpp:3001
 msgid "Mag. Drum\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2994
+#: src/frontend/mame/ui/selmenu.cpp:3003
 msgid "Mag. Drum\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2997
+#: src/frontend/mame/ui/selmenu.cpp:3006
 msgid "(EP)ROM\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:2999
+#: src/frontend/mame/ui/selmenu.cpp:3008
 msgid "(EP)ROM\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3002
+#: src/frontend/mame/ui/selmenu.cpp:3011
 msgid "Communications\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3004
+#: src/frontend/mame/ui/selmenu.cpp:3013
 msgid "Communications\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3007
+#: src/frontend/mame/ui/selmenu.cpp:3016
 msgid "LAN\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3009
+#: src/frontend/mame/ui/selmenu.cpp:3018
 msgid "LAN\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3012
+#: src/frontend/mame/ui/selmenu.cpp:3021
 msgid "WAN\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3014
+#: src/frontend/mame/ui/selmenu.cpp:3023
 msgid "WAN\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3017
+#: src/frontend/mame/ui/selmenu.cpp:3026
 msgid "Timing\tUnimplemented\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3019
+#: src/frontend/mame/ui/selmenu.cpp:3028
 msgid "Timing\tImperfect\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3021
+#: src/frontend/mame/ui/selmenu.cpp:3030
 msgid "Mechanical Machine\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3021
+#: src/frontend/mame/ui/selmenu.cpp:3030
 msgid "Mechanical Machine\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3022
+#: src/frontend/mame/ui/selmenu.cpp:3031
 msgid "Requires Artwork\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3022
+#: src/frontend/mame/ui/selmenu.cpp:3031
 msgid "Requires Artwork\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3023
+#: src/frontend/mame/ui/selmenu.cpp:3032
 msgid "Requires Clickable Artwork\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3023
+#: src/frontend/mame/ui/selmenu.cpp:3032
 msgid "Requires Clickable Artwork\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3025
+#: src/frontend/mame/ui/selmenu.cpp:3034
 msgid "Support Cocktail\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3026
+#: src/frontend/mame/ui/selmenu.cpp:3035
 msgid "Driver is BIOS\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3026
+#: src/frontend/mame/ui/selmenu.cpp:3035
 msgid "Driver is BIOS\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3027
+#: src/frontend/mame/ui/selmenu.cpp:3036
 msgid "Support Save\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3027
+#: src/frontend/mame/ui/selmenu.cpp:3036
 msgid "Support Save\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3028
+#: src/frontend/mame/ui/selmenu.cpp:3037
 msgid "Screen Orientation\tVertical\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3028
+#: src/frontend/mame/ui/selmenu.cpp:3037
 msgid "Screen Orientation\tHorizontal\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3038
+#: src/frontend/mame/ui/selmenu.cpp:3047
 msgid "Requires CHD\tYes\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3038
+#: src/frontend/mame/ui/selmenu.cpp:3047
 msgid "Requires CHD\tNo\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3051
-msgid "ROM Audit Result\tOK\n"
+#: src/frontend/mame/ui/selmenu.cpp:3060
+msgid "Media Audit Result\tOK\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3053
-msgid "ROM Audit Result\tBAD\n"
+#: src/frontend/mame/ui/selmenu.cpp:3062
+msgid "Media Audit Result\tBAD\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3056
+#: src/frontend/mame/ui/selmenu.cpp:3065
 msgid "Samples Audit Result\tNone Needed\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3058
+#: src/frontend/mame/ui/selmenu.cpp:3067
 msgid "Samples Audit Result\tOK\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3060
+#: src/frontend/mame/ui/selmenu.cpp:3069
 msgid "Samples Audit Result\tBAD\n"
 msgstr ""
 
-#: src/frontend/mame/ui/selmenu.cpp:3064
+#: src/frontend/mame/ui/selmenu.cpp:3073
 msgid ""
-"ROM Audit \tDisabled\n"
-"Samples Audit \tDisabled\n"
+"Media Audit\tDisabled\n"
+"Samples Audit\tDisabled\n"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:150
+#: src/frontend/mame/ui/sndmenu.cpp:146
 msgid "Sound"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:151
+#: src/frontend/mame/ui/sndmenu.cpp:147
 msgid "Compressor"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:152
+#: src/frontend/mame/ui/sndmenu.cpp:148
 msgid "Sample Rate"
 msgstr ""
 
-#: src/frontend/mame/ui/sndmenu.cpp:153
+#: src/frontend/mame/ui/sndmenu.cpp:149
 msgid "Use External Samples"
 msgstr ""
 
@@ -3120,511 +3124,681 @@ msgstr ""
 msgid "  Screen '%1$s': Vector\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:132
+#: src/frontend/mame/ui/devopt.cpp:135
 #, c-format
 msgid "  Screen '%1$s': %2$d × %3$d (V) %4$s Hz\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:133
+#: src/frontend/mame/ui/devopt.cpp:136
 #, c-format
 msgid "  Screen '%1$s': %2$d × %3$d (H) %4$s Hz\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:147
+#: src/frontend/mame/ui/devopt.cpp:150
 msgid "* Sound:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:211
+#: src/frontend/mame/ui/devopt.cpp:214
 #, c-format
 msgid ""
 "* BIOS settings:\n"
 "  %1$d options    [default: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:255 src/frontend/mame/ui/devopt.cpp:271
-#: src/frontend/mame/ui/devopt.cpp:332
+#: src/frontend/mame/ui/devopt.cpp:258 src/frontend/mame/ui/devopt.cpp:274
+#: src/frontend/mame/ui/devopt.cpp:335
 #, c-format
 msgid "  %1$s    [default: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:260 src/frontend/mame/ui/devopt.cpp:276
+#: src/frontend/mame/ui/devopt.cpp:263 src/frontend/mame/ui/devopt.cpp:279
 #, c-format
 msgid "  %1$s\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:282
+#: src/frontend/mame/ui/devopt.cpp:285
 msgid "* DIP switch settings:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:287
+#: src/frontend/mame/ui/devopt.cpp:290
 msgid "* Configuration settings:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:291
+#: src/frontend/mame/ui/devopt.cpp:294
 msgid "* Input device(s):\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:293
+#: src/frontend/mame/ui/devopt.cpp:296
 #, c-format
 msgid "  User inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:295
+#: src/frontend/mame/ui/devopt.cpp:298
 #, c-format
 msgid "  Mahjong inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:297
+#: src/frontend/mame/ui/devopt.cpp:300
 #, c-format
 msgid "  Hanafuda inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:299
+#: src/frontend/mame/ui/devopt.cpp:302
 #, c-format
 msgid "  Gambling inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:301
+#: src/frontend/mame/ui/devopt.cpp:304
 #, c-format
 msgid "  Analog inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:303
+#: src/frontend/mame/ui/devopt.cpp:306
 #, c-format
 msgid "  Adjuster inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:305
+#: src/frontend/mame/ui/devopt.cpp:308
 #, c-format
 msgid "  Keypad inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:307
+#: src/frontend/mame/ui/devopt.cpp:310
 #, c-format
 msgid "  Keyboard inputs    [%1$d inputs]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:312
+#: src/frontend/mame/ui/devopt.cpp:315
 msgid "* Media Options:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:317
+#: src/frontend/mame/ui/devopt.cpp:320
 #, c-format
 msgid "  %1$s    [tag: %2$s]\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:327
+#: src/frontend/mame/ui/devopt.cpp:330
 msgid "* Slot Options:\n"
 msgstr ""
 
-#: src/frontend/mame/ui/devopt.cpp:341
+#: src/frontend/mame/ui/devopt.cpp:344
 msgid "[None]\n"
 msgstr ""
 
-#: src/emu/render.cpp:1847
+#: src/emu/render.cpp:1796
 #, c-format
 msgctxt "view-name"
 msgid "Screen %1$u Standard (%2$u:%3$u)"
 msgstr ""
 
-#: src/emu/render.cpp:1873
+#: src/emu/render.cpp:1822
 #, c-format
 msgctxt "view-name"
 msgid "Screen %1$u Pixel Aspect (%2$u:%3$u)"
 msgstr ""
 
-#: src/emu/render.cpp:1895 src/emu/render.cpp:2030
+#: src/emu/render.cpp:1844 src/emu/render.cpp:1979
 msgctxt "view-name"
 msgid "Cocktail"
 msgstr ""
 
-#: src/emu/render.cpp:2015
+#: src/emu/render.cpp:1964
 msgctxt "view-name"
 msgid "Left-to-Right"
 msgstr ""
 
-#: src/emu/render.cpp:2016
+#: src/emu/render.cpp:1965
 msgctxt "view-name"
 msgid "Left-to-Right (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2017
+#: src/emu/render.cpp:1966
 msgctxt "view-name"
 msgid "Top-to-Bottom"
 msgstr ""
 
-#: src/emu/render.cpp:2018
+#: src/emu/render.cpp:1967
 msgctxt "view-name"
 msgid "Top-to-Bottom (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2069
+#: src/emu/render.cpp:2018
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Left-to-Right, Top-to-Bottom"
 msgstr ""
 
-#: src/emu/render.cpp:2078
+#: src/emu/render.cpp:2027
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Left-to-Right, Top-to-Bottom (Gapless)"
 msgstr ""
 
-#: src/emu/render.cpp:2087
+#: src/emu/render.cpp:2036
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Top-to-Bottom, Left-to-Right"
 msgstr ""
 
-#: src/emu/render.cpp:2096
+#: src/emu/render.cpp:2045
 #, c-format
 msgctxt "view-name"
 msgid "%1$u×%2$u Top-to-Bottom, Left-to-Right (Gapless)"
 msgstr ""
 
-#: src/emu/inpttype.ipp:22
+#: src/emu/ioport.cpp:332
+#, c-format
 msgctxt "input-name"
-msgid "P1 Up"
+msgid "P%1$u"
 msgstr ""
 
-#: src/emu/inpttype.ipp:23
+#: src/emu/ioport.cpp:1924
 msgctxt "input-name"
-msgid "P1 Down"
+msgid "???"
 msgstr ""
 
-#: src/emu/inpttype.ipp:24
+#: src/emu/inpttype.ipp:22 src/emu/inpttype.ipp:140 src/emu/inpttype.ipp:221
+#: src/emu/inpttype.ipp:255 src/emu/inpttype.ipp:289 src/emu/inpttype.ipp:323
+#: src/emu/inpttype.ipp:357 src/emu/inpttype.ipp:391 src/emu/inpttype.ipp:425
+#: src/emu/inpttype.ipp:459
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left"
+msgid "%p Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:25
+#: src/emu/inpttype.ipp:23 src/emu/inpttype.ipp:141 src/emu/inpttype.ipp:222
+#: src/emu/inpttype.ipp:256 src/emu/inpttype.ipp:290 src/emu/inpttype.ipp:324
+#: src/emu/inpttype.ipp:358 src/emu/inpttype.ipp:392 src/emu/inpttype.ipp:426
+#: src/emu/inpttype.ipp:460
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right"
+msgid "%p Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:26
+#: src/emu/inpttype.ipp:24 src/emu/inpttype.ipp:142 src/emu/inpttype.ipp:223
+#: src/emu/inpttype.ipp:257 src/emu/inpttype.ipp:291 src/emu/inpttype.ipp:325
+#: src/emu/inpttype.ipp:359 src/emu/inpttype.ipp:393 src/emu/inpttype.ipp:427
+#: src/emu/inpttype.ipp:461
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Up"
+msgid "%p Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:27
+#: src/emu/inpttype.ipp:25 src/emu/inpttype.ipp:143 src/emu/inpttype.ipp:224
+#: src/emu/inpttype.ipp:258 src/emu/inpttype.ipp:292 src/emu/inpttype.ipp:326
+#: src/emu/inpttype.ipp:360 src/emu/inpttype.ipp:394 src/emu/inpttype.ipp:428
+#: src/emu/inpttype.ipp:462
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Down"
+msgid "%p Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:28
+#: src/emu/inpttype.ipp:26 src/emu/inpttype.ipp:144 src/emu/inpttype.ipp:225
+#: src/emu/inpttype.ipp:259 src/emu/inpttype.ipp:293 src/emu/inpttype.ipp:327
+#: src/emu/inpttype.ipp:361 src/emu/inpttype.ipp:395 src/emu/inpttype.ipp:429
+#: src/emu/inpttype.ipp:463
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Left"
+msgid "%p Right Stick/Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:29
+#: src/emu/inpttype.ipp:27 src/emu/inpttype.ipp:145 src/emu/inpttype.ipp:226
+#: src/emu/inpttype.ipp:260 src/emu/inpttype.ipp:294 src/emu/inpttype.ipp:328
+#: src/emu/inpttype.ipp:362 src/emu/inpttype.ipp:396 src/emu/inpttype.ipp:430
+#: src/emu/inpttype.ipp:464
+#, c-format
 msgctxt "input-name"
-msgid "P1 Right Stick/Right"
+msgid "%p Right Stick/Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:30
+#: src/emu/inpttype.ipp:28 src/emu/inpttype.ipp:146 src/emu/inpttype.ipp:227
+#: src/emu/inpttype.ipp:261 src/emu/inpttype.ipp:295 src/emu/inpttype.ipp:329
+#: src/emu/inpttype.ipp:363 src/emu/inpttype.ipp:397 src/emu/inpttype.ipp:431
+#: src/emu/inpttype.ipp:465
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Up"
+msgid "%p Right Stick/Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:31
+#: src/emu/inpttype.ipp:29 src/emu/inpttype.ipp:147 src/emu/inpttype.ipp:228
+#: src/emu/inpttype.ipp:262 src/emu/inpttype.ipp:296 src/emu/inpttype.ipp:330
+#: src/emu/inpttype.ipp:364 src/emu/inpttype.ipp:398 src/emu/inpttype.ipp:432
+#: src/emu/inpttype.ipp:466
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Down"
+msgid "%p Right Stick/Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:32
+#: src/emu/inpttype.ipp:30 src/emu/inpttype.ipp:148 src/emu/inpttype.ipp:229
+#: src/emu/inpttype.ipp:263 src/emu/inpttype.ipp:297 src/emu/inpttype.ipp:331
+#: src/emu/inpttype.ipp:365 src/emu/inpttype.ipp:399 src/emu/inpttype.ipp:433
+#: src/emu/inpttype.ipp:467
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Left"
+msgid "%p Left Stick/Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:33
+#: src/emu/inpttype.ipp:31 src/emu/inpttype.ipp:149 src/emu/inpttype.ipp:230
+#: src/emu/inpttype.ipp:264 src/emu/inpttype.ipp:298 src/emu/inpttype.ipp:332
+#: src/emu/inpttype.ipp:366 src/emu/inpttype.ipp:400 src/emu/inpttype.ipp:434
+#: src/emu/inpttype.ipp:468
+#, c-format
 msgctxt "input-name"
-msgid "P1 Left Stick/Right"
+msgid "%p Left Stick/Down"
 msgstr ""
 
-#: src/emu/inpttype.ipp:34
+#: src/emu/inpttype.ipp:32 src/emu/inpttype.ipp:150 src/emu/inpttype.ipp:231
+#: src/emu/inpttype.ipp:265 src/emu/inpttype.ipp:299 src/emu/inpttype.ipp:333
+#: src/emu/inpttype.ipp:367 src/emu/inpttype.ipp:401 src/emu/inpttype.ipp:435
+#: src/emu/inpttype.ipp:469
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 1"
+msgid "%p Left Stick/Left"
 msgstr ""
 
-#: src/emu/inpttype.ipp:35
+#: src/emu/inpttype.ipp:33 src/emu/inpttype.ipp:151 src/emu/inpttype.ipp:232
+#: src/emu/inpttype.ipp:266 src/emu/inpttype.ipp:300 src/emu/inpttype.ipp:334
+#: src/emu/inpttype.ipp:368 src/emu/inpttype.ipp:402 src/emu/inpttype.ipp:436
+#: src/emu/inpttype.ipp:470
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 2"
+msgid "%p Left Stick/Right"
 msgstr ""
 
-#: src/emu/inpttype.ipp:36
+#: src/emu/inpttype.ipp:34 src/emu/inpttype.ipp:152 src/emu/inpttype.ipp:233
+#: src/emu/inpttype.ipp:267 src/emu/inpttype.ipp:301 src/emu/inpttype.ipp:335
+#: src/emu/inpttype.ipp:369 src/emu/inpttype.ipp:403 src/emu/inpttype.ipp:437
+#: src/emu/inpttype.ipp:471
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 3"
+msgid "%p Button 1"
 msgstr ""
 
-#: src/emu/inpttype.ipp:37
+#: src/emu/inpttype.ipp:35 src/emu/inpttype.ipp:153 src/emu/inpttype.ipp:234
+#: src/emu/inpttype.ipp:268 src/emu/inpttype.ipp:302 src/emu/inpttype.ipp:336
+#: src/emu/inpttype.ipp:370 src/emu/inpttype.ipp:404 src/emu/inpttype.ipp:438
+#: src/emu/inpttype.ipp:472
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 4"
+msgid "%p Button 2"
 msgstr ""
 
-#: src/emu/inpttype.ipp:38
+#: src/emu/inpttype.ipp:36 src/emu/inpttype.ipp:154 src/emu/inpttype.ipp:235
+#: src/emu/inpttype.ipp:269 src/emu/inpttype.ipp:303 src/emu/inpttype.ipp:337
+#: src/emu/inpttype.ipp:371 src/emu/inpttype.ipp:405 src/emu/inpttype.ipp:439
+#: src/emu/inpttype.ipp:473
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 5"
+msgid "%p Button 3"
 msgstr ""
 
-#: src/emu/inpttype.ipp:39
+#: src/emu/inpttype.ipp:37 src/emu/inpttype.ipp:155 src/emu/inpttype.ipp:236
+#: src/emu/inpttype.ipp:270 src/emu/inpttype.ipp:304 src/emu/inpttype.ipp:338
+#: src/emu/inpttype.ipp:372 src/emu/inpttype.ipp:406 src/emu/inpttype.ipp:440
+#: src/emu/inpttype.ipp:474
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 6"
+msgid "%p Button 4"
 msgstr ""
 
-#: src/emu/inpttype.ipp:40
+#: src/emu/inpttype.ipp:38 src/emu/inpttype.ipp:156 src/emu/inpttype.ipp:237
+#: src/emu/inpttype.ipp:271 src/emu/inpttype.ipp:305 src/emu/inpttype.ipp:339
+#: src/emu/inpttype.ipp:373 src/emu/inpttype.ipp:407 src/emu/inpttype.ipp:441
+#: src/emu/inpttype.ipp:475
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 7"
+msgid "%p Button 5"
 msgstr ""
 
-#: src/emu/inpttype.ipp:41
+#: src/emu/inpttype.ipp:39 src/emu/inpttype.ipp:157 src/emu/inpttype.ipp:238
+#: src/emu/inpttype.ipp:272 src/emu/inpttype.ipp:306 src/emu/inpttype.ipp:340
+#: src/emu/inpttype.ipp:374 src/emu/inpttype.ipp:408 src/emu/inpttype.ipp:442
+#: src/emu/inpttype.ipp:476
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 8"
+msgid "%p Button 6"
 msgstr ""
 
-#: src/emu/inpttype.ipp:42
+#: src/emu/inpttype.ipp:40 src/emu/inpttype.ipp:158 src/emu/inpttype.ipp:239
+#: src/emu/inpttype.ipp:273 src/emu/inpttype.ipp:307 src/emu/inpttype.ipp:341
+#: src/emu/inpttype.ipp:375 src/emu/inpttype.ipp:409 src/emu/inpttype.ipp:443
+#: src/emu/inpttype.ipp:477
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 9"
+msgid "%p Button 7"
 msgstr ""
 
-#: src/emu/inpttype.ipp:43
+#: src/emu/inpttype.ipp:41 src/emu/inpttype.ipp:159 src/emu/inpttype.ipp:240
+#: src/emu/inpttype.ipp:274 src/emu/inpttype.ipp:308 src/emu/inpttype.ipp:342
+#: src/emu/inpttype.ipp:376 src/emu/inpttype.ipp:410 src/emu/inpttype.ipp:444
+#: src/emu/inpttype.ipp:478
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 10"
+msgid "%p Button 8"
 msgstr ""
 
-#: src/emu/inpttype.ipp:44
+#: src/emu/inpttype.ipp:42 src/emu/inpttype.ipp:160 src/emu/inpttype.ipp:241
+#: src/emu/inpttype.ipp:275 src/emu/inpttype.ipp:309 src/emu/inpttype.ipp:343
+#: src/emu/inpttype.ipp:377 src/emu/inpttype.ipp:411 src/emu/inpttype.ipp:445
+#: src/emu/inpttype.ipp:479
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 11"
+msgid "%p Button 9"
 msgstr ""
 
-#: src/emu/inpttype.ipp:45
+#: src/emu/inpttype.ipp:43 src/emu/inpttype.ipp:161 src/emu/inpttype.ipp:242
+#: src/emu/inpttype.ipp:276 src/emu/inpttype.ipp:310 src/emu/inpttype.ipp:344
+#: src/emu/inpttype.ipp:378 src/emu/inpttype.ipp:412 src/emu/inpttype.ipp:446
+#: src/emu/inpttype.ipp:480
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 12"
+msgid "%p Button 10"
 msgstr ""
 
-#: src/emu/inpttype.ipp:46
+#: src/emu/inpttype.ipp:44 src/emu/inpttype.ipp:162 src/emu/inpttype.ipp:243
+#: src/emu/inpttype.ipp:277 src/emu/inpttype.ipp:311 src/emu/inpttype.ipp:345
+#: src/emu/inpttype.ipp:379 src/emu/inpttype.ipp:413 src/emu/inpttype.ipp:447
+#: src/emu/inpttype.ipp:481
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 13"
+msgid "%p Button 11"
 msgstr ""
 
-#: src/emu/inpttype.ipp:47
+#: src/emu/inpttype.ipp:45 src/emu/inpttype.ipp:163 src/emu/inpttype.ipp:244
+#: src/emu/inpttype.ipp:278 src/emu/inpttype.ipp:312 src/emu/inpttype.ipp:346
+#: src/emu/inpttype.ipp:380 src/emu/inpttype.ipp:414 src/emu/inpttype.ipp:448
+#: src/emu/inpttype.ipp:482
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 14"
+msgid "%p Button 12"
 msgstr ""
 
-#: src/emu/inpttype.ipp:48
+#: src/emu/inpttype.ipp:46 src/emu/inpttype.ipp:164 src/emu/inpttype.ipp:245
+#: src/emu/inpttype.ipp:279 src/emu/inpttype.ipp:313 src/emu/inpttype.ipp:347
+#: src/emu/inpttype.ipp:381 src/emu/inpttype.ipp:415 src/emu/inpttype.ipp:449
+#: src/emu/inpttype.ipp:483
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 15"
+msgid "%p Button 13"
 msgstr ""
 
-#: src/emu/inpttype.ipp:49
+#: src/emu/inpttype.ipp:47 src/emu/inpttype.ipp:165 src/emu/inpttype.ipp:246
+#: src/emu/inpttype.ipp:280 src/emu/inpttype.ipp:314 src/emu/inpttype.ipp:348
+#: src/emu/inpttype.ipp:382 src/emu/inpttype.ipp:416 src/emu/inpttype.ipp:450
+#: src/emu/inpttype.ipp:484
+#, c-format
 msgctxt "input-name"
-msgid "P1 Button 16"
+msgid "%p Button 14"
 msgstr ""
 
-#: src/emu/inpttype.ipp:50
+#: src/emu/inpttype.ipp:48 src/emu/inpttype.ipp:166 src/emu/inpttype.ipp:247
+#: src/emu/inpttype.ipp:281 src/emu/inpttype.ipp:315 src/emu/inpttype.ipp:349
+#: src/emu/inpttype.ipp:383 src/emu/inpttype.ipp:417 src/emu/inpttype.ipp:451
+#: src/emu/inpttype.ipp:485
+#, c-format
 msgctxt "input-name"
-msgid "P1 Start"
+msgid "%p Button 15"
 msgstr ""
 
-#: src/emu/inpttype.ipp:51
+#: src/emu/inpttype.ipp:49 src/emu/inpttype.ipp:167 src/emu/inpttype.ipp:248
+#: src/emu/inpttype.ipp:282 src/emu/inpttype.ipp:316 src/emu/inpttype.ipp:350
+#: src/emu/inpttype.ipp:384 src/emu/inpttype.ipp:418 src/emu/inpttype.ipp:452
+#: src/emu/inpttype.ipp:486
+#, c-format
 msgctxt "input-name"
-msgid "P1 Select"
+msgid "%p Button 16"
 msgstr ""
 
-#: src/emu/inpttype.ipp:56
+#: src/emu/inpttype.ipp:50 src/emu/inpttype.ipp:168 src/emu/inpttype.ipp:249
+#: src/emu/inpttype.ipp:283 src/emu/inpttype.ipp:317 src/emu/inpttype.ipp:351
+#: src/emu/inpttype.ipp:385 src/emu/inpttype.ipp:419 src/emu/inpttype.ipp:453
+#: src/emu/inpttype.ipp:487
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong A"
+msgid "%p Start"
 msgstr ""
 
-#: src/emu/inpttype.ipp:57
+#: src/emu/inpttype.ipp:51 src/emu/inpttype.ipp:169 src/emu/inpttype.ipp:250
+#: src/emu/inpttype.ipp:284 src/emu/inpttype.ipp:318 src/emu/inpttype.ipp:352
+#: src/emu/inpttype.ipp:386 src/emu/inpttype.ipp:420 src/emu/inpttype.ipp:454
+#: src/emu/inpttype.ipp:488
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong B"
+msgid "%p Select"
 msgstr ""
 
-#: src/emu/inpttype.ipp:58
+#: src/emu/inpttype.ipp:56 src/emu/inpttype.ipp:174
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong C"
+msgid "%p Mahjong A"
 msgstr ""
 
-#: src/emu/inpttype.ipp:59
+#: src/emu/inpttype.ipp:57 src/emu/inpttype.ipp:175
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong D"
+msgid "%p Mahjong B"
 msgstr ""
 
-#: src/emu/inpttype.ipp:60
+#: src/emu/inpttype.ipp:58 src/emu/inpttype.ipp:176
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong E"
+msgid "%p Mahjong C"
 msgstr ""
 
-#: src/emu/inpttype.ipp:61
+#: src/emu/inpttype.ipp:59 src/emu/inpttype.ipp:177
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong F"
+msgid "%p Mahjong D"
 msgstr ""
 
-#: src/emu/inpttype.ipp:62
+#: src/emu/inpttype.ipp:60 src/emu/inpttype.ipp:178
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong G"
+msgid "%p Mahjong E"
 msgstr ""
 
-#: src/emu/inpttype.ipp:63
+#: src/emu/inpttype.ipp:61 src/emu/inpttype.ipp:179
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong H"
+msgid "%p Mahjong F"
 msgstr ""
 
-#: src/emu/inpttype.ipp:64
+#: src/emu/inpttype.ipp:62 src/emu/inpttype.ipp:180
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong I"
+msgid "%p Mahjong G"
 msgstr ""
 
-#: src/emu/inpttype.ipp:65
+#: src/emu/inpttype.ipp:63 src/emu/inpttype.ipp:181
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong J"
+msgid "%p Mahjong H"
 msgstr ""
 
-#: src/emu/inpttype.ipp:66
+#: src/emu/inpttype.ipp:64 src/emu/inpttype.ipp:182
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong K"
+msgid "%p Mahjong I"
 msgstr ""
 
-#: src/emu/inpttype.ipp:67
+#: src/emu/inpttype.ipp:65 src/emu/inpttype.ipp:183
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong L"
+msgid "%p Mahjong J"
 msgstr ""
 
-#: src/emu/inpttype.ipp:68
+#: src/emu/inpttype.ipp:66 src/emu/inpttype.ipp:184
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong M"
+msgid "%p Mahjong K"
 msgstr ""
 
-#: src/emu/inpttype.ipp:69
+#: src/emu/inpttype.ipp:67 src/emu/inpttype.ipp:185
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong N"
+msgid "%p Mahjong L"
 msgstr ""
 
-#: src/emu/inpttype.ipp:70
+#: src/emu/inpttype.ipp:68 src/emu/inpttype.ipp:186
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong O"
+msgid "%p Mahjong M"
 msgstr ""
 
-#: src/emu/inpttype.ipp:71
+#: src/emu/inpttype.ipp:69 src/emu/inpttype.ipp:187
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong P"
+msgid "%p Mahjong N"
 msgstr ""
 
-#: src/emu/inpttype.ipp:72
+#: src/emu/inpttype.ipp:70 src/emu/inpttype.ipp:188
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Q"
+msgid "%p Mahjong O"
 msgstr ""
 
-#: src/emu/inpttype.ipp:73
+#: src/emu/inpttype.ipp:71 src/emu/inpttype.ipp:189
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Kan"
+msgid "%p Mahjong P"
 msgstr ""
 
-#: src/emu/inpttype.ipp:74
+#: src/emu/inpttype.ipp:72 src/emu/inpttype.ipp:190
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Pon"
+msgid "%p Mahjong Q"
 msgstr ""
 
-#: src/emu/inpttype.ipp:75
+#: src/emu/inpttype.ipp:73 src/emu/inpttype.ipp:191
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Chi"
+msgid "%p Mahjong Kan"
 msgstr ""
 
-#: src/emu/inpttype.ipp:76
+#: src/emu/inpttype.ipp:74 src/emu/inpttype.ipp:192
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Reach"
+msgid "%p Mahjong Pon"
 msgstr ""
 
-#: src/emu/inpttype.ipp:77
+#: src/emu/inpttype.ipp:75 src/emu/inpttype.ipp:193
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Ron"
+msgid "%p Mahjong Chi"
 msgstr ""
 
-#: src/emu/inpttype.ipp:78
+#: src/emu/inpttype.ipp:76 src/emu/inpttype.ipp:194
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Flip Flop"
+msgid "%p Mahjong Reach"
 msgstr ""
 
-#: src/emu/inpttype.ipp:79
+#: src/emu/inpttype.ipp:77 src/emu/inpttype.ipp:195
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Bet"
+msgid "%p Mahjong Ron"
 msgstr ""
 
-#: src/emu/inpttype.ipp:80
+#: src/emu/inpttype.ipp:78 src/emu/inpttype.ipp:200
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Take Score"
+msgid "%p Mahjong Flip Flop"
 msgstr ""
 
-#: src/emu/inpttype.ipp:81
+#: src/emu/inpttype.ipp:79 src/emu/inpttype.ipp:196
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Double Up"
+msgid "%p Mahjong Bet"
 msgstr ""
 
-#: src/emu/inpttype.ipp:82
+#: src/emu/inpttype.ipp:80 src/emu/inpttype.ipp:198
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Big"
+msgid "%p Mahjong Take Score"
 msgstr ""
 
-#: src/emu/inpttype.ipp:83
+#: src/emu/inpttype.ipp:81 src/emu/inpttype.ipp:199
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Small"
+msgid "%p Mahjong Double Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:84
+#: src/emu/inpttype.ipp:82 src/emu/inpttype.ipp:201
+#, c-format
 msgctxt "input-name"
-msgid "P1 Mahjong Last Chance"
+msgid "%p Mahjong Big"
 msgstr ""
 
-#: src/emu/inpttype.ipp:89
+#: src/emu/inpttype.ipp:83 src/emu/inpttype.ipp:202
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda A/1"
+msgid "%p Mahjong Small"
 msgstr ""
 
-#: src/emu/inpttype.ipp:90
+#: src/emu/inpttype.ipp:84 src/emu/inpttype.ipp:197
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda B/2"
+msgid "%p Mahjong Last Chance"
 msgstr ""
 
-#: src/emu/inpttype.ipp:91
+#: src/emu/inpttype.ipp:89 src/emu/inpttype.ipp:207
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda C/3"
+msgid "%p Hanafuda A/1"
 msgstr ""
 
-#: src/emu/inpttype.ipp:92
+#: src/emu/inpttype.ipp:90 src/emu/inpttype.ipp:208
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda D/4"
+msgid "%p Hanafuda B/2"
 msgstr ""
 
-#: src/emu/inpttype.ipp:93
+#: src/emu/inpttype.ipp:91 src/emu/inpttype.ipp:209
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda E/5"
+msgid "%p Hanafuda C/3"
 msgstr ""
 
-#: src/emu/inpttype.ipp:94
+#: src/emu/inpttype.ipp:92 src/emu/inpttype.ipp:210
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda F/6"
+msgid "%p Hanafuda D/4"
 msgstr ""
 
-#: src/emu/inpttype.ipp:95
+#: src/emu/inpttype.ipp:93 src/emu/inpttype.ipp:211
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda G/7"
+msgid "%p Hanafuda E/5"
 msgstr ""
 
-#: src/emu/inpttype.ipp:96
+#: src/emu/inpttype.ipp:94 src/emu/inpttype.ipp:212
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda H/8"
+msgid "%p Hanafuda F/6"
 msgstr ""
 
-#: src/emu/inpttype.ipp:97
+#: src/emu/inpttype.ipp:95 src/emu/inpttype.ipp:213
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda Yes"
+msgid "%p Hanafuda G/7"
 msgstr ""
 
-#: src/emu/inpttype.ipp:98
+#: src/emu/inpttype.ipp:96 src/emu/inpttype.ipp:214
+#, c-format
 msgctxt "input-name"
-msgid "P1 Hanafuda No"
+msgid "%p Hanafuda H/8"
+msgstr ""
+
+#: src/emu/inpttype.ipp:97 src/emu/inpttype.ipp:215
+#, c-format
+msgctxt "input-name"
+msgid "%p Hanafuda Yes"
+msgstr ""
+
+#: src/emu/inpttype.ipp:98 src/emu/inpttype.ipp:216
+#, c-format
+msgctxt "input-name"
+msgid "%p Hanafuda No"
 msgstr ""
 
 #: src/emu/inpttype.ipp:103
@@ -3752,1551 +3926,6 @@ msgctxt "input-name"
 msgid "Stop All Reels"
 msgstr ""
 
-#: src/emu/inpttype.ipp:140
-msgctxt "input-name"
-msgid "P2 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:141
-msgctxt "input-name"
-msgid "P2 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:142
-msgctxt "input-name"
-msgid "P2 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:143
-msgctxt "input-name"
-msgid "P2 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:144
-msgctxt "input-name"
-msgid "P2 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:145
-msgctxt "input-name"
-msgid "P2 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:146
-msgctxt "input-name"
-msgid "P2 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:147
-msgctxt "input-name"
-msgid "P2 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:148
-msgctxt "input-name"
-msgid "P2 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:149
-msgctxt "input-name"
-msgid "P2 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:150
-msgctxt "input-name"
-msgid "P2 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:151
-msgctxt "input-name"
-msgid "P2 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:152
-msgctxt "input-name"
-msgid "P2 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:153
-msgctxt "input-name"
-msgid "P2 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:154
-msgctxt "input-name"
-msgid "P2 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:155
-msgctxt "input-name"
-msgid "P2 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:156
-msgctxt "input-name"
-msgid "P2 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:157
-msgctxt "input-name"
-msgid "P2 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:158
-msgctxt "input-name"
-msgid "P2 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:159
-msgctxt "input-name"
-msgid "P2 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:160
-msgctxt "input-name"
-msgid "P2 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:161
-msgctxt "input-name"
-msgid "P2 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:162
-msgctxt "input-name"
-msgid "P2 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:163
-msgctxt "input-name"
-msgid "P2 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:164
-msgctxt "input-name"
-msgid "P2 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:165
-msgctxt "input-name"
-msgid "P2 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:166
-msgctxt "input-name"
-msgid "P2 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:167
-msgctxt "input-name"
-msgid "P2 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:168
-msgctxt "input-name"
-msgid "P2 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:169
-msgctxt "input-name"
-msgid "P2 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:174
-msgctxt "input-name"
-msgid "P2 Mahjong A"
-msgstr ""
-
-#: src/emu/inpttype.ipp:175
-msgctxt "input-name"
-msgid "P2 Mahjong B"
-msgstr ""
-
-#: src/emu/inpttype.ipp:176
-msgctxt "input-name"
-msgid "P2 Mahjong C"
-msgstr ""
-
-#: src/emu/inpttype.ipp:177
-msgctxt "input-name"
-msgid "P2 Mahjong D"
-msgstr ""
-
-#: src/emu/inpttype.ipp:178
-msgctxt "input-name"
-msgid "P2 Mahjong E"
-msgstr ""
-
-#: src/emu/inpttype.ipp:179
-msgctxt "input-name"
-msgid "P2 Mahjong F"
-msgstr ""
-
-#: src/emu/inpttype.ipp:180
-msgctxt "input-name"
-msgid "P2 Mahjong G"
-msgstr ""
-
-#: src/emu/inpttype.ipp:181
-msgctxt "input-name"
-msgid "P2 Mahjong H"
-msgstr ""
-
-#: src/emu/inpttype.ipp:182
-msgctxt "input-name"
-msgid "P2 Mahjong I"
-msgstr ""
-
-#: src/emu/inpttype.ipp:183
-msgctxt "input-name"
-msgid "P2 Mahjong J"
-msgstr ""
-
-#: src/emu/inpttype.ipp:184
-msgctxt "input-name"
-msgid "P2 Mahjong K"
-msgstr ""
-
-#: src/emu/inpttype.ipp:185
-msgctxt "input-name"
-msgid "P2 Mahjong L"
-msgstr ""
-
-#: src/emu/inpttype.ipp:186
-msgctxt "input-name"
-msgid "P2 Mahjong M"
-msgstr ""
-
-#: src/emu/inpttype.ipp:187
-msgctxt "input-name"
-msgid "P2 Mahjong N"
-msgstr ""
-
-#: src/emu/inpttype.ipp:188
-msgctxt "input-name"
-msgid "P2 Mahjong O"
-msgstr ""
-
-#: src/emu/inpttype.ipp:189
-msgctxt "input-name"
-msgid "P2 Mahjong P"
-msgstr ""
-
-#: src/emu/inpttype.ipp:190
-msgctxt "input-name"
-msgid "P2 Mahjong Q"
-msgstr ""
-
-#: src/emu/inpttype.ipp:191
-msgctxt "input-name"
-msgid "P2 Mahjong Kan"
-msgstr ""
-
-#: src/emu/inpttype.ipp:192
-msgctxt "input-name"
-msgid "P2 Mahjong Pon"
-msgstr ""
-
-#: src/emu/inpttype.ipp:193
-msgctxt "input-name"
-msgid "P2 Mahjong Chi"
-msgstr ""
-
-#: src/emu/inpttype.ipp:194
-msgctxt "input-name"
-msgid "P2 Mahjong Reach"
-msgstr ""
-
-#: src/emu/inpttype.ipp:195
-msgctxt "input-name"
-msgid "P2 Mahjong Ron"
-msgstr ""
-
-#: src/emu/inpttype.ipp:196
-msgctxt "input-name"
-msgid "P2 Mahjong Bet"
-msgstr ""
-
-#: src/emu/inpttype.ipp:197
-msgctxt "input-name"
-msgid "P2 Mahjong Last Chance"
-msgstr ""
-
-#: src/emu/inpttype.ipp:198
-msgctxt "input-name"
-msgid "P2 Mahjong Take Score"
-msgstr ""
-
-#: src/emu/inpttype.ipp:199
-msgctxt "input-name"
-msgid "P2 Mahjong Double Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:200
-msgctxt "input-name"
-msgid "P2 Mahjong Flip Flop"
-msgstr ""
-
-#: src/emu/inpttype.ipp:201
-msgctxt "input-name"
-msgid "P2 Mahjong Big"
-msgstr ""
-
-#: src/emu/inpttype.ipp:202
-msgctxt "input-name"
-msgid "P2 Mahjong Small"
-msgstr ""
-
-#: src/emu/inpttype.ipp:207
-msgctxt "input-name"
-msgid "P2 Hanafuda A/1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:208
-msgctxt "input-name"
-msgid "P2 Hanafuda B/2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:209
-msgctxt "input-name"
-msgid "P2 Hanafuda C/3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:210
-msgctxt "input-name"
-msgid "P2 Hanafuda D/4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:211
-msgctxt "input-name"
-msgid "P2 Hanafuda E/5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:212
-msgctxt "input-name"
-msgid "P2 Hanafuda F/6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:213
-msgctxt "input-name"
-msgid "P2 Hanafuda G/7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:214
-msgctxt "input-name"
-msgid "P2 Hanafuda H/8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:215
-msgctxt "input-name"
-msgid "P2 Hanafuda Yes"
-msgstr ""
-
-#: src/emu/inpttype.ipp:216
-msgctxt "input-name"
-msgid "P2 Hanafuda No"
-msgstr ""
-
-#: src/emu/inpttype.ipp:221
-msgctxt "input-name"
-msgid "P3 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:222
-msgctxt "input-name"
-msgid "P3 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:223
-msgctxt "input-name"
-msgid "P3 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:224
-msgctxt "input-name"
-msgid "P3 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:225
-msgctxt "input-name"
-msgid "P3 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:226
-msgctxt "input-name"
-msgid "P3 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:227
-msgctxt "input-name"
-msgid "P3 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:228
-msgctxt "input-name"
-msgid "P3 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:229
-msgctxt "input-name"
-msgid "P3 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:230
-msgctxt "input-name"
-msgid "P3 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:231
-msgctxt "input-name"
-msgid "P3 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:232
-msgctxt "input-name"
-msgid "P3 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:233
-msgctxt "input-name"
-msgid "P3 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:234
-msgctxt "input-name"
-msgid "P3 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:235
-msgctxt "input-name"
-msgid "P3 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:236
-msgctxt "input-name"
-msgid "P3 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:237
-msgctxt "input-name"
-msgid "P3 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:238
-msgctxt "input-name"
-msgid "P3 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:239
-msgctxt "input-name"
-msgid "P3 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:240
-msgctxt "input-name"
-msgid "P3 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:241
-msgctxt "input-name"
-msgid "P3 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:242
-msgctxt "input-name"
-msgid "P3 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:243
-msgctxt "input-name"
-msgid "P3 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:244
-msgctxt "input-name"
-msgid "P3 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:245
-msgctxt "input-name"
-msgid "P3 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:246
-msgctxt "input-name"
-msgid "P3 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:247
-msgctxt "input-name"
-msgid "P3 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:248
-msgctxt "input-name"
-msgid "P3 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:249
-msgctxt "input-name"
-msgid "P3 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:250
-msgctxt "input-name"
-msgid "P3 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:255
-msgctxt "input-name"
-msgid "P4 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:256
-msgctxt "input-name"
-msgid "P4 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:257
-msgctxt "input-name"
-msgid "P4 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:258
-msgctxt "input-name"
-msgid "P4 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:259
-msgctxt "input-name"
-msgid "P4 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:260
-msgctxt "input-name"
-msgid "P4 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:261
-msgctxt "input-name"
-msgid "P4 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:262
-msgctxt "input-name"
-msgid "P4 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:263
-msgctxt "input-name"
-msgid "P4 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:264
-msgctxt "input-name"
-msgid "P4 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:265
-msgctxt "input-name"
-msgid "P4 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:266
-msgctxt "input-name"
-msgid "P4 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:267
-msgctxt "input-name"
-msgid "P4 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:268
-msgctxt "input-name"
-msgid "P4 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:269
-msgctxt "input-name"
-msgid "P4 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:270
-msgctxt "input-name"
-msgid "P4 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:271
-msgctxt "input-name"
-msgid "P4 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:272
-msgctxt "input-name"
-msgid "P4 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:273
-msgctxt "input-name"
-msgid "P4 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:274
-msgctxt "input-name"
-msgid "P4 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:275
-msgctxt "input-name"
-msgid "P4 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:276
-msgctxt "input-name"
-msgid "P4 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:277
-msgctxt "input-name"
-msgid "P4 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:278
-msgctxt "input-name"
-msgid "P4 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:279
-msgctxt "input-name"
-msgid "P4 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:280
-msgctxt "input-name"
-msgid "P4 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:281
-msgctxt "input-name"
-msgid "P4 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:282
-msgctxt "input-name"
-msgid "P4 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:283
-msgctxt "input-name"
-msgid "P4 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:284
-msgctxt "input-name"
-msgid "P4 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:289
-msgctxt "input-name"
-msgid "P5 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:290
-msgctxt "input-name"
-msgid "P5 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:291
-msgctxt "input-name"
-msgid "P5 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:292
-msgctxt "input-name"
-msgid "P5 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:293
-msgctxt "input-name"
-msgid "P5 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:294
-msgctxt "input-name"
-msgid "P5 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:295
-msgctxt "input-name"
-msgid "P5 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:296
-msgctxt "input-name"
-msgid "P5 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:297
-msgctxt "input-name"
-msgid "P5 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:298
-msgctxt "input-name"
-msgid "P5 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:299
-msgctxt "input-name"
-msgid "P5 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:300
-msgctxt "input-name"
-msgid "P5 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:301
-msgctxt "input-name"
-msgid "P5 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:302
-msgctxt "input-name"
-msgid "P5 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:303
-msgctxt "input-name"
-msgid "P5 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:304
-msgctxt "input-name"
-msgid "P5 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:305
-msgctxt "input-name"
-msgid "P5 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:306
-msgctxt "input-name"
-msgid "P5 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:307
-msgctxt "input-name"
-msgid "P5 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:308
-msgctxt "input-name"
-msgid "P5 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:309
-msgctxt "input-name"
-msgid "P5 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:310
-msgctxt "input-name"
-msgid "P5 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:311
-msgctxt "input-name"
-msgid "P5 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:312
-msgctxt "input-name"
-msgid "P5 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:313
-msgctxt "input-name"
-msgid "P5 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:314
-msgctxt "input-name"
-msgid "P5 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:315
-msgctxt "input-name"
-msgid "P5 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:316
-msgctxt "input-name"
-msgid "P5 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:317
-msgctxt "input-name"
-msgid "P5 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:318
-msgctxt "input-name"
-msgid "P5 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:323
-msgctxt "input-name"
-msgid "P6 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:324
-msgctxt "input-name"
-msgid "P6 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:325
-msgctxt "input-name"
-msgid "P6 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:326
-msgctxt "input-name"
-msgid "P6 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:327
-msgctxt "input-name"
-msgid "P6 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:328
-msgctxt "input-name"
-msgid "P6 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:329
-msgctxt "input-name"
-msgid "P6 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:330
-msgctxt "input-name"
-msgid "P6 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:331
-msgctxt "input-name"
-msgid "P6 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:332
-msgctxt "input-name"
-msgid "P6 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:333
-msgctxt "input-name"
-msgid "P6 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:334
-msgctxt "input-name"
-msgid "P6 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:335
-msgctxt "input-name"
-msgid "P6 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:336
-msgctxt "input-name"
-msgid "P6 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:337
-msgctxt "input-name"
-msgid "P6 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:338
-msgctxt "input-name"
-msgid "P6 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:339
-msgctxt "input-name"
-msgid "P6 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:340
-msgctxt "input-name"
-msgid "P6 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:341
-msgctxt "input-name"
-msgid "P6 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:342
-msgctxt "input-name"
-msgid "P6 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:343
-msgctxt "input-name"
-msgid "P6 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:344
-msgctxt "input-name"
-msgid "P6 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:345
-msgctxt "input-name"
-msgid "P6 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:346
-msgctxt "input-name"
-msgid "P6 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:347
-msgctxt "input-name"
-msgid "P6 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:348
-msgctxt "input-name"
-msgid "P6 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:349
-msgctxt "input-name"
-msgid "P6 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:350
-msgctxt "input-name"
-msgid "P6 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:351
-msgctxt "input-name"
-msgid "P6 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:352
-msgctxt "input-name"
-msgid "P6 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:357
-msgctxt "input-name"
-msgid "P7 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:358
-msgctxt "input-name"
-msgid "P7 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:359
-msgctxt "input-name"
-msgid "P7 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:360
-msgctxt "input-name"
-msgid "P7 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:361
-msgctxt "input-name"
-msgid "P7 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:362
-msgctxt "input-name"
-msgid "P7 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:363
-msgctxt "input-name"
-msgid "P7 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:364
-msgctxt "input-name"
-msgid "P7 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:365
-msgctxt "input-name"
-msgid "P7 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:366
-msgctxt "input-name"
-msgid "P7 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:367
-msgctxt "input-name"
-msgid "P7 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:368
-msgctxt "input-name"
-msgid "P7 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:369
-msgctxt "input-name"
-msgid "P7 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:370
-msgctxt "input-name"
-msgid "P7 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:371
-msgctxt "input-name"
-msgid "P7 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:372
-msgctxt "input-name"
-msgid "P7 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:373
-msgctxt "input-name"
-msgid "P7 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:374
-msgctxt "input-name"
-msgid "P7 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:375
-msgctxt "input-name"
-msgid "P7 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:376
-msgctxt "input-name"
-msgid "P7 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:377
-msgctxt "input-name"
-msgid "P7 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:378
-msgctxt "input-name"
-msgid "P7 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:379
-msgctxt "input-name"
-msgid "P7 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:380
-msgctxt "input-name"
-msgid "P7 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:381
-msgctxt "input-name"
-msgid "P7 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:382
-msgctxt "input-name"
-msgid "P7 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:383
-msgctxt "input-name"
-msgid "P7 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:384
-msgctxt "input-name"
-msgid "P7 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:385
-msgctxt "input-name"
-msgid "P7 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:386
-msgctxt "input-name"
-msgid "P7 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:391
-msgctxt "input-name"
-msgid "P8 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:392
-msgctxt "input-name"
-msgid "P8 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:393
-msgctxt "input-name"
-msgid "P8 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:394
-msgctxt "input-name"
-msgid "P8 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:395
-msgctxt "input-name"
-msgid "P8 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:396
-msgctxt "input-name"
-msgid "P8 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:397
-msgctxt "input-name"
-msgid "P8 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:398
-msgctxt "input-name"
-msgid "P8 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:399
-msgctxt "input-name"
-msgid "P8 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:400
-msgctxt "input-name"
-msgid "P8 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:401
-msgctxt "input-name"
-msgid "P8 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:402
-msgctxt "input-name"
-msgid "P8 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:403
-msgctxt "input-name"
-msgid "P8 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:404
-msgctxt "input-name"
-msgid "P8 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:405
-msgctxt "input-name"
-msgid "P8 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:406
-msgctxt "input-name"
-msgid "P8 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:407
-msgctxt "input-name"
-msgid "P8 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:408
-msgctxt "input-name"
-msgid "P8 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:409
-msgctxt "input-name"
-msgid "P8 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:410
-msgctxt "input-name"
-msgid "P8 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:411
-msgctxt "input-name"
-msgid "P8 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:412
-msgctxt "input-name"
-msgid "P8 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:413
-msgctxt "input-name"
-msgid "P8 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:414
-msgctxt "input-name"
-msgid "P8 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:415
-msgctxt "input-name"
-msgid "P8 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:416
-msgctxt "input-name"
-msgid "P8 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:417
-msgctxt "input-name"
-msgid "P8 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:418
-msgctxt "input-name"
-msgid "P8 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:419
-msgctxt "input-name"
-msgid "P8 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:420
-msgctxt "input-name"
-msgid "P8 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:425
-msgctxt "input-name"
-msgid "P9 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:426
-msgctxt "input-name"
-msgid "P9 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:427
-msgctxt "input-name"
-msgid "P9 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:428
-msgctxt "input-name"
-msgid "P9 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:429
-msgctxt "input-name"
-msgid "P9 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:430
-msgctxt "input-name"
-msgid "P9 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:431
-msgctxt "input-name"
-msgid "P9 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:432
-msgctxt "input-name"
-msgid "P9 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:433
-msgctxt "input-name"
-msgid "P9 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:434
-msgctxt "input-name"
-msgid "P9 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:435
-msgctxt "input-name"
-msgid "P9 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:436
-msgctxt "input-name"
-msgid "P9 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:437
-msgctxt "input-name"
-msgid "P9 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:438
-msgctxt "input-name"
-msgid "P9 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:439
-msgctxt "input-name"
-msgid "P9 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:440
-msgctxt "input-name"
-msgid "P9 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:441
-msgctxt "input-name"
-msgid "P9 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:442
-msgctxt "input-name"
-msgid "P9 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:443
-msgctxt "input-name"
-msgid "P9 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:444
-msgctxt "input-name"
-msgid "P9 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:445
-msgctxt "input-name"
-msgid "P9 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:446
-msgctxt "input-name"
-msgid "P9 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:447
-msgctxt "input-name"
-msgid "P9 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:448
-msgctxt "input-name"
-msgid "P9 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:449
-msgctxt "input-name"
-msgid "P9 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:450
-msgctxt "input-name"
-msgid "P9 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:451
-msgctxt "input-name"
-msgid "P9 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:452
-msgctxt "input-name"
-msgid "P9 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:453
-msgctxt "input-name"
-msgid "P9 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:454
-msgctxt "input-name"
-msgid "P9 Select"
-msgstr ""
-
-#: src/emu/inpttype.ipp:459
-msgctxt "input-name"
-msgid "P10 Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:460
-msgctxt "input-name"
-msgid "P10 Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:461
-msgctxt "input-name"
-msgid "P10 Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:462
-msgctxt "input-name"
-msgid "P10 Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:463
-msgctxt "input-name"
-msgid "P10 Right Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:464
-msgctxt "input-name"
-msgid "P10 Right Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:465
-msgctxt "input-name"
-msgid "P10 Right Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:466
-msgctxt "input-name"
-msgid "P10 Right Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:467
-msgctxt "input-name"
-msgid "P10 Left Stick/Up"
-msgstr ""
-
-#: src/emu/inpttype.ipp:468
-msgctxt "input-name"
-msgid "P10 Left Stick/Down"
-msgstr ""
-
-#: src/emu/inpttype.ipp:469
-msgctxt "input-name"
-msgid "P10 Left Stick/Left"
-msgstr ""
-
-#: src/emu/inpttype.ipp:470
-msgctxt "input-name"
-msgid "P10 Left Stick/Right"
-msgstr ""
-
-#: src/emu/inpttype.ipp:471
-msgctxt "input-name"
-msgid "P10 Button 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:472
-msgctxt "input-name"
-msgid "P10 Button 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:473
-msgctxt "input-name"
-msgid "P10 Button 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:474
-msgctxt "input-name"
-msgid "P10 Button 4"
-msgstr ""
-
-#: src/emu/inpttype.ipp:475
-msgctxt "input-name"
-msgid "P10 Button 5"
-msgstr ""
-
-#: src/emu/inpttype.ipp:476
-msgctxt "input-name"
-msgid "P10 Button 6"
-msgstr ""
-
-#: src/emu/inpttype.ipp:477
-msgctxt "input-name"
-msgid "P10 Button 7"
-msgstr ""
-
-#: src/emu/inpttype.ipp:478
-msgctxt "input-name"
-msgid "P10 Button 8"
-msgstr ""
-
-#: src/emu/inpttype.ipp:479
-msgctxt "input-name"
-msgid "P10 Button 9"
-msgstr ""
-
-#: src/emu/inpttype.ipp:480
-msgctxt "input-name"
-msgid "P10 Button 10"
-msgstr ""
-
-#: src/emu/inpttype.ipp:481
-msgctxt "input-name"
-msgid "P10 Button 11"
-msgstr ""
-
-#: src/emu/inpttype.ipp:482
-msgctxt "input-name"
-msgid "P10 Button 12"
-msgstr ""
-
-#: src/emu/inpttype.ipp:483
-msgctxt "input-name"
-msgid "P10 Button 13"
-msgstr ""
-
-#: src/emu/inpttype.ipp:484
-msgctxt "input-name"
-msgid "P10 Button 14"
-msgstr ""
-
-#: src/emu/inpttype.ipp:485
-msgctxt "input-name"
-msgid "P10 Button 15"
-msgstr ""
-
-#: src/emu/inpttype.ipp:486
-msgctxt "input-name"
-msgid "P10 Button 16"
-msgstr ""
-
-#: src/emu/inpttype.ipp:487
-msgctxt "input-name"
-msgid "P10 Start"
-msgstr ""
-
-#: src/emu/inpttype.ipp:488
-msgctxt "input-name"
-msgid "P10 Select"
-msgstr ""
-
 #: src/emu/inpttype.ipp:493
 msgctxt "input-name"
 msgid "1 Player Start"
@@ -5477,154 +4106,31 @@ msgctxt "input-name"
 msgid "Volume Up"
 msgstr ""
 
-#: src/emu/inpttype.ipp:550
-msgctxt "input-name"
-msgid "P1 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:551
-msgctxt "input-name"
-msgid "P2 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:552
-msgctxt "input-name"
-msgid "P3 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:553
-msgctxt "input-name"
-msgid "P4 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:554
-msgctxt "input-name"
-msgid "P5 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:555
-msgctxt "input-name"
-msgid "P6 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:556
-msgctxt "input-name"
-msgid "P7 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:557
-msgctxt "input-name"
-msgid "P8 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:558
-msgctxt "input-name"
-msgid "P9 Pedal 1"
-msgstr ""
-
+#: src/emu/inpttype.ipp:550 src/emu/inpttype.ipp:551 src/emu/inpttype.ipp:552
+#: src/emu/inpttype.ipp:553 src/emu/inpttype.ipp:554 src/emu/inpttype.ipp:555
+#: src/emu/inpttype.ipp:556 src/emu/inpttype.ipp:557 src/emu/inpttype.ipp:558
 #: src/emu/inpttype.ipp:559
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 1"
-msgstr ""
-
-#: src/emu/inpttype.ipp:564
-msgctxt "input-name"
-msgid "P1 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:565
-msgctxt "input-name"
-msgid "P2 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:566
-msgctxt "input-name"
-msgid "P3 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:567
-msgctxt "input-name"
-msgid "P4 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:568
-msgctxt "input-name"
-msgid "P5 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:569
-msgctxt "input-name"
-msgid "P6 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:570
-msgctxt "input-name"
-msgid "P7 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:571
-msgctxt "input-name"
-msgid "P8 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:572
-msgctxt "input-name"
-msgid "P9 Pedal 2"
+msgid "%p Pedal 1"
 msgstr ""
 
+#: src/emu/inpttype.ipp:564 src/emu/inpttype.ipp:565 src/emu/inpttype.ipp:566
+#: src/emu/inpttype.ipp:567 src/emu/inpttype.ipp:568 src/emu/inpttype.ipp:569
+#: src/emu/inpttype.ipp:570 src/emu/inpttype.ipp:571 src/emu/inpttype.ipp:572
 #: src/emu/inpttype.ipp:573
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 2"
-msgstr ""
-
-#: src/emu/inpttype.ipp:578
-msgctxt "input-name"
-msgid "P1 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:579
-msgctxt "input-name"
-msgid "P2 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:580
-msgctxt "input-name"
-msgid "P3 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:581
-msgctxt "input-name"
-msgid "P4 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:582
-msgctxt "input-name"
-msgid "P5 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:583
-msgctxt "input-name"
-msgid "P6 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:584
-msgctxt "input-name"
-msgid "P7 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:585
-msgctxt "input-name"
-msgid "P8 Pedal 3"
-msgstr ""
-
-#: src/emu/inpttype.ipp:586
-msgctxt "input-name"
-msgid "P9 Pedal 3"
+msgid "%p Pedal 2"
 msgstr ""
 
+#: src/emu/inpttype.ipp:578 src/emu/inpttype.ipp:579 src/emu/inpttype.ipp:580
+#: src/emu/inpttype.ipp:581 src/emu/inpttype.ipp:582 src/emu/inpttype.ipp:583
+#: src/emu/inpttype.ipp:584 src/emu/inpttype.ipp:585 src/emu/inpttype.ipp:586
 #: src/emu/inpttype.ipp:587
+#, c-format
 msgctxt "input-name"
-msgid "P10 Pedal 3"
+msgid "%p Pedal 3"
 msgstr ""
 
 #: src/emu/inpttype.ipp:592
diff --git a/plugins/autofire/autofire_menu.lua b/plugins/autofire/autofire_menu.lua
index dea692dd74b..5c87e27a63d 100644
--- a/plugins/autofire/autofire_menu.lua
+++ b/plugins/autofire/autofire_menu.lua
@@ -90,7 +90,7 @@ local function populate_main_menu(buttons)
 			rate = math.floor(rate * 100) / 100
 			local text
 			if button.button then
-				text = string.format(_p('plugin-autofire', '%s [%g Hz]'), _p('input-name', button.button.name), rate)
+				text = string.format(_p('plugin-autofire', '%s [%g Hz]'), button.button.name, rate)
 			else
 				text = string.format(_p('plugin-autofire', 'n/a [%g Hz]'), rate)
 			end
@@ -145,7 +145,7 @@ end
 local function populate_configure_menu(menu)
 	local button_name
 	if current_button.button then
-		button_name = _p('input-name', current_button.button.name)
+		button_name = current_button.button.name
 	elseif current_button.port then
 		button_name = _p('plugin-autofire', 'n/a')
 	else
diff --git a/plugins/commonui/init.lua b/plugins/commonui/init.lua
index 26b65a5e1b5..16f4b6cc7b0 100644
--- a/plugins/commonui/init.lua
+++ b/plugins/commonui/init.lua
@@ -82,7 +82,7 @@ function commonui.input_selection_menu(action, title, filter)
 		local selection = index_first_choice
 		for index, field in ipairs(choices) do
 			if field then
-				table.insert(items, { _p('input-name', field.name), '', '' })
+				table.insert(items, { field.name, '', '' })
 				if initial_selection and (field.port.tag == initial_selection.port.tag) and (field.mask == initial_selection.mask) and (field.type == initial_selection.type) then
 					selection = #items
 					initial_selection = nil
diff --git a/plugins/inputmacro/inputmacro_menu.lua b/plugins/inputmacro/inputmacro_menu.lua
index 92c18706509..33223e9f20f 100644
--- a/plugins/inputmacro/inputmacro_menu.lua
+++ b/plugins/inputmacro/inputmacro_menu.lua
@@ -393,7 +393,7 @@ local function add_edit_items(items)
 		for j, input in ipairs(step.inputs) do
 			local inputname
 			if input.field then
-				inputname = _p('input-name', input.field.name)
+				inputname = input.field.name
 			elseif input.port then
 				inputname = _p('plugin-inputmacro', 'n/a')
 			else
diff --git a/src/devices/bus/neogeo_ctrl/joystick.cpp b/src/devices/bus/neogeo_ctrl/joystick.cpp
index f38dba81127..fe2712d00a8 100644
--- a/src/devices/bus/neogeo_ctrl/joystick.cpp
+++ b/src/devices/bus/neogeo_ctrl/joystick.cpp
@@ -31,10 +31,10 @@ static INPUT_PORTS_START( neogeo_joy )
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN )
 	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT )
 	PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT )
-	PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("A")
-	PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("B")
-	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("C")
-	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_NAME("D")
+	PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("%p A")
+	PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("%p B")
+	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("%p C")
+	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_NAME("%p D")
 
 	PORT_START("START_SELECT")
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_START )
@@ -130,20 +130,20 @@ static INPUT_PORTS_START( neogeo_joy_ac )
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
 	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
 	PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1)
-	PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
-	PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
-	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
-	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1)
+	PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) PORT_NAME("%p A")
+	PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) PORT_NAME("%p B")
+	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1) PORT_NAME("%p C")
+	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1) PORT_NAME("%p D")
 
 	PORT_START("JOY2")
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
 	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2)
 	PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(2)
-	PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
-	PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
-	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
-	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(2)
+	PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) PORT_NAME("%p A")
+	PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) PORT_NAME("%p B")
+	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) PORT_NAME("%p C")
+	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(2) PORT_NAME("%p D")
 
 	PORT_START("START")
 	PORT_BIT( 0xfa, IP_ACTIVE_LOW, IPT_UNUSED )
diff --git a/src/devices/bus/nes_ctrl/joypad.cpp b/src/devices/bus/nes_ctrl/joypad.cpp
index f6c8116c72c..8336f2158d5 100644
--- a/src/devices/bus/nes_ctrl/joypad.cpp
+++ b/src/devices/bus/nes_ctrl/joypad.cpp
@@ -42,8 +42,8 @@ DEFINE_DEVICE_TYPE(NES_ARCSTICK,    nes_arcstick_device, "nes_arcstick", "Ninten
 
 static INPUT_PORTS_START( nes_joypad )
 	PORT_START("JOYPAD")
-	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_NAME("A")
-	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("B")
+	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_NAME("%p A")
+	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("%p B")
 	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SELECT )
 	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_START )
 	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY
@@ -54,8 +54,8 @@ INPUT_PORTS_END
 
 static INPUT_PORTS_START( nes_fcpad_p2 )
 	PORT_START("JOYPAD")
-	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_NAME("A")
-	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("B")
+	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_NAME("%p A")
+	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("%p B")
 	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SELECT ) PORT_NAME("Microphone")
 	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_UNUSED )
 	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY
@@ -98,8 +98,8 @@ static INPUT_PORTS_START( nes_arcstick )
 	PORT_CONFSETTING(  0x02, "Player II" )
 
 	PORT_START("JOYPAD")
-	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_NAME("A")
-	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("B")
+	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_NAME("%p A")
+	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("%p B")
 	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SELECT )
 	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_START )
 	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY     PORT_CONDITION("CONFIG", 0x01, EQUALS, 0x01)
diff --git a/src/emu/inpttype.ipp b/src/emu/inpttype.ipp
index aca3973673a..59c6a458779 100644
--- a/src/emu/inpttype.ipp
+++ b/src/emu/inpttype.ipp
@@ -19,83 +19,83 @@ namespace {
 
 #define CORE_INPUT_TYPES_P1 \
 		CORE_INPUT_TYPES_BEGIN(p1) \
-		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  JOYSTICK_UP,         N_p("input-name", "P1 Up"),                  input_seq(KEYCODE_UP, input_seq::or_code, JOYCODE_Y_UP_SWITCH_INDEXED(0)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  JOYSTICK_DOWN,       N_p("input-name", "P1 Down"),                input_seq(KEYCODE_DOWN, input_seq::or_code, JOYCODE_Y_DOWN_SWITCH_INDEXED(0)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  JOYSTICK_LEFT,       N_p("input-name", "P1 Left"),                input_seq(KEYCODE_LEFT, input_seq::or_code, JOYCODE_X_LEFT_SWITCH_INDEXED(0)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  JOYSTICK_RIGHT,      N_p("input-name", "P1 Right"),               input_seq(KEYCODE_RIGHT, input_seq::or_code, JOYCODE_X_RIGHT_SWITCH_INDEXED(0)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  JOYSTICKRIGHT_UP,    N_p("input-name", "P1 Right Stick/Up"),      input_seq(KEYCODE_I, input_seq::or_code, JOYCODE_BUTTON2_INDEXED(0)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  JOYSTICKRIGHT_DOWN,  N_p("input-name", "P1 Right Stick/Down"),    input_seq(KEYCODE_K, input_seq::or_code, JOYCODE_BUTTON3_INDEXED(0)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  JOYSTICKRIGHT_LEFT,  N_p("input-name", "P1 Right Stick/Left"),    input_seq(KEYCODE_J, input_seq::or_code, JOYCODE_BUTTON1_INDEXED(0)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  JOYSTICKRIGHT_RIGHT, N_p("input-name", "P1 Right Stick/Right"),   input_seq(KEYCODE_L, input_seq::or_code, JOYCODE_BUTTON4_INDEXED(0)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  JOYSTICKLEFT_UP,     N_p("input-name", "P1 Left Stick/Up"),       input_seq(KEYCODE_E, input_seq::or_code, JOYCODE_Y_UP_SWITCH_INDEXED(0)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  JOYSTICKLEFT_DOWN,   N_p("input-name", "P1 Left Stick/Down"),     input_seq(KEYCODE_D, input_seq::or_code, JOYCODE_Y_DOWN_SWITCH_INDEXED(0)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  JOYSTICKLEFT_LEFT,   N_p("input-name", "P1 Left Stick/Left"),     input_seq(KEYCODE_S, input_seq::or_code, JOYCODE_X_LEFT_SWITCH_INDEXED(0)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  JOYSTICKLEFT_RIGHT,  N_p("input-name", "P1 Left Stick/Right"),    input_seq(KEYCODE_F, input_seq::or_code, JOYCODE_X_RIGHT_SWITCH_INDEXED(0)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  BUTTON1,             N_p("input-name", "P1 Button 1"),            input_seq(KEYCODE_LCONTROL, input_seq::or_code, JOYCODE_BUTTON1_INDEXED(0), input_seq::or_code, MOUSECODE_BUTTON1_INDEXED(0), input_seq::or_code, GUNCODE_BUTTON1_INDEXED(0)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  BUTTON2,             N_p("input-name", "P1 Button 2"),            input_seq(KEYCODE_LALT, input_seq::or_code, JOYCODE_BUTTON2_INDEXED(0), input_seq::or_code, MOUSECODE_BUTTON3_INDEXED(0), input_seq::or_code, GUNCODE_BUTTON2_INDEXED(0)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  BUTTON3,             N_p("input-name", "P1 Button 3"),            input_seq(KEYCODE_SPACE, input_seq::or_code, JOYCODE_BUTTON3_INDEXED(0), input_seq::or_code, MOUSECODE_BUTTON2_INDEXED(0)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  BUTTON4,             N_p("input-name", "P1 Button 4"),            input_seq(KEYCODE_LSHIFT, input_seq::or_code, JOYCODE_BUTTON4_INDEXED(0)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  BUTTON5,             N_p("input-name", "P1 Button 5"),            input_seq(KEYCODE_Z, input_seq::or_code, JOYCODE_BUTTON5_INDEXED(0)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  BUTTON6,             N_p("input-name", "P1 Button 6"),            input_seq(KEYCODE_X, input_seq::or_code, JOYCODE_BUTTON6_INDEXED(0)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  BUTTON7,             N_p("input-name", "P1 Button 7"),            input_seq(KEYCODE_C, input_seq::or_code, JOYCODE_BUTTON7_INDEXED(0)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  BUTTON8,             N_p("input-name", "P1 Button 8"),            input_seq(KEYCODE_V, input_seq::or_code, JOYCODE_BUTTON8_INDEXED(0)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  BUTTON9,             N_p("input-name", "P1 Button 9"),            input_seq(KEYCODE_B, input_seq::or_code, JOYCODE_BUTTON9_INDEXED(0)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  BUTTON10,            N_p("input-name", "P1 Button 10"),           input_seq(KEYCODE_N, input_seq::or_code, JOYCODE_BUTTON10_INDEXED(0)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  BUTTON11,            N_p("input-name", "P1 Button 11"),           input_seq(KEYCODE_M, input_seq::or_code, JOYCODE_BUTTON11_INDEXED(0)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  BUTTON12,            N_p("input-name", "P1 Button 12"),           input_seq(KEYCODE_COMMA, input_seq::or_code, JOYCODE_BUTTON12_INDEXED(0)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  BUTTON13,            N_p("input-name", "P1 Button 13"),           input_seq(KEYCODE_STOP, input_seq::or_code, JOYCODE_BUTTON13_INDEXED(0)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  BUTTON14,            N_p("input-name", "P1 Button 14"),           input_seq(KEYCODE_SLASH, input_seq::or_code, JOYCODE_BUTTON14_INDEXED(0)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  BUTTON15,            N_p("input-name", "P1 Button 15"),           input_seq(KEYCODE_RSHIFT, input_seq::or_code, JOYCODE_BUTTON15_INDEXED(0)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  BUTTON16,            N_p("input-name", "P1 Button 16"),           input_seq(JOYCODE_BUTTON16_INDEXED(0)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  START,               N_p("input-name", "P1 Start"),               input_seq(KEYCODE_1, input_seq::or_code, JOYCODE_START_INDEXED(0)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  SELECT,              N_p("input-name", "P1 Select"),              input_seq(KEYCODE_5, input_seq::or_code, JOYCODE_SELECT_INDEXED(0)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  JOYSTICK_UP,         N_p("input-name", "%p Up"),                  input_seq(KEYCODE_UP, input_seq::or_code, JOYCODE_Y_UP_SWITCH_INDEXED(0)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  JOYSTICK_DOWN,       N_p("input-name", "%p Down"),                input_seq(KEYCODE_DOWN, input_seq::or_code, JOYCODE_Y_DOWN_SWITCH_INDEXED(0)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  JOYSTICK_LEFT,       N_p("input-name", "%p Left"),                input_seq(KEYCODE_LEFT, input_seq::or_code, JOYCODE_X_LEFT_SWITCH_INDEXED(0)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  JOYSTICK_RIGHT,      N_p("input-name", "%p Right"),               input_seq(KEYCODE_RIGHT, input_seq::or_code, JOYCODE_X_RIGHT_SWITCH_INDEXED(0)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  JOYSTICKRIGHT_UP,    N_p("input-name", "%p Right Stick/Up"),      input_seq(KEYCODE_I, input_seq::or_code, JOYCODE_BUTTON2_INDEXED(0)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  JOYSTICKRIGHT_DOWN,  N_p("input-name", "%p Right Stick/Down"),    input_seq(KEYCODE_K, input_seq::or_code, JOYCODE_BUTTON3_INDEXED(0)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  JOYSTICKRIGHT_LEFT,  N_p("input-name", "%p Right Stick/Left"),    input_seq(KEYCODE_J, input_seq::or_code, JOYCODE_BUTTON1_INDEXED(0)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  JOYSTICKRIGHT_RIGHT, N_p("input-name", "%p Right Stick/Right"),   input_seq(KEYCODE_L, input_seq::or_code, JOYCODE_BUTTON4_INDEXED(0)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  JOYSTICKLEFT_UP,     N_p("input-name", "%p Left Stick/Up"),       input_seq(KEYCODE_E, input_seq::or_code, JOYCODE_Y_UP_SWITCH_INDEXED(0)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  JOYSTICKLEFT_DOWN,   N_p("input-name", "%p Left Stick/Down"),     input_seq(KEYCODE_D, input_seq::or_code, JOYCODE_Y_DOWN_SWITCH_INDEXED(0)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  JOYSTICKLEFT_LEFT,   N_p("input-name", "%p Left Stick/Left"),     input_seq(KEYCODE_S, input_seq::or_code, JOYCODE_X_LEFT_SWITCH_INDEXED(0)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  JOYSTICKLEFT_RIGHT,  N_p("input-name", "%p Left Stick/Right"),    input_seq(KEYCODE_F, input_seq::or_code, JOYCODE_X_RIGHT_SWITCH_INDEXED(0)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  BUTTON1,             N_p("input-name", "%p Button 1"),            input_seq(KEYCODE_LCONTROL, input_seq::or_code, JOYCODE_BUTTON1_INDEXED(0), input_seq::or_code, MOUSECODE_BUTTON1_INDEXED(0), input_seq::or_code, GUNCODE_BUTTON1_INDEXED(0)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  BUTTON2,             N_p("input-name", "%p Button 2"),            input_seq(KEYCODE_LALT, input_seq::or_code, JOYCODE_BUTTON2_INDEXED(0), input_seq::or_code, MOUSECODE_BUTTON3_INDEXED(0), input_seq::or_code, GUNCODE_BUTTON2_INDEXED(0)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  BUTTON3,             N_p("input-name", "%p Button 3"),            input_seq(KEYCODE_SPACE, input_seq::or_code, JOYCODE_BUTTON3_INDEXED(0), input_seq::or_code, MOUSECODE_BUTTON2_INDEXED(0)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  BUTTON4,             N_p("input-name", "%p Button 4"),            input_seq(KEYCODE_LSHIFT, input_seq::or_code, JOYCODE_BUTTON4_INDEXED(0)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  BUTTON5,             N_p("input-name", "%p Button 5"),            input_seq(KEYCODE_Z, input_seq::or_code, JOYCODE_BUTTON5_INDEXED(0)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  BUTTON6,             N_p("input-name", "%p Button 6"),            input_seq(KEYCODE_X, input_seq::or_code, JOYCODE_BUTTON6_INDEXED(0)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  BUTTON7,             N_p("input-name", "%p Button 7"),            input_seq(KEYCODE_C, input_seq::or_code, JOYCODE_BUTTON7_INDEXED(0)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  BUTTON8,             N_p("input-name", "%p Button 8"),            input_seq(KEYCODE_V, input_seq::or_code, JOYCODE_BUTTON8_INDEXED(0)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  BUTTON9,             N_p("input-name", "%p Button 9"),            input_seq(KEYCODE_B, input_seq::or_code, JOYCODE_BUTTON9_INDEXED(0)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  BUTTON10,            N_p("input-name", "%p Button 10"),           input_seq(KEYCODE_N, input_seq::or_code, JOYCODE_BUTTON10_INDEXED(0)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  BUTTON11,            N_p("input-name", "%p Button 11"),           input_seq(KEYCODE_M, input_seq::or_code, JOYCODE_BUTTON11_INDEXED(0)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  BUTTON12,            N_p("input-name", "%p Button 12"),           input_seq(KEYCODE_COMMA, input_seq::or_code, JOYCODE_BUTTON12_INDEXED(0)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  BUTTON13,            N_p("input-name", "%p Button 13"),           input_seq(KEYCODE_STOP, input_seq::or_code, JOYCODE_BUTTON13_INDEXED(0)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  BUTTON14,            N_p("input-name", "%p Button 14"),           input_seq(KEYCODE_SLASH, input_seq::or_code, JOYCODE_BUTTON14_INDEXED(0)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  BUTTON15,            N_p("input-name", "%p Button 15"),           input_seq(KEYCODE_RSHIFT, input_seq::or_code, JOYCODE_BUTTON15_INDEXED(0)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  BUTTON16,            N_p("input-name", "%p Button 16"),           input_seq(JOYCODE_BUTTON16_INDEXED(0)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  START,               N_p("input-name", "%p Start"),               input_seq(KEYCODE_1, input_seq::or_code, JOYCODE_START_INDEXED(0)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  SELECT,              N_p("input-name", "%p Select"),              input_seq(KEYCODE_5, input_seq::or_code, JOYCODE_SELECT_INDEXED(0)) ) \
 		CORE_INPUT_TYPES_END()
 
 #define CORE_INPUT_TYPES_P1_MAHJONG \
 		CORE_INPUT_TYPES_BEGIN(p1_mahjong) \
-		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  MAHJONG_A,           N_p("input-name", "P1 Mahjong A"),           input_seq(KEYCODE_A) ) \
-		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  MAHJONG_B,           N_p("input-name", "P1 Mahjong B"),           input_seq(KEYCODE_B) ) \
-		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  MAHJONG_C,           N_p("input-name", "P1 Mahjong C"),           input_seq(KEYCODE_C) ) \
-		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  MAHJONG_D,           N_p("input-name", "P1 Mahjong D"),           input_seq(KEYCODE_D) ) \
-		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  MAHJONG_E,           N_p("input-name", "P1 Mahjong E"),           input_seq(KEYCODE_E) ) \
-		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  MAHJONG_F,           N_p("input-name", "P1 Mahjong F"),           input_seq(KEYCODE_F) ) \
-		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  MAHJONG_G,           N_p("input-name", "P1 Mahjong G"),           input_seq(KEYCODE_G) ) \
-		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  MAHJONG_H,           N_p("input-name", "P1 Mahjong H"),           input_seq(KEYCODE_H) ) \
-		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  MAHJONG_I,           N_p("input-name", "P1 Mahjong I"),           input_seq(KEYCODE_I) ) \
-		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  MAHJONG_J,           N_p("input-name", "P1 Mahjong J"),           input_seq(KEYCODE_J) ) \
-		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  MAHJONG_K,           N_p("input-name", "P1 Mahjong K"),           input_seq(KEYCODE_K) ) \
-		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  MAHJONG_L,           N_p("input-name", "P1 Mahjong L"),           input_seq(KEYCODE_L) ) \
-		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  MAHJONG_M,           N_p("input-name", "P1 Mahjong M"),           input_seq(KEYCODE_M) ) \
-		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  MAHJONG_N,           N_p("input-name", "P1 Mahjong N"),           input_seq(KEYCODE_N) ) \
-		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  MAHJONG_O,           N_p("input-name", "P1 Mahjong O"),           input_seq(KEYCODE_O) ) \
-		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  MAHJONG_P,           N_p("input-name", "P1 Mahjong P"),           input_seq(KEYCODE_COLON) ) \
-		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  MAHJONG_Q,           N_p("input-name", "P1 Mahjong Q"),           input_seq(KEYCODE_Q) ) \
-		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  MAHJONG_KAN,         N_p("input-name", "P1 Mahjong Kan"),         input_seq(KEYCODE_LCONTROL) ) \
-		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  MAHJONG_PON,         N_p("input-name", "P1 Mahjong Pon"),         input_seq(KEYCODE_LALT) ) \
-		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  MAHJONG_CHI,         N_p("input-name", "P1 Mahjong Chi"),         input_seq(KEYCODE_SPACE) ) \
-		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  MAHJONG_REACH,       N_p("input-name", "P1 Mahjong Reach"),       input_seq(KEYCODE_LSHIFT) ) \
-		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  MAHJONG_RON,         N_p("input-name", "P1 Mahjong Ron"),         input_seq(KEYCODE_Z) ) \
-		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  MAHJONG_FLIP_FLOP,   N_p("input-name", "P1 Mahjong Flip Flop"),   input_seq(KEYCODE_Y) ) \
-		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  MAHJONG_BET,         N_p("input-name", "P1 Mahjong Bet"),         input_seq(KEYCODE_3) ) \
-		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  MAHJONG_SCORE,       N_p("input-name", "P1 Mahjong Take Score"),  input_seq(KEYCODE_RCONTROL) ) \
-		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  MAHJONG_DOUBLE_UP,   N_p("input-name", "P1 Mahjong Double Up"),   input_seq(KEYCODE_RSHIFT) ) \
-		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  MAHJONG_BIG,         N_p("input-name", "P1 Mahjong Big"),         input_seq(KEYCODE_ENTER) ) \
-		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  MAHJONG_SMALL,       N_p("input-name", "P1 Mahjong Small"),       input_seq(KEYCODE_BACKSPACE) ) \
-		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  MAHJONG_LAST_CHANCE, N_p("input-name", "P1 Mahjong Last Chance"), input_seq(KEYCODE_RALT) ) \
+		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  MAHJONG_A,           N_p("input-name", "%p Mahjong A"),           input_seq(KEYCODE_A) ) \
+		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  MAHJONG_B,           N_p("input-name", "%p Mahjong B"),           input_seq(KEYCODE_B) ) \
+		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  MAHJONG_C,           N_p("input-name", "%p Mahjong C"),           input_seq(KEYCODE_C) ) \
+		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  MAHJONG_D,           N_p("input-name", "%p Mahjong D"),           input_seq(KEYCODE_D) ) \
+		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  MAHJONG_E,           N_p("input-name", "%p Mahjong E"),           input_seq(KEYCODE_E) ) \
+		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  MAHJONG_F,           N_p("input-name", "%p Mahjong F"),           input_seq(KEYCODE_F) ) \
+		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  MAHJONG_G,           N_p("input-name", "%p Mahjong G"),           input_seq(KEYCODE_G) ) \
+		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  MAHJONG_H,           N_p("input-name", "%p Mahjong H"),           input_seq(KEYCODE_H) ) \
+		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  MAHJONG_I,           N_p("input-name", "%p Mahjong I"),           input_seq(KEYCODE_I) ) \
+		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  MAHJONG_J,           N_p("input-name", "%p Mahjong J"),           input_seq(KEYCODE_J) ) \
+		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  MAHJONG_K,           N_p("input-name", "%p Mahjong K"),           input_seq(KEYCODE_K) ) \
+		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  MAHJONG_L,           N_p("input-name", "%p Mahjong L"),           input_seq(KEYCODE_L) ) \
+		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  MAHJONG_M,           N_p("input-name", "%p Mahjong M"),           input_seq(KEYCODE_M) ) \
+		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  MAHJONG_N,           N_p("input-name", "%p Mahjong N"),           input_seq(KEYCODE_N) ) \
+		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  MAHJONG_O,           N_p("input-name", "%p Mahjong O"),           input_seq(KEYCODE_O) ) \
+		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  MAHJONG_P,           N_p("input-name", "%p Mahjong P"),           input_seq(KEYCODE_COLON) ) \
+		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  MAHJONG_Q,           N_p("input-name", "%p Mahjong Q"),           input_seq(KEYCODE_Q) ) \
+		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  MAHJONG_KAN,         N_p("input-name", "%p Mahjong Kan"),         input_seq(KEYCODE_LCONTROL) ) \
+		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  MAHJONG_PON,         N_p("input-name", "%p Mahjong Pon"),         input_seq(KEYCODE_LALT) ) \
+		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  MAHJONG_CHI,         N_p("input-name", "%p Mahjong Chi"),         input_seq(KEYCODE_SPACE) ) \
+		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  MAHJONG_REACH,       N_p("input-name", "%p Mahjong Reach"),       input_seq(KEYCODE_LSHIFT) ) \
+		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  MAHJONG_RON,         N_p("input-name", "%p Mahjong Ron"),         input_seq(KEYCODE_Z) ) \
+		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  MAHJONG_FLIP_FLOP,   N_p("input-name", "%p Mahjong Flip Flop"),   input_seq(KEYCODE_Y) ) \
+		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  MAHJONG_BET,         N_p("input-name", "%p Mahjong Bet"),         input_seq(KEYCODE_3) ) \
+		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  MAHJONG_SCORE,       N_p("input-name", "%p Mahjong Take Score"),  input_seq(KEYCODE_RCONTROL) ) \
+		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  MAHJONG_DOUBLE_UP,   N_p("input-name", "%p Mahjong Double Up"),   input_seq(KEYCODE_RSHIFT) ) \
+		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  MAHJONG_BIG,         N_p("input-name", "%p Mahjong Big"),         input_seq(KEYCODE_ENTER) ) \
+		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  MAHJONG_SMALL,       N_p("input-name", "%p Mahjong Small"),       input_seq(KEYCODE_BACKSPACE) ) \
+		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  MAHJONG_LAST_CHANCE, N_p("input-name", "%p Mahjong Last Chance"), input_seq(KEYCODE_RALT) ) \
 		CORE_INPUT_TYPES_END()
 
 #define CORE_INPUT_TYPES_P1_HANAFUDA \
 		CORE_INPUT_TYPES_BEGIN(p1_hanafuda) \
-		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  HANAFUDA_A,          N_p("input-name", "P1 Hanafuda A/1"),        input_seq(KEYCODE_A) ) \
-		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  HANAFUDA_B,          N_p("input-name", "P1 Hanafuda B/2"),        input_seq(KEYCODE_B) ) \
-		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  HANAFUDA_C,          N_p("input-name", "P1 Hanafuda C/3"),        input_seq(KEYCODE_C) ) \
-		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  HANAFUDA_D,          N_p("input-name", "P1 Hanafuda D/4"),        input_seq(KEYCODE_D) ) \
-		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  HANAFUDA_E,          N_p("input-name", "P1 Hanafuda E/5"),        input_seq(KEYCODE_E) ) \
-		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  HANAFUDA_F,          N_p("input-name", "P1 Hanafuda F/6"),        input_seq(KEYCODE_F) ) \
-		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  HANAFUDA_G,          N_p("input-name", "P1 Hanafuda G/7"),        input_seq(KEYCODE_G) ) \
-		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  HANAFUDA_H,          N_p("input-name", "P1 Hanafuda H/8"),        input_seq(KEYCODE_H) ) \
-		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  HANAFUDA_YES,        N_p("input-name", "P1 Hanafuda Yes"),        input_seq(KEYCODE_M) ) \
-		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  HANAFUDA_NO,         N_p("input-name", "P1 Hanafuda No"),         input_seq(KEYCODE_N) ) \
+		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  HANAFUDA_A,          N_p("input-name", "%p Hanafuda A/1"),        input_seq(KEYCODE_A) ) \
+		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  HANAFUDA_B,          N_p("input-name", "%p Hanafuda B/2"),        input_seq(KEYCODE_B) ) \
+		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  HANAFUDA_C,          N_p("input-name", "%p Hanafuda C/3"),        input_seq(KEYCODE_C) ) \
+		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  HANAFUDA_D,          N_p("input-name", "%p Hanafuda D/4"),        input_seq(KEYCODE_D) ) \
+		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  HANAFUDA_E,          N_p("input-name", "%p Hanafuda E/5"),        input_seq(KEYCODE_E) ) \
+		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  HANAFUDA_F,          N_p("input-name", "%p Hanafuda F/6"),        input_seq(KEYCODE_F) ) \
+		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  HANAFUDA_G,          N_p("input-name", "%p Hanafuda G/7"),        input_seq(KEYCODE_G) ) \
+		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  HANAFUDA_H,          N_p("input-name", "%p Hanafuda H/8"),        input_seq(KEYCODE_H) ) \
+		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  HANAFUDA_YES,        N_p("input-name", "%p Hanafuda Yes"),        input_seq(KEYCODE_M) ) \
+		INPUT_PORT_DIGITAL_TYPE(  1, PLAYER1,  HANAFUDA_NO,         N_p("input-name", "%p Hanafuda No"),         input_seq(KEYCODE_N) ) \
 		CORE_INPUT_TYPES_END()
 
 #define CORE_INPUT_TYPES_GAMBLE \
@@ -137,355 +137,355 @@ namespace {
 
 #define CORE_INPUT_TYPES_P2 \
 		CORE_INPUT_TYPES_BEGIN(p2) \
-		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  JOYSTICK_UP,         N_p("input-name", "P2 Up"),                  input_seq(KEYCODE_R, input_seq::or_code, JOYCODE_Y_UP_SWITCH_INDEXED(1)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  JOYSTICK_DOWN,       N_p("input-name", "P2 Down"),                input_seq(KEYCODE_F, input_seq::or_code, JOYCODE_Y_DOWN_SWITCH_INDEXED(1)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  JOYSTICK_LEFT,       N_p("input-name", "P2 Left"),                input_seq(KEYCODE_D, input_seq::or_code, JOYCODE_X_LEFT_SWITCH_INDEXED(1)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  JOYSTICK_RIGHT,      N_p("input-name", "P2 Right"),               input_seq(KEYCODE_G, input_seq::or_code, JOYCODE_X_RIGHT_SWITCH_INDEXED(1)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  JOYSTICKRIGHT_UP,    N_p("input-name", "P2 Right Stick/Up"),      input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  JOYSTICKRIGHT_DOWN,  N_p("input-name", "P2 Right Stick/Down"),    input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  JOYSTICKRIGHT_LEFT,  N_p("input-name", "P2 Right Stick/Left"),    input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  JOYSTICKRIGHT_RIGHT, N_p("input-name", "P2 Right Stick/Right"),   input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  JOYSTICKLEFT_UP,     N_p("input-name", "P2 Left Stick/Up"),       input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  JOYSTICKLEFT_DOWN,   N_p("input-name", "P2 Left Stick/Down"),     input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  JOYSTICKLEFT_LEFT,   N_p("input-name", "P2 Left Stick/Left"),     input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  JOYSTICKLEFT_RIGHT,  N_p("input-name", "P2 Left Stick/Right"),    input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  BUTTON1,             N_p("input-name", "P2 Button 1"),            input_seq(KEYCODE_A, input_seq::or_code, JOYCODE_BUTTON1_INDEXED(1), input_seq::or_code, MOUSECODE_BUTTON1_INDEXED(1), input_seq::or_code, GUNCODE_BUTTON1_INDEXED(1)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  BUTTON2,             N_p("input-name", "P2 Button 2"),            input_seq(KEYCODE_S, input_seq::or_code, JOYCODE_BUTTON2_INDEXED(1), input_seq::or_code, MOUSECODE_BUTTON3_INDEXED(1), input_seq::or_code, GUNCODE_BUTTON2_INDEXED(1)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  BUTTON3,             N_p("input-name", "P2 Button 3"),            input_seq(KEYCODE_Q, input_seq::or_code, JOYCODE_BUTTON3_INDEXED(1), input_seq::or_code, MOUSECODE_BUTTON2_INDEXED(1)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  BUTTON4,             N_p("input-name", "P2 Button 4"),            input_seq(KEYCODE_W, input_seq::or_code, JOYCODE_BUTTON4_INDEXED(1)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  BUTTON5,             N_p("input-name", "P2 Button 5"),            input_seq(KEYCODE_E, input_seq::or_code, JOYCODE_BUTTON5_INDEXED(1)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  BUTTON6,             N_p("input-name", "P2 Button 6"),            input_seq(JOYCODE_BUTTON6_INDEXED(1)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  BUTTON7,             N_p("input-name", "P2 Button 7"),            input_seq(JOYCODE_BUTTON7_INDEXED(1)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  BUTTON8,             N_p("input-name", "P2 Button 8"),            input_seq(JOYCODE_BUTTON8_INDEXED(1)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  BUTTON9,             N_p("input-name", "P2 Button 9"),            input_seq(JOYCODE_BUTTON9_INDEXED(1)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  BUTTON10,            N_p("input-name", "P2 Button 10"),           input_seq(JOYCODE_BUTTON10_INDEXED(1)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  BUTTON11,            N_p("input-name", "P2 Button 11"),           input_seq(JOYCODE_BUTTON11_INDEXED(1)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  BUTTON12,            N_p("input-name", "P2 Button 12"),           input_seq(JOYCODE_BUTTON12_INDEXED(1)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  BUTTON13,            N_p("input-name", "P2 Button 13"),           input_seq(JOYCODE_BUTTON13_INDEXED(1)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  BUTTON14,            N_p("input-name", "P2 Button 14"),           input_seq(JOYCODE_BUTTON14_INDEXED(1)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  BUTTON15,            N_p("input-name", "P2 Button 15"),           input_seq(JOYCODE_BUTTON15_INDEXED(1)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  BUTTON16,            N_p("input-name", "P2 Button 16"),           input_seq(JOYCODE_BUTTON16_INDEXED(1)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  START,               N_p("input-name", "P2 Start"),               input_seq(KEYCODE_2, input_seq::or_code, JOYCODE_START_INDEXED(1)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  SELECT,              N_p("input-name", "P2 Select"),              input_seq(KEYCODE_6, input_seq::or_code, JOYCODE_SELECT_INDEXED(1)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  JOYSTICK_UP,         N_p("input-name", "%p Up"),                  input_seq(KEYCODE_R, input_seq::or_code, JOYCODE_Y_UP_SWITCH_INDEXED(1)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  JOYSTICK_DOWN,       N_p("input-name", "%p Down"),                input_seq(KEYCODE_F, input_seq::or_code, JOYCODE_Y_DOWN_SWITCH_INDEXED(1)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  JOYSTICK_LEFT,       N_p("input-name", "%p Left"),                input_seq(KEYCODE_D, input_seq::or_code, JOYCODE_X_LEFT_SWITCH_INDEXED(1)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  JOYSTICK_RIGHT,      N_p("input-name", "%p Right"),               input_seq(KEYCODE_G, input_seq::or_code, JOYCODE_X_RIGHT_SWITCH_INDEXED(1)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  JOYSTICKRIGHT_UP,    N_p("input-name", "%p Right Stick/Up"),      input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  JOYSTICKRIGHT_DOWN,  N_p("input-name", "%p Right Stick/Down"),    input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  JOYSTICKRIGHT_LEFT,  N_p("input-name", "%p Right Stick/Left"),    input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  JOYSTICKRIGHT_RIGHT, N_p("input-name", "%p Right Stick/Right"),   input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  JOYSTICKLEFT_UP,     N_p("input-name", "%p Left Stick/Up"),       input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  JOYSTICKLEFT_DOWN,   N_p("input-name", "%p Left Stick/Down"),     input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  JOYSTICKLEFT_LEFT,   N_p("input-name", "%p Left Stick/Left"),     input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  JOYSTICKLEFT_RIGHT,  N_p("input-name", "%p Left Stick/Right"),    input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  BUTTON1,             N_p("input-name", "%p Button 1"),            input_seq(KEYCODE_A, input_seq::or_code, JOYCODE_BUTTON1_INDEXED(1), input_seq::or_code, MOUSECODE_BUTTON1_INDEXED(1), input_seq::or_code, GUNCODE_BUTTON1_INDEXED(1)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  BUTTON2,             N_p("input-name", "%p Button 2"),            input_seq(KEYCODE_S, input_seq::or_code, JOYCODE_BUTTON2_INDEXED(1), input_seq::or_code, MOUSECODE_BUTTON3_INDEXED(1), input_seq::or_code, GUNCODE_BUTTON2_INDEXED(1)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  BUTTON3,             N_p("input-name", "%p Button 3"),            input_seq(KEYCODE_Q, input_seq::or_code, JOYCODE_BUTTON3_INDEXED(1), input_seq::or_code, MOUSECODE_BUTTON2_INDEXED(1)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  BUTTON4,             N_p("input-name", "%p Button 4"),            input_seq(KEYCODE_W, input_seq::or_code, JOYCODE_BUTTON4_INDEXED(1)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  BUTTON5,             N_p("input-name", "%p Button 5"),            input_seq(KEYCODE_E, input_seq::or_code, JOYCODE_BUTTON5_INDEXED(1)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  BUTTON6,             N_p("input-name", "%p Button 6"),            input_seq(JOYCODE_BUTTON6_INDEXED(1)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  BUTTON7,             N_p("input-name", "%p Button 7"),            input_seq(JOYCODE_BUTTON7_INDEXED(1)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  BUTTON8,             N_p("input-name", "%p Button 8"),            input_seq(JOYCODE_BUTTON8_INDEXED(1)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  BUTTON9,             N_p("input-name", "%p Button 9"),            input_seq(JOYCODE_BUTTON9_INDEXED(1)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  BUTTON10,            N_p("input-name", "%p Button 10"),           input_seq(JOYCODE_BUTTON10_INDEXED(1)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  BUTTON11,            N_p("input-name", "%p Button 11"),           input_seq(JOYCODE_BUTTON11_INDEXED(1)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  BUTTON12,            N_p("input-name", "%p Button 12"),           input_seq(JOYCODE_BUTTON12_INDEXED(1)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  BUTTON13,            N_p("input-name", "%p Button 13"),           input_seq(JOYCODE_BUTTON13_INDEXED(1)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  BUTTON14,            N_p("input-name", "%p Button 14"),           input_seq(JOYCODE_BUTTON14_INDEXED(1)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  BUTTON15,            N_p("input-name", "%p Button 15"),           input_seq(JOYCODE_BUTTON15_INDEXED(1)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  BUTTON16,            N_p("input-name", "%p Button 16"),           input_seq(JOYCODE_BUTTON16_INDEXED(1)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  START,               N_p("input-name", "%p Start"),               input_seq(KEYCODE_2, input_seq::or_code, JOYCODE_START_INDEXED(1)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  SELECT,              N_p("input-name", "%p Select"),              input_seq(KEYCODE_6, input_seq::or_code, JOYCODE_SELECT_INDEXED(1)) ) \
 		CORE_INPUT_TYPES_END()
 
 #define CORE_INPUT_TYPES_P2_MAHJONG \
 		CORE_INPUT_TYPES_BEGIN(p2_mahjong) \
-		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  MAHJONG_A,           N_p("input-name", "P2 Mahjong A"),           input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  MAHJONG_B,           N_p("input-name", "P2 Mahjong B"),           input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  MAHJONG_C,           N_p("input-name", "P2 Mahjong C"),           input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  MAHJONG_D,           N_p("input-name", "P2 Mahjong D"),           input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  MAHJONG_E,           N_p("input-name", "P2 Mahjong E"),           input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  MAHJONG_F,           N_p("input-name", "P2 Mahjong F"),           input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  MAHJONG_G,           N_p("input-name", "P2 Mahjong G"),           input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  MAHJONG_H,           N_p("input-name", "P2 Mahjong H"),           input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  MAHJONG_I,           N_p("input-name", "P2 Mahjong I"),           input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  MAHJONG_J,           N_p("input-name", "P2 Mahjong J"),           input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  MAHJONG_K,           N_p("input-name", "P2 Mahjong K"),           input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  MAHJONG_L,           N_p("input-name", "P2 Mahjong L"),           input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  MAHJONG_M,           N_p("input-name", "P2 Mahjong M"),           input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  MAHJONG_N,           N_p("input-name", "P2 Mahjong N"),           input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  MAHJONG_O,           N_p("input-name", "P2 Mahjong O"),           input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  MAHJONG_P,           N_p("input-name", "P2 Mahjong P"),           input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  MAHJONG_Q,           N_p("input-name", "P2 Mahjong Q"),           input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  MAHJONG_KAN,         N_p("input-name", "P2 Mahjong Kan"),         input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  MAHJONG_PON,         N_p("input-name", "P2 Mahjong Pon"),         input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  MAHJONG_CHI,         N_p("input-name", "P2 Mahjong Chi"),         input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  MAHJONG_REACH,       N_p("input-name", "P2 Mahjong Reach"),       input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  MAHJONG_RON,         N_p("input-name", "P2 Mahjong Ron"),         input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  MAHJONG_BET,         N_p("input-name", "P2 Mahjong Bet"),         input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  MAHJONG_LAST_CHANCE, N_p("input-name", "P2 Mahjong Last Chance"), input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  MAHJONG_SCORE,       N_p("input-name", "P2 Mahjong Take Score"),  input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  MAHJONG_DOUBLE_UP,   N_p("input-name", "P2 Mahjong Double Up"),   input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  MAHJONG_FLIP_FLOP,   N_p("input-name", "P2 Mahjong Flip Flop"),   input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  MAHJONG_BIG,         N_p("input-name", "P2 Mahjong Big"),         input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  MAHJONG_SMALL,       N_p("input-name", "P2 Mahjong Small"),       input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  MAHJONG_A,           N_p("input-name", "%p Mahjong A"),           input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  MAHJONG_B,           N_p("input-name", "%p Mahjong B"),           input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  MAHJONG_C,           N_p("input-name", "%p Mahjong C"),           input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  MAHJONG_D,           N_p("input-name", "%p Mahjong D"),           input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  MAHJONG_E,           N_p("input-name", "%p Mahjong E"),           input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  MAHJONG_F,           N_p("input-name", "%p Mahjong F"),           input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  MAHJONG_G,           N_p("input-name", "%p Mahjong G"),           input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  MAHJONG_H,           N_p("input-name", "%p Mahjong H"),           input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  MAHJONG_I,           N_p("input-name", "%p Mahjong I"),           input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  MAHJONG_J,           N_p("input-name", "%p Mahjong J"),           input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  MAHJONG_K,           N_p("input-name", "%p Mahjong K"),           input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  MAHJONG_L,           N_p("input-name", "%p Mahjong L"),           input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  MAHJONG_M,           N_p("input-name", "%p Mahjong M"),           input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  MAHJONG_N,           N_p("input-name", "%p Mahjong N"),           input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  MAHJONG_O,           N_p("input-name", "%p Mahjong O"),           input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  MAHJONG_P,           N_p("input-name", "%p Mahjong P"),           input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  MAHJONG_Q,           N_p("input-name", "%p Mahjong Q"),           input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  MAHJONG_KAN,         N_p("input-name", "%p Mahjong Kan"),         input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  MAHJONG_PON,         N_p("input-name", "%p Mahjong Pon"),         input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  MAHJONG_CHI,         N_p("input-name", "%p Mahjong Chi"),         input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  MAHJONG_REACH,       N_p("input-name", "%p Mahjong Reach"),       input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  MAHJONG_RON,         N_p("input-name", "%p Mahjong Ron"),         input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  MAHJONG_FLIP_FLOP,   N_p("input-name", "%p Mahjong Flip Flop"),   input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  MAHJONG_BET,         N_p("input-name", "%p Mahjong Bet"),         input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  MAHJONG_SCORE,       N_p("input-name", "%p Mahjong Take Score"),  input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  MAHJONG_DOUBLE_UP,   N_p("input-name", "%p Mahjong Double Up"),   input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  MAHJONG_BIG,         N_p("input-name", "%p Mahjong Big"),         input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  MAHJONG_SMALL,       N_p("input-name", "%p Mahjong Small"),       input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  MAHJONG_LAST_CHANCE, N_p("input-name", "%p Mahjong Last Chance"), input_seq() ) \
 		CORE_INPUT_TYPES_END()
 
 #define CORE_INPUT_TYPES_P2_HANAFUDA \
 		CORE_INPUT_TYPES_BEGIN(p2_hanafuda) \
-		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  HANAFUDA_A,          N_p("input-name", "P2 Hanafuda A/1"),        input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  HANAFUDA_B,          N_p("input-name", "P2 Hanafuda B/2"),        input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  HANAFUDA_C,          N_p("input-name", "P2 Hanafuda C/3"),        input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  HANAFUDA_D,          N_p("input-name", "P2 Hanafuda D/4"),        input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  HANAFUDA_E,          N_p("input-name", "P2 Hanafuda E/5"),        input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  HANAFUDA_F,          N_p("input-name", "P2 Hanafuda F/6"),        input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  HANAFUDA_G,          N_p("input-name", "P2 Hanafuda G/7"),        input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  HANAFUDA_H,          N_p("input-name", "P2 Hanafuda H/8"),        input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  HANAFUDA_YES,        N_p("input-name", "P2 Hanafuda Yes"),        input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  HANAFUDA_NO,         N_p("input-name", "P2 Hanafuda No"),         input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  HANAFUDA_A,          N_p("input-name", "%p Hanafuda A/1"),        input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  HANAFUDA_B,          N_p("input-name", "%p Hanafuda B/2"),        input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  HANAFUDA_C,          N_p("input-name", "%p Hanafuda C/3"),        input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  HANAFUDA_D,          N_p("input-name", "%p Hanafuda D/4"),        input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  HANAFUDA_E,          N_p("input-name", "%p Hanafuda E/5"),        input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  HANAFUDA_F,          N_p("input-name", "%p Hanafuda F/6"),        input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  HANAFUDA_G,          N_p("input-name", "%p Hanafuda G/7"),        input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  HANAFUDA_H,          N_p("input-name", "%p Hanafuda H/8"),        input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  HANAFUDA_YES,        N_p("input-name", "%p Hanafuda Yes"),        input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  2, PLAYER2,  HANAFUDA_NO,         N_p("input-name", "%p Hanafuda No"),         input_seq() ) \
 		CORE_INPUT_TYPES_END()
 
 #define CORE_INPUT_TYPES_P3 \
 		CORE_INPUT_TYPES_BEGIN(p3) \
-		INPUT_PORT_DIGITAL_TYPE(  3, PLAYER3,  JOYSTICK_UP,         N_p("input-name", "P3 Up"),                  input_seq(KEYCODE_I, input_seq::or_code, JOYCODE_Y_UP_SWITCH_INDEXED(2)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  3, PLAYER3,  JOYSTICK_DOWN,       N_p("input-name", "P3 Down"),                input_seq(KEYCODE_K, input_seq::or_code, JOYCODE_Y_DOWN_SWITCH_INDEXED(2)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  3, PLAYER3,  JOYSTICK_LEFT,       N_p("input-name", "P3 Left"),                input_seq(KEYCODE_J, input_seq::or_code, JOYCODE_X_LEFT_SWITCH_INDEXED(2)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  3, PLAYER3,  JOYSTICK_RIGHT,      N_p("input-name", "P3 Right"),               input_seq(KEYCODE_L, input_seq::or_code, JOYCODE_X_RIGHT_SWITCH_INDEXED(2)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  3, PLAYER3,  JOYSTICKRIGHT_UP,    N_p("input-name", "P3 Right Stick/Up"),      input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE(  3, PLAYER3,  JOYSTICKRIGHT_DOWN,  N_p("input-name", "P3 Right Stick/Down"),    input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE(  3, PLAYER3,  JOYSTICKRIGHT_LEFT,  N_p("input-name", "P3 Right Stick/Left"),    input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE(  3, PLAYER3,  JOYSTICKRIGHT_RIGHT, N_p("input-name", "P3 Right Stick/Right"),   input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE(  3, PLAYER3,  JOYSTICKLEFT_UP,     N_p("input-name", "P3 Left Stick/Up"),       input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE(  3, PLAYER3,  JOYSTICKLEFT_DOWN,   N_p("input-name", "P3 Left Stick/Down"),     input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE(  3, PLAYER3,  JOYSTICKLEFT_LEFT,   N_p("input-name", "P3 Left Stick/Left"),     input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE(  3, PLAYER3,  JOYSTICKLEFT_RIGHT,  N_p("input-name", "P3 Left Stick/Right"),    input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE(  3, PLAYER3,  BUTTON1,             N_p("input-name", "P3 Button 1"),            input_seq(KEYCODE_RCONTROL, input_seq::or_code, JOYCODE_BUTTON1_INDEXED(2), input_seq::or_code, GUNCODE_BUTTON1_INDEXED(2)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  3, PLAYER3,  BUTTON2,             N_p("input-name", "P3 Button 2"),            input_seq(KEYCODE_RSHIFT, input_seq::or_code, JOYCODE_BUTTON2_INDEXED(2), input_seq::or_code, GUNCODE_BUTTON2_INDEXED(2)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  3, PLAYER3,  BUTTON3,             N_p("input-name", "P3 Button 3"),            input_seq(KEYCODE_ENTER, input_seq::or_code, JOYCODE_BUTTON3_INDEXED(2)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  3, PLAYER3,  BUTTON4,             N_p("input-name", "P3 Button 4"),            input_seq(JOYCODE_BUTTON4_INDEXED(2)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  3, PLAYER3,  BUTTON5,             N_p("input-name", "P3 Button 5"),            input_seq(JOYCODE_BUTTON5_INDEXED(2)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  3, PLAYER3,  BUTTON6,             N_p("input-name", "P3 Button 6"),            input_seq(JOYCODE_BUTTON6_INDEXED(2)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  3, PLAYER3,  BUTTON7,             N_p("input-name", "P3 Button 7"),            input_seq(JOYCODE_BUTTON7_INDEXED(2)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  3, PLAYER3,  BUTTON8,             N_p("input-name", "P3 Button 8"),            input_seq(JOYCODE_BUTTON8_INDEXED(2)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  3, PLAYER3,  BUTTON9,             N_p("input-name", "P3 Button 9"),            input_seq(JOYCODE_BUTTON9_INDEXED(2)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  3, PLAYER3,  BUTTON10,            N_p("input-name", "P3 Button 10"),           input_seq(JOYCODE_BUTTON10_INDEXED(2)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  3, PLAYER3,  BUTTON11,            N_p("input-name", "P3 Button 11"),           input_seq(JOYCODE_BUTTON11_INDEXED(2)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  3, PLAYER3,  BUTTON12,            N_p("input-name", "P3 Button 12"),           input_seq(JOYCODE_BUTTON12_INDEXED(2)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  3, PLAYER3,  BUTTON13,            N_p("input-name", "P3 Button 13"),           input_seq(JOYCODE_BUTTON13_INDEXED(2)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  3, PLAYER3,  BUTTON14,            N_p("input-name", "P3 Button 14"),           input_seq(JOYCODE_BUTTON14_INDEXED(2)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  3, PLAYER3,  BUTTON15,            N_p("input-name", "P3 Button 15"),           input_seq(JOYCODE_BUTTON15_INDEXED(2)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  3, PLAYER3,  BUTTON16,            N_p("input-name", "P3 Button 16"),           input_seq(JOYCODE_BUTTON16_INDEXED(2)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  3, PLAYER3,  START,               N_p("input-name", "P3 Start"),               input_seq(KEYCODE_3, input_seq::or_code, JOYCODE_START_INDEXED(2)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  3, PLAYER3,  SELECT,              N_p("input-name", "P3 Select"),              input_seq(KEYCODE_7, input_seq::or_code, JOYCODE_SELECT_INDEXED(2)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  3, PLAYER3,  JOYSTICK_UP,         N_p("input-name", "%p Up"),                  input_seq(KEYCODE_I, input_seq::or_code, JOYCODE_Y_UP_SWITCH_INDEXED(2)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  3, PLAYER3,  JOYSTICK_DOWN,       N_p("input-name", "%p Down"),                input_seq(KEYCODE_K, input_seq::or_code, JOYCODE_Y_DOWN_SWITCH_INDEXED(2)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  3, PLAYER3,  JOYSTICK_LEFT,       N_p("input-name", "%p Left"),                input_seq(KEYCODE_J, input_seq::or_code, JOYCODE_X_LEFT_SWITCH_INDEXED(2)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  3, PLAYER3,  JOYSTICK_RIGHT,      N_p("input-name", "%p Right"),               input_seq(KEYCODE_L, input_seq::or_code, JOYCODE_X_RIGHT_SWITCH_INDEXED(2)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  3, PLAYER3,  JOYSTICKRIGHT_UP,    N_p("input-name", "%p Right Stick/Up"),      input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  3, PLAYER3,  JOYSTICKRIGHT_DOWN,  N_p("input-name", "%p Right Stick/Down"),    input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  3, PLAYER3,  JOYSTICKRIGHT_LEFT,  N_p("input-name", "%p Right Stick/Left"),    input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  3, PLAYER3,  JOYSTICKRIGHT_RIGHT, N_p("input-name", "%p Right Stick/Right"),   input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  3, PLAYER3,  JOYSTICKLEFT_UP,     N_p("input-name", "%p Left Stick/Up"),       input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  3, PLAYER3,  JOYSTICKLEFT_DOWN,   N_p("input-name", "%p Left Stick/Down"),     input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  3, PLAYER3,  JOYSTICKLEFT_LEFT,   N_p("input-name", "%p Left Stick/Left"),     input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  3, PLAYER3,  JOYSTICKLEFT_RIGHT,  N_p("input-name", "%p Left Stick/Right"),    input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  3, PLAYER3,  BUTTON1,             N_p("input-name", "%p Button 1"),            input_seq(KEYCODE_RCONTROL, input_seq::or_code, JOYCODE_BUTTON1_INDEXED(2), input_seq::or_code, GUNCODE_BUTTON1_INDEXED(2)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  3, PLAYER3,  BUTTON2,             N_p("input-name", "%p Button 2"),            input_seq(KEYCODE_RSHIFT, input_seq::or_code, JOYCODE_BUTTON2_INDEXED(2), input_seq::or_code, GUNCODE_BUTTON2_INDEXED(2)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  3, PLAYER3,  BUTTON3,             N_p("input-name", "%p Button 3"),            input_seq(KEYCODE_ENTER, input_seq::or_code, JOYCODE_BUTTON3_INDEXED(2)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  3, PLAYER3,  BUTTON4,             N_p("input-name", "%p Button 4"),            input_seq(JOYCODE_BUTTON4_INDEXED(2)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  3, PLAYER3,  BUTTON5,             N_p("input-name", "%p Button 5"),            input_seq(JOYCODE_BUTTON5_INDEXED(2)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  3, PLAYER3,  BUTTON6,             N_p("input-name", "%p Button 6"),            input_seq(JOYCODE_BUTTON6_INDEXED(2)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  3, PLAYER3,  BUTTON7,             N_p("input-name", "%p Button 7"),            input_seq(JOYCODE_BUTTON7_INDEXED(2)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  3, PLAYER3,  BUTTON8,             N_p("input-name", "%p Button 8"),            input_seq(JOYCODE_BUTTON8_INDEXED(2)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  3, PLAYER3,  BUTTON9,             N_p("input-name", "%p Button 9"),            input_seq(JOYCODE_BUTTON9_INDEXED(2)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  3, PLAYER3,  BUTTON10,            N_p("input-name", "%p Button 10"),           input_seq(JOYCODE_BUTTON10_INDEXED(2)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  3, PLAYER3,  BUTTON11,            N_p("input-name", "%p Button 11"),           input_seq(JOYCODE_BUTTON11_INDEXED(2)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  3, PLAYER3,  BUTTON12,            N_p("input-name", "%p Button 12"),           input_seq(JOYCODE_BUTTON12_INDEXED(2)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  3, PLAYER3,  BUTTON13,            N_p("input-name", "%p Button 13"),           input_seq(JOYCODE_BUTTON13_INDEXED(2)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  3, PLAYER3,  BUTTON14,            N_p("input-name", "%p Button 14"),           input_seq(JOYCODE_BUTTON14_INDEXED(2)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  3, PLAYER3,  BUTTON15,            N_p("input-name", "%p Button 15"),           input_seq(JOYCODE_BUTTON15_INDEXED(2)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  3, PLAYER3,  BUTTON16,            N_p("input-name", "%p Button 16"),           input_seq(JOYCODE_BUTTON16_INDEXED(2)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  3, PLAYER3,  START,               N_p("input-name", "%p Start"),               input_seq(KEYCODE_3, input_seq::or_code, JOYCODE_START_INDEXED(2)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  3, PLAYER3,  SELECT,              N_p("input-name", "%p Select"),              input_seq(KEYCODE_7, input_seq::or_code, JOYCODE_SELECT_INDEXED(2)) ) \
 		CORE_INPUT_TYPES_END()
 
 #define CORE_INPUT_TYPES_P4 \
 		CORE_INPUT_TYPES_BEGIN(p4) \
-		INPUT_PORT_DIGITAL_TYPE(  4, PLAYER4,  JOYSTICK_UP,         N_p("input-name", "P4 Up"),                  input_seq(KEYCODE_8_PAD, input_seq::or_code, JOYCODE_Y_UP_SWITCH_INDEXED(3)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  4, PLAYER4,  JOYSTICK_DOWN,       N_p("input-name", "P4 Down"),                input_seq(KEYCODE_2_PAD, input_seq::or_code, JOYCODE_Y_DOWN_SWITCH_INDEXED(3)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  4, PLAYER4,  JOYSTICK_LEFT,       N_p("input-name", "P4 Left"),                input_seq(KEYCODE_4_PAD, input_seq::or_code, JOYCODE_X_LEFT_SWITCH_INDEXED(3)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  4, PLAYER4,  JOYSTICK_RIGHT,      N_p("input-name", "P4 Right"),               input_seq(KEYCODE_6_PAD, input_seq::or_code, JOYCODE_X_RIGHT_SWITCH_INDEXED(3)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  4, PLAYER4,  JOYSTICKRIGHT_UP,    N_p("input-name", "P4 Right Stick/Up"),      input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE(  4, PLAYER4,  JOYSTICKRIGHT_DOWN,  N_p("input-name", "P4 Right Stick/Down"),    input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE(  4, PLAYER4,  JOYSTICKRIGHT_LEFT,  N_p("input-name", "P4 Right Stick/Left"),    input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE(  4, PLAYER4,  JOYSTICKRIGHT_RIGHT, N_p("input-name", "P4 Right Stick/Right"),   input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE(  4, PLAYER4,  JOYSTICKLEFT_UP,     N_p("input-name", "P4 Left Stick/Up"),       input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE(  4, PLAYER4,  JOYSTICKLEFT_DOWN,   N_p("input-name", "P4 Left Stick/Down"),     input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE(  4, PLAYER4,  JOYSTICKLEFT_LEFT,   N_p("input-name", "P4 Left Stick/Left"),     input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE(  4, PLAYER4,  JOYSTICKLEFT_RIGHT,  N_p("input-name", "P4 Left Stick/Right"),    input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE(  4, PLAYER4,  BUTTON1,             N_p("input-name", "P4 Button 1"),            input_seq(KEYCODE_0_PAD, input_seq::or_code, JOYCODE_BUTTON1_INDEXED(3)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  4, PLAYER4,  BUTTON2,             N_p("input-name", "P4 Button 2"),            input_seq(KEYCODE_DEL_PAD, input_seq::or_code, JOYCODE_BUTTON2_INDEXED(3)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  4, PLAYER4,  BUTTON3,             N_p("input-name", "P4 Button 3"),            input_seq(KEYCODE_ENTER_PAD, input_seq::or_code, JOYCODE_BUTTON3_INDEXED(3)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  4, PLAYER4,  BUTTON4,             N_p("input-name", "P4 Button 4"),            input_seq(JOYCODE_BUTTON4_INDEXED(3)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  4, PLAYER4,  BUTTON5,             N_p("input-name", "P4 Button 5"),            input_seq(JOYCODE_BUTTON5_INDEXED(3)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  4, PLAYER4,  BUTTON6,             N_p("input-name", "P4 Button 6"),            input_seq(JOYCODE_BUTTON6_INDEXED(3)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  4, PLAYER4,  BUTTON7,             N_p("input-name", "P4 Button 7"),            input_seq(JOYCODE_BUTTON7_INDEXED(3)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  4, PLAYER4,  BUTTON8,             N_p("input-name", "P4 Button 8"),            input_seq(JOYCODE_BUTTON8_INDEXED(3)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  4, PLAYER4,  BUTTON9,             N_p("input-name", "P4 Button 9"),            input_seq(JOYCODE_BUTTON9_INDEXED(3)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  4, PLAYER4,  BUTTON10,            N_p("input-name", "P4 Button 10"),           input_seq(JOYCODE_BUTTON10_INDEXED(3)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  4, PLAYER4,  BUTTON11,            N_p("input-name", "P4 Button 11"),           input_seq(JOYCODE_BUTTON11_INDEXED(3)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  4, PLAYER4,  BUTTON12,            N_p("input-name", "P4 Button 12"),           input_seq(JOYCODE_BUTTON12_INDEXED(3)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  4, PLAYER4,  BUTTON13,            N_p("input-name", "P4 Button 13"),           input_seq(JOYCODE_BUTTON13_INDEXED(3)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  4, PLAYER4,  BUTTON14,            N_p("input-name", "P4 Button 14"),           input_seq(JOYCODE_BUTTON14_INDEXED(3)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  4, PLAYER4,  BUTTON15,            N_p("input-name", "P4 Button 15"),           input_seq(JOYCODE_BUTTON15_INDEXED(3)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  4, PLAYER4,  BUTTON16,            N_p("input-name", "P4 Button 16"),           input_seq(JOYCODE_BUTTON16_INDEXED(3)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  4, PLAYER4,  START,               N_p("input-name", "P4 Start"),               input_seq(KEYCODE_4, input_seq::or_code, JOYCODE_START_INDEXED(3)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  4, PLAYER4,  SELECT,              N_p("input-name", "P4 Select"),              input_seq(KEYCODE_8, input_seq::or_code, JOYCODE_SELECT_INDEXED(3)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  4, PLAYER4,  JOYSTICK_UP,         N_p("input-name", "%p Up"),                  input_seq(KEYCODE_8_PAD, input_seq::or_code, JOYCODE_Y_UP_SWITCH_INDEXED(3)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  4, PLAYER4,  JOYSTICK_DOWN,       N_p("input-name", "%p Down"),                input_seq(KEYCODE_2_PAD, input_seq::or_code, JOYCODE_Y_DOWN_SWITCH_INDEXED(3)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  4, PLAYER4,  JOYSTICK_LEFT,       N_p("input-name", "%p Left"),                input_seq(KEYCODE_4_PAD, input_seq::or_code, JOYCODE_X_LEFT_SWITCH_INDEXED(3)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  4, PLAYER4,  JOYSTICK_RIGHT,      N_p("input-name", "%p Right"),               input_seq(KEYCODE_6_PAD, input_seq::or_code, JOYCODE_X_RIGHT_SWITCH_INDEXED(3)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  4, PLAYER4,  JOYSTICKRIGHT_UP,    N_p("input-name", "%p Right Stick/Up"),      input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  4, PLAYER4,  JOYSTICKRIGHT_DOWN,  N_p("input-name", "%p Right Stick/Down"),    input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  4, PLAYER4,  JOYSTICKRIGHT_LEFT,  N_p("input-name", "%p Right Stick/Left"),    input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  4, PLAYER4,  JOYSTICKRIGHT_RIGHT, N_p("input-name", "%p Right Stick/Right"),   input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  4, PLAYER4,  JOYSTICKLEFT_UP,     N_p("input-name", "%p Left Stick/Up"),       input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  4, PLAYER4,  JOYSTICKLEFT_DOWN,   N_p("input-name", "%p Left Stick/Down"),     input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  4, PLAYER4,  JOYSTICKLEFT_LEFT,   N_p("input-name", "%p Left Stick/Left"),     input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  4, PLAYER4,  JOYSTICKLEFT_RIGHT,  N_p("input-name", "%p Left Stick/Right"),    input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  4, PLAYER4,  BUTTON1,             N_p("input-name", "%p Button 1"),            input_seq(KEYCODE_0_PAD, input_seq::or_code, JOYCODE_BUTTON1_INDEXED(3)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  4, PLAYER4,  BUTTON2,             N_p("input-name", "%p Button 2"),            input_seq(KEYCODE_DEL_PAD, input_seq::or_code, JOYCODE_BUTTON2_INDEXED(3)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  4, PLAYER4,  BUTTON3,             N_p("input-name", "%p Button 3"),            input_seq(KEYCODE_ENTER_PAD, input_seq::or_code, JOYCODE_BUTTON3_INDEXED(3)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  4, PLAYER4,  BUTTON4,             N_p("input-name", "%p Button 4"),            input_seq(JOYCODE_BUTTON4_INDEXED(3)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  4, PLAYER4,  BUTTON5,             N_p("input-name", "%p Button 5"),            input_seq(JOYCODE_BUTTON5_INDEXED(3)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  4, PLAYER4,  BUTTON6,             N_p("input-name", "%p Button 6"),            input_seq(JOYCODE_BUTTON6_INDEXED(3)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  4, PLAYER4,  BUTTON7,             N_p("input-name", "%p Button 7"),            input_seq(JOYCODE_BUTTON7_INDEXED(3)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  4, PLAYER4,  BUTTON8,             N_p("input-name", "%p Button 8"),            input_seq(JOYCODE_BUTTON8_INDEXED(3)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  4, PLAYER4,  BUTTON9,             N_p("input-name", "%p Button 9"),            input_seq(JOYCODE_BUTTON9_INDEXED(3)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  4, PLAYER4,  BUTTON10,            N_p("input-name", "%p Button 10"),           input_seq(JOYCODE_BUTTON10_INDEXED(3)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  4, PLAYER4,  BUTTON11,            N_p("input-name", "%p Button 11"),           input_seq(JOYCODE_BUTTON11_INDEXED(3)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  4, PLAYER4,  BUTTON12,            N_p("input-name", "%p Button 12"),           input_seq(JOYCODE_BUTTON12_INDEXED(3)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  4, PLAYER4,  BUTTON13,            N_p("input-name", "%p Button 13"),           input_seq(JOYCODE_BUTTON13_INDEXED(3)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  4, PLAYER4,  BUTTON14,            N_p("input-name", "%p Button 14"),           input_seq(JOYCODE_BUTTON14_INDEXED(3)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  4, PLAYER4,  BUTTON15,            N_p("input-name", "%p Button 15"),           input_seq(JOYCODE_BUTTON15_INDEXED(3)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  4, PLAYER4,  BUTTON16,            N_p("input-name", "%p Button 16"),           input_seq(JOYCODE_BUTTON16_INDEXED(3)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  4, PLAYER4,  START,               N_p("input-name", "%p Start"),               input_seq(KEYCODE_4, input_seq::or_code, JOYCODE_START_INDEXED(3)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  4, PLAYER4,  SELECT,              N_p("input-name", "%p Select"),              input_seq(KEYCODE_8, input_seq::or_code, JOYCODE_SELECT_INDEXED(3)) ) \
 		CORE_INPUT_TYPES_END()
 
 #define CORE_INPUT_TYPES_P5 \
 		CORE_INPUT_TYPES_BEGIN(p5) \
-		INPUT_PORT_DIGITAL_TYPE(  5, PLAYER5,  JOYSTICK_UP,         N_p("input-name", "P5 Up"),                  input_seq(JOYCODE_Y_UP_SWITCH_INDEXED(4)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  5, PLAYER5,  JOYSTICK_DOWN,       N_p("input-name", "P5 Down"),                input_seq(JOYCODE_Y_DOWN_SWITCH_INDEXED(4)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  5, PLAYER5,  JOYSTICK_LEFT,       N_p("input-name", "P5 Left"),                input_seq(JOYCODE_X_LEFT_SWITCH_INDEXED(4)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  5, PLAYER5,  JOYSTICK_RIGHT,      N_p("input-name", "P5 Right"),               input_seq(JOYCODE_X_RIGHT_SWITCH_INDEXED(4)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  5, PLAYER5,  JOYSTICKRIGHT_UP,    N_p("input-name", "P5 Right Stick/Up"),      input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE(  5, PLAYER5,  JOYSTICKRIGHT_DOWN,  N_p("input-name", "P5 Right Stick/Down"),    input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE(  5, PLAYER5,  JOYSTICKRIGHT_LEFT,  N_p("input-name", "P5 Right Stick/Left"),    input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE(  5, PLAYER5,  JOYSTICKRIGHT_RIGHT, N_p("input-name", "P5 Right Stick/Right"),   input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE(  5, PLAYER5,  JOYSTICKLEFT_UP,     N_p("input-name", "P5 Left Stick/Up"),       input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE(  5, PLAYER5,  JOYSTICKLEFT_DOWN,   N_p("input-name", "P5 Left Stick/Down"),     input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE(  5, PLAYER5,  JOYSTICKLEFT_LEFT,   N_p("input-name", "P5 Left Stick/Left"),     input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE(  5, PLAYER5,  JOYSTICKLEFT_RIGHT,  N_p("input-name", "P5 Left Stick/Right"),    input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE(  5, PLAYER5,  BUTTON1,             N_p("input-name", "P5 Button 1"),            input_seq(JOYCODE_BUTTON1_INDEXED(4)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  5, PLAYER5,  BUTTON2,             N_p("input-name", "P5 Button 2"),            input_seq(JOYCODE_BUTTON2_INDEXED(4)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  5, PLAYER5,  BUTTON3,             N_p("input-name", "P5 Button 3"),            input_seq(JOYCODE_BUTTON3_INDEXED(4)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  5, PLAYER5,  BUTTON4,             N_p("input-name", "P5 Button 4"),            input_seq(JOYCODE_BUTTON4_INDEXED(4)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  5, PLAYER5,  BUTTON5,             N_p("input-name", "P5 Button 5"),            input_seq(JOYCODE_BUTTON5_INDEXED(4)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  5, PLAYER5,  BUTTON6,             N_p("input-name", "P5 Button 6"),            input_seq(JOYCODE_BUTTON6_INDEXED(4)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  5, PLAYER5,  BUTTON7,             N_p("input-name", "P5 Button 7"),            input_seq(JOYCODE_BUTTON7_INDEXED(4)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  5, PLAYER5,  BUTTON8,             N_p("input-name", "P5 Button 8"),            input_seq(JOYCODE_BUTTON8_INDEXED(4)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  5, PLAYER5,  BUTTON9,             N_p("input-name", "P5 Button 9"),            input_seq(JOYCODE_BUTTON9_INDEXED(4)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  5, PLAYER5,  BUTTON10,            N_p("input-name", "P5 Button 10"),           input_seq(JOYCODE_BUTTON10_INDEXED(4)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  5, PLAYER5,  BUTTON11,            N_p("input-name", "P5 Button 11"),           input_seq(JOYCODE_BUTTON11_INDEXED(4)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  5, PLAYER5,  BUTTON12,            N_p("input-name", "P5 Button 12"),           input_seq(JOYCODE_BUTTON12_INDEXED(4)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  5, PLAYER5,  BUTTON13,            N_p("input-name", "P5 Button 13"),           input_seq(JOYCODE_BUTTON13_INDEXED(4)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  5, PLAYER5,  BUTTON14,            N_p("input-name", "P5 Button 14"),           input_seq(JOYCODE_BUTTON14_INDEXED(4)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  5, PLAYER5,  BUTTON15,            N_p("input-name", "P5 Button 15"),           input_seq(JOYCODE_BUTTON15_INDEXED(4)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  5, PLAYER5,  BUTTON16,            N_p("input-name", "P5 Button 16"),           input_seq(JOYCODE_BUTTON16_INDEXED(4)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  5, PLAYER5,  START,               N_p("input-name", "P5 Start"),               input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE(  5, PLAYER5,  SELECT,              N_p("input-name", "P5 Select"),              input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  5, PLAYER5,  JOYSTICK_UP,         N_p("input-name", "%p Up"),                  input_seq(JOYCODE_Y_UP_SWITCH_INDEXED(4)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  5, PLAYER5,  JOYSTICK_DOWN,       N_p("input-name", "%p Down"),                input_seq(JOYCODE_Y_DOWN_SWITCH_INDEXED(4)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  5, PLAYER5,  JOYSTICK_LEFT,       N_p("input-name", "%p Left"),                input_seq(JOYCODE_X_LEFT_SWITCH_INDEXED(4)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  5, PLAYER5,  JOYSTICK_RIGHT,      N_p("input-name", "%p Right"),               input_seq(JOYCODE_X_RIGHT_SWITCH_INDEXED(4)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  5, PLAYER5,  JOYSTICKRIGHT_UP,    N_p("input-name", "%p Right Stick/Up"),      input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  5, PLAYER5,  JOYSTICKRIGHT_DOWN,  N_p("input-name", "%p Right Stick/Down"),    input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  5, PLAYER5,  JOYSTICKRIGHT_LEFT,  N_p("input-name", "%p Right Stick/Left"),    input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  5, PLAYER5,  JOYSTICKRIGHT_RIGHT, N_p("input-name", "%p Right Stick/Right"),   input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  5, PLAYER5,  JOYSTICKLEFT_UP,     N_p("input-name", "%p Left Stick/Up"),       input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  5, PLAYER5,  JOYSTICKLEFT_DOWN,   N_p("input-name", "%p Left Stick/Down"),     input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  5, PLAYER5,  JOYSTICKLEFT_LEFT,   N_p("input-name", "%p Left Stick/Left"),     input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  5, PLAYER5,  JOYSTICKLEFT_RIGHT,  N_p("input-name", "%p Left Stick/Right"),    input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  5, PLAYER5,  BUTTON1,             N_p("input-name", "%p Button 1"),            input_seq(JOYCODE_BUTTON1_INDEXED(4)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  5, PLAYER5,  BUTTON2,             N_p("input-name", "%p Button 2"),            input_seq(JOYCODE_BUTTON2_INDEXED(4)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  5, PLAYER5,  BUTTON3,             N_p("input-name", "%p Button 3"),            input_seq(JOYCODE_BUTTON3_INDEXED(4)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  5, PLAYER5,  BUTTON4,             N_p("input-name", "%p Button 4"),            input_seq(JOYCODE_BUTTON4_INDEXED(4)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  5, PLAYER5,  BUTTON5,             N_p("input-name", "%p Button 5"),            input_seq(JOYCODE_BUTTON5_INDEXED(4)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  5, PLAYER5,  BUTTON6,             N_p("input-name", "%p Button 6"),            input_seq(JOYCODE_BUTTON6_INDEXED(4)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  5, PLAYER5,  BUTTON7,             N_p("input-name", "%p Button 7"),            input_seq(JOYCODE_BUTTON7_INDEXED(4)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  5, PLAYER5,  BUTTON8,             N_p("input-name", "%p Button 8"),            input_seq(JOYCODE_BUTTON8_INDEXED(4)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  5, PLAYER5,  BUTTON9,             N_p("input-name", "%p Button 9"),            input_seq(JOYCODE_BUTTON9_INDEXED(4)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  5, PLAYER5,  BUTTON10,            N_p("input-name", "%p Button 10"),           input_seq(JOYCODE_BUTTON10_INDEXED(4)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  5, PLAYER5,  BUTTON11,            N_p("input-name", "%p Button 11"),           input_seq(JOYCODE_BUTTON11_INDEXED(4)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  5, PLAYER5,  BUTTON12,            N_p("input-name", "%p Button 12"),           input_seq(JOYCODE_BUTTON12_INDEXED(4)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  5, PLAYER5,  BUTTON13,            N_p("input-name", "%p Button 13"),           input_seq(JOYCODE_BUTTON13_INDEXED(4)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  5, PLAYER5,  BUTTON14,            N_p("input-name", "%p Button 14"),           input_seq(JOYCODE_BUTTON14_INDEXED(4)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  5, PLAYER5,  BUTTON15,            N_p("input-name", "%p Button 15"),           input_seq(JOYCODE_BUTTON15_INDEXED(4)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  5, PLAYER5,  BUTTON16,            N_p("input-name", "%p Button 16"),           input_seq(JOYCODE_BUTTON16_INDEXED(4)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  5, PLAYER5,  START,               N_p("input-name", "%p Start"),               input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  5, PLAYER5,  SELECT,              N_p("input-name", "%p Select"),              input_seq() ) \
 		CORE_INPUT_TYPES_END()
 
 #define CORE_INPUT_TYPES_P6 \
 		CORE_INPUT_TYPES_BEGIN(p6) \
-		INPUT_PORT_DIGITAL_TYPE(  6, PLAYER6,  JOYSTICK_UP,         N_p("input-name", "P6 Up"),                  input_seq(JOYCODE_Y_UP_SWITCH_INDEXED(5)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  6, PLAYER6,  JOYSTICK_DOWN,       N_p("input-name", "P6 Down"),                input_seq(JOYCODE_Y_DOWN_SWITCH_INDEXED(5)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  6, PLAYER6,  JOYSTICK_LEFT,       N_p("input-name", "P6 Left"),                input_seq(JOYCODE_X_LEFT_SWITCH_INDEXED(5)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  6, PLAYER6,  JOYSTICK_RIGHT,      N_p("input-name", "P6 Right"),               input_seq(JOYCODE_X_RIGHT_SWITCH_INDEXED(5)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  6, PLAYER6,  JOYSTICKRIGHT_UP,    N_p("input-name", "P6 Right Stick/Up"),      input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE(  6, PLAYER6,  JOYSTICKRIGHT_DOWN,  N_p("input-name", "P6 Right Stick/Down"),    input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE(  6, PLAYER6,  JOYSTICKRIGHT_LEFT,  N_p("input-name", "P6 Right Stick/Left"),    input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE(  6, PLAYER6,  JOYSTICKRIGHT_RIGHT, N_p("input-name", "P6 Right Stick/Right"),   input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE(  6, PLAYER6,  JOYSTICKLEFT_UP,     N_p("input-name", "P6 Left Stick/Up"),       input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE(  6, PLAYER6,  JOYSTICKLEFT_DOWN,   N_p("input-name", "P6 Left Stick/Down"),     input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE(  6, PLAYER6,  JOYSTICKLEFT_LEFT,   N_p("input-name", "P6 Left Stick/Left"),     input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE(  6, PLAYER6,  JOYSTICKLEFT_RIGHT,  N_p("input-name", "P6 Left Stick/Right"),    input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE(  6, PLAYER6,  BUTTON1,             N_p("input-name", "P6 Button 1"),            input_seq(JOYCODE_BUTTON1_INDEXED(5)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  6, PLAYER6,  BUTTON2,             N_p("input-name", "P6 Button 2"),            input_seq(JOYCODE_BUTTON2_INDEXED(5)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  6, PLAYER6,  BUTTON3,             N_p("input-name", "P6 Button 3"),            input_seq(JOYCODE_BUTTON3_INDEXED(5)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  6, PLAYER6,  BUTTON4,             N_p("input-name", "P6 Button 4"),            input_seq(JOYCODE_BUTTON4_INDEXED(5)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  6, PLAYER6,  BUTTON5,             N_p("input-name", "P6 Button 5"),            input_seq(JOYCODE_BUTTON5_INDEXED(5)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  6, PLAYER6,  BUTTON6,             N_p("input-name", "P6 Button 6"),            input_seq(JOYCODE_BUTTON6_INDEXED(5)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  6, PLAYER6,  BUTTON7,             N_p("input-name", "P6 Button 7"),            input_seq(JOYCODE_BUTTON7_INDEXED(5)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  6, PLAYER6,  BUTTON8,             N_p("input-name", "P6 Button 8"),            input_seq(JOYCODE_BUTTON8_INDEXED(5)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  6, PLAYER6,  BUTTON9,             N_p("input-name", "P6 Button 9"),            input_seq(JOYCODE_BUTTON9_INDEXED(5)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  6, PLAYER6,  BUTTON10,            N_p("input-name", "P6 Button 10"),           input_seq(JOYCODE_BUTTON10_INDEXED(5)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  6, PLAYER6,  BUTTON11,            N_p("input-name", "P6 Button 11"),           input_seq(JOYCODE_BUTTON11_INDEXED(5)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  6, PLAYER6,  BUTTON12,            N_p("input-name", "P6 Button 12"),           input_seq(JOYCODE_BUTTON12_INDEXED(5)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  6, PLAYER6,  BUTTON13,            N_p("input-name", "P6 Button 13"),           input_seq(JOYCODE_BUTTON13_INDEXED(5)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  6, PLAYER6,  BUTTON14,            N_p("input-name", "P6 Button 14"),           input_seq(JOYCODE_BUTTON14_INDEXED(5)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  6, PLAYER6,  BUTTON15,            N_p("input-name", "P6 Button 15"),           input_seq(JOYCODE_BUTTON15_INDEXED(5)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  6, PLAYER6,  BUTTON16,            N_p("input-name", "P6 Button 16"),           input_seq(JOYCODE_BUTTON16_INDEXED(5)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  6, PLAYER6,  START,               N_p("input-name", "P6 Start"),               input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE(  6, PLAYER6,  SELECT,              N_p("input-name", "P6 Select"),              input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  6, PLAYER6,  JOYSTICK_UP,         N_p("input-name", "%p Up"),                  input_seq(JOYCODE_Y_UP_SWITCH_INDEXED(5)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  6, PLAYER6,  JOYSTICK_DOWN,       N_p("input-name", "%p Down"),                input_seq(JOYCODE_Y_DOWN_SWITCH_INDEXED(5)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  6, PLAYER6,  JOYSTICK_LEFT,       N_p("input-name", "%p Left"),                input_seq(JOYCODE_X_LEFT_SWITCH_INDEXED(5)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  6, PLAYER6,  JOYSTICK_RIGHT,      N_p("input-name", "%p Right"),               input_seq(JOYCODE_X_RIGHT_SWITCH_INDEXED(5)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  6, PLAYER6,  JOYSTICKRIGHT_UP,    N_p("input-name", "%p Right Stick/Up"),      input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  6, PLAYER6,  JOYSTICKRIGHT_DOWN,  N_p("input-name", "%p Right Stick/Down"),    input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  6, PLAYER6,  JOYSTICKRIGHT_LEFT,  N_p("input-name", "%p Right Stick/Left"),    input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  6, PLAYER6,  JOYSTICKRIGHT_RIGHT, N_p("input-name", "%p Right Stick/Right"),   input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  6, PLAYER6,  JOYSTICKLEFT_UP,     N_p("input-name", "%p Left Stick/Up"),       input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  6, PLAYER6,  JOYSTICKLEFT_DOWN,   N_p("input-name", "%p Left Stick/Down"),     input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  6, PLAYER6,  JOYSTICKLEFT_LEFT,   N_p("input-name", "%p Left Stick/Left"),     input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  6, PLAYER6,  JOYSTICKLEFT_RIGHT,  N_p("input-name", "%p Left Stick/Right"),    input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  6, PLAYER6,  BUTTON1,             N_p("input-name", "%p Button 1"),            input_seq(JOYCODE_BUTTON1_INDEXED(5)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  6, PLAYER6,  BUTTON2,             N_p("input-name", "%p Button 2"),            input_seq(JOYCODE_BUTTON2_INDEXED(5)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  6, PLAYER6,  BUTTON3,             N_p("input-name", "%p Button 3"),            input_seq(JOYCODE_BUTTON3_INDEXED(5)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  6, PLAYER6,  BUTTON4,             N_p("input-name", "%p Button 4"),            input_seq(JOYCODE_BUTTON4_INDEXED(5)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  6, PLAYER6,  BUTTON5,             N_p("input-name", "%p Button 5"),            input_seq(JOYCODE_BUTTON5_INDEXED(5)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  6, PLAYER6,  BUTTON6,             N_p("input-name", "%p Button 6"),            input_seq(JOYCODE_BUTTON6_INDEXED(5)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  6, PLAYER6,  BUTTON7,             N_p("input-name", "%p Button 7"),            input_seq(JOYCODE_BUTTON7_INDEXED(5)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  6, PLAYER6,  BUTTON8,             N_p("input-name", "%p Button 8"),            input_seq(JOYCODE_BUTTON8_INDEXED(5)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  6, PLAYER6,  BUTTON9,             N_p("input-name", "%p Button 9"),            input_seq(JOYCODE_BUTTON9_INDEXED(5)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  6, PLAYER6,  BUTTON10,            N_p("input-name", "%p Button 10"),           input_seq(JOYCODE_BUTTON10_INDEXED(5)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  6, PLAYER6,  BUTTON11,            N_p("input-name", "%p Button 11"),           input_seq(JOYCODE_BUTTON11_INDEXED(5)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  6, PLAYER6,  BUTTON12,            N_p("input-name", "%p Button 12"),           input_seq(JOYCODE_BUTTON12_INDEXED(5)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  6, PLAYER6,  BUTTON13,            N_p("input-name", "%p Button 13"),           input_seq(JOYCODE_BUTTON13_INDEXED(5)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  6, PLAYER6,  BUTTON14,            N_p("input-name", "%p Button 14"),           input_seq(JOYCODE_BUTTON14_INDEXED(5)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  6, PLAYER6,  BUTTON15,            N_p("input-name", "%p Button 15"),           input_seq(JOYCODE_BUTTON15_INDEXED(5)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  6, PLAYER6,  BUTTON16,            N_p("input-name", "%p Button 16"),           input_seq(JOYCODE_BUTTON16_INDEXED(5)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  6, PLAYER6,  START,               N_p("input-name", "%p Start"),               input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  6, PLAYER6,  SELECT,              N_p("input-name", "%p Select"),              input_seq() ) \
 		CORE_INPUT_TYPES_END()
 
 #define CORE_INPUT_TYPES_P7 \
 		CORE_INPUT_TYPES_BEGIN(p7) \
-		INPUT_PORT_DIGITAL_TYPE(  7, PLAYER7,  JOYSTICK_UP,         N_p("input-name", "P7 Up"),                  input_seq(JOYCODE_Y_UP_SWITCH_INDEXED(6)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  7, PLAYER7,  JOYSTICK_DOWN,       N_p("input-name", "P7 Down"),                input_seq(JOYCODE_Y_DOWN_SWITCH_INDEXED(6)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  7, PLAYER7,  JOYSTICK_LEFT,       N_p("input-name", "P7 Left"),                input_seq(JOYCODE_X_LEFT_SWITCH_INDEXED(6)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  7, PLAYER7,  JOYSTICK_RIGHT,      N_p("input-name", "P7 Right"),               input_seq(JOYCODE_X_RIGHT_SWITCH_INDEXED(6)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  7, PLAYER7,  JOYSTICKRIGHT_UP,    N_p("input-name", "P7 Right Stick/Up"),      input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE(  7, PLAYER7,  JOYSTICKRIGHT_DOWN,  N_p("input-name", "P7 Right Stick/Down"),    input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE(  7, PLAYER7,  JOYSTICKRIGHT_LEFT,  N_p("input-name", "P7 Right Stick/Left"),    input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE(  7, PLAYER7,  JOYSTICKRIGHT_RIGHT, N_p("input-name", "P7 Right Stick/Right"),   input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE(  7, PLAYER7,  JOYSTICKLEFT_UP,     N_p("input-name", "P7 Left Stick/Up"),       input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE(  7, PLAYER7,  JOYSTICKLEFT_DOWN,   N_p("input-name", "P7 Left Stick/Down"),     input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE(  7, PLAYER7,  JOYSTICKLEFT_LEFT,   N_p("input-name", "P7 Left Stick/Left"),     input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE(  7, PLAYER7,  JOYSTICKLEFT_RIGHT,  N_p("input-name", "P7 Left Stick/Right"),    input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE(  7, PLAYER7,  BUTTON1,             N_p("input-name", "P7 Button 1"),            input_seq(JOYCODE_BUTTON1_INDEXED(6)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  7, PLAYER7,  BUTTON2,             N_p("input-name", "P7 Button 2"),            input_seq(JOYCODE_BUTTON2_INDEXED(6)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  7, PLAYER7,  BUTTON3,             N_p("input-name", "P7 Button 3"),            input_seq(JOYCODE_BUTTON3_INDEXED(6)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  7, PLAYER7,  BUTTON4,             N_p("input-name", "P7 Button 4"),            input_seq(JOYCODE_BUTTON4_INDEXED(6)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  7, PLAYER7,  BUTTON5,             N_p("input-name", "P7 Button 5"),            input_seq(JOYCODE_BUTTON5_INDEXED(6)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  7, PLAYER7,  BUTTON6,             N_p("input-name", "P7 Button 6"),            input_seq(JOYCODE_BUTTON6_INDEXED(6)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  7, PLAYER7,  BUTTON7,             N_p("input-name", "P7 Button 7"),            input_seq(JOYCODE_BUTTON7_INDEXED(6)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  7, PLAYER7,  BUTTON8,             N_p("input-name", "P7 Button 8"),            input_seq(JOYCODE_BUTTON8_INDEXED(6)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  7, PLAYER7,  BUTTON9,             N_p("input-name", "P7 Button 9"),            input_seq(JOYCODE_BUTTON9_INDEXED(6)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  7, PLAYER7,  BUTTON10,            N_p("input-name", "P7 Button 10"),           input_seq(JOYCODE_BUTTON10_INDEXED(6)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  7, PLAYER7,  BUTTON11,            N_p("input-name", "P7 Button 11"),           input_seq(JOYCODE_BUTTON11_INDEXED(6)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  7, PLAYER7,  BUTTON12,            N_p("input-name", "P7 Button 12"),           input_seq(JOYCODE_BUTTON12_INDEXED(6)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  7, PLAYER7,  BUTTON13,            N_p("input-name", "P7 Button 13"),           input_seq(JOYCODE_BUTTON13_INDEXED(6)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  7, PLAYER7,  BUTTON14,            N_p("input-name", "P7 Button 14"),           input_seq(JOYCODE_BUTTON14_INDEXED(6)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  7, PLAYER7,  BUTTON15,            N_p("input-name", "P7 Button 15"),           input_seq(JOYCODE_BUTTON15_INDEXED(6)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  7, PLAYER7,  BUTTON16,            N_p("input-name", "P7 Button 16"),           input_seq(JOYCODE_BUTTON16_INDEXED(6)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  7, PLAYER7,  START,               N_p("input-name", "P7 Start"),               input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE(  7, PLAYER7,  SELECT,              N_p("input-name", "P7 Select"),              input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  7, PLAYER7,  JOYSTICK_UP,         N_p("input-name", "%p Up"),                  input_seq(JOYCODE_Y_UP_SWITCH_INDEXED(6)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  7, PLAYER7,  JOYSTICK_DOWN,       N_p("input-name", "%p Down"),                input_seq(JOYCODE_Y_DOWN_SWITCH_INDEXED(6)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  7, PLAYER7,  JOYSTICK_LEFT,       N_p("input-name", "%p Left"),                input_seq(JOYCODE_X_LEFT_SWITCH_INDEXED(6)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  7, PLAYER7,  JOYSTICK_RIGHT,      N_p("input-name", "%p Right"),               input_seq(JOYCODE_X_RIGHT_SWITCH_INDEXED(6)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  7, PLAYER7,  JOYSTICKRIGHT_UP,    N_p("input-name", "%p Right Stick/Up"),      input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  7, PLAYER7,  JOYSTICKRIGHT_DOWN,  N_p("input-name", "%p Right Stick/Down"),    input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  7, PLAYER7,  JOYSTICKRIGHT_LEFT,  N_p("input-name", "%p Right Stick/Left"),    input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  7, PLAYER7,  JOYSTICKRIGHT_RIGHT, N_p("input-name", "%p Right Stick/Right"),   input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  7, PLAYER7,  JOYSTICKLEFT_UP,     N_p("input-name", "%p Left Stick/Up"),       input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  7, PLAYER7,  JOYSTICKLEFT_DOWN,   N_p("input-name", "%p Left Stick/Down"),     input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  7, PLAYER7,  JOYSTICKLEFT_LEFT,   N_p("input-name", "%p Left Stick/Left"),     input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  7, PLAYER7,  JOYSTICKLEFT_RIGHT,  N_p("input-name", "%p Left Stick/Right"),    input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  7, PLAYER7,  BUTTON1,             N_p("input-name", "%p Button 1"),            input_seq(JOYCODE_BUTTON1_INDEXED(6)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  7, PLAYER7,  BUTTON2,             N_p("input-name", "%p Button 2"),            input_seq(JOYCODE_BUTTON2_INDEXED(6)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  7, PLAYER7,  BUTTON3,             N_p("input-name", "%p Button 3"),            input_seq(JOYCODE_BUTTON3_INDEXED(6)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  7, PLAYER7,  BUTTON4,             N_p("input-name", "%p Button 4"),            input_seq(JOYCODE_BUTTON4_INDEXED(6)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  7, PLAYER7,  BUTTON5,             N_p("input-name", "%p Button 5"),            input_seq(JOYCODE_BUTTON5_INDEXED(6)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  7, PLAYER7,  BUTTON6,             N_p("input-name", "%p Button 6"),            input_seq(JOYCODE_BUTTON6_INDEXED(6)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  7, PLAYER7,  BUTTON7,             N_p("input-name", "%p Button 7"),            input_seq(JOYCODE_BUTTON7_INDEXED(6)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  7, PLAYER7,  BUTTON8,             N_p("input-name", "%p Button 8"),            input_seq(JOYCODE_BUTTON8_INDEXED(6)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  7, PLAYER7,  BUTTON9,             N_p("input-name", "%p Button 9"),            input_seq(JOYCODE_BUTTON9_INDEXED(6)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  7, PLAYER7,  BUTTON10,            N_p("input-name", "%p Button 10"),           input_seq(JOYCODE_BUTTON10_INDEXED(6)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  7, PLAYER7,  BUTTON11,            N_p("input-name", "%p Button 11"),           input_seq(JOYCODE_BUTTON11_INDEXED(6)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  7, PLAYER7,  BUTTON12,            N_p("input-name", "%p Button 12"),           input_seq(JOYCODE_BUTTON12_INDEXED(6)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  7, PLAYER7,  BUTTON13,            N_p("input-name", "%p Button 13"),           input_seq(JOYCODE_BUTTON13_INDEXED(6)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  7, PLAYER7,  BUTTON14,            N_p("input-name", "%p Button 14"),           input_seq(JOYCODE_BUTTON14_INDEXED(6)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  7, PLAYER7,  BUTTON15,            N_p("input-name", "%p Button 15"),           input_seq(JOYCODE_BUTTON15_INDEXED(6)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  7, PLAYER7,  BUTTON16,            N_p("input-name", "%p Button 16"),           input_seq(JOYCODE_BUTTON16_INDEXED(6)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  7, PLAYER7,  START,               N_p("input-name", "%p Start"),               input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  7, PLAYER7,  SELECT,              N_p("input-name", "%p Select"),              input_seq() ) \
 		CORE_INPUT_TYPES_END()
 
 #define CORE_INPUT_TYPES_P8 \
 		CORE_INPUT_TYPES_BEGIN(p8) \
-		INPUT_PORT_DIGITAL_TYPE(  8, PLAYER8,  JOYSTICK_UP,         N_p("input-name", "P8 Up"),                  input_seq(JOYCODE_Y_UP_SWITCH_INDEXED(7)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  8, PLAYER8,  JOYSTICK_DOWN,       N_p("input-name", "P8 Down"),                input_seq(JOYCODE_Y_DOWN_SWITCH_INDEXED(7)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  8, PLAYER8,  JOYSTICK_LEFT,       N_p("input-name", "P8 Left"),                input_seq(JOYCODE_X_LEFT_SWITCH_INDEXED(7)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  8, PLAYER8,  JOYSTICK_RIGHT,      N_p("input-name", "P8 Right"),               input_seq(JOYCODE_X_RIGHT_SWITCH_INDEXED(7)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  8, PLAYER8,  JOYSTICKRIGHT_UP,    N_p("input-name", "P8 Right Stick/Up"),      input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE(  8, PLAYER8,  JOYSTICKRIGHT_DOWN,  N_p("input-name", "P8 Right Stick/Down"),    input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE(  8, PLAYER8,  JOYSTICKRIGHT_LEFT,  N_p("input-name", "P8 Right Stick/Left"),    input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE(  8, PLAYER8,  JOYSTICKRIGHT_RIGHT, N_p("input-name", "P8 Right Stick/Right"),   input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE(  8, PLAYER8,  JOYSTICKLEFT_UP,     N_p("input-name", "P8 Left Stick/Up"),       input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE(  8, PLAYER8,  JOYSTICKLEFT_DOWN,   N_p("input-name", "P8 Left Stick/Down"),     input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE(  8, PLAYER8,  JOYSTICKLEFT_LEFT,   N_p("input-name", "P8 Left Stick/Left"),     input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE(  8, PLAYER8,  JOYSTICKLEFT_RIGHT,  N_p("input-name", "P8 Left Stick/Right"),    input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE(  8, PLAYER8,  BUTTON1,             N_p("input-name", "P8 Button 1"),            input_seq(JOYCODE_BUTTON1_INDEXED(7)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  8, PLAYER8,  BUTTON2,             N_p("input-name", "P8 Button 2"),            input_seq(JOYCODE_BUTTON2_INDEXED(7)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  8, PLAYER8,  BUTTON3,             N_p("input-name", "P8 Button 3"),            input_seq(JOYCODE_BUTTON3_INDEXED(7)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  8, PLAYER8,  BUTTON4,             N_p("input-name", "P8 Button 4"),            input_seq(JOYCODE_BUTTON4_INDEXED(7)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  8, PLAYER8,  BUTTON5,             N_p("input-name", "P8 Button 5"),            input_seq(JOYCODE_BUTTON5_INDEXED(7)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  8, PLAYER8,  BUTTON6,             N_p("input-name", "P8 Button 6"),            input_seq(JOYCODE_BUTTON6_INDEXED(7)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  8, PLAYER8,  BUTTON7,             N_p("input-name", "P8 Button 7"),            input_seq(JOYCODE_BUTTON7_INDEXED(7)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  8, PLAYER8,  BUTTON8,             N_p("input-name", "P8 Button 8"),            input_seq(JOYCODE_BUTTON8_INDEXED(7)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  8, PLAYER8,  BUTTON9,             N_p("input-name", "P8 Button 9"),            input_seq(JOYCODE_BUTTON9_INDEXED(7)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  8, PLAYER8,  BUTTON10,            N_p("input-name", "P8 Button 10"),           input_seq(JOYCODE_BUTTON10_INDEXED(7)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  8, PLAYER8,  BUTTON11,            N_p("input-name", "P8 Button 11"),           input_seq(JOYCODE_BUTTON11_INDEXED(7)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  8, PLAYER8,  BUTTON12,            N_p("input-name", "P8 Button 12"),           input_seq(JOYCODE_BUTTON12_INDEXED(7)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  8, PLAYER8,  BUTTON13,            N_p("input-name", "P8 Button 13"),           input_seq(JOYCODE_BUTTON13_INDEXED(7)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  8, PLAYER8,  BUTTON14,            N_p("input-name", "P8 Button 14"),           input_seq(JOYCODE_BUTTON14_INDEXED(7)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  8, PLAYER8,  BUTTON15,            N_p("input-name", "P8 Button 15"),           input_seq(JOYCODE_BUTTON15_INDEXED(7)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  8, PLAYER8,  BUTTON16,            N_p("input-name", "P8 Button 16"),           input_seq(JOYCODE_BUTTON16_INDEXED(7)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  8, PLAYER8,  START,               N_p("input-name", "P8 Start"),               input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE(  8, PLAYER8,  SELECT,              N_p("input-name", "P8 Select"),              input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  8, PLAYER8,  JOYSTICK_UP,         N_p("input-name", "%p Up"),                  input_seq(JOYCODE_Y_UP_SWITCH_INDEXED(7)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  8, PLAYER8,  JOYSTICK_DOWN,       N_p("input-name", "%p Down"),                input_seq(JOYCODE_Y_DOWN_SWITCH_INDEXED(7)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  8, PLAYER8,  JOYSTICK_LEFT,       N_p("input-name", "%p Left"),                input_seq(JOYCODE_X_LEFT_SWITCH_INDEXED(7)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  8, PLAYER8,  JOYSTICK_RIGHT,      N_p("input-name", "%p Right"),               input_seq(JOYCODE_X_RIGHT_SWITCH_INDEXED(7)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  8, PLAYER8,  JOYSTICKRIGHT_UP,    N_p("input-name", "%p Right Stick/Up"),      input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  8, PLAYER8,  JOYSTICKRIGHT_DOWN,  N_p("input-name", "%p Right Stick/Down"),    input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  8, PLAYER8,  JOYSTICKRIGHT_LEFT,  N_p("input-name", "%p Right Stick/Left"),    input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  8, PLAYER8,  JOYSTICKRIGHT_RIGHT, N_p("input-name", "%p Right Stick/Right"),   input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  8, PLAYER8,  JOYSTICKLEFT_UP,     N_p("input-name", "%p Left Stick/Up"),       input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  8, PLAYER8,  JOYSTICKLEFT_DOWN,   N_p("input-name", "%p Left Stick/Down"),     input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  8, PLAYER8,  JOYSTICKLEFT_LEFT,   N_p("input-name", "%p Left Stick/Left"),     input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  8, PLAYER8,  JOYSTICKLEFT_RIGHT,  N_p("input-name", "%p Left Stick/Right"),    input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  8, PLAYER8,  BUTTON1,             N_p("input-name", "%p Button 1"),            input_seq(JOYCODE_BUTTON1_INDEXED(7)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  8, PLAYER8,  BUTTON2,             N_p("input-name", "%p Button 2"),            input_seq(JOYCODE_BUTTON2_INDEXED(7)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  8, PLAYER8,  BUTTON3,             N_p("input-name", "%p Button 3"),            input_seq(JOYCODE_BUTTON3_INDEXED(7)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  8, PLAYER8,  BUTTON4,             N_p("input-name", "%p Button 4"),            input_seq(JOYCODE_BUTTON4_INDEXED(7)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  8, PLAYER8,  BUTTON5,             N_p("input-name", "%p Button 5"),            input_seq(JOYCODE_BUTTON5_INDEXED(7)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  8, PLAYER8,  BUTTON6,             N_p("input-name", "%p Button 6"),            input_seq(JOYCODE_BUTTON6_INDEXED(7)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  8, PLAYER8,  BUTTON7,             N_p("input-name", "%p Button 7"),            input_seq(JOYCODE_BUTTON7_INDEXED(7)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  8, PLAYER8,  BUTTON8,             N_p("input-name", "%p Button 8"),            input_seq(JOYCODE_BUTTON8_INDEXED(7)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  8, PLAYER8,  BUTTON9,             N_p("input-name", "%p Button 9"),            input_seq(JOYCODE_BUTTON9_INDEXED(7)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  8, PLAYER8,  BUTTON10,            N_p("input-name", "%p Button 10"),           input_seq(JOYCODE_BUTTON10_INDEXED(7)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  8, PLAYER8,  BUTTON11,            N_p("input-name", "%p Button 11"),           input_seq(JOYCODE_BUTTON11_INDEXED(7)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  8, PLAYER8,  BUTTON12,            N_p("input-name", "%p Button 12"),           input_seq(JOYCODE_BUTTON12_INDEXED(7)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  8, PLAYER8,  BUTTON13,            N_p("input-name", "%p Button 13"),           input_seq(JOYCODE_BUTTON13_INDEXED(7)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  8, PLAYER8,  BUTTON14,            N_p("input-name", "%p Button 14"),           input_seq(JOYCODE_BUTTON14_INDEXED(7)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  8, PLAYER8,  BUTTON15,            N_p("input-name", "%p Button 15"),           input_seq(JOYCODE_BUTTON15_INDEXED(7)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  8, PLAYER8,  BUTTON16,            N_p("input-name", "%p Button 16"),           input_seq(JOYCODE_BUTTON16_INDEXED(7)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  8, PLAYER8,  START,               N_p("input-name", "%p Start"),               input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  8, PLAYER8,  SELECT,              N_p("input-name", "%p Select"),              input_seq() ) \
 		CORE_INPUT_TYPES_END()
 
 #define CORE_INPUT_TYPES_P9 \
 		CORE_INPUT_TYPES_BEGIN(p9) \
-		INPUT_PORT_DIGITAL_TYPE(  9, PLAYER9,  JOYSTICK_UP,         N_p("input-name", "P9 Up"),                  input_seq(JOYCODE_Y_UP_SWITCH_INDEXED(8)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  9, PLAYER9,  JOYSTICK_DOWN,       N_p("input-name", "P9 Down"),                input_seq(JOYCODE_Y_DOWN_SWITCH_INDEXED(8)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  9, PLAYER9,  JOYSTICK_LEFT,       N_p("input-name", "P9 Left"),                input_seq(JOYCODE_X_LEFT_SWITCH_INDEXED(8)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  9, PLAYER9,  JOYSTICK_RIGHT,      N_p("input-name", "P9 Right"),               input_seq(JOYCODE_X_RIGHT_SWITCH_INDEXED(8)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  9, PLAYER9,  JOYSTICKRIGHT_UP,    N_p("input-name", "P9 Right Stick/Up"),      input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE(  9, PLAYER9,  JOYSTICKRIGHT_DOWN,  N_p("input-name", "P9 Right Stick/Down"),    input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE(  9, PLAYER9,  JOYSTICKRIGHT_LEFT,  N_p("input-name", "P9 Right Stick/Left"),    input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE(  9, PLAYER9,  JOYSTICKRIGHT_RIGHT, N_p("input-name", "P9 Right Stick/Right"),   input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE(  9, PLAYER9,  JOYSTICKLEFT_UP,     N_p("input-name", "P9 Left Stick/Up"),       input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE(  9, PLAYER9,  JOYSTICKLEFT_DOWN,   N_p("input-name", "P9 Left Stick/Down"),     input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE(  9, PLAYER9,  JOYSTICKLEFT_LEFT,   N_p("input-name", "P9 Left Stick/Left"),     input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE(  9, PLAYER9,  JOYSTICKLEFT_RIGHT,  N_p("input-name", "P9 Left Stick/Right"),    input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE(  9, PLAYER9,  BUTTON1,             N_p("input-name", "P9 Button 1"),            input_seq(JOYCODE_BUTTON1_INDEXED(8)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  9, PLAYER9,  BUTTON2,             N_p("input-name", "P9 Button 2"),            input_seq(JOYCODE_BUTTON2_INDEXED(8)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  9, PLAYER9,  BUTTON3,             N_p("input-name", "P9 Button 3"),            input_seq(JOYCODE_BUTTON3_INDEXED(8)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  9, PLAYER9,  BUTTON4,             N_p("input-name", "P9 Button 4"),            input_seq(JOYCODE_BUTTON4_INDEXED(8)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  9, PLAYER9,  BUTTON5,             N_p("input-name", "P9 Button 5"),            input_seq(JOYCODE_BUTTON5_INDEXED(8)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  9, PLAYER9,  BUTTON6,             N_p("input-name", "P9 Button 6"),            input_seq(JOYCODE_BUTTON6_INDEXED(8)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  9, PLAYER9,  BUTTON7,             N_p("input-name", "P9 Button 7"),            input_seq(JOYCODE_BUTTON7_INDEXED(8)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  9, PLAYER9,  BUTTON8,             N_p("input-name", "P9 Button 8"),            input_seq(JOYCODE_BUTTON8_INDEXED(8)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  9, PLAYER9,  BUTTON9,             N_p("input-name", "P9 Button 9"),            input_seq(JOYCODE_BUTTON9_INDEXED(8)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  9, PLAYER9,  BUTTON10,            N_p("input-name", "P9 Button 10"),           input_seq(JOYCODE_BUTTON10_INDEXED(8)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  9, PLAYER9,  BUTTON11,            N_p("input-name", "P9 Button 11"),           input_seq(JOYCODE_BUTTON11_INDEXED(8)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  9, PLAYER9,  BUTTON12,            N_p("input-name", "P9 Button 12"),           input_seq(JOYCODE_BUTTON12_INDEXED(8)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  9, PLAYER9,  BUTTON13,            N_p("input-name", "P9 Button 13"),           input_seq(JOYCODE_BUTTON13_INDEXED(8)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  9, PLAYER9,  BUTTON14,            N_p("input-name", "P9 Button 14"),           input_seq(JOYCODE_BUTTON14_INDEXED(8)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  9, PLAYER9,  BUTTON15,            N_p("input-name", "P9 Button 15"),           input_seq(JOYCODE_BUTTON15_INDEXED(8)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  9, PLAYER9,  BUTTON16,            N_p("input-name", "P9 Button 16"),           input_seq(JOYCODE_BUTTON16_INDEXED(8)) ) \
-		INPUT_PORT_DIGITAL_TYPE(  9, PLAYER9,  START,               N_p("input-name", "P9 Start"),               input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE(  9, PLAYER9,  SELECT,              N_p("input-name", "P9 Select"),              input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  9, PLAYER9,  JOYSTICK_UP,         N_p("input-name", "%p Up"),                  input_seq(JOYCODE_Y_UP_SWITCH_INDEXED(8)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  9, PLAYER9,  JOYSTICK_DOWN,       N_p("input-name", "%p Down"),                input_seq(JOYCODE_Y_DOWN_SWITCH_INDEXED(8)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  9, PLAYER9,  JOYSTICK_LEFT,       N_p("input-name", "%p Left"),                input_seq(JOYCODE_X_LEFT_SWITCH_INDEXED(8)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  9, PLAYER9,  JOYSTICK_RIGHT,      N_p("input-name", "%p Right"),               input_seq(JOYCODE_X_RIGHT_SWITCH_INDEXED(8)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  9, PLAYER9,  JOYSTICKRIGHT_UP,    N_p("input-name", "%p Right Stick/Up"),      input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  9, PLAYER9,  JOYSTICKRIGHT_DOWN,  N_p("input-name", "%p Right Stick/Down"),    input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  9, PLAYER9,  JOYSTICKRIGHT_LEFT,  N_p("input-name", "%p Right Stick/Left"),    input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  9, PLAYER9,  JOYSTICKRIGHT_RIGHT, N_p("input-name", "%p Right Stick/Right"),   input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  9, PLAYER9,  JOYSTICKLEFT_UP,     N_p("input-name", "%p Left Stick/Up"),       input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  9, PLAYER9,  JOYSTICKLEFT_DOWN,   N_p("input-name", "%p Left Stick/Down"),     input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  9, PLAYER9,  JOYSTICKLEFT_LEFT,   N_p("input-name", "%p Left Stick/Left"),     input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  9, PLAYER9,  JOYSTICKLEFT_RIGHT,  N_p("input-name", "%p Left Stick/Right"),    input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  9, PLAYER9,  BUTTON1,             N_p("input-name", "%p Button 1"),            input_seq(JOYCODE_BUTTON1_INDEXED(8)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  9, PLAYER9,  BUTTON2,             N_p("input-name", "%p Button 2"),            input_seq(JOYCODE_BUTTON2_INDEXED(8)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  9, PLAYER9,  BUTTON3,             N_p("input-name", "%p Button 3"),            input_seq(JOYCODE_BUTTON3_INDEXED(8)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  9, PLAYER9,  BUTTON4,             N_p("input-name", "%p Button 4"),            input_seq(JOYCODE_BUTTON4_INDEXED(8)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  9, PLAYER9,  BUTTON5,             N_p("input-name", "%p Button 5"),            input_seq(JOYCODE_BUTTON5_INDEXED(8)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  9, PLAYER9,  BUTTON6,             N_p("input-name", "%p Button 6"),            input_seq(JOYCODE_BUTTON6_INDEXED(8)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  9, PLAYER9,  BUTTON7,             N_p("input-name", "%p Button 7"),            input_seq(JOYCODE_BUTTON7_INDEXED(8)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  9, PLAYER9,  BUTTON8,             N_p("input-name", "%p Button 8"),            input_seq(JOYCODE_BUTTON8_INDEXED(8)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  9, PLAYER9,  BUTTON9,             N_p("input-name", "%p Button 9"),            input_seq(JOYCODE_BUTTON9_INDEXED(8)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  9, PLAYER9,  BUTTON10,            N_p("input-name", "%p Button 10"),           input_seq(JOYCODE_BUTTON10_INDEXED(8)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  9, PLAYER9,  BUTTON11,            N_p("input-name", "%p Button 11"),           input_seq(JOYCODE_BUTTON11_INDEXED(8)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  9, PLAYER9,  BUTTON12,            N_p("input-name", "%p Button 12"),           input_seq(JOYCODE_BUTTON12_INDEXED(8)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  9, PLAYER9,  BUTTON13,            N_p("input-name", "%p Button 13"),           input_seq(JOYCODE_BUTTON13_INDEXED(8)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  9, PLAYER9,  BUTTON14,            N_p("input-name", "%p Button 14"),           input_seq(JOYCODE_BUTTON14_INDEXED(8)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  9, PLAYER9,  BUTTON15,            N_p("input-name", "%p Button 15"),           input_seq(JOYCODE_BUTTON15_INDEXED(8)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  9, PLAYER9,  BUTTON16,            N_p("input-name", "%p Button 16"),           input_seq(JOYCODE_BUTTON16_INDEXED(8)) ) \
+		INPUT_PORT_DIGITAL_TYPE(  9, PLAYER9,  START,               N_p("input-name", "%p Start"),               input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE(  9, PLAYER9,  SELECT,              N_p("input-name", "%p Select"),              input_seq() ) \
 		CORE_INPUT_TYPES_END()
 
 #define CORE_INPUT_TYPES_P10 \
 		CORE_INPUT_TYPES_BEGIN(p10) \
-		INPUT_PORT_DIGITAL_TYPE( 10, PLAYER10, JOYSTICK_UP,         N_p("input-name", "P10 Up"),                  input_seq(JOYCODE_Y_UP_SWITCH_INDEXED(9)) ) \
-		INPUT_PORT_DIGITAL_TYPE( 10, PLAYER10, JOYSTICK_DOWN,       N_p("input-name", "P10 Down"),                input_seq(JOYCODE_Y_DOWN_SWITCH_INDEXED(9)) ) \
-		INPUT_PORT_DIGITAL_TYPE( 10, PLAYER10, JOYSTICK_LEFT,       N_p("input-name", "P10 Left"),                input_seq(JOYCODE_X_LEFT_SWITCH_INDEXED(9)) ) \
-		INPUT_PORT_DIGITAL_TYPE( 10, PLAYER10, JOYSTICK_RIGHT,      N_p("input-name", "P10 Right"),               input_seq(JOYCODE_X_RIGHT_SWITCH_INDEXED(9)) ) \
-		INPUT_PORT_DIGITAL_TYPE( 10, PLAYER10, JOYSTICKRIGHT_UP,    N_p("input-name", "P10 Right Stick/Up"),      input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE( 10, PLAYER10, JOYSTICKRIGHT_DOWN,  N_p("input-name", "P10 Right Stick/Down"),    input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE( 10, PLAYER10, JOYSTICKRIGHT_LEFT,  N_p("input-name", "P10 Right Stick/Left"),    input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE( 10, PLAYER10, JOYSTICKRIGHT_RIGHT, N_p("input-name", "P10 Right Stick/Right"),   input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE( 10, PLAYER10, JOYSTICKLEFT_UP,     N_p("input-name", "P10 Left Stick/Up"),       input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE( 10, PLAYER10, JOYSTICKLEFT_DOWN,   N_p("input-name", "P10 Left Stick/Down"),     input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE( 10, PLAYER10, JOYSTICKLEFT_LEFT,   N_p("input-name", "P10 Left Stick/Left"),     input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE( 10, PLAYER10, JOYSTICKLEFT_RIGHT,  N_p("input-name", "P10 Left Stick/Right"),    input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE( 10, PLAYER10, BUTTON1,             N_p("input-name", "P10 Button 1"),            input_seq(JOYCODE_BUTTON1_INDEXED(9)) ) \
-		INPUT_PORT_DIGITAL_TYPE( 10, PLAYER10, BUTTON2,             N_p("input-name", "P10 Button 2"),            input_seq(JOYCODE_BUTTON2_INDEXED(9)) ) \
-		INPUT_PORT_DIGITAL_TYPE( 10, PLAYER10, BUTTON3,             N_p("input-name", "P10 Button 3"),            input_seq(JOYCODE_BUTTON3_INDEXED(9)) ) \
-		INPUT_PORT_DIGITAL_TYPE( 10, PLAYER10, BUTTON4,             N_p("input-name", "P10 Button 4"),            input_seq(JOYCODE_BUTTON4_INDEXED(9)) ) \
-		INPUT_PORT_DIGITAL_TYPE( 10, PLAYER10, BUTTON5,             N_p("input-name", "P10 Button 5"),            input_seq(JOYCODE_BUTTON5_INDEXED(9)) ) \
-		INPUT_PORT_DIGITAL_TYPE( 10, PLAYER10, BUTTON6,             N_p("input-name", "P10 Button 6"),            input_seq(JOYCODE_BUTTON6_INDEXED(9)) ) \
-		INPUT_PORT_DIGITAL_TYPE( 10, PLAYER10, BUTTON7,             N_p("input-name", "P10 Button 7"),            input_seq(JOYCODE_BUTTON7_INDEXED(9)) ) \
-		INPUT_PORT_DIGITAL_TYPE( 10, PLAYER10, BUTTON8,             N_p("input-name", "P10 Button 8"),            input_seq(JOYCODE_BUTTON8_INDEXED(9)) ) \
-		INPUT_PORT_DIGITAL_TYPE( 10, PLAYER10, BUTTON9,             N_p("input-name", "P10 Button 9"),            input_seq(JOYCODE_BUTTON9_INDEXED(9)) ) \
-		INPUT_PORT_DIGITAL_TYPE( 10, PLAYER10, BUTTON10,            N_p("input-name", "P10 Button 10"),           input_seq(JOYCODE_BUTTON10_INDEXED(9)) ) \
-		INPUT_PORT_DIGITAL_TYPE( 10, PLAYER10, BUTTON11,            N_p("input-name", "P10 Button 11"),           input_seq(JOYCODE_BUTTON11_INDEXED(9)) ) \
-		INPUT_PORT_DIGITAL_TYPE( 10, PLAYER10, BUTTON12,            N_p("input-name", "P10 Button 12"),           input_seq(JOYCODE_BUTTON12_INDEXED(9)) ) \
-		INPUT_PORT_DIGITAL_TYPE( 10, PLAYER10, BUTTON13,            N_p("input-name", "P10 Button 13"),           input_seq(JOYCODE_BUTTON13_INDEXED(9)) ) \
-		INPUT_PORT_DIGITAL_TYPE( 10, PLAYER10, BUTTON14,            N_p("input-name", "P10 Button 14"),           input_seq(JOYCODE_BUTTON14_INDEXED(9)) ) \
-		INPUT_PORT_DIGITAL_TYPE( 10, PLAYER10, BUTTON15,            N_p("input-name", "P10 Button 15"),           input_seq(JOYCODE_BUTTON15_INDEXED(9)) ) \
-		INPUT_PORT_DIGITAL_TYPE( 10, PLAYER10, BUTTON16,            N_p("input-name", "P10 Button 16"),           input_seq(JOYCODE_BUTTON16_INDEXED(9)) ) \
-		INPUT_PORT_DIGITAL_TYPE( 10, PLAYER10, START,               N_p("input-name", "P10 Start"),               input_seq() ) \
-		INPUT_PORT_DIGITAL_TYPE( 10, PLAYER10, SELECT,              N_p("input-name", "P10 Select"),              input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE( 10, PLAYER10, JOYSTICK_UP,         N_p("input-name", "%p Up"),                  input_seq(JOYCODE_Y_UP_SWITCH_INDEXED(9)) ) \
+		INPUT_PORT_DIGITAL_TYPE( 10, PLAYER10, JOYSTICK_DOWN,       N_p("input-name", "%p Down"),                input_seq(JOYCODE_Y_DOWN_SWITCH_INDEXED(9)) ) \
+		INPUT_PORT_DIGITAL_TYPE( 10, PLAYER10, JOYSTICK_LEFT,       N_p("input-name", "%p Left"),                input_seq(JOYCODE_X_LEFT_SWITCH_INDEXED(9)) ) \
+		INPUT_PORT_DIGITAL_TYPE( 10, PLAYER10, JOYSTICK_RIGHT,      N_p("input-name", "%p Right"),               input_seq(JOYCODE_X_RIGHT_SWITCH_INDEXED(9)) ) \
+		INPUT_PORT_DIGITAL_TYPE( 10, PLAYER10, JOYSTICKRIGHT_UP,    N_p("input-name", "%p Right Stick/Up"),      input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE( 10, PLAYER10, JOYSTICKRIGHT_DOWN,  N_p("input-name", "%p Right Stick/Down"),    input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE( 10, PLAYER10, JOYSTICKRIGHT_LEFT,  N_p("input-name", "%p Right Stick/Left"),    input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE( 10, PLAYER10, JOYSTICKRIGHT_RIGHT, N_p("input-name", "%p Right Stick/Right"),   input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE( 10, PLAYER10, JOYSTICKLEFT_UP,     N_p("input-name", "%p Left Stick/Up"),       input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE( 10, PLAYER10, JOYSTICKLEFT_DOWN,   N_p("input-name", "%p Left Stick/Down"),     input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE( 10, PLAYER10, JOYSTICKLEFT_LEFT,   N_p("input-name", "%p Left Stick/Left"),     input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE( 10, PLAYER10, JOYSTICKLEFT_RIGHT,  N_p("input-name", "%p Left Stick/Right"),    input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE( 10, PLAYER10, BUTTON1,             N_p("input-name", "%p Button 1"),            input_seq(JOYCODE_BUTTON1_INDEXED(9)) ) \
+		INPUT_PORT_DIGITAL_TYPE( 10, PLAYER10, BUTTON2,             N_p("input-name", "%p Button 2"),            input_seq(JOYCODE_BUTTON2_INDEXED(9)) ) \
+		INPUT_PORT_DIGITAL_TYPE( 10, PLAYER10, BUTTON3,             N_p("input-name", "%p Button 3"),            input_seq(JOYCODE_BUTTON3_INDEXED(9)) ) \
+		INPUT_PORT_DIGITAL_TYPE( 10, PLAYER10, BUTTON4,             N_p("input-name", "%p Button 4"),            input_seq(JOYCODE_BUTTON4_INDEXED(9)) ) \
+		INPUT_PORT_DIGITAL_TYPE( 10, PLAYER10, BUTTON5,             N_p("input-name", "%p Button 5"),            input_seq(JOYCODE_BUTTON5_INDEXED(9)) ) \
+		INPUT_PORT_DIGITAL_TYPE( 10, PLAYER10, BUTTON6,             N_p("input-name", "%p Button 6"),            input_seq(JOYCODE_BUTTON6_INDEXED(9)) ) \
+		INPUT_PORT_DIGITAL_TYPE( 10, PLAYER10, BUTTON7,             N_p("input-name", "%p Button 7"),            input_seq(JOYCODE_BUTTON7_INDEXED(9)) ) \
+		INPUT_PORT_DIGITAL_TYPE( 10, PLAYER10, BUTTON8,             N_p("input-name", "%p Button 8"),            input_seq(JOYCODE_BUTTON8_INDEXED(9)) ) \
+		INPUT_PORT_DIGITAL_TYPE( 10, PLAYER10, BUTTON9,             N_p("input-name", "%p Button 9"),            input_seq(JOYCODE_BUTTON9_INDEXED(9)) ) \
+		INPUT_PORT_DIGITAL_TYPE( 10, PLAYER10, BUTTON10,            N_p("input-name", "%p Button 10"),           input_seq(JOYCODE_BUTTON10_INDEXED(9)) ) \
+		INPUT_PORT_DIGITAL_TYPE( 10, PLAYER10, BUTTON11,            N_p("input-name", "%p Button 11"),           input_seq(JOYCODE_BUTTON11_INDEXED(9)) ) \
+		INPUT_PORT_DIGITAL_TYPE( 10, PLAYER10, BUTTON12,            N_p("input-name", "%p Button 12"),           input_seq(JOYCODE_BUTTON12_INDEXED(9)) ) \
+		INPUT_PORT_DIGITAL_TYPE( 10, PLAYER10, BUTTON13,            N_p("input-name", "%p Button 13"),           input_seq(JOYCODE_BUTTON13_INDEXED(9)) ) \
+		INPUT_PORT_DIGITAL_TYPE( 10, PLAYER10, BUTTON14,            N_p("input-name", "%p Button 14"),           input_seq(JOYCODE_BUTTON14_INDEXED(9)) ) \
+		INPUT_PORT_DIGITAL_TYPE( 10, PLAYER10, BUTTON15,            N_p("input-name", "%p Button 15"),           input_seq(JOYCODE_BUTTON15_INDEXED(9)) ) \
+		INPUT_PORT_DIGITAL_TYPE( 10, PLAYER10, BUTTON16,            N_p("input-name", "%p Button 16"),           input_seq(JOYCODE_BUTTON16_INDEXED(9)) ) \
+		INPUT_PORT_DIGITAL_TYPE( 10, PLAYER10, START,               N_p("input-name", "%p Start"),               input_seq() ) \
+		INPUT_PORT_DIGITAL_TYPE( 10, PLAYER10, SELECT,              N_p("input-name", "%p Select"),              input_seq() ) \
 		CORE_INPUT_TYPES_END()
 
 #define CORE_INPUT_TYPES_START \
@@ -547,44 +547,44 @@ namespace {
 
 #define CORE_INPUT_TYPES_PEDAL \
 		CORE_INPUT_TYPES_BEGIN(pedal) \
-		INPUT_PORT_ANALOG_TYPE(   1, PLAYER1,  PEDAL,               N_p("input-name", "P1 Pedal 1"),             input_seq(JOYCODE_Z_NEG_ABSOLUTE_INDEXED(0)), input_seq(), input_seq(KEYCODE_LCONTROL, input_seq::or_code, JOYCODE_BUTTON1_INDEXED(0)) ) \
-		INPUT_PORT_ANALOG_TYPE(   2, PLAYER2,  PEDAL,               N_p("input-name", "P2 Pedal 1"),             input_seq(JOYCODE_Z_NEG_ABSOLUTE_INDEXED(1)), input_seq(), input_seq(KEYCODE_A, input_seq::or_code, JOYCODE_BUTTON1_INDEXED(1)) ) \
-		INPUT_PORT_ANALOG_TYPE(   3, PLAYER3,  PEDAL,               N_p("input-name", "P3 Pedal 1"),             input_seq(JOYCODE_Z_NEG_ABSOLUTE_INDEXED(2)), input_seq(), input_seq(KEYCODE_RCONTROL, input_seq::or_code, JOYCODE_BUTTON1_INDEXED(2)) ) \
-		INPUT_PORT_ANALOG_TYPE(   4, PLAYER4,  PEDAL,               N_p("input-name", "P4 Pedal 1"),             input_seq(JOYCODE_Z_NEG_ABSOLUTE_INDEXED(3)), input_seq(), input_seq(KEYCODE_0_PAD, input_seq::or_code, JOYCODE_BUTTON1_INDEXED(3)) ) \
-		INPUT_PORT_ANALOG_TYPE(   5, PLAYER5,  PEDAL,               N_p("input-name", "P5 Pedal 1"),             input_seq(JOYCODE_Z_NEG_ABSOLUTE_INDEXED(4)), input_seq(), input_seq(JOYCODE_BUTTON1_INDEXED(4)) ) \
-		INPUT_PORT_ANALOG_TYPE(   6, PLAYER6,  PEDAL,               N_p("input-name", "P6 Pedal 1"),             input_seq(JOYCODE_Z_NEG_ABSOLUTE_INDEXED(5)), input_seq(), input_seq(JOYCODE_BUTTON1_INDEXED(5)) ) \
-		INPUT_PORT_ANALOG_TYPE(   7, PLAYER7,  PEDAL,               N_p("input-name", "P7 Pedal 1"),             input_seq(JOYCODE_Z_NEG_ABSOLUTE_INDEXED(6)), input_seq(), input_seq(JOYCODE_BUTTON1_INDEXED(6)) ) \
-		INPUT_PORT_ANALOG_TYPE(   8, PLAYER8,  PEDAL,               N_p("input-name", "P8 Pedal 1"),             input_seq(JOYCODE_Z_NEG_ABSOLUTE_INDEXED(7)), input_seq(), input_seq(JOYCODE_BUTTON1_INDEXED(7)) ) \
-		INPUT_PORT_ANALOG_TYPE(   9, PLAYER9,  PEDAL,               N_p("input-name", "P9 Pedal 1"),             input_seq(JOYCODE_Z_NEG_ABSOLUTE_INDEXED(8)), input_seq(), input_seq(JOYCODE_BUTTON1_INDEXED(8)) ) \
-		INPUT_PORT_ANALOG_TYPE(  10, PLAYER10, PEDAL,               N_p("input-name", "P10 Pedal 1"),            input_seq(JOYCODE_Z_NEG_ABSOLUTE_INDEXED(9)), input_seq(), input_seq(JOYCODE_BUTTON1_INDEXED(9)) ) \
+		INPUT_PORT_ANALOG_TYPE(   1, PLAYER1,  PEDAL,               N_p("input-name", "%p Pedal 1"),             input_seq(JOYCODE_Z_NEG_ABSOLUTE_INDEXED(0)), input_seq(), input_seq(KEYCODE_LCONTROL, input_seq::or_code, JOYCODE_BUTTON1_INDEXED(0)) ) \
+		INPUT_PORT_ANALOG_TYPE(   2, PLAYER2,  PEDAL,               N_p("input-name", "%p Pedal 1"),             input_seq(JOYCODE_Z_NEG_ABSOLUTE_INDEXED(1)), input_seq(), input_seq(KEYCODE_A, input_seq::or_code, JOYCODE_BUTTON1_INDEXED(1)) ) \
+		INPUT_PORT_ANALOG_TYPE(   3, PLAYER3,  PEDAL,               N_p("input-name", "%p Pedal 1"),             input_seq(JOYCODE_Z_NEG_ABSOLUTE_INDEXED(2)), input_seq(), input_seq(KEYCODE_RCONTROL, input_seq::or_code, JOYCODE_BUTTON1_INDEXED(2)) ) \
+		INPUT_PORT_ANALOG_TYPE(   4, PLAYER4,  PEDAL,               N_p("input-name", "%p Pedal 1"),             input_seq(JOYCODE_Z_NEG_ABSOLUTE_INDEXED(3)), input_seq(), input_seq(KEYCODE_0_PAD, input_seq::or_code, JOYCODE_BUTTON1_INDEXED(3)) ) \
+		INPUT_PORT_ANALOG_TYPE(   5, PLAYER5,  PEDAL,               N_p("input-name", "%p Pedal 1"),             input_seq(JOYCODE_Z_NEG_ABSOLUTE_INDEXED(4)), input_seq(), input_seq(JOYCODE_BUTTON1_INDEXED(4)) ) \
+		INPUT_PORT_ANALOG_TYPE(   6, PLAYER6,  PEDAL,               N_p("input-name", "%p Pedal 1"),             input_seq(JOYCODE_Z_NEG_ABSOLUTE_INDEXED(5)), input_seq(), input_seq(JOYCODE_BUTTON1_INDEXED(5)) ) \
+		INPUT_PORT_ANALOG_TYPE(   7, PLAYER7,  PEDAL,               N_p("input-name", "%p Pedal 1"),             input_seq(JOYCODE_Z_NEG_ABSOLUTE_INDEXED(6)), input_seq(), input_seq(JOYCODE_BUTTON1_INDEXED(6)) ) \
+		INPUT_PORT_ANALOG_TYPE(   8, PLAYER8,  PEDAL,               N_p("input-name", "%p Pedal 1"),             input_seq(JOYCODE_Z_NEG_ABSOLUTE_INDEXED(7)), input_seq(), input_seq(JOYCODE_BUTTON1_INDEXED(7)) ) \
+		INPUT_PORT_ANALOG_TYPE(   9, PLAYER9,  PEDAL,               N_p("input-name", "%p Pedal 1"),             input_seq(JOYCODE_Z_NEG_ABSOLUTE_INDEXED(8)), input_seq(), input_seq(JOYCODE_BUTTON1_INDEXED(8)) ) \
+		INPUT_PORT_ANALOG_TYPE(  10, PLAYER10, PEDAL,               N_p("input-name", "%p Pedal 1"),             input_seq(JOYCODE_Z_NEG_ABSOLUTE_INDEXED(9)), input_seq(), input_seq(JOYCODE_BUTTON1_INDEXED(9)) ) \
 		CORE_INPUT_TYPES_END()
 
 #define CORE_INPUT_TYPES_PEDAL2 \
 		CORE_INPUT_TYPES_BEGIN(pedal2) \
-		INPUT_PORT_ANALOG_TYPE(   1, PLAYER1,  PEDAL2,              N_p("input-name", "P1 Pedal 2"),             input_seq(JOYCODE_W_NEG_ABSOLUTE_INDEXED(0)), input_seq(), input_seq(KEYCODE_LALT, input_seq::or_code, JOYCODE_BUTTON2_INDEXED(0)) ) \
-		INPUT_PORT_ANALOG_TYPE(   2, PLAYER2,  PEDAL2,              N_p("input-name", "P2 Pedal 2"),             input_seq(JOYCODE_W_NEG_ABSOLUTE_INDEXED(1)), input_seq(), input_seq(KEYCODE_S, input_seq::or_code, JOYCODE_BUTTON2_INDEXED(1)) ) \
-		INPUT_PORT_ANALOG_TYPE(   3, PLAYER3,  PEDAL2,              N_p("input-name", "P3 Pedal 2"),             input_seq(JOYCODE_W_NEG_ABSOLUTE_INDEXED(2)), input_seq(), input_seq(KEYCODE_RSHIFT, input_seq::or_code, JOYCODE_BUTTON2_INDEXED(2)) ) \
-		INPUT_PORT_ANALOG_TYPE(   4, PLAYER4,  PEDAL2,              N_p("input-name", "P4 Pedal 2"),             input_seq(JOYCODE_W_NEG_ABSOLUTE_INDEXED(3)), input_seq(), input_seq(KEYCODE_DEL_PAD, input_seq::or_code, JOYCODE_BUTTON2_INDEXED(3)) ) \
-		INPUT_PORT_ANALOG_TYPE(   5, PLAYER5,  PEDAL2,              N_p("input-name", "P5 Pedal 2"),             input_seq(JOYCODE_W_NEG_ABSOLUTE_INDEXED(4)), input_seq(), input_seq(JOYCODE_BUTTON2_INDEXED(4)) ) \
-		INPUT_PORT_ANALOG_TYPE(   6, PLAYER6,  PEDAL2,              N_p("input-name", "P6 Pedal 2"),             input_seq(JOYCODE_W_NEG_ABSOLUTE_INDEXED(5)), input_seq(), input_seq(JOYCODE_BUTTON2_INDEXED(5)) ) \
-		INPUT_PORT_ANALOG_TYPE(   7, PLAYER7,  PEDAL2,              N_p("input-name", "P7 Pedal 2"),             input_seq(JOYCODE_W_NEG_ABSOLUTE_INDEXED(6)), input_seq(), input_seq(JOYCODE_BUTTON2_INDEXED(6)) ) \
-		INPUT_PORT_ANALOG_TYPE(   8, PLAYER8,  PEDAL2,              N_p("input-name", "P8 Pedal 2"),             input_seq(JOYCODE_W_NEG_ABSOLUTE_INDEXED(7)), input_seq(), input_seq(JOYCODE_BUTTON2_INDEXED(7)) ) \
-		INPUT_PORT_ANALOG_TYPE(   9, PLAYER9,  PEDAL2,              N_p("input-name", "P9 Pedal 2"),             input_seq(JOYCODE_W_NEG_ABSOLUTE_INDEXED(8)), input_seq(), input_seq(JOYCODE_BUTTON2_INDEXED(8)) ) \
-		INPUT_PORT_ANALOG_TYPE(  10, PLAYER10, PEDAL2,              N_p("input-name", "P10 Pedal 2"),            input_seq(JOYCODE_W_NEG_ABSOLUTE_INDEXED(9)), input_seq(), input_seq(JOYCODE_BUTTON2_INDEXED(9)) ) \
+		INPUT_PORT_ANALOG_TYPE(   1, PLAYER1,  PEDAL2,              N_p("input-name", "%p Pedal 2"),             input_seq(JOYCODE_W_NEG_ABSOLUTE_INDEXED(0)), input_seq(), input_seq(KEYCODE_LALT, input_seq::or_code, JOYCODE_BUTTON2_INDEXED(0)) ) \
+		INPUT_PORT_ANALOG_TYPE(   2, PLAYER2,  PEDAL2,              N_p("input-name", "%p Pedal 2"),             input_seq(JOYCODE_W_NEG_ABSOLUTE_INDEXED(1)), input_seq(), input_seq(KEYCODE_S, input_seq::or_code, JOYCODE_BUTTON2_INDEXED(1)) ) \
+		INPUT_PORT_ANALOG_TYPE(   3, PLAYER3,  PEDAL2,              N_p("input-name", "%p Pedal 2"),             input_seq(JOYCODE_W_NEG_ABSOLUTE_INDEXED(2)), input_seq(), input_seq(KEYCODE_RSHIFT, input_seq::or_code, JOYCODE_BUTTON2_INDEXED(2)) ) \
+		INPUT_PORT_ANALOG_TYPE(   4, PLAYER4,  PEDAL2,              N_p("input-name", "%p Pedal 2"),             input_seq(JOYCODE_W_NEG_ABSOLUTE_INDEXED(3)), input_seq(), input_seq(KEYCODE_DEL_PAD, input_seq::or_code, JOYCODE_BUTTON2_INDEXED(3)) ) \
+		INPUT_PORT_ANALOG_TYPE(   5, PLAYER5,  PEDAL2,              N_p("input-name", "%p Pedal 2"),             input_seq(JOYCODE_W_NEG_ABSOLUTE_INDEXED(4)), input_seq(), input_seq(JOYCODE_BUTTON2_INDEXED(4)) ) \
+		INPUT_PORT_ANALOG_TYPE(   6, PLAYER6,  PEDAL2,              N_p("input-name", "%p Pedal 2"),             input_seq(JOYCODE_W_NEG_ABSOLUTE_INDEXED(5)), input_seq(), input_seq(JOYCODE_BUTTON2_INDEXED(5)) ) \
+		INPUT_PORT_ANALOG_TYPE(   7, PLAYER7,  PEDAL2,              N_p("input-name", "%p Pedal 2"),             input_seq(JOYCODE_W_NEG_ABSOLUTE_INDEXED(6)), input_seq(), input_seq(JOYCODE_BUTTON2_INDEXED(6)) ) \
+		INPUT_PORT_ANALOG_TYPE(   8, PLAYER8,  PEDAL2,              N_p("input-name", "%p Pedal 2"),             input_seq(JOYCODE_W_NEG_ABSOLUTE_INDEXED(7)), input_seq(), input_seq(JOYCODE_BUTTON2_INDEXED(7)) ) \
+		INPUT_PORT_ANALOG_TYPE(   9, PLAYER9,  PEDAL2,              N_p("input-name", "%p Pedal 2"),             input_seq(JOYCODE_W_NEG_ABSOLUTE_INDEXED(8)), input_seq(), input_seq(JOYCODE_BUTTON2_INDEXED(8)) ) \
+		INPUT_PORT_ANALOG_TYPE(  10, PLAYER10, PEDAL2,              N_p("input-name", "%p Pedal 2"),             input_seq(JOYCODE_W_NEG_ABSOLUTE_INDEXED(9)), input_seq(), input_seq(JOYCODE_BUTTON2_INDEXED(9)) ) \
 		CORE_INPUT_TYPES_END()
 
 #define CORE_INPUT_TYPES_PEDAL3 \
 		CORE_INPUT_TYPES_BEGIN(pedal3) \
-		INPUT_PORT_ANALOG_TYPE(   1, PLAYER1,  PEDAL3,              N_p("input-name", "P1 Pedal 3"),             input_seq(), input_seq(), input_seq(KEYCODE_SPACE, input_seq::or_code, JOYCODE_BUTTON3_INDEXED(0)) ) \
-		INPUT_PORT_ANALOG_TYPE(   2, PLAYER2,  PEDAL3,              N_p("input-name", "P2 Pedal 3"),             input_seq(), input_seq(), input_seq(KEYCODE_Q, input_seq::or_code, JOYCODE_BUTTON3_INDEXED(1)) ) \
-		INPUT_PORT_ANALOG_TYPE(   3, PLAYER3,  PEDAL3,              N_p("input-name", "P3 Pedal 3"),             input_seq(), input_seq(), input_seq(KEYCODE_ENTER, input_seq::or_code, JOYCODE_BUTTON3_INDEXED(2)) ) \
-		INPUT_PORT_ANALOG_TYPE(   4, PLAYER4,  PEDAL3,              N_p("input-name", "P4 Pedal 3"),             input_seq(), input_seq(), input_seq(KEYCODE_ENTER_PAD, input_seq::or_code, JOYCODE_BUTTON3_INDEXED(3)) ) \
-		INPUT_PORT_ANALOG_TYPE(   5, PLAYER5,  PEDAL3,              N_p("input-name", "P5 Pedal 3"),             input_seq(), input_seq(), input_seq(JOYCODE_BUTTON3_INDEXED(4)) ) \
-		INPUT_PORT_ANALOG_TYPE(   6, PLAYER6,  PEDAL3,              N_p("input-name", "P6 Pedal 3"),             input_seq(), input_seq(), input_seq(JOYCODE_BUTTON3_INDEXED(5)) ) \
-		INPUT_PORT_ANALOG_TYPE(   7, PLAYER7,  PEDAL3,              N_p("input-name", "P7 Pedal 3"),             input_seq(), input_seq(), input_seq(JOYCODE_BUTTON3_INDEXED(6)) ) \
-		INPUT_PORT_ANALOG_TYPE(   8, PLAYER8,  PEDAL3,              N_p("input-name", "P8 Pedal 3"),             input_seq(), input_seq(), input_seq(JOYCODE_BUTTON3_INDEXED(7)) ) \
-		INPUT_PORT_ANALOG_TYPE(   9, PLAYER9,  PEDAL3,              N_p("input-name", "P9 Pedal 3"),             input_seq(), input_seq(), input_seq(JOYCODE_BUTTON3_INDEXED(8)) ) \
-		INPUT_PORT_ANALOG_TYPE(  10, PLAYER10, PEDAL3,              N_p("input-name", "P10 Pedal 3"),            input_seq(), input_seq(), input_seq(JOYCODE_BUTTON3_INDEXED(9)) ) \
+		INPUT_PORT_ANALOG_TYPE(   1, PLAYER1,  PEDAL3,              N_p("input-name", "%p Pedal 3"),             input_seq(), input_seq(), input_seq(KEYCODE_SPACE, input_seq::or_code, JOYCODE_BUTTON3_INDEXED(0)) ) \
+		INPUT_PORT_ANALOG_TYPE(   2, PLAYER2,  PEDAL3,              N_p("input-name", "%p Pedal 3"),             input_seq(), input_seq(), input_seq(KEYCODE_Q, input_seq::or_code, JOYCODE_BUTTON3_INDEXED(1)) ) \
+		INPUT_PORT_ANALOG_TYPE(   3, PLAYER3,  PEDAL3,              N_p("input-name", "%p Pedal 3"),             input_seq(), input_seq(), input_seq(KEYCODE_ENTER, input_seq::or_code, JOYCODE_BUTTON3_INDEXED(2)) ) \
+		INPUT_PORT_ANALOG_TYPE(   4, PLAYER4,  PEDAL3,              N_p("input-name", "%p Pedal 3"),             input_seq(), input_seq(), input_seq(KEYCODE_ENTER_PAD, input_seq::or_code, JOYCODE_BUTTON3_INDEXED(3)) ) \
+		INPUT_PORT_ANALOG_TYPE(   5, PLAYER5,  PEDAL3,              N_p("input-name", "%p Pedal 3"),             input_seq(), input_seq(), input_seq(JOYCODE_BUTTON3_INDEXED(4)) ) \
+		INPUT_PORT_ANALOG_TYPE(   6, PLAYER6,  PEDAL3,              N_p("input-name", "%p Pedal 3"),             input_seq(), input_seq(), input_seq(JOYCODE_BUTTON3_INDEXED(5)) ) \
+		INPUT_PORT_ANALOG_TYPE(   7, PLAYER7,  PEDAL3,              N_p("input-name", "%p Pedal 3"),             input_seq(), input_seq(), input_seq(JOYCODE_BUTTON3_INDEXED(6)) ) \
+		INPUT_PORT_ANALOG_TYPE(   8, PLAYER8,  PEDAL3,              N_p("input-name", "%p Pedal 3"),             input_seq(), input_seq(), input_seq(JOYCODE_BUTTON3_INDEXED(7)) ) \
+		INPUT_PORT_ANALOG_TYPE(   9, PLAYER9,  PEDAL3,              N_p("input-name", "%p Pedal 3"),             input_seq(), input_seq(), input_seq(JOYCODE_BUTTON3_INDEXED(8)) ) \
+		INPUT_PORT_ANALOG_TYPE(  10, PLAYER10, PEDAL3,              N_p("input-name", "%p Pedal 3"),             input_seq(), input_seq(), input_seq(JOYCODE_BUTTON3_INDEXED(9)) ) \
 		CORE_INPUT_TYPES_END()
 
 #define CORE_INPUT_TYPES_PADDLE \
diff --git a/src/emu/ioport.cpp b/src/emu/ioport.cpp
index 7bc4c455b78..a9b86776247 100644
--- a/src/emu/ioport.cpp
+++ b/src/emu/ioport.cpp
@@ -101,6 +101,7 @@
 
 #include "util/corestr.h"
 #include "util/ioprocsfilter.h"
+#include "util/language.h"
 #include "util/unicode.h"
 
 #include "osdepend.h"
@@ -307,6 +308,37 @@ inline bool input_seq_good(running_machine &machine, input_seq const &seq)
 		return input_seq::end_code != machine.input().seq_clean(seq)[0];
 }
 
+
+std::string substitute_player(std::string_view name, u8 player)
+{
+	using util::lang_translate;
+
+	std::string result;
+	while (!name.empty())
+	{
+		auto const found = name.find('%');
+		if ((std::string_view::npos == found) || (name.length() == found + 1))
+		{
+			result.append(name);
+			break;
+		}
+		switch (name[found + 1])
+		{
+		case '%':
+			result.append(name.substr(0, found + 1));
+			break;
+		case 'p':
+			result.append(name.substr(0, found));
+			result.append(util::string_format(_("input-name", "P%1$u"), player + 1));
+			break;
+		default:
+			result.append(name.substr(0, found + 2));
+		}
+		name.remove_prefix(found + 2);
+	}
+	return result;
+}
+
 } // anonymous namespace
 
 
@@ -390,6 +422,24 @@ input_type_entry::input_type_entry(ioport_type type, ioport_group group, int pla
 }
 
 
+//-------------------------------------------------
+//  name - gets the display name for the input
+//  type
+//-------------------------------------------------
+
+std::string input_type_entry::name() const
+{
+	using util::lang_translate;
+
+	if (!m_name)
+		return std::string();
+	else if ((group() < IPG_PLAYER1) || (group() > IPG_PLAYER10))
+		return _("input-name", m_name);
+	else
+		return substitute_player(_("input-name", m_name), player());
+}
+
+
 //-------------------------------------------------
 //  replace_code - replace all instances of
 //   oldcodewith newcode in all sequences
@@ -685,16 +735,25 @@ ioport_field::~ioport_field()
 //  field (this must never return nullptr)
 //-------------------------------------------------
 
-const char *ioport_field::name() const
+std::string ioport_field::name() const
 {
-	// if we have a non-default name, use that
-	if (m_live != nullptr && !m_live->name.empty())
-		return m_live->name.c_str();
-	if (m_name != nullptr)
+	using util::lang_translate;
+
+	// if we have an overridden name, use that
+	if (m_live && !m_live->name.empty())
+		return m_live->name;
+
+	// if no specific name, use the generic name for the type
+	if (!m_name)
+		return manager().type_name(m_type, m_player);
+
+	// return name for non-controller fields as-is
+	ioport_group const group = manager().type_group(m_type, m_player);
+	if ((group < IPG_PLAYER1) || (group > IPG_PLAYER10))
 		return m_name;
 
-	// otherwise, return the name associated with the type
-	return manager().type_name(m_type, m_player);
+	// substitute the player number in if necessary
+	return substitute_player(m_name, m_player);
 }
 
 
@@ -750,8 +809,8 @@ void ioport_field::set_defseq(input_seq_type seqtype, const input_seq &newseq)
 ioport_type_class ioport_field::type_class() const noexcept
 {
 	// inputs associated with specific players
-	ioport_group group = manager().type_group(m_type, m_player);
-	if (group >= IPG_PLAYER1 && group <= IPG_PLAYER10)
+	ioport_group const group = manager().type_group(m_type, m_player);
+	if ((group >= IPG_PLAYER1) && (group <= IPG_PLAYER10))
 		return INPUT_CLASS_CONTROLLER;
 
 	// keys (names derived from character codes)
@@ -1702,12 +1761,14 @@ time_t ioport_manager::initialize()
 			if (&port.second->device() == &device)
 			{
 				for (ioport_field &field : port.second->fields())
+				{
 					if (field.type_class() == INPUT_CLASS_CONTROLLER)
 					{
 						if (players < field.player() + 1)
 							players = field.player() + 1;
 						field.set_player(field.player() + player_offset);
 					}
+				}
 			}
 		}
 		player_offset += players;
@@ -1846,15 +1907,21 @@ ioport_manager::~ioport_manager()
 //  type/player
 //-------------------------------------------------
 
-const char *ioport_manager::type_name(ioport_type type, u8 player) const noexcept
+std::string ioport_manager::type_name(ioport_type type, u8 player) const
 {
+	using util::lang_translate;
+
 	// if we have a machine, use the live state and quick lookup
-	input_type_entry *entry = m_type_to_entry[type][player];
-	if (entry != nullptr && entry->name() != nullptr)
-		return entry->name();
+	input_type_entry const *const entry = m_type_to_entry[type][player];
+	if (entry)
+	{
+		std::string name = entry->name();
+		if (!name.empty())
+			return name;
+	}
 
 	// if we find nothing, return a default string (not a null pointer)
-	return "???";
+	return _("input-name", "???");
 }
 
 
diff --git a/src/emu/ioport.h b/src/emu/ioport.h
index c767d44c250..e81cce1e8c4 100644
--- a/src/emu/ioport.h
+++ b/src/emu/ioport.h
@@ -798,7 +798,7 @@ public:
 	ioport_group group() const noexcept { return m_group; }
 	u8 player() const noexcept { return m_player; }
 	const char *token() const noexcept { return m_token; }
-	const char *name() const noexcept { return m_name; }
+	std::string name() const;
 	input_seq &defseq(input_seq_type seqtype = SEQ_TYPE_STANDARD) noexcept { return m_defseq[seqtype]; }
 	const input_seq &defseq(input_seq_type seqtype = SEQ_TYPE_STANDARD) const noexcept { return m_defseq[seqtype]; }
 	const input_seq &seq(input_seq_type seqtype = SEQ_TYPE_STANDARD) const noexcept { return m_seq[seqtype]; }
@@ -1037,7 +1037,7 @@ public:
 	bool analog_invert() const { return ((m_flags & ANALOG_FLAG_INVERT) != 0); }
 
 	u8 impulse() const noexcept { return m_impulse; }
-	const char *name() const;
+	std::string name() const;
 	const char *specific_name() const noexcept { return m_name; }
 	const input_seq &seq(input_seq_type seqtype = SEQ_TYPE_STANDARD) const noexcept;
 	const input_seq &defseq(input_seq_type seqtype = SEQ_TYPE_STANDARD) const noexcept;
@@ -1382,7 +1382,7 @@ public:
 	// type helpers
 	const std::vector<input_type_entry> &types() const noexcept { return m_typelist; }
 	bool type_pressed(ioport_type type, int player = 0);
-	const char *type_name(ioport_type type, u8 player) const noexcept;
+	std::string type_name(ioport_type type, u8 player) const;
 	ioport_group type_group(ioport_type type, int player) const noexcept;
 	const input_seq &type_seq(ioport_type type, int player = 0, input_seq_type seqtype = SEQ_TYPE_STANDARD) const noexcept;
 	void set_type_seq(ioport_type type, int player, input_seq_type seqtype, const input_seq &newseq) noexcept;
diff --git a/src/emu/validity.cpp b/src/emu/validity.cpp
index 18ba2c6fc6b..e4cf0860064 100644
--- a/src/emu/validity.cpp
+++ b/src/emu/validity.cpp
@@ -2292,8 +2292,9 @@ void validity_checker::validate_analog_input_field(const ioport_field &field)
 
 void validity_checker::validate_dip_settings(const ioport_field &field)
 {
-	const char *demo_sounds = ioport_string_from_index(INPUT_STRING_Demo_Sounds);
-	const char *flipscreen = ioport_string_from_index(INPUT_STRING_Flip_Screen);
+	char const *const demo_sounds = ioport_string_from_index(INPUT_STRING_Demo_Sounds);
+	char const *const flipscreen = ioport_string_from_index(INPUT_STRING_Flip_Screen);
+	char const *const name = field.specific_name();
 	u8 coin_list[__input_string_coinage_end + 1 - __input_string_coinage_start] = { 0 };
 	bool coin_error = false;
 
@@ -2306,15 +2307,15 @@ void validity_checker::validate_dip_settings(const ioport_field &field)
 			coin_list[strindex - __input_string_coinage_start] = 1;
 
 		// make sure demo sounds default to on
-		if (field.name() == demo_sounds && strindex == INPUT_STRING_On && field.defvalue() != setting->value())
+		if (name == demo_sounds && strindex == INPUT_STRING_On && field.defvalue() != setting->value())
 			osd_printf_error("Demo Sounds must default to On\n");
 
 		// check for bad demo sounds options
-		if (field.name() == demo_sounds && (strindex == INPUT_STRING_Yes || strindex == INPUT_STRING_No))
+		if (name == demo_sounds && (strindex == INPUT_STRING_Yes || strindex == INPUT_STRING_No))
 			osd_printf_error("Demo Sounds option must be Off/On, not %s\n", setting->name());
 
 		// check for bad flip screen options
-		if (field.name() == flipscreen && (strindex == INPUT_STRING_Yes || strindex == INPUT_STRING_No))
+		if (name == flipscreen && (strindex == INPUT_STRING_Yes || strindex == INPUT_STRING_No))
 			osd_printf_error("Flip Screen option must be Off/On, not %s\n", setting->name());
 
 		// if we have a neighbor, compare ourselves to him
@@ -2324,21 +2325,21 @@ void validity_checker::validate_dip_settings(const ioport_field &field)
 			// check for inverted off/on DIP switch order
 			int next_strindex = get_defstr_index(nextsetting->name(), true);
 			if (strindex == INPUT_STRING_On && next_strindex == INPUT_STRING_Off)
-				osd_printf_error("%s option must have Off/On options in the order: Off, On\n", field.name());
+				osd_printf_error("%s option must have Off/On options in the order: Off, On\n", name);
 
 			// check for inverted yes/no DIP switch order
 			else if (strindex == INPUT_STRING_Yes && next_strindex == INPUT_STRING_No)
-				osd_printf_error("%s option must have Yes/No options in the order: No, Yes\n", field.name());
+				osd_printf_error("%s option must have Yes/No options in the order: No, Yes\n", name);
 
 			// check for inverted upright/cocktail DIP switch order
 			else if (strindex == INPUT_STRING_Cocktail && next_strindex == INPUT_STRING_Upright)
-				osd_printf_error("%s option must have Upright/Cocktail options in the order: Upright, Cocktail\n", field.name());
+				osd_printf_error("%s option must have Upright/Cocktail options in the order: Upright, Cocktail\n", name);
 
 			// check for proper coin ordering
 			else if (strindex >= __input_string_coinage_start && strindex <= __input_string_coinage_end && next_strindex >= __input_string_coinage_start && next_strindex <= __input_string_coinage_end &&
 						strindex >= next_strindex && setting->condition() == nextsetting->condition())
 			{
-				osd_printf_error("%s option has unsorted coinage %s > %s\n", field.name(), setting->name(), nextsetting->name());
+				osd_printf_error("%s option has unsorted coinage %s > %s\n", name, setting->name(), nextsetting->name());
 				coin_error = true;
 			}
 		}
@@ -2467,9 +2468,6 @@ void validity_checker::validate_inputs(device_t &root)
 					// check for invalid UTF-8
 					if (!utf8_is_valid_string(name))
 						osd_printf_error("Field '%s' has invalid characters\n", name);
-
-					// look up the string and print an error if default strings are not used
-					/*strindex =get_defstr_index(defstr_map, name, driver, &error);*/
 				}
 
 				// verify conditions on the field
diff --git a/src/frontend/mame/infoxml.cpp b/src/frontend/mame/infoxml.cpp
index 8ff033194bf..6adb5f5e588 100644
--- a/src/frontend/mame/infoxml.cpp
+++ b/src/frontend/mame/infoxml.cpp
@@ -110,7 +110,7 @@ void output_footer(std::ostream &out);
 void output_one(std::ostream &out, driver_enumerator &drivlist, const game_driver &driver, device_type_set *devtypes);
 void output_sampleof(std::ostream &out, device_t &device);
 void output_bios(std::ostream &out, device_t const &device);
-void output_rom(std::ostream &out, machine_config &config, driver_enumerator *drivlist, const game_driver *driver, device_t &device);
+void output_rom(std::ostream &out, machine_config &config, driver_list const *drivlist, const game_driver *driver, device_t &device);
 void output_device_refs(std::ostream &out, device_t &root);
 void output_sample(std::ostream &out, device_t &device);
 void output_chips(std::ostream &out, device_t &device, const char *root_tag);
@@ -131,7 +131,7 @@ void output_ramoptions(std::ostream &out, device_t &root);
 void output_one_device(std::ostream &out, machine_config &config, device_t &device, const char *devtag);
 void output_devices(std::ostream &out, emu_options &lookup_options, device_type_set const *filter);
 
-char const *get_merge_name(driver_enumerator &drivlist, game_driver const &driver, util::hash_collection const &romhashes);
+char const *get_merge_name(driver_list const &drivlist, game_driver const &driver, util::hash_collection const &romhashes);
 char const *get_merge_name(machine_config &config, device_t const &device, util::hash_collection const &romhashes);
 char const *get_merge_name(tiny_rom_entry const *roms, util::hash_collection const &romhashes);
 
@@ -982,7 +982,7 @@ void output_bios(std::ostream &out, device_t const &device)
 //  the XML output
 //-------------------------------------------------
 
-void output_rom(std::ostream &out, machine_config &config, driver_enumerator *drivlist, const game_driver *driver, device_t &device)
+void output_rom(std::ostream &out, machine_config &config, driver_list const *drivlist, const game_driver *driver, device_t &device)
 {
 	enum class type { BIOS, NORMAL, DISK };
 	std::map<u32, char const *> biosnames;
@@ -1053,7 +1053,7 @@ void output_rom(std::ostream &out, machine_config &config, driver_enumerator *dr
 			if ((type::DISK == pass) != is_disk)
 				continue;
 
-			// BIOS ROMs only apply to bioses
+			// BIOS ROMs only apply to BIOSes
 			// FIXME: disk images associated with a system BIOS will never be listed
 			u32 const biosno(ROM_GETBIOSFLAGS(rom));
 			if ((type::BIOS == pass) != bool(biosno))
@@ -1824,7 +1824,7 @@ void output_switches(std::ostream &out, const ioport_list &portlist, const char
 				newtag = newtag.substr(newtag.find(oldtag.append(root_tag)) + oldtag.length());
 
 				// output the switch name information
-				std::string const normalized_field_name(normalize_string(field.name()));
+				std::string const normalized_field_name(normalize_string(field.specific_name()));
 				std::string const normalized_newtag(normalize_string(newtag));
 				util::stream_format(out, "\t\t<%s name=\"%s\" tag=\"%s\" mask=\"%u\">\n", outertag, normalized_field_name, normalized_newtag, field.mask());
 				if (!field.condition().none())
@@ -1894,7 +1894,7 @@ void output_adjusters(std::ostream &out, const ioport_list &portlist)
 		for (ioport_field const &field : port.second->fields())
 			if (field.type() == IPT_ADJUSTER)
 			{
-				util::stream_format(out, "\t\t<adjuster name=\"%s\" default=\"%d\"/>\n", normalize_string(field.name()), field.defvalue());
+				util::stream_format(out, "\t\t<adjuster name=\"%s\" default=\"%d\"/>\n", normalize_string(field.specific_name()), field.defvalue());
 			}
 }
 
@@ -2169,7 +2169,7 @@ void output_ramoptions(std::ostream &out, device_t &root)
 //  parent set
 //-------------------------------------------------
 
-char const *get_merge_name(driver_enumerator &drivlist, game_driver const &driver, util::hash_collection const &romhashes)
+char const *get_merge_name(driver_list const &drivlist, game_driver const &driver, util::hash_collection const &romhashes)
 {
 	char const *result = nullptr;
 
diff --git a/src/frontend/mame/ui/auditmenu.cpp b/src/frontend/mame/ui/auditmenu.cpp
index aaad0967f00..a5cb46fc4d8 100644
--- a/src/frontend/mame/ui/auditmenu.cpp
+++ b/src/frontend/mame/ui/auditmenu.cpp
@@ -95,7 +95,7 @@ void menu_audit::custom_render(void *selectedref, float top, float bottom, float
 			std::size_t const total(m_fast ? m_unavailable : m_availablesorted.size());
 			std::ostringstream text;
 			util::stream_format(text,
-					_("Auditing ROMs for machine %2$u of %3$u...\n%1$s"),
+					_("Auditing media for machine %2$u of %3$u...\n%1$s"),
 					system ? std::string_view(system->description) : std::string_view(),
 					(std::min)(audited + 1, total),
 					total);
@@ -133,8 +133,8 @@ bool menu_audit::custom_ui_cancel()
 void menu_audit::populate(float &customtop, float &custombottom)
 {
 	if (m_unavailable && (m_availablesorted.size() != m_unavailable))
-		item_append(util::string_format(_("Audit ROMs for %1$u machines marked unavailable"), m_unavailable), 0, ITEMREF_START_FAST);
-	item_append(util::string_format(_("Audit ROMs for all %1$u machines"), m_availablesorted.size()), 0, ITEMREF_START_FULL);
+		item_append(util::string_format(_("Audit media for %1$u machines marked unavailable"), m_unavailable), 0, ITEMREF_START_FAST);
+	item_append(util::string_format(_("Audit media for all %1$u machines"), m_availablesorted.size()), 0, ITEMREF_START_FULL);
 	item_append(menu_item_type::SEPARATOR, 0);
 	custombottom = (ui().get_line_height() * 1.0f) + (ui().box_tb_border() * 3.0f);
 }
diff --git a/src/frontend/mame/ui/inputmap.cpp b/src/frontend/mame/ui/inputmap.cpp
index ada0d087505..38dd73111be 100644
--- a/src/frontend/mame/ui/inputmap.cpp
+++ b/src/frontend/mame/ui/inputmap.cpp
@@ -78,26 +78,30 @@ void menu_input_general::populate(float &customtop, float &custombottom)
 		for (const input_type_entry &entry : machine().ioport().types())
 		{
 			// add if we match the group and we have a valid name
-			if ((entry.group() == group) && entry.name() && entry.name()[0])
+			if (entry.group() == group)
 			{
-				// loop over all sequence types
-				for (input_seq_type seqtype = SEQ_TYPE_STANDARD; seqtype < SEQ_TYPE_TOTAL; ++seqtype)
+				std::string name = entry.name();
+				if (!name.empty())
 				{
-					// build an entry for the standard sequence
-					input_item_data &item(data.emplace_back());
-					item.ref = &entry;
-					item.seqtype = seqtype;
-					item.seq = machine().ioport().type_seq(entry.type(), entry.player(), seqtype);
-					item.defseq = &entry.defseq(seqtype);
-					item.group = entry.group();
-					item.type = ioport_manager::type_is_analog(entry.type()) ? (INPUT_TYPE_ANALOG + seqtype) : INPUT_TYPE_DIGITAL;
-					item.is_optional = false;
-					item.name = _("input-name", entry.name());
-					item.owner = nullptr;
+					// loop over all sequence types
+					for (input_seq_type seqtype = SEQ_TYPE_STANDARD; seqtype < SEQ_TYPE_TOTAL; ++seqtype)
+					{
+						// build an entry for the standard sequence
+						input_item_data &item(data.emplace_back());
+						item.ref = &entry;
+						item.seqtype = seqtype;
+						item.seq = machine().ioport().type_seq(entry.type(), entry.player(), seqtype);
+						item.defseq = &entry.defseq(seqtype);
+						item.group = entry.group();
+						item.type = ioport_manager::type_is_analog(entry.type()) ? (INPUT_TYPE_ANALOG + seqtype) : INPUT_TYPE_DIGITAL;
+						item.is_optional = false;
+						item.name = name;
+						item.owner = nullptr;
 
-					// stop after one, unless we're analog
-					if (item.type == INPUT_TYPE_DIGITAL)
-						break;
+						// stop after one, unless we're analog
+						if (item.type == INPUT_TYPE_DIGITAL)
+							break;
+					}
 				}
 			}
 		}
@@ -165,7 +169,7 @@ void menu_input_specific::populate(float &customtop, float &custombottom)
 						item.group = machine().ioport().type_group(field.type(), field.player());
 						item.type = field.is_analog() ? (INPUT_TYPE_ANALOG + seqtype) : INPUT_TYPE_DIGITAL;
 						item.is_optional = field.optional();
-						item.name = _("input-name", field.name());
+						item.name = field.name();
 						item.owner = &field.device();
 
 						// stop after one, unless we're analog
@@ -203,7 +207,7 @@ void menu_input_specific::populate(float &customtop, float &custombottom)
 						return true;
 					if (!codes2.empty() && (codes1.empty() || codes1[0] > codes2[0]))
 						return false;
-					cmp = strcmp(i1.name, i2.name);
+					cmp = i1.name.compare(i2.name);
 					if (cmp < 0)
 						return true;
 					if (cmp > 0)
diff --git a/src/frontend/mame/ui/inputmap.h b/src/frontend/mame/ui/inputmap.h
index 841382daf21..a43a6829b06 100644
--- a/src/frontend/mame/ui/inputmap.h
+++ b/src/frontend/mame/ui/inputmap.h
@@ -54,7 +54,7 @@ protected:
 		input_seq_type      seqtype = SEQ_TYPE_INVALID; // sequence type
 		input_seq           seq;                        // copy of the live sequence
 		const input_seq *   defseq = nullptr;           // pointer to the default sequence
-		const char *        name = nullptr;             // pointer to the base name of the item
+		std::string         name;                       // base name of the item
 		const device_t *    owner = nullptr;            // pointer to the owner of the item
 		ioport_group        group = IPG_INVALID;        // group type
 		uint8_t             type = 0U;                  // type of port
diff --git a/src/frontend/mame/ui/mainmenu.cpp b/src/frontend/mame/ui/mainmenu.cpp
index 0de7d7ca4d3..74f0060b6df 100644
--- a/src/frontend/mame/ui/mainmenu.cpp
+++ b/src/frontend/mame/ui/mainmenu.cpp
@@ -120,7 +120,7 @@ void menu_main::populate(float &customtop, float &custombottom)
 
 	item_append(_("Input (general)"), 0, (void *)INPUT_GROUPS);
 
-	item_append(_("Input (this Machine)"), 0, (void *)INPUT_SPECIFIC);
+	item_append(_("Input (this machine)"), 0, (void *)INPUT_SPECIFIC);
 
 	if (ui().machine_info().has_analog())
 		item_append(_("Analog Controls"), 0, (void *)ANALOG);
@@ -152,7 +152,7 @@ void menu_main::populate(float &customtop, float &custombottom)
 		item_append(_("Tape Control"), 0, (void *)TAPE_CONTROL);
 
 	if (pty_interface_enumerator(machine().root_device()).first() != nullptr)
-		item_append(_("Pseudo terminals"), 0, (void *)PTY_INFO);
+		item_append(_("Pseudo Terminals"), 0, (void *)PTY_INFO);
 
 	if (ui().machine_info().has_bioses())
 		item_append(_("BIOS Selection"), 0, (void *)BIOS_SELECTION);
@@ -197,7 +197,7 @@ void menu_main::populate(float &customtop, float &custombottom)
 
 	item_append(menu_item_type::SEPARATOR);
 
-	item_append(string_format(_("About %s"), emulator_info::get_appname()), 0, (void *)ABOUT);
+	item_append(string_format(_("About %1$s"), emulator_info::get_appname()), 0, (void *)ABOUT);
 
 	item_append(menu_item_type::SEPARATOR);
 
diff --git a/src/frontend/mame/ui/selmenu.cpp b/src/frontend/mame/ui/selmenu.cpp
index 1b393edc91a..3c16f83f112 100644
--- a/src/frontend/mame/ui/selmenu.cpp
+++ b/src/frontend/mame/ui/selmenu.cpp
@@ -2768,7 +2768,7 @@ void menu_select_launch::infos_render(float origx1, float origy1, float origx2,
 			}
 			else
 			{
-				m_info_buffer = "";
+				m_info_buffer.clear();
 				mame_machine_manager::instance()->lua()->call_plugin("data", m_info_view - 1, m_info_buffer);
 			}
 		}
@@ -3057,9 +3057,9 @@ void menu_select_launch::general_info(ui_system_info const *system, game_driver
 
 		// if everything looks good, schedule the new driver
 		if (audit_passed(summary))
-			str << _("ROM Audit Result\tOK\n");
+			str << _("Media Audit Result\tOK\n");
 		else
-			str << _("ROM Audit Result\tBAD\n");
+			str << _("Media Audit Result\tBAD\n");
 
 		if (summary_samples == media_auditor::NONE_NEEDED)
 			str << _("Samples Audit Result\tNone Needed\n");
@@ -3070,10 +3070,10 @@ void menu_select_launch::general_info(ui_system_info const *system, game_driver
 	}
 	else
 	{
-		str << _("ROM Audit \tDisabled\nSamples Audit \tDisabled\n");
+		str << _("Media Audit\tDisabled\nSamples Audit\tDisabled\n");
 	}
 
-	buffer = str.str();
+	buffer = std::move(str).str();
 }
 
 } // namespace ui
diff --git a/src/frontend/mame/ui/submenu.cpp b/src/frontend/mame/ui/submenu.cpp
index c36f837ce5c..496201c1cc4 100644
--- a/src/frontend/mame/ui/submenu.cpp
+++ b/src/frontend/mame/ui/submenu.cpp
@@ -36,12 +36,12 @@ std::vector<submenu::option> submenu::misc_options()
 			{ option_type::UI,   N_("Enlarge images in the right panel"),       OPTION_ENLARGE_SNAPS },
 			{ option_type::EMU,  N_("Cheats"),                                  OPTION_CHEAT },
 			{ option_type::EMU,  N_("Show mouse pointer"),                      OPTION_UI_MOUSE },
-			{ option_type::EMU,  N_("Confirm quit from machines"),              OPTION_CONFIRM_QUIT },
-			{ option_type::EMU,  N_("Skip information screen at startup"),      OPTION_SKIP_GAMEINFO },
+			{ option_type::EMU,  N_("Confirm quit from emulation"),             OPTION_CONFIRM_QUIT },
+			{ option_type::EMU,  N_("Skip system information screen"),          OPTION_SKIP_GAMEINFO },
 			{ option_type::UI,   N_("Force 4:3 aspect for snapshot display"),   OPTION_FORCED4X3 },
 			{ option_type::UI,   N_("Use image as background"),                 OPTION_USE_BACKGROUND },
 			{ option_type::UI,   N_("Skip BIOS selection menu"),                OPTION_SKIP_BIOS_MENU },
-			{ option_type::UI,   N_("Skip software parts selection menu"),      OPTION_SKIP_PARTS_MENU },
+			{ option_type::UI,   N_("Skip software part selection menu"),       OPTION_SKIP_PARTS_MENU },
 			{ option_type::UI,   N_("Info auto audit"),                         OPTION_INFO_AUTO_AUDIT },
 			{ option_type::UI,   N_("Hide romless machine from available list"),OPTION_HIDE_ROMLESS } };
 }
@@ -88,11 +88,11 @@ std::vector<submenu::option> submenu::advanced_options()
 			{ option_type::EMU,  N_("Multi-mouse"),                             OPTION_MULTIMOUSE },
 			{ option_type::EMU,  N_("Steadykey"),                               OPTION_STEADYKEY },
 			{ option_type::EMU,  N_("UI active"),                               OPTION_UI_ACTIVE },
-			{ option_type::EMU,  N_("Offscreen reload"),                        OPTION_OFFSCREEN_RELOAD },
+			{ option_type::EMU,  N_("Off-screen reload"),                       OPTION_OFFSCREEN_RELOAD },
 			{ option_type::EMU,  N_("Joystick deadzone"),                       OPTION_JOYSTICK_DEADZONE },
 			{ option_type::EMU,  N_("Joystick saturation"),                     OPTION_JOYSTICK_SATURATION },
 			{ option_type::EMU,  N_("Natural keyboard"),                        OPTION_NATURAL_KEYBOARD },
-			{ option_type::EMU,  N_("Simultaneous contradictory"),              OPTION_JOYSTICK_CONTRADICTORY },
+			{ option_type::EMU,  N_("Allow contradictory joystick inputs"),     OPTION_JOYSTICK_CONTRADICTORY },
 			{ option_type::EMU,  N_("Coin impulse"),                            OPTION_COIN_IMPULSE } };
 }
 
@@ -103,7 +103,7 @@ std::vector<submenu::option> submenu::control_options()
 			{ option_type::EMU,  N_("Lightgun Device Assignment"),              OPTION_LIGHTGUN_DEVICE },
 			{ option_type::EMU,  N_("Trackball Device Assignment"),             OPTION_TRACKBALL_DEVICE },
 			{ option_type::EMU,  N_("Pedal Device Assignment"),                 OPTION_PEDAL_DEVICE },
-			{ option_type::EMU,  N_("Adstick Device Assignment"),               OPTION_ADSTICK_DEVICE },
+			{ option_type::EMU,  N_("AD Stick Device Assignment"),              OPTION_ADSTICK_DEVICE },
 			{ option_type::EMU,  N_("Paddle Device Assignment"),                OPTION_PADDLE_DEVICE },
 			{ option_type::EMU,  N_("Dial Device Assignment"),                  OPTION_DIAL_DEVICE },
 			{ option_type::EMU,  N_("Positional Device Assignment"),            OPTION_POSITIONAL_DEVICE },
diff --git a/src/frontend/mame/ui/ui.cpp b/src/frontend/mame/ui/ui.cpp
index 663354420d2..f5978f9c1ea 100644
--- a/src/frontend/mame/ui/ui.cpp
+++ b/src/frontend/mame/ui/ui.cpp
@@ -351,7 +351,7 @@ void mame_ui_manager::initialize(running_machine &machine)
 		const char *const service_mode_dipname = ioport_configurer::string_from_token(DEF_STR(Service_Mode));
 		for (auto &port : machine.ioport().ports())
 			for (ioport_field &field : port.second->fields())
-				if (field.type() == IPT_DIPSWITCH && strcmp(field.name(), service_mode_dipname) == 0)
+				if ((field.type() == IPT_DIPSWITCH) && (field.name() == service_mode_dipname)) // FIXME: probably breaks with localisation, also issues with multiple devices
 					field.set_defseq(machine.ioport().type_seq(IPT_SERVICE));
 	}