shop names fix some errors

crawl-ref/source/dat/database/shopname.txt

@@ -644,44 +644,61 @@ w:1
 ###############################################################################
 # Shop: General Store
 ###############################################################################
-general shop plural
-
-Home [Goods|Wares]
 %%%%
-general noun singular
-
-Doohicky
+general noun
 
 Essential
 
 Knick-knack
 
-W[ha|o]tsit
-
 Thing
 
 Thingama[bob|jig|doo]
-%%%%
-general noun plural
-
-w:50
-@general noun singular@s
 
-Bits
-
-Bits & [Bobs|Pieces]
+W[ha|o]tsit
+%%%%
+general noun no plural
 
 Convenience
 
 Junk
 
 Garbage
 
-Odds & Sods
+Home [Goods|Ware]
 
 Stuff
 
 Tat
+
+%%%%
+general noun singular
+
+w:100
+@general noun@
+
+w:50
+@general noun no plural@
+
+Doohickey
+%%%%
+general noun plural
+
+w:100
+@general noun@s
+
+w:50
+@general noun no plural@
+
+Bits
+
+Bits & [Bobs|Pieces]
+
+Doohickies
+
+Homewares
+
+Odds & Sods
 %%%%
 # XX: Still not happy about this: some of these *could* be used
 # standalone (Corner, One Stop) without even a noun, but we're not
@@ -998,7 +1015,7 @@ w:5
 
 @shop suffix singular@
 %%%%
-weapons shop name
+weapon shop name
 
 @intro name@ @weapon shop suffix@
 
@@ -1228,7 +1245,7 @@ jewellery prefix
 
 Spangl[ed|y]
 %%%%
-jewellery type
+jewellery noun
 
 [B|Sp]angle