EPG: Change reserved/user-defined genres to match appropriate generic EPG categories

diff --git a/src/epg.c b/src/epg.c
index f3007b82f0934cb014ee28793fda917c0f485410..c4f626b1cfe91abcdc2cd919df25966d7fa45405 100644 (file)
--- a/src/epg.c
+++ b/src/epg.c
@@ -2225,11 +2225,13 @@ static const char **_epg_genre_names[16][16] = {
     C_{ N_("Romance"), NULL },
     C_{ N_("Serious"), N_("Classical"), N_("Religious"), N_("Historical movie"), N_("Drama"), NULL },
     C_{ N_("Adult movie"), N_("Drama"), NULL },
-    C_{ N_("Adult movie"), N_("Drama"), NULL },
-    C_{ N_("Adult movie"), N_("Drama"), NULL },
-    C_{ N_("Adult movie"), N_("Drama"), NULL },
-    C_{ N_("Adult movie"), N_("Drama"), NULL },
-    C_{ N_("Adult movie"), N_("Drama"), NULL },
+    C_{ N_("Movie / drama"), NULL },
+    C_{ N_("Movie / drama"), NULL },
+    C_{ N_("Movie / drama"), NULL },
+    C_{ N_("Movie / drama"), NULL },
+    C_{ N_("Movie / drama"), NULL },
+    C_{ N_("Movie / drama"), NULL },
+    C_{ N_("Movie / drama"), NULL },
   },
   { /* 02 */
     C_{ N_("News"), N_("Current affairs"), NULL },
@@ -2237,31 +2239,35 @@ static const char **_epg_genre_names[16][16] = {
     C_{ N_("News magazine"), NULL },
     C_{ N_("Documentary"), NULL },
     C_{ N_("Discussion"), N_("Interview"), N_("Debate"), NULL },
-    C_{ N_("Discussion"), N_("Interview"), N_("Debate"), NULL },
-    C_{ N_("Discussion"), N_("Interview"), N_("Debate"), NULL },
-    C_{ N_("Discussion"), N_("Interview"), N_("Debate"), NULL },
-    C_{ N_("Discussion"), N_("Interview"), N_("Debate"), NULL },
-    C_{ N_("Discussion"), N_("Interview"), N_("Debate"), NULL },
-    C_{ N_("Discussion"), N_("Interview"), N_("Debate"), NULL },
-    C_{ N_("Discussion"), N_("Interview"), N_("Debate"), NULL },
-    C_{ N_("Discussion"), N_("Interview"), N_("Debate"), NULL },
-    C_{ N_("Discussion"), N_("Interview"), N_("Debate"), NULL },
+    C_{ N_("News / Current Affairs"), NULL },
+    C_{ N_("News / Current Affairs"), NULL },
+    C_{ N_("News / Current Affairs"), NULL },
+    C_{ N_("News / Current Affairs"), NULL },
+    C_{ N_("News / Current Affairs"), NULL },
+    C_{ N_("News / Current Affairs"), NULL },
+    C_{ N_("News / Current Affairs"), NULL },
+    C_{ N_("News / Current Affairs"), NULL },
+    C_{ N_("News / Current Affairs"), NULL },
+    C_{ N_("News / Current Affairs"), NULL },
+    C_{ N_("News / Current Affairs"), NULL },
   },
   { /* 03 */
     C_{ N_("Show"), N_("Game show"), NULL },
     C_{ N_("Game show"), N_("Quiz"), N_("Contest"), NULL },
     C_{ N_("Variety show"), NULL },
     C_{ N_("Talk show"), NULL },
-    C_{ N_("Talk show"), NULL },
-    C_{ N_("Talk show"), NULL },
-    C_{ N_("Talk show"), NULL },
-    C_{ N_("Talk show"), NULL },
-    C_{ N_("Talk show"), NULL },
-    C_{ N_("Talk show"), NULL },
-    C_{ N_("Talk show"), NULL },
-    C_{ N_("Talk show"), NULL },
-    C_{ N_("Talk show"), NULL },
-    C_{ N_("Talk show"), NULL },
+    C_{ N_("Show / Game show"), NULL },
+    C_{ N_("Show / Game show"), NULL },
+    C_{ N_("Show / Game show"), NULL },
+    C_{ N_("Show / Game show"), NULL },
+    C_{ N_("Show / Game show"), NULL },
+    C_{ N_("Show / Game show"), NULL },
+    C_{ N_("Show / Game show"), NULL },
+    C_{ N_("Show / Game show"), NULL },
+    C_{ N_("Show / Game show"), NULL },
+    C_{ N_("Show / Game show"), NULL },
+    C_{ N_("Show / Game show"), NULL },
+    C_{ N_("Show / Game show"), NULL },
   },
   { /* 04 */
     C_{ N_("Sports"), NULL },
@@ -2276,6 +2282,10 @@ static const char **_epg_genre_names[16][16] = {
     C_{ N_("Winter sports"), NULL },
     C_{ N_("Equestrian"), NULL },
     C_{ N_("Martial sports"), NULL },
+    C_{ N_("Sports"), NULL },
+    C_{ N_("Sports"), NULL },
+    C_{ N_("Sports"), NULL },
+    C_{ N_("Sports"), NULL },
   },
   { /* 05 */
     C_{ N_("Children's / Youth programs"), NULL },
@@ -2284,14 +2294,16 @@ static const char **_epg_genre_names[16][16] = {
     C_{ N_("Entertainment programs for 10 to 16"), NULL },
     C_{ N_("Informational"), N_("Educational"), N_("School programs"), NULL },
     C_{ N_("Cartoons"), N_("Puppets"), NULL },
-    C_{ N_("Cartoons"), N_("Puppets"), NULL },
-    C_{ N_("Cartoons"), N_("Puppets"), NULL },
-    C_{ N_("Cartoons"), N_("Puppets"), NULL },
-    C_{ N_("Cartoons"), N_("Puppets"), NULL },
-    C_{ N_("Cartoons"), N_("Puppets"), NULL },
-    C_{ N_("Cartoons"), N_("Puppets"), NULL },
-    C_{ N_("Cartoons"), N_("Puppets"), NULL },
-    C_{ N_("Cartoons"), N_("Puppets"), NULL },
+    C_{ N_("Children's / Youth Programs"), NULL },
+    C_{ N_("Children's / Youth Programs"), NULL },
+    C_{ N_("Children's / Youth Programs"), NULL },
+    C_{ N_("Children's / Youth Programs"), NULL },
+    C_{ N_("Children's / Youth Programs"), NULL },
+    C_{ N_("Children's / Youth Programs"), NULL },
+    C_{ N_("Children's / Youth Programs"), NULL },
+    C_{ N_("Children's / Youth Programs"), NULL },
+    C_{ N_("Children's / Youth Programs"), NULL },
+    C_{ N_("Children's / Youth Programs"), NULL },
   },
   { /* 06 */
     C_{ N_("Music"), N_("Ballet"), N_("Dance"), NULL },
@@ -2301,6 +2313,15 @@ static const char **_epg_genre_names[16][16] = {
     C_{ N_("Jazz"), NULL },
     C_{ N_("Musical"), N_("Opera"), NULL },
     C_{ N_("Ballet"), NULL },
+    C_{ N_("Music / Ballet / Dance"), NULL },
+    C_{ N_("Music / Ballet / Dance"), NULL },
+    C_{ N_("Music / Ballet / Dance"), NULL },
+    C_{ N_("Music / Ballet / Dance"), NULL },
+    C_{ N_("Music / Ballet / Dance"), NULL },
+    C_{ N_("Music / Ballet / Dance"), NULL },
+    C_{ N_("Music / Ballet / Dance"), NULL },
+    C_{ N_("Music / Ballet / Dance"), NULL },
+    C_{ N_("Music / Ballet / Dance"), NULL },
   },
   { /* 07 */
     C_{ N_("Arts"), N_("Culture (without music)"), NULL },
@@ -2315,22 +2336,28 @@ static const char **_epg_genre_names[16][16] = {
     C_{ N_("New media"), NULL },
     C_{ N_("Arts magazines"), N_("Culture magazines"), NULL },
     C_{ N_("Fashion"), NULL },
+    C_{ N_("Arts / Culture (without music)"), NULL },
+    C_{ N_("Arts / Culture (without music)"), NULL },
+    C_{ N_("Arts / Culture (without music)"), NULL },
+    C_{ N_("Arts / Culture (without music)"), NULL },
   },
   { /* 08 */
     C_{ N_("Social"), N_("Political issues"), N_("Economics"), NULL },
     C_{ N_("Magazines"), N_("Reports"), N_("Documentary"), NULL },
     C_{ N_("Economics"), N_("Social advisory"), NULL },
     C_{ N_("Remarkable people"), NULL },
-    C_{ N_("Remarkable people"), NULL },
-    C_{ N_("Remarkable people"), NULL },
-    C_{ N_("Remarkable people"), NULL },
-    C_{ N_("Remarkable people"), NULL },
-    C_{ N_("Remarkable people"), NULL },
-    C_{ N_("Remarkable people"), NULL },
-    C_{ N_("Remarkable people"), NULL },
-    C_{ N_("Remarkable people"), NULL },
-    C_{ N_("Remarkable people"), NULL },
-    C_{ N_("Remarkable people"), NULL },
+    C_{ N_("Social / Political issues / Economics"), NULL },
+    C_{ N_("Social / Political issues / Economics"), NULL },
+    C_{ N_("Social / Political issues / Economics"), NULL },
+    C_{ N_("Social / Political issues / Economics"), NULL },
+    C_{ N_("Social / Political issues / Economics"), NULL },
+    C_{ N_("Social / Political issues / Economics"), NULL },
+    C_{ N_("Social / Political issues / Economics"), NULL },
+    C_{ N_("Social / Political issues / Economics"), NULL },
+    C_{ N_("Social / Political issues / Economics"), NULL },
+    C_{ N_("Social / Political issues / Economics"), NULL },
+    C_{ N_("Social / Political issues / Economics"), NULL },
+    C_{ N_("Social / Political issues / Economics"), NULL },
   },
   { /* 09 */
     C_{ N_("Education"), N_("Science"), N_("Factual topics"), NULL },
@@ -2341,12 +2368,14 @@ static const char **_epg_genre_names[16][16] = {
     C_{ N_("Social"), N_("Spiritual sciences"), NULL },
     C_{ N_("Further education"), NULL },
     C_{ N_("Languages"), NULL },
-    C_{ N_("Languages"), NULL },
-    C_{ N_("Languages"), NULL },
-    C_{ N_("Languages"), NULL },
-    C_{ N_("Languages"), NULL },
-    C_{ N_("Languages"), NULL },
-    C_{ N_("Languages"), NULL },
+    C_{ N_("Education / Science / Factual topics"), NULL },
+    C_{ N_("Education / Science / Factual topics"), NULL },
+    C_{ N_("Education / Science / Factual topics"), NULL },
+    C_{ N_("Education / Science / Factual topics"), NULL },
+    C_{ N_("Education / Science / Factual topics"), NULL },
+    C_{ N_("Education / Science / Factual topics"), NULL },
+    C_{ N_("Education / Science / Factual topics"), NULL },
+    C_{ N_("Education / Science / Factual topics"), NULL },
   },
   { /* 10 */
     C_{ N_("Leisure hobbies"), NULL },
@@ -2357,12 +2386,14 @@ static const char **_epg_genre_names[16][16] = {
     C_{ N_("Cooking"), NULL },
     C_{ N_("Advertisement / Shopping"), NULL },
     C_{ N_("Gardening"), NULL },
-    C_{ N_("Gardening"), NULL },
-    C_{ N_("Gardening"), NULL },
-    C_{ N_("Gardening"), NULL },
-    C_{ N_("Gardening"), NULL },
-    C_{ N_("Gardening"), NULL },
-    C_{ N_("Gardening"), NULL },
+    C_{ N_("Leisure hobbies"), NULL },
+    C_{ N_("Leisure hobbies"), NULL },
+    C_{ N_("Leisure hobbies"), NULL },
+    C_{ N_("Leisure hobbies"), NULL },
+    C_{ N_("Leisure hobbies"), NULL },
+    C_{ N_("Leisure hobbies"), NULL },
+    C_{ N_("Leisure hobbies"), NULL },
+    C_{ N_("Leisure hobbies"), NULL },
   }
 };