(svn r10606) -Fix (r8826): plural and single cargo names were mixed up.

src/cargotype.h

@@ -33,8 +33,8 @@ struct CargoSpec {
 	uint16 multipliertowngrowth;
 	uint8 callback_mask;
 
-	StringID name;
 	StringID name_plural;
+	StringID name;
 	StringID units_volume;
 	StringID quantifier;
 	StringID abbrev;

src/newgrf.cpp

@@ -1532,11 +1532,11 @@ static bool CargoChangeInfo(uint cid, int numinfo, int prop, byte **bufp, int le
 				break;
 
 			case 0x09: /* String ID for cargo type name */
-				cs->name = grf_load_word(&buf);
+				cs->name_plural = grf_load_word(&buf);
 				break;
 
-			case 0x0A: /* String for cargo name, plural */
-				cs->name_plural = grf_load_word(&buf);
+			case 0x0A: /* String for 1 unit of cargo */
+				cs->name = grf_load_word(&buf);
 				break;
 
 			case 0x0B: