Update content type names to match DTT list better

descriptor.c

@@ -335,29 +335,31 @@ content_type(struct descriptor *d)
 	switch (d->content.d84.level1)
 	{
 	    case 0x1:
-		return "Film/Drama";
+		return "Film";
 	    case 0x2:
-		return "News/Current affairs";
+		return "News & Factual";
 	    case 0x3:
-		return "Show/Game show";
+		return "Entertainment (Show)";
 	    case 0x4:
 		return "Sport";
 	    case 0x5:
 		return "Children";
 	    case 0x6:
-		return "Music/Ballet/Dance";
+		return "Entertainment (Music)";
 	    case 0x7:
-		return "Arts/Culture";
+		return "News & Factual (Arts)";
 	    case 0x8:
-		return "Social/Political/Economic";
+		return "News & Factual (Social)";
 	    case 0x9:
-		return "Education/Science/Factual";
+		return "Education";
 	    case 0xa:
-		return "Leisure";
+		return "Lifestyle";
+	    case 0xc:
+		return "Adult";
 	    case 0xf:
 		return "Drama";
 	}
-	return "Undefined";
+	return "Unclassified";
 }
 
 void