From c9d7570023e9a6bf67de20a9f46546e5ebd0e393 Mon Sep 17 00:00:00 2001
From: Wintermute 0110 <wintermute0110@gmail.com>
Date: Thu, 3 May 2018 04:18:52 +0900
Subject: [PATCH] Fix Acorn SL names so they show in the right position in
 front-ends. (#3503)

* Fix Acorn SL names so they show in the right position in front-ends.

* Fix mistake in BBC Bridge Companion. Thanks to Pernod70.

* Fixed more names. Thanks to Pernod70.

* Some more name fixes.

* Fix names for hardware manufactured by Casper and Torch.

* SL title disc lowercase for coherence.
---
 hash/bbc_flop_32016.xml  | 4 ++--
 hash/bbc_flop_6502.xml   | 4 ++--
 hash/bbc_flop_65c102.xml | 4 ++--
 hash/bbc_flop_68000.xml  | 4 ++--
 hash/bbc_flop_80186.xml  | 4 ++--
 hash/bbc_flop_arm.xml    | 4 ++--
 hash/bbc_flop_torch.xml  | 4 ++--
 hash/bbc_flop_z80.xml    | 4 ++--
 hash/bbca_cass.xml       | 4 ++--
 hash/bbcb_cass.xml       | 4 ++--
 hash/bbcb_cass_de.xml    | 4 ++--
 hash/bbcb_flop.xml       | 4 ++--
 hash/bbcb_flop_orig.xml  | 4 ++--
 hash/bbcb_flop_us.xml    | 4 ++--
 hash/bbcbc.xml           | 2 ++
 hash/bbcm_cart.xml       | 4 ++--
 hash/bbcm_cass.xml       | 4 ++--
 hash/bbcm_flop.xml       | 4 ++--
 hash/bbcmc_flop.xml      | 4 ++--
 19 files changed, 38 insertions(+), 36 deletions(-)

diff --git a/hash/bbc_flop_32016.xml b/hash/bbc_flop_32016.xml
index bec6703922b..44d6b214ebf 100644
--- a/hash/bbc_flop_32016.xml
+++ b/hash/bbc_flop_32016.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE softwarelist SYSTEM "softwarelist.dtd">
 
-<!-- BBC Micro - 32016 Co-Processor Discs -->
+<!-- Acorn BBC Micro - 32016 Co-Processor Discs -->
 
 <!-- Loading Instructions:
 
       Hold down the SHIFT key and press and release the BREAK key.
 -->
 
-<softwarelist name="bbc_flop_32016" description="32016 Co-Processor Discs">
+<softwarelist name="bbc_flop_32016" description="Acorn 32016 Co-Processor discs">
 
 	<software name="panos11" cloneof="panos14" supported="no">
 		<description>PanOS Version 1.10 System Disks</description>
diff --git a/hash/bbc_flop_6502.xml b/hash/bbc_flop_6502.xml
index b373b71c9e6..4b7c6b954fb 100644
--- a/hash/bbc_flop_6502.xml
+++ b/hash/bbc_flop_6502.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE softwarelist SYSTEM "softwarelist.dtd">
 
-<!-- BBC Micro - 6502 2nd Processor Discs -->
+<!-- Acorn BBC Micro - 6502 2nd Processor Discs -->
 
 <!-- Loading Instructions:
 
       Hold down the SHIFT key and press and release the BREAK key.
 -->
 
-<softwarelist name="bbc_flop_6502" description="6502 2nd Processor Discs">
+<softwarelist name="bbc_flop_6502" description="Acorn 6502 2nd Processor discs">
 
 	<software name="6502dev">
 		<description>6502 Development Package</description>
diff --git a/hash/bbc_flop_65c102.xml b/hash/bbc_flop_65c102.xml
index 70b27072b03..b74e39122f4 100644
--- a/hash/bbc_flop_65c102.xml
+++ b/hash/bbc_flop_65c102.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE softwarelist SYSTEM "softwarelist.dtd">
 
-<!-- BBC Micro - 65C102 Co-Processor Discs -->
+<!-- Acorn BBC Micro - 65C102 Co-Processor discs -->
 
 <!-- Loading Instructions:
 
       Hold down the SHIFT key and press and release the BREAK key.
 -->
 
-<softwarelist name="bbc_flop_65c102" description="65C102 Co-Processor Discs">
+<softwarelist name="bbc_flop_65c102" description="Acorn 65C102 Co-Processor discs">
 
 	<software name="coprosup">
 		<description>65C102 Co-Processor Support Disc</description>
diff --git a/hash/bbc_flop_68000.xml b/hash/bbc_flop_68000.xml
index 8276602823f..f1a1d9d60e1 100644
--- a/hash/bbc_flop_68000.xml
+++ b/hash/bbc_flop_68000.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE softwarelist SYSTEM "softwarelist.dtd">
 
-<!-- BBC Micro - 68000 Co-Processor Discs -->
+<!-- Acorn BBC Micro - Casper 68000 Co-Processor discs -->
 
 <!-- Loading Instructions:
 
       Hold down the SHIFT key and press and release the BREAK key.
 -->
 
-<softwarelist name="bbc_flop_68000" description="Casper 68000 2nd Processor Discs">
+<softwarelist name="bbc_flop_68000" description="Casper 68000 2nd Processor discs">
 
 	<software name="casper">
 		<description>Casper Support Discs</description>
diff --git a/hash/bbc_flop_80186.xml b/hash/bbc_flop_80186.xml
index f6b621735ce..7406d9a243b 100644
--- a/hash/bbc_flop_80186.xml
+++ b/hash/bbc_flop_80186.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE softwarelist SYSTEM "softwarelist.dtd">
 
-<!-- BBC Micro - 80186 Co-Processor Discs -->
+<!-- Acorn BBC Master - 80186 Co-Processor discs -->
 
-<softwarelist name="bbc_flop_80186" description="80186 Co-Processor Discs">
+<softwarelist name="bbc_flop_80186" description="Acorn 80186 Co-Processor discs">
 
 	<software name="m512sys">
 		<description>BBC Master 512 System Discs</description>
diff --git a/hash/bbc_flop_arm.xml b/hash/bbc_flop_arm.xml
index 51397e5521b..167e07b5073 100644
--- a/hash/bbc_flop_arm.xml
+++ b/hash/bbc_flop_arm.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE softwarelist SYSTEM "softwarelist.dtd">
 
-<!-- BBC Micro - ARM Co-Processor Discs -->
+<!-- Acorn BBC Micro - ARM Co-Processor discs -->
 
 <!-- Loading Instructions:
 
       Hold down the SHIFT key and press and release the BREAK key.
 -->
 
-<softwarelist name="bbc_flop_arm" description="ARM Co-Processor Discs">
+<softwarelist name="bbc_flop_arm" description="Acorn ARM Co-Processor discs">
 
 	<software name="armevals">
 		<description>ARM Evaluation System Discs</description>
diff --git a/hash/bbc_flop_torch.xml b/hash/bbc_flop_torch.xml
index 5b74c9bd44f..db464d87bd0 100644
--- a/hash/bbc_flop_torch.xml
+++ b/hash/bbc_flop_torch.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE softwarelist SYSTEM "softwarelist.dtd">
 
-<!-- BBC Micro - Torch Z80/68000 Co-Processor Discs -->
+<!-- Acorn BBC Micro - Torch Z80/68000 Co-Processor discs -->
 
-<softwarelist name="bbc_flop_torch" description="Torch Z80/68000 Co-Processor Discs">
+<softwarelist name="bbc_flop_torch" description="Torch Z80/68000 Co-Processor discs">
 
 	<!-- Z80 -->
 
diff --git a/hash/bbc_flop_z80.xml b/hash/bbc_flop_z80.xml
index 48e005b3772..f2f1364028f 100644
--- a/hash/bbc_flop_z80.xml
+++ b/hash/bbc_flop_z80.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE softwarelist SYSTEM "softwarelist.dtd">
 
-<!-- BBC Micro - Z80 2nd Processor Discs -->
+<!-- Acorn BBC Micro - Z80 2nd Processor discs -->
 
 <!-- Loading CP/M:
 
       Reset with Z80 co-processor enabled and Acorn CP/M System Disc 1 in drive 0.
 -->
 
-<softwarelist name="bbc_flop_z80" description="Z80 2nd Processor Discs">
+<softwarelist name="bbc_flop_z80" description="Acorn Z80 2nd Processor discs">
 
 	<software name="cpmsys">
 		<description>Acorn CP/M System Discs</description>
diff --git a/hash/bbca_cass.xml b/hash/bbca_cass.xml
index 86e65da9048..bb7b2d61738 100644
--- a/hash/bbca_cass.xml
+++ b/hash/bbca_cass.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE softwarelist SYSTEM "softwarelist.dtd">
 
-<!-- BBC Micro Model A Tapes -->
+<!-- Acorn BBC Micro Model A Tapes -->
 
 <!-- I believe all the Cassette images here are original, so some may require the manuals for additional copy protection. -->
 
@@ -12,7 +12,7 @@
 
 <!-- This list was compiled from the archive at http://www.stairwaytohell.com/. Additional titles will be added as they are made available at http://stardot.org.uk/ forum. -->
 
-<softwarelist name="bbca_cass" description="BBC Micro Model A cassettes">
+<softwarelist name="bbca_cass" description="Acorn BBC Micro Model A cassettes">
 
 	<!-- Games -->
 
diff --git a/hash/bbcb_cass.xml b/hash/bbcb_cass.xml
index 4a6c67f0289..5fa569fb56c 100644
--- a/hash/bbcb_cass.xml
+++ b/hash/bbcb_cass.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE softwarelist SYSTEM "softwarelist.dtd">
 
-<!-- BBC Micro Model B Tapes -->
+<!-- Acorn BBC Micro Model B Tapes -->
 
 <!-- I believe all the Cassette images here are original, so some require the manuals for additional copy protection -->
 
@@ -14,7 +14,7 @@
 
 <!-- This list was compiled from the archive at http://www.stairwaytohell.com/. Additional titles will be added as they are made available at http://stardot.org.uk/ forum. -->
 
-<softwarelist name="bbcb_cass" description="BBC Micro Model B cassettes">
+<softwarelist name="bbcb_cass" description="Acorn BBC Micro Model B cassettes">
 
 	<!-- Games -->
 
diff --git a/hash/bbcb_cass_de.xml b/hash/bbcb_cass_de.xml
index 66d98ad2377..649e5cc5211 100644
--- a/hash/bbcb_cass_de.xml
+++ b/hash/bbcb_cass_de.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE softwarelist SYSTEM "softwarelist.dtd">
 
-<!-- BBC Micro Model B (German) Tapes -->
+<!-- Acorn BBC Micro Model B (German) Tapes -->
 
 <!-- I believe all the Cassette images here are original, so some require the manuals for additional copy protection -->
 
@@ -12,7 +12,7 @@
       To start/stop the tape you must use the MAME UI, so you'll have to turn full keyboard mode off with Scroll Lock, then navigate the menus, turning Scroll Lock back on when you're finished.
 -->
 
-<softwarelist name="bbcb_cass_de" description="BBC Micro Model B (German) cassettes">
+<softwarelist name="bbcb_cass_de" description="Acorn BBC Micro Model B (German) cassettes">
 
 	<!-- Games -->
 
diff --git a/hash/bbcb_flop.xml b/hash/bbcb_flop.xml
index e14b15abbef..7df6da6981f 100644
--- a/hash/bbcb_flop.xml
+++ b/hash/bbcb_flop.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE softwarelist SYSTEM "softwarelist.dtd">
 
-<!-- BBC Micro Model B Disks -->
+<!-- Acorn BBC Micro Model B Disks -->
 
 <!-- Loading Instructions:
 
@@ -13,7 +13,7 @@
 <!-- All images in this list contain no protection, they are either deprotected disc images or transferred from cassette. Some may never have been protected and will be marked if known. -->
 
 
-<softwarelist name="bbcb_flop" description="BBC Micro Model B disks">
+<softwarelist name="bbcb_flop" description="Acorn BBC Micro Model B disks">
 
 	<!-- Games -->
 
diff --git a/hash/bbcb_flop_orig.xml b/hash/bbcb_flop_orig.xml
index a007dfe6a74..64b8cc3e09c 100644
--- a/hash/bbcb_flop_orig.xml
+++ b/hash/bbcb_flop_orig.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE softwarelist SYSTEM "softwarelist.dtd">
 
-<!-- BBC Micro Model B Original Disks -->
+<!-- Acorn BBC Micro Model B Original Disks -->
 
 <!-- Loading Instructions:
 
@@ -12,7 +12,7 @@
 
 <!-- All images in this list were created from original discs, most contain copy protection. -->
 
-<softwarelist name="bbcb_flop_orig" description="BBC Micro Model B Original disks">
+<softwarelist name="bbcb_flop_orig" description="Acorn BBC Micro Model B Original disks">
 
 	<!-- Games -->
 
diff --git a/hash/bbcb_flop_us.xml b/hash/bbcb_flop_us.xml
index 451d62d5626..3e6615cbfb3 100644
--- a/hash/bbcb_flop_us.xml
+++ b/hash/bbcb_flop_us.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE softwarelist SYSTEM "softwarelist.dtd">
 
-<!-- BBC Micro Model B (US) Disks -->
+<!-- Acorn BBC Micro Model B (US) Disks -->
 
 <!-- Loading Instructions:
 
       Hold down the SHIFT key and press and release the BREAK key.
 -->
 
-<softwarelist name="bbcb_flop_us" description="BBC Micro Model B (US) disks">
+<softwarelist name="bbcb_flop_us" description="Acorn BBC Micro Model B (US) disks">
 
 	<software name="intrutil">
 		<description>Introductory and Utilities Disk</description>
diff --git a/hash/bbcbc.xml b/hash/bbcbc.xml
index 2788609f39b..dcbf3f37c6e 100644
--- a/hash/bbcbc.xml
+++ b/hash/bbcbc.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0"?>
 <!DOCTYPE softwarelist SYSTEM "softwarelist.dtd">
+
 <!-- The BBC Bridge Companion only used a cartridge slot for software -->
+
 <softwarelist name="bbcbc" description="BBC Bridge Companion cartridges">
 	<software name="advbidng">
 		<description>Advanced Bidding</description>
diff --git a/hash/bbcm_cart.xml b/hash/bbcm_cart.xml
index 06209e94b06..18832d15855 100644
--- a/hash/bbcm_cart.xml
+++ b/hash/bbcm_cart.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE softwarelist SYSTEM "softwarelist.dtd">
 
-<!-- BBC Master ROM Cartridges -->
+<!-- Acorn BBC Master ROM Cartridges -->
 
 <!-- Loading Instructions:
 
       Hold down the SHIFT key and SPACEbar and press and release the BREAK key.
 -->
 
-<softwarelist name="bbcm_cart" description="BBC Master cartridges">
+<softwarelist name="bbcm_cart" description="Acorn BBC Master cartridges">
 
 	<software name="demo">
 		<description>BBC Master Demonstration Cartridge</description>
diff --git a/hash/bbcm_cass.xml b/hash/bbcm_cass.xml
index f389c5cc1e2..69e7313428e 100644
--- a/hash/bbcm_cass.xml
+++ b/hash/bbcm_cass.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE softwarelist SYSTEM "softwarelist.dtd">
 
-<!-- BBC Master Tapes -->
+<!-- Acorn BBC Master Tapes -->
 
 <!-- I believe all the Cassette images here are original, so some may require the manuals for additional copy protection. -->
 
@@ -12,7 +12,7 @@
       To start/stop the tape you must use the MESS menus, so you'll have to turn full keyboard mode off with Scroll Lock, then navigate the menus, turning Scroll Lock back on when you're finished.
 -->
 
-<softwarelist name="bbcm_cass" description="BBC Master cassettes">
+<softwarelist name="bbcm_cass" description="Acorn BBC Master cassettes">
 
 	<!-- Games -->
 
diff --git a/hash/bbcm_flop.xml b/hash/bbcm_flop.xml
index 32108cf30b7..92f737d63ec 100644
--- a/hash/bbcm_flop.xml
+++ b/hash/bbcm_flop.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE softwarelist SYSTEM "softwarelist.dtd">
 
-<!-- BBC Master Disks -->
+<!-- Acorn BBC Master Disks -->
 
 <!-- Loading Instructions:
 
@@ -12,7 +12,7 @@
       - MFM requires ADFS (A and BREAK)
 -->
 
-<softwarelist name="bbcm_flop" description="BBC Master disks">
+<softwarelist name="bbcm_flop" description="Acorn BBC Master disks">
 
 	<software name="welcomem">
 		<description>Welcome &amp; Utilities Disc</description>
diff --git a/hash/bbcmc_flop.xml b/hash/bbcmc_flop.xml
index b9a89d687d4..fca2734ba47 100644
--- a/hash/bbcmc_flop.xml
+++ b/hash/bbcmc_flop.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE softwarelist SYSTEM "softwarelist.dtd">
 
-<!-- BBC Master Compact Disks -->
+<!-- Acorn BBC Master Compact Disks -->
 
 <!-- Loading Instructions:
 
       Hold down the SHIFT key and press and release the BREAK key.
 -->
 
-<softwarelist name="bbcmc_flop" description="BBC Master Compact disks">
+<softwarelist name="bbcmc_flop" description="Acorn BBC Master Compact disks">
 
 	<software name="alps24">
 		<description>ALPS - Adventure Language Programming System</description>