Generic name to object

data/json/items/generic.json

@@ -5,12 +5,11 @@
     "id": "animal",
     "symbol": "?",
     "color": "white",
-    "name": "animal",
-    "name_plural": "none",
+    "name": { "str": "animal", "str_pl": "none" },
     "description": "seeing this is a bug",
     "stackable": true,
     "price": 0,
-    "volume": 0,
+    "volume": "0 ml",
     "flags": [ "PSEUDO", "PERPETUAL" ],
     "fuel": { "energy": 1 }
   },
@@ -305,8 +304,7 @@
     "category": "spare_parts",
     "symbol": ",",
     "color": "light_gray",
-    "name": "chunk of chitin",
-    "name_plural": "chunks of chitin",
+    "name": { "str": "chunk of chitin", "str_pl": "chunks of chitin" },
     "description": "A piece of an insect's exoskeleton.  It is light and very durable.",
     "price": 0,
     "material": "chitin",
@@ -336,8 +334,7 @@
     "type": "GENERIC",
     "id": "acidchitin_piece",
     "copy-from": "chitin_piece",
-    "name": "chunk of biosilicified chitin",
-    "name_plural": "chunks of biosilicified chitin",
+    "name": { "str": "chunk of biosilicified chitin", "str_pl": "chunks of biosilicified chitin" },
     "description": "A lump of exoskeleton that has undergone biosilicification.  It is acid-resistant and remarkably sturdy.",
     "material": "acidchitin",
     "flags": [ "NO_SALVAGE" ],
@@ -348,8 +345,7 @@
     "id": "bundle_rag",
     "type": "GENERIC",
     "category": "spare_parts",
-    "name": "bundle of rags",
-    "name_plural": "bundles of rags",
+    "name": { "str": "bundle of rags", "str_pl": "bundles of rags" },
     "description": "Cotton rags, bundled tightly together for storage.  Disassemble to unpack.",
     "weight": "800 g",
     "volume": "750 ml",
@@ -362,8 +358,7 @@
     "id": "bundle_leather",
     "type": "GENERIC",
     "category": "spare_parts",
-    "name": "bundle of leather",
-    "name_plural": "bundles of leather",
+    "name": { "str": "bundle of leather", "str_pl": "bundles of leather" },
     "description": "Leather patches, bundled tightly together for storage.  Disassemble to unpack.",
     "weight": "1000 g",
     "volume": "1 L",
@@ -376,8 +371,7 @@
     "id": "bundle_wool",
     "type": "GENERIC",
     "category": "spare_parts",
-    "name": "bundle of felt",
-    "name_plural": "bundles of felt",
+    "name": { "str": "bundle of felt", "str_pl": "bundles of felt" },
     "description": "Felt patches, bundled tightly together for storage.  Disassemble to unpack.",
     "weight": "1000 g",
     "volume": "1 L",
@@ -682,8 +676,7 @@
     "id": "torch_done",
     "symbol": "/",
     "color": "brown",
-    "name": "burnt out torch",
-    "name_plural": "burnt out torches",
+    "name": { "str": "burnt out torch", "str_pl": "burnt out torches" },
     "description": "A torch that has consumed all its fuel; it can be recrafted into another torch.",
     "category": "other",
     "material": "wood",
@@ -1608,8 +1601,7 @@
     "category": "spare_parts",
     "symbol": ";",
     "color": "light_gray",
-    "name": "clockworks",
-    "name_plural": "clockworks",
+    "name": { "str": "clockworks", "str_pl": "clockworks" },
     "description": "A small assortment of gears and other clockwork gubbins.",
     "price": 200,
     "price_postapoc": 0,

data/json/items/melee/fake.json

@@ -2,8 +2,7 @@
   {
     "type": "GENERIC",
     "id": "bio_claws_weapon",
-    "name": "bionic claws",
-    "name_plural": "bionic claws",
+    "name": { "str": "bionic claws", "str_pl": "bionic claws" },
     "description": "Short and sharp claws made from a high-tech metal.",
     "to_hit": 4,
     "color": "light_gray",

data/json/items/melee/unarmed_weapons.json

@@ -21,8 +21,7 @@
     "id": "cestus",
     "symbol": "3",
     "color": "light_gray",
-    "name": "cestus",
-    "name_plural": "cestuses",
+    "name": { "str": "cestus", "str_pl": "cestuses" },
     "description": "A leather hand and arm wrap incorporating metal plates over the knuckles to improve punching power and defence.",
     "material": [ "leather", "steel" ],
     "volume": "100 ml",

data/json/items/tool/lighting.json

@@ -20,8 +20,7 @@
     "id": "atomic_lamp_off",
     "type": "GENERIC",
     "category": "tools",
-    "name": "atomic lamp (covered)",
-    "name_plural": "atomic lamps (covered)",
+    "name": { "str": "atomic lamp (covered)", "str_pl": "atomic lamps (covered)" },
     "description": "Powered by the magic of nuclear decay and low-energy LEDs, this very expensive lamp will emit a small amount of light for at least a decade.  Before the Cataclysm, it was mostly an expensive way to show off your preparedness.  Now, it's actually pretty cool.  The cover is closed.  Use it to open the cover and show the light.",
     "weight": "1438 g",
     "volume": "1 L",
@@ -66,8 +65,7 @@
     "id": "atomic_light_off",
     "type": "GENERIC",
     "category": "tools",
-    "name": "atomic reading light (covered)",
-    "name_plural": "atomic reading lights (covered)",
+    "name": { "str": "atomic reading light (covered)", "str_pl": "atomic reading lights (covered)" },
     "description": "Powered by the magic of nuclear decay and low-energy LEDs, this extremely expensive little light will provide just enough light to read by for at least a decade.  It is also available with a cute cartoon bear cover to turn it into a nightlight for a very wealthy child with a fear of the dark.  The cover is closed.  Use it to open the cover and show the light.",
     "weight": "214 g",
     "volume": "250 ml",

data/json/items/tool/workshop.json

@@ -101,8 +101,7 @@
     "id": "carding_paddles",
     "type": "GENERIC",
     "category": "tools",
-    "name": "carding paddles",
-    "name_plural": "pairs of carding paddles",
+    "name": { "str": "carding paddles", "str_pl": "pairs of carding paddles" },
     "description": "A pair of toothy wooden paddles used to clean fibers for use in textile production.",
     "weight": "360 g",
     "volume": "500 ml",

data/json/items/vehicle/boat.json

@@ -37,8 +37,7 @@
     "id": "carbonfiber_boat_hull",
     "symbol": "o",
     "color": "brown",
-    "name": "carbon fiber boat hull",
-    "name_plural": "carbon fiber boat hulls",
+    "name": { "str": "carbon fiber boat hull" },
     "description": "A carbon fiber sheet that keeps the boat afloat.  Add boat hulls to a vehicle until it floats.  Then attach oars or a motor to get the boat to move.",
     "price": 40000,
     "price_postapoc": 8000,

data/json/items/vehicle/noise.json

@@ -48,8 +48,7 @@
   {
     "type": "GENERIC",
     "id": "chimes",
-    "name": "chime loudspeakers",
-    "name_plural": "chime loudspeakers",
+    "name": { "str": "chime loudspeakers", "str_pl": "chime loudspeakers" },
     "description": "A stereo system with loudspeakers and a built-in set of simple melodies that it will play.  Commonly used by ice cream trucks to draw the attention of children in the days when children wanted ice cream more than brains.",
     "weight": "2600 g",
     "to_hit": -2,